Uecko/AbetoDesign_FactuGES2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Filtro por tarifas en articulos

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@148 93f398dd-4eb6-7a46-baf6-13f46f578da2
This commit is contained in:
roberto 2020-05-15 09:26:45 +00:00
parent 943ba6484b
commit e8c19a2c76
15 changed files with 235 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Build/Build.fbl6
View File

Binary file not shown.

96
Source/Base/Base.dproj
View File

@ -65,54 +65,54 @@
<DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\Modulos\Tarifas\adortl.dcp" />
<DCCReference Include="..\Modulos\Tarifas\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Tarifas\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Tarifas\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Tarifas\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Tarifas\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Tarifas\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Tarifas\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Tarifas\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Tarifas\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Tarifas\designide.dcp" />
<DCCReference Include="..\Modulos\Tarifas\dsnap.dcp" />
<DCCReference Include="..\Modulos\Tarifas\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Tarifas\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Tarifas\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Tarifas\GUISDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Tarifas\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Tarifas\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Tarifas\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Tarifas\Jcl.dcp" />
<DCCReference Include="..\Modulos\Tarifas\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Tarifas\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Tarifas\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Tarifas\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Tarifas\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Tarifas\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Tarifas\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Tarifas\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Tarifas\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Tarifas\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Tarifas\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Tarifas\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Tarifas\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Tarifas\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Tarifas\PluginSDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Tarifas\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Tarifas\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Tarifas\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Tarifas\rtl.dcp" />
<DCCReference Include="..\Modulos\Tarifas\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Tarifas\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Tarifas\vcl.dcp" />
<DCCReference Include="..\Modulos\Tarifas\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Tarifas\vcldb.dcp" />
<DCCReference Include="..\Modulos\Tarifas\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Tarifas\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Tarifas\vclx.dcp" />
<DCCReference Include="..\Modulos\Tarifas\xmlrtl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\adortl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\designide.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dsnap.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\GUISDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\Jcl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\PluginSDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\rtl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vcl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vcldb.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vclx.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\xmlrtl.dcp" />
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
<DCCReference Include="Conexion\uConfigurarConexion.pas">
<Form>fConfigurarConexion</Form>

2
Source/Cliente/FactuGES.dproj
View File

@ -51,7 +51,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">2</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.8.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">3</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.8.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>

BIN
Source/Cliente/FactuGES.res
View File

Binary file not shown.

5
Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm
View File

@ -249,6 +249,11 @@ inherited DataModuleArticulos: TDataModuleArticulos
Name = 'ELIMINADO'
DataType = datSmallInt
DisplayLabel = 'Eliminado'
end
item
Name = 'TARIFA'
DataType = datString
Size = 255
end>
Params = <
item

43
Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas
View File

