Migración a DevExpress x.36

git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES/trunk@248 c93665c3-c93d-084d-9b98-7d5f4a9c3376

Build/Build.fbp5

@@ -571,10 +571,10 @@ source_path
               <Property name="LinkProductVersionToFileVersion" type="Boolean">True</Property>
               <Property name="Locale" type="Integer">3082</Property>
               <Property MultiValue="0" name="LogToVariable" type="string"></Property>
-              <Property name="MajorVersion" type="Integer">2</Property>
+              <Property name="MajorVersion" type="Integer">3</Property>
               <Property MultiValue="0" name="ManifestFile" type="string"></Property>
               <Property name="MaxRetryAttempts" type="Cardinal">0</Property>
-              <Property name="MinorVersion" type="Integer">7</Property>
+              <Property name="MinorVersion" type="Integer">0</Property>
               <Property name="NodeCollapsed" type="Boolean">False</Property>
               <Property name="PauseInterval" type="Cardinal">0</Property>
               <Property MultiValue="0" name="ProjectFile" type="WideString">%source_path%\Servidor\FactuGES_Server.dpr</Property>
@@ -594,15 +594,15 @@ source_path
               <Property name="UseVersionFromDOF" type="Boolean">True</Property>
               <Property MultiValue="1" name="VersionInfoKeys" type="WideString"><![CDATA[CompanyName=Rodax Software S.L.
 FileDescription=
-FileVersion=2.7.0.0
+FileVersion=3.0.0.0
 InternalName=
 LegalCopyright=
 LegalTrademarks=
 OriginalFilename=
 ProductName=FactuGES Server
-ProductVersion=2.7.0.0
+ProductVersion=3.0.0.0
 Comments=
-CompileDate=martes, 01 de abril de 2008 10:41
+CompileDate=jueves, 29 de mayo de 2008 19:41
 ]]>
                 </Property>
               <Property MultiValue="0" name="VersionInfoPropertySetName" type="string"></Property>
@@ -19365,7 +19365,7 @@ Comments=
                 <Property MultiValue="0" name="ExtraCommandline" type="WideString"></Property>
                 <Property name="HintsAsError" type="Boolean">False</Property>
                 <Property MultiValue="0" name="IconFile" type="WideString"></Property>
-                <Property name="IgnoreFailure" type="WordBool">True</Property>
+                <Property name="IgnoreFailure" type="WordBool">False</Property>
                 <Property name="IncludeCompileDate" type="WordBool">False</Property>
                 <Property name="IncludeManifest" type="Boolean">False</Property>
                 <Property name="IncludeVerInfo" type="WordBool">True</Property>
@@ -20596,10 +20596,10 @@ Comments=
               <Property name="LinkProductVersionToFileVersion" type="Boolean">False</Property>
               <Property name="Locale" type="Integer">3082</Property>
               <Property MultiValue="0" name="LogToVariable" type="string"></Property>
-              <Property name="MajorVersion" type="Integer">2</Property>
+              <Property name="MajorVersion" type="Integer">3</Property>
               <Property MultiValue="0" name="ManifestFile" type="string"></Property>
               <Property name="MaxRetryAttempts" type="Cardinal">0</Property>
-              <Property name="MinorVersion" type="Integer">7</Property>
+              <Property name="MinorVersion" type="Integer">0</Property>
               <Property name="NodeCollapsed" type="Boolean">False</Property>
               <Property name="PauseInterval" type="Cardinal">0</Property>
               <Property MultiValue="0" name="ProjectFile" type="WideString">%source_path%\Cliente\FactuGES.dpr</Property>
@@ -20619,13 +20619,13 @@ Comments=
               <Property name="UseVersionFromDOF" type="Boolean">False</Property>
               <Property MultiValue="1" name="VersionInfoKeys" type="WideString"><![CDATA[CompanyName=Rodax Software S.L.
 FileDescription=
-FileVersion=2.7.0.0
+FileVersion=3.0.0.0
 InternalName=FactuGES
 LegalCopyright=
 LegalTrademarks=
 OriginalFilename=
 ProductName=
-ProductVersion=2.7.0.0
+ProductVersion=3.0.0.0
 Comments=
 ]]>
                 </Property>

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,

Source/Base/GUIBase/GUIBase.dpk

