Se prepara la subida 1.7.4

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@940 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
roberto 2009-04-17 09:34:26 +00:00
parent 1b5e4c6761
commit c97ada9964
33 changed files with 440 additions and 242 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -43,9 +43,9 @@ type
function GenerarAbono(AFactura: IBizFacturaCliente): IBizFacturaCliente; function GenerarAbono(AFactura: IBizFacturaCliente): IBizFacturaCliente;
procedure Preview(AFactura : IBizFacturaCliente; AllItems: Boolean = false; procedure Preview(AFactura : IBizFacturaCliente; AllItems: Boolean = false;
const VerSello: Boolean = True); const VerSello: Boolean = True; const VerCopia: Boolean = True);
procedure Print(AFactura : IBizFacturaCliente; AllItems: Boolean = false; procedure Print(AFactura : IBizFacturaCliente; AllItems: Boolean = false;
const VerSello: Boolean = True); const VerSello: Boolean = True; const VerCopia: Boolean = True);
procedure RecalcularImportes(AFactura: IBizFacturaCliente); procedure RecalcularImportes(AFactura: IBizFacturaCliente);
function EsModificable(AFactura: IBizFacturaCliente): Boolean; function EsModificable(AFactura: IBizFacturaCliente): Boolean;
@ -111,9 +111,9 @@ type
procedure RecuperarCliente(AFactura : IBizFacturaCliente); procedure RecuperarCliente(AFactura : IBizFacturaCliente);
procedure Preview(AFactura : IBizFacturaCliente; AllItems: Boolean = false; procedure Preview(AFactura : IBizFacturaCliente; AllItems: Boolean = false;
const VerSello: Boolean = True); const VerSello: Boolean = True; const VerCopia: Boolean = True);
procedure Print(AFactura : IBizFacturaCliente; AllItems: Boolean = false; procedure Print(AFactura : IBizFacturaCliente; AllItems: Boolean = false;
const VerSello: Boolean = True); const VerSello: Boolean = True; const VerCopia: Boolean = True);
procedure RecalcularImportes(AFactura: IBizFacturaCliente); procedure RecalcularImportes(AFactura: IBizFacturaCliente);
function EsModificable(AFactura: IBizFacturaCliente): Boolean; function EsModificable(AFactura: IBizFacturaCliente): Boolean;
@ -1044,7 +1044,7 @@ begin
end; end;
procedure TFacturasClienteController.Preview(AFactura: IBizFacturaCliente; AllItems: Boolean = false; procedure TFacturasClienteController.Preview(AFactura: IBizFacturaCliente; AllItems: Boolean = false;
const VerSello: Boolean = True); const VerSello: Boolean = True; const VerCopia: Boolean = True);
var var
AReportController : IFacturasClienteReportController; AReportController : IFacturasClienteReportController;
ID_Facturas: TIntegerList; ID_Facturas: TIntegerList;
@ -1071,7 +1071,7 @@ begin
else else
ID_Facturas.Add(AFactura.ID); ID_Facturas.Add(AFactura.ID);
AReportController.Preview(ID_Facturas, VerSello); AReportController.Preview(ID_Facturas, VerSello, VerCopia);
finally finally
AReportController := NIL; AReportController := NIL;
@ -1080,7 +1080,7 @@ begin
end; end;
procedure TFacturasClienteController.Print(AFactura: IBizFacturaCliente; AllItems: Boolean = false; procedure TFacturasClienteController.Print(AFactura: IBizFacturaCliente; AllItems: Boolean = false;
const VerSello: Boolean = True); const VerSello: Boolean = True; const VerCopia: Boolean = True);
var var
AReportController : IFacturasClienteReportController; AReportController : IFacturasClienteReportController;
ID_Facturas: TIntegerList; ID_Facturas: TIntegerList;
@ -1107,7 +1107,7 @@ begin
else else
ID_Facturas.Add(AFactura.ID); ID_Facturas.Add(AFactura.ID);
AReportController.Print(ID_Facturas, VerSello); AReportController.Print(ID_Facturas, VerSello, VerCopia);
finally finally
AReportController := NIL; AReportController := NIL;

View File

@ -10,8 +10,8 @@ uses
type type
IFacturasClienteReportController = interface(IControllerBase) IFacturasClienteReportController = interface(IControllerBase)
['{A0F41767-4FF6-4BAE-9FC9-894DD721D756}'] ['{A0F41767-4FF6-4BAE-9FC9-894DD721D756}']
procedure Preview(const AListaID : TIntegerList; const VerSello: Boolean = True); procedure Preview(const AListaID : TIntegerList; const VerSello: Boolean = True; const VerCopia: Boolean = True);
procedure Print(const AListaID : TIntegerList; const VerSello: Boolean = True); procedure Print(const AListaID : TIntegerList; const VerSello: Boolean = True; const VerCopia: Boolean = True);
function ExportToWord(const AID: Integer; const AFileName : String = ''; const VerSello: Boolean = True): Boolean; function ExportToWord(const AID: Integer; const AFileName : String = ''; const VerSello: Boolean = True): Boolean;
function ExportToPDF(const AID: Integer; const AFileName : String = ''; const VerSello: Boolean = True): Boolean; function ExportToPDF(const AID: Integer; const AFileName : String = ''; const VerSello: Boolean = True): Boolean;
end; end;
@ -19,14 +19,13 @@ type
TFacturasClienteReportController = class(TControllerBase, IFacturasClienteReportController) TFacturasClienteReportController = class(TControllerBase, IFacturasClienteReportController)
private private
FDataModule : IDataModuleFacturasClienteReport; FDataModule : IDataModuleFacturasClienteReport;
function CreateEditor(const AName: String; const IID: TGUID; function CreateEditor(const AName: String; const IID: TGUID; out Intf): Boolean;
out Intf): Boolean;
public public
constructor Create; override; constructor Create; override;
destructor Destroy; override; destructor Destroy; override;
procedure Preview(const AListaID : TIntegerList; const VerSello: Boolean = True); procedure Preview(const AListaID : TIntegerList; const VerSello: Boolean = True; const VerCopia: Boolean = True);
procedure Print(const AListaID : TIntegerList; const VerSello: Boolean = True); procedure Print(const AListaID : TIntegerList; const VerSello: Boolean = True; const VerCopia: Boolean = True);
function ExportToWord(const AID: Integer; const AFileName : String = ''; const VerSello: Boolean = True): Boolean; function ExportToWord(const AID: Integer; const AFileName : String = ''; const VerSello: Boolean = True): Boolean;
function ExportToPDF(const AID: Integer; const AFileName : String = ''; const VerSello: Boolean = True): Boolean; function ExportToPDF(const AID: Integer; const AFileName : String = ''; const VerSello: Boolean = True): Boolean;
end; end;
@ -108,14 +107,14 @@ begin
end; end;
end; end;
procedure TFacturasClienteReportController.Preview(const AListaID : TIntegerList; const VerSello: Boolean = True); procedure TFacturasClienteReportController.Preview(const AListaID : TIntegerList; const VerSello: Boolean = True; const VerCopia: Boolean = True);
var var
AStream: Binary; AStream: Binary;
AEditor : IEditorFacturasClientePreview; AEditor : IEditorFacturasClientePreview;
begin begin
AEditor := NIL; AEditor := NIL;
AStream := FDataModule.GetRptFacturas(AListaID, VerSello); AStream := FDataModule.GetRptFacturas(AListaID, VerSello, VerCopia);
try try
CreateEditor('EditorFacturasClientePreview', IEditorFacturasClientePreview, AEditor); CreateEditor('EditorFacturasClientePreview', IEditorFacturasClientePreview, AEditor);
if Assigned(AEditor) then if Assigned(AEditor) then
@ -133,7 +132,7 @@ begin
end; end;
end; end;
procedure TFacturasClienteReportController.Print(const AListaID : TIntegerList; const VerSello: Boolean = True); procedure TFacturasClienteReportController.Print(const AListaID : TIntegerList; const VerSello: Boolean = True; const VerCopia: Boolean = True);
var var
AStream: Binary; AStream: Binary;
AEditor : IEditorFacturasClientePreview; AEditor : IEditorFacturasClientePreview;
@ -141,7 +140,7 @@ begin
AEditor := NIL; AEditor := NIL;
ShowHourglassCursor; ShowHourglassCursor;
try try
AStream := FDataModule.GetRptFacturas(AListaID, VerSello); AStream := FDataModule.GetRptFacturas(AListaID, VerSello, VerCopia);
try try
CreateEditor('EditorFacturasClientePreview', IEditorFacturasClientePreview, AEditor); CreateEditor('EditorFacturasClientePreview', IEditorFacturasClientePreview, AEditor);
if Assigned(AEditor) then if Assigned(AEditor) then

View File