@ -9,8 +9,8 @@ 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_Articulos = '{2C138ECF-D6E8-4443-911B-58696FF1BC19}';
RID_ArticulosParaCliente = '{C82C52D1-5EF1-4A6F-90C5-7C0C6DAB55B7}';
RID_Articulos = '{FCE45B58-C93D-4D11-B79C-5863414119A8}';
RID_ArticulosParaCliente = '{322AB9AB-809C-498B-9AF3-064681559994}';
{ Data table names }
nme_Articulos = 'Articulos';
@ -82,6 +82,7 @@ const
fld_ArticulosParaClienteID_PROVEEDOR = 'ID_PROVEEDOR';
fld_ArticulosParaClienteNOMBRE_PROVEEDOR = 'NOMBRE_PROVEEDOR';
fld_ArticulosParaClienteELIMINADO = 'ELIMINADO';
fld_ArticulosParaClienteTARIFA = 'TARIFA';
{ ArticulosParaCliente field indexes }
idx_ArticulosParaClienteID = 0;
@ -103,11 +104,12 @@ const
idx_ArticulosParaClienteID_PROVEEDOR = 16;
idx_ArticulosParaClienteNOMBRE_PROVEEDOR = 17;
idx_ArticulosParaClienteELIMINADO = 18;
idx_ArticulosParaClienteTARIFA = 19;
type
{ IArticulos }
IArticulos = interface(IDAStronglyTypedDataTable)
['{D4C9C55E-D22D-41C6-AFE7-DC03ED7268AA}']
['{4F856619-6BFA-4796-847B-9A11D27924BB}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -382,7 +384,7 @@ type
{ IArticulosParaCliente }
IArticulosParaCliente = interface(IDAStronglyTypedDataTable)
['{4741F599-3EAC-4F68-A567-30EF2A1E9AD4}']
['{E7E5C59D-B62B-4977-BC27-2152122F9007}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -459,6 +461,10 @@ type
procedure SetELIMINADOValue(const aValue: SmallInt);
function GetELIMINADOIsNull: Boolean;
procedure SetELIMINADOIsNull(const aValue: Boolean);
function GetTARIFAValue: String;
procedure SetTARIFAValue(const aValue: String);
function GetTARIFAIsNull: Boolean;
procedure SetTARIFAIsNull(const aValue: Boolean);
{ Properties }
@ -500,6 +506,8 @@ type
property NOMBRE_PROVEEDORIsNull: Boolean read GetNOMBRE_PROVEEDORIsNull write SetNOMBRE_PROVEEDORIsNull;
property ELIMINADO: SmallInt read GetELIMINADOValue write SetELIMINADOValue;
property ELIMINADOIsNull: Boolean read GetELIMINADOIsNull write SetELIMINADOIsNull;
property TARIFA: String read GetTARIFAValue write SetTARIFAValue;
property TARIFAIsNull: Boolean read GetTARIFAIsNull write SetTARIFAIsNull;
end;
{ TArticulosParaClienteDataTableRules }
@ -584,6 +592,10 @@ type
procedure SetELIMINADOValue(const aValue: SmallInt); virtual;
function GetELIMINADOIsNull: Boolean; virtual;
procedure SetELIMINADOIsNull(const aValue: Boolean); virtual;
function GetTARIFAValue: String; virtual;
procedure SetTARIFAValue(const aValue: String); virtual;
function GetTARIFAIsNull: Boolean; virtual;
procedure SetTARIFAIsNull(const aValue: Boolean); virtual;
{ Properties }
property ID: Integer read GetIDValue write SetIDValue;
@ -624,6 +636,8 @@ type
property NOMBRE_PROVEEDORIsNull: Boolean read GetNOMBRE_PROVEEDORIsNull write SetNOMBRE_PROVEEDORIsNull;
property ELIMINADO: SmallInt read GetELIMINADOValue write SetELIMINADOValue;
property ELIMINADOIsNull: Boolean read GetELIMINADOIsNull write SetELIMINADOIsNull;
property TARIFA: String read GetTARIFAValue write SetTARIFAValue;
property TARIFAIsNull: Boolean read GetTARIFAIsNull write SetTARIFAIsNull;
public
constructor Create(aDataTable: TDADataTable); override;
@ -1520,6 +1534,27 @@ begin
DataTable.Fields[idx_ArticulosParaClienteELIMINADO].AsVariant := Null;
end;
function TArticulosParaClienteDataTableRules.GetTARIFAValue: String;
begin
result := DataTable.Fields[idx_ArticulosParaClienteTARIFA].AsString;
end;
procedure TArticulosParaClienteDataTableRules.SetTARIFAValue(const aValue: String);
begin
DataTable.Fields[idx_ArticulosParaClienteTARIFA].AsString := aValue;
end;
function TArticulosParaClienteDataTableRules.GetTARIFAIsNull: boolean;
begin
result := DataTable.Fields[idx_ArticulosParaClienteTARIFA].IsNull;
end;
procedure TArticulosParaClienteDataTableRules.SetTARIFAIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_ArticulosParaClienteTARIFA].AsVariant := Null;
end;
initialization
RegisterDataTableRules(RID_Articulos, TArticulosDataTableRules);

51
Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas
View File

@ -9,13 +9,13 @@ 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_ArticulosDelta = '{0D8E9FD9-0FF5-411E-A908-0F1A11BD54F8}';
RID_ArticulosParaClienteDelta = '{F027EC4F-34AC-45F9-9FE8-F7CC81290D65}';
RID_ArticulosDelta = '{E937FC30-1124-40F5-8DD5-7F7A875BF0BD}';
RID_ArticulosParaClienteDelta = '{36B39661-C6E3-499D-8165-84207792A7CA}';
type
{ IArticulosDelta }
IArticulosDelta = interface(IArticulos)
['{0D8E9FD9-0FF5-411E-A908-0F1A11BD54F8}']
['{E937FC30-1124-40F5-8DD5-7F7A875BF0BD}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@ -290,7 +290,7 @@ type
{ IArticulosParaClienteDelta }
IArticulosParaClienteDelta = interface(IArticulosParaCliente)
['{F027EC4F-34AC-45F9-9FE8-F7CC81290D65}']
['{36B39661-C6E3-499D-8165-84207792A7CA}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@ -311,6 +311,7 @@ type
function GetOldID_PROVEEDORValue : Integer;
function GetOldNOMBRE_PROVEEDORValue : String;
function GetOldELIMINADOValue : SmallInt;
function GetOldTARIFAValue : String;
{ Properties }
property OldID : Integer read GetOldIDValue;
@ -332,6 +333,7 @@ type
property OldID_PROVEEDOR : Integer read GetOldID_PROVEEDORValue;
property OldNOMBRE_PROVEEDOR : String read GetOldNOMBRE_PROVEEDORValue;
property OldELIMINADO : SmallInt read GetOldELIMINADOValue;
property OldTARIFA : String read GetOldTARIFAValue;
end;
{ TArticulosParaClienteBusinessProcessorRules }
@ -454,6 +456,12 @@ type
function GetOldELIMINADOIsNull: Boolean; virtual;
procedure SetELIMINADOValue(const aValue: SmallInt); virtual;
procedure SetELIMINADOIsNull(const aValue: Boolean); virtual;
function GetTARIFAValue: String; virtual;
function GetTARIFAIsNull: Boolean; virtual;
function GetOldTARIFAValue: String; virtual;
function GetOldTARIFAIsNull: Boolean; virtual;
procedure SetTARIFAValue(const aValue: String); virtual;
procedure SetTARIFAIsNull(const aValue: Boolean); virtual;
{ Properties }
property ID : Integer read GetIDValue write SetIDValue;
@ -532,6 +540,10 @@ type
property ELIMINADOIsNull : Boolean read GetELIMINADOIsNull write SetELIMINADOIsNull;
property OldELIMINADO : SmallInt read GetOldELIMINADOValue;
property OldELIMINADOIsNull : Boolean read GetOldELIMINADOIsNull;
property TARIFA : String read GetTARIFAValue write SetTARIFAValue;
property TARIFAIsNull : Boolean read GetTARIFAIsNull write SetTARIFAIsNull;
property OldTARIFA : String read GetOldTARIFAValue;
property OldTARIFAIsNull : Boolean read GetOldTARIFAIsNull;
public
constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@ -1831,6 +1843,37 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteELIMINADO] := Null;
end;
function TArticulosParaClienteBusinessProcessorRules.GetTARIFAValue: String;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteTARIFA];
end;
function TArticulosParaClienteBusinessProcessorRules.GetTARIFAIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteTARIFA]);
end;
function TArticulosParaClienteBusinessProcessorRules.GetOldTARIFAValue: String;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosParaClienteTARIFA];
end;
function TArticulosParaClienteBusinessProcessorRules.GetOldTARIFAIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosParaClienteTARIFA]);
end;
procedure TArticulosParaClienteBusinessProcessorRules.SetTARIFAValue(const aValue: String);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteTARIFA] := aValue;
end;
procedure TArticulosParaClienteBusinessProcessorRules.SetTARIFAIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteTARIFA] := Null;
end;
initialization
RegisterBusinessProcessorRules(RID_ArticulosDelta, TArticulosBusinessProcessorRules);