@@ -65,7 +65,7 @@ requires
   dxPScxCommonD10,
   dxPSLnksD10,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   dxPsPrVwAdvD10,
   dxBarExtItemsD10,

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

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

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;

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

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;
 

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

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'
+    cxLibrary.ConverterCantCreateStyleRepository = 'No se puede crear un almac'#233'n de estilos'
-    PageControl2.NoBaseImages = 'BaseImages no est'#225' asignado'
+    PageControl.ImageListIndexError = 'El '#237'ndice (%d) deber'#225' estar entre 0 y %d'
-    PageControl2.NoRegisteredStyles = 'No hay estilos registrados'
+    PageControl.NoBaseImages = 'BaseImages no est'#225' asignado'
-    PageControl2.PageIndexError = '%d es un valor inv'#225'lido para PageIndex, debe estar entre 0 y %d'
+    PageControl.NoRegisteredStyles = 'No hay estilos registrados'
-    PageControl2.PainterClassError = 'La clase PCPainter es nula'
+    PageControl.PageIndexError = '%d es un valor inv'#225'lido para PageIndex, debe estar entre 0 y %d'
-    PageControl2.StandardStyleError = '%s es un estilo est'#225'ndar no soportado'
+    PageControl.PainterClassError = 'La clase PCPainter es nula'
-    PageControl2.StyleNameError = '%s es un nombre de estilo no registrado'
+    PageControl.StandardStyleError = '%s es un estilo est'#225'ndar no soportado'
-    PageControl2.TabCountEqualsZero = 'Tabs.Count = 0'
+    PageControl.StyleNameError = '%s es un nombre de estilo no registrado'
-    PageControl2.TabIndexError = 'El '#237'ndice de la pesta'#241'a (%d) est'#225' fuera de l'#237'mites'
+    PageControl.TabCountEqualsZero = 'Tabs.Count = 0'
-    PageControl2.TabVisibleIndexOutsOfBounds = 'Propiedad TabVisibleIndex (%d) deber'#225' estar entre 0 y %d'
+    PageControl.TabIndexError = 'El '#237'ndice de la pesta'#241'a (%d) est'#225' fuera de l'#237'mites'
-    PageControl2.VisibleTabListEmpty = 'No hay pesta'#241'as visibles'
+    PageControl.TabVisibleIndexOutsOfBounds = 'Propiedad TabVisibleIndex (%d) deber'#225' estar entre 0 y %d'
-    QuantumGrid5.GridRecursiveLevels = 'No se pueden crear niveles recursivos'
+    PageControl.VisibleTabListEmpty = 'No hay pesta'#241'as visibles'
-    QuantumGrid5.GridDeletingConfirmationCaption = 'Confirmar'
+    PageControl.PCAllowRotateError = '%s es un estilo que no soporta pesta'#241'as rotatorias'
-    QuantumGrid5.GridDeletingFocusedConfirmationText = #191'Borrar registro?'
+    QuantumGrid.GridRecursiveLevels = 'No se pueden crear niveles recursivos'
-    QuantumGrid5.GridDeletingSelectedConfirmationText = #191'Borrar todos los registros seleccionados?'
+    QuantumGrid.GridDeletingConfirmationCaption = 'Confirmar'
-    QuantumGrid5.GridNoDataInfoText = '<No hay datos a mostrar>'
+    QuantumGrid.GridDeletingFocusedConfirmationText = #191'Borrar registro?'
-    QuantumGrid5.GridNewItemRowInfoText = 'Haga click aqu'#237' para agregar una nueva l'#237'nea'
+    QuantumGrid.GridDeletingSelectedConfirmationText = #191'Borrar todos los registros seleccionados?'
-    QuantumGrid5.GridFilterIsEmpty = '<Filtro Vac'#237'o>'
+    QuantumGrid.GridNoDataInfoText = '<No hay datos a mostrar>'
-    QuantumGrid5.GridCustomizationFormCaption = 'Personalizaci'#243'n'
+    QuantumGrid.GridNewItemRowInfoText = 'Haga click aqu'#237' para agregar una nueva l'#237'nea'
-    QuantumGrid5.GridCustomizationFormColumnsPageCaption = 'Columnas'
+    QuantumGrid.GridFilterIsEmpty = '<Filtro Vac'#237'o>'
-    QuantumGrid5.GridGroupByBoxCaption = 'Arrastre una columna aqu'#237' para agrupar por dicha columna'
+    QuantumGrid.GridCustomizationFormCaption = 'Personalizaci'#243'n'
-    QuantumGrid5.GridFilterCustomizeButtonCaption = 'Personalizar...'
+    QuantumGrid.GridCustomizationFormColumnsPageCaption = 'Columnas'
-    QuantumGrid5.GridColumnsQuickCustomizationHint = 'Haga click aqu'#237' para seleccionar las columas visibles'
+    QuantumGrid.GridGroupByBoxCaption = 'Arrastre una columna aqu'#237' para agrupar por dicha columna'
-    QuantumGrid5.GridCustomizationFormBandsPageCaption = 'Bandas'
+    QuantumGrid.GridFilterCustomizeButtonCaption = 'Personalizar...'
-    QuantumGrid5.GridBandsQuickCustomizationHint = 'Haga click aqu'#237' para seleccionar las bandas visibles'
+    QuantumGrid.GridColumnsQuickCustomizationHint = 'Haga click aqu'#237' para seleccionar las columas visibles'
-    QuantumGrid5.GridCustomizationFormRowsPageCaption = 'Rows'
+    QuantumGrid.GridCustomizationFormBandsPageCaption = 'Bandas'
-    QuantumGrid5.GridConverterIntermediaryMissing = 'Omiti'#243' un componente intermediario!'
+    QuantumGrid.GridBandsQuickCustomizationHint = 'Haga click aqu'#237' para seleccionar las bandas visibles'
-    QuantumGrid5.GridConverterNotExistGrid = 'cxGrid no existe'
+    QuantumGrid.GridCustomizationFormRowsPageCaption = 'Rows'
-    QuantumGrid5.GridConverterNotExistComponent = 'El componente no existe'
+    QuantumGrid.GridConverterIntermediaryMissing = 'Omiti'#243' un componente intermediario!'
-    QuantumGrid5.ImportErrorCaption = 'Error al importar'
+    QuantumGrid.GridConverterNotExistGrid = 'cxGrid no existe'
-    QuantumGrid5.NotExistGridView = 'No existe la vista del grid'
+    QuantumGrid.GridConverterNotExistComponent = 'El componente no existe'
-    QuantumGrid5.NotExistGridLevel = 'No existe un nivel de grid activo'
+    QuantumGrid.ImportErrorCaption = 'Error al importar'
-    QuantumGrid5.CantCreateExportOutputFile = 'No se puede crear el archivo de exportaci'#243'n'
+    QuantumGrid.NotExistGridView = 'No existe la vista del grid'
-    QuantumGrid5.EditRepositoryExtLookupComboBoxItem = 
+    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 = '<serie nula>'
+    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'
+    Editors.EditButtonCancel = 'Cancelar'
-    Editors5.EditInvalidRepositoryItem = 'Elemento de repositorio no v'#225'lido'
+    Editors.EditButtonOK = 'Aceptar'
-    Editors5.EditNumericValueConvertError = 'No se puede convertir a valor num'#233'rico'
+    Editors.EditDateConvertError = 'El valor no se puede convertir a fecha'
-    Editors5.EditPopupCircularReferencingError = 'Referencia circular no permitida'
+    Editors.EditInvalidRepositoryItem = 'Elemento de repositorio no v'#225'lido'
-    Editors5.EditPostError = 'Ocurri'#243' un error durante el grabado del valor de edici'#243'n'
+    Editors.EditNumericValueConvertError = 'No se puede convertir a valor num'#233'rico'
-    Editors5.EditTimeConvertError = 'No se puede convertir a valor de tiempo'
+    Editors.EditPopupCircularReferencingError = 'Referencia circular no permitida'
-    Editors5.EditValidateErrorText = 'Valor inv'#225'lido. Use la tecla de escape para cancelar cambios'
+    Editors.EditPostError = 'Ocurri'#243' un error durante el grabado del valor de edici'#243'n'
-    Editors5.EditValueOutOfBounds = 'Valor fuera de l'#237'mites'
+    Editors.EditTimeConvertError = 'No se puede convertir a valor de tiempo'
-    Editors5.EditCheckBoxChecked = 'True'
+    Editors.EditValidateErrorText = 'Valor inv'#225'lido. Use la tecla de escape para cancelar cambios'
-    Editors5.EditCheckBoxUnchecked = 'False'
+    Editors.EditValueOutOfBounds = 'Valor fuera de l'#237'mites'
-    Editors5.TextTrue = 'True'
+    Editors.EditCheckBoxChecked = 'True'
-    Editors5.TextFalse = 'False'
+    Editors.EditCheckBoxUnchecked = 'False'
-    Editors5.BlobButtonOK = '&Aceptar'
+    Editors.TextTrue = 'True'
-    Editors5.BlobButtonCancel = '&Cancelar'
+    Editors.TextFalse = 'False'
-    Editors5.BlobButtonClose = '&Cerrar'
+    Editors.BlobButtonOK = '&Aceptar'
-    Editors5.BlobMemo = '(MEMO)'
+    Editors.BlobButtonCancel = '&Cancelar'
-    Editors5.BlobMemoEmpty = '(memo)'
+    Editors.BlobButtonClose = '&Cerrar'
-    Editors5.BlobPicture = '(IM'#193'GEN)'
+    Editors.BlobMemo = '(MEMO)'
-    Editors5.BlobPictureEmpty = '(im'#225'gen)'
+    Editors.BlobMemoEmpty = '(memo)'
-    Editors5.MenuItemCaptionCut = 'Cor&tar'
+    Editors.BlobPicture = '(IM'#193'GEN)'
-    Editors5.MenuItemCaptionCopy = '&Copiar'
+    Editors.BlobPictureEmpty = '(im'#225'gen)'
-    Editors5.MenuItemCaptionPaste = '&Pegar'
+    Editors.MenuItemCaptionCut = 'Cor&tar'
-    Editors5.MenuItemCaptionDelete = '&Borrar'
+    Editors.MenuItemCaptionCopy = '&Copiar'
-    Editors5.MenuItemCaptionLoad = '&Leer...'
+    Editors.MenuItemCaptionPaste = '&Pegar'
-    Editors5.MenuItemCaptionSave = 'Guardar &Como...'
+    Editors.MenuItemCaptionDelete = '&Borrar'
-    Editors5.DatePopupClear = 'Limpiar'
+    Editors.MenuItemCaptionLoad = '&Leer...'
-    Editors5.DatePopupNow = 'Ahora'
+    Editors.MenuItemCaptionSave = 'Guardar &Como...'
-    Editors5.DatePopupOK = 'Aceptar'
+    Editors.DatePopupClear = 'Limpiar'
-    Editors5.DatePopupToday = 'Hoy'
+    Editors.DatePopupNow = 'Ahora'
-    Editors5.DateError = 'Fecha inv'#225'lida'
+    Editors.DatePopupOK = 'Aceptar'
-    Editors5.DateToday = 'hoy'
+    Editors.DatePopupToday = 'Hoy'
-    Editors5.DateYesterday = 'ayer'
+    Editors.DateError = 'Fecha inv'#225'lida'
-    Editors5.DateTomorrow = 'ma'#241'ana'
+    Editors.DateToday = 'hoy'
-    Editors5.DateSunday = 'Domingo'
+    Editors.DateYesterday = 'ayer'
-    Editors5.DateMonday = 'Lunes'
+    Editors.DateTomorrow = 'ma'#241'ana'
-    Editors5.DateTuesday = 'Martes'
+    Editors.DateSunday = 'Domingo'
-    Editors5.DateWednesday = 'Mi'#233'rcoles'
+    Editors.DateMonday = 'Lunes'
-    Editors5.DateThursday = 'Jueves'
+    Editors.DateTuesday = 'Martes'
-    Editors5.DateFriday = 'Viernes'
+    Editors.DateWednesday = 'Mi'#233'rcoles'
-    Editors5.DateSaturday = 'S'#225'bado'
+    Editors.DateThursday = 'Jueves'
-    Editors5.DateFirst = 'Primero'
+    Editors.DateFriday = 'Viernes'
-    Editors5.DateSecond = 'segundo'
+    Editors.DateSaturday = 'S'#225'bado'
-    Editors5.DateThird = 'tercero'
+    Editors.DateFirst = 'Primero'
-    Editors5.DateFourth = 'Cuarto'
+    Editors.DateSecond = 'segundo'
-    Editors5.DateFifth = 'Quinto'
+    Editors.DateThird = 'tercero'
-    Editors5.DateSixth = 'sexto'
+    Editors.DateFourth = 'Cuarto'
-    Editors5.DateSeventh = 's'#233'ptimo'
+    Editors.DateFifth = 'Quinto'
-    Editors5.DateBOM = 'bom'
+    Editors.DateSixth = 'sexto'
-    Editors5.DateEOM = 'eom'
+    Editors.DateSeventh = 's'#233'ptimo'
-    Editors5.DateNow = 'ahora'
+    Editors.DateBOM = 'bom'
-    Editors5.CalcError = 'Error'
+    Editors.DateEOM = 'eom'
-    Editors5.HyperLinkPrefix = 'http://'
+    Editors.DateNow = 'ahora'
-    Editors5.HyperLinkDoubleSlash = '//'
+    Editors.CalcError = 'Error'
-    Editors5.EditRepositoryBlobItem = 'BlobEdit|Representa el editor de BLOB'
+    Editors.HyperLinkPrefix = 'http://'
-    Editors5.EditRepositoryButtonItem = 
+    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'
+    Editors.EditRepositoryComboBoxItem = 'ComboBox|Representa el editor de la caja combo'
-    Editors5.EditRepositoryCurrencyItem = 
+    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'
+    Editors.EditRepositoryHyperLinkItem = 'HyperLink|Representa un editor de texto de hiperv'#237'nculos'
-    Editors5.EditRepositoryImageComboBoxItem = 
+    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'
+    Editors.EditRepositoryImageItem = 'Image|Representa un editor de im'#225'genes'
-    Editors5.EditRepositoryLookupComboBoxItem = 'LookupComboBox|Representa una caja de b'#250'squeda'
+    Editors.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'
+    Editors.EditRepositoryMaskItem = 'MaskEdit|Representa un control de edici'#243'n gen'#233'rico con m'#225'scara'
-    Editors5.EditRepositoryMemoItem = 
+    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)'
+    Editors.EditRepositorySpinItem = 'SpinEdit|Representa un editor de incrementos/decrementos (spin)'
-    Editors5.EditRepositoryRadioGroupItem = 'RadioGroup|Represents a group of radio buttons'
+    Editors.EditRepositoryRadioGroupItem = 'RadioGroup|Represents a group of radio buttons'
-    Editors5.EditRepositoryTextItem = 'TextEdit|Representa un editor de texto de l'#237'nea sencilla'
+    Editors.EditRepositoryTextItem = 'TextEdit|Representa un editor de texto de l'#237'nea sencilla'
-    Editors5.EditRepositoryTimeItem = 'TimeEdit|Representa un editor mostrando valores de tiempo'
+    Editors.EditRepositoryTimeItem = 'TimeEdit|Representa un editor mostrando valores de tiempo'
-    Editors5.RegExprLine = 'L'#237'nea'
+    Editors.EditRepositoryColorComboBoxItem = 'ColorComboBox |Represents a editor with color functionality'
-    Editors5.RegExprChar = 'Char'
+    Editors.EditRepositoryFontNameComboBoxItem = 'FontNameComboBox |Represents a editor with font functionality'
-    Editors5.RegExprNotAssignedSourceStream = 'No se ha asignado el stream fuente'
+    Editors.EditRepositoryLabelItem = 'Label|Represents a Label'
-    Editors5.RegExprEmptySourceStream = 'El stream or'#237'gen est'#225' vac'#237'o'
+    Editors.EditRepositoryProgressBarItem = 'ProgressBar|Represents a ProgressBar'
-    Editors5.RegExprCantUsePlusQuantifier = 'El cuantificador '#39'+'#39' no puede aplicarse aqu'#237
+    Editors.EditRepositoryTrackBarItem = 'TrackBar|Represents a TrackBar'
-    Editors5.RegExprCantUseStarQuantifier = 'El cuantificador '#39'*'#39' no puede aplicarse aqu'#237
+    Editors.EditRepositorySpinButtonItem = 'SpinButton|Represents a SpinButton'
-    Editors5.RegExprCantCreateEmptyAlt = 'La alternativa no debe estar vac'#237'a'
+    Editors.EditRepositoryCheckComboBox = 'CheckComboBox|Represents a CheckComboBox'
-    Editors5.RegExprCantCreateEmptyBlock = 'El bloque no debe estar vac'#237'o'
+    Editors.EditRepositoryShellComboBoxItem = 
-    Editors5.RegExprIllegalSymbol = 'S'#237'mbolo no permitido '#39'%s'#39
+      'ShellComboBox|Represents a combo box with a dropdown shell tree ' +
-    Editors5.RegExprIllegalQuantifier = 'Cuantificador no permitido '#39'%s'#39
+      'view'
-    Editors5.RegExprNotSupportQuantifier = 'El par'#225'metro cuantificador no es soportado'
+    Editors.EditRepositoryCheckGroupItem = 'CheckGroup|Represents a group of check boxes'
-    Editors5.RegExprIllegalIntegerValue = 'Valor entero no permitido'
+    Editors.EditRepositoryRichEditItem = 'RichEdit|RichEdit control'
-    Editors5.RegExprTooBigReferenceNumber = 'N'#250'mero de referencia demasiado grande'
+    Editors.EditCheckGroupCaptionStateDelimiter = ': '
-    Editors5.RegExprCantCreateEmptyEnum = 'No puedo crear enumeraci'#243'n vac'#237'a'
+    Editors.EditCheckGroupFilterColumnSeparator = '; '
-    Editors5.RegExprSubrangeOrder = 'El caracter de inicio del subrango debe ser menor al de fin'
+    Editors.EditCheckGroupChecked = 'Checked'
-    Editors5.RegExprHexNumberExpected0 = 'Se esperaba n'#250'mero Hexadecimal'
+    Editors.EditCheckGroupGrayed = 'Grayed'
-    Editors5.RegExprHexNumberExpected = 'N'#250'mero Hexadecimal esperado pero encontr'#243' '#39'%s'#39
+    Editors.EditCheckGroupUnchecked = 'Unchecked'
-    Editors5.RegExprMissing = 'Falta '#39'%s'#39
+    Editors.CheckComboBoxStatesItemsPropertyDlgCaption = 'cxCheckComboBox - CheckStates editor'
-    Editors5.RegExprUnnecessary = 'Innecesario '#39'%s'#39
+    Editors.CheckGroupStatesItemsPropertyDlgCaption = 'cxCheckGroup - CheckStates editor'
-    Editors5.RegExprIncorrectSpace = 'Espacio incorrecto despu'#233's de '#39'\'#39
+    Editors.CheckComboBoxEmptySelectionText = 'None selected'
-    Editors5.RegExprNotCompiled = 'Expresi'#243'n regular no compila'
+    Editors.ColorComboBoxDefaultDescription = 'Color not selected'
-    Editors5.RegExprIncorrectParameterQuantifier = 'Cuantificador de par'#225'metros incorrecto'
+    Editors.EditRichEditLibraryError = 'Cannot load a RichEdit library'
-    Editors5.RegExprCantUseParameterQuantifier = 'The parameter quantifier cannot be applied here'
+    Editors.EditRichEditLineInsertionError = 'RichEdit line insertion error'
-    Editors5.MaskEditRegExprError = 'Errores en expresiones regulares:'
+    Editors.EditRichEditLoadFail = 'Failed to Load Stream'
-    Editors5.MaskEditInvalidEditValue = 'El valor de edici'#243'n es inv'#225'lido'
+    Editors.EditRichEditSaveFail = 'Failed to Save Stream'
-    Editors5.MaskEditNoMask = 'Ninguno'
+    Editors.EditRichEditUndoCaption = '&Undo'
-    Editors5.MaskEditIllegalFileFormat = 'Formato de archivo ilegal'
+    Editors.EditRichEditRedoCaption = '&Redo'
-    Editors5.MaskEditEmptyMaskCollectionFile = 'El archivo de colecci'#243'n de m'#225'scaras est'#225' vac'#237'o'
+    Editors.EditRichEditCutCaption = 'Cu&t'
-    Editors5.MaskEditMaskCollectionFiles = 'Archivos de colecci'#243'n de m'#225'scaras'
+    Editors.EditRichEditCopyCaption = '&Copy'
-    Editors5.SpinEditInvalidNumericValue = 'Valor num'#233'rico no v'#225'lido'
+    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.FilterBoxNonBlanksCaption = '(NoVac'#237'os)'
-    Filter.FilterBoolOperatorAnd = 'AND'
+    Filter.FilterBoolOperatorAnd = 'Y'
-    Filter.FilterBoolOperatorOr = 'OR'
+    Filter.FilterBoolOperatorOr = 'O'
-    Filter.FilterBoolOperatorNotAnd = 'NOT AND'
+    Filter.FilterBoolOperatorNotAnd = 'NO Y'
-    Filter.FilterBoolOperatorNotOr = 'NOT OR'
+    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 = '<ra'#237'z>'
     Filter.FilterControlNullString = '<vac'#237'o>'
