From 2bff632717e00cd5bbbf5f2221a6208dee80dc53 Mon Sep 17 00:00:00 2001 From: david Date: Fri, 21 Dec 2007 10:53:42 +0000 Subject: [PATCH] =?UTF-8?q?Detalles=20de=20art=C3=ADculos:=20Habilitadas?= =?UTF-8?q?=20las=20acciones=20de=20formateo=20de=20fuente=20y=20repaso=20?= =?UTF-8?q?general.=20-?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@196 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Source/GUIBase/uEditorDBItem.dfm | 8 +- Source/GUIBase/uViewDetallesBase.dfm | 87 ++++++----- Source/GUIBase/uViewDetallesBase.pas | 9 +- Source/GUIBase/uViewDetallesDTO.dfm | 96 +----------- .../Views/uViewDetallesAlbaranCliente.dfm | 6 - .../Views/uViewDetallesAlbaranCliente.pas | 2 +- .../Views/uViewDetallesAlbaranProveedor.pas | 3 +- .../Views/uViewDetallesArticulos.dfm | 139 ++++++++++-------- .../Views/uViewDetallesArticulos.pas | 64 +++++++- .../Views/uViewDetallesFacturaCliente.pas | 2 +- .../Views/uViewDetallesFacturaProveedor.pas | 2 +- .../Views/uViewDetallesPedidoProveedor.pas | 3 +- .../Views/uEditorPresupuestosCliente.dfm | 3 +- .../Views/uViewDetallesPresupuestoCliente.dfm | 36 +---- .../Views/uViewDetallesPresupuestoCliente.pas | 2 +- 15 files changed, 204 insertions(+), 258 deletions(-) diff --git a/Source/GUIBase/uEditorDBItem.dfm b/Source/GUIBase/uEditorDBItem.dfm index a7205946..9edf8834 100644 --- a/Source/GUIBase/uEditorDBItem.dfm +++ b/Source/GUIBase/uEditorDBItem.dfm @@ -45,16 +45,12 @@ inherited fEditorDBItem: TfEditorDBItem ActivePage = pagGeneral Align = alClient TabOrder = 2 - ExplicitLeft = 0 - ExplicitTop = 76 - ExplicitWidth = 652 - ExplicitHeight = 366 object pagGeneral: TTabSheet Caption = 'General' ExplicitLeft = 0 ExplicitTop = 0 - ExplicitWidth = 644 - ExplicitHeight = 338 + ExplicitWidth = 0 + ExplicitHeight = 0 end end inherited StatusBar: TJvStatusBar diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm index 823cc458..d24c6cfa 100644 --- a/Source/GUIBase/uViewDetallesBase.dfm +++ b/Source/GUIBase/uViewDetallesBase.dfm @@ -10,9 +10,9 @@ inherited frViewDetallesBase: TfrViewDetallesBase Left = 0 Top = 0 Width = 451 - Height = 46 + Height = 73 AutoSize = True - ButtonWidth = 63 + ButtonWidth = 141 Caption = 'ToolBar1' EdgeInner = esNone EdgeOuter = esNone @@ -64,7 +64,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase DroppedDownWidth = 145 MaxMRUCount = 0 FontName = 'Tahoma' - ItemIndex = 34 + ItemIndex = 35 Options = [foTrueTypeOnly, foNoOEMFonts, foScalableOnly, foWysiWyg] Sorted = True TabOrder = 2 @@ -107,49 +107,50 @@ inherited frViewDetallesBase: TfrViewDetallesBase AutoSize = True end object ToolButton7: TToolButton - Left = 229 + Left = 261 Top = 22 Action = RichEditItalic1 AutoSize = True end object ToolButton8: TToolButton - Left = 263 + Left = 328 Top = 22 Action = RichEditUnderline1 AutoSize = True end object ToolButton12: TToolButton - Left = 297 + Left = 0 Top = 22 Width = 8 Caption = 'ToolButton12' ImageIndex = 10 + Wrap = True Style = tbsSeparator end object ToolButton9: TToolButton - Left = 305 - Top = 22 + Left = 0 + Top = 52 Action = RichEditAlignLeft1 AutoSize = True end object ToolButton10: TToolButton - Left = 339 - Top = 22 + Left = 145 + Top = 52 Action = RichEditAlignCenter1 AutoSize = True end object ToolButton11: TToolButton - Left = 373 - Top = 22 + Left = 270 + Top = 52 Action = RichEditAlignRight1 AutoSize = True end end object cxGrid: TcxGrid Left = 0 - Top = 72 + Top = 99 Width = 451 - Height = 232 + Height = 205 Align = alClient TabOrder = 1 LookAndFeel.Kind = lfStandard @@ -195,10 +196,6 @@ inherited frViewDetallesBase: TfrViewDetallesBase OptionsView.GroupByBox = False OptionsView.HeaderEndEllipsis = True OptionsView.Indicator = True - OptionsView.NewItemRowInfoText = 'Click here to add a new row' - Styles.ContentEven = cxStyleEven - Styles.ContentOdd = cxStyleOdd - Styles.Selection = cxStyleSelection Styles.OnGetContentStyle = cxGridViewStylesGetContentStyle object cxGridViewID: TcxGridDBColumn DataBinding.FieldName = 'ID' @@ -310,7 +307,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object TBXDock1: TTBXDock Left = 0 - Top = 46 + Top = 73 Width = 451 Height = 26 BackgroundOnToolbars = False @@ -412,64 +409,63 @@ inherited frViewDetallesBase: TfrViewDetallesBase OnUpdate = actBajarUpdate end object RichEditBold1: TRichEditBold - Category = 'Format' + Category = 'Formato' AutoCheck = True + Caption = 'Negrita' Hint = 'Negrita' ImageIndex = 4 ShortCut = 16450 end object RichEditItalic1: TRichEditItalic - Category = 'Format' + Category = 'Formato' AutoCheck = True + Caption = 'Cursiva' Hint = 'Cursiva' ImageIndex = 5 ShortCut = 16457 end object RichEditUnderline1: TRichEditUnderline - Category = 'Format' + Category = 'Formato' AutoCheck = True + Caption = 'Subrayado' Hint = 'Subrayado' ImageIndex = 6 ShortCut = 16469 end object RichEditAlignLeft1: TRichEditAlignLeft - Category = 'Format' + Category = 'Formato' AutoCheck = True + Caption = 'Alineaci'#243'n a la izquierda' Hint = 'Alinear a la izquierda' ImageIndex = 7 end object RichEditAlignCenter1: TRichEditAlignCenter - Category = 'Format' + Category = 'Formato' AutoCheck = True + Caption = 'Alineaci'#243'n centrada' Hint = 'Center|Centers text between margins' ImageIndex = 8 end object RichEditAlignRight1: TRichEditAlignRight - Category = 'Format' + Category = 'Formato' AutoCheck = True + Caption = 'Alineaci'#243'n a la derecha' Hint = 'Align Right|Aligns text at the right indent' ImageIndex = 9 end object FontEdit1: TFontEdit - Category = 'Dialog' + Category = 'Formato' + Caption = 'Fuente' Dialog.Font.Charset = DEFAULT_CHARSET Dialog.Font.Color = clWindowText Dialog.Font.Height = -11 Dialog.Font.Name = 'Tahoma' Dialog.Font.Style = [] - Enabled = False Hint = 'Formato de fuente' ImageIndex = 10 BeforeExecute = FontEdit1BeforeExecute OnAccept = FontEdit1Accept end - object RichEditAlignRight2: TRichEditAlignRight - Category = 'Format' - AutoCheck = True - Caption = 'Align &Right' - Hint = 'Align Right|Aligns text at the right indent' - ImageIndex = 11 - end object actAnchoAutomatico: TAction Category = 'Operaciones' Caption = 'Ancho autom'#225'tico' @@ -477,6 +473,18 @@ inherited frViewDetallesBase: TfrViewDetallesBase OnExecute = actAnchoAutomaticoExecute OnUpdate = actAnchoAutomaticoUpdate end + object actDetallesCortar: TAction + Category = 'Editar' + Caption = 'Cortar' + end + object actDetallesCopiar: TAction + Category = 'Editar' + Caption = 'Copiar' + end + object actDetallesPegar: TAction + Category = 'Editar' + Caption = 'Pegar' + end end object DADataSource: TDADataSource Left = 8 @@ -693,17 +701,6 @@ inherited frViewDetallesBase: TfrViewDetallesBase object cxStyleRepository: TcxStyleRepository Left = 8 Top = 168 - object cxStyleEven: TcxStyle - end - object cxStyleOdd: TcxStyle - AssignedValues = [svColor] - Color = 16119285 - end - object cxStyleSelection: TcxStyle - AssignedValues = [svColor, svTextColor] - Color = clHighlight - TextColor = clHighlightText - end object cxStyle_IMPORTETOTAL: TcxStyle AssignedValues = [svColor] Color = clInactiveCaptionText diff --git a/Source/GUIBase/uViewDetallesBase.pas b/Source/GUIBase/uViewDetallesBase.pas index 95eca84d..b408651e 100644 --- a/Source/GUIBase/uViewDetallesBase.pas +++ b/Source/GUIBase/uViewDetallesBase.pas @@ -45,9 +45,6 @@ type ContenidoImageList: TPngImageList; ToolBar1: TToolBar; cxStyleRepository: TcxStyleRepository; - cxStyleEven: TcxStyle; - cxStyleOdd: TcxStyle; - cxStyleSelection: TcxStyle; ToolButton1: TToolButton; ToolButton2: TToolButton; ToolButton3: TToolButton; @@ -102,11 +99,13 @@ type cxStyle_IMPORTETOTAL: TcxStyle; cxStyle_SUBTOTAL: TcxStyle; cxStyle_TITULO: TcxStyle; - RichEditAlignRight2: TRichEditAlignRight; actAnchoAutomatico: TAction; TBXSeparatorItem5: TTBXSeparatorItem; TBXItem13: TTBXItem; cxStyle_DESCUENTO: TcxStyle; + actDetallesCortar: TAction; + actDetallesCopiar: TAction; + actDetallesPegar: TAction; procedure actAnadirExecute(Sender: TObject); procedure actEliminarExecute(Sender: TObject); @@ -462,7 +461,7 @@ procedure TfrViewDetallesBase.cxGridViewStylesGetContentStyle( var ATipo : String; begin - AStyle := cxStyleEven; + AStyle := NIL; if Assigned(ARecord) then begin ATipo := DarTipoConcepto(ARecord); diff --git a/Source/GUIBase/uViewDetallesDTO.dfm b/Source/GUIBase/uViewDetallesDTO.dfm index 7584ea4d..6d17930d 100644 --- a/Source/GUIBase/uViewDetallesDTO.dfm +++ b/Source/GUIBase/uViewDetallesDTO.dfm @@ -1,10 +1,5 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO - Width = 927 - Height = 304 inherited ToolBar1: TToolBar - Width = 927 - ButtonWidth = 110 - ExplicitHeight = 73 inherited ToolButton1: TToolButton ExplicitWidth = 109 end @@ -13,67 +8,20 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO ExplicitLeft = 109 ExplicitWidth = 114 end - inherited ToolButton4: TToolButton [2] + inherited ToolButton3: TToolButton Left = 223 ExplicitLeft = 223 end - inherited FontName: TJvFontComboBox [3] - Left = 279 - ExplicitLeft = 279 + inherited ToolButton4: TToolButton + Left = 278 + ExplicitLeft = 278 end - inherited ToolButton3: TToolButton [4] - Left = 424 - ExplicitLeft = 424 - end - inherited ToolButton8: TToolButton [5] - Left = 479 - ExplicitLeft = 479 - end - inherited ToolButton13: TToolButton [6] - Left = 513 - ExplicitLeft = 513 - end - inherited ToolButton6: TToolButton [7] - Left = 521 - ExplicitLeft = 521 - end - inherited ToolButton7: TToolButton [8] - Left = 555 - ExplicitLeft = 555 - end - inherited ToolButton12: TToolButton [9] - Left = 589 - ExplicitLeft = 589 - end - inherited ToolButton9: TToolButton [10] - Left = 597 - ExplicitLeft = 597 - end - inherited ToolButton10: TToolButton [11] - Left = 631 - ExplicitLeft = 631 - end - inherited ToolButton11: TToolButton [12] - Left = 665 - ExplicitLeft = 665 - end - inherited ToolButton14: TToolButton [13] - Left = 699 - Enabled = True - ExplicitLeft = 699 - end - inherited FontSize: TEdit [14] - Left = 733 - ExplicitLeft = 733 - end - inherited UpDown1: TUpDown [15] - Left = 759 - ExplicitLeft = 759 + inherited ToolButton14: TToolButton + Left = 334 + ExplicitLeft = 334 end end inherited cxGrid: TcxGrid - Width = 927 - Height = 254 inherited cxGridView: TcxGridDBTableView object cxGridViewDESCUENTO: TcxGridDBColumn [6] Caption = 'Dto' @@ -107,12 +55,6 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO end end end - inherited TBXDock1: TTBXDock - Width = 927 - inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 447 - end - end inherited ActionListContenido: TActionList inherited actAnadir: TAction Caption = 'A'#241'adir concepto' @@ -120,29 +62,5 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO inherited actEliminar: TAction Caption = 'Eliminar concepto' end - inherited RichEditBold1: TRichEditBold - Visible = False - end - inherited RichEditItalic1: TRichEditItalic - Visible = False - end - inherited RichEditUnderline1: TRichEditUnderline - Visible = False - end - inherited RichEditAlignLeft1: TRichEditAlignLeft - Visible = False - end - inherited RichEditAlignCenter1: TRichEditAlignCenter - Visible = False - end - inherited RichEditAlignRight1: TRichEditAlignRight - Visible = False - end - inherited FontEdit1: TFontEdit - Visible = False - end - inherited RichEditAlignRight2: TRichEditAlignRight - Visible = False - end end end diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm index 1ef65893..cbccf602 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm @@ -1,12 +1,6 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente inherited cxGrid: TcxGrid inherited cxGridView: TcxGridDBTableView - inherited cxGridViewID: TcxGridDBColumn - Visible = False - end - inherited cxGridViewPOSICION: TcxGridDBColumn - Visible = False - end inherited cxGridViewTIPO: TcxGridDBColumn Visible = False end diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas index a422d87c..fe0a0f80 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.pas @@ -13,7 +13,7 @@ uses JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, TBX, TB2Dock, TB2Toolbar, uControllerDetallesArticulos, uBizAlbaranesCliente, cxDropDownEdit, cxCalendar, cxDBEdit, dxLayoutControl, cxContainer, cxLookupEdit, - cxDBLookupEdit, cxDBLookupComboBox, uDAInterfaces; + cxDBLookupEdit, cxDBLookupComboBox, uDAInterfaces, cxButtonEdit; type IViewDetallesAlbaranCliente = interface(IViewDetallesArticulos) diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.pas index 714c4a65..63a5a0cf 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.pas @@ -11,7 +11,8 @@ uses cxGrid, cxImageComboBox, cxTextEdit, cxMaskEdit, cxCheckBox, cxCurrencyEdit, Grids, DBGrids, StdCtrls, ExtCtrls, cxRichEdit, ExtActns, StdActns, JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, TBX, TB2Dock, TB2Toolbar, - uControllerDetallesArticulos, uBizAlbaranesProveedor, uDAInterfaces; + uControllerDetallesArticulos, uBizAlbaranesProveedor, uDAInterfaces, + cxButtonEdit, cxDropDownEdit; type IViewDetallesAlbaranProveedor = interface(IViewDetallesArticulos) diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm index 4221f034..2ecde6ef 100644 --- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm +++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm @@ -1,73 +1,51 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos - Width = 771 - Height = 463 + Width = 930 ParentBiDiMode = False OnShow = CustomViewShow inherited ToolBar1: TToolBar - Width = 771 + Width = 930 + Height = 51 inherited ToolButton4: TToolButton - Wrap = True - end - inherited ToolButton14: TToolButton - Left = 0 - Top = 22 - Wrap = False - ExplicitLeft = 0 - ExplicitTop = 22 - end - inherited FontName: TJvFontComboBox - Left = 34 - ExplicitLeft = 34 - end - inherited FontSize: TEdit - Left = 179 - Width = 42 - ExplicitLeft = 179 - ExplicitWidth = 42 - end - inherited UpDown1: TUpDown - Left = 221 - Width = 17 - ExplicitLeft = 221 - ExplicitWidth = 17 - end - inherited ToolButton13: TToolButton - Left = 238 - ExplicitLeft = 238 - end - inherited ToolButton6: TToolButton - Left = 246 - ExplicitLeft = 246 + ExplicitTop = 30 end inherited ToolButton7: TToolButton - Left = 280 - ExplicitLeft = 280 - end - inherited ToolButton8: TToolButton - Left = 314 - ExplicitLeft = 314 - end - inherited ToolButton12: TToolButton - Left = 348 - ExplicitLeft = 348 - end - inherited ToolButton9: TToolButton - Left = 356 - ExplicitLeft = 356 - end - inherited ToolButton10: TToolButton - Left = 390 - ExplicitLeft = 390 + Wrap = False end inherited ToolButton11: TToolButton - Left = 424 - ExplicitLeft = 424 + Left = 334 + Top = 30 + ExplicitLeft = 334 + ExplicitTop = 30 + end + inherited ToolButton9: TToolButton + Left = 475 + Top = 30 + ExplicitLeft = 475 + ExplicitTop = 30 + end + inherited ToolButton8: TToolButton + Left = 620 + Top = 30 + Wrap = False + ExplicitLeft = 620 + ExplicitTop = 30 + end + inherited ToolButton10: TToolButton + Left = 703 + Top = 30 + ExplicitLeft = 703 + ExplicitTop = 30 end end inherited cxGrid: TcxGrid - Width = 771 - Height = 391 + Top = 77 + Width = 930 + Height = 227 + ExplicitTop = 121 + ExplicitHeight = 183 inherited cxGridView: TcxGridDBTableView + OptionsSelection.HideFocusRectOnExit = False + OptionsView.ShowEditButtons = gsebForFocusedRecord inherited cxGridViewTIPO: TcxGridDBColumn Width = 26 end @@ -79,7 +57,13 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos object cxGridViewREFERENCIA: TcxGridDBColumn [4] Caption = 'Referencia' DataBinding.FieldName = 'REFERENCIA' - PropertiesClassName = 'TcxTextEditProperties' + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.OnButtonClick = cxGridViewREFERENCIAPropertiesButtonClick Width = 59 end object cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn [5] @@ -119,24 +103,49 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos end end inherited TBXDock1: TTBXDock - Width = 771 - ExplicitWidth = 451 + Top = 51 + Width = 930 + ExplicitTop = 51 + ExplicitWidth = 930 inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 548 - object TBXItem12: TTBXItem [0] - Action = actAnadirArticulos - DisplayMode = nbdmImageAndText + ExplicitWidth = 626 + inherited TBXItem5: TTBXItem + Visible = True + end + inherited TBXItem6: TTBXItem + Visible = True + end + inherited TBXItem7: TTBXItem + Visible = True + end + inherited TBXItem9: TTBXItem + Visible = True + end + inherited TBXItem10: TTBXItem + Visible = True + end + inherited TBXItem11: TTBXItem + Visible = True + end + inherited TBXItem8: TTBXItem + Visible = True end end end inherited ActionListContenido: TActionList - object actAnadirArticulos: TAction + object actAnadirArticulos: TAction [12] Category = 'Operaciones' Caption = 'A'#241'adir art'#237'culos' ImageIndex = 12 OnExecute = actAnadirArticulosExecute OnUpdate = actAnadirArticulosUpdate end + object actBuscarArticulo: TAction [13] + Category = 'Operaciones' + Caption = 'Buscar art'#237'culo' + OnExecute = actBuscarArticuloExecute + OnUpdate = actBuscarArticuloUpdate + end end inherited ContenidoImageList: TPngImageList PngImages = < diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas index 6eec7067..84cb739b 100644 --- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas +++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas @@ -11,7 +11,7 @@ uses cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, ComCtrls, StdCtrls, JvExStdCtrls, JvCombobox, JvColorCombo, ToolWin, uControllerDetallesArticulos, - cxTextEdit, uDAInterfaces, cxDropDownEdit; + cxTextEdit, uDAInterfaces, cxDropDownEdit, cxButtonEdit; type IViewDetallesArticulos = interface(IViewDetallesDTO) @@ -23,8 +23,8 @@ type cxGridViewREFERENCIA: TcxGridDBColumn; cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn; actAnadirArticulos: TAction; - TBXItem12: TTBXItem; cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn; + actBuscarArticulo: TAction; procedure CustomViewCreate(Sender: TObject); procedure CustomViewDestroy(Sender: TObject); procedure actAnadirArticulosExecute(Sender: TObject); @@ -33,9 +33,16 @@ type procedure OnValidateReferenciaProveedor(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); procedure CustomViewShow(Sender: TObject); procedure cxGridViewUNIDAD_MEDIDAPropertiesInitPopup(Sender: TObject); - + procedure cxGridViewREFERENCIAPropertiesButtonClick(Sender: TObject; + AButtonIndex: Integer); + procedure actBuscarArticuloExecute(Sender: TObject); + procedure actBuscarArticuloUpdate(Sender: TObject); + procedure actDetalleCopiarExecute(Sender: TObject); + procedure actDetallePegarExecute(Sender: TObject); + procedure actDetalleCortarExecute(Sender: TObject); protected procedure AnadirArticulosInterno; virtual; + procedure RellenarArticulosInterno; virtual; function AnadirArticulo(pReferencia: String; TipoReferencia: TEnumReferencia): Boolean; virtual; end; @@ -85,6 +92,13 @@ begin SeleccionarRowActual; end; +procedure TfrViewDetallesArticulos.cxGridViewREFERENCIAPropertiesButtonClick( + Sender: TObject; AButtonIndex: Integer); +begin + inherited; + actBuscarArticulo.Execute; +end; + procedure TfrViewDetallesArticulos.cxGridViewUNIDAD_MEDIDAPropertiesInitPopup( Sender: TObject); var @@ -150,12 +164,56 @@ begin end; end; +procedure TfrViewDetallesArticulos.RellenarArticulosInterno; +begin + (Controller as IControllerDetallesArticulos).AnadirArticulos(Detalles, False); +end; + procedure TfrViewDetallesArticulos.actAnadirArticulosUpdate(Sender: TObject); begin inherited; (Sender as TAction).Enabled := actAnadir.Enabled; end; +procedure TfrViewDetallesArticulos.actBuscarArticuloExecute(Sender: TObject); +begin + cxGridView.BeginUpdate; + try + if cxGridView.Controller.EditingController.IsEditing then + cxGridView.Controller.EditingController.Edit.PostEditValue; + + RellenarArticulosInterno; + finally + cxGridView.EndUpdate; + end; + + SeleccionarRowActual; +end; + +procedure TfrViewDetallesArticulos.actBuscarArticuloUpdate(Sender: TObject); +begin + inherited; + (Sender as TAction).Enabled := actAnadir.Enabled; +end; + +procedure TfrViewDetallesArticulos.actDetalleCopiarExecute(Sender: TObject); +begin + inherited; + cxGridView.CopyToClipboard(False); +end; + +procedure TfrViewDetallesArticulos.actDetalleCortarExecute(Sender: TObject); +begin + inherited; +// +end; + +procedure TfrViewDetallesArticulos.actDetallePegarExecute(Sender: TObject); +begin + inherited; +// +end; + function TfrViewDetallesArticulos.AnadirArticulo(pReferencia: String; TipoReferencia: TEnumReferencia): Boolean; begin Result := (Controller as IControllerDetallesArticulos).AnadirArticulo(Detalles, pReferencia, TipoReferencia); diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas index 57fd3ce0..e29d30a7 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas @@ -12,7 +12,7 @@ uses Grids, DBGrids, StdCtrls, ExtCtrls, cxRichEdit, StdActns, ExtActns, JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, TBX, TB2Dock, TB2Toolbar, uControllerDetallesArticulos, uViewDetallesArticulos, uBizFacturasCliente, - uDAInterfaces, cxDropDownEdit; + uDAInterfaces, cxDropDownEdit, cxButtonEdit; type IViewDetallesFacturaCliente = interface(IViewDetallesArticulos) diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.pas index b80080fa..fe92c0aa 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.pas +++ b/Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.pas @@ -12,7 +12,7 @@ uses Grids, DBGrids, StdCtrls, ExtCtrls, cxRichEdit, StdActns, ExtActns, JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, TBX, TB2Dock, TB2Toolbar, uControllerDetallesArticulos, uViewDetallesArticulos, uBizFacturasProveedor, - uDAInterfaces; + uDAInterfaces, cxButtonEdit, cxDropDownEdit; type IViewDetallesFacturaProveedor = interface(IViewDetallesArticulos) diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.pas index 35ab2898..eca00938 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.pas +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.pas @@ -11,7 +11,8 @@ uses cxGrid, cxImageComboBox, cxTextEdit, cxMaskEdit, cxCheckBox, cxCurrencyEdit, Grids, DBGrids, StdCtrls, ExtCtrls, cxRichEdit, ExtActns, StdActns, JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, TBX, TB2Dock, TB2Toolbar, - uControllerDetallesArticulos, uBizPedidosProveedor, uDAInterfaces; + uControllerDetallesArticulos, uBizPedidosProveedor, uDAInterfaces, + cxButtonEdit, cxDropDownEdit; type IViewDetallesPedidoProveedor = interface(IViewDetallesArticulos) diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.dfm index 1eaa25ad..c8de64f5 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.dfm @@ -124,7 +124,7 @@ inherited fEditorPresupuestosCliente: TfEditorPresupuestosCliente Width = 674 ExplicitWidth = 674 inherited tbxMain: TTBXToolbar - ExplicitWidth = 632 + ExplicitWidth = 561 end inherited tbxMenu: TTBXToolbar ExplicitWidth = 674 @@ -165,6 +165,7 @@ inherited fEditorPresupuestosCliente: TfEditorPresupuestosCliente end inherited actDuplicar: TAction Enabled = False + Visible = False end object actGenerarAlbaranCli: TAction Category = 'Acciones' diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm index 032a4e45..15cfad4a 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.dfm @@ -1,36 +1,8 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente + Width = 969 + Height = 375 inherited cxGrid: TcxGrid - inherited cxGridView: TcxGridDBTableView - inherited cxGridViewTIPO: TcxGridDBColumn - Width = 51 - end - inherited cxGridViewREFERENCIA: TcxGridDBColumn - Width = 74 - end - inherited cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn - Width = 82 - end - inherited cxGridViewDESCRIPCION: TcxGridDBColumn - Width = 440 - end - inherited cxGridViewCANTIDAD: TcxGridDBColumn - Width = 55 - end - inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn - Width = 54 - end - inherited cxGridViewDESCUENTO: TcxGridDBColumn - Width = 28 - end - inherited cxGridViewIMPORTENETO: TcxGridDBColumn - Width = 65 - end - inherited cxGridViewIMPORTEPORTE: TcxGridDBColumn - Visible = False - end - inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn - Width = 68 - end - end + Width = 969 + Height = 298 end end diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.pas index d6031e3c..009b02b0 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewDetallesPresupuestoCliente.pas @@ -12,7 +12,7 @@ uses Grids, DBGrids, StdCtrls, ExtCtrls, cxRichEdit, ExtActns, StdActns, JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, TBX, TB2Dock, TB2Toolbar, uControllerDetallesArticulos, uBizPresupuestosCliente, uDAInterfaces, Buttons, - Mask, DBCtrls; + Mask, DBCtrls, cxButtonEdit, cxDropDownEdit; type IViewDetallesPresupuestoCliente = interface(IViewDetallesArticulos)