15
Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm
View File

@ -349,9 +349,9 @@ object srvArticulos: TsrvArticulos
'S.DESCUENTO_LINEA as DESCUENTO,'#10'/*'#10' CLIENTES_DTOS_PROVEEDO' +
'RES.DESCUENTO,'#10'*/'#10' V_ARTICULOS.PRECIO_NETO,'#10' V_ARTIC' +
'ULOS.INVENTARIABLE,'#10' V_ARTICULOS.ID_PROVEEDOR,'#10' V_AR' +
'TICULOS.NOMBRE_PROVEEDOR,'#10' V_ARTICULOS.ELIMINADO'#10'FROM V_AR' +
'TICULOS'#10'LEFT OUTER JOIN CLIENTES_DATOS'#10'ON (CLIENTES_DATOS.ID_CLI' +
'ENTE = :ID_CLIENTE)'#10'where {where}'#10
'TICULOS.NOMBRE_PROVEEDOR,'#10' V_ARTICULOS.ELIMINADO,'#10' V' +
'_ARTICULOS.TARIFA'#10'FROM V_ARTICULOS'#10'LEFT OUTER JOIN CLIENTES_DATO' +
'S'#10'ON (CLIENTES_DATOS.ID_CLIENTE = :ID_CLIENTE)'#10'where {where}'#10
StatementType = stSQL
ColumnMappings = <
item
@ -430,6 +430,10 @@ object srvArticulos: TsrvArticulos
item
DatasetField = 'ELIMINADO'
TableField = 'ELIMINADO'
end
item
DatasetField = 'TARIFA'
TableField = 'TARIFA'
end>
end>
Name = 'ArticulosParaCliente'
@ -517,6 +521,11 @@ object srvArticulos: TsrvArticulos
Name = 'ELIMINADO'
DataType = datSmallInt
DisplayLabel = 'Eliminado'
end
item
Name = 'TARIFA'
DataType = datString
Size = 255
end>
end>
JoinDataTables = <>

