Acana_Interiorismo/FactuGES2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Arreglos varios. Se arreglan los datosseleccion de los documentos para que cuando hacemos uno nuevo el campo persona de contacto este desactivado hasta que se asigne un cliente o proveedor

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@429 f4e31baf-9722-1c47-927c-6f952f962d4b
This commit is contained in:
roberto 2009-08-04 16:20:02 +00:00
parent e400fa16c3
commit 8d0131ca98
8 changed files with 142 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Informes/1/InfPresupuestoCliente.fr3
View File

File diff suppressed because one or more lines are too long

2
Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas
View File

@ -993,7 +993,7 @@ begin
AAlbaran.DataTable.FieldByName(fld_AlbaranesClienteCODIGO_POSTAL).Clear; AAlbaran.DataTable.FieldByName(fld_AlbaranesClienteCODIGO_POSTAL).Clear;
AAlbaran.DataTable.FieldByName(fld_AlbaranesClientePROVINCIA).Clear; AAlbaran.DataTable.FieldByName(fld_AlbaranesClientePROVINCIA).Clear;
AAlbaran.DataTable.FieldByName(fld_AlbaranesClienteTELEFONO).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 if not bEnEdicion then
AAlbaran.Post; AAlbaran.Post;

10
Source/Modulos/Albaranes de cliente/Views/uViewDatosYSeleccionClienteAlbaran.pas
View File

@ -317,7 +317,10 @@ begin
if not FCliente.DataTable.Active then if not FCliente.DataTable.Active then
FCliente.DataTable.Active := True; 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 if FCliente.Direcciones.RecordCount > 0 then
ElegirDireccionCliente ElegirDireccionCliente
@ -386,7 +389,10 @@ begin
if not FCliente.DataTable.Active then if not FCliente.DataTable.Active then
FCliente.DataTable.Active := True; 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; RefrescarDireccion;
end end
else begin else begin

192
Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm
View File

