From 0cdfb0a20197d4dab7e7cd0670518eb4ae70173b Mon Sep 17 00:00:00 2001 From: roberto Date: Thu, 6 Nov 2008 18:52:39 +0000 Subject: [PATCH] Repaso general de operaciones con inventario git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@739 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Source/Cliente/FactuGES.dpr | 1 + .../Inventario/Views/Inventario_view.dpk | Bin 1670 -> 1787 bytes .../Inventario/Views/Inventario_view.dproj | 16 +- .../Inventario/Views/Inventario_view.res | Bin 384 -> 4748 bytes .../uEditorElegirAlmacenObraOperacion.dfm | 81 +++++ .../uEditorElegirAlmacenObraOperacion.pas | 24 ++ .../Views/uEditorElegirArticulosAlmacen.dfm | 93 +++-- .../Views/uEditorElegirArticulosAlmacen.pas | 2 +- .../Views/uEditorEntradaSalidaArticulos.dfm | 46 +-- .../Inventario/Views/uEditorInventario.dfm | 321 +----------------- .../Inventario/Views/uEditorInventario.pas | 132 ++++--- .../Inventario/Views/uViewInventario.dfm | 27 +- .../Inventario/Views/uViewInventario.pas | 8 +- 13 files changed, 300 insertions(+), 451 deletions(-) create mode 100644 Source/Modulos/Inventario/Views/uEditorElegirAlmacenObraOperacion.dfm create mode 100644 Source/Modulos/Inventario/Views/uEditorElegirAlmacenObraOperacion.pas diff --git a/Source/Cliente/FactuGES.dpr b/Source/Cliente/FactuGES.dpr index 906bce24..c094c23d 100644 --- a/Source/Cliente/FactuGES.dpr +++ b/Source/Cliente/FactuGES.dpr @@ -2,6 +2,7 @@ program FactuGES; uses // ExceptionLog, + ExceptionLog, Forms, Windows, SysUtils, diff --git a/Source/Modulos/Inventario/Views/Inventario_view.dpk b/Source/Modulos/Inventario/Views/Inventario_view.dpk index fa19fd7d8b7480d60c62c16c22b709683313fa98..84b70c980f3301a63085fca0a72bedc1279c4139 100644 GIT binary patch delta 106 zcmZqU{mr|ficL+2mrFsR)HNluB)`ZtCpA5@$T253F*!BQKdC6uzaX_JF*!3oZ}LGF dVIfTM$px%p3Yfxqwbr~`yj-byDSEtI3;^A3Bvk+a delta 20 bcmey(+s3=0ijBvbmy4GxH7`Yvmx}=aKEMRM diff --git a/Source/Modulos/Inventario/Views/Inventario_view.dproj b/Source/Modulos/Inventario/Views/Inventario_view.dproj index 99ebdf9d..cb85a018 100644 --- a/Source/Modulos/Inventario/Views/Inventario_view.dproj +++ b/Source/Modulos/Inventario/Views/Inventario_view.dproj @@ -1,4 +1,5 @@ - + + {4269f0a2-b81f-47f7-a014-f7f28bc5bb79} Inventario_view.dpk @@ -46,15 +47,18 @@ MainSource - - - - - + + + + +
fEditorDetalleReservas
TfEditorDetalleReservas + +
fEditorElegirAlmacenObraOperacion
+
fEditorElegirArticulosAlmacen
TfEditorElegirArticulosAlmacen diff --git a/Source/Modulos/Inventario/Views/Inventario_view.res b/Source/Modulos/Inventario/Views/Inventario_view.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/Inventario/Views/uEditorElegirAlmacenObraOperacion.dfm b/Source/Modulos/Inventario/Views/uEditorElegirAlmacenObraOperacion.dfm new file mode 100644 index 00000000..b94c203b --- /dev/null +++ b/Source/Modulos/Inventario/Views/uEditorElegirAlmacenObraOperacion.dfm @@ -0,0 +1,81 @@ +object fEditorElegirAlmacenObraOperacion: TfEditorElegirAlmacenObraOperacion + Left = 0 + Top = 0 + BorderStyle = bsDialog + Caption = 'Elegir ' + ClientHeight = 141 + ClientWidth = 580 + Color = clBtnFace + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + OldCreateOrder = False + Position = poScreenCenter + DesignSize = ( + 580 + 141) + PixelsPerInch = 96 + TextHeight = 13 + object eEtiqueta: TLabel + Left = 42 + Top = 48 + Width = 96 + Height = 13 + Caption = 'Almac'#233'n:' + end + object eDescripcion: TLabel + Left = 42 + Top = 16 + Width = 247 + Height = 13 + Caption = 'Elija sobre qu'#233' almac'#233'n desea realizar la operaci'#243'n.' + end + object cxListaAlmacenesObras: TcxComboBox + Left = 144 + Top = 45 + Anchors = [akLeft, akTop, akRight] + Properties.DropDownListStyle = lsEditFixedList + Properties.DropDownRows = 25 + Properties.ImmediatePost = True + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 0 + Width = 421 + end + object Panel1: TPanel + Left = 0 + Top = 100 + Width = 580 + Height = 41 + Align = alBottom + BevelOuter = bvNone + TabOrder = 1 + ExplicitWidth = 579 + object Button2: TButton + Left = 408 + Top = 8 + Width = 75 + Height = 25 + Caption = 'Aceptar' + ModalResult = 1 + TabOrder = 0 + end + object Button1: TButton + Left = 489 + Top = 8 + Width = 75 + Height = 25 + Caption = 'Cancelar' + ModalResult = 2 + TabOrder = 1 + end + end +end diff --git a/Source/Modulos/Inventario/Views/uEditorElegirAlmacenObraOperacion.pas b/Source/Modulos/Inventario/Views/uEditorElegirAlmacenObraOperacion.pas new file mode 100644 index 00000000..faa15286 --- /dev/null +++ b/Source/Modulos/Inventario/Views/uEditorElegirAlmacenObraOperacion.pas @@ -0,0 +1,24 @@ +unit uEditorElegirAlmacenObraOperacion; + +interface + +uses + Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, + Dialogs, cxGraphics, cxControls, cxContainer, cxEdit, cxTextEdit, cxMaskEdit, + cxDropDownEdit, StdCtrls, ExtCtrls; + +type + TfEditorElegirAlmacenObraOperacion = class(TForm) + eEtiqueta: TLabel; + cxListaAlmacenesObras: TcxComboBox; + eDescripcion: TLabel; + Panel1: TPanel; + Button2: TButton; + Button1: TButton; + end; + +implementation +{$R *.dfm} + + +end. diff --git a/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.dfm b/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.dfm index 72a40b20..a23b00f0 100644 --- a/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.dfm +++ b/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.dfm @@ -1,13 +1,13 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen Caption = 'Seleccionar art'#237'culos' - ClientWidth = 656 - ExplicitWidth = 664 + ClientWidth = 832 + ExplicitWidth = 840 PixelsPerInch = 96 TextHeight = 13 object JvgWizardHeader1: TJvgWizardHeader [0] Left = 0 Top = 27 - Width = 656 + Width = 832 Height = 60 CaptionFont.Charset = DEFAULT_CHARSET CaptionFont.Color = clWindowText @@ -34,20 +34,25 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen Gradient.Orientation = fgdVertical BufferedDraw = False ExplicitTop = 87 + ExplicitWidth = 656 end inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 656 + Width = 832 Caption = 'Lista de art'#237'culos' Visible = False ExplicitWidth = 656 inherited Image1: TImage - Left = 629 + Left = 805 ExplicitLeft = 629 end + inherited Image2: TImage + Left = 778 + ExplicitLeft = 602 + end end inherited TBXDock: TTBXDock Top = 87 - Width = 656 + Width = 832 Height = 49 ExplicitTop = 87 ExplicitWidth = 656 @@ -55,7 +60,7 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen inherited tbxMain: TTBXToolbar Align = alLeft DockPos = -6 - ExplicitWidth = 284 + ExplicitWidth = 427 inherited TBXItem2: TTBXItem Visible = False end @@ -73,40 +78,40 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen end end inherited tbxFiltro: TTBXToolbar - Left = 284 + Left = 427 Top = 23 Align = alLeft DockPos = 101 DockRow = 1 - ExplicitLeft = 284 + ExplicitLeft = 427 ExplicitTop = 23 inherited TBXItem34: TTBXItem Action = actQuitarFiltro2 end end inherited tbxMenu: TTBXToolbar - ExplicitWidth = 656 + ExplicitWidth = 832 end inherited TBXTMain2: TTBXToolbar - Left = 559 + Left = 696 Top = 23 DockPos = 559 DockRow = 1 Visible = False - ExplicitLeft = 559 + ExplicitLeft = 696 ExplicitTop = 23 ExplicitWidth = 36 end end inherited StatusBar: TJvStatusBar - Width = 656 + Width = 832 Visible = False ExplicitWidth = 656 end inline frViewBarraSeleccion1: TfrViewBarraSeleccion [4] Left = 0 Top = 472 - Width = 656 + Width = 832 Height = 49 Align = alBottom Font.Charset = DEFAULT_CHARSET @@ -120,15 +125,18 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen ExplicitTop = 472 ExplicitWidth = 656 inherited JvFooter1: TJvFooter - Width = 656 + Width = 832 ExplicitWidth = 656 + DesignSize = ( + 832 + 49) inherited bSeleccionar: TJvFooterBtn - Left = 444 + Left = 620 ExplicitLeft = 444 end inherited bCancelar: TJvFooterBtn - Left = 548 - ExplicitLeft = 548 + Left = 724 + ExplicitLeft = 724 end end inherited BarraSeleccionActionList: TActionList @@ -145,17 +153,16 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen end inherited frViewInventario1: TfrViewInventario [5] Top = 136 - Width = 656 + Width = 832 Height = 336 ExplicitTop = 136 ExplicitWidth = 656 ExplicitHeight = 336 inherited cxGrid: TcxGrid - Width = 656 - Height = 208 - RootLevelOptions.DetailTabsPosition = dtpNone + Width = 832 + Height = 167 ExplicitWidth = 656 - ExplicitHeight = 208 + ExplicitHeight = 167 inherited cxGridView: TcxGridDBTableView DataController.Summary.DefaultGroupSummaryItems = < item @@ -177,33 +184,51 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen end end inherited frViewFiltroBase1: TfrViewFiltroBase - Width = 656 + Width = 832 ExplicitWidth = 656 inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 656 inherited dxLayoutControl1: TdxLayoutControl - Width = 656 + Width = 832 ExplicitWidth = 656 inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 561 Width = 561 end + inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end inherited edtFechaFinFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 241 Width = 241 end inherited eLista: TcxComboBox Left = 628 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 628 ExplicitWidth = 20 Width = 20 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 656 + Width = 832 ExplicitWidth = 656 inherited tbxBotones: TTBXToolbar - Width = 646 + Width = 822 ExplicitWidth = 646 end end @@ -214,14 +239,22 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen ExplicitTop = 310 ExplicitWidth = 656 inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 656 + Width = 832 ExplicitWidth = 656 inherited TBXToolbar1: TTBXToolbar - Width = 646 + Width = 822 ExplicitWidth = 646 end end end + inherited pnlAlmacenes: TPanel + Width = 832 + ExplicitWidth = 656 + inherited cxListaAlmacenesObras: TcxComboBox + Properties.OnEditValueChanged = nil + Width = 757 + end + end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink BuiltInReportLink = True @@ -257,7 +290,7 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen end inherited JvAppRegistryStorage: TJvAppRegistryStorage [12] end - inherited GridPopupMenu: TPopupMenu [13] + inherited GridPopupMenu: TPopupMenu Left = 80 Top = 192 end diff --git a/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas b/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas index c3870cff..a4c878b6 100644 --- a/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas +++ b/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas @@ -12,7 +12,7 @@ uses JvNavigationPane, uViewBarraSeleccion, JvgWizardHeader, StdCtrls, uEditorArticulos, uBizArticulos, uIEditorElegirArticulosAlmacen, JvExComCtrls, JvStatusBar, uEditorInventario, uViewInventario, uBizInventario, - JSDialog, uDAInterfaces; + JSDialog, uDAInterfaces, dxGDIPlusClasses; type TfEditorElegirArticulosAlmacen = class(TfEditorInventario, IEditorElegirArticulosAlmacen) diff --git a/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.dfm b/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.dfm index aca7e19d..a17a026a 100644 --- a/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.dfm +++ b/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.dfm @@ -3,18 +3,18 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos Top = 196 Caption = 'Entrada de art'#237'culos en almac'#233'n' ClientHeight = 556 - ClientWidth = 773 + ClientWidth = 853 OnClose = CustomEditorClose - ExplicitWidth = 781 + ExplicitWidth = 861 ExplicitHeight = 590 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 773 + Width = 853 Caption = 'Entrada de art'#237'culos en ' ExplicitWidth = 773 inherited Image1: TImage - Left = 746 + Left = 720 Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0000180806000000E0773DF80000000970485973000017120000171201679FD2 @@ -34,9 +34,13 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos 16D0BA550100E46DEBE08B969D720000000049454E44AE426082} ExplicitLeft = 625 end + inherited lblDesbloquear: TcxLabel + Left = 755 + ExplicitLeft = 675 + end end inherited TBXDock: TTBXDock - Width = 773 + Width = 853 ExplicitWidth = 773 inherited tbxMain: TTBXToolbar ExplicitWidth = 164 @@ -47,7 +51,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos end end inherited tbxMenu: TTBXToolbar - ExplicitWidth = 773 + ExplicitWidth = 853 inherited TBXSubmenuItem4: TTBXSubmenuItem object TBXItem33: TTBXItem [11] Action = actGuardarCerrar @@ -60,7 +64,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos end inherited pgPaginas: TPageControl Top = 257 - Width = 767 + Width = 847 Height = 277 MultiLine = True Visible = False @@ -76,7 +80,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos end inherited StatusBar: TJvStatusBar Top = 537 - Width = 773 + Width = 853 Panels = < item Width = 200 @@ -88,7 +92,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos AlignWithMargins = True Left = 5 Top = 224 - Width = 763 + Width = 843 Height = 30 Margins.Left = 5 Margins.Top = 2 @@ -106,6 +110,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos ShowHint = True TabOrder = 4 Transparent = True + ExplicitWidth = 763 object ToolButton1: TToolButton Left = 0 Top = 0 @@ -136,8 +141,9 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos object TBXDockPaneles: TTBXDock [5] Left = 0 Top = 76 - Width = 773 + Width = 853 Height = 146 + ExplicitWidth = 773 object pnlMovimiento: TTBXDockablePanel Left = 0 Top = 89 @@ -155,7 +161,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos TabOrder = 0 Visible = False DesignSize = ( - 769 + 849 53) object Label1: TLabel Left = 266 @@ -208,7 +214,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos StyleHot.LookAndFeel.NativeStyle = True TabOrder = 1 Height = 21 - Width = 1727 + Width = 535 end end object pnlEntradaPedido: TTBXDockablePanel @@ -327,7 +333,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos inline frViewEntradaSalidaArticulos1: TfrViewEntradaSalidaArticulos [6] Left = 0 Top = 254 - Width = 773 + Width = 853 Height = 283 Align = alClient Font.Charset = DEFAULT_CHARSET @@ -342,18 +348,18 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos ExplicitWidth = 773 ExplicitHeight = 283 inherited cxGrid: TcxGrid - Width = 757 + Width = 837 Height = 139 ExplicitWidth = 757 ExplicitHeight = 139 end inherited frViewFiltroBase1: TfrViewFiltroBase - Width = 773 + Width = 853 ExplicitWidth = 773 inherited TBXDockablePanel1: TTBXDockablePanel ExplicitWidth = 773 inherited dxLayoutControl1: TdxLayoutControl - Width = 773 + Width = 853 ExplicitWidth = 773 inherited txtFiltroTodo: TcxTextEdit Style.LookAndFeel.SkinName = '' @@ -385,10 +391,10 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 773 + Width = 853 ExplicitWidth = 773 inherited tbxBotones: TTBXToolbar - Width = 763 + Width = 843 ExplicitWidth = 763 end end @@ -399,10 +405,10 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos ExplicitTop = 257 ExplicitWidth = 773 inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 773 + Width = 853 ExplicitWidth = 773 inherited TBXToolbar1: TTBXToolbar - Width = 763 + Width = 843 ExplicitWidth = 763 end end diff --git a/Source/Modulos/Inventario/Views/uEditorInventario.dfm b/Source/Modulos/Inventario/Views/uEditorInventario.dfm index 7c7780aa..f94b3943 100644 --- a/Source/Modulos/Inventario/Views/uEditorInventario.dfm +++ b/Source/Modulos/Inventario/Views/uEditorInventario.dfm @@ -255,6 +255,10 @@ inherited fEditorInventario: TfEditorInventario end end end + inherited dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList + Left = 128 + Top = 8 + end end inherited pnlAgrupaciones: TTBXDockablePanel Top = 393 @@ -270,9 +274,12 @@ inherited fEditorInventario: TfEditorInventario end end end - inherited Panel1: TPanel + inherited pnlAlmacenes: TPanel Width = 669 ExplicitWidth = 669 + DesignSize = ( + 669 + 41) end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink @@ -291,7 +298,8 @@ inherited fEditorInventario: TfEditorInventario end end inherited EditorActionList: TActionList [4] - Left = 88 + Left = 96 + Top = 112 inherited actNuevo: TAction Caption = '&Entrada' ImageIndex = 21 @@ -1935,313 +1943,4 @@ inherited fEditorInventario: TfEditorInventario Action = actReservar end end - object JsElegirAlmacenDialog: TJSDialog - Content.Strings = ( - #191'Sobre qu'#233' almac'#233'n desea realizar la operaci'#243'n?') - DialogOptions = [doRadioButtons, doModal] - Glyph.Data = { - 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001C00 - 00001C0806000000720DDF940000000970485973000017120000171201679FD2 - 520000000467414D410000B18E7CFB51930000020F4944415478DAE5D4DB2B04 - 511800F06FB659D7CD2D892816B984258992242129E5924BDEE49147FF81571E - 9495072F44BB1EF69127CAA5DC436E895C4A92AC6CC48E9961EC3963C7EEEC65 - CEAC6D5F7CF575E69C33F3FD3AA773861204014219D4FF02298AF2FAD2709B5E - B8BEBF0E18195B17A4C28A20C2FA8D16E059065EACF7F0FE6203FBAB986B9619 - D0EB93A169D0E8757E7A6C089ED2BBC1643291814E4C2CF0EC13F3368FB0AE8E - 5618DF0E27038381A1200283851181C1C414C191F6CC3F611DED2DA0D150E4E0 - 402515F0A56CACAF83C8A808A069DA0DF50B8EF65242437D1F11C0B13C701C87 - DBA58555282E2B045A4B83D691AE685040578C6339585DDC8082923C0CC9D13F - 83728CE378D858D981DC826C8CC9D189DD88C0C10F86151119BAB77D08593919 - 222843270F74EAC1AFCF2FBC126F181A3FDA3F85F4CC34097245A74EE2D4814A - 18EA9F1D5F404A6A1284858779A0B3E789E42009869E2FCF6F203129016FA11C - 9DBB4A26034931D691B73777101B1F8341396AB94D53064930C6FE21818F0F56 - 88D6454907C589CE5BB3C16C36BBFF3EE5605D6DAF072616E781E7C53196FD5D - 1DEADB9E6D18D06A7F4FE73263C018AAEB17ACAAEC715FCD4F515F186ADFDFDE - 1C975C23615B9A720953042BCA3A556168FB19C68EBF47E8A1AEDA0D53044B0D - ADAA30144EF038A6C60353048BF29B55614ED017A6086E32DD1048F8C2FC82A1 - 889083DF93D867F65E51168D0000000049454E44AE426082} - Instruction.Text = 'Elija el almac'#233'n' - Instruction.Glyph.Data = { - 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001C00 - 00001C0806000000720DDF940000000970485973000017120000171201679FD2 - 520000000467414D410000B18E7CFB5193000003104944415478DAAD96FB4B14 - 5114C7CFE463DC1E606444BFF54424D3DC55CA52B1CCD7165A219905054182FD - 1452FD5810FD100406610A669A998FC4F5BDB6266265DAB60F5DD15E58FE03B2 - 3F99D29ABBA7B9779C71C61D9D6177CFCE70CFDCB97B3EF7DCF3BD33C38082FD - B502B2B300CC656020048688A24F036233A0671F40D43160BA87BF62AEEE1010 - 60D7AE293AD8B835815E9B625C80DC8F1E88D4A7C1E8C1FB8F9FD6C3C44035B3 - 21500A65F6D700FE2EA580A5EC551F4A50359316B31D76EFDC0EE5F72A645045 - A067AE0623074B8140891108F1057064CC0D556053DF173812B707E6DCF332A8 - 225080D201DB4AF99BF335B4D502F371415BCC364833C4C29F458F0C2A031281 - 081734AB0B3C88403C1E6E3E2E7960F6A8FFD27A7D3EF07A11DA2C76C84A8D87 - A57FCB32E8B8A54A4C8C21B59365C9015996EF2240B6634DF435B51460A46D1F - 70C093AA46BF09C980C12CA914E6F371ADD707EF1DB3B0B0B8006EB79B8EA96B - EA5106121851245129118FD8BFA2DC5C53C6BAF5EBBBBA97C2D64EC064195B1F - 286C76E956A0EA5C51AEB4764A9929F5750D5A9581D2274B9B651C0BA2F514A8 - 6F28E36B70AD9A4253EF97A9AA55B0CEBA87D03B645B3F43C1DE589C58186D10 - 81150FCAC57B11E161B04517099BB953C78643141B01BA28EEE4DAB0B04DE2B8 - CA460B9C399902E661BB3AB0F5AD038BF30CD4D7E7DD14815A61023027DD00EF - 469C1A80FD1C307F1578FD4A81E665945AD68924181A9D5007B6F4DBF1527E32 - F5C9D3632351F8F549AEE916B14EAA039BCD362C31A6040D23E7887D4A03B0CF - 86C5C6641A24BB7646D3F2D51A77F8C1BCDCFFC79CD3EAC0D7BD56AE86294165 - 4660CB5C6B737DD3062CCA31D00069E76E05241862CF1EDD05E7D40F756063CF - 673C7F5A4F679A59541EF03E4C8C3B0893DF67D481AFBAC7B0F05412CD30EBE2 - ED80F7617CEC0198FEF94B1BF06C6622AD4B4EC99D80F7A1666043D7281A3312 - FD84C20B8417C3AA789405239826E0CBCE4F98979E10344C33B0BE630473D312 - 82866906D6993E62F6F1C3F45D160A5305BE68FF8095CF5B4302134CFE1185EA - 1FB8A1B4FF4FE32FF6FADB8B5E0000000049454E44AE426082} - Instruction.Icon = tdiCustom - RadioButtons = < - item - Caption = 'Radio Button 0' - Value = 200 - end - item - Caption = 'Radio Button 1' - Value = 201 - end - item - Caption = 'Radio Button 2' - Value = 202 - end - item - Caption = 'Radio Button 3' - Value = 203 - end> - ButtonBar.Buttons = [cbOK] - MainIcon = tdiCustom - Title = 'FactuGES' - Position = dpMainFormCenter - Icon.Data = { - 0000010003002020100001000400E8020000360000002020000001000800A808 - 00001E0300002020000001002000A8100000C60B000028000000200000004000 - 0000010004000000000000020000000000000000000000000000000000000000 - 000000008000008000000080800080000000800080008080000080808000C0C0 - C0000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF000000 - 0000000000000000000000000000000008777777777777777777777700000000 - 0877767777677776777767760000000008F88888888888888888888700000000 - 08F8FF8F8F888888888888860000000008FF8F8F88F8F8888888888C00000000 - 08F88888F8888888888888860000000008F8688878E8888E88E8788700000000 - 08F8688888F8F8FFFFFF88760000000008FF4888888F8FFFFFFF788700000000 - 08F8676767677677677658E50000000008FF8888888887878787888700000000 - 08FF8887887E8888888888860000000008FFE8E8E788C8E8FF8F8F8600000000 - 08FFF8F8F8F8FF8F88F8F8870000000008FFFFFF8FF8F8F8F88F888600000000 - 0FF8477878787878788788860000000008FF68888888F8FF8F8F788700000000 - 08B7588888FF8FFFFFFF78860000083008BB47887776777777776F86000000B7 - 8B9B73BB88788787E87878870000008BB8B9BB78888888EFF8F8FF8600000087 - B8BB8B888E8E8E88FFF8F886000000088BBB888FFFFFFFFFF8F877770000B9BB - B8FFBB9B9BFFFFFFF87466460000BBB9BB8FBBBBB8FFFFFFF88F888700000008 - B8BB88888FFFFFFFF88F8F7700000008BBBBBB8FFFFFFFFFFF8887700000007B - B7B98BB8FFFFFFFFF8887700000000B78B9B87B888F88F88F8877000000007B0 - 08BB883B78888788787700000000000000B9000000000000000000000000FFFF - FFFFF800000FF800000FF800000FF800000FF800000FF800000FF800000FF800 - 000FF800000FF800000FF800000FF800000FF800000FF800000FF800000FF800 - 000FF800000FF800000F9800000FC000000FC000000FC000000FE000000F0000 - 000F0000000FE000000FE000001FC000003FC000007F980000FFFCFFFFFF2800 - 0000200000004000000001000800000000000004000000000000000000000001 - 00000001000000000000694731007C5D49007E604C0081635000826451008567 - 540085685500886B5900896D5B008A6E5D008B705F008E715F008B7260008C72 - 61008E74640084766C00957A6900977D6D00887B72009A8171009D8272009C84 - 76009D8778009F897B00A28A7900A08B7D00A18C7E00E1B06E00E1B67D003E7A - 970073A0A5007AA2B70074AFBD007BB2BB003CAACE0028A5DB0020ADDF000D9A - E500209EE3000DA6E2001AA4EF0000A6FF000CABFE0009ACFE0010A4F10015AC - FA0000B5FB0000B0FD000CB6FC0000BFF90000BAFD0004BAFD0009BBFB0013B6 - F40015BFFA001CBDFB0026B7FD00589EC50040A4CD0040ABCC0050A2C7005DAE - C00060A3C20062A4C60060B7CB006AB0CD007BB6C80077BAC80061BADD0044AD - E50000C3F80007C6FB0000CAF80000CFFB0000D4F90026C8FA0026CDF8002BCC - F90039C4FB0039C2FC0039CAFA003FCFFB0024D6F80030D2F80039D5F80000F8 - F8001FF8F8002CF6F8003EF4F8005AC6DC0070CDDF0052C0E40054C9E3004DCE - FA005FC7FF004FD2FB004DD9F8005FD9FB006ED3E70063CDFE0060D1FB0060D8 - F90060DDF80046F8F90056F0F8005FFAFA0073E3F80073E4F90073EEF80060F1 - F800958A84009A918C0081999500A68F8200AD968500A3968C00AE988900AD9A - 8D00B19A8B00AF9C9000B09E9200B59F9200B7A29300B2A19600B5A19400B7A4 - 9700BDA79700B4A39800B1A59D00B4A79F00BAA69800BCA79900B4A89F00BCA8 - 9900BAA89C00BDAA9D00BEAC9E0083ADBD00B5A9A100BDABA000BEADA100BFAF - A500A0BABE00C0AB9E00C1AC9E00C6AE9F00E2B98100E4BA8300E4BB8400E5BC - 8500E1BD8E00E3BF9000C0ADA000C2B0A300C2B1A500C4B2A600C1B2A800C3B5 - AB00C8B4A800CCB9AD00CEBCB100D0BEB200D1BFB400E4C19300E5C29400E6C4 - 9600E8C69900D0C9A300CFC1B800D2C1B600D3C3B800D5C4B900D6C6BC00D8C6 - BC00D6C8BE00DAC9BF00ECD3B000EDD4B200EFD6B500E7D1B800E7D3BD00F0D8 - B6008CB7C40080BEC70097C3C70099C3C900ABD7CF00AFD9DD0086E3F90086E7 - F90086ECF8009EE5FB0090E8F900ACEDFC00BCEAFD00BCF1FB00BFF1FD00D7C9 - C000D9CAC100DCCBC200DACCC200DDCCC300DACCC400DDCEC400DED0C600DED1 - C900DED3CC00DFD4CD00E1D1C900E2D5CD00F0DCC200E3D8D200E5D9D200E2DA - D500E6DBD400E5DCD500E8DDD600E6DDD800E9DFD900E6E0DB00EAE0DA00EAE2 - DD00ECE3DE00EBE4DE00ECE4DE00F3E7D900C6E1EF00C9EFFD00D7F6FD00DFF3 - FF00DFFEFE00EBE7E300EDE6E100EFE7E400EEE8E400F0EAE600F2EDE900F2EE - EC00F4EFEC00F5F0EE00F9F4ED00E7FAFD00EBF8FF00F6F2F000F7F4F100F8F4 - F200F9F7F500FAF8F600FBF9F900FCFBFA00FCFCFB00FEFEFE00000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000007D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D - 0D0D0000000000000000009C9C19191919191919191919191919191919191919 - 1903000000000000000000ABDECBCBC7C7AFABABABABAAA3A2A2A0A0A0A0A0A0 - 8607000000000000000000ABECEAE9DEDEDEDED7D5D2D2D2CBCBCBCBB0CBB0CB - 9007000000000000000000ABEDECEAE9DEDEDBD7D7D5D2D2D2CDCDCBB0B0B0B0 - 9007000000000000000000AFEDE9A9CFD2CFD2CDCBCBCBB0B0ABACA3A3A3A3B0 - 9007000000000000000000AFF0D5017783838386868686869099909999907BB0 - 9007000000000000000000B0F4D501A0B0CBD2D5DEECEDF7FAFAFAFAFAF77BAA - 9007000000000000000000CBF4DC01A0B0B0B0D2D5DBEAEDF7FAFAFAFAF47BB0 - 9007000000000000000000CBF8DC010404070604090909090D0D110D110D02A3 - 9007000000000000000000CBFAED9E9E9E9C999E8C8C8C868683837E7D7D7ACB - 9007000000000000000000CBFAF1A7A7A6A6A6A69898989898B5DBDBD5D5D2D2 - 9907000000000000000000CDFAF796969696961D961D931D1DB4DEDBD7D5D5D2 - 9C07000000000000000000CFFAFAFAFAF8F7F0F0EDEDEDECE9E9DEDEDED7D5D5 - 9907000000000000000000CDFAFAEAF0EDEDECEAEAE9DEDEDBDCD5D5D5D5D2D5 - 9C07000000000000000000D2FAEC01737D7D7B7D7D7B7D7B7D7B7B7B7D7B7DD2 - 9907000000000000000000CFFAEC019EABB0CBD2D5DCDEECEDF4F4F4F4EA7BD2 - 9C07000000000000000000B9524601A0B0B0CBB5D5DEEAEDF7FAFAFAFAF47DD5 - 9C070000000000213F0000B83226010C3F5C1F111214141616191B1B1B1807D2 - 9C07000000000000253D8A5B322D711E2860BA7E7E7A7E797A797979767676D5 - 9E0700000000000041375E662F2B65314EBBB6B6B6B6B4B4B1E2F4EDEDEDECEA - 9C070000000000008F5D66663232394EC1A81C1C1C1C1C1C1CD3F7F4EDDED7D5 - 9C0700000000000000B7BE6E5758BEBDE4E6E6F3FAFAFAFAFAFAF7F4D5928675 - 7304000000002A2A2A2A4A6AFAE7562F2A2A2A5FFAFAFAFAFAFAF8D577010101 - 0101000000004747472F4A59C5E7564A32474766FAFAFAFAFAFAFADCA0D2CFB0 - A20C00000000000000436C6958686D6BC2C5C5E7FAFAFAFAFAFAFADEAADEDBCB - 1470000000000000004551534A4A5250C0E7FAFAFAFAFAFAFAFAFADEAAD7B514 - 700000000000000042384C54472B613550C3FAFAFAFAFAFAFAFAFADEA1B0196F - 000000000000000024234463322EBC5A3664E3ECE9E9E9E9E9E9E9CF90731300 - 000000000000003A3C00002232298B8B3E3B207E8B7E8B7E827E817E74100000 - 0000000000000000000000003227000000000000000000000000000000000000 - 000000000000FFFFFFFFF800000FF800000FF800000FF800000FF800000FF800 - 000FF800000FF800000FF800000FF800000FF800000FF800000FF800000FF800 - 000FF800000FF800000FF800000FF800000F9800000FC000000FC000000FC000 - 000FE000000F0000000F0000000FE000000FE000001FC000003FC000007F9800 - 00FFFCFFFFFF2800000020000000400000000100200000000000801000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000007067 - 5F70AA9382E570513CE3735540E3735540E3735540E3735540E3735540E37355 - 40E3735540E3735540E3735540E3735540E3735540E3735540E3735540E37355 - 40E3735540E3735540E3735540E3735540E3735540E3735540E372533EE5BAAB - A070000000000000000000000000000000000000000000000000000000005E54 - 4C7FCAB7ABFFC5B5AAFFA18877FFA28A78FFA28A79FFA28A79FFA28A79FFA28A - 79FFA28A79FFA28A79FFA28A79FFA28A79FFA28A79FFA28A79FFA28A79FFA28A - 79FFA28A79FFA28A79FFA28A79FFA28A79FFA28A79FFA58D7CFF7A5B46FFB2A1 - 967F000000000000000000000000000000000000000000000000000000006055 - 4D7ED7C6BBFFEDE4E0FFD9CCC4FFD9CCC4FFD9CBC3FFD8CAC1FFD7C9BFFFD6C7 - BDFFD5C6BBFFD4C4BAFFD3C3B8FFD2C1B7FFD1C0B5FFD0BEB3FFCFBDB2FFCEBC - B0FFCEBBAFFFCEBBAFFFCEBBAFFFCEBBAFFFCEBCB0FFBEAA9CFF82644FFFB2A1 - 967E000000000000000000000000000000000000000000000000000000006056 - 4D7ED7C8BCFFF2EBE8FFEFE9E5FFEEE7E2FFECE5E0FFEBE2DEFFEAE0DBFFE9DE - D8FFE7DBD4FFE5D9D1FFE3D7CFFFE2D4CCFFE1D2C9FFDFD0C7FFDDCDC4FFDCCB - C2FFDBC9BFFFDBC9BFFFDBC9BFFFDBC9BFFFDCCAC1FFC1AC9FFF81634FFFB2A1 - 967E000000000000000000000000000000000000000000000000000000006155 - 4E7ED8C9BDFFF3EDE9FFF1EAE6FFF0E9E6FFEEE6E1FFECE4DFFFEBE2DDFFEAE0 - DAFFE9DED7FFE7DBD4FFE5D9D1FFE3D7CFFFE2D4CCFFE1D2C9FFDFD0C7FFDDCD - C4FFDCCBC2FFDBC9BFFFDBC9BFFFDBC9BFFFDCCAC0FFC1AC9FFF81634FFFB2A1 - 967E000000000000000000000000000000000000000000000000000000006157 - 4E7ED9C9BFFFF4EFEDFFEFE8E3FFD0C2B9FFDFD5CEFFE0D5CEFFE0D4CCFFDED3 - CBFFDDD1C8FFDCCFC6FFDACCC4FFD9CBC1FFD8C9BFFFD7C7BDFFD6C5BBFFD5C4 - B9FFD3C2B7FFD2C0B5FFD2BFB4FFD2BFB4FFDAC8BEFFC1AC9FFF81634FFFB2A1 - 967E000000000000000000000000000000000000000000000000000000006256 - 4F7EDACCC0FFF5F2EFFFE5DDD9FF5C3821FFB0998AFFB8A394FFB8A394FFB9A3 - 94FFB8A495FFB9A597FFB9A698FFBAA698FFBBA799FFBBA89AFFBBA89BFFBCA8 - 9BFFBCA89BFFBCA89BFFBBA89AFFB49E8FFFD8C6BBFFC1AC9FFF81634FFFB2A1 - 967E000000000000000000000000000000000000000000000000000000006256 - 4F7EDBCBC1FFF8F4F3FFE7E0DBFF5F3C24FFD0BDB2FFDCCBC1FFDDCCC3FFE2D2 - CBFFE7DBD4FFEDE2DEFFF0E8E6FFF5F0EDFFF9F7F4FFFDFDFDFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFAF8F7FFB39D8DFFD8C6BBFFC1AC9FFF81634FFFB2A1 - 967E000000000000000000000000000000000000000000000000000000006256 - 4F7EDCCEC3FFFAF6F5FFE9E2DDFF5F3C24FFD2BFB5FFDFCDC4FFDECCC3FFE0CE - C6FFE4D4CDFFE9DDD6FFEFE4E0FFF1EAE8FFF7F1EFFFFBF8F6FFFFFEFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFCFBFAFFB5A090FFD9C7BEFFC1AD9FFF81634FFFB2A1 - 967E000000000000000000000000000000000000000000000000000000006257 - 4F7EDDCFC4FFFCF9F9FFE9E4E0FF5F3A23FF7C5D49FF7F5F4CFF7E5F4CFF7E60 - 4DFF7F614DFF816350FF826552FF836654FF846856FF856A57FF866B59FF876C - 5BFF876D5BFF876D5BFF866B59FF72523DFFD5C3B9FFC1AFA1FF81634FFFB2A1 - 967E000000000000000000000000000000000000000000000000000000006357 - 507EDECFC6FFFCFCFBFFF4F1F0FFC3B6AEFFC3B5ADFFC1B4ACFFC0B3AAFFBFB1 - A9FFBEB0A6FFBDAEA5FFBDACA3FFBCABA2FFBBAAA0FFBAA99FFFB8A69AFFB8A4 - 98FFB6A396FFB5A194FFB49F93FFB39D90FFDCCDC4FFC2AEA1FF81634FFFB2A1 - 967E000000000000000000000000000000000000000000000000000000006357 - 507EDFD2C7FFFEFEFDFFF9F5EFFFE8C696FFE9C799FFE8C697FFE7C596FFE7C4 - 95FFE6C394FFE5C293FFE4C091FFE4C090FFE3BF8FFFE2BD8CFFE9D5BFFFEBE1 - DCFFEADFD8FFE7DCD5FFE5DAD3FFE4D8D0FFE3D4CCFFC2AFA2FF81634FFFB2A1 - 967E000000000000000000000000000000000000000000000000000000006458 - 517EE0D3C8FFFFFFFFFFFAF5EFFFE3B77CFFE4B97FFFE2B87EFFE3B77DFFE2B7 - 7CFFE2B67BFFE1B57AFFE1B479FFE0B478FFE0B377FFDFB174FFE6D0B7FFEBE1 - DCFFE8DFD9FFE8DDD6FFE6D9D2FFE3D8D1FFE4D7CFFFC3AFA2FF81634FFFB2A1 - 967E000000000000000000000000000000000000000000000000000000006458 - 517EE1D2C9FFFFFFFFFFFEFEFDFFFEFFFFFFFCFDFEFFFBFBFBFFF9F7F8FFF8F5 - F6FFF7F3F2FFF5F1F0FFF4EFEEFFF1EDEBFFF0EBE9FFEEE9E6FFEDE6E2FFECE3 - DEFFEBE1DBFFE9DFD9FFE8DDD6FFE6DAD3FFE5D9D2FFC3B0A3FF81634FFFB2A1 - 967E000000000000000000000000000000000000000000000000000000006459 - 517EE1D4CAFFFFFFFFFFFDFDFCFFEEEBE8FFF5F2F0FFF4F0EFFFF3EFECFFF2ED - EAFFF1EBE8FFEEE9E5FFEFE7E3FFECE5E1FFEAE4DEFFEAE1DCFFE8E0DAFFE7DE - D8FFE6DDD6FFE5DBD4FFE4D8D1FFE2D6CEFFE6DBD4FFC3B1A4FF81634EFFB2A1 - 967E000000000000000000000000000000000000000000000000000000006559 - 527EE2D4CAFFFFFFFFFFF0ECEAFF5B361EFFAB9383FFB39D8EFFB39D8DFFB39D - 8DFFB29D8DFFB29C8DFFB29C8CFFB29C8CFFB29C8CFFB29C8CFFB29C8CFFB29C - 8CFFB29C8CFFB29C8CFFB29C8DFFB39D8EFFE3D8D0FFC4B1A4FF81634EFFB2A1 - 967E000000000000000000000000000000000000000000000000000000006559 - 527EE5D4CAFFFFFFFFFFF7F0EBFF5F3B24FFCCB8ADFFD7C5BAFFD9C7BDFFDCCC - C3FFE1D4CCFFE5DAD4FFE8E0DBFFEDE5E1FFF1EBE9FFF5F2EFFFF7F5F3FFF8F6 - F4FFF8F5F4FFF8F6F4FFF1EEEAFFB29C8DFFE6DAD3FFC4B2A5FF81634EFFB2A1 - 967E00000000000000000000000000000000000000000000000000000000685A - 527E9AC6C9FF35CFFEFF3DAEEBFF663E24FFD2BFB4FFE0CBBFFFE0C9BDFFE1CD - C4FFE4D5CDFFE9DED7FFEEE5E0FFF2EBE8FFF6F2F0FFFCF8F8FFFFFFFEFFFFFF - FFFFFFFFFFFFFFFFFFFFFCFAF9FFB49E8FFFE7DED7FFC5B3A6FF81634EFFB2A1 - 967E00000000000000000000000000000000007792910072A7A3001E33366957 - 4C7C86C1C8FF00BFFBFF079AEBFF6A3E23FF926D57FF5FA3C8FF4AC1E8FF6C9C - A2FF917260FF927767FF947A69FF957C6CFF977E6FFF998171FF9A8374FF9B85 - 76FF9C8678FF9C8678FF998274FF7D5E49FFE3D9D4FFC5B3A7FF81634EFFB2A1 - 967E00000000000000000000000000000000005A6F7000A9E5E40075AEAE5C90 - A5BD75D0E0FF00BFFAFF0CA3F4FF8A9A91FF3C7492FF03A4E4FF4AD5FFFF98C4 - CBFFB3A196FFB1A197FFB0A096FFB09F95FFAF9D92FFAF9C91FFAD9A8EFFAC99 - 8CFFAB988AFFAB9789FFAA9688FFA99386FFE8E0DAFFC5B4A7FF81634EFFB2A1 - 967E00000000000000000000000000000000000000002DA5BFC110C2FFFF4DD0 - FDFF64DBF9FF00B3FAFF09A8FEFF68D7FFFF04B5FFFF24CCFBFFAFD8CEFFF7DA - B8FFF3DBBBFFF3DBBAFFF2D9B9FFF1D8B7FFF0D7B4FFEED5B2FFF6EADDFFF9F6 - F4FFF7F3F1FFF5F1EEFFF5EFECFFF4EDEAFFF1EBE7FFC6B4A8FF81634EFFB2A1 - 967E00000000000000000000000000000000000000005F8A909142C7E4E960DE - F8FF64D7FAFF00B6FDFF00B8FDFF21B2FDFF1ECCF7FF93EBFCFFD2C69BFFE1AB - 63FFDFAC66FFDFAC66FFDFAC66FFDFAC66FFDFAC66FFDEA961FFEFDBC0FFF8F6 - F5FFF6F2F0FFF3EDEBFFECE2DCFFE9DFD9FFE5DBD6FFC2B1A4FF81634FFFB2A1 - 967E000000000000000000000000000E171A000E171A00040B145994A4A990EB - FCFF61F1F7FF13FAF7FF23F9F7FF93EDF7FF8CE5F8FFD5F2FDFFE9F8FFFFE7F8 - FFFFF0FCFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFDFEFFFFFAFAF9FFF9F7 - F5FFF7F2F0FFE8DFD8FFC7AE9FFFBEA998FFAF9888FFB09A8AFF7F604DFFB2A1 - 967E00000000000000000000000000AAFFFF00AAFFFF00AAFFFF00A4FFFF00CD - FAFF5DFCF9FFFFFFFFFFEEFEFEFF00FBF7FF00AAFEFF00A1FFFF00A1FFFF00A0 - FFFF56C3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCFDFBFFFCFBFAFFFBFA - F8FFE6DDD6FFAA9180FF5D3922FF603D26FF613E27FF613E28FF634029FFB4A3 - 987E00000000000000000000000000CAFFFF00CAFFFF00CBFFFF00B0FFFF00CD - FBFF38F5F7FFC3EFFAFFF0FFFEFF00FAF7FF00C8F7FF00C2F7FF00C2F7FF00C1 - F7FF57D7FAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFEFEFFFDFDFCFFFCFC - FBFFE7DED8FFCCB9ACFFE6DBD5FFE2D7D0FFDCCFC5FFD7C5BBFF8E705DFFB4A2 - 9680000000000000000000000000002E383C002E383C00252F364C99B0B57DE8 - FBFF59F1F7FF25F7F7FF41FAF8FF7CEEF7FF77E4F7FFB5EFFCFFC6F2FDFFC3F2 - FDFFD9F6FCFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDFEFEFFFEFE - FEFFE9E1DAFFCEBCAFFFF1E9E3FFEADFD8FFE4D5CCFF9D816FFF3A291F868985 - 831C00000000000000000000000000000000000000004E7073774AB0DADC37C9 - FBFF22D5F7FF00D3F9FF02C3FBFF37D5F7FF34BEFCFFA2E6FAFFECFBFDFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFF - FFFFEAE2DCFFCDBBADFFEADFD8FFE3D5CBFF9F8271FF3E2D2386050100200000 - 000000000000000000000000000000000000000000003E9CC4C219C0FFFF23C9 - FCFF30D3F8FF00BEF8FF06A8FEFF4FDCF8FF00B8FCFF32C2FBFFC0EBFCFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFEAE3DEFFCDB9ABFFDDCEC4FFA58979FF3E2C1F8F0905041B000000000000 - 000000000000000000000000000000000000003451510099DDDB0091C0C35DAD - BCCF76D7E9FF00BEF9FF10A9FBFFBDDEDEFF5AC8DDFF0AB5F7FF62CEFFFFCBE4 - F1FFF1E7E0FFEFE7E1FFEEE6E1FFEEE6E1FFEEE6E0FFEDE6E0FFEDE5E0FFEEE6 - E1FFE1D4CCFFC5AE9FFFA68D7FF53E2718A10402000E00000000000000000000 - 0000000000000000000000000000000000000075B7AF0099C7C500323E425442 - 3B5C6BA8B1DA00C1FCFF0EA1F3F8A98E80C0AB9081C12698B1C10088C4C14C85 - A3C1A18D80C19E8D81C19E8B81C19D8C80C19B8C7FC19B8A7FC19C897FC19A89 - 7EC19B8B7EC1897769C2432B1BAC000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000045565A00C5FFFF0094E6E2000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000FFFFFFFFF0000007F0000007F0000007F000 - 0007F0000007F0000007F0000007F0000007F0000007F0000007F0000007F000 - 0007F0000007F0000007F0000007F0000007F0000007F0000007800000078000 - 0007C0000007C000000700000007000000070000000700000007C000000FC000 - 001F8000003F800000FFF8FFFFFF} - Left = 152 - Top = 152 - end end diff --git a/Source/Modulos/Inventario/Views/uEditorInventario.pas b/Source/Modulos/Inventario/Views/uEditorInventario.pas index de375ea2..28b66d3d 100644 --- a/Source/Modulos/Inventario/Views/uEditorInventario.pas +++ b/Source/Modulos/Inventario/Views/uEditorInventario.pas @@ -12,7 +12,7 @@ uses uViewBase, uViewBarraSeleccion, JvComponentBase, uEditorGridBase, uIEditorInventario, uBizInventario, uViewGridBase, uInventarioController, JvExComCtrls, JvStatusBar, uViewGrid2Niveles, JSDialog, uBizAlmacenes, - uDAInterfaces, dxGDIPlusClasses; + uDAInterfaces, dxGDIPlusClasses, uEditorElegirAlmacenObraOperacion; type TEnumSeleccion = (tAlmacen, tObra, tAlmacenObra); @@ -29,7 +29,6 @@ type actExpandir: TAction; actContraer: TAction; frViewInventario1: TfrViewInventario; - JsElegirAlmacenDialog: TJSDialog; actReservados: TAction; TBXItem38: TTBXItem; Image2: TImage; @@ -48,7 +47,7 @@ type procedure actReservadosExecute(Sender: TObject); private - function Seleccionar(Descripcion: String; TipoSeleccion: TEnumSeleccion): Integer; + function Seleccionar(Descripcion: String; TipoSeleccion: TEnumSeleccion): Variant; function DarIDAlmacenSeleccionado(Descripcion: String): Integer; function DarIDObraSeleccionada(Descripcion: String): Integer; @@ -140,14 +139,14 @@ end; procedure TfEditorInventario.EliminarInterno; var - IDAlmacenOrigen: Integer; + IDAlmacenOrigen: Variant; begin if (TipoInventario = CTE_INV_ALMACEN) then - IDAlmacenOrigen := darIDAlmacenSeleccionado('Elija el almacén donde se realizará la salida') + IDAlmacenOrigen := DarIDAlmacenSeleccionado('Elija el almacén donde se realizará la salida') else IDAlmacenOrigen := DarIDObraSeleccionada('Elija la obra donde se realizará la salida'); - if IDAlmacenOrigen <> -1 then + if not VarIsNull(IDAlmacenOrigen) then begin FController.SalidaArticulosLibre(FInventario, IDAlmacenOrigen); RefrescarInterno; @@ -221,14 +220,14 @@ end; procedure TfEditorInventario.NuevoInterno; var - IDAlmacenDestino: Integer; + IDAlmacenDestino: Variant; begin if (TipoInventario = CTE_INV_ALMACEN) then IDAlmacenDestino := DarIDAlmacenSeleccionado('Elija el almacén donde se realizará la entrada') else IDAlmacenDestino := DarIDObraSeleccionada('Elija la obra donde se realizará la entrada'); - if IDAlmacenDestino <> -1 then + if not VarIsNull(IDAlmacenDestino) then begin FController.EntradaArticulosLibre(FInventario, IDAlmacenDestino); RefrescarInterno; @@ -260,66 +259,61 @@ begin inherited; end; -function TfEditorInventario.Seleccionar(Descripcion: String; TipoSeleccion: TEnumSeleccion): Integer; +function TfEditorInventario.Seleccionar(Descripcion: String; TipoSeleccion: TEnumSeleccion): Variant; var - AAlmacenes : IBizAlmacen; - AObras : IBizObra; - Respuesta : integer; + ALista : TStringList; + AListaAux : TStringList; + Respuesta : Variant; + i: Integer; + begin - Result := -1; + Result := Null; - AAlmacenes := Controller.AlmacenesController.BuscarTodos; - AObras := Controller.ObrasController.BuscarTodos; - AAlmacenes.DataTable.Active := True; - AObras.DataTable.Active := True; + with TfEditorElegirAlmacenObraOperacion.Create(NIL) do + try + case TipoSeleccion of + tAlmacen: begin + Caption := Descripcion; + eDescripcion.Caption := 'Elija sobre qué almacén desea realizar la operación.'; + eEtiqueta.Caption := 'Almacén:'; + ALista := Controller.AlmacenesController.DarListaAlmacenes; + end; + tObra: begin + Caption := Descripcion; + eDescripcion.Caption := 'Elija sobre qué obra desea realizar la operación.'; + eEtiqueta.Caption := 'Obra:'; + ALista := Controller.ObrasController.DarListaObras; + end; + tAlmacenObra: begin + Caption := Descripcion; + eDescripcion.Caption := 'Elija sobre qué almacén u obra desea realizar la operación.'; + eEtiqueta.Caption := 'Almacén/Obra:'; + ALista := Controller.AlmacenesController.DarListaAlmacenes; + AListaAux := Controller.ObrasController.DarListaObras; - JsElegirAlmacenDialog.Content.Clear; - case TipoSeleccion of - tAlmacen: JsElegirAlmacenDialog.Content.Add('¿Sobre que almacén desea realizar la operación?'); - tObra: JsElegirAlmacenDialog.Content.Add('¿Sobre que obra desea realizar la operación?'); - tAlmacenObra: JsElegirAlmacenDialog.Content.Add('¿Sobre que almacén / obra desea realizar la operación?'); + for i := 0 to AListaAux.Count - 1 do + ALista.Add(Format('%s=%s', [AListaAux.Names[i], AListaAux.Values[AListaAux.Names[i]]])); + end; + end; + + with cxListaAlmacenesObras.Properties.Items do + begin + BeginUpdate; + try + Clear; + for i := 0 to ALista.Count - 1 do + Add(ALista.Names[i]); + finally + EndUpdate; + end; + end; + + if (ShowModal = mrOk) then + Result := ALista.Values[cxListaAlmacenesObras.EditValue]; + + finally + Free; end; - JsElegirAlmacenDialog.Instruction.Text := Descripcion; - JsElegirAlmacenDialog.RadioButtons.Clear; - - if TipoSeleccion in [tAlmacen, tAlmacenObra] then - with JsElegirAlmacenDialog.RadioButtons do - begin - AAlmacenes.First; - while not AAlmacenes.EOF do - begin - with Add do - begin - Caption := AAlmacenes.NOMBRE; - Value := 1000 + AAlmacenes.ID; - end; - //Asi sabemos que solo va a intentar chequear el primero si hemos añadido al menos un item - Items[0].Checked := True; - AAlmacenes.Next; - end; - end; - - if TipoSeleccion in [tObra, tAlmacenObra] then - with JsElegirAlmacenDialog.RadioButtons do - begin - AObras.First; - while not AObras.EOF do - begin - with Add do - begin - Caption := AObras.NOMBRE; - Value := 1000 + AObras.ID; - end; - //Asi sabemos que solo va a intentar chequear el primero si hemos añadido al menos un item - Items[0].Checked := True; - AObras.Next; - end; - end; - - //Sacar la pantalla de selección y devolver el almacén seleccionado. - Respuesta := JsElegirAlmacenDialog.Execute; - if Respuesta <> IDCANCEL then - Result := JsElegirAlmacenDialog.RadioResult - 1000; end; procedure TfEditorInventario.SetController(const Value: IInventarioController); @@ -369,17 +363,17 @@ end; procedure TfEditorInventario.actTrasladarExecute(Sender: TObject); var - IDAlmacenOrigen, IDAlmacenDestino: Integer; + IDAlmacenOrigen, IDAlmacenDestino: Variant; begin if (TipoInventario = CTE_INV_ALMACEN) then IDAlmacenOrigen := DarIDAlmacenSeleccionado('Elija el almacén de origen (de donde salen los artículos)') else IDAlmacenOrigen := DarIDObraSeleccionada('Elija la obra de origen (de donde salen los artículos)'); - if IDAlmacenOrigen <> -1 then + if not VarIsnull(IDAlmacenOrigen) then begin IDAlmacenDestino := Seleccionar('Elija el almacén u obra de destino (donde entran los artículos)', tAlmacenObra); - if IDAlmacenDestino <> -1 then + if not VarIsNull(IDAlmacenDestino) then begin FController.TrasladarArticulosLibre(FInventario, IDAlmacenOrigen, IDAlmacenDestino); RefrescarInterno; @@ -389,7 +383,7 @@ end; procedure TfEditorInventario.actReservarExecute(Sender: TObject); var - IDAlmacenOrigen, IDAlmacenDestino: Integer; + IDAlmacenOrigen, IDAlmacenDestino: Variant; begin if (TipoInventario = CTE_INV_ALMACEN) then @@ -397,10 +391,10 @@ begin else IDAlmacenOrigen := DarIDObraSeleccionada('Elija la obra donde desea reservar el material'); - if IDAlmacenOrigen <> -1 then + if not VarIsNull(IDAlmacenOrigen) then begin IDAlmacenDestino := Seleccionar('Elija el almacén/obra para el que desea reservar el material (donde irán los materiales)', tAlmacenObra); - if IDAlmacenDestino <> -1 then + if not VarIsNull(IDAlmacenDestino) then begin FController.ReservarArticulosLibre(FInventario, IDAlmacenOrigen, IDAlmacenDestino); RefrescarInterno; diff --git a/Source/Modulos/Inventario/Views/uViewInventario.dfm b/Source/Modulos/Inventario/Views/uViewInventario.dfm index 37d05cdf..f2e9be84 100644 --- a/Source/Modulos/Inventario/Views/uViewInventario.dfm +++ b/Source/Modulos/Inventario/Views/uViewInventario.dfm @@ -9,7 +9,7 @@ inherited frViewInventario: TfrViewInventario Width = 678 Height = 438 ExplicitTop = 143 - ExplicitWidth = 674 + ExplicitWidth = 678 ExplicitHeight = 438 inherited cxGridView: TcxGridDBTableView DataController.Summary.DefaultGroupSummaryItems = < @@ -168,12 +168,12 @@ inherited frViewInventario: TfrViewInventario end inherited frViewFiltroBase1: TfrViewFiltroBase Width = 678 - ExplicitWidth = 674 + ExplicitWidth = 678 inherited TBXDockablePanel1: TTBXDockablePanel - ExplicitWidth = 674 + ExplicitWidth = 678 inherited dxLayoutControl1: TdxLayoutControl Width = 678 - ExplicitWidth = 674 + ExplicitWidth = 678 inherited txtFiltroTodo: TcxTextEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' @@ -201,10 +201,10 @@ inherited frViewInventario: TfrViewInventario end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 678 - ExplicitWidth = 674 + ExplicitWidth = 678 inherited tbxBotones: TTBXToolbar Width = 668 - ExplicitWidth = 664 + ExplicitWidth = 668 end end end @@ -212,31 +212,30 @@ inherited frViewInventario: TfrViewInventario inherited pnlAgrupaciones: TTBXDockablePanel Top = 581 ExplicitTop = 581 - ExplicitWidth = 674 + ExplicitWidth = 678 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 678 - ExplicitWidth = 674 + ExplicitWidth = 678 inherited TBXToolbar1: TTBXToolbar Width = 668 - ExplicitWidth = 664 + ExplicitWidth = 668 end end end - object Panel1: TPanel [3] + object pnlAlmacenes: TPanel [3] Left = 0 Top = 102 Width = 678 Height = 41 Align = alTop TabOrder = 3 - ExplicitWidth = 674 DesignSize = ( 678 41) object eAlmacen: TLabel Left = 10 Top = 16 - Width = 71 + Width = 44 Height = 13 Caption = 'Almac'#233'n:' end @@ -248,9 +247,13 @@ inherited frViewInventario: TfrViewInventario Properties.DropDownRows = 25 Properties.ImmediatePost = True Properties.OnEditValueChanged = cxListaObrasPropertiesEditValueChanged + Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 0 Width = 581 diff --git a/Source/Modulos/Inventario/Views/uViewInventario.pas b/Source/Modulos/Inventario/Views/uViewInventario.pas index 1e695ec0..e308f3ed 100644 --- a/Source/Modulos/Inventario/Views/uViewInventario.pas +++ b/Source/Modulos/Inventario/Views/uViewInventario.pas @@ -51,7 +51,7 @@ type cxGridViewID: TcxGridDBColumn; cxGridViewID_ARTICULO: TcxGridDBColumn; cxStyleArticuloConStock: TcxStyle; - Panel1: TPanel; + pnlAlmacenes: TPanel; cxListaAlmacenesObras: TcxComboBox; eAlmacen: TLabel; procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; @@ -120,7 +120,11 @@ end; procedure TfrViewInventario.CustomViewShow(Sender: TObject); begin inherited; - cxListaAlmacenesObras.ItemIndex := 0; + if Assigned(FAlmacenes) or Assigned(FObras) then + cxListaAlmacenesObras.ItemIndex := 0 + //En el caso de ser la vista para la selección de articulos de un determinado almacén + else + pnlAlmacenes.Visible:= False; end; procedure TfrViewInventario.cxGridViewStylesGetContentStyle(Sender: