* Ticket #166 -> Arreglo para que en la ficha del pedido a proveedor salga el fax y el cod. de cliente.

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@794 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
David Arranz 2008-12-03 17:15:22 +00:00
parent e7a7dd8ae2
commit 5c8c2b2b94
7 changed files with 78 additions and 67 deletions

View File

@ -80,6 +80,7 @@ begin
PROVINCIA := AContacto.PROVINCIA; PROVINCIA := AContacto.PROVINCIA;
CODIGO_POSTAL := AContacto.CODIGO_POSTAL; CODIGO_POSTAL := AContacto.CODIGO_POSTAL;
TELEFONO := AContacto.TELEFONO_1; TELEFONO := AContacto.TELEFONO_1;
FAX := AContacto.FAX;
MOVIL := AContacto.MOVIL_1; MOVIL := AContacto.MOVIL_1;
EMAIL := AContacto.EMAIL_1; EMAIL := AContacto.EMAIL_1;
end; end;

View File

@ -57,7 +57,6 @@ contains
uViewProveedorPedido in 'uViewProveedorPedido.pas' {frViewProveedorPedido: TFrame}, uViewProveedorPedido in 'uViewProveedorPedido.pas' {frViewProveedorPedido: TFrame},
uEditorElegirPersonaContactoPedido in 'uEditorElegirPersonaContactoPedido.pas' {fEditorElegirPersonaContactoPedido: TfEditorSituacionPedidoProveedor}, uEditorElegirPersonaContactoPedido in 'uEditorElegirPersonaContactoPedido.pas' {fEditorElegirPersonaContactoPedido: TfEditorSituacionPedidoProveedor},
uViewObraReserva in 'uViewObraReserva.pas' {frViewObraReserva: TFrame}, uViewObraReserva in 'uViewObraReserva.pas' {frViewObraReserva: TFrame},
uDialogOpcionesImpresion in 'uDialogOpcionesImpresion.pas' {fDialogOpcionesImpresion: TForm}, uDialogOpcionesImpresion in 'uDialogOpcionesImpresion.pas' {fDialogOpcionesImpresion: TForm};
uViewDatosYSeleccionProveedorPedido in 'uViewDatosYSeleccionProveedorPedido.pas' {frViewDatosYSeleccionProveedorPedido: TFrame};
end. end.

View File

@ -49,20 +49,20 @@
<DelphiCompile Include="PedidosProveedor_view.dpk"> <DelphiCompile Include="PedidosProveedor_view.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\Almacenes_controller.dcp" /> <DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\Almacenes_controller.dcp" />
<DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\Almacenes_model.dcp" /> <DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\Almacenes_model.dcp" />
<DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\Articulos_view.dcp" /> <DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\Articulos_view.dcp" />
<DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\Contactos_controller.dcp" /> <DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\Contactos_controller.dcp" />
<DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\Contactos_model.dcp" /> <DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\Contactos_model.dcp" />
<DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\Contactos_view.dcp" /> <DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\Contactos_view.dcp" />
<DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\GestorInformes_controller.dcp" /> <DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\GestorInformes_controller.dcp" />
<DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\GUIBase.dcp" /> <DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\GUIBase.dcp" />
<DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\Obras_controller.dcp" /> <DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\Obras_controller.dcp" />
<DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\Obras_model.dcp" /> <DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\Obras_model.dcp" />
<DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\PedidosProveedor_controller.dcp" /> <DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\PedidosProveedor_controller.dcp" />
<DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\PedidosProveedor_model.dcp" /> <DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\PedidosProveedor_model.dcp" />
<DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\PedProv_AlbProv_relation.dcp" /> <DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\PedProv_AlbProv_relation.dcp" />
<DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\PedProv_FacProv_relation.dcp" /> <DCCReference Include="..\..\..\..\Resources\Firmas Tecsitel\PedProv_FacProv_relation.dcp" />
<DCCReference Include="uDialogOpcionesImpresion.pas"> <DCCReference Include="uDialogOpcionesImpresion.pas">
<Form>fDialogOpcionesImpresion</Form> <Form>fDialogOpcionesImpresion</Form>
<DesignClass>TForm</DesignClass> <DesignClass>TForm</DesignClass>
@ -100,10 +100,6 @@
<DesignClass>TfEditorSituacionPedidoProveedor</DesignClass> <DesignClass>TfEditorSituacionPedidoProveedor</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="uPedidosProveedorViewRegister.pas" /> <DCCReference Include="uPedidosProveedorViewRegister.pas" />
<DCCReference Include="uViewDatosYSeleccionProveedorPedido.pas">
<Form>fruViewDatosYSeleccionProveedorPedido</Form>
<DesignClass>TFrame</DesignClass>
</DCCReference>
<DCCReference Include="uViewDetallesPedidoProveedor.pas"> <DCCReference Include="uViewDetallesPedidoProveedor.pas">
<Form>frViewDetallesPedidoProveedor</Form> <Form>frViewDetallesPedidoProveedor</Form>
<DesignClass>TFrame</DesignClass> <DesignClass>TFrame</DesignClass>