@ -2,19 +2,19 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Left = 332 Left = 332
Top = 147 Top = 147
Caption = 'Nuevo presupuesto de cliente' Caption = 'Nuevo presupuesto de cliente'
ClientHeight = 661 ClientHeight = 676
ClientWidth = 816 ClientWidth = 848
OnClose = CustomEditorClose OnClose = CustomEditorClose
ExplicitWidth = 824 ExplicitWidth = 856
ExplicitHeight = 695 ExplicitHeight = 710
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader
Width = 816 Width = 848
Caption = 'Nuevo presupuesto de cliente' Caption = 'Nuevo presupuesto de cliente'
ExplicitWidth = 816 ExplicitWidth = 816
inherited Image1: TImage inherited Image1: TImage
Left = 789 Left = 821
Picture.Data = { Picture.Data = {
0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800
0000180806000000E0773DF80000000970485973000017120000171201679FD2 0000180806000000E0773DF80000000970485973000017120000171201679FD2
@ -126,7 +126,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
end end
end end
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
Width = 816 Width = 848
ExplicitWidth = 816 ExplicitWidth = 816
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
ExplicitWidth = 732 ExplicitWidth = 732
@ -153,7 +153,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
end end
end end
inherited tbxMenu: TTBXToolbar inherited tbxMenu: TTBXToolbar
ExplicitWidth = 816 ExplicitWidth = 848
object TBXSubmenuItem2: TTBXSubmenuItem [4] object TBXSubmenuItem2: TTBXSubmenuItem [4]
Caption = 'A&cciones' Caption = 'A&cciones'
object TBXItem34: TTBXItem object TBXItem34: TTBXItem
@ -168,8 +168,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
end end
end end
inherited StatusBar: TJvStatusBar inherited StatusBar: TJvStatusBar
Top = 642 Top = 657
Width = 816 Width = 848
Panels = < Panels = <
item item
Width = 200 Width = 200
@ -178,8 +178,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitWidth = 816 ExplicitWidth = 816
end end
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 810 Width = 842
Height = 336 Height = 351
TabOrder = 1 TabOrder = 1
OnChanging = pgPaginasChanging OnChanging = pgPaginasChanging
ExplicitTop = 109 ExplicitTop = 109
@ -194,11 +194,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object pagContenido: TTabSheet object pagContenido: TTabSheet
Caption = 'Contenido' Caption = 'Contenido'
ImageIndex = 1 ImageIndex = 1
ExplicitWidth = 802
ExplicitHeight = 308
inline frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente inline frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 802 Width = 834
Height = 308 Height = 323
Align = alClient Align = alClient
BiDiMode = bdLeftToRight BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -213,57 +215,91 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitWidth = 802 ExplicitWidth = 802
ExplicitHeight = 308 ExplicitHeight = 308
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 802 Width = 834
Height = 24
ExplicitWidth = 802 ExplicitWidth = 802
inherited FontSize: TEdit inherited ToolButton14: TToolButton
Wrap = False
end
inherited FontSize: TEdit [5]
Left = 368
Top = 0
Width = 58 Width = 58
ExplicitLeft = 368
ExplicitTop = 0
ExplicitWidth = 58 ExplicitWidth = 58
end end
inherited UpDown1: TUpDown inherited UpDown1: TUpDown [6]
Left = 203 Left = 426
ExplicitLeft = 203 Top = 0
ExplicitLeft = 426
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox [7]
Left = 443
Top = 0
ExplicitLeft = 443
ExplicitTop = 0
end end
inherited ToolButton13: TToolButton inherited ToolButton13: TToolButton
Left = 220 Left = 588
ExplicitLeft = 220 Top = 0
ExplicitLeft = 588
ExplicitTop = 0
end end
inherited ToolButton6: TToolButton inherited ToolButton6: TToolButton
Left = 228 Left = 596
ExplicitLeft = 228 Top = 0
ExplicitLeft = 596
ExplicitTop = 0
end end
inherited ToolButton7: TToolButton inherited ToolButton7: TToolButton
Left = 262 Left = 630
ExplicitLeft = 262 Top = 0
ExplicitLeft = 630
ExplicitTop = 0
end end
inherited ToolButton8: TToolButton inherited ToolButton8: TToolButton
Left = 296 Left = 664
ExplicitLeft = 296 Top = 0
ExplicitLeft = 664
ExplicitTop = 0
end end
inherited ToolButton12: TToolButton inherited ToolButton12: TToolButton
Left = 330 Left = 698
ExplicitLeft = 330 Top = 0
ExplicitLeft = 698
ExplicitTop = 0
end end
inherited ToolButton9: TToolButton inherited ToolButton9: TToolButton
Left = 338 Left = 706
ExplicitLeft = 338 Top = 0
ExplicitLeft = 706
ExplicitTop = 0
end end
inherited ToolButton10: TToolButton inherited ToolButton10: TToolButton
Left = 372 Left = 740
ExplicitLeft = 372 Top = 0
ExplicitLeft = 740
ExplicitTop = 0
end end
inherited ToolButton11: TToolButton inherited ToolButton11: TToolButton
Left = 406 Left = 774
ExplicitLeft = 406 Top = 0
ExplicitLeft = 774
ExplicitTop = 0
end end
end end
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Width = 802 Top = 50
Height = 236 Width = 834
Height = 273
ExplicitWidth = 802 ExplicitWidth = 802
ExplicitHeight = 236 ExplicitHeight = 236
end end
inherited TBXDock1: TTBXDock inherited TBXDock1: TTBXDock
Width = 802 Top = 24
Width = 834
ExplicitWidth = 802 ExplicitWidth = 802
inherited TBXToolbar1: TTBXToolbar inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 614 ExplicitWidth = 614
@ -274,11 +310,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object pagInicidencias: TTabSheet object pagInicidencias: TTabSheet
Caption = 'Incidencias' Caption = 'Incidencias'
ImageIndex = 2 ImageIndex = 2
ExplicitWidth = 802
ExplicitHeight = 308
inline frViewIncidenciasCli: TfrViewIncidencias inline frViewIncidenciasCli: TfrViewIncidencias
Left = 0 Left = 0
Top = 0 Top = 0
Width = 802 Width = 834
Height = 308 Height = 323
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -291,22 +329,22 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitWidth = 802 ExplicitWidth = 802
ExplicitHeight = 308 ExplicitHeight = 308
inherited pnlSup: TPanel inherited pnlSup: TPanel
Width = 802 Width = 834
ExplicitWidth = 802 ExplicitWidth = 802
inherited eIncidenciaActiva: TcxDBCheckBox inherited eIncidenciaActiva: TcxDBCheckBox
ExplicitHeight = 21 ExplicitHeight = 21
end end
end end
inherited GroupBox1: TGroupBox inherited GroupBox1: TGroupBox
Width = 802 Width = 834
Height = 280 Height = 295
ExplicitWidth = 802 ExplicitWidth = 802
ExplicitHeight = 280 ExplicitHeight = 280
inherited eIncidencias: TcxDBMemo inherited eIncidencias: TcxDBMemo
ExplicitWidth = 779 ExplicitWidth = 779
ExplicitHeight = 277 ExplicitHeight = 277
Height = 277 Height = 292
Width = 779 Width = 811
end end
end end
end end
@ -314,11 +352,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object pagDocumentos: TTabSheet object pagDocumentos: TTabSheet
Caption = 'Documentos' Caption = 'Documentos'
ImageIndex = 5 ImageIndex = 5
ExplicitWidth = 802
ExplicitHeight = 308
inline frViewDocumentosPresupuestoCliente1: TfrViewDocumentosPresupuestoCliente inline frViewDocumentosPresupuestoCliente1: TfrViewDocumentosPresupuestoCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 802 Width = 834
Height = 308 Height = 323
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -331,30 +371,30 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitWidth = 802 ExplicitWidth = 802
ExplicitHeight = 308 ExplicitHeight = 308
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
Width = 802 Width = 834
ExplicitWidth = 802 ExplicitWidth = 834
end end
inherited ListView1: TListView inherited ListView1: TListView
Width = 802 Width = 834
Height = 285 Height = 300
ExplicitWidth = 802 ExplicitWidth = 834
ExplicitHeight = 285 ExplicitHeight = 300
end end
end end
end end
end end
inherited PnlComentario: TPanel inherited PnlComentario: TPanel
Width = 816 Width = 848
ExplicitWidth = 816 ExplicitWidth = 816
inherited lbComentario: TLabel inherited lbComentario: TLabel
Width = 806 Width = 838
Height = 25 Height = 25
end end
end end
inline frViewTotales1: TfrViewTotales [5] inline frViewTotales1: TfrViewTotales [5]
Left = 0 Left = 0
Top = 448 Top = 463
Width = 816 Width = 848
Height = 194 Height = 194
Align = alBottom Align = alBottom
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -369,18 +409,18 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitWidth = 816 ExplicitWidth = 816
ExplicitHeight = 194 ExplicitHeight = 194
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 816 Width = 848
ExplicitWidth = 816 ExplicitWidth = 816
inherited Bevel3: TBevel inherited Bevel3: TBevel
Left = 402 Left = 417
Height = 122 Height = 122
ExplicitLeft = 402 ExplicitLeft = 417
ExplicitHeight = 122 ExplicitHeight = 122
end end
inherited Bevel4: TBevel inherited Bevel4: TBevel
Left = 514 Left = 529
Width = 210 Width = 210
ExplicitLeft = 514 ExplicitLeft = 529
ExplicitWidth = 210 ExplicitWidth = 210
end end
inherited ImporteDto: TcxDBCurrencyEdit inherited ImporteDto: TcxDBCurrencyEdit
@ -393,24 +433,24 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 93 Width = 93
end end
inherited ImporteIVA: TcxDBCurrencyEdit inherited ImporteIVA: TcxDBCurrencyEdit
Left = 585 Left = 600
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 585 ExplicitLeft = 600
ExplicitWidth = 137 ExplicitWidth = 137
Width = 137 Width = 137
end end
inherited ImporteTotal: TcxDBCurrencyEdit inherited ImporteTotal: TcxDBCurrencyEdit
Left = 515 Left = 530
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 515 ExplicitLeft = 530
ExplicitWidth = 137 ExplicitWidth = 137
Width = 137 Width = 137
end end
@ -422,42 +462,42 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
end end
inherited edtIVA: TcxDBSpinEdit inherited edtIVA: TcxDBSpinEdit
Left = 514 Left = 529
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 514 ExplicitLeft = 529
end end
inherited ImporteBase: TcxDBCurrencyEdit inherited ImporteBase: TcxDBCurrencyEdit
Left = 514 Left = 529
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 514 ExplicitLeft = 529
ExplicitWidth = 92 ExplicitWidth = 92
Width = 92 Width = 92
end end
inherited edtRE: TcxDBSpinEdit inherited edtRE: TcxDBSpinEdit
Left = 514 Left = 529
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 514 ExplicitLeft = 529
end end
inherited ImporteRE: TcxDBCurrencyEdit inherited ImporteRE: TcxDBCurrencyEdit
Left = 585 Left = 600
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 585 ExplicitLeft = 600
ExplicitWidth = 56 ExplicitWidth = 56
Width = 56 Width = 56
end end
@ -490,9 +530,9 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 81 Width = 81
end end
inherited bTiposIVA: TButton inherited bTiposIVA: TButton
Left = 254 Left = 269
OnClick = frViewTotales1bTiposIVAClick OnClick = frViewTotales1bTiposIVAClick
ExplicitLeft = 254 ExplicitLeft = 269
end end
inherited cbRecargoEquivalencia: TcxDBCheckBox inherited cbRecargoEquivalencia: TcxDBCheckBox
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''

2
Source/Modulos/Presupuestos de cliente/Views/uViewDatosYSeleccionClientePresupuesto.dfm
View File

@ -17,8 +17,6 @@ inherited frViewDatosYSeleccionClientePresupuesto: TfrViewDatosYSeleccionCliente
TabOrder = 0 TabOrder = 0
TabStop = False TabStop = False
AutoContentSizes = [acsWidth, acsHeight] AutoContentSizes = [acsWidth, acsHeight]
ExplicitWidth = 505
ExplicitHeight = 165
DesignSize = ( DesignSize = (
539 539
200) 200)

10
Source/Modulos/Presupuestos de cliente/Views/uViewDatosYSeleccionClientePresupuesto.pas
View File

@ -320,7 +320,10 @@ begin
if not FCliente.DataTable.Active then if not FCliente.DataTable.Active then
FCliente.DataTable.Active := True; 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 if FCliente.Direcciones.RecordCount > 0 then
ElegirDireccionCliente ElegirDireccionCliente
@ -389,7 +392,10 @@ begin
if not FCliente.DataTable.Active then if not FCliente.DataTable.Active then
FCliente.DataTable.Active := True; 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; RefrescarDireccion;
end end
else begin else begin

BIN
Source/Servidor/FactuGES_Server.RES
View File

Binary file not shown.

2
Source/Servidor/FactuGES_Server.rc
View File

@ -16,7 +16,7 @@ BEGIN
VALUE "FileVersion", "2.3.4.0\0" VALUE "FileVersion", "2.3.4.0\0"
VALUE "ProductName", "FactuGES (Servidor)\0" VALUE "ProductName", "FactuGES (Servidor)\0"
VALUE "ProductVersion", "2.3.4.0\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
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"