diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index 8f114a4..1489887 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 e0eaa0f..a059afb 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -65,55 +65,55 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 34ccb94..78a2382 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -52,7 +52,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2220FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.2.2.0FactuGES v2FactuGES v22.2.2.0 +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2230FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.2.3.0FactuGES v2FactuGES v22.2.3.0 File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 9b3864f..54bf16e 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 4cf8df4..0edfe47 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -58,34 +58,34 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/uEditorDBBase.dfm b/Source/GUIBase/uEditorDBBase.dfm index ac98e86..f8a8aba 100644 --- a/Source/GUIBase/uEditorDBBase.dfm +++ b/Source/GUIBase/uEditorDBBase.dfm @@ -5,7 +5,7 @@ inherited fEditorDBBase: TfEditorDBBase ClientHeight = 454 ClientWidth = 646 ExplicitWidth = 654 - ExplicitHeight = 488 + ExplicitHeight = 492 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader diff --git a/Source/GUIBase/uEditorDBItem.dfm b/Source/GUIBase/uEditorDBItem.dfm index 0467683..3493aa6 100644 --- a/Source/GUIBase/uEditorDBItem.dfm +++ b/Source/GUIBase/uEditorDBItem.dfm @@ -21,7 +21,7 @@ inherited fEditorDBItem: TfEditorDBItem Width = 650 ExplicitWidth = 650 inherited tbxMain: TTBXToolbar - ExplicitWidth = 605 + ExplicitWidth = 650 inherited TBXItem26: TTBXItem Visible = False end @@ -77,14 +77,14 @@ inherited fEditorDBItem: TfEditorDBItem object pgPaginas: TPageControl [3] AlignWithMargins = True Left = 3 - Top = 109 + Top = 112 Width = 644 - Height = 328 + Height = 325 ActivePage = pagGeneral Align = alClient TabOrder = 2 - ExplicitTop = 118 - ExplicitHeight = 319 + ExplicitTop = 109 + ExplicitHeight = 328 object pagGeneral: TTabSheet Caption = 'General' ExplicitLeft = 0 @@ -95,7 +95,7 @@ inherited fEditorDBItem: TfEditorDBItem end object PnlComentario: TPanel [4] Left = 0 - Top = 76 + Top = 79 Width = 650 Height = 30 Align = alTop @@ -105,7 +105,7 @@ inherited fEditorDBItem: TfEditorDBItem ParentBackground = False TabOrder = 4 VerticalAlignment = taAlignTop - ExplicitTop = 85 + ExplicitTop = 76 object lbComentario: TLabel AlignWithMargins = True Left = 6 diff --git a/Source/GUIBase/uEditorGridBase.dfm b/Source/GUIBase/uEditorGridBase.dfm index a681b19..4f9a5da 100644 --- a/Source/GUIBase/uEditorGridBase.dfm +++ b/Source/GUIBase/uEditorGridBase.dfm @@ -6,7 +6,7 @@ inherited fEditorGridBase: TfEditorGridBase ClientWidth = 543 OnDestroy = CustomEditorDestroy ExplicitWidth = 551 - ExplicitHeight = 478 + ExplicitHeight = 482 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -22,15 +22,15 @@ inherited fEditorGridBase: TfEditorGridBase inherited TBXDock: TTBXDock Top = 27 Width = 543 - Height = 75 + Height = 79 ExplicitTop = 27 ExplicitWidth = 543 - ExplicitHeight = 75 + ExplicitHeight = 79 inherited tbxMain: TTBXToolbar DockPos = 0 DragHandleStyle = dhDouble TabOrder = 1 - ExplicitWidth = 543 + ExplicitWidth = 513 inherited TBXItem29: TTBXItem Visible = False end @@ -76,7 +76,7 @@ inherited fEditorGridBase: TfEditorGridBase end object tbxFiltro: TTBXToolbar [1] Left = 0 - Top = 49 + Top = 52 Align = alRight CloseButton = False DefaultDock = TBXDock @@ -104,7 +104,7 @@ inherited fEditorGridBase: TfEditorGridBase Caption = 'Filtrar:' end object tbxEditFiltro: TTBXEditItem - EditWidth = 200 + EditWidth = 125 ImageIndex = 10 EditorFontSettings.Italic = tsTrue ExtendedAccept = True @@ -112,6 +112,17 @@ inherited fEditorGridBase: TfEditorGridBase ShowImage = True OnChange = tbxEditFiltroChange end + object tbxEditFiltro2: TTBXEditItem + EditWidth = 125 + Enabled = False + ImageIndex = 10 + Visible = False + EditorFontSettings.Italic = tsTrue + ExtendedAccept = True + Images = SmallImages + ShowImage = True + OnChange = tbxEditFiltro2Change + end object TBXItem34: TTBXItem Action = actQuitarFiltro end @@ -168,8 +179,8 @@ inherited fEditorGridBase: TfEditorGridBase end end object TBXTMain2: TTBXToolbar - Left = 337 - Top = 49 + Left = 334 + Top = 52 Caption = 'tbxMain' ChevronHint = 'M'#225's botones|' DockMode = dmCannotFloatOrChangeDocks @@ -243,6 +254,8 @@ inherited fEditorGridBase: TfEditorGridBase object actExportarExcel: TAction Category = 'Archivo' Caption = 'Exportar a fichero Excel...' + Enabled = False + Visible = False OnExecute = actExportarExcelExecute OnUpdate = actExportarExcelUpdate end diff --git a/Source/GUIBase/uEditorGridBase.pas b/Source/GUIBase/uEditorGridBase.pas index 09daa41..2f3de3f 100644 --- a/Source/GUIBase/uEditorGridBase.pas +++ b/Source/GUIBase/uEditorGridBase.pas @@ -67,7 +67,9 @@ type lblAno: TTBXLabelItem; cbxListaAnos: TTBXComboBoxItem; sepAno: TTBXSeparatorItem; + tbxEditFiltro2: TTBXEditItem; procedure tbxEditFiltroChange(Sender: TObject; const Text: String); + procedure tbxEditFiltro2Change(Sender: TObject; const Text: string); procedure FormShow(Sender: TObject); procedure actQuitarFiltroExecute(Sender: TObject); procedure actDuplicarUpdate(Sender: TObject); @@ -81,6 +83,7 @@ type procedure CustomEditorDestroy(Sender: TObject); procedure actExportarExcelExecute(Sender: TObject); procedure actExportarExcelUpdate(Sender: TObject); + protected FListaAnos: TStringList; FViewGrid : IViewGridBase; @@ -224,6 +227,18 @@ begin end; end; +procedure TfEditorGridBase.tbxEditFiltro2Change(Sender: TObject; + const Text: string); +begin + if Assigned(ViewGrid) then + begin + if Length(Text) > 0 then + ViewGrid.Filter2 := Text + else + actQuitarFiltro.Execute; + end; +end; + procedure TfEditorGridBase.tbxEditFiltroChange(Sender: TObject; const Text: String); begin if Assigned(ViewGrid) then @@ -244,7 +259,7 @@ begin ViewGrid.RestoreFromIniFile; end; - cbxListaAnos.ItemIndex := 0; + cbxListaAnos.ItemIndex := 0; end; procedure TfEditorGridBase.actEliminarUpdate(Sender: TObject); @@ -281,6 +296,7 @@ begin if ViewGrid.ViewFiltros.VerFiltros then begin tbxEditFiltro.Visible := False; + tbxEditFiltro2.Visible := False; TBXItem7.Visible := False; end else @@ -288,6 +304,12 @@ begin tbxEditFiltro.Text := ''; tbxEditFiltro.Visible := True; TBXItem7.Visible := True; + + if (tbxEditFiltro2.Enabled) then + begin + tbxEditFiltro2.Text := ''; + tbxEditFiltro2.Visible := True; + end; end; end; @@ -326,6 +348,8 @@ begin begin tbxEditFiltro.Text := ''; ViewGrid.Filter := ''; + tbxEditFiltro2.Text := ''; + ViewGrid.Filter2 := ''; end; end; diff --git a/Source/GUIBase/uViewFiltroBase.dfm b/Source/GUIBase/uViewFiltroBase.dfm index 01cc95e..98fa4c3 100644 --- a/Source/GUIBase/uViewFiltroBase.dfm +++ b/Source/GUIBase/uViewFiltroBase.dfm @@ -1,8 +1,8 @@ inherited frViewFiltroBase: TfrViewFiltroBase - Width = 565 + Width = 533 Height = 163 Visible = False - ExplicitWidth = 565 + ExplicitWidth = 533 ExplicitHeight = 163 object TBXDockablePanel1: TTBXDockablePanel Left = 0 @@ -19,16 +19,18 @@ inherited frViewFiltroBase: TfrViewFiltroBase ShowCaptionWhenDocked = False SupportedDocks = [dkStandardDock, dkMultiDock] TabOrder = 0 + ExplicitWidth = 565 object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 565 + Width = 533 Height = 133 Align = alClient ParentBackground = True TabOrder = 0 TabStop = False AutoContentSizes = [acsWidth, acsHeight] + ExplicitWidth = 565 object txtFiltroTodo: TcxTextEdit Left = 87 Top = 10 @@ -49,7 +51,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' TabOrder = 0 - Width = 273 + Width = 200 end object edtFechaIniFiltro: TcxDateEdit Left = 87 @@ -72,7 +74,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 1 + TabOrder = 2 Width = 200 end object edtFechaFinFiltro: TcxDateEdit @@ -96,7 +98,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 2 + TabOrder = 3 Width = 200 end object edtFecha2FinFiltro: TcxDateEdit @@ -121,7 +123,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 4 + TabOrder = 5 Width = 200 end object edtFecha2IniFiltro: TcxDateEdit @@ -146,7 +148,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 3 + TabOrder = 4 Width = 200 end object edtFecha3IniFiltro: TcxDateEdit @@ -171,7 +173,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 5 + TabOrder = 6 Width = 200 end object edtFecha3FinFiltro: TcxDateEdit @@ -196,19 +198,60 @@ inherited frViewFiltroBase: TfrViewFiltroBase StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.SkinName = '' - TabOrder = 6 + TabOrder = 7 + Width = 200 + end + object txtFiltroTodo2: TcxTextEdit + Left = 315 + Top = 10 + 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 = '' + 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 = 1 Width = 200 end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False Hidden = True ShowBorder = False - object dxLayoutControl1Item1: TdxLayoutItem - Caption = 'Que contenga:' - Control = txtFiltroTodo - ControlOptions.ShowBorder = False + object dxLayoutControl1Group3: TdxLayoutGroup + ShowCaption = False + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item1: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Que contenga:' + Control = txtFiltroTodo + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item8: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'y' + Enabled = False + Visible = False + Control = txtFiltroTodo2 + ControlOptions.ShowBorder = False + end end object dxLayoutControl1Group1: TdxLayoutGroup + AutoAligns = [aaVertical] ShowCaption = False Hidden = True LayoutDirection = ldHorizontal @@ -255,11 +298,13 @@ inherited frViewFiltroBase: TfrViewFiltroBase LayoutDirection = ldHorizontal ShowBorder = False object dxLayoutControl1Item6: TdxLayoutItem + AutoAligns = [aaVertical] Caption = 'Entre fecha 3:' Control = edtFecha3IniFiltro ControlOptions.ShowBorder = False end object dxLayoutControl1Item7: TdxLayoutItem + AutoAligns = [aaVertical] Caption = 'y ' Control = edtFecha3FinFiltro ControlOptions.ShowBorder = False @@ -270,15 +315,16 @@ inherited frViewFiltroBase: TfrViewFiltroBase object TBXAlignmentPanel1: TTBXAlignmentPanel Left = 0 Top = 133 - Width = 565 + Width = 533 Height = 30 Margins.Left = 10 Align = alBottom TabOrder = 1 + ExplicitWidth = 565 object tbxBotones: TTBXToolbar Left = 10 Top = 0 - Width = 555 + Width = 523 Height = 30 Align = alTop AutoResize = False @@ -292,6 +338,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase ParentShowHint = False ShowHint = True TabOrder = 0 + ExplicitWidth = 555 object TBXItem2: TTBXItem Action = actQuitarFiltro DisplayMode = nbdmImageAndText diff --git a/Source/GUIBase/uViewFiltroBase.pas b/Source/GUIBase/uViewFiltroBase.pas index 4dddbb1..ab85bb9 100644 --- a/Source/GUIBase/uViewFiltroBase.pas +++ b/Source/GUIBase/uViewFiltroBase.pas @@ -24,6 +24,10 @@ type function GetTexto: String; procedure SetTexto(const Value: String); property Texto: String read GetTexto write SetTexto; + + function GetTexto2: String; + procedure SetTexto2(const Value: String); + property Texto2: String read GetTexto2 write SetTexto2; end; TfrViewFiltroBase = class(TfrViewBase, IViewFiltroBase) @@ -54,6 +58,9 @@ type dxLayoutControl1Item7: TdxLayoutItem; edtFecha3FinFiltro: TcxDateEdit; dxLayoutControl1Group2: TdxLayoutGroup; + dxLayoutControl1Item8: TdxLayoutItem; + txtFiltroTodo2: TcxTextEdit; + dxLayoutControl1Group3: TdxLayoutGroup; procedure OnCamposFiltroChange(Sender: TObject); procedure actQuitarFiltroExecute(Sender: TObject); @@ -66,6 +73,8 @@ type procedure SetVerFiltros(const Value: Boolean); function GetTexto: String; procedure SetTexto(const Value: String); + function GetTexto2: String; + procedure SetTexto2(const Value: String); protected procedure LimpiarCampos; virtual; @@ -77,6 +86,7 @@ type property OnFiltrosChange: TNotifyEvent read GetFiltrosChange write SetFiltrosChange; property VerFiltros: Boolean read GetVerFiltros write SetVerFiltros; property Texto: String read GetTexto write SetTexto; + property Texto2: String read GetTexto2 write SetTexto2; end; implementation @@ -116,6 +126,7 @@ end; procedure TfrViewFiltroBase.LimpiarCampos; begin txtFiltroTodo.Clear; + txtFiltroTodo2.Clear; edtFechaIniFiltro.Clear; edtFechaFinFiltro.Clear; edtFecha2IniFiltro.Clear; @@ -179,9 +190,19 @@ begin Result := txtFiltroTodo.Text; end; +function TfrViewFiltroBase.GetTexto2: String; +begin + Result := txtFiltroTodo2.Text; +end; + procedure TfrViewFiltroBase.SetTexto(const Value: String); begin txtFiltroTodo.Text := Value; end; +procedure TfrViewFiltroBase.SetTexto2(const Value: String); +begin + txtFiltroTodo2.Text := Value; +end; + end. diff --git a/Source/GUIBase/uViewGrid.dfm b/Source/GUIBase/uViewGrid.dfm index 0bcbbc6..cab7d97 100644 --- a/Source/GUIBase/uViewGrid.dfm +++ b/Source/GUIBase/uViewGrid.dfm @@ -5,13 +5,15 @@ inherited frViewGrid: TfrViewGrid ExplicitHeight = 594 object cxGrid: TcxGrid [0] Left = 0 - Top = 102 + Top = 105 Width = 554 - Height = 466 + Height = 463 Align = alClient TabOrder = 0 LookAndFeel.Kind = lfOffice11 LookAndFeel.NativeStyle = True + ExplicitTop = 120 + ExplicitHeight = 448 object cxGridView: TcxGridDBTableView OnDblClick = cxGridViewDblClick NavigatorButtons.ConfirmDelete = False @@ -61,7 +63,7 @@ inherited frViewGrid: TfrViewGrid Left = 0 Top = 0 Width = 554 - Height = 102 + Height = 105 Align = alTop Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -73,58 +75,108 @@ inherited frViewGrid: TfrViewGrid Visible = False ReadOnly = False ExplicitWidth = 554 - ExplicitHeight = 102 + ExplicitHeight = 105 inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 554 - ExplicitHeight = 102 + ExplicitHeight = 120 inherited dxLayoutControl1: TdxLayoutControl Width = 554 - Height = 72 + Height = 75 ExplicitWidth = 554 - ExplicitHeight = 72 + ExplicitHeight = 90 inherited txtFiltroTodo: TcxTextEdit + Top = -10 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 457 - Width = 457 + ExplicitTop = -10 + ExplicitWidth = 273 + Width = 273 end inherited edtFechaIniFiltro: TcxDateEdit + Top = 17 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 240 - Width = 240 + ExplicitTop = 17 + ExplicitWidth = 200 + Width = 200 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 344 + Left = 317 + Top = 17 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 344 + ExplicitLeft = 317 + ExplicitTop = 17 ExplicitWidth = 200 Width = 200 end inherited edtFecha2FinFiltro: TcxDateEdit + Left = 317 + Top = 44 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 317 + ExplicitTop = 44 + ExplicitWidth = 200 + Width = 200 end inherited edtFecha2IniFiltro: TcxDateEdit + Top = 44 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitTop = 44 + ExplicitWidth = 200 + Width = 200 + end + inherited edtFecha3IniFiltro: TcxDateEdit + Top = 71 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitTop = 71 + ExplicitWidth = 200 + Width = 200 + end + inherited edtFecha3FinFiltro: TcxDateEdit + Left = 318 + Top = 71 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 318 + ExplicitTop = 71 + ExplicitWidth = 200 + Width = 200 + end + inherited txtFiltroTodo2: TcxTextEdit + Left = 308 + Top = -10 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 308 + ExplicitTop = -10 + ExplicitWidth = 275 + Width = 275 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Top = 72 + Top = 75 Width = 554 - ExplicitTop = 72 + ExplicitTop = 90 ExplicitWidth = 554 inherited tbxBotones: TTBXToolbar Width = 544 @@ -192,7 +244,7 @@ inherited frViewGrid: TfrViewGrid PrinterPage.ScaleMode = smFit PrinterPage._dxMeasurementUnits_ = 0 PrinterPage._dxLastMU_ = 2 - ReportDocument.CreationDate = 43888.650270717590000000 + ReportDocument.CreationDate = 44650.486065104170000000 StyleManager = dmBase.dxPrintStyleManager1 OptionsCards.Shadow.Depth = 0 OptionsExpanding.ExpandGroupRows = True diff --git a/Source/GUIBase/uViewGridBase.pas b/Source/GUIBase/uViewGridBase.pas index 67231bc..261bc03 100644 --- a/Source/GUIBase/uViewGridBase.pas +++ b/Source/GUIBase/uViewGridBase.pas @@ -65,6 +65,10 @@ type function GetFilter: string; property Filter: string read GetFilter write SetFilter; + procedure SetFilter2(const Value: string); + function GetFilter2: string; + property Filter2: string read GetFilter2 write SetFilter2; + function GetFiltered: Boolean; property Filtered : Boolean read GetFiltered; @@ -87,6 +91,7 @@ type private FViewFiltros: IViewFiltroBase; FFilter: string; + FFilter2: string; FOnFilterChanged : TNotifyEvent; FGridStatus : TcxGridStatus; procedure BestFitAllColumns; @@ -105,13 +110,16 @@ type function getNumSeleccionados: Integer; procedure SetFilter(const Value: string); virtual; + procedure SetFilter2(const Value: string); virtual; procedure RefrescarFiltro; function GetFilter: string; virtual; + function GetFilter2: string; virtual; function GetFiltered: Boolean; virtual; - procedure FiltrarGrid(TextoFiltro : String); virtual; function GetViewFiltros: IViewFiltroBase; procedure SetViewFiltros(const Value: IViewFiltroBase); virtual; procedure FilterChanged(Sender : TObject); virtual; + procedure FiltrarGrid(TextoFiltro : String); overload; virtual; + procedure FiltrarGrid(TextoFiltro1, TextoFiltro2: String); overload; virtual; public constructor Create(AOwner: TComponent); override; @@ -148,6 +156,7 @@ type const APartialCompare: Boolean = False) : Boolean;} property Filter: string read GetFilter write SetFilter; + property Filter2: string read GetFilter2 write SetFilter2; property Filtered : Boolean read GetFiltered; procedure AnadirOtrosFiltros; virtual; @@ -225,6 +234,7 @@ constructor TfrViewGridBase.Create(AOwner: TComponent); begin inherited; FFilter := ''; + FFilter2 := ''; FOnFilterChanged := FilterChanged; FPopupMenu := nil; FOnDblClick := nil; @@ -261,6 +271,11 @@ begin Result := FFilter; end; +function TfrViewGridBase.GetFilter2: string; +begin + Result := FFilter2; +end; + function TfrViewGridBase.GetFiltered: Boolean; begin //Los niveles de los grid no se consideran filtros @@ -333,7 +348,10 @@ procedure TfrViewGridBase.RefrescarFiltro; begin //De esta forma obligaremos a que se creen nuevamente todos los filtros, cuando llamemos a este metodo if Assigned(ViewFiltros) then + begin Filter := ViewFiltros.Texto; + Filter2 := ViewFiltros.Texto2; + end; end; procedure TfrViewGridBase.RestoreFromIniFile; @@ -391,7 +409,24 @@ begin if Assigned(ViewFiltros) then ViewFiltros.Texto := FFilter; - FiltrarGrid(FFilter); + FiltrarGrid(FFilter, FFilter2); + + //Obliga a generar todos los filtros de las vista hija + AnadirOtrosFiltros; + + if Assigned(FOnFilterChanged) then + FOnFilterChanged(Self); +end; + +procedure TfrViewGridBase.SetFilter2(const Value: string); +begin + FFilter2 := Value; + + //Así tendremos el mismo valor en el filtro simple que en el filtro en detalle + if Assigned(ViewFiltros) then + ViewFiltros.Texto2 := FFilter2; + + FiltrarGrid(FFilter, FFilter2); //Obliga a generar todos los filtros de las vista hija AnadirOtrosFiltros; @@ -502,6 +537,52 @@ begin // end; +procedure TfrViewGridBase.FiltrarGrid(TextoFiltro1, TextoFiltro2: String); +var + Columna: TcxGridDBColumn; + i: Integer; + AItemList: TcxFilterCriteriaItemList; +begin + with _FocusedView.DataController.Filter do + begin + BeginUpdate; + try + Options := [fcoCaseInsensitive, fcoSoftCompare]; + Root.Clear; + if Length(TextoFiltro1) > 0 then + begin + AItemList := Root.AddItemList(fboAnd); + AItemList.BoolOperatorKind := fboOr; + for i:=0 to (_FocusedView as TcxGridDBTableView).ColumnCount - 1 do + begin + Columna := (_FocusedView as TcxGridDBTableView).Columns[i]; + if (Length(Columna.Caption) > 0) and (Columna.Caption <> 'RecID') then + AItemList.AddItem(Columna, foLike, '%'+TextoFiltro1+'%', IntToStr(i)); + end; + end; + + if Length(TextoFiltro2) > 0 then + begin + AItemList := Root.AddItemList(fboAnd); + AItemList.BoolOperatorKind := fboOr; + for i:=0 to (_FocusedView as TcxGridDBTableView).ColumnCount - 1 do + begin + Columna := (_FocusedView as TcxGridDBTableView).Columns[i]; + if (Length(Columna.Caption) > 0) and (Columna.Caption <> 'RecID') then + AItemList.AddItem(Columna, foLike, '%'+TextoFiltro2+'%', IntToStr(i)); + end; + end; + + if ((Length(TextoFiltro1) > 0) or (Length(TextoFiltro2) > 0)) then + Active := True + else + Active := False; + finally + EndUpdate; + end; + end; +end; + destructor TfrViewGridBase.Destroy; begin FOnFilterChanged := Nil; diff --git a/Source/Lib/ApplicationBase.dcp b/Source/Lib/ApplicationBase.dcp index 9a132de..682d342 100644 Binary files a/Source/Lib/ApplicationBase.dcp and b/Source/Lib/ApplicationBase.dcp differ diff --git a/Source/Lib/Base.dcp b/Source/Lib/Base.dcp index 41cff28..eda01be 100644 Binary files a/Source/Lib/Base.dcp and b/Source/Lib/Base.dcp differ diff --git a/Source/Lib/GUIBase.dcp b/Source/Lib/GUIBase.dcp index 83042bf..268bbfa 100644 Binary files a/Source/Lib/GUIBase.dcp and b/Source/Lib/GUIBase.dcp differ diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.dfm b/Source/Modulos/Contactos/Views/uEditorClientes.dfm index 34334cb..cc4c742 100644 --- a/Source/Modulos/Contactos/Views/uEditorClientes.dfm +++ b/Source/Modulos/Contactos/Views/uEditorClientes.dfm @@ -52,16 +52,23 @@ inherited fEditorClientes: TfEditorClientes Width = 786 ExplicitWidth = 786 inherited tbxMain: TTBXToolbar - ExplicitWidth = 775 + ExplicitWidth = 632 + end + inherited tbxFiltro: TTBXToolbar + ExplicitWidth = 319 + inherited tbxEditFiltro2: TTBXEditItem + Enabled = True + Visible = True + end end inherited tbxMenu: TTBXToolbar ExplicitWidth = 786 end inherited TBXTMain2: TTBXToolbar - Left = 275 + Left = 319 DockPos = 275 Visible = True - ExplicitLeft = 275 + ExplicitLeft = 319 ExplicitWidth = 67 object TBXItem38: TTBXItem Action = actLOPD @@ -94,10 +101,16 @@ inherited fEditorClientes: TfEditorClientes ExplicitHeight = 398 inherited cxGrid: TcxGrid Width = 786 - Height = 270 + Height = 267 ExplicitWidth = 786 - ExplicitHeight = 270 + ExplicitHeight = 267 inherited cxGridView: TcxGridDBTableView + DataController.Summary.FooterSummaryItems = < + item + Format = '0 clientes' + Kind = skCount + Column = frViewClientes1.cxGridViewNOMBRE + end> end end inherited frViewFiltroBase1: TfrViewFiltroBase @@ -146,6 +159,28 @@ inherited fEditorClientes: TfEditorClientes 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 txtFiltroTodo2: TcxTextEdit + Left = 511 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 511 + ExplicitWidth = 275 + Width = 275 + end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 786 diff --git a/Source/Modulos/Contactos/Views/uViewClientes.dfm b/Source/Modulos/Contactos/Views/uViewClientes.dfm index d6cdabd..ba6c819 100644 --- a/Source/Modulos/Contactos/Views/uViewClientes.dfm +++ b/Source/Modulos/Contactos/Views/uViewClientes.dfm @@ -5,9 +5,10 @@ inherited frViewClientes: TfrViewClientes ExplicitHeight = 504 inherited cxGrid: TcxGrid Width = 633 - Height = 376 + Height = 373 + ExplicitTop = 105 ExplicitWidth = 633 - ExplicitHeight = 376 + ExplicitHeight = 373 inherited cxGridView: TcxGridDBTableView DataController.Summary.FooterSummaryItems = < item @@ -86,6 +87,10 @@ inherited frViewClientes: TfrViewClientes VisibleForCustomization = False Width = 90 end + object cxGridViewPROCEDENCIA_CLIENTE: TcxGridDBColumn + Caption = 'Procedencia' + DataBinding.FieldName = 'PROCEDENCIA_CLIENTE' + end end end inherited frViewFiltroBase1: TfrViewFiltroBase @@ -134,9 +139,41 @@ inherited frViewClientes: TfrViewClientes 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 txtFiltroTodo2: TcxTextEdit + Left = 555 + Enabled = True + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 555 + ExplicitWidth = 275 + Width = 275 + end + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControl1Group3: TdxLayoutGroup + inherited dxLayoutControl1Item8: TdxLayoutItem + Enabled = True + Visible = True + end + end + end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 633 + ExplicitTop = 75 ExplicitWidth = 633 inherited tbxBotones: TTBXToolbar Width = 623 diff --git a/Source/Modulos/Contactos/Views/uViewClientes.pas b/Source/Modulos/Contactos/Views/uViewClientes.pas index 1d1c8c7..6797043 100644 --- a/Source/Modulos/Contactos/Views/uViewClientes.pas +++ b/Source/Modulos/Contactos/Views/uViewClientes.pas @@ -28,6 +28,7 @@ type cxGridViewPERSONA_CONTACTO: TcxGridDBColumn; cxGridViewFECHA_ALTA: TcxGridDBColumn; cxGridViewLISTA_NOMBRES: TcxGridDBColumn; + cxGridViewPROCEDENCIA_CLIENTE: TcxGridDBColumn; procedure cxGridViewCODIGOCustomDrawCell(Sender: TcxCustomGridTableView; ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean); diff --git a/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm b/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm index 2d430ab..db76633 100644 --- a/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm @@ -368,6 +368,11 @@ inherited DataModuleContratosCliente: TDataModuleContratosCliente Name = 'CAMPO_LIBRE' DataType = datString Size = 255 + end + item + Name = 'PROCEDENCIA_CLIENTE' + DataType = datString + Size = 255 end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] diff --git a/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas b/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas index 2055cd1..5aeb510 100644 --- a/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas +++ b/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas @@ -9,13 +9,13 @@ 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_Valores = '{0549BE41-8DC9-4C9D-812F-6D146575E4B4}'; - RID_Propiedades = '{A65EEF12-2395-4143-9DA6-F23FFF505ADF}'; - RID_ListaAnosContratos = '{D47DCD2C-5EED-4423-A22A-1CC3F1347D27}'; - RID_ContratosClienteBeneficios = '{6B12BAFF-EBC0-4A87-A7EA-CEF5B669B735}'; - RID_ContratosCliente = '{0BA8D712-E5F9-4808-B8C1-251F0007E42F}'; - RID_TiposCapitulos = '{AE2C99EF-A3DF-41B8-A583-3D4D2146EFDF}'; - RID_ContratosCliente_Detalles = '{A3A68389-EC21-4034-9751-29C596223D59}'; + RID_Valores = '{AEE43CFA-1BB9-4CAC-8556-BFFC8FCEC733}'; + RID_Propiedades = '{B0855CF2-8ED5-4024-AEF7-D177FF322892}'; + RID_ListaAnosContratos = '{7E058AD2-196F-4A8A-AC1D-8DE9CBA5C393}'; + RID_ContratosClienteBeneficios = '{0EFEC438-3D7F-4359-BCCA-04AB52950321}'; + RID_ContratosCliente = '{00CCC87B-31E8-4640-BD5A-80EA152531B1}'; + RID_TiposCapitulos = '{FDAC7B98-87A1-41D6-A1C8-1FF22B060EBD}'; + RID_ContratosCliente_Detalles = '{68294EF3-4491-4A62-BCB2-E2FCE40EC48F}'; { Data table names } nme_Valores = 'Valores'; @@ -141,6 +141,7 @@ const fld_ContratosClienteFACTURA_ASOCIADA = 'FACTURA_ASOCIADA'; fld_ContratosClienteFECHA_PREVISTA_MONTAJE = 'FECHA_PREVISTA_MONTAJE'; fld_ContratosClienteCAMPO_LIBRE = 'CAMPO_LIBRE'; + fld_ContratosClientePROCEDENCIA_CLIENTE = 'PROCEDENCIA_CLIENTE'; { ContratosCliente field indexes } idx_ContratosClienteID = 0; @@ -197,6 +198,7 @@ const idx_ContratosClienteFACTURA_ASOCIADA = 51; idx_ContratosClienteFECHA_PREVISTA_MONTAJE = 52; idx_ContratosClienteCAMPO_LIBRE = 53; + idx_ContratosClientePROCEDENCIA_CLIENTE = 54; { TiposCapitulos fields } fld_TiposCapitulosID = 'ID'; @@ -255,7 +257,7 @@ const type { IValores } IValores = interface(IDAStronglyTypedDataTable) - ['{456DE31B-603C-49A6-B24F-F8F67E7BA1D9}'] + ['{B7DEBA9E-BCE7-44A0-A0D2-208F8F26EC42}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -314,7 +316,7 @@ type { IPropiedades } IPropiedades = interface(IDAStronglyTypedDataTable) - ['{B20DDA26-6EF1-49DF-8C3F-3C113EC3A75A}'] + ['{6063DDB1-1BC1-4242-A704-513F0F3137A7}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -373,7 +375,7 @@ type { IListaAnosContratos } IListaAnosContratos = interface(IDAStronglyTypedDataTable) - ['{EDC46A9F-5445-43F2-8B16-2C80FA55312C}'] + ['{7AE79F64-046B-478B-A184-60A42E6CEC14}'] { Property getters and setters } function GetANOValue: String; procedure SetANOValue(const aValue: String); @@ -408,7 +410,7 @@ type { IContratosClienteBeneficios } IContratosClienteBeneficios = interface(IDAStronglyTypedDataTable) - ['{6D340200-67CA-469A-924A-B2AD661BF858}'] + ['{CA71E23E-0E59-4812-BD81-DD1B8C7F72F9}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -611,7 +613,7 @@ type { IContratosCliente } IContratosCliente = interface(IDAStronglyTypedDataTable) - ['{FE98EB74-D1A6-4425-8087-F9D05815E895}'] + ['{57FF1442-BB37-430E-B945-F2BD12A522F4}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -823,6 +825,10 @@ type procedure SetCAMPO_LIBREValue(const aValue: String); function GetCAMPO_LIBREIsNull: Boolean; procedure SetCAMPO_LIBREIsNull(const aValue: Boolean); + function GetPROCEDENCIA_CLIENTEValue: String; + procedure SetPROCEDENCIA_CLIENTEValue(const aValue: String); + function GetPROCEDENCIA_CLIENTEIsNull: Boolean; + procedure SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean); { Properties } @@ -934,6 +940,8 @@ type property FECHA_PREVISTA_MONTAJEIsNull: Boolean read GetFECHA_PREVISTA_MONTAJEIsNull write SetFECHA_PREVISTA_MONTAJEIsNull; property CAMPO_LIBRE: String read GetCAMPO_LIBREValue write SetCAMPO_LIBREValue; property CAMPO_LIBREIsNull: Boolean read GetCAMPO_LIBREIsNull write SetCAMPO_LIBREIsNull; + property PROCEDENCIA_CLIENTE: String read GetPROCEDENCIA_CLIENTEValue write SetPROCEDENCIA_CLIENTEValue; + property PROCEDENCIA_CLIENTEIsNull: Boolean read GetPROCEDENCIA_CLIENTEIsNull write SetPROCEDENCIA_CLIENTEIsNull; end; { TContratosClienteDataTableRules } @@ -1163,6 +1171,10 @@ type procedure SetCAMPO_LIBREValue(const aValue: String); virtual; function GetCAMPO_LIBREIsNull: Boolean; virtual; procedure SetCAMPO_LIBREIsNull(const aValue: Boolean); virtual; + function GetPROCEDENCIA_CLIENTEValue: String; virtual; + procedure SetPROCEDENCIA_CLIENTEValue(const aValue: String); virtual; + function GetPROCEDENCIA_CLIENTEIsNull: Boolean; virtual; + procedure SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean); virtual; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -1273,6 +1285,8 @@ type property FECHA_PREVISTA_MONTAJEIsNull: Boolean read GetFECHA_PREVISTA_MONTAJEIsNull write SetFECHA_PREVISTA_MONTAJEIsNull; property CAMPO_LIBRE: String read GetCAMPO_LIBREValue write SetCAMPO_LIBREValue; property CAMPO_LIBREIsNull: Boolean read GetCAMPO_LIBREIsNull write SetCAMPO_LIBREIsNull; + property PROCEDENCIA_CLIENTE: String read GetPROCEDENCIA_CLIENTEValue write SetPROCEDENCIA_CLIENTEValue; + property PROCEDENCIA_CLIENTEIsNull: Boolean read GetPROCEDENCIA_CLIENTEIsNull write SetPROCEDENCIA_CLIENTEIsNull; public constructor Create(aDataTable: TDADataTable); override; @@ -1285,7 +1299,7 @@ type } { ITiposCapitulos } ITiposCapitulos = interface(IDAStronglyTypedDataTable) - ['{5302F198-C996-421D-9897-7155FFFF5C6C}'] + ['{A289CB54-D71E-428B-9B81-18A5A7D546DE}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1380,7 +1394,7 @@ type { IContratosCliente_Detalles } IContratosCliente_Detalles = interface(IDAStronglyTypedDataTable) - ['{45BBDB1C-0E57-4631-A81F-17286C3F0225}'] + ['{DABADFCD-EEA9-4ACB-919D-9F2239F1912B}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -3296,6 +3310,27 @@ begin DataTable.Fields[idx_ContratosClienteCAMPO_LIBRE].AsVariant := Null; end; +function TContratosClienteDataTableRules.GetPROCEDENCIA_CLIENTEValue: String; +begin + result := DataTable.Fields[idx_ContratosClientePROCEDENCIA_CLIENTE].AsString; +end; + +procedure TContratosClienteDataTableRules.SetPROCEDENCIA_CLIENTEValue(const aValue: String); +begin + DataTable.Fields[idx_ContratosClientePROCEDENCIA_CLIENTE].AsString := aValue; +end; + +function TContratosClienteDataTableRules.GetPROCEDENCIA_CLIENTEIsNull: boolean; +begin + result := DataTable.Fields[idx_ContratosClientePROCEDENCIA_CLIENTE].IsNull; +end; + +procedure TContratosClienteDataTableRules.SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ContratosClientePROCEDENCIA_CLIENTE].AsVariant := Null; +end; + { TTiposCapitulosDataTableRules } constructor TTiposCapitulosDataTableRules.Create(aDataTable: TDADataTable); diff --git a/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas b/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas index 1501320..68ed916 100644 --- a/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas +++ b/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas @@ -9,18 +9,18 @@ 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_ValoresDelta = '{406066CE-3BB3-42F3-B7FC-493C9BA814E8}'; - RID_PropiedadesDelta = '{F16E429C-3CD8-4458-8312-208C5A37AFD6}'; - RID_ListaAnosContratosDelta = '{524A7663-3184-41AC-98BC-61A438830141}'; - RID_ContratosClienteBeneficiosDelta = '{30858076-5CCE-49DC-8A00-C7B87CE73B2A}'; - RID_ContratosClienteDelta = '{1F8826C9-2B51-4454-B6D7-CF7879E483EF}'; - RID_TiposCapitulosDelta = '{962F7FF0-8B19-4D5F-9F87-108CA74B52C9}'; - RID_ContratosCliente_DetallesDelta = '{E8242C5E-E9FE-492B-A51C-A9387B2E4765}'; + RID_ValoresDelta = '{7C597F28-9CAB-4563-AB03-5109CCD1E4FD}'; + RID_PropiedadesDelta = '{AEAD2B1C-5693-4333-B72F-D7FCB996C77C}'; + RID_ListaAnosContratosDelta = '{5420790C-645C-4AAD-84FB-8194E39EC4DC}'; + RID_ContratosClienteBeneficiosDelta = '{C92FEDD1-D568-4200-A088-37BAFD5C3BBE}'; + RID_ContratosClienteDelta = '{026E716F-C412-4A7B-BA3A-1D689117FC73}'; + RID_TiposCapitulosDelta = '{3515E5DD-2CF2-4ED9-A717-1FE908B2D252}'; + RID_ContratosCliente_DetallesDelta = '{04D0B422-F0D9-4FF9-8BFA-67148A8EA383}'; type { IValoresDelta } IValoresDelta = interface(IValores) - ['{406066CE-3BB3-42F3-B7FC-493C9BA814E8}'] + ['{7C597F28-9CAB-4563-AB03-5109CCD1E4FD}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_PROPIEDADValue : Integer; @@ -78,7 +78,7 @@ type { IPropiedadesDelta } IPropiedadesDelta = interface(IPropiedades) - ['{F16E429C-3CD8-4458-8312-208C5A37AFD6}'] + ['{AEAD2B1C-5693-4333-B72F-D7FCB996C77C}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -136,7 +136,7 @@ type { IListaAnosContratosDelta } IListaAnosContratosDelta = interface(IListaAnosContratos) - ['{524A7663-3184-41AC-98BC-61A438830141}'] + ['{5420790C-645C-4AAD-84FB-8194E39EC4DC}'] { Property getters and setters } function GetOldANOValue : String; @@ -170,7 +170,7 @@ type { IContratosClienteBeneficiosDelta } IContratosClienteBeneficiosDelta = interface(IContratosClienteBeneficios) - ['{30858076-5CCE-49DC-8A00-C7B87CE73B2A}'] + ['{C92FEDD1-D568-4200-A088-37BAFD5C3BBE}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldREFERENCIAValue : String; @@ -372,7 +372,7 @@ type { IContratosClienteDelta } IContratosClienteDelta = interface(IContratosCliente) - ['{1F8826C9-2B51-4454-B6D7-CF7879E483EF}'] + ['{026E716F-C412-4A7B-BA3A-1D689117FC73}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -428,6 +428,7 @@ type function GetOldFACTURA_ASOCIADAValue : String; function GetOldFECHA_PREVISTA_MONTAJEValue : DateTime; function GetOldCAMPO_LIBREValue : String; + function GetOldPROCEDENCIA_CLIENTEValue : String; { Properties } property OldID : Integer read GetOldIDValue; @@ -484,6 +485,7 @@ type property OldFACTURA_ASOCIADA : String read GetOldFACTURA_ASOCIADAValue; property OldFECHA_PREVISTA_MONTAJE : DateTime read GetOldFECHA_PREVISTA_MONTAJEValue; property OldCAMPO_LIBRE : String read GetOldCAMPO_LIBREValue; + property OldPROCEDENCIA_CLIENTE : String read GetOldPROCEDENCIA_CLIENTEValue; end; { TContratosClienteBusinessProcessorRules } @@ -821,6 +823,12 @@ type function GetOldCAMPO_LIBREIsNull: Boolean; virtual; procedure SetCAMPO_LIBREValue(const aValue: String); virtual; procedure SetCAMPO_LIBREIsNull(const aValue: Boolean); virtual; + function GetPROCEDENCIA_CLIENTEValue: String; virtual; + function GetPROCEDENCIA_CLIENTEIsNull: Boolean; virtual; + function GetOldPROCEDENCIA_CLIENTEValue: String; virtual; + function GetOldPROCEDENCIA_CLIENTEIsNull: Boolean; virtual; + procedure SetPROCEDENCIA_CLIENTEValue(const aValue: String); virtual; + procedure SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -1039,6 +1047,10 @@ type property CAMPO_LIBREIsNull : Boolean read GetCAMPO_LIBREIsNull write SetCAMPO_LIBREIsNull; property OldCAMPO_LIBRE : String read GetOldCAMPO_LIBREValue; property OldCAMPO_LIBREIsNull : Boolean read GetOldCAMPO_LIBREIsNull; + property PROCEDENCIA_CLIENTE : String read GetPROCEDENCIA_CLIENTEValue write SetPROCEDENCIA_CLIENTEValue; + property PROCEDENCIA_CLIENTEIsNull : Boolean read GetPROCEDENCIA_CLIENTEIsNull write SetPROCEDENCIA_CLIENTEIsNull; + property OldPROCEDENCIA_CLIENTE : String read GetOldPROCEDENCIA_CLIENTEValue; + property OldPROCEDENCIA_CLIENTEIsNull : Boolean read GetOldPROCEDENCIA_CLIENTEIsNull; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -1048,7 +1060,7 @@ type { ITiposCapitulosDelta } ITiposCapitulosDelta = interface(ITiposCapitulos) - ['{962F7FF0-8B19-4D5F-9F87-108CA74B52C9}'] + ['{3515E5DD-2CF2-4ED9-A717-1FE908B2D252}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldPOSICIONValue : Integer; @@ -1142,7 +1154,7 @@ type { IContratosCliente_DetallesDelta } IContratosCliente_DetallesDelta = interface(IContratosCliente_Detalles) - ['{E8242C5E-E9FE-492B-A51C-A9387B2E4765}'] + ['{04D0B422-F0D9-4FF9-8BFA-67148A8EA383}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTRATOValue : Integer; @@ -3824,6 +3836,37 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteCAMPO_LIBRE] := Null; end; +function TContratosClienteBusinessProcessorRules.GetPROCEDENCIA_CLIENTEValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClientePROCEDENCIA_CLIENTE]; +end; + +function TContratosClienteBusinessProcessorRules.GetPROCEDENCIA_CLIENTEIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClientePROCEDENCIA_CLIENTE]); +end; + +function TContratosClienteBusinessProcessorRules.GetOldPROCEDENCIA_CLIENTEValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClientePROCEDENCIA_CLIENTE]; +end; + +function TContratosClienteBusinessProcessorRules.GetOldPROCEDENCIA_CLIENTEIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClientePROCEDENCIA_CLIENTE]); +end; + +procedure TContratosClienteBusinessProcessorRules.SetPROCEDENCIA_CLIENTEValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClientePROCEDENCIA_CLIENTE] := aValue; +end; + +procedure TContratosClienteBusinessProcessorRules.SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClientePROCEDENCIA_CLIENTE] := Null; +end; + { TTiposCapitulosBusinessProcessorRules } constructor TTiposCapitulosBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); diff --git a/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm b/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm index 7ebf1ab..3c58783 100644 --- a/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm +++ b/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm @@ -498,6 +498,10 @@ object srvContratosCliente: TsrvContratosCliente item DatasetField = 'LOPD' TableField = 'LOPD' + end + item + DatasetField = 'PROCEDENCIA_CLIENTE' + TableField = 'PROCEDENCIA_CLIENTE' end> end> Name = 'ContratosCliente' @@ -794,6 +798,11 @@ object srvContratosCliente: TsrvContratosCliente Name = 'CAMPO_LIBRE' DataType = datString Size = 255 + end + item + Name = 'PROCEDENCIA_CLIENTE' + DataType = datString + Size = 255 end> end item diff --git a/Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.dfm index a5625b7..0533adb 100644 --- a/Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.dfm @@ -126,7 +126,7 @@ inherited fEditorContratosCliente: TfEditorContratosCliente Width = 1119 ExplicitWidth = 1119 inherited tbxMain: TTBXToolbar - ExplicitWidth = 894 + ExplicitWidth = 751 object TBXSubmenuItem3: TTBXSubmenuItem [0] Caption = 'Nuevo' DisplayMode = nbdmImageAndText @@ -157,7 +157,7 @@ inherited fEditorContratosCliente: TfEditorContratosCliente end end inherited tbxFiltro: TTBXToolbar - ExplicitWidth = 431 + ExplicitWidth = 481 inherited lblAno: TTBXLabelItem Visible = True end @@ -167,6 +167,10 @@ inherited fEditorContratosCliente: TfEditorContratosCliente inherited sepAno: TTBXSeparatorItem Visible = True end + inherited tbxEditFiltro2: TTBXEditItem + Enabled = True + Visible = True + end end inherited tbxMenu: TTBXToolbar ExplicitWidth = 1119 @@ -190,10 +194,10 @@ inherited fEditorContratosCliente: TfEditorContratosCliente end end inherited TBXTMain2: TTBXToolbar - Left = 431 + Left = 481 DockPos = 343 Visible = True - ExplicitLeft = 431 + ExplicitLeft = 481 ExplicitWidth = 430 object TBXItem50: TTBXItem Action = actLOPD diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm index 168310b..e750c7c 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm @@ -123,6 +123,10 @@ inherited frViewContratosCliente: TfrViewContratosCliente Visible = False VisibleForCustomization = False end + object cxGridViewPROCEDENCIA_CLIENTE: TcxGridDBColumn + Caption = 'Procedencia' + DataBinding.FieldName = 'PROCEDENCIA_CLIENTE' + end object cxGridViewNIF_CIF: TcxGridDBColumn Caption = 'NIF/CIF' DataBinding.FieldName = 'NIF_CIF' @@ -211,6 +215,8 @@ inherited frViewContratosCliente: TfrViewContratosCliente StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 146 + ExplicitWidth = 273 + Width = 273 end inherited edtFechaIniFiltro: TcxDateEdit Left = 146 @@ -219,8 +225,6 @@ inherited frViewContratosCliente: TfrViewContratosCliente StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 146 - ExplicitWidth = 200 - Width = 200 end inherited edtFechaFinFiltro: TcxDateEdit Left = 366 @@ -266,7 +270,24 @@ inherited frViewContratosCliente: TfrViewContratosCliente StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 366 end + inherited txtFiltroTodo2: TcxTextEdit + Left = 543 + Enabled = True + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 543 + ExplicitWidth = 275 + Width = 275 + end inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControl1Group3: TdxLayoutGroup + inherited dxLayoutControl1Item8: TdxLayoutItem + Enabled = True + Visible = True + end + end inherited dxLayoutControl1Group2: TdxLayoutGroup Visible = True inherited dxLayoutControl1Item5: TdxLayoutItem diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas index 8eedd26..b5e91d1 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas @@ -62,6 +62,7 @@ type TBXSeparatorItem1: TTBXSeparatorItem; TBXSeparatorItem3: TTBXSeparatorItem; TBXSeparatorItem4: TTBXSeparatorItem; + cxGridViewPROCEDENCIA_CLIENTE: TcxGridDBColumn; procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel); procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; diff --git a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm index 153d547..66e3934 100644 --- a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm @@ -334,6 +334,11 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente Size = 255 DisplayLabel = 'Otros nombres' DictionaryEntry = 'FacturasCliente_LISTA_NOMBRES' + end + item + Name = 'PROCEDENCIA_CLIENTE' + DataType = datString + Size = 255 end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] diff --git a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas index 77604d2..8bb5d35 100644 --- a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas +++ b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas @@ -9,9 +9,9 @@ const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ListaAnosFacturas = '{5C79DBFB-3749-4E03-8CDE-DE9D4C57D4A9}'; - RID_FacturasCliente = '{CED0F94B-8407-4B71-A940-CD9F5546C129}'; - RID_FacturasCliente_Detalles = '{09F93CCC-0AC0-4637-9AD7-11A92F660FCB}'; + RID_ListaAnosFacturas = '{484D7187-CB40-476A-9513-05D56701D4B9}'; + RID_FacturasCliente = '{6D39955F-2046-48A8-A1A0-D1B462E5236E}'; + RID_FacturasCliente_Detalles = '{35F0CA37-6ADD-4C61-9D67-0466331C6F62}'; { Data table names } nme_ListaAnosFacturas = 'ListaAnosFacturas'; @@ -78,6 +78,7 @@ const fld_FacturasClienteSIN_COMISION = 'SIN_COMISION'; fld_FacturasClienteTIPO_FACTURA = 'TIPO_FACTURA'; fld_FacturasClienteLISTA_NOMBRES = 'LISTA_NOMBRES'; + fld_FacturasClientePROCEDENCIA_CLIENTE = 'PROCEDENCIA_CLIENTE'; { FacturasCliente field indexes } idx_FacturasClienteID = 0; @@ -133,6 +134,7 @@ const idx_FacturasClienteSIN_COMISION = 50; idx_FacturasClienteTIPO_FACTURA = 51; idx_FacturasClienteLISTA_NOMBRES = 52; + idx_FacturasClientePROCEDENCIA_CLIENTE = 53; { FacturasCliente_Detalles fields } fld_FacturasCliente_DetallesID = 'ID'; @@ -169,7 +171,7 @@ const type { IListaAnosFacturas } IListaAnosFacturas = interface(IDAStronglyTypedDataTable) - ['{7BB039B7-6272-44A4-9D97-8C440C2E331D}'] + ['{538ADACC-485C-464B-84AD-84ADBF7D37E2}'] { Property getters and setters } function GetANOValue: String; procedure SetANOValue(const aValue: String); @@ -204,7 +206,7 @@ type { IFacturasCliente } IFacturasCliente = interface(IDAStronglyTypedDataTable) - ['{D08B97D1-FCA0-4F86-85DD-1A1355E36197}'] + ['{45CA2939-6E07-4742-82AE-4698DB6B3A14}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -417,6 +419,10 @@ type procedure SetLISTA_NOMBRESValue(const aValue: String); function GetLISTA_NOMBRESIsNull: Boolean; procedure SetLISTA_NOMBRESIsNull(const aValue: Boolean); + function GetPROCEDENCIA_CLIENTEValue: String; + procedure SetPROCEDENCIA_CLIENTEValue(const aValue: String); + function GetPROCEDENCIA_CLIENTEIsNull: Boolean; + procedure SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean); { Properties } @@ -526,6 +532,8 @@ type property TIPO_FACTURAIsNull: Boolean read GetTIPO_FACTURAIsNull write SetTIPO_FACTURAIsNull; property LISTA_NOMBRES: String read GetLISTA_NOMBRESValue write SetLISTA_NOMBRESValue; property LISTA_NOMBRESIsNull: Boolean read GetLISTA_NOMBRESIsNull write SetLISTA_NOMBRESIsNull; + property PROCEDENCIA_CLIENTE: String read GetPROCEDENCIA_CLIENTEValue write SetPROCEDENCIA_CLIENTEValue; + property PROCEDENCIA_CLIENTEIsNull: Boolean read GetPROCEDENCIA_CLIENTEIsNull write SetPROCEDENCIA_CLIENTEIsNull; end; { TFacturasClienteDataTableRules } @@ -746,6 +754,10 @@ type procedure SetLISTA_NOMBRESValue(const aValue: String); virtual; function GetLISTA_NOMBRESIsNull: Boolean; virtual; procedure SetLISTA_NOMBRESIsNull(const aValue: Boolean); virtual; + function GetPROCEDENCIA_CLIENTEValue: String; virtual; + procedure SetPROCEDENCIA_CLIENTEValue(const aValue: String); virtual; + function GetPROCEDENCIA_CLIENTEIsNull: Boolean; virtual; + procedure SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean); virtual; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -854,6 +866,8 @@ type property TIPO_FACTURAIsNull: Boolean read GetTIPO_FACTURAIsNull write SetTIPO_FACTURAIsNull; property LISTA_NOMBRES: String read GetLISTA_NOMBRESValue write SetLISTA_NOMBRESValue; property LISTA_NOMBRESIsNull: Boolean read GetLISTA_NOMBRESIsNull write SetLISTA_NOMBRESIsNull; + property PROCEDENCIA_CLIENTE: String read GetPROCEDENCIA_CLIENTEValue write SetPROCEDENCIA_CLIENTEValue; + property PROCEDENCIA_CLIENTEIsNull: Boolean read GetPROCEDENCIA_CLIENTEIsNull write SetPROCEDENCIA_CLIENTEIsNull; public constructor Create(aDataTable: TDADataTable); override; @@ -863,7 +877,7 @@ type { IFacturasCliente_Detalles } IFacturasCliente_Detalles = interface(IDAStronglyTypedDataTable) - ['{87689EEB-6BF8-4ED2-9742-3AF5F4DDBE64}'] + ['{75F87DDE-E13B-42B1-8550-89F45849D374}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2220,6 +2234,27 @@ begin DataTable.Fields[idx_FacturasClienteLISTA_NOMBRES].AsVariant := Null; end; +function TFacturasClienteDataTableRules.GetPROCEDENCIA_CLIENTEValue: String; +begin + result := DataTable.Fields[idx_FacturasClientePROCEDENCIA_CLIENTE].AsString; +end; + +procedure TFacturasClienteDataTableRules.SetPROCEDENCIA_CLIENTEValue(const aValue: String); +begin + DataTable.Fields[idx_FacturasClientePROCEDENCIA_CLIENTE].AsString := aValue; +end; + +function TFacturasClienteDataTableRules.GetPROCEDENCIA_CLIENTEIsNull: boolean; +begin + result := DataTable.Fields[idx_FacturasClientePROCEDENCIA_CLIENTE].IsNull; +end; + +procedure TFacturasClienteDataTableRules.SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_FacturasClientePROCEDENCIA_CLIENTE].AsVariant := Null; +end; + { TFacturasCliente_DetallesDataTableRules } constructor TFacturasCliente_DetallesDataTableRules.Create(aDataTable: TDADataTable); diff --git a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas index fd12b5d..fd64d93 100644 --- a/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas +++ b/Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas @@ -9,14 +9,14 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ListaAnosFacturasDelta = '{9438FFD8-FD2B-4464-9595-56BBA42ACD21}'; - RID_FacturasClienteDelta = '{09E35A03-382A-4D70-8058-B54DCCE256A8}'; - RID_FacturasCliente_DetallesDelta = '{EC1C8D93-0843-41B9-9D1C-034145DA9FB5}'; + RID_ListaAnosFacturasDelta = '{C9831765-1629-4325-A1FF-1FAE87FC82C2}'; + RID_FacturasClienteDelta = '{7FBCB9F2-5A0C-4C4C-9503-27624E85B1F2}'; + RID_FacturasCliente_DetallesDelta = '{E532A60C-1259-4F35-B997-18F37616D9FD}'; type { IListaAnosFacturasDelta } IListaAnosFacturasDelta = interface(IListaAnosFacturas) - ['{9438FFD8-FD2B-4464-9595-56BBA42ACD21}'] + ['{C9831765-1629-4325-A1FF-1FAE87FC82C2}'] { Property getters and setters } function GetOldANOValue : String; @@ -50,7 +50,7 @@ type { IFacturasClienteDelta } IFacturasClienteDelta = interface(IFacturasCliente) - ['{09E35A03-382A-4D70-8058-B54DCCE256A8}'] + ['{7FBCB9F2-5A0C-4C4C-9503-27624E85B1F2}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -105,6 +105,7 @@ type function GetOldSIN_COMISIONValue : SmallInt; function GetOldTIPO_FACTURAValue : String; function GetOldLISTA_NOMBRESValue : String; + function GetOldPROCEDENCIA_CLIENTEValue : String; { Properties } property OldID : Integer read GetOldIDValue; @@ -160,6 +161,7 @@ type property OldSIN_COMISION : SmallInt read GetOldSIN_COMISIONValue; property OldTIPO_FACTURA : String read GetOldTIPO_FACTURAValue; property OldLISTA_NOMBRES : String read GetOldLISTA_NOMBRESValue; + property OldPROCEDENCIA_CLIENTE : String read GetOldPROCEDENCIA_CLIENTEValue; end; { TFacturasClienteBusinessProcessorRules } @@ -486,6 +488,12 @@ type function GetOldLISTA_NOMBRESIsNull: Boolean; virtual; procedure SetLISTA_NOMBRESValue(const aValue: String); virtual; procedure SetLISTA_NOMBRESIsNull(const aValue: Boolean); virtual; + function GetPROCEDENCIA_CLIENTEValue: String; virtual; + function GetPROCEDENCIA_CLIENTEIsNull: Boolean; virtual; + function GetOldPROCEDENCIA_CLIENTEValue: String; virtual; + function GetOldPROCEDENCIA_CLIENTEIsNull: Boolean; virtual; + procedure SetPROCEDENCIA_CLIENTEValue(const aValue: String); virtual; + procedure SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -700,6 +708,10 @@ type property LISTA_NOMBRESIsNull : Boolean read GetLISTA_NOMBRESIsNull write SetLISTA_NOMBRESIsNull; property OldLISTA_NOMBRES : String read GetOldLISTA_NOMBRESValue; property OldLISTA_NOMBRESIsNull : Boolean read GetOldLISTA_NOMBRESIsNull; + property PROCEDENCIA_CLIENTE : String read GetPROCEDENCIA_CLIENTEValue write SetPROCEDENCIA_CLIENTEValue; + property PROCEDENCIA_CLIENTEIsNull : Boolean read GetPROCEDENCIA_CLIENTEIsNull write SetPROCEDENCIA_CLIENTEIsNull; + property OldPROCEDENCIA_CLIENTE : String read GetOldPROCEDENCIA_CLIENTEValue; + property OldPROCEDENCIA_CLIENTEIsNull : Boolean read GetOldPROCEDENCIA_CLIENTEIsNull; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -709,7 +721,7 @@ type { IFacturasCliente_DetallesDelta } IFacturasCliente_DetallesDelta = interface(IFacturasCliente_Detalles) - ['{EC1C8D93-0843-41B9-9D1C-034145DA9FB5}'] + ['{E532A60C-1259-4F35-B997-18F37616D9FD}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_FACTURAValue : Integer; @@ -2607,6 +2619,37 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteLISTA_NOMBRES] := Null; end; +function TFacturasClienteBusinessProcessorRules.GetPROCEDENCIA_CLIENTEValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClientePROCEDENCIA_CLIENTE]; +end; + +function TFacturasClienteBusinessProcessorRules.GetPROCEDENCIA_CLIENTEIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClientePROCEDENCIA_CLIENTE]); +end; + +function TFacturasClienteBusinessProcessorRules.GetOldPROCEDENCIA_CLIENTEValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClientePROCEDENCIA_CLIENTE]; +end; + +function TFacturasClienteBusinessProcessorRules.GetOldPROCEDENCIA_CLIENTEIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClientePROCEDENCIA_CLIENTE]); +end; + +procedure TFacturasClienteBusinessProcessorRules.SetPROCEDENCIA_CLIENTEValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClientePROCEDENCIA_CLIENTE] := aValue; +end; + +procedure TFacturasClienteBusinessProcessorRules.SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClientePROCEDENCIA_CLIENTE] := Null; +end; + { TFacturasCliente_DetallesBusinessProcessorRules } constructor TFacturasCliente_DetallesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); diff --git a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm index d35f51d..bae4c1c 100644 --- a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm +++ b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm @@ -259,6 +259,10 @@ object srvFacturasCliente: TsrvFacturasCliente item DatasetField = 'LISTA_NOMBRES' TableField = 'LISTA_NOMBRES' + end + item + DatasetField = 'PROCEDENCIA_CLIENTE' + TableField = 'PROCEDENCIA_CLIENTE' end> end> Name = 'FacturasCliente' @@ -537,6 +541,11 @@ object srvFacturasCliente: TsrvFacturasCliente DataType = datString Size = 255 DictionaryEntry = 'FacturasCliente_LISTA_NOMBRES' + end + item + Name = 'PROCEDENCIA_CLIENTE' + DataType = datString + Size = 255 end> end item diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm index 13608f4..b91a900 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm @@ -38,7 +38,7 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente Width = 640 ExplicitWidth = 640 inherited tbxMain: TTBXToolbar - ExplicitWidth = 640 + ExplicitWidth = 632 object TBXSubmenuItem2: TTBXSubmenuItem [0] Caption = 'Nuevo' DisplayMode = nbdmImageAndText @@ -62,7 +62,7 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente end end inherited tbxFiltro: TTBXToolbar - ExplicitWidth = 431 + ExplicitWidth = 481 inherited lblAno: TTBXLabelItem Visible = True end @@ -72,15 +72,19 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente inherited sepAno: TTBXSeparatorItem Visible = True end + inherited tbxEditFiltro2: TTBXEditItem + Enabled = True + Visible = True + end end inherited tbxMenu: TTBXToolbar ExplicitWidth = 640 end inherited TBXTMain2: TTBXToolbar - Left = 431 + Left = 481 Visible = True - ExplicitLeft = 431 - ExplicitWidth = 209 + ExplicitLeft = 481 + ExplicitWidth = 159 object TBXItem42: TTBXItem Action = actCambiarSituacion DisplayMode = nbdmImageAndText @@ -126,9 +130,9 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente ExplicitHeight = 545 inherited cxGrid: TcxGrid Width = 640 - Height = 417 + Height = 414 ExplicitWidth = 640 - ExplicitHeight = 417 + ExplicitHeight = 414 inherited cxGridView: TcxGridDBTableView DataController.Summary.DefaultGroupSummaryItems = < item @@ -246,9 +250,32 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente 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 txtFiltroTodo2: TcxTextEdit + Left = 436 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 436 + ExplicitWidth = 275 + Width = 275 + end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 640 + ExplicitTop = 75 ExplicitWidth = 640 inherited tbxBotones: TTBXToolbar Width = 630 diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm index 4ea76c1..bf49aa1 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm @@ -5,11 +5,12 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente ExplicitHeight = 397 inherited cxGrid: TcxGrid Width = 802 - Height = 269 + Height = 266 RootLevelOptions.DetailTabsPosition = dtpTop OnActiveTabChanged = cxGridActiveTabChanged + ExplicitTop = 105 ExplicitWidth = 802 - ExplicitHeight = 269 + ExplicitHeight = 266 inherited cxGridView: TcxGridDBTableView DataController.KeyFieldNames = 'ID' DataController.Options = [dcoAnsiSort, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoGroupsAlwaysExpanded] @@ -187,6 +188,10 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente Caption = 'Otros nombres' DataBinding.FieldName = 'LISTA_NOMBRES' end + object cxGridViewPROCEDENCIA_CLIENTE: TcxGridDBColumn + Caption = 'Procedencia' + DataBinding.FieldName = 'PROCEDENCIA_CLIENTE' + end end inherited cxGridLevel: TcxGridLevel Caption = 'Todas' @@ -214,6 +219,8 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 273 + Width = 273 end inherited edtFechaIniFiltro: TcxDateEdit Style.LookAndFeel.SkinName = '' @@ -251,19 +258,33 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' end + inherited txtFiltroTodo2: TcxTextEdit + Left = 445 + Enabled = True + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 445 + ExplicitWidth = 275 + Width = 275 + end inherited dxLayoutControl1Group_Root: TdxLayoutGroup - inherited dxLayoutControl1Group2: TdxLayoutGroup - Visible = False - end - inherited dxLayoutControl1Group4: TdxLayoutGroup - Visible = False + inherited dxLayoutControl1Group3: TdxLayoutGroup + inherited dxLayoutControl1Item8: TdxLayoutItem + Enabled = True + Visible = True + end end end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 802 + ExplicitTop = 75 + ExplicitWidth = 802 inherited tbxBotones: TTBXToolbar Width = 792 + ExplicitWidth = 792 end end end diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas index 4cd895e..a2cc15d 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas @@ -66,6 +66,7 @@ type cxGridViewVENDEDOR: TcxGridDBColumn; cxGridViewLISTA_NOMBRES: TcxGridDBColumn; cxGridViewLOPD: TcxGridDBColumn; + cxGridViewPROCEDENCIA_CLIENTE: TcxGridDBColumn; procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out AStyle: TcxStyle); diff --git a/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas b/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas index 931cc16..9efc4b5 100644 --- a/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas +++ b/Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas @@ -1372,7 +1372,8 @@ begin ARecibos.IMPORTE := AFactura.IMPORTE_TOTAL * (AFormaPago.Plazos.PORCENTAJE / 100); end; - ARecibos.DESCRIPCION := 'Pago de factura ' + AFactura.REFERENCIA + ': son ' + CifraToLetras(ARecibos.IMPORTE); +// ARecibos.DESCRIPCION := 'Pago de factura ' + AFactura.REFERENCIA + ': son ' + CifraToLetras(ARecibos.IMPORTE); + ARecibos.DESCRIPCION := 'Pago de factura ' + AFactura.REFERENCIA + ' - ' + ARecibos.NOMBRE + ' - Ref. ' + AFactura.REFERENCIA_PROVEEDOR + ': son ' + CifraToLetras(ARecibos.IMPORTE); ARecibosProveedorController.Guardar(ARecibos); if (AFormaPago.Plazos.RecordCount < 1) and (not AFormaPago.ID_SUBCUENTAIsNull) then diff --git a/Source/Modulos/Lib/AlbCli_FacCli_relation.dcp b/Source/Modulos/Lib/AlbCli_FacCli_relation.dcp index b329aaf..cc4da7f 100644 Binary files a/Source/Modulos/Lib/AlbCli_FacCli_relation.dcp and b/Source/Modulos/Lib/AlbCli_FacCli_relation.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesCliente_controller.dcp b/Source/Modulos/Lib/AlbaranesCliente_controller.dcp index 4bd644b..d8c9948 100644 Binary files a/Source/Modulos/Lib/AlbaranesCliente_controller.dcp and b/Source/Modulos/Lib/AlbaranesCliente_controller.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesCliente_data.dcp b/Source/Modulos/Lib/AlbaranesCliente_data.dcp index 5f40b12..9c920e4 100644 Binary files a/Source/Modulos/Lib/AlbaranesCliente_data.dcp and b/Source/Modulos/Lib/AlbaranesCliente_data.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesCliente_model.dcp b/Source/Modulos/Lib/AlbaranesCliente_model.dcp index 071d86c..d0a9c57 100644 Binary files a/Source/Modulos/Lib/AlbaranesCliente_model.dcp and b/Source/Modulos/Lib/AlbaranesCliente_model.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesCliente_plugin.dcp b/Source/Modulos/Lib/AlbaranesCliente_plugin.dcp index 59d5d0a..17743b4 100644 Binary files a/Source/Modulos/Lib/AlbaranesCliente_plugin.dcp and b/Source/Modulos/Lib/AlbaranesCliente_plugin.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesCliente_view.dcp b/Source/Modulos/Lib/AlbaranesCliente_view.dcp index 6003a08..1778ff4 100644 Binary files a/Source/Modulos/Lib/AlbaranesCliente_view.dcp and b/Source/Modulos/Lib/AlbaranesCliente_view.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesProveedor_controller.dcp b/Source/Modulos/Lib/AlbaranesProveedor_controller.dcp index ec9e5dc..47f86b8 100644 Binary files a/Source/Modulos/Lib/AlbaranesProveedor_controller.dcp and b/Source/Modulos/Lib/AlbaranesProveedor_controller.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesProveedor_data.dcp b/Source/Modulos/Lib/AlbaranesProveedor_data.dcp index fed3721..fbc9343 100644 Binary files a/Source/Modulos/Lib/AlbaranesProveedor_data.dcp and b/Source/Modulos/Lib/AlbaranesProveedor_data.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesProveedor_model.dcp b/Source/Modulos/Lib/AlbaranesProveedor_model.dcp index 58cd719..65136ab 100644 Binary files a/Source/Modulos/Lib/AlbaranesProveedor_model.dcp and b/Source/Modulos/Lib/AlbaranesProveedor_model.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesProveedor_plugin.dcp b/Source/Modulos/Lib/AlbaranesProveedor_plugin.dcp index 55291d1..dca6b64 100644 Binary files a/Source/Modulos/Lib/AlbaranesProveedor_plugin.dcp and b/Source/Modulos/Lib/AlbaranesProveedor_plugin.dcp differ diff --git a/Source/Modulos/Lib/AlbaranesProveedor_view.dcp b/Source/Modulos/Lib/AlbaranesProveedor_view.dcp index 8c85c53..065f74f 100644 Binary files a/Source/Modulos/Lib/AlbaranesProveedor_view.dcp and b/Source/Modulos/Lib/AlbaranesProveedor_view.dcp differ diff --git a/Source/Modulos/Lib/Almacenes_controller.dcp b/Source/Modulos/Lib/Almacenes_controller.dcp index fa37356..d7d4a63 100644 Binary files a/Source/Modulos/Lib/Almacenes_controller.dcp and b/Source/Modulos/Lib/Almacenes_controller.dcp differ diff --git a/Source/Modulos/Lib/Almacenes_data.dcp b/Source/Modulos/Lib/Almacenes_data.dcp index 9af7deb..c4a4e80 100644 Binary files a/Source/Modulos/Lib/Almacenes_data.dcp and b/Source/Modulos/Lib/Almacenes_data.dcp differ diff --git a/Source/Modulos/Lib/Almacenes_model.dcp b/Source/Modulos/Lib/Almacenes_model.dcp index c91542f..e8245cc 100644 Binary files a/Source/Modulos/Lib/Almacenes_model.dcp and b/Source/Modulos/Lib/Almacenes_model.dcp differ diff --git a/Source/Modulos/Lib/Almacenes_plugin.dcp b/Source/Modulos/Lib/Almacenes_plugin.dcp index 3ef7a9a..80282ba 100644 Binary files a/Source/Modulos/Lib/Almacenes_plugin.dcp and b/Source/Modulos/Lib/Almacenes_plugin.dcp differ diff --git a/Source/Modulos/Lib/Almacenes_view.dcp b/Source/Modulos/Lib/Almacenes_view.dcp index 0c18222..07bbca5 100644 Binary files a/Source/Modulos/Lib/Almacenes_view.dcp and b/Source/Modulos/Lib/Almacenes_view.dcp differ diff --git a/Source/Modulos/Lib/Articulos_controller.dcp b/Source/Modulos/Lib/Articulos_controller.dcp index c322a07..4b643fe 100644 Binary files a/Source/Modulos/Lib/Articulos_controller.dcp and b/Source/Modulos/Lib/Articulos_controller.dcp differ diff --git a/Source/Modulos/Lib/Articulos_data.dcp b/Source/Modulos/Lib/Articulos_data.dcp index 0688371..4b509af 100644 Binary files a/Source/Modulos/Lib/Articulos_data.dcp and b/Source/Modulos/Lib/Articulos_data.dcp differ diff --git a/Source/Modulos/Lib/Articulos_model.dcp b/Source/Modulos/Lib/Articulos_model.dcp index fc64ac4..6fb109c 100644 Binary files a/Source/Modulos/Lib/Articulos_model.dcp and b/Source/Modulos/Lib/Articulos_model.dcp differ diff --git a/Source/Modulos/Lib/Articulos_plugin.dcp b/Source/Modulos/Lib/Articulos_plugin.dcp index b9d0994..12cf655 100644 Binary files a/Source/Modulos/Lib/Articulos_plugin.dcp and b/Source/Modulos/Lib/Articulos_plugin.dcp differ diff --git a/Source/Modulos/Lib/Articulos_view.dcp b/Source/Modulos/Lib/Articulos_view.dcp index 5935a5f..ff465b5 100644 Binary files a/Source/Modulos/Lib/Articulos_view.dcp and b/Source/Modulos/Lib/Articulos_view.dcp differ diff --git a/Source/Modulos/Lib/BancaElectronica_controller.dcp b/Source/Modulos/Lib/BancaElectronica_controller.dcp index 48061c8..648a8a7 100644 Binary files a/Source/Modulos/Lib/BancaElectronica_controller.dcp and b/Source/Modulos/Lib/BancaElectronica_controller.dcp differ diff --git a/Source/Modulos/Lib/BancaElectronica_plugin.dcp b/Source/Modulos/Lib/BancaElectronica_plugin.dcp index 52c1753..99f9099 100644 Binary files a/Source/Modulos/Lib/BancaElectronica_plugin.dcp and b/Source/Modulos/Lib/BancaElectronica_plugin.dcp differ diff --git a/Source/Modulos/Lib/BancaElectronica_view.dcp b/Source/Modulos/Lib/BancaElectronica_view.dcp index 9e29d61..74c1c04 100644 Binary files a/Source/Modulos/Lib/BancaElectronica_view.dcp and b/Source/Modulos/Lib/BancaElectronica_view.dcp differ diff --git a/Source/Modulos/Lib/Comisiones_controller.dcp b/Source/Modulos/Lib/Comisiones_controller.dcp index f43a03b..2009d0b 100644 Binary files a/Source/Modulos/Lib/Comisiones_controller.dcp and b/Source/Modulos/Lib/Comisiones_controller.dcp differ diff --git a/Source/Modulos/Lib/Comisiones_data.dcp b/Source/Modulos/Lib/Comisiones_data.dcp index 6be06e6..c939e46 100644 Binary files a/Source/Modulos/Lib/Comisiones_data.dcp and b/Source/Modulos/Lib/Comisiones_data.dcp differ diff --git a/Source/Modulos/Lib/Comisiones_model.dcp b/Source/Modulos/Lib/Comisiones_model.dcp index 4f0a9d0..a2c0e44 100644 Binary files a/Source/Modulos/Lib/Comisiones_model.dcp and b/Source/Modulos/Lib/Comisiones_model.dcp differ diff --git a/Source/Modulos/Lib/Comisiones_plugin.dcp b/Source/Modulos/Lib/Comisiones_plugin.dcp index 12ac517..4ae5831 100644 Binary files a/Source/Modulos/Lib/Comisiones_plugin.dcp and b/Source/Modulos/Lib/Comisiones_plugin.dcp differ diff --git a/Source/Modulos/Lib/Comisiones_view.dcp b/Source/Modulos/Lib/Comisiones_view.dcp index 7f2e45c..66ee12f 100644 Binary files a/Source/Modulos/Lib/Comisiones_view.dcp and b/Source/Modulos/Lib/Comisiones_view.dcp differ diff --git a/Source/Modulos/Lib/ConCli_AlbCli_relation.dcp b/Source/Modulos/Lib/ConCli_AlbCli_relation.dcp index 049dab4..208a1a5 100644 Binary files a/Source/Modulos/Lib/ConCli_AlbCli_relation.dcp and b/Source/Modulos/Lib/ConCli_AlbCli_relation.dcp differ diff --git a/Source/Modulos/Lib/ConCli_FacCli_relation.dcp b/Source/Modulos/Lib/ConCli_FacCli_relation.dcp index 1ce71fa..2a9c67e 100644 Binary files a/Source/Modulos/Lib/ConCli_FacCli_relation.dcp and b/Source/Modulos/Lib/ConCli_FacCli_relation.dcp differ diff --git a/Source/Modulos/Lib/ConCli_PedProv_relation.dcp b/Source/Modulos/Lib/ConCli_PedProv_relation.dcp index cbadd15..a4c02b6 100644 Binary files a/Source/Modulos/Lib/ConCli_PedProv_relation.dcp and b/Source/Modulos/Lib/ConCli_PedProv_relation.dcp differ diff --git a/Source/Modulos/Lib/ConCli_RecCli_relation.dcp b/Source/Modulos/Lib/ConCli_RecCli_relation.dcp index 2c0ddaa..23938bd 100644 Binary files a/Source/Modulos/Lib/ConCli_RecCli_relation.dcp and b/Source/Modulos/Lib/ConCli_RecCli_relation.dcp differ diff --git a/Source/Modulos/Lib/Contabilidad_controller.dcp b/Source/Modulos/Lib/Contabilidad_controller.dcp index 66b6538..6513ce3 100644 Binary files a/Source/Modulos/Lib/Contabilidad_controller.dcp and b/Source/Modulos/Lib/Contabilidad_controller.dcp differ diff --git a/Source/Modulos/Lib/Contabilidad_data.dcp b/Source/Modulos/Lib/Contabilidad_data.dcp index dbf272e..8fa8f4f 100644 Binary files a/Source/Modulos/Lib/Contabilidad_data.dcp and b/Source/Modulos/Lib/Contabilidad_data.dcp differ diff --git a/Source/Modulos/Lib/Contabilidad_model.dcp b/Source/Modulos/Lib/Contabilidad_model.dcp index c17d165..7015307 100644 Binary files a/Source/Modulos/Lib/Contabilidad_model.dcp and b/Source/Modulos/Lib/Contabilidad_model.dcp differ diff --git a/Source/Modulos/Lib/Contabilidad_plugin.dcp b/Source/Modulos/Lib/Contabilidad_plugin.dcp index 800e17a..85be938 100644 Binary files a/Source/Modulos/Lib/Contabilidad_plugin.dcp and b/Source/Modulos/Lib/Contabilidad_plugin.dcp differ diff --git a/Source/Modulos/Lib/Contabilidad_view.dcp b/Source/Modulos/Lib/Contabilidad_view.dcp index 214517e..b98fcc7 100644 Binary files a/Source/Modulos/Lib/Contabilidad_view.dcp and b/Source/Modulos/Lib/Contabilidad_view.dcp differ diff --git a/Source/Modulos/Lib/Contactos_controller.dcp b/Source/Modulos/Lib/Contactos_controller.dcp index 41cb6e5..5cd844c 100644 Binary files a/Source/Modulos/Lib/Contactos_controller.dcp and b/Source/Modulos/Lib/Contactos_controller.dcp differ diff --git a/Source/Modulos/Lib/Contactos_data.dcp b/Source/Modulos/Lib/Contactos_data.dcp index b92d423..04eed85 100644 Binary files a/Source/Modulos/Lib/Contactos_data.dcp and b/Source/Modulos/Lib/Contactos_data.dcp differ diff --git a/Source/Modulos/Lib/Contactos_model.dcp b/Source/Modulos/Lib/Contactos_model.dcp index 10ea129..74c1313 100644 Binary files a/Source/Modulos/Lib/Contactos_model.dcp and b/Source/Modulos/Lib/Contactos_model.dcp differ diff --git a/Source/Modulos/Lib/Contactos_plugin.dcp b/Source/Modulos/Lib/Contactos_plugin.dcp index 0d56176..5a48365 100644 Binary files a/Source/Modulos/Lib/Contactos_plugin.dcp and b/Source/Modulos/Lib/Contactos_plugin.dcp differ diff --git a/Source/Modulos/Lib/Contactos_view.dcp b/Source/Modulos/Lib/Contactos_view.dcp index a93fd6f..8151d58 100644 Binary files a/Source/Modulos/Lib/Contactos_view.dcp and b/Source/Modulos/Lib/Contactos_view.dcp differ diff --git a/Source/Modulos/Lib/ContratosCliente_controller.dcp b/Source/Modulos/Lib/ContratosCliente_controller.dcp index 24ce16f..c0c4d4b 100644 Binary files a/Source/Modulos/Lib/ContratosCliente_controller.dcp and b/Source/Modulos/Lib/ContratosCliente_controller.dcp differ diff --git a/Source/Modulos/Lib/ContratosCliente_data.dcp b/Source/Modulos/Lib/ContratosCliente_data.dcp index 4a99346..a0ab54c 100644 Binary files a/Source/Modulos/Lib/ContratosCliente_data.dcp and b/Source/Modulos/Lib/ContratosCliente_data.dcp differ diff --git a/Source/Modulos/Lib/ContratosCliente_model.dcp b/Source/Modulos/Lib/ContratosCliente_model.dcp index eeb914a..063efd3 100644 Binary files a/Source/Modulos/Lib/ContratosCliente_model.dcp and b/Source/Modulos/Lib/ContratosCliente_model.dcp differ diff --git a/Source/Modulos/Lib/ContratosCliente_plugin.dcp b/Source/Modulos/Lib/ContratosCliente_plugin.dcp index c98a40e..4647067 100644 Binary files a/Source/Modulos/Lib/ContratosCliente_plugin.dcp and b/Source/Modulos/Lib/ContratosCliente_plugin.dcp differ diff --git a/Source/Modulos/Lib/ContratosCliente_view.dcp b/Source/Modulos/Lib/ContratosCliente_view.dcp index 4d2f820..c7492b5 100644 Binary files a/Source/Modulos/Lib/ContratosCliente_view.dcp and b/Source/Modulos/Lib/ContratosCliente_view.dcp differ diff --git a/Source/Modulos/Lib/Ejercicios_plugin.dcp b/Source/Modulos/Lib/Ejercicios_plugin.dcp index 9f2f510..713703b 100644 Binary files a/Source/Modulos/Lib/Ejercicios_plugin.dcp and b/Source/Modulos/Lib/Ejercicios_plugin.dcp differ diff --git a/Source/Modulos/Lib/FacturasCliente_controller.dcp b/Source/Modulos/Lib/FacturasCliente_controller.dcp index e5da9ba..a32daed 100644 Binary files a/Source/Modulos/Lib/FacturasCliente_controller.dcp and b/Source/Modulos/Lib/FacturasCliente_controller.dcp differ diff --git a/Source/Modulos/Lib/FacturasCliente_data.dcp b/Source/Modulos/Lib/FacturasCliente_data.dcp index 7304bb3..732056e 100644 Binary files a/Source/Modulos/Lib/FacturasCliente_data.dcp and b/Source/Modulos/Lib/FacturasCliente_data.dcp differ diff --git a/Source/Modulos/Lib/FacturasCliente_model.dcp b/Source/Modulos/Lib/FacturasCliente_model.dcp index 75b1f2e..f1dd13a 100644 Binary files a/Source/Modulos/Lib/FacturasCliente_model.dcp and b/Source/Modulos/Lib/FacturasCliente_model.dcp differ diff --git a/Source/Modulos/Lib/FacturasCliente_plugin.dcp b/Source/Modulos/Lib/FacturasCliente_plugin.dcp index 998d0c4..a2fca57 100644 Binary files a/Source/Modulos/Lib/FacturasCliente_plugin.dcp and b/Source/Modulos/Lib/FacturasCliente_plugin.dcp differ diff --git a/Source/Modulos/Lib/FacturasCliente_view.dcp b/Source/Modulos/Lib/FacturasCliente_view.dcp index 8f0238c..cae9038 100644 Binary files a/Source/Modulos/Lib/FacturasCliente_view.dcp and b/Source/Modulos/Lib/FacturasCliente_view.dcp differ diff --git a/Source/Modulos/Lib/FacturasProveedor_controller.dcp b/Source/Modulos/Lib/FacturasProveedor_controller.dcp index 3ba7969..7f3be66 100644 Binary files a/Source/Modulos/Lib/FacturasProveedor_controller.dcp and b/Source/Modulos/Lib/FacturasProveedor_controller.dcp differ diff --git a/Source/Modulos/Lib/FacturasProveedor_data.dcp b/Source/Modulos/Lib/FacturasProveedor_data.dcp index bbc7d9b..b7c7959 100644 Binary files a/Source/Modulos/Lib/FacturasProveedor_data.dcp and b/Source/Modulos/Lib/FacturasProveedor_data.dcp differ diff --git a/Source/Modulos/Lib/FacturasProveedor_model.dcp b/Source/Modulos/Lib/FacturasProveedor_model.dcp index ce72fbe..39736c1 100644 Binary files a/Source/Modulos/Lib/FacturasProveedor_model.dcp and b/Source/Modulos/Lib/FacturasProveedor_model.dcp differ diff --git a/Source/Modulos/Lib/FacturasProveedor_plugin.dcp b/Source/Modulos/Lib/FacturasProveedor_plugin.dcp index 3c63484..880c5f3 100644 Binary files a/Source/Modulos/Lib/FacturasProveedor_plugin.dcp and b/Source/Modulos/Lib/FacturasProveedor_plugin.dcp differ diff --git a/Source/Modulos/Lib/FacturasProveedor_view.dcp b/Source/Modulos/Lib/FacturasProveedor_view.dcp index 8ab2588..793e5a4 100644 Binary files a/Source/Modulos/Lib/FacturasProveedor_view.dcp and b/Source/Modulos/Lib/FacturasProveedor_view.dcp differ diff --git a/Source/Modulos/Lib/Familias_controller.dcp b/Source/Modulos/Lib/Familias_controller.dcp index a22ebd0..bae8fce 100644 Binary files a/Source/Modulos/Lib/Familias_controller.dcp and b/Source/Modulos/Lib/Familias_controller.dcp differ diff --git a/Source/Modulos/Lib/Familias_data.dcp b/Source/Modulos/Lib/Familias_data.dcp index 6db4090..74af6bb 100644 Binary files a/Source/Modulos/Lib/Familias_data.dcp and b/Source/Modulos/Lib/Familias_data.dcp differ diff --git a/Source/Modulos/Lib/Familias_model.dcp b/Source/Modulos/Lib/Familias_model.dcp index d756d0f..796be51 100644 Binary files a/Source/Modulos/Lib/Familias_model.dcp and b/Source/Modulos/Lib/Familias_model.dcp differ diff --git a/Source/Modulos/Lib/Familias_plugin.dcp b/Source/Modulos/Lib/Familias_plugin.dcp index bebf5aa..d2314a1 100644 Binary files a/Source/Modulos/Lib/Familias_plugin.dcp and b/Source/Modulos/Lib/Familias_plugin.dcp differ diff --git a/Source/Modulos/Lib/Familias_view.dcp b/Source/Modulos/Lib/Familias_view.dcp index ec21906..a683b14 100644 Binary files a/Source/Modulos/Lib/Familias_view.dcp and b/Source/Modulos/Lib/Familias_view.dcp differ diff --git a/Source/Modulos/Lib/FormasPago_controller.dcp b/Source/Modulos/Lib/FormasPago_controller.dcp index 748d839..f9e6086 100644 Binary files a/Source/Modulos/Lib/FormasPago_controller.dcp and b/Source/Modulos/Lib/FormasPago_controller.dcp differ diff --git a/Source/Modulos/Lib/FormasPago_data.dcp b/Source/Modulos/Lib/FormasPago_data.dcp index 8a686a1..974f044 100644 Binary files a/Source/Modulos/Lib/FormasPago_data.dcp and b/Source/Modulos/Lib/FormasPago_data.dcp differ diff --git a/Source/Modulos/Lib/FormasPago_model.dcp b/Source/Modulos/Lib/FormasPago_model.dcp index 592121d..c052639 100644 Binary files a/Source/Modulos/Lib/FormasPago_model.dcp and b/Source/Modulos/Lib/FormasPago_model.dcp differ diff --git a/Source/Modulos/Lib/FormasPago_plugin.dcp b/Source/Modulos/Lib/FormasPago_plugin.dcp index 3d3185b..be1ef16 100644 Binary files a/Source/Modulos/Lib/FormasPago_plugin.dcp and b/Source/Modulos/Lib/FormasPago_plugin.dcp differ diff --git a/Source/Modulos/Lib/FormasPago_view.dcp b/Source/Modulos/Lib/FormasPago_view.dcp index bdfe699..10e2852 100644 Binary files a/Source/Modulos/Lib/FormasPago_view.dcp and b/Source/Modulos/Lib/FormasPago_view.dcp differ diff --git a/Source/Modulos/Lib/GestorDocumentos_controller.dcp b/Source/Modulos/Lib/GestorDocumentos_controller.dcp index 6e42256..9f9ccb9 100644 Binary files a/Source/Modulos/Lib/GestorDocumentos_controller.dcp and b/Source/Modulos/Lib/GestorDocumentos_controller.dcp differ diff --git a/Source/Modulos/Lib/GestorDocumentos_data.dcp b/Source/Modulos/Lib/GestorDocumentos_data.dcp index 85a69ab..d7b454e 100644 Binary files a/Source/Modulos/Lib/GestorDocumentos_data.dcp and b/Source/Modulos/Lib/GestorDocumentos_data.dcp differ diff --git a/Source/Modulos/Lib/GestorInformes_controller.dcp b/Source/Modulos/Lib/GestorInformes_controller.dcp index 47a9ff4..5c46640 100644 Binary files a/Source/Modulos/Lib/GestorInformes_controller.dcp and b/Source/Modulos/Lib/GestorInformes_controller.dcp differ diff --git a/Source/Modulos/Lib/GestorInformes_data.dcp b/Source/Modulos/Lib/GestorInformes_data.dcp index df4b2bd..a2cbce7 100644 Binary files a/Source/Modulos/Lib/GestorInformes_data.dcp and b/Source/Modulos/Lib/GestorInformes_data.dcp differ diff --git a/Source/Modulos/Lib/GestorInformes_model.dcp b/Source/Modulos/Lib/GestorInformes_model.dcp index 0e16ce8..bac9c8d 100644 Binary files a/Source/Modulos/Lib/GestorInformes_model.dcp and b/Source/Modulos/Lib/GestorInformes_model.dcp differ diff --git a/Source/Modulos/Lib/GestorInformes_plugin.dcp b/Source/Modulos/Lib/GestorInformes_plugin.dcp index 19acacb..d1b339d 100644 Binary files a/Source/Modulos/Lib/GestorInformes_plugin.dcp and b/Source/Modulos/Lib/GestorInformes_plugin.dcp differ diff --git a/Source/Modulos/Lib/GestorInformes_view.dcp b/Source/Modulos/Lib/GestorInformes_view.dcp index bcedd89..b6939f2 100644 Binary files a/Source/Modulos/Lib/GestorInformes_view.dcp and b/Source/Modulos/Lib/GestorInformes_view.dcp differ diff --git a/Source/Modulos/Lib/HistoricoMovimientos_controller.dcp b/Source/Modulos/Lib/HistoricoMovimientos_controller.dcp index 70a1295..1e2491d 100644 Binary files a/Source/Modulos/Lib/HistoricoMovimientos_controller.dcp and b/Source/Modulos/Lib/HistoricoMovimientos_controller.dcp differ diff --git a/Source/Modulos/Lib/HistoricoMovimientos_data.dcp b/Source/Modulos/Lib/HistoricoMovimientos_data.dcp index 14ed1ca..a6e26ca 100644 Binary files a/Source/Modulos/Lib/HistoricoMovimientos_data.dcp and b/Source/Modulos/Lib/HistoricoMovimientos_data.dcp differ diff --git a/Source/Modulos/Lib/HistoricoMovimientos_model.dcp b/Source/Modulos/Lib/HistoricoMovimientos_model.dcp index c32e71e..a004a80 100644 Binary files a/Source/Modulos/Lib/HistoricoMovimientos_model.dcp and b/Source/Modulos/Lib/HistoricoMovimientos_model.dcp differ diff --git a/Source/Modulos/Lib/HistoricoMovimientos_plugin.dcp b/Source/Modulos/Lib/HistoricoMovimientos_plugin.dcp index 7ad114a..65af87a 100644 Binary files a/Source/Modulos/Lib/HistoricoMovimientos_plugin.dcp and b/Source/Modulos/Lib/HistoricoMovimientos_plugin.dcp differ diff --git a/Source/Modulos/Lib/HistoricoMovimientos_view.dcp b/Source/Modulos/Lib/HistoricoMovimientos_view.dcp index fceb0d7..c498fc2 100644 Binary files a/Source/Modulos/Lib/HistoricoMovimientos_view.dcp and b/Source/Modulos/Lib/HistoricoMovimientos_view.dcp differ diff --git a/Source/Modulos/Lib/Inventario_controller.dcp b/Source/Modulos/Lib/Inventario_controller.dcp index c1df32d..9934033 100644 Binary files a/Source/Modulos/Lib/Inventario_controller.dcp and b/Source/Modulos/Lib/Inventario_controller.dcp differ diff --git a/Source/Modulos/Lib/Inventario_data.dcp b/Source/Modulos/Lib/Inventario_data.dcp index 31003f8..8c11c28 100644 Binary files a/Source/Modulos/Lib/Inventario_data.dcp and b/Source/Modulos/Lib/Inventario_data.dcp differ diff --git a/Source/Modulos/Lib/Inventario_model.dcp b/Source/Modulos/Lib/Inventario_model.dcp index d9569c8..2f7c83f 100644 Binary files a/Source/Modulos/Lib/Inventario_model.dcp and b/Source/Modulos/Lib/Inventario_model.dcp differ diff --git a/Source/Modulos/Lib/Inventario_plugin.dcp b/Source/Modulos/Lib/Inventario_plugin.dcp index 8b7b9ab..1591626 100644 Binary files a/Source/Modulos/Lib/Inventario_plugin.dcp and b/Source/Modulos/Lib/Inventario_plugin.dcp differ diff --git a/Source/Modulos/Lib/Inventario_view.dcp b/Source/Modulos/Lib/Inventario_view.dcp index 71dce90..ec89617 100644 Binary files a/Source/Modulos/Lib/Inventario_view.dcp and b/Source/Modulos/Lib/Inventario_view.dcp differ diff --git a/Source/Modulos/Lib/PedidosProveedor_controller.dcp b/Source/Modulos/Lib/PedidosProveedor_controller.dcp index a9925bf..71849f7 100644 Binary files a/Source/Modulos/Lib/PedidosProveedor_controller.dcp and b/Source/Modulos/Lib/PedidosProveedor_controller.dcp differ diff --git a/Source/Modulos/Lib/PedidosProveedor_data.dcp b/Source/Modulos/Lib/PedidosProveedor_data.dcp index d1cac76..dd8ef9e 100644 Binary files a/Source/Modulos/Lib/PedidosProveedor_data.dcp and b/Source/Modulos/Lib/PedidosProveedor_data.dcp differ diff --git a/Source/Modulos/Lib/PedidosProveedor_model.dcp b/Source/Modulos/Lib/PedidosProveedor_model.dcp index 6a52674..047a891 100644 Binary files a/Source/Modulos/Lib/PedidosProveedor_model.dcp and b/Source/Modulos/Lib/PedidosProveedor_model.dcp differ diff --git a/Source/Modulos/Lib/PedidosProveedor_plugin.dcp b/Source/Modulos/Lib/PedidosProveedor_plugin.dcp index 7d90243..6877614 100644 Binary files a/Source/Modulos/Lib/PedidosProveedor_plugin.dcp and b/Source/Modulos/Lib/PedidosProveedor_plugin.dcp differ diff --git a/Source/Modulos/Lib/PedidosProveedor_view.dcp b/Source/Modulos/Lib/PedidosProveedor_view.dcp index 22363a6..395ada5 100644 Binary files a/Source/Modulos/Lib/PedidosProveedor_view.dcp and b/Source/Modulos/Lib/PedidosProveedor_view.dcp differ diff --git a/Source/Modulos/Lib/PreCli_ConCli_relation.dcp b/Source/Modulos/Lib/PreCli_ConCli_relation.dcp index 8f79f9a..b03857f 100644 Binary files a/Source/Modulos/Lib/PreCli_ConCli_relation.dcp and b/Source/Modulos/Lib/PreCli_ConCli_relation.dcp differ diff --git a/Source/Modulos/Lib/PresupuestosCliente_controller.dcp b/Source/Modulos/Lib/PresupuestosCliente_controller.dcp index ac2fb30..e20c51a 100644 Binary files a/Source/Modulos/Lib/PresupuestosCliente_controller.dcp and b/Source/Modulos/Lib/PresupuestosCliente_controller.dcp differ diff --git a/Source/Modulos/Lib/PresupuestosCliente_data.dcp b/Source/Modulos/Lib/PresupuestosCliente_data.dcp index 40a1f3e..955c70d 100644 Binary files a/Source/Modulos/Lib/PresupuestosCliente_data.dcp and b/Source/Modulos/Lib/PresupuestosCliente_data.dcp differ diff --git a/Source/Modulos/Lib/PresupuestosCliente_model.dcp b/Source/Modulos/Lib/PresupuestosCliente_model.dcp index 1337a73..b190fc3 100644 Binary files a/Source/Modulos/Lib/PresupuestosCliente_model.dcp and b/Source/Modulos/Lib/PresupuestosCliente_model.dcp differ diff --git a/Source/Modulos/Lib/PresupuestosCliente_plugin.dcp b/Source/Modulos/Lib/PresupuestosCliente_plugin.dcp index 3bd38cc..3533d1d 100644 Binary files a/Source/Modulos/Lib/PresupuestosCliente_plugin.dcp and b/Source/Modulos/Lib/PresupuestosCliente_plugin.dcp differ diff --git a/Source/Modulos/Lib/PresupuestosCliente_view.dcp b/Source/Modulos/Lib/PresupuestosCliente_view.dcp index 7f1e904..81966f8 100644 Binary files a/Source/Modulos/Lib/PresupuestosCliente_view.dcp and b/Source/Modulos/Lib/PresupuestosCliente_view.dcp differ diff --git a/Source/Modulos/Lib/RecibosCliente_controller.dcp b/Source/Modulos/Lib/RecibosCliente_controller.dcp index 2b769bf..3bdb23d 100644 Binary files a/Source/Modulos/Lib/RecibosCliente_controller.dcp and b/Source/Modulos/Lib/RecibosCliente_controller.dcp differ diff --git a/Source/Modulos/Lib/RecibosCliente_data.dcp b/Source/Modulos/Lib/RecibosCliente_data.dcp index a33623c..12a24e6 100644 Binary files a/Source/Modulos/Lib/RecibosCliente_data.dcp and b/Source/Modulos/Lib/RecibosCliente_data.dcp differ diff --git a/Source/Modulos/Lib/RecibosCliente_model.dcp b/Source/Modulos/Lib/RecibosCliente_model.dcp index ad6e3c4..191ba8e 100644 Binary files a/Source/Modulos/Lib/RecibosCliente_model.dcp and b/Source/Modulos/Lib/RecibosCliente_model.dcp differ diff --git a/Source/Modulos/Lib/RecibosCliente_plugin.dcp b/Source/Modulos/Lib/RecibosCliente_plugin.dcp index 2ee2175..aa10037 100644 Binary files a/Source/Modulos/Lib/RecibosCliente_plugin.dcp and b/Source/Modulos/Lib/RecibosCliente_plugin.dcp differ diff --git a/Source/Modulos/Lib/RecibosCliente_view.dcp b/Source/Modulos/Lib/RecibosCliente_view.dcp index 99c9456..574140d 100644 Binary files a/Source/Modulos/Lib/RecibosCliente_view.dcp and b/Source/Modulos/Lib/RecibosCliente_view.dcp differ diff --git a/Source/Modulos/Lib/RecibosProveedor_controller.dcp b/Source/Modulos/Lib/RecibosProveedor_controller.dcp index 7b0adcc..fd0cb34 100644 Binary files a/Source/Modulos/Lib/RecibosProveedor_controller.dcp and b/Source/Modulos/Lib/RecibosProveedor_controller.dcp differ diff --git a/Source/Modulos/Lib/RecibosProveedor_data.dcp b/Source/Modulos/Lib/RecibosProveedor_data.dcp index 5139a23..8ff74c9 100644 Binary files a/Source/Modulos/Lib/RecibosProveedor_data.dcp and b/Source/Modulos/Lib/RecibosProveedor_data.dcp differ diff --git a/Source/Modulos/Lib/RecibosProveedor_model.dcp b/Source/Modulos/Lib/RecibosProveedor_model.dcp index 969ed87..8605386 100644 Binary files a/Source/Modulos/Lib/RecibosProveedor_model.dcp and b/Source/Modulos/Lib/RecibosProveedor_model.dcp differ diff --git a/Source/Modulos/Lib/RecibosProveedor_plugin.dcp b/Source/Modulos/Lib/RecibosProveedor_plugin.dcp index e48c5ae..9ba903b 100644 Binary files a/Source/Modulos/Lib/RecibosProveedor_plugin.dcp and b/Source/Modulos/Lib/RecibosProveedor_plugin.dcp differ diff --git a/Source/Modulos/Lib/RecibosProveedor_view.dcp b/Source/Modulos/Lib/RecibosProveedor_view.dcp index dd95a76..04be9fb 100644 Binary files a/Source/Modulos/Lib/RecibosProveedor_view.dcp and b/Source/Modulos/Lib/RecibosProveedor_view.dcp differ diff --git a/Source/Modulos/Lib/Referencias_controller.dcp b/Source/Modulos/Lib/Referencias_controller.dcp index 803d636..59bc272 100644 Binary files a/Source/Modulos/Lib/Referencias_controller.dcp and b/Source/Modulos/Lib/Referencias_controller.dcp differ diff --git a/Source/Modulos/Lib/Referencias_data.dcp b/Source/Modulos/Lib/Referencias_data.dcp index 5f58bb1..02fa717 100644 Binary files a/Source/Modulos/Lib/Referencias_data.dcp and b/Source/Modulos/Lib/Referencias_data.dcp differ diff --git a/Source/Modulos/Lib/Referencias_model.dcp b/Source/Modulos/Lib/Referencias_model.dcp index df09190..2cd8230 100644 Binary files a/Source/Modulos/Lib/Referencias_model.dcp and b/Source/Modulos/Lib/Referencias_model.dcp differ diff --git a/Source/Modulos/Lib/Referencias_plugin.dcp b/Source/Modulos/Lib/Referencias_plugin.dcp index 0082187..3d0b83b 100644 Binary files a/Source/Modulos/Lib/Referencias_plugin.dcp and b/Source/Modulos/Lib/Referencias_plugin.dcp differ diff --git a/Source/Modulos/Lib/Referencias_view.dcp b/Source/Modulos/Lib/Referencias_view.dcp index c719210..244a9f8 100644 Binary files a/Source/Modulos/Lib/Referencias_view.dcp and b/Source/Modulos/Lib/Referencias_view.dcp differ diff --git a/Source/Modulos/Lib/RemesasCliente_controller.dcp b/Source/Modulos/Lib/RemesasCliente_controller.dcp index fe225dd..42b1234 100644 Binary files a/Source/Modulos/Lib/RemesasCliente_controller.dcp and b/Source/Modulos/Lib/RemesasCliente_controller.dcp differ diff --git a/Source/Modulos/Lib/RemesasCliente_data.dcp b/Source/Modulos/Lib/RemesasCliente_data.dcp index d150ce8..e0a93b2 100644 Binary files a/Source/Modulos/Lib/RemesasCliente_data.dcp and b/Source/Modulos/Lib/RemesasCliente_data.dcp differ diff --git a/Source/Modulos/Lib/RemesasCliente_model.dcp b/Source/Modulos/Lib/RemesasCliente_model.dcp index 00ea9bd..ad1e94d 100644 Binary files a/Source/Modulos/Lib/RemesasCliente_model.dcp and b/Source/Modulos/Lib/RemesasCliente_model.dcp differ diff --git a/Source/Modulos/Lib/RemesasCliente_plugin.dcp b/Source/Modulos/Lib/RemesasCliente_plugin.dcp index 64d8168..d027ba1 100644 Binary files a/Source/Modulos/Lib/RemesasCliente_plugin.dcp and b/Source/Modulos/Lib/RemesasCliente_plugin.dcp differ diff --git a/Source/Modulos/Lib/RemesasCliente_view.dcp b/Source/Modulos/Lib/RemesasCliente_view.dcp index edca2e3..4b801d0 100644 Binary files a/Source/Modulos/Lib/RemesasCliente_view.dcp and b/Source/Modulos/Lib/RemesasCliente_view.dcp differ diff --git a/Source/Modulos/Lib/RemesasProveedor_controller.dcp b/Source/Modulos/Lib/RemesasProveedor_controller.dcp index 7825c51..f6ce3a5 100644 Binary files a/Source/Modulos/Lib/RemesasProveedor_controller.dcp and b/Source/Modulos/Lib/RemesasProveedor_controller.dcp differ diff --git a/Source/Modulos/Lib/RemesasProveedor_data.dcp b/Source/Modulos/Lib/RemesasProveedor_data.dcp index 67da85b..c13c02e 100644 Binary files a/Source/Modulos/Lib/RemesasProveedor_data.dcp and b/Source/Modulos/Lib/RemesasProveedor_data.dcp differ diff --git a/Source/Modulos/Lib/RemesasProveedor_model.dcp b/Source/Modulos/Lib/RemesasProveedor_model.dcp index 53ed5f3..8b61b76 100644 Binary files a/Source/Modulos/Lib/RemesasProveedor_model.dcp and b/Source/Modulos/Lib/RemesasProveedor_model.dcp differ diff --git a/Source/Modulos/Lib/RemesasProveedor_plugin.dcp b/Source/Modulos/Lib/RemesasProveedor_plugin.dcp index 49cc7e0..f66050c 100644 Binary files a/Source/Modulos/Lib/RemesasProveedor_plugin.dcp and b/Source/Modulos/Lib/RemesasProveedor_plugin.dcp differ diff --git a/Source/Modulos/Lib/RemesasProveedor_view.dcp b/Source/Modulos/Lib/RemesasProveedor_view.dcp index faf6473..e0bc40a 100644 Binary files a/Source/Modulos/Lib/RemesasProveedor_view.dcp and b/Source/Modulos/Lib/RemesasProveedor_view.dcp differ diff --git a/Source/Modulos/Lib/TiposIVA_controller.dcp b/Source/Modulos/Lib/TiposIVA_controller.dcp index 5b989f1..fd4e36d 100644 Binary files a/Source/Modulos/Lib/TiposIVA_controller.dcp and b/Source/Modulos/Lib/TiposIVA_controller.dcp differ diff --git a/Source/Modulos/Lib/TiposIVA_data.dcp b/Source/Modulos/Lib/TiposIVA_data.dcp index 463ec3b..0b0edc3 100644 Binary files a/Source/Modulos/Lib/TiposIVA_data.dcp and b/Source/Modulos/Lib/TiposIVA_data.dcp differ diff --git a/Source/Modulos/Lib/TiposIVA_model.dcp b/Source/Modulos/Lib/TiposIVA_model.dcp index 3c1ab14..36b5669 100644 Binary files a/Source/Modulos/Lib/TiposIVA_model.dcp and b/Source/Modulos/Lib/TiposIVA_model.dcp differ diff --git a/Source/Modulos/Lib/TiposIVA_plugin.dcp b/Source/Modulos/Lib/TiposIVA_plugin.dcp index 8b98cff..b0a5800 100644 Binary files a/Source/Modulos/Lib/TiposIVA_plugin.dcp and b/Source/Modulos/Lib/TiposIVA_plugin.dcp differ diff --git a/Source/Modulos/Lib/TiposIVA_view.dcp b/Source/Modulos/Lib/TiposIVA_view.dcp index 1dd9997..0b1bdea 100644 Binary files a/Source/Modulos/Lib/TiposIVA_view.dcp and b/Source/Modulos/Lib/TiposIVA_view.dcp differ diff --git a/Source/Modulos/Lib/UnidadesMedida_controller.dcp b/Source/Modulos/Lib/UnidadesMedida_controller.dcp index 888fa82..e443a65 100644 Binary files a/Source/Modulos/Lib/UnidadesMedida_controller.dcp and b/Source/Modulos/Lib/UnidadesMedida_controller.dcp differ diff --git a/Source/Modulos/Lib/UnidadesMedida_data.dcp b/Source/Modulos/Lib/UnidadesMedida_data.dcp index b62fe21..90102af 100644 Binary files a/Source/Modulos/Lib/UnidadesMedida_data.dcp and b/Source/Modulos/Lib/UnidadesMedida_data.dcp differ diff --git a/Source/Modulos/Lib/UnidadesMedida_model.dcp b/Source/Modulos/Lib/UnidadesMedida_model.dcp index eb9fdb5..bcd9503 100644 Binary files a/Source/Modulos/Lib/UnidadesMedida_model.dcp and b/Source/Modulos/Lib/UnidadesMedida_model.dcp differ diff --git a/Source/Modulos/Lib/UnidadesMedida_plugin.dcp b/Source/Modulos/Lib/UnidadesMedida_plugin.dcp index 9ab7a3c..fede481 100644 Binary files a/Source/Modulos/Lib/UnidadesMedida_plugin.dcp and b/Source/Modulos/Lib/UnidadesMedida_plugin.dcp differ diff --git a/Source/Modulos/Lib/UnidadesMedida_view.dcp b/Source/Modulos/Lib/UnidadesMedida_view.dcp index 4421009..1d82a72 100644 Binary files a/Source/Modulos/Lib/UnidadesMedida_view.dcp and b/Source/Modulos/Lib/UnidadesMedida_view.dcp differ diff --git a/Source/Modulos/Presupuestos de cliente/Data/uDataModulePresupuestosCliente.dfm b/Source/Modulos/Presupuestos de cliente/Data/uDataModulePresupuestosCliente.dfm index 9747411..14290f6 100644 --- a/Source/Modulos/Presupuestos de cliente/Data/uDataModulePresupuestosCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Data/uDataModulePresupuestosCliente.dfm @@ -291,18 +291,28 @@ inherited DataModulePresupuestosCliente: TDataModulePresupuestosCliente item Name = 'CALIDADES' DataType = datMemo + BlobType = dabtBlob DisplayLabel = 'Calidades' + DictionaryEntry = 'PresupuestosCliente_CALIDADES' end item Name = 'REFERENCIA_CLIENTE' DataType = datString Size = 255 + DisplayLabel = 'PedidosCliente_REFERENCIA_CLIENTE' + DictionaryEntry = 'PresupuestosCliente_REFERENCIA_CLIENTE' end item Name = 'LISTA_NOMBRES' DataType = datString Size = 255 DisplayLabel = 'Otros nombres' + DictionaryEntry = 'PresupuestosCliente_LISTA_NOMBRES' + end + item + Name = 'PROCEDENCIA_CLIENTE' + DataType = datString + Size = 255 end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] diff --git a/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteClient_Intf.pas b/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteClient_Intf.pas index bc56a94..91b3579 100644 --- a/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteClient_Intf.pas +++ b/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteClient_Intf.pas @@ -9,12 +9,12 @@ 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_Valores = '{69845B8B-862E-4186-A539-0491EC6224F3}'; - RID_Propiedades = '{895EC925-C718-4589-BD6E-3B98E68C7469}'; - RID_ListaAnosPresupuestos = '{4258D9C8-6F6E-4C32-B278-7DDE0FCE6843}'; - RID_PresupuestosCliente = '{52ACB41F-F244-4D13-9769-9202F76311C0}'; - RID_CapitulosPresupuesto = '{A1E223AB-6F46-437F-B40F-7CCF8AD46DEA}'; - RID_PresupuestosCliente_Detalles = '{BFF68D7B-A862-4E85-AA60-7BD45944AEC5}'; + RID_Valores = '{917255D3-04E9-4CF3-9063-1991DCCA0CE3}'; + RID_Propiedades = '{59D4AAFC-C6F1-4288-BE8B-AE298B596EAD}'; + RID_ListaAnosPresupuestos = '{0F54D52C-207A-4241-9463-360BD137E3AC}'; + RID_PresupuestosCliente = '{8CAA1800-CBF6-4046-B1E7-94794BFB9B83}'; + RID_CapitulosPresupuesto = '{17A1DA0C-5CAF-4871-A8A9-3A77BBC0B051}'; + RID_PresupuestosCliente_Detalles = '{1A26FCB9-619E-4610-AAD3-59413894686C}'; { Data table names } nme_Valores = 'Valores'; @@ -101,6 +101,7 @@ const fld_PresupuestosClienteCALIDADES = 'CALIDADES'; fld_PresupuestosClienteREFERENCIA_CLIENTE = 'REFERENCIA_CLIENTE'; fld_PresupuestosClienteLISTA_NOMBRES = 'LISTA_NOMBRES'; + fld_PresupuestosClientePROCEDENCIA_CLIENTE = 'PROCEDENCIA_CLIENTE'; { PresupuestosCliente field indexes } idx_PresupuestosClienteID = 0; @@ -147,6 +148,7 @@ const idx_PresupuestosClienteCALIDADES = 41; idx_PresupuestosClienteREFERENCIA_CLIENTE = 42; idx_PresupuestosClienteLISTA_NOMBRES = 43; + idx_PresupuestosClientePROCEDENCIA_CLIENTE = 44; { CapitulosPresupuesto fields } fld_CapitulosPresupuestoID = 'ID'; @@ -215,7 +217,7 @@ const type { IValores } IValores = interface(IDAStronglyTypedDataTable) - ['{4A86E969-6E16-450C-A82B-D645B8E298C4}'] + ['{AB3D08F7-2EA3-443A-8763-71A4B54D3013}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -322,7 +324,7 @@ type { IPropiedades } IPropiedades = interface(IDAStronglyTypedDataTable) - ['{B33EF001-F0B3-4377-A019-646EB05608B0}'] + ['{3714E84B-0148-4D46-BE30-C93E172200AC}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -369,7 +371,7 @@ type { IListaAnosPresupuestos } IListaAnosPresupuestos = interface(IDAStronglyTypedDataTable) - ['{4F552890-7869-406F-B323-DDC2C6BBAABD}'] + ['{67B2C967-68FD-4A09-AB21-FFE884DAC957}'] { Property getters and setters } function GetANOValue: String; procedure SetANOValue(const aValue: String); @@ -404,7 +406,7 @@ type { IPresupuestosCliente } IPresupuestosCliente = interface(IDAStronglyTypedDataTable) - ['{302CF5F9-CA89-4181-9EE0-29CE9C739B7E}'] + ['{709C93A8-0FE6-49F4-88E1-CDD4E068DEF8}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -577,6 +579,10 @@ type procedure SetLISTA_NOMBRESValue(const aValue: String); function GetLISTA_NOMBRESIsNull: Boolean; procedure SetLISTA_NOMBRESIsNull(const aValue: Boolean); + function GetPROCEDENCIA_CLIENTEValue: String; + procedure SetPROCEDENCIA_CLIENTEValue(const aValue: String); + function GetPROCEDENCIA_CLIENTEIsNull: Boolean; + procedure SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean); { Properties } @@ -668,6 +674,8 @@ type property REFERENCIA_CLIENTEIsNull: Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull; property LISTA_NOMBRES: String read GetLISTA_NOMBRESValue write SetLISTA_NOMBRESValue; property LISTA_NOMBRESIsNull: Boolean read GetLISTA_NOMBRESIsNull write SetLISTA_NOMBRESIsNull; + property PROCEDENCIA_CLIENTE: String read GetPROCEDENCIA_CLIENTEValue write SetPROCEDENCIA_CLIENTEValue; + property PROCEDENCIA_CLIENTEIsNull: Boolean read GetPROCEDENCIA_CLIENTEIsNull write SetPROCEDENCIA_CLIENTEIsNull; end; { TPresupuestosClienteDataTableRules } @@ -856,6 +864,10 @@ type procedure SetLISTA_NOMBRESValue(const aValue: String); virtual; function GetLISTA_NOMBRESIsNull: Boolean; virtual; procedure SetLISTA_NOMBRESIsNull(const aValue: Boolean); virtual; + function GetPROCEDENCIA_CLIENTEValue: String; virtual; + procedure SetPROCEDENCIA_CLIENTEValue(const aValue: String); virtual; + function GetPROCEDENCIA_CLIENTEIsNull: Boolean; virtual; + procedure SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean); virtual; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -946,6 +958,8 @@ type property REFERENCIA_CLIENTEIsNull: Boolean read GetREFERENCIA_CLIENTEIsNull write SetREFERENCIA_CLIENTEIsNull; property LISTA_NOMBRES: String read GetLISTA_NOMBRESValue write SetLISTA_NOMBRESValue; property LISTA_NOMBRESIsNull: Boolean read GetLISTA_NOMBRESIsNull write SetLISTA_NOMBRESIsNull; + property PROCEDENCIA_CLIENTE: String read GetPROCEDENCIA_CLIENTEValue write SetPROCEDENCIA_CLIENTEValue; + property PROCEDENCIA_CLIENTEIsNull: Boolean read GetPROCEDENCIA_CLIENTEIsNull write SetPROCEDENCIA_CLIENTEIsNull; public constructor Create(aDataTable: TDADataTable); override; @@ -955,7 +969,7 @@ type { ICapitulosPresupuesto } ICapitulosPresupuesto = interface(IDAStronglyTypedDataTable) - ['{1D0F3A1A-E5C1-487E-8EF0-0496F49E0D34}'] + ['{48A979B4-B3B0-41DA-898A-1AF4A9B5C79D}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1110,7 +1124,7 @@ type { IPresupuestosCliente_Detalles } IPresupuestosCliente_Detalles = interface(IDAStronglyTypedDataTable) - ['{ECFB879A-6B6E-4125-A97B-14BA365AFB4E}'] + ['{DEA18856-E9AE-485D-9D5A-54B606627E8A}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2547,6 +2561,27 @@ begin DataTable.Fields[idx_PresupuestosClienteLISTA_NOMBRES].AsVariant := Null; end; +function TPresupuestosClienteDataTableRules.GetPROCEDENCIA_CLIENTEValue: String; +begin + result := DataTable.Fields[idx_PresupuestosClientePROCEDENCIA_CLIENTE].AsString; +end; + +procedure TPresupuestosClienteDataTableRules.SetPROCEDENCIA_CLIENTEValue(const aValue: String); +begin + DataTable.Fields[idx_PresupuestosClientePROCEDENCIA_CLIENTE].AsString := aValue; +end; + +function TPresupuestosClienteDataTableRules.GetPROCEDENCIA_CLIENTEIsNull: boolean; +begin + result := DataTable.Fields[idx_PresupuestosClientePROCEDENCIA_CLIENTE].IsNull; +end; + +procedure TPresupuestosClienteDataTableRules.SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_PresupuestosClientePROCEDENCIA_CLIENTE].AsVariant := Null; +end; + { TCapitulosPresupuestoDataTableRules } constructor TCapitulosPresupuestoDataTableRules.Create(aDataTable: TDADataTable); diff --git a/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteServer_Intf.pas b/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteServer_Intf.pas index 813b93c..da96c61 100644 --- a/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteServer_Intf.pas +++ b/Source/Modulos/Presupuestos de cliente/Model/schPresupuestosClienteServer_Intf.pas @@ -9,17 +9,17 @@ 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_ValoresDelta = '{687FCBCD-2F9D-4E98-8515-FD5E9FCEE32A}'; - RID_PropiedadesDelta = '{784A3DDA-A3AF-49BB-A49C-7EEF41AA4565}'; - RID_ListaAnosPresupuestosDelta = '{881F141B-82C6-448C-80E9-D26A157B293A}'; - RID_PresupuestosClienteDelta = '{C5E20CDB-A1E1-42F8-B46F-25C93C4957F6}'; - RID_CapitulosPresupuestoDelta = '{17439B2D-6084-4A58-8AB1-6437324028C0}'; - RID_PresupuestosCliente_DetallesDelta = '{D011385B-63AE-4484-AF6A-DE0CA4F3E913}'; + RID_ValoresDelta = '{9B543FC9-DBF4-4438-A584-5C04CDCD249F}'; + RID_PropiedadesDelta = '{0F685E41-8B3F-4921-B0AA-042F4E295657}'; + RID_ListaAnosPresupuestosDelta = '{6BDBFE45-9646-4711-B21F-5CE4D8E8F94D}'; + RID_PresupuestosClienteDelta = '{C23FE048-077C-496A-92E5-166499BC211B}'; + RID_CapitulosPresupuestoDelta = '{EB65DDBD-79C6-4A83-836C-202A312701FB}'; + RID_PresupuestosCliente_DetallesDelta = '{B3CFFF89-A178-408D-82D3-80C66ABC8C63}'; type { IValoresDelta } IValoresDelta = interface(IValores) - ['{687FCBCD-2F9D-4E98-8515-FD5E9FCEE32A}'] + ['{9B543FC9-DBF4-4438-A584-5C04CDCD249F}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -125,7 +125,7 @@ type { IPropiedadesDelta } IPropiedadesDelta = interface(IPropiedades) - ['{784A3DDA-A3AF-49BB-A49C-7EEF41AA4565}'] + ['{0F685E41-8B3F-4921-B0AA-042F4E295657}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -171,7 +171,7 @@ type { IListaAnosPresupuestosDelta } IListaAnosPresupuestosDelta = interface(IListaAnosPresupuestos) - ['{881F141B-82C6-448C-80E9-D26A157B293A}'] + ['{6BDBFE45-9646-4711-B21F-5CE4D8E8F94D}'] { Property getters and setters } function GetOldANOValue : String; @@ -205,7 +205,7 @@ type { IPresupuestosClienteDelta } IPresupuestosClienteDelta = interface(IPresupuestosCliente) - ['{C5E20CDB-A1E1-42F8-B46F-25C93C4957F6}'] + ['{C23FE048-077C-496A-92E5-166499BC211B}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -251,6 +251,7 @@ type function GetOldCALIDADESValue : IROStrings; function GetOldREFERENCIA_CLIENTEValue : String; function GetOldLISTA_NOMBRESValue : String; + function GetOldPROCEDENCIA_CLIENTEValue : String; { Properties } property OldID : Integer read GetOldIDValue; @@ -297,6 +298,7 @@ type property OldCALIDADES : IROStrings read GetOldCALIDADESValue; property OldREFERENCIA_CLIENTE : String read GetOldREFERENCIA_CLIENTEValue; property OldLISTA_NOMBRES : String read GetOldLISTA_NOMBRESValue; + property OldPROCEDENCIA_CLIENTE : String read GetOldPROCEDENCIA_CLIENTEValue; end; { TPresupuestosClienteBusinessProcessorRules } @@ -573,6 +575,12 @@ type function GetOldLISTA_NOMBRESIsNull: Boolean; virtual; procedure SetLISTA_NOMBRESValue(const aValue: String); virtual; procedure SetLISTA_NOMBRESIsNull(const aValue: Boolean); virtual; + function GetPROCEDENCIA_CLIENTEValue: String; virtual; + function GetPROCEDENCIA_CLIENTEIsNull: Boolean; virtual; + function GetOldPROCEDENCIA_CLIENTEValue: String; virtual; + function GetOldPROCEDENCIA_CLIENTEIsNull: Boolean; virtual; + procedure SetPROCEDENCIA_CLIENTEValue(const aValue: String); virtual; + procedure SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -751,6 +759,10 @@ type property LISTA_NOMBRESIsNull : Boolean read GetLISTA_NOMBRESIsNull write SetLISTA_NOMBRESIsNull; property OldLISTA_NOMBRES : String read GetOldLISTA_NOMBRESValue; property OldLISTA_NOMBRESIsNull : Boolean read GetOldLISTA_NOMBRESIsNull; + property PROCEDENCIA_CLIENTE : String read GetPROCEDENCIA_CLIENTEValue write SetPROCEDENCIA_CLIENTEValue; + property PROCEDENCIA_CLIENTEIsNull : Boolean read GetPROCEDENCIA_CLIENTEIsNull write SetPROCEDENCIA_CLIENTEIsNull; + property OldPROCEDENCIA_CLIENTE : String read GetOldPROCEDENCIA_CLIENTEValue; + property OldPROCEDENCIA_CLIENTEIsNull : Boolean read GetOldPROCEDENCIA_CLIENTEIsNull; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -760,7 +772,7 @@ type { ICapitulosPresupuestoDelta } ICapitulosPresupuestoDelta = interface(ICapitulosPresupuesto) - ['{17439B2D-6084-4A58-8AB1-6437324028C0}'] + ['{EB65DDBD-79C6-4A83-836C-202A312701FB}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldPOSICIONValue : Integer; @@ -914,7 +926,7 @@ type { IPresupuestosCliente_DetallesDelta } IPresupuestosCliente_DetallesDelta = interface(IPresupuestosCliente_Detalles) - ['{D011385B-63AE-4484-AF6A-DE0CA4F3E913}'] + ['{B3CFFF89-A178-408D-82D3-80C66ABC8C63}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_PRESUPUESTOValue : Integer; @@ -2896,6 +2908,37 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_PresupuestosClienteLISTA_NOMBRES] := Null; end; +function TPresupuestosClienteBusinessProcessorRules.GetPROCEDENCIA_CLIENTEValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_PresupuestosClientePROCEDENCIA_CLIENTE]; +end; + +function TPresupuestosClienteBusinessProcessorRules.GetPROCEDENCIA_CLIENTEIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_PresupuestosClientePROCEDENCIA_CLIENTE]); +end; + +function TPresupuestosClienteBusinessProcessorRules.GetOldPROCEDENCIA_CLIENTEValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_PresupuestosClientePROCEDENCIA_CLIENTE]; +end; + +function TPresupuestosClienteBusinessProcessorRules.GetOldPROCEDENCIA_CLIENTEIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_PresupuestosClientePROCEDENCIA_CLIENTE]); +end; + +procedure TPresupuestosClienteBusinessProcessorRules.SetPROCEDENCIA_CLIENTEValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_PresupuestosClientePROCEDENCIA_CLIENTE] := aValue; +end; + +procedure TPresupuestosClienteBusinessProcessorRules.SetPROCEDENCIA_CLIENTEIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_PresupuestosClientePROCEDENCIA_CLIENTE] := Null; +end; + { TCapitulosPresupuestoBusinessProcessorRules } constructor TCapitulosPresupuestoBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); diff --git a/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.dfm b/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.dfm index 132e52d..287bbae 100644 --- a/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.dfm +++ b/Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.dfm @@ -342,6 +342,10 @@ object srvPresupuestosCliente: TsrvPresupuestosCliente item DatasetField = 'LISTA_NOMBRES' TableField = 'LISTA_NOMBRES' + end + item + DatasetField = 'PROCEDENCIA_CLIENTE' + TableField = 'PROCEDENCIA_CLIENTE' end> end> Name = 'PresupuestosCliente' @@ -583,6 +587,11 @@ object srvPresupuestosCliente: TsrvPresupuestosCliente DataType = datString Size = 255 DictionaryEntry = 'PresupuestosCliente_LISTA_NOMBRES' + end + item + Name = 'PROCEDENCIA_CLIENTE' + DataType = datString + Size = 255 end> end item diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm index 11705ae..d336d5b 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm @@ -130,6 +130,10 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente BestFitMaxWidth = 65 Width = 65 end + object cxGridViewPROCEDENCIA_CLIENTE: TcxGridDBColumn + Caption = 'Procedencia' + DataBinding.FieldName = 'PROCEDENCIA_CLIENTE' + end end inherited cxGridLevel: TcxGridLevel Caption = 'Todos' @@ -145,6 +149,65 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente end end inherited frViewFiltroBase1: TfrViewFiltroBase + Width = 903 + ExplicitWidth = 903 + inherited TBXDockablePanel1: TTBXDockablePanel + ExplicitWidth = 903 + inherited dxLayoutControl1: TdxLayoutControl + Width = 903 + 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 = '' + end + inherited edtFechaFinFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + 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 = 903 + ExplicitWidth = 903 + inherited tbxBotones: TTBXToolbar + Width = 893 + ExplicitWidth = 893 + end + end + end end inherited pnlAgrupaciones: TTBXDockablePanel Top = 499 diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas index 014fa0e..68744fa 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas @@ -48,6 +48,7 @@ type cxGridViewTIPO: TcxGridDBColumn; cxGridViewColumn1: TcxGridDBColumn; cxGridViewLISTA_NOMBRES: TcxGridDBColumn; + cxGridViewPROCEDENCIA_CLIENTE: TcxGridDBColumn; procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel); procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr index 4a495e5..7947910 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -115,8 +115,6 @@ uses schFamiliasServer_Intf in '..\Modulos\Familias\Model\schFamiliasServer_Intf.pas', schArticulosClient_Intf in '..\Modulos\Articulos\Model\schArticulosClient_Intf.pas', schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas', - schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas', - schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas', uRptListadosContactos_Server in '..\Modulos\Contactos\Reports\uRptListadosContactos_Server.pas' {RptListadosContactos: TDataModule}, uRptPedidosProveedor_Server in '..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas' {RptPedidosProveedor: TDataModule}, schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas', @@ -127,10 +125,6 @@ uses schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas', schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas', schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas', - 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', schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas', schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas', schRecibosProveedorClient_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas', @@ -138,7 +132,13 @@ uses schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas', schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas', schFormasPagoClient_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas', - schFormasPagoServer_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas'; + schFormasPagoServer_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas', + schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas', + schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas', + schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas', + schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas', + schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas', + schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas'; {$R *.res} {$R ..\Servicios\RODLFile.res} diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index f0534e1..a671423 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -28,7 +28,7 @@ Delphi.Personality - FalseTrueFalseTrueFalse2220FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.2.2.0FactuGES v2(Servidor)2.2.2.0martes, 02 de marzo de 2021 15:34 + FalseTrueFalseTrueFalse2230FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.2.3.0FactuGES v2(Servidor)2.2.3.0miércoles, 30 de marzo de 2022 12:13 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 066202b..b301b71 100644 Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