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
This commit is contained in:
roberto 2010-06-18 14:42:25 +00:00
parent a57405e140
commit 8979d1d0ba
3 changed files with 42 additions and 25 deletions

View File

@ -127,6 +127,8 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
inherited lblDesbloquear: TcxLabel inherited lblDesbloquear: TcxLabel
Left = 667 Left = 667
ExplicitLeft = 667 ExplicitLeft = 667
AnchorX = 712
AnchorY = 14
end end
end end
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
@ -164,10 +166,6 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
object pagContenido: TTabSheet object pagContenido: TTabSheet
Caption = 'Contenido' Caption = 'Contenido'
ImageIndex = 1 ImageIndex = 1
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
inline frViewDetallesAlbaranProveedor1: TfrViewDetallesAlbaranProveedor inline frViewDetallesAlbaranProveedor1: TfrViewDetallesAlbaranProveedor
Left = 0 Left = 0
Top = 0 Top = 0
@ -200,13 +198,14 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
ExplicitLeft = 278 ExplicitLeft = 278
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton14: TToolButton [4] inherited ToolButton14: TToolButton
Left = 334 Left = 334
Top = 0 Top = 0
Wrap = False
ExplicitLeft = 334 ExplicitLeft = 334
ExplicitTop = 0 ExplicitTop = 0
end end
inherited FontName: TJvFontComboBox [5] inherited FontName: TJvFontComboBox
Left = 399 Left = 399
Top = 0 Top = 0
ExplicitLeft = 399 ExplicitLeft = 399
@ -234,44 +233,43 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
ExplicitTop = 0 ExplicitTop = 0
ExplicitHeight = 27 ExplicitHeight = 27
end end
inherited ToolButton6: TToolButton [9] inherited ToolButton6: TToolButton
Left = 0 Left = 0
Top = 27 Top = 27
ExplicitLeft = 0 ExplicitLeft = 0
ExplicitTop = 27 ExplicitTop = 27
end end
inherited ToolButton7: TToolButton [10] inherited ToolButton7: TToolButton
Left = 66 Left = 66
Top = 27 Top = 27
ExplicitLeft = 66 ExplicitLeft = 66
ExplicitTop = 27 ExplicitTop = 27
end end
inherited ToolButton8: TToolButton [11] inherited ToolButton8: TToolButton
Left = 133 Left = 133
Top = 27 Top = 27
ExplicitLeft = 133 ExplicitLeft = 133
ExplicitTop = 27 ExplicitTop = 27
end end
inherited ToolButton12: TToolButton [12] inherited ToolButton12: TToolButton
Left = 216 Left = 216
Top = 27 Top = 27
ExplicitLeft = 216 ExplicitLeft = 216
ExplicitTop = 27 ExplicitTop = 27
ExplicitHeight = 22
end end
inherited ToolButton9: TToolButton [13] inherited ToolButton9: TToolButton
Left = 224 Left = 224
Top = 27 Top = 27
ExplicitLeft = 224 ExplicitLeft = 224
ExplicitTop = 27 ExplicitTop = 27
end end
inherited ToolButton10: TToolButton [14] inherited ToolButton10: TToolButton
Left = 369 Left = 369
Top = 27 Top = 27
ExplicitLeft = 369 ExplicitLeft = 369
ExplicitTop = 27 ExplicitTop = 27
end end
inherited ToolButton11: TToolButton [15] inherited ToolButton11: TToolButton
Left = 494 Left = 494
Top = 27 Top = 27
ExplicitLeft = 494 ExplicitLeft = 494
@ -309,10 +307,6 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
object pagInicidencias: TTabSheet object pagInicidencias: TTabSheet
Caption = 'Incidencias' Caption = 'Incidencias'
ImageIndex = 2 ImageIndex = 2
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
inline frViewIncidenciasCli: TfrViewIncidencias inline frViewIncidenciasCli: TfrViewIncidencias
Left = 0 Left = 0
Top = 0 Top = 0

View File

