diff --git a/Build/Build.fbp5 b/Build/Build.fbp5 index a4582f57..ca999633 100644 --- a/Build/Build.fbp5 +++ b/Build/Build.fbp5 @@ -571,10 +571,10 @@ source_path True 3082 - 2 + 3 0 - 7 + 0 False 0 %source_path%\Servidor\FactuGES_Server.dpr @@ -594,15 +594,15 @@ source_path True @@ -19365,7 +19365,7 @@ Comments= False - True + False False False True @@ -20596,10 +20596,10 @@ Comments= False 3082 - 2 + 3 0 - 7 + 0 False 0 %source_path%\Cliente\FactuGES.dpr @@ -20619,13 +20619,13 @@ Comments= False diff --git a/Database/FACTUGES.FDB b/Database/FACTUGES.FDB index 503bba7d..baf64dbc 100644 Binary files a/Database/FACTUGES.FDB and b/Database/FACTUGES.FDB differ diff --git a/Source/Base/Base.dpk b/Source/Base/Base.dpk index c1c4d680..6b282975 100644 --- a/Source/Base/Base.dpk +++ b/Source/Base/Base.dpk @@ -45,7 +45,7 @@ requires cxExportD10, tbx_d10, tb2k_d10, - cxIntl5D10, + cxIntl6D10, vclactnband, designide, xmlrtl, @@ -66,7 +66,7 @@ requires dxPScxCommonD10, dxPSLnksD10, vclshlctrls, - dxPScxGridLnkD10, + dxPScxGrid6LnkD10, dclcxLibraryD10, dxPsPrVwAdvD10, dxBarExtItemsD10, diff --git a/Source/Base/GUIBase/GUIBase.dpk b/Source/Base/GUIBase/GUIBase.dpk index 5cf719bb..6f53b2df 100644 --- a/Source/Base/GUIBase/GUIBase.dpk +++ b/Source/Base/GUIBase/GUIBase.dpk @@ -65,7 +65,7 @@ requires dxPScxCommonD10, dxPSLnksD10, vclshlctrls, - dxPScxGridLnkD10, + dxPScxGrid6LnkD10, dclcxLibraryD10, dxPsPrVwAdvD10, dxBarExtItemsD10, diff --git a/Source/Base/GUIBase/_uViewGridBase.pas b/Source/Base/GUIBase/_uViewGridBase.pas index 6151a2a3..99ee9d3b 100644 --- a/Source/Base/GUIBase/_uViewGridBase.pas +++ b/Source/Base/GUIBase/_uViewGridBase.pas @@ -18,7 +18,7 @@ uses cxGridTableView, cxGridDBTableView, cxGrid, Menus, ActnList, Grids, DBGrids, JvComponent, JvFormAutoSize, dxPSGlbl, dxPSUtl, dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns, - dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGridLnk, dxPrnDlg, + dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, dxPrnDlg, cxIntlPrintSys3, dxPSPrvwAdv, uGridUtils; type diff --git a/Source/Base/GUIBase/uViewGrid.dfm b/Source/Base/GUIBase/uViewGrid.dfm index fc28a638..812f4035 100644 --- a/Source/Base/GUIBase/uViewGrid.dfm +++ b/Source/Base/GUIBase/uViewGrid.dfm @@ -47,7 +47,6 @@ inherited frViewGrid: TfrViewGrid OptionsView.GridLines = glHorizontal OptionsView.GroupByBox = False OptionsView.HeaderEndEllipsis = True - OptionsView.NewItemRowInfoText = 'Click here to add a new row' Styles.Inactive = cxStyleSelection Styles.Selection = cxStyleSelection Styles.OnGetContentStyle = cxGridViewStylesGetContentStyle @@ -108,6 +107,7 @@ inherited frViewGrid: TfrViewGrid SupportedDocks = [dkStandardDock, dkMultiDock] TabOrder = 2 Visible = False + ExplicitWidth = 128 object TBXAlignmentPanel1: TTBXAlignmentPanel Left = 0 Top = 0 @@ -155,7 +155,7 @@ inherited frViewGrid: TfrViewGrid PrinterPage.ScaleMode = smFit PrinterPage._dxMeasurementUnits_ = 0 PrinterPage._dxLastMU_ = 2 - ReportDocument.CreationDate = 39449.781622719910000000 + ReportDocument.CreationDate = 39615.820451203710000000 StyleManager = dxPrintStyleManager1 OptionsCards.Shadow.Depth = 0 OptionsExpanding.ExpandGroupRows = True @@ -187,6 +187,7 @@ inherited frViewGrid: TfrViewGrid object cxStyleRepository1: TcxStyleRepository Left = 296 Top = 128 + PixelsPerInch = 96 object cxStyleEven: TcxStyle end object cxStyleOdd: TcxStyle @@ -241,6 +242,7 @@ inherited frViewGrid: TfrViewGrid object cxStyleRepositoryInforme: TcxStyleRepository Left = 368 Top = 160 + PixelsPerInch = 96 object cxStyleContentInforme: TcxStyle AssignedValues = [svColor, svFont, svTextColor] Color = clWhite diff --git a/Source/Base/GUIBase/uViewGrid.pas b/Source/Base/GUIBase/uViewGrid.pas index 9b2cb08c..1a64dab7 100644 --- a/Source/Base/GUIBase/uViewGrid.pas +++ b/Source/Base/GUIBase/uViewGrid.pas @@ -18,7 +18,7 @@ uses cxGridTableView, cxGridDBTableView, cxGrid, Menus, ActnList, Grids, DBGrids, JvComponent, JvFormAutoSize, dxPSGlbl, dxPSUtl, dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns, - dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGridLnk, dxPrnDlg, + dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, dxPrnDlg, cxIntlPrintSys3, dxPSPrvwAdv, uViewGridBase, cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, ComCtrls, cxPC, ImgList, PngImageList, TB2Item, TBX, TB2Dock, TB2Toolbar, TBXDkPanels, dxPgsDlg; diff --git a/Source/Base/GUIBase/uViewGrid2Niveles.dfm b/Source/Base/GUIBase/uViewGrid2Niveles.dfm index abc45386..be16c2f6 100644 --- a/Source/Base/GUIBase/uViewGrid2Niveles.dfm +++ b/Source/Base/GUIBase/uViewGrid2Niveles.dfm @@ -96,6 +96,7 @@ inherited frViewGrid2Niveles: TfrViewGrid2Niveles object cxStyleRepository1: TcxStyleRepository Left = 296 Top = 128 + PixelsPerInch = 96 object cxStyleEven: TcxStyle end object cxStyleOdd: TcxStyle diff --git a/Source/Base/GUIBase/uViewGrid2Niveles.pas b/Source/Base/GUIBase/uViewGrid2Niveles.pas index 030b5664..c38bc2c7 100644 --- a/Source/Base/GUIBase/uViewGrid2Niveles.pas +++ b/Source/Base/GUIBase/uViewGrid2Niveles.pas @@ -18,7 +18,7 @@ uses cxGridTableView, cxGridDBTableView, cxGrid, Menus, ActnList, Grids, DBGrids, JvComponent, JvFormAutoSize, dxPSGlbl, dxPSUtl, dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns, - dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGridLnk, dxPrnDlg, + dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, dxPrnDlg, cxIntlPrintSys3, dxPSPrvwAdv, uViewGridBase, cxGridCustomPopupMenu, cxGridPopupMenu; diff --git a/Source/Base/GUIBase/uViewGridBase.pas b/Source/Base/GUIBase/uViewGridBase.pas index 37be12a9..2e87530d 100644 --- a/Source/Base/GUIBase/uViewGridBase.pas +++ b/Source/Base/GUIBase/uViewGridBase.pas @@ -18,7 +18,7 @@ uses cxGridTableView, cxGridDBTableView, cxGrid, Menus, ActnList, Grids, DBGrids, JvComponent, JvFormAutoSize, dxPSGlbl, dxPSUtl, dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns, - dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGridLnk, dxPrnDlg, + dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, dxPrnDlg, cxIntlPrintSys3, dxPSPrvwAdv, uGridUtils, uViewFiltroBase; type diff --git a/Source/Base/uDataModuleBase.dfm b/Source/Base/uDataModuleBase.dfm index 3a012e38..31a10b8e 100644 --- a/Source/Base/uDataModuleBase.dfm +++ b/Source/Base/uDataModuleBase.dfm @@ -193,42 +193,111 @@ object dmBase: TdmBase object cxIntl: TcxIntl Connected = True cxLibrary.CantCreateRegistryKey = 'No se puede crear la llave de registro : \%s' - PageControl2.ImageListIndexError = 'El '#237'ndice (%d) deber'#225' estar entre 0 y %d' - PageControl2.NoBaseImages = 'BaseImages no est'#225' asignado' - PageControl2.NoRegisteredStyles = 'No hay estilos registrados' - PageControl2.PageIndexError = '%d es un valor inv'#225'lido para PageIndex, debe estar entre 0 y %d' - PageControl2.PainterClassError = 'La clase PCPainter es nula' - PageControl2.StandardStyleError = '%s es un estilo est'#225'ndar no soportado' - PageControl2.StyleNameError = '%s es un nombre de estilo no registrado' - PageControl2.TabCountEqualsZero = 'Tabs.Count = 0' - PageControl2.TabIndexError = 'El '#237'ndice de la pesta'#241'a (%d) est'#225' fuera de l'#237'mites' - PageControl2.TabVisibleIndexOutsOfBounds = 'Propiedad TabVisibleIndex (%d) deber'#225' estar entre 0 y %d' - PageControl2.VisibleTabListEmpty = 'No hay pesta'#241'as visibles' - QuantumGrid5.GridRecursiveLevels = 'No se pueden crear niveles recursivos' - QuantumGrid5.GridDeletingConfirmationCaption = 'Confirmar' - QuantumGrid5.GridDeletingFocusedConfirmationText = #191'Borrar registro?' - QuantumGrid5.GridDeletingSelectedConfirmationText = #191'Borrar todos los registros seleccionados?' - QuantumGrid5.GridNoDataInfoText = '' - QuantumGrid5.GridNewItemRowInfoText = 'Haga click aqu'#237' para agregar una nueva l'#237'nea' - QuantumGrid5.GridFilterIsEmpty = '' - QuantumGrid5.GridCustomizationFormCaption = 'Personalizaci'#243'n' - QuantumGrid5.GridCustomizationFormColumnsPageCaption = 'Columnas' - QuantumGrid5.GridGroupByBoxCaption = 'Arrastre una columna aqu'#237' para agrupar por dicha columna' - QuantumGrid5.GridFilterCustomizeButtonCaption = 'Personalizar...' - QuantumGrid5.GridColumnsQuickCustomizationHint = 'Haga click aqu'#237' para seleccionar las columas visibles' - QuantumGrid5.GridCustomizationFormBandsPageCaption = 'Bandas' - QuantumGrid5.GridBandsQuickCustomizationHint = 'Haga click aqu'#237' para seleccionar las bandas visibles' - QuantumGrid5.GridCustomizationFormRowsPageCaption = 'Rows' - QuantumGrid5.GridConverterIntermediaryMissing = 'Omiti'#243' un componente intermediario!' - QuantumGrid5.GridConverterNotExistGrid = 'cxGrid no existe' - QuantumGrid5.GridConverterNotExistComponent = 'El componente no existe' - QuantumGrid5.ImportErrorCaption = 'Error al importar' - QuantumGrid5.NotExistGridView = 'No existe la vista del grid' - QuantumGrid5.NotExistGridLevel = 'No existe un nivel de grid activo' - QuantumGrid5.CantCreateExportOutputFile = 'No se puede crear el archivo de exportaci'#243'n' - QuantumGrid5.EditRepositoryExtLookupComboBoxItem = + cxLibrary.ConverterCantCreateStyleRepository = 'No se puede crear un almac'#233'n de estilos' + PageControl.ImageListIndexError = 'El '#237'ndice (%d) deber'#225' estar entre 0 y %d' + PageControl.NoBaseImages = 'BaseImages no est'#225' asignado' + PageControl.NoRegisteredStyles = 'No hay estilos registrados' + PageControl.PageIndexError = '%d es un valor inv'#225'lido para PageIndex, debe estar entre 0 y %d' + PageControl.PainterClassError = 'La clase PCPainter es nula' + PageControl.StandardStyleError = '%s es un estilo est'#225'ndar no soportado' + PageControl.StyleNameError = '%s es un nombre de estilo no registrado' + PageControl.TabCountEqualsZero = 'Tabs.Count = 0' + PageControl.TabIndexError = 'El '#237'ndice de la pesta'#241'a (%d) est'#225' fuera de l'#237'mites' + PageControl.TabVisibleIndexOutsOfBounds = 'Propiedad TabVisibleIndex (%d) deber'#225' estar entre 0 y %d' + PageControl.VisibleTabListEmpty = 'No hay pesta'#241'as visibles' + PageControl.PCAllowRotateError = '%s es un estilo que no soporta pesta'#241'as rotatorias' + QuantumGrid.GridRecursiveLevels = 'No se pueden crear niveles recursivos' + QuantumGrid.GridDeletingConfirmationCaption = 'Confirmar' + QuantumGrid.GridDeletingFocusedConfirmationText = #191'Borrar registro?' + QuantumGrid.GridDeletingSelectedConfirmationText = #191'Borrar todos los registros seleccionados?' + QuantumGrid.GridNoDataInfoText = '' + QuantumGrid.GridNewItemRowInfoText = 'Haga click aqu'#237' para agregar una nueva l'#237'nea' + QuantumGrid.GridFilterIsEmpty = '' + QuantumGrid.GridCustomizationFormCaption = 'Personalizaci'#243'n' + QuantumGrid.GridCustomizationFormColumnsPageCaption = 'Columnas' + QuantumGrid.GridGroupByBoxCaption = 'Arrastre una columna aqu'#237' para agrupar por dicha columna' + QuantumGrid.GridFilterCustomizeButtonCaption = 'Personalizar...' + QuantumGrid.GridColumnsQuickCustomizationHint = 'Haga click aqu'#237' para seleccionar las columas visibles' + QuantumGrid.GridCustomizationFormBandsPageCaption = 'Bandas' + QuantumGrid.GridBandsQuickCustomizationHint = 'Haga click aqu'#237' para seleccionar las bandas visibles' + QuantumGrid.GridCustomizationFormRowsPageCaption = 'Rows' + QuantumGrid.GridConverterIntermediaryMissing = 'Omiti'#243' un componente intermediario!' + QuantumGrid.GridConverterNotExistGrid = 'cxGrid no existe' + QuantumGrid.GridConverterNotExistComponent = 'El componente no existe' + QuantumGrid.ImportErrorCaption = 'Error al importar' + QuantumGrid.NotExistGridView = 'No existe la vista del grid' + QuantumGrid.NotExistGridLevel = 'No existe un nivel de grid activo' + QuantumGrid.CantCreateExportOutputFile = 'No se puede crear el archivo de exportaci'#243'n' + QuantumGrid.EditRepositoryExtLookupComboBoxItem = 'ExtLookupComboBox|Representa un ultra avanzado control de busque' + 'da (lookup) usando el QuantumGrid como su control de despliegue' + QuantumGrid.GridFilterRowInfoText = 'Haga clic aqu'#237' para definir un filtro' + QuantumGrid.GridFilterApplyButtonCaption = 'Aplicar Filtro' + QuantumGrid.GridYesterday = 'Ayer' + QuantumGrid.GridToday = 'Hoy' + QuantumGrid.GridTomorrow = 'Ma'#241'ana' + QuantumGrid.GridLast30Days = #218'ltimos 30 d'#237'as' + QuantumGrid.GridLast14Days = #218'ltimos 14 d'#237'as' + QuantumGrid.GridLast7Days = #218'ltimos 7 d'#237'as' + QuantumGrid.GridNext7Days = 'Pr'#243'ximos 7 d'#237'as' + QuantumGrid.GridNext14Days = 'Pr'#243'ximos 14 d'#237'as' + QuantumGrid.GridNext30Days = 'Pr'#243'ximos 30 d'#237'as' + QuantumGrid.GridLastTwoWeeks = #218'lt. dos semanas' + QuantumGrid.GridLastWeek = 'Semana pasada' + QuantumGrid.GridThisWeek = #201'sta semana' + QuantumGrid.GridNextWeek = 'Pr'#243'xima semana' + QuantumGrid.GridNextTwoWeeks = 'Pr'#243'x. dos semanas' + QuantumGrid.GridLastMonth = #218'ltimo mes' + QuantumGrid.GridThisMonth = #201'ste mes' + QuantumGrid.GridNextMonth = 'Pr'#243'ximo mes' + QuantumGrid.GridLastYear = 'A'#241'o pasado' + QuantumGrid.GridThisYear = #201'ste a'#241'o' + QuantumGrid.GridNextYear = 'Pr'#243'ximo a'#241'o' + QuantumGrid.GridPast = 'Pasado' + QuantumGrid.GridFuture = 'Futuro' + QuantumGrid.GridMonthFormat = 'mmmm yyyy' + QuantumGrid.GridYearFormat = 'yyyy' + QuantumGrid.GridChartCategoriesDisplayText = 'Datos' + QuantumGrid.GridChartValueHintFormat = '%s para %s es %s' + QuantumGrid.GridChartPercentValueTickMarkLabelFormat = '0%' + QuantumGrid.GridChartToolBoxDataLevels = 'Niveles de Datos:' + QuantumGrid.GridChartToolBoxDataLevelSelectValue = 'seleccione valor' + QuantumGrid.GridChartToolBoxCustomizeButtonCaption = 'Personalizar Gr'#225'fico' + QuantumGrid.GridChartNoneDiagramDisplayText = 'Sin Diagrama' + QuantumGrid.GridChartColumnDiagramDisplayText = 'Diagrama de Columnas' + QuantumGrid.GridChartBarDiagramDisplayText = 'Diagrama de Barras' + QuantumGrid.GridChartLineDiagramDisplayText = 'Diagrama de L'#237'neas' + QuantumGrid.GridChartAreaDiagramDisplayText = 'Diagrama de '#193'rea' + QuantumGrid.GridChartPieDiagramDisplayText = 'Diagrama de Tarta' + QuantumGrid.GridChartCustomizationFormSeriesPageCaption = 'Series' + QuantumGrid.GridChartCustomizationFormSortBySeries = 'Ordenar Por:' + QuantumGrid.GridChartCustomizationFormNoSortedSeries = '' + QuantumGrid.GridChartCustomizationFormDataGroupsPageCaption = 'Grupos de Datos' + QuantumGrid.GridChartCustomizationFormOptionsPageCaption = 'Opciones' + QuantumGrid.GridChartLegend = 'Leyenda' + QuantumGrid.GridChartLegendKeyBorder = 'Marco de Clave' + QuantumGrid.GridChartPosition = 'Posici'#243'n' + QuantumGrid.GridChartPositionDefault = 'Defecto' + QuantumGrid.GridChartPositionNone = 'Ninguno' + QuantumGrid.GridChartPositionLeft = 'Izquierda' + QuantumGrid.GridChartPositionTop = 'Superior' + QuantumGrid.GridChartPositionRight = 'Derecha' + QuantumGrid.GridChartPositionBottom = 'Inferior' + QuantumGrid.GridChartAlignment = 'Alineaci'#243'n' + QuantumGrid.GridChartAlignmentDefault = 'Defecto' + QuantumGrid.GridChartAlignmentStart = 'Inicio' + QuantumGrid.GridChartAlignmentCenter = 'Centro' + QuantumGrid.GridChartAlignmentEnd = 'Final' + QuantumGrid.GridChartOrientation = 'Orientaci'#243'n' + QuantumGrid.GridChartOrientationDefault = 'Defecto' + QuantumGrid.GridChartOrientationHorizontal = 'Horizontal' + QuantumGrid.GridChartOrientationVertical = 'Vertical' + QuantumGrid.GridChartBorder = 'Marco' + QuantumGrid.GridChartTitle = 'T'#237'tulo' + QuantumGrid.GridChartToolBox = 'Caja de Herramientas' + QuantumGrid.GridChartDiagramSelector = 'Selector de Diagramas' + QuantumGrid.GridChartOther = 'Otro' + QuantumGrid.GridChartValueHints = 'Valores de Ayuda' Navigator.NavigatorHint_First = 'Primer registro' Navigator.NavigatorHint_Prior = 'Registro anterior' Navigator.NavigatorHint_PriorPage = 'P'#225'gina anterior' @@ -237,6 +306,7 @@ object dmBase: TdmBase Navigator.NavigatorHint_Last = #218'ltimo registro' Navigator.NavigatorHint_Insert = 'Insertar registro' Navigator.NavigatorHint_Delete = 'Borrar registro' + Navigator.NavigatorHint_Append = 'Append record' Navigator.NavigatorHint_Edit = 'Editar registro' Navigator.NavigatorHint_Post = 'Grabar edici'#243'n' Navigator.NavigatorHint_Cancel = 'Cancelar edici'#243'n' @@ -245,127 +315,167 @@ object dmBase: TdmBase Navigator.NavigatorHint_GotoBookmark = 'Volver a Marca' Navigator.NavigatorHint_Filter = 'Filtrar datos' Navigator.Navigator_DeleteRecordQuestion = #191'Desea borrar este el registro?' - Editors5.EditDateConvertError = 'El valor no se puede convertir a fecha' - Editors5.EditInvalidRepositoryItem = 'Elemento de repositorio no v'#225'lido' - Editors5.EditNumericValueConvertError = 'No se puede convertir a valor num'#233'rico' - Editors5.EditPopupCircularReferencingError = 'Referencia circular no permitida' - Editors5.EditPostError = 'Ocurri'#243' un error durante el grabado del valor de edici'#243'n' - Editors5.EditTimeConvertError = 'No se puede convertir a valor de tiempo' - Editors5.EditValidateErrorText = 'Valor inv'#225'lido. Use la tecla de escape para cancelar cambios' - Editors5.EditValueOutOfBounds = 'Valor fuera de l'#237'mites' - Editors5.EditCheckBoxChecked = 'True' - Editors5.EditCheckBoxUnchecked = 'False' - Editors5.TextTrue = 'True' - Editors5.TextFalse = 'False' - Editors5.BlobButtonOK = '&Aceptar' - Editors5.BlobButtonCancel = '&Cancelar' - Editors5.BlobButtonClose = '&Cerrar' - Editors5.BlobMemo = '(MEMO)' - Editors5.BlobMemoEmpty = '(memo)' - Editors5.BlobPicture = '(IM'#193'GEN)' - Editors5.BlobPictureEmpty = '(im'#225'gen)' - Editors5.MenuItemCaptionCut = 'Cor&tar' - Editors5.MenuItemCaptionCopy = '&Copiar' - Editors5.MenuItemCaptionPaste = '&Pegar' - Editors5.MenuItemCaptionDelete = '&Borrar' - Editors5.MenuItemCaptionLoad = '&Leer...' - Editors5.MenuItemCaptionSave = 'Guardar &Como...' - Editors5.DatePopupClear = 'Limpiar' - Editors5.DatePopupNow = 'Ahora' - Editors5.DatePopupOK = 'Aceptar' - Editors5.DatePopupToday = 'Hoy' - Editors5.DateError = 'Fecha inv'#225'lida' - Editors5.DateToday = 'hoy' - Editors5.DateYesterday = 'ayer' - Editors5.DateTomorrow = 'ma'#241'ana' - Editors5.DateSunday = 'Domingo' - Editors5.DateMonday = 'Lunes' - Editors5.DateTuesday = 'Martes' - Editors5.DateWednesday = 'Mi'#233'rcoles' - Editors5.DateThursday = 'Jueves' - Editors5.DateFriday = 'Viernes' - Editors5.DateSaturday = 'S'#225'bado' - Editors5.DateFirst = 'Primero' - Editors5.DateSecond = 'segundo' - Editors5.DateThird = 'tercero' - Editors5.DateFourth = 'Cuarto' - Editors5.DateFifth = 'Quinto' - Editors5.DateSixth = 'sexto' - Editors5.DateSeventh = 's'#233'ptimo' - Editors5.DateBOM = 'bom' - Editors5.DateEOM = 'eom' - Editors5.DateNow = 'ahora' - Editors5.CalcError = 'Error' - Editors5.HyperLinkPrefix = 'http://' - Editors5.HyperLinkDoubleSlash = '//' - Editors5.EditRepositoryBlobItem = 'BlobEdit|Representa el editor de BLOB' - Editors5.EditRepositoryButtonItem = + Editors.EditButtonCancel = 'Cancelar' + Editors.EditButtonOK = 'Aceptar' + Editors.EditDateConvertError = 'El valor no se puede convertir a fecha' + Editors.EditInvalidRepositoryItem = 'Elemento de repositorio no v'#225'lido' + Editors.EditNumericValueConvertError = 'No se puede convertir a valor num'#233'rico' + Editors.EditPopupCircularReferencingError = 'Referencia circular no permitida' + Editors.EditPostError = 'Ocurri'#243' un error durante el grabado del valor de edici'#243'n' + Editors.EditTimeConvertError = 'No se puede convertir a valor de tiempo' + Editors.EditValidateErrorText = 'Valor inv'#225'lido. Use la tecla de escape para cancelar cambios' + Editors.EditValueOutOfBounds = 'Valor fuera de l'#237'mites' + Editors.EditCheckBoxChecked = 'True' + Editors.EditCheckBoxUnchecked = 'False' + Editors.TextTrue = 'True' + Editors.TextFalse = 'False' + Editors.BlobButtonOK = '&Aceptar' + Editors.BlobButtonCancel = '&Cancelar' + Editors.BlobButtonClose = '&Cerrar' + Editors.BlobMemo = '(MEMO)' + Editors.BlobMemoEmpty = '(memo)' + Editors.BlobPicture = '(IM'#193'GEN)' + Editors.BlobPictureEmpty = '(im'#225'gen)' + Editors.MenuItemCaptionCut = 'Cor&tar' + Editors.MenuItemCaptionCopy = '&Copiar' + Editors.MenuItemCaptionPaste = '&Pegar' + Editors.MenuItemCaptionDelete = '&Borrar' + Editors.MenuItemCaptionLoad = '&Leer...' + Editors.MenuItemCaptionSave = 'Guardar &Como...' + Editors.DatePopupClear = 'Limpiar' + Editors.DatePopupNow = 'Ahora' + Editors.DatePopupOK = 'Aceptar' + Editors.DatePopupToday = 'Hoy' + Editors.DateError = 'Fecha inv'#225'lida' + Editors.DateToday = 'hoy' + Editors.DateYesterday = 'ayer' + Editors.DateTomorrow = 'ma'#241'ana' + Editors.DateSunday = 'Domingo' + Editors.DateMonday = 'Lunes' + Editors.DateTuesday = 'Martes' + Editors.DateWednesday = 'Mi'#233'rcoles' + Editors.DateThursday = 'Jueves' + Editors.DateFriday = 'Viernes' + Editors.DateSaturday = 'S'#225'bado' + Editors.DateFirst = 'Primero' + Editors.DateSecond = 'segundo' + Editors.DateThird = 'tercero' + Editors.DateFourth = 'Cuarto' + Editors.DateFifth = 'Quinto' + Editors.DateSixth = 'sexto' + Editors.DateSeventh = 's'#233'ptimo' + Editors.DateBOM = 'bom' + Editors.DateEOM = 'eom' + Editors.DateNow = 'ahora' + Editors.CalcError = 'Error' + Editors.HyperLinkPrefix = 'http://' + Editors.HyperLinkDoubleSlash = '//' + Editors.EditRepositoryBlobItem = 'BlobEdit|Representa el editor de BLOB' + Editors.EditRepositoryButtonItem = 'ButtonEdit|Representa un control de edici'#243'n con controles incrus' + 'tados' - Editors5.EditRepositoryCalcItem = + Editors.EditRepositoryCalcItem = 'CalcEdit|Representa un control de edici'#243'n con una ventana de cal' + 'culadora desplegable' - Editors5.EditRepositoryCheckBoxItem = + Editors.EditRepositoryCheckBoxItem = 'CheckBox|Representa un control de caja de marca que permite sele' + 'ccionar una opci'#243'n' - Editors5.EditRepositoryComboBoxItem = 'ComboBox|Representa el editor de la caja combo' - Editors5.EditRepositoryCurrencyItem = + Editors.EditRepositoryComboBoxItem = 'ComboBox|Representa el editor de la caja combo' + Editors.EditRepositoryCurrencyItem = 'CurrencyEdit|Representa un editor que habilita la edici'#243'n de val' + 'ores monetarios' - Editors5.EditRepositoryDateItem = + Editors.EditRepositoryDateItem = 'DateEdit|Representa un control de edici'#243'n con un calendario desp' + 'legable' - Editors5.EditRepositoryHyperLinkItem = 'HyperLink|Representa un editor de texto de hiperv'#237'nculos' - Editors5.EditRepositoryImageComboBoxItem = + Editors.EditRepositoryHyperLinkItem = 'HyperLink|Representa un editor de texto de hiperv'#237'nculos' + Editors.EditRepositoryImageComboBoxItem = 'ImageComboBox|Representa un editor que muestra una lista de im'#225'g' + 'enes y texto en la ventana desplegable' - Editors5.EditRepositoryImageItem = 'Image|Representa un editor de im'#225'genes' - Editors5.EditRepositoryLookupComboBoxItem = 'LookupComboBox|Representa una caja de b'#250'squeda' - Editors5.EditRepositoryMaskItem = 'MaskEdit|Representa un control de edici'#243'n gen'#233'rico con m'#225'scara' - Editors5.EditRepositoryMemoItem = + Editors.EditRepositoryImageItem = 'Image|Representa un editor de im'#225'genes' + Editors.EditRepositoryLookupComboBoxItem = 'LookupComboBox|Representa una caja de b'#250'squeda' + Editors.EditRepositoryMaskItem = 'MaskEdit|Representa un control de edici'#243'n gen'#233'rico con m'#225'scara' + Editors.EditRepositoryMemoItem = 'Memo|Representa un control de edici'#243'n que permite editar datos m' + 'emo' - Editors5.EditRepositoryMRUItem = + Editors.EditRepositoryMRUItem = 'MRUEdit|Representa un editor de texto mostrando la lista de los ' + 'elementos m'#225's recientemente usados (MRU) en una ventana desplega' + 'ble' - Editors5.EditRepositoryPopupItem = + Editors.EditRepositoryPopupItem = 'PopupEdit|Representa un control de edici'#243'n con una lista despleg' + 'able' - Editors5.EditRepositorySpinItem = 'SpinEdit|Representa un editor de incrementos/decrementos (spin)' - Editors5.EditRepositoryRadioGroupItem = 'RadioGroup|Represents a group of radio buttons' - Editors5.EditRepositoryTextItem = 'TextEdit|Representa un editor de texto de l'#237'nea sencilla' - Editors5.EditRepositoryTimeItem = 'TimeEdit|Representa un editor mostrando valores de tiempo' - Editors5.RegExprLine = 'L'#237'nea' - Editors5.RegExprChar = 'Char' - Editors5.RegExprNotAssignedSourceStream = 'No se ha asignado el stream fuente' - Editors5.RegExprEmptySourceStream = 'El stream or'#237'gen est'#225' vac'#237'o' - Editors5.RegExprCantUsePlusQuantifier = 'El cuantificador '#39'+'#39' no puede aplicarse aqu'#237 - Editors5.RegExprCantUseStarQuantifier = 'El cuantificador '#39'*'#39' no puede aplicarse aqu'#237 - Editors5.RegExprCantCreateEmptyAlt = 'La alternativa no debe estar vac'#237'a' - Editors5.RegExprCantCreateEmptyBlock = 'El bloque no debe estar vac'#237'o' - Editors5.RegExprIllegalSymbol = 'S'#237'mbolo no permitido '#39'%s'#39 - Editors5.RegExprIllegalQuantifier = 'Cuantificador no permitido '#39'%s'#39 - Editors5.RegExprNotSupportQuantifier = 'El par'#225'metro cuantificador no es soportado' - Editors5.RegExprIllegalIntegerValue = 'Valor entero no permitido' - Editors5.RegExprTooBigReferenceNumber = 'N'#250'mero de referencia demasiado grande' - Editors5.RegExprCantCreateEmptyEnum = 'No puedo crear enumeraci'#243'n vac'#237'a' - Editors5.RegExprSubrangeOrder = 'El caracter de inicio del subrango debe ser menor al de fin' - Editors5.RegExprHexNumberExpected0 = 'Se esperaba n'#250'mero Hexadecimal' - Editors5.RegExprHexNumberExpected = 'N'#250'mero Hexadecimal esperado pero encontr'#243' '#39'%s'#39 - Editors5.RegExprMissing = 'Falta '#39'%s'#39 - Editors5.RegExprUnnecessary = 'Innecesario '#39'%s'#39 - Editors5.RegExprIncorrectSpace = 'Espacio incorrecto despu'#233's de '#39'\'#39 - Editors5.RegExprNotCompiled = 'Expresi'#243'n regular no compila' - Editors5.RegExprIncorrectParameterQuantifier = 'Cuantificador de par'#225'metros incorrecto' - Editors5.RegExprCantUseParameterQuantifier = 'The parameter quantifier cannot be applied here' - Editors5.MaskEditRegExprError = 'Errores en expresiones regulares:' - Editors5.MaskEditInvalidEditValue = 'El valor de edici'#243'n es inv'#225'lido' - Editors5.MaskEditNoMask = 'Ninguno' - Editors5.MaskEditIllegalFileFormat = 'Formato de archivo ilegal' - Editors5.MaskEditEmptyMaskCollectionFile = 'El archivo de colecci'#243'n de m'#225'scaras est'#225' vac'#237'o' - Editors5.MaskEditMaskCollectionFiles = 'Archivos de colecci'#243'n de m'#225'scaras' - Editors5.SpinEditInvalidNumericValue = 'Valor num'#233'rico no v'#225'lido' + Editors.EditRepositorySpinItem = 'SpinEdit|Representa un editor de incrementos/decrementos (spin)' + Editors.EditRepositoryRadioGroupItem = 'RadioGroup|Represents a group of radio buttons' + Editors.EditRepositoryTextItem = 'TextEdit|Representa un editor de texto de l'#237'nea sencilla' + Editors.EditRepositoryTimeItem = 'TimeEdit|Representa un editor mostrando valores de tiempo' + Editors.EditRepositoryColorComboBoxItem = 'ColorComboBox |Represents a editor with color functionality' + Editors.EditRepositoryFontNameComboBoxItem = 'FontNameComboBox |Represents a editor with font functionality' + Editors.EditRepositoryLabelItem = 'Label|Represents a Label' + Editors.EditRepositoryProgressBarItem = 'ProgressBar|Represents a ProgressBar' + Editors.EditRepositoryTrackBarItem = 'TrackBar|Represents a TrackBar' + Editors.EditRepositorySpinButtonItem = 'SpinButton|Represents a SpinButton' + Editors.EditRepositoryCheckComboBox = 'CheckComboBox|Represents a CheckComboBox' + Editors.EditRepositoryShellComboBoxItem = + 'ShellComboBox|Represents a combo box with a dropdown shell tree ' + + 'view' + Editors.EditRepositoryCheckGroupItem = 'CheckGroup|Represents a group of check boxes' + Editors.EditRepositoryRichEditItem = 'RichEdit|RichEdit control' + Editors.EditCheckGroupCaptionStateDelimiter = ': ' + Editors.EditCheckGroupFilterColumnSeparator = '; ' + Editors.EditCheckGroupChecked = 'Checked' + Editors.EditCheckGroupGrayed = 'Grayed' + Editors.EditCheckGroupUnchecked = 'Unchecked' + Editors.CheckComboBoxStatesItemsPropertyDlgCaption = 'cxCheckComboBox - CheckStates editor' + Editors.CheckGroupStatesItemsPropertyDlgCaption = 'cxCheckGroup - CheckStates editor' + Editors.CheckComboBoxEmptySelectionText = 'None selected' + Editors.ColorComboBoxDefaultDescription = 'Color not selected' + Editors.EditRichEditLibraryError = 'Cannot load a RichEdit library' + Editors.EditRichEditLineInsertionError = 'RichEdit line insertion error' + Editors.EditRichEditLoadFail = 'Failed to Load Stream' + Editors.EditRichEditSaveFail = 'Failed to Save Stream' + Editors.EditRichEditUndoCaption = '&Undo' + Editors.EditRichEditRedoCaption = '&Redo' + Editors.EditRichEditCutCaption = 'Cu&t' + Editors.EditRichEditCopyCaption = '&Copy' + Editors.EditRichEditPasteCaption = '&Paste' + Editors.EditRichEditDeleteCaption = '&Delete' + Editors.EditRichEditSelectAllCaption = 'Select &All' + Editors.RegExprLine = 'L'#237'nea' + Editors.RegExprChar = 'Char' + Editors.RegExprNotAssignedSourceStream = 'No se ha asignado el stream fuente' + Editors.RegExprEmptySourceStream = 'El stream or'#237'gen est'#225' vac'#237'o' + Editors.RegExprCantUsePlusQuantifier = 'El cuantificador '#39'+'#39' no puede aplicarse aqu'#237 + Editors.RegExprCantUseStarQuantifier = 'El cuantificador '#39'*'#39' no puede aplicarse aqu'#237 + Editors.RegExprCantCreateEmptyAlt = 'La alternativa no debe estar vac'#237'a' + Editors.RegExprCantCreateEmptyBlock = 'El bloque no debe estar vac'#237'o' + Editors.RegExprIllegalSymbol = 'S'#237'mbolo no permitido '#39'%s'#39 + Editors.RegExprIllegalQuantifier = 'Cuantificador no permitido '#39'%s'#39 + Editors.RegExprNotSupportQuantifier = 'El par'#225'metro cuantificador no es soportado' + Editors.RegExprIllegalIntegerValue = 'Valor entero no permitido' + Editors.RegExprTooBigReferenceNumber = 'N'#250'mero de referencia demasiado grande' + Editors.RegExprCantCreateEmptyEnum = 'No puedo crear enumeraci'#243'n vac'#237'a' + Editors.RegExprSubrangeOrder = 'El caracter de inicio del subrango debe ser menor al de fin' + Editors.RegExprHexNumberExpected0 = 'Se esperaba n'#250'mero Hexadecimal' + Editors.RegExprHexNumberExpected = 'N'#250'mero Hexadecimal esperado pero encontr'#243' '#39'%s'#39 + Editors.RegExprMissing = 'Falta '#39'%s'#39 + Editors.RegExprUnnecessary = 'Innecesario '#39'%s'#39 + Editors.RegExprIncorrectSpace = 'Espacio incorrecto despu'#233's de '#39'\'#39 + Editors.RegExprNotCompiled = 'Expresi'#243'n regular no compila' + Editors.RegExprIncorrectParameterQuantifier = 'Cuantificador de par'#225'metros incorrecto' + Editors.RegExprCantUseParameterQuantifier = 'The parameter quantifier cannot be applied here' + Editors.UDAssociated = ' is already associated with ' + Editors.HotZoneStyleMediaPlayer9 = 'MediaPlayer9' + Editors.HotZoneStyleMediaPlayer8 = 'MediaPlayer8' + Editors.HotZoneStyleXPTaskBar = 'XPTaskBar' + Editors.HotZoneStyleSimple = 'Simple' + Editors.LoadingFonts = 'Loading ...' + Editors.MaskEditRegExprError = 'Errores en expresiones regulares:' + Editors.MaskEditInvalidEditValue = 'El valor de edici'#243'n es inv'#225'lido' + Editors.MaskEditNoMask = 'Ninguno' + Editors.MaskEditIllegalFileFormat = 'Formato de archivo ilegal' + Editors.MaskEditEmptyMaskCollectionFile = 'El archivo de colecci'#243'n de m'#225'scaras est'#225' vac'#237'o' + Editors.MaskEditMaskCollectionFiles = 'Archivos de colecci'#243'n de m'#225'scaras' + Editors.SpinEditInvalidNumericValue = 'Valor num'#233'rico no v'#225'lido' Datacontroller.DataReadError = 'Error de lectura en or'#237'gen de datos' Datacontroller.DataWriteError = 'Error de escritura en or'#237'gen de datos (stream)' Datacontroller.DataItemExistError = 'El elemento ya existe' @@ -402,6 +512,16 @@ object dmBase: TdmBase Filter.FilterOperatorNextWeek = 'es semana siguiente' Filter.FilterOperatorNextMonth = 'es mes siguiente' Filter.FilterOperatorNextYear = 'es a'#241'o pr'#243'ximo' + Filter.FilterOperatorLast7Days = #218'ltimos 7 d'#237'as' + Filter.FilterOperatorLast14Days = #218'ltimos 14 d'#237'as' + Filter.FilterOperatorLastTwoWeeks = #218'ltimas 2 semanas' + Filter.FilterOperatorLast30Days = #218'ltimos 30 d'#237'as' + Filter.FilterOperatorPast = 'Pasado' + Filter.FilterOperatorNext7Days = 'Pr'#243'ximos 7 d'#237'as' + Filter.FilterOperatorNext14Days = 'Pr'#243'ximos 14 d'#237'as' + Filter.FilterOperatorNextTwoWeeks = 'Pr'#243'ximas 2 semanas' + Filter.FilterOperatorNext30Days = 'Pr'#243'ximos 30 d'#237'as' + Filter.FilterOperatorFuture = 'Futuro' Filter.FilterAndCaption = 'y' Filter.FilterOrCaption = 'o' Filter.FilterNotCaption = 'no' @@ -417,17 +537,17 @@ object dmBase: TdmBase Filter.FilterBoxAllCaption = '(Todos)' Filter.FilterBoxCustomCaption = '(Personalizado...)' Filter.FilterBoxBlanksCaption = '(Vac'#237'os)' - Filter.FilterBoxNonBlanksCaption = '(No vac'#237'os)' - Filter.FilterBoolOperatorAnd = 'AND' - Filter.FilterBoolOperatorOr = 'OR' - Filter.FilterBoolOperatorNotAnd = 'NOT AND' - Filter.FilterBoolOperatorNotOr = 'NOT OR' + Filter.FilterBoxNonBlanksCaption = '(NoVac'#237'os)' + Filter.FilterBoolOperatorAnd = 'Y' + Filter.FilterBoolOperatorOr = 'O' + Filter.FilterBoolOperatorNotAnd = 'NO Y' + Filter.FilterBoolOperatorNotOr = 'NO O' Filter.FilterRootButtonCaption = 'Filtro' Filter.FilterAddCondition = 'Agregar &Condici'#243'n' Filter.FilterAddGroup = 'Agregar &Grupo' Filter.FilterRemoveRow = '&Remover Fila' Filter.FilterClearAll = 'Limpiar &Todo' - Filter.FilterFooterAddCondition = 'Agregar una nueva condici'#243'n' + Filter.FilterFooterAddCondition = 'presione el bot'#243'n para agregar una nueva condici'#243'n' Filter.FilterGroupCaption = 'aplica a las siguientes condiciones' Filter.FilterRootGroupCaption = '' Filter.FilterControlNullString = '' @@ -454,7 +574,7 @@ object dmBase: TdmBase GridPopupMenu.GridNone = 'Ninguno' GridPopupMenu.GridSortColumnAsc = 'Ordenar Ascendente' GridPopupMenu.GridSortColumnDesc = 'Ordenar Descendente' - GridPopupMenu.GridClearSorting = 'Clear Sorting' + GridPopupMenu.GridClearSorting = 'Eliminar Ordenaci'#243'n' GridPopupMenu.GridGroupByThisField = 'Agrupar por este campo' GridPopupMenu.GridRemoveThisGroupItem = 'Remover del grupo' GridPopupMenu.GridGroupByBox = 'Panel "Agrupar por"' @@ -474,6 +594,9 @@ object dmBase: TdmBase GridPopupMenu.GridCountMenuItem = 'Contar' GridPopupMenu.GridAvgMenuItem = 'Promedio' GridPopupMenu.GridNoneMenuItem = 'Ninguno' + GridPopupMenu.GridSortByGroupValues = 'Sort by Group Value' + GridPopupMenu.GridSortBySummaryCaption = 'Sort by Group Summary:' + GridPopupMenu.GridSortBySummary = '%s for %s' GridExport.UnsupportedExport = 'Tipo de exportaci'#243'n no soportado: %1' GridExport.StyleManagerKill = 'El administrador de estilo esta siendo utilizado y no puede ser ' + @@ -496,15 +619,15 @@ object dmBase: TdmBase GridExport.BoolTrue = 'True' GridExport.BoolFalse = 'False' Translate.cxLibrary = True - Translate.PageControl2 = False - Translate.QuantumGrid5 = True - Translate.Editors5 = True + Translate.PageControl = False + Translate.QuantumGrid = False + Translate.Editors = False Translate.Datacontroller = True Translate.Filter = True Translate.GridPopupMenu = True Translate.GridExport = True Translate.Navigator = True - Version = '5.0' + Version = '6.29' Left = 104 Top = 16 end @@ -1617,7 +1740,7 @@ object dmBase: TdmBase KiloBytes = 'KB' MegaBytes = 'MB' GigaBytes = 'GB' - Left = 224 + Left = 184 Top = 16 end end diff --git a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dpk b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dpk index af5cf3be..0944f7d4 100644 --- a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dpk +++ b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dpk @@ -53,7 +53,7 @@ requires xmlrtl, vclactnband, vclshlctrls, - dxPScxGridLnkD10, + dxPScxGrid6LnkD10, dclcxLibraryD10, PngComponentsD10, PNG_D10, diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas index 0d2d3db0..a879cec7 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, diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.pas index cc52d503..a1b23c83 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.pas @@ -9,7 +9,7 @@ uses dxPSGlbl, dxPSUtl, dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns, dxPSEdgePatterns, dxPgsDlg, dxPSCore, ImgList, PngImageList, ActnList, cxGridCustomPopupMenu, cxGridPopupMenu, - dxPScxCommon, dxPScxGridLnk, uDADataTable, TB2Item, TBX, TB2Toolbar, + dxPScxCommon, dxPScxGrid6Lnk, uDADataTable, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid; diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewElegirArticulosAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewElegirArticulosAlbaranesCliente.pas index f84af6e8..5154a7b8 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewElegirArticulosAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewElegirArticulosAlbaranesCliente.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, dxPgsDlg, ActnList, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase; diff --git a/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.dpk b/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.dpk index cf174d6f..947e84e2 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.dpk +++ b/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.dpk @@ -53,7 +53,7 @@ requires xmlrtl, vclactnband, vclshlctrls, - dxPScxGridLnkD10, + dxPScxGrid6LnkD10, dclcxLibraryD10, PngComponentsD10, PNG_D10, 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/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/Almacenes_view.dpk b/Source/Modulos/Almacenes/Views/Almacenes_view.dpk index d134ca28..8acd5805 100644 --- a/Source/Modulos/Almacenes/Views/Almacenes_view.dpk +++ b/Source/Modulos/Almacenes/Views/Almacenes_view.dpk @@ -55,7 +55,7 @@ requires xmlrtl, vclactnband, vclshlctrls, - dxPScxGridLnkD10, + dxPScxGrid6LnkD10, dclcxLibraryD10, PngComponentsD10, PNG_D10, diff --git a/Source/Modulos/Almacenes/Views/uViewAlmacenes.pas b/Source/Modulos/Almacenes/Views/uViewAlmacenes.pas index 26f42b3e..d584e8a2 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; diff --git a/Source/Modulos/Articulos/Views/Articulos_view.dpk b/Source/Modulos/Articulos/Views/Articulos_view.dpk index cce496ef..dcc8bc4a 100644 --- a/Source/Modulos/Articulos/Views/Articulos_view.dpk +++ b/Source/Modulos/Articulos/Views/Articulos_view.dpk @@ -49,7 +49,7 @@ requires xmlrtl, vclactnband, vclshlctrls, - dxPScxGridLnkD10, + dxPScxGrid6LnkD10, dclcxLibraryD10, JvCoreD10R, Jcl, diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.pas b/Source/Modulos/Articulos/Views/uViewArticulos.pas index 9d3ccad6..a14591f4 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; diff --git a/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.dpk b/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.dpk index 0dec33f9..cd143c9b 100644 --- a/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.dpk +++ b/Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.dpk @@ -39,7 +39,7 @@ requires dxLayoutControlD10, dxPSCoreD10, dxPScxCommonD10, - dxPScxGridLnkD10, + dxPScxGrid6LnkD10, dxPsPrVwAdvD10, DataAbstract_D10, Base, diff --git a/Source/Modulos/Comisiones/Controller/Comisiones_controller.dpk b/Source/Modulos/Comisiones/Controller/Comisiones_controller.dpk index f70241fb..f2c18753 100644 --- a/Source/Modulos/Comisiones/Controller/Comisiones_controller.dpk +++ b/Source/Modulos/Comisiones/Controller/Comisiones_controller.dpk @@ -40,7 +40,7 @@ requires dxLayoutControlD10, dxPSCoreD10, dxPScxCommonD10, - dxPScxGridLnkD10, + dxPScxGrid6LnkD10, dxPsPrVwAdvD10, Comisiones_data, Comisiones_model, diff --git a/Source/Modulos/Comisiones/Views/Comisiones_view.dpk b/Source/Modulos/Comisiones/Views/Comisiones_view.dpk index 9119edfd..72f70036 100644 --- a/Source/Modulos/Comisiones/Views/Comisiones_view.dpk +++ b/Source/Modulos/Comisiones/Views/Comisiones_view.dpk @@ -52,7 +52,7 @@ requires xmlrtl, vclactnband, vclshlctrls, - dxPScxGridLnkD10, + dxPScxGrid6LnkD10, dclcxLibraryD10, JvCoreD10R, Jcl, diff --git a/Source/Modulos/Comisiones/Views/uViewComisiones.pas b/Source/Modulos/Comisiones/Views/uViewComisiones.pas index e1f59c9e..8533bb94 100644 --- a/Source/Modulos/Comisiones/Views/uViewComisiones.pas +++ b/Source/Modulos/Comisiones/Views/uViewComisiones.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; diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dpk b/Source/Modulos/Contactos/Views/Contactos_view.dpk index 38a443fc..b568a080 100644 --- a/Source/Modulos/Contactos/Views/Contactos_view.dpk +++ b/Source/Modulos/Contactos/Views/Contactos_view.dpk @@ -52,7 +52,7 @@ requires xmlrtl, vclactnband, vclshlctrls, - dxPScxGridLnkD10, + dxPScxGrid6LnkD10, dclcxLibraryD10, JvCoreD10R, Jcl, diff --git a/Source/Modulos/Contactos/Views/uViewAgentes.pas b/Source/Modulos/Contactos/Views/uViewAgentes.pas index b4f29e02..193c3099 100644 --- a/Source/Modulos/Contactos/Views/uViewAgentes.pas +++ b/Source/Modulos/Contactos/Views/uViewAgentes.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; diff --git a/Source/Modulos/Contactos/Views/uViewClientes.pas b/Source/Modulos/Contactos/Views/uViewClientes.pas index b0496e42..62e8ca04 100644 --- a/Source/Modulos/Contactos/Views/uViewClientes.pas +++ b/Source/Modulos/Contactos/Views/uViewClientes.pas @@ -12,7 +12,7 @@ uses dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns, dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, cxImageComboBox, cxGridCustomPopupMenu, cxGridPopupMenu, - dxPScxGridLnk, ExtCtrls, JvComponentBase, JvBalloonHint, JvHint, + dxPScxGrid6Lnk, ExtCtrls, JvComponentBase, JvBalloonHint, JvHint, uViewFiltroBase, dxPgsDlg, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock; type diff --git a/Source/Modulos/Contactos/Views/uViewContactos.dfm b/Source/Modulos/Contactos/Views/uViewContactos.dfm index d122e107..64f9ba3c 100644 --- a/Source/Modulos/Contactos/Views/uViewContactos.dfm +++ b/Source/Modulos/Contactos/Views/uViewContactos.dfm @@ -12,7 +12,7 @@ inherited frViewContactos: TfrViewContactos DataController.KeyFieldNames = 'ID' DataController.Summary.FooterSummaryItems = < item - Format = '0 clientes' + Format = '0 clientes' Kind = skCount FieldName = 'ID' Column = cxGridViewNOMBRE @@ -98,23 +98,17 @@ inherited frViewContactos: TfrViewContactos inherited dxLayoutControl1: TdxLayoutControl Width = 557 ExplicitWidth = 557 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end inherited edtFechaFinFiltro: TcxDateEdit - ExplicitWidth = 201 - Width = 201 + ExplicitWidth = 264 + Width = 264 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 557 + ExplicitWidth = 557 inherited tbxBotones: TTBXToolbar Width = 547 + ExplicitWidth = 547 end end end diff --git a/Source/Modulos/Contactos/Views/uViewContactos.pas b/Source/Modulos/Contactos/Views/uViewContactos.pas index 402ea141..3ea4d4fd 100644 --- a/Source/Modulos/Contactos/Views/uViewContactos.pas +++ b/Source/Modulos/Contactos/Views/uViewContactos.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, udatamoduleclientes, cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, ComCtrls, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg; diff --git a/Source/Modulos/Contactos/Views/uViewProveedores.pas b/Source/Modulos/Contactos/Views/uViewProveedores.pas index 2f747b0b..8f06b122 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/Empresas/Empresas_Group.config b/Source/Modulos/Empresas/Empresas_Group.config new file mode 100644 index 00000000..c8f28340 --- /dev/null +++ b/Source/Modulos/Empresas/Empresas_Group.config @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/Source/Modulos/Empresas/Views/Empresas_view.bdsproj b/Source/Modulos/Empresas/Views/Empresas_view.bdsproj index df17f8a0..657cbdfd 100644 --- a/Source/Modulos/Empresas/Views/Empresas_view.bdsproj +++ b/Source/Modulos/Empresas/Views/Empresas_view.bdsproj @@ -223,7 +223,7 @@ ExpressGDI+ Library by Developer Express Inc. -