From 44fa0b0199db6dd82849a817f3c23993a6c9750a Mon Sep 17 00:00:00 2001 From: david Date: Mon, 1 Feb 2010 19:24:25 +0000 Subject: [PATCH] =?UTF-8?q?Arreglos=20est=C3=A9ticos=20varios.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.Noviseda_FactuGES2/trunk@83 f33bb606-9f5c-448d-9c99-757f00063c96 --- Source/ApplicationBase/ApplicationBase.dpk | 2 +- Source/ApplicationBase/ApplicationBase.dproj | 9 +- Source/ApplicationBase/ApplicationBase.res | Bin 384 -> 4748 bytes .../Usuarios/Views/uEditorPerfilUsuario.dfm | 13 - .../Usuarios/Views/uEditorPerfilUsuario.pas | 7 +- .../Usuarios/Views/uEditorPerfilesUsuario.pas | 3 +- .../Usuarios/Views/uEditorUsuario.dfm | 35 +-- .../Usuarios/Views/uEditorUsuario.pas | 5 +- .../Usuarios/Views/uEditorUsuarios.dfm | 6 +- .../Usuarios/Views/uEditorUsuarios.pas | 2 +- .../Usuarios/Views/uViewPerfilUsuario.dfm | 26 +- .../Usuarios/Views/uViewPerfilUsuario.pas | 3 +- .../Usuarios/Views/uViewUsuario.dfm | 65 ++--- .../Usuarios/Views/uViewUsuario.pas | 3 +- Source/Base/Base.dproj | 102 +++---- .../uDataModuleConfiguracion.dfm | 4 +- Source/Base/uDMBase.dfm | 31 ++- Source/Base/uDMBase.pas | 4 +- Source/GUIBase/GUIBase.dproj | 52 ++-- Source/GUIBase/GUIBase.res | Bin 384 -> 4748 bytes Source/GUIBase/uEditorBase.dfm | 2 +- Source/GUIBase/uEditorDBItem.dfm | 4 + Source/GUIBase/uViewDetallesBase.dfm | 6 +- Source/GUIBase/uViewDetallesDTO.dfm | 109 ++++++-- Source/GUIBase/uViewFiltroBase.dfm | 19 +- Source/GUIBase/uViewFiltroBase.pas | 3 +- Source/GUIBase/uViewGrid.dfm | 4 +- Source/GUIBase/uViewTotales.dfm | 69 +---- Source/GUIBase/uViewTotales.pas | 4 +- .../AlbaranesCliente_Group.groupproj | 16 +- .../AlbaranesCliente_controller.dproj | 8 +- .../AlbaranesCliente_controller.res | Bin 384 -> 4748 bytes .../Data/uDataModuleAlbaranesCliente.dfm | 2 +- .../Data/uDataModuleAlbaranesCliente.pas | 7 +- .../Views/AlbaranesCliente_view.dproj | 54 ++-- .../Views/AlbaranesCliente_view.res | Bin 384 -> 4748 bytes .../Views/uEditorAlbaranCliente.dfm | 151 +++++----- .../Views/uEditorAlbaranCliente.pas | 9 +- .../Views/uEditorAlbaranDevCliente.dfm | 124 +++++---- .../Views/uEditorAlbaranDevCliente.pas | 5 +- .../Views/uEditorDetalleEtiqueta.dfm | 16 ++ .../Views/uEditorElegirAlbaranesCliente.dfm | 14 +- .../Views/uEditorElegirAlbaranesCliente.pas | 2 +- .../Views/uViewAlbaranCliente.dfm | 235 ++++++++-------- .../Views/uViewAlbaranCliente.pas | 5 +- .../Views/uViewAlbaranDevCliente.dfm | 31 ++- .../Views/uViewAlbaranDevCliente.pas | 3 +- .../Views/uViewAlbaranesCliente.dfm | 19 +- .../Views/uViewAlbaranesCliente.pas | 4 +- .../Views/uViewAlbaranesDevCliente.dfm | 16 +- .../Views/uViewAlbaranesDevCliente.pas | 5 +- .../uViewDatosYSeleccionClienteAlbaran.dfm | 67 ++--- .../uViewDatosYSeleccionClienteAlbaran.pas | 4 +- .../Views/uViewDetallesAlbaranCliente.dfm | 116 ++++---- .../Views/uViewDetallesAlbaranCliente.pas | 3 +- .../Views/uViewTotalesAlbaran.dfm | 37 ++- .../Views/uViewTotalesAlbaran.pas | 3 +- .../Almacenes/Views/uEditorAlmacen.dfm | 21 +- .../Almacenes/Views/uEditorAlmacen.pas | 9 +- .../Modulos/Almacenes/Views/uViewAlmacen.dfm | 44 +-- .../Modulos/Almacenes/Views/uViewAlmacen.pas | 3 +- .../Controller/Articulos_controller.dproj | 32 +-- .../Controller/Articulos_controller.res | Bin 384 -> 4748 bytes .../Articulos/Data/Articulos_data.dproj | 2 +- .../Modulos/Articulos/Data/Articulos_data.res | Bin 384 -> 4748 bytes .../Articulos/Model/Articulos_model.dproj | 20 +- .../Articulos/Model/Articulos_model.res | Bin 384 -> 4748 bytes .../Articulos/Views/Articulos_view.dproj | 16 +- .../Articulos/Views/Articulos_view.res | Bin 384 -> 4748 bytes .../Articulos/Views/uEditorArticulo.dfm | 19 +- .../Articulos/Views/uEditorArticulo.pas | 6 +- .../Modulos/Articulos/Views/uViewArticulo.dfm | 62 ++--- .../Modulos/Articulos/Views/uViewArticulo.pas | 3 +- .../Views/uViewDetallesArticulos.dfm | 145 +++++----- .../Views/uViewDetallesArticulosParaVenta.dfm | 93 +++++++ .../Controller/Contactos_controller.dproj | 60 ++-- .../Controller/Contactos_controller.res | Bin 384 -> 4748 bytes .../Contactos/Data/Contactos_data.dproj | 36 +-- .../Modulos/Contactos/Data/Contactos_data.res | Bin 384 -> 4748 bytes .../Contactos/Data/uDataModuleContactos.dfm | 2 +- .../Contactos/Data/uDataModuleContactos.pas | 2 +- .../Contactos/Model/Contactos_model.dproj | 22 +- .../Contactos/Model/Contactos_model.res | Bin 384 -> 4748 bytes .../Contactos/Views/Contactos_view.dproj | 114 ++++---- .../Contactos/Views/Contactos_view.res | Bin 384 -> 4748 bytes .../Contactos/Views/uEditorCliente.dfm | 193 ++++--------- .../Contactos/Views/uEditorClientes.dfm | 3 - .../Contactos/Views/uEditorClientes.pas | 8 +- .../Contactos/Views/uEditorContacto.dfm | 14 - .../Contactos/Views/uEditorContacto.pas | 2 - .../Contactos/Views/uEditorDatoBancario.dfm | 9 +- .../Contactos/Views/uEditorDatoBancario.pas | 2 +- .../Contactos/Views/uEditorDireccion.pas | 3 +- .../Contactos/Views/uEditorElegirClientes.dfm | 45 ++- .../Contactos/Views/uEditorElegirClientes.pas | 2 +- .../Contactos/Views/uEditorEmpleado.dfm | 234 ++++++---------- .../Contactos/Views/uEditorEmpleado.pas | 4 +- .../Contactos/Views/uEditorGruposEmpleado.dfm | 8 +- .../Contactos/Views/uEditorGruposEmpleado.pas | 2 +- .../Contactos/Views/uEditorPersonal.pas | 3 +- .../Contactos/Views/uEditorProveedor.dfm | 259 ++++++----------- .../Contactos/Views/uEditorProveedor.pas | 2 +- .../Contactos/Views/uEditorVendedor.dfm | 105 ++----- .../Contactos/Views/uEditorVendedor.pas | 3 +- .../Views/uViewClienteDatosComerciales.dfm | 34 +-- .../Views/uViewClienteDatosComerciales.pas | 2 +- .../Modulos/Contactos/Views/uViewContacto.dfm | 39 +-- .../Modulos/Contactos/Views/uViewContacto.pas | 2 +- .../Modulos/Contactos/Views/uViewEmpleado.dfm | 113 +++----- .../Modulos/Contactos/Views/uViewEmpleado.pas | 2 +- .../Contactos/Views/uViewProveedor.dfm | 100 +++---- .../Contactos/Views/uViewProveedor.pas | 3 +- .../Views/uViewProveedorDatosComerciales.dfm | 61 ++-- .../Views/uViewProveedorDatosComerciales.pas | 3 +- .../FacturasCliente_controller.dproj | 2 +- .../Controller/FacturasCliente_controller.res | Bin 384 -> 4748 bytes .../Data/FacturasCliente_data.res | Bin 384 -> 4748 bytes .../Model/FacturasCliente_model.dproj | 6 +- .../Model/FacturasCliente_model.res | Bin 384 -> 4748 bytes .../Plugin/FacturasCliente_plugin.dproj | 24 +- .../Plugin/FacturasCliente_plugin.res | Bin 384 -> 4748 bytes .../Views/FacturasCliente_view.dproj | 58 ++-- .../Views/FacturasCliente_view.res | Bin 384 -> 4748 bytes ...DialogOpcionesImpresionFacturasCliente.dfm | 10 +- .../Views/uEditorFacturaCliente.dfm | 261 +++++++++--------- .../Views/uEditorFacturasClienteReport.dfm | 1 + .../Views/uEditorFacturasClienteReport.pas | 7 +- ...ewDatosYSeleccionClienteFacturaCliente.dfm | 9 +- ...ewDatosYSeleccionClienteFacturaCliente.pas | 2 +- .../Views/uViewDetallesFacturaCliente.dfm | 111 +++----- .../Views/uViewFacturaCliente.dfm | 149 +++++----- .../Views/uViewFacturaCliente.pas | 5 +- .../Views/uViewTotalesFactura.dfm | 34 +-- .../GestorInformes_controller.dproj | 6 +- .../Controller/GestorInformes_controller.res | Bin 384 -> 4748 bytes .../Data/GestorInformes_data.dproj | 4 +- .../Data/GestorInformes_data.res | Bin 384 -> 4748 bytes .../Model/GestorInformes_model.dproj | 2 +- .../Model/GestorInformes_model.res | Bin 384 -> 4748 bytes .../Plugin/GestorInformes_plugin.dproj | 10 +- .../Plugin/GestorInformes_plugin.res | Bin 384 -> 4748 bytes .../Views/GestorInformes_view.dproj | 80 +++--- .../Views/GestorInformes_view.res | Bin 384 -> 4748 bytes .../Views/PedidosProveedor_view.dproj | 28 +- .../Views/PedidosProveedor_view.res | Bin 384 -> 4748 bytes .../PresupuestosCliente_controller.dproj | 12 +- .../PresupuestosCliente_controller.res | Bin 384 -> 4748 bytes .../Views/PresupuestosCliente_view.dproj | 48 ++-- .../Views/PresupuestosCliente_view.res | Bin 384 -> 4748 bytes .../Data/uDataModuleRecibosCliente.dfm | 2 +- .../Data/uDataModuleRecibosCliente.pas | 2 +- .../Views/RecibosCliente_view.dproj | 10 +- .../Views/RecibosCliente_view.res | Bin 384 -> 4748 bytes .../Views/uEditorReciboCliente.dfm | 51 ++-- .../Views/uEditorReciboCliente.pas | 3 +- .../Views/uViewReciboCliImportes.dfm | 21 +- .../Views/uViewReciboCliImportes.pas | 3 +- .../Views/uViewReciboCliente.dfm | 89 ++---- .../Views/uViewReciboCliente.pas | 4 +- .../Views/uViewRecibosCliCompensados.pas | 2 +- .../AlbCli_FacCli_relation.dproj | 8 +- .../AlbCli_FacCli_relation.res | Bin 384 -> 4748 bytes .../PreCli_FacCli_relation.dproj | 81 +----- .../PreCli_FacCli_relation.res | Bin 384 -> 4748 bytes .../Views/uEditorRemesaCliente.dfm | 68 ++--- .../Views/uEditorRemesaCliente.pas | 2 - .../Views/uViewRemesaCliente.dfm | 57 +--- .../Views/uViewRemesaCliente.pas | 4 +- 168 files changed, 2089 insertions(+), 2706 deletions(-) diff --git a/Source/ApplicationBase/ApplicationBase.dpk b/Source/ApplicationBase/ApplicationBase.dpk index c17b8d7..cdcb891 100644 --- a/Source/ApplicationBase/ApplicationBase.dpk +++ b/Source/ApplicationBase/ApplicationBase.dpk @@ -68,7 +68,7 @@ contains uViewPerfilUsuario in 'Usuarios\Views\uViewPerfilUsuario.pas' {frViewPerfilUsuario: TFrame}, uIEditorPerfilesUsuario in 'Usuarios\Controller\View\uIEditorPerfilesUsuario.pas', uIEditorPerfilUsuario in 'Usuarios\Controller\View\uIEditorPerfilUsuario.pas', - uEditorUsuarios in 'Usuarios\Views\uEditorUsuarios.pas' {fEditorUsuarios: TForm}, + uEditorUsuarios in 'Usuarios\Views\uEditorUsuarios.pas' {fEditorUsuarios: T}, uViewUsuarios in 'Usuarios\Views\uViewUsuarios.pas' {frViewUsuarios: TFrame}, uEditorUsuario in 'Usuarios\Views\uEditorUsuario.pas' {fEditorUsuario: TFrame}, uViewUsuario in 'Usuarios\Views\uViewUsuario.pas' {frViewUsuario: TFrame}, diff --git a/Source/ApplicationBase/ApplicationBase.dproj b/Source/ApplicationBase/ApplicationBase.dproj index 7f62faa..ce679d9 100644 --- a/Source/ApplicationBase/ApplicationBase.dproj +++ b/Source/ApplicationBase/ApplicationBase.dproj @@ -55,11 +55,10 @@ MainSource - - - - - + + + + diff --git a/Source/ApplicationBase/ApplicationBase.res b/Source/ApplicationBase/ApplicationBase.res index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644 GIT binary patch literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP delta 11 ScmeBCZD5|Duvteife`=|>;pCc diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorPerfilUsuario.dfm b/Source/ApplicationBase/Usuarios/Views/uEditorPerfilUsuario.dfm index 75d2b9f..35c4025 100644 --- a/Source/ApplicationBase/Usuarios/Views/uEditorPerfilUsuario.dfm +++ b/Source/ApplicationBase/Usuarios/Views/uEditorPerfilUsuario.dfm @@ -44,17 +44,4 @@ inherited fEditorPerfilUsuario: TfEditorPerfilUsuario Visible = False end end - object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList - Left = 248 - Top = 168 - object dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel - GroupOptions.CaptionOptions.Font.Charset = DEFAULT_CHARSET - GroupOptions.CaptionOptions.Font.Color = clWindowText - GroupOptions.CaptionOptions.Font.Height = -11 - GroupOptions.CaptionOptions.Font.Name = 'Tahoma' - GroupOptions.CaptionOptions.Font.Style = [fsBold] - GroupOptions.CaptionOptions.TextColor = clHighlight - GroupOptions.CaptionOptions.UseDefaultFont = False - end - end end diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorPerfilUsuario.pas b/Source/ApplicationBase/Usuarios/Views/uEditorPerfilUsuario.pas index 4c29c6c..3a0c73b 100644 --- a/Source/ApplicationBase/Usuarios/Views/uEditorPerfilUsuario.pas +++ b/Source/ApplicationBase/Usuarios/Views/uEditorPerfilUsuario.pas @@ -10,12 +10,11 @@ uses TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvNavigationPane, uIEditorPerfilUsuario, uUsuariosController, uCustomView, uViewBase, uViewPerfilUsuario, uBizUsuarios, dxLayoutLookAndFeels, cxControls, - cxContainer, cxEdit, cxLabel; + cxContainer, cxEdit, cxLabel, cxGraphics, cxLookAndFeels, uDMBase, + cxLookAndFeelPainters; type TfEditorPerfilUsuario = class(TfEditorDBItem, IEditorPerfilUsuario) - dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList; - dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel; private FController : IUsuariosController; FPerfilUsuario : IBizPerfilUsuario; @@ -67,7 +66,7 @@ begin begin Parent := pagGeneral; Align := alClient; - dxLayoutControlArticulo.LookAndFeel := dxLayoutOfficeLookAndFeel1; + dxLayoutControlArticulo.LookAndFeel := dmBase.dxLayoutSkinLookAndFeel; end; ViewPerfilUsuario := AViewPerfilUsuario; end; diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorPerfilesUsuario.pas b/Source/ApplicationBase/Usuarios/Views/uEditorPerfilesUsuario.pas index 11ff5d9..e91175f 100644 --- a/Source/ApplicationBase/Usuarios/Views/uEditorPerfilesUsuario.pas +++ b/Source/ApplicationBase/Usuarios/Views/uEditorPerfilesUsuario.pas @@ -9,7 +9,8 @@ uses PngImageList, StdActns, ActnList, ComCtrls, JvExComCtrls, JvStatusBar, SpTBXItem, TB2ExtItems, TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvNavigationPane, uIEditorPerfilesUsuario, - uUsuariosController, uBizUsuarios, uViewPerfilesUsuario; + uUsuariosController, uBizUsuarios, uViewPerfilesUsuario, StdCtrls, + TntStdCtrls, SpTBXEditors; type TfEditorPerfilesUsuario = class(TfEditorGridBase, IEditorPerfilesUsuario) diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorUsuario.dfm b/Source/ApplicationBase/Usuarios/Views/uEditorUsuario.dfm index cb7befc..d2706f8 100644 --- a/Source/ApplicationBase/Usuarios/Views/uEditorUsuario.dfm +++ b/Source/ApplicationBase/Usuarios/Views/uEditorUsuario.dfm @@ -50,71 +50,53 @@ inherited fEditorUsuario: TfEditorUsuario ExplicitHeight = 332 inherited dxLayoutControlArticulo: TdxLayoutControl Width = 887 - LookAndFeel = dxLayoutOfficeLookAndFeel1 + Height = 332 ExplicitWidth = 887 - DesignSize = ( - 887 - 249) - inherited PngSpeedButton3: TPngSpeedButton - Top = 84 - ExplicitTop = 84 - end + ExplicitHeight = 332 inherited eNombre: TcxDBTextEdit - Top = 30 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 30 ExplicitWidth = 164 Width = 164 end inherited eUsuario: TcxDBTextEdit - Top = 57 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 57 ExplicitWidth = 108 Width = 108 end inherited eMail: TcxDBHyperLinkEdit - Top = 84 Properties.Prefix = 'mailto:' Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 84 end inherited ePassword: TcxTextEdit - Top = 163 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 163 ExplicitWidth = 121 Width = 121 end inherited eConfirmarPassword: TcxTextEdit - Top = 190 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 190 ExplicitWidth = 372 Width = 372 end inherited cbPerfil: TcxComboBox - Top = 112 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitTop = 112 end end end @@ -155,17 +137,4 @@ inherited fEditorUsuario: TfEditorUsuario inherited StatusBarImages: TPngImageList Top = 312 end - object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList - Left = 336 - Top = 160 - object dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel - GroupOptions.CaptionOptions.Font.Charset = DEFAULT_CHARSET - GroupOptions.CaptionOptions.Font.Color = clWindowText - GroupOptions.CaptionOptions.Font.Height = -11 - GroupOptions.CaptionOptions.Font.Name = 'Tahoma' - GroupOptions.CaptionOptions.Font.Style = [fsBold] - GroupOptions.CaptionOptions.TextColor = clHighlight - GroupOptions.CaptionOptions.UseDefaultFont = False - end - end end diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorUsuario.pas b/Source/ApplicationBase/Usuarios/Views/uEditorUsuario.pas index 43acd31..77ae2d7 100644 --- a/Source/ApplicationBase/Usuarios/Views/uEditorUsuario.pas +++ b/Source/ApplicationBase/Usuarios/Views/uEditorUsuario.pas @@ -9,13 +9,12 @@ uses StdActns, ActnList, ComCtrls, JvExComCtrls, JvStatusBar, SpTBXItem, TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvNavigationPane, uIEditorUsuario, uUsuariosController, uCustomView, uViewBase, uViewUsuario, - uBizUsuarios, dxLayoutLookAndFeels, cxControls, cxContainer, cxEdit, cxLabel; + uBizUsuarios, dxLayoutLookAndFeels, cxControls, cxContainer, cxEdit, cxLabel, + cxGraphics, cxLookAndFeels, cxLookAndFeelPainters; type TfEditorUsuario = class(TfEditorDBItem, IEditorUsuario) frViewUsuario1: TfrViewUsuario; - dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList; - dxLayoutOfficeLookAndFeel1: TdxLayoutOfficeLookAndFeel; actCambiarPassword: TAction; TBXSubmenuItem2: TSpTBXSubmenuItem; TBXItem7: TSpTBXItem; diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorUsuarios.dfm b/Source/ApplicationBase/Usuarios/Views/uEditorUsuarios.dfm index e42cfe9..ddf5184 100644 --- a/Source/ApplicationBase/Usuarios/Views/uEditorUsuarios.dfm +++ b/Source/ApplicationBase/Usuarios/Views/uEditorUsuarios.dfm @@ -7,7 +7,10 @@ inherited fEditorUsuarios: TfEditorUsuarios PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader + Top = 75 Width = 840 + ExplicitLeft = 8 + ExplicitTop = 120 ExplicitWidth = 840 inherited Image1: TImage Left = 813 @@ -15,10 +18,11 @@ inherited fEditorUsuarios: TfEditorUsuarios end end inherited TBXDock: TSpTBXDock + Top = 0 Width = 840 ExplicitWidth = 840 inherited tbxMain: TSpTBXToolbar - ExplicitWidth = 521 + ExplicitWidth = 664 object TBXItem39: TSpTBXItem [8] Action = actCambiarPassword end diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorUsuarios.pas b/Source/ApplicationBase/Usuarios/Views/uEditorUsuarios.pas index d66b443..40f9ad6 100644 --- a/Source/ApplicationBase/Usuarios/Views/uEditorUsuarios.pas +++ b/Source/ApplicationBase/Usuarios/Views/uEditorUsuarios.pas @@ -10,7 +10,7 @@ uses TB2ExtItems, TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvNavigationPane, uCustomView, uViewBase, uViewGridBase, uViewGrid, uViewUsuarios, uIEditorUsuarios, uUsuariosController, - uBizUsuarios; + uBizUsuarios, StdCtrls, TntStdCtrls, SpTBXEditors; type TfEditorUsuarios = class(TfEditorGridBase, IEditorUsuarios) diff --git a/Source/ApplicationBase/Usuarios/Views/uViewPerfilUsuario.dfm b/Source/ApplicationBase/Usuarios/Views/uViewPerfilUsuario.dfm index d588715..df0dedc 100644 --- a/Source/ApplicationBase/Usuarios/Views/uViewPerfilUsuario.dfm +++ b/Source/ApplicationBase/Usuarios/Views/uViewPerfilUsuario.dfm @@ -7,22 +7,21 @@ inherited frViewPerfilUsuario: TfrViewPerfilUsuario Left = 0 Top = 0 Width = 509 - Height = 113 + Height = 97 Align = alTop ParentBackground = True TabOrder = 0 - AutoContentSizes = [acsWidth] + TabStop = False + LayoutLookAndFeel = dmBase.dxLayoutSkinLookAndFeel DesignSize = ( 509 - 113) + 97) object eNombre: TcxDBTextEdit Left = 68 Top = 28 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'USERNAME' DataBinding.DataSource = dsUsuario - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.Color = 14745599 Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard @@ -37,25 +36,28 @@ inherited frViewPerfilUsuario: TfrViewPerfilUsuario Width = 164 end object dxLayoutGroup1: TdxLayoutGroup - ShowCaption = False + AlignHorz = ahParentManaged + AlignVert = avTop + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True ShowBorder = False object dxLayoutGroup2: TdxLayoutGroup - AutoAligns = [] AlignHorz = ahClient AlignVert = avClient - Caption = 'Datos del perfil' + CaptionOptions.Text = 'Datos del perfil' + ButtonOptions.Buttons = <> object dxLayoutControlArticuloItem3: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Nombre:' + CaptionOptions.Text = 'Nombre:' Control = eNombre ControlOptions.ShowBorder = False end end object dxLayoutControlArticuloGroup3: TdxLayoutGroup - Caption = 'New Group' - ShowCaption = False + CaptionOptions.Text = 'New Group' + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> LayoutDirection = ldHorizontal ShowBorder = False end diff --git a/Source/ApplicationBase/Usuarios/Views/uViewPerfilUsuario.pas b/Source/ApplicationBase/Usuarios/Views/uViewPerfilUsuario.pas index f3deec1..90841e0 100644 --- a/Source/ApplicationBase/Usuarios/Views/uViewPerfilUsuario.pas +++ b/Source/ApplicationBase/Usuarios/Views/uViewPerfilUsuario.pas @@ -8,7 +8,8 @@ uses dxLayoutControl, cxCurrencyEdit, uCustomView, cxControls, DB, uDAInterfaces, uDADataTable, ActnList, cxCheckBox, cxDBEdit, cxMaskEdit, cxSpinEdit, cxHyperLinkEdit, cxContainer, cxEdit, cxTextEdit, Buttons, PngSpeedButton, - uBizUsuarios, cxDropDownEdit; + uBizUsuarios, cxDropDownEdit, uDMBase, cxLookAndFeels, cxLookAndFeelPainters, + dxLayoutcxEditAdapters; type IViewPerfilUsuario = interface(IViewBase) diff --git a/Source/ApplicationBase/Usuarios/Views/uViewUsuario.dfm b/Source/ApplicationBase/Usuarios/Views/uViewUsuario.dfm index d06a6c1..772bbf9 100644 --- a/Source/ApplicationBase/Usuarios/Views/uViewUsuario.dfm +++ b/Source/ApplicationBase/Usuarios/Views/uViewUsuario.dfm @@ -9,15 +9,16 @@ inherited frViewUsuario: TfrViewUsuario Left = 0 Top = 0 Width = 509 - Height = 249 - Align = alTop + Height = 275 + Align = alClient ParentBackground = True TabOrder = 0 TabStop = False - AutoContentSizes = [acsWidth] + LayoutLookAndFeel = dmBase.dxLayoutSkinLookAndFeel + ExplicitHeight = 249 DesignSize = ( 509 - 249) + 275) object PngSpeedButton3: TPngSpeedButton Left = 335 Top = 82 @@ -48,8 +49,6 @@ inherited frViewUsuario: TfrViewUsuario Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'USERNAME' DataBinding.DataSource = dsUsuario - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.Color = 14745599 Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard @@ -72,8 +71,6 @@ inherited frViewUsuario: TfrViewUsuario Top = 55 DataBinding.DataField = 'LOGIN' DataBinding.DataSource = dsUsuario - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.Color = 14745599 Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard @@ -101,8 +98,6 @@ inherited frViewUsuario: TfrViewUsuario Properties.OnEditValueChanged = eMailPropertiesEditValueChanged Properties.OnValidate = eMailPropertiesValidate Properties.Prefix = 'mailto:' - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True @@ -124,8 +119,6 @@ inherited frViewUsuario: TfrViewUsuario Top = 167 Properties.EchoMode = eemPassword Properties.PasswordChar = '*' - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' @@ -146,8 +139,6 @@ inherited frViewUsuario: TfrViewUsuario Top = 194 Properties.EchoMode = eemPassword Properties.PasswordChar = '*' - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' @@ -171,13 +162,9 @@ inherited frViewUsuario: TfrViewUsuario Properties.ImmediateUpdateText = True Properties.PostPopupValueOnTab = True Properties.OnValidate = cbPerfilPropertiesValidate - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' - Style.ButtonStyle = bts3D - Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True StyleDisabled.LookAndFeel.SkinName = '' @@ -191,68 +178,72 @@ inherited frViewUsuario: TfrViewUsuario Width = 194 end object dxLayoutGroup1: TdxLayoutGroup - ShowCaption = False + AlignHorz = ahParentManaged + AlignVert = avClient + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True ShowBorder = False object dxLayoutGroup2: TdxLayoutGroup - AutoAligns = [] AlignHorz = ahClient - AlignVert = avClient - Caption = 'Datos del usuario' + AlignVert = avTop + CaptionOptions.Text = 'Datos del usuario' + ButtonOptions.Buttons = <> object dxLayoutControlArticuloItem3: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Nombre completo:' + CaptionOptions.Text = 'Nombre completo:' Control = eNombre ControlOptions.ShowBorder = False end object dxLayoutControlArticuloItem8: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Usuario:' + CaptionOptions.Text = 'Usuario:' Control = eUsuario ControlOptions.ShowBorder = False end object dxLayoutControlArticuloGroup2: TdxLayoutGroup - ShowCaption = False + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True LayoutDirection = ldHorizontal ShowBorder = False object dxLayoutControlArticuloItem4: TdxLayoutItem - AutoAligns = [aaVertical] - Caption = 'Correo electr'#243'nico' + AlignHorz = ahLeft + CaptionOptions.Text = 'Correo electr'#243'nico' Control = eMail ControlOptions.ShowBorder = False end object dxLayoutControlArticuloItem5: TdxLayoutItem - ShowCaption = False + CaptionOptions.Visible = False Control = PngSpeedButton3 ControlOptions.ShowBorder = False end end object dxLayoutControlArticuloItem1: TdxLayoutItem - AutoAligns = [aaVertical] - Caption = 'Perfil de usuario:' + AlignHorz = ahLeft + CaptionOptions.Text = 'Perfil de usuario:' Control = cbPerfil ControlOptions.ShowBorder = False end end object dxLayoutControlArticuloGroup5: TdxLayoutGroup - Caption = 'Seguridad' + CaptionOptions.Text = 'Seguridad' + ButtonOptions.Buttons = <> object dxLayoutControlArticuloItem11: TdxLayoutItem - Caption = 'Contrase'#241'a:' + CaptionOptions.Text = 'Contrase'#241'a:' Control = ePassword ControlOptions.ShowBorder = False end object dxLayoutControlArticuloItem12: TdxLayoutItem - Caption = 'Confirmar contrase'#241'a:' + CaptionOptions.Text = 'Confirmar contrase'#241'a:' Control = eConfirmarPassword ControlOptions.ShowBorder = False end end object dxLayoutControlArticuloGroup3: TdxLayoutGroup - Caption = 'New Group' - ShowCaption = False + CaptionOptions.Text = 'New Group' + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> LayoutDirection = ldHorizontal ShowBorder = False end diff --git a/Source/ApplicationBase/Usuarios/Views/uViewUsuario.pas b/Source/ApplicationBase/Usuarios/Views/uViewUsuario.pas index 66f47e5..821865b 100644 --- a/Source/ApplicationBase/Usuarios/Views/uViewUsuario.pas +++ b/Source/ApplicationBase/Usuarios/Views/uViewUsuario.pas @@ -8,7 +8,8 @@ uses dxLayoutControl, cxCurrencyEdit, uCustomView, cxControls, DB, uDAInterfaces, uDADataTable, ActnList, cxCheckBox, cxDBEdit, cxMaskEdit, cxSpinEdit, cxHyperLinkEdit, cxContainer, cxEdit, cxTextEdit, Buttons, PngSpeedButton, - uBizUsuarios, cxDropDownEdit, ExtCtrls; + uBizUsuarios, cxDropDownEdit, ExtCtrls, uDMBase, cxLookAndFeels, + cxLookAndFeelPainters, dxLayoutcxEditAdapters; type IViewUsuario = interface(IViewBase) diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 5ddf5f3..63228d5 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -54,58 +54,58 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
TForm diff --git a/Source/Base/Configuracion/uDataModuleConfiguracion.dfm b/Source/Base/Configuracion/uDataModuleConfiguracion.dfm index 2f98e4e..37418ba 100644 --- a/Source/Base/Configuracion/uDataModuleConfiguracion.dfm +++ b/Source/Base/Configuracion/uDataModuleConfiguracion.dfm @@ -1,7 +1,7 @@ object dmConfiguracion: TdmConfiguracion OldCreateOrder = False - Height = 160 - Width = 100 + Height = 104 + Width = 109 object RORemoteService: TRORemoteService ServiceName = 'srvConfiguracion' Left = 24 diff --git a/Source/Base/uDMBase.dfm b/Source/Base/uDMBase.dfm index ebd0515..2384927 100644 --- a/Source/Base/uDMBase.dfm +++ b/Source/Base/uDMBase.dfm @@ -146,7 +146,22 @@ object dmBase: TdmBase Bitmap = {} end object StyleManager: TJvNavPaneStyleManager + Colors.ButtonColorFrom = clWhite + Colors.ButtonColorTo = 12435133 + Colors.ButtonHotColorFrom = 13009540 + Colors.ButtonHotColorTo = 13009540 + Colors.ButtonSelectedColorFrom = 14602190 + Colors.ButtonSelectedColorTo = 14602190 Colors.ButtonSeparatorColor = 2987520 + Colors.SplitterColorFrom = 13026246 + Colors.SplitterColorTo = 9211532 + Colors.DividerColorFrom = 15725551 + Colors.DividerColorTo = 13026246 + Colors.HeaderColorFrom = 8684164 + Colors.HeaderColorTo = 8684164 + Colors.FrameColor = 8684676 + Colors.ToolPanelHeaderColorFrom = clWhite + Colors.ToolPanelHeaderColorTo = 12435133 Fonts.NavPanelFont.Charset = DEFAULT_CHARSET Fonts.NavPanelFont.Color = clWindowText Fonts.NavPanelFont.Height = -13 @@ -168,18 +183,18 @@ object dmBase: TdmBase Fonts.HeaderFont.Name = 'Arial' Fonts.HeaderFont.Style = [fsBold] Theme = nptCustom - Left = 104 + Left = 88 Top = 80 end object JvLogFile: TJvLogFile - Left = 184 + Left = 160 Top = 80 end object dxPrintStyleManager1: TdxPrintStyleManager CurrentStyle = dxPrintStyleManager1Style1 Version = 0 - Left = 280 - Top = 16 + Left = 232 + Top = 80 object dxPrintStyleManager1Style1: TdxPSPrintStyle PrinterPage.DMPaper = 9 PrinterPage.Footer = 6350 @@ -211,4 +226,12 @@ object dmBase: TdmBase BuiltInStyle = True end end + object dxLayoutLookAndFeelList: TdxLayoutLookAndFeelList + Left = 88 + Top = 16 + object dxLayoutSkinLookAndFeel: TdxLayoutSkinLookAndFeel + LookAndFeel.Kind = lfStandard + LookAndFeel.NativeStyle = True + end + end end diff --git a/Source/Base/uDMBase.pas b/Source/Base/uDMBase.pas index 6e569e6..9c53803 100644 --- a/Source/Base/uDMBase.pas +++ b/Source/Base/uDMBase.pas @@ -7,7 +7,7 @@ uses Classes, ImgList, SysUtils, DataAbstract4_Intf, uDADataTable, JvAppStorage, JvAppRegistryStorage, JvComponentBase, JvLogFile, dxPSGlbl, dxPSUtl, dxPrnPg, - dxBkgnd, dxWrap, dxPrnDev, dxPgsDlg, dxPSCore; + dxBkgnd, dxWrap, dxPrnDev, dxPgsDlg, dxPSCore, dxLayoutLookAndFeels; type TdmBase = class(TDataModule) @@ -16,6 +16,8 @@ type JvLogFile: TJvLogFile; dxPrintStyleManager1: TdxPrintStyleManager; dxPrintStyleManager1Style1: TdxPSPrintStyle; + dxLayoutLookAndFeelList: TdxLayoutLookAndFeelList; + dxLayoutSkinLookAndFeel: TdxLayoutSkinLookAndFeel; procedure DAClientDataModuleCreate(Sender: TObject); procedure DataModuleDestroy(Sender: TObject); private diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index 89f5ab3..23e1da5 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -59,32 +59,32 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644 GIT binary patch literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP delta 11 ScmeBCZD5|Duvteife`=|>;pCc diff --git a/Source/GUIBase/uEditorBase.dfm b/Source/GUIBase/uEditorBase.dfm index f7f548c..746cbba 100644 --- a/Source/GUIBase/uEditorBase.dfm +++ b/Source/GUIBase/uEditorBase.dfm @@ -76,7 +76,7 @@ object fEditorBase: TfEditorBase Left = 0 Top = 23 ChevronHint = 'M'#225's botones|' - DockMode = dmCannotFloatOrChangeDocks + DockMode = dmCannotFloat DockPos = -23 DockRow = 1 Images = SmallImages diff --git a/Source/GUIBase/uEditorDBItem.dfm b/Source/GUIBase/uEditorDBItem.dfm index 3c5ed1a..48bbe6f 100644 --- a/Source/GUIBase/uEditorDBItem.dfm +++ b/Source/GUIBase/uEditorDBItem.dfm @@ -77,6 +77,10 @@ inherited fEditorDBItem: TfEditorDBItem TabOrder = 2 object pagGeneral: TTabSheet Caption = 'General' + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 end end inherited StatusBar: TJvStatusBar diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm index 762cec7..f349432 100644 --- a/Source/GUIBase/uViewDetallesBase.dfm +++ b/Source/GUIBase/uViewDetallesBase.dfm @@ -129,19 +129,19 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object ToolButton9: TToolButton Left = 0 - Top = 49 + Top = 52 Action = RichEditAlignLeft1 AutoSize = True end object ToolButton10: TToolButton Left = 145 - Top = 49 + Top = 52 Action = RichEditAlignCenter1 AutoSize = True end object ToolButton11: TToolButton Left = 270 - Top = 49 + Top = 52 Action = RichEditAlignRight1 AutoSize = True end diff --git a/Source/GUIBase/uViewDetallesDTO.dfm b/Source/GUIBase/uViewDetallesDTO.dfm index 3cd9f00..c960061 100644 --- a/Source/GUIBase/uViewDetallesDTO.dfm +++ b/Source/GUIBase/uViewDetallesDTO.dfm @@ -1,51 +1,103 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO inherited ToolBar1: TToolBar + Height = 73 + ExplicitHeight = 73 inherited ToolButton1: TToolButton ExplicitWidth = 109 end - inherited ToolButton2: TToolButton + inherited ToolButton3: TToolButton [1] Left = 109 ExplicitLeft = 109 + end + inherited ToolButton2: TToolButton [2] + Left = 164 + ExplicitLeft = 164 ExplicitWidth = 114 end - inherited ToolButton3: TToolButton - Left = 223 - ExplicitLeft = 223 - end - inherited ToolButton4: TToolButton + inherited ToolButton14: TToolButton [3] Left = 278 + Top = 0 ExplicitLeft = 278 + ExplicitTop = 0 end - inherited ToolButton14: TToolButton - Left = 334 - ExplicitLeft = 334 + inherited ToolButton4: TToolButton [4] end - inherited FontSize: TEdit + inherited ToolButton9: TToolButton [5] + Left = 56 + Top = 22 + ExplicitLeft = 56 + ExplicitTop = 22 + end + inherited ToolButton10: TToolButton [6] + Left = 201 + Top = 22 + ExplicitLeft = 201 + ExplicitTop = 22 + end + inherited FontName: TJvFontComboBox [7] + Left = 326 + Top = 22 + ExplicitLeft = 326 + ExplicitTop = 22 + end + inherited UpDown1: TUpDown [8] + Left = 471 + Top = 22 + ExplicitLeft = 471 + ExplicitTop = 22 + end + inherited ToolButton13: TToolButton [9] + Left = 0 + Top = 22 + Wrap = True + ExplicitLeft = 0 + ExplicitTop = 22 + ExplicitHeight = 30 + end + inherited ToolButton6: TToolButton [10] + Left = 0 + Top = 52 + ExplicitLeft = 0 + ExplicitTop = 52 + end + inherited ToolButton7: TToolButton [11] + Left = 66 + Top = 52 + ExplicitLeft = 66 + ExplicitTop = 52 + end + inherited FontSize: TEdit [12] + Left = 133 + Top = 52 Width = 41 + ExplicitLeft = 133 + ExplicitTop = 52 ExplicitWidth = 41 end - inherited UpDown1: TUpDown - Left = 186 - ExplicitLeft = 186 + inherited ToolButton12: TToolButton [13] + Left = 174 + Top = 52 + ExplicitLeft = 174 + ExplicitTop = 52 end - inherited ToolButton13: TToolButton - Left = 202 - ExplicitLeft = 202 + inherited ToolButton11: TToolButton [14] + Left = 182 + Top = 52 + ExplicitLeft = 182 + ExplicitTop = 52 end - inherited ToolButton6: TToolButton - Left = 210 - ExplicitLeft = 210 - end - inherited ToolButton7: TToolButton - Left = 276 - ExplicitLeft = 276 - end - inherited ToolButton8: TToolButton - Left = 343 - ExplicitLeft = 343 + inherited ToolButton8: TToolButton [15] + Left = 323 + Top = 52 + ExplicitLeft = 323 + ExplicitTop = 52 end end inherited cxGrid: TcxGrid + Top = 99 + Height = 205 + ExplicitTop = 126 + ExplicitHeight = 178 inherited cxGridView: TcxGridDBTableView object cxGridViewDESCUENTO: TcxGridDBColumn [7] Caption = 'Dto' @@ -85,6 +137,9 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO end end end + inherited TBXDock1: TSpTBXDock + Top = 73 + end inherited ActionListContenido: TActionList inherited actAnadir: TAction Caption = 'A'#241'adir concepto' diff --git a/Source/GUIBase/uViewFiltroBase.dfm b/Source/GUIBase/uViewFiltroBase.dfm index 2d4da3c..9cf2843 100644 --- a/Source/GUIBase/uViewFiltroBase.dfm +++ b/Source/GUIBase/uViewFiltroBase.dfm @@ -24,12 +24,11 @@ inherited frViewFiltroBase: TfrViewFiltroBase ParentBackground = True TabOrder = 0 TabStop = False + LayoutLookAndFeel = dmBase.dxLayoutSkinLookAndFeel object txtFiltroTodo: TcxTextEdit Left = 87 Top = 10 Properties.OnChange = OnCamposFiltroChange - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True @@ -50,14 +49,10 @@ inherited frViewFiltroBase: TfrViewFiltroBase Left = 87 Top = 37 Properties.OnChange = OnCamposFiltroChange - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' - Style.ButtonStyle = bts3D - Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True StyleDisabled.LookAndFeel.SkinName = '' @@ -74,14 +69,10 @@ inherited frViewFiltroBase: TfrViewFiltroBase Left = 198 Top = 37 Properties.OnChange = OnCamposFiltroChange - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' - Style.ButtonStyle = bts3D - Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True StyleDisabled.LookAndFeel.SkinName = '' @@ -99,12 +90,8 @@ inherited frViewFiltroBase: TfrViewFiltroBase Top = 37 Properties.DropDownListStyle = lsEditFixedList Properties.OnChange = OnCamposFiltroChange - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.SkinName = '' - Style.ButtonStyle = bts3D - Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' @@ -190,10 +177,6 @@ inherited frViewFiltroBase: TfrViewFiltroBase end end end - object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList - Left = 136 - Top = 16 - end object ActionList1: TActionList Images = PngImageList Left = 280 diff --git a/Source/GUIBase/uViewFiltroBase.pas b/Source/GUIBase/uViewFiltroBase.pas index c61b9b3..d6cec00 100644 --- a/Source/GUIBase/uViewFiltroBase.pas +++ b/Source/GUIBase/uViewFiltroBase.pas @@ -7,7 +7,7 @@ uses Dialogs, StdCtrls, Buttons, cxRadioGroup, SpTBXDkPanels, TB2ExtItems, SpTBXItem, TB2Item, TB2Dock, TB2Toolbar, ActnList, ImgList, PngImageList, cxGraphics, dxLayoutLookAndFeels, dxLayoutControl, cxDropDownEdit, cxMaskEdit, - cxCalendar, cxContainer, cxEdit, cxTextEdit, cxControls, uViewBase, + cxCalendar, cxContainer, cxEdit, cxTextEdit, cxControls, uViewBase, uDMBase, cxLookAndFeels, cxLookAndFeelPainters, dxLayoutcxEditAdapters; type @@ -29,7 +29,6 @@ type TfrViewFiltroBase = class(TfrViewBase, IViewFiltroBase) dxLayoutControl1Group_Root: TdxLayoutGroup; dxLayoutControl1: TdxLayoutControl; - dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList; dxLayoutControl1Item1: TdxLayoutItem; txtFiltroTodo: TcxTextEdit; dxLayoutControl1Item2: TdxLayoutItem; diff --git a/Source/GUIBase/uViewGrid.dfm b/Source/GUIBase/uViewGrid.dfm index b837a68..094eff6 100644 --- a/Source/GUIBase/uViewGrid.dfm +++ b/Source/GUIBase/uViewGrid.dfm @@ -18,7 +18,6 @@ inherited frViewGrid: TfrViewGrid TabOrder = 0 LookAndFeel.Kind = lfStandard LookAndFeel.NativeStyle = True - ExplicitHeight = 211 object cxGridView: TcxGridDBTableView OnDblClick = cxGridViewDblClick NavigatorButtons.ConfirmDelete = False @@ -202,7 +201,7 @@ inherited frViewGrid: TfrViewGrid PrinterPage.ScaleMode = smFit PrinterPage._dxMeasurementUnits_ = 0 PrinterPage._dxLastMU_ = 2 - ReportDocument.CreationDate = 40200.519988935190000000 + ReportDocument.CreationDate = 40210.831000844900000000 StyleManager = dmBase.dxPrintStyleManager1 OptionsCards.Shadow.Depth = 0 OptionsExpanding.ExpandGroupRows = True @@ -226,6 +225,7 @@ inherited frViewGrid: TfrViewGrid end end object dxPSEngineController1: TdxPSEngineController + Active = True DialogsLookAndFeel.Kind = lfStandard DialogsLookAndFeel.NativeStyle = True PreviewDialogStyle = 'Advanced' diff --git a/Source/GUIBase/uViewTotales.dfm b/Source/GUIBase/uViewTotales.dfm index c2ad455..4eb788f 100644 --- a/Source/GUIBase/uViewTotales.dfm +++ b/Source/GUIBase/uViewTotales.dfm @@ -1,8 +1,8 @@ inherited frViewTotales: TfrViewTotales - Width = 788 + Width = 451 Height = 233 Align = alBottom - ExplicitWidth = 788 + ExplicitWidth = 451 ExplicitHeight = 233 object Bevel5: TBevel Left = 666 @@ -15,7 +15,7 @@ inherited frViewTotales: TfrViewTotales AlignWithMargins = True Left = 0 Top = 0 - Width = 788 + Width = 451 Height = 233 Margins.Left = 0 Margins.Top = 0 @@ -25,17 +25,16 @@ inherited frViewTotales: TfrViewTotales ParentBackground = True TabOrder = 0 TabStop = False - ExplicitWidth = 451 - ExplicitHeight = 360 + LayoutLookAndFeel = dmBase.dxLayoutSkinLookAndFeel object Bevel3: TBevel - Left = 329 + Left = 278 Top = 28 Width = 3 Height = 100 Shape = bsRightLine end object Bevel4: TBevel - Left = 442 + Left = 376 Top = 70 Width = 342 Height = 9 @@ -53,8 +52,6 @@ inherited frViewTotales: TfrViewTotales Properties.ReadOnly = True Properties.UseLeftAlignmentOnEditing = False Properties.UseThousandSeparator = True - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.Font.Charset = DEFAULT_CHARSET Style.Font.Color = clWindowText Style.Font.Height = -11 @@ -77,7 +74,7 @@ inherited frViewTotales: TfrViewTotales Width = 87 end object ImporteIVA: TcxDBCurrencyEdit - Left = 513 + Left = 447 Top = 105 AutoSize = False DataBinding.DataField = 'IMPORTE_IVA' @@ -87,8 +84,6 @@ inherited frViewTotales: TfrViewTotales Properties.ReadOnly = True Properties.UseLeftAlignmentOnEditing = False Properties.UseThousandSeparator = True - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.Font.Charset = DEFAULT_CHARSET Style.Font.Color = clWindowText Style.Font.Height = -11 @@ -111,7 +106,7 @@ inherited frViewTotales: TfrViewTotales Width = 20 end object ImporteTotal: TcxDBCurrencyEdit - Left = 442 + Left = 376 Top = 159 AutoSize = False DataBinding.DataField = 'IMPORTE_TOTAL' @@ -121,8 +116,6 @@ inherited frViewTotales: TfrViewTotales Properties.ReadOnly = True Properties.UseLeftAlignmentOnEditing = False Properties.UseThousandSeparator = True - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.Font.Charset = DEFAULT_CHARSET Style.Font.Color = clWindowText Style.Font.Height = -12 @@ -156,8 +149,6 @@ inherited frViewTotales: TfrViewTotales Properties.DisplayFormat = ',0.00 %;-,0.00 %' Properties.ImmediatePost = True Properties.MaxValue = 100.000000000000000000 - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.Font.Charset = DEFAULT_CHARSET Style.Font.Color = clWindowText Style.Font.Height = -11 @@ -167,7 +158,6 @@ inherited frViewTotales: TfrViewTotales Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText - Style.ButtonStyle = bts3D Style.IsFontAssigned = True StyleDisabled.LookAndFeel.NativeStyle = True StyleDisabled.LookAndFeel.SkinName = '' @@ -180,7 +170,7 @@ inherited frViewTotales: TfrViewTotales Width = 65 end object edtIVA: TcxDBSpinEdit - Left = 442 + Left = 376 Top = 105 AutoSize = False DataBinding.DataField = 'IVA' @@ -191,8 +181,6 @@ inherited frViewTotales: TfrViewTotales Properties.DisplayFormat = ',0.00 %;-,0.00 %' Properties.ImmediatePost = True Properties.MaxValue = 100.000000000000000000 - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.Font.Charset = DEFAULT_CHARSET Style.Font.Color = clWindowText Style.Font.Height = -11 @@ -203,7 +191,6 @@ inherited frViewTotales: TfrViewTotales Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText - Style.ButtonStyle = bts3D Style.IsFontAssigned = True StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True @@ -220,7 +207,7 @@ inherited frViewTotales: TfrViewTotales Width = 65 end object ImporteBase: TcxDBCurrencyEdit - Left = 442 + Left = 376 Top = 28 AutoSize = False DataBinding.DataField = 'BASE_IMPONIBLE' @@ -230,8 +217,6 @@ inherited frViewTotales: TfrViewTotales Properties.ReadOnly = True Properties.UseLeftAlignmentOnEditing = False Properties.UseThousandSeparator = True - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.Font.Charset = DEFAULT_CHARSET Style.Font.Color = clWindowText Style.Font.Height = -11 @@ -254,7 +239,7 @@ inherited frViewTotales: TfrViewTotales Width = 91 end object edtRE: TcxDBSpinEdit - Left = 442 + Left = 376 Top = 132 AutoSize = False DataBinding.DataField = 'RE' @@ -265,8 +250,6 @@ inherited frViewTotales: TfrViewTotales Properties.DisplayFormat = ',0.00 %;-,0.00 %' Properties.ImmediatePost = True Properties.MaxValue = 100.000000000000000000 - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.Font.Charset = DEFAULT_CHARSET Style.Font.Color = clWindowText Style.Font.Height = -11 @@ -277,7 +260,6 @@ inherited frViewTotales: TfrViewTotales Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' Style.TextColor = clWindowText - Style.ButtonStyle = bts3D Style.IsFontAssigned = True StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True @@ -294,7 +276,7 @@ inherited frViewTotales: TfrViewTotales Width = 65 end object ImporteRE: TcxDBCurrencyEdit - Left = 513 + Left = 447 Top = 132 AutoSize = False DataBinding.DataField = 'IMPORTE_RE' @@ -304,8 +286,6 @@ inherited frViewTotales: TfrViewTotales Properties.ReadOnly = True Properties.UseLeftAlignmentOnEditing = False Properties.UseThousandSeparator = True - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.Font.Charset = DEFAULT_CHARSET Style.Font.Color = clWindowText Style.Font.Height = -11 @@ -338,8 +318,6 @@ inherited frViewTotales: TfrViewTotales Properties.ReadOnly = True Properties.UseLeftAlignmentOnEditing = False Properties.UseThousandSeparator = True - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.Font.Charset = DEFAULT_CHARSET Style.Font.Color = clWindowText Style.Font.Height = -11 @@ -372,8 +350,6 @@ inherited frViewTotales: TfrViewTotales Properties.ReadOnly = False Properties.UseLeftAlignmentOnEditing = False Properties.UseThousandSeparator = True - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.Font.Charset = DEFAULT_CHARSET Style.Font.Color = clWindowText Style.Font.Height = -11 @@ -410,14 +386,10 @@ inherited frViewTotales: TfrViewTotales Properties.ListOptions.ShowHeader = False Properties.ListOptions.SyncMode = True Properties.ListSource = dsTiposIVA - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True Style.LookAndFeel.SkinName = '' - Style.ButtonStyle = bts3D - Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True StyleDisabled.LookAndFeel.SkinName = '' @@ -431,7 +403,7 @@ inherited frViewTotales: TfrViewTotales Width = 20 end object bTiposIVA: TButton - Left = 181 + Left = 130 Top = 109 Width = 132 Height = 21 @@ -450,8 +422,6 @@ inherited frViewTotales: TfrViewTotales Properties.NullStyle = nssUnchecked Properties.ValueChecked = 1 Properties.ValueUnchecked = 0 - Style.BorderColor = clWindowFrame - Style.BorderStyle = ebs3D Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True @@ -631,7 +601,6 @@ inherited frViewTotales: TfrViewTotales object dxLayoutControl1Item3: TdxLayoutItem AlignHorz = ahClient CaptionOptions.Text = 'Importe total:' - LayoutLookAndFeel = LookAndFeelIMPORTE_TOTAL Control = ImporteTotal ControlOptions.ShowBorder = False end @@ -647,18 +616,6 @@ inherited frViewTotales: TfrViewTotales Left = 8 Top = 8 end - object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList - Left = 40 - Top = 8 - object LookAndFeelIMPORTE_TOTAL: TdxLayoutStandardLookAndFeel - ItemOptions.CaptionOptions.Font.Charset = DEFAULT_CHARSET - ItemOptions.CaptionOptions.Font.Color = clWindowText - ItemOptions.CaptionOptions.Font.Height = -12 - ItemOptions.CaptionOptions.Font.Name = 'Tahoma' - ItemOptions.CaptionOptions.Font.Style = [fsBold] - ItemOptions.CaptionOptions.UseDefaultFont = False - end - end object dsTiposIVA: TDADataSource Left = 8 Top = 40 diff --git a/Source/GUIBase/uViewTotales.pas b/Source/GUIBase/uViewTotales.pas index fc45b6f..78e24c3 100644 --- a/Source/GUIBase/uViewTotales.pas +++ b/Source/GUIBase/uViewTotales.pas @@ -5,7 +5,7 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, uViewBase, ExtCtrls, StdCtrls, DB, uDADataTable, cxGraphics, - cxTextEdit, cxMaskEdit, cxDropDownEdit, cxDBEdit, cxControls, + cxTextEdit, cxMaskEdit, cxDropDownEdit, cxDBEdit, cxControls, uDMBase, cxContainer, cxEdit, cxLabel, cxDBLabel, cxCurrencyEdit, cxSpinEdit, ComCtrls, dxLayoutControl, dxLayoutLookAndFeels, cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, cxCheckBox, uDAInterfaces, cxCalendar, cxLookAndFeels, @@ -48,8 +48,6 @@ type Bevel4: TBevel; dxLayoutControl1Group9: TdxLayoutGroup; dxLayoutControl1Group8: TdxLayoutGroup; - dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList; - LookAndFeelIMPORTE_TOTAL: TdxLayoutStandardLookAndFeel; dxLayoutControl1Item11: TdxLayoutItem; eIVA: TcxDBLookupComboBox; dxLayoutControl1Item15: TdxLayoutItem; diff --git a/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj index f246900..4b6ca6a 100644 --- a/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj +++ b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj @@ -14,6 +14,7 @@ + @@ -261,14 +262,23 @@ + + + + + + + + + - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj index 815c87e..0caa9e4 100644 --- a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj +++ b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.dproj @@ -49,14 +49,14 @@ MainSource + + + + - - - - diff --git a/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.res b/Source/Modulos/Albaranes de cliente/Controller/AlbaranesCliente_controller.res index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644 GIT binary patch literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP delta 11 ScmeBCZD5|Duvteife`=|>;pCc diff --git a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm index 5c93482..1d3f0db 100644 --- a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm @@ -10,12 +10,12 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente Top = 16 end object rda_AlbaranesCliente: TDARemoteDataAdapter - DataStreamer = Bin2DataStreamer GetSchemaCall.RemoteService = RORemoteService GetDataCall.RemoteService = RORemoteService UpdateDataCall.RemoteService = RORemoteService GetScriptsCall.RemoteService = RORemoteService RemoteService = RORemoteService + DataStreamer = Bin2DataStreamer Left = 43 Top = 151 end diff --git a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.pas index 9cdefcc..052b45f 100644 --- a/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.pas @@ -9,7 +9,8 @@ uses uIDataModuleAlbaranesCliente, uBizAlbaranesCliente, uBizDetallesAlbaranCliente, uBizDetalleColoresAlbaranCliente, uIDataModuleAlbaranesClienteReport, uDataModuleBase, uDABin2DataStreamer, uDAMemDataTable, - uDAInterfaces, uDADataStreamer, uDARemoteDataAdapter, uIntegerListUtils; + uDAInterfaces, uDADataStreamer, uDARemoteDataAdapter, uIntegerListUtils, + uDADataAdapter; type TDataModuleAlbaranesCliente = class(TDataModuleBase, IDataModuleAlbaranesCliente, IDataModuleAlbaranesClienteReport) @@ -76,7 +77,7 @@ begin try Result := (RORemoteService as IsrvAlbaranesCliente).GenerarInforme(AParam); finally -// FreeAndNil(AParam); + FreeAndNil(AParam); end; end; @@ -173,7 +174,7 @@ begin try Result := (RORemoteService as IsrvAlbaranesCliente).GenerarInformeEtiquetas(AParam, Mercancia, Bultos) finally -// FreeAndNil(AParam); + FreeAndNil(AParam); end; end; diff --git a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj index c00d509..e8c5c0c 100644 --- a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj +++ b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj @@ -54,28 +54,32 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
fEditorAlbaranCliente
@@ -98,7 +102,7 @@ TCustomEditor -
fEditorAlbaranDevCliente
+
fEditorDetalleEtiqueta
TCustomEditor @@ -145,10 +149,6 @@
frViewTotalesAlbaran
TCustomView - - - - \ No newline at end of file +EurekaLog Last Line --> diff --git a/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.res b/Source/Modulos/Facturas de cliente/Plugin/FacturasCliente_plugin.res index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644 GIT binary patch literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP delta 11 ScmeBCZD5|Duvteife`=|>;pCc diff --git a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dproj b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dproj index 4a862f2..521ef3d 100644 --- a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dproj +++ b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dproj @@ -49,30 +49,34 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogOpcionesImpresionFacturasCliente
TfEditorElegirFacturasCliente @@ -118,13 +122,9 @@ TFrame -
frViewTotalesFacturaCliente
+
frViewTotalesFactura
TFrame - - - -