Tecistel/Tecsitel_FactuGES2
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Se prepara la subida 1.7.4

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Informes/1/InfFacturaCliente.fr3
View File

File diff suppressed because one or more lines are too long

7
Source/Informes/2/InfFacturaCliente.fr3
View File

File diff suppressed because one or more lines are too long

16
Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas
View File

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

19
Source/Modulos/Facturas de cliente/Controller/uFacturasClienteReportController.pas
View File

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

8
Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm
View File

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

6
Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.pas
View File

@ -33,7 +33,7 @@ type
function NewItem : IBizFacturaCliente;
// 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 GetRptPDFFactura(const AID: Integer; const VerSello: Boolean = True): Binary;
end;
@ -54,13 +54,13 @@ begin
RORemoteService.Message := dmConexion.Message;
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
AParam : TIntegerArray;
begin
AParam := AListaID.ToIntegerArray;
try
Result := (RORemoteService as IsrvFacturasCliente).GenerarInforme(AParam, VerSello);
Result := (RORemoteService as IsrvFacturasCliente).GenerarInforme(AParam, VerSello, VerCopia);
finally
FreeANDNIL(AParam);
end;

16
Source/Modulos/Facturas de cliente/FacturasCliente_Group.groupproj
View File

@ -24,6 +24,7 @@
<Projects Include="..\Gestor de informes\Model\GestorInformes_model.dproj" />
<Projects Include="..\Gestor de informes\Plugin\GestorInformes_plugin.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\Views\PresupuestosCliente_view.dproj" />
<Projects Include="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" />
@ -301,14 +302,23 @@
<Target Name="PresupuestosCliente_view:Make">
<MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="Make" />
</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">
<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 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 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>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project>

2
Source/Modulos/Facturas de cliente/Model/Data/uIDataModuleFacturasClienteReport.pas
View File