@ -10,12 +10,12 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
Top = 24 Top = 24
end end
object rda_FacturasCliente: TDARemoteDataAdapter object rda_FacturasCliente: TDARemoteDataAdapter
DataStreamer = Bin2DataStreamer
GetSchemaCall.RemoteService = RORemoteService GetSchemaCall.RemoteService = RORemoteService
GetDataCall.RemoteService = RORemoteService GetDataCall.RemoteService = RORemoteService
UpdateDataCall.RemoteService = RORemoteService UpdateDataCall.RemoteService = RORemoteService
GetScriptsCall.RemoteService = RORemoteService GetScriptsCall.RemoteService = RORemoteService
RemoteService = RORemoteService RemoteService = RORemoteService
DataStreamer = Bin2DataStreamer
Left = 51 Left = 51
Top = 143 Top = 143
end end
@ -274,8 +274,6 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
Params = <> Params = <>
StreamingOptions = [soDisableEventsWhileStreaming] StreamingOptions = [soDisableEventsWhileStreaming]
RemoteDataAdapter = rda_FacturasCliente RemoteDataAdapter = rda_FacturasCliente
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'FacturasCliente' LogicalName = 'FacturasCliente'
IndexDefs = <> IndexDefs = <>
Left = 240 Left = 240
@ -392,8 +390,6 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
MasterSource = ds_FacturasCliente MasterSource = ds_FacturasCliente
MasterFields = 'ID' MasterFields = 'ID'
DetailFields = 'ID_FACTURA' DetailFields = 'ID_FACTURA'
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'FacturasCliente_Detalles' LogicalName = 'FacturasCliente_Detalles'
IndexDefs = <> IndexDefs = <>
Left = 400 Left = 400
@ -416,8 +412,6 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
Params = <> Params = <>
StreamingOptions = [soDisableEventsWhileStreaming] StreamingOptions = [soDisableEventsWhileStreaming]
RemoteDataAdapter = rda_FacturasCliente RemoteDataAdapter = rda_FacturasCliente
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'ListaAnosFacturas' LogicalName = 'ListaAnosFacturas'
IndexDefs = <> IndexDefs = <>
Left = 240 Left = 240

View File

@ -33,7 +33,7 @@ type
function NewItem : IBizFacturaCliente; function NewItem : IBizFacturaCliente;
// Report // Report
function GetRptFacturas(const AListaID: TIntegerList; const VerSello: Boolean = True): Binary; function GetRptFacturas(const AListaID: TIntegerList; const VerSello: Boolean = True; const VerCopia: Boolean = True): Binary;
function GetRptWordFactura(const AID: Integer; const VerSello: Boolean = True): Binary; function GetRptWordFactura(const AID: Integer; const VerSello: Boolean = True): Binary;
function GetRptPDFFactura(const AID: Integer; const VerSello: Boolean = True): Binary; function GetRptPDFFactura(const AID: Integer; const VerSello: Boolean = True): Binary;
end; end;
@ -54,13 +54,13 @@ begin
RORemoteService.Message := dmConexion.Message; RORemoteService.Message := dmConexion.Message;
end; end;
function TDataModuleFacturasCliente.GetRptFacturas(const AListaID: TIntegerList; const VerSello: Boolean = True): Binary; function TDataModuleFacturasCliente.GetRptFacturas(const AListaID: TIntegerList; const VerSello: Boolean = True; const VerCopia: Boolean = True): Binary;
var var
AParam : TIntegerArray; AParam : TIntegerArray;
begin begin
AParam := AListaID.ToIntegerArray; AParam := AListaID.ToIntegerArray;
try try
Result := (RORemoteService as IsrvFacturasCliente).GenerarInforme(AParam, VerSello); Result := (RORemoteService as IsrvFacturasCliente).GenerarInforme(AParam, VerSello, VerCopia);
finally finally
FreeANDNIL(AParam); FreeANDNIL(AParam);
end; end;

View File

@ -24,6 +24,7 @@
<Projects Include="..\Gestor de informes\Model\GestorInformes_model.dproj" /> <Projects Include="..\Gestor de informes\Model\GestorInformes_model.dproj" />
<Projects Include="..\Gestor de informes\Plugin\GestorInformes_plugin.dproj" /> <Projects Include="..\Gestor de informes\Plugin\GestorInformes_plugin.dproj" />
<Projects Include="..\Gestor de informes\Views\GestorInformes_view.dproj" /> <Projects Include="..\Gestor de informes\Views\GestorInformes_view.dproj" />
<Projects Include="..\Pedidos a proveedor\Views\PedidosProveedor_view.dproj" />
<Projects Include="..\Presupuestos de cliente\Controller\PresupuestosCliente_controller.dproj" /> <Projects Include="..\Presupuestos de cliente\Controller\PresupuestosCliente_controller.dproj" />
<Projects Include="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" /> <Projects Include="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" />
<Projects Include="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" /> <Projects Include="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" />
@ -301,14 +302,23 @@
<Target Name="PresupuestosCliente_view:Make"> <Target Name="PresupuestosCliente_view:Make">
<MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="Make" /> <MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="Make" />
</Target> </Target>
<Target Name="PedidosProveedor_view">
<MSBuild Projects="..\Pedidos a proveedor\Views\PedidosProveedor_view.dproj" Targets="" />
</Target>
<Target Name="PedidosProveedor_view:Clean">
<MSBuild Projects="..\Pedidos a proveedor\Views\PedidosProveedor_view.dproj" Targets="Clean" />
</Target>
<Target Name="PedidosProveedor_view:Make">
<MSBuild Projects="..\Pedidos a proveedor\Views\PedidosProveedor_view.dproj" Targets="Make" />
</Target>
<Target Name="Build"> <Target Name="Build">
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;GestorInformes_model;GestorInformes_data;GestorInformes_controller;FacturasCliente_model;FacturasCliente_data;FacturasCliente_controller;PreCli_FacCli_relation;AlbCli_FacCli_relation;FacturasCliente_view;FacturasCliente_plugin;AlbaranesCliente_view;PresupuestosCliente_controller;GestorInformes_view;AlbaranesCliente_controller;GestorInformes_plugin;FactuGES;FactuGES_Server;PresupuestosCliente_view" /> <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;GestorInformes_model;GestorInformes_data;GestorInformes_controller;FacturasCliente_model;FacturasCliente_data;FacturasCliente_controller;PreCli_FacCli_relation;AlbCli_FacCli_relation;FacturasCliente_view;FacturasCliente_plugin;AlbaranesCliente_view;PresupuestosCliente_controller;GestorInformes_view;AlbaranesCliente_controller;GestorInformes_plugin;FactuGES;FactuGES_Server;PresupuestosCliente_view;PedidosProveedor_view" />
</Target> </Target>
<Target Name="Clean"> <Target Name="Clean">
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;GestorInformes_model:Clean;GestorInformes_data:Clean;GestorInformes_controller:Clean;FacturasCliente_model:Clean;FacturasCliente_data:Clean;FacturasCliente_controller:Clean;PreCli_FacCli_relation:Clean;AlbCli_FacCli_relation:Clean;FacturasCliente_view:Clean;FacturasCliente_plugin:Clean;AlbaranesCliente_view:Clean;PresupuestosCliente_controller:Clean;GestorInformes_view:Clean;AlbaranesCliente_controller:Clean;GestorInformes_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;PresupuestosCliente_view:Clean" /> <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;GestorInformes_model:Clean;GestorInformes_data:Clean;GestorInformes_controller:Clean;FacturasCliente_model:Clean;FacturasCliente_data:Clean;FacturasCliente_controller:Clean;PreCli_FacCli_relation:Clean;AlbCli_FacCli_relation:Clean;FacturasCliente_view:Clean;FacturasCliente_plugin:Clean;AlbaranesCliente_view:Clean;PresupuestosCliente_controller:Clean;GestorInformes_view:Clean;AlbaranesCliente_controller:Clean;GestorInformes_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;PresupuestosCliente_view:Clean;PedidosProveedor_view:Clean" />
</Target> </Target>
<Target Name="Make"> <Target Name="Make">
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;GestorInformes_model:Make;GestorInformes_data:Make;GestorInformes_controller:Make;FacturasCliente_model:Make;FacturasCliente_data:Make;FacturasCliente_controller:Make;PreCli_FacCli_relation:Make;AlbCli_FacCli_relation:Make;FacturasCliente_view:Make;FacturasCliente_plugin:Make;AlbaranesCliente_view:Make;PresupuestosCliente_controller:Make;GestorInformes_view:Make;AlbaranesCliente_controller:Make;GestorInformes_plugin:Make;FactuGES:Make;FactuGES_Server:Make;PresupuestosCliente_view:Make" /> <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;GestorInformes_model:Make;GestorInformes_data:Make;GestorInformes_controller:Make;FacturasCliente_model:Make;FacturasCliente_data:Make;FacturasCliente_controller:Make;PreCli_FacCli_relation:Make;AlbCli_FacCli_relation:Make;FacturasCliente_view:Make;FacturasCliente_plugin:Make;AlbaranesCliente_view:Make;PresupuestosCliente_controller:Make;GestorInformes_view:Make;AlbaranesCliente_controller:Make;GestorInformes_plugin:Make;FactuGES:Make;FactuGES_Server:Make;PresupuestosCliente_view:Make;PedidosProveedor_view:Make" />
</Target> </Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" /> <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project> </Project>

View File

@ -8,7 +8,7 @@ uses
type type
IDataModuleFacturasClienteReport = interface IDataModuleFacturasClienteReport = interface
['{D241A912-78C6-4C65-AEBF-8DDEFE35F511}'] ['{D241A912-78C6-4C65-AEBF-8DDEFE35F511}']
function GetRptFacturas(const AListaID: TIntegerList; const VerSello: Boolean = True): Binary; function GetRptFacturas(const AListaID: TIntegerList; const VerSello: Boolean = True; const VerCopia: Boolean = True): Binary;
function GetRptWordFactura(const AID: Integer; const VerSello: Boolean = True): Binary; function GetRptWordFactura(const AID: Integer; const VerSello: Boolean = True): Binary;
function GetRptPDFFactura(const AID: Integer; const VerSello: Boolean = True): Binary; function GetRptPDFFactura(const AID: Integer; const VerSello: Boolean = True): Binary;
end; end;