@@ -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.PageControl = False
-    Translate.QuantumGrid5 = True
+    Translate.QuantumGrid = False
-    Translate.Editors5 = True
+    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

Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dpk

@@ -53,7 +53,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   PngComponentsD10,
   PNG_D10,

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,

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;

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;

Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.dpk

@@ -53,7 +53,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   PngComponentsD10,
   PNG_D10,

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;

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;

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,

Source/Modulos/Almacenes/Views/Almacenes_view.dpk

@@ -55,7 +55,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   PngComponentsD10,
   PNG_D10,

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;
 

Source/Modulos/Articulos/Views/Articulos_view.dpk

@@ -49,7 +49,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   JvCoreD10R,
   Jcl,

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;

Source/Modulos/Banca electronica/Controller/BancaElectronica_controller.dpk

@@ -39,7 +39,7 @@ requires
   dxLayoutControlD10,
   dxPSCoreD10,
   dxPScxCommonD10,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dxPsPrVwAdvD10,
   DataAbstract_D10,
   Base,

Source/Modulos/Comisiones/Controller/Comisiones_controller.dpk

@@ -40,7 +40,7 @@ requires
   dxLayoutControlD10,
   dxPSCoreD10,
   dxPScxCommonD10,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dxPsPrVwAdvD10,
   Comisiones_data,
   Comisiones_model,

