diff --git a/Source/GUIBase/uViewTotales.dfm b/Source/GUIBase/uViewTotales.dfm index d3e8b6e6..739478ea 100644 --- a/Source/GUIBase/uViewTotales.dfm +++ b/Source/GUIBase/uViewTotales.dfm @@ -1,14 +1,14 @@ inherited frViewTotales: TfrViewTotales - Width = 451 - Height = 350 + Width = 880 + Height = 316 Align = alBottom - ExplicitWidth = 451 - ExplicitHeight = 350 + ExplicitWidth = 880 + ExplicitHeight = 316 object dxLayoutControl1: TdxLayoutControl AlignWithMargins = True Left = 0 Top = 0 - Width = 451 + Width = 880 Height = 217 Margins.Left = 0 Margins.Top = 0 @@ -18,6 +18,7 @@ inherited frViewTotales: TfrViewTotales ParentBackground = True TabOrder = 0 AutoContentSizes = [acsWidth, acsHeight] + ExplicitWidth = 451 object Bevel1: TBevel Left = 104 Top = 109 @@ -26,14 +27,14 @@ inherited frViewTotales: TfrViewTotales Shape = bsBottomLine end object Bevel3: TBevel - Left = 278 + Left = 434 Top = 28 Width = 3 Height = 122 Shape = bsRightLine end object Bevel4: TBevel - Left = 390 + Left = 546 Top = 109 Width = 192 Height = 9 @@ -71,7 +72,7 @@ inherited frViewTotales: TfrViewTotales Width = 93 end object ImporteIVA: TcxDBCurrencyEdit - Left = 461 + Left = 617 Top = 55 AutoSize = False DataBinding.DataField = 'IMPORTE_IVA' @@ -102,7 +103,7 @@ inherited frViewTotales: TfrViewTotales Width = 137 end object ImporteTotal: TcxDBCurrencyEdit - Left = 391 + Left = 547 Top = 129 AutoSize = False DataBinding.DataField = 'IMPORTE_TOTAL' @@ -164,7 +165,7 @@ inherited frViewTotales: TfrViewTotales Width = 65 end object edtIVA: TcxDBSpinEdit - Left = 390 + Left = 546 Top = 55 AutoSize = False DataBinding.DataField = 'IVA' @@ -201,7 +202,7 @@ inherited frViewTotales: TfrViewTotales Width = 65 end object ImporteBase: TcxDBCurrencyEdit - Left = 390 + Left = 546 Top = 28 AutoSize = False DataBinding.DataField = 'BASE_IMPONIBLE' @@ -232,7 +233,7 @@ inherited frViewTotales: TfrViewTotales Width = 92 end object edtRE: TcxDBSpinEdit - Left = 390 + Left = 546 Top = 82 AutoSize = False DataBinding.DataField = 'RE' @@ -269,7 +270,7 @@ inherited frViewTotales: TfrViewTotales Width = 65 end object ImporteRE: TcxDBCurrencyEdit - Left = 461 + Left = 617 Top = 82 AutoSize = False DataBinding.DataField = 'IMPORTE_RE' @@ -365,7 +366,6 @@ inherited frViewTotales: TfrViewTotales Top = 55 DataBinding.DataField = 'ID_TIPO_IVA' DataBinding.DataSource = DADataSource - Properties.GridMode = True Properties.ImmediatePost = True Properties.KeyFieldNames = 'ID' Properties.ListColumns = < @@ -374,6 +374,7 @@ inherited frViewTotales: TfrViewTotales end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsTiposIVA Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -392,7 +393,7 @@ inherited frViewTotales: TfrViewTotales Width = 81 end object bTiposIVA: TButton - Left = 130 + Left = 286 Top = 55 Width = 132 Height = 21 diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm index 1b7177a7..c3cd14b0 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm @@ -329,6 +329,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsFormaPago Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -401,6 +402,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsAlmacenes Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas index da3149b9..075265f2 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas @@ -8,7 +8,7 @@ uses dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns, dxPSEdgePatterns, cxImageComboBox, ImgList, Controls, PngImageList, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, - cxGridCustomPopupMenu, cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGridLnk, + cxGridCustomPopupMenu, cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, uDADataTable, cxGridLevel, cxClasses, cxControls, cxGridCustomView, Classes, cxGrid, uBizAlbaranesCliente, cxCurrencyEdit, Forms, uViewFiltroBase, ComCtrls, Tabs, @@ -289,3 +289,4 @@ begin end; end. + \ No newline at end of file diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.pas index cc52d503..af69998f 100644 Binary files a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.pas and b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.pas differ diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewElegirArticulosAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewElegirArticulosAlbaranesCliente.pas index f84af6e8..8bbb1964 100644 Binary files a/Source/Modulos/Albaranes de cliente/Views/uViewElegirArticulosAlbaranesCliente.pas and b/Source/Modulos/Albaranes de cliente/Views/uViewElegirArticulosAlbaranesCliente.pas differ diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm index 667de217..a4edfa34 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm @@ -203,6 +203,7 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsFormaPago Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.pas index 2ead872b..a0195923 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesDevProveedor.pas @@ -9,7 +9,7 @@ uses cxCurrencyEdit, dxPSGlbl, dxPSUtl, dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns, dxPSEdgePatterns, dxPgsDlg, dxPSCore, ImgList, PngImageList, ActnList, cxGridCustomPopupMenu, - cxGridPopupMenu, dxPScxCommon, dxPScxGridLnk, uDADataTable, TB2Item, TBX, + cxGridPopupMenu, dxPScxCommon, dxPScxGrid6Lnk, uDADataTable, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, cxTextEdit; diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas index 4fe86c32..7981ecdc 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas @@ -8,7 +8,7 @@ uses dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns, dxPSEdgePatterns, cxImageComboBox, ImgList, Controls, PngImageList, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, - cxGridCustomPopupMenu, cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGridLnk, + cxGridCustomPopupMenu, cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, uDADataTable, cxGridLevel, cxClasses, cxControls, cxGridCustomView, Classes, cxGrid, uBizAlbaranesProveedor, cxCurrencyEdit, Forms, uViewFiltroBase, ActnList, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, cxTextEdit; diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.dfm index bbfafb4d..47fac2cf 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewDireccionEntregaAlbaranProv.dfm @@ -41,7 +41,7 @@ inherited frViewDireccionEntregaAlbaranProv: TfrViewDireccionEntregaAlbaranProv DataBinding.DataField = 'ID_ALMACEN' DataBinding.DataSource = dsAlbaran Properties.DropDownListStyle = lsFixedList - Properties.GridMode = True + Properties.ListOptions.SyncMode = True Properties.ImmediatePost = True Properties.KeyFieldNames = 'ID' Properties.ListColumns = < diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewElegirArticulosAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewElegirArticulosAlbaranesProveedor.pas index 27cbc174..4f3ae741 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewElegirArticulosAlbaranesProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewElegirArticulosAlbaranesProveedor.pas @@ -8,7 +8,7 @@ uses cxDataStorage, cxEdit, DB, cxDBData, cxImageComboBox, cxCurrencyEdit, cxSpinEdit, dxPSGlbl, dxPSUtl, dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns, dxPSEdgePatterns, ImgList, PngImageList, - cxGridCustomPopupMenu, cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGridLnk, + cxGridCustomPopupMenu, cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, uDADataTable, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, uBizContactos, dxPgsDlg, ActnList, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, diff --git a/Source/Modulos/Almacenes/Views/uViewAlmacenes.pas b/Source/Modulos/Almacenes/Views/uViewAlmacenes.pas index 02f5ec31..a73d02a3 100644 --- a/Source/Modulos/Almacenes/Views/uViewAlmacenes.pas +++ b/Source/Modulos/Almacenes/Views/uViewAlmacenes.pas @@ -11,7 +11,7 @@ uses cxGridBandedTableView, cxGridDBBandedTableView, JvComponent, JvFormAutoSize, PngImageList, ImgList, dxPSGlbl, dxPSUtl, dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns, - dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGridLnk, + dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces; diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.pas b/Source/Modulos/Articulos/Views/uViewArticulos.pas index 84918dc8..c7cba095 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulos.pas +++ b/Source/Modulos/Articulos/Views/uViewArticulos.pas @@ -11,7 +11,7 @@ uses cxGridBandedTableView, cxGridDBBandedTableView, JvComponent, JvFormAutoSize, PngImageList, ImgList, dxPSGlbl, dxPSUtl, dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns, - dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGridLnk, + dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, cxGridCustomPopupMenu, cxGridPopupMenu, cxCurrencyEdit, cxSpinEdit, cxCheckBox, cxCheckComboBox, cxImageComboBox, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, dxPgsDlg, uDAInterfaces; diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm index 2ecde6ef..07133061 100644 --- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm +++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm @@ -1,54 +1,10 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos - Width = 930 ParentBiDiMode = False OnShow = CustomViewShow - inherited ToolBar1: TToolBar - Width = 930 - Height = 51 - inherited ToolButton4: TToolButton - ExplicitTop = 30 - end - inherited ToolButton7: TToolButton - Wrap = False - end - inherited ToolButton11: TToolButton - 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 - 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 object cxGridViewID_ARTICULO: TcxGridDBColumn [3] DataBinding.FieldName = 'ID_ARTICULO' Visible = False @@ -75,9 +31,6 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos inherited cxGridViewDESCRIPCION: TcxGridDBColumn Width = 85 end - inherited cxGridViewCANTIDAD: TcxGridDBColumn - Width = 48 - end object cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn [8] Caption = 'Unid. medida' PropertiesClassName = 'TcxComboBoxProperties' @@ -85,10 +38,11 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos Properties.ImmediateUpdateText = True Properties.OnInitPopup = cxGridViewUNIDAD_MEDIDAPropertiesInitPopup Visible = False + Options.CellMerging = True Width = 60 end inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn - Width = 48 + Width = 50 end inherited cxGridViewDESCUENTO: TcxGridDBColumn HeaderAlignmentHorz = taRightJustify @@ -98,37 +52,7 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos Caption = 'Porte unidad' end inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn - Width = 49 - end - end - end - inherited TBXDock1: TTBXDock - Top = 51 - Width = 930 - ExplicitTop = 51 - ExplicitWidth = 930 - inherited TBXToolbar1: TTBXToolbar - 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 + Width = 50 end end end diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas index 84cb739b..8b87a0d5 100644 --- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas +++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas @@ -44,13 +44,14 @@ type procedure AnadirArticulosInterno; virtual; procedure RellenarArticulosInterno; virtual; function AnadirArticulo(pReferencia: String; TipoReferencia: TEnumReferencia): Boolean; virtual; + function EsTipoEditable(AItem: TcxCustomGridTableItem): Boolean; override; end; implementation {$R *.dfm} uses - uViewDetallesBase, uUnidadesMedidaController; + uCalculosUtils, uViewDetallesBase, uControllerDetallesBase, uUnidadesMedidaController; procedure TfrViewDetallesArticulos.actAnadirArticulosExecute(Sender: TObject); begin @@ -122,7 +123,26 @@ begin end; end; end; +end; +function TfrViewDetallesArticulos.EsTipoEditable( + AItem: TcxCustomGridTableItem): Boolean; +var + IndiceCol : Integer; +begin + Result := True; + + if (AItem.Index in [cxGridViewREFERENCIA.Index, cxGridViewREFERENCIA_PROVEEDOR.Index]) then + begin + IndiceCol := cxGridView.GetColumnByFieldName(CAMPO_TIPO).Index; + if ((AItem.GridView.Items[IndiceCol].EditValue = TIPO_DETALLE_SALTO) or + (AItem.GridView.Items[IndiceCol].EditValue = TIPO_DETALLE_SUBTOTAL) or + (AItem.GridView.Items[IndiceCol].EditValue = TIPO_DETALLE_DESCUENTO) or + (AItem.GridView.Items[IndiceCol].EditValue = TIPO_DETALLE_TITULO)) then + Result := False; + end + else + Result := inherited EsTipoEditable(AItem); end; procedure TfrViewDetallesArticulos.OnValidateReferencia(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); diff --git a/Source/Modulos/Contactos/Views/uEditorElegirClientes.dfm b/Source/Modulos/Contactos/Views/uEditorElegirClientes.dfm index 48bc3b81..7dc23fbf 100644 --- a/Source/Modulos/Contactos/Views/uEditorElegirClientes.dfm +++ b/Source/Modulos/Contactos/Views/uEditorElegirClientes.dfm @@ -51,17 +51,17 @@ inherited fEditorElegirClientes: TfEditorElegirClientes ExplicitTop = 87 ExplicitWidth = 683 inherited tbxMain: TTBXToolbar - ExplicitWidth = 284 + ExplicitWidth = 126 inherited TBXItem36: TTBXItem Action = actAnchoAuto2 end end inherited tbxFiltro: TTBXToolbar - Left = 284 + Left = 126 Top = 23 DockPos = 96 DockRow = 1 - ExplicitLeft = 284 + ExplicitLeft = 126 ExplicitTop = 23 inherited TBXItem34: TTBXItem Action = actQuitarFiltro2 @@ -165,17 +165,9 @@ inherited fEditorElegirClientes: TfEditorElegirClientes inherited dxLayoutControl1: TdxLayoutControl Width = 663 ExplicitWidth = 663 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 457 - Width = 457 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 240 - Width = 240 - end inherited edtFechaFinFiltro: TcxDateEdit - ExplicitWidth = 332 - Width = 332 + ExplicitWidth = 232 + Width = 232 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel @@ -196,15 +188,6 @@ inherited fEditorElegirClientes: TfEditorElegirClientes ExplicitWidth = 663 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 663 - ExplicitWidth = 663 - inherited TBXToolbar1: TTBXToolbar - Width = 653 - ExplicitWidth = 653 - inherited TBXItem2: TTBXItem [0] - end - inherited TBXItem1: TTBXItem [1] - end - end end end inherited dsDataSource: TDADataSource diff --git a/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm b/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm index 7cf338e6..28d1ac16 100644 --- a/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm +++ b/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm @@ -63,6 +63,8 @@ inherited fEditorEmpleado: TfEditorEmpleado ExplicitWidth = 676 ExplicitHeight = 481 inherited pagGeneral: TTabSheet + ExplicitLeft = 0 + ExplicitTop = 0 ExplicitWidth = 668 ExplicitHeight = 453 inline frViewEmpleado1: TfrViewEmpleado @@ -106,28 +108,28 @@ inherited fEditorEmpleado: TfEditorEmpleado ExplicitTop = 162 end inherited eCalle: TcxDBTextEdit - Top = 189 - ExplicitTop = 189 + Top = 162 + ExplicitTop = 162 ExplicitWidth = 174 Width = 174 end inherited eProvincia: TcxDBTextEdit - Top = 243 - ExplicitTop = 243 + Top = 216 + ExplicitTop = 216 ExplicitWidth = 174 Width = 174 end inherited ePoblacion: TcxDBTextEdit - Top = 216 - ExplicitTop = 216 + Top = 189 + ExplicitTop = 189 ExplicitWidth = 108 Width = 108 end inherited eCodigoPostal: TcxDBTextEdit Left = 312 - Top = 216 + Top = 189 ExplicitLeft = 312 - ExplicitTop = 216 + ExplicitTop = 189 end inherited eObservaciones: TcxDBMemo Top = 294 @@ -137,6 +139,20 @@ inherited fEditorEmpleado: TfEditorEmpleado Height = 148 Width = 185 end + inherited eFechaNacimiento: TcxDBDateEdit + Top = 84 + ExplicitTop = 84 + ExplicitWidth = 80 + Width = 80 + end + inherited eFechaAltaEmpresa: TcxDBDateEdit + Left = 290 + Top = 84 + ExplicitLeft = 290 + ExplicitTop = 84 + ExplicitWidth = 80 + Width = 80 + end inherited eTlfParticular: TcxDBTextEdit Left = 500 Top = 57 @@ -153,6 +169,12 @@ inherited fEditorEmpleado: TfEditorEmpleado ExplicitWidth = 172 Width = 172 end + inherited cbCategoria: TcxDBComboBox + Top = 111 + ExplicitTop = 111 + ExplicitWidth = 225 + Width = 225 + end inherited eTlfMovil: TcxDBTextEdit Left = 500 Top = 84 @@ -175,20 +197,6 @@ inherited fEditorEmpleado: TfEditorEmpleado ExplicitWidth = 263 Width = 263 end - inherited eFechaNacimiento: TcxDBDateEdit - Top = 84 - ExplicitTop = 84 - ExplicitWidth = 80 - Width = 80 - end - inherited eFechaAltaEmpresa: TcxDBDateEdit - Left = 290 - Top = 84 - ExplicitLeft = 290 - ExplicitTop = 84 - ExplicitWidth = 80 - Width = 80 - end inherited eNIFCIF: TcxDBTextEdit Left = 219 Top = 30 @@ -215,12 +223,6 @@ inherited fEditorEmpleado: TfEditorEmpleado ExplicitWidth = 165 Width = 165 end - inherited cbCategoria: TcxDBComboBox - Top = 111 - ExplicitTop = 111 - ExplicitWidth = 225 - Width = 225 - end inherited ePaginaWeb: TcxDBHyperLinkEdit Left = 500 Top = 217 @@ -236,8 +238,8 @@ inherited fEditorEmpleado: TfEditorEmpleado Width = 97 end inherited ePersonaContacto: TcxDBTextEdit - Top = 162 - ExplicitTop = 162 + Top = 243 + ExplicitTop = 243 ExplicitWidth = 256 Width = 256 end @@ -260,23 +262,9 @@ inherited fEditorEmpleado: TfEditorEmpleado Width = 668 LookAndFeel = dxLayoutOfficeLookAndFeel ExplicitWidth = 668 - inherited eEntidad: TcxDBTextEdit - ExplicitWidth = 114 - Width = 114 - end inherited eSucursal: TcxDBTextEdit Left = 429 ExplicitLeft = 429 - ExplicitWidth = 112 - Width = 112 - end - inherited eCuenta: TcxDBTextEdit - ExplicitWidth = 194 - Width = 194 - end - inherited eTitular: TcxDBTextEdit - ExplicitWidth = 194 - Width = 194 end end end @@ -284,6 +272,10 @@ inherited fEditorEmpleado: TfEditorEmpleado object pagFormacion: TTabSheet Caption = 'Formaci'#243'n' ImageIndex = 2 + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 @@ -401,6 +393,10 @@ inherited fEditorEmpleado: TfEditorEmpleado object pagExperiencia: TTabSheet Caption = 'Experiencia' ImageIndex = 3 + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object dxLayoutControl2: TdxLayoutControl Left = 0 Top = 0 diff --git a/Source/Modulos/Contactos/Views/uEditorEmpleado.pas b/Source/Modulos/Contactos/Views/uEditorEmpleado.pas index b9fae393..cc8b75e9 100644 --- a/Source/Modulos/Contactos/Views/uEditorEmpleado.pas +++ b/Source/Modulos/Contactos/Views/uEditorEmpleado.pas @@ -1,4 +1,4 @@ -unit uEditorEmpleado; +unit uEditorEmpleado; interface @@ -11,7 +11,8 @@ uses uViewEmpleado, uBizContactos, uIEditorEmpleado, pngimage, TBXStatusBars, JvExComCtrls, JvStatusBar, uViewDetallesGenerico, uViewContactoDatosBancarios, dxLayoutLookAndFeels, - dxLayoutControl, cxContainer, cxEdit, cxTextEdit, cxMemo, cxDBEdit, cxControls; + dxLayoutControl, cxContainer, cxEdit, cxTextEdit, cxMemo, cxDBEdit, cxControls, + uDAInterfaces; type TfEditorEmpleado = class(TfEditorContacto, IEditorEmpleado) diff --git a/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm b/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm index feb8174c..2437b343 100644 --- a/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm +++ b/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm @@ -109,6 +109,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsFormaPago Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -148,6 +149,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsTiposIVA Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D diff --git a/Source/Modulos/Contactos/Views/uViewClientes.dfm b/Source/Modulos/Contactos/Views/uViewClientes.dfm index 20e53a66..ee1a4441 100644 --- a/Source/Modulos/Contactos/Views/uViewClientes.dfm +++ b/Source/Modulos/Contactos/Views/uViewClientes.dfm @@ -1,5 +1,11 @@ inherited frViewClientes: TfrViewClientes + Width = 793 + Height = 592 + ExplicitWidth = 793 + ExplicitHeight = 592 inherited cxGrid: TcxGrid + Width = 793 + Height = 464 inherited cxGridView: TcxGridDBTableView DataController.Summary.FooterSummaryItems = < item @@ -59,8 +65,10 @@ inherited frViewClientes: TfrViewClientes end end inherited frViewFiltroBase1: TfrViewFiltroBase + Width = 793 inherited TBXDockablePanel1: TTBXDockablePanel inherited dxLayoutControl1: TdxLayoutControl + Width = 793 inherited txtFiltroTodo: TcxTextEdit ExplicitWidth = 273 Width = 273 @@ -70,15 +78,26 @@ inherited frViewClientes: TfrViewClientes Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit + Left = 335 + ExplicitLeft = 335 ExplicitWidth = 284 Width = 284 end end + inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 793 + inherited tbxBotones: TTBXToolbar + Width = 783 + end + end end end inherited pnlAgrupaciones: TTBXDockablePanel + Top = 566 inherited TBXAlignmentPanel1: TTBXAlignmentPanel + Width = 793 inherited TBXToolbar1: TTBXToolbar + Width = 783 Visible = False end end diff --git a/Source/Modulos/Contactos/Views/uViewClientes.pas b/Source/Modulos/Contactos/Views/uViewClientes.pas index 9cc273d2..d9c50777 100644 Binary files a/Source/Modulos/Contactos/Views/uViewClientes.pas and b/Source/Modulos/Contactos/Views/uViewClientes.pas differ diff --git a/Source/Modulos/Contactos/Views/uViewContactos.dfm b/Source/Modulos/Contactos/Views/uViewContactos.dfm index 9a88d414..287269d8 100644 --- a/Source/Modulos/Contactos/Views/uViewContactos.dfm +++ b/Source/Modulos/Contactos/Views/uViewContactos.dfm @@ -99,8 +99,8 @@ inherited frViewContactos: TfrViewContactos Width = 557 ExplicitWidth = 557 inherited edtFechaFinFiltro: TcxDateEdit - ExplicitWidth = 284 - Width = 284 + ExplicitWidth = 307 + Width = 307 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel diff --git a/Source/Modulos/Contactos/Views/uViewContactos.pas b/Source/Modulos/Contactos/Views/uViewContactos.pas index 14eb0a64..23c43097 100644 --- a/Source/Modulos/Contactos/Views/uViewContactos.pas +++ b/Source/Modulos/Contactos/Views/uViewContactos.pas @@ -11,10 +11,10 @@ uses cxGridBandedTableView, cxGridDBBandedTableView, JvComponent, JvFormAutoSize, PngImageList, ImgList, dxPSGlbl, dxPSUtl, dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns, - dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGridLnk, - udatamoduleclientes, cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, + dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, + uDataModuleClientes, cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, ComCtrls, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, - uDAInterfaces; + uDAInterfaces, dxPScxGrid6Lnk; type IViewContactos = interface(IViewGrid) diff --git a/Source/Modulos/Contactos/Views/uViewEmpleados.pas b/Source/Modulos/Contactos/Views/uViewEmpleados.pas index b244977b..f49da4be 100644 --- a/Source/Modulos/Contactos/Views/uViewEmpleados.pas +++ b/Source/Modulos/Contactos/Views/uViewEmpleados.pas @@ -8,7 +8,7 @@ uses cxDataStorage, cxEdit, DB, cxDBData, dxPSGlbl, dxPSUtl, dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns, dxPSEdgePatterns, ImgList, PngImageList, cxGridCustomPopupMenu, - cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGridLnk, uDADataTable, + cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, uDADataTable, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg, ActnList, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, uDAInterfaces; diff --git a/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.dfm b/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.dfm index d684b2a4..a3e2a02c 100644 --- a/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.dfm +++ b/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.dfm @@ -62,6 +62,7 @@ inherited frViewProveedorDatosComerciales: TfrViewProveedorDatosComerciales end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsFormaPago Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -100,6 +101,7 @@ inherited frViewProveedorDatosComerciales: TfrViewProveedorDatosComerciales end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsTiposIVA Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D diff --git a/Source/Modulos/Contactos/Views/uViewProveedores.pas b/Source/Modulos/Contactos/Views/uViewProveedores.pas index a4adcdb4..27a0d752 100644 --- a/Source/Modulos/Contactos/Views/uViewProveedores.pas +++ b/Source/Modulos/Contactos/Views/uViewProveedores.pas @@ -8,7 +8,7 @@ uses cxDataStorage, cxEdit, DB, cxDBData, dxPSGlbl, dxPSUtl, dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns, dxPSEdgePatterns, ImgList, PngImageList, cxGridCustomPopupMenu, - cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGridLnk, uDADataTable, + cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, uDADataTable, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg, ActnList, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, cxImageComboBox, diff --git a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj index 8cd753e0..a7583e0e 100644 --- a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj +++ b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj @@ -90,7 +90,7 @@