From c06cdb0a919976ddd6cf1220e9efd0ff7da71661 Mon Sep 17 00:00:00 2001 From: roberto Date: Thu, 17 Jan 2013 09:12:47 +0000 Subject: [PATCH] =?UTF-8?q?Cambio=20a=204=20decimales=20los=20detalles=20d?= =?UTF-8?q?e=20todos=20los=20articulos,=20se=20arregla=20tambi=C3=A9n=20in?= =?UTF-8?q?ventario=20de=20obras.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@1067 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Source/Base/Base.res | Bin 4748 -> 384 bytes .../Articulos/Views/uEditorArticulo.dfm | 45 +- .../Articulos/Views/uEditorArticulo.pas | 2 +- .../Articulos/Views/uViewArticulos.dfm | 18 + .../Articulos/Views/uViewArticulos.pas | 2 +- .../Views/uViewArticulosPorProveedor.dfm | 16 + .../Views/uViewArticulosPorProveedor.pas | 2 +- .../Views/uViewArticulosProveedores.dfm | 20 + .../Views/uViewArticulosProveedores.pas | 2 +- .../Views/uEditorElegirArticulosCatalogo.dfm | 131 ++-- .../Views/uEditorElegirArticulosCatalogo.pas | 3 +- .../Inventario/Views/uViewDetalleReservas.pas | 2 +- .../Views/uViewElegirArticulosCatalogo.dfm | 20 + .../Views/uViewElegirArticulosCatalogo.pas | 2 +- .../Views/uViewEntradaSalidaArticulos.pas | 2 +- .../Inventario/Views/uViewInventario.pas | 12 +- Source/Servidor/FactuGES_Server.RES | Bin 23200 -> 23200 bytes Source/Servidor/FactuGES_Server.dproj | 661 +++++++++--------- Source/Servidor/FactuGES_Server.rc | 2 +- 19 files changed, 503 insertions(+), 439 deletions(-) diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 11 ScmeBCZD5|Duvteife`=|>;pCc 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 diff --git a/Source/Modulos/Articulos/Views/uEditorArticulo.dfm b/Source/Modulos/Articulos/Views/uEditorArticulo.dfm index 1d663233..da7f829c 100644 --- a/Source/Modulos/Articulos/Views/uEditorArticulo.dfm +++ b/Source/Modulos/Articulos/Views/uEditorArticulo.dfm @@ -34,6 +34,12 @@ inherited fEditorArticulo: TfEditorArticulo 4495BD38333E3DC0F0B71000FEC966E74A55381F0000000049454E44AE426082} ExplicitLeft = 607 end + inherited lblDesbloquear: TcxLabel + Left = 780 + ExplicitLeft = 780 + AnchorX = 825 + AnchorY = 14 + end end inherited TBXDock: TTBXDock Width = 905 @@ -133,45 +139,6 @@ inherited fEditorArticulo: TfEditorArticulo ExplicitWidth = 891 ExplicitHeight = 254 inherited cxGridView: TcxGridDBTableView - inherited cxGridViewPRECIO_COSTE: TcxGridDBColumn - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - GroupSummaryAlignment = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewDESCUENTO: TcxGridDBColumn - Properties.Alignment.Horz = taRightJustify - GroupSummaryAlignment = taRightJustify - end - inherited cxGridViewPRECIO_NETO: TcxGridDBColumn - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - GroupSummaryAlignment = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewPRECIO_PORTE: TcxGridDBColumn - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - GroupSummaryAlignment = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewPRECIO_PVP_VENTA: TcxGridDBColumn - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - GroupSummaryAlignment = taRightJustify - HeaderAlignmentHorz = taRightJustify - end - inherited cxGridViewPRECIO_PVP_TOTAL: TcxGridDBColumn - PropertiesClassName = 'TcxCurrencyEditProperties' - Properties.Alignment.Horz = taRightJustify - FooterAlignmentHorz = taRightJustify - GroupSummaryAlignment = taRightJustify - HeaderAlignmentHorz = taRightJustify - end end end inherited ToolBar1: TToolBar diff --git a/Source/Modulos/Articulos/Views/uEditorArticulo.pas b/Source/Modulos/Articulos/Views/uEditorArticulo.pas index d8eff2da..8aa951ff 100644 --- a/Source/Modulos/Articulos/Views/uEditorArticulo.pas +++ b/Source/Modulos/Articulos/Views/uEditorArticulo.pas @@ -18,7 +18,7 @@ uses cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid, uViewDetallesGenerico, uViewArticulosProveedores, dxLayoutControl, cxContainer, - cxTextEdit, cxMaskEdit, cxSpinEdit, cxDBEdit, cxCurrencyEdit; + cxTextEdit, cxMaskEdit, cxSpinEdit, cxDBEdit, cxCurrencyEdit, cxLabel; type TfEditorArticulo = class(TfEditorDBItem, IEditorArticulo) diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.dfm b/Source/Modulos/Articulos/Views/uViewArticulos.dfm index 43d5ada9..c27f3dd7 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulos.dfm +++ b/Source/Modulos/Articulos/Views/uViewArticulos.dfm @@ -58,9 +58,19 @@ inherited frViewArticulos: TfrViewArticulos end object cxGridViewPRECIO_PVP_VENTA: TcxGridDBColumn DataBinding.FieldName = 'PRECIO_PVP_VENTA' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + Properties.DecimalPlaces = 4 + Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364 + HeaderAlignmentHorz = taRightJustify end object cxGridViewPRECIO_PVP_TOTAL: TcxGridDBColumn DataBinding.FieldName = 'PRECIO_PVP_TOTAL' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + Properties.DecimalPlaces = 4 + Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364 + HeaderAlignmentHorz = taRightJustify end end inherited cxGridLevel: TcxGridLevel @@ -88,20 +98,28 @@ inherited frViewArticulos: TfrViewArticulos StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 272 + Width = 272 end inherited edtFechaFinFiltro: TcxDateEdit + Left = 376 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 376 + ExplicitWidth = 221 + Width = 221 end inherited eLista: TcxComboBox + Left = 634 Properties.DropDownRows = 20 Properties.OnChange = frViewFiltroBase1eListaPropertiesChange Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 634 ExplicitWidth = 71 Width = 71 end diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.pas b/Source/Modulos/Articulos/Views/uViewArticulos.pas index b2d8364d..b4559c65 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulos.pas +++ b/Source/Modulos/Articulos/Views/uViewArticulos.pas @@ -15,7 +15,7 @@ uses cxGridCustomPopupMenu, cxGridPopupMenu, cxCurrencyEdit, cxSpinEdit, cxCheckBox, cxCheckComboBox, cxImageComboBox, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, dxPgsDlg, uDAInterfaces, - uArticulosController; + uArticulosController, uCustomView, uViewBase; type IViewArticulos = interface(IViewGrid) diff --git a/Source/Modulos/Articulos/Views/uViewArticulosPorProveedor.dfm b/Source/Modulos/Articulos/Views/uViewArticulosPorProveedor.dfm index 7da8c4e1..9bcf441e 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulosPorProveedor.dfm +++ b/Source/Modulos/Articulos/Views/uViewArticulosPorProveedor.dfm @@ -130,6 +130,8 @@ inherited frViewArticulosPorProveedor: TfrViewArticulosPorProveedor DataBinding.FieldName = 'PRECIO_COSTE' PropertiesClassName = 'TcxCurrencyEditProperties' Properties.Alignment.Horz = taRightJustify + Properties.DecimalPlaces = 4 + Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364 BestFitMaxWidth = 60 FooterAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify @@ -149,6 +151,8 @@ inherited frViewArticulosPorProveedor: TfrViewArticulosPorProveedor DataBinding.FieldName = 'PRECIO_NETO' PropertiesClassName = 'TcxCurrencyEditProperties' Properties.Alignment.Horz = taRightJustify + Properties.DecimalPlaces = 4 + Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364 BestFitMaxWidth = 60 FooterAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify @@ -178,6 +182,8 @@ inherited frViewArticulosPorProveedor: TfrViewArticulosPorProveedor DataBinding.FieldName = 'PRECIO_PVP_VENTA' PropertiesClassName = 'TcxCurrencyEditProperties' Properties.Alignment.Horz = taRightJustify + Properties.DecimalPlaces = 4 + Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364 GroupSummaryAlignment = taRightJustify HeaderAlignmentHorz = taRightJustify end @@ -212,6 +218,8 @@ inherited frViewArticulosPorProveedor: TfrViewArticulosPorProveedor DataBinding.FieldName = 'PRECIO_PVP_TOTAL' PropertiesClassName = 'TcxCurrencyEditProperties' Properties.Alignment.Horz = taRightJustify + Properties.DecimalPlaces = 4 + Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364 HeaderAlignmentHorz = taRightJustify end end @@ -240,20 +248,28 @@ inherited frViewArticulosPorProveedor: TfrViewArticulosPorProveedor StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 272 + Width = 272 end inherited edtFechaFinFiltro: TcxDateEdit + Left = 376 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 376 + ExplicitWidth = 221 + Width = 221 end inherited eLista: TcxComboBox + Left = 634 Properties.DropDownRows = 20 Properties.OnChange = nil Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 634 ExplicitWidth = 71 Width = 71 end diff --git a/Source/Modulos/Articulos/Views/uViewArticulosPorProveedor.pas b/Source/Modulos/Articulos/Views/uViewArticulosPorProveedor.pas index c666c0d0..0e600d42 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulosPorProveedor.pas +++ b/Source/Modulos/Articulos/Views/uViewArticulosPorProveedor.pas @@ -15,7 +15,7 @@ uses cxGridCustomPopupMenu, cxGridPopupMenu, cxCurrencyEdit, cxSpinEdit, cxCheckBox, cxCheckComboBox, cxImageComboBox, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, dxPgsDlg, uDAInterfaces, - uArticulosController, uViewArticulos; + uArticulosController, uViewArticulos, uCustomView, uViewBase; type TfrViewArticulosPorProveedor = class(TfrViewGrid, IViewArticulos) diff --git a/Source/Modulos/Articulos/Views/uViewArticulosProveedores.dfm b/Source/Modulos/Articulos/Views/uViewArticulosProveedores.dfm index f5fd9df8..8c630d91 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulosProveedores.dfm +++ b/Source/Modulos/Articulos/Views/uViewArticulosProveedores.dfm @@ -46,6 +46,11 @@ inherited frViewArticulosProveedores: TfrViewArticulosProveedores object cxGridViewPRECIO_COSTE: TcxGridDBColumn Caption = 'Precio material' DataBinding.FieldName = 'PRECIO_COSTE' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + Properties.DecimalPlaces = 4 + Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364 + HeaderAlignmentHorz = taRightJustify end object cxGridViewDESCUENTO: TcxGridDBColumn Caption = 'Descuento' @@ -61,6 +66,11 @@ inherited frViewArticulosProveedores: TfrViewArticulosProveedores object cxGridViewPRECIO_NETO: TcxGridDBColumn Caption = 'Precio coste' DataBinding.FieldName = 'PRECIO_NETO' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + Properties.DecimalPlaces = 4 + Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364 + HeaderAlignmentHorz = taRightJustify Options.Editing = False end object cxGridViewPRECIO_PORTE: TcxGridDBColumn @@ -72,11 +82,21 @@ inherited frViewArticulosProveedores: TfrViewArticulosProveedores object cxGridViewPRECIO_PVP_VENTA: TcxGridDBColumn Caption = 'Precio P.V.P (Suministro)' DataBinding.FieldName = 'PRECIO_PVP_VENTA' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + Properties.DecimalPlaces = 4 + Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364 + HeaderAlignmentHorz = taRightJustify Options.Editing = False end object cxGridViewPRECIO_PVP_TOTAL: TcxGridDBColumn Caption = 'Precio P.V.P (Total)' DataBinding.FieldName = 'PRECIO_PVP_TOTAL' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify + Properties.DecimalPlaces = 4 + Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364 + HeaderAlignmentHorz = taRightJustify Options.Editing = False end object cxGridViewID_ARTICULO: TcxGridDBColumn diff --git a/Source/Modulos/Articulos/Views/uViewArticulosProveedores.pas b/Source/Modulos/Articulos/Views/uViewArticulosProveedores.pas index 591eb742..3e5ee15e 100644 --- a/Source/Modulos/Articulos/Views/uViewArticulosProveedores.pas +++ b/Source/Modulos/Articulos/Views/uViewArticulosProveedores.pas @@ -11,7 +11,7 @@ uses cxControls, cxGridCustomView, cxGrid, cxDBLookupComboBox, cxSpinEdit, uBizContactos, uProveedoresController, uDAInterfaces, uBizArticulos, uArticulosController, - cxTextEdit, cxCalendar; + cxTextEdit, cxCalendar, cxCurrencyEdit; type IViewArticulosProveedores = interface(IViewBase) diff --git a/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.dfm b/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.dfm index 0fa873fd..95642e42 100644 --- a/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.dfm +++ b/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.dfm @@ -6,80 +6,60 @@ inherited fEditorElegirArticulosCatalogo: TfEditorElegirArticulosCatalogo ExplicitHeight = 611 PixelsPerInch = 96 TextHeight = 13 - object pnlHeader: TPanel - Left = 0 - Top = 0 - Width = 656 - Height = 64 - Align = alTop - BevelOuter = bvNone - Color = clWhite - Padding.Left = 25 - Padding.Top = 8 - Padding.Right = 25 - Padding.Bottom = 8 - ParentBackground = False - TabOrder = 5 - object lblTitle: TLabel - AlignWithMargins = True - Left = 25 - Top = 8 - Width = 606 - Height = 13 - Margins.Left = 0 - Margins.Top = 0 - Margins.Right = 0 - Margins.Bottom = 8 - Align = alTop - Caption = '' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [fsBold] - ParentFont = False - ExplicitWidth = 135 - end - object lblComments: TLabel - AlignWithMargins = True - Left = 50 - Top = 29 - Width = 581 - Height = 27 - Margins.Left = 25 - Margins.Top = 0 - Margins.Right = 0 - Align = alClient - ExplicitWidth = 3 - ExplicitHeight = 13 - end - end inherited JvNavPanelHeader: TJvNavPanelHeader Width = 697 + ExplicitWidth = 697 inherited Image1: TImage Left = 670 + ExplicitLeft = 670 end end inherited TBXDock: TTBXDock Width = 697 + ExplicitWidth = 697 + inherited tbxMain: TTBXToolbar + ExplicitWidth = 324 + end + inherited tbxFiltro: TTBXToolbar + Left = 324 + ExplicitLeft = 324 + end inherited tbxMenu: TTBXToolbar ExplicitWidth = 697 end inherited TBXTMain2: TTBXToolbar + Left = 661 DockPos = 401 + ExplicitLeft = 661 end end inherited StatusBar: TJvStatusBar Top = 558 Width = 697 + ExplicitTop = 558 + ExplicitWidth = 697 + end + inherited pnlHeader: TPanel + Width = 697 + TabOrder = 5 + inherited lblTitle: TLabel + Width = 647 + end + inherited lblComments: TLabel + Width = 622 + end end inherited frViewBarraSeleccion1: TfrViewBarraSeleccion Top = 509 Width = 697 + ExplicitTop = 509 + ExplicitWidth = 697 inherited JvFooter1: TJvFooter Width = 697 + ExplicitWidth = 697 inherited bSeleccionar: TJvFooterBtn Left = 485 + ExplicitLeft = 485 end inherited bCancelar: TJvFooterBtn Left = 589 @@ -89,9 +69,9 @@ inherited fEditorElegirArticulosCatalogo: TfEditorElegirArticulosCatalogo end inline frViewElegirArticulosCatalogo1: TfrViewElegirArticulosCatalogo [5] Left = 0 - Top = 136 + Top = 140 Width = 697 - Height = 373 + Height = 369 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -101,11 +81,14 @@ inherited fEditorElegirArticulosCatalogo: TfEditorElegirArticulosCatalogo ParentFont = False TabOrder = 4 ReadOnly = False - ExplicitLeft = -59 - ExplicitTop = -18 + ExplicitTop = 140 + ExplicitWidth = 697 + ExplicitHeight = 369 inherited cxGrid: TcxGrid Width = 697 - Height = 245 + Height = 241 + ExplicitWidth = 697 + ExplicitHeight = 241 inherited cxGridView: TcxGridDBTableView DataController.Summary.FooterSummaryItems = < item @@ -117,29 +100,67 @@ inherited fEditorElegirArticulosCatalogo: TfEditorElegirArticulosCatalogo end inherited frViewFiltroBase1: TfrViewFiltroBase Width = 697 + ExplicitWidth = 697 inherited TBXDockablePanel1: TTBXDockablePanel + ExplicitWidth = 697 inherited dxLayoutControl1: TdxLayoutControl Width = 697 + ExplicitWidth = 697 + inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end + inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 121 + Width = 121 + end + inherited edtFechaFinFiltro: TcxDateEdit + Left = 225 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 225 + ExplicitWidth = 121 + Width = 121 + end inherited eLista: TcxComboBox + Left = 383 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 383 ExplicitWidth = 304 Width = 304 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 697 + ExplicitWidth = 697 inherited tbxBotones: TTBXToolbar Width = 687 + ExplicitWidth = 687 end end end end inherited pnlAgrupaciones: TTBXDockablePanel - Top = 347 - ExplicitWidth = 715 + Top = 343 + ExplicitTop = 343 + ExplicitWidth = 697 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 697 + ExplicitWidth = 697 inherited TBXToolbar1: TTBXToolbar Width = 687 + ExplicitWidth = 687 end end end diff --git a/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.pas b/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.pas index 712af720..1d7e2149 100644 --- a/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.pas +++ b/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.pas @@ -10,7 +10,8 @@ uses JvExComCtrls, JvStatusBar, TBX, TB2ExtItems, TBXExtItems, TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane, uIEditorElegirArticulosCatalogo, uDAInterfaces, - uViewGridBase, uViewGrid, uViewArticulos, uViewElegirArticulosCatalogo; + uViewGridBase, uViewGrid, uViewArticulos, uViewElegirArticulosCatalogo, + StdCtrls; type TfEditorElegirArticulosCatalogo = class(TfEditorElegirArticulos, IEditorElegirArticulosCatalogo) diff --git a/Source/Modulos/Inventario/Views/uViewDetalleReservas.pas b/Source/Modulos/Inventario/Views/uViewDetalleReservas.pas index 9a32a369..3288024d 100644 --- a/Source/Modulos/Inventario/Views/uViewDetalleReservas.pas +++ b/Source/Modulos/Inventario/Views/uViewDetalleReservas.pas @@ -15,7 +15,7 @@ uses cxButtonEdit, cxGridCustomPopupMenu, cxGridPopupMenu, uViewGrid, uBizInventario, uBizAlmacenes, cxSpinEdit, uViewFiltroBase, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, cxCurrencyEdit, uAlmacenesController, - uDAInterfaces, cxContainer, cxMaskEdit, cxDropDownEdit; + uDAInterfaces, cxContainer, cxMaskEdit, cxDropDownEdit, uCustomView, uViewBase; type IViewDetalleReservas = interface(IViewGrid) diff --git a/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.dfm b/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.dfm index 7e167708..00528d4c 100644 --- a/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.dfm +++ b/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.dfm @@ -2,14 +2,34 @@ inherited frViewElegirArticulosCatalogo: TfrViewElegirArticulosCatalogo inherited frViewFiltroBase1: TfrViewFiltroBase inherited TBXDockablePanel1: TTBXDockablePanel inherited dxLayoutControl1: TdxLayoutControl + inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end + inherited eLista: TcxComboBox + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end end end end diff --git a/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.pas b/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.pas index 2a81ab4c..72f8158e 100644 --- a/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.pas +++ b/Source/Modulos/Inventario/Views/uViewElegirArticulosCatalogo.pas @@ -12,7 +12,7 @@ uses uDADataTable, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg, ActnList, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, - uDAInterfaces; + uDAInterfaces, uCustomView, uViewBase; type IViewElegirArticulosCatalogo = interface(IViewArticulos) diff --git a/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas b/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas index 7aec86c1..d41d56da 100644 --- a/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas +++ b/Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas @@ -14,7 +14,7 @@ uses cxGridCustomPopupMenu, cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, uAlmacenesController, uBizAlmacenes, TB2Item, TBX, TB2Dock, TB2Toolbar, uDataModuleInventario, cxRichEdit, cxTextEdit, dxPgsDlg, TBXDkPanels, - uViewFiltroBase, cxSpinEdit, uDAInterfaces; + uViewFiltroBase, cxSpinEdit, uDAInterfaces, uCustomView, uViewBase; type IViewViewEntradaSalidaArticulos = interface(IViewGrid) diff --git a/Source/Modulos/Inventario/Views/uViewInventario.pas b/Source/Modulos/Inventario/Views/uViewInventario.pas index 76ef6675..3ad9eeed 100644 --- a/Source/Modulos/Inventario/Views/uViewInventario.pas +++ b/Source/Modulos/Inventario/Views/uViewInventario.pas @@ -129,11 +129,13 @@ begin inherited; if Assigned(FAlmacenes) or Assigned(FObras) then begin - for i := 0 to FAlmacenes.Count - 1 do - begin - if (FAlmacenes.ValueFromIndex[i] = IntToStr(AppFactuGES.EmpresaActiva.ID_ALMACEN)) then - Aindex := i; - end; + Aindex := 0; + if Assigned(FAlmacenes) then + for i := 0 to FAlmacenes.Count - 1 do + begin + if (FAlmacenes.ValueFromIndex[i] = IntToStr(AppFactuGES.EmpresaActiva.ID_ALMACEN)) then + Aindex := i; + end; cxListaAlmacenesObras.ItemIndex := Aindex; end //En el caso de ser la vista para la selección de articulos de un determinado almacén diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 2a23419cc4a229ee041de8eecf5e4b95a6fde324..501df49fa9d0a928e4ebccb7f8961612c5107cb4 100644 GIT binary patch delta 79 zcmZ3mm2tsV#tjltj=2np3`Gnj455 delta 79 zcmZ3mm2tsV#tjltj#&()45Z?f|zF4+#JO diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 1ba5700f..2f3b8b84 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -1,335 +1,334 @@ - + - - {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} - FactuGES_Server.dpr - Debug - AnyCPU - DCC32 - ..\..\Output\Debug\Servidor\FactuGES_Server.exe - vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 - - - 7.0 - False - False - 0 - 3 - ..\..\Output\Release\Servidor - RELEASE - - - 7.0 - 3 - ..\..\Output\Debug\Servidor - DEBUG; - True - True - True - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - - - Delphi.Personality - - -FalseTrueFalse/standaloneTrueFalse1940FalseFalseFalseFalseFalse308212521.9.4.01.9.4.0martes, 22 de noviembre de 2011 10:27 - - ExpressPrinting System by Developer Express Inc. - FactuGES_Server.dpr - - - - - MainSource - - - - - -
srvEmpresas
- TDARemoteService -
- -
srvProvinciasPoblaciones_Impl
- TDataModule -
- - - -
srvUsuarios
- TDataAbstractService -
- - - - - - - -
RptAlbaranesCliente
- TDataModule -
- -
RptWordAlbaranCliente
- TDataModule -
- -
srvAlbaranesCliente
- TDataAbstractService -
- - - - -
RptAlbaranesProveedor
- TDataModule -
- -
RptWordAlbaranProveedor
- TDataModule -
- -
srvAlbaranesProveedor
- TDataAbstractService -
- - - -
srvAlmacenes
- TDARemoteService -
- - - - -
srvArticulos
- TDARemoteService -
- - - - - - - -
RptEtiquetasContacto
- TDataModule -
- -
RptFichasEmpleado
- TDataModule -
- -
srvContactos
- TDARemoteService -
- - - -
srvFabricantes
- TDataAbstractService -
- - - - -
RptFacturasCliente
- TDataModule -
- -
RptWordFacturaCliente
- TDataModule -
- -
srvFacturasCliente
- TDataAbstractService -
- - - - -
RptFacturasProveedor
- TDataModule -
- -
srvFacturasProveedor
- TDataAbstractService -
- - - -
srvFamilias
- TDataAbstractService -
- - - -
srvFormasPago
- TDataAbstractService -
- -
srvGestorDocumentos
- TDataAbstractService -
- -
srvGestorInformes
- TDataAbstractService -
- - - -
srvHistoricoMovimientos
- TDataAbstractService -
- - - -
srvInventario
- TDataAbstractService -
- - - - -
srvObras
- TDataAbstractService -
- - - - -
RptPedidosProveedor
- TDataModule -
- -
RptWordPedidoProveedor
- TDataModule -
- -
srvPedidosProveedor
- TDataAbstractService -
- - - - -
RptPresupuestosCliente
- TDataModule -
- -
RptWordCertificadoTrabajo
- TDataModule -
- -
RptWordPresupuestoCliente
- TDataModule -
- -
srvPresupuestosCliente
- TDataAbstractService -
- - - -
RptRecibosCliente
- TDataModule -
- -
srvRecibosCliente
- TDataAbstractService -
- - - -
RptRecibosProveedor
- TDataModule -
- -
srvRecibosProveedor
- TDataAbstractService -
- - - -
srvReferencias
- TDataAbstractService -
- - - - -
srvRemesasCliente
- TDataAbstractService -
- - - - -
srvRemesasProveedor
- TDataAbstractService -
- - - -
srvTiposIVA
- TDataAbstractService -
- - - -
srvUnidadesMedida
- TDataAbstractService -
- - - -
srvConfiguracion
- TDataAbstractService -
- -
frConexionBD
- TFrame -
- -
frConfGeneral
- TFrame -
- -
fConfiguracion
- TForm -
- -
FrameConfiguracion
- TFrame -
- -
srvLogin
- TDARemoteService -
- -
fAcercaDe
-
- -
dmServer
- TDataModule -
- -
fServerForm
-
- - - - - - - - - - -
+ + {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} + FactuGES_Server.dpr + Debug + AnyCPU + DCC32 + ..\..\Output\Debug\Servidor\FactuGES_Server.exe + vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 + + + 7.0 + False + False + 0 + 3 + ..\..\Output\Release\Servidor + RELEASE + + + 7.0 + 3 + ..\..\Output\Debug\Servidor + DEBUG; + True + True + True + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + + + Delphi.Personality + + + FalseTrueFalse/standaloneTrueFalse1940FalseFalseFalseFalseFalse308212521.9.4.01.9.4.0martes, 22 de noviembre de 2011 10:27 + ExpressPrinting System by Developer Express Inc. + FactuGES_Server.dpr + + + + + MainSource + + + + + +
srvEmpresas
+ TDARemoteService +
+ +
srvProvinciasPoblaciones_Impl
+ TDataModule +
+ + + +
srvUsuarios
+ TDataAbstractService +
+ + + + + + + +
RptAlbaranesCliente
+ TDataModule +
+ +
RptWordAlbaranCliente
+ TDataModule +
+ +
srvAlbaranesCliente
+ TDataAbstractService +
+ + + + +
RptAlbaranesProveedor
+ TDataModule +
+ +
RptWordAlbaranProveedor
+ TDataModule +
+ +
srvAlbaranesProveedor
+ TDataAbstractService +
+ + + +
srvAlmacenes
+ TDARemoteService +
+ + + + +
srvArticulos
+ TDARemoteService +
+ + + + + + + +
RptEtiquetasContacto
+ TDataModule +
+ +
RptFichasEmpleado
+ TDataModule +
+ +
srvContactos
+ TDARemoteService +
+ + + +
srvFabricantes
+ TDataAbstractService +
+ + + + +
RptFacturasCliente
+ TDataModule +
+ +
RptWordFacturaCliente
+ TDataModule +
+ +
srvFacturasCliente
+ TDataAbstractService +
+ + + + +
RptFacturasProveedor
+ TDataModule +
+ +
srvFacturasProveedor
+ TDataAbstractService +
+ + + +
srvFamilias
+ TDataAbstractService +
+ + + +
srvFormasPago
+ TDataAbstractService +
+ +
srvGestorDocumentos
+ TDataAbstractService +
+ +
srvGestorInformes
+ TDataAbstractService +
+ + + +
srvHistoricoMovimientos
+ TDataAbstractService +
+ + + +
srvInventario
+ TDataAbstractService +
+ + + + +
srvObras
+ TDataAbstractService +
+ + + + +
RptPedidosProveedor
+ TDataModule +
+ +
RptWordPedidoProveedor
+ TDataModule +
+ +
srvPedidosProveedor
+ TDataAbstractService +
+ + + + +
RptPresupuestosCliente
+ TDataModule +
+ +
RptWordCertificadoTrabajo
+ TDataModule +
+ +
RptWordPresupuestoCliente
+ TDataModule +
+ +
srvPresupuestosCliente
+ TDataAbstractService +
+ + + +
RptRecibosCliente
+ TDataModule +
+ +
srvRecibosCliente
+ TDataAbstractService +
+ + + +
RptRecibosProveedor
+ TDataModule +
+ +
srvRecibosProveedor
+ TDataAbstractService +
+ + + +
srvReferencias
+ TDataAbstractService +
+ + + + +
srvRemesasCliente
+ TDataAbstractService +
+ + + + +
srvRemesasProveedor
+ TDataAbstractService +
+ + + +
srvTiposIVA
+ TDataAbstractService +
+ + + +
srvUnidadesMedida
+ TDataAbstractService +
+ + + +
srvConfiguracion
+ TDataAbstractService +
+ +
frConexionBD
+ TFrame +
+ +
frConfGeneral
+ TFrame +
+ +
fConfiguracion
+ TForm +
+ +
FrameConfiguracion
+ TFrame +
+ +
srvLogin
+ TDARemoteService +
+ +
fAcercaDe
+
+ +
dmServer
+ TDataModule +
+ +
fServerForm
+
+ + + + + + + + + + +