View File

@ -1105,6 +1105,7 @@ object RptFacturasCliente: TRptFacturasCliente
UserName = 'frxDBCabecera' UserName = 'frxDBCabecera'
CloseDataSource = False CloseDataSource = False
DataSource = DADSCabecera DataSource = DADSCabecera
BCDToCurrency = False
Left = 264 Left = 264
Top = 16 Top = 16
end end
@ -1112,6 +1113,7 @@ object RptFacturasCliente: TRptFacturasCliente
UserName = 'frxDBDetalles' UserName = 'frxDBDetalles'
CloseDataSource = False CloseDataSource = False
DataSource = DADSDetalles DataSource = DADSDetalles
BCDToCurrency = False
Left = 344 Left = 344
Top = 16 Top = 16
end end
@ -1476,8 +1478,6 @@ object RptFacturasCliente: TRptFacturasCliente
RemoteFetchEnabled = False RemoteFetchEnabled = False
LocalSchema = schReport LocalSchema = schReport
LocalDataStreamer = Bin2DataStreamer LocalDataStreamer = Bin2DataStreamer
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'InformeFacturasCliente_Detalles' LogicalName = 'InformeFacturasCliente_Detalles'
IndexDefs = <> IndexDefs = <>
Left = 344 Left = 344
@ -1648,8 +1648,6 @@ object RptFacturasCliente: TRptFacturasCliente
RemoteFetchEnabled = False RemoteFetchEnabled = False
LocalSchema = schReport LocalSchema = schReport
LocalDataStreamer = Bin2DataStreamer LocalDataStreamer = Bin2DataStreamer
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'InformeFacturasCliente' LogicalName = 'InformeFacturasCliente'
IndexDefs = <> IndexDefs = <>
Left = 264 Left = 264
@ -1684,7 +1682,7 @@ object RptFacturasCliente: TRptFacturasCliente
Top = 392 Top = 392
end end
object frxReport: TfrxReport object frxReport: TfrxReport
Version = '4.3' Version = '4.7.71'
DotMatrixReport = False DotMatrixReport = False
EngineOptions.DoublePass = True EngineOptions.DoublePass = True
IniFile = '\Software\Fast Reports' IniFile = '\Software\Fast Reports'
@ -1724,6 +1722,7 @@ object RptFacturasCliente: TRptFacturasCliente
UserName = 'frxDBVencimientos' UserName = 'frxDBVencimientos'
CloseDataSource = False CloseDataSource = False
DataSource = DADSVencimientos DataSource = DADSVencimientos
BCDToCurrency = False
Left = 440 Left = 440
Top = 16 Top = 16
end end
@ -1761,8 +1760,6 @@ object RptFacturasCliente: TRptFacturasCliente
RemoteFetchEnabled = False RemoteFetchEnabled = False
LocalSchema = schReport LocalSchema = schReport
LocalDataStreamer = Bin2DataStreamer LocalDataStreamer = Bin2DataStreamer
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'InformeFacturasCliente_Vencimientos' LogicalName = 'InformeFacturasCliente_Vencimientos'
IndexDefs = <> IndexDefs = <>
Left = 440 Left = 440
@ -1804,13 +1801,21 @@ object RptFacturasCliente: TRptFacturasCliente
ShowDialog = False ShowDialog = False
UseFileCache = True UseFileCache = True
ShowProgress = False ShowProgress = False
OverwritePrompt = False
PrintOptimized = True PrintOptimized = True
Outline = False Outline = False
Background = False
HTMLTags = True
Author = 'FactuGES' Author = 'FactuGES'
Subject = 'FactuGES' Subject = 'FactuGES'
Background = False
Creator = 'FactuGES' Creator = 'FactuGES'
HTMLTags = True ProtectionFlags = [ePrint, eModify, eCopy, eAnnot]
HideToolbar = False
HideMenubar = False
HideWindowUI = False
FitWindow = False
CenterWindow = False
PrintScaling = False
Left = 424 Left = 424
Top = 288 Top = 288
end end
@ -1884,8 +1889,6 @@ object RptFacturasCliente: TRptFacturasCliente
RemoteFetchEnabled = False RemoteFetchEnabled = False
LocalSchema = schReport LocalSchema = schReport
LocalDataStreamer = Bin2DataStreamer LocalDataStreamer = Bin2DataStreamer
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'InformeListadoFacturas' LogicalName = 'InformeListadoFacturas'
IndexDefs = <> IndexDefs = <>
Left = 576 Left = 576
@ -1901,6 +1904,7 @@ object RptFacturasCliente: TRptFacturasCliente
UserName = 'frxDBInformeListadoFacturas' UserName = 'frxDBInformeListadoFacturas'
CloseDataSource = False CloseDataSource = False
DataSource = DADSInformeListadoFacturas DataSource = DADSInformeListadoFacturas
BCDToCurrency = False
Left = 576 Left = 576
Top = 16 Top = 16
end end
@ -1908,6 +1912,7 @@ object RptFacturasCliente: TRptFacturasCliente
UserName = 'frxDBInformeListadoFacturasPendientes' UserName = 'frxDBInformeListadoFacturasPendientes'
CloseDataSource = False CloseDataSource = False
DataSource = DADSInformeListadoFacturasPendientes DataSource = DADSInformeListadoFacturasPendientes
BCDToCurrency = False
Left = 792 Left = 792
Top = 16 Top = 16
end end
@ -1987,8 +1992,6 @@ object RptFacturasCliente: TRptFacturasCliente
RemoteFetchEnabled = False RemoteFetchEnabled = False
LocalSchema = schReport LocalSchema = schReport
LocalDataStreamer = Bin2DataStreamer LocalDataStreamer = Bin2DataStreamer
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'InformeListadoFacturasPendientes' LogicalName = 'InformeListadoFacturasPendientes'
IndexDefs = <> IndexDefs = <>
Left = 792 Left = 792
@ -1998,6 +2001,7 @@ object RptFacturasCliente: TRptFacturasCliente
UserName = 'frxDBInformeListadoFacturasResumen' UserName = 'frxDBInformeListadoFacturasResumen'
CloseDataSource = True CloseDataSource = True
DataSource = DADSInformeListadoFacturasResumen DataSource = DADSInformeListadoFacturasResumen
BCDToCurrency = False
Left = 576 Left = 576
Top = 216 Top = 216
end end
@ -2015,8 +2019,6 @@ object RptFacturasCliente: TRptFacturasCliente
LogChanges = False LogChanges = False
StreamingOptions = [soDisableEventsWhileStreaming] StreamingOptions = [soDisableEventsWhileStreaming]
RemoteFetchEnabled = False RemoteFetchEnabled = False
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
IndexDefs = <> IndexDefs = <>
Left = 576 Left = 576
Top = 328 Top = 328

View File