Source/Modulos/Comisiones/Views/Comisiones_view.dpk

@@ -52,7 +52,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   JvCoreD10R,
   Jcl,

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;

Source/Modulos/Contactos/Views/Contactos_view.dpk

@@ -52,7 +52,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   JvCoreD10R,
   Jcl,

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;

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

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
+          ExplicitWidth = 264
-          Width = 201
+          Width = 264
         end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 557
+        ExplicitWidth = 557
         inherited tbxBotones: TTBXToolbar
           Width = 547
+          ExplicitWidth = 547
         end
       end
     end

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;
 

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;

Source/Modulos/Empresas/Empresas_Group.config

@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<TgConfig Version="3" SubLevelDisabled="False" />

Source/Modulos/Empresas/Views/Empresas_view.bdsproj

@@ -223,7 +223,7 @@
       <Excluded_Packages Name="C:\Documents and Settings\David\Mis documentos\Borland Studio Projects\Bpl\dxGDIPlusD10.bpl">ExpressGDI+ Library by Developer Express Inc.</Excluded_Packages>
     </Excluded_Packages>
   </Delphi.Personality>
-<!-- EurekaLog First Line
+	<!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=519
 Activate=1

Source/Modulos/Empresas/Views/Empresas_view.dpk

@@ -52,7 +52,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   JvCoreD10R,
   Jcl,

Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dpk