View File

@ -1,13 +1,13 @@
inherited frViewDatosYSeleccionProveedorPedido: TfrViewDatosYSeleccionProveedorPedido inherited frViewDatosYSeleccionProveedorPedido: TfrViewDatosYSeleccionProveedorPedido
Width = 505 Width = 505
Height = 171 Height = 214
ExplicitWidth = 505 ExplicitWidth = 505
ExplicitHeight = 171 ExplicitHeight = 214
object dxLayoutControl1: TdxLayoutControl object dxLayoutControl1: TdxLayoutControl
Left = 0 Left = 0
Top = 0 Top = 0
Width = 505 Width = 505
Height = 171 Height = 214
Margins.Left = 0 Margins.Left = 0
Margins.Top = 0 Margins.Top = 0
Margins.Right = 0 Margins.Right = 0
@ -19,7 +19,7 @@ inherited frViewDatosYSeleccionProveedorPedido: TfrViewDatosYSeleccionProveedorP
AutoContentSizes = [acsWidth, acsHeight] AutoContentSizes = [acsWidth, acsHeight]
DesignSize = ( DesignSize = (
505 505
171) 214)
object edtlNombre: TcxDBTextEdit object edtlNombre: TcxDBTextEdit
Left = 63 Left = 63
Top = 41 Top = 41
@ -47,12 +47,12 @@ inherited frViewDatosYSeleccionProveedorPedido: TfrViewDatosYSeleccionProveedorP
Height = 21 Height = 21
Width = 224 Width = 224
end end
object edtNIFCIF: TcxDBTextEdit object edtCODIGO_ASIGNADO: TcxDBTextEdit
Left = 392 Left = 392
Top = 41 Top = 41
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
AutoSize = False AutoSize = False
DataBinding.DataField = 'NIF_CIF' DataBinding.DataField = 'CODIGO_ASIGNADO'
DataBinding.DataSource = dsProveedor DataBinding.DataSource = dsProveedor
Enabled = False Enabled = False
ParentFont = False ParentFont = False
@ -76,7 +76,7 @@ inherited frViewDatosYSeleccionProveedorPedido: TfrViewDatosYSeleccionProveedorP
end end
object edtPersonaContacto: TcxDBTextEdit object edtPersonaContacto: TcxDBTextEdit
Left = 63 Left = 63
Top = 101 Top = 137
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
AutoSize = False AutoSize = False
DataBinding.DataField = 'PERSONA_CONTACTO_PROV' DataBinding.DataField = 'PERSONA_CONTACTO_PROV'
@ -98,9 +98,10 @@ inherited frViewDatosYSeleccionProveedorPedido: TfrViewDatosYSeleccionProveedorP
Height = 21 Height = 21
Width = 283 Width = 283
end end
object edtDireccion: TcxTextEdit object edtDireccion: TcxMemo
Left = 63 Left = 63
Top = 70 Top = 68
Enabled = False
Style.BorderColor = clWindowFrame Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D Style.BorderStyle = ebs3D
Style.HotTrack = False Style.HotTrack = False
@ -118,7 +119,8 @@ inherited frViewDatosYSeleccionProveedorPedido: TfrViewDatosYSeleccionProveedorP
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 4 TabOrder = 4
Width = 121 Height = 61
Width = 386
end end
object Button4: TButton object Button4: TButton
Left = 472 Left = 472
@ -130,7 +132,7 @@ inherited frViewDatosYSeleccionProveedorPedido: TfrViewDatosYSeleccionProveedorP
end end
object Button5: TButton object Button5: TButton
Left = 472 Left = 472
Top = 99 Top = 135
Width = 23 Width = 23
Height = 25 Height = 25
Action = actElegirPersonaContacto Action = actElegirPersonaContacto
@ -138,7 +140,7 @@ inherited frViewDatosYSeleccionProveedorPedido: TfrViewDatosYSeleccionProveedorP
end end
object Button3: TBitBtn object Button3: TBitBtn
Left = 297 Left = 297
Top = 130 Top = 166
Width = 198 Width = 198
Height = 25 Height = 25
Action = actVerContacto Action = actVerContacto
@ -303,8 +305,8 @@ inherited frViewDatosYSeleccionProveedorPedido: TfrViewDatosYSeleccionProveedorP
object dxLayoutControl1Item2: TdxLayoutItem object dxLayoutControl1Item2: TdxLayoutItem
AutoAligns = [aaVertical] AutoAligns = [aaVertical]
AlignHorz = ahRight AlignHorz = ahRight
Caption = 'NIF/CIF:' Caption = 'Cod. cli:'
Control = edtNIFCIF Control = edtCODIGO_ASIGNADO
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
end end
@ -317,7 +319,8 @@ inherited frViewDatosYSeleccionProveedorPedido: TfrViewDatosYSeleccionProveedorP
AutoAligns = [] AutoAligns = []
AlignHorz = ahClient AlignHorz = ahClient
AlignVert = avCenter AlignVert = avCenter
Caption = 'Direcci'#243'n' Caption = 'Direcci'#243'n:'
CaptionOptions.AlignVert = tavTop
Control = edtDireccion Control = edtDireccion
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end