22
Source/Modulos/Articulos/Views/uViewArticulo.dfm
View File

@ -1,6 +1,6 @@
inherited frViewArticulo: TfrViewArticulo
Width = 1136
Height = 491
Width = 451
Height = 304
Align = alClient
OnCreate = CustomViewCreate
OnDestroy = CustomViewDestroy
@ -10,19 +10,18 @@ inherited frViewArticulo: TfrViewArticulo
object dxLayoutControlArticulo: TdxLayoutControl
Left = 0
Top = 0
Width = 1136
Width = 451
Height = 481
Align = alTop
ParentBackground = True
TabOrder = 0
TabStop = False
AutoContentSizes = [acsWidth]
ExplicitTop = 7
DesignSize = (
1136
451
481)
object PngSpeedButton2: TPngSpeedButton
Left = 1091
Left = 546
Top = 28
Width = 23
Height = 22
@ -49,7 +48,7 @@ inherited frViewArticulo: TfrViewArticulo
PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled]
end
object PngSpeedButton1: TPngSpeedButton
Left = 1091
Left = 546
Top = 56
Width = 23
Height = 22
@ -123,7 +122,7 @@ inherited frViewArticulo: TfrViewArticulo
Width = 144
end
object eImagen: TcxImage
Left = 927
Left = 486
Top = 28
Properties.GraphicClassName = 'TJPEGImage'
Properties.ImmediatePost = True
@ -169,7 +168,7 @@ inherited frViewArticulo: TfrViewArticulo
Width = 70
end
inline frViewDatosYSeleccionProveedor1: TfrViewDatosYSeleccionProveedor
Left = 764
Left = 219
Top = 220
Width = 350
Height = 202
@ -182,7 +181,7 @@ inherited frViewArticulo: TfrViewArticulo
ParentFont = False
TabOrder = 15
ReadOnly = False
ExplicitLeft = 764
ExplicitLeft = 219
ExplicitTop = 220
inherited dxLayoutControl1: TdxLayoutControl
inherited edtNIFCIF: TcxDBTextEdit
@ -314,7 +313,7 @@ inherited frViewArticulo: TfrViewArticulo
Width = 86
end
object cbNoInventariable: TcxDBCheckBox
Left = 558
Left = 289
Top = 163
Caption = 'Art'#237'culo no inventariable'
DataBinding.DataField = 'INVENTARIABLE'
@ -398,6 +397,7 @@ inherited frViewArticulo: TfrViewArticulo
Top = 55
DataBinding.DataField = 'TARIFA'
DataBinding.DataSource = dsViewArticulo
Properties.DropDownListStyle = lsEditFixedList
Properties.DropDownRows = 16
Properties.ImmediatePost = True
Properties.OnInitPopup = cbTarifaPropertiesInitPopup

10
Source/Modulos/Articulos/Views/uViewArticulos.dfm
View File

@ -2,11 +2,14 @@ inherited frViewArticulos: TfrViewArticulos
Width = 896
Height = 680
OnCreate = CustomViewCreate
OnShow = CustomViewShow
ExplicitWidth = 896
ExplicitHeight = 680
inherited cxGrid: TcxGrid
Width = 896
Height = 552
RootLevelOptions.DetailTabsPosition = dtpTop
OnActiveTabChanged = cxGridActiveTabChanged
ExplicitWidth = 896
ExplicitHeight = 552
inherited cxGridView: TcxGridDBTableView
@ -178,6 +181,13 @@ inherited frViewArticulos: TfrViewArticulos
Width = 158
end
end
inherited cxGridLevel: TcxGridLevel
Caption = 'TARIFA 2020'
end
object cxGridLevel1: TcxGridLevel
Tag = 1
Caption = 'TARIFAS ANTERIORES'
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase
Width = 896

52
Source/Modulos/Articulos/Views/uViewArticulos.pas
View File

