From 9adc4f23569659b730b9d65b27566684278481a1 Mon Sep 17 00:00:00 2001
From: roberto <rblanco@rodax-software.com>
Date: Thu, 13 Jan 2011 18:44:59 +0000
Subject: [PATCH] Errores #511: Error al crear una liquidaciones de comisiones
 desde cero

git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES2/trunk@109 b2cfbe5a-eba1-4a0c-8b32-7feea0a119f2
---
 .../Controller/uComisionesController.pas      |  10 +-
 .../Comisiones/Model/uBizComisiones.pas       |   2 +-
 .../Comisiones/Views/Comisiones_view.dproj    | 106 +++++++++---------
 .../Comisiones/Views/uEditorComision.dfm      |  17 +--
 .../Comisiones/Views/uEditorComision.pas      |  24 ++--
 .../Comisiones/Views/uEditorComisiones.pas    |   1 +
 6 files changed, 79 insertions(+), 81 deletions(-)

diff --git a/Source/Modulos/Comisiones/Controller/uComisionesController.pas b/Source/Modulos/Comisiones/Controller/uComisionesController.pas
index e03544e..1137e49 100644
--- a/Source/Modulos/Comisiones/Controller/uComisionesController.pas
+++ b/Source/Modulos/Comisiones/Controller/uComisionesController.pas
@@ -94,7 +94,7 @@ end;
 
 procedure TComisionesController.AsignarID(AComision: IBizComisiones; const IDNuevo: Integer);
 begin
-  if not Assigned(AComision) then
+{  if not Assigned(AComision) then
     raise Exception.Create ('Comision no asignado');
 
   AsignarIDDetalles(AComision.Facturas, IDNuevo, AComision.EsNuevo);
@@ -105,11 +105,12 @@ begin
     AComision.ID := IDNuevo;
     AComision.Post;
   end;
+}
 end;
 
 procedure TComisionesController.AsignarIDDetalles(AFacturasComision: IBizFacturasComision; IDComision: Integer; AEsNuevo: Boolean);
 begin
-  with AFacturasComision do
+{  with AFacturasComision do
   begin
     DataTable.DisableControls;
     try
@@ -141,7 +142,7 @@ begin
           total de las tuplas de detalle.
         }
 
-      if AEsNuevo then
+ {     if AEsNuevo then
       begin
         while RecordCount > 0 do
         begin
@@ -170,6 +171,7 @@ begin
       DataTable.EnableControls;
     end;
   end;
+}  
 end;
 
 procedure TComisionesController.AsignarImporteTotal(AComision: IBizComisiones; const ImporteTotal: Variant);
@@ -504,6 +506,8 @@ begin
     ShowHourglassCursor;
     try
       AComision.DataTable.ApplyUpdates;
+      AComision.Facturas.DataTable.ApplyUpdates;
+      AComision.Facturas.DataTable.Refresh;
       //Si todo ha ido bien, asignamos la comision a las facturas asociadas
       //Como no están declarados como maestro-detalles debemos hacer el applyupdates nosotros
 //      RecibosClienteController.AsignarRemesa(ARemesaCliente.Recibos, NuevoID);
diff --git a/Source/Modulos/Comisiones/Model/uBizComisiones.pas b/Source/Modulos/Comisiones/Model/uBizComisiones.pas
index ae38f40..c08306b 100644
--- a/Source/Modulos/Comisiones/Model/uBizComisiones.pas
+++ b/Source/Modulos/Comisiones/Model/uBizComisiones.pas
@@ -90,7 +90,7 @@ end;
 procedure TBizComisiones.OnNewRecord(Sender: TDADataTable);
 begin
   inherited;
-  ID := GetRecNo; // -1, -2, -3...
+//  ID := GetRecNo; // -1, -2, -3...
   IniciarValoresComisionLiquidacionNuevo;
 end;
 
diff --git a/Source/Modulos/Comisiones/Views/Comisiones_view.dproj b/Source/Modulos/Comisiones/Views/Comisiones_view.dproj
index 67910f7..4cf93c2 100644
--- a/Source/Modulos/Comisiones/Views/Comisiones_view.dproj
+++ b/Source/Modulos/Comisiones/Views/Comisiones_view.dproj
@@ -38,52 +38,58 @@
     <DelphiCompile Include="Comisiones_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="adortl.dcp" />
-    <DCCReference Include="ApplicationBase.dcp" />
-    <DCCReference Include="bdertl.dcp" />
-    <DCCReference Include="Comisiones_controller.dcp" />
-    <DCCReference Include="Contactos_controller.dcp" />
-    <DCCReference Include="Contactos_model.dcp" />
-    <DCCReference Include="cxDataD11.dcp" />
-    <DCCReference Include="cxEditorsD11.dcp" />
-    <DCCReference Include="cxExportD11.dcp" />
-    <DCCReference Include="cxExtEditorsD11.dcp" />
-    <DCCReference Include="cxGridD11.dcp" />
-    <DCCReference Include="cxLibraryD11.dcp" />
-    <DCCReference Include="cxPageControlD11.dcp" />
-    <DCCReference Include="DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="dbrtl.dcp" />
-    <DCCReference Include="designide.dcp" />
-    <DCCReference Include="dsnap.dcp" />
-    <DCCReference Include="dxComnD11.dcp" />
-    <DCCReference Include="dxCoreD11.dcp" />
-    <DCCReference Include="dxGDIPlusD11.dcp" />
-    <DCCReference Include="dxLayoutControlD11.dcp" />
-    <DCCReference Include="dxThemeD11.dcp" />
-    <DCCReference Include="fqb110.dcp" />
-    <DCCReference Include="frx11.dcp" />
-    <DCCReference Include="frxe11.dcp" />
-    <DCCReference Include="frxTee11.dcp" />
-    <DCCReference Include="fs11.dcp" />
-    <DCCReference Include="fsTee11.dcp" />
-    <DCCReference Include="GUIBase.dcp" />
-    <DCCReference Include="GUISDK_D11R.dcp" />
-    <DCCReference Include="Jcl.dcp" />
-    <DCCReference Include="JclVcl.dcp" />
-    <DCCReference Include="JvAppFrmD11R.dcp" />
-    <DCCReference Include="JvCoreD11R.dcp" />
-    <DCCReference Include="JvCtrlsD11R.dcp" />
-    <DCCReference Include="JvPageCompsD11R.dcp" />
-    <DCCReference Include="JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="JvSystemD11R.dcp" />
-    <DCCReference Include="PngComponentsD10.dcp" />
-    <DCCReference Include="PNG_D10.dcp" />
-    <DCCReference Include="RemObjects_Core_D11.dcp" />
-    <DCCReference Include="rtl.dcp" />
-    <DCCReference Include="tb2k_d10.dcp" />
-    <DCCReference Include="tbx_d10.dcp" />
-    <DCCReference Include="tee.dcp" />
-    <DCCReference Include="teeUI.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\adortl.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\ApplicationBase.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\bdertl.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\Comisiones_controller.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\Contactos_controller.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\Contactos_model.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\cxDataD11.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\cxEditorsD11.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\cxExportD11.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\cxGridD11.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\cxLibraryD11.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\cxPageControlD11.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\dbrtl.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\designide.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\dsnap.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\dxComnD11.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\dxCoreD11.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\dxLayoutControlD11.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\dxThemeD11.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\fqb110.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\frx11.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\frxe11.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\frxTee11.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\fs11.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\fsTee11.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\GUIBase.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\GUISDK_D11R.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\Jcl.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\JclVcl.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\JvAppFrmD11R.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\JvCoreD11R.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\JvSystemD11R.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\PngComponentsD10.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\PNG_D10.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\rtl.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\tb2k_d10.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\tbx_d10.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\tee.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\teeUI.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\vcl.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\vclactnband.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\vcldb.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\vcljpg.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\vclx.dcp" />
+    <DCCReference Include="..\..\Remesas de cliente\Controller\xmlrtl.dcp" />
     <DCCReference Include="uComisionesViewRegister.pas" />
     <DCCReference Include="uEditorComision.pas">
       <Form>fEditorComision</Form>
@@ -94,7 +100,7 @@
       <DesignClass>TfEditorComisiones</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorComisionesReport.pas">
-      <Form>fEditorComisionesRepor</Form>
+      <Form>fEditorComisionesReport</Form>
       <DesignClass>TfEditorComisiones</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewComision.pas">
@@ -109,12 +115,6 @@
       <Form>frViewFacturasComision</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
-    <DCCReference Include="vcl.dcp" />
-    <DCCReference Include="vclactnband.dcp" />
-    <DCCReference Include="vcldb.dcp" />
-    <DCCReference Include="vcljpg.dcp" />
-    <DCCReference Include="vclx.dcp" />
-    <DCCReference Include="xmlrtl.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
diff --git a/Source/Modulos/Comisiones/Views/uEditorComision.dfm b/Source/Modulos/Comisiones/Views/uEditorComision.dfm
index df5a8cc..9b87cd2 100644
--- a/Source/Modulos/Comisiones/Views/uEditorComision.dfm
+++ b/Source/Modulos/Comisiones/Views/uEditorComision.dfm
@@ -225,23 +225,11 @@ inherited fEditorComision: TfEditorComision
           inherited ToolBar1: TToolBar
             Width = 607
             ExplicitWidth = 607
-            inherited ToolButton1: TToolButton
-              ExplicitWidth = 113
-            end
-            inherited ToolButton4: TToolButton
-              ExplicitWidth = 113
-            end
-            inherited ToolButton2: TToolButton
-              ExplicitWidth = 113
-            end
-            inherited ToolButton7: TToolButton
-              ExplicitWidth = 113
-            end
             inherited ToolButton3: TToolButton
-              ExplicitWidth = 113
+              ExplicitWidth = 98
             end
             inherited ToolButton8: TToolButton
-              ExplicitWidth = 113
+              ExplicitWidth = 99
             end
           end
         end
@@ -290,6 +278,7 @@ inherited fEditorComision: TfEditorComision
     Font.Style = []
     ParentFont = False
     TabOrder = 4
+    Visible = False
     ReadOnly = False
     ExplicitTop = 479
     ExplicitWidth = 611
diff --git a/Source/Modulos/Comisiones/Views/uEditorComision.pas b/Source/Modulos/Comisiones/Views/uEditorComision.pas
index 2662108..a282f63 100644
--- a/Source/Modulos/Comisiones/Views/uEditorComision.pas
+++ b/Source/Modulos/Comisiones/Views/uEditorComision.pas
@@ -54,7 +54,6 @@ type
     procedure EliminarInterno; override;
     procedure PrevisualizarInterno; override;
     procedure ImprimirInterno; override;
-//    procedure CerrarInterno; override;
 
     procedure PonerTitulos(const ATitulo: string = ''); override;
 //    function GetModified: Boolean; override;
@@ -110,11 +109,19 @@ begin
   bEsNuevo := False;
 
   ShowHourglassCursor;
+  frViewFacturasComision1.cxGridView.DataController.Summary.OnAfterSummary := Nil;
+
 //  frViewRecibosComision1.OnViewModified := Nil;
-  //frViewDetallesFacturaCliente1.SaveGridStatus; // Para guardar estado del grid
+//frViewDetallesFacturaCliente1.SaveGridStatus; // Para guardar estado del grid
 //  frViewDetallesFacturaCliente1.BeginUpdate;  // Para que no se mueva el foco
   try
     bEsNuevo := FComision.EsNuevo;
+
+
+//  AImporteTotal := ASender.FooterSummaryValues[1];
+
+//  if Assigned(FController) then
+    FController.AsignarImporteTotal(Comision, frViewFacturasComision1.cxGridView.DataController.Summary.FooterSummaryValues[1]);
     FController.Guardar(FComision);
 
   finally
@@ -125,7 +132,10 @@ begin
 
   if bEsNuevo then
     ShowInfoMessage('La liquidación de comisiones se ha dado de alta con el código ' + FComision.REFERENCIA);
+
   Modified := False;
+
+//  frViewFacturasComision1.cxGridView.DataController.Summary.OnAfterSummary := OnFacturasComisionSummaryAfterSummary;
 //  frViewRecibosComision1.Modified := False;
 //  frViewRecibosComision1.OnViewModified := OnRecibosChanged;
 end;
@@ -232,7 +242,7 @@ begin
 
   Comision.DataTable.Active := True;
 
-  frViewFacturasComision1.cxGridView.DataController.Summary.OnAfterSummary := OnFacturasComisionSummaryAfterSummary;
+//  frViewFacturasComision1.cxGridView.DataController.Summary.OnAfterSummary := OnFacturasComisionSummaryAfterSummary;
 end;
 
 procedure TfEditorComision.OnFacturasComisionSummaryAfterSummary(ASender: TcxDataSummary);
@@ -271,13 +281,7 @@ begin
 //  FController.EliminarReciboCliente(Comision);
 //  HayCambios := True;
 end;
-{
-procedure TfEditorComision.CerrarInterno;
-begin
-  frViewRecibosComision1.OnViewModified := Nil;
-  inherited;
-end;
-}
+
 constructor TfEditorComision.Create(AOwner: TComponent);
 begin
   inherited;
diff --git a/Source/Modulos/Comisiones/Views/uEditorComisiones.pas b/Source/Modulos/Comisiones/Views/uEditorComisiones.pas
index 922c1a9..9afd93d 100644
--- a/Source/Modulos/Comisiones/Views/uEditorComisiones.pas
+++ b/Source/Modulos/Comisiones/Views/uEditorComisiones.pas
@@ -106,6 +106,7 @@ begin
   inherited;
   FController.Anadir(Comisiones);
   FController.Ver(Comisiones);
+//  Comisiones.DataTable.Refresh;
 end;
 
 procedure TfEditorComisiones.PonerTitulos(const ATitulo: string);