@@ -53,7 +53,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   PngComponentsD10,
   PNG_D10,

Source/Modulos/Facturas de cliente/Views/uViewElegirArticulosFacturasCliente.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;

Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas

@@ -9,7 +9,7 @@ uses
   dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider,
   dxPSFillPatterns, dxPSEdgePatterns, cxImageComboBox, cxTextEdit, ImgList,
   PngImageList, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
-  dxPSCore, dxPScxCommon, dxPScxGridLnk, ActnList, uDADataTable,
+  dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, ActnList, uDADataTable,
   cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid,
   cxImage, Grids, DBGrids, uBizFacturasCliente, cxGridCustomPopupMenu,
   cxGridPopupMenu, cxCalendar, cxCurrencyEdit, uViewFiltroBase, TB2Item, TBX,

Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dpk

@@ -50,7 +50,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   dsnap,
   adortl,

Source/Modulos/Facturas de proveedor/Views/uViewElegirArticulosFacturasProveedor.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,

Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas

@@ -9,7 +9,7 @@ uses
   dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider,
   dxPSFillPatterns, dxPSEdgePatterns, cxImageComboBox, cxTextEdit, ImgList,
   PngImageList, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
-  dxPSCore, dxPScxCommon, dxPScxGridLnk, ActnList, uDADataTable,
+  dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, ActnList, uDADataTable,
   cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid,
   cxImage, Grids, DBGrids, uBizFacturasProveedor, cxGridCustomPopupMenu,
   cxGridPopupMenu, cxCalendar, cxCurrencyEdit, uViewFiltroBase, TB2Item, TBX,

Source/Modulos/Familias/Controller/Familias_controller.dpk

@@ -42,7 +42,7 @@ requires
   dxLayoutControlD10,
   dxPSCoreD10,
   dxPScxCommonD10,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dxPsPrVwAdvD10,
   GUIBase;
 

Source/Modulos/Formas de pago/Controller/FormasPago_controller.dpk

@@ -40,7 +40,7 @@ requires
   dxLayoutControlD10,
   dxPSCoreD10,
   dxPScxCommonD10,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dxPsPrVwAdvD10,
   FormasPago_model,
   FormasPago_data;

Source/Modulos/Historico de movimientos/Views/HistoricoMovimientos_view.dpk

@@ -51,7 +51,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   PngComponentsD10,
   PNG_D10,

Source/Modulos/Historico de movimientos/Views/uViewHistoricoMovimientos.pas

@@ -10,7 +10,7 @@ uses
   cxGridCustomView, cxGridCustomTableView, cxGridTableView,
   cxGridDBTableView, cxGrid, StdCtrls, ExtCtrls, cxLabel, dxPSGlbl, dxPSUtl,
   dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns,
-  dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGridLnk, cxImage,
+  dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, cxImage,
   cxImageComboBox, ImgList, PngImageList, cxTextEdit, Grids, DBGrids, cxDBLookupComboBox,
   cxButtonEdit, cxGridCustomPopupMenu, cxGridPopupMenu, uViewGrid,
   uBizHistoricoMovimientos, uBizAlmacenes, cxSpinEdit, uViewFiltroBase, TB2Item, TBX,