@ -44,6 +44,7 @@ type
cxGridViewPRECIO_PVP: TcxGridDBColumn;
cxGridViewPRECIOPVP2: TcxGridDBColumn;
cxGridViewTARIFA: TcxGridDBColumn;
cxGridLevel1: TcxGridLevel;
procedure cxGridViewIDCustomDrawCell(
Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
@ -55,6 +56,8 @@ type
procedure cxGridViewPRECIOPVP2GetDisplayText(Sender: TcxCustomGridTableItem;
ARecord: TcxCustomGridRecord; var AText: string);
procedure CustomViewCreate(Sender: TObject);
procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel);
procedure CustomViewShow(Sender: TObject);
protected
FPrecioPunto: Currency;
FArticulos: IBizArticulo;
@ -63,9 +66,15 @@ type
procedure SetPrecioPunto (const AValue: Currency);
function GetPrecioPunto: Currency;
//Filtros relativos a la vista
procedure AnadirFiltroTarifa;
public
property Articulos: IBizArticulo read GetArticulos write SetArticulos;
property PrecioPunto : Currency read GetPrecioPunto write SetPrecioPunto;
procedure AnadirOtrosFiltros; override;
end;
implementation
@ -146,12 +155,55 @@ begin
(Sender as TAction).Checked := not (cxGridViewNOMBRE_PROVEEDOR.GroupIndex < 0);
end;
procedure TfrViewArticulos.AnadirFiltroTarifa;
var
FFiltro : TcxFilterCriteriaItemList;
begin
FFiltro := AddFilterGrid(fboAnd);
case cxGrid.ActiveLevel.Index of
0 : FFiltro.AddItem(cxGridViewTARIFA, foEqual, 'TARIFA 2020', 'TARIFA 2020');
1 : FFiltro.AddItem(cxGridViewTARIFA, foNotEqual, 'TARIFA 2020', 'ARTICULOS DE OTRAS TARIFAS');
end;
end;
procedure TfrViewArticulos.AnadirOtrosFiltros;
begin
inherited;
AnadirFiltroTarifa;
//Finalmente activamos el filtro si tenemos algo
if cxGridView.DataController.Filter.IsEmpty
then cxGridView.DataController.Filter.Active := False
else cxGridView.DataController.Filter.Active := True;
cxGrid.ActiveLevel.GridView := cxGridView;
end;
procedure TfrViewArticulos.CustomViewCreate(Sender: TObject);
begin
inherited;
PrecioPunto := AppFactuGES.EmpresaActiva.PRECIO_PUNTO;
end;
procedure TfrViewArticulos.CustomViewShow(Sender: TObject);
begin
inherited;
RefrescarFiltro;
end;
procedure TfrViewArticulos.cxGridActiveTabChanged(Sender: TcxCustomGrid;
ALevel: TcxGridLevel);
begin
inherited;
cxGridView.DataController.Filter.BeginUpdate;
try
RefrescarFiltro;
finally
cxGridView.DataController.Filter.EndUpdate;
end;
end;
procedure TfrViewArticulos.cxGridViewIDCustomDrawCell(
Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);

6
Source/Modulos/Presupuestos de cliente/Views/uViewElegirArticulosPresupuestosCliente.dfm
View File

@ -7,18 +7,24 @@ inherited frViewElegirArticulosPresupuestosCliente: TfrViewElegirArticulosPresup
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 457
Width = 457
end
inherited edtFechaIniFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 240
Width = 240
end
inherited edtFechaFinFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 200
Width = 200
end
end
end

5
Source/Modulos/Tarifas/Views/uEditorTarifas.pas
View File

@ -81,7 +81,7 @@ implementation
{ TfEditorTarifas }
uses
uDialogUtils;
uDialogUtils, uFactuGES_App;
function TfEditorTarifas.GetController: ITarifasController;
begin
@ -129,7 +129,8 @@ end;
procedure TfEditorTarifas.actEliminarUpdate(Sender: TObject);
begin
(Sender as TAction).Enabled := (FTarifas.DataTable.RecordCount > 0) and
(Length(ListaTarifas.SelectedItem) > 0);
(Length(ListaTarifas.SelectedItem) > 0) and
(AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR);
end;

2
Source/Servidor/FactuGES_Server.dproj
View File

@ -28,7 +28,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType/>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">2</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.8.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 20 de marzo de 2020 17:29</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">3</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.8.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.8.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 07 de mayo de 2020 13:24</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>

BIN
Source/Servidor/FactuGES_Server.res
View File

Binary file not shown.