diff --git a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas
index 511a544b..1912ee77 100644
--- a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas
+++ b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas
@@ -908,7 +908,7 @@ begin
AFactura.DataTable.ApplyUpdates;
//Se generan los recibos automáticamente a partir de la forma de pago
- GenerarRecibos(AFactura);
+// GenerarRecibos(AFactura);
Result := True;
finally
diff --git a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm
index 28c4d578..40967cbe 100644
--- a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm
@@ -251,7 +251,8 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'FacturasCliente'
- Left = 216
+ IndexDefs = <>
+ Left = 224
Top = 112
end
object ds_FacturasCliente: TDADataSource
@@ -345,15 +346,11 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
Name = 'REFERENCIA'
DataType = datString
Size = 255
- DisplayLabel = 'FacturasCliente_Detalles_REFERENCIA'
- DictionaryEntry = 'FacturasCliente_Detalles_REFERENCIA'
end
item
Name = 'REFERENCIA_PROVEEDOR'
DataType = datString
Size = 255
- DisplayLabel = 'FacturasCliente_Detalles_REFERENCIA_PROVEEDOR'
- DictionaryEntry = 'FacturasCliente_Detalles_REFERENCIA_PROVEEDOR'
end>
Params = <>
MasterMappingMode = mmWhere
@@ -365,6 +362,7 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'FacturasCliente_Detalles'
+ IndexDefs = <>
Left = 368
Top = 104
end
diff --git a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.pas
index 9a580994..5aa599ea 100644
--- a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.pas
+++ b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.pas
@@ -70,7 +70,6 @@ begin
begin
BusinessRulesID := BIZ_CLIENT_DETALLES_FACTURA_CLIENTE;
DetailOptions := DetailOptions - [dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates];
- ShowMessage('Capullo');
end;
Result := (ADetalles as IBizDetallesFacturaCliente);
finally
diff --git a/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.dproj b/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.dproj
index a1d0c260..b114d58e 100644
--- a/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.dproj
+++ b/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.dproj
@@ -44,6 +44,10 @@
FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0
+
+
+
+
RemObjects Pascal Script - RemObjects SDK 3.0 Integration
EurekaLog 5.1.9
FacturasCliente_model.dpk
@@ -547,4 +551,4 @@ mtException_AntiFreeze0="The application seems to be frozen."
Count mtInvalidEmailMsg=1
mtInvalidEmailMsg0="Invalid email."
TextsCollection=English
-EurekaLog Last Line -->
+EurekaLog Last Line -->
\ No newline at end of file
diff --git a/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.res b/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.res
index 8b251f31..1641339f 100644
Binary files a/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.res and b/Source/Modulos/Facturas de cliente/Model/FacturasCliente_model.res differ
diff --git a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas
index 452cede2..750cc14e 100644
--- a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas
+++ b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas
@@ -9,9 +9,9 @@ const
{ Data table rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
- RID_DarReferencia = '{1526E934-E09C-4D57-A8D8-4F31500D8594}';
- RID_FacturasCliente = '{C65E2A72-1751-4D36-8567-CB2BBF7EFA58}';
- RID_FacturasCliente_Detalles = '{8B5BE8A5-D693-4692-9675-EB95ED7022D2}';
+ RID_DarReferencia = '{EE290313-AC22-43B7-815F-58253B4EF915}';
+ RID_FacturasCliente = '{39FCB7C7-33D8-41D0-B361-7006793E354E}';
+ RID_FacturasCliente_Detalles = '{2277CCFA-8265-4007-B54E-AFBB5EEB7366}';
{ Data table names }
nme_DarReferencia = 'DarReferencia';
@@ -131,7 +131,7 @@ const
type
{ IDarReferencia }
IDarReferencia = interface(IDAStronglyTypedDataTable)
- ['{938701A9-6465-40C9-B596-6C766F0879AA}']
+ ['{FC6FD5A4-62B4-4B90-A7B7-04717D03C5BE}']
{ Property getters and setters }
function GetVALORValue: String;
procedure SetVALORValue(const aValue: String);
@@ -166,7 +166,7 @@ type
{ IFacturasCliente }
IFacturasCliente = interface(IDAStronglyTypedDataTable)
- ['{253CD155-FE1A-4ECC-B2A0-7049F126A6AA}']
+ ['{C611FEEA-3F5D-4990-87EC-5E077E74DDAB}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -597,7 +597,7 @@ type
{ IFacturasCliente_Detalles }
IFacturasCliente_Detalles = interface(IDAStronglyTypedDataTable)
- ['{0610850B-E0CE-47CF-B4F4-E00BC94573EC}']
+ ['{BD1BDC59-CA88-4C8D-B189-A917927D3F22}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
diff --git a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas
index 7244aff1..d9cecb1f 100644
--- a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas
+++ b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas
@@ -9,14 +9,14 @@ const
{ Delta rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
- RID_DarReferenciaDelta = '{E6F28C09-709A-477E-A19E-B9ECA3780F30}';
- RID_FacturasClienteDelta = '{D2372D5E-71C5-4C82-B9E3-574D757F492E}';
- RID_FacturasCliente_DetallesDelta = '{D4EC6688-FBC3-4AEC-B444-5E25CCC58C4E}';
+ RID_DarReferenciaDelta = '{3F90C22F-1A27-477C-8666-97294D63941A}';
+ RID_FacturasClienteDelta = '{5DED3958-196C-45DF-93EB-942421D0DB76}';
+ RID_FacturasCliente_DetallesDelta = '{D421677A-3717-40DD-9787-33F108D28E17}';
type
{ IDarReferenciaDelta }
IDarReferenciaDelta = interface(IDarReferencia)
- ['{E6F28C09-709A-477E-A19E-B9ECA3780F30}']
+ ['{3F90C22F-1A27-477C-8666-97294D63941A}']
{ Property getters and setters }
function GetOldVALORValue : String;
@@ -50,7 +50,7 @@ type
{ IFacturasClienteDelta }
IFacturasClienteDelta = interface(IFacturasCliente)
- ['{D2372D5E-71C5-4C82-B9E3-574D757F492E}']
+ ['{5DED3958-196C-45DF-93EB-942421D0DB76}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@@ -481,7 +481,7 @@ type
{ IFacturasCliente_DetallesDelta }
IFacturasCliente_DetallesDelta = interface(IFacturasCliente_Detalles)
- ['{D4EC6688-FBC3-4AEC-B444-5E25CCC58C4E}']
+ ['{D421677A-3717-40DD-9787-33F108D28E17}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_FACTURAValue : Integer;
diff --git a/Source/Modulos/Facturas de cliente/Model/uBizDetallesFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Model/uBizDetallesFacturaCliente.pas
index 0037807b..b0045c71 100644
--- a/Source/Modulos/Facturas de cliente/Model/uBizDetallesFacturaCliente.pas
+++ b/Source/Modulos/Facturas de cliente/Model/uBizDetallesFacturaCliente.pas
@@ -19,8 +19,6 @@ type
protected
procedure OnNewRecord(Sender: TDADataTable); override;
procedure BeforeInsert(Sender: TDADataTable); override;
- public
- constructor Create(aDataTable: TDADataTable); override;
end;
implementation
@@ -34,31 +32,16 @@ procedure TBizDetallesFacturaCliente.BeforeInsert(Sender: TDADataTable);
var
AMasterTable : TDADataTable;
begin
- ShowMessage('BeforeInsert');
inherited;
AMasterTable := DataTable.GetMasterDataTable;
- if not Assigned(AMasterTable) then
- showmessage('No estoy asignao')
- else
- showmessage('estoy asignao');
-
if Assigned(AMasterTable) and (AMasterTable.State = dsInsert) then
begin
AMasterTable.Post;
- showmessage('Hago post');
end;
end;
-constructor TBizDetallesFacturaCliente.Create(aDataTable: TDADataTable);
-begin
- ShowMessage('Create Biz');
- inherited Create(aDataTable);
-// ContIdAux := -1;
-end;
-
procedure TBizDetallesFacturaCliente.OnNewRecord(Sender: TDADataTable);
begin
- ShowMessage('OnNewRecord');
inherited;
// ID := ContIdAux; // -1, -2, -3...
// Dec(ContIdAux);
diff --git a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas
index 213d0ef5..14997f80 100644
--- a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas
+++ b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas
@@ -72,6 +72,7 @@ type
procedure OnNewRecord(Sender: TDADataTable); override;
+ function GetSITUACIONValue: String; override;
procedure SetID_FORMA_PAGOValue(const aValue: Integer); override;
procedure SetID_COMISION_LIQUIDADAValue(const aValue: Integer); override;
procedure SetID_TIPO_IVAValue(const aValue: Integer); override;
@@ -225,6 +226,11 @@ begin
Result := FDetalles;
end;
+function TBizFacturaCliente.GetSITUACIONValue: String;
+begin
+ result := Trim(DataTable.Fields[idx_FacturasClienteSITUACION].AsString);
+end;
+
procedure TBizFacturaCliente.ID_TIPO_IVAOnChange(Sender: TDACustomField);
begin
AsignarTipoIVA(ID_TIPO_IVA);
@@ -242,7 +248,7 @@ end;
procedure TBizFacturaCliente.IniciarValoresFacturaNueva;
begin
-// ID_EMPRESA := dmUsuarios.IDEmpresaActual;
+ ID_EMPRESA := 1; //dmUsuarios.IDEmpresaActual;
// USUARIO := dmUsuarios.LoginInfo.Usuario;
FECHA_FACTURA := DateOf(Now);
TIPO := CTE_TIPO_FACTURA;
@@ -310,9 +316,7 @@ end;
procedure TBizFacturaCliente.SetDetalles(Value: IBizDetallesFacturaCliente);
begin
FDetalles := Value;
- showmessage('Voy a enlazar');
EnlazarMaestroDetalle(FDetallesLink, FDetalles);
- showmessage('Enlazado');
end;
procedure TBizFacturaCliente.SetID_COMISION_LIQUIDADAValue(const aValue: Integer);
diff --git a/Source/Modulos/Facturas de cliente/Model/uBizFacturasClienteServer.pas b/Source/Modulos/Facturas de cliente/Model/uBizFacturasClienteServer.pas
index 469a8aa8..eb3c83e7 100644
--- a/Source/Modulos/Facturas de cliente/Model/uBizFacturasClienteServer.pas
+++ b/Source/Modulos/Facturas de cliente/Model/uBizFacturasClienteServer.pas
@@ -3,7 +3,7 @@ unit uBizFacturasClienteServer;
interface
uses
- schFacturasClienteServer_Intf, uDAInterfaces,
+ schFacturasClienteServer_Intf, uDAInterfaces, uDADelta,
uDADataTable, uDABusinessProcessor;
const
@@ -16,10 +16,7 @@ const
type
TBizFacturasClienteServer = class(TFacturasClienteBusinessProcessorRules)
protected
-
-// procedure BeforeProcessChange(Sender: TDABusinessProcessor;
-// aChangeType: TDAChangeType; aChange: TDADeltaChange;
-// var ProcessChange: Boolean); override;
+ procedure BeforeProcessDelta(Sender: TDABusinessProcessor; const aDelta: IDADelta); override;
end;
implementation
@@ -30,10 +27,8 @@ uses
{ TBizFacturasClienteServer }
-{
-procedure TBizFacturasClienteServer.BeforeProcessChange(
- Sender: TDABusinessProcessor; aChangeType: TDAChangeType;
- aChange: TDADeltaChange; var ProcessChange: Boolean);
+procedure TBizFacturasClienteServer.BeforeProcessDelta(
+ Sender: TDABusinessProcessor; const aDelta: IDADelta);
var
ASchema : TDASchema;
ACurrentConn : IDAConnection;
@@ -43,19 +38,19 @@ var
begin
inherited;
- case aChangeType of
+ case Sender.CurrentChange.ChangeType of
ctInsert, ctUpdate: begin
//Si la referencia no ha sido asignada le asignamos una nosotros
- if (VarIsNull(aChange.NewValueByName[fld_FacturasClienteREFERENCIA]))
- or (VarToStr(aChange.NewValueByName[fld_FacturasClienteREFERENCIA]) = '') then
+ if (VarIsNull(Sender.CurrentChange.NewValueByName[fld_FacturasClienteREFERENCIA]))
+ or (VarToStr(Sender.CurrentChange.NewValueByName[fld_FacturasClienteREFERENCIA]) = '') then
begin
ASchema := BusinessProcessor.Schema;
ACurrentConn := GetBusinessProcessorConnection(BusinessProcessor);
try
//Siempre va a estar rellena
- Empresa := aChange.NewValueByName[fld_FacturasClienteID_EMPRESA];
- Tipo := aChange.NewValueByName[fld_FacturasClienteTIPO];
+ Empresa := Sender.CurrentChange.NewValueByName[fld_FacturasClienteID_EMPRESA];
+ Tipo := Sender.CurrentChange.NewValueByName[fld_FacturasClienteTIPO];
if Tipo = CTE_TIPO_FACTURA then
dsData := ASchema.NewDataset(ACurrentConn, 'DarReferencia', ['CODIGO', 'EMPRESA'], [REF_FACTURAS_CLIENTE, Empresa])
@@ -75,9 +70,9 @@ begin
try
if Tipo = CTE_TIPO_FACTURA then
- ASchema.NewCommand(ACurrentConn, 'ModificarReferencia', ['CODIGO', 'VALOR', 'ID_EMPRESA'], [REF_FACTURAS_CLIENTE, DarReferenciaSiguiente(REFERENCIA), Empresa])
+ ASchema.NewCommand(ACurrentConn, 'ModificarReferencia', ['CODIGO', 'VALOR', 'EMPRESA'], [REF_FACTURAS_CLIENTE, DarReferenciaSiguiente(REFERENCIA), Empresa])
else
- ASchema.NewCommand(ACurrentConn, 'ModificarReferencia', ['CODIGO', 'VALOR', 'ID_EMPRESA'], [REF_ABONOS_CLIENTE, DarReferenciaSiguiente(REFERENCIA), Empresa]);
+ ASchema.NewCommand(ACurrentConn, 'ModificarReferencia', ['CODIGO', 'VALOR', 'EMPRESA'], [REF_ABONOS_CLIENTE, DarReferenciaSiguiente(REFERENCIA), Empresa]);
except
RaiseError('Error al asignar la nueva ' + REFERENCIA + ' referencia en tabla');
@@ -86,7 +81,6 @@ begin
end;
end;
end;
-}
initialization
RegisterBusinessProcessorRules(BIZ_SERVER_FACTURAS_CLIENTE, TBizFacturasClienteServer);
diff --git a/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.dproj b/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.dproj
index 0319fc38..36c98955 100644
--- a/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.dproj
+++ b/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.dproj
@@ -41,44 +41,11 @@
Delphi.Personality
Package
-
- False
- True
- False
-
-
- True
- False
- False
-
-
- True
- False
- 1
- 0
- 0
- 0
- False
- False
- False
- False
- False
- 3082
- 1252
-
-
-
-
- 1.0.0.0
-
-
-
-
-
- 1.0.0.0
-
-
-
+FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0
+
+
+
+
@@ -89,26 +56,21 @@
RemObjects Pascal Script - RemObjects SDK 3.0 Integration
EurekaLog 5.1.9
-
-
- FacturasCliente_plugin.dpk
-
-
+ FacturasCliente_plugin.dpk
MainSource
-
-
-
+
+
+
-
+EurekaLog Last Line -->
\ No newline at end of file
diff --git a/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.drc b/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.drc
index b51478f5..62aadb0d 100644
--- a/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.drc
+++ b/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.drc
@@ -14,4 +14,4 @@ END
/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Plugin\uPluginFacturasCliente.dfm */
/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Plugin\FacturasCliente_plugin.res */
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Plugin\FacturasCliente_plugin.drf */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf182.tmp */
diff --git a/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.rc b/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.rc
index e69de29b..153736af 100644
--- a/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.rc
+++ b/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.rc
@@ -0,0 +1,22 @@
+1 VERSIONINFO
+FILEVERSION 1,0,0,0
+PRODUCTVERSION 1,0,0,0
+FILEFLAGSMASK 0x3FL
+FILEFLAGS 0x00L
+FILEOS 0x40004L
+FILETYPE 0x1L
+FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "0C0A04E4"
+ BEGIN
+ VALUE "FileVersion", "1.0.0.0\0"
+ VALUE "ProductVersion", "1.0.0.0\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0C0A, 1252
+ END
+END
diff --git a/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.res b/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.res
index 86c94e6a..8b251f31 100644
Binary files a/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.res and b/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.res differ
diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm
index c30a64c2..bb8e7b64 100644
--- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm
+++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm
@@ -4,12 +4,10 @@ object RptFacturasCliente: TRptFacturasCliente
Height = 405
Width = 447
object DADataCabecera: TDADataSource
- DataTable = tbl_FacturaCliente
Left = 264
Top = 72
end
object DADataDetalles: TDADataSource
- DataTable = tbl_DetallesFacturaCliente
Left = 344
Top = 72
end
@@ -21,11 +19,6 @@ object RptFacturasCliente: TRptFacturasCliente
LogChanges = False
StreamingOptions = [soDisableEventsWhileStreaming]
RemoteFetchEnabled = False
- SchemaCall.Params = <>
- DataRequestCall.Params = <>
- DataUpdateCall.Params = <>
- ScriptCall.Params = <>
- ReadOnly = False
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
IndexDefs = <>
@@ -40,11 +33,6 @@ object RptFacturasCliente: TRptFacturasCliente
LogChanges = False
StreamingOptions = [soDisableEventsWhileStreaming]
RemoteFetchEnabled = False
- SchemaCall.Params = <>
- DataRequestCall.Params = <>
- DataUpdateCall.Params = <>
- ScriptCall.Params = <>
- ReadOnly = False
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
IndexDefs = <>
@@ -79,20 +67,14 @@ object RptFacturasCliente: TRptFacturasCliente
Left = 360
Top = 296
end
- object frxChartObject1: TfrxChartObject
- Left = 256
- Top = 344
- end
object schReport: TDASchema
ConnectionManager = dmServer.ConnectionManager
- DataDictionary = DataDictionary
Datasets = <
item
Params = <
item
Name = 'ID'
DataType = datInteger
- BlobType = dabtUnknown
Value = '1'
ParamType = daptInput
end>
@@ -289,449 +271,210 @@ object RptFacturasCliente: TRptFacturasCliente
item
Name = 'ID'
DataType = datAutoInc
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_ID'
InPrimaryKey = True
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'ID_EMPRESA'
DataType = datInteger
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_ID_EMPRESA'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'FECHA_FACTURA'
DataType = datDateTime
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_FECHA_FACTURA'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'BASE_IMPONIBLE'
DataType = datFloat
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_BASE_IMPONIBLE'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'REFERENCIA'
DataType = datString
Size = 20
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_REFERENCIA'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'IMPORTE_DESCUENTO'
DataType = datFloat
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_IMPORTE_DESCUENTO'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'DESCUENTO'
DataType = datFloat
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_DESCUENTO'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'IMPORTE_IVA'
DataType = datFloat
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_IMPORTE_IVA'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'RE'
DataType = datFloat
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'IMPORTE_RE'
DataType = datFloat
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'IMPORTE_TOTAL'
DataType = datFloat
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_IMPORTE_TOTAL'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'IVA'
DataType = datFloat
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_IVA'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'FORMA_PAGO'
DataType = datString
Size = 255
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Forma de pago'
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'ID_CLIENTE'
DataType = datInteger
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_ID_CLIENTE'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'NIF_CIF'
DataType = datString
Size = 15
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_NIF_CIF'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'OBSERVACIONES'
DataType = datMemo
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_OBSERVACIONES'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'NOMBRE'
DataType = datString
Size = 100
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_NOMBRE'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'CALLE'
DataType = datString
Size = 150
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_CALLE'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'PROVINCIA'
DataType = datString
Size = 30
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_PROVINCIA'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'CODIGO_POSTAL'
DataType = datString
Size = 10
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_CODIGO_POSTAL'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'TITULAR'
DataType = datString
Size = 255
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'ENTIDAD'
DataType = datString
Size = 15
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'SUCURSAL'
DataType = datString
Size = 15
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'DC'
DataType = datString
Size = 15
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'CUENTA'
DataType = datString
Size = 15
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'POBLACION'
DataType = datString
Size = 150
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_POBLACION'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'NIF_CIF_EMPRESA'
DataType = datString
Size = 15
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'RAZON_SOCIAL'
DataType = datString
Size = 255
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'CALLE_EMPRESA'
DataType = datString
Size = 255
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'POBLACION_EMPRESA'
DataType = datString
Size = 255
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'PROVINCIA_EMPRESA'
DataType = datString
Size = 255
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'CODIGO_POSTAL_EMPRESA'
DataType = datString
Size = 10
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'TELEFONO_1'
DataType = datString
Size = 25
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'FAX'
DataType = datString
Size = 25
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'MOVIL_1'
DataType = datString
Size = 25
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'EMAIL_1'
DataType = datString
Size = 255
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'PAGINA_WEB'
DataType = datString
Size = 255
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'REGISTRO_MERCANTIL'
DataType = datString
Size = 255
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'LOGOTIPO'
DataType = datBlob
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end>
- BusinessRulesClient.ScriptLanguage = rslPascalScript
- BusinessRulesServer.ScriptLanguage = rslPascalScript
end
item
Params = <
item
Name = 'ID_FACTURA'
DataType = datInteger
- BlobType = dabtUnknown
Value = '13'
ParamType = daptInput
end>
@@ -792,114 +535,60 @@ object RptFacturasCliente: TRptFacturasCliente
item
Name = 'ID'
DataType = datAutoInc
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_Detalles_ID'
InPrimaryKey = True
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'ID_FACTURA'
DataType = datInteger
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_Detalles_ID_FACTURA'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'POSICION'
DataType = datInteger
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_Detalles_POSICION'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'TIPO_DETALLE'
DataType = datString
Size = 10
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_Detalles_TIPO_DETALLE'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'CONCEPTO'
DataType = datString
Size = 2000
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_Detalles_CONCEPTO'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'CANTIDAD'
DataType = datInteger
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_Detalles_CANTIDAD'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'IMPORTE_UNIDAD'
DataType = datFloat
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_Detalles_IMPORTE_UNIDAD'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'DESCUENTO'
DataType = datFloat
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'IMPORTE_TOTAL'
DataType = datFloat
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_Detalles_IMPORTE_TOTAL'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'VISIBLE'
DataType = datInteger
- BlobType = dabtUnknown
DictionaryEntry = 'FacturasCliente_Detalles_VISIBLE'
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end>
- BusinessRulesClient.ScriptLanguage = rslPascalScript
- BusinessRulesServer.ScriptLanguage = rslPascalScript
end
item
Params = <
item
Name = 'ID_FACTURA'
- BlobType = dabtUnknown
Value = ''
ParamType = daptInput
end>
@@ -924,31 +613,18 @@ object RptFacturasCliente: TRptFacturasCliente
item
Name = 'FECHA_VENCIMIENTO'
DataType = datDateTime
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end
item
Name = 'IMPORTE_TOTAL'
DataType = datFloat
- BlobType = dabtUnknown
- DisplayWidth = 0
- Alignment = taLeftJustify
- InPrimaryKey = False
- Calculated = False
- Lookup = False
- LookupCache = False
end>
- BusinessRulesClient.ScriptLanguage = rslPascalScript
- BusinessRulesServer.ScriptLanguage = rslPascalScript
end>
+ JoinDataTables = <>
+ UnionDataTables = <>
Commands = <>
RelationShips = <>
UpdateRules = <>
+ Version = 0
Left = 48
Top = 16
end
@@ -957,287 +633,191 @@ object RptFacturasCliente: TRptFacturasCliente
item
Name = 'FacturasCliente_ID'
DataType = datAutoInc
- BlobType = dabtUnknown
Required = True
- DisplayWidth = 0
DisplayLabel = 'ID'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_ID_EMPRESA'
DataType = datInteger
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'ID_EMPRESA'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_ID_CONTRATO'
DataType = datInteger
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'ID_CONTRATO'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_FECHA_FACTURA'
DataType = datDateTime
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Fecha de las factura'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_VENCIMIENTO'
DataType = datInteger
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Vencimiento'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_SITUACION'
DataType = datString
Size = 255
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Situaci'#243'n'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_BASE_IMPONIBLE'
DataType = datFloat
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Base imponible'
Alignment = taRightJustify
end
item
Name = 'FacturasCliente_IMPORTE_DESCUENTO'
DataType = datFloat
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Importe dto.'
Alignment = taRightJustify
end
item
Name = 'FacturasCliente_IMPORTE_IVA'
DataType = datFloat
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Importe IVA'
Alignment = taRightJustify
end
item
Name = 'FacturasCliente_IMPORTE_TOTAL'
DataType = datFloat
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Importe total'
Alignment = taRightJustify
end
item
Name = 'FacturasCliente_FORMA_PAGO'
DataType = datMemo
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Forma de pago'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_ID_CLIENTE'
DataType = datInteger
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'ID_CLIENTE'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_NIF_CIF'
DataType = datString
Size = 15
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'NIF/CIF'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_CODIGO_POSTAL'
DataType = datString
Size = 10
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'C'#243'd. postal'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_FECHA_ALTA'
DataType = datDateTime
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'FECHA_ALTA'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_FECHA_MODIFICACION'
DataType = datDateTime
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'FECHA_MODIFICACION'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_OBSERVACIONES'
DataType = datMemo
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Observaciones'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_NOMBRE'
DataType = datString
Size = 100
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Cliente'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_CALLE'
DataType = datString
Size = 150
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Direcci'#243'n'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_PROVINCIA'
DataType = datString
Size = 30
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Provincia'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_POBLACION'
DataType = datString
Size = 150
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Poblaci'#243'n'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_IVA'
DataType = datFloat
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'IVA'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_USUARIO'
DataType = datString
Size = 100
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'USUARIO'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_REFERENCIA'
DataType = datString
Size = 20
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Referencia'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_DESCUENTO'
DataType = datFloat
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Dto.'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_Detalles_ID'
DataType = datAutoInc
- BlobType = dabtUnknown
Required = True
- DisplayWidth = 0
DisplayLabel = 'ID'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_Detalles_ID_FACTURA'
DataType = datInteger
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'ID_FACTURA'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_Detalles_TIPO_DETALLE'
DataType = datString
Size = 10
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Tipo detalle'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_Detalles_CONCEPTO'
DataType = datString
Size = 2000
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Concepto'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_Detalles_IMPORTE_UNIDAD'
DataType = datFloat
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Importe unidad'
Alignment = taRightJustify
end
item
Name = 'FacturasCliente_Detalles_IMPORTE_TOTAL'
DataType = datFloat
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Importe total'
Alignment = taRightJustify
end
item
Name = 'FacturasCliente_Detalles_VISIBLE'
DataType = datInteger
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = #191'Visible?'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_Detalles_POSICION'
DataType = datInteger
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Posici'#243'n'
- Alignment = taLeftJustify
end
item
Name = 'FacturasCliente_Detalles_CANTIDAD'
DataType = datInteger
- BlobType = dabtUnknown
- DisplayWidth = 0
DisplayLabel = 'Cantidad'
- Alignment = taLeftJustify
end>
Left = 46
Top = 158
@@ -1474,19 +1054,16 @@ object RptFacturasCliente: TRptFacturasCliente
object frxDBCabecera: TfrxDBDataset
UserName = 'frxDBCabecera'
CloseDataSource = True
- DataSource = DADataCabecera
Left = 264
Top = 16
end
object frxDBDetalles: TfrxDBDataset
UserName = 'frxDBDetalles'
CloseDataSource = False
- DataSource = DADataDetalles
Left = 344
Top = 16
end
object DADataVencimientos: TDADataSource
- DataTable = tbl_Vencimientos
Left = 264
Top = 184
end
@@ -1498,11 +1075,6 @@ object RptFacturasCliente: TRptFacturasCliente
LogChanges = False
StreamingOptions = [soDisableEventsWhileStreaming]
RemoteFetchEnabled = False
- SchemaCall.Params = <>
- DataRequestCall.Params = <>
- DataUpdateCall.Params = <>
- ScriptCall.Params = <>
- ReadOnly = False
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
IndexDefs = <>
@@ -1512,7 +1084,6 @@ object RptFacturasCliente: TRptFacturasCliente
object frxDBDataset1: TfrxDBDataset
UserName = 'frxDBVencimientos'
CloseDataSource = True
- DataSource = DADataVencimientos
Left = 344
Top = 184
end
diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas
index 10e7405c..d9d03c27 100644
--- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas
+++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas
@@ -7,7 +7,7 @@ uses
Dialogs, frxClass, frxDBSet, uDAScriptingProvider,
uDADataTable, uDACDSDataTable, DB, uDAClasses, frxChart, frxGradient,
frxChBox, frxCross, frxOLE, frxBarcode, frxRich, uDABINAdapter, uROTypes,
- uDAInterfaces;
+ uDAInterfaces, uDADataStreamer;
type
TRptFacturasCliente = class(TDataModule)
@@ -22,7 +22,6 @@ type
frxCrossObject1: TfrxCrossObject;
frxCheckBoxObject1: TfrxCheckBoxObject;
frxGradientObject1: TfrxGradientObject;
- frxChartObject1: TfrxChartObject;
frxDBCabecera: TfrxDBDataset;
frxDBDetalles: TfrxDBDataset;
DADataVencimientos: TDADataSource;
diff --git a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm
index 2391b71c..b7fb2914 100644
--- a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm
+++ b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm
@@ -385,6 +385,7 @@ object srvFacturasCliente: TsrvFacturasCliente
Statements = <
item
Connection = 'IBX'
+ TargetTable = 'FACTURAS_CLIENTE_DETALLES'
SQL =
'SELECT'#10' FACTURAS_CLIENTE_DETALLES.ID, FACTURAS_CLIENTE_DETALL' +
'ES.ID_FACTURA,'#10' FACTURAS_CLIENTE_DETALLES.POSICION, FACTURAS_' +
@@ -393,10 +394,10 @@ object srvFacturasCliente: TsrvFacturasCliente
'DETALLES.IMPORTE_UNIDAD, FACTURAS_CLIENTE_DETALLES.IMPORTE_TOTAL' +
','#10' FACTURAS_CLIENTE_DETALLES.VISIBLE,'#10#10' FACTURAS_CLIENTE_D' +
'ETALLES.ID_ARTICULO, FACTURAS_CLIENTE_DETALLES.DESCUENTO,'#10' FA' +
- 'CTURAS_CLIENTE_DETALLES.IMPORTE_PORTE,'#10' ARTICULOS.REFERENCIA,' +
- ' ARTICULOS.REFERENCIA_PROV as REFERENCIA_PROVEEDOR'#10' '#10'FROM FAC' +
- 'TURAS_CLIENTE_DETALLES'#10'LEFT JOIN ARTICULOS ON FACTURAS_CLIENTE_D' +
- 'ETALLES.ID_ARTICULO = ARTICULOS.ID'#10'ORDER BY POSICION;'#10
+ 'CTURAS_CLIENTE_DETALLES.IMPORTE_PORTE, ARTICULOS.REFERENCIA,'#10' ' +
+ ' ARTICULOS.REFERENCIA_PROV as REFERENCIA_PROVEEDOR'#10#10'FROM FACTURA' +
+ 'S_CLIENTE_DETALLES'#10'LEFT JOIN ARTICULOS ON FACTURAS_CLIENTE_DETAL' +
+ 'LES.ID_ARTICULO = ARTICULOS.ID'#10'where {where}'#10'ORDER BY POSICION;'#10
StatementType = stSQL
ColumnMappings = <
item
@@ -449,11 +450,13 @@ object srvFacturasCliente: TsrvFacturasCliente
end
item
DatasetField = 'REFERENCIA'
- TableField = 'REFERENCIA'
+ TableField = ''
+ SQLOrigin = 'REFERENCIA'
end
item
DatasetField = 'REFERENCIA_PROVEEDOR'
- TableField = 'REFERENCIA_PROVEEDOR'
+ TableField = ''
+ SQLOrigin = 'REFERENCIA_PROVEEDOR'
end>
end>
Name = 'FacturasCliente_Detalles'
@@ -527,13 +530,11 @@ object srvFacturasCliente: TsrvFacturasCliente
Name = 'REFERENCIA'
DataType = datString
Size = 255
- DictionaryEntry = 'FacturasCliente_Detalles_REFERENCIA'
end
item
Name = 'REFERENCIA_PROVEEDOR'
DataType = datString
Size = 255
- DictionaryEntry = 'FacturasCliente_Detalles_REFERENCIA_PROVEEDOR'
end>
end>
JoinDataTables = <>
@@ -550,7 +551,7 @@ object srvFacturasCliente: TsrvFacturasCliente
Value = ''
end
item
- Name = 'ID_EMPRESA'
+ Name = 'EMPRESA'
Value = ''
end>
Statements = <
@@ -558,7 +559,7 @@ object srvFacturasCliente: TsrvFacturasCliente
Connection = 'IBX'
SQL =
'UPDATE REFERENCIAS SET'#10' VALOR = :VALOR'#10'WHERE CODIGO = :COD' +
- 'IGO AND'#10' ID_EMPRESA = :ID_EMPRESA'
+ 'IGO AND'#10' ID_EMPRESA = :EMPRESA'#10
StatementType = stSQL
ColumnMappings = <>
end>
@@ -589,7 +590,6 @@ object srvFacturasCliente: TsrvFacturasCliente
DataType = datAutoInc
GeneratorName = 'GEN_FACTURA_CLIENTE_DETALLES_ID'
Value = ''
- ParamType = daptInput
end
item
Name = 'CANTIDAD'
@@ -662,6 +662,7 @@ object srvFacturasCliente: TsrvFacturasCliente
Statements = <
item
Connection = 'IBX'
+ Default = True
TargetTable = 'FACTURAS_CLIENTE_DETALLES'
SQL =
'INSERT'#10' INTO FACTURAS_CLIENTE_DETALLES'#10' (ID, CANTIDAD, POSIC' +
@@ -795,7 +796,6 @@ object srvFacturasCliente: TsrvFacturasCliente
DataType = datAutoInc
GeneratorName = 'GEN_FACTURAS_CLIENTE_ID'
Value = ''
- ParamType = daptInput
end
item
Name = 'ID_EMPRESA'
@@ -970,6 +970,7 @@ object srvFacturasCliente: TsrvFacturasCliente
Statements = <
item
Connection = 'IBX'
+ Default = True
TargetTable = 'FACTURAS_CLIENTE'
SQL =
'INSERT INTO FACTURAS_CLIENTE ('#10' ID,'#10' ID_EMPRESA,'#10' REFER' +
@@ -1550,4 +1551,26 @@ object srvFacturasCliente: TsrvFacturasCliente
Left = 48
Top = 80
end
+ object bpFacturasCliente: TDABusinessProcessor
+ Schema = schFacturasCliente
+ InsertCommandName = 'Insert_FacturasCliente'
+ DeleteCommandName = 'Delete_FacturasCliente'
+ UpdateCommandName = 'Update_FacturasCliente'
+ ReferencedDataset = 'FacturasCliente'
+ ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands]
+ UpdateMode = updWhereKeyOnly
+ Left = 248
+ Top = 24
+ end
+ object bpFacturasClienteDetalles: TDABusinessProcessor
+ Schema = schFacturasCliente
+ InsertCommandName = 'Insert_FacturasCliente_Detalles'
+ DeleteCommandName = 'Delete_FacturasCliente_Detalles'
+ UpdateCommandName = 'Update_FacturasCliente_Detalles'
+ ReferencedDataset = 'FacturasCliente_Detalles'
+ ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands]
+ UpdateMode = updWhereKeyOnly
+ Left = 248
+ Top = 77
+ end
end
diff --git a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.pas b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.pas
index dde1d540..38eecf30 100644
--- a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.pas
+++ b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.pas
@@ -24,6 +24,8 @@ type
TsrvFacturasCliente = class(TDataAbstractService, IsrvFacturasCliente)
Diagrams: TDADiagrams;
Bin2DataStreamer: TDABin2DataStreamer;
+ bpFacturasCliente: TDABusinessProcessor;
+ bpFacturasClienteDetalles: TDABusinessProcessor;
schFacturasCliente: TDASchema;
DataDictionary: TDADataDictionary;
procedure DARemoteServiceBeforeGetDatasetData(const Dataset: IDADataset;
@@ -66,13 +68,13 @@ begin
filtrando DataSet por ID_EMPRESA. }
{ FiltrarAccesoUsuario(Session, Connection, schFacturasCliente, DataSet, fld_FacturasClienteID_EMPRESA);
end;
-}
+}
end;
procedure TsrvFacturasCliente.DARemoteServiceCreate(Sender: TObject);
begin
SessionManager := dmServer.SessionManager;
-// bpFacturasCliente.BusinessRulesID := BIZ_SERVER_FACTURAS_CLIENTE;
+ bpFacturasCliente.BusinessRulesID := BIZ_SERVER_FACTURAS_CLIENTE;
end;
procedure TsrvFacturasCliente.DataAbstractServiceBeforeAcquireConnection(
@@ -85,14 +87,13 @@ function TsrvFacturasCliente.GenerateReport(const FacturaID: String): Binary;
//var
// AReportGenerator : TRptFacturasCliente;
begin
-{
- AReportGenerator := TRptFacturasCliente.Create(nil);
+{ AReportGenerator := TRptFacturasCliente.Create(nil);
try
Result := AReportGenerator.GenerarFactura(FacturaID);
finally
FreeAndNIL(AReportGenerator);
end;
-}
+ }
end;
initialization
diff --git a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.drc b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.drc
index 9dc325b9..8dcdbd6f 100644
--- a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.drc
+++ b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.drc
@@ -22,4 +22,4 @@ END
/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Views\uEditorElegirArticulosFacturaCliente.dfm */
/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Views\uEditorElegirFacturasCliente.dfm */
/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Views\FacturasCliente_view.res */
-/* C:\Codigo Tecsitel\Source\Modulos\Facturas de cliente\Views\FacturasCliente_view.drf */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf180.tmp */
diff --git a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.res b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.res
index 86c94e6a..36f26e23 100644
Binary files a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.res and b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.res differ
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
index 1c002f42..eeb83a66 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
@@ -11,10 +11,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
- Top = 90
Width = 788
Caption = 'Nueva factura de cliente'
- ExplicitTop = 90
ExplicitWidth = 788
inherited Image1: TImage
Left = 761
@@ -41,9 +39,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
end
end
inherited TBXDock: TTBXDock
- Top = 41
Width = 788
- ExplicitTop = 41
ExplicitWidth = 788
inherited tbxMain: TTBXToolbar
ExplicitWidth = 488
@@ -73,24 +69,21 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
end
end
inherited pgPaginas: TPageControl
- Top = 117
Width = 788
- Height = 276
- ActivePage = pagContenido
+ Height = 317
OnChanging = pgPaginasChanging
- ExplicitTop = 117
ExplicitWidth = 788
- ExplicitHeight = 276
+ ExplicitHeight = 317
inherited pagGeneral: TTabSheet
ExplicitLeft = 4
ExplicitTop = 24
ExplicitWidth = 780
- ExplicitHeight = 248
+ ExplicitHeight = 289
inline frViewFacturaCliente1: TfrViewFacturaCliente
Left = 0
Top = 0
Width = 780
- Height = 248
+ Height = 289
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -101,15 +94,15 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
TabOrder = 0
ReadOnly = False
ExplicitWidth = 780
- ExplicitHeight = 248
+ ExplicitHeight = 289
inherited dxLayoutControl1: TdxLayoutControl
Width = 780
- Height = 248
+ Height = 289
ExplicitWidth = 780
- ExplicitHeight = 248
+ ExplicitHeight = 289
DesignSize = (
780
- 248)
+ 289)
inherited eReferencia: TcxDBTextEdit
ExplicitWidth = 393
Width = 393
@@ -125,9 +118,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Width = 473
end
inherited frViewClienteFactura: TfrViewDatosYSeleccionCliente
- Left = 465
+ Left = 474
Width = 332
- ExplicitLeft = 465
+ ExplicitLeft = 474
ExplicitWidth = 332
inherited dxLayoutControl1: TdxLayoutControl
Width = 332
@@ -135,28 +128,18 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
inherited edtlNombre: TcxDBTextEdit
DataBinding.DataSource = frViewFacturaCliente1.DADataSource
Properties.OnChange = frViewClienteFacturaedtlNombrePropertiesChange
- ExplicitWidth = 224
- Width = 224
end
inherited edtNIFCIF: TcxDBTextEdit
DataBinding.DataSource = frViewFacturaCliente1.DADataSource
- ExplicitWidth = 562
- Width = 562
end
inherited edtCalle: TcxDBTextEdit
DataBinding.DataSource = frViewFacturaCliente1.DADataSource
- ExplicitWidth = 562
- Width = 562
end
inherited edtPoblacion: TcxDBTextEdit
DataBinding.DataSource = frViewFacturaCliente1.DADataSource
- ExplicitWidth = 177
- Width = 177
end
inherited edtProvincia: TcxDBTextEdit
DataBinding.DataSource = frViewFacturaCliente1.DADataSource
- ExplicitWidth = 327
- Width = 327
end
inherited edtCodigoPostal: TcxDBTextEdit
DataBinding.DataSource = frViewFacturaCliente1.DADataSource
@@ -168,8 +151,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Width = 255
end
inherited bFormasPago: TButton
- Left = 305
- ExplicitLeft = 305
+ Left = 314
+ ExplicitLeft = 314
end
end
end
@@ -181,7 +164,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Left = 0
Top = 0
Width = 780
- Height = 248
+ Height = 289
Align = alClient
BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET
@@ -194,7 +177,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
TabOrder = 0
ReadOnly = False
ExplicitWidth = 780
- ExplicitHeight = 248
+ ExplicitHeight = 289
inherited ToolBar1: TToolBar
Width = 780
ExplicitWidth = 780
@@ -257,9 +240,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
end
inherited cxGrid: TcxGrid
Width = 780
- Height = 176
+ Height = 217
ExplicitWidth = 780
- ExplicitHeight = 176
+ ExplicitHeight = 217
end
inherited TBXDock1: TTBXDock
Width = 780
@@ -269,28 +252,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
end
end
end
- object Button1: TButton
- Left = 624
- Top = 3
- Width = 75
- Height = 25
- Caption = 'Button1'
- TabOrder = 1
- OnClick = Button1Click
- end
- object DBGrid1: TDBGrid
- Left = 164
- Top = 136
- Width = 517
- Height = 120
- DataSource = frViewDetallesFacturaCliente1.DADataSource
- TabOrder = 2
- TitleFont.Charset = DEFAULT_CHARSET
- TitleFont.Color = clWindowText
- TitleFont.Height = -11
- TitleFont.Name = 'Tahoma'
- TitleFont.Style = []
- end
end
end
inherited StatusBar: TJvStatusBar
@@ -478,68 +439,16 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
end
end
end
- object Panel1: TPanel [5]
- Left = 0
- Top = 0
- Width = 788
- Height = 41
- Align = alTop
- Caption = 'Panel1'
- TabOrder = 5
- DesignSize = (
- 788
- 41)
- object ssss: TcxDBTextEdit
- Left = 420
- Top = 14
- Anchors = [akLeft, akTop, akRight]
- DataBinding.DataField = 'ID'
- DataBinding.DataSource = dsDataTable
- Properties.ReadOnly = False
- Style.BorderColor = clWindowFrame
- Style.BorderStyle = ebs3D
- Style.Color = clInfoBk
- Style.HotTrack = False
- Style.LookAndFeel.NativeStyle = True
- StyleDisabled.Color = clMenuBar
- StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.TextColor = clWindowText
- StyleFocused.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 0
- Width = 322
- end
- object cxDBTextEdit1: TcxDBTextEdit
- Left = 26
- Top = 11
- Anchors = [akLeft, akTop, akRight]
- DataBinding.DataField = 'ID'
- DataBinding.DataSource = frViewDetallesFacturaCliente1.DADataSource
- Properties.ReadOnly = False
- Style.BorderColor = clWindowFrame
- Style.BorderStyle = ebs3D
- Style.Color = clInfoBk
- Style.HotTrack = False
- Style.LookAndFeel.NativeStyle = True
- StyleDisabled.Color = clMenuBar
- StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.TextColor = clWindowText
- StyleFocused.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 1
- Width = 322
- end
- end
- inherited EditorActionList: TActionList [6]
+ inherited EditorActionList: TActionList [5]
Left = 8
Top = 144
end
- inherited SmallImages: TPngImageList [7]
+ inherited SmallImages: TPngImageList [6]
end
- inherited LargeImages: TPngImageList [8]
+ inherited LargeImages: TPngImageList [7]
end
- inherited JvFormStorage: TJvFormStorage [9]
+ inherited JvFormStorage: TJvFormStorage [8]
end
- inherited dsDataTable: TDADataSource [11]
+ inherited dsDataTable: TDADataSource [10]
end
end
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas
index 9806950d..a0a8f29b 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas
@@ -24,11 +24,6 @@ type
frViewFacturaCliente1: TfrViewFacturaCliente;
frViewTotales1: TfrViewTotales;
frViewDetallesFacturaCliente1: TfrViewDetallesFacturaCliente;
- Panel1: TPanel;
- ssss: TcxDBTextEdit;
- Button1: TButton;
- DBGrid1: TDBGrid;
- cxDBTextEdit1: TcxDBTextEdit;
procedure FormShow(Sender: TObject);
procedure frViewClienteFactura1edtlNombrePropertiesEditValueChanged(Sender: TObject);
procedure dsDataTableDataChange(Sender: TObject; Field: TField);
@@ -44,7 +39,7 @@ type
procedure frViewTotales1ePortePropertiesValidate(Sender: TObject;
var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
procedure frViewTotales1ePorteEditing(Sender: TObject; var CanEdit: Boolean);
- procedure Button1Click(Sender: TObject);
+
private
procedure RecalcularPortePorUnidad;
@@ -93,14 +88,6 @@ uses
{
**************************** TfEditorFacturaCliente ****************************
}
-procedure TfEditorFacturaCliente.Button1Click(Sender: TObject);
-begin
- inherited;
-// if fFactura.DataTable.Editing then
-// FFactura.DataTable.post;
- ShowMessage('ClassName -> ' + FFactura.Detalles.DataTable.BusinessEventsObj.ClassName);
- FFactura.Detalles.Insert;
-end;
constructor TfEditorFacturaCliente.Create(AOwner: TComponent);
begin
@@ -189,10 +176,10 @@ procedure TfEditorFacturaCliente.frViewTotales1cbRecargoEquivalenciaPropertiesEd
Sender: TObject);
begin
inherited;
-{ if frViewTotales1.cbRecargoEquivalencia.Checked then
+ if frViewTotales1.cbRecargoEquivalencia.Checked then
Factura.RECARGO_EQUIVALENCIA := 1
else
- Factura.RECARGO_EQUIVALENCIA := 0;}
+ Factura.RECARGO_EQUIVALENCIA := 0;
end;
procedure TfEditorFacturaCliente.frViewTotales1edtDescuentoPropertiesValidate(
@@ -329,7 +316,7 @@ var
ACadena : String;
begin
inherited;
-{
+
if (not Assigned(FFactura)) or (FFactura.ID_CLIENTE = ID_NULO) then
begin
if FFactura.TIPO = CTE_TIPO_FACTURA then
@@ -339,7 +326,6 @@ begin
ShowWarningMessage(ACadena);
AllowChange := False;
end;
-}
end;
procedure TfEditorFacturaCliente.PonerTitulos(const ATitulo: string);
@@ -399,8 +385,7 @@ begin
if Assigned(FFactura) then
begin
dsDataTable.DataTable := FFactura.DataTable;
- frViewTotales1.DADataSource.DataTable := FFactura.DataTable;
-
+// frViewTotales1.DADataSource.DataTable := FFactura.DataTable;
FTiposIVA := FTiposIVAController.BuscarTodos;
frViewTotales1.dsTiposIVA.DataTable := FTiposIVA.DataTable;
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm
index b23c9353..709eacaa 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm
@@ -122,18 +122,18 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
Width = 640
ExplicitWidth = 640
inherited txtFiltroTodo: TcxTextEdit
- ExplicitWidth = 273
- Width = 273
+ ExplicitWidth = 457
+ Width = 457
end
inherited edtFechaIniFiltro: TcxDateEdit
- ExplicitWidth = 121
- Width = 121
+ ExplicitWidth = 240
+ Width = 240
end
inherited edtFechaFinFiltro: TcxDateEdit
- Left = 295
- ExplicitLeft = 295
- ExplicitWidth = 244
- Width = 244
+ Left = 351
+ ExplicitLeft = 351
+ ExplicitWidth = 273
+ Width = 273
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas
index 3c6b55b4..194d2df5 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas
@@ -82,17 +82,7 @@ end;
procedure TfEditorFacturasCliente.actNuevaFacturaExecute(Sender: TObject);
begin
- //actNuevo.Execute;
- Controller.Anadir(Facturas);
- with Facturas do
- begin
- ID_CLIENTE := 320;
- Post;
- Detalles.Insert;
- Detalles.CONCEPTO := '111111';
- ShowMessage('ID -> ' + IntToStr(Detalles.ID));
- Detalles.Post;
- end;
+ actNuevo.Execute;
end;
procedure TfEditorFacturasCliente.actNuevoAbonoExecute(Sender: TObject);
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm
index 60866831..44b33ab1 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm
@@ -1,6 +1,15 @@
inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente
inherited cxGrid: TcxGrid
inherited cxGridView: TcxGridDBTableView
+ inherited cxGridViewID: TcxGridDBColumn
+ Visible = False
+ end
+ inherited cxGridViewPOSICION: TcxGridDBColumn
+ Visible = False
+ end
+ inherited cxGridViewTIPO: TcxGridDBColumn
+ Visible = False
+ end
inherited cxGridViewIMPORTEPORTE: TcxGridDBColumn
Visible = False
end
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm
index ed4b5f17..ef350f91 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm
@@ -1,6 +1,6 @@
inherited frViewFacturaCliente: TfrViewFacturaCliente
- Width = 649
- Height = 301
+ Width = 451
+ Height = 304
Align = alClient
OnCreate = CustomViewCreate
OnDestroy = CustomViewDestroy
@@ -9,18 +9,16 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
object dxLayoutControl1: TdxLayoutControl
Left = 0
Top = 0
- Width = 649
- Height = 301
+ Width = 451
+ Height = 304
Align = alClient
ParentBackground = True
TabOrder = 0
AutoContentSizes = [acsWidth, acsHeight]
LookAndFeel = dxLayoutOfficeLookAndFeel1
- ExplicitWidth = 451
- ExplicitHeight = 304
DesignSize = (
- 649
- 301)
+ 451
+ 304)
object eReferencia: TcxDBTextEdit
Left = 124
Top = 30
@@ -81,7 +79,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
Width = 301
end
inline frViewClienteFactura: TfrViewDatosYSeleccionCliente
- Left = 340
+ Left = 310
Top = 30
Width = 314
Height = 215
@@ -93,38 +91,48 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
ParentFont = False
TabOrder = 5
ReadOnly = False
- ExplicitLeft = 340
+ ExplicitLeft = 310
ExplicitTop = 30
ExplicitWidth = 314
ExplicitHeight = 215
inherited dxLayoutControl1: TdxLayoutControl
Width = 314
Height = 215
- ExplicitWidth = 119
+ ExplicitWidth = 314
ExplicitHeight = 215
inherited edtlNombre: TcxDBTextEdit
DataBinding.DataSource = DADataSource
+ ExplicitWidth = 224
+ Width = 224
end
inherited edtNIFCIF: TcxDBTextEdit
DataBinding.DataSource = DADataSource
+ ExplicitWidth = 562
+ Width = 562
end
inherited edtCalle: TcxDBTextEdit
DataBinding.DataSource = DADataSource
+ ExplicitWidth = 562
+ Width = 562
end
inherited edtPoblacion: TcxDBTextEdit
DataBinding.DataSource = DADataSource
+ ExplicitWidth = 177
+ Width = 177
end
inherited edtProvincia: TcxDBTextEdit
DataBinding.DataSource = DADataSource
+ ExplicitWidth = 327
+ Width = 327
end
inherited edtCodigoPostal: TcxDBTextEdit
- Left = 195
+ Left = 192
DataBinding.DataSource = DADataSource
- ExplicitLeft = 195
+ ExplicitLeft = 192
end
inherited Button3: TBitBtn
- Left = 85
- ExplicitLeft = 85
+ Left = 82
+ ExplicitLeft = 82
end
end
end
@@ -160,7 +168,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
Width = 78
end
object bFormasPago: TButton
- Left = 180
+ Left = 150
Top = 84
Width = 132
Height = 23
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas
index 138d3add..fce43d1b 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas
+++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas
@@ -9,7 +9,7 @@ uses
cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit, dxLayoutControl,
cxMemo, cxMaskEdit, cxDropDownEdit, cxCalendar, cxSpinEdit, StdCtrls, Mask,
DBCtrls, cxGraphics, dxLayoutLookAndFeels, cxLookupEdit, cxDBLookupEdit,
- cxDBLookupComboBox, uFormasPagoController, uDAInterfaces;
+ cxDBLookupComboBox, uFormasPagoController, uDAInterfaces, uBizFormasPago;
type
IViewFacturaCliente = interface(IViewBase)
@@ -48,6 +48,7 @@ type
procedure CustomViewCreate(Sender: TObject);
protected
FFactura : IBizFacturaCliente;
+ FFormasPago : IBizFormaPago;
FFormasPagoController : IFormasPagoController;
function GetFactura: IBizFacturaCliente;
procedure SetFactura(const Value: IBizFacturaCliente);
@@ -59,8 +60,7 @@ type
implementation
uses
- uDataModuleContactos, schFacturasClienteClient_Intf,
- uBizFormasPago;
+ uDataModuleContactos, schFacturasClienteClient_Intf;
{$R *.dfm}
@@ -69,19 +69,22 @@ uses
procedure TfrViewFacturaCliente.bFormasPagoClick(Sender: TObject);
begin
inherited;
- FFormasPagoController.VerTodos((dsFormaPago.DataTable) as IBizFormaPago);
+ if Assigned(FFormasPago) then
+ FFormasPagoController.VerTodos(FFormasPago);
end;
procedure TfrViewFacturaCliente.CustomViewCreate(Sender: TObject);
begin
inherited;
-// FFormasPagoController := TFormasPagoController.Create;
+ FFormasPago := Nil;
+ FFormasPagoController := TFormasPagoController.Create;
end;
procedure TfrViewFacturaCliente.CustomViewDestroy(Sender: TObject);
begin
inherited;
-// FFormasPagoController := NIL;
+ FFormasPago := Nil;
+ FFormasPagoController := NIL;
end;
function TfrViewFacturaCliente.GetFactura: IBizFacturaCliente;
@@ -97,10 +100,11 @@ begin
if Assigned(FFactura) then
begin
DADataSource.DataTable := FFactura.DataTable;
-{
- dsFormaPago.DataTable := FFormasPagoController.BuscarTodos.DataTable;
+
+ FFormasPago := FFormasPagoController.BuscarTodos;
+ dsFormaPago.DataTable := FFormasPago.DataTable;
dsFormaPago.DataTable.Active := True;
-}
+
//Solo se deshabilita al insertar, luego la referencia será modificable
//eReferencia.Enabled := (FFactura.DataTable.State = dsInsert);