View File

@ -10,7 +10,8 @@ uses
pngimage, JvExControls, JvComponent, JvButton, JvTransparentButton, Mask, pngimage, JvExControls, JvComponent, JvButton, JvTransparentButton, Mask,
DBCtrls, uProveedoresController, dxLayoutControl, Buttons, uDAInterfaces, DBCtrls, uProveedoresController, dxLayoutControl, Buttons, uDAInterfaces,
cxMaskEdit, cxButtonEdit, uBizPedidosProveedor, uBizDireccionesContacto, cxMaskEdit, cxButtonEdit, uBizPedidosProveedor, uBizDireccionesContacto,
uDireccionesContactoController, Menus, cxLookAndFeelPainters, cxButtons; uDireccionesContactoController, Menus, cxLookAndFeelPainters, cxButtons,
cxMemo;
type type
IViewDatosYSeleccionProveedorPedido = interface(IViewBase) IViewDatosYSeleccionProveedorPedido = interface(IViewBase)
@ -51,7 +52,7 @@ type
dxLayoutControl1Item1: TdxLayoutItem; dxLayoutControl1Item1: TdxLayoutItem;
edtlNombre: TcxDBTextEdit; edtlNombre: TcxDBTextEdit;
dxLayoutControl1Item2: TdxLayoutItem; dxLayoutControl1Item2: TdxLayoutItem;
edtNIFCIF: TcxDBTextEdit; edtCODIGO_ASIGNADO: TcxDBTextEdit;
dsPedido: TDADataSource; dsPedido: TDADataSource;
actElegirDireccion: TAction; actElegirDireccion: TAction;
actElegirPersonaContacto: TAction; actElegirPersonaContacto: TAction;
@ -59,7 +60,7 @@ type
edtPersonaContacto: TcxDBTextEdit; edtPersonaContacto: TcxDBTextEdit;
dxLayoutControl1Group4: TdxLayoutGroup; dxLayoutControl1Group4: TdxLayoutGroup;
dxLayoutControl1Item4: TdxLayoutItem; dxLayoutControl1Item4: TdxLayoutItem;
edtDireccion: TcxTextEdit; edtDireccion: TcxMemo;
Button4: TButton; Button4: TButton;
dxLayoutControl1Item5: TdxLayoutItem; dxLayoutControl1Item5: TdxLayoutItem;
dxLayoutControl1Group3: TdxLayoutGroup; dxLayoutControl1Group3: TdxLayoutGroup;
@ -202,7 +203,7 @@ begin
FDireccionesController := TDireccionesContactoController.Create; FDireccionesController := TDireccionesContactoController.Create;
edtlNombre.Enabled := False; edtlNombre.Enabled := False;
edtNIFCIF.Enabled := False; edtCODIGO_ASIGNADO.Enabled := False;
edtDireccion.Enabled := False; edtDireccion.Enabled := False;
edtPersonaContacto.Enabled := False; edtPersonaContacto.Enabled := False;
end; end;
@ -289,10 +290,16 @@ begin
ACadena := ''; ACadena := '';
if Assigned(FDireccion) then if Assigned(FDireccion) then
begin
ACadena := Format('%s %s %s %s', ACadena := Format('%s %s %s %s',
[FDireccion.CALLE, FDireccion.POBLACION, [FDireccion.CALLE, FDireccion.POBLACION,
FDireccion.CODIGO_POSTAL, FDireccion.PROVINCIA]); FDireccion.CODIGO_POSTAL, FDireccion.PROVINCIA]);
if not FDireccion.FAXIsNull then
ACadena := ACadena + #13#10 + 'Fax: ' + FDireccion.FAX;
end;
edtDireccion.Text := ACadena; edtDireccion.Text := ACadena;
end; end;

View File