@ -59,8 +59,8 @@ type
procedure EliminarInterno; override; procedure EliminarInterno; override;
procedure PrevisualizarInterno; override; procedure PrevisualizarInterno; override;
procedure ImprimirInterno; override; procedure ImprimirInterno; override;
function PuedoImprimir: Boolean; override; function PuedoImprimir: Boolean; override;
property ViewAlbaran: IViewAlbaranProveedor read GetViewAlbaran write SetViewAlbaran; property ViewAlbaran: IViewAlbaranProveedor read GetViewAlbaran write SetViewAlbaran;
@ -82,7 +82,8 @@ implementation
uses uses
uViewDatosYSeleccionProveedor, uDataModuleUsuarios, uProveedoresController, uViewDatosYSeleccionProveedor, uDataModuleUsuarios, uProveedoresController,
uBizDireccionesContacto, uDialogUtils, uDataTableUtils, uFactuGES_App; uBizDireccionesContacto, uDialogUtils, uDataTableUtils, uFactuGES_App,
uDialogOpcionesImpresionAlbaranesProveedor;
{$R *.dfm} {$R *.dfm}
@ -225,10 +226,17 @@ end;
procedure TfEditorAlbaranProveedor.ImprimirInterno; procedure TfEditorAlbaranProveedor.ImprimirInterno;
var var
AllItems: Boolean; AllItems: Boolean;
FImprimirPrecios : Boolean;
FImprimirRefProveedor : Boolean;
begin begin
inherited; inherited;
AllItems := False; AllItems := False;
FController.Print(FAlbaran, AllItems); FImprimirPrecios := True;
FImprimirRefProveedor := True;
if ElegirOpcionesImpresionAlbaranProveedor(FImprimirPrecios, FImprimirRefProveedor) then
FController.Preview(FAlbaran, AllItems, FImprimirPrecios, FImprimirRefProveedor);
end; end;
procedure TfEditorAlbaranProveedor.OnProveedorChanged(Sender: TObject); procedure TfEditorAlbaranProveedor.OnProveedorChanged(Sender: TObject);
@ -277,10 +285,17 @@ end;
procedure TfEditorAlbaranProveedor.PrevisualizarInterno; procedure TfEditorAlbaranProveedor.PrevisualizarInterno;
var var
AllItems: Boolean; AllItems: Boolean;
FImprimirPrecios : Boolean;
FImprimirRefProveedor : Boolean;
begin begin
inherited; inherited;
AllItems := False; AllItems := False;
FController.Preview(FAlbaran, AllItems); FImprimirPrecios := True;
FImprimirRefProveedor := True;
if ElegirOpcionesImpresionAlbaranProveedor(FImprimirPrecios, FImprimirRefProveedor) then
FController.Preview(FAlbaran, AllItems, FImprimirPrecios, FImprimirRefProveedor);
end; end;
procedure TfEditorAlbaranProveedor.RecalcularPortePorUnidad; procedure TfEditorAlbaranProveedor.RecalcularPortePorUnidad;

View File

@ -235,9 +235,14 @@ var
Respuesta : Integer; Respuesta : Integer;
AAlbaranes: IBizAlbaranProveedor; AAlbaranes: IBizAlbaranProveedor;
AllItems: Boolean; AllItems: Boolean;
FImprimirPrecios : Boolean;
FImprimirRefProveedor : Boolean;
begin begin
AAlbaranes := Nil; AAlbaranes := Nil;
AllItems := False; AllItems := False;
FImprimirPrecios := True;
FImprimirRefProveedor := True;
if MultiSelect and Assigned(ViewGrid) then if MultiSelect and Assigned(ViewGrid) then
AllItems := (ViewGrid.NumSeleccionados > 1); AllItems := (ViewGrid.NumSeleccionados > 1);
@ -264,7 +269,10 @@ begin
AAlbaranes := Albaranes; AAlbaranes := Albaranes;
if Assigned(AAlbaranes) then if Assigned(AAlbaranes) then
FController.Print(AAlbaranes, AllItems); begin
if ElegirOpcionesImpresionAlbaranProveedor(FImprimirPrecios, FImprimirRefProveedor) then
FController.Print(AAlbaranes, AllItems, FImprimirPrecios, FImprimirRefProveedor);
end;
end; end;
end; end;
end; end;
@ -334,7 +342,7 @@ begin
AllItems := False; AllItems := False;
FImprimirPrecios := True; FImprimirPrecios := True;
FImprimirRefProveedor := True; FImprimirRefProveedor := True;
if MultiSelect and Assigned(ViewGrid) then if MultiSelect and Assigned(ViewGrid) then
AllItems := (ViewGrid.NumSeleccionados > 1); AllItems := (ViewGrid.NumSeleccionados > 1);