@ -105,7 +105,7 @@ type
FDesglosado : Boolean; FDesglosado : Boolean;
//Genera cada una de las facturas a imprimir //Genera cada una de las facturas a imprimir
procedure _GenerarFactura(const ID: Integer; const VerSello: Boolean = True); procedure _GenerarFactura(const ID: Integer; const VerSello: Boolean = True; const VerCopia: Boolean = True);
procedure PrepararTablaInforme(ATabla: TDAMemDataTable); procedure PrepararTablaInforme(ATabla: TDAMemDataTable);
procedure PrepararTablaResumenInforme(ATabla: IDADataset); procedure PrepararTablaResumenInforme(ATabla: IDADataset);
@ -113,7 +113,7 @@ type
procedure IniciarParametrosInforme; procedure IniciarParametrosInforme;
procedure RecuperarNombresClientes; procedure RecuperarNombresClientes;
public public
function GenerarFactura(const ListaID : TIntegerArray; const VerSello: Boolean = True): Binary; function GenerarFactura(const ListaID : TIntegerArray; const VerSello: Boolean = True; const VerCopia: Boolean = True): Binary;
function GenerarFacturaEnPDF(const ListaID : TIntegerArray; const VerSello: Boolean = True): Binary; function GenerarFacturaEnPDF(const ListaID : TIntegerArray; const VerSello: Boolean = True): Binary;
function GenerarInformeIVA(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary; function GenerarInformeIVA(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
function GenerarInformeListadoFacturas(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const FechaVenInicio: Variant; const FechaVenFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary; function GenerarInformeListadoFacturas(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const FechaVenInicio: Variant; const FechaVenFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
@ -171,7 +171,7 @@ begin
FreeANDNIL(FListaNombresClientes); FreeANDNIL(FListaNombresClientes);
end; end;
function TRptFacturasCliente.GenerarFactura(const ListaID: TIntegerArray; const VerSello: Boolean = True): Binary; function TRptFacturasCliente.GenerarFactura(const ListaID: TIntegerArray; const VerSello: Boolean = True; const VerCopia: Boolean = True): Binary;
var var
i: Integer; i: Integer;
begin begin
@ -179,7 +179,7 @@ begin
try try
//Vamos generando todos y cada una de las facturas recibidas //Vamos generando todos y cada una de las facturas recibidas
for i := 0 to ListaID.Count - 1 do for i := 0 to ListaID.Count - 1 do
_GenerarFactura(ListaID.Items[i], VerSello); _GenerarFactura(ListaID.Items[i], VerSello, VerCopia);
frxReport.PreviewPages.SaveToStream(Result); frxReport.PreviewPages.SaveToStream(Result);
finally finally
@ -651,7 +651,7 @@ begin
end; end;
end; end;
procedure TRptFacturasCliente._GenerarFactura(const ID: Integer; const VerSello: Boolean = True); procedure TRptFacturasCliente._GenerarFactura(const ID: Integer; const VerSello: Boolean = True; const VerCopia: Boolean = True);
var var
AInforme: Variant; AInforme: Variant;
@ -679,7 +679,16 @@ begin
frxReport.Variables.Variables['VerSello'] := 1 frxReport.Variables.Variables['VerSello'] := 1
else else
frxReport.Variables.Variables['VerSello'] := 0; frxReport.Variables.Variables['VerSello'] := 0;
//La primera impresion siempre es sin la etiqueta copia
frxReport.Variables.Variables['VerCopia'] := 0;
frxReport.PrepareReport(False); frxReport.PrepareReport(False);
if VerCopia then
begin
frxReport.Variables.Variables['VerCopia'] := 1;
frxReport.PrepareReport(False);
end;
finally finally
FConnection.RollbackTransaction; //<--- Creo que no va a hacer falta. "PUES SI ES NECESARIO" FConnection.RollbackTransaction; //<--- Creo que no va a hacer falta. "PUES SI ES NECESARIO"
end; end;

View File

@ -34,7 +34,7 @@ type
private private
protected protected
{ IsrvFacturasCliente methods } { IsrvFacturasCliente methods }
function GenerarInforme(const ListaID: TIntegerArray; const VerSello: Boolean = True): Binary; function GenerarInforme(const ListaID: TIntegerArray; const VerSello: Boolean = True; const VerCopia: Boolean = True): Binary;
function GenerarInformeEnWord(const ID: Integer; const VerSello: Boolean = True): Binary; function GenerarInformeEnWord(const ID: Integer; const VerSello: Boolean = True): Binary;
function GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerSello: Boolean = True): Binary; function GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerSello: Boolean = True): Binary;
end; end;
@ -95,13 +95,13 @@ begin
end; end;
end; end;
function TsrvFacturasCliente.GenerarInforme(const ListaID: TIntegerArray; const VerSello: Boolean = True): Binary; function TsrvFacturasCliente.GenerarInforme(const ListaID: TIntegerArray; const VerSello: Boolean = True; const VerCopia: Boolean = True): Binary;
var var
AReportGenerator : TRptFacturasCliente; AReportGenerator : TRptFacturasCliente;
begin begin
AReportGenerator := TRptFacturasCliente.Create(nil); AReportGenerator := TRptFacturasCliente.Create(nil);
try try
Result := AReportGenerator.GenerarFactura(ListaID, VerSello); Result := AReportGenerator.GenerarFactura(ListaID, VerSello, VerCopia);
finally finally
FreeAndNIL(AReportGenerator); FreeAndNIL(AReportGenerator);
end; end;

View File

@ -34,7 +34,9 @@ requires
Articulos_view, Articulos_view,
AlbCli_FacCli_relation, AlbCli_FacCli_relation,
PreCli_FacCli_relation, PreCli_FacCli_relation,
GestorInformes_controller; GestorInformes_controller,
rtl,
vcl;
contains contains
uFacturasClienteViewRegister in 'uFacturasClienteViewRegister.pas', uFacturasClienteViewRegister in 'uFacturasClienteViewRegister.pas',
@ -47,6 +49,7 @@ contains
uEditorElegirArticulosFacturaCliente in 'uEditorElegirArticulosFacturaCliente.pas' {fEditorElegirArticulosFacturaCliente: TForm}, uEditorElegirArticulosFacturaCliente in 'uEditorElegirArticulosFacturaCliente.pas' {fEditorElegirArticulosFacturaCliente: TForm},
uViewElegirArticulosFacturasCliente in 'uViewElegirArticulosFacturasCliente.pas' {frViewElegirArticulosFacturasCliente: TFrame}, uViewElegirArticulosFacturasCliente in 'uViewElegirArticulosFacturasCliente.pas' {frViewElegirArticulosFacturasCliente: TFrame},
uEditorElegirFacturasCliente in 'uEditorElegirFacturasCliente.pas' {fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente}, uEditorElegirFacturasCliente in 'uEditorElegirFacturasCliente.pas' {fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente},
uViewDatosYSeleccionClienteFacturaCliente in 'uViewDatosYSeleccionClienteFacturaCliente.pas' {frViewDatosYSeleccionClienteFacturaCliente: TFrame}; uViewDatosYSeleccionClienteFacturaCliente in 'uViewDatosYSeleccionClienteFacturaCliente.pas' {frViewDatosYSeleccionClienteFacturaCliente: TFrame},
uDialogOpcionesImpresionFacturasCliente in 'uDialogOpcionesImpresionFacturasCliente.pas' {fDialogOpcionesImpresionFacturasCliente: TfEditorElegirFacturasCliente};
end. end.

View File

@ -49,16 +49,21 @@
<DelphiCompile Include="FacturasCliente_view.dpk"> <DelphiCompile Include="FacturasCliente_view.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\..\..\Cliente\AlbCli_FacCli_relation.dcp" /> <DCCReference Include="AlbCli_FacCli_relation.dcp" />
<DCCReference Include="..\..\..\Cliente\ApplicationBase.dcp" /> <DCCReference Include="ApplicationBase.dcp" />
<DCCReference Include="..\..\..\Cliente\Articulos_view.dcp" /> <DCCReference Include="Articulos_view.dcp" />
<DCCReference Include="..\..\..\Cliente\Base.dcp" /> <DCCReference Include="Base.dcp" />
<DCCReference Include="..\..\..\Cliente\Contactos_view.dcp" /> <DCCReference Include="Contactos_view.dcp" />
<DCCReference Include="..\..\..\Cliente\FacturasCliente_controller.dcp" /> <DCCReference Include="FacturasCliente_controller.dcp" />
<DCCReference Include="..\..\..\Cliente\FacturasCliente_model.dcp" /> <DCCReference Include="FacturasCliente_model.dcp" />
<DCCReference Include="..\..\..\Cliente\GestorInformes_controller.dcp" /> <DCCReference Include="GestorInformes_controller.dcp" />
<DCCReference Include="..\..\..\Cliente\GUIBase.dcp" /> <DCCReference Include="GUIBase.dcp" />
<DCCReference Include="..\..\..\Cliente\PreCli_FacCli_relation.dcp" /> <DCCReference Include="PreCli_FacCli_relation.dcp" />
<DCCReference Include="rtl.dcp" />
<DCCReference Include="uDialogOpcionesImpresionFacturasCliente.pas">
<Form>fDialogOpcionesImpresionFacturasCliente</Form>
<DesignClass>TfEditorElegirFacturasCliente</DesignClass>
</DCCReference>
<DCCReference Include="uEditorElegirArticulosFacturaCliente.pas"> <DCCReference Include="uEditorElegirArticulosFacturaCliente.pas">
<Form>fEditorElegirArticulosFacturaCliente</Form> <Form>fEditorElegirArticulosFacturaCliente</Form>
<DesignClass>TForm</DesignClass> <DesignClass>TForm</DesignClass>
@ -99,6 +104,7 @@
<Form>frViewFacturasCliente</Form> <Form>frViewFacturasCliente</Form>
<DesignClass>TFrame</DesignClass> <DesignClass>TFrame</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="vcl.dcp" />
</ItemGroup> </ItemGroup>
</Project> </Project>
<!-- EurekaLog First Line <!-- EurekaLog First Line

View File

@ -0,0 +1,76 @@
inherited fDialogOpcionesImpresionFacturasCliente: TfDialogOpcionesImpresionFacturasCliente
Caption = 'Opciones para facturas de cliente'
ClientHeight = 197
ClientWidth = 488
ExplicitWidth = 494
ExplicitHeight = 229
PixelsPerInch = 96
TextHeight = 13
inherited pnlBotones: TFlowPanel
Top = 141
Width = 488
ExplicitTop = 141
ExplicitWidth = 488
inherited Button1: TButton
Left = 392
ExplicitLeft = 392
end
inherited Button2: TButton
Left = 302
ExplicitLeft = 302
end
end
inherited FlowPanel1: TFlowPanel
Width = 488
Height = 141
ExplicitWidth = 488
ExplicitHeight = 141
inherited lblInstruccion: TLabel
Width = 397
Margins.Bottom = 10
Caption = 'Indique las siguiente opciones para la factura de cliente:'
ExplicitWidth = 397
end
inherited Label2: TLabel
Top = 60
Width = 195
Height = 11
Visible = False
ExplicitTop = 60
ExplicitWidth = 195
ExplicitHeight = 11
end
object cbVerSello: TCheckBox
AlignWithMargins = True
Left = 34
Top = 74
Width = 415
Height = 17
Caption = 'Mostrar sello de la empresa'
Checked = True
State = cbChecked
TabOrder = 0
end
object cbVerCopia: TCheckBox
AlignWithMargins = True
Left = 34
Top = 97
Width = 441
Height = 17
Caption = 'Mostrar copia de factura'
Checked = True
State = cbChecked
TabOrder = 1
end
end
inherited ActionList1: TActionList
Left = 8
Top = 16
inherited actAceptar: TAction
OnExecute = actAceptarExecute
end
inherited actCancelar: TAction
OnExecute = actCancelarExecute
end
end
end

View File

@ -0,0 +1,59 @@
unit uDialogOpcionesImpresionFacturasCliente;
interface
uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, uDialogBase, ActnList, StdCtrls, ExtCtrls;
type
TfDialogOpcionesImpresionFacturasCliente = class(TfDialogBase)
cbVerSello: TCheckBox;
cbVerCopia: TCheckBox;
procedure actAceptarExecute(Sender: TObject);
procedure actCancelarExecute(Sender: TObject);
private
{ Private declarations }
public
{ Public declarations }
end;
function ElegirOpcionesImpresionFacturaCliente(var AVerSello : Boolean; var AVerCopia : Boolean): Boolean;
implementation
{$R *.dfm}
function ElegirOpcionesImpresionFacturaCliente(var AVerSello : Boolean; var AVerCopia : Boolean): Boolean;
var
AEditor : TfDialogOpcionesImpresionFacturasCliente;
begin
AEditor := TfDialogOpcionesImpresionFacturasCliente.Create(NIL);
try
AEditor.cbVerSello.Checked := AVerSello;
AEditor.cbVerCopia.Checked := AVerCopia;
Result := (AEditor.ShowModal = mrOk);
if Result then
begin
AVerSello := AEditor.cbVerSello.Checked;
AVerCopia := AEditor.cbVerCopia.Checked;
end;
finally
AEditor.Release;
end;
end;
procedure TfDialogOpcionesImpresionFacturasCliente.actAceptarExecute(Sender: TObject);
begin
inherited;
ModalResult := mrOk
end;
procedure TfDialogOpcionesImpresionFacturasCliente.actCancelarExecute(Sender: TObject);
begin
inherited;
ModalResult := mrCancel;
end;
end.

View File

@ -123,7 +123,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
284) 284)
inherited Label1: TLabel inherited Label1: TLabel
Left = 378 Left = 378
Width = 311
ExplicitLeft = 378 ExplicitLeft = 378
ExplicitWidth = 311
end end
inherited eReferencia: TcxDBTextEdit inherited eReferencia: TcxDBTextEdit
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -178,6 +180,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 378 ExplicitLeft = 378
ExplicitWidth = 339
Width = 339
end end
inherited bElegirClienteFinal: TButton inherited bElegirClienteFinal: TButton
Left = 725 Left = 725
@ -185,13 +189,18 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
end end
inherited frViewDatosYSeleccionClienteFacturaCliente1: TfrViewDatosYSeleccionClienteFacturaCliente inherited frViewDatosYSeleccionClienteFacturaCliente1: TfrViewDatosYSeleccionClienteFacturaCliente
Left = 367 Left = 367
Width = 505
ExplicitLeft = 367 ExplicitLeft = 367
ExplicitWidth = 505
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 505
inherited edtlNombre: TcxDBTextEdit inherited edtlNombre: TcxDBTextEdit
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 224
Width = 224
end end
inherited edtNIFCIF: TcxDBTextEdit inherited edtNIFCIF: TcxDBTextEdit
Left = 279 Left = 279
@ -210,6 +219,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 121
Width = 121
end end
inherited Button4: TButton inherited Button4: TButton
Left = 359 Left = 359
@ -222,6 +233,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 275
Width = 275
end end
end end
end end

