From 816a4a38c40f74a850c172fa7111c410320c8f2a Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Fri, 31 Oct 2008 15:48:27 +0000
Subject: [PATCH] =?UTF-8?q?Obras:=20=20-=20preguntar=20fecha=20de=20cierre?=
 =?UTF-8?q?=20de=20una=20ejecuci=C3=B3n=20=20-=20mejorado=20el=20editor?=
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.Tecsitel_FactuGES2/trunk@716 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 Source/Cliente/FactuGES.dpr                   |   1 +
 Source/Cliente/FactuGES.dproj                 |  24 +++++-
 .../Obras/Controller/Obras_controller.dpk     | Bin 782 -> 848 bytes
 .../Obras/Controller/Obras_controller.dproj   |  14 ++--
 .../Obras/Controller/Obras_controller.res     | Bin 384 -> 4748 bytes
 .../View/uIEditorFechaCierreObra.pas          |  18 +++++
 .../Obras/Controller/uObrasController.pas     |  39 +++++-----
 Source/Modulos/Obras/Model/uBizObras.pas      |  10 ++-
 Source/Modulos/Obras/Views/Obras_view.dpk     |   3 +-
 Source/Modulos/Obras/Views/Obras_view.dproj   |  73 +++++++++++++++---
 Source/Modulos/Obras/Views/Obras_view.res     | Bin 384 -> 4748 bytes
 .../Obras/Views/uEditorFechaCierreObra.dfm    |  61 +++++++++++++++
 .../Obras/Views/uEditorFechaCierreObra.pas    |  43 +++++++++++
 Source/Modulos/Obras/Views/uEditorObra.dfm    |  35 ++++-----
 Source/Modulos/Obras/Views/uEditorObra.pas    |  23 +++---
 .../Obras/Views/uObrasViewRegister.pas        |   5 +-
 .../Obras/Views/uViewEjecucionObra.dfm        |  48 ++++--------
 .../Obras/Views/uViewEjecucionObra.pas        |   2 -
 .../Obras/Views/uViewListaEjecucionesObra.dfm |   3 +-
 .../Obras/Views/uViewListaPedidosProvObra.pas |   3 +
 .../Views/uViewListaPresupuestosObra.dfm      |   2 +
 .../Views/uViewListaPresupuestosObra.pas      |   3 +
 Source/Servidor/FactuGES_Server.dpr           |   1 +
 Source/Servidor/FactuGES_Server.dproj         |   4 +-
 Source/Servidor/FactuGES_Server.rc            |   2 +-
 25 files changed, 306 insertions(+), 111 deletions(-)
 create mode 100644 Source/Modulos/Obras/Controller/View/uIEditorFechaCierreObra.pas
 create mode 100644 Source/Modulos/Obras/Views/uEditorFechaCierreObra.dfm
 create mode 100644 Source/Modulos/Obras/Views/uEditorFechaCierreObra.pas

diff --git a/Source/Cliente/FactuGES.dpr b/Source/Cliente/FactuGES.dpr
index 89e112a9..03acc18b 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 a21291ec..fdf485be 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -45,7 +45,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_SymbolReferenceInfo>2</DCC_SymbolReferenceInfo>
@@ -62,6 +62,26 @@
       
       
       
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD10.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\PluginSDK_D10R.bpl">PluginSDK for Delphi 10 (Runtime)</Excluded_Packages>
@@ -92,7 +112,7 @@
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6011
-Activate=0
+Activate=1
 Activate Handle=1
 Save Log File=1
 Foreground Tab=0
