diff --git a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm index 319fad60..c42b0753 100644 --- a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm +++ b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.dfm @@ -753,14 +753,14 @@ object RptAlbaranesCliente: TRptAlbaranesCliente object frxDBCabecera: TfrxDBDataset UserName = 'frxDBCabecera' CloseDataSource = False - DataSource = DataSource1 + DataSource = DADSCabecera Left = 264 Top = 16 end object frxDBDetalles: TfrxDBDataset UserName = 'frxDBDetalles' CloseDataSource = False - DataSource = DataSource3 + DataSource = DADSDetalles Left = 344 Top = 16 end diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas index 37b88e17..4b198fca 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas @@ -236,14 +236,14 @@ begin AClientesController := TClientesController.Create; try // Avisar si no hay datos bancarios - if not AClientesController.TieneDatosBancarios(FAlbaran.Cliente) then - ShowWarningMessage('Este cliente no tiene datos bancarios en su ficha'); + {if not AClientesController.TieneDatosBancarios(FAlbaran.Cliente) then + ShowWarningMessage('Este cliente no tiene datos bancarios en su ficha');} // Elegir la dirección de envio case FAlbaran.Cliente.Direcciones.RecordCount of 0 : begin ADireccion := NIL; - ShowWarningMessage('Este cliente no tiene ' + #10#13 + 'ninguna dirección de envío en su ficha'); + //ShowWarningMessage('Este cliente no tiene ninguna dirección de envío en su ficha'); end; 1 : begin ADireccion := FAlbaran.Cliente.Direcciones; diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm index 0fc09119..a502c072 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm @@ -1,87 +1,82 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente inherited ToolBar1: TToolBar - Height = 95 - ExplicitHeight = 95 - inherited FontName: TJvFontComboBox [4] - Left = 56 + Height = 73 + ExplicitHeight = 73 + inherited ToolButton3: TToolButton + Wrap = False + end + inherited ToolButton4: TToolButton + Left = 278 + Top = 0 + ExplicitLeft = 278 + ExplicitTop = 0 + end + inherited ToolButton14: TToolButton + Left = 334 + Top = 0 + ExplicitLeft = 334 + ExplicitTop = 0 + end + inherited FontName: TJvFontComboBox Top = 22 - ExplicitLeft = 56 ExplicitTop = 22 end - inherited ToolButton14: TToolButton [5] - Left = 201 - Wrap = False - ExplicitLeft = 201 - end inherited FontSize: TEdit - Left = 266 Top = 22 - ExplicitLeft = 266 ExplicitTop = 22 end inherited UpDown1: TUpDown - Left = 308 Top = 22 - ExplicitLeft = 308 ExplicitTop = 22 end inherited ToolButton13: TToolButton - Left = 325 Top = 22 - ExplicitLeft = 325 ExplicitTop = 22 end - inherited ToolButton11: TToolButton [9] - Left = 333 + inherited ToolButton6: TToolButton Top = 22 - ExplicitLeft = 333 ExplicitTop = 22 end - inherited ToolButton12: TToolButton [10] + inherited ToolButton7: TToolButton + Top = 22 + ExplicitTop = 22 + end + inherited ToolButton8: TToolButton + Top = 22 + ExplicitTop = 22 + end + inherited ToolButton12: TToolButton Left = 0 Top = 22 Wrap = True ExplicitLeft = 0 ExplicitTop = 22 - ExplicitHeight = 30 + ExplicitHeight = 27 end - inherited ToolButton9: TToolButton [11] + inherited ToolButton9: TToolButton Left = 0 - Top = 52 + Top = 49 ExplicitLeft = 0 - ExplicitTop = 52 + ExplicitTop = 49 end - inherited ToolButton10: TToolButton [12] + inherited ToolButton10: TToolButton Left = 145 - Top = 52 + Top = 49 ExplicitLeft = 145 - ExplicitTop = 52 + ExplicitTop = 49 end - inherited ToolButton6: TToolButton [13] + inherited ToolButton11: TToolButton Left = 270 - Top = 52 + Top = 49 ExplicitLeft = 270 - ExplicitTop = 52 - end - inherited ToolButton7: TToolButton [14] - Left = 336 - Top = 52 - Wrap = True - ExplicitLeft = 336 - ExplicitTop = 52 - end - inherited ToolButton8: TToolButton [15] - Left = 0 - Top = 74 - ExplicitLeft = 0 - ExplicitTop = 74 + ExplicitTop = 49 end end inherited cxGrid: TcxGrid - Top = 121 - Height = 183 - ExplicitTop = 121 - ExplicitHeight = 183 + Top = 99 + Height = 205 + ExplicitTop = 99 + ExplicitHeight = 205 inherited cxGridView: TcxGridDBTableView inherited cxGridViewTIPO: TcxGridDBColumn Visible = False @@ -90,7 +85,16 @@ inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente end end inherited TBXDock1: TTBXDock - Top = 95 - ExplicitTop = 95 + Top = 73 + ExplicitTop = 73 + inherited TBXToolbar1: TTBXToolbar + DockPos = 0 + inherited TBXSubmenuItem1: TTBXSubmenuItem + Visible = False + end + inherited TBXSeparatorItem6: TTBXSeparatorItem + Visible = False + end + end end end diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.dfm index 2c1e05af..c02ca492 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewDetallesAlbaranProveedor.dfm @@ -1,9 +1,98 @@ inherited frViewDetallesAlbaranProveedor: TfrViewDetallesAlbaranProveedor + inherited ToolBar1: TToolBar + Height = 73 + ExplicitHeight = 73 + inherited ToolButton3: TToolButton + Wrap = False + end + inherited ToolButton4: TToolButton + Left = 278 + Top = 0 + ExplicitLeft = 278 + ExplicitTop = 0 + end + inherited ToolButton14: TToolButton + Left = 334 + Top = 0 + ExplicitLeft = 334 + ExplicitTop = 0 + end + inherited FontName: TJvFontComboBox + Top = 22 + ExplicitTop = 22 + end + inherited FontSize: TEdit + Top = 22 + ExplicitTop = 22 + end + inherited UpDown1: TUpDown + Top = 22 + ExplicitTop = 22 + end + inherited ToolButton13: TToolButton + Top = 22 + ExplicitTop = 22 + end + inherited ToolButton6: TToolButton + Top = 22 + ExplicitTop = 22 + end + inherited ToolButton7: TToolButton + Top = 22 + ExplicitTop = 22 + end + inherited ToolButton8: TToolButton + Top = 22 + ExplicitTop = 22 + end + inherited ToolButton12: TToolButton + Left = 0 + Top = 22 + Wrap = True + ExplicitLeft = 0 + ExplicitTop = 22 + ExplicitHeight = 27 + end + inherited ToolButton9: TToolButton + Left = 0 + Top = 49 + ExplicitLeft = 0 + ExplicitTop = 49 + end + inherited ToolButton10: TToolButton + Left = 145 + Top = 49 + ExplicitLeft = 145 + ExplicitTop = 49 + end + inherited ToolButton11: TToolButton + Left = 270 + Top = 49 + ExplicitLeft = 270 + ExplicitTop = 49 + end + end inherited cxGrid: TcxGrid + Top = 99 + Height = 205 + ExplicitTop = 99 + ExplicitHeight = 205 inherited cxGridView: TcxGridDBTableView inherited cxGridViewIMPORTENETO: TcxGridDBColumn Properties.ReadOnly = False end end end + inherited TBXDock1: TTBXDock + Top = 73 + ExplicitTop = 73 + inherited TBXToolbar1: TTBXToolbar + inherited TBXSubmenuItem1: TTBXSubmenuItem + Visible = False + end + inherited TBXSeparatorItem6: TTBXSeparatorItem + Visible = False + end + end + end end