Source/Modulos/Informe margen por articulo/Servidor/srvInfMargenArticulo_Impl.pas

@@ -44,7 +44,7 @@ const
 
   //SOLO PARA INFORME AGRUPADO POR FACTURA PARA SACAR BENEFICIO REAL
   CTE_DATA_NAME = 'InfMargenPorFactura';
-  CAMPOS_SUMA = '#CANTIDAD#IMP_UNIDAD#IMP_NETO#IMP_PORTE#IMP_TOTAL#IMP_NETO_ULT_COM_TOTAL#IMP_NETO_PRO_COM_TOTAL#IMP_MARGEN_ULT_COMP_TOTAL#IMP_MARGEN_PRO_COMP_TOTAL';
+  CAMPOS_SUMA = '#CANTIDAD#IMP_UNIDAD#IMP_NETO#IMP_PORTE#IMP_TOTAL#IMP_NETO_ULT_COM_TOTAL#IMP_NETO_PRO_COM_TOTAL#IMP_MARGEN_ULT_COMP_TOTAL#IMP_MARGEN_PRO_COMP_TOTAL#';
 
 procedure Create_srv_InfMargenArticulo(out anInstance : IUnknown);
 begin

Source/Modulos/Informe margen por articulo/Views/InfMargenArticulo_view.dpk

@@ -47,7 +47,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   dsnap,
   adortl,

Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticuloGrid.dfm

@@ -93,6 +93,7 @@ inherited frViewInfMargenArticuloGrid: TfrViewInfMargenArticuloGrid
           Position = spFooter
           Column = cxGridViewPOR_MARGEN_PRO_COMP
         end>
+      DataController.Summary.FooterSummaryItems.OnSummary = cxGridViewDataControllerSummaryFooterSummaryItemsSummary
       DataController.Summary.FooterSummaryItems = <
         item
           Format = ',0.00 %;-,0.00 %'
@@ -162,12 +163,12 @@ inherited frViewInfMargenArticuloGrid: TfrViewInfMargenArticuloGrid
       object cxGridViewID_EMPRESA: TcxGridDBColumn
         Caption = 'Id_empresa'
         DataBinding.FieldName = 'ID_EMPRESA'
-        Hidden = True
+        VisibleForCustomization = False
       end
       object cxGridViewID_CLIENTE: TcxGridDBColumn
         Caption = 'Id_cliente'
         DataBinding.FieldName = 'ID_CLIENTE'
-        Hidden = True
+        VisibleForCustomization = False
       end
       object cxGridViewID_FACTURA: TcxGridDBColumn
         Caption = 'Id_factura'
@@ -176,7 +177,7 @@ inherited frViewInfMargenArticuloGrid: TfrViewInfMargenArticuloGrid
       object cxGridViewID_ARTICULO: TcxGridDBColumn
         Caption = 'Id_articulo'
         DataBinding.FieldName = 'ID_ARTICULO'
-        Hidden = True
+        VisibleForCustomization = False
       end
       object cxGridViewNIF_CIF_CLIENTE: TcxGridDBColumn
         Caption = 'NIF/CIF cliente'
@@ -498,7 +499,7 @@ inherited frViewInfMargenArticuloGrid: TfrViewInfMargenArticuloGrid
       end
       object cxGridViewID_DETALLE: TcxGridDBColumn
         DataBinding.FieldName = 'ID_DETALLE'
-        Hidden = True
+        VisibleForCustomization = False
       end
       object cxGridViewIMP_UNIDAD: TcxGridDBColumn
         Caption = 'Precio uni. venta'
@@ -591,6 +592,7 @@ inherited frViewInfMargenArticuloGrid: TfrViewInfMargenArticuloGrid
   object cxStyleRepository1: TcxStyleRepository
     Left = 16
     Top = 48
+    PixelsPerInch = 96
     object cxStyleRed: TcxStyle
       AssignedValues = [svTextColor]
       TextColor = clRed

Source/Modulos/Informe margen por articulo/Views/uViewInfMargenArticuloGrid.pas

@@ -10,7 +10,7 @@ uses
   cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid,
   cxCurrencyEdit, cxCalendar, dxPSGlbl, dxPSUtl, dxPrnPg, dxBkgnd, dxWrap,
   dxPrnDev, dxPSEngn, dxPSCompsProvider, dxPSFillPatterns,
-  dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGridLnk, dxPgsDlg,
+  dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, dxPgsDlg,
   cxDropDownEdit, StdCtrls, cxSpinEdit;
 
 type
@@ -97,6 +97,9 @@ type
     procedure cxGridViewDataControllerSortingChanged(Sender: TObject);
     procedure cxGridViewDataControllerSummaryAfterSummary(ASender: TcxDataSummary);
     procedure cxGridViewDataControllerFilterChanged(Sender: TObject);
+    procedure cxGridViewDataControllerSummaryFooterSummaryItemsSummary(
+      ASender: TcxDataSummaryItems; Arguments: TcxSummaryEventArguments;
+      var OutArguments: TcxSummaryEventOutArguments);
   protected
     procedure ActivarEventos; override;
     procedure DesactivarEventos; override;
@@ -229,10 +232,38 @@ procedure TfrViewInfMargenArticuloGrid.cxGridViewDataControllerSummaryAfterSumma
   ASender: TcxDataSummary);
 begin
   inherited;
+
+  //
   if Assigned(FOnViewChanged) then
     FOnViewChanged(Self);
 end;
 
+procedure TfrViewInfMargenArticuloGrid.cxGridViewDataControllerSummaryFooterSummaryItemsSummary(
+  ASender: TcxDataSummaryItems; Arguments: TcxSummaryEventArguments;
+  var OutArguments: TcxSummaryEventOutArguments);
+var
+  AIndex: Integer;
+  ACalculo: Currency;
+begin
+  inherited;
+  if Arguments.SummaryItem.ItemLink = cxGridViewPOR_MARGEN_PRO_COMP then
+  begin
+    if cxGridViewIMP_TOTAL.Visible
+    and cxGridViewIMP_MARGEN_PRO_COMP_TOTAL.Visible then
+    begin
+      ACalculo:=0;
+      AIndex := ASender.IndexOfItemLink(cxGridViewIMP_MARGEN_PRO_COMP_TOTAL);
+      if not VarIsNull(cxGridView.DataController.Summary.FooterSummaryValues[AIndex]) then
+         ACalculo := cxGridView.DataController.Summary.FooterSummaryValues[AIndex] * 100;
+      AIndex := ASender.IndexOfItemLink(cxGridViewIMP_TOTAL);
+      if not VarIsNull(cxGridView.DataController.Summary.FooterSummaryValues[AIndex]) then
+         ACalculo := ACalculo / cxGridView.DataController.Summary.FooterSummaryValues[AIndex];
+
+      OutArguments.Value := ACalculo;
+    end;
+  end;
+end;
+
 procedure TfrViewInfMargenArticuloGrid.cxGridViewDataControllerFilterChanged(
   Sender: TObject);
 begin

Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.dpk

