diff --git a/Database/VISTAS.SQL b/Database/VISTAS.SQL
index 33de6d16..d72fc201 100644
--- a/Database/VISTAS.SQL
+++ b/Database/VISTAS.SQL
@@ -1088,7 +1088,8 @@ CREATE VIEW V_ALBARANES_CLIENTE(
ID_AGENTE,
AGENTE,
NUM_COPIAS,
- NUM_CORREOS)
+ NUM_CORREOS,
+ BLOQUEADO)
AS
SELECT
ALBARANES_CLIENTE.ID,
@@ -1137,7 +1138,8 @@ SELECT
CLIENTES_DATOS.ID_AGENTE,
AGENTES.NOMBRE,
IMPRESIONES.NUM_COPIAS,
- REGISTRO_CORREOS.NUM_CORREOS
+ REGISTRO_CORREOS.NUM_CORREOS,
+ CLIENTES_DATOS.BLOQUEADO
FROM
ALBARANES_CLIENTE
diff --git a/Source/Iconos/Generales/16x16/Thumbs.db b/Source/Iconos/Generales/16x16/Thumbs.db
index a90cf8b6..cfd40c7c 100644
Binary files a/Source/Iconos/Generales/16x16/Thumbs.db and b/Source/Iconos/Generales/16x16/Thumbs.db differ
diff --git a/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.bdsgroup b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.bdsgroup
index 853c89b6..6ebc10ec 100644
--- a/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.bdsgroup
+++ b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.bdsgroup
@@ -8,7 +8,9 @@
-
+
+
+
..\..\DataAbstract_D10\DataAbstract_D10.bdsproj
..\..\Base\Base.bdsproj
..\..\Base\ControllerBase\ControllerBase.bdsproj
@@ -23,7 +25,9 @@
..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.bdsproj
Views\AlbaranesCliente_view.bdsproj
Plugin\AlbaranesCliente_plugin.bdsproj
- DataAbstract_D10.bpl Base.bpl ControllerBase.bpl GUIBase.bpl Contactos_view.bpl Articulos_view.bpl AlbaranesCliente_model.bpl AlbaranesCliente_data.bpl AlbaranesCliente_controller.bpl FacturasCliente_controller.bpl PedCli_AlbCli_relation.bpl AlbCli_FacCli_relation.bpl AlbaranesCliente_view.bpl AlbaranesCliente_plugin.bpl
+ ..\..\Servidor\FactuGES_Server.bdsproj
+ ..\..\Cliente\FactuGES.bdsproj
+ DataAbstract_D10.bpl Base.bpl ControllerBase.bpl GUIBase.bpl Contactos_view.bpl Articulos_view.bpl AlbaranesCliente_model.bpl AlbaranesCliente_data.bpl AlbaranesCliente_controller.bpl FacturasCliente_controller.bpl PedCli_AlbCli_relation.bpl AlbCli_FacCli_relation.bpl AlbaranesCliente_view.bpl AlbaranesCliente_plugin.bpl FactuGES_Server.exe FactuGES.exe
diff --git a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm
index 805a5dff..c4aa0364 100644
--- a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm
+++ b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm
@@ -691,6 +691,17 @@ object DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente
Calculated = False
Lookup = False
LookupCache = False
+ end
+ item
+ Name = 'BLOQUEADO'
+ DataType = datInteger
+ BlobType = dabtUnknown
+ DisplayWidth = 0
+ Alignment = taLeftJustify
+ InPrimaryKey = False
+ Calculated = False
+ Lookup = False
+ LookupCache = False
end>
Params = <>
MasterMappingMode = mmDataRequest
diff --git a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas
index 88469101..5f5a1dc7 100644
--- a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas
+++ b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas
@@ -9,11 +9,11 @@ const
{ Data table rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
- RID_DarReferencia = '{7910182F-C750-477D-95BF-08F2A32DBBC9}';
- RID_AlbaranesCliente = '{8E92D862-BB47-4D2E-B022-9AE333F45CFB}';
- RID_AlbaranesCliente_Detalles = '{4789ECDF-65FC-4F74-A7FD-70CE7881AE7F}';
- RID_AlbaranesCliente_Detalles_Refresh = '{64EE6606-7337-4ED8-A39A-726558E9C79F}';
- RID_AlbaranesCliente_Refresh = '{CBA10CA3-9CE3-4197-8B89-A71F88321C1D}';
+ RID_DarReferencia = '{6E198309-9D28-4477-9CA0-EB9D2D66816E}';
+ RID_AlbaranesCliente = '{427DEED0-B45E-416C-9691-878364B1D157}';
+ RID_AlbaranesCliente_Detalles = '{F872903B-5A03-4005-9BC7-BF23C732C514}';
+ RID_AlbaranesCliente_Detalles_Refresh = '{34528702-5411-427E-A31E-AD548FE013DB}';
+ RID_AlbaranesCliente_Refresh = '{75C41D7C-87F3-4135-94D8-64EB689EEED2}';
{ Data table names }
nme_DarReferencia = 'DarReferencia';
@@ -76,6 +76,7 @@ const
fld_AlbaranesClienteID_FAC_ALB_DEV = 'ID_FAC_ALB_DEV';
fld_AlbaranesClienteREFERENCIA_FAC_ALB_DEV = 'REFERENCIA_FAC_ALB_DEV';
fld_AlbaranesClienteNUM_CORREOS = 'NUM_CORREOS';
+ fld_AlbaranesClienteBLOQUEADO = 'BLOQUEADO';
{ AlbaranesCliente field indexes }
idx_AlbaranesClienteID = 0;
@@ -125,6 +126,7 @@ const
idx_AlbaranesClienteID_FAC_ALB_DEV = 44;
idx_AlbaranesClienteREFERENCIA_FAC_ALB_DEV = 45;
idx_AlbaranesClienteNUM_CORREOS = 46;
+ idx_AlbaranesClienteBLOQUEADO = 47;
{ AlbaranesCliente_Detalles fields }
fld_AlbaranesCliente_DetallesID = 'ID';
@@ -295,7 +297,7 @@ const
type
{ IDarReferencia }
IDarReferencia = interface(IDAStronglyTypedDataTable)
- ['{B26C0C4F-CE5F-493E-A95B-CF00900E04AA}']
+ ['{161D1427-0B1E-4930-99D1-32771941E834}']
{ Property getters and setters }
function GetVALORValue: String;
procedure SetVALORValue(const aValue: String);
@@ -324,7 +326,7 @@ type
{ IAlbaranesCliente }
IAlbaranesCliente = interface(IDAStronglyTypedDataTable)
- ['{BBC4A28E-F0DC-478F-9BC2-080337DC7917}']
+ ['{D1B387DE-6B5E-4E62-9D66-DCAE4650B924}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -420,6 +422,8 @@ type
procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String);
function GetNUM_CORREOSValue: Integer;
procedure SetNUM_CORREOSValue(const aValue: Integer);
+ function GetBLOQUEADOValue: Integer;
+ procedure SetBLOQUEADOValue(const aValue: Integer);
{ Properties }
@@ -470,6 +474,7 @@ type
property ID_FAC_ALB_DEV: Integer read GetID_FAC_ALB_DEVValue write SetID_FAC_ALB_DEVValue;
property REFERENCIA_FAC_ALB_DEV: String read GetREFERENCIA_FAC_ALB_DEVValue write SetREFERENCIA_FAC_ALB_DEVValue;
property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
+ property BLOQUEADO: Integer read GetBLOQUEADOValue write SetBLOQUEADOValue;
end;
{ TAlbaranesClienteDataTableRules }
@@ -571,6 +576,8 @@ type
procedure SetREFERENCIA_FAC_ALB_DEVValue(const aValue: String); virtual;
function GetNUM_CORREOSValue: Integer; virtual;
procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
+ function GetBLOQUEADOValue: Integer; virtual;
+ procedure SetBLOQUEADOValue(const aValue: Integer); virtual;
{ Properties }
property ID: Integer read GetIDValue write SetIDValue;
@@ -620,6 +627,7 @@ type
property ID_FAC_ALB_DEV: Integer read GetID_FAC_ALB_DEVValue write SetID_FAC_ALB_DEVValue;
property REFERENCIA_FAC_ALB_DEV: String read GetREFERENCIA_FAC_ALB_DEVValue write SetREFERENCIA_FAC_ALB_DEVValue;
property NUM_CORREOS: Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
+ property BLOQUEADO: Integer read GetBLOQUEADOValue write SetBLOQUEADOValue;
public
constructor Create(aDataTable: TDADataTable); override;
@@ -629,7 +637,7 @@ type
{ IAlbaranesCliente_Detalles }
IAlbaranesCliente_Detalles = interface(IDAStronglyTypedDataTable)
- ['{BF1D2AA9-5A6E-422D-8D86-CAF9E9B8EF00}']
+ ['{B24E4037-B5C6-4614-A46B-883647A0DE56}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -742,7 +750,7 @@ type
{ IAlbaranesCliente_Detalles_Refresh }
IAlbaranesCliente_Detalles_Refresh = interface(IDAStronglyTypedDataTable)
- ['{7F822116-DE0E-47B2-99E8-6D3D0BDEA474}']
+ ['{EDB2FD19-DB40-48A9-927F-438CF7EAEA89}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -855,7 +863,7 @@ type
{ IAlbaranesCliente_Refresh }
IAlbaranesCliente_Refresh = interface(IDAStronglyTypedDataTable)
- ['{7A245E1D-D2E0-4024-BF66-4682E328B476}']
+ ['{F4C1C165-FC99-4013-8201-13BC3A53C5B3}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@@ -1667,6 +1675,16 @@ begin
DataTable.Fields[idx_AlbaranesClienteNUM_CORREOS].AsInteger := aValue;
end;
+function TAlbaranesClienteDataTableRules.GetBLOQUEADOValue: Integer;
+begin
+ result := DataTable.Fields[idx_AlbaranesClienteBLOQUEADO].AsInteger;
+end;
+
+procedure TAlbaranesClienteDataTableRules.SetBLOQUEADOValue(const aValue: Integer);
+begin
+ DataTable.Fields[idx_AlbaranesClienteBLOQUEADO].AsInteger := aValue;
+end;
+
{ TAlbaranesCliente_DetallesDataTableRules }
constructor TAlbaranesCliente_DetallesDataTableRules.Create(aDataTable: TDADataTable);
diff --git a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas
index 1724b981..cdcfebd4 100644
--- a/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas
+++ b/Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_Intf.pas
@@ -9,16 +9,16 @@ const
{ Delta rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
- RID_DarReferenciaDelta = '{DD15293A-3280-426D-9927-112CDD3205BC}';
- RID_AlbaranesClienteDelta = '{E62B1307-F6FC-424A-9975-21616BE7FDB2}';
- RID_AlbaranesCliente_DetallesDelta = '{703B8F12-1E88-4317-8E66-66F53506A042}';
- RID_AlbaranesCliente_Detalles_RefreshDelta = '{76996524-4884-49A1-B1AA-8A141E887553}';
- RID_AlbaranesCliente_RefreshDelta = '{3728694F-04C7-4B85-95C0-E03375F3DE53}';
+ RID_DarReferenciaDelta = '{F5B4C4C3-C729-4547-87F6-03DBAC94A16C}';
+ RID_AlbaranesClienteDelta = '{6BB65B45-5F5A-4D5B-81BE-A0E323B271D3}';
+ RID_AlbaranesCliente_DetallesDelta = '{983E8353-C226-4781-BFC0-41B9FD033718}';
+ RID_AlbaranesCliente_Detalles_RefreshDelta = '{9AB519AF-EFCD-467E-A3C2-13A7ACF9BA27}';
+ RID_AlbaranesCliente_RefreshDelta = '{2AC22218-4783-4C52-8DD3-7F7DAD417657}';
type
{ IDarReferenciaDelta }
IDarReferenciaDelta = interface(IDarReferencia)
- ['{DD15293A-3280-426D-9927-112CDD3205BC}']
+ ['{F5B4C4C3-C729-4547-87F6-03DBAC94A16C}']
{ Property getters and setters }
function GetOldVALORValue : String;
@@ -47,7 +47,7 @@ type
{ IAlbaranesClienteDelta }
IAlbaranesClienteDelta = interface(IAlbaranesCliente)
- ['{E62B1307-F6FC-424A-9975-21616BE7FDB2}']
+ ['{6BB65B45-5F5A-4D5B-81BE-A0E323B271D3}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@@ -96,6 +96,7 @@ type
function GetOldID_FAC_ALB_DEVValue : Integer;
function GetOldREFERENCIA_FAC_ALB_DEVValue : String;
function GetOldNUM_CORREOSValue : Integer;
+ function GetOldBLOQUEADOValue : Integer;
{ Properties }
property OldID : Integer read GetOldIDValue;
@@ -145,6 +146,7 @@ type
property OldID_FAC_ALB_DEV : Integer read GetOldID_FAC_ALB_DEVValue;
property OldREFERENCIA_FAC_ALB_DEV : String read GetOldREFERENCIA_FAC_ALB_DEVValue;
property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
+ property OldBLOQUEADO : Integer read GetOldBLOQUEADOValue;
end;
{ TAlbaranesClienteBusinessProcessorRules }
@@ -293,6 +295,9 @@ type
function GetNUM_CORREOSValue: Integer; virtual;
function GetOldNUM_CORREOSValue: Integer; virtual;
procedure SetNUM_CORREOSValue(const aValue: Integer); virtual;
+ function GetBLOQUEADOValue: Integer; virtual;
+ function GetOldBLOQUEADOValue: Integer; virtual;
+ procedure SetBLOQUEADOValue(const aValue: Integer); virtual;
{ Properties }
property ID : Integer read GetIDValue write SetIDValue;
@@ -389,6 +394,8 @@ type
property OldREFERENCIA_FAC_ALB_DEV : String read GetOldREFERENCIA_FAC_ALB_DEVValue;
property NUM_CORREOS : Integer read GetNUM_CORREOSValue write SetNUM_CORREOSValue;
property OldNUM_CORREOS : Integer read GetOldNUM_CORREOSValue;
+ property BLOQUEADO : Integer read GetBLOQUEADOValue write SetBLOQUEADOValue;
+ property OldBLOQUEADO : Integer read GetOldBLOQUEADOValue;
public
constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -398,7 +405,7 @@ type
{ IAlbaranesCliente_DetallesDelta }
IAlbaranesCliente_DetallesDelta = interface(IAlbaranesCliente_Detalles)
- ['{703B8F12-1E88-4317-8E66-66F53506A042}']
+ ['{983E8353-C226-4781-BFC0-41B9FD033718}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_ALBARANValue : Integer;
@@ -525,7 +532,7 @@ type
{ IAlbaranesCliente_Detalles_RefreshDelta }
IAlbaranesCliente_Detalles_RefreshDelta = interface(IAlbaranesCliente_Detalles_Refresh)
- ['{76996524-4884-49A1-B1AA-8A141E887553}']
+ ['{9AB519AF-EFCD-467E-A3C2-13A7ACF9BA27}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_ALBARANValue : Integer;
@@ -652,7 +659,7 @@ type
{ IAlbaranesCliente_RefreshDelta }
IAlbaranesCliente_RefreshDelta = interface(IAlbaranesCliente_Refresh)
- ['{3728694F-04C7-4B85-95C0-E03375F3DE53}']
+ ['{2AC22218-4783-4C52-8DD3-7F7DAD417657}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@@ -1753,6 +1760,21 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteNUM_CORREOS] := aValue;
end;
+function TAlbaranesClienteBusinessProcessorRules.GetBLOQUEADOValue: Integer;
+begin
+ result := BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteBLOQUEADO];
+end;
+
+function TAlbaranesClienteBusinessProcessorRules.GetOldBLOQUEADOValue: Integer;
+begin
+ result := BusinessProcessor.CurrentChange.OldValueByName[fld_AlbaranesClienteBLOQUEADO];
+end;
+
+procedure TAlbaranesClienteBusinessProcessorRules.SetBLOQUEADOValue(const aValue: Integer);
+begin
+ BusinessProcessor.CurrentChange.NewValueByName[fld_AlbaranesClienteBLOQUEADO] := aValue;
+end;
+
{ TAlbaranesCliente_DetallesBusinessProcessorRules }
constructor TAlbaranesCliente_DetallesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
diff --git a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm
index cfefb14d..def985c4 100644
--- a/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm
+++ b/Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm
@@ -80,8 +80,8 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
'HA_ALTA,'#10' FECHA_MODIFICACION, USUARIO, ID_FORMA_PAGO, FECHA_P' +
'REVISTA_ENVIO, FECHA_ENVIO,'#10' FECHA_RECEPCION, ID_AGENTE, AGEN' +
'TE, NUM_COPIAS, ID_ALBARAN_DEV, REFERENCIA_ALB_DEV,'#10' ID_FAC_A' +
- 'LB_DEV, REFERENCIA_FAC_ALB_DEV, NUM_CORREOS'#10' FROM'#10' V_ALBARAN' +
- 'ES_CLIENTE'
+ 'LB_DEV, REFERENCIA_FAC_ALB_DEV, NUM_CORREOS, BLOQUEADO'#10' FROM'#10' ' +
+ ' V_ALBARANES_CLIENTE'
StatementType = stSQL
ColumnMappings = <
item
@@ -271,6 +271,10 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
item
DatasetField = 'NUM_CORREOS'
TableField = 'NUM_CORREOS'
+ end
+ item
+ DatasetField = 'BLOQUEADO'
+ TableField = 'BLOQUEADO'
end>
end>
Name = 'AlbaranesCliente'
@@ -763,6 +767,17 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
Calculated = False
Lookup = False
LookupCache = False
+ end
+ item
+ Name = 'BLOQUEADO'
+ DataType = datInteger
+ BlobType = dabtUnknown
+ DisplayWidth = 0
+ Alignment = taLeftJustify
+ InPrimaryKey = False
+ Calculated = False
+ Lookup = False
+ LookupCache = False
end>
BusinessRulesClient.ScriptLanguage = rslPascalScript
BusinessRulesServer.ScriptLanguage = rslPascalScript
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm
index 292805cf..261c2247 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm
@@ -61,6 +61,28 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
Width = 25
OnCustomDrawHeader = cxGridViewNUM_CORREOSCustomDrawHeader
end
+ object cxGridViewBLOQUEADO: TcxGridDBColumn
+ Caption = #191'Bloqueado?'
+ DataBinding.FieldName = 'BLOQUEADO'
+ PropertiesClassName = 'TcxImageComboBoxProperties'
+ Properties.Images = PngImageList10
+ Properties.Items = <
+ item
+ Description = '0'
+ Value = 0
+ end
+ item
+ Description = '1'
+ ImageIndex = 2
+ Tag = 1
+ Value = 1
+ end>
+ Properties.LargeImages = PngImageList10
+ BestFitMaxWidth = 25
+ MinWidth = 25
+ VisibleForCustomization = False
+ Width = 25
+ end
object cxGridViewINCIDENCIAS_ACTIVAS: TcxGridDBColumn
Caption = 'Incidencias'
DataBinding.FieldName = 'INCIDENCIAS_ACTIVAS'
@@ -189,6 +211,9 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
Options.DetailFrameColor = clNone
Options.DetailFrameWidth = 0
end
+ object cxGridLevelBloqueados: TcxGridLevel
+ Caption = 'Bloqueados'
+ end
end
inherited frViewFiltroBase1: TfrViewFiltroBase
Width = 596
@@ -198,17 +223,9 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
inherited dxLayoutControl1: TdxLayoutControl
Width = 596
ExplicitWidth = 596
- inherited txtFiltroTodo: TcxTextEdit
- ExplicitWidth = 273
- Width = 273
- end
- inherited edtFechaIniFiltro: TcxDateEdit
- ExplicitWidth = 121
- Width = 121
- end
inherited edtFechaFinFiltro: TcxDateEdit
- Left = 251
- ExplicitLeft = 251
+ Left = 317
+ ExplicitLeft = 317
ExplicitWidth = 294
Width = 294
end
@@ -273,20 +290,28 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
TextColor = clBlue
end
object cxStylePENDIENTES: TcxStyle
- AssignedValues = [svTextColor]
+ AssignedValues = [svColor, svTextColor]
+ Color = clWhite
TextColor = clGreen
end
object cxStyleENVIADOS: TcxStyle
- AssignedValues = [svTextColor]
+ AssignedValues = [svColor, svTextColor]
+ Color = clWhite
TextColor = clBlue
end
object cxStyleSERVIDOS: TcxStyle
+ AssignedValues = [svColor]
+ Color = clWhite
end
object cxStyleRETRASADOS: TcxStyle
AssignedValues = [svColor, svTextColor]
Color = 15527167
TextColor = clRed
end
+ object cxStyleBLOQUEADOS: TcxStyle
+ AssignedValues = [svColor]
+ Color = 6793212
+ end
end
inherited cxViewGridPopupMenu: TcxGridPopupMenu
Left = 280
@@ -391,6 +416,25 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
2FEEC02251018239FFBF0000000049454E44AE426082}
Name = 'PngImage1'
Background = clWindow
+ end
+ item
+ PngImage.Data = {
+ 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+ 610000000970485973000017120000171201679FD252000001664944415478DA
+ 63FCFFFF3F0325801164002323235CE05023A73990D266E3FF3E1726F6EB2367
+ 3290BA6A57FFFD244C0C66318A0130CDD679E7E622DBF2FB6627C3DCB9AB8EEA
+ CAFC2F861982CB802490E6DF2F0F32CCE8C8801B90919100A6418664CFFE6683
+ D380131318FE9BC65F67985CA8C960A4C86901B20DE42AA0774E18582430CC98
+ B180A1600103235106C014C2C4F11A70B8890B6C0BB1210F0C540BDBBA6F27E1
+ 069C9CC8F8DFC0630603ABB83D41CDB0F0C99FFF9F11C50090D3FFBDD9C7F0FF
+ EF2F04FE87603380D93F18AE9C9ECB70E202037603FEBEDC01D770ECC67D86A6
+ 69F718EAB29418CCE538C19AFFFFF9CE70F5FC32DC06FC79B6096EB367C161B8
+ B3B7B42A8335FFFBF383E1FAE575B80DF8FD780D8AB3BDCBCEA368FE0FC437AE
+ 6FC36DC0AFFB8BE1066C3EFD8C61C69A370CD1EEAC0C61269C60038004C3CDDB
+ FBB01B008A850B3B3208C602385DA01B004A07E7EE139F0E40A914251D500200
+ A1723AF0CAFCCBE70000000049454E44AE426082}
+ Name = 'PngImage2'
+ Background = clWindow
end>
Bitmap = {}
end
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas
index 43567d15..71c80c49 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas
@@ -64,6 +64,9 @@ type
cxGridViewAGENTE: TcxGridDBColumn;
cxGridViewNUM_COPIAS: TcxGridDBColumn;
cxGridViewNUM_CORREOS: TcxGridDBColumn;
+ cxGridLevelBloqueados: TcxGridLevel;
+ cxGridViewBLOQUEADO: TcxGridDBColumn;
+ cxStyleBLOQUEADOS: TcxStyle;
procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel:
TcxGridLevel);
procedure cxGridViewCODIGOCustomDrawCell(Sender: TcxCustomGridTableView;
@@ -105,7 +108,8 @@ type
implementation
-uses SysUtils, DateUtils, variants, windows, uDataModuleAlbaranesCliente, schAlbaranesClienteClient_Intf,
+uses
+ Graphics, SysUtils, DateUtils, variants, windows, uDataModuleAlbaranesCliente, schAlbaranesClienteClient_Intf,
uViewGridBase;
{$R *.dfm}
@@ -213,6 +217,11 @@ begin
FFiltro := AddFilterGrid(fboAnd);
FFiltro.AddItem(cxGridViewFECHA_PREVISTA_ENVIO, foLess, DateOf(Now), 'RETRASADOS');
end;
+ 5 : begin
+ FFiltro.AddItem(cxGridViewBLOQUEADO, foEqual, '1', '1');
+ FFiltro := AddFilterGrid(fboAnd);
+ FFiltro.AddItem(cxGridViewSITUACION, foNotEqual, SITUACION_ALBARAN_SERVIDO, SITUACION_ALBARAN_SERVIDO);
+ end;
end;
end;
@@ -328,10 +337,12 @@ procedure TfrViewAlbaranesCliente.cxGridViewStylesGetContentStyle(Sender:
var
IndiceCol: Integer;
ASituacion: string;
+
begin
inherited;
if Assigned(ARecord) then
begin
+ //ESTILO SITUACIONES
if Assigned((Sender as TcxGridDBTableView).GetColumnByFieldName(fld_AlbaranesClienteSITUACION)) then
begin
IndiceCol := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_AlbaranesClienteSITUACION).Index;
@@ -344,14 +355,22 @@ begin
else
AStyle := cxStylePENDIENTES
else
- AStyle := cxStylePENDIENTES;
+ AStyle := cxStylePENDIENTES;
end
else if ASituacion = SITUACION_ALBARAN_ENVIADO then
- AStyle := cxStyleENVIADOS
+ AStyle := cxStyleENVIADOS;
+ end
else if ASituacion = SITUACION_ALBARAN_SERVIDO then
- AStyle := cxStyleSERVIDOS;
+ AStyle := cxStyleSERVIDOS;
+ end;
+
+ //ESTILO DE BLOQUEADOS
+ if Assigned((Sender as TcxGridDBTableView).GetColumnByFieldName(fld_AlbaranesClienteBLOQUEADO)) then
+ begin
+ IndiceCol := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_AlbaranesClienteBLOQUEADO).Index;
+ if (VarToStr(ARecord.DisplayTexts[IndiceCol]) = '1') then
+ AStyle := cxStyleBLOQUEADOS;
end;
- end;
end;
function TfrViewAlbaranesCliente.GetAlbaranes: IBizAlbaranCliente;
diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr
index bdcb64bc..2a3dfee9 100644
--- a/Source/Servidor/FactuGES_Server.dpr
+++ b/Source/Servidor/FactuGES_Server.dpr
@@ -127,8 +127,6 @@ uses
schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas',
schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas',
schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas',
- schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
- schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas',
schAlbaranesProveedorClient_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas',
schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas',
schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
@@ -136,7 +134,9 @@ uses
schPedidosClienteClient_Intf in '..\Modulos\Pedidos de cliente\Model\schPedidosClienteClient_Intf.pas',
schPedidosClienteServer_Intf in '..\Modulos\Pedidos de cliente\Model\schPedidosClienteServer_Intf.pas',
schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas',
- schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas';
+ schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas',
+ schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
+ schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas';
{$R *.res}
{$R ..\Servicios\RODLFile.res}