diff --git a/Source/Informes/1/InfPresupuestoCliente.fr3 b/Source/Informes/1/InfPresupuestoCliente.fr3 index 12d6db85..38fa8756 100644 --- a/Source/Informes/1/InfPresupuestoCliente.fr3 +++ b/Source/Informes/1/InfPresupuestoCliente.fr3 @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -42,11 +42,11 @@ - + - + @@ -62,7 +62,7 @@ - + diff --git a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas index 9453f7f9..579b97fb 100644 --- a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas +++ b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas @@ -993,7 +993,7 @@ begin AAlbaran.DataTable.FieldByName(fld_AlbaranesClienteCODIGO_POSTAL).Clear; AAlbaran.DataTable.FieldByName(fld_AlbaranesClientePROVINCIA).Clear; AAlbaran.DataTable.FieldByName(fld_AlbaranesClienteTELEFONO).Clear; - AAlbaran.DataTable.FieldByName(fld_AlbaranesClientePERSONA_CONTACTO).Clear; +// AAlbaran.DataTable.FieldByName(fld_AlbaranesClientePERSONA_CONTACTO).Clear; if not bEnEdicion then AAlbaran.Post; diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDatosYSeleccionClienteAlbaran.pas b/Source/Modulos/Albaranes de cliente/Views/uViewDatosYSeleccionClienteAlbaran.pas index d3b64261..55b86ee2 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewDatosYSeleccionClienteAlbaran.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewDatosYSeleccionClienteAlbaran.pas @@ -317,7 +317,10 @@ begin if not FCliente.DataTable.Active then FCliente.DataTable.Active := True; - edtPersonaContacto.Enabled := True; + + //Solo podremos establecer persona de contacto si se ha asignado un cliente + if FCliente.ID > 0 then + edtPersonaContacto.Enabled := True; if FCliente.Direcciones.RecordCount > 0 then ElegirDireccionCliente @@ -386,7 +389,10 @@ begin if not FCliente.DataTable.Active then FCliente.DataTable.Active := True; - edtPersonaContacto.Enabled := True; + //Solo podremos establecer persona de contacto si se ha asignado un cliente + if FCliente.ID > 0 then + edtPersonaContacto.Enabled := True; + RefrescarDireccion; end else begin diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm index 7dfe23fa..2947265a 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm @@ -2,19 +2,19 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente Left = 332 Top = 147 Caption = 'Nuevo presupuesto de cliente' - ClientHeight = 661 - ClientWidth = 816 + ClientHeight = 676 + ClientWidth = 848 OnClose = CustomEditorClose - ExplicitWidth = 824 - ExplicitHeight = 695 + ExplicitWidth = 856 + ExplicitHeight = 710 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 816 + Width = 848 Caption = 'Nuevo presupuesto de cliente' ExplicitWidth = 816 inherited Image1: TImage - Left = 789 + Left = 821 Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0000180806000000E0773DF80000000970485973000017120000171201679FD2 @@ -126,7 +126,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente end end inherited TBXDock: TTBXDock - Width = 816 + Width = 848 ExplicitWidth = 816 inherited tbxMain: TTBXToolbar ExplicitWidth = 732 @@ -153,7 +153,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente end end inherited tbxMenu: TTBXToolbar - ExplicitWidth = 816 + ExplicitWidth = 848 object TBXSubmenuItem2: TTBXSubmenuItem [4] Caption = 'A&cciones' object TBXItem34: TTBXItem @@ -168,8 +168,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente end end inherited StatusBar: TJvStatusBar - Top = 642 - Width = 816 + Top = 657 + Width = 848 Panels = < item Width = 200 @@ -178,8 +178,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ExplicitWidth = 816 end inherited pgPaginas: TPageControl - Width = 810 - Height = 336 + Width = 842 + Height = 351 TabOrder = 1 OnChanging = pgPaginasChanging ExplicitTop = 109 @@ -194,11 +194,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente object pagContenido: TTabSheet Caption = 'Contenido' ImageIndex = 1 + ExplicitWidth = 802 + ExplicitHeight = 308 inline frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente Left = 0 Top = 0 - Width = 802 - Height = 308 + Width = 834 + Height = 323 Align = alClient BiDiMode = bdLeftToRight Font.Charset = DEFAULT_CHARSET @@ -213,57 +215,91 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ExplicitWidth = 802 ExplicitHeight = 308 inherited ToolBar1: TToolBar - Width = 802 + Width = 834 + Height = 24 ExplicitWidth = 802 - inherited FontSize: TEdit + inherited ToolButton14: TToolButton + Wrap = False + end + inherited FontSize: TEdit [5] + Left = 368 + Top = 0 Width = 58 + ExplicitLeft = 368 + ExplicitTop = 0 ExplicitWidth = 58 end - inherited UpDown1: TUpDown - Left = 203 - ExplicitLeft = 203 + inherited UpDown1: TUpDown [6] + Left = 426 + Top = 0 + ExplicitLeft = 426 + ExplicitTop = 0 + end + inherited FontName: TJvFontComboBox [7] + Left = 443 + Top = 0 + ExplicitLeft = 443 + ExplicitTop = 0 end inherited ToolButton13: TToolButton - Left = 220 - ExplicitLeft = 220 + Left = 588 + Top = 0 + ExplicitLeft = 588 + ExplicitTop = 0 end inherited ToolButton6: TToolButton - Left = 228 - ExplicitLeft = 228 + Left = 596 + Top = 0 + ExplicitLeft = 596 + ExplicitTop = 0 end inherited ToolButton7: TToolButton - Left = 262 - ExplicitLeft = 262 + Left = 630 + Top = 0 + ExplicitLeft = 630 + ExplicitTop = 0 end inherited ToolButton8: TToolButton - Left = 296 - ExplicitLeft = 296 + Left = 664 + Top = 0 + ExplicitLeft = 664 + ExplicitTop = 0 end inherited ToolButton12: TToolButton - Left = 330 - ExplicitLeft = 330 + Left = 698 + Top = 0 + ExplicitLeft = 698 + ExplicitTop = 0 end inherited ToolButton9: TToolButton - Left = 338 - ExplicitLeft = 338 + Left = 706 + Top = 0 + ExplicitLeft = 706 + ExplicitTop = 0 end inherited ToolButton10: TToolButton - Left = 372 - ExplicitLeft = 372 + Left = 740 + Top = 0 + ExplicitLeft = 740 + ExplicitTop = 0 end inherited ToolButton11: TToolButton - Left = 406 - ExplicitLeft = 406 + Left = 774 + Top = 0 + ExplicitLeft = 774 + ExplicitTop = 0 end end inherited cxGrid: TcxGrid - Width = 802 - Height = 236 + Top = 50 + Width = 834 + Height = 273 ExplicitWidth = 802 ExplicitHeight = 236 end inherited TBXDock1: TTBXDock - Width = 802 + Top = 24 + Width = 834 ExplicitWidth = 802 inherited TBXToolbar1: TTBXToolbar ExplicitWidth = 614 @@ -274,11 +310,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente object pagInicidencias: TTabSheet Caption = 'Incidencias' ImageIndex = 2 + ExplicitWidth = 802 + ExplicitHeight = 308 inline frViewIncidenciasCli: TfrViewIncidencias Left = 0 Top = 0 - Width = 802 - Height = 308 + Width = 834 + Height = 323 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -291,22 +329,22 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ExplicitWidth = 802 ExplicitHeight = 308 inherited pnlSup: TPanel - Width = 802 + Width = 834 ExplicitWidth = 802 inherited eIncidenciaActiva: TcxDBCheckBox ExplicitHeight = 21 end end inherited GroupBox1: TGroupBox - Width = 802 - Height = 280 + Width = 834 + Height = 295 ExplicitWidth = 802 ExplicitHeight = 280 inherited eIncidencias: TcxDBMemo ExplicitWidth = 779 ExplicitHeight = 277 - Height = 277 - Width = 779 + Height = 292 + Width = 811 end end end @@ -314,11 +352,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente object pagDocumentos: TTabSheet Caption = 'Documentos' ImageIndex = 5 + ExplicitWidth = 802 + ExplicitHeight = 308 inline frViewDocumentosPresupuestoCliente1: TfrViewDocumentosPresupuestoCliente Left = 0 Top = 0 - Width = 802 - Height = 308 + Width = 834 + Height = 323 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -331,30 +371,30 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ExplicitWidth = 802 ExplicitHeight = 308 inherited TBXDock: TTBXDock - Width = 802 - ExplicitWidth = 802 + Width = 834 + ExplicitWidth = 834 end inherited ListView1: TListView - Width = 802 - Height = 285 - ExplicitWidth = 802 - ExplicitHeight = 285 + Width = 834 + Height = 300 + ExplicitWidth = 834 + ExplicitHeight = 300 end end end end inherited PnlComentario: TPanel - Width = 816 + Width = 848 ExplicitWidth = 816 inherited lbComentario: TLabel - Width = 806 + Width = 838 Height = 25 end end inline frViewTotales1: TfrViewTotales [5] Left = 0 - Top = 448 - Width = 816 + Top = 463 + Width = 848 Height = 194 Align = alBottom Font.Charset = DEFAULT_CHARSET @@ -369,18 +409,18 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ExplicitWidth = 816 ExplicitHeight = 194 inherited dxLayoutControl1: TdxLayoutControl - Width = 816 + Width = 848 ExplicitWidth = 816 inherited Bevel3: TBevel - Left = 402 + Left = 417 Height = 122 - ExplicitLeft = 402 + ExplicitLeft = 417 ExplicitHeight = 122 end inherited Bevel4: TBevel - Left = 514 + Left = 529 Width = 210 - ExplicitLeft = 514 + ExplicitLeft = 529 ExplicitWidth = 210 end inherited ImporteDto: TcxDBCurrencyEdit @@ -393,24 +433,24 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente Width = 93 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 585 + Left = 600 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 585 + ExplicitLeft = 600 ExplicitWidth = 137 Width = 137 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 515 + Left = 530 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 515 + ExplicitLeft = 530 ExplicitWidth = 137 Width = 137 end @@ -422,42 +462,42 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente StyleHot.LookAndFeel.SkinName = '' end inherited edtIVA: TcxDBSpinEdit - Left = 514 + Left = 529 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 514 + ExplicitLeft = 529 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 514 + Left = 529 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 514 + ExplicitLeft = 529 ExplicitWidth = 92 Width = 92 end inherited edtRE: TcxDBSpinEdit - Left = 514 + Left = 529 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 514 + ExplicitLeft = 529 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 585 + Left = 600 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 585 + ExplicitLeft = 600 ExplicitWidth = 56 Width = 56 end @@ -490,9 +530,9 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente Width = 81 end inherited bTiposIVA: TButton - Left = 254 + Left = 269 OnClick = frViewTotales1bTiposIVAClick - ExplicitLeft = 254 + ExplicitLeft = 269 end inherited cbRecargoEquivalencia: TcxDBCheckBox Style.LookAndFeel.SkinName = '' diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewDatosYSeleccionClientePresupuesto.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewDatosYSeleccionClientePresupuesto.dfm index fd6f5089..d1f82151 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewDatosYSeleccionClientePresupuesto.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewDatosYSeleccionClientePresupuesto.dfm @@ -17,8 +17,6 @@ inherited frViewDatosYSeleccionClientePresupuesto: TfrViewDatosYSeleccionCliente TabOrder = 0 TabStop = False AutoContentSizes = [acsWidth, acsHeight] - ExplicitWidth = 505 - ExplicitHeight = 165 DesignSize = ( 539 200) diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewDatosYSeleccionClientePresupuesto.pas b/Source/Modulos/Presupuestos de cliente/Views/uViewDatosYSeleccionClientePresupuesto.pas index 505b6f1d..f58ffd40 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewDatosYSeleccionClientePresupuesto.pas +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewDatosYSeleccionClientePresupuesto.pas @@ -320,7 +320,10 @@ begin if not FCliente.DataTable.Active then FCliente.DataTable.Active := True; - edtPersonaContacto.Enabled := True; + + //Solo podremos establecer persona de contacto si se ha asignado un cliente + if FCliente.ID > 0 then + edtPersonaContacto.Enabled := True; if FCliente.Direcciones.RecordCount > 0 then ElegirDireccionCliente @@ -389,7 +392,10 @@ begin if not FCliente.DataTable.Active then FCliente.DataTable.Active := True; - edtPersonaContacto.Enabled := True; + //Solo podremos establecer persona de contacto si se ha asignado un cliente + if FCliente.ID > 0 then + edtPersonaContacto.Enabled := True; + RefrescarDireccion; end else begin diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 7aaf811f..d3166548 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 96573873..4e3b46f9 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -16,7 +16,7 @@ BEGIN VALUE "FileVersion", "2.3.4.0\0" VALUE "ProductName", "FactuGES (Servidor)\0" VALUE "ProductVersion", "2.3.4.0\0" - VALUE "CompileDate", "miércoles, 15 de julio de 2009 16:41\0" + VALUE "CompileDate", "martes, 04 de agosto de 2009 16:48\0" END END BLOCK "VarFileInfo"