diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql index b1933211..5abaa879 100644 --- a/Database/scripts/factuges.sql +++ b/Database/scripts/factuges.sql @@ -1529,7 +1529,7 @@ MANO_OBRA, PRECIO_PVP_TOTAL, ID_ARTICULO) AS -SELECT ARTICULOS.ID || 0 || ARTICULOS_PROVEEDORES.ID_PROVEEDOR, +SELECT ARTICULOS.ID, ARTICULOS.ID_EMPRESA, ARTICULOS.REFERENCIA, ARTICULOS.DESCRIPCION, ARTICULOS.UNIDAD_MEDIDA, ARTICULOS.FAMILIA, ARTICULOS.IMAGEN, ARTICULOS.COMISIONABLE, ARTICULOS.FECHA_ALTA, diff --git a/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.dfm b/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.dfm index f952f067..4b3721b8 100644 --- a/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.dfm +++ b/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.dfm @@ -12,6 +12,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos inherited JvNavPanelHeader: TJvNavPanelHeader Width = 773 Caption = 'Entrada de art'#237'culos en ' + ExplicitWidth = 773 inherited Image1: TImage Left = 746 Picture.Data = { @@ -36,6 +37,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos end inherited TBXDock: TTBXDock Width = 773 + ExplicitWidth = 773 inherited tbxMain: TTBXToolbar ExplicitWidth = 164 object TBXItem7: TTBXItem [16] @@ -63,11 +65,12 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos MultiLine = True Visible = False ExplicitTop = 257 + ExplicitWidth = 767 ExplicitHeight = 277 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 - ExplicitWidth = 638 + ExplicitWidth = 759 ExplicitHeight = 249 end end @@ -79,6 +82,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos Width = 200 end> ExplicitTop = 537 + ExplicitWidth = 773 end object ToolBar1: TToolBar [4] AlignWithMargins = True @@ -102,7 +106,6 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos ShowHint = True TabOrder = 4 Transparent = True - ExplicitWidth = 642 object ToolButton1: TToolButton Left = 0 Top = 0 @@ -135,7 +138,6 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos Top = 76 Width = 773 Height = 146 - ExplicitWidth = 652 object pnlMovimiento: TTBXDockablePanel Left = 0 Top = 89 @@ -206,7 +208,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos StyleHot.LookAndFeel.NativeStyle = True TabOrder = 1 Height = 21 - Width = 445 + Width = 1086 end end object pnlEntradaPedido: TTBXDockablePanel @@ -337,39 +339,37 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos TabOrder = 6 ReadOnly = False ExplicitTop = 254 - ExplicitWidth = 652 + ExplicitWidth = 773 ExplicitHeight = 283 inherited cxGrid: TcxGrid Width = 757 Height = 139 - ExplicitLeft = 8 - ExplicitTop = 110 - ExplicitWidth = 636 + ExplicitWidth = 757 ExplicitHeight = 139 end inherited frViewFiltroBase1: TfrViewFiltroBase Width = 773 - ExplicitWidth = 652 + ExplicitWidth = 773 inherited TBXDockablePanel1: TTBXDockablePanel - ExplicitWidth = 652 + ExplicitWidth = 773 inherited dxLayoutControl1: TdxLayoutControl Width = 773 - ExplicitWidth = 652 + ExplicitWidth = 773 inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 555 - Width = 555 + ExplicitWidth = 676 + Width = 676 end inherited eLista: TcxComboBox - ExplicitWidth = 259 - Width = 259 + ExplicitWidth = 380 + Width = 380 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 773 - ExplicitWidth = 652 + ExplicitWidth = 773 inherited tbxBotones: TTBXToolbar Width = 763 - ExplicitWidth = 642 + ExplicitWidth = 763 end end end @@ -377,13 +377,13 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos inherited pnlAgrupaciones: TTBXDockablePanel Top = 257 ExplicitTop = 257 - ExplicitWidth = 652 + ExplicitWidth = 773 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 773 - ExplicitWidth = 652 + ExplicitWidth = 773 inherited TBXToolbar1: TTBXToolbar Width = 763 - ExplicitWidth = 642 + ExplicitWidth = 763 end end end diff --git a/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.pas b/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.pas index f428b699..dc96d1bc 100644 --- a/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.pas +++ b/Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.pas @@ -177,10 +177,14 @@ begin edtReferenciaPedido.Caption := FPedidoProveedor.REFERENCIA; edtSituacion.Caption := FPedidoProveedor.SITUACION; edtProveedor.Caption := FPedidoProveedor.NOMBRE; - pnlEntradaPedido.Visible := True + pnlEntradaPedido.Visible := True; + TBXItem7.Visible := True; end else + begin pnlEntradaPedido.Visible := False; + TBXItem7.Visible := False; + end; end; procedure TfEditorEntradaSalidaArticulos.actAnadirInventarioExecute(Sender: TObject);