View File

@ -84,8 +84,9 @@ implementation
{$R *.dfm} {$R *.dfm}
uses uses
uBizContactos, uDataModuleUsuarios, uFactuGES_App, uBizContactos, uDataModuleUsuarios, uFactuGES_App,
uDetallesFacturaClienteController, uDialogUtils, uDataTableUtils; uDetallesFacturaClienteController, uDialogUtils, uDataTableUtils,
uDialogOpcionesImpresionFacturasCliente;
// uGenerarAlbaranesCliFacCliUtils; // uGenerarAlbaranesCliFacCliUtils;
@ -310,13 +311,20 @@ begin
end; end;
procedure TfEditorFacturaCliente.ImprimirInterno; procedure TfEditorFacturaCliente.ImprimirInterno;
var
AVerSello: Boolean;
AVerCopia: Boolean;
AllItems: Boolean;
begin begin
inherited; inherited;
AllItems := False;
AVerSello := True;
AVerCopia := True;
//Preguntamos si desea que en las facturas se vea el Sello //Preguntamos si desea que en las facturas se vea el Sello
if (Application.MessageBox('¿Desea previsualizar la factura con sello?', 'Atención', MB_YESNO) = IDYES) then if ElegirOpcionesImpresionFacturaCliente(AVerSello, AVerCopia) then
FController.Print(FFactura) FController.Print(FFactura, AllItems, AVerSello, AVerCopia);
else
FController.Print(FFactura, False, False);
end; end;
procedure TfEditorFacturaCliente.OnClienteChanged(Sender: TObject); procedure TfEditorFacturaCliente.OnClienteChanged(Sender: TObject);
@ -383,13 +391,20 @@ begin
end; end;
procedure TfEditorFacturaCliente.PrevisualizarInterno; procedure TfEditorFacturaCliente.PrevisualizarInterno;
var
AVerSello: Boolean;
AVerCopia: Boolean;
AllItems: Boolean;
begin begin
inherited; inherited;
AllItems := False;
AVerSello := True;
AVerCopia := True;
//Preguntamos si desea que en las facturas se vea el Sello //Preguntamos si desea que en las facturas se vea el Sello
if (Application.MessageBox('¿Desea previsualizar la factura con sello?', 'Atención', MB_YESNO) = IDYES) then if ElegirOpcionesImpresionFacturaCliente(AVerSello, AVerCopia) then
FController.Preview(FFactura) FController.Preview(FFactura, AllItems, AVerSello, AVerCopia);
else
FController.Preview(FFactura, False, False);
end; end;
procedure TfEditorFacturaCliente.RecalcularPortePorUnidad; procedure TfEditorFacturaCliente.RecalcularPortePorUnidad;

View File

@ -174,22 +174,22 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
Width = 263 Width = 263
end end
inherited edtFechaFinFiltro: TcxDateEdit inherited edtFechaFinFiltro: TcxDateEdit
Left = 367 Left = 441
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 367 ExplicitLeft = 441
ExplicitWidth = 263 ExplicitWidth = 263
Width = 263 Width = 263
end end
inherited eLista: TcxComboBox inherited eLista: TcxComboBox
Left = 667 Left = 801
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 667 ExplicitLeft = 801
ExplicitWidth = 20 ExplicitWidth = 20
Width = 20 Width = 20
end end

View File

@ -84,7 +84,7 @@ implementation
uses uses
uDataModuleFacturasCliente, uDataModuleUsuarios, uAlbaranesClienteController, uFactuGES_App, uDataModuleFacturasCliente, uDataModuleUsuarios, uAlbaranesClienteController, uFactuGES_App,
uGenerarFacturasCliAlbCliUtils, uGenerarFacturasCliPreCliUtils, uGenerarFacturasCliAlbCliUtils, uGenerarFacturasCliPreCliUtils,
uBizAlbaranesCliente, uGestorInformesController, uBizAlbaranesCliente, uGestorInformesController, uDialogOpcionesImpresionFacturasCliente,
uEditorBase, uGridStatusUtils, uDBSelectionListUtils, udialogUtils; uEditorBase, uGridStatusUtils, uDBSelectionListUtils, udialogUtils;
{$R *.dfm} {$R *.dfm}
@ -306,10 +306,12 @@ var
AFacturas: IBizFacturaCliente; AFacturas: IBizFacturaCliente;
AllItems: Boolean; AllItems: Boolean;
AVerSello: Boolean; AVerSello: Boolean;
AVerCopia: Boolean;
begin begin
AFacturas := Nil; AFacturas := Nil;
AllItems := False; AllItems := False;
AVerSello := False; AVerSello := True;
AVerCopia := True;
if MultiSelect and Assigned(ViewGrid) then if MultiSelect and Assigned(ViewGrid) then
AllItems := (ViewGrid.NumSeleccionados > 1); AllItems := (ViewGrid.NumSeleccionados > 1);
@ -336,11 +338,9 @@ begin
AFacturas := Facturas; AFacturas := Facturas;
//Preguntamos si desea que en las facturas se vea el Sello //Preguntamos si desea que en las facturas se vea el Sello
if (Application.MessageBox('¿Desea previsualizar la/s factura/s con sello?', 'Atención', MB_YESNO) = IDYES) then if ElegirOpcionesImpresionFacturaCliente(AVerSello, AVerCopia) then
AVerSello:= true; if Assigned(AFacturas) then
FController.Print(AFacturas, AllItems, AVerSello, AVerCopia);
if Assigned(AFacturas) then
FController.Print(AFacturas, AllItems, AVerSello);
end; end;
end; end;
end; end;
@ -401,10 +401,12 @@ var
AFacturas: IBizFacturaCliente; AFacturas: IBizFacturaCliente;
AllItems: Boolean; AllItems: Boolean;
AVerSello: Boolean; AVerSello: Boolean;
AVerCopia: Boolean;
begin begin
AFacturas := Nil; AFacturas := Nil;
AllItems := False; AllItems := False;
AVerSello := False; AVerSello := True;
AVerCopia := True;
if MultiSelect and Assigned(ViewGrid) then if MultiSelect and Assigned(ViewGrid) then
AllItems := (ViewGrid.NumSeleccionados > 1); AllItems := (ViewGrid.NumSeleccionados > 1);
@ -431,11 +433,9 @@ begin
AFacturas := Facturas; AFacturas := Facturas;
//Preguntamos si desea que en las facturas se vea el Sello //Preguntamos si desea que en las facturas se vea el Sello
if (Application.MessageBox('¿Desea previsualizar la/s factura/s con sello?', 'Atención', MB_YESNO) = IDYES) then if ElegirOpcionesImpresionFacturaCliente(AVerSello, AVerCopia) then
AVerSello:= true; if Assigned(AFacturas) then
FController.Preview(AFacturas, AllItems, AVerSello, AVerCopia);
if Assigned(AFacturas) then
FController.Preview(AFacturas, AllItems, AVerSello);
end; end;
end; end;
end; end;

View File

@ -57,6 +57,6 @@ contains
uViewProveedorPedido in 'uViewProveedorPedido.pas' {frViewProveedorPedido: TFrame}, uViewProveedorPedido in 'uViewProveedorPedido.pas' {frViewProveedorPedido: TFrame},
uEditorElegirPersonaContactoPedido in 'uEditorElegirPersonaContactoPedido.pas' {fEditorElegirPersonaContactoPedido: TfEditorSituacionPedidoProveedor}, uEditorElegirPersonaContactoPedido in 'uEditorElegirPersonaContactoPedido.pas' {fEditorElegirPersonaContactoPedido: TfEditorSituacionPedidoProveedor},
uViewObraReserva in 'uViewObraReserva.pas' {frViewObraReserva: TFrame}, uViewObraReserva in 'uViewObraReserva.pas' {frViewObraReserva: TFrame},
uDialogOpcionesImpresion in 'uDialogOpcionesImpresion.pas' {fDialogOpcionesImpresion: TForm}; uDialogOpcionesImpresionPedidosProveedor in 'uDialogOpcionesImpresionPedidosProveedor.pas' {fDialogOpcionesImpresionPedidosProveedor: TForm};
end. end.

View File

@ -49,22 +49,22 @@
<DelphiCompile Include="PedidosProveedor_view.dpk"> <DelphiCompile Include="PedidosProveedor_view.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\Almacenes_controller.dcp" /> <DCCReference Include="Almacenes_controller.dcp" />
<DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\Almacenes_model.dcp" /> <DCCReference Include="Almacenes_model.dcp" />
<DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\Articulos_view.dcp" /> <DCCReference Include="Articulos_view.dcp" />
<DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\Contactos_controller.dcp" /> <DCCReference Include="Contactos_controller.dcp" />
<DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\Contactos_model.dcp" /> <DCCReference Include="Contactos_model.dcp" />
<DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\Contactos_view.dcp" /> <DCCReference Include="Contactos_view.dcp" />
<DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\GestorInformes_controller.dcp" /> <DCCReference Include="GestorInformes_controller.dcp" />
<DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\GUIBase.dcp" /> <DCCReference Include="GUIBase.dcp" />
<DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\Obras_controller.dcp" /> <DCCReference Include="Obras_controller.dcp" />
<DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\Obras_model.dcp" /> <DCCReference Include="Obras_model.dcp" />
<DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\PedidosProveedor_controller.dcp" /> <DCCReference Include="PedidosProveedor_controller.dcp" />
<DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\PedidosProveedor_model.dcp" /> <DCCReference Include="PedidosProveedor_model.dcp" />
<DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\PedProv_AlbProv_relation.dcp" /> <DCCReference Include="PedProv_AlbProv_relation.dcp" />
<DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\PedProv_FacProv_relation.dcp" /> <DCCReference Include="PedProv_FacProv_relation.dcp" />
<DCCReference Include="uDialogOpcionesImpresion.pas"> <DCCReference Include="uDialogOpcionesImpresionPedidosProveedor.pas">
<Form>fDialogOpcionesImpresion</Form> <Form>fDialogOpcionesImpresionPedidosProveedor</Form>
<DesignClass>TForm</DesignClass> <DesignClass>TForm</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="uEditorDireccionEntregaPedidoProveedor.pas"> <DCCReference Include="uEditorDireccionEntregaPedidoProveedor.pas">

View File

@ -1,4 +1,4 @@
inherited fDialogOpcionesImpresion: TfDialogOpcionesImpresion inherited fDialogOpcionesImpresionPedidosProveedor: TfDialogOpcionesImpresionPedidosProveedor
Caption = 'Opciones para pedido a proveedor' Caption = 'Opciones para pedido a proveedor'
ClientHeight = 197 ClientHeight = 197
ClientWidth = 488 ClientWidth = 488

View File

@ -1,4 +1,4 @@
unit uDialogOpcionesImpresion; unit uDialogOpcionesImpresionPedidosProveedor;
interface interface
@ -7,7 +7,7 @@ uses
Dialogs, uDialogBase, ActnList, StdCtrls, ExtCtrls; Dialogs, uDialogBase, ActnList, StdCtrls, ExtCtrls;
type type
TfDialogOpcionesImpresion = class(TfDialogBase) TfDialogOpcionesImpresionPedidosProveedor = class(TfDialogBase)
cbVerPrecios: TCheckBox; cbVerPrecios: TCheckBox;
cbVerRefProveedor: TCheckBox; cbVerRefProveedor: TCheckBox;
procedure actAceptarExecute(Sender: TObject); procedure actAceptarExecute(Sender: TObject);
@ -26,9 +26,9 @@ implementation
function ElegirOpcionesImpresionPedidoProveedor(var AVerPrecios : Boolean; var AVerRefProveedor : Boolean): Boolean; function ElegirOpcionesImpresionPedidoProveedor(var AVerPrecios : Boolean; var AVerRefProveedor : Boolean): Boolean;
var var
AEditor : TfDialogOpcionesImpresion; AEditor : TfDialogOpcionesImpresionPedidosProveedor;
begin begin
AEditor := TfDialogOpcionesImpresion.Create(NIL); AEditor := TfDialogOpcionesImpresionPedidosProveedor.Create(NIL);
try try
AEditor.cbVerPrecios.Checked := AVerPrecios; AEditor.cbVerPrecios.Checked := AVerPrecios;
AEditor.cbVerRefProveedor.Checked := AVerRefProveedor; AEditor.cbVerRefProveedor.Checked := AVerRefProveedor;
@ -44,13 +44,13 @@ begin
end; end;
end; end;
procedure TfDialogOpcionesImpresion.actAceptarExecute(Sender: TObject); procedure TfDialogOpcionesImpresionPedidosProveedor.actAceptarExecute(Sender: TObject);
begin begin
inherited; inherited;
ModalResult := mrOk ModalResult := mrOk
end; end;
procedure TfDialogOpcionesImpresion.actCancelarExecute(Sender: TObject); procedure TfDialogOpcionesImpresionPedidosProveedor.actCancelarExecute(Sender: TObject);
begin begin
inherited; inherited;
ModalResult := mrCancel; ModalResult := mrCancel;

View File

@ -45,6 +45,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
inherited lblDesbloquear: TcxLabel inherited lblDesbloquear: TcxLabel
Left = 754 Left = 754
ExplicitLeft = 754 ExplicitLeft = 754
AnchorX = 799
AnchorY = 14
end end
end end
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
@ -93,6 +95,9 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
object pagContenido: TTabSheet object pagContenido: TTabSheet
Caption = 'Contenido' Caption = 'Contenido'
ImageIndex = 1 ImageIndex = 1
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 506 ExplicitHeight = 506
inline frViewDetallesPedidoProveedor1: TfrViewDetallesPedidoProveedor inline frViewDetallesPedidoProveedor1: TfrViewDetallesPedidoProveedor
Left = 0 Left = 0
@ -114,106 +119,103 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ExplicitHeight = 506 ExplicitHeight = 506
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 865 Width = 865
Height = 51 Height = 46
ExplicitWidth = 865 ExplicitWidth = 865
ExplicitHeight = 51 ExplicitHeight = 46
inherited ToolButton3: TToolButton inherited ToolButton3: TToolButton
Wrap = False Wrap = False
end end
inherited ToolButton4: TToolButton inherited ToolButton4: TToolButton
Left = 278 Left = 278
Top = 0 Top = 0
Wrap = True
ExplicitLeft = 278 ExplicitLeft = 278
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton14: TToolButton [4] inherited ToolButton14: TToolButton
Left = 334 Left = 0
Top = 0 Wrap = False
ExplicitLeft = 334 ExplicitLeft = 0
ExplicitTop = 0
end end
inherited FontName: TJvFontComboBox [5] inherited FontName: TJvFontComboBox
Left = 399 Left = 65
Top = 0 Top = 22
ExplicitLeft = 399 ExplicitLeft = 65
ExplicitTop = 0 ExplicitTop = 22
end end
inherited FontSize: TEdit inherited FontSize: TEdit
Left = 544 Left = 210
Top = 0 Top = 22
Width = 294 Width = 294
ExplicitLeft = 544 ExplicitLeft = 210
ExplicitTop = 0 ExplicitTop = 22
ExplicitWidth = 294 ExplicitWidth = 294
end end
inherited ToolButton13: TToolButton [7] inherited UpDown1: TUpDown
Left = 0 Left = 504
Top = 0 Top = 22
Wrap = True ExplicitLeft = 504
ExplicitLeft = 0 ExplicitTop = 22
ExplicitTop = 0
ExplicitHeight = 27
end end
inherited UpDown1: TUpDown [8] inherited ToolButton13: TToolButton
Left = 0 Left = 521
Top = 27 Top = 22
ExplicitLeft = 0 ExplicitLeft = 521
ExplicitTop = 27 ExplicitTop = 22
end end
inherited ToolButton6: TToolButton [9] inherited ToolButton6: TToolButton
Left = 17 Left = 529
Top = 27 Top = 22
ExplicitLeft = 17 ExplicitLeft = 529
ExplicitTop = 27 ExplicitTop = 22
end end
inherited ToolButton7: TToolButton [10] inherited ToolButton7: TToolButton
Left = 83 Left = 595
Top = 27 Top = 22
ExplicitLeft = 83 ExplicitLeft = 595
ExplicitTop = 27 ExplicitTop = 22
end end
inherited ToolButton8: TToolButton [11] inherited ToolButton8: TToolButton
Left = 150 Left = 662
Top = 27 Top = 22
ExplicitLeft = 150 ExplicitLeft = 662
ExplicitTop = 27 ExplicitTop = 22
end end
inherited ToolButton12: TToolButton [12] inherited ToolButton12: TToolButton
Left = 233 Left = 745
Top = 27 Top = 22
ExplicitLeft = 233 ExplicitLeft = 745
ExplicitTop = 27 ExplicitTop = 22
ExplicitHeight = 22
end end
inherited ToolButton9: TToolButton [13] inherited ToolButton9: TToolButton
Left = 241 Left = 753
Top = 27 Top = 22
ExplicitLeft = 241 ExplicitLeft = 753
ExplicitTop = 27 ExplicitTop = 22
end end
inherited ToolButton10: TToolButton [14] inherited ToolButton10: TToolButton
Left = 386 Left = 898
Top = 27 Top = 22
ExplicitLeft = 386 ExplicitLeft = 898
ExplicitTop = 27 ExplicitTop = 22
end end
inherited ToolButton11: TToolButton [15] inherited ToolButton11: TToolButton
Left = 511 Left = 1023
Top = 27 Top = 22
ExplicitLeft = 511 ExplicitLeft = 1023
ExplicitTop = 27 ExplicitTop = 22
end end
end end
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Top = 77 Top = 72
Width = 865 Width = 865
Height = 426 Height = 431
ExplicitTop = 77 ExplicitTop = 77
ExplicitWidth = 865 ExplicitWidth = 865
ExplicitHeight = 429 ExplicitHeight = 429
end end
inherited TBXDock1: TTBXDock inherited TBXDock1: TTBXDock
Top = 51 Top = 46
Width = 865 Width = 865
ExplicitTop = 51 ExplicitTop = 51
ExplicitWidth = 865 ExplicitWidth = 865
@ -235,6 +237,9 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
object pagInicidencias: TTabSheet object pagInicidencias: TTabSheet
Caption = 'Incidencias' Caption = 'Incidencias'
ImageIndex = 2 ImageIndex = 2
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 506 ExplicitHeight = 506
inline frViewIncidenciasProv: TfrViewIncidencias inline frViewIncidenciasProv: TfrViewIncidencias
Left = 0 Left = 0
@ -266,7 +271,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ExplicitHeight = 478 ExplicitHeight = 478
inherited eIncidencias: TcxDBMemo inherited eIncidencias: TcxDBMemo
ExplicitWidth = 848 ExplicitWidth = 848
ExplicitHeight = 451 ExplicitHeight = 448
Height = 448 Height = 448
Width = 848 Width = 848
end end
@ -309,113 +314,113 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ExplicitHeight = 43 ExplicitHeight = 43
inherited Bevel3: TBevel inherited Bevel3: TBevel
Left = 458 Left = 458
Top = -12 Top = 11
Height = 30 Height = 30
ExplicitLeft = 458 ExplicitLeft = 458
ExplicitTop = -12 ExplicitTop = 11
ExplicitHeight = 30 ExplicitHeight = 30
end end
inherited Bevel4: TBevel inherited Bevel4: TBevel
Left = 570 Left = 570
Top = 30 Top = 53
Width = 21 Width = 21
ExplicitLeft = 570 ExplicitLeft = 570
ExplicitTop = 30 ExplicitTop = 53
ExplicitWidth = 21 ExplicitWidth = 21
end end
inherited Bevel1: TBevel inherited Bevel1: TBevel
Left = 570 Left = 570
Top = 146 Top = 169
Width = 73 Width = 73
ExplicitLeft = 570 ExplicitLeft = 570
ExplicitTop = 146 ExplicitTop = 169
ExplicitWidth = 73 ExplicitWidth = 73
end end
inherited Bevel2: TBevel inherited Bevel2: TBevel
Left = 120 Left = 120
Top = 148 Top = 171
Width = 368 Width = 368
ExplicitLeft = 120 ExplicitLeft = 120
ExplicitTop = 148 ExplicitTop = 171
ExplicitWidth = 368 ExplicitWidth = 368
end end
inherited ImporteDto: TcxDBCurrencyEdit inherited ImporteDto: TcxDBCurrencyEdit
Left = 191 Left = 191
Top = 15 Top = 38
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 191 ExplicitLeft = 191
ExplicitTop = 15 ExplicitTop = 38
ExplicitWidth = 253 ExplicitWidth = 253
Width = 253 Width = 253
end end
inherited ImporteIVA: TcxDBCurrencyEdit inherited ImporteIVA: TcxDBCurrencyEdit
Left = 641 Left = 641
Top = 65 Top = 88
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 641 ExplicitLeft = 641
ExplicitTop = 65 ExplicitTop = 88
ExplicitWidth = 252 ExplicitWidth = 252
Width = 252 Width = 252
end end
inherited ImporteTotal: TcxDBCurrencyEdit inherited ImporteTotal: TcxDBCurrencyEdit
Left = 571 Left = 571
Top = 119 Top = 142
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 571 ExplicitLeft = 571
ExplicitTop = 119 ExplicitTop = 142
ExplicitWidth = 322 ExplicitWidth = 322
Width = 322 Width = 322
end end
inherited edtDescuento: TcxDBSpinEdit inherited edtDescuento: TcxDBSpinEdit
Left = 120 Left = 120
Top = 15 Top = 38
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 120 ExplicitLeft = 120
ExplicitTop = 15 ExplicitTop = 38
end end
inherited edtIVA: TcxDBSpinEdit inherited edtIVA: TcxDBSpinEdit
Left = 570 Left = 570
Top = 65 Top = 88
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 570 ExplicitLeft = 570
ExplicitTop = 65 ExplicitTop = 88
end end
inherited ImporteBase: TcxDBCurrencyEdit inherited ImporteBase: TcxDBCurrencyEdit
Left = 570 Left = 570
Top = -12 Top = 11
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 570 ExplicitLeft = 570
ExplicitTop = -12 ExplicitTop = 11
ExplicitWidth = 323 ExplicitWidth = 323
Width = 323 Width = 323
end end
inherited edtRE: TcxDBSpinEdit inherited edtRE: TcxDBSpinEdit
Left = 570 Left = 570
Top = 92 Top = 115
DataBinding.DataField = '' DataBinding.DataField = ''
DataBinding.DataSource = nil DataBinding.DataSource = nil
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -424,11 +429,11 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 570 ExplicitLeft = 570
ExplicitTop = 92 ExplicitTop = 115
end end
inherited ImporteRE: TcxDBCurrencyEdit inherited ImporteRE: TcxDBCurrencyEdit
Left = 641 Left = 641
Top = 92 Top = 115
DataBinding.DataField = '' DataBinding.DataField = ''
DataBinding.DataSource = nil DataBinding.DataSource = nil
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -437,26 +442,26 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 641 ExplicitLeft = 641
ExplicitTop = 92 ExplicitTop = 115
ExplicitWidth = 252 ExplicitWidth = 252
Width = 252 Width = 252
end end
inherited eImporteNeto: TcxDBCurrencyEdit inherited eImporteNeto: TcxDBCurrencyEdit
Left = 120 Left = 120
Top = -12 Top = 11
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 120 ExplicitLeft = 120
ExplicitTop = -12 ExplicitTop = 11
ExplicitWidth = 324 ExplicitWidth = 324
Width = 324 Width = 324
end end
inherited ePorte: TcxDBCurrencyEdit inherited ePorte: TcxDBCurrencyEdit
Left = 120 Left = 120
Top = 42 Top = 65
Properties.OnValidate = frViewTotales1ePortePropertiesValidate Properties.OnValidate = frViewTotales1ePortePropertiesValidate
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
@ -464,13 +469,13 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 120 ExplicitLeft = 120
ExplicitTop = 42 ExplicitTop = 65
ExplicitWidth = 324 ExplicitWidth = 324
Width = 324 Width = 324
end end
inherited eIVA: TcxDBLookupComboBox inherited eIVA: TcxDBLookupComboBox
Left = 120 Left = 120
Top = 69 Top = 92
DataBinding.DataField = '' DataBinding.DataField = ''
DataBinding.DataSource = nil DataBinding.DataSource = nil
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -478,62 +483,62 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 120 ExplicitLeft = 120
ExplicitTop = 69 ExplicitTop = 92
ExplicitWidth = 186 ExplicitWidth = 186
Width = 186 Width = 186
end end
inherited bTiposIVA: TButton inherited bTiposIVA: TButton
Left = 310 Left = 310
Top = 69 Top = 92
ExplicitLeft = 310 ExplicitLeft = 310
ExplicitTop = 69 ExplicitTop = 92
end end
inherited cbRecargoEquivalencia: TcxDBCheckBox inherited cbRecargoEquivalencia: TcxDBCheckBox
Left = 120 Left = 120
Top = 96 Top = 119
DataBinding.DataField = '' DataBinding.DataField = ''
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 120 ExplicitLeft = 120
ExplicitTop = 96 ExplicitTop = 119
ExplicitWidth = 324 ExplicitWidth = 324
Width = 324 Width = 324
end end
inherited edtRetencion: TcxDBSpinEdit inherited edtRetencion: TcxDBSpinEdit
Left = 570 Left = 570
Top = 166 Top = 189
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 570 ExplicitLeft = 570
ExplicitTop = 166 ExplicitTop = 189
end end
inherited edtImporteRetencion: TcxDBCurrencyEdit inherited edtImporteRetencion: TcxDBCurrencyEdit
Left = 641 Left = 641
Top = 166 Top = 189
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 641 ExplicitLeft = 641
ExplicitTop = 166 ExplicitTop = 189
ExplicitWidth = 180 ExplicitWidth = 180
Width = 180 Width = 180
end end
inherited edtFechaRetencion: TcxDBDateEdit inherited edtFechaRetencion: TcxDBDateEdit
Left = 120 Left = 120
Top = 168 Top = 191
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 120 ExplicitLeft = 120
ExplicitTop = 168 ExplicitTop = 191
ExplicitWidth = 280 ExplicitWidth = 280
Width = 280 Width = 280
end end