@ -46,8 +46,8 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Width = 333 Width = 333
end end
object edtFechaConfirmacion: TcxDBDateEdit object edtFechaConfirmacion: TcxDBDateEdit
Left = 578 Left = 589
Top = 262 Top = 292
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'FECHA_CONFIRMACION' DataBinding.DataField = 'FECHA_CONFIRMACION'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -71,8 +71,8 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Width = 344 Width = 344
end end
object edtFechaEntrega: TcxDBDateEdit object edtFechaEntrega: TcxDBDateEdit
Left = 578 Left = 589
Top = 289 Top = 319
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'FECHA_ENTREGA' DataBinding.DataField = 'FECHA_ENTREGA'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -94,8 +94,8 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Width = 344 Width = 344
end end
object memObservaciones: TcxDBMemo object memObservaciones: TcxDBMemo
Left = 463 Left = 474
Top = 346 Top = 376
Anchors = [akLeft, akTop, akRight, akBottom] Anchors = [akLeft, akTop, akRight, akBottom]
DataBinding.DataField = 'OBSERVACIONES' DataBinding.DataField = 'OBSERVACIONES'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -189,9 +189,9 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Width = 551 Width = 551
end end
inherited bModificar: TBitBtn inherited bModificar: TBitBtn
Left = 273 Left = 284
Top = 164 Top = 164
ExplicitLeft = 273 ExplicitLeft = 284
ExplicitTop = 164 ExplicitTop = 164
end end
inherited txtDireccion: TStaticText inherited txtDireccion: TStaticText
@ -261,7 +261,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Width = 195 Width = 195
end end
object bFormasPago: TButton object bFormasPago: TButton
Left = 301 Left = 312
Top = 82 Top = 82
Width = 132 Width = 132
Height = 21 Height = 21
@ -270,8 +270,8 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
OnClick = bFormasPagoClick OnClick = bFormasPagoClick
end end
object edtFechaEnvio: TcxDBDateEdit object edtFechaEnvio: TcxDBDateEdit
Left = 578 Left = 589
Top = 235 Top = 265
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'FECHA_ENVIO' DataBinding.DataField = 'FECHA_ENVIO'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -322,7 +322,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Width = 195 Width = 195
end end
object bVerPedidoCliente: TButton object bVerPedidoCliente: TButton
Left = 301 Left = 312
Top = 109 Top = 109
Width = 132 Width = 132
Height = 23 Height = 23
@ -356,8 +356,8 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
ExplicitWidth = 202 ExplicitWidth = 202
end end
inherited Button3: TBitBtn inherited Button3: TBitBtn
Left = 257 Left = 268
ExplicitLeft = 257 ExplicitLeft = 268
end end
inherited cbObraReserva: TcxComboBox inherited cbObraReserva: TcxComboBox
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -378,10 +378,10 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
end end
end end
inline frViewDatosYSeleccionProveedorPedido1: TfrViewDatosYSeleccionProveedorPedido inline frViewDatosYSeleccionProveedorPedido1: TfrViewDatosYSeleccionProveedorPedido
Left = 463 Left = 474
Top = 28 Top = 28
Width = 505 Width = 480
Height = 171 Height = 201
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -11 Font.Height = -11
@ -390,9 +390,14 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
ParentFont = False ParentFont = False
TabOrder = 8 TabOrder = 8
ReadOnly = False ReadOnly = False
ExplicitLeft = 463 ExplicitLeft = 474
ExplicitTop = 28 ExplicitTop = 28
ExplicitWidth = 480
ExplicitHeight = 201
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 480
Height = 201
ExplicitHeight = 171
inherited edtlNombre: TcxDBTextEdit inherited edtlNombre: TcxDBTextEdit
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
@ -401,13 +406,13 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
ExplicitWidth = 224 ExplicitWidth = 224
Width = 224 Width = 224
end end
inherited edtNIFCIF: TcxDBTextEdit inherited edtCODIGO_ASIGNADO: TcxDBTextEdit
Left = 367 Left = 356
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 367 ExplicitLeft = 356
end end
inherited edtPersonaContacto: TcxDBTextEdit inherited edtPersonaContacto: TcxDBTextEdit
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -417,7 +422,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
ExplicitWidth = 283 ExplicitWidth = 283
Width = 283 Width = 283
end end
inherited edtDireccion: TcxTextEdit inherited edtDireccion: TcxMemo
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
@ -426,16 +431,16 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Width = 121 Width = 121
end end
inherited Button4: TButton inherited Button4: TButton
Left = 447 Left = 436
ExplicitLeft = 447 ExplicitLeft = 436
end end
inherited Button5: TButton inherited Button5: TButton
Left = 447 Left = 436
ExplicitLeft = 447 ExplicitLeft = 436
end end
inherited Button3: TBitBtn inherited Button3: TBitBtn
Left = 272 Left = 261
ExplicitLeft = 272 ExplicitLeft = 261
end end
end end
end end