diff --git a/Build/Build.fbl6 b/Build/Build.fbl6
index fef5ed6..da5e737 100644
Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ
diff --git a/Build/Build.fbpInf b/Build/Build.fbpInf
index 62bcbc6..2813cbe 100644
--- a/Build/Build.fbpInf
+++ b/Build/Build.fbpInf
@@ -1,6 +1,6 @@
- {0F75D8EA-B6C2-4ECA-9E1E-45E235135301},{10527A84-0FB7-4007-9B23-9E5826133948},{154CD4CE-0F61-40F6-8CE6-CF525D3CFDCA},{282C2736-74F5-49C2-95D0-C1C4D359AEB2},{331AC851-CE2F-4986-9381-A257AB26B1AD},{3F8BEF26-5F4F-4B97-B1BC-118F36CBDD68},{4968AB21-B759-4F4A-9214-8792F67DA1E2},{4B038673-47F7-4436-BD07-D557FA62337E},{68D393D0-7234-4D5A-9D3A-A3FDC1593E55},{6C425F09-E04B-49EC-89E2-8C93D60E9055},{7251A871-CE6C-41D1-A404-735619825EAE},{816E4470-A0A2-4675-A270-7721426D4FD2},{856B4CEA-BF27-4696-8FFC-4507B6E29943},{A181C54F-9BE8-4404-9AB9-FEE8A9C3443D},{AD23CE23-8728-48FA-84FD-264E27BA8F46},{B70F0EA3-7874-42B0-BFB8-430D43AC2D61},{C662116C-EB3F-4161-A768-49D13B08EFE5},{CE990EA4-7660-4997-8CBF-6C6AA978753A},{E8E8671F-894B-4049-B4A6-905B57207637},{F2541E28-3C45-4A17-BEC5-185CBF9D2A90}
+ {0F75D8EA-B6C2-4ECA-9E1E-45E235135301},{10527A84-0FB7-4007-9B23-9E5826133948},{154CD4CE-0F61-40F6-8CE6-CF525D3CFDCA},{331AC851-CE2F-4986-9381-A257AB26B1AD},{3F8BEF26-5F4F-4B97-B1BC-118F36CBDD68},{4968AB21-B759-4F4A-9214-8792F67DA1E2},{4B038673-47F7-4436-BD07-D557FA62337E},{68D393D0-7234-4D5A-9D3A-A3FDC1593E55},{6C425F09-E04B-49EC-89E2-8C93D60E9055},{7251A871-CE6C-41D1-A404-735619825EAE},{789902B1-5E64-4FD9-80BF-6113B13BFE12},{856B4CEA-BF27-4696-8FFC-4507B6E29943},{A181C54F-9BE8-4404-9AB9-FEE8A9C3443D},{AD23CE23-8728-48FA-84FD-264E27BA8F46},{B70F0EA3-7874-42B0-BFB8-430D43AC2D61},{C662116C-EB3F-4161-A768-49D13B08EFE5},{CE990EA4-7660-4997-8CBF-6C6AA978753A},{E8E8671F-894B-4049-B4A6-905B57207637},{F2541E28-3C45-4A17-BEC5-185CBF9D2A90}
@@ -14,8 +14,8 @@
- 00:00:01
- 30/08/2013 13:07:24
+ 00:04:03
+ 02/12/2013 13:45:23
True
diff --git a/Build/Build.fbz6 b/Build/Build.fbz6
index 35e3ae5..d82a694 100644
Binary files a/Build/Build.fbz6 and b/Build/Build.fbz6 differ
diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql
index 04be030..a987570 100644
--- a/Database/scripts/factuges.sql
+++ b/Database/scripts/factuges.sql
@@ -510,7 +510,8 @@ CREATE TABLE CLIENTES_DATOS (
VENCIMIENTO_FACTURAS_2 SMALLINT,
VENCIMIENTO_FACTURAS_3 SMALLINT,
FELICITACION TIPO_BOOLEANO,
- TIPO_CLIENTE VARCHAR(255) COLLATE ES_ES
+ TIPO_CLIENTE VARCHAR(255) COLLATE ES_ES,
+ SEPA TIPO_BOOLEANO DEFAULT 0 NOT NULL
);
CREATE TABLE CLIENTES_DTOS_PROVEEDORES (
@@ -1997,7 +1998,8 @@ CREATE VIEW V_CLIENTES(
CODIGO_ASIGNADO,
DESCUENTO,
FELICITACION,
- TIPO_CLIENTE)
+ TIPO_CLIENTE,
+ SEPA)
AS
SELECT
V_CONTACTOS.ID,
@@ -2042,7 +2044,8 @@ SELECT
CLIENTES_DATOS.CODIGO_ASIGNADO,
CLIENTES_DATOS.DESCUENTO,
CLIENTES_DATOS.FELICITACION,
- CLIENTES_DATOS.TIPO_CLIENTE
+ CLIENTES_DATOS.TIPO_CLIENTE,
+ CLIENTES_DATOS.SEPA
FROM
V_CONTACTOS
LEFT OUTER JOIN CLIENTES_DATOS ON (V_CONTACTOS.ID = CLIENTES_DATOS.ID_CLIENTE)
diff --git a/Resources/Iconos/Contactos/16x16/Script-Edit.png b/Resources/Iconos/Contactos/16x16/Script-Edit.png
new file mode 100644
index 0000000..a8e0307
Binary files /dev/null and b/Resources/Iconos/Contactos/16x16/Script-Edit.png differ
diff --git a/Resources/Iconos/Contactos/16x16/Thumbs.db b/Resources/Iconos/Contactos/16x16/Thumbs.db
new file mode 100644
index 0000000..59b5bff
Binary files /dev/null and b/Resources/Iconos/Contactos/16x16/Thumbs.db differ
diff --git a/Resources/Iconos/Contactos/24x24/Script-Edit.png b/Resources/Iconos/Contactos/24x24/Script-Edit.png
new file mode 100644
index 0000000..8cf94d8
Binary files /dev/null and b/Resources/Iconos/Contactos/24x24/Script-Edit.png differ
diff --git a/Resources/Iconos/Contactos/28x28/Script-Edit.png b/Resources/Iconos/Contactos/28x28/Script-Edit.png
new file mode 100644
index 0000000..80c35d7
Binary files /dev/null and b/Resources/Iconos/Contactos/28x28/Script-Edit.png differ
diff --git a/Source/ApplicationBase/uPlugins_Intf.pas b/Source/ApplicationBase/uPlugins_Intf.pas
index 04f2df6..aa4c701 100644
--- a/Source/ApplicationBase/uPlugins_Intf.pas
+++ b/Source/ApplicationBase/uPlugins_Intf.pas
@@ -9,6 +9,7 @@ const
MODULENAME_PEDIDOS_CLIENTE = 'PedidosCliente_plugin.bpl';
MODULENAME_ALBARANES_CLIENTE = 'AlbaranesCliente_plugin.bpl';
MODULENAME_FACTURAS_CLIENTE = 'FacturasCliente_plugin.bpl';
+ MODULENAME_FACTURAS_PROFORMA = 'FacturasProforma_plugin.bpl';
MODULENAME_RECIBOS_CLIENTE = 'RecibosCliente_plugin.bpl';
MODULENAME_PEDIDOS_PROVEEDOR = 'PedidosProveedor_plugin.bpl';
@@ -43,6 +44,12 @@ type
const ANombreCliente : String = '');
end;
+ IMCFacturasProforma = interface(IInterface)
+ ['{5B0F25E1-DAD9-42AD-9F8A-48756F910225}']
+ procedure VerFacturas(const ID_Cliente: Integer;
+ const ANombreCliente : String = '');
+ end;
+
IMCRecibosCliente = interface(IInterface)
['{6535395A-1450-4E19-8031-F9CD3D062F6D}']
procedure VerRecibos(const ID_Cliente: Integer;
diff --git a/Source/Cliente/uBootStrap.pas b/Source/Cliente/uBootStrap.pas
index 06ceef2..6ff6c6a 100644
--- a/Source/Cliente/uBootStrap.pas
+++ b/Source/Cliente/uBootStrap.pas
@@ -39,6 +39,7 @@ begin
LoadModule('RecibosCliente_plugin.bpl');
LoadModule(MODULENAME_FACTURAS_CLIENTE);
+ LoadModule(MODULENAME_FACTURAS_PROFORMA);
LoadModule(MODULENAME_PEDIDOS_PROVEEDOR);
LoadModule(MODULENAME_ALBARANES_PROVEEDOR);
diff --git a/Source/GUIBase/uViewTotales.dfm b/Source/GUIBase/uViewTotales.dfm
index 0ef6073..1ef4486 100644
--- a/Source/GUIBase/uViewTotales.dfm
+++ b/Source/GUIBase/uViewTotales.dfm
@@ -1,9 +1,9 @@
inherited frViewTotales: TfrViewTotales
- Width = 451
- Height = 252
+ Width = 772
+ Height = 368
Align = alBottom
- ExplicitWidth = 451
- ExplicitHeight = 252
+ ExplicitWidth = 771
+ ExplicitHeight = 368
object Bevel5: TBevel
Left = 666
Top = 109
@@ -15,8 +15,8 @@ inherited frViewTotales: TfrViewTotales
AlignWithMargins = True
Left = 0
Top = 0
- Width = 451
- Height = 252
+ Width = 772
+ Height = 368
Margins.Left = 0
Margins.Top = 0
Margins.Right = 0
@@ -26,22 +26,24 @@ inherited frViewTotales: TfrViewTotales
TabOrder = 0
TabStop = False
AutoContentSizes = [acsWidth, acsHeight]
+ ExplicitWidth = 451
+ ExplicitHeight = 252
object Bevel3: TBevel
- Left = 305
+ Left = 394
Top = 28
Width = 3
Height = 100
Shape = bsRightLine
end
object Bevel4: TBevel
- Left = 417
+ Left = 506
Top = 70
Width = 342
Height = 9
Shape = bsBottomLine
end
object Bevel1: TBevel
- Left = 417
+ Left = 506
Top = 186
Width = 368
Height = 9
@@ -90,7 +92,7 @@ inherited frViewTotales: TfrViewTotales
Width = 87
end
object ImporteIVA: TcxDBCurrencyEdit
- Left = 488
+ Left = 577
Top = 105
AutoSize = False
DataBinding.DataField = 'IMPORTE_IVA'
@@ -125,7 +127,7 @@ inherited frViewTotales: TfrViewTotales
Width = 20
end
object ImporteTotal: TcxDBCurrencyEdit
- Left = 418
+ Left = 507
Top = 159
AutoSize = False
DataBinding.DataField = 'IMPORTE_TOTAL'
@@ -195,7 +197,7 @@ inherited frViewTotales: TfrViewTotales
Width = 65
end
object edtIVA: TcxDBSpinEdit
- Left = 417
+ Left = 506
Top = 105
AutoSize = False
DataBinding.DataField = 'IVA'
@@ -236,7 +238,7 @@ inherited frViewTotales: TfrViewTotales
Width = 65
end
object ImporteBase: TcxDBCurrencyEdit
- Left = 417
+ Left = 506
Top = 28
AutoSize = False
DataBinding.DataField = 'BASE_IMPONIBLE'
@@ -271,7 +273,7 @@ inherited frViewTotales: TfrViewTotales
Width = 91
end
object edtRE: TcxDBSpinEdit
- Left = 417
+ Left = 506
Top = 132
AutoSize = False
DataBinding.DataField = 'RE'
@@ -312,7 +314,7 @@ inherited frViewTotales: TfrViewTotales
Width = 65
end
object ImporteRE: TcxDBCurrencyEdit
- Left = 488
+ Left = 577
Top = 132
AutoSize = False
DataBinding.DataField = 'IMPORTE_RE'
@@ -450,7 +452,7 @@ inherited frViewTotales: TfrViewTotales
Width = 20
end
object bTiposIVA: TButton
- Left = 157
+ Left = 246
Top = 109
Width = 132
Height = 21
@@ -488,7 +490,7 @@ inherited frViewTotales: TfrViewTotales
Width = 221
end
object edtRetencion: TcxDBSpinEdit
- Left = 417
+ Left = 506
Top = 206
AutoSize = False
DataBinding.DataSource = DADataSource
@@ -527,7 +529,7 @@ inherited frViewTotales: TfrViewTotales
Width = 65
end
object edtImporteRetencion: TcxDBCurrencyEdit
- Left = 488
+ Left = 577
Top = 206
AutoSize = False
DataBinding.DataSource = DADataSource
diff --git a/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm b/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm
index c74b2cd..e7a8f11 100644
--- a/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm
+++ b/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm
@@ -286,6 +286,10 @@ inherited DataModuleClientes: TDataModuleClientes
Name = 'TIPO_CLIENTE'
DataType = datString
Size = 255
+ end
+ item
+ Name = 'SEPA'
+ DataType = datSmallInt
end>
Params = <>
StreamingOptions = [soDisableEventsWhileStreaming]
diff --git a/Source/Modulos/Contactos/Model/Contactos_model.identcache b/Source/Modulos/Contactos/Model/Contactos_model.identcache
index 6c778be..f899011 100644
Binary files a/Source/Modulos/Contactos/Model/Contactos_model.identcache and b/Source/Modulos/Contactos/Model/Contactos_model.identcache differ
diff --git a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas
index 927ff94..6ae8ab8 100644
--- a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas
+++ b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas
@@ -3,34 +3,34 @@ unit schContactosClient_Intf;
interface
uses
- Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
+ Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
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_Contactos = '{FC98FC9D-2174-484A-84DB-29A5FF522A49}';
- RID_GruposCliente = '{FAE5A018-A73D-4F40-BC2B-D43431C80929}';
- RID_DatosBancarios = '{204762D1-0752-48E4-8D13-73A6E478ABC2}';
- RID_Clientes = '{9BE4C879-165C-4D3F-9BBA-526B77860B3F}';
- RID_Proveedores = '{7B7762CE-6B42-4B50-A194-78BE5FFB71E5}';
- RID_Empleados = '{0B610962-07D1-4C7D-BC7B-65AC8824DDC4}';
- RID_DireccionesContacto = '{68C042FD-68F6-440A-B10F-0314491B1100}';
- RID_ClientesDescuentos = '{845D6324-B528-4907-923D-7A1E0517F59A}';
- RID_GruposProveedor = '{B5573F10-E1CB-400B-8595-F5E7E6812CAE}';
- RID_GruposEmpleado = '{6EF2382C-65F9-4429-8EFE-7BBE4F35FEED}';
- RID_Contactos_Refresh = '{5A18AE89-0712-468F-A606-94C4B8BBF4DE}';
- RID_ContratosEmpleados = '{D4DDC2BA-74CF-4EBC-AEF9-476BDE3FDFE7}';
- RID_DescripcionesProveedores = '{8F5E1C48-6D57-4DBB-9621-EEEF38163532}';
- RID_PersonalContacto = '{8CBD048B-EEF4-46F3-A027-B66E39125D87}';
- RID_Agentes_Comisiones = '{3FEA025A-89BF-4B2F-84DB-29BECC676846}';
- RID_ListaAnosObjetivosAlb = '{67328F62-088C-4B54-A4EA-256CEAEE2D1A}';
- RID_Agentes = '{8F775E20-FF8D-4966-94D4-CAA4B3EDE612}';
- RID_ClientesDescuentosArticulos = '{5A7F7F18-FFC7-4BBD-9632-0EF2C3A855C9}';
- RID_Agentes_Objetivos_albaranes = '{6C51A34C-790F-477E-8F90-341B0FE11746}';
- RID_Agentes_Objetivos_facturas = '{F8E77A40-78F2-44F5-BA10-4DA0BF8FE0CE}';
- RID_ListaAnosObjetivosFac = '{4A823B2D-CD57-404E-A7DD-587779C21C84}';
- RID_TiposCliente = '{E6135AF1-7B14-4726-979D-7DDC74BFB4D2}';
+ RID_Contactos = '{FBD2AAD5-CF1A-4748-AB85-1C366E1895C6}';
+ RID_GruposCliente = '{64DAFBB8-1672-4851-ABE6-92C49E8D4B57}';
+ RID_DatosBancarios = '{2E0FD9E5-4DC4-4D5F-91FD-8A75BFB2C591}';
+ RID_Clientes = '{3F3959CA-7FFD-4204-84C6-EB72686D1339}';
+ RID_Proveedores = '{E13E8932-AD15-4517-BF6B-A35E99F15143}';
+ RID_Empleados = '{5DEB85DB-8DFA-4F47-ABA8-073D22019702}';
+ RID_DireccionesContacto = '{703AD49B-BC88-40BF-A334-D8E36692A73F}';
+ RID_ClientesDescuentos = '{4B4343F6-C4F9-4227-B5D5-732793C9E4FD}';
+ RID_GruposProveedor = '{50BEB5B1-18D2-4964-80CA-A6348F1399CF}';
+ RID_GruposEmpleado = '{F38B7EB9-A2EF-4855-8477-74812BF2A5A4}';
+ RID_Contactos_Refresh = '{D4220A4F-12DF-48CD-A3FE-719ED1F87AE2}';
+ RID_ContratosEmpleados = '{E24AE0CB-F240-457B-BB39-24AC9127A589}';
+ RID_DescripcionesProveedores = '{D7A82072-1797-4B0A-BD79-0CC63702D713}';
+ RID_PersonalContacto = '{EAA43A4E-003C-46CC-B819-66F5841B103D}';
+ RID_Agentes_Comisiones = '{88CEF29A-906A-4A8B-9096-E6E403B4D87D}';
+ RID_ListaAnosObjetivosAlb = '{FB89CCC3-56B0-43FC-91FA-358CC0874438}';
+ RID_Agentes = '{4EE3484F-6FAA-49B9-973C-A48CE905A97C}';
+ RID_ClientesDescuentosArticulos = '{DEED0FE2-E7BF-433F-80AA-6DB119277D32}';
+ RID_Agentes_Objetivos_albaranes = '{36E5577F-660B-474E-AFFA-C43D241CB818}';
+ RID_Agentes_Objetivos_facturas = '{97B80D0A-D948-4E06-A9DA-6ABBEE918407}';
+ RID_ListaAnosObjetivosFac = '{928DF566-75F5-48D6-8711-36C9ECEAEE39}';
+ RID_TiposCliente = '{EBFA5662-8619-447E-98AC-FB6C89A2E6E4}';
{ Data table names }
nme_Contactos = 'Contactos';
@@ -180,6 +180,7 @@ const
fld_ClientesDESCUENTO = 'DESCUENTO';
fld_ClientesFELICITACION = 'FELICITACION';
fld_ClientesTIPO_CLIENTE = 'TIPO_CLIENTE';
+ fld_ClientesSEPA = 'SEPA';
{ Clientes field indexes }
idx_ClientesID = 0;
@@ -225,6 +226,7 @@ const
idx_ClientesDESCUENTO = 40;
idx_ClientesFELICITACION = 41;
idx_ClientesTIPO_CLIENTE = 42;
+ idx_ClientesSEPA = 43;
{ Proveedores fields }
fld_ProveedoresID = 'ID';
@@ -679,7 +681,7 @@ const
type
{ IContactos }
IContactos = interface(IDAStronglyTypedDataTable)
- ['{DFDDB687-2921-467A-BB23-198E5B922F84}']
+ ['{1AD56C50-FF1F-4BE0-98F8-DE3D848998CC}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -824,7 +826,7 @@ type
end;
{ TContactosDataTableRules }
- TContactosDataTableRules = class(TIntfObjectDADataTableRules, IContactos)
+ TContactosDataTableRules = class(TDADataTableRules, IContactos)
private
f_NOTAS: IROStrings;
procedure NOTAS_OnChange(Sender: TObject);
@@ -978,7 +980,7 @@ type
{ IGruposCliente }
IGruposCliente = interface(IDAStronglyTypedDataTable)
- ['{1AE838BB-826E-4CA2-AAA1-D6049D08A77B}']
+ ['{88033175-AF9C-486C-8368-9CACE26FEC08}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -998,7 +1000,7 @@ type
end;
{ TGruposClienteDataTableRules }
- TGruposClienteDataTableRules = class(TIntfObjectDADataTableRules, IGruposCliente)
+ TGruposClienteDataTableRules = class(TDADataTableRules, IGruposCliente)
private
protected
{ Property getters and setters }
@@ -1025,7 +1027,7 @@ type
{ IDatosBancarios }
IDatosBancarios = interface(IDAStronglyTypedDataTable)
- ['{AEB463FE-AD2E-442F-BAAB-D8AD664AC39D}']
+ ['{2EA42D35-6139-4E19-B604-7D184E77D6BE}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -1087,7 +1089,7 @@ type
end;
{ TDatosBancariosDataTableRules }
- TDatosBancariosDataTableRules = class(TIntfObjectDADataTableRules, IDatosBancarios)
+ TDatosBancariosDataTableRules = class(TDADataTableRules, IDatosBancarios)
private
protected
{ Property getters and setters }
@@ -1156,7 +1158,7 @@ type
{ IClientes }
IClientes = interface(IDAStronglyTypedDataTable)
- ['{4F9EC316-7AC6-4C71-968A-5BAA61CAFCA4}']
+ ['{032412C7-385C-43AC-A778-915178DFA8C2}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -1329,6 +1331,10 @@ type
procedure SetTIPO_CLIENTEValue(const aValue: String);
function GetTIPO_CLIENTEIsNull: Boolean;
procedure SetTIPO_CLIENTEIsNull(const aValue: Boolean);
+ function GetSEPAValue: SmallInt;
+ procedure SetSEPAValue(const aValue: SmallInt);
+ function GetSEPAIsNull: Boolean;
+ procedure SetSEPAIsNull(const aValue: Boolean);
{ Properties }
@@ -1418,10 +1424,12 @@ type
property FELICITACIONIsNull: Boolean read GetFELICITACIONIsNull write SetFELICITACIONIsNull;
property TIPO_CLIENTE: String read GetTIPO_CLIENTEValue write SetTIPO_CLIENTEValue;
property TIPO_CLIENTEIsNull: Boolean read GetTIPO_CLIENTEIsNull write SetTIPO_CLIENTEIsNull;
+ property SEPA: SmallInt read GetSEPAValue write SetSEPAValue;
+ property SEPAIsNull: Boolean read GetSEPAIsNull write SetSEPAIsNull;
end;
{ TClientesDataTableRules }
- TClientesDataTableRules = class(TIntfObjectDADataTableRules, IClientes)
+ TClientesDataTableRules = class(TDADataTableRules, IClientes)
private
f_NOTAS: IROStrings;
procedure NOTAS_OnChange(Sender: TObject);
@@ -1598,6 +1606,10 @@ type
procedure SetTIPO_CLIENTEValue(const aValue: String); virtual;
function GetTIPO_CLIENTEIsNull: Boolean; virtual;
procedure SetTIPO_CLIENTEIsNull(const aValue: Boolean); virtual;
+ function GetSEPAValue: SmallInt; virtual;
+ procedure SetSEPAValue(const aValue: SmallInt); virtual;
+ function GetSEPAIsNull: Boolean; virtual;
+ procedure SetSEPAIsNull(const aValue: Boolean); virtual;
{ Properties }
property ID: Integer read GetIDValue write SetIDValue;
@@ -1686,6 +1698,8 @@ type
property FELICITACIONIsNull: Boolean read GetFELICITACIONIsNull write SetFELICITACIONIsNull;
property TIPO_CLIENTE: String read GetTIPO_CLIENTEValue write SetTIPO_CLIENTEValue;
property TIPO_CLIENTEIsNull: Boolean read GetTIPO_CLIENTEIsNull write SetTIPO_CLIENTEIsNull;
+ property SEPA: SmallInt read GetSEPAValue write SetSEPAValue;
+ property SEPAIsNull: Boolean read GetSEPAIsNull write SetSEPAIsNull;
public
constructor Create(aDataTable: TDADataTable); override;
@@ -1695,7 +1709,7 @@ type
{ IProveedores }
IProveedores = interface(IDAStronglyTypedDataTable)
- ['{62DCC209-287A-4380-8D4B-83913824D08F}']
+ ['{C0661B3D-7908-4A22-9C90-299A4A8214A7}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -1936,7 +1950,7 @@ type
end;
{ TProveedoresDataTableRules }
- TProveedoresDataTableRules = class(TIntfObjectDADataTableRules, IProveedores)
+ TProveedoresDataTableRules = class(TDADataTableRules, IProveedores)
private
f_NOTAS: IROStrings;
procedure NOTAS_OnChange(Sender: TObject);
@@ -2186,7 +2200,7 @@ type
{ IEmpleados }
IEmpleados = interface(IDAStronglyTypedDataTable)
- ['{A5050F92-4FC8-4B4F-BCFF-7BBA2CB4EDEE}']
+ ['{6C3AFA58-13CD-451A-8F67-583E41E567BB}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -2393,7 +2407,7 @@ type
end;
{ TEmpleadosDataTableRules }
- TEmpleadosDataTableRules = class(TIntfObjectDADataTableRules, IEmpleados)
+ TEmpleadosDataTableRules = class(TDADataTableRules, IEmpleados)
private
f_NOTAS: IROStrings;
f_FORMACION_BASE: IROStrings;
@@ -2617,7 +2631,7 @@ type
{ IDireccionesContacto }
IDireccionesContacto = interface(IDAStronglyTypedDataTable)
- ['{907598A0-83B2-4A54-A19D-82FF0656D8F8}']
+ ['{584BA328-3C52-4F73-9680-8E8879730929}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -2720,7 +2734,7 @@ type
end;
{ TDireccionesContactoDataTableRules }
- TDireccionesContactoDataTableRules = class(TIntfObjectDADataTableRules, IDireccionesContacto)
+ TDireccionesContactoDataTableRules = class(TDADataTableRules, IDireccionesContacto)
private
f_NOTAS: IROStrings;
procedure NOTAS_OnChange(Sender: TObject);
@@ -2832,7 +2846,7 @@ type
{ IClientesDescuentos }
IClientesDescuentos = interface(IDAStronglyTypedDataTable)
- ['{C7856FE7-0714-4949-B67D-882FFB8DC44E}']
+ ['{8FC11078-DE4A-4FBF-9741-934A72DC7963}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -2870,7 +2884,7 @@ type
end;
{ TClientesDescuentosDataTableRules }
- TClientesDescuentosDataTableRules = class(TIntfObjectDADataTableRules, IClientesDescuentos)
+ TClientesDescuentosDataTableRules = class(TDADataTableRules, IClientesDescuentos)
private
protected
{ Property getters and setters }
@@ -2915,7 +2929,7 @@ type
{ IGruposProveedor }
IGruposProveedor = interface(IDAStronglyTypedDataTable)
- ['{3B8825BB-FF71-47C9-A232-E0931855228A}']
+ ['{B8B9E5C6-E8D8-40FC-A541-1CA958F216A7}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -2935,7 +2949,7 @@ type
end;
{ TGruposProveedorDataTableRules }
- TGruposProveedorDataTableRules = class(TIntfObjectDADataTableRules, IGruposProveedor)
+ TGruposProveedorDataTableRules = class(TDADataTableRules, IGruposProveedor)
private
protected
{ Property getters and setters }
@@ -2962,7 +2976,7 @@ type
{ IGruposEmpleado }
IGruposEmpleado = interface(IDAStronglyTypedDataTable)
- ['{F6D330DB-5908-4E6C-9063-62CDA0A13EF7}']
+ ['{0DC9C834-D9D9-4AB1-A9C6-1EE5DA73A9B6}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -2982,7 +2996,7 @@ type
end;
{ TGruposEmpleadoDataTableRules }
- TGruposEmpleadoDataTableRules = class(TIntfObjectDADataTableRules, IGruposEmpleado)
+ TGruposEmpleadoDataTableRules = class(TDADataTableRules, IGruposEmpleado)
private
protected
{ Property getters and setters }
@@ -3009,7 +3023,7 @@ type
{ IContactos_Refresh }
IContactos_Refresh = interface(IDAStronglyTypedDataTable)
- ['{DA718CA5-E280-45E1-A143-299A9CCCE433}']
+ ['{E118F78A-B03F-4BC1-99E2-711BF84051E5}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -3142,7 +3156,7 @@ type
end;
{ TContactos_RefreshDataTableRules }
- TContactos_RefreshDataTableRules = class(TIntfObjectDADataTableRules, IContactos_Refresh)
+ TContactos_RefreshDataTableRules = class(TDADataTableRules, IContactos_Refresh)
private
f_NOTAS: IROStrings;
procedure NOTAS_OnChange(Sender: TObject);
@@ -3284,7 +3298,7 @@ type
{ IContratosEmpleados }
IContratosEmpleados = interface(IDAStronglyTypedDataTable)
- ['{137AAE38-80D8-469E-AD22-9627330E7B2F}']
+ ['{8E2C915C-BF70-4136-8B6A-1684095B7BC0}']
{ Property getters and setters }
function GetCONTRATOValue: String;
procedure SetCONTRATOValue(const aValue: String);
@@ -3298,7 +3312,7 @@ type
end;
{ TContratosEmpleadosDataTableRules }
- TContratosEmpleadosDataTableRules = class(TIntfObjectDADataTableRules, IContratosEmpleados)
+ TContratosEmpleadosDataTableRules = class(TDADataTableRules, IContratosEmpleados)
private
protected
{ Property getters and setters }
@@ -3319,7 +3333,7 @@ type
{ IDescripcionesProveedores }
IDescripcionesProveedores = interface(IDAStronglyTypedDataTable)
- ['{8172171A-10E0-409A-8E0B-D5D9365ABB23}']
+ ['{4717E1AA-49F0-4492-9086-311919DB6829}']
{ Property getters and setters }
function GetDESCRIPCION_PROVEEDORValue: String;
procedure SetDESCRIPCION_PROVEEDORValue(const aValue: String);
@@ -3333,7 +3347,7 @@ type
end;
{ TDescripcionesProveedoresDataTableRules }
- TDescripcionesProveedoresDataTableRules = class(TIntfObjectDADataTableRules, IDescripcionesProveedores)
+ TDescripcionesProveedoresDataTableRules = class(TDADataTableRules, IDescripcionesProveedores)
private
protected
{ Property getters and setters }
@@ -3354,7 +3368,7 @@ type
{ IPersonalContacto }
IPersonalContacto = interface(IDAStronglyTypedDataTable)
- ['{02E89BFD-3160-4164-BF61-221FF595CB3A}']
+ ['{FD93D978-23A4-4927-9BA6-B940CCC50F79}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -3422,7 +3436,7 @@ type
end;
{ TPersonalContactoDataTableRules }
- TPersonalContactoDataTableRules = class(TIntfObjectDADataTableRules, IPersonalContacto)
+ TPersonalContactoDataTableRules = class(TDADataTableRules, IPersonalContacto)
private
protected
{ Property getters and setters }
@@ -3497,7 +3511,7 @@ type
{ IAgentes_Comisiones }
IAgentes_Comisiones = interface(IDAStronglyTypedDataTable)
- ['{B2B154B4-F8DA-46FB-A06F-5000849254F6}']
+ ['{76DECC2C-AB59-47F6-988B-62080DA3ED75}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -3535,7 +3549,7 @@ type
end;
{ TAgentes_ComisionesDataTableRules }
- TAgentes_ComisionesDataTableRules = class(TIntfObjectDADataTableRules, IAgentes_Comisiones)
+ TAgentes_ComisionesDataTableRules = class(TDADataTableRules, IAgentes_Comisiones)
private
protected
{ Property getters and setters }
@@ -3580,7 +3594,7 @@ type
{ IListaAnosObjetivosAlb }
IListaAnosObjetivosAlb = interface(IDAStronglyTypedDataTable)
- ['{53124C57-F091-4204-AD95-FB2195C92120}']
+ ['{D05374C6-E73E-4782-974E-CAEEDC99B4E6}']
{ Property getters and setters }
function GetANOValue: SmallInt;
procedure SetANOValue(const aValue: SmallInt);
@@ -3594,7 +3608,7 @@ type
end;
{ TListaAnosObjetivosAlbDataTableRules }
- TListaAnosObjetivosAlbDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosObjetivosAlb)
+ TListaAnosObjetivosAlbDataTableRules = class(TDADataTableRules, IListaAnosObjetivosAlb)
private
protected
{ Property getters and setters }
@@ -3615,7 +3629,7 @@ type
{ IAgentes }
IAgentes = interface(IDAStronglyTypedDataTable)
- ['{535CB005-A65B-46CB-9265-8D882CF9BC29}']
+ ['{B84D0431-CF66-4A7E-A111-D528F18DF697}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -3778,7 +3792,7 @@ type
end;
{ TAgentesDataTableRules }
- TAgentesDataTableRules = class(TIntfObjectDADataTableRules, IAgentes)
+ TAgentesDataTableRules = class(TDADataTableRules, IAgentes)
private
f_NOTAS: IROStrings;
procedure NOTAS_OnChange(Sender: TObject);
@@ -3950,7 +3964,7 @@ type
{ IClientesDescuentosArticulos }
IClientesDescuentosArticulos = interface(IDAStronglyTypedDataTable)
- ['{BF0D2DCF-FE11-4DB2-8860-5234FD2EA0B4}']
+ ['{BFD9569E-95ED-4789-9A0E-B909E2EE092A}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -4012,7 +4026,7 @@ type
end;
{ TClientesDescuentosArticulosDataTableRules }
- TClientesDescuentosArticulosDataTableRules = class(TIntfObjectDADataTableRules, IClientesDescuentosArticulos)
+ TClientesDescuentosArticulosDataTableRules = class(TDADataTableRules, IClientesDescuentosArticulos)
private
protected
{ Property getters and setters }
@@ -4081,7 +4095,7 @@ type
{ IAgentes_Objetivos_albaranes }
IAgentes_Objetivos_albaranes = interface(IDAStronglyTypedDataTable)
- ['{A4F09DDA-8A26-4DA2-925F-EE02B2E6D290}']
+ ['{86C7C651-E96D-4EFD-91CD-C079A43A27A4}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -4131,7 +4145,7 @@ type
end;
{ TAgentes_Objetivos_albaranesDataTableRules }
- TAgentes_Objetivos_albaranesDataTableRules = class(TIntfObjectDADataTableRules, IAgentes_Objetivos_albaranes)
+ TAgentes_Objetivos_albaranesDataTableRules = class(TDADataTableRules, IAgentes_Objetivos_albaranes)
private
protected
{ Property getters and setters }
@@ -4188,7 +4202,7 @@ type
{ IAgentes_Objetivos_facturas }
IAgentes_Objetivos_facturas = interface(IDAStronglyTypedDataTable)
- ['{F0B134F6-AE87-4835-B443-997AD16988DB}']
+ ['{17DFBC0C-4204-4DC1-809F-C11A91125D98}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -4238,7 +4252,7 @@ type
end;
{ TAgentes_Objetivos_facturasDataTableRules }
- TAgentes_Objetivos_facturasDataTableRules = class(TIntfObjectDADataTableRules, IAgentes_Objetivos_facturas)
+ TAgentes_Objetivos_facturasDataTableRules = class(TDADataTableRules, IAgentes_Objetivos_facturas)
private
protected
{ Property getters and setters }
@@ -4295,7 +4309,7 @@ type
{ IListaAnosObjetivosFac }
IListaAnosObjetivosFac = interface(IDAStronglyTypedDataTable)
- ['{E2EB26D2-2409-4320-AF04-A0A4834E1D84}']
+ ['{AB67A2D7-D4FF-47E1-9EE1-493C4D3A2EAD}']
{ Property getters and setters }
function GetANOValue: SmallInt;
procedure SetANOValue(const aValue: SmallInt);
@@ -4309,7 +4323,7 @@ type
end;
{ TListaAnosObjetivosFacDataTableRules }
- TListaAnosObjetivosFacDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosObjetivosFac)
+ TListaAnosObjetivosFacDataTableRules = class(TDADataTableRules, IListaAnosObjetivosFac)
private
protected
{ Property getters and setters }
@@ -4330,7 +4344,7 @@ type
{ ITiposCliente }
ITiposCliente = interface(IDAStronglyTypedDataTable)
- ['{C44A4DE6-41B4-436D-9CA7-7165BD25595A}']
+ ['{517D7479-E97F-4BBE-BEA1-0980F1344B2C}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -4350,7 +4364,7 @@ type
end;
{ TTiposClienteDataTableRules }
- TTiposClienteDataTableRules = class(TIntfObjectDADataTableRules, ITiposCliente)
+ TTiposClienteDataTableRules = class(TDADataTableRules, ITiposCliente)
private
protected
{ Property getters and setters }
@@ -6057,6 +6071,27 @@ begin
DataTable.Fields[idx_ClientesTIPO_CLIENTE].AsVariant := Null;
end;
+function TClientesDataTableRules.GetSEPAValue: SmallInt;
+begin
+ result := DataTable.Fields[idx_ClientesSEPA].AsSmallInt;
+end;
+
+procedure TClientesDataTableRules.SetSEPAValue(const aValue: SmallInt);
+begin
+ DataTable.Fields[idx_ClientesSEPA].AsSmallInt := aValue;
+end;
+
+function TClientesDataTableRules.GetSEPAIsNull: boolean;
+begin
+ result := DataTable.Fields[idx_ClientesSEPA].IsNull;
+end;
+
+procedure TClientesDataTableRules.SetSEPAIsNull(const aValue: Boolean);
+begin
+ if aValue then
+ DataTable.Fields[idx_ClientesSEPA].AsVariant := Null;
+end;
+
{ TProveedoresDataTableRules }
constructor TProveedoresDataTableRules.Create(aDataTable: TDADataTable);
diff --git a/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas b/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas
index 70ad408..2eced4a 100644
--- a/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas
+++ b/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas
@@ -9,33 +9,33 @@ 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_ContactosDelta = '{0D14A3EF-8221-4271-BB6E-C28975FF9384}';
- RID_GruposClienteDelta = '{A90F7994-1ABF-4A46-8CD2-1397FA5FA695}';
- RID_DatosBancariosDelta = '{9137AF65-F02A-46E3-8E69-439A2138AEDA}';
- RID_ClientesDelta = '{AE74F38D-EC62-478C-9009-91DFA765C1BA}';
- RID_ProveedoresDelta = '{007E9A07-B1B7-449A-88D5-E230A1268906}';
- RID_EmpleadosDelta = '{E44640BF-985F-493D-9681-A58B1E9C5048}';
- RID_DireccionesContactoDelta = '{CD29AE32-0F09-43B0-BD60-0BABB4F28F91}';
- RID_ClientesDescuentosDelta = '{95022EA1-5BE2-4708-BA5B-77536F57D331}';
- RID_GruposProveedorDelta = '{0ABA7E39-36B3-44E2-B3E1-8BFF6D38B7CA}';
- RID_GruposEmpleadoDelta = '{6BD3D176-0D39-439D-8782-8F79DC7C2C90}';
- RID_Contactos_RefreshDelta = '{2FA063C0-9DCA-4BF6-A9A7-FD4D319ECF88}';
- RID_ContratosEmpleadosDelta = '{D0F4C06F-1363-49E5-8094-158E6E33781A}';
- RID_DescripcionesProveedoresDelta = '{30864B1C-279D-4203-95F3-38A1D42044E0}';
- RID_PersonalContactoDelta = '{E60BCF43-0FAA-4EF1-BD68-0BC8328AE3A9}';
- RID_Agentes_ComisionesDelta = '{A4522C74-DA90-4B25-9757-FC901C4297C0}';
- RID_ListaAnosObjetivosAlbDelta = '{2D43A4A9-A60F-4847-90D8-506A9E438E8F}';
- RID_AgentesDelta = '{B0FC98F6-07E3-4186-ACF7-4525A8B771C7}';
- RID_ClientesDescuentosArticulosDelta = '{FC2F2307-6B92-4C15-BDC7-5A140CBF00F0}';
- RID_Agentes_Objetivos_albaranesDelta = '{BF428235-7C8E-4ABB-B20A-4CAD58BD98EC}';
- RID_Agentes_Objetivos_facturasDelta = '{BC496438-46AC-4530-83E8-558F3ACDFB57}';
- RID_ListaAnosObjetivosFacDelta = '{292DE1F7-DE87-44ED-AB50-050BC49C8CB1}';
- RID_TiposClienteDelta = '{FA885475-ECC3-45C8-BF6B-DBE4E19F6C00}';
+ RID_ContactosDelta = '{79676E3A-28FD-48E7-A1FF-E754E103F801}';
+ RID_GruposClienteDelta = '{53603EC3-5239-471B-9478-3E20BC31F3D6}';
+ RID_DatosBancariosDelta = '{1591F7B3-141B-49A9-B540-A8FEBED5226B}';
+ RID_ClientesDelta = '{05CD6380-6399-4281-8E9F-6732C67A63DE}';
+ RID_ProveedoresDelta = '{8E9CE42F-5FE9-4E9F-AE52-19B803809EA5}';
+ RID_EmpleadosDelta = '{D5D65099-1A31-4207-84AC-F4DA6A43592A}';
+ RID_DireccionesContactoDelta = '{0ED25D53-DE46-4E8A-9308-93B211FBF15B}';
+ RID_ClientesDescuentosDelta = '{C97901CD-8DD8-49FB-8BFB-7074517E322D}';
+ RID_GruposProveedorDelta = '{9F6338E6-59A2-40C8-BC9D-23C178FC2160}';
+ RID_GruposEmpleadoDelta = '{78EEEB9B-70B4-4D54-8B5B-0C7237FCAB40}';
+ RID_Contactos_RefreshDelta = '{7AC13450-107B-4B2D-8284-9DA3F9723729}';
+ RID_ContratosEmpleadosDelta = '{55C48082-E644-4561-88C8-A7825F0FA31F}';
+ RID_DescripcionesProveedoresDelta = '{80E685C5-AB20-4EBE-B7D4-500C29E4312C}';
+ RID_PersonalContactoDelta = '{02EF5E3B-5A4E-4F52-B801-8999B48F9CBE}';
+ RID_Agentes_ComisionesDelta = '{6FE9C733-D4D6-4375-ADD0-A78267946BED}';
+ RID_ListaAnosObjetivosAlbDelta = '{10F3BE6F-702C-4D7D-A9DD-D07185F39A7F}';
+ RID_AgentesDelta = '{BEB2E149-7144-4704-B83C-1F534413A927}';
+ RID_ClientesDescuentosArticulosDelta = '{49A3CDFA-BD96-4B3E-BE40-B3E2E17E9958}';
+ RID_Agentes_Objetivos_albaranesDelta = '{59BCD74F-1F68-4931-87CD-D630E334C36A}';
+ RID_Agentes_Objetivos_facturasDelta = '{6ABCD9E8-ACCD-4EE7-836E-C3D09BB71907}';
+ RID_ListaAnosObjetivosFacDelta = '{DA75406A-C26B-473D-91D8-6864A41AF5EE}';
+ RID_TiposClienteDelta = '{1FDEE269-2D12-4DDA-9AA9-D9BF6461CA29}';
type
{ IContactosDelta }
IContactosDelta = interface(IContactos)
- ['{0D14A3EF-8221-4271-BB6E-C28975FF9384}']
+ ['{79676E3A-28FD-48E7-A1FF-E754E103F801}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CATEGORIAValue : Integer;
@@ -334,7 +334,7 @@ type
{ IGruposClienteDelta }
IGruposClienteDelta = interface(IGruposCliente)
- ['{A90F7994-1ABF-4A46-8CD2-1397FA5FA695}']
+ ['{53603EC3-5239-471B-9478-3E20BC31F3D6}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String;
@@ -380,7 +380,7 @@ type
{ IDatosBancariosDelta }
IDatosBancariosDelta = interface(IDatosBancarios)
- ['{9137AF65-F02A-46E3-8E69-439A2138AEDA}']
+ ['{1591F7B3-141B-49A9-B540-A8FEBED5226B}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CONTACTOValue : Integer;
@@ -510,7 +510,7 @@ type
{ IClientesDelta }
IClientesDelta = interface(IClientes)
- ['{AE74F38D-EC62-478C-9009-91DFA765C1BA}']
+ ['{05CD6380-6399-4281-8E9F-6732C67A63DE}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CATEGORIAValue : Integer;
@@ -555,6 +555,7 @@ type
function GetOldDESCUENTOValue : Float;
function GetOldFELICITACIONValue : SmallInt;
function GetOldTIPO_CLIENTEValue : String;
+ function GetOldSEPAValue : SmallInt;
{ Properties }
property OldID : Integer read GetOldIDValue;
@@ -600,6 +601,7 @@ type
property OldDESCUENTO : Float read GetOldDESCUENTOValue;
property OldFELICITACION : SmallInt read GetOldFELICITACIONValue;
property OldTIPO_CLIENTE : String read GetOldTIPO_CLIENTEValue;
+ property OldSEPA : SmallInt read GetOldSEPAValue;
end;
{ TClientesBusinessProcessorRules }
@@ -866,6 +868,12 @@ type
function GetOldTIPO_CLIENTEIsNull: Boolean; virtual;
procedure SetTIPO_CLIENTEValue(const aValue: String); virtual;
procedure SetTIPO_CLIENTEIsNull(const aValue: Boolean); virtual;
+ function GetSEPAValue: SmallInt; virtual;
+ function GetSEPAIsNull: Boolean; virtual;
+ function GetOldSEPAValue: SmallInt; virtual;
+ function GetOldSEPAIsNull: Boolean; virtual;
+ procedure SetSEPAValue(const aValue: SmallInt); virtual;
+ procedure SetSEPAIsNull(const aValue: Boolean); virtual;
{ Properties }
property ID : Integer read GetIDValue write SetIDValue;
@@ -1040,6 +1048,10 @@ type
property TIPO_CLIENTEIsNull : Boolean read GetTIPO_CLIENTEIsNull write SetTIPO_CLIENTEIsNull;
property OldTIPO_CLIENTE : String read GetOldTIPO_CLIENTEValue;
property OldTIPO_CLIENTEIsNull : Boolean read GetOldTIPO_CLIENTEIsNull;
+ property SEPA : SmallInt read GetSEPAValue write SetSEPAValue;
+ property SEPAIsNull : Boolean read GetSEPAIsNull write SetSEPAIsNull;
+ property OldSEPA : SmallInt read GetOldSEPAValue;
+ property OldSEPAIsNull : Boolean read GetOldSEPAIsNull;
public
constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -1049,7 +1061,7 @@ type
{ IProveedoresDelta }
IProveedoresDelta = interface(IProveedores)
- ['{007E9A07-B1B7-449A-88D5-E230A1268906}']
+ ['{8E9CE42F-5FE9-4E9F-AE52-19B803809EA5}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CATEGORIAValue : Integer;
@@ -1540,7 +1552,7 @@ type
{ IEmpleadosDelta }
IEmpleadosDelta = interface(IEmpleados)
- ['{E44640BF-985F-493D-9681-A58B1E9C5048}']
+ ['{D5D65099-1A31-4207-84AC-F4DA6A43592A}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CATEGORIAValue : Integer;
@@ -1975,7 +1987,7 @@ type
{ IDireccionesContactoDelta }
IDireccionesContactoDelta = interface(IDireccionesContacto)
- ['{CD29AE32-0F09-43B0-BD60-0BABB4F28F91}']
+ ['{0ED25D53-DE46-4E8A-9308-93B211FBF15B}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CONTACTOValue : Integer;
@@ -2190,7 +2202,7 @@ type
{ IClientesDescuentosDelta }
IClientesDescuentosDelta = interface(IClientesDescuentos)
- ['{95022EA1-5BE2-4708-BA5B-77536F57D331}']
+ ['{C97901CD-8DD8-49FB-8BFB-7074517E322D}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CLIENTEValue : Integer;
@@ -2272,7 +2284,7 @@ type
{ IGruposProveedorDelta }
IGruposProveedorDelta = interface(IGruposProveedor)
- ['{0ABA7E39-36B3-44E2-B3E1-8BFF6D38B7CA}']
+ ['{9F6338E6-59A2-40C8-BC9D-23C178FC2160}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String;
@@ -2318,7 +2330,7 @@ type
{ IGruposEmpleadoDelta }
IGruposEmpleadoDelta = interface(IGruposEmpleado)
- ['{6BD3D176-0D39-439D-8782-8F79DC7C2C90}']
+ ['{78EEEB9B-70B4-4D54-8B5B-0C7237FCAB40}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String;
@@ -2364,7 +2376,7 @@ type
{ IContactos_RefreshDelta }
IContactos_RefreshDelta = interface(IContactos_Refresh)
- ['{2FA063C0-9DCA-4BF6-A9A7-FD4D319ECF88}']
+ ['{7AC13450-107B-4B2D-8284-9DA3F9723729}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldNIF_CIFValue : String;
@@ -2639,7 +2651,7 @@ type
{ IContratosEmpleadosDelta }
IContratosEmpleadosDelta = interface(IContratosEmpleados)
- ['{D0F4C06F-1363-49E5-8094-158E6E33781A}']
+ ['{55C48082-E644-4561-88C8-A7825F0FA31F}']
{ Property getters and setters }
function GetOldCONTRATOValue : String;
@@ -2673,7 +2685,7 @@ type
{ IDescripcionesProveedoresDelta }
IDescripcionesProveedoresDelta = interface(IDescripcionesProveedores)
- ['{30864B1C-279D-4203-95F3-38A1D42044E0}']
+ ['{80E685C5-AB20-4EBE-B7D4-500C29E4312C}']
{ Property getters and setters }
function GetOldDESCRIPCION_PROVEEDORValue : String;
@@ -2707,7 +2719,7 @@ type
{ IPersonalContactoDelta }
IPersonalContactoDelta = interface(IPersonalContacto)
- ['{E60BCF43-0FAA-4EF1-BD68-0BC8328AE3A9}']
+ ['{02EF5E3B-5A4E-4F52-B801-8999B48F9CBE}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CONTACTOValue : Integer;
@@ -2849,7 +2861,7 @@ type
{ IAgentes_ComisionesDelta }
IAgentes_ComisionesDelta = interface(IAgentes_Comisiones)
- ['{A4522C74-DA90-4B25-9757-FC901C4297C0}']
+ ['{6FE9C733-D4D6-4375-ADD0-A78267946BED}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_AGENTEValue : Integer;
@@ -2931,7 +2943,7 @@ type
{ IListaAnosObjetivosAlbDelta }
IListaAnosObjetivosAlbDelta = interface(IListaAnosObjetivosAlb)
- ['{2D43A4A9-A60F-4847-90D8-506A9E438E8F}']
+ ['{10F3BE6F-702C-4D7D-A9DD-D07185F39A7F}']
{ Property getters and setters }
function GetOldANOValue : SmallInt;
@@ -2965,7 +2977,7 @@ type
{ IAgentesDelta }
IAgentesDelta = interface(IAgentes)
- ['{B0FC98F6-07E3-4186-ACF7-4525A8B771C7}']
+ ['{BEB2E149-7144-4704-B83C-1F534413A927}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CATEGORIAValue : Integer;
@@ -3300,7 +3312,7 @@ type
{ IClientesDescuentosArticulosDelta }
IClientesDescuentosArticulosDelta = interface(IClientesDescuentosArticulos)
- ['{FC2F2307-6B92-4C15-BDC7-5A140CBF00F0}']
+ ['{49A3CDFA-BD96-4B3E-BE40-B3E2E17E9958}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CLIENTEValue : Integer;
@@ -3430,7 +3442,7 @@ type
{ IAgentes_Objetivos_albaranesDelta }
IAgentes_Objetivos_albaranesDelta = interface(IAgentes_Objetivos_albaranes)
- ['{BF428235-7C8E-4ABB-B20A-4CAD58BD98EC}']
+ ['{59BCD74F-1F68-4931-87CD-D630E334C36A}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_AGENTEValue : Integer;
@@ -3536,7 +3548,7 @@ type
{ IAgentes_Objetivos_facturasDelta }
IAgentes_Objetivos_facturasDelta = interface(IAgentes_Objetivos_facturas)
- ['{BC496438-46AC-4530-83E8-558F3ACDFB57}']
+ ['{6ABCD9E8-ACCD-4EE7-836E-C3D09BB71907}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_AGENTEValue : Integer;
@@ -3642,7 +3654,7 @@ type
{ IListaAnosObjetivosFacDelta }
IListaAnosObjetivosFacDelta = interface(IListaAnosObjetivosFac)
- ['{292DE1F7-DE87-44ED-AB50-050BC49C8CB1}']
+ ['{DA75406A-C26B-473D-91D8-6864A41AF5EE}']
{ Property getters and setters }
function GetOldANOValue : SmallInt;
@@ -3676,7 +3688,7 @@ type
{ ITiposClienteDelta }
ITiposClienteDelta = interface(ITiposCliente)
- ['{FA885475-ECC3-45C8-BF6B-DBE4E19F6C00}']
+ ['{1FDEE269-2D12-4DDA-9AA9-D9BF6461CA29}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String;
@@ -6175,6 +6187,37 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesTIPO_CLIENTE] := Null;
end;
+function TClientesBusinessProcessorRules.GetSEPAValue: SmallInt;
+begin
+ result := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesSEPA];
+end;
+
+function TClientesBusinessProcessorRules.GetSEPAIsNull: Boolean;
+begin
+ result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesSEPA]);
+end;
+
+function TClientesBusinessProcessorRules.GetOldSEPAValue: SmallInt;
+begin
+ result := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesSEPA];
+end;
+
+function TClientesBusinessProcessorRules.GetOldSEPAIsNull: Boolean;
+begin
+ result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesSEPA]);
+end;
+
+procedure TClientesBusinessProcessorRules.SetSEPAValue(const aValue: SmallInt);
+begin
+ BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesSEPA] := aValue;
+end;
+
+procedure TClientesBusinessProcessorRules.SetSEPAIsNull(const aValue: Boolean);
+begin
+ if aValue then
+ BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesSEPA] := Null;
+end;
+
{ TProveedoresBusinessProcessorRules }
constructor TProveedoresBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
diff --git a/Source/Modulos/Contactos/Model/uBizClientesServer.pas b/Source/Modulos/Contactos/Model/uBizClientesServer.pas
index a8e2cfd..1b6cca7 100644
--- a/Source/Modulos/Contactos/Model/uBizClientesServer.pas
+++ b/Source/Modulos/Contactos/Model/uBizClientesServer.pas
@@ -100,6 +100,8 @@ begin
ParamByName('VENCIMIENTO_FACTURAS_3').Value := aChange.NewValueByName[fld_ClientesVENCIMIENTO_FACTURAS_3];
ParamByName('FELICITACION').Value := aChange.NewValueByName[fld_ClientesFELICITACION];
ParamByName('EMAIL_ADMINISTRACION').Value := aChange.NewValueByName[fld_ClientesEMAIL_ADMINISTRACION];
+ ParamByName('TIPO_CLIENTE').Value := aChange.NewValueByName[fld_ClientesTIPO_CLIENTE];
+ ParamByName('SEPA').Value := aChange.NewValueByName[fld_ClientesSEPA];
Execute;
end;
finally
@@ -144,6 +146,8 @@ begin
ParamByName('VENCIMIENTO_FACTURAS_3').Value := aChange.NewValueByName[fld_ClientesVENCIMIENTO_FACTURAS_3];
ParamByName('FELICITACION').Value := aChange.NewValueByName[fld_ClientesFELICITACION];
ParamByName('EMAIL_ADMINISTRACION').Value := aChange.NewValueByName[fld_ClientesEMAIL_ADMINISTRACION];
+ ParamByName('TIPO_CLIENTE').Value := aChange.NewValueByName[fld_ClientesTIPO_CLIENTE];
+ ParamByName('SEPA').Value := aChange.NewValueByName[fld_ClientesSEPA];
Execute;
end;
finally
diff --git a/Source/Modulos/Contactos/Model/uBizContactos.pas b/Source/Modulos/Contactos/Model/uBizContactos.pas
index 0e45fb2..69ca3d3 100644
--- a/Source/Modulos/Contactos/Model/uBizContactos.pas
+++ b/Source/Modulos/Contactos/Model/uBizContactos.pas
@@ -74,6 +74,9 @@ type
function GetBLOQUEADOValue: Integer;
procedure SetBLOQUEADOValue(const aValue: Integer);
+ function GetSEPAValue: Integer;
+ procedure SetSEPAValue(const aValue: Integer);
+
function GetMOTIVO_BLOQUEOValue: String;
procedure SetMOTIVO_BLOQUEOValue(const aValue: String);
@@ -116,6 +119,7 @@ type
property VENCIMIENTO_FACTURAS_2: Smallint read GetVENCIMIENTO_FACTURAS_2Value write SetVENCIMIENTO_FACTURAS_2Value;
property VENCIMIENTO_FACTURAS_3: Smallint read GetVENCIMIENTO_FACTURAS_3Value write SetVENCIMIENTO_FACTURAS_3Value;
property BLOQUEADO: Integer read GetBLOQUEADOValue write SetBLOQUEADOValue;
+ property SEPA: Integer read GetSEPAValue write SetSEPAValue;
property MOTIVO_BLOQUEO: String read GetMOTIVO_BLOQUEOValue write SetMOTIVO_BLOQUEOValue;
property RECARGO_EQUIVALENCIA: Integer read GetRECARGO_EQUIVALENCIAValue write SetRECARGO_EQUIVALENCIAValue;
property REGIMEN_IVA: String read GetREGIMEN_IVAValue write SetREGIMEN_IVAValue;
@@ -329,6 +333,9 @@ type
function GetBLOQUEADOValue: Integer;
procedure SetBLOQUEADOValue(const aValue: Integer);
+ function GetSEPAValue: Integer;
+ procedure SetSEPAValue(const aValue: Integer);
+
function GetMOTIVO_BLOQUEOValue: String;
procedure SetMOTIVO_BLOQUEOValue(const aValue: String);
@@ -375,6 +382,7 @@ type
property VENCIMIENTO_FACTURAS_2: Smallint read GetVENCIMIENTO_FACTURAS_2Value write SetVENCIMIENTO_FACTURAS_2Value;
property VENCIMIENTO_FACTURAS_3: Smallint read GetVENCIMIENTO_FACTURAS_3Value write SetVENCIMIENTO_FACTURAS_3Value;
property BLOQUEADO: Integer read GetBLOQUEADOValue write SetBLOQUEADOValue;
+ property SEPA: Integer read GetSEPAValue write SetSEPAValue;
property MOTIVO_BLOQUEO: String read GetMOTIVO_BLOQUEOValue write SetMOTIVO_BLOQUEOValue;
property RECARGO_EQUIVALENCIA: Integer read GetRECARGO_EQUIVALENCIAValue write SetRECARGO_EQUIVALENCIAValue;
property REGIMEN_IVA: String read GetREGIMEN_IVAValue write SetREGIMEN_IVAValue;
@@ -772,6 +780,11 @@ begin
Result := DataTable.Fields[idx_ClientesREGIMEN_IVA].AsString;
end;
+function TBizCliente.GetSEPAValue: Integer;
+begin
+ result := DataTable.Fields[idx_ClientesSEPA].AsInteger;
+end;
+
function TBizCliente.GetTIENDA_WEBValue: Integer;
begin
result := DataTable.Fields[idx_ClientesTIENDA_WEB].AsInteger;
@@ -807,6 +820,11 @@ begin
DataTable.Fields[idx_ClientesREGIMEN_IVA].AsString := aValue;
end;
+procedure TBizCliente.SetSEPAValue(const aValue: Integer);
+begin
+ DataTable.Fields[idx_ClientesSEPA].AsInteger := aValue;
+end;
+
procedure TBizCliente.SetTIENDA_WEBValue(const aValue: Integer);
begin
DataTable.Fields[idx_ClientesTIENDA_WEB].AsInteger := aValue;
diff --git a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm
index 25d2898..ac6c441 100644
--- a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm
+++ b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm
@@ -563,6 +563,10 @@ object srvContactos: TsrvContactos
item
DatasetField = 'TIPO_CLIENTE'
TableField = 'TIPO_CLIENTE'
+ end
+ item
+ DatasetField = 'SEPA'
+ TableField = 'SEPA'
end>
end>
Name = 'Clientes'
@@ -799,6 +803,10 @@ object srvContactos: TsrvContactos
Name = 'TIPO_CLIENTE'
DataType = datString
Size = 255
+ end
+ item
+ Name = 'SEPA'
+ DataType = datSmallInt
end>
end
item
@@ -3658,6 +3666,11 @@ object srvContactos: TsrvContactos
DataType = datString
Size = 255
Value = ''
+ end
+ item
+ Name = 'SEPA'
+ DataType = datSmallInt
+ Value = ''
end>
Statements = <
item
@@ -3669,13 +3682,13 @@ object srvContactos: TsrvContactos
'UEO, REGIMEN_IVA, ID_TIPO_IVA, ID_FORMA_PAGO,'#10' TIENDA_WEB, C' +
'ODIGO_ASIGNADO, DESCUENTO, RAPEL, ID_AGENTE, EMAIL_ADMINISTRACIO' +
'N,'#10' VENCIMIENTO_FACTURAS_1, VENCIMIENTO_FACTURAS_2, VENCIMIE' +
- 'NTO_FACTURAS_3,'#10' FELICITACION, TIPO_CLIENTE)'#10' VALUES'#10' (:' +
- 'ID_CLIENTE, :GRUPO_CLIENTE, :RECARGO_EQUIVALENCIA, :NOMBRE_COMER' +
- 'CIAL,'#10' :BLOQUEADO, :MOTIVO_BLOQUEO, :REGIMEN_IVA, :ID_TIPO_I' +
- 'VA, :ID_FORMA_PAGO,'#10' :TIENDA_WEB, :CODIGO_ASIGNADO, :DESCUEN' +
- 'TO, :RAPEL, :ID_AGENTE, :EMAIL_ADMINISTRACION,'#10' :VENCIMIENTO' +
- '_FACTURAS_1, :VENCIMIENTO_FACTURAS_2, :VENCIMIENTO_FACTURAS_3,'#10' ' +
- ' :FELICITACION, :TIPO_CLIENTE)'#10' '#10#10
+ 'NTO_FACTURAS_3,'#10' FELICITACION, TIPO_CLIENTE, SEPA)'#10' VALUES'#10 +
+ ' (:ID_CLIENTE, :GRUPO_CLIENTE, :RECARGO_EQUIVALENCIA, :NOMBRE' +
+ '_COMERCIAL,'#10' :BLOQUEADO, :MOTIVO_BLOQUEO, :REGIMEN_IVA, :ID_' +
+ 'TIPO_IVA, :ID_FORMA_PAGO,'#10' :TIENDA_WEB, :CODIGO_ASIGNADO, :D' +
+ 'ESCUENTO, :RAPEL, :ID_AGENTE, :EMAIL_ADMINISTRACION,'#10' :VENCI' +
+ 'MIENTO_FACTURAS_1, :VENCIMIENTO_FACTURAS_2, :VENCIMIENTO_FACTURA' +
+ 'S_3,'#10' :FELICITACION, :TIPO_CLIENTE, :SEPA)'#10' '#10#10
StatementType = stSQL
ColumnMappings = <>
end>
@@ -3810,6 +3823,11 @@ object srvContactos: TsrvContactos
Size = 255
Value = ''
end
+ item
+ Name = 'SEPA'
+ DataType = datSmallInt
+ Value = ''
+ end
item
Name = 'OLD_ID_CLIENTE'
Value = ''
@@ -3831,7 +3849,8 @@ object srvContactos: TsrvContactos
' = :VENCIMIENTO_FACTURAS_1,'#10' VENCIMIENTO_FACTURAS_2 = :VENCIM' +
'IENTO_FACTURAS_2,'#10' VENCIMIENTO_FACTURAS_3 = :VENCIMIENTO_FACT' +
'URAS_3,'#10' FELICITACION = :FELICITACION,'#10' TIPO_CLIENTE = :TI' +
- 'PO_CLIENTE'#10' WHERE'#10' (ID_CLIENTE = :OLD_ID_CLIENTE)'#10
+ 'PO_CLIENTE,'#10' SEPA = :SEPA'#10' WHERE'#10' (ID_CLIENTE = :OLD_ID_C' +
+ 'LIENTE)'#10
StatementType = stSQL
ColumnMappings = <>
end>
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.identcache b/Source/Modulos/Contactos/Views/Contactos_view.identcache
index 790afa9..89006ea 100644
Binary files a/Source/Modulos/Contactos/Views/Contactos_view.identcache and b/Source/Modulos/Contactos/Views/Contactos_view.identcache differ
diff --git a/Source/Modulos/Contactos/Views/uViewCliente.dfm b/Source/Modulos/Contactos/Views/uViewCliente.dfm
index d207dc9..c3391f4 100644
--- a/Source/Modulos/Contactos/Views/uViewCliente.dfm
+++ b/Source/Modulos/Contactos/Views/uViewCliente.dfm
@@ -23,7 +23,7 @@ inherited frViewCliente: TfrViewCliente
ExplicitLeft = 913
end
object Label1: TLabel [3]
- Left = 533
+ Left = 552
Top = 440
Width = 269
Height = 39
@@ -34,7 +34,7 @@ inherited frViewCliente: TfrViewCliente
WordWrap = True
end
object Label2: TLabel [4]
- Left = 533
+ Left = 552
Top = 337
Width = 271
Height = 39
@@ -77,7 +77,7 @@ inherited frViewCliente: TfrViewCliente
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 10
+ TabOrder = 11
ExplicitLeft = 132
ExplicitTop = 404
ExplicitWidth = 260
@@ -90,7 +90,7 @@ inherited frViewCliente: TfrViewCliente
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 11
+ TabOrder = 12
ExplicitLeft = 132
ExplicitTop = 431
ExplicitWidth = 159
@@ -137,7 +137,7 @@ inherited frViewCliente: TfrViewCliente
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 8
+ TabOrder = 9
Width = 370
end
object cbGrupoCliente: TcxDBComboBox [10]
@@ -180,7 +180,7 @@ inherited frViewCliente: TfrViewCliente
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 9
+ TabOrder = 10
Width = 260
end
object eCodigoAsignado: TcxDBTextEdit [12]
@@ -210,25 +210,25 @@ inherited frViewCliente: TfrViewCliente
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 13
+ TabOrder = 14
ExplicitLeft = 132
ExplicitTop = 458
ExplicitWidth = 260
Width = 260
end
inherited eCodigoPostal: TcxDBTextEdit
- Left = 438
+ Left = 457
Top = 431
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 12
- ExplicitLeft = 438
+ TabOrder = 13
+ ExplicitLeft = 457
ExplicitTop = 431
end
object cbFelicitacion: TcxDBCheckBox [15]
- Left = 533
+ Left = 552
Top = 280
Caption = 'Mandar felicitaci'#243'n navide'#241'a a este cliente'
DataBinding.DataField = 'FELICITACION'
@@ -248,11 +248,11 @@ inherited frViewCliente: TfrViewCliente
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 22
+ TabOrder = 23
Width = 370
end
object cxDBCheckBox1: TcxDBCheckBox [16]
- Left = 533
+ Left = 552
Top = 485
Caption = 'Permitir el acceso de este cliente a la tienda web'
DataBinding.DataField = 'TIENDA_WEB'
@@ -273,7 +273,7 @@ inherited frViewCliente: TfrViewCliente
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 24
+ TabOrder = 25
Width = 274
end
object cbRapel: TcxDBCheckBox [17]
@@ -302,7 +302,7 @@ inherited frViewCliente: TfrViewCliente
Width = 308
end
object eMailAdministracion: TcxDBHyperLinkEdit [18]
- Left = 645
+ Left = 664
Top = 382
DataBinding.DataField = 'EMAIL_ADMINISTRACION'
DataBinding.DataSource = dsContacto
@@ -320,7 +320,7 @@ inherited frViewCliente: TfrViewCliente
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 23
+ TabOrder = 24
Width = 133
end
inherited eObservaciones: TcxDBMemo
@@ -329,7 +329,7 @@ inherited frViewCliente: TfrViewCliente
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 25
+ TabOrder = 26
ExplicitTop = 542
ExplicitWidth = 733
ExplicitHeight = 69
@@ -337,46 +337,46 @@ inherited frViewCliente: TfrViewCliente
Width = 733
end
inherited eTlfParticular: TcxDBTextEdit
- Left = 645
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 16
- ExplicitLeft = 645
- ExplicitWidth = 238
- Width = 238
- end
- inherited eTlfTrabajo: TcxDBTextEdit
- Left = 645
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 15
- ExplicitLeft = 645
- ExplicitWidth = 238
- Width = 238
- end
- inherited eTlfMovil: TcxDBTextEdit
- Left = 645
+ Left = 664
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 17
- ExplicitLeft = 645
+ ExplicitLeft = 664
ExplicitWidth = 238
Width = 238
end
- inherited eFax: TcxDBTextEdit
- Left = 645
+ inherited eTlfTrabajo: TcxDBTextEdit
+ Left = 664
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ TabOrder = 16
+ ExplicitLeft = 664
+ ExplicitWidth = 238
+ Width = 238
+ end
+ inherited eTlfMovil: TcxDBTextEdit
+ Left = 664
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 18
- ExplicitLeft = 645
+ ExplicitLeft = 664
+ ExplicitWidth = 238
+ Width = 238
+ end
+ inherited eFax: TcxDBTextEdit
+ Left = 664
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ TabOrder = 19
+ ExplicitLeft = 664
ExplicitWidth = 238
Width = 238
end
@@ -391,74 +391,41 @@ inherited frViewCliente: TfrViewCliente
Width = 260
end
inherited eNIFCIF: TcxDBTextEdit
- Left = 361
+ Left = 373
Properties.OnValidate = eNIFCIFPropertiesValidate
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 361
+ ExplicitLeft = 373
ExplicitWidth = 91
Width = 91
end
inherited eMailTrabajo: TcxDBHyperLinkEdit
- Left = 645
- Properties.Prefix = 'mailto:'
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 19
- ExplicitLeft = 645
- ExplicitWidth = 209
- Width = 209
- end
- inherited eMailParticular: TcxDBHyperLinkEdit
- Left = 645
+ Left = 664
Properties.Prefix = 'mailto:'
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 20
- ExplicitLeft = 645
+ ExplicitLeft = 664
ExplicitWidth = 209
Width = 209
end
- inherited ePaginaWeb: TcxDBHyperLinkEdit
- Left = 645
+ inherited eMailParticular: TcxDBHyperLinkEdit
+ Left = 664
+ Properties.Prefix = 'mailto:'
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 21
- ExplicitLeft = 645
+ ExplicitLeft = 664
ExplicitWidth = 209
Width = 209
end
- inherited eReferencia: TcxDBTextEdit
- Left = 132
- Enabled = True
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 132
- end
- inherited ePersonaContacto: TcxDBTextEdit
- Left = 132
- Top = 485
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 14
- ExplicitLeft = 132
- ExplicitTop = 485
- ExplicitWidth = 260
- Width = 260
- end
- object cbTipoCliente: TcxDBComboBox [31]
+ object cbTipoCliente: TcxDBComboBox [28]
Left = 132
Top = 163
DataBinding.DataField = 'TIPO_CLIENTE'
@@ -482,6 +449,64 @@ inherited frViewCliente: TfrViewCliente
TabOrder = 6
Width = 332
end
+ inherited ePaginaWeb: TcxDBHyperLinkEdit
+ Left = 664
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ TabOrder = 22
+ ExplicitLeft = 664
+ ExplicitWidth = 209
+ Width = 209
+ end
+ inherited eReferencia: TcxDBTextEdit
+ Left = 132
+ Enabled = True
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 132
+ end
+ inherited ePersonaContacto: TcxDBTextEdit
+ Left = 132
+ Top = 485
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ TabOrder = 15
+ ExplicitLeft = 132
+ ExplicitTop = 485
+ ExplicitWidth = 260
+ Width = 260
+ end
+ object cbSEPA: TcxDBCheckBox [32]
+ Left = 22
+ Top = 217
+ Action = actBloqueoCliente
+ Caption = 'Este cliente ha aceptado SEPA'
+ DataBinding.DataField = 'SEPA'
+ DataBinding.DataSource = dsContacto
+ Properties.ImmediatePost = True
+ Properties.NullStyle = nssUnchecked
+ Properties.ValueChecked = 1
+ Properties.ValueUnchecked = 0
+ Style.BorderColor = clWindowFrame
+ Style.BorderStyle = ebs3D
+ Style.HotTrack = False
+ Style.LookAndFeel.Kind = lfStandard
+ Style.LookAndFeel.NativeStyle = True
+ StyleDisabled.LookAndFeel.Kind = lfStandard
+ StyleDisabled.LookAndFeel.NativeStyle = True
+ StyleFocused.LookAndFeel.Kind = lfStandard
+ StyleFocused.LookAndFeel.NativeStyle = True
+ StyleHot.LookAndFeel.Kind = lfStandard
+ StyleHot.LookAndFeel.NativeStyle = True
+ TabOrder = 8
+ Width = 481
+ end
inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
AutoAligns = [aaHorizontal]
AlignVert = avBottom
@@ -517,6 +542,11 @@ inherited frViewCliente: TfrViewCliente
Control = cbRapel
ControlOptions.ShowBorder = False
end
+ object dxLayoutControlContactoItem31: TdxLayoutItem
+ ShowCaption = False
+ Control = cbSEPA
+ ControlOptions.ShowBorder = False
+ end
end
object dxLayoutControlContactoGroup18: TdxLayoutGroup [1]
Caption = 'Bloqueo'
diff --git a/Source/Modulos/Contactos/Views/uViewCliente.pas b/Source/Modulos/Contactos/Views/uViewCliente.pas
index faca643..7d74094 100644
--- a/Source/Modulos/Contactos/Views/uViewCliente.pas
+++ b/Source/Modulos/Contactos/Views/uViewCliente.pas
@@ -46,6 +46,8 @@ type
actMandarCorreoAdministracion: TAction;
dxLayoutControlContactoItem30: TdxLayoutItem;
cbTipoCliente: TcxDBComboBox;
+ dxLayoutControlContactoItem31: TdxLayoutItem;
+ cbSEPA: TcxDBCheckBox;
procedure cbGrupoClientePropertiesInitPopup(Sender: TObject);
procedure cbGrupoClientePropertiesValidate(Sender: TObject;
diff --git a/Source/Modulos/Contactos/Views/uViewClientes.dfm b/Source/Modulos/Contactos/Views/uViewClientes.dfm
index 9f7a4d6..37b0eb5 100644
--- a/Source/Modulos/Contactos/Views/uViewClientes.dfm
+++ b/Source/Modulos/Contactos/Views/uViewClientes.dfm
@@ -26,7 +26,20 @@ inherited frViewClientes: TfrViewClientes
inherited cxGridViewICONO: TcxGridDBColumn
OnGetCellHint = cxGridViewICONOGetCellHint
end
- object cxGridViewBLOQUEADO: TcxGridDBColumn [1]
+ object cxGridViewSEPA: TcxGridDBColumn [1]
+ DataBinding.FieldName = 'SEPA'
+ PropertiesClassName = 'TcxImageComboBoxProperties'
+ Properties.Images = GridPNGImageList
+ Properties.Items = <
+ item
+ Value = 0
+ end
+ item
+ ImageIndex = 7
+ Value = 1
+ end>
+ end
+ object cxGridViewBLOQUEADO: TcxGridDBColumn [2]
DataBinding.FieldName = 'BLOQUEADO'
PropertiesClassName = 'TcxImageComboBoxProperties'
Properties.Images = GridPNGImageList
@@ -43,7 +56,7 @@ inherited frViewClientes: TfrViewClientes
Options.HorzSizing = False
Width = 22
end
- object cxGridViewFELICITACION: TcxGridDBColumn [2]
+ object cxGridViewFELICITACION: TcxGridDBColumn [3]
Caption = 'Felicitaci'#243'n'
DataBinding.FieldName = 'FELICITACION'
PropertiesClassName = 'TcxImageComboBoxProperties'
@@ -66,7 +79,7 @@ inherited frViewClientes: TfrViewClientes
VisibleForCustomization = False
Width = 22
end
- object cxGridViewTiendaWeb: TcxGridDBColumn [3]
+ object cxGridViewTiendaWeb: TcxGridDBColumn [4]
Caption = 'Acceso a tienda web'
DataBinding.FieldName = 'TIENDA_WEB'
PropertiesClassName = 'TcxImageComboBoxProperties'
@@ -85,7 +98,7 @@ inherited frViewClientes: TfrViewClientes
Options.HorzSizing = False
Width = 22
end
- object cxGridViewRAPEL: TcxGridDBColumn [4]
+ object cxGridViewRAPEL: TcxGridDBColumn [5]
Caption = 'Rapel'
DataBinding.FieldName = 'RAPEL'
PropertiesClassName = 'TcxImageComboBoxProperties'
@@ -99,7 +112,7 @@ inherited frViewClientes: TfrViewClientes
Value = 1
end>
end
- object cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn [8]
+ object cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn [9]
DataBinding.FieldName = 'NOMBRE_COMERCIAL'
BestFitMaxWidth = 90
Width = 164
@@ -109,6 +122,14 @@ inherited frViewClientes: TfrViewClientes
DataBinding.FieldName = 'AGENTE'
Visible = False
end
+ object cxGridViewTIPO_CLIENTE: TcxGridDBColumn
+ Caption = 'Tipo Cliente'
+ DataBinding.FieldName = 'TIPO_CLIENTE'
+ end
+ object cxGridViewGRUPO_CLIENTE: TcxGridDBColumn
+ Caption = 'Marcas'
+ DataBinding.FieldName = 'GRUPO_CLIENTE'
+ end
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase
@@ -527,6 +548,31 @@ inherited frViewClientes: TfrViewClientes
FE13D48C030000F232A0AC2AC1CAB80000000049454E44AE426082}
Name = 'PngImage6'
Background = clWindow
+ end
+ item
+ PngImage.Data = {
+ 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+ 610000000970485973000017120000171201679FD2520000022C4944415478DA
+ 8DD25F4853511C07F0EFA12661412D945E963D047B305A46A0112D7A982DFB63
+ 59467F26084122A82F1249206614D56089B12E444B5A391745A8AB5C917B10FF
+ 405B206BA1953049BD4C66B61C0CC79A76DA39E4ED5EB7C8DFCBB987737F1F7E
+ BFDF3904A97015900623E8AD357E10FC89EB57064CF9DB773A223F66F97EA33A
+ 0727CAD749E72C28A520A964772AB94475AE0E49A7154B484D553FADAB2F8256
+ 9B85F97940147FE2E18309982D5AA200EEA756B6F96569408ECE04CDB80EBBAB
+ FF22D67B7AFE73344AF1E5531837AFBD83EB75199100F6C1905073332AF7F9B0
+ 497B088157B51272ACA48B76F51CE755249314EF7DD3105A7D1C9100161A8D86
+ 3E6F143920475815E2D4773024145AE4FF8E8E84F1D12FA2FE5221510C2513B2
+ 617F82CFA1EC703704DB519EEC783482D5348E3667A912F817525845790BA653
+ DD58AF5E8B8ACA6DE879318AD6BB86746039121E73C3AF6AC7C9D23348240862
+ B145CC4522181A984C6F417E7D06C35630A4E0FC02ECED4F70C47896274F4ECC
+ F2161E3B0F2887B8FCEE59E4E56D96CE3C9E20C68333B0B779F1ACB35C798D72
+ C0DCA247763678CFF1F8825476203005BBED0DDCBDB5CA8794A90586C893FBFA
+ 3E63F0ED341C9D07D39F72A62132E472D31ECCC5A2F8E08DA1C3F1122AE4C2D5
+ 7B7A65007F81C54F69CDC5BD102C83305DD8857C9D1A36EB30EE08C56445C012
+ C256C16E4470EC1B5A6E0C2BAAF82FC0E2B6D94BFB3D5FB1A3680BB256252B1A
+ AFEA3BE4C06FF6482AF06E98E4770000000049454E44AE426082}
+ Name = 'PngImage7'
+ Background = clWindow
end>
Bitmap = {}
end
diff --git a/Source/Modulos/Contactos/Views/uViewClientes.pas b/Source/Modulos/Contactos/Views/uViewClientes.pas
index ce1dccc..394d74e 100644
--- a/Source/Modulos/Contactos/Views/uViewClientes.pas
+++ b/Source/Modulos/Contactos/Views/uViewClientes.pas
@@ -31,6 +31,9 @@ type
TBXSeparatorItem1: TTBXSeparatorItem;
TBXItem2: TTBXItem;
actAgentes: TAction;
+ cxGridViewSEPA: TcxGridDBColumn;
+ cxGridViewTIPO_CLIENTE: TcxGridDBColumn;
+ cxGridViewGRUPO_CLIENTE: TcxGridDBColumn;
procedure cxGridViewICONOGetCellHint(Sender: TcxCustomGridTableItem;
ARecord: TcxCustomGridRecord; ACellViewInfo: TcxGridTableDataCellViewInfo;
const AMousePos: TPoint; var AHintText: TCaption;
diff --git a/Source/Modulos/Facturas proforma/Controller/FacturasProforma_controller.dproj b/Source/Modulos/Facturas proforma/Controller/FacturasProforma_controller.dproj
index 2caa19a..b10be13 100644
--- a/Source/Modulos/Facturas proforma/Controller/FacturasProforma_controller.dproj
+++ b/Source/Modulos/Facturas proforma/Controller/FacturasProforma_controller.dproj
@@ -49,12 +49,12 @@
MainSource
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/Source/Modulos/Facturas proforma/Controller/uDetallesFacturaProformaController.pas b/Source/Modulos/Facturas proforma/Controller/uDetallesFacturaProformaController.pas
index 39a5f65..892dcdd 100644
--- a/Source/Modulos/Facturas proforma/Controller/uDetallesFacturaProformaController.pas
+++ b/Source/Modulos/Facturas proforma/Controller/uDetallesFacturaProformaController.pas
@@ -11,7 +11,6 @@ type
['{5DBAE3ED-D54F-4C62-AEBF-2BED29D91DD2}']
procedure AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; ACliente: IBizCliente; const ANuevaFila :Boolean = True; const ACantidad: Integer = 1); overload;
procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; ACliente: IBizCliente);
- procedure AnadirDetalleFacturaAsociadaAbono(ADetalles: IBizDetallesFacturaProforma; AReferencia: String; AFecha: String);
procedure DesglosarPorteDetalles(ImportePorte: Currency; ADetalles: IDAStronglyTypedDataTable);
function DarTotalPorteTotal(ADetalles: IDAStronglyTypedDataTable): Double;
end;
@@ -37,9 +36,6 @@ type
procedure AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; ACliente: IBizCliente; const ANuevaFila :Boolean = True; const ACantidad: Integer = 1); overload;
procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; ACliente: IBizCliente); overload;
- //ABONOS
- procedure AnadirDetalleFacturaAsociadaAbono(ADetalles: IBizDetallesFacturaProforma; AReferencia: String; AFecha: String);
-
constructor Create; override;
destructor Destroy; override;
end;
@@ -94,29 +90,12 @@ begin
end;
end;
-procedure TDetallesFacturaProformaController.AnadirDetalleFacturaAsociadaAbono(ADetalles: IBizDetallesFacturaProforma; AReferencia: String; AFecha: String);
-begin
- AnadirConceptoInicial(ADetalles, 'ABONO DE FACTURA ' + AReferencia + ' con fecha ' + AFecha);
-end;
procedure TDetallesFacturaProformaController.AsignarController;
begin
FArticulosController := TArticulosFacturaProformaController.Create;
end;
-{procedure TDetallesFacturaProformaController.AsignarDatos(ADetalles: IDAStronglyTypedDataTable; IDCabecera: Integer);
-begin
- inherited;
-
- with (ADetalles as IBizDetallesFacturaProforma) do
- begin
- Edit;
-// ID := FDataModule.GetNextID(DataTable.LogicalName);
- ID_FACTURA := IDCabecera;
- Post
- end;
-end;}
-
function TDetallesFacturaProformaController.CalcularImporteTotalConcepto(DataTable: TDADataTable): Double;
begin
Result := CalcularLineaConcepto(DataTable);
diff --git a/Source/Modulos/Facturas proforma/Data/FacturasProforma_data.dproj b/Source/Modulos/Facturas proforma/Data/FacturasProforma_data.dproj
index f0d36dc..443a963 100644
--- a/Source/Modulos/Facturas proforma/Data/FacturasProforma_data.dproj
+++ b/Source/Modulos/Facturas proforma/Data/FacturasProforma_data.dproj
@@ -49,7 +49,7 @@
MainSource
-
+
TDAClientDataModule
diff --git a/Source/Modulos/Facturas proforma/Data/uDataModuleFacturasProforma.dfm b/Source/Modulos/Facturas proforma/Data/uDataModuleFacturasProforma.dfm
index 3582fa7..28422fa 100644
--- a/Source/Modulos/Facturas proforma/Data/uDataModuleFacturasProforma.dfm
+++ b/Source/Modulos/Facturas proforma/Data/uDataModuleFacturasProforma.dfm
@@ -30,7 +30,9 @@ inherited DataModuleFacturasProforma: TDataModuleFacturasProforma
Name = 'ID'
DataType = datAutoInc
GeneratorName = 'GEN_FACTURAS_PROFORMA_ID'
+ ServerAutoRefresh = True
DictionaryEntry = 'FacturasProforma_ID'
+ InPrimaryKey = True
end
item
Name = 'ID_EMPRESA'
@@ -247,6 +249,11 @@ inherited DataModuleFacturasProforma: TDataModuleFacturasProforma
DisplayLabel = 'FacturasProforma_DATOS_BANCARIOS'
DictionaryEntry = 'FacturasProforma_DATOS_BANCARIOS'
end
+ item
+ Name = 'REFERENCIA_CLIENTE'
+ DataType = datString
+ Size = 255
+ end
item
Name = 'ID_PEDIDO'
DataType = datInteger
@@ -279,10 +286,10 @@ inherited DataModuleFacturasProforma: TDataModuleFacturasProforma
item
Name = 'ID'
DataType = datAutoInc
- GeneratorName = 'GEN_FACTURAS_PROFORMA_DETALLES_ID'
- LogChanges = False
- ReadOnly = True
- ServerCalculated = True
+ GeneratorName = 'GEN_FACTURAS_PROFORMA_DET_ID'
+ ServerAutoRefresh = True
+ DictionaryEntry = 'FacturasProforma_Detalles_ID'
+ InPrimaryKey = True
end
item
Name = 'ID_FACTURA'
diff --git a/Source/Modulos/Facturas proforma/FacturasProforma_Group.groupproj b/Source/Modulos/Facturas proforma/FacturasProforma_Group.groupproj
index 63e428d..1a95fa9 100644
--- a/Source/Modulos/Facturas proforma/FacturasProforma_Group.groupproj
+++ b/Source/Modulos/Facturas proforma/FacturasProforma_Group.groupproj
@@ -17,12 +17,10 @@
-
-
-
+
@@ -130,33 +128,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -184,6 +155,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -202,23 +191,14 @@
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
\ No newline at end of file
diff --git a/Source/Modulos/Facturas proforma/Model/FacturasProforma_model.dproj b/Source/Modulos/Facturas proforma/Model/FacturasProforma_model.dproj
index dcd3cf5..544afd9 100644
--- a/Source/Modulos/Facturas proforma/Model/FacturasProforma_model.dproj
+++ b/Source/Modulos/Facturas proforma/Model/FacturasProforma_model.dproj
@@ -52,24 +52,24 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
diff --git a/Source/Modulos/Facturas proforma/Model/schFacturasProformaClient_Intf.pas b/Source/Modulos/Facturas proforma/Model/schFacturasProformaClient_Intf.pas
index 29333a1..8c1fda1 100644
--- a/Source/Modulos/Facturas proforma/Model/schFacturasProformaClient_Intf.pas
+++ b/Source/Modulos/Facturas proforma/Model/schFacturasProformaClient_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_ListaAnosFacturas = '{DDF5317C-9065-43AC-B0CB-915F5FD3A062}';
- RID_FacturasProforma = '{85BC1F8F-4B69-4951-ACFB-D9D56114212E}';
- RID_FacturasProforma_Detalles = '{A5610583-C2D4-4B7B-AC06-04716A9AA6CD}';
+ RID_ListaAnosFacturas = '{FEEF09C4-67C8-4306-BC5D-E9B624ED4218}';
+ RID_FacturasProforma = '{E96B0663-EB3C-45D1-8A6E-3A0178CC014A}';
+ RID_FacturasProforma_Detalles = '{318BEE60-3B5B-4A8C-9A41-DFD51E23B35C}';
{ Data table names }
nme_ListaAnosFacturas = 'ListaAnosFacturas';
@@ -60,6 +60,7 @@ const
fld_FacturasProformaNUM_COPIAS = 'NUM_COPIAS';
fld_FacturasProformaNUM_CORREOS = 'NUM_CORREOS';
fld_FacturasProformaDATOS_BANCARIOS = 'DATOS_BANCARIOS';
+ fld_FacturasProformaREFERENCIA_CLIENTE = 'REFERENCIA_CLIENTE';
fld_FacturasProformaID_PEDIDO = 'ID_PEDIDO';
fld_FacturasProformaID_FACTURA_FINAL = 'ID_FACTURA_FINAL';
@@ -99,8 +100,9 @@ const
idx_FacturasProformaNUM_COPIAS = 32;
idx_FacturasProformaNUM_CORREOS = 33;
idx_FacturasProformaDATOS_BANCARIOS = 34;
- idx_FacturasProformaID_PEDIDO = 35;
- idx_FacturasProformaID_FACTURA_FINAL = 36;
+ idx_FacturasProformaREFERENCIA_CLIENTE = 35;
+ idx_FacturasProformaID_PEDIDO = 36;
+ idx_FacturasProformaID_FACTURA_FINAL = 37;
{ FacturasProforma_Detalles fields }
fld_FacturasProforma_DetallesID = 'ID';
@@ -139,7 +141,7 @@ const
type
{ IListaAnosFacturas }
IListaAnosFacturas = interface(IDAStronglyTypedDataTable)
- ['{1046FD4E-10DD-4EA5-81EA-F74D0CA63809}']
+ ['{CBCFE754-67D7-40A8-B21A-4450E8EC413F}']
{ Property getters and setters }
function GetANOValue: String;
procedure SetANOValue(const aValue: String);
@@ -174,7 +176,7 @@ type
{ IFacturasProforma }
IFacturasProforma = interface(IDAStronglyTypedDataTable)
- ['{E3F5CD3D-BEB3-4FBE-8D1E-D949C4FDBF1D}']
+ ['{F8DFF550-5A11-49CC-976D-93AEECB72322}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -315,6 +317,10 @@ type
procedure SetDATOS_BANCARIOSValue(const aValue: String);
function GetDATOS_BANCARIOSIsNull: Boolean;
procedure SetDATOS_BANCARIOSIsNull(const aValue: Boolean);
+ function GetREFERENCIA_CLIENTEValue: String;
+ procedure SetREFERENCIA_CLIENTEValue(const aValue: String);
+ function GetREFERENCIA_CLIENTEIsNull: Boolean;
+ procedure SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean);
function GetID_PEDIDOValue: Integer;
procedure SetID_PEDIDOValue(const aValue: Integer);
function GetID_PEDIDOIsNull: Boolean;
@@ -396,6 +402,8 @@ type
property NUM_CORREOSIsNull: Boolean read GetNUM_CORREOSIsNull write SetNUM_CORREOSIsNull;
property DATOS_BANCARIOS: String read GetDATOS_BANCARIOSValue write SetDATOS_BANCARIOSValue;
property DATOS_BANCARIOSIsNull: Boolean read GetDATOS_BANCARIOSIsNull write SetDATOS_BANCARIOSIsNull;
+ property REFERENCIA_CLIENTE: String read GetREFERENCIA_CLIENTEValue write SetREFERENCIA_CLIENTEValue;
+ property REFERENCIA_CLIENTEIsNull: Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull;
property ID_PEDIDO: Integer read GetID_PEDIDOValue write SetID_PEDIDOValue;
property ID_PEDIDOIsNull: Boolean read GetID_PEDIDOIsNull write SetID_PEDIDOIsNull;
property ID_FACTURA_FINAL: Integer read GetID_FACTURA_FINALValue write SetID_FACTURA_FINALValue;
@@ -548,6 +556,10 @@ type
procedure SetDATOS_BANCARIOSValue(const aValue: String); virtual;
function GetDATOS_BANCARIOSIsNull: Boolean; virtual;
procedure SetDATOS_BANCARIOSIsNull(const aValue: Boolean); virtual;
+ function GetREFERENCIA_CLIENTEValue: String; virtual;
+ procedure SetREFERENCIA_CLIENTEValue(const aValue: String); virtual;
+ function GetREFERENCIA_CLIENTEIsNull: Boolean; virtual;
+ procedure SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean); virtual;
function GetID_PEDIDOValue: Integer; virtual;
procedure SetID_PEDIDOValue(const aValue: Integer); virtual;
function GetID_PEDIDOIsNull: Boolean; virtual;
@@ -628,6 +640,8 @@ type
property NUM_CORREOSIsNull: Boolean read GetNUM_CORREOSIsNull write SetNUM_CORREOSIsNull;
property DATOS_BANCARIOS: String read GetDATOS_BANCARIOSValue write SetDATOS_BANCARIOSValue;
property DATOS_BANCARIOSIsNull: Boolean read GetDATOS_BANCARIOSIsNull write SetDATOS_BANCARIOSIsNull;
+ property REFERENCIA_CLIENTE: String read GetREFERENCIA_CLIENTEValue write SetREFERENCIA_CLIENTEValue;
+ property REFERENCIA_CLIENTEIsNull: Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull;
property ID_PEDIDO: Integer read GetID_PEDIDOValue write SetID_PEDIDOValue;
property ID_PEDIDOIsNull: Boolean read GetID_PEDIDOIsNull write SetID_PEDIDOIsNull;
property ID_FACTURA_FINAL: Integer read GetID_FACTURA_FINALValue write SetID_FACTURA_FINALValue;
@@ -641,7 +655,7 @@ type
{ IFacturasProforma_Detalles }
IFacturasProforma_Detalles = interface(IDAStronglyTypedDataTable)
- ['{F034CF38-F812-40CD-A475-F2E19A2DA211}']
+ ['{B411FAE4-15F3-4FFB-B84A-6E0BFDF91CE9}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -1632,6 +1646,27 @@ begin
DataTable.Fields[idx_FacturasProformaDATOS_BANCARIOS].AsVariant := Null;
end;
+function TFacturasProformaDataTableRules.GetREFERENCIA_CLIENTEValue: String;
+begin
+ result := DataTable.Fields[idx_FacturasProformaREFERENCIA_CLIENTE].AsString;
+end;
+
+procedure TFacturasProformaDataTableRules.SetREFERENCIA_CLIENTEValue(const aValue: String);
+begin
+ DataTable.Fields[idx_FacturasProformaREFERENCIA_CLIENTE].AsString := aValue;
+end;
+
+function TFacturasProformaDataTableRules.GetREFERENCIA_CLIENTEIsNull: boolean;
+begin
+ result := DataTable.Fields[idx_FacturasProformaREFERENCIA_CLIENTE].IsNull;
+end;
+
+procedure TFacturasProformaDataTableRules.SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean);
+begin
+ if aValue then
+ DataTable.Fields[idx_FacturasProformaREFERENCIA_CLIENTE].AsVariant := Null;
+end;
+
function TFacturasProformaDataTableRules.GetID_PEDIDOValue: Integer;
begin
result := DataTable.Fields[idx_FacturasProformaID_PEDIDO].AsInteger;
diff --git a/Source/Modulos/Facturas proforma/Model/schFacturasProformaServer_Intf.pas b/Source/Modulos/Facturas proforma/Model/schFacturasProformaServer_Intf.pas
index d19db40..2d8f848 100644
--- a/Source/Modulos/Facturas proforma/Model/schFacturasProformaServer_Intf.pas
+++ b/Source/Modulos/Facturas proforma/Model/schFacturasProformaServer_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_ListaAnosFacturasDelta = '{ABACB817-6763-4A88-8B1E-5AB9DB10C790}';
- RID_FacturasProformaDelta = '{816D3941-8CF1-4491-AB51-33755DA5A8B0}';
- RID_FacturasProforma_DetallesDelta = '{A48F6A67-93C6-41E8-A234-B04189C7559D}';
+ RID_ListaAnosFacturasDelta = '{1E0FB8B9-0971-4C08-9852-81F821095795}';
+ RID_FacturasProformaDelta = '{8CCB35B8-FB46-40BB-8D1C-F22A11E81325}';
+ RID_FacturasProforma_DetallesDelta = '{9C6DD5EA-A831-40AF-AAF2-792029C0567D}';
type
{ IListaAnosFacturasDelta }
IListaAnosFacturasDelta = interface(IListaAnosFacturas)
- ['{ABACB817-6763-4A88-8B1E-5AB9DB10C790}']
+ ['{1E0FB8B9-0971-4C08-9852-81F821095795}']
{ Property getters and setters }
function GetOldANOValue : String;
@@ -50,7 +50,7 @@ type
{ IFacturasProformaDelta }
IFacturasProformaDelta = interface(IFacturasProforma)
- ['{816D3941-8CF1-4491-AB51-33755DA5A8B0}']
+ ['{8CCB35B8-FB46-40BB-8D1C-F22A11E81325}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@@ -87,6 +87,7 @@ type
function GetOldNUM_COPIASValue : SmallInt;
function GetOldNUM_CORREOSValue : SmallInt;
function GetOldDATOS_BANCARIOSValue : String;
+ function GetOldREFERENCIA_CLIENTEValue : String;
function GetOldID_PEDIDOValue : Integer;
function GetOldID_FACTURA_FINALValue : Integer;
@@ -126,6 +127,7 @@ type
property OldNUM_COPIAS : SmallInt read GetOldNUM_COPIASValue;
property OldNUM_CORREOS : SmallInt read GetOldNUM_CORREOSValue;
property OldDATOS_BANCARIOS : String read GetOldDATOS_BANCARIOSValue;
+ property OldREFERENCIA_CLIENTE : String read GetOldREFERENCIA_CLIENTEValue;
property OldID_PEDIDO : Integer read GetOldID_PEDIDOValue;
property OldID_FACTURA_FINAL : Integer read GetOldID_FACTURA_FINALValue;
end;
@@ -346,6 +348,12 @@ type
function GetOldDATOS_BANCARIOSIsNull: Boolean; virtual;
procedure SetDATOS_BANCARIOSValue(const aValue: String); virtual;
procedure SetDATOS_BANCARIOSIsNull(const aValue: Boolean); virtual;
+ function GetREFERENCIA_CLIENTEValue: String; virtual;
+ function GetREFERENCIA_CLIENTEIsNull: Boolean; virtual;
+ function GetOldREFERENCIA_CLIENTEValue: String; virtual;
+ function GetOldREFERENCIA_CLIENTEIsNull: Boolean; virtual;
+ procedure SetREFERENCIA_CLIENTEValue(const aValue: String); virtual;
+ procedure SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean); virtual;
function GetID_PEDIDOValue: Integer; virtual;
function GetID_PEDIDOIsNull: Boolean; virtual;
function GetOldID_PEDIDOValue: Integer; virtual;
@@ -500,6 +508,10 @@ type
property DATOS_BANCARIOSIsNull : Boolean read GetDATOS_BANCARIOSIsNull write SetDATOS_BANCARIOSIsNull;
property OldDATOS_BANCARIOS : String read GetOldDATOS_BANCARIOSValue;
property OldDATOS_BANCARIOSIsNull : Boolean read GetOldDATOS_BANCARIOSIsNull;
+ property REFERENCIA_CLIENTE : String read GetREFERENCIA_CLIENTEValue write SetREFERENCIA_CLIENTEValue;
+ property REFERENCIA_CLIENTEIsNull : Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull;
+ property OldREFERENCIA_CLIENTE : String read GetOldREFERENCIA_CLIENTEValue;
+ property OldREFERENCIA_CLIENTEIsNull : Boolean read GetOldREFERENCIA_CLIENTEIsNull;
property ID_PEDIDO : Integer read GetID_PEDIDOValue write SetID_PEDIDOValue;
property ID_PEDIDOIsNull : Boolean read GetID_PEDIDOIsNull write SetID_PEDIDOIsNull;
property OldID_PEDIDO : Integer read GetOldID_PEDIDOValue;
@@ -517,7 +529,7 @@ type
{ IFacturasProforma_DetallesDelta }
IFacturasProforma_DetallesDelta = interface(IFacturasProforma_Detalles)
- ['{A48F6A67-93C6-41E8-A234-B04189C7559D}']
+ ['{9C6DD5EA-A831-40AF-AAF2-792029C0567D}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_FACTURAValue : Integer;
@@ -1869,6 +1881,37 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProformaDATOS_BANCARIOS] := Null;
end;
+function TFacturasProformaBusinessProcessorRules.GetREFERENCIA_CLIENTEValue: String;
+begin
+ result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProformaREFERENCIA_CLIENTE];
+end;
+
+function TFacturasProformaBusinessProcessorRules.GetREFERENCIA_CLIENTEIsNull: Boolean;
+begin
+ result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProformaREFERENCIA_CLIENTE]);
+end;
+
+function TFacturasProformaBusinessProcessorRules.GetOldREFERENCIA_CLIENTEValue: String;
+begin
+ result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProformaREFERENCIA_CLIENTE];
+end;
+
+function TFacturasProformaBusinessProcessorRules.GetOldREFERENCIA_CLIENTEIsNull: Boolean;
+begin
+ result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProformaREFERENCIA_CLIENTE]);
+end;
+
+procedure TFacturasProformaBusinessProcessorRules.SetREFERENCIA_CLIENTEValue(const aValue: String);
+begin
+ BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProformaREFERENCIA_CLIENTE] := aValue;
+end;
+
+procedure TFacturasProformaBusinessProcessorRules.SetREFERENCIA_CLIENTEIsNull(const aValue: Boolean);
+begin
+ if aValue then
+ BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProformaREFERENCIA_CLIENTE] := Null;
+end;
+
function TFacturasProformaBusinessProcessorRules.GetID_PEDIDOValue: Integer;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProformaID_PEDIDO];
diff --git a/Source/Modulos/Facturas proforma/Plugin/FacturasCliente_plugin.bdsproj b/Source/Modulos/Facturas proforma/Plugin/FacturasCliente_plugin.bdsproj
deleted file mode 100644
index 300c85f..0000000
--- a/Source/Modulos/Facturas proforma/Plugin/FacturasCliente_plugin.bdsproj
+++ /dev/null
@@ -1,495 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- FacturasCliente_plugin.dpk
-
-
- 7.0
-
-
- 8
- 0
- 1
- 1
- 0
- 0
- 1
- 1
- 1
- 0
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 1
- 0
- 1
- 1
- 1
- True
- True
- WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
-
- False
-
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- True
- False
- False
- False
- True
- True
- True
- True
- True
- True
-
-
-
- 3
- 0
- False
- 1
- False
- False
- False
- 16384
- 1048576
- 4194304
-
-
-
-
- .\
- ..\..\..\..\Output\Debug\Cliente
- ..\..\Lib
- ..\..\..\Lib;..\..\Lib
-
-
-
- False
-
-
-
-
-
- False
-
-
- True
- False
-
-
-
- $00000000
-
-
-
- True
- False
- 1
- 0
- 0
- 0
- False
- False
- False
- False
- False
- 3082
- 1252
-
-
-
-
- 1.0.0.0
-
-
-
-
-
- 1.0.0.0
-
-
- RemObjects Pascal Script - RemObjects SDK 3.0 Integration
- EurekaLog 5.1.9
-
-
-
-
diff --git a/Source/Modulos/Facturas proforma/Plugin/FacturasCliente_plugin.dpk b/Source/Modulos/Facturas proforma/Plugin/FacturasProforma_plugin.dpk
similarity index 73%
rename from Source/Modulos/Facturas proforma/Plugin/FacturasCliente_plugin.dpk
rename to Source/Modulos/Facturas proforma/Plugin/FacturasProforma_plugin.dpk
index fe3e348..dfdf0d0 100644
Binary files a/Source/Modulos/Facturas proforma/Plugin/FacturasCliente_plugin.dpk and b/Source/Modulos/Facturas proforma/Plugin/FacturasProforma_plugin.dpk differ
diff --git a/Source/Modulos/Facturas proforma/Plugin/FacturasCliente_plugin.dproj b/Source/Modulos/Facturas proforma/Plugin/FacturasProforma_plugin.dproj
similarity index 86%
rename from Source/Modulos/Facturas proforma/Plugin/FacturasCliente_plugin.dproj
rename to Source/Modulos/Facturas proforma/Plugin/FacturasProforma_plugin.dproj
index 36c9895..2115d6f 100644
--- a/Source/Modulos/Facturas proforma/Plugin/FacturasCliente_plugin.dproj
+++ b/Source/Modulos/Facturas proforma/Plugin/FacturasProforma_plugin.dproj
@@ -1,11 +1,11 @@

{e7d762a1-3a15-46b2-bd5b-3821d13b8347}
- FacturasCliente_plugin.dpk
+ FacturasProforma_plugin.dpk
Debug
AnyCPU
DCC32
- ..\..\..\..\Output\Debug\Cliente\FacturasCliente_plugin.bpl
+ ..\..\..\..\Output\Debug\Cliente\FacturasProforma_plugin.bpl
7.0
@@ -41,39 +41,31 @@
Delphi.Personality
Package
-FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0
-
-
-
-
-
-
-
-
+FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0
RemObjects Pascal Script - RemObjects SDK 3.0 Integration
EurekaLog 5.1.9
- FacturasCliente_plugin.dpk
+ FacturasProforma_plugin.dpk
-
+
MainSource
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
+EurekaLog Last Line -->
diff --git a/Source/Modulos/Facturas proforma/Plugin/FacturasProforma_plugin.drc b/Source/Modulos/Facturas proforma/Plugin/FacturasProforma_plugin.drc
new file mode 100644
index 0000000..ef00be8
--- /dev/null
+++ b/Source/Modulos/Facturas proforma/Plugin/FacturasProforma_plugin.drc
@@ -0,0 +1,17 @@
+/* VER185
+ Generated by the CodeGear Delphi Pascal Compiler
+ because -GD or --drc was supplied to the compiler.
+
+ This file contains compiler-generated resources that
+ were bound to the executable.
+ If this file is empty, then no compiler-generated
+ resources were bound to the produced executable.
+*/
+
+STRINGTABLE
+BEGIN
+END
+
+/* C:\Codigo\Source\Modulos\Facturas proforma\Plugin\uPluginFacturasProforma.dfm */
+/* C:\Codigo\Source\Modulos\Facturas proforma\Plugin\FacturasProforma_plugin.res */
+/* C:\Codigo\Source\Modulos\Facturas proforma\Plugin\FacturasProforma_plugin.drf */
diff --git a/Source/Modulos/Facturas proforma/Plugin/FacturasCliente_plugin.rc b/Source/Modulos/Facturas proforma/Plugin/FacturasProforma_plugin.rc
similarity index 100%
rename from Source/Modulos/Facturas proforma/Plugin/FacturasCliente_plugin.rc
rename to Source/Modulos/Facturas proforma/Plugin/FacturasProforma_plugin.rc
diff --git a/Source/Modulos/Facturas proforma/Plugin/FacturasCliente_plugin.res b/Source/Modulos/Facturas proforma/Plugin/FacturasProforma_plugin.res
similarity index 100%
rename from Source/Modulos/Facturas proforma/Plugin/FacturasCliente_plugin.res
rename to Source/Modulos/Facturas proforma/Plugin/FacturasProforma_plugin.res
diff --git a/Source/Modulos/Facturas proforma/Plugin/uPluginFacturasCliente.pas b/Source/Modulos/Facturas proforma/Plugin/uPluginFacturasCliente.pas
deleted file mode 100644
index 2284c40..0000000
--- a/Source/Modulos/Facturas proforma/Plugin/uPluginFacturasCliente.pas
+++ /dev/null
@@ -1,97 +0,0 @@
-unit uPluginFacturasCliente;
-
-interface
-
-uses
- uModuleController, uInterfaces, uHostManager, Menus, Classes, ActnList,
- ImgList, Controls, PngImageList, uPlugins_Intf;
-
-type
- TPluginFacturasCliente = class(TModuleController, IMCFacturasCliente)
- actFacturasCliente: TAction;
- ExtraImages: TPngImageList;
- LargeImages: TPngImageList;
- MainMenu: TMainMenu;
- ModuleActionList: TActionList;
- SmallImages: TPngImageList;
- Ventas1: TMenuItem;
- Facturasdecliente1: TMenuItem;
- procedure actFacturasClienteExecute(Sender: TObject);
- public
- constructor Create(AOwner: TComponent); override;
- destructor Destroy; override;
- procedure VerFacturas(const ID_Cliente: Integer;
- const ANombreCliente : String = '');
- end;
-
-implementation
-
-{$R *.dfm}
-
-uses
- Forms, Dialogs, SysUtils, cxControls,
- uFacturasClienteController, uBizFacturasCliente, uFacturasClienteViewRegister;
-
-function GetModule : TModuleController;
-begin
- Result := TPluginFacturasCliente.Create(NIL);
-end;
-
-exports
- GetModule name GET_MODULE_FUNC;
-
-procedure TPluginFacturasCliente.actFacturasClienteExecute(Sender: TObject);
-var
- AFacturasClienteController : IFacturasClienteController;
- AFacturasCliente : IBizFacturaCliente;
-
-begin
- AFacturasClienteController := TFacturasClienteController.Create;
- AFacturasCliente := (AFacturasClienteController.BuscarTodos as IBizFacturaCliente);
- AFacturasClienteController.VerTodos(AFacturasCliente);
-end;
-
-constructor TPluginFacturasCliente.Create(AOwner: TComponent);
-begin
- inherited;
- ModuleName := MODULENAME_FACTURAS_CLIENTE;
- uFacturasClienteViewRegister.RegisterViews;
-end;
-
-destructor TPluginFacturasCliente.Destroy;
-begin
- uFacturasClienteViewRegister.UnregisterViews;
- inherited;
-end;
-
-procedure TPluginFacturasCliente.VerFacturas(const ID_Cliente: Integer;
- const ANombreCliente: String);
-var
- AFacturasClienteController : IFacturasClienteController;
- AFacturasCliente : IBizFacturaCliente;
- AText : String;
-begin
- AText := Format('Lista de facturas del cliente %s', [ANombreCliente]);
- AFacturasClienteController := TFacturasClienteController.Create;
- try
- ShowHourglassCursor;
- try
- AFacturasCliente := AFacturasClienteController.BuscarTodos(ID_Cliente);
- finally
- HideHourglassCursor;
- end;
- AFacturasClienteController.VerTodos(AFacturasCliente, True, AText);
- finally
- AFacturasCliente := NIL;
- AFacturasClienteController := NIL;
- end;
-end;
-
-
-initialization
- RegisterModuleClass(TPluginFacturasCliente);
-
-finalization
- UnRegisterModuleClass(TPluginFacturasCliente);
-
-end.
diff --git a/Source/Modulos/Facturas proforma/Plugin/uPluginFacturasCliente.dfm b/Source/Modulos/Facturas proforma/Plugin/uPluginFacturasProforma.dfm
similarity index 92%
rename from Source/Modulos/Facturas proforma/Plugin/uPluginFacturasCliente.dfm
rename to Source/Modulos/Facturas proforma/Plugin/uPluginFacturasProforma.dfm
index 23dc28a..91a714e 100644
--- a/Source/Modulos/Facturas proforma/Plugin/uPluginFacturasCliente.dfm
+++ b/Source/Modulos/Facturas proforma/Plugin/uPluginFacturasProforma.dfm
@@ -1,9 +1,9 @@
-object PluginFacturasCliente: TPluginFacturasCliente
+object PluginFacturasProforma: TPluginFacturasProforma
OldCreateOrder = True
- DefaultAction = actFacturasCliente
+ DefaultAction = actFacturasProforma
Description = 'Ventas'
ModuleMenu = MainMenu
- ModuleName = 'Facturas de cliente'
+ ModuleName = 'Facturas proforma'
SmallImages = SmallImages
LargeImages = LargeImages
Author = 'Rodax Software'
@@ -44,11 +44,11 @@ object PluginFacturasCliente: TPluginFacturasCliente
Images = LargeImages
Left = 40
Top = 72
- object actFacturasCliente: TAction
+ object actFacturasProforma: TAction
Category = 'Ventas'
- Caption = 'Facturas de cliente'
+ Caption = 'Facturas proforma'
ImageIndex = 0
- OnExecute = actFacturasClienteExecute
+ OnExecute = actFacturasProformaExecute
end
end
object MainMenu: TMainMenu
@@ -62,7 +62,7 @@ object PluginFacturasCliente: TPluginFacturasCliente
ImageIndex = 0
object Facturasdecliente1: TMenuItem
Tag = 301
- Action = actFacturasCliente
+ Action = actFacturasProforma
end
end
end
diff --git a/Source/Modulos/Facturas proforma/Plugin/uPluginFacturasProforma.pas b/Source/Modulos/Facturas proforma/Plugin/uPluginFacturasProforma.pas
new file mode 100644
index 0000000..75d57ed
--- /dev/null
+++ b/Source/Modulos/Facturas proforma/Plugin/uPluginFacturasProforma.pas
@@ -0,0 +1,97 @@
+unit uPluginFacturasProforma;
+
+interface
+
+uses
+ uModuleController, uInterfaces, uHostManager, Menus, Classes, ActnList,
+ ImgList, Controls, PngImageList, uPlugins_Intf;
+
+type
+ TPluginFacturasProforma = class(TModuleController, IMCFacturasProforma)
+ actFacturasProforma: TAction;
+ ExtraImages: TPngImageList;
+ LargeImages: TPngImageList;
+ MainMenu: TMainMenu;
+ ModuleActionList: TActionList;
+ SmallImages: TPngImageList;
+ Ventas1: TMenuItem;
+ Facturasdecliente1: TMenuItem;
+ procedure actFacturasProformaExecute(Sender: TObject);
+ public
+ constructor Create(AOwner: TComponent); override;
+ destructor Destroy; override;
+ procedure VerFacturas(const ID_Cliente: Integer;
+ const ANombreCliente : String = '');
+ end;
+
+implementation
+
+{$R *.dfm}
+
+uses
+ Forms, Dialogs, SysUtils, cxControls,
+ uFacturasProformaController, uBizFacturasProforma, uFacturasProformaViewRegister;
+
+function GetModule : TModuleController;
+begin
+ Result := TPluginFacturasProforma.Create(NIL);
+end;
+
+exports
+ GetModule name GET_MODULE_FUNC;
+
+procedure TPluginFacturasProforma.actFacturasProformaExecute(Sender: TObject);
+var
+ AFacturasProformaController : IFacturasProformaController;
+ AFacturasProforma : IBizFacturaProforma;
+
+begin
+ AFacturasProformaController := TFacturasProformaController.Create;
+ AFacturasProforma := (AFacturasProformaController.BuscarTodos as IBizFacturaProforma);
+ AFacturasProformaController.VerTodos(AFacturasProforma);
+end;
+
+constructor TPluginFacturasProforma.Create(AOwner: TComponent);
+begin
+ inherited;
+ ModuleName := MODULENAME_FACTURAS_CLIENTE;
+ uFacturasProformaViewRegister.RegisterViews;
+end;
+
+destructor TPluginFacturasProforma.Destroy;
+begin
+ uFacturasProformaViewRegister.UnregisterViews;
+ inherited;
+end;
+
+procedure TPluginFacturasProforma.VerFacturas(const ID_Cliente: Integer;
+ const ANombreCliente: String);
+var
+ AFacturasProformaController : IFacturasProformaController;
+ AFacturasProforma : IBizFacturaProforma;
+ AText : String;
+begin
+ AText := Format('Lista de facturas proforma %s', [ANombreCliente]);
+ AFacturasProformaController := TFacturasProformaController.Create;
+ try
+ ShowHourglassCursor;
+ try
+ AFacturasProforma := AFacturasProformaController.BuscarTodos(ID_Cliente);
+ finally
+ HideHourglassCursor;
+ end;
+ AFacturasProformaController.VerTodos(AFacturasProforma, True, AText);
+ finally
+ AFacturasProforma := NIL;
+ AFacturasProformaController := NIL;
+ end;
+end;
+
+
+initialization
+ RegisterModuleClass(TPluginFacturasProforma);
+
+finalization
+ UnRegisterModuleClass(TPluginFacturasProforma);
+
+end.
diff --git a/Source/Modulos/Facturas proforma/Servidor/srvFacturasProforma_Impl.dfm b/Source/Modulos/Facturas proforma/Servidor/srvFacturasProforma_Impl.dfm
index 975b118..2d9d423 100644
--- a/Source/Modulos/Facturas proforma/Servidor/srvFacturasProforma_Impl.dfm
+++ b/Source/Modulos/Facturas proforma/Servidor/srvFacturasProforma_Impl.dfm
@@ -195,6 +195,10 @@ object srvFacturasProforma: TsrvFacturasProforma
item
DatasetField = 'ID_FACTURA_FINAL'
TableField = 'ID_FACTURA_FINAL'
+ end
+ item
+ DatasetField = 'REFERENCIA_CLIENTE'
+ TableField = 'REFERENCIA_CLIENTE'
end>
end>
Name = 'FacturasProforma'
@@ -203,7 +207,9 @@ object srvFacturasProforma: TsrvFacturasProforma
Name = 'ID'
DataType = datAutoInc
GeneratorName = 'GEN_FACTURAS_PROFORMA_ID'
+ ServerAutoRefresh = True
DictionaryEntry = 'FacturasProforma_ID'
+ InPrimaryKey = True
end
item
Name = 'ID_EMPRESA'
@@ -386,6 +392,11 @@ object srvFacturasProforma: TsrvFacturasProforma
Size = 255
DictionaryEntry = 'FacturasProforma_DATOS_BANCARIOS'
end
+ item
+ Name = 'REFERENCIA_CLIENTE'
+ DataType = datString
+ Size = 255
+ end
item
Name = 'ID_PEDIDO'
DataType = datInteger
@@ -486,10 +497,10 @@ object srvFacturasProforma: TsrvFacturasProforma
item
Name = 'ID'
DataType = datAutoInc
- GeneratorName = 'GEN_FACTURAS_PROFORMA_DETALLES_ID'
- LogChanges = False
- ReadOnly = True
- ServerCalculated = True
+ GeneratorName = 'GEN_FACTURAS_PROFORMA_DET_ID'
+ ServerAutoRefresh = True
+ DictionaryEntry = 'FacturasProforma_Detalles_ID'
+ InPrimaryKey = True
end
item
Name = 'ID_FACTURA'
@@ -593,7 +604,7 @@ object srvFacturasProforma: TsrvFacturasProforma
item
Name = 'ID'
DataType = datAutoInc
- GeneratorName = 'GEN_FACTURA_CLIENTE_DET_ID'
+ GeneratorName = 'GEN_FACTURAS_PROFORMA_DET_ID'
Value = ''
end
item
@@ -1033,6 +1044,8 @@ object srvFacturasProforma: TsrvFacturasProforma
end
item
Name = 'SITUACION'
+ DataType = datString
+ Size = 255
Value = ''
end
item
@@ -1181,14 +1194,18 @@ object srvFacturasProforma: TsrvFacturasProforma
end
item
Name = 'REFERENCIA_CLIENTE'
+ DataType = datString
+ Size = 255
Value = ''
end
item
Name = 'ID_PEDIDO'
+ DataType = datInteger
Value = ''
end
item
Name = 'ID_FACTURA_FINAL'
+ DataType = datInteger
Value = ''
end
item
@@ -1287,302 +1304,6 @@ object srvFacturasProforma: TsrvFacturasProforma
end
object DataDictionary: TDADataDictionary
Fields = <
- item
- Name = 'FacturasCliente_CLIENTE_FINAL'
- DataType = datString
- Size = 255
- DisplayLabel = 'Cliente final'
- end
- item
- Name = 'FacturasCliente_ID'
- DataType = datAutoInc
- GeneratorName = 'GEN_FACTURAS_CLIENTE_ID'
- Required = True
- DisplayLabel = 'ID'
- ServerAutoRefresh = True
- end
- item
- Name = 'FacturasCliente_ID_EMPRESA'
- DataType = datInteger
- DisplayLabel = 'ID_EMPRESA'
- end
- item
- Name = 'FacturasCliente_FECHA_FACTURA'
- DataType = datDateTime
- DisplayLabel = 'Fecha de las factura'
- end
- item
- Name = 'FacturasCliente_VENCIMIENTO'
- DataType = datInteger
- DisplayLabel = 'Vencimiento'
- end
- item
- Name = 'FacturasCliente_SITUACION'
- DataType = datString
- Size = 255
- DisplayLabel = 'Situaci'#243'n'
- end
- item
- Name = 'FacturasCliente_BASE_IMPONIBLE'
- DataType = datCurrency
- DisplayLabel = 'Base imponible'
- Alignment = taRightJustify
- end
- item
- Name = 'FacturasCliente_IMPORTE_DESCUENTO'
- DataType = datCurrency
- DisplayLabel = 'Importe dto.'
- Alignment = taRightJustify
- end
- item
- Name = 'FacturasCliente_IMPORTE_IVA'
- DataType = datCurrency
- DisplayLabel = 'Importe IVA'
- Alignment = taRightJustify
- end
- item
- Name = 'FacturasCliente_IMPORTE_TOTAL'
- DataType = datCurrency
- DisplayLabel = 'Importe total'
- Alignment = taRightJustify
- end
- item
- Name = 'FacturasCliente_FORMA_PAGO'
- DataType = datMemo
- DisplayLabel = 'Forma de pago'
- end
- item
- Name = 'FacturasCliente_ID_CLIENTE'
- DataType = datInteger
- DisplayLabel = 'ID_CLIENTE'
- end
- item
- Name = 'FacturasCliente_NIF_CIF'
- DataType = datString
- Size = 15
- DisplayLabel = 'NIF/CIF'
- end
- item
- Name = 'FacturasCliente_CODIGO_POSTAL'
- DataType = datString
- Size = 10
- DisplayLabel = 'C'#243'd. postal'
- end
- item
- Name = 'FacturasCliente_FECHA_ALTA'
- DataType = datDateTime
- DisplayLabel = 'FECHA_ALTA'
- end
- item
- Name = 'FacturasCliente_FECHA_MODIFICACION'
- DataType = datDateTime
- DisplayLabel = 'FECHA_MODIFICACION'
- end
- item
- Name = 'FacturasCliente_OBSERVACIONES'
- DataType = datMemo
- DisplayLabel = 'Observaciones'
- end
- item
- Name = 'FacturasCliente_NOMBRE'
- DataType = datString
- Size = 100
- DisplayLabel = 'Cliente'
- end
- item
- Name = 'FacturasCliente_CALLE'
- DataType = datString
- Size = 150
- DisplayLabel = 'Direcci'#243'n'
- end
- item
- Name = 'FacturasCliente_PROVINCIA'
- DataType = datString
- Size = 30
- DisplayLabel = 'Provincia'
- end
- item
- Name = 'FacturasCliente_POBLACION'
- DataType = datString
- Size = 150
- DisplayLabel = 'Poblaci'#243'n'
- end
- item
- Name = 'FacturasCliente_IVA'
- DataType = datFloat
- DisplayLabel = 'IVA'
- Alignment = taRightJustify
- end
- item
- Name = 'FacturasCliente_USUARIO'
- DataType = datString
- Size = 100
- DisplayLabel = 'USUARIO'
- end
- item
- Name = 'FacturasCliente_DESCUENTO'
- DataType = datFloat
- DisplayLabel = 'Dto.'
- Alignment = taRightJustify
- end
- item
- Name = 'FacturasCliente_Detalles_ID'
- DataType = datAutoInc
- GeneratorName = 'GEN_FACTURA_CLIENTE_DETALLES_ID'
- Required = True
- DisplayLabel = 'ID'
- ServerAutoRefresh = True
- end
- item
- Name = 'FacturasCliente_Detalles_ID_FACTURA'
- DataType = datInteger
- DisplayLabel = 'ID_FACTURA'
- end
- item
- Name = 'FacturasCliente_Detalles_TIPO_DETALLE'
- DataType = datString
- Size = 25
- DisplayLabel = 'Tipo detalle'
- end
- item
- Name = 'FacturasCliente_Detalles_CONCEPTO'
- DataType = datString
- Size = 2000
- DisplayLabel = 'Concepto'
- end
- item
- Name = 'FacturasCliente_Detalles_IMPORTE_UNIDAD'
- DataType = datCurrency
- DisplayLabel = 'Importe unidad'
- Alignment = taRightJustify
- end
- item
- Name = 'FacturasCliente_Detalles_IMPORTE_TOTAL'
- DataType = datCurrency
- DisplayLabel = 'Importe total'
- Alignment = taRightJustify
- end
- item
- Name = 'FacturasCliente_Detalles_VISIBLE'
- DataType = datInteger
- DisplayLabel = #191'Visible?'
- end
- item
- Name = 'FacturasCliente_Detalles_POSICION'
- DataType = datInteger
- DisplayLabel = 'Posici'#243'n'
- end
- item
- Name = 'FacturasCliente_Detalles_CANTIDAD'
- DataType = datFloat
- DisplayLabel = 'Cantidad'
- end
- item
- Name = 'FacturasCliente_FECHA_PAGADO'
- DataType = datDateTime
- DisplayLabel = 'Fecha de pago'
- end
- item
- Name = 'FacturasCliente_FECHA_VENCIMIENTO'
- DataType = datDateTime
- DisplayLabel = 'Fecha de vencimiento'
- ServerAutoRefresh = True
- end
- item
- Name = 'FacturasCliente_RE'
- DataType = datFloat
- DisplayLabel = 'RE'
- Alignment = taRightJustify
- end
- item
- Name = 'FacturasCliente_IMPORTE_RE'
- DataType = datCurrency
- DisplayLabel = 'Importe RE'
- Alignment = taRightJustify
- end
- item
- Name = 'FacturasCliente_REFERENCIA'
- DataType = datString
- Size = 20
- DisplayLabel = 'Referencia'
- ServerAutoRefresh = True
- end
- item
- Name = 'FacturasCliente_ID_FORMA_PAGO'
- DataType = datInteger
- end
- item
- Name = 'FacturasCliente_IMPORTE_NETO'
- DataType = datCurrency
- DisplayLabel = 'Importe neto'
- Alignment = taRightJustify
- end
- item
- Name = 'FacturasCliente_IMPORTE_PORTE'
- DataType = datCurrency
- DisplayLabel = 'Importe del porte'
- Alignment = taRightJustify
- end
- item
- Name = 'FacturasCliente_RECARGO_EQUIVALENCIA'
- DataType = datSmallInt
- DisplayLabel = #191'Con R.E.?'
- end
- item
- Name = 'FacturasCliente_TIPO'
- DataType = datString
- Size = 1
- DisplayLabel = 'Tipo'
- end
- item
- Name = 'FacturasCliente_ID_TIPO_IVA'
- DataType = datInteger
- DisplayLabel = 'ID_TIPO_IVA'
- end
- item
- Name = 'FacturasCliente_ID_COMISION_LIQUIDADA'
- DataType = datInteger
- DisplayLabel = 'ID_COMISION_LIQUIDADA'
- end
- item
- Name = 'FacturasCliente_REFERENCIA_COMISION'
- DataType = datString
- Size = 255
- DisplayLabel = 'REFERENCIA_COMISION'
- end
- item
- Name = 'FacturasCliente_ID_AGENTE'
- DataType = datInteger
- DisplayLabel = 'ID_AGENTE'
- end
- item
- Name = 'FacturasCliente_Detalles_ID_ARTICULO'
- DataType = datInteger
- end
- item
- Name = 'FacturasCliente_Detalles_DESCUENTO'
- DataType = datFloat
- end
- item
- Name = 'FacturasCliente_Detalles_IMPORTE_PORTE'
- DataType = datCurrency
- end
- item
- Name = 'FacturasCliente_Detalles_REFERENCIA'
- DataType = datString
- Size = 255
- end
- item
- Name = 'FacturasCliente_Detalles_REFERENCIA_PROVEEDOR'
- DataType = datString
- Size = 255
- end
- item
- Name = 'FacturasCliente_DATOS_BANCARIOS'
- DataType = datString
- Size = 255
- DisplayLabel = 'Datos bancarios'
- end
item
Name = 'FacturasProforma_ID'
DataType = datAutoInc
@@ -1754,12 +1475,6 @@ object srvFacturasProforma: TsrvFacturasProforma
DataType = datString
Size = 255
end
- item
- Name = 'FacturasProforma_Detalles_ID'
- DataType = datAutoInc
- GeneratorName = 'GEN_FACTURAS_PROFORMA_DETALLES_ID'
- DisplayLabel = 'ID'
- end
item
Name = 'FacturasProforma_Detalles_ID_FACTURA'
DataType = datInteger
@@ -1810,6 +1525,13 @@ object srvFacturasProforma: TsrvFacturasProforma
Name = 'FacturasProforma_Detalles_REFERENCIA_PROVEEDOR'
DataType = datString
Size = 255
+ end
+ item
+ Name = 'FacturasProforma_Detalles_ID'
+ DataType = datAutoInc
+ GeneratorName = 'GEN_FACTURAS_PROFORMA_DET_ID'
+ DisplayLabel = 'ID'
+ ServerAutoRefresh = True
end>
Left = 150
Top = 22
@@ -1824,7 +1546,7 @@ object srvFacturasProforma: TsrvFacturasProforma
DeleteCommandName = 'Delete_FacturasProforma'
UpdateCommandName = 'Update_FacturasProforma'
ReferencedDataset = 'FacturasProforma'
- ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands]
+ ProcessorOptions = [poPrepareCommands]
UpdateMode = updWhereKeyOnly
Left = 248
Top = 24
@@ -1835,7 +1557,7 @@ object srvFacturasProforma: TsrvFacturasProforma
DeleteCommandName = 'Delete_FacturasProforma_Detalles'
UpdateCommandName = 'Update_FacturasProforma_Detalles'
ReferencedDataset = 'FacturasProforma_Detalles'
- ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands]
+ ProcessorOptions = [poPrepareCommands]
UpdateMode = updWhereKeyOnly
Left = 248
Top = 77
diff --git a/Source/Modulos/Facturas proforma/Views/FacturasProforma_view.dpk b/Source/Modulos/Facturas proforma/Views/FacturasProforma_view.dpk
index 0cf5cac..9d79649 100644
--- a/Source/Modulos/Facturas proforma/Views/FacturasProforma_view.dpk
+++ b/Source/Modulos/Facturas proforma/Views/FacturasProforma_view.dpk
@@ -29,7 +29,6 @@ requires
GUIBase,
ApplicationBase,
Contactos_view,
- Articulos_view,
rtl,
vcl,
cxLibraryD11,
@@ -66,7 +65,8 @@ requires
Jcl,
JvCoreD11R,
JvSystemD11R,
- JvPageCompsD11R;
+ JvPageCompsD11R,
+ Articulos_view;
contains
uFacturasProformaViewRegister in 'uFacturasProformaViewRegister.pas',
diff --git a/Source/Modulos/Facturas proforma/Views/FacturasProforma_view.dproj b/Source/Modulos/Facturas proforma/Views/FacturasProforma_view.dproj
index 6b17d0d..274e01a 100644
--- a/Source/Modulos/Facturas proforma/Views/FacturasProforma_view.dproj
+++ b/Source/Modulos/Facturas proforma/Views/FacturasProforma_view.dproj
@@ -49,42 +49,48 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
TForm
@@ -98,7 +104,7 @@
TForm
-
+
TForm
@@ -133,12 +139,6 @@
TFrame
-
-
-
-
-
-