View File

@ -80,7 +80,7 @@ implementation
uses uses
uViewDatosYSeleccionProveedor, uDataModuleUsuarios, uGridStatusUtils, uDialogUtils, uViewDatosYSeleccionProveedor, uDataModuleUsuarios, uGridStatusUtils, uDialogUtils,
uFactuGES_App, uDialogOpcionesImpresion; uFactuGES_App, uDialogOpcionesImpresionPedidosProveedor;
{$R *.dfm} {$R *.dfm}

View File

@ -154,22 +154,22 @@ inherited fEditorPedidosProveedor: TfEditorPedidosProveedor
Width = 267 Width = 267
end end
inherited edtFechaFinFiltro: TcxDateEdit inherited edtFechaFinFiltro: TcxDateEdit
Left = 371 Left = 277
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 371 ExplicitLeft = 277
ExplicitWidth = 319 ExplicitWidth = 319
Width = 319 Width = 319
end end
inherited eLista: TcxComboBox inherited eLista: TcxComboBox
Left = 727 Left = 543
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 727 ExplicitLeft = 543
ExplicitWidth = 215 ExplicitWidth = 215
Width = 215 Width = 215
end end

View File

@ -79,7 +79,7 @@ uses
uGenerarAlbaranesProvUtils, uGenerarFacturasProvPedUtils, uGenerarAlbaranesProvUtils, uGenerarFacturasProvPedUtils,
// uInventarioController, uBizInventario, // uInventarioController, uBizInventario,
uDialogUtils, uGridStatusUtils, uDBSelectionListUtils, uDialogUtils, uGridStatusUtils, uDBSelectionListUtils,
uDialogOpcionesImpresion, uGestorInformesController; uDialogOpcionesImpresionPedidosProveedor, uGestorInformesController;
// uAlbaranesProveedorController, uBizAlbaranesProveedor, // uAlbaranesProveedorController, uBizAlbaranesProveedor,
// uGenerarPedidosProvUtils, ; // uGenerarPedidosProvUtils, ;

View File

@ -248,6 +248,8 @@
</Parameter> </Parameter>
<Parameter Name="VerSello" DataType="Boolean" Flag="In" > <Parameter Name="VerSello" DataType="Boolean" Flag="In" >
</Parameter> </Parameter>
<Parameter Name="VerCopia" DataType="Boolean" Flag="In" >
</Parameter>
</Parameters> </Parameters>
</Operation> </Operation>
<Operation Name="GenerarInformeEnWord" UID="{04A25AE7-9AC6-474F-9A4A-04D8292959E6}"> <Operation Name="GenerarInformeEnWord" UID="{04A25AE7-9AC6-474F-9A4A-04D8292959E6}">

View File

@ -500,7 +500,7 @@ type
{ IsrvFacturasCliente } { IsrvFacturasCliente }
IsrvFacturasCliente = interface(IDataAbstractService) IsrvFacturasCliente = interface(IDataAbstractService)
['{56B4FFF0-AB1B-46B2-BA16-ABD5360F6311}'] ['{56B4FFF0-AB1B-46B2-BA16-ABD5360F6311}']
function GenerarInforme(const ListaID: TIntegerArray; const VerSello: Boolean): Binary; function GenerarInforme(const ListaID: TIntegerArray; const VerSello: Boolean; const VerCopia: Boolean): Binary;
function GenerarInformeEnWord(const ID: Integer; const VerSello: Boolean): Binary; function GenerarInformeEnWord(const ID: Integer; const VerSello: Boolean): Binary;
function GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerSello: Boolean): Binary; function GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerSello: Boolean): Binary;
end; end;
@ -515,7 +515,7 @@ type
protected protected
function __GetInterfaceName:string; override; function __GetInterfaceName:string; override;
function GenerarInforme(const ListaID: TIntegerArray; const VerSello: Boolean): Binary; function GenerarInforme(const ListaID: TIntegerArray; const VerSello: Boolean; const VerCopia: Boolean): Binary;
function GenerarInformeEnWord(const ID: Integer; const VerSello: Boolean): Binary; function GenerarInformeEnWord(const ID: Integer; const VerSello: Boolean): Binary;
function GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerSello: Boolean): Binary; function GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerSello: Boolean): Binary;
end; end;
@ -1657,13 +1657,14 @@ begin
result := 'srvFacturasCliente'; result := 'srvFacturasCliente';
end; end;
function TsrvFacturasCliente_Proxy.GenerarInforme(const ListaID: TIntegerArray; const VerSello: Boolean): Binary; function TsrvFacturasCliente_Proxy.GenerarInforme(const ListaID: TIntegerArray; const VerSello: Boolean; const VerCopia: Boolean): Binary;
begin begin
try try
result := nil; result := nil;
__Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInforme'); __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInforme');
__Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []); __Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
__Message.Write('VerSello', TypeInfo(Boolean), VerSello, []); __Message.Write('VerSello', TypeInfo(Boolean), VerSello, []);
__Message.Write('VerCopia', TypeInfo(Boolean), VerCopia, []);
__Message.Finalize; __Message.Finalize;
__TransportChannel.Dispatch(__Message); __TransportChannel.Dispatch(__Message);

View File

@ -762,10 +762,11 @@ begin
end; end;
procedure TsrvFacturasCliente_Invoker.Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); procedure TsrvFacturasCliente_Invoker.Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
{ function GenerarInforme(const ListaID: TIntegerArray; const VerSello: Boolean): Binary; } { function GenerarInforme(const ListaID: TIntegerArray; const VerSello: Boolean; const VerCopia: Boolean): Binary; }
var var
ListaID: FactuGES_Intf.TIntegerArray; ListaID: FactuGES_Intf.TIntegerArray;
VerSello: Boolean; VerSello: Boolean;
VerCopia: Boolean;
lResult: Binary; lResult: Binary;
__lObjectDisposer: TROObjectDisposer; __lObjectDisposer: TROObjectDisposer;
begin begin
@ -774,8 +775,9 @@ begin
try try
__Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []); __Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
__Message.Read('VerSello', TypeInfo(Boolean), VerSello, []); __Message.Read('VerSello', TypeInfo(Boolean), VerSello, []);
__Message.Read('VerCopia', TypeInfo(Boolean), VerCopia, []);
lResult := (__Instance as IsrvFacturasCliente).GenerarInforme(ListaID, VerSello); lResult := (__Instance as IsrvFacturasCliente).GenerarInforme(ListaID, VerSello, VerCopia);
__Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvFacturasCliente', 'GenerarInformeResponse'); __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvFacturasCliente', 'GenerarInformeResponse');
__Message.Write('Result', TypeInfo(Binary), lResult, []); __Message.Write('Result', TypeInfo(Binary), lResult, []);

Binary file not shown.

Binary file not shown.

View File

@ -14,7 +14,7 @@ BEGIN
BEGIN BEGIN
VALUE "FileVersion", "1.7.3.0\0" VALUE "FileVersion", "1.7.3.0\0"
VALUE "ProductVersion", "1.7.3.0\0" VALUE "ProductVersion", "1.7.3.0\0"
VALUE "CompileDate", "miércoles, 15 de abril de 2009 17:16\0" VALUE "CompileDate", "viernes, 17 de abril de 2009 10:41\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"