diff --git a/Source/Modulos/Obras/Controller/Obras_controller.dpk b/Source/Modulos/Obras/Controller/Obras_controller.dpk
index 768433615d77a829bc1578b354b2531c82f70520..37b20331c6dbe278ec00be10aeb14cc5ed940061 100644
GIT binary patch
delta 86
zcmeBUyTG=AiP=wwmrFsR)YCO3vn0RBEj2kK(K$1<s3_GxsVGq)GfzQ1EHkw{28RN@
Ug2ZBVYhEs1uGG8~Jzg#b0Ll3qSO5S3

delta 20
bcmcb>*2lJiiJ8Zmmy4GxH7`Yvmx}=aGsXlF

diff --git a/Source/Modulos/Obras/Controller/Obras_controller.dproj b/Source/Modulos/Obras/Controller/Obras_controller.dproj
index 10932e92..587d6556 100644
--- a/Source/Modulos/Obras/Controller/Obras_controller.dproj
+++ b/Source/Modulos/Obras/Controller/Obras_controller.dproj
@@ -1,4 +1,5 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{12085ab3-37D9-4E64-8D4C-74D7748385D4}</ProjectGuid>
     <MainSource>Obras_controller.dpk</MainSource>
@@ -46,12 +47,13 @@
     <DelphiCompile Include="Obras_controller.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Obras_data.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Obras_model.dcp" />
     <DCCReference Include="uObrasController.pas" />
+    <DCCReference Include="View\ApplicationBase.dcp" />
+    <DCCReference Include="View\Contactos_model.dcp" />
+    <DCCReference Include="View\GUIBase.dcp" />
+    <DCCReference Include="View\Obras_data.dcp" />
+    <DCCReference Include="View\Obras_model.dcp" />
+    <DCCReference Include="View\uIEditorFechaCierreObra.pas" />
     <DCCReference Include="View\uIEditorListaObras.pas" />
     <DCCReference Include="View\uIEditorObra.pas" />
     <DCCReference Include="View\uIEditorObras.pas" />
diff --git a/Source/Modulos/Obras/Controller/Obras_controller.res b/Source/Modulos/Obras/Controller/Obras_controller.res
index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644
GIT binary patch
literal 4748
zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg
zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?<w4U-ol;S2jC7
zx4(byej2@_#)0HWvg0i^wC4Xli+W*aXJ^(njceK|Kb@c3qFNX>p${kR>3GhM`oH*q
zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W
zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7
z{BT%G%irdMe*|oDJmgvJ<ltI;x5J<Oc>aA2`9B<Z5Toyra?r{a4$fnJHGXo6Pmcq8
z{JGCD500t1h4|yI?-f&xoj9;YT&Ch&JLO*X#NC3sCI0Xmc<f_vh`jn-1E!?th$%QM
znzGM|)$vl3f7;nE+9qR}|A?C$H3K&BFdq9?uxrIqHIne#5?8G@da2ybWLGKA686M2
z*LJMMMk4<U`dzFC9}HrSxLfOGll{P#??xir)$c2}C;ql+y-&Wa(LP{PgPk1E1@{uR
zIMCNz;u9;r(axhQvEx%?i#p<Vn=Z!SK%f10?4_`0@RY8lXRM3(t(nFSzJ$4kJr6&x
ze)~B%biu*TY$HDstHD=|UGxJceYiUQQa0Gu(p3og@%ZJ><6Xi*?M~Q;)@Sbfwf3uf
zVaWkbU<NjR3%=~AdoZbkXp`f@b0%GBT^$^V5e(n|#O(?P)hBbF)4n%2cw6U#adPM!
zz(!`V|Bfl{aH0)Y&w;SK7R4<z{p;Gwz1D%l86L3ZFZQ&=pB$<&esXT|OZ?=AGaWoe
z{>jU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv
zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N|
z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc
z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0
zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38=
zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W
zVvPDBKHh;i=RU4J_ta3E;)M<P+=2X7;VbzliQZ=IHV#+fr#{!(ukt%UJMS8=332qg
z7jD)rSbpCW+^j*cd6LUEe8#9n&v!NEJM(@?SHvB$=h@|)fjw|&qD?NQ5A&R>n>Y+L
zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m
z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJu<OVP
zzHjp+hnwo*3NQE$JTA(agu~silV5T`du+GJgWGi_7mAy`Nk8fLt~%GF$;XXcE-ri?
zyIglyyzA`K-);4Eem2MZm07RBza@W3UP)d`Rz=RFk-I);`s{$L%yyBNX0OTjo5Gk0
zs}g44uXg*l%xo^{`#0=kd*2?}Cz22Bv2;Gu?;3o~(D#gk1OKYQSCAb$(&vu@_pvWO
z>gbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T
z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC
zy(^m((;DnQmDQ<zX+PK(Lfu@ox#mOnbZjSDl}IBqv$qwK+2@))5$ba>Katmw!@c`|
G?EMQ&4NnpP

delta 11
ScmeBCZD5|Duvteife`=|>;pCc

diff --git a/Source/Modulos/Obras/Controller/View/uIEditorFechaCierreObra.pas b/Source/Modulos/Obras/Controller/View/uIEditorFechaCierreObra.pas
new file mode 100644
index 00000000..f208d175
--- /dev/null
+++ b/Source/Modulos/Obras/Controller/View/uIEditorFechaCierreObra.pas
@@ -0,0 +1,18 @@
+unit uIEditorFechaCierreObra;
+
+interface
+
+type
+  IEditorFechaCierreObra = interface
+  ['{2124B621-143A-4955-90EF-EC2053840A47}']
+    function ShowModal : Integer;
+    procedure Show;
+
+    procedure SetFechaCierre (const Value : TDateTime);
+    function GetFechaCierre : TDateTime;
+    property FechaCierre : TDateTime read GetFechaCierre write SetFechaCierre;
+  end;
+
+implementation
+
+end.
diff --git a/Source/Modulos/Obras/Controller/uObrasController.pas b/Source/Modulos/Obras/Controller/uObrasController.pas
index cff3477c..72bccf19 100644
--- a/Source/Modulos/Obras/Controller/uObrasController.pas
+++ b/Source/Modulos/Obras/Controller/uObrasController.pas
@@ -88,7 +88,8 @@ uses
   cxControls, DB, uEditorRegistryUtils, schObrasClient_Intf,
   uIEditorObras, uIEditorObra, uDataModuleObras, Variants,
   uDataModuleUsuarios, uDAInterfaces, uDataTableUtils, uFactuGES_App,
-  uDateUtils, uROTypes, DateUtils, Controls, Windows, uIEditorListaObras;
+  uDateUtils, uROTypes, DateUtils, Controls, Windows, uIEditorListaObras,
+  uIEditorFechaCierreObra;
 
 { TObrasController }
 
@@ -174,31 +175,33 @@ end;
 
 procedure TObrasController.CerrarEjecucionActiva(AObra: IBizObra;
   const AFecha: TDateTime);
+var
+  AEditor : IEditorFechaCierreObra;
 begin
+  AEditor := NIL;
+
   if not Assigned(AObra) then
     raise Exception.Create ('Obra no asignada (CerrarEjecucion)');
 
   if AObra.DataTable.Active then
      AObra.DataTable.Active := True;
 
-{  with AObra.Ejecuciones do
-  begin
-    Insert;
-    FECHA_INICIO := AObra.EjecucionEnCurso.FECHA_INICIO;
-    FECHA_FIN := AFecha;
-    ID_SUBCONTRATA := AObra.EjecucionEnCurso.ID_SUBCONTRATA;
-    NOMBRE := AObra.EjecucionEnCurso.NOMBRE;
-    IMPORTE_GASTOS := AObra.EjecucionEnCurso.IMPORTE_GASTOS;
-    IMPORTE_INGRESOS := AObra.EjecucionEnCurso.IMPORTE_INGRESOS;
-    IMPORTE_TOTAL := AObra.EjecucionEnCurso.IMPORTE_TOTAL;
-    OBSERVACIONES.AddStrings(AObra.EjecucionEnCurso.OBSERVACIONES.Strings);
-    Post;
+  CreateEditor('EditorFechaCierreObra', IEditorFechaCierreObra, AEditor);
+  try
+    if Assigned(AEditor) then
+      with (AEditor as IEditorFechaCierreObra) do
+      begin
+        FechaCierre := DateOf(AFecha);
+        if (ShowModal = mrOk) then
+        begin
+          AObra.Ejecuciones.Edit;
+          AObra.Ejecuciones.FECHA_FIN := DateOf(FechaCierre);
+          AObra.Ejecuciones.Post;
+        end;
+      end;
+  finally
+    AEditor := NIL;
   end;
-
-  with AObra.EjecucionEnCurso do
-  begin
-    Delete;
-  end;}
 end;
 
 procedure TObrasController.CopiarDireccion(const ACliente: IBizCliente;
diff --git a/Source/Modulos/Obras/Model/uBizObras.pas b/Source/Modulos/Obras/Model/uBizObras.pas
index 856fcd30..101ec2c3 100644
--- a/Source/Modulos/Obras/Model/uBizObras.pas
+++ b/Source/Modulos/Obras/Model/uBizObras.pas
@@ -29,6 +29,7 @@ type
     ['{6BAFA32B-39A5-4BC3-9F16-97A36745C3D9}']
     function EsNuevo : Boolean;
     function EnCurso : Boolean;
+    procedure RecalcularBeneficio;
 
     function GetPresupuestos: IBizEjecucionPresupuestos;
     procedure SetPresupuestos(Value: IBizEjecucionPresupuestos);
@@ -124,7 +125,8 @@ type
   public
     function EsNuevo : Boolean;
     function EnCurso : Boolean;
-
+    procedure RecalcularBeneficio;
+    
     constructor Create(aDataTable: TDADataTable); override;
     destructor Destroy; override;
 
@@ -280,6 +282,12 @@ begin
   FECHA_INICIO := DateOf(Now);
 end;
 
+procedure TBizEjecucionesObra.RecalcularBeneficio;
+begin
+  Edit;
+  IMPORTE_TOTAL := IMPORTE_INGRESOS - IMPORTE_GASTOS;
+end;
+
 procedure TBizEjecucionesObra.SetPedidos(
   Value: IBizEjecucionPedidosProveedor);
 begin
diff --git a/Source/Modulos/Obras/Views/Obras_view.dpk b/Source/Modulos/Obras/Views/Obras_view.dpk
index 5f9c3219..0a0b3701 100644
--- a/Source/Modulos/Obras/Views/Obras_view.dpk
+++ b/Source/Modulos/Obras/Views/Obras_view.dpk
@@ -50,6 +50,7 @@ contains
   uViewListaEjecucionesObra in 'uViewListaEjecucionesObra.pas' {frViewListaEjecucionesObra: TFrame},
   uViewEjecucionObra in 'uViewEjecucionObra.pas' {frViewEjecucionObra: TFrame},
   uViewListaPedidosProvObra in 'uViewListaPedidosProvObra.pas' {frViewListaPedidosProvObra: TFrame},
-  uViewListaPresupuestosObra in 'uViewListaPresupuestosObra.pas' {frViewListaPresupuestosObra: TFrame};
+  uViewListaPresupuestosObra in 'uViewListaPresupuestosObra.pas' {frViewListaPresupuestosObra: TFrame},
+  uEditorFechaCierreObra in 'uEditorFechaCierreObra.pas' {fEditorFechaCierreObra: TfEditorFechaCierreObra};
 
 end.
diff --git a/Source/Modulos/Obras/Views/Obras_view.dproj b/Source/Modulos/Obras/Views/Obras_view.dproj
index f6acbbee..c347390c 100644
--- a/Source/Modulos/Obras/Views/Obras_view.dproj
+++ b/Source/Modulos/Obras/Views/Obras_view.dproj
@@ -47,18 +47,67 @@
     <DelphiCompile Include="Obras_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="ApplicationBase.dcp" />
-    <DCCReference Include="Base.dcp" />
-    <DCCReference Include="Contactos_controller.dcp" />
-    <DCCReference Include="Contactos_model.dcp" />
-    <DCCReference Include="Contactos_view.dcp" />
-    <DCCReference Include="GUIBase.dcp" />
-    <DCCReference Include="Obras_controller.dcp" />
-    <DCCReference Include="Obras_model.dcp" />
-    <DCCReference Include="PedidosProveedor_controllercontainsuViewObrain.dcp" />
-    <DCCReference Include="PedidosProveedor_model.dcp" />
-    <DCCReference Include="PresupuestosCliente_controller.dcp" />
-    <DCCReference Include="PresupuestosCliente_model.dcp" />
+    <DCCReference Include="..\Controller\View\ApplicationBase.dcp" />
+    <DCCReference Include="..\Controller\View\Base.dcp" />
+    <DCCReference Include="..\Controller\View\Contactos_controller.dcp" />
+    <DCCReference Include="..\Controller\View\Contactos_model.dcp" />
+    <DCCReference Include="..\Controller\View\Contactos_view.dcp" />
+    <DCCReference Include="..\Controller\View\GUIBase.dcp" />
+    <DCCReference Include="..\Controller\View\Obras_controller.dcp" />
+    <DCCReference Include="..\Controller\View\Obras_model.dcp" />
+    <DCCReference Include="..\Controller\View\PedidosProveedor_controller.dcp" />
+    <DCCReference Include="..\Controller\View\PedidosProveedor_model.dcp" />
+    <DCCReference Include="..\Controller\View\PresupuestosCliente_controller.dcp" />
+    <DCCReference Include="..\Controller\View\PresupuestosCliente_model.dcp" />
+    <DCCReference Include="uEditorFechaCierreObra.pas">
+      <Form>fEditorFechaCierreObra</Form>
+      <DesignClass>TfEditorObra</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uEditorListaObras.pas">
+      <Form>fEditorListaObras</Form>
+      <DesignClass>TfListaObras</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uEditorObra.pas">
+      <Form>fEditorObra</Form>
+      <DesignClass>TfEditorObra</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uEditorObras.pas">
+      <Form>fEditorObras</Form>
+      <DesignClass>TfEditorObras</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uObrasViewRegister.pas" />
+    <DCCReference Include="uViewClienteAsociadoObra.pas">
+      <Form>frViewClienteAsociadoObra</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uViewEjecucionObra.pas">
+      <Form>frViewEjecucionObra</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uViewListaEjecucionesObra.pas">
+      <Form>frViewListaEjecucionesObra</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uViewListaPedidosProvObra.pas">
+      <Form>frViewListaPedidosProvObra</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uViewListaPresupuestosObra.pas">
+      <Form>frViewListaPresupuestosObra</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uViewObra.pas">
+      <Form>frViewObra</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uViewObras.pas">
+      <Form>frViewObras</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uViewSubcontrataObra.pas">
+      <Form>frViewSubcontrataObra</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
diff --git a/Source/Modulos/Obras/Views/Obras_view.res b/Source/Modulos/Obras/Views/Obras_view.res
index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644
GIT binary patch
literal 4748
zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg
zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?<w4U-ol;S2jC7
zx4(byej2@_#)0HWvg0i^wC4Xli+W*aXJ^(njceK|Kb@c3qFNX>p${kR>3GhM`oH*q
zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W
zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7
z{BT%G%irdMe*|oDJmgvJ<ltI;x5J<Oc>aA2`9B<Z5Toyra?r{a4$fnJHGXo6Pmcq8
z{JGCD500t1h4|yI?-f&xoj9;YT&Ch&JLO*X#NC3sCI0Xmc<f_vh`jn-1E!?th$%QM
znzGM|)$vl3f7;nE+9qR}|A?C$H3K&BFdq9?uxrIqHIne#5?8G@da2ybWLGKA686M2
z*LJMMMk4<U`dzFC9}HrSxLfOGll{P#??xir)$c2}C;ql+y-&Wa(LP{PgPk1E1@{uR
zIMCNz;u9;r(axhQvEx%?i#p<Vn=Z!SK%f10?4_`0@RY8lXRM3(t(nFSzJ$4kJr6&x
ze)~B%biu*TY$HDstHD=|UGxJceYiUQQa0Gu(p3og@%ZJ><6Xi*?M~Q;)@Sbfwf3uf
zVaWkbU<NjR3%=~AdoZbkXp`f@b0%GBT^$^V5e(n|#O(?P)hBbF)4n%2cw6U#adPM!
zz(!`V|Bfl{aH0)Y&w;SK7R4<z{p;Gwz1D%l86L3ZFZQ&=pB$<&esXT|OZ?=AGaWoe
z{>jU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv
zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N|
z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc
z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0
zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38=
zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W
zVvPDBKHh;i=RU4J_ta3E;)M<P+=2X7;VbzliQZ=IHV#+fr#{!(ukt%UJMS8=332qg
z7jD)rSbpCW+^j*cd6LUEe8#9n&v!NEJM(@?SHvB$=h@|)fjw|&qD?NQ5A&R>n>Y+L
zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m
z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJu<OVP
zzHjp+hnwo*3NQE$JTA(agu~silV5T`du+GJgWGi_7mAy`Nk8fLt~%GF$;XXcE-ri?
zyIglyyzA`K-);4Eem2MZm07RBza@W3UP)d`Rz=RFk-I);`s{$L%yyBNX0OTjo5Gk0
zs}g44uXg*l%xo^{`#0=kd*2?}Cz22Bv2;Gu?;3o~(D#gk1OKYQSCAb$(&vu@_pvWO
z>gbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T
z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC
zy(^m((;DnQmDQ<zX+PK(Lfu@ox#mOnbZjSDl}IBqv$qwK+2@))5$ba>Katmw!@c`|
G?EMQ&4NnpP

delta 11
ScmeBCZD5|Duvteife`=|>;pCc

diff --git a/Source/Modulos/Obras/Views/uEditorFechaCierreObra.dfm b/Source/Modulos/Obras/Views/uEditorFechaCierreObra.dfm
new file mode 100644
index 00000000..ccc7a964
--- /dev/null
+++ b/Source/Modulos/Obras/Views/uEditorFechaCierreObra.dfm
@@ -0,0 +1,61 @@
+object fEditorFechaCierreObra: TfEditorFechaCierreObra
+  Left = 0
+  Top = 0
+  BorderIcons = [biSystemMenu]
+  Caption = 'Fecha de cierre'
+  ClientHeight = 141
+  ClientWidth = 253
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
+  FormStyle = fsStayOnTop
+  OldCreateOrder = False
+  Position = poMainFormCenter
+  OnShow = FormShow
+  PixelsPerInch = 96
+  TextHeight = 13
+  object Label1: TLabel
+    Left = 8
+    Top = 10
+    Width = 237
+    Height = 31
+    Caption = 'Establezca la fecha de cierre para esta ejecuci'#243'n de obra:'
+    WordWrap = True
+  end
+  object edtFechaDecision: TcxDateEdit
+    Left = 48
+    Top = 47
+    Style.LookAndFeel.Kind = lfStandard
+    Style.LookAndFeel.NativeStyle = True
+    StyleDisabled.LookAndFeel.Kind = lfStandard
+    StyleDisabled.LookAndFeel.NativeStyle = True
+    StyleFocused.LookAndFeel.Kind = lfStandard
+    StyleFocused.LookAndFeel.NativeStyle = True
+    StyleHot.LookAndFeel.Kind = lfStandard
+    StyleHot.LookAndFeel.NativeStyle = True
+    TabOrder = 0
+    Width = 169
+  end
+  object bAceptar: TButton
+    Left = 85
+    Top = 105
+    Width = 75
+    Height = 25
+    Caption = 'Aceptar'
+    ModalResult = 1
+    TabOrder = 1
+  end
+  object bCancelar: TButton
+    Left = 166
+    Top = 105
+    Width = 75
+    Height = 25
+    Cancel = True
+    Caption = 'Cancelar'
+    ModalResult = 2
+    TabOrder = 2
+  end
+end
diff --git a/Source/Modulos/Obras/Views/uEditorFechaCierreObra.pas b/Source/Modulos/Obras/Views/uEditorFechaCierreObra.pas
new file mode 100644
index 00000000..635ddd8c
--- /dev/null
+++ b/Source/Modulos/Obras/Views/uEditorFechaCierreObra.pas
@@ -0,0 +1,43 @@
+unit uEditorFechaCierreObra;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, StdCtrls, cxControls, cxContainer,
+  cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit, cxCalendar, uIEditorFechaCierreObra;
+
+type
+  TfEditorFechaCierreObra = class(TForm, IEditorFechaCierreObra)
+    Label1: TLabel;
+    edtFechaDecision: TcxDateEdit;
+    bAceptar: TButton;
+    bCancelar: TButton;
+    procedure FormShow(Sender: TObject);
+  private
+    procedure SetFechaCierre (const Value : TDateTime);
+    function GetFechaCierre : TDateTime;
+  public
+    property FechaCierre : TDateTime read GetFechaCierre write SetFechaCierre;
+  end;
+
+implementation
+
+{$R *.dfm}
+
+procedure TfEditorFechaCierreObra.FormShow(Sender: TObject);
+begin
+  edtFechaDecision.Date := now;
+end;
+
+function TfEditorFechaCierreObra.GetFechaCierre: TDateTime;
+begin
+  Result := edtFechaDecision.Date;
+end;
+
+procedure TfEditorFechaCierreObra.SetFechaCierre(const Value: TDateTime);
+begin
+  edtFechaDecision.Date := Value;
+end;
+
+end.
diff --git a/Source/Modulos/Obras/Views/uEditorObra.dfm b/Source/Modulos/Obras/Views/uEditorObra.dfm
index b98f3998..5ea530c2 100644
--- a/Source/Modulos/Obras/Views/uEditorObra.dfm
+++ b/Source/Modulos/Obras/Views/uEditorObra.dfm
@@ -50,13 +50,19 @@ inherited fEditorObra: TfEditorObra
     Width = 632
     ExplicitWidth = 632
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 330
+      ExplicitWidth = 632
       inherited TBXItem2: TTBXItem
         Visible = False
       end
       inherited TBXItem5: TTBXItem
         Visible = False
       end
+      object TBXItem34: TTBXItem [7]
+        Action = actNuevaEjecucion
+      end
+      object TBXItem35: TTBXItem [8]
+        Action = actFinalizarEjecucion
+      end
       inherited TBXItem23: TTBXItem
         Visible = False
       end
@@ -115,35 +121,24 @@ inherited fEditorObra: TfEditorObra
     ActivePage = pagListaEjecuciones
     OnChange = pgPaginasChange
     ExplicitWidth = 626
-    ExplicitHeight = 240
+    ExplicitHeight = 318
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
       ExplicitTop = 24
       ExplicitWidth = 618
-      ExplicitHeight = 212
-    end
-    object pagNuevaEjecucion: TTabSheet
-      Caption = 'Ejecuci'#243'n en curso'
-      ImageIndex = 3
-      ExplicitHeight = 212
-      object bNuevaEjecucion: TButton
-        Left = 48
-        Top = 24
-        Width = 145
-        Height = 25
-        Action = actNuevaEjecucion
-        TabOrder = 0
-      end
+      ExplicitHeight = 290
     end
     object pagEjecucionActual: TTabSheet
       Caption = 'Ejecuci'#243'n en curso'
       ImageIndex = 4
-      ExplicitHeight = 212
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
     end
     object pagListaEjecuciones: TTabSheet
       Caption = 'Lista de ejecuciones'
       ImageIndex = 5
-      ExplicitHeight = 212
       inline frViewListaEjecucionesObra1: TfrViewListaEjecucionesObra
         Left = 0
         Top = 0
@@ -159,12 +154,12 @@ inherited fEditorObra: TfEditorObra
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 618
-        ExplicitHeight = 212
+        ExplicitHeight = 290
         inherited cxGrid: TcxGrid
           Width = 618
           Height = 265
           ExplicitWidth = 618
-          ExplicitHeight = 187
+          ExplicitHeight = 265
           inherited cxGridView: TcxGridDBTableView
             DataController.Summary.FooterSummaryItems = <
               item
diff --git a/Source/Modulos/Obras/Views/uEditorObra.pas b/Source/Modulos/Obras/Views/uEditorObra.pas
index 28041199..b07dea41 100644
--- a/Source/Modulos/Obras/Views/uEditorObra.pas
+++ b/Source/Modulos/Obras/Views/uEditorObra.pas
@@ -21,10 +21,8 @@ type
   TfEditorObra = class(TfEditorDBItem, IEditorObra)
     dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList;
     dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel;
-    pagNuevaEjecucion: TTabSheet;
     pagEjecucionActual: TTabSheet;
     pagListaEjecuciones: TTabSheet;
-    bNuevaEjecucion: TButton;
     frViewListaEjecucionesObra1: TfrViewListaEjecucionesObra;
     actNuevaEjecucion: TAction;
     actFinalizarEjecucion: TAction;
@@ -33,6 +31,8 @@ type
     TBXItem33: TTBXItem;
     DBGrid1: TDBGrid;
     dsEjecucionActiva: TDADataSource;
+    TBXItem34: TTBXItem;
+    TBXItem35: TTBXItem;
     procedure FormShow(Sender: TObject);
     procedure CustomEditorClose(Sender: TObject; var Action: TCloseAction);
     procedure actNuevaEjecucionExecute(Sender: TObject);
@@ -64,6 +64,7 @@ type
     //sobreescribir este metodo
     procedure AsignarVista; virtual;
     procedure AsignarVistaEjecucion;
+    procedure DestruirVistaEjecucion;
 
   public
     property Obra: IBizObra read GetObra write SetObra;
@@ -210,6 +211,11 @@ begin
   inherited;
 end;
 
+procedure TfEditorObra.DestruirVistaEjecucion;
+begin
+  FViewEjecucionActual := NIL;
+end;
+
 procedure TfEditorObra.actFinalizarEjecucionExecute(Sender: TObject);
 begin
   if (ShowConfirmMessage('Finalizar la ejecución en curso', 'La ejecución actual pasará a ser histórica. ¿Desea cerrar la ejecución actual de la obra?') = IDYES) then
@@ -217,9 +223,9 @@ begin
     ShowHourglassCursor;
     try
       FController.CerrarEjecucionActiva(FObra, Now);
-      FViewEjecucionActual := NIL;
+      DestruirVistaEjecucion;
       ActualizarPestanas;
-      pgPaginas.ActivePageIndex := pagNuevaEjecucion.PageIndex;
+      pgPaginas.ActivePageIndex := pagListaEjecuciones.PageIndex;
     finally
       HideHourglassCursor;
     end;
@@ -257,14 +263,9 @@ end;
 procedure TfEditorObra.ActualizarPestanas;
 begin
   if Assigned(FViewEjecucionActual) then
-  begin
-    pagNuevaEjecucion.TabVisible := False;
     pagEjecucionActual.TabVisible := True
-  end
-  else begin
-    pagNuevaEjecucion.TabVisible := True;
+  else
     pagEjecucionActual.TabVisible := False;
-  end;
 end;
 
 procedure TfEditorObra.AsignarVista;
@@ -285,7 +286,7 @@ procedure TfEditorObra.AsignarVistaEjecucion;
 var
   AViewEjecucion: TfrViewEjecucionObra;
 begin
-  AViewEjecucion := TfrViewEjecucionObra.Create(Self);
+  AViewEjecucion := TfrViewEjecucionObra.Create(NIL);
 
   with AViewEjecucion do
   begin
diff --git a/Source/Modulos/Obras/Views/uObrasViewRegister.pas b/Source/Modulos/Obras/Views/uObrasViewRegister.pas
index 58fe9e78..836e206c 100644
--- a/Source/Modulos/Obras/Views/uObrasViewRegister.pas
+++ b/Source/Modulos/Obras/Views/uObrasViewRegister.pas
@@ -8,13 +8,15 @@ procedure UnregisterViews;
 implementation
 
 uses
-  uEditorRegistryUtils, uEditorObras, uEditorObra, uEditorListaObras;
+  uEditorRegistryUtils, uEditorObras, uEditorObra, uEditorListaObras,
+  uEditorFechaCierreObra;
 
 procedure RegisterViews;
 begin
   EditorRegistry.RegisterClass(TfEditorObra, 'EditorObra');
   EditorRegistry.RegisterClass(TfEditorObras, 'EditorObras');
   EditorRegistry.RegisterClass(TfEditorListaObras, 'EditorListaObras');
+  EditorRegistry.RegisterClass(TfEditorFechaCierreObra, 'EditorFechaCierreObra');
 end;
 
 procedure UnregisterViews;
@@ -22,6 +24,7 @@ begin
   EditorRegistry.UnRegisterClass(TfEditorObra);
   EditorRegistry.UnRegisterClass(TfEditorObras);
   EditorRegistry.UnRegisterClass(TfEditorListaObras);
+  EditorRegistry.UnRegisterClass(TfEditorFechaCierreObra);
 end;
 
 end.
diff --git a/Source/Modulos/Obras/Views/uViewEjecucionObra.dfm b/Source/Modulos/Obras/Views/uViewEjecucionObra.dfm
index ae22ee64..25a13ad2 100644
--- a/Source/Modulos/Obras/Views/uViewEjecucionObra.dfm
+++ b/Source/Modulos/Obras/Views/uViewEjecucionObra.dfm
@@ -56,14 +56,6 @@ inherited frViewEjecucionObra: TfrViewEjecucionObra
       Width = 129
       Height = 25
       Action = actCancelarEjecucion
-      TabOrder = 2
-    end
-    object bFinEjecucion: TButton
-      Left = 279
-      Top = 28
-      Width = 137
-      Height = 25
-      Action = actFinEjecucion
       TabOrder = 1
     end
     object ImporteBase: TcxDBCurrencyEdit
@@ -98,7 +90,7 @@ inherited frViewEjecucionObra: TfrViewEjecucionObra
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 7
+      TabOrder = 6
       Height = 21
       Width = 254
     end
@@ -134,7 +126,7 @@ inherited frViewEjecucionObra: TfrViewEjecucionObra
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 8
+      TabOrder = 7
       Height = 21
       Width = 254
     end
@@ -170,7 +162,7 @@ inherited frViewEjecucionObra: TfrViewEjecucionObra
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 9
+      TabOrder = 8
       Height = 21
       Width = 254
     end
@@ -185,7 +177,7 @@ inherited frViewEjecucionObra: TfrViewEjecucionObra
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 5
+      TabOrder = 4
       ReadOnly = False
       ExplicitLeft = 22
       ExplicitTop = 120
@@ -208,18 +200,6 @@ inherited frViewEjecucionObra: TfrViewEjecucionObra
       inherited ToolBar1: TToolBar
         Width = 645
         ExplicitWidth = 645
-        inherited ToolButton1: TToolButton
-          ExplicitWidth = 62
-        end
-        inherited ToolButton4: TToolButton
-          ExplicitWidth = 74
-        end
-        inherited ToolButton2: TToolButton
-          ExplicitWidth = 67
-        end
-        inherited ToolButton7: TToolButton
-          ExplicitWidth = 117
-        end
       end
       inherited dsDetalles: TDADataSource
         Left = 56
@@ -245,7 +225,7 @@ inherited frViewEjecucionObra: TfrViewEjecucionObra
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 6
+      TabOrder = 5
       ReadOnly = False
       ExplicitLeft = 22
       ExplicitTop = 294
@@ -256,6 +236,14 @@ inherited frViewEjecucionObra: TfrViewEjecucionObra
         Height = 94
         ExplicitWidth = 645
         ExplicitHeight = 94
+        inherited cxGridView: TcxGridDBTableView
+          DataController.Summary.FooterSummaryItems = <
+            item
+              Format = ',0.00 '#8364';-,0.00 '#8364
+              Kind = skSum
+              Column = frViewListaPedidosProvObra1.cxGridViewBASE_IMPONIBLE
+            end>
+        end
       end
       inherited ToolBar1: TToolBar
         Width = 645
@@ -280,7 +268,7 @@ inherited frViewEjecucionObra: TfrViewEjecucionObra
       Width = 120
       Height = 25
       Caption = 'Elegir subcontrata'
-      TabOrder = 4
+      TabOrder = 3
       OnClick = bElegirSubcontrataClick
       Glyph.Data = {
         36040000424D3604000000000000360000002800000010000000100000000100
@@ -341,7 +329,7 @@ inherited frViewEjecucionObra: TfrViewEjecucionObra
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 3
+      TabOrder = 2
       Height = 21
       Width = 301
     end
@@ -363,12 +351,6 @@ inherited frViewEjecucionObra: TfrViewEjecucionObra
             Control = edtFecha
             ControlOptions.ShowBorder = False
           end
-          object dxLayoutControlEjecucionObraItem3: TdxLayoutItem
-            AutoAligns = [aaVertical]
-            ShowCaption = False
-            Control = bFinEjecucion
-            ControlOptions.ShowBorder = False
-          end
           object dxLayoutControlEjecucionObraItem2: TdxLayoutItem
             AutoAligns = [aaVertical]
             AlignHorz = ahRight
diff --git a/Source/Modulos/Obras/Views/uViewEjecucionObra.pas b/Source/Modulos/Obras/Views/uViewEjecucionObra.pas
index 60db9d74..a34edd90 100644
--- a/Source/Modulos/Obras/Views/uViewEjecucionObra.pas
+++ b/Source/Modulos/Obras/Views/uViewEjecucionObra.pas
@@ -37,8 +37,6 @@ type
     actCancelarEjecucion: TAction;
     dxLayoutControlEjecucionObraItem2: TdxLayoutItem;
     bCancelarEjecucion: TButton;
-    dxLayoutControlEjecucionObraItem3: TdxLayoutItem;
-    bFinEjecucion: TButton;
     dxLayoutControlEjecucionObraGroup3: TdxLayoutGroup;
     dxLayoutControlEjecucionObraItem4: TdxLayoutItem;
     ImporteBase: TcxDBCurrencyEdit;
diff --git a/Source/Modulos/Obras/Views/uViewListaEjecucionesObra.dfm b/Source/Modulos/Obras/Views/uViewListaEjecucionesObra.dfm
index 39e1f24b..00223909 100644
--- a/Source/Modulos/Obras/Views/uViewListaEjecucionesObra.dfm
+++ b/Source/Modulos/Obras/Views/uViewListaEjecucionesObra.dfm
@@ -86,15 +86,16 @@ inherited frViewListaEjecucionesObra: TfrViewListaEjecucionesObra
   end
   inherited ToolBar1: TToolBar
     Width = 697
-    Visible = False
     ExplicitWidth = 697
     inherited ToolButton1: TToolButton
       ExplicitWidth = 62
     end
     inherited ToolButton4: TToolButton
+      Visible = False
       ExplicitWidth = 74
     end
     inherited ToolButton2: TToolButton
+      Visible = False
       ExplicitWidth = 67
     end
     inherited ToolButton7: TToolButton
diff --git a/Source/Modulos/Obras/Views/uViewListaPedidosProvObra.pas b/Source/Modulos/Obras/Views/uViewListaPedidosProvObra.pas
index df18e603..f2e4bb52 100644
--- a/Source/Modulos/Obras/Views/uViewListaPedidosProvObra.pas
+++ b/Source/Modulos/Obras/Views/uViewListaPedidosProvObra.pas
@@ -73,6 +73,7 @@ begin
 
       FObra.Ejecuciones.Edit;
       FObra.Ejecuciones.IMPORTE_GASTOS := FObra.Ejecuciones.IMPORTE_GASTOS + FPedidosProvEjecucion.BASE_IMPONIBLE;
+      FObra.Ejecuciones.RecalcularBeneficio;      
     end;
   finally
     APedido := NIL;
@@ -110,6 +111,7 @@ begin
   inherited;
   FObra.Ejecuciones.Edit;
   FObra.Ejecuciones.IMPORTE_GASTOS := FObra.Ejecuciones.IMPORTE_GASTOS - AImporte;
+  FObra.Ejecuciones.RecalcularBeneficio;  
 end;
 
 function TfrViewListaPedidosProvObra.GetObra: IBizObra;
@@ -144,6 +146,7 @@ begin
           FObra.Ejecuciones.Edit;
           FObra.Ejecuciones.IMPORTE_GASTOS := FObra.Ejecuciones.IMPORTE_GASTOS - AImporte;
           FObra.Ejecuciones.IMPORTE_GASTOS := FObra.Ejecuciones.IMPORTE_GASTOS + FPedidosProvEjecucion.BASE_IMPONIBLE;
+          FObra.Ejecuciones.RecalcularBeneficio;
         end;
       end;
     finally
diff --git a/Source/Modulos/Obras/Views/uViewListaPresupuestosObra.dfm b/Source/Modulos/Obras/Views/uViewListaPresupuestosObra.dfm
index ff579c54..48476cb0 100644
--- a/Source/Modulos/Obras/Views/uViewListaPresupuestosObra.dfm
+++ b/Source/Modulos/Obras/Views/uViewListaPresupuestosObra.dfm
@@ -3,6 +3,7 @@ inherited frViewListaPresupuestosObra: TfrViewListaPresupuestosObra
   ExplicitWidth = 821
   inherited cxGrid: TcxGrid
     Width = 821
+    ExplicitWidth = 821
     inherited cxGridView: TcxGridDBTableView
       DataController.Summary.FooterSummaryItems = <
         item
@@ -53,6 +54,7 @@ inherited frViewListaPresupuestosObra: TfrViewListaPresupuestosObra
   inherited ToolBar1: TToolBar
     Width = 821
     ButtonWidth = 128
+    ExplicitWidth = 821
     inherited ToolButton1: TToolButton
       ExplicitWidth = 132
     end
diff --git a/Source/Modulos/Obras/Views/uViewListaPresupuestosObra.pas b/Source/Modulos/Obras/Views/uViewListaPresupuestosObra.pas
index 6a4170c1..92919f9c 100644
--- a/Source/Modulos/Obras/Views/uViewListaPresupuestosObra.pas
+++ b/Source/Modulos/Obras/Views/uViewListaPresupuestosObra.pas
@@ -79,6 +79,7 @@ begin
 
       FObra.Ejecuciones.Edit;
       FObra.Ejecuciones.IMPORTE_INGRESOS := FObra.Ejecuciones.IMPORTE_INGRESOS + FPresupuestosEjecucion.BASE_IMPONIBLE;
+      FObra.Ejecuciones.RecalcularBeneficio;      
     end;
   finally
     APresupuesto := NIL;
@@ -111,6 +112,7 @@ begin
   inherited;
   FObra.Ejecuciones.Edit;
   FObra.Ejecuciones.IMPORTE_INGRESOS := FObra.Ejecuciones.IMPORTE_INGRESOS - AImporte;
+  FObra.Ejecuciones.RecalcularBeneficio;  
 end;
 
 function TfrViewListaPresupuestosObra.GetController: IObrasController;
@@ -150,6 +152,7 @@ begin
           FObra.Ejecuciones.Edit;
           FObra.Ejecuciones.IMPORTE_INGRESOS := FObra.Ejecuciones.IMPORTE_INGRESOS - AImporte;
           FObra.Ejecuciones.IMPORTE_INGRESOS := FObra.Ejecuciones.IMPORTE_INGRESOS + FPresupuestosEjecucion.BASE_IMPONIBLE;
+          FObra.Ejecuciones.RecalcularBeneficio;          
         end;
       end;
     finally
diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr
index f6fc0770..9a583756 100644
--- a/Source/Servidor/FactuGES_Server.dpr
+++ b/Source/Servidor/FactuGES_Server.dpr
@@ -3,6 +3,7 @@ program FactuGES_Server;
 {#ROGEN:..\Servicios\FactuGES.rodl} // RemObjects: Careful, do not remove!
 
 uses
+  ExceptionLog,
   uROComInit,
   uROComboService,
   Forms,
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 9d9862f9..d49f8cb8 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -22,7 +22,7 @@
     <Version>7.0</Version>
     <DCC_MapFile>3</DCC_MapFile>
     <DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
-    <DCC_Define>DEBUG;</DCC_Define>
+    <DCC_Define>DEBUG;EUREKALOG;EUREKALOG_VER6</DCC_Define>
     <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
     <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
     <DCC_DebugVN>True</DCC_DebugVN>
@@ -304,7 +304,7 @@
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6011
-Activate=0
+Activate=1
 Activate Handle=1
 Save Log File=1
 Foreground Tab=0
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 254b3467..e30e3a7c 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "1.4.0.0\0"
               VALUE "ProductVersion", "1.4.0.0\0"
-              VALUE "CompileDate", "lunes, 27 de octubre de 2008 11:41\0"
+              VALUE "CompileDate", "viernes, 31 de octubre de 2008 10:20\0"
          END
     END
     BLOCK "VarFileInfo"