@@ -47,7 +47,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   dsnap,
   adortl,

Source/Modulos/Informe ventas por articulo/Views/uViewInfVentasArticuloGrid.pas

@@ -10,7 +10,7 @@ uses
   cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid,
   cxCurrencyEdit, cxCalendar, dxPSGlbl, dxPSUtl, dxPrnPg, dxBkgnd, dxWrap,
   dxPrnDev, dxPSEngn, dxPSCompsProvider, dxPSFillPatterns,
-  dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGridLnk, dxPgsDlg,
+  dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, dxPgsDlg,
   cxDropDownEdit, StdCtrls, cxSpinEdit;
 
 type

Source/Modulos/Informes base/Views/InformesBase_view.dpk

@@ -51,7 +51,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   PngComponentsD10,
   PNG_D10,

Source/Modulos/Informes base/Views/uViewColumnas.pas

@@ -7,7 +7,7 @@ uses
   Dialogs, uViewBase, dxLayoutControl, cxControls, cxContainer, cxListBox,
   TBXDkPanels, ActnList, cxCustomData,  cxGridDBTableView, cxGridTableView,
   JvExControls, JvComponent, JvxCheckListBox, uViewInformeBaseGrid,
-  cxCheckListBox, cxCheckBox, uViewInformeBaseParametros;
+  cxCheckListBox, cxCheckBox, uViewInformeBaseParametros, cxLookAndFeelPainters;
 
 type
   IViewColumnas = interface(IViewInformeBaseParametros)
@@ -33,6 +33,7 @@ implementation
 
 {$R *.dfm}
 
+
 { TfrViewColumnas }
 
 procedure TfrViewColumnas.Refresh;

Source/Modulos/Informes base/Views/uViewInformeBaseGrid.pas

@@ -17,7 +17,7 @@ uses
   dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns,
   dxPSEdgePatterns, dxPSCore, ActnList, uDADataTable, cxGridLevel,
   cxClasses, cxControls, cxGridCustomView, cxGridCustomTableView,
-  cxGridTableView, cxGridDBTableView, cxGrid, dxPScxCommon, dxPScxGridLnk,
+  cxGridTableView, cxGridDBTableView, cxGrid, dxPScxCommon, dxPScxGrid6Lnk,
   dxPgsDlg;
 
 type

Source/Modulos/Inventario/Views/Inventario_view.dpk

@@ -51,7 +51,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   PngComponentsD10,
   PNG_D10,

Source/Modulos/Inventario/Views/uViewDetalleReservas.pas

@@ -10,7 +10,7 @@ uses
   cxGridCustomView, cxGridCustomTableView, cxGridTableView,
   cxGridDBTableView, cxGrid, StdCtrls, ExtCtrls, cxLabel, dxPSGlbl, dxPSUtl,
   dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns,
-  dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGridLnk, cxImage,
+  dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, cxImage,
   cxImageComboBox, ImgList, PngImageList, cxTextEdit, Grids, DBGrids, cxDBLookupComboBox,
   cxButtonEdit, cxGridCustomPopupMenu, cxGridPopupMenu, uViewGrid,
   uBizInventario, uBizAlmacenes, cxSpinEdit, uViewFiltroBase, TB2Item, TBX,

Source/Modulos/Inventario/Views/uViewDetallesSinAlbaran.pas

@@ -10,7 +10,7 @@ uses
   cxGridCustomView, cxGridCustomTableView, cxGridTableView,
   cxGridDBTableView, cxGrid, StdCtrls, ExtCtrls, cxLabel, dxPSGlbl, dxPSUtl,
   dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns,
-  dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGridLnk, cxImage,
+  dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, cxImage,
   cxImageComboBox, ImgList, PngImageList, cxTextEdit, Grids, DBGrids, cxDBLookupComboBox,
   cxButtonEdit, cxGridCustomPopupMenu, cxGridPopupMenu, uViewGrid,
   uBizInventario, uBizAlmacenes, cxSpinEdit, uViewFiltroBase, TB2Item, TBX,

Source/Modulos/Inventario/Views/uViewDetallesSinRecibir.pas

@@ -10,7 +10,7 @@ uses
   cxGridCustomView, cxGridCustomTableView, cxGridTableView,
   cxGridDBTableView, cxGrid, StdCtrls, ExtCtrls, cxLabel, dxPSGlbl, dxPSUtl,
   dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns,
-  dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGridLnk, cxImage,
+  dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, cxImage,
   cxImageComboBox, ImgList, PngImageList, cxTextEdit, Grids, DBGrids, cxDBLookupComboBox,
   cxButtonEdit, cxGridCustomPopupMenu, cxGridPopupMenu, uViewGrid,
   uBizInventario, uBizAlmacenes, cxSpinEdit, uViewFiltroBase, TB2Item, TBX,

Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.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;

Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas

@@ -11,7 +11,7 @@ uses
   cxGridDBTableView, cxGrid, cxDBLookupComboBox, uViewGrid, StdCtrls,
   dxPSGlbl, dxPSUtl, dxPSEngn, dxPrnPg, dxBkgnd, dxWrap,
   dxPrnDev, dxPSCompsProvider, dxPSFillPatterns, dxPSEdgePatterns,
-  cxGridCustomPopupMenu, cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGridLnk,
+  cxGridCustomPopupMenu, cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk,
   uAlmacenesController, uBizAlmacenes, TB2Item, TBX, TB2Dock, TB2Toolbar,
   uDataModuleInventario, cxRichEdit, cxTextEdit, dxPgsDlg, TBXDkPanels,
   uViewFiltroBase, cxSpinEdit;

Source/Modulos/Inventario/Views/uViewInventario.pas

