diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index 6971afa..6c246ba 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 be8839b..206bda5 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -44,6 +44,13 @@ Package FalseTrueFalseLibreria base de FactuGESFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 + + + + + + + VCL for the Web Design Package for CodeGear RAD Studio CodeGear WebSnap Components CodeGear SOAP Components @@ -58,56 +65,56 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
TForm diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 6b752ab..00ce19a 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -52,7 +52,8 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2030FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.0.3.0FactuGES v2FactuGES v22.0.3.0 +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2100FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.1.0.0FactuGES v2FactuGES v22.1.0.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 4c32aad..1e2e333 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index b51a870..4cf8df4 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -58,34 +58,34 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/uViewFiltroBase.dfm b/Source/GUIBase/uViewFiltroBase.dfm index 96cf8aa..01cc95e 100644 --- a/Source/GUIBase/uViewFiltroBase.dfm +++ b/Source/GUIBase/uViewFiltroBase.dfm @@ -1,9 +1,9 @@ inherited frViewFiltroBase: TfrViewFiltroBase Width = 565 - Height = 137 + Height = 163 Visible = False ExplicitWidth = 565 - ExplicitHeight = 137 + ExplicitHeight = 163 object TBXDockablePanel1: TTBXDockablePanel Left = 0 Top = 0 @@ -23,7 +23,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase Left = 0 Top = 0 Width = 565 - Height = 107 + Height = 133 Align = alClient ParentBackground = True TabOrder = 0 @@ -73,10 +73,10 @@ inherited frViewFiltroBase: TfrViewFiltroBase StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' TabOrder = 1 - Width = 130 + Width = 200 end object edtFechaFinFiltro: TcxDateEdit - Left = 234 + Left = 307 Top = 37 Properties.OnChange = OnCamposFiltroChange Style.BorderColor = clWindowFrame @@ -97,10 +97,10 @@ inherited frViewFiltroBase: TfrViewFiltroBase StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' TabOrder = 2 - Width = 130 + Width = 200 end object edtFecha2FinFiltro: TcxDateEdit - Left = 234 + Left = 307 Top = 64 Enabled = False Properties.OnChange = OnCamposFiltroChange @@ -122,7 +122,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' TabOrder = 4 - Width = 130 + Width = 200 end object edtFecha2IniFiltro: TcxDateEdit Left = 87 @@ -147,7 +147,57 @@ inherited frViewFiltroBase: TfrViewFiltroBase StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' TabOrder = 3 - Width = 130 + Width = 200 + end + object edtFecha3IniFiltro: TcxDateEdit + Left = 87 + Top = 91 + Enabled = False + Properties.OnChange = OnCamposFiltroChange + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' + Style.ButtonStyle = bts3D + Style.PopupBorderStyle = epbsFrame3D + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 5 + Width = 200 + end + object edtFecha3FinFiltro: TcxDateEdit + Left = 307 + Top = 91 + Enabled = False + Properties.OnChange = OnCamposFiltroChange + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' + Style.ButtonStyle = bts3D + Style.PopupBorderStyle = epbsFrame3D + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 6 + Width = 200 end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False @@ -161,53 +211,65 @@ inherited frViewFiltroBase: TfrViewFiltroBase object dxLayoutControl1Group1: TdxLayoutGroup ShowCaption = False Hidden = True + LayoutDirection = ldHorizontal ShowBorder = False - object dxLayoutControl1Group3: TdxLayoutGroup + object dxLayoutControl1Item2: TdxLayoutItem AutoAligns = [aaVertical] - ShowCaption = False - Hidden = True - LayoutDirection = ldHorizontal - ShowBorder = False - object dxLayoutControl1Item2: TdxLayoutItem - AutoAligns = [aaVertical] - Caption = 'Entre la fecha:' - Control = edtFechaIniFiltro - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item3: TdxLayoutItem - AutoAligns = [aaVertical] - Caption = 'y' - Control = edtFechaFinFiltro - ControlOptions.ShowBorder = False - end + Caption = 'Entre la fecha:' + Control = edtFechaIniFiltro + ControlOptions.ShowBorder = False end - object dxLayoutControl1Group4: TdxLayoutGroup + object dxLayoutControl1Item3: TdxLayoutItem AutoAligns = [aaVertical] - Enabled = False - ShowCaption = False - Visible = False - Hidden = True - LayoutDirection = ldHorizontal - ShowBorder = False - object dxLayoutControl1Item5: TdxLayoutItem - AutoAligns = [aaVertical] - Caption = 'Entre fecha 2:' - Control = edtFecha2IniFiltro - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item4: TdxLayoutItem - AutoAligns = [aaVertical] - Caption = 'y' - Control = edtFecha2FinFiltro - ControlOptions.ShowBorder = False - end + Caption = 'y' + Control = edtFechaFinFiltro + ControlOptions.ShowBorder = False + end + end + object dxLayoutControl1Group2: TdxLayoutGroup + AutoAligns = [aaVertical] + ShowCaption = False + Visible = False + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item5: TdxLayoutItem + AutoAligns = [aaVertical] + Caption = 'Entre fecha 2:' + Control = edtFecha2IniFiltro + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item4: TdxLayoutItem + AutoAligns = [aaVertical] + Caption = 'y' + Control = edtFecha2FinFiltro + ControlOptions.ShowBorder = False + end + end + object dxLayoutControl1Group4: TdxLayoutGroup + AutoAligns = [aaVertical] + Enabled = False + ShowCaption = False + Visible = False + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item6: TdxLayoutItem + Caption = 'Entre fecha 3:' + Control = edtFecha3IniFiltro + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item7: TdxLayoutItem + Caption = 'y ' + Control = edtFecha3FinFiltro + ControlOptions.ShowBorder = False end end end end object TBXAlignmentPanel1: TTBXAlignmentPanel Left = 0 - Top = 107 + Top = 133 Width = 565 Height = 30 Margins.Left = 10 diff --git a/Source/GUIBase/uViewFiltroBase.pas b/Source/GUIBase/uViewFiltroBase.pas index f922594..4dddbb1 100644 --- a/Source/GUIBase/uViewFiltroBase.pas +++ b/Source/GUIBase/uViewFiltroBase.pas @@ -48,8 +48,12 @@ type edtFecha2FinFiltro: TcxDateEdit; dxLayoutControl1Item5: TdxLayoutItem; edtFecha2IniFiltro: TcxDateEdit; - dxLayoutControl1Group3: TdxLayoutGroup; dxLayoutControl1Group4: TdxLayoutGroup; + dxLayoutControl1Item6: TdxLayoutItem; + edtFecha3IniFiltro: TcxDateEdit; + dxLayoutControl1Item7: TdxLayoutItem; + edtFecha3FinFiltro: TcxDateEdit; + dxLayoutControl1Group2: TdxLayoutGroup; procedure OnCamposFiltroChange(Sender: TObject); procedure actQuitarFiltroExecute(Sender: TObject); @@ -116,6 +120,8 @@ begin edtFechaFinFiltro.Clear; edtFecha2IniFiltro.Clear; edtFecha2FinFiltro.Clear; + edtFecha3IniFiltro.Clear; + edtFecha3FinFiltro.Clear; end; procedure TfrViewFiltroBase.OnCamposFiltroChange(Sender: TObject); @@ -148,6 +154,17 @@ begin Result := False; end end; + + if not VarIsNull(edtFecha3IniFiltro.EditValue) and not VarIsNull(edtFecha3FinFiltro.EditValue) then + begin + if (edtFecha3IniFiltro.EditValue > edtFecha3FinFiltro.EditValue) then + begin + ShowWarningMessage('La fecha de inicio debe ser anterior a la fecha final'); + edtFechaIniFiltro.SetFocus; + Result := False; + end + end; + end; procedure TfrViewFiltroBase.actQuitarFiltroExecute(Sender: TObject); diff --git a/Source/GUIBase/uViewTotales.dfm b/Source/GUIBase/uViewTotales.dfm index e79581c..ba7f50f 100644 --- a/Source/GUIBase/uViewTotales.dfm +++ b/Source/GUIBase/uViewTotales.dfm @@ -1,14 +1,14 @@ inherited frViewTotales: TfrViewTotales - Width = 1064 - Height = 206 + Width = 970 + Height = 222 Align = alBottom - ExplicitWidth = 1063 - ExplicitHeight = 206 + ExplicitWidth = 970 + ExplicitHeight = 222 object dxLayoutControl1: TdxLayoutControl AlignWithMargins = True Left = 0 Top = 0 - Width = 1064 + Width = 970 Height = 217 Margins.Left = 0 Margins.Top = 0 @@ -21,15 +21,15 @@ inherited frViewTotales: TfrViewTotales AutoContentSizes = [acsWidth, acsHeight] ExplicitWidth = 451 object Bevel3: TBevel - Left = 520 + Left = 389 Top = 28 Width = 3 Height = 122 Shape = bsRightLine end object Bevel4: TBevel - Left = 632 - Top = 70 + Left = 501 + Top = 97 Width = 210 Height = 9 Shape = bsBottomLine @@ -66,8 +66,8 @@ inherited frViewTotales: TfrViewTotales Width = 93 end object ImporteIVA: TcxDBCurrencyEdit - Left = 703 - Top = 105 + Left = 572 + Top = 132 AutoSize = False DataBinding.DataField = 'IMPORTE_IVA' DataBinding.DataSource = DADataSource @@ -92,13 +92,13 @@ inherited frViewTotales: TfrViewTotales StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 9 + TabOrder = 11 Height = 21 Width = 137 end object ImporteTotal: TcxDBCurrencyEdit - Left = 633 - Top = 159 + Left = 502 + Top = 186 AutoSize = False DataBinding.DataField = 'IMPORTE_TOTAL' DataBinding.DataSource = DADataSource @@ -124,7 +124,7 @@ inherited frViewTotales: TfrViewTotales StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 12 + TabOrder = 14 Height = 21 Width = 137 end @@ -159,8 +159,8 @@ inherited frViewTotales: TfrViewTotales Width = 65 end object edtIVA: TcxDBSpinEdit - Left = 632 - Top = 105 + Left = 501 + Top = 132 AutoSize = False DataBinding.DataField = 'IVA' DataBinding.DataSource = DADataSource @@ -191,12 +191,12 @@ inherited frViewTotales: TfrViewTotales StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 8 + TabOrder = 10 Height = 21 Width = 65 end object ImporteBase: TcxDBCurrencyEdit - Left = 632 + Left = 501 Top = 28 AutoSize = False DataBinding.DataField = 'BASE_IMPONIBLE' @@ -226,8 +226,8 @@ inherited frViewTotales: TfrViewTotales Width = 92 end object edtRE: TcxDBSpinEdit - Left = 632 - Top = 132 + Left = 501 + Top = 159 AutoSize = False DataBinding.DataField = 'RE' DataBinding.DataSource = DADataSource @@ -258,13 +258,13 @@ inherited frViewTotales: TfrViewTotales StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 10 + TabOrder = 12 Height = 21 Width = 65 end object ImporteRE: TcxDBCurrencyEdit - Left = 703 - Top = 132 + Left = 572 + Top = 159 AutoSize = False DataBinding.DataField = 'IMPORTE_RE' DataBinding.DataSource = DADataSource @@ -289,7 +289,7 @@ inherited frViewTotales: TfrViewTotales StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 11 + TabOrder = 13 Height = 21 Width = 56 end @@ -387,7 +387,7 @@ inherited frViewTotales: TfrViewTotales Width = 81 end object bTiposIVA: TButton - Left = 372 + Left = 241 Top = 109 Width = 132 Height = 21 @@ -420,6 +420,72 @@ inherited frViewTotales: TfrViewTotales TabOrder = 6 Width = 219 end + object edtRetencion: TcxDBSpinEdit + Left = 501 + Top = 55 + AutoSize = False + DataBinding.DataSource = DADataSource + Enabled = False + ParentFont = False + Properties.Alignment.Horz = taRightJustify + Properties.AssignedValues.MinValue = True + Properties.DisplayFormat = ',0.00 %;-,0.00 %' + Properties.ImmediatePost = True + Properties.MaxValue = 100.000000000000000000 + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.Font.Charset = DEFAULT_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -11 + Style.Font.Name = 'Tahoma' + Style.Font.Style = [] + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + Style.TextColor = clWindowText + Style.ButtonStyle = bts3D + Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.TextColor = clWindowText + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 8 + Height = 21 + Width = 65 + end + object ImporteRetencion: TcxDBCurrencyEdit + Left = 572 + Top = 55 + AutoSize = False + DataBinding.DataSource = DADataSource + Enabled = False + ParentFont = False + Properties.Alignment.Horz = taRightJustify + Properties.ReadOnly = True + Properties.UseLeftAlignmentOnEditing = False + Properties.UseThousandSeparator = True + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.Font.Charset = DEFAULT_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -11 + Style.Font.Name = 'Tahoma' + Style.Font.Style = [] + Style.HotTrack = False + Style.LookAndFeel.NativeStyle = True + Style.TextColor = clWindowText + Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.TextColor = clWindowText + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 9 + Height = 21 + Width = 281 + end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False Hidden = True @@ -532,6 +598,25 @@ inherited frViewTotales: TfrViewTotales Control = ImporteBase ControlOptions.ShowBorder = False end + object dxLayoutControl1Group12: TdxLayoutGroup + Enabled = False + ShowCaption = False + Visible = False + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item10: TdxLayoutItem + Caption = 'Retenci'#243'n:' + Control = edtRetencion + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item17: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Control = ImporteRetencion + ControlOptions.ShowBorder = False + end + end object dxLayoutControl1Item14: TdxLayoutItem AutoAligns = [aaVertical] AlignHorz = ahClient diff --git a/Source/GUIBase/uViewTotales.pas b/Source/GUIBase/uViewTotales.pas index 7458376..ddb0468 100644 --- a/Source/GUIBase/uViewTotales.pas +++ b/Source/GUIBase/uViewTotales.pas @@ -59,6 +59,11 @@ type cbRecargoEquivalencia: TcxDBCheckBox; dxLayoutControl1Group10: TdxLayoutGroup; dxLayoutControl1Group11: TdxLayoutGroup; + dxLayoutControl1Item10: TdxLayoutItem; + edtRetencion: TcxDBSpinEdit; + dxLayoutControl1Item17: TdxLayoutItem; + ImporteRetencion: TcxDBCurrencyEdit; + dxLayoutControl1Group12: TdxLayoutGroup; public { Public declarations } end; diff --git a/Source/Modulos/Contactos/Controller/uContactosController.pas b/Source/Modulos/Contactos/Controller/uContactosController.pas index 02331dd..1daad3c 100644 --- a/Source/Modulos/Contactos/Controller/uContactosController.pas +++ b/Source/Modulos/Contactos/Controller/uContactosController.pas @@ -392,9 +392,13 @@ end;} function TContactosController.ValidarContacto(AContacto: IBizContacto): Boolean; var NifCifTratado: String; - aaa: integer; + NifValido: Boolean; + CifValido: Boolean; begin + NifValido:= false; + CifValido:= false; + if not Assigned(AContacto) then raise Exception.Create ('Contacto no asignado'); @@ -409,14 +413,12 @@ begin else begin NifCifTratado := uStringsUtils.CadLimpiaCar(AContacto.NIF_CIF); - //Si es DNI/NIF - if TryStrToInt(Copy(NifCifTratado, 1, 1), aaa) then - begin - if not uStringsUtils.comprobarLetraNIF(NifCifTratado) then - raise Exception.Create('El DNI/NIF introducido no es correcto.') - end - else if not uStringsUtils.validarCIF(NifCifTratado) then - raise Exception.Create('El CIF introducido no es correcto.') + NifValido := uStringsUtils.comprobarLetraNIF(NifCifTratado); + if not NifValido then + CifValido := uStringsUtils.validarCIF(NifCifTratado); + + if not (NifValido or CifValido) then + raise Exception.Create('El DNI/NIF/CIF introducido no es correcto.') end; // Asegurarse de valores en campos "automáticos" diff --git a/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dpk b/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dpk index 8e67390..92a9866 100644 --- a/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dpk +++ b/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dpk @@ -77,7 +77,8 @@ requires JvSystemD11R, JvPageCompsD11R, ConCli_PedProv_relation, - ConCli_RecCli_relation; + ConCli_RecCli_relation, + PresupuestosCliente_controller; contains uContratosClienteViewRegister in 'uContratosClienteViewRegister.pas', diff --git a/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj b/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj index 89bd806..5279071 100644 --- a/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj +++ b/Source/Modulos/Contratos de cliente/Views/ContratosCliente_view.dproj @@ -91,6 +91,7 @@ + diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm index b76f78f..168310b 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm @@ -1,17 +1,18 @@ inherited frViewContratosCliente: TfrViewContratosCliente Width = 903 Height = 525 + OnShow = CustomViewShow ExplicitWidth = 903 ExplicitHeight = 525 inherited cxGrid: TcxGrid - Top = 130 + Top = 160 Width = 903 - Height = 369 + Height = 339 RootLevelOptions.DetailTabsPosition = dtpTop OnActiveTabChanged = cxGridActiveTabChanged - ExplicitTop = 130 + ExplicitTop = 160 ExplicitWidth = 903 - ExplicitHeight = 369 + ExplicitHeight = 339 inherited cxGridView: TcxGridDBTableView DataController.KeyFieldNames = 'ID' DataController.Options = [dcoAnsiSort, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoGroupsAlwaysExpanded] @@ -192,81 +193,99 @@ inherited frViewContratosCliente: TfrViewContratosCliente end inherited frViewFiltroBase1: TfrViewFiltroBase Width = 903 - Height = 130 + Height = 160 ExplicitWidth = 903 - ExplicitHeight = 130 + ExplicitHeight = 160 inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 903 - ExplicitHeight = 130 + ExplicitHeight = 160 inherited dxLayoutControl1: TdxLayoutControl Width = 903 - Height = 100 + Height = 130 ExplicitWidth = 903 - ExplicitHeight = 100 + ExplicitHeight = 130 inherited txtFiltroTodo: TcxTextEdit - Left = 116 + Left = 146 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 116 + ExplicitLeft = 146 end inherited edtFechaIniFiltro: TcxDateEdit - Left = 116 + Left = 146 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 116 + ExplicitLeft = 146 ExplicitWidth = 200 Width = 200 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 333 + Left = 366 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 333 + ExplicitLeft = 366 end inherited edtFecha2FinFiltro: TcxDateEdit - Left = 333 + Left = 366 Enabled = True Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 333 - ExplicitWidth = 200 - Width = 200 + ExplicitLeft = 366 end inherited edtFecha2IniFiltro: TcxDateEdit - Left = 116 + Left = 146 Enabled = True Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 116 - ExplicitWidth = 200 - Width = 200 + ExplicitLeft = 146 + end + inherited edtFecha3IniFiltro: TcxDateEdit + Left = 146 + Enabled = True + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 146 + end + inherited edtFecha3FinFiltro: TcxDateEdit + Left = 366 + Enabled = True + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 366 end inherited dxLayoutControl1Group_Root: TdxLayoutGroup - inherited dxLayoutControl1Group1: TdxLayoutGroup - inherited dxLayoutControl1Group4: TdxLayoutGroup - Enabled = True - Visible = True - inherited dxLayoutControl1Item5: TdxLayoutItem - Caption = 'Entre fecha decisi'#243'n:' - end + inherited dxLayoutControl1Group2: TdxLayoutGroup + Visible = True + inherited dxLayoutControl1Item5: TdxLayoutItem + Caption = 'Entre fecha decisi'#243'n:' + end + end + inherited dxLayoutControl1Group4: TdxLayoutGroup + Enabled = True + Visible = True + inherited dxLayoutControl1Item6: TdxLayoutItem + Caption = 'Entre fecha prev. montaje:' end end end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Top = 100 + Top = 130 Width = 903 - ExplicitTop = 100 + ExplicitTop = 130 ExplicitWidth = 903 inherited tbxBotones: TTBXToolbar Width = 893 @@ -289,7 +308,22 @@ inherited frViewContratosCliente: TfrViewContratosCliente object TBXSeparatorItem2: TTBXSeparatorItem end object TBXItem3: TTBXItem - Action = actCliente + Action = actCocinas + end + object TBXSeparatorItem3: TTBXSeparatorItem + end + object TBXItem2: TTBXItem + Action = actBanos + end + object TBXSeparatorItem1: TTBXSeparatorItem + end + object TBXItem4: TTBXItem + Action = actElectrodomesticos + end + object TBXSeparatorItem4: TTBXSeparatorItem + end + object TBXItem5: TTBXItem + Action = actVarios end end end @@ -311,10 +345,28 @@ inherited frViewContratosCliente: TfrViewContratosCliente inherited ActionList1: TActionList Left = 200 Top = 448 - object actCliente: TAction - Caption = 'Cliente' - OnExecute = actClienteExecute - OnUpdate = actClienteUpdate + inherited actQuitarAgrupaciones: TAction + Caption = 'Todos' + end + object actCocinas: TAction + Caption = 'Cocinas' + OnExecute = actCocinasExecute + OnUpdate = actCocinasUpdate + end + object actBanos: TAction + Caption = 'Ba'#241'os' + OnExecute = actBanosExecute + OnUpdate = actBanosUpdate + end + object actElectrodomesticos: TAction + Caption = 'Electrodom'#233'sticos' + OnExecute = actElectrodomesticosExecute + OnUpdate = actElectrodomesticosUpdate + end + object actVarios: TAction + Caption = 'Varios' + OnExecute = actVariosExecute + OnUpdate = actVariosUpdate end end inherited GridPNGImageList: TPngImageList diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas index a8e1e06..8eedd26 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas @@ -33,7 +33,7 @@ type cxGridLevelAceptados: TcxGridLevel; cxStylePENDIENTES: TcxStyle; cxStyleACEPTADO: TcxStyle; - actCliente: TAction; + actCocinas: TAction; TBXSeparatorItem2: TTBXSeparatorItem; TBXItem3: TTBXItem; cxGridViewNIF_CIF: TcxGridDBColumn; @@ -53,13 +53,22 @@ type cxGridViewFECHA_PREVISTA_MONTAJE: TcxGridDBColumn; cxGridViewCAMPO_LIBRE: TcxGridDBColumn; cxGridViewLOPD: TcxGridDBColumn; + actBanos: TAction; + actElectrodomesticos: TAction; + actVarios: TAction; + TBXItem2: TTBXItem; + TBXItem4: TTBXItem; + TBXItem5: TTBXItem; + TBXSeparatorItem1: TTBXSeparatorItem; + TBXSeparatorItem3: TTBXSeparatorItem; + TBXSeparatorItem4: TTBXSeparatorItem; procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel); procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); - procedure actClienteExecute(Sender: TObject); - procedure actClienteUpdate(Sender: TObject); + procedure actCocinasExecute(Sender: TObject); + procedure actCocinasUpdate(Sender: TObject); procedure cxGridViewICONOCustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); @@ -72,11 +81,22 @@ type ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2, AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer); procedure frViewFiltroBase1actQuitarFiltroExecute(Sender: TObject); + procedure actQuitarAgrupacionesUpdate(Sender: TObject); + procedure actQuitarAgrupacionesExecute(Sender: TObject); + procedure CustomViewShow(Sender: TObject); + procedure actBanosExecute(Sender: TObject); + procedure actBanosUpdate(Sender: TObject); + procedure actElectrodomesticosExecute(Sender: TObject); + procedure actElectrodomesticosUpdate(Sender: TObject); + procedure actVariosExecute(Sender: TObject); + procedure actVariosUpdate(Sender: TObject); private + FTipoContrato: String; //Filtros relativos a la vista procedure AnadirFiltroSituaciones; procedure AnadirFiltroFechas; + procedure AnadirFiltroTipo; protected FContratos: IBizContratoCliente; @@ -91,30 +111,74 @@ implementation uses SysUtils, variants, uDataModuleContratosCliente, schContratosClienteClient_Intf, - uViewGridBase, + uViewGridBase, uPresupuestosClienteController, //uReferenciasUtils, cxVariants; {$R *.dfm} -procedure TfrViewContratosCliente.actClienteExecute(Sender: TObject); -begin - if (cxGridViewNOMBRE.GroupIndex < 0) then - begin - cxGridViewNOMBRE.GroupIndex := cxGridView.GroupedColumnCount; - cxGridViewNOMBRE.Visible := False; - end - else - begin - cxGridViewNOMBRE.GroupIndex := -1; - cxGridViewNOMBRE.Visible := True; - end; -end; - -procedure TfrViewContratosCliente.actClienteUpdate(Sender: TObject); +procedure TfrViewContratosCliente.actBanosExecute(Sender: TObject); begin inherited; - (Sender as TAction).Checked := not (cxGridViewNOMBRE.GroupIndex < 0); + FTipoContrato := CTE_BANO; + RefrescarFiltro +end; + +procedure TfrViewContratosCliente.actBanosUpdate(Sender: TObject); +begin + inherited; + (Sender as TAction).Enabled := (FTipoContrato <> CTE_BANO); +end; + +procedure TfrViewContratosCliente.actCocinasExecute(Sender: TObject); +begin + FTipoContrato := CTE_COCINA; + RefrescarFiltro +end; + +procedure TfrViewContratosCliente.actCocinasUpdate(Sender: TObject); +begin + inherited; + (Sender as TAction).Enabled := (FTipoContrato <> CTE_COCINA); +end; + +procedure TfrViewContratosCliente.actElectrodomesticosExecute(Sender: TObject); +begin + inherited; + FTipoContrato := CTE_ELECTRODOMESTICO; + RefrescarFiltro +end; + +procedure TfrViewContratosCliente.actElectrodomesticosUpdate(Sender: TObject); +begin + inherited; + (Sender as TAction).Enabled := (FTipoContrato <> CTE_ELECTRODOMESTICO); +end; + +procedure TfrViewContratosCliente.actQuitarAgrupacionesExecute(Sender: TObject); +begin + inherited; + FTipoContrato := ''; + RefrescarFiltro +end; + +procedure TfrViewContratosCliente.actQuitarAgrupacionesUpdate(Sender: TObject); +begin + inherited; + (Sender as TAction).Enabled := (FTipoContrato <> ''); +end; + +procedure TfrViewContratosCliente.actVariosExecute(Sender: TObject); +begin + inherited; + FTipoContrato := CTE_VARIOS; + RefrescarFiltro +end; + +procedure TfrViewContratosCliente.actVariosUpdate(Sender: TObject); +begin + inherited; + (Sender as TAction).Enabled := (FTipoContrato <> CTE_VARIOS); end; procedure TfrViewContratosCliente.AnadirFiltroFechas; @@ -122,12 +186,15 @@ var Columna: TcxGridDBColumn; Fecha1, Fecha2: Variant; FechaDecision1, FechaDecision2: Variant; + FechaMontaje1, FechaMontaje2: Variant; FFiltro : TcxFilterCriteriaItemList; begin Fecha1 := frViewFiltroBase1.edtFechaIniFiltro.EditValue; Fecha2 := frViewFiltroBase1.edtFechaFinFiltro.EditValue; FechaDecision1 := frViewFiltroBase1.edtFecha2IniFiltro.EditValue; FechaDecision2 := frViewFiltroBase1.edtFecha2FinFiltro.EditValue; + FechaMontaje1 := frViewFiltroBase1.edtFecha3IniFiltro.EditValue; + FechaMontaje2 := frViewFiltroBase1.edtFecha3FinFiltro.EditValue; if not VarIsNull(Fecha1) and not VarIsNull(Fecha2) then @@ -149,6 +216,16 @@ begin FFiltro.AddItem(Columna, foBetween, varArrayOf([FechaDecision1, FechaDecision2]), VarToStr(FechaDecision1) + ' and ' + VarToStr(FechaDecision2)); end; + if not VarIsNull(FechaMontaje1) + and not VarIsNull(FechaMontaje2) then + begin + cxGridView.DataController.Filter.Options := [fcoCaseInsensitive, fcoSoftCompare]; + FFiltro := AddFilterGrid(fboAnd); + + Columna := (cxGridView as TcxGridDBTableView).GetColumnByFieldName('FECHA_PREVISTA_MONTAJE'); + FFiltro.AddItem(Columna, foBetween, varArrayOf([FechaMontaje1, FechaMontaje2]), VarToStr(FechaMontaje1) + ' and ' + VarToStr(FechaMontaje2)); + end; + end; procedure TfrViewContratosCliente.AnadirFiltroSituaciones; @@ -164,12 +241,26 @@ begin end; end; +procedure TfrViewContratosCliente.AnadirFiltroTipo; +var + FFiltro : TcxFilterCriteriaItemList; +begin + FFiltro := AddFilterGrid(fboAnd); + + if (FTipoContrato <> '') then + if (FTipoContrato = CTE_COCINA) then FFiltro.AddItem(cxGridViewTIPO_CONTRATO, foEqual, CTE_COCINA, CTE_COCINA) + else if (FTipoContrato = CTE_BANO) then FFiltro.AddItem(cxGridViewTIPO_CONTRATO, foEqual, CTE_BANO, CTE_BANO) + else if (FTipoContrato = CTE_ELECTRODOMESTICO) then FFiltro.AddItem(cxGridViewTIPO_CONTRATO, foEqual, CTE_ELECTRODOMESTICO, CTE_ELECTRODOMESTICO) + else if (FTipoContrato = CTE_VARIOS) then FFiltro.AddItem(cxGridViewTIPO_CONTRATO, foEqual, CTE_VARIOS, CTE_VARIOS) +end; + procedure TfrViewContratosCliente.AnadirOtrosFiltros; begin inherited; AnadirFiltroSituaciones; AnadirFiltroFechas; + AnadirFiltroTipo; //Finalmente activamos el filtro si tenemos algo if cxGridView.DataController.Filter.IsEmpty then @@ -179,6 +270,12 @@ begin cxGrid.ActiveLevel.GridView := cxGridView; end; +procedure TfrViewContratosCliente.CustomViewShow(Sender: TObject); +begin + inherited; + FTipoContrato := ''; +end; + procedure TfrViewContratosCliente.cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel); begin inherited; diff --git a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas index 1166519..9ee2878 100644 --- a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas +++ b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas @@ -129,7 +129,7 @@ type implementation uses - uDateUtils, uNumUtils, Controls, cxControls, DB, uEditorRegistryUtils, schFacturasClienteClient_Intf, + uDADelta, uDateUtils, uNumUtils, Controls, cxControls, DB, uEditorRegistryUtils, schFacturasClienteClient_Intf, uBizContactos, uIEditorFacturasCliente, uIEditorFacturaCliente, uFactuGES_App, uDataModuleFacturasCliente, uBizDetallesFacturaCliente, uControllerDetallesBase, uDataModuleUsuarios, uDAInterfaces, uDataTableUtils, uAlbaranesClienteController, @@ -864,9 +864,11 @@ begin begin SetDataTableReadOnly(AFactura.DataTable, True); AEditor.ReadOnly := True; - AEditor.Comentario := AComentario; end; + if (AComentario <> null) then + AEditor.Comentario := AComentario; + AEditor.ShowModal; //MODO CONSULTAR (Se deja la tabla como estaba) @@ -1076,24 +1078,29 @@ begin if not Assigned(AFactura) then raise Exception.Create ('Factura no asignado: EsModificable'); -{ + if (AFactura.SITUACION <> CTE_PENDIENTE) then begin - Result := False; - AComentario := 'La factura esta parcial o totalmente pagada, por lo que no puede ser modificada'; + if (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR) + or (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA) then + AComentario := 'ATENCIÓN - La factura esta parcial o totalmente pagada, los recibos se verán modificados si cambia los importes' + else + begin + Result := False; + AComentario := 'SOLO LECTURA - La factura esta parcial o totalmente pagada, por lo que no puede ser modificada'; + end end else -} - if (AFactura.ESTADO_EJERCICIO = CTE_CERRADO) then - begin - Result := False; - AComentario := 'La factura tiene un asiento asociado en la parte contable cuyo ejercicio esta cerrado, por lo que no puede ser modificada'; - end - else if (AFactura.ASIENTO_PUNTEADO > 0) then - begin - Result := False; - AComentario := 'La factura tiene un asiento asociado en la parte contable y está punteado, por lo que no puede ser modificada'; - end; + if (AFactura.ESTADO_EJERCICIO = CTE_CERRADO) then + begin + Result := False; + AComentario := 'SOLO LECTURA - La factura tiene un asiento en caja o banco que está cerrado, por lo que no puede ser modificada'; + end + else if (AFactura.ASIENTO_PUNTEADO > 0) then + begin + Result := False; + AComentario := 'SOLO LECTURA - La factura tiene un asiento en caja o banco que está cerrado, por lo que no puede ser modificada'; + end; end; procedure TFacturasClienteController.RecalcularImportes( @@ -1254,8 +1261,12 @@ end; function TFacturasClienteController.Guardar(AFactura: IBizFacturaCliente): Boolean; var IDNuevo : Integer; + EsModificacion: Boolean; + HayCambio: TDADeltaChange; + regenerarRecibos : Boolean; begin Result := False; + regenerarRecibos := True; if not Assigned(AFactura) then raise Exception.Create ('Factura no asignada'); @@ -1263,6 +1274,8 @@ begin if not Assigned(FDetallesController) then raise Exception.Create ('Controller detalles no asignado'); + EsModificacion := (AFactura.ID > 0); + if ValidarFactura(AFactura) then begin ShowHourglassCursor; @@ -1270,11 +1283,31 @@ begin // Asegurarnos de que todos los importes están bien. RecalcularImportes(AFactura); + if EsModificacion then + begin + //Al modificar la factura, si no cambia el importe no tocamos sus recibos. + regenerarRecibos := False; + //Comprobamos si ha cambiado el importe total, para avisar de la regeneración de los recibos + HayCambio := AFactura.DataTable.Delta.FindChange(AFactura.RecNo); + if (Assigned(HayCambio)) + and (HayCambio.OldValueByName[fld_FacturasClienteIMPORTE_TOTAL] <> 0) then + begin +// showmessage(currtostr(RoundCurrency(AFactura.DataTable.FieldByName('IMPORTE_TOTAL').asVariant))); +// showmessage(currtostr(RoundCurrency(HayCambio.OldValueByName[fld_FacturasClienteIMPORTE_TOTAL]))); + if (RoundCurrency(AFactura.DataTable.FieldByName('IMPORTE_TOTAL').asVariant) <> RoundCurrency(HayCambio.OldValueByName[fld_FacturasClienteIMPORTE_TOTAL])) then + if (Application.MessageBox('Ha cambiado el importe total, por lo que se regenerarán los recibos según forma de pago asignada, ¿desea continuar?', 'Atención', MB_YESNO) = IDYES) then + regenerarRecibos := True + else + exit; + end; + end; + try AFactura.DataTable.ApplyUpdates; //Se generan los recibos automáticamente a partir de la forma de pago - GenerarRecibos(AFactura); + if regenerarRecibos then + GenerarRecibos(AFactura); Result := True; finally diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm index 675cf91..7006eb1 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm @@ -229,6 +229,10 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente object pagContenido: TTabSheet Caption = 'Contenido' ImageIndex = 1 + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 inline frViewDetallesFacturaCliente1: TfrViewDetallesFacturaCliente Left = 0 Top = 0 @@ -399,10 +403,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente TabOrder = 5 ExplicitTop = 76 ExplicitWidth = 860 - inherited lbComentario: TLabel - Width = 850 - Height = 25 - end end inline frViewTotales1: TfrViewTotales [5] Left = 0 diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm index b6c0a53..4ea76c1 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm @@ -71,6 +71,7 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente Width = 32 end object cxGridViewFECHA_FACTURA: TcxGridDBColumn + Caption = 'Fecha' DataBinding.FieldName = 'FECHA_FACTURA' PropertiesClassName = 'TcxDateEditProperties' SortIndex = 0 @@ -213,26 +214,18 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 434 - Width = 434 end inherited edtFechaIniFiltro: TcxDateEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 144 - Width = 144 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 248 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 248 - ExplicitWidth = 273 - Width = 273 end inherited edtFecha2FinFiltro: TcxDateEdit Style.LookAndFeel.SkinName = '' @@ -246,13 +239,31 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' end + inherited edtFecha3IniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end + inherited edtFecha3FinFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControl1Group2: TdxLayoutGroup + Visible = False + end + inherited dxLayoutControl1Group4: TdxLayoutGroup + Visible = False + end + end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 802 - ExplicitWidth = 802 inherited tbxBotones: TTBXToolbar Width = 792 - ExplicitWidth = 792 end end end diff --git a/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm index eec8792..6ab0b03 100644 --- a/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm @@ -279,6 +279,14 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor item Name = 'ASIENTO_PUNTEADO' DataType = datSmallInt + end + item + Name = 'RETENCION' + DataType = datFloat + end + item + Name = 'IMPORTE_RETENCION' + DataType = datCurrency end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] diff --git a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas index 65fe6e5..98dec0d 100644 --- a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas +++ b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas @@ -9,10 +9,10 @@ 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 = '{AC60C8BC-495E-48DF-A8FB-F0A1B96ED488}'; - RID_FacturasProveedor_Contratos = '{FD10948E-7DD9-44C9-B2A4-AE33442BB1C4}'; - RID_FacturasProveedor = '{02648E8D-ABE2-42AC-8CBC-0EB726128FF5}'; - RID_FacturasProveedor_Detalles = '{E3399B43-8A7A-43D5-9556-7141B2C66B6D}'; + RID_ListaAnosFacturas = '{5EC733D0-DC7F-43A8-A290-90DF3580EF60}'; + RID_FacturasProveedor_Contratos = '{8CB5511A-E896-473C-A67E-6E3141296AF8}'; + RID_FacturasProveedor = '{14B00AB0-8C72-44BF-8319-54A81E4EA612}'; + RID_FacturasProveedor_Detalles = '{C43F1F4D-4F6A-4ECD-B6DA-D66F7E6042E6}'; { Data table names } nme_ListaAnosFacturas = 'ListaAnosFacturas'; @@ -93,6 +93,8 @@ const fld_FacturasProveedorID_EJERCICIO = 'ID_EJERCICIO'; fld_FacturasProveedorESTADO_EJERCICIO = 'ESTADO_EJERCICIO'; fld_FacturasProveedorASIENTO_PUNTEADO = 'ASIENTO_PUNTEADO'; + fld_FacturasProveedorRETENCION = 'RETENCION'; + fld_FacturasProveedorIMPORTE_RETENCION = 'IMPORTE_RETENCION'; { FacturasProveedor field indexes } idx_FacturasProveedorID = 0; @@ -137,6 +139,8 @@ const idx_FacturasProveedorID_EJERCICIO = 39; idx_FacturasProveedorESTADO_EJERCICIO = 40; idx_FacturasProveedorASIENTO_PUNTEADO = 41; + idx_FacturasProveedorRETENCION = 42; + idx_FacturasProveedorIMPORTE_RETENCION = 43; { FacturasProveedor_Detalles fields } fld_FacturasProveedor_DetallesID = 'ID'; @@ -173,7 +177,7 @@ const type { IListaAnosFacturas } IListaAnosFacturas = interface(IDAStronglyTypedDataTable) - ['{FAF57A29-B041-4117-BB23-6995C053530D}'] + ['{DE768EB7-76CF-44E8-AE1E-BC2CE5BC60C2}'] { Property getters and setters } function GetANOValue: String; procedure SetANOValue(const aValue: String); @@ -208,7 +212,7 @@ type { IFacturasProveedor_Contratos } IFacturasProveedor_Contratos = interface(IDAStronglyTypedDataTable) - ['{BA21422E-6A0B-4696-9AA5-90931308ABB9}'] + ['{471034E3-DD97-4487-8564-52AA41745E50}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -351,7 +355,7 @@ type { IFacturasProveedor } IFacturasProveedor = interface(IDAStronglyTypedDataTable) - ['{A800E27C-90E1-4803-934E-F05577C89FF0}'] + ['{993E54AD-C84E-4314-A0FD-C6FC6B5C12C1}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -520,6 +524,14 @@ type procedure SetASIENTO_PUNTEADOValue(const aValue: SmallInt); function GetASIENTO_PUNTEADOIsNull: Boolean; procedure SetASIENTO_PUNTEADOIsNull(const aValue: Boolean); + function GetRETENCIONValue: Float; + procedure SetRETENCIONValue(const aValue: Float); + function GetRETENCIONIsNull: Boolean; + procedure SetRETENCIONIsNull(const aValue: Boolean); + function GetIMPORTE_RETENCIONValue: Currency; + procedure SetIMPORTE_RETENCIONValue(const aValue: Currency); + function GetIMPORTE_RETENCIONIsNull: Boolean; + procedure SetIMPORTE_RETENCIONIsNull(const aValue: Boolean); { Properties } @@ -607,6 +619,10 @@ type property ESTADO_EJERCICIOIsNull: Boolean read GetESTADO_EJERCICIOIsNull write SetESTADO_EJERCICIOIsNull; property ASIENTO_PUNTEADO: SmallInt read GetASIENTO_PUNTEADOValue write SetASIENTO_PUNTEADOValue; property ASIENTO_PUNTEADOIsNull: Boolean read GetASIENTO_PUNTEADOIsNull write SetASIENTO_PUNTEADOIsNull; + property RETENCION: Float read GetRETENCIONValue write SetRETENCIONValue; + property RETENCIONIsNull: Boolean read GetRETENCIONIsNull write SetRETENCIONIsNull; + property IMPORTE_RETENCION: Currency read GetIMPORTE_RETENCIONValue write SetIMPORTE_RETENCIONValue; + property IMPORTE_RETENCIONIsNull: Boolean read GetIMPORTE_RETENCIONIsNull write SetIMPORTE_RETENCIONIsNull; end; { TFacturasProveedorDataTableRules } @@ -783,6 +799,14 @@ type procedure SetASIENTO_PUNTEADOValue(const aValue: SmallInt); virtual; function GetASIENTO_PUNTEADOIsNull: Boolean; virtual; procedure SetASIENTO_PUNTEADOIsNull(const aValue: Boolean); virtual; + function GetRETENCIONValue: Float; virtual; + procedure SetRETENCIONValue(const aValue: Float); virtual; + function GetRETENCIONIsNull: Boolean; virtual; + procedure SetRETENCIONIsNull(const aValue: Boolean); virtual; + function GetIMPORTE_RETENCIONValue: Currency; virtual; + procedure SetIMPORTE_RETENCIONValue(const aValue: Currency); virtual; + function GetIMPORTE_RETENCIONIsNull: Boolean; virtual; + procedure SetIMPORTE_RETENCIONIsNull(const aValue: Boolean); virtual; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -869,6 +893,10 @@ type property ESTADO_EJERCICIOIsNull: Boolean read GetESTADO_EJERCICIOIsNull write SetESTADO_EJERCICIOIsNull; property ASIENTO_PUNTEADO: SmallInt read GetASIENTO_PUNTEADOValue write SetASIENTO_PUNTEADOValue; property ASIENTO_PUNTEADOIsNull: Boolean read GetASIENTO_PUNTEADOIsNull write SetASIENTO_PUNTEADOIsNull; + property RETENCION: Float read GetRETENCIONValue write SetRETENCIONValue; + property RETENCIONIsNull: Boolean read GetRETENCIONIsNull write SetRETENCIONIsNull; + property IMPORTE_RETENCION: Currency read GetIMPORTE_RETENCIONValue write SetIMPORTE_RETENCIONValue; + property IMPORTE_RETENCIONIsNull: Boolean read GetIMPORTE_RETENCIONIsNull write SetIMPORTE_RETENCIONIsNull; public constructor Create(aDataTable: TDADataTable); override; @@ -878,7 +906,7 @@ type { IFacturasProveedor_Detalles } IFacturasProveedor_Detalles = interface(IDAStronglyTypedDataTable) - ['{97643250-7BAE-41BC-80E5-C29B90428B11}'] + ['{024EFC64-A8A8-497F-891E-D4B407378FA4}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2226,6 +2254,48 @@ begin DataTable.Fields[idx_FacturasProveedorASIENTO_PUNTEADO].AsVariant := Null; end; +function TFacturasProveedorDataTableRules.GetRETENCIONValue: Float; +begin + result := DataTable.Fields[idx_FacturasProveedorRETENCION].AsFloat; +end; + +procedure TFacturasProveedorDataTableRules.SetRETENCIONValue(const aValue: Float); +begin + DataTable.Fields[idx_FacturasProveedorRETENCION].AsFloat := aValue; +end; + +function TFacturasProveedorDataTableRules.GetRETENCIONIsNull: boolean; +begin + result := DataTable.Fields[idx_FacturasProveedorRETENCION].IsNull; +end; + +procedure TFacturasProveedorDataTableRules.SetRETENCIONIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_FacturasProveedorRETENCION].AsVariant := Null; +end; + +function TFacturasProveedorDataTableRules.GetIMPORTE_RETENCIONValue: Currency; +begin + result := DataTable.Fields[idx_FacturasProveedorIMPORTE_RETENCION].AsCurrency; +end; + +procedure TFacturasProveedorDataTableRules.SetIMPORTE_RETENCIONValue(const aValue: Currency); +begin + DataTable.Fields[idx_FacturasProveedorIMPORTE_RETENCION].AsCurrency := aValue; +end; + +function TFacturasProveedorDataTableRules.GetIMPORTE_RETENCIONIsNull: boolean; +begin + result := DataTable.Fields[idx_FacturasProveedorIMPORTE_RETENCION].IsNull; +end; + +procedure TFacturasProveedorDataTableRules.SetIMPORTE_RETENCIONIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_FacturasProveedorIMPORTE_RETENCION].AsVariant := Null; +end; + { TFacturasProveedor_DetallesDataTableRules } constructor TFacturasProveedor_DetallesDataTableRules.Create(aDataTable: TDADataTable); diff --git a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas index 7ccaa61..0bbff47 100644 --- a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas +++ b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas @@ -9,15 +9,15 @@ 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 = '{11B2F55D-8E10-4744-90FE-09B9E35F2FD2}'; - RID_FacturasProveedor_ContratosDelta = '{9D428BD9-22AB-49AB-AFB2-DB1FBE62DCD9}'; - RID_FacturasProveedorDelta = '{98907E69-D7C8-4129-A683-D21D62102641}'; - RID_FacturasProveedor_DetallesDelta = '{197D0B2A-4B73-41DF-82C9-255F9DAD3A56}'; + RID_ListaAnosFacturasDelta = '{30F77C37-AF68-42B8-9656-F46D79178373}'; + RID_FacturasProveedor_ContratosDelta = '{C5F637C2-E1B3-4A3E-8C74-35548EE2B2EB}'; + RID_FacturasProveedorDelta = '{6D103885-6FF2-4452-8C98-1F805E1C3147}'; + RID_FacturasProveedor_DetallesDelta = '{4A9BB6AD-05CD-4C05-8245-1004B1C351F9}'; type { IListaAnosFacturasDelta } IListaAnosFacturasDelta = interface(IListaAnosFacturas) - ['{11B2F55D-8E10-4744-90FE-09B9E35F2FD2}'] + ['{30F77C37-AF68-42B8-9656-F46D79178373}'] { Property getters and setters } function GetOldANOValue : String; @@ -51,7 +51,7 @@ type { IFacturasProveedor_ContratosDelta } IFacturasProveedor_ContratosDelta = interface(IFacturasProveedor_Contratos) - ['{9D428BD9-22AB-49AB-AFB2-DB1FBE62DCD9}'] + ['{C5F637C2-E1B3-4A3E-8C74-35548EE2B2EB}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_FACTURAValue : Integer; @@ -193,7 +193,7 @@ type { IFacturasProveedorDelta } IFacturasProveedorDelta = interface(IFacturasProveedor) - ['{98907E69-D7C8-4129-A683-D21D62102641}'] + ['{6D103885-6FF2-4452-8C98-1F805E1C3147}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -237,6 +237,8 @@ type function GetOldID_EJERCICIOValue : Integer; function GetOldESTADO_EJERCICIOValue : String; function GetOldASIENTO_PUNTEADOValue : SmallInt; + function GetOldRETENCIONValue : Float; + function GetOldIMPORTE_RETENCIONValue : Currency; { Properties } property OldID : Integer read GetOldIDValue; @@ -281,6 +283,8 @@ type property OldID_EJERCICIO : Integer read GetOldID_EJERCICIOValue; property OldESTADO_EJERCICIO : String read GetOldESTADO_EJERCICIOValue; property OldASIENTO_PUNTEADO : SmallInt read GetOldASIENTO_PUNTEADOValue; + property OldRETENCION : Float read GetOldRETENCIONValue; + property OldIMPORTE_RETENCION : Currency read GetOldIMPORTE_RETENCIONValue; end; { TFacturasProveedorBusinessProcessorRules } @@ -541,6 +545,18 @@ type function GetOldASIENTO_PUNTEADOIsNull: Boolean; virtual; procedure SetASIENTO_PUNTEADOValue(const aValue: SmallInt); virtual; procedure SetASIENTO_PUNTEADOIsNull(const aValue: Boolean); virtual; + function GetRETENCIONValue: Float; virtual; + function GetRETENCIONIsNull: Boolean; virtual; + function GetOldRETENCIONValue: Float; virtual; + function GetOldRETENCIONIsNull: Boolean; virtual; + procedure SetRETENCIONValue(const aValue: Float); virtual; + procedure SetRETENCIONIsNull(const aValue: Boolean); virtual; + function GetIMPORTE_RETENCIONValue: Currency; virtual; + function GetIMPORTE_RETENCIONIsNull: Boolean; virtual; + function GetOldIMPORTE_RETENCIONValue: Currency; virtual; + function GetOldIMPORTE_RETENCIONIsNull: Boolean; virtual; + procedure SetIMPORTE_RETENCIONValue(const aValue: Currency); virtual; + procedure SetIMPORTE_RETENCIONIsNull(const aValue: Boolean); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -711,6 +727,14 @@ type property ASIENTO_PUNTEADOIsNull : Boolean read GetASIENTO_PUNTEADOIsNull write SetASIENTO_PUNTEADOIsNull; property OldASIENTO_PUNTEADO : SmallInt read GetOldASIENTO_PUNTEADOValue; property OldASIENTO_PUNTEADOIsNull : Boolean read GetOldASIENTO_PUNTEADOIsNull; + property RETENCION : Float read GetRETENCIONValue write SetRETENCIONValue; + property RETENCIONIsNull : Boolean read GetRETENCIONIsNull write SetRETENCIONIsNull; + property OldRETENCION : Float read GetOldRETENCIONValue; + property OldRETENCIONIsNull : Boolean read GetOldRETENCIONIsNull; + property IMPORTE_RETENCION : Currency read GetIMPORTE_RETENCIONValue write SetIMPORTE_RETENCIONValue; + property IMPORTE_RETENCIONIsNull : Boolean read GetIMPORTE_RETENCIONIsNull write SetIMPORTE_RETENCIONIsNull; + property OldIMPORTE_RETENCION : Currency read GetOldIMPORTE_RETENCIONValue; + property OldIMPORTE_RETENCIONIsNull : Boolean read GetOldIMPORTE_RETENCIONIsNull; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -720,7 +744,7 @@ type { IFacturasProveedor_DetallesDelta } IFacturasProveedor_DetallesDelta = interface(IFacturasProveedor_Detalles) - ['{197D0B2A-4B73-41DF-82C9-255F9DAD3A56}'] + ['{4A9BB6AD-05CD-4C05-8245-1004B1C351F9}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_FACTURAValue : Integer; @@ -2599,6 +2623,68 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorASIENTO_PUNTEADO] := Null; end; +function TFacturasProveedorBusinessProcessorRules.GetRETENCIONValue: Float; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorRETENCION]; +end; + +function TFacturasProveedorBusinessProcessorRules.GetRETENCIONIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorRETENCION]); +end; + +function TFacturasProveedorBusinessProcessorRules.GetOldRETENCIONValue: Float; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedorRETENCION]; +end; + +function TFacturasProveedorBusinessProcessorRules.GetOldRETENCIONIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedorRETENCION]); +end; + +procedure TFacturasProveedorBusinessProcessorRules.SetRETENCIONValue(const aValue: Float); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorRETENCION] := aValue; +end; + +procedure TFacturasProveedorBusinessProcessorRules.SetRETENCIONIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorRETENCION] := Null; +end; + +function TFacturasProveedorBusinessProcessorRules.GetIMPORTE_RETENCIONValue: Currency; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_RETENCION]; +end; + +function TFacturasProveedorBusinessProcessorRules.GetIMPORTE_RETENCIONIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_RETENCION]); +end; + +function TFacturasProveedorBusinessProcessorRules.GetOldIMPORTE_RETENCIONValue: Currency; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedorIMPORTE_RETENCION]; +end; + +function TFacturasProveedorBusinessProcessorRules.GetOldIMPORTE_RETENCIONIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedorIMPORTE_RETENCION]); +end; + +procedure TFacturasProveedorBusinessProcessorRules.SetIMPORTE_RETENCIONValue(const aValue: Currency); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_RETENCION] := aValue; +end; + +procedure TFacturasProveedorBusinessProcessorRules.SetIMPORTE_RETENCIONIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_RETENCION] := Null; +end; + { TFacturasProveedor_DetallesBusinessProcessorRules } constructor TFacturasProveedor_DetallesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); diff --git a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas index 9d5ebf6..0dafadb 100644 --- a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas +++ b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas @@ -48,6 +48,7 @@ type procedure CalcularDescuento; procedure CalcularIVA; procedure CalcularRE; + procedure CalcularRetencion; procedure CalcularBaseImponible; procedure AsignarTipoIVA (IDTipoIVA : Integer); protected @@ -77,6 +78,7 @@ type procedure DESCUENTOOnChange(Sender: TDACustomField); procedure IVAOnChange(Sender: TDACustomField); procedure REOnChange(Sender: TDACustomField); + procedure RetencionOnChange(Sender: TDACustomField); procedure SetID_TIENDAValue(const aValue: Integer); procedure SetID_SUBCUENTAValue(const aValue: Integer); @@ -160,10 +162,11 @@ begin CalcularBaseImponible; CalcularIVA; CalcularRE; + CalcularRetencion; if not Self.DataTable.Editing then Edit; - IMPORTE_TOTAL := BASE_IMPONIBLE + IMPORTE_IVA + IMPORTE_RE; + IMPORTE_TOTAL := BASE_IMPONIBLE + IMPORTE_IVA - IMPORTE_RETENCION + IMPORTE_RE; finally DataTable.Fields.FieldEventsDisabled := False; DataTable.EnableControls; @@ -184,6 +187,13 @@ begin IMPORTE_RE := (RE / 100) * BASE_IMPONIBLE; end; +procedure TBizFacturaProveedor.CalcularRetencion; +begin + if not Self.DataTable.Editing then + Edit; + IMPORTE_RETENCION := (RETENCION / 100) * BASE_IMPONIBLE; +end; + constructor TBizFacturaProveedor.Create(aDataTable: TDADataTable); begin inherited; @@ -199,6 +209,7 @@ begin FieldByName(fld_FacturasProveedorDESCUENTO).OnChange := DESCUENTOOnChange; FieldByName(fld_FacturasProveedorIVA).OnChange := IVAOnChange; FieldByName(fld_FacturasProveedorRE).OnChange := REOnChange; + FieldByName(fld_FacturasProveedorRetencion).OnChange := RetencionOnChange; end; FDetallesLink := TDADataSource.Create(NIL); @@ -319,6 +330,11 @@ begin CalcularImporteTotal; end; +procedure TBizFacturaProveedor.RetencionOnChange(Sender: TDACustomField); +begin + CalcularImporteTotal; +end; + procedure TBizFacturaProveedor.SetProveedor(AValue: IBizProveedor); var bEnEdicion : Boolean; diff --git a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm index ac03da9..07b444d 100644 --- a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm +++ b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm @@ -340,6 +340,14 @@ object srvFacturasProveedor: TsrvFacturasProveedor item DatasetField = 'ASIENTO_PUNTEADO' TableField = 'ASIENTO_PUNTEADO' + end + item + DatasetField = 'RETENCION' + TableField = 'RETENCION' + end + item + DatasetField = 'IMPORTE_RETENCION' + TableField = 'IMPORTE_RETENCION' end> end> Name = 'FacturasProveedor' @@ -564,6 +572,14 @@ object srvFacturasProveedor: TsrvFacturasProveedor item Name = 'ASIENTO_PUNTEADO' DataType = datSmallInt + end + item + Name = 'RETENCION' + DataType = datFloat + end + item + Name = 'IMPORTE_RETENCION' + DataType = datCurrency end> end item @@ -803,118 +819,166 @@ object srvFacturasProveedor: TsrvFacturasProveedor end item Name = 'ID_EMPRESA' + DataType = datInteger Value = '' end item Name = 'REFERENCIA' + DataType = datString + Size = 255 Value = '' end item Name = 'REFERENCIA_PROVEEDOR' + DataType = datString + Size = 255 Value = '' end item Name = 'FECHA_FACTURA' + DataType = datDateTime Value = '' end item Name = 'FECHA_VENCIMIENTO' + DataType = datDateTime Value = '' end item Name = 'BASE_IMPONIBLE' + DataType = datCurrency Value = '' end item Name = 'DESCUENTO' + DataType = datFloat Value = '' end item Name = 'IMPORTE_DESCUENTO' + DataType = datCurrency Value = '' end item Name = 'IVA' + DataType = datFloat Value = '' end item Name = 'IMPORTE_IVA' + DataType = datCurrency Value = '' end item Name = 'RE' + DataType = datFloat Value = '' end item Name = 'IMPORTE_RE' + DataType = datCurrency Value = '' end item Name = 'IMPORTE_TOTAL' + DataType = datCurrency Value = '' end item Name = 'OBSERVACIONES' + DataType = datMemo Value = '' end item Name = 'ID_PROVEEDOR' + DataType = datInteger Value = '' end item Name = 'NIF_CIF' + DataType = datString + Size = 15 Value = '' end item Name = 'NOMBRE' + DataType = datString + Size = 255 Value = '' end item Name = 'CALLE' + DataType = datString + Size = 255 Value = '' end item Name = 'POBLACION' + DataType = datString + Size = 255 Value = '' end item Name = 'PROVINCIA' + DataType = datString + Size = 255 Value = '' end item Name = 'CODIGO_POSTAL' + DataType = datString + Size = 10 Value = '' end item Name = 'USUARIO' + DataType = datString + Size = 30 Value = '' end item Name = 'ID_FORMA_PAGO' + DataType = datInteger Value = '' end item Name = 'RECARGO_EQUIVALENCIA' + DataType = datSmallInt Value = '' end item Name = 'ID_TIPO_IVA' + DataType = datInteger Value = '' end item Name = 'IMPORTE_NETO' + DataType = datCurrency Value = '' end item Name = 'IMPORTE_PORTE' + DataType = datCurrency Value = '' end item Name = 'IGNORAR_CONTABILIDAD' + DataType = datSmallInt Value = '' end item Name = 'ID_TIENDA' + DataType = datInteger + Value = '' + end + item + Name = 'RETENCION' + DataType = datFloat + Value = '' + end + item + Name = 'IMPORTE_RETENCION' + DataType = datCurrency Value = '' end> Statements = < @@ -930,15 +994,16 @@ object srvFacturasProveedor: TsrvFacturasProveedor 'EDOR, NIF_CIF, '#10' NOMBRE, CALLE, POBLACION, PROVINCIA, CODIGO' + '_POSTAL, '#10' FECHA_ALTA, USUARIO, ID_FORMA_PAGO,'#10' RECARGO_' + 'EQUIVALENCIA, ID_TIPO_IVA, IMPORTE_NETO, IMPORTE_PORTE, IGNORAR_' + - 'CONTABILIDAD,'#10' ID_TIENDA)'#10' VALUES'#10' (:ID, :ID_EMPRESA, :R' + - 'EFERENCIA, :REFERENCIA_PROVEEDOR,'#10' :FECHA_FACTURA, :FECHA_VE' + - 'NCIMIENTO, :BASE_IMPONIBLE, :DESCUENTO,'#10' :IMPORTE_DESCUENTO,' + - ' :IVA, :IMPORTE_IVA, :RE, :IMPORTE_RE, '#10' :IMPORTE_TOTAL, :OB' + - 'SERVACIONES, :ID_PROVEEDOR, :NIF_CIF, '#10' :NOMBRE, :CALLE, :PO' + - 'BLACION, :PROVINCIA, :CODIGO_POSTAL, '#10' CURRENT_TIMESTAMP, :U' + - 'SUARIO, :ID_FORMA_PAGO,'#10' :RECARGO_EQUIVALENCIA, :ID_TIPO_IVA' + - ', :IMPORTE_NETO, '#10' :IMPORTE_PORTE, :IGNORAR_CONTABILIDAD, :I' + - 'D_TIENDA)'#10' '#10' '#10#10 + 'CONTABILIDAD,'#10' ID_TIENDA, RETENCION, IMPORTE_RETENCION)'#10' VA' + + 'LUES'#10' (:ID, :ID_EMPRESA, :REFERENCIA, :REFERENCIA_PROVEEDOR,'#10 + + ' :FECHA_FACTURA, :FECHA_VENCIMIENTO, :BASE_IMPONIBLE, :DESCU' + + 'ENTO,'#10' :IMPORTE_DESCUENTO, :IVA, :IMPORTE_IVA, :RE, :IMPORTE' + + '_RE, '#10' :IMPORTE_TOTAL, :OBSERVACIONES, :ID_PROVEEDOR, :NIF_C' + + 'IF, '#10' :NOMBRE, :CALLE, :POBLACION, :PROVINCIA, :CODIGO_POSTA' + + 'L, '#10' CURRENT_TIMESTAMP, :USUARIO, :ID_FORMA_PAGO,'#10' :RECA' + + 'RGO_EQUIVALENCIA, :ID_TIPO_IVA, :IMPORTE_NETO, '#10' :IMPORTE_PO' + + 'RTE, :IGNORAR_CONTABILIDAD, :ID_TIENDA, :RETENCION, :IMPORTE_RET' + + 'ENCION)'#10' '#10' '#10#10 StatementType = stSQL ColumnMappings = <> end> @@ -967,122 +1032,171 @@ object srvFacturasProveedor: TsrvFacturasProveedor Params = < item Name = 'ID' + DataType = datInteger Value = '' end item Name = 'ID_EMPRESA' + DataType = datInteger Value = '' end item Name = 'REFERENCIA' + DataType = datString + Size = 255 Value = '' end item Name = 'REFERENCIA_PROVEEDOR' + DataType = datString + Size = 255 Value = '' end item Name = 'FECHA_FACTURA' + DataType = datDateTime Value = '' end item Name = 'FECHA_VENCIMIENTO' + DataType = datDateTime Value = '' end item Name = 'BASE_IMPONIBLE' + DataType = datCurrency Value = '' end item Name = 'DESCUENTO' + DataType = datFloat Value = '' end item Name = 'IMPORTE_DESCUENTO' + DataType = datCurrency Value = '' end item Name = 'IVA' + DataType = datFloat Value = '' end item Name = 'IMPORTE_IVA' + DataType = datCurrency Value = '' end item Name = 'RE' + DataType = datFloat Value = '' end item Name = 'IMPORTE_RE' + DataType = datCurrency Value = '' end item Name = 'IMPORTE_TOTAL' + DataType = datCurrency Value = '' end item Name = 'OBSERVACIONES' + DataType = datMemo Value = '' end item Name = 'ID_PROVEEDOR' + DataType = datInteger Value = '' end item Name = 'NIF_CIF' + DataType = datString + Size = 15 Value = '' end item Name = 'NOMBRE' + DataType = datString + Size = 255 Value = '' end item Name = 'CALLE' + DataType = datString + Size = 255 Value = '' end item Name = 'POBLACION' + DataType = datString + Size = 255 Value = '' end item Name = 'PROVINCIA' + DataType = datString + Size = 255 Value = '' end item Name = 'CODIGO_POSTAL' + DataType = datString + Size = 10 Value = '' end item Name = 'USUARIO' + DataType = datString + Size = 30 Value = '' end item Name = 'ID_FORMA_PAGO' + DataType = datInteger Value = '' end item Name = 'RECARGO_EQUIVALENCIA' + DataType = datSmallInt Value = '' end item Name = 'ID_TIPO_IVA' + DataType = datInteger Value = '' end item Name = 'IMPORTE_NETO' + DataType = datCurrency Value = '' end item Name = 'IMPORTE_PORTE' + DataType = datCurrency Value = '' end item Name = 'IGNORAR_CONTABILIDAD' + DataType = datSmallInt Value = '' end item Name = 'ID_TIENDA' + DataType = datInteger + Value = '' + end + item + Name = 'RETENCION' + DataType = datFloat + Value = '' + end + item + Name = 'IMPORTE_RETENCION' + DataType = datCurrency Value = '' end item @@ -1111,7 +1225,9 @@ object srvFacturasProveedor: TsrvFacturasProveedor 'ECARGO_EQUIVALENCIA = :RECARGO_EQUIVALENCIA, '#10' ID_TIPO_IVA = ' + ':ID_TIPO_IVA, '#10' IMPORTE_NETO = :IMPORTE_NETO, '#10' IMPORTE_PO' + 'RTE = :IMPORTE_PORTE,'#10' IGNORAR_CONTABILIDAD = :IGNORAR_CONTAB' + - 'ILIDAD,'#10' ID_TIENDA = :ID_TIENDA'#10' WHERE'#10' (ID = :OLD_ID)'#10 + 'ILIDAD,'#10' ID_TIENDA = :ID_TIENDA,'#10' RETENCION = :RETENCION,'#10 + + ' IMPORTE_RETENCION = :IMPORTE_RETENCION'#10' WHERE'#10' (ID = :OL' + + 'D_ID)'#10 StatementType = stSQL ColumnMappings = <> end> diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm index 30199a7..8a2c252 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm @@ -268,57 +268,57 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ExplicitWidth = 57 end inherited UpDown1: TUpDown - Left = 570 + Left = 586 Top = 0 - ExplicitLeft = 570 + ExplicitLeft = 586 ExplicitTop = 0 end inherited ToolButton13: TToolButton - Left = 587 + Left = 603 Top = 0 - ExplicitLeft = 587 + ExplicitLeft = 603 ExplicitTop = 0 end inherited ToolButton6: TToolButton - Left = 595 + Left = 611 Top = 0 - ExplicitLeft = 595 + ExplicitLeft = 611 ExplicitTop = 0 end inherited ToolButton7: TToolButton - Left = 629 + Left = 645 Top = 0 - ExplicitLeft = 629 + ExplicitLeft = 645 ExplicitTop = 0 end inherited ToolButton8: TToolButton - Left = 663 + Left = 679 Top = 0 - ExplicitLeft = 663 + ExplicitLeft = 679 ExplicitTop = 0 end inherited ToolButton12: TToolButton - Left = 697 + Left = 713 Top = 0 - ExplicitLeft = 697 + ExplicitLeft = 713 ExplicitTop = 0 end inherited ToolButton9: TToolButton - Left = 705 + Left = 721 Top = 0 - ExplicitLeft = 705 + ExplicitLeft = 721 ExplicitTop = 0 end inherited ToolButton10: TToolButton - Left = 739 + Left = 755 Top = 0 - ExplicitLeft = 739 + ExplicitLeft = 755 ExplicitTop = 0 end inherited ToolButton11: TToolButton - Left = 773 + Left = 789 Top = 0 - ExplicitLeft = 773 + ExplicitLeft = 789 ExplicitTop = 0 end end @@ -377,18 +377,6 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor inherited ToolBar1: TToolBar Width = 1097 ExplicitWidth = 1097 - inherited ToolButton1: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton4: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton2: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton7: TToolButton - ExplicitWidth = 113 - end end end end @@ -465,19 +453,19 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Width = 1111 ExplicitWidth = 1111 inherited Bevel3: TBevel - Left = 587 + Left = 496 Top = 30 Height = 122 - ExplicitLeft = 587 + ExplicitLeft = 496 ExplicitTop = 30 ExplicitHeight = 122 end inherited Bevel4: TBevel - Left = 699 - Top = 57 + Left = 608 + Top = 84 Width = 186 - ExplicitLeft = 699 - ExplicitTop = 57 + ExplicitLeft = 608 + ExplicitTop = 84 ExplicitWidth = 186 end inherited ImporteDto: TcxDBCurrencyEdit @@ -492,28 +480,28 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Width = 207 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 770 - Top = 77 + Left = 679 + Top = 104 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 770 - ExplicitTop = 77 + ExplicitLeft = 679 + ExplicitTop = 104 ExplicitWidth = 143 Width = 143 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 700 - Top = 131 + Left = 609 + Top = 158 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 700 - ExplicitTop = 131 + ExplicitLeft = 609 + ExplicitTop = 158 ExplicitWidth = 213 Width = 213 end @@ -528,51 +516,51 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ExplicitTop = 57 end inherited edtIVA: TcxDBSpinEdit - Left = 699 - Top = 77 + Left = 608 + Top = 104 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 699 - ExplicitTop = 77 + ExplicitLeft = 608 + ExplicitTop = 104 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 699 + Left = 608 Top = 30 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 699 + ExplicitLeft = 608 ExplicitTop = 30 ExplicitWidth = 214 Width = 214 end inherited edtRE: TcxDBSpinEdit - Left = 699 - Top = 104 + Left = 608 + Top = 131 Properties.AssignedValues.MinValue = True Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 699 - ExplicitTop = 104 + ExplicitLeft = 608 + ExplicitTop = 131 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 770 - Top = 104 + Left = 679 + Top = 131 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 770 - ExplicitTop = 104 + ExplicitLeft = 679 + ExplicitTop = 131 ExplicitWidth = 143 Width = 143 end @@ -616,10 +604,10 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Width = 140 end inherited bTiposIVA: TButton - Left = 439 + Left = 348 Top = 111 OnClick = frViewTotales1bTiposIVAClick - ExplicitLeft = 439 + ExplicitLeft = 348 ExplicitTop = 111 end inherited cbRecargoEquivalencia: TcxDBCheckBox @@ -632,6 +620,25 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ExplicitWidth = 278 Width = 278 end + inherited edtRetencion: TcxDBSpinEdit + Left = 608 + Top = 57 + DataBinding.DataField = 'RETENCION' + Enabled = True + Style.IsFontAssigned = True + ExplicitLeft = 608 + ExplicitTop = 57 + end + inherited ImporteRetencion: TcxDBCurrencyEdit + Left = 679 + Top = 57 + DataBinding.DataField = 'IMPORTE_RETENCION' + Style.IsFontAssigned = True + ExplicitLeft = 679 + ExplicitTop = 57 + ExplicitWidth = 281 + Width = 281 + end inherited dxLayoutControl1Group_Root: TdxLayoutGroup LookAndFeel = frViewFacturaProveedor1.dxLayoutOfficeLookAndFeel1 inherited dxLayoutControl1Group1: TdxLayoutGroup @@ -653,6 +660,16 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor inherited dxLayoutControl1Group5: TdxLayoutGroup inherited dxLayoutControl1Group3: TdxLayoutGroup inherited dxLayoutControl1Group11: TdxLayoutGroup + inherited dxLayoutControl1Group12: TdxLayoutGroup + Enabled = True + Visible = True + inherited dxLayoutControl1Item10: TdxLayoutItem + Caption = 'Retenci'#243'n IRPF:' + end + inherited dxLayoutControl1Item17: TdxLayoutItem + Enabled = False + end + end inherited dxLayoutControl1Item14: TdxLayoutItem Offsets.Bottom = 0 Offsets.Top = 0 diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm index 49f7c24..9a1de8d 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm @@ -146,6 +146,9 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor end object cxGridViewIVA: TcxGridDBColumn DataBinding.FieldName = 'IVA' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taCenter + Properties.AssignedValues.DisplayFormat = True Visible = False FooterAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify @@ -153,12 +156,16 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor object cxGridViewIMPORTE_IVA: TcxGridDBColumn DataBinding.FieldName = 'IMPORTE_IVA' PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify Visible = False FooterAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify end object cxGridViewRE: TcxGridDBColumn DataBinding.FieldName = 'RE' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taCenter + Properties.AssignedValues.DisplayFormat = True Visible = False FooterAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify @@ -166,6 +173,7 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor object cxGridViewIMPORTE_RE: TcxGridDBColumn DataBinding.FieldName = 'IMPORTE_RE' PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify Visible = False FooterAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify @@ -178,6 +186,25 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor HeaderAlignmentHorz = taRightJustify Width = 98 end + object cxGridViewRETENCION: TcxGridDBColumn + Caption = 'Retenci'#243'n IRPF' + DataBinding.FieldName = 'RETENCION' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taCenter + Properties.AssignedValues.DisplayFormat = True + FooterAlignmentHorz = taRightJustify + GroupSummaryAlignment = taRightJustify + HeaderAlignmentHorz = taRightJustify + end + object cxGridViewIMPORTE_RETENCION: TcxGridDBColumn + Caption = 'Importe retenci'#243'n' + DataBinding.FieldName = 'IMPORTE_RETENCION' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + FooterAlignmentHorz = taRightJustify + GroupSummaryAlignment = taRightJustify + HeaderAlignmentHorz = taRightJustify + end end inherited cxGridLevel: TcxGridLevel Caption = 'Todas' @@ -206,57 +233,77 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor ExplicitWidth = 955 ExplicitHeight = 100 inherited txtFiltroTodo: TcxTextEdit + Left = 94 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 94 end inherited edtFechaIniFiltro: TcxDateEdit + Left = 94 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 94 ExplicitWidth = 200 Width = 200 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 311 + Left = 314 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 311 + ExplicitLeft = 314 end inherited edtFecha2FinFiltro: TcxDateEdit - Left = 311 + Left = 314 Enabled = True Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 311 - ExplicitWidth = 200 - Width = 200 + ExplicitLeft = 314 end inherited edtFecha2IniFiltro: TcxDateEdit + Left = 94 Enabled = True Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 200 - Width = 200 + ExplicitLeft = 94 + end + inherited edtFecha3IniFiltro: TcxDateEdit + Left = 94 + Enabled = True + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 94 + end + inherited edtFecha3FinFiltro: TcxDateEdit + Left = 314 + Enabled = True + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 314 end inherited dxLayoutControl1Group_Root: TdxLayoutGroup - inherited dxLayoutControl1Group1: TdxLayoutGroup - inherited dxLayoutControl1Group4: TdxLayoutGroup - Enabled = True - Visible = True - inherited dxLayoutControl1Item5: TdxLayoutItem - Caption = 'Entre fecha vto:' - end + inherited dxLayoutControl1Group2: TdxLayoutGroup + Visible = True + inherited dxLayoutControl1Item5: TdxLayoutItem + Caption = 'Entre fecha vto:' end end + inherited dxLayoutControl1Group4: TdxLayoutGroup + Enabled = True + end end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas index 602f04b..3ea621c 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas +++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas @@ -60,6 +60,8 @@ type cxGridViewNOMBRE_PROVEEDOR: TcxGridDBColumn; cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn; cxGridViewFECHA_VENCIMIENTO: TcxGridDBColumn; + cxGridViewRETENCION: TcxGridDBColumn; + cxGridViewIMPORTE_RETENCION: TcxGridDBColumn; procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm index bd67135..11705ae 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm @@ -6,9 +6,8 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente ExplicitWidth = 903 ExplicitHeight = 525 inherited cxGrid: TcxGrid - Top = 130 Width = 903 - Height = 369 + Height = 397 RootLevelOptions.DetailTabsPosition = dtpTop OnActiveTabChanged = cxGridActiveTabChanged ExplicitWidth = 903 @@ -146,80 +145,6 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente end end inherited frViewFiltroBase1: TfrViewFiltroBase - Width = 903 - Height = 130 - ExplicitWidth = 903 - ExplicitHeight = 130 - inherited TBXDockablePanel1: TTBXDockablePanel - ExplicitWidth = 903 - inherited dxLayoutControl1: TdxLayoutControl - Width = 903 - Height = 100 - ExplicitWidth = 903 - inherited txtFiltroTodo: TcxTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - end - inherited edtFechaIniFiltro: TcxDateEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 200 - Width = 200 - end - inherited edtFechaFinFiltro: TcxDateEdit - Left = 333 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 333 - end - inherited edtFecha2FinFiltro: TcxDateEdit - Left = 333 - Enabled = True - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 333 - ExplicitWidth = 200 - Width = 200 - end - inherited edtFecha2IniFiltro: TcxDateEdit - Enabled = True - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 200 - Width = 200 - end - inherited dxLayoutControl1Group_Root: TdxLayoutGroup - inherited dxLayoutControl1Group1: TdxLayoutGroup - inherited dxLayoutControl1Group4: TdxLayoutGroup - Enabled = True - Visible = True - inherited dxLayoutControl1Item5: TdxLayoutItem - Caption = 'Entre fecha decisi'#243'n:' - end - end - end - end - end - inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Top = 100 - Width = 903 - ExplicitWidth = 903 - inherited tbxBotones: TTBXToolbar - Width = 893 - ExplicitWidth = 893 - end - end - end end inherited pnlAgrupaciones: TTBXDockablePanel Top = 499 diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm index abfa743..ddf1a97 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm @@ -4,12 +4,14 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente ExplicitWidth = 686 ExplicitHeight = 445 inherited cxGrid: TcxGrid + Top = 95 Width = 686 - Height = 317 + Height = 324 RootLevelOptions.DetailTabsPosition = dtpTop OnActiveTabChanged = cxGridActiveTabChanged + ExplicitTop = 95 ExplicitWidth = 686 - ExplicitHeight = 317 + ExplicitHeight = 324 inherited cxGridView: TcxGridDBTableView DataController.KeyFieldNames = 'ID' DataController.Options = [dcoAnsiSort, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoGroupsAlwaysExpanded] @@ -230,12 +232,17 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente end inherited frViewFiltroBase1: TfrViewFiltroBase Width = 686 + Height = 95 ExplicitWidth = 686 + ExplicitHeight = 95 inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 686 + ExplicitHeight = 95 inherited dxLayoutControl1: TdxLayoutControl Width = 686 + Height = 65 ExplicitWidth = 686 + ExplicitHeight = 65 inherited txtFiltroTodo: TcxTextEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' @@ -249,22 +256,56 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 183 - Width = 183 + ExplicitWidth = 200 + Width = 200 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 367 + Left = 307 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 367 - ExplicitWidth = 234 - Width = 234 + ExplicitLeft = 307 + end + inherited edtFecha2FinFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end + inherited edtFecha2IniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end + inherited edtFecha3IniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end + inherited edtFecha3FinFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControl1Group2: TdxLayoutGroup + Enabled = False + Visible = False + Hidden = False + end + inherited dxLayoutControl1Group4: TdxLayoutGroup + Visible = False + end end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Top = 65 Width = 686 + ExplicitTop = 65 ExplicitWidth = 686 inherited tbxBotones: TTBXToolbar Width = 676 diff --git a/Source/Modulos/Recibos de proveedor/RecibosProveedor_Group.groupproj b/Source/Modulos/Recibos de proveedor/RecibosProveedor_Group.groupproj index d549d13..a1d2bd6 100644 --- a/Source/Modulos/Recibos de proveedor/RecibosProveedor_Group.groupproj +++ b/Source/Modulos/Recibos de proveedor/RecibosProveedor_Group.groupproj @@ -12,6 +12,7 @@ + @@ -141,14 +142,23 @@ + + + + + + + + + - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm index 690a023..0664eb5 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm @@ -8,7 +8,7 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor Top = 64 Width = 654 Visible = False - ExplicitLeft = -8 + ExplicitTop = 64 ExplicitWidth = 654 inherited Image1: TImage Left = 627 @@ -19,7 +19,7 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor Top = 175 Width = 654 Height = 72 - ExplicitTop = 111 + ExplicitTop = 175 ExplicitWidth = 654 ExplicitHeight = 72 inherited tbxMain: TTBXToolbar @@ -117,15 +117,15 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor Top = 247 Width = 654 Height = 362 - ExplicitTop = 183 + ExplicitTop = 247 ExplicitWidth = 654 - ExplicitHeight = 426 + ExplicitHeight = 362 inherited cxGrid: TcxGrid Width = 654 - Height = 234 + Height = 216 RootLevelOptions.DetailTabsPosition = dtpNone ExplicitWidth = 654 - ExplicitHeight = 298 + ExplicitHeight = 216 inherited cxGridView: TcxGridDBTableView DataController.Summary.DefaultGroupSummaryItems = < item @@ -155,19 +155,55 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor Width = 654 ExplicitWidth = 654 inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 273 Width = 273 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 252 - ExplicitLeft = 252 + Left = 279 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 279 ExplicitWidth = 343 Width = 343 end + inherited edtFecha2FinFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end + inherited edtFecha2IniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end + inherited edtFecha3IniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end + inherited edtFecha3FinFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 654 @@ -181,7 +217,7 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor end inherited pnlAgrupaciones: TTBXDockablePanel Top = 336 - ExplicitTop = 400 + ExplicitTop = 336 ExplicitWidth = 654 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 654 @@ -221,7 +257,6 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor ShowCaptionWhenDocked = False SupportedDocks = [dkStandardDock, dkMultiDock] TabOrder = 5 - ExplicitTop = 0 object Label1: TLabel Left = 329 Top = 50 @@ -359,8 +394,6 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor Padding.Bottom = 8 ParentBackground = False TabOrder = 6 - ExplicitLeft = 8 - ExplicitTop = -29 object lblTitle: TLabel AlignWithMargins = True Left = 25 @@ -407,7 +440,7 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor end inherited JvFormStorage: TJvFormStorage [13] end - inherited GridPopupMenu: TPopupMenu + inherited GridPopupMenu: TPopupMenu [14] Left = 80 Top = 192 end diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm index 631584c..1517a20 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm @@ -93,9 +93,9 @@ inherited fEditorRecibosProveedor: TfEditorRecibosProveedor ExplicitHeight = 543 inherited cxGrid: TcxGrid Width = 638 - Height = 415 + Height = 387 ExplicitWidth = 638 - ExplicitHeight = 415 + ExplicitHeight = 387 inherited cxGridView: TcxGridDBTableView DataController.Summary.DefaultGroupSummaryItems = < item @@ -136,39 +136,67 @@ inherited fEditorRecibosProveedor: TfEditorRecibosProveedor Width = 638 ExplicitWidth = 638 inherited txtFiltroTodo: TcxTextEdit - Left = 109 + Left = 139 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 109 - ExplicitWidth = 541 - Width = 541 + ExplicitLeft = 139 + ExplicitWidth = 457 + Width = 457 end inherited edtFechaIniFiltro: TcxDateEdit - Left = 109 + Left = 139 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 109 - ExplicitWidth = 190 - Width = 190 + ExplicitLeft = 139 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 306 + Left = 359 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 306 - ExplicitWidth = 334 - Width = 334 + ExplicitLeft = 359 + end + inherited edtFecha2FinFiltro: TcxDateEdit + Left = 359 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 359 + end + inherited edtFecha2IniFiltro: TcxDateEdit + Left = 139 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 139 + end + inherited edtFecha3IniFiltro: TcxDateEdit + Left = 139 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 139 + end + inherited edtFecha3FinFiltro: TcxDateEdit + Left = 359 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 359 end inherited dxLayoutControl1Group_Root: TdxLayoutGroup - inherited dxLayoutControl1Group1: TdxLayoutGroup - inherited dxLayoutControl1Item2: TdxLayoutItem - Caption = 'Entre la fecha vto.:' + inherited dxLayoutControl1Group2: TdxLayoutGroup + inherited dxLayoutControl1Item5: TdxLayoutItem + Caption = 'Entre fecha vencimiento:' end end end diff --git a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm index 062d0d0..b6d4c97 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm @@ -1,15 +1,17 @@ inherited frViewRecibosProveedor: TfrViewRecibosProveedor - Width = 531 - Height = 415 - ExplicitWidth = 531 - ExplicitHeight = 415 + Width = 717 + Height = 548 + ExplicitWidth = 717 + ExplicitHeight = 548 inherited cxGrid: TcxGrid - Width = 531 - Height = 287 + Top = 130 + Width = 717 + Height = 392 RootLevelOptions.DetailTabsPosition = dtpTop OnActiveTabChanged = cxGridActiveTabChanged - ExplicitWidth = 531 - ExplicitHeight = 287 + ExplicitTop = 130 + ExplicitWidth = 717 + ExplicitHeight = 392 inherited cxGridView: TcxGridDBTableView DataController.KeyFieldNames = 'ID' DataController.Options = [dcoAnsiSort, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoGroupsAlwaysExpanded] @@ -163,61 +165,115 @@ inherited frViewRecibosProveedor: TfrViewRecibosProveedor end end inherited frViewFiltroBase1: TfrViewFiltroBase - Width = 531 - ExplicitWidth = 531 + Width = 717 + Height = 130 + ExplicitWidth = 717 + ExplicitHeight = 130 inherited TBXDockablePanel1: TTBXDockablePanel - ExplicitWidth = 531 + ExplicitWidth = 717 + ExplicitHeight = 130 inherited dxLayoutControl1: TdxLayoutControl - Width = 531 - ExplicitWidth = 531 + Width = 717 + Height = 100 + ExplicitWidth = 717 + ExplicitHeight = 100 inherited txtFiltroTodo: TcxTextEdit + Left = 150 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 434 - Width = 434 + ExplicitLeft = 150 end inherited edtFechaIniFiltro: TcxDateEdit + Left = 150 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 130 - Width = 130 + ExplicitLeft = 150 + ExplicitWidth = 200 + Width = 200 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 234 + Left = 370 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 234 - ExplicitWidth = 287 - Width = 287 + ExplicitLeft = 370 + end + inherited edtFecha2FinFiltro: TcxDateEdit + Left = 370 + Enabled = True + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 370 + end + inherited edtFecha2IniFiltro: TcxDateEdit + Left = 150 + Enabled = True + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 150 + end + inherited edtFecha3IniFiltro: TcxDateEdit + Left = 150 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 150 + end + inherited edtFecha3FinFiltro: TcxDateEdit + Left = 370 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 370 + end + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControl1Group1: TdxLayoutGroup + inherited dxLayoutControl1Item2: TdxLayoutItem + Caption = 'Entre la fecha de emisi'#243'n:' + end + end + inherited dxLayoutControl1Group2: TdxLayoutGroup + Visible = True + inherited dxLayoutControl1Item5: TdxLayoutItem + Caption = 'Entre fecha de vencimiento:' + end + end end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 531 - ExplicitWidth = 531 + Top = 100 + Width = 717 + ExplicitTop = 100 + ExplicitWidth = 717 inherited tbxBotones: TTBXToolbar - Width = 521 - ExplicitWidth = 521 + Width = 707 + ExplicitWidth = 707 end end end end inherited pnlAgrupaciones: TTBXDockablePanel - Top = 389 + Top = 522 Visible = True - ExplicitTop = 389 - ExplicitWidth = 531 + ExplicitTop = 522 + ExplicitWidth = 717 inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 531 - ExplicitWidth = 531 + Width = 717 + ExplicitWidth = 717 inherited TBXToolbar1: TTBXToolbar - Width = 521 - ExplicitWidth = 521 + Width = 707 + ExplicitWidth = 707 object TBXSeparatorItem1: TTBXSeparatorItem end object TBXItem2: TTBXItem diff --git a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.pas b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.pas index 7fc408d..513c1e6 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.pas +++ b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.pas @@ -115,10 +115,13 @@ procedure TfrViewRecibosProveedor.AnadirFiltroFechas; var Columna: TcxGridDBColumn; Fecha1, Fecha2: Variant; + FechaVencimiento1, FechaVencimiento2: Variant; FFiltro : TcxFilterCriteriaItemList; begin Fecha1 := frViewFiltroBase1.edtFechaIniFiltro.EditValue; Fecha2 := frViewFiltroBase1.edtFechaFinFiltro.EditValue; + FechaVencimiento1 := frViewFiltroBase1.edtFecha2IniFiltro.EditValue; + FechaVencimiento2 := frViewFiltroBase1.edtFecha2FinFiltro.EditValue; if not VarIsNull(Fecha1) and not VarIsNull(Fecha2) then @@ -126,9 +129,20 @@ begin cxGridView.DataController.Filter.Options := [fcoCaseInsensitive, fcoSoftCompare]; FFiltro := AddFilterGrid(fboAnd); - Columna := (cxGridView as TcxGridDBTableView).GetColumnByFieldName(fld_RecibosCompensadosProvFECHA_VENCIMIENTO); + Columna := (cxGridView as TcxGridDBTableView).GetColumnByFieldName(fld_RecibosCompensadosProvFECHA_EMISION); FFiltro.AddItem(Columna, foBetween, varArrayOf([Fecha1, Fecha2]), VarToStr(Fecha1) + ' and ' + VarToStr(Fecha2)); end; + + if not VarIsNull(FechaVencimiento1) + and not VarIsNull(FechaVencimiento2) then + begin + cxGridView.DataController.Filter.Options := [fcoCaseInsensitive, fcoSoftCompare]; + FFiltro := AddFilterGrid(fboAnd); + + Columna := (cxGridView as TcxGridDBTableView).GetColumnByFieldName(fld_RecibosCompensadosProvFECHA_VENCIMIENTO); + FFiltro.AddItem(Columna, foBetween, varArrayOf([FechaVencimiento1, FechaVencimiento2]), VarToStr(FechaVencimiento1) + ' and ' + VarToStr(FechaVencimiento2)); + end; + end; procedure TfrViewRecibosProveedor.AnadirFiltroSituaciones; diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr index 94555b1..9ba1547 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -127,8 +127,6 @@ uses schFormasPagoServer_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas', schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas', schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas', - schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas', - schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas', schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas', schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas', schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas', @@ -138,7 +136,9 @@ uses schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas', schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas', schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas', - schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas'; + schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas', + schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas', + schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas'; {$R *.res} {$R ..\Servicios\RODLFile.res} diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index bac48bb..c6db079 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -28,7 +28,7 @@ Delphi.Personality - FalseTrueFalseTrueFalse2030FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.0.3.0FactuGES v2(Servidor)2.0.3.0miércoles, 04 de marzo de 2020 17:03 + FalseTrueFalseTrueFalse2100FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.1.0.0FactuGES v2(Servidor)2.1.0.0martes, 26 de mayo de 2020 11:25 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 3b11f29..7474e3a 100644 Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