diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index 3b0b057..6da65e5 100644 Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 4ae3ba0..adae6f9 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -65,54 +65,54 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 81821fb..1120028 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -51,7 +51,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2820FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.8.2.0FactuGESFactuGES2.8.2.0 +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2830FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.8.3.0FactuGESFactuGES2.8.3.0 File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 9c046f3..cbc977a 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm b/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm index 8f389cb..52357a4 100644 --- a/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm +++ b/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm @@ -249,6 +249,11 @@ inherited DataModuleArticulos: TDataModuleArticulos Name = 'ELIMINADO' DataType = datSmallInt DisplayLabel = 'Eliminado' + end + item + Name = 'TARIFA' + DataType = datString + Size = 255 end> Params = < item diff --git a/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas b/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas index 79d0abe..d4bdd32 100644 --- a/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas +++ b/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas @@ -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); diff --git a/Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas b/Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas index ae677ed..00f4546 100644 --- a/Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas +++ b/Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas @@ -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); diff --git a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm index a856f69..c25feeb 100644 --- a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm +++ b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm @@ -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 = <> diff --git a/Source/Modulos/Articulos/Views/uViewArticulo.dfm b/Source/Modulos/Articulos/Views/uViewArticulo.dfm index 3c61345..f5c15a5 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulo.dfm +++ b/Source/Modulos/Articulos/Views/uViewArticulo.dfm @@ -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 diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.dfm b/Source/Modulos/Articulos/Views/uViewArticulos.dfm index 3c8b3d2..2817b1d 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulos.dfm +++ b/Source/Modulos/Articulos/Views/uViewArticulos.dfm @@ -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 diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.pas b/Source/Modulos/Articulos/Views/uViewArticulos.pas index 3387b73..686e34f 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulos.pas +++ b/Source/Modulos/Articulos/Views/uViewArticulos.pas @@ -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); diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewElegirArticulosPresupuestosCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewElegirArticulosPresupuestosCliente.dfm index 2493827..0fc8ec8 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewElegirArticulosPresupuestosCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewElegirArticulosPresupuestosCliente.dfm @@ -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 diff --git a/Source/Modulos/Tarifas/Views/uEditorTarifas.pas b/Source/Modulos/Tarifas/Views/uEditorTarifas.pas index b090337..0ae7a94 100644 --- a/Source/Modulos/Tarifas/Views/uEditorTarifas.pas +++ b/Source/Modulos/Tarifas/Views/uEditorTarifas.pas @@ -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; diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 47ca073..f01539a 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -28,7 +28,7 @@ Delphi.Personality - FalseTrueFalseTrueFalse2820FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.8.2.0FactuGES (Servidor)2.8.2.0viernes, 20 de marzo de 2020 17:29 + FalseTrueFalseTrueFalse2830FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.8.3.0FactuGES (Servidor)2.8.3.0jueves, 07 de mayo de 2020 13:24 File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found FactuGES_Server.dpr diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res index 9e3420e..ae5c5b2 100644 Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