@ -8,7 +8,7 @@ uses
type
IDataModuleFacturasClienteReport = interface
['{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 GetRptPDFFactura(const AID: Integer; const VerSello: Boolean = True): Binary;
end;

32
Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm
View File

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

19
Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas
View File

@ -105,7 +105,7 @@ type
FDesglosado : Boolean;
//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 PrepararTablaResumenInforme(ATabla: IDADataset);
@ -113,7 +113,7 @@ type
procedure IniciarParametrosInforme;
procedure RecuperarNombresClientes;
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 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;
@ -171,7 +171,7 @@ begin
FreeANDNIL(FListaNombresClientes);
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
i: Integer;
begin
@ -179,7 +179,7 @@ begin
try
//Vamos generando todos y cada una de las facturas recibidas
for i := 0 to ListaID.Count - 1 do
_GenerarFactura(ListaID.Items[i], VerSello);
_GenerarFactura(ListaID.Items[i], VerSello, VerCopia);
frxReport.PreviewPages.SaveToStream(Result);
finally
@ -651,7 +651,7 @@ begin
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
AInforme: Variant;
@ -679,7 +679,16 @@ begin
frxReport.Variables.Variables['VerSello'] := 1
else
frxReport.Variables.Variables['VerSello'] := 0;
//La primera impresion siempre es sin la etiqueta copia
frxReport.Variables.Variables['VerCopia'] := 0;
frxReport.PrepareReport(False);
if VerCopia then
begin
frxReport.Variables.Variables['VerCopia'] := 1;
frxReport.PrepareReport(False);
end;
finally
FConnection.RollbackTransaction; //<--- Creo que no va a hacer falta. "PUES SI ES NECESARIO"
end;

6
Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.pas
View File

@ -34,7 +34,7 @@ type
private
protected
{ 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 GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerSello: Boolean = True): Binary;
end;
@ -95,13 +95,13 @@ begin
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
AReportGenerator : TRptFacturasCliente;
begin
AReportGenerator := TRptFacturasCliente.Create(nil);
try
Result := AReportGenerator.GenerarFactura(ListaID, VerSello);
Result := AReportGenerator.GenerarFactura(ListaID, VerSello, VerCopia);
finally
FreeAndNIL(AReportGenerator);
end;

7
Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dpk
View File

@ -34,7 +34,9 @@ requires
Articulos_view,
AlbCli_FacCli_relation,
PreCli_FacCli_relation,
GestorInformes_controller;
GestorInformes_controller,
rtl,
vcl;
contains
uFacturasClienteViewRegister in 'uFacturasClienteViewRegister.pas',
@ -47,6 +49,7 @@ contains
uEditorElegirArticulosFacturaCliente in 'uEditorElegirArticulosFacturaCliente.pas' {fEditorElegirArticulosFacturaCliente: TForm},
uViewElegirArticulosFacturasCliente in 'uViewElegirArticulosFacturasCliente.pas' {frViewElegirArticulosFacturasCliente: TFrame},
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.

26
Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dproj
View File

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

76
Source/Modulos/Facturas de cliente/Views/uDialogOpcionesImpresionFacturasCliente.dfm Normal file
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

59
Source/Modulos/Facturas de cliente/Views/uDialogOpcionesImpresionFacturasCliente.pas Normal file
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.

13
Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
View File

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

35
Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas
View File

@ -84,8 +84,9 @@ implementation
{$R *.dfm}
uses
uBizContactos, uDataModuleUsuarios, uFactuGES_App,
uDetallesFacturaClienteController, uDialogUtils, uDataTableUtils;
uBizContactos, uDataModuleUsuarios, uFactuGES_App,
uDetallesFacturaClienteController, uDialogUtils, uDataTableUtils,
uDialogOpcionesImpresionFacturasCliente;
// uGenerarAlbaranesCliFacCliUtils;
@ -310,13 +311,20 @@ begin
end;
procedure TfEditorFacturaCliente.ImprimirInterno;
var
AVerSello: Boolean;
AVerCopia: Boolean;
AllItems: Boolean;
begin
inherited;
AllItems := False;
AVerSello := True;
AVerCopia := True;
//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
FController.Print(FFactura)
else
FController.Print(FFactura, False, False);
if ElegirOpcionesImpresionFacturaCliente(AVerSello, AVerCopia) then
FController.Print(FFactura, AllItems, AVerSello, AVerCopia);
end;
procedure TfEditorFacturaCliente.OnClienteChanged(Sender: TObject);
@ -383,13 +391,20 @@ begin
end;
procedure TfEditorFacturaCliente.PrevisualizarInterno;
var
AVerSello: Boolean;
AVerCopia: Boolean;
AllItems: Boolean;
begin
inherited;
AllItems := False;
AVerSello := True;
AVerCopia := True;
//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
FController.Preview(FFactura)
else
FController.Preview(FFactura, False, False);
if ElegirOpcionesImpresionFacturaCliente(AVerSello, AVerCopia) then
FController.Preview(FFactura, AllItems, AVerSello, AVerCopia);
end;
procedure TfEditorFacturaCliente.RecalcularPortePorUnidad;

8
Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm
View File

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

26
Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas
View File

@ -84,7 +84,7 @@ implementation
uses
uDataModuleFacturasCliente, uDataModuleUsuarios, uAlbaranesClienteController, uFactuGES_App,
uGenerarFacturasCliAlbCliUtils, uGenerarFacturasCliPreCliUtils,
uBizAlbaranesCliente, uGestorInformesController,
uBizAlbaranesCliente, uGestorInformesController, uDialogOpcionesImpresionFacturasCliente,
uEditorBase, uGridStatusUtils, uDBSelectionListUtils, udialogUtils;
{$R *.dfm}
@ -306,10 +306,12 @@ var
AFacturas: IBizFacturaCliente;
AllItems: Boolean;
AVerSello: Boolean;
AVerCopia: Boolean;
begin
AFacturas := Nil;
AllItems := False;
AVerSello := False;
AVerSello := True;
AVerCopia := True;
if MultiSelect and Assigned(ViewGrid) then
AllItems := (ViewGrid.NumSeleccionados > 1);
@ -336,11 +338,9 @@ begin
AFacturas := Facturas;
//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
AVerSello:= true;
if Assigned(AFacturas) then
FController.Print(AFacturas, AllItems, AVerSello);
if ElegirOpcionesImpresionFacturaCliente(AVerSello, AVerCopia) then
if Assigned(AFacturas) then
FController.Print(AFacturas, AllItems, AVerSello, AVerCopia);
end;
end;
end;
@ -401,10 +401,12 @@ var
AFacturas: IBizFacturaCliente;
AllItems: Boolean;
AVerSello: Boolean;
AVerCopia: Boolean;
begin
AFacturas := Nil;
AllItems := False;
AVerSello := False;
AVerSello := True;
AVerCopia := True;
if MultiSelect and Assigned(ViewGrid) then
AllItems := (ViewGrid.NumSeleccionados > 1);
@ -431,11 +433,9 @@ begin
AFacturas := Facturas;
//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
AVerSello:= true;
if Assigned(AFacturas) then
FController.Preview(AFacturas, AllItems, AVerSello);
if ElegirOpcionesImpresionFacturaCliente(AVerSello, AVerCopia) then
if Assigned(AFacturas) then
FController.Preview(AFacturas, AllItems, AVerSello, AVerCopia);
end;
end;
end;

2
Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dpk
View File

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

32
Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj
View File

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

2
Source/Modulos/Pedidos a proveedor/Views/uDialogOpcionesImpresion.dfm → Source/Modulos/Pedidos a proveedor/Views/uDialogOpcionesImpresionPedidosProveedor.dfm
View File

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

12
Source/Modulos/Pedidos a proveedor/Views/uDialogOpcionesImpresion.pas → Source/Modulos/Pedidos a proveedor/Views/uDialogOpcionesImpresionPedidosProveedor.pas
View File

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

221
Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm
View File

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

2
Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas
View File

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

8
Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.dfm
View File

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

2
Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.pas
View File

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

2
Source/Servicios/FactuGES.RODL
View File

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

7
Source/Servicios/FactuGES_Intf.pas
View File

@ -500,7 +500,7 @@ type
{ IsrvFacturasCliente }
IsrvFacturasCliente = interface(IDataAbstractService)
['{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 GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerSello: Boolean): Binary;
end;
@ -515,7 +515,7 @@ type
protected
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 GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerSello: Boolean): Binary;
end;
@ -1657,13 +1657,14 @@ begin
result := 'srvFacturasCliente';
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
try
result := nil;
__Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInforme');
__Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
__Message.Write('VerSello', TypeInfo(Boolean), VerSello, []);
__Message.Write('VerCopia', TypeInfo(Boolean), VerCopia, []);
__Message.Finalize;
__TransportChannel.Dispatch(__Message);

6
Source/Servicios/FactuGES_Invk.pas
View File

@ -762,10 +762,11 @@ begin
end;
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
ListaID: FactuGES_Intf.TIntegerArray;
VerSello: Boolean;
VerCopia: Boolean;
lResult: Binary;
__lObjectDisposer: TROObjectDisposer;
begin
@ -774,8 +775,9 @@ begin
try
__Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
__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.Write('Result', TypeInfo(Binary), lResult, []);

BIN
Source/Servicios/RODLFILE.res
View File

Binary file not shown.

BIN
Source/Servidor/FactuGES_Server.RES
View File

Binary file not shown.

2
Source/Servidor/FactuGES_Server.rc
View File

@ -14,7 +14,7 @@ BEGIN
BEGIN
VALUE "FileVersion", "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
BLOCK "VarFileInfo"