@@ -10,7 +10,7 @@ uses
   cxGridCustomView, cxGridCustomTableView, cxGridTableView,
   cxGridDBTableView, cxGrid, StdCtrls, ExtCtrls, cxLabel, dxPSGlbl, dxPSUtl,
   dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider, dxPSFillPatterns,
-  dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGridLnk, cxImage,
+  dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, cxImage,
   cxImageComboBox, ImgList, PngImageList, cxTextEdit, Grids, DBGrids, cxDBLookupComboBox,
   cxButtonEdit, cxGridCustomPopupMenu, cxGridPopupMenu, uViewGrid,
   uBizInventario, uBizAlmacenes, cxSpinEdit, uViewFiltroBase, TB2Item, TBX,

Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dpk

@@ -53,7 +53,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   PngComponentsD10,
   PNG_D10,

Source/Modulos/Pedidos a proveedor/Views/uViewElegirArticulosPedidosProveedor.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,

Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.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,
   uBizPedidosProveedor, cxCurrencyEdit, Forms, uViewFiltroBase, ActnList,

Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.dpk

@@ -53,7 +53,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   PngComponentsD10,
   PNG_D10,

Source/Modulos/Pedidos de cliente/Views/uViewElegirArticulosPedidosCliente.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;

Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.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,
   uBizPedidosCliente, cxCurrencyEdit, Forms, uViewFiltroBase, ActnList, TB2Item,

Source/Modulos/Recibos de cliente/Controller/RecibosCliente_controller.dpk

@@ -39,7 +39,7 @@ requires
   dxLayoutControlD10,
   dxPSCoreD10,
   dxPScxCommonD10,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dxPsPrVwAdvD10,
   GUISDK_D10,
   ccpack10,

Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.dpk

@@ -55,7 +55,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   PngComponentsD10,
   PNG_D10,

Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas

@@ -9,7 +9,7 @@ uses
   dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider,
   dxPSFillPatterns, dxPSEdgePatterns, cxImageComboBox, cxTextEdit, ImgList,
   PngImageList, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
-  dxPSCore, dxPScxCommon, dxPScxGridLnk, ActnList, uDADataTable,
+  dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, ActnList, uDADataTable,
   cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid,
   cxImage, Grids, DBGrids, uBizRecibosCliente, cxGridCustomPopupMenu,
   cxGridPopupMenu, cxCalendar, cxCurrencyEdit, uViewFiltroBase, TB2Item, TBX,

Source/Modulos/Recibos de proveedor/Controller/RecibosProveedor_controller.dpk

@@ -39,7 +39,7 @@ requires
   dxLayoutControlD10,
   dxPSCoreD10,
   dxPScxCommonD10,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dxPsPrVwAdvD10,
   GUISDK_D10,
   ccpack10,

Source/Modulos/Recibos de proveedor/Views/RecibosProveedor_view.dpk

@@ -52,7 +52,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   PngComponentsD10,
   PNG_D10,

Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.pas

@@ -9,7 +9,7 @@ uses
   dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider,
   dxPSFillPatterns, dxPSEdgePatterns, cxImageComboBox, cxTextEdit, ImgList,
   PngImageList, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
-  dxPSCore, dxPScxCommon, dxPScxGridLnk, ActnList, uDADataTable,
+  dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, ActnList, uDADataTable,
   cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid,
   cxImage, Grids, DBGrids, uBizRecibosProveedor, cxGridCustomPopupMenu,
   cxGridPopupMenu, cxCalendar, cxCurrencyEdit, uViewFiltroBase, TB2Item, TBX,

Source/Modulos/Referencias/Controller/Referencias_controller.dpk

@@ -40,7 +40,7 @@ requires
   dxLayoutControlD10,
   dxPSCoreD10,
   dxPScxCommonD10,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dxPsPrVwAdvD10,
   Referencias_model,
   Referencias_data;

Source/Modulos/Remesas de cliente/Views/RemesasCliente_view.dpk

@@ -47,7 +47,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   JvCoreD10R,
   Jcl,

Source/Modulos/Remesas de cliente/Views/uViewRecibosRemesaCliente_2.pas

@@ -9,7 +9,7 @@ uses
   dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider,
   dxPSFillPatterns, dxPSEdgePatterns, cxImageComboBox, cxTextEdit, ImgList,
   PngImageList, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
-  dxPSCore, dxPScxCommon, dxPScxGridLnk, ActnList, uDADataTable,
+  dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, ActnList, uDADataTable,
   cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid,
   cxImage, Grids, DBGrids, uBizRecibosCliente, cxGridCustomPopupMenu,
   cxGridPopupMenu, cxCalendar, cxCurrencyEdit, ComCtrls, ToolWin, dxPgsDlg,

Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.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;

Source/Modulos/Remesas de proveedor/Views/RemesasProveedor_view.dpk

@@ -47,7 +47,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   JvCoreD10R,
   Jcl,

Source/Modulos/Remesas de proveedor/Views/uViewRemesasProveedor.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;

Source/Modulos/Tienda web/Controller/TiendaWeb_controller.dpk

@@ -39,7 +39,7 @@ requires
   dxLayoutControlD10,
   dxPSCoreD10,
   dxPScxCommonD10,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dxPsPrVwAdvD10,
   DataAbstract_D10,
   Base,

Source/Modulos/Tienda web/Views/TiendaWeb_view.dpk

@@ -55,7 +55,7 @@ requires
   xmlrtl,
   vclactnband,
   vclshlctrls,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dclcxLibraryD10,
   PngComponentsD10,
   PNG_D10,

Source/Modulos/Tipos de IVA/Controller/TiposIVA_controller.dpk

@@ -39,7 +39,7 @@ requires
   dxLayoutControlD10,
   dxPSCoreD10,
   dxPScxCommonD10,
-  dxPScxGridLnkD10,
+  dxPScxGrid6LnkD10,
   dxPsPrVwAdvD10,
   DataAbstract_D10,
   Base,

Source/Servidor/FactuGES_Server.rc

@@ -16,7 +16,7 @@ BEGIN
               VALUE "FileVersion", "3.0.0.0\0"
               VALUE "ProductName", "FactuGES Server\0"
               VALUE "ProductVersion", "3.0.0.0\0"
-              VALUE "CompileDate", "lunes, 16 de junio de 2008 18:29\0"
+              VALUE "CompileDate", "lunes, 16 de junio de 2008 19:42\0"
          END
     END
     BLOCK "VarFileInfo"