From 8979d1d0ba8d24d1b4fea84f16a2e7a3cafdfe1e Mon Sep 17 00:00:00 2001
From: roberto <rblanco@rodax-software.com>
Date: Fri, 18 Jun 2010 14:42:25 +0000
Subject: [PATCH] Se adaptan los albaranes de proveedor para que se pueda
 imprimir con o sin importes, y con o sin referencias de proveedor

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@1001 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 .../Views/uEditorAlbaranProveedor.dfm         | 30 ++++++++-----------
 .../Views/uEditorAlbaranProveedor.pas         | 25 ++++++++++++----
 .../Views/uEditorAlbaranesProveedor.pas       | 12 ++++++--
 3 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm
index b2833e6c..b8050179 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm	
+++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm	
@@ -127,6 +127,8 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
     inherited lblDesbloquear: TcxLabel
       Left = 667
       ExplicitLeft = 667
+      AnchorX = 712
+      AnchorY = 14
     end
   end
   inherited TBXDock: TTBXDock
@@ -164,10 +166,6 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
     object pagContenido: TTabSheet
       Caption = 'Contenido'
       ImageIndex = 1
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       inline frViewDetallesAlbaranProveedor1: TfrViewDetallesAlbaranProveedor
         Left = 0
         Top = 0
@@ -200,13 +198,14 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
             ExplicitLeft = 278
             ExplicitTop = 0
           end
-          inherited ToolButton14: TToolButton [4]
+          inherited ToolButton14: TToolButton
             Left = 334
             Top = 0
+            Wrap = False
             ExplicitLeft = 334
             ExplicitTop = 0
           end
-          inherited FontName: TJvFontComboBox [5]
+          inherited FontName: TJvFontComboBox
             Left = 399
             Top = 0
             ExplicitLeft = 399
@@ -234,44 +233,43 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
             ExplicitTop = 0
             ExplicitHeight = 27
           end
-          inherited ToolButton6: TToolButton [9]
+          inherited ToolButton6: TToolButton
             Left = 0
             Top = 27
             ExplicitLeft = 0
             ExplicitTop = 27
           end
-          inherited ToolButton7: TToolButton [10]
+          inherited ToolButton7: TToolButton
             Left = 66
             Top = 27
             ExplicitLeft = 66
             ExplicitTop = 27
           end
-          inherited ToolButton8: TToolButton [11]
+          inherited ToolButton8: TToolButton
             Left = 133
             Top = 27
             ExplicitLeft = 133
             ExplicitTop = 27
           end
-          inherited ToolButton12: TToolButton [12]
+          inherited ToolButton12: TToolButton
             Left = 216
             Top = 27
             ExplicitLeft = 216
             ExplicitTop = 27
-            ExplicitHeight = 22
           end
-          inherited ToolButton9: TToolButton [13]
+          inherited ToolButton9: TToolButton
             Left = 224
             Top = 27
             ExplicitLeft = 224
             ExplicitTop = 27
           end
-          inherited ToolButton10: TToolButton [14]
+          inherited ToolButton10: TToolButton
             Left = 369
             Top = 27
             ExplicitLeft = 369
             ExplicitTop = 27
           end
-          inherited ToolButton11: TToolButton [15]
+          inherited ToolButton11: TToolButton
             Left = 494
             Top = 27
             ExplicitLeft = 494
@@ -309,10 +307,6 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
     object pagInicidencias: TTabSheet
       Caption = 'Incidencias'
       ImageIndex = 2
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       inline frViewIncidenciasCli: TfrViewIncidencias
         Left = 0
         Top = 0
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas
index f4e28c2a..cc49556a 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas	
+++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas	
@@ -59,8 +59,8 @@ type
     procedure EliminarInterno; override;
     procedure PrevisualizarInterno; override;
     procedure ImprimirInterno; override;
-    
-    function PuedoImprimir: Boolean; override;            
+
+    function PuedoImprimir: Boolean; override;
 
     property ViewAlbaran: IViewAlbaranProveedor read GetViewAlbaran write SetViewAlbaran;
 
@@ -82,7 +82,8 @@ implementation
 
 uses
   uViewDatosYSeleccionProveedor, uDataModuleUsuarios, uProveedoresController,
-  uBizDireccionesContacto, uDialogUtils, uDataTableUtils, uFactuGES_App;
+  uBizDireccionesContacto, uDialogUtils, uDataTableUtils, uFactuGES_App,
+  uDialogOpcionesImpresionAlbaranesProveedor;
 
 {$R *.dfm}
 
@@ -225,10 +226,17 @@ end;
 procedure TfEditorAlbaranProveedor.ImprimirInterno;
 var
   AllItems: Boolean;
+  FImprimirPrecios : Boolean;
+  FImprimirRefProveedor : Boolean;
+
 begin
   inherited;
   AllItems := False;
-  FController.Print(FAlbaran, AllItems);
+  FImprimirPrecios := True;
+  FImprimirRefProveedor := True;
+
+  if ElegirOpcionesImpresionAlbaranProveedor(FImprimirPrecios, FImprimirRefProveedor) then
+    FController.Preview(FAlbaran, AllItems, FImprimirPrecios, FImprimirRefProveedor);
 end;
 
 procedure TfEditorAlbaranProveedor.OnProveedorChanged(Sender: TObject);
@@ -277,10 +285,17 @@ end;
 procedure TfEditorAlbaranProveedor.PrevisualizarInterno;
 var
   AllItems: Boolean;
+  FImprimirPrecios : Boolean;
+  FImprimirRefProveedor : Boolean;
+
 begin
   inherited;
   AllItems := False;
-  FController.Preview(FAlbaran, AllItems);
+  FImprimirPrecios := True;
+  FImprimirRefProveedor := True;
+
+  if ElegirOpcionesImpresionAlbaranProveedor(FImprimirPrecios, FImprimirRefProveedor) then
+    FController.Preview(FAlbaran, AllItems, FImprimirPrecios, FImprimirRefProveedor);
 end;
 
 procedure TfEditorAlbaranProveedor.RecalcularPortePorUnidad;
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.pas
index a4b5d1cc..697cc42e 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.pas	
+++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.pas	
@@ -235,9 +235,14 @@ var
   Respuesta : Integer;
   AAlbaranes: IBizAlbaranProveedor;
   AllItems: Boolean;
+  FImprimirPrecios : Boolean;
+  FImprimirRefProveedor : Boolean;
+  
 begin
   AAlbaranes := Nil;
   AllItems := False;
+  FImprimirPrecios := True;
+  FImprimirRefProveedor := True;
 
   if MultiSelect and Assigned(ViewGrid) then
      AllItems :=  (ViewGrid.NumSeleccionados > 1);
@@ -264,7 +269,10 @@ begin
                     AAlbaranes := Albaranes;
 
                   if Assigned(AAlbaranes) then
-                     FController.Print(AAlbaranes, AllItems);
+                  begin
+                    if ElegirOpcionesImpresionAlbaranProveedor(FImprimirPrecios, FImprimirRefProveedor) then
+                      FController.Print(AAlbaranes, AllItems, FImprimirPrecios, FImprimirRefProveedor);
+                  end;
                 end;
       end;
     end;
@@ -334,7 +342,7 @@ begin
   AllItems := False;
   FImprimirPrecios := True;
   FImprimirRefProveedor := True;
-  
+
 
   if MultiSelect and Assigned(ViewGrid) then
      AllItems :=  (ViewGrid.NumSeleccionados > 1);