Tecistel/Tecsitel_FactuGES2
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Se cambia informes de pedidos para que se visualice la fecha prevista de recepcion si esta rellena

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@437 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
roberto 2008-06-05 16:54:31 +00:00
parent b851f5b13a
commit 8b870535f9
4 changed files with 146 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm
View File

@ -25,15 +25,15 @@ object RptPedidosProveedor: TRptPedidosProveedor
SQL =
'SELECT'#10' V_PEDIDOS_PROVEEDOR.ID,'#10' V_PEDIDOS_PROVEEDOR.ID_EMPRES' +
'A,'#10' V_PEDIDOS_PROVEEDOR.REFERENCIA,'#10' V_PEDIDOS_PROVEEDOR.FECHA' +
'_PEDIDO,'#10' V_PEDIDOS_PROVEEDOR.OBSERVACIONES,'#10' V_PROVEEDORES.NO' +
'MBRE,'#10' V_PROVEEDORES.FAX,'#10' V_PROVEEDORES.PERSONA_CONTACTO,'#10' V' +
'_PROVEEDORES.CODIGO_ASIGNADO AS CODIGO_CLIENTE,'#10' V_PEDIDOS_PROV' +
'EEDOR.CALLE,'#10' V_PEDIDOS_PROVEEDOR.POBLACION,'#10' V_PEDIDOS_PROVEE' +
'DOR.PROVINCIA,'#10' V_PEDIDOS_PROVEEDOR.CODIGO_POSTAL,'#10' V_PEDIDOS_' +
'PROVEEDOR.PERSONA_CONTACTO AS ENTREGAR_A'#10'FROM'#10' V_PEDIDOS_PROVEE' +
'DOR'#10' LEFT OUTER JOIN V_PROVEEDORES ON (V_PROVEEDORES.ID = V_PED' +
'IDOS_PROVEEDOR.ID_PROVEEDOR)'#10'WHERE V_PEDIDOS_PROVEEDOR.ID = :ID'#10 +
#10
'_PEDIDO,'#10' V_PEDIDOS_PROVEEDOR.FECHA_ENTREGA,'#10' V_PEDIDOS_PROVEE' +
'DOR.OBSERVACIONES,'#10' V_PROVEEDORES.NOMBRE,'#10' V_PROVEEDORES.FAX,'#10 +
' V_PROVEEDORES.PERSONA_CONTACTO,'#10' V_PROVEEDORES.CODIGO_ASIGNAD' +
'O AS CODIGO_CLIENTE,'#10' V_PEDIDOS_PROVEEDOR.CALLE,'#10' V_PEDIDOS_PR' +
'OVEEDOR.POBLACION,'#10' V_PEDIDOS_PROVEEDOR.PROVINCIA,'#10' V_PEDIDOS_' +
'PROVEEDOR.CODIGO_POSTAL,'#10' V_PEDIDOS_PROVEEDOR.PERSONA_CONTACTO ' +
'AS ENTREGAR_A'#10'FROM'#10' V_PEDIDOS_PROVEEDOR'#10' LEFT OUTER JOIN V_PRO' +
'VEEDORES ON (V_PROVEEDORES.ID = V_PEDIDOS_PROVEEDOR.ID_PROVEEDOR' +
')'#10'WHERE V_PEDIDOS_PROVEEDOR.ID = :ID'#10#10
StatementType = stSQL
ColumnMappings = <
item
@ -91,6 +91,10 @@ object RptPedidosProveedor: TRptPedidosProveedor
item
DatasetField = 'ENTREGAR_A'
TableField = 'ENTREGAR_A'
end
item
DatasetField = 'FECHA_ENTREGA'
TableField = 'FECHA_ENTREGA'
end>
end>
Name = 'Informe_Cabecera'
@ -112,6 +116,10 @@ object RptPedidosProveedor: TRptPedidosProveedor
Name = 'FECHA_PEDIDO'
DataType = datDateTime
end
item
Name = 'FECHA_ENTREGA'
DataType = datDateTime
end
item
Name = 'OBSERVACIONES'
DataType = datMemo
@ -316,7 +324,7 @@ object RptPedidosProveedor: TRptPedidosProveedor
PrintOptions.Printer = 'Por defecto'
PrintOptions.PrintOnSheet = 0
ReportOptions.CreateDate = 39065.872423495400000000
ReportOptions.LastChange = 39532.667815752300000000
ReportOptions.LastChange = 39604.765585937500000000
ScriptLanguage = 'PascalScript'
ScriptText.Strings = (
''
@ -705,6 +713,10 @@ object RptPedidosProveedor: TRptPedidosProveedor
Name = 'FECHA_PEDIDO'
DataType = datDateTime
end
item
Name = 'FECHA_ENTREGA'
DataType = datDateTime
end
item
Name = 'OBSERVACIONES'
DataType = datMemo

33
Source/Modulos/Pedidos a proveedor/Reports/uRptWordPedidoProveedor.dfm
View File

@ -21,16 +21,17 @@ object RptWordPedidoProveedor: TRptWordPedidoProveedor
SQL =
'SELECT'#10' V_PEDIDOS_PROVEEDOR.ID,'#10' V_PEDIDOS_PROVEEDOR.ID_EMPRES' +
'A,'#10' V_PEDIDOS_PROVEEDOR.REFERENCIA,'#10' V_PEDIDOS_PROVEEDOR.FECHA' +
'_PEDIDO,'#10' V_PEDIDOS_PROVEEDOR.OBSERVACIONES,'#10' V_PROVEEDORES.NO' +
'MBRE,'#10' V_PROVEEDORES.FAX,'#10' V_PROVEEDORES.PERSONA_CONTACTO,'#10' V' +
'_PROVEEDORES.CODIGO_ASIGNADO AS CODIGO_CLIENTE,'#10' V_PEDIDOS_PROV' +
'EEDOR.CALLE AS CALLE_ALMACEN,'#10' V_PEDIDOS_PROVEEDOR.POBLACION AS' +
' POBLACION_ALMACEN,'#10' V_PEDIDOS_PROVEEDOR.PROVINCIA AS PROVINCIA' +
'_ALMACEN,'#10' V_PEDIDOS_PROVEEDOR.CODIGO_POSTAL AS CODIGO_POSTAL_A' +
'LMACEN,'#10' V_PEDIDOS_PROVEEDOR.PERSONA_CONTACTO AS PERSONA_CONTAC' +
'TO_ALMACEN'#10'FROM'#10' V_PEDIDOS_PROVEEDOR'#10' LEFT OUTER JOIN V_PROVEE' +
'DORES ON (V_PROVEEDORES.ID = V_PEDIDOS_PROVEEDOR.ID_PROVEEDOR)'#10'W' +
'HERE V_PEDIDOS_PROVEEDOR.ID = :ID'#10#10
'_PEDIDO,'#10' V_PEDIDOS_PROVEEDOR.FECHA_ENTREGA,'#10' V_PEDIDOS_PROVEE' +
'DOR.OBSERVACIONES,'#10' V_PROVEEDORES.NOMBRE,'#10' V_PROVEEDORES.FAX,'#10 +
' V_PROVEEDORES.PERSONA_CONTACTO,'#10' V_PROVEEDORES.CODIGO_ASIGNAD' +
'O AS CODIGO_CLIENTE,'#10' V_PEDIDOS_PROVEEDOR.CALLE AS CALLE_ALMACE' +
'N,'#10' V_PEDIDOS_PROVEEDOR.POBLACION AS POBLACION_ALMACEN,'#10' V_PED' +
'IDOS_PROVEEDOR.PROVINCIA AS PROVINCIA_ALMACEN,'#10' V_PEDIDOS_PROVE' +
'EDOR.CODIGO_POSTAL AS CODIGO_POSTAL_ALMACEN,'#10' V_PEDIDOS_PROVEED' +
'OR.PERSONA_CONTACTO AS PERSONA_CONTACTO_ALMACEN'#10'FROM'#10' V_PEDIDOS' +
'_PROVEEDOR'#10' LEFT OUTER JOIN V_PROVEEDORES ON (V_PROVEEDORES.ID ' +
'= V_PEDIDOS_PROVEEDOR.ID_PROVEEDOR)'#10'WHERE V_PEDIDOS_PROVEEDOR.ID' +
' = :ID'#10#10
StatementType = stSQL
ColumnMappings = <
item
@ -88,6 +89,10 @@ object RptWordPedidoProveedor: TRptWordPedidoProveedor
item
DatasetField = 'CODIGO_CLIENTE'
TableField = 'CODIGO_CLIENTE'
end
item
DatasetField = 'FECHA_ENTREGA'
TableField = 'FECHA_ENTREGA'
end>
end>
Name = 'Informe_Cabecera'
@ -109,6 +114,10 @@ object RptWordPedidoProveedor: TRptWordPedidoProveedor
Name = 'FECHA_PEDIDO'
DataType = datDateTime
end
item
Name = 'FECHA_ENTREGA'
DataType = datDateTime
end
item
Name = 'OBSERVACIONES'
DataType = datMemo
@ -329,6 +338,10 @@ object RptWordPedidoProveedor: TRptWordPedidoProveedor
Name = 'FECHA_PEDIDO'
DataType = datDateTime
end
item
Name = 'FECHA_ENTREGA'
DataType = datDateTime
end
item
Name = 'OBSERVACIONES'
DataType = datMemo

4
Source/Modulos/Pedidos a proveedor/Reports/uRptWordPedidoProveedor.pas
View File

@ -247,6 +247,10 @@ begin
FieldByName('CODIGOPOSTALALMACEN').AsString + ' ' + FieldByName('POBLACIONALMACEN').AsString + ', ' + FieldByName('PROVINCIAALMACEN').AsString);}
ReplaceBookmark('PersonaEntrega', FieldByName('PERSONA_CONTACTO_ALMACEN').AsString);
if FieldByName('FECHA_ENTREGA').IsNull then
ReplaceBookmark('FechaEntrega', '')
else
ReplaceBookmark('FechaEntrega', 'FECHA DE ENTREGA PREVISTA: ' + FieldByName('FECHA_ENTREGA').AsString);
ReplaceBookmark('NombreProveedor', FieldByName('NOMBRE').AsString);
ReplaceBookmark('FaxProveedor', FieldByName('FAX').AsString);

178
Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm
View File

@ -2,19 +2,19 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
Left = 332
Top = 147
Caption = 'Nuevo pedido a proveedor'
ClientHeight = 617
ClientWidth = 765
ClientHeight = 633
ClientWidth = 879
OnClose = CustomEditorClose
ExplicitWidth = 773
ExplicitHeight = 644
ExplicitWidth = 887
ExplicitHeight = 667
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
Width = 765
Width = 879
Caption = 'Nuevo pedido a proveedor'
ExplicitWidth = 765
inherited Image1: TImage
Left = 738
Left = 852
Picture.Data = {
0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800
0000180806000000E0773DF80000000970485973000017120000171201679FD2
@ -43,7 +43,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
end
end
inherited TBXDock: TTBXDock
Width = 765
Width = 879
ExplicitWidth = 765
inherited tbxMain: TTBXToolbar
ExplicitWidth = 488
@ -58,12 +58,13 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
end
end
inherited tbxMenu: TTBXToolbar
ExplicitWidth = 765
ExplicitWidth = 879
end
end
inherited pgPaginas: TPageControl
Width = 759
Height = 470
Width = 873
Height = 486
ActivePage = pagInicidencias
TabOrder = 1
OnChanging = pgPaginasChanging
ExplicitWidth = 759
@ -77,11 +78,13 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
object pagContenido: TTabSheet
Caption = 'Contenido'
ImageIndex = 1
ExplicitWidth = 751
ExplicitHeight = 442
inline frViewDetallesPedidoProveedor1: TfrViewDetallesPedidoProveedor
Left = 0
Top = 0
Width = 751
Height = 442
Width = 865
Height = 458
Align = alClient
BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET
@ -96,7 +99,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ExplicitWidth = 751
ExplicitHeight = 442
inherited ToolBar1: TToolBar
Width = 751
Width = 865
Height = 51
ExplicitWidth = 751
ExplicitHeight = 51
@ -109,13 +112,14 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ExplicitLeft = 278
ExplicitTop = 0
end
inherited ToolButton14: TToolButton [4]
inherited ToolButton14: TToolButton
Left = 334
Top = 0
Wrap = False
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox [5]
inherited FontName: TJvFontComboBox
Left = 399
Top = 0
ExplicitLeft = 399
@ -124,10 +128,10 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
inherited FontSize: TEdit
Left = 544
Top = 0
Width = 102
Width = 118
ExplicitLeft = 544
ExplicitTop = 0
ExplicitWidth = 102
ExplicitWidth = 118
end
inherited ToolButton13: TToolButton [7]
Left = 0
@ -143,44 +147,43 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ExplicitLeft = 0
ExplicitTop = 27
end
inherited ToolButton6: TToolButton [9]
inherited ToolButton6: TToolButton
Left = 17
Top = 27
ExplicitLeft = 17
ExplicitTop = 27
end
inherited ToolButton7: TToolButton [10]
inherited ToolButton7: TToolButton
Left = 83
Top = 27
ExplicitLeft = 83
ExplicitTop = 27
end
inherited ToolButton8: TToolButton [11]
inherited ToolButton8: TToolButton
Left = 150
Top = 27
ExplicitLeft = 150
ExplicitTop = 27
end
inherited ToolButton12: TToolButton [12]
inherited ToolButton12: TToolButton
Left = 233
Top = 27
ExplicitLeft = 233
ExplicitTop = 27
ExplicitHeight = 22
end
inherited ToolButton9: TToolButton [13]
inherited ToolButton9: TToolButton
Left = 241
Top = 27
ExplicitLeft = 241
ExplicitTop = 27
end
inherited ToolButton10: TToolButton [14]
inherited ToolButton10: TToolButton
Left = 386
Top = 27
ExplicitLeft = 386
ExplicitTop = 27
end
inherited ToolButton11: TToolButton [15]
inherited ToolButton11: TToolButton
Left = 511
Top = 27
ExplicitLeft = 511
@ -189,11 +192,10 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
end
inherited cxGrid: TcxGrid
Top = 77
Width = 751
Height = 365
ExplicitTop = 72
Width = 865
Height = 381
ExplicitWidth = 751
ExplicitHeight = 370
ExplicitHeight = 365
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewIMPORTENETO: TcxGridDBColumn
Options.Editing = True
@ -202,22 +204,33 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
end
inherited TBXDock1: TTBXDock
Top = 51
Width = 751
Width = 865
ExplicitWidth = 751
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 626
ExplicitWidth = 745
end
end
inherited cxGridPopupMenu: TcxGridPopupMenu
PopupMenus = <
item
GridView = frViewDetallesPedidoProveedor1.cxGridView
HitTypes = [gvhtNone, gvhtCell, gvhtRecord, gvhtRowIndicator]
Index = 0
PopupMenu = frViewDetallesPedidoProveedor1.GridGeneralPopupMenu
end>
end
end
end
object pagInicidencias: TTabSheet
Caption = 'Incidencias'
ImageIndex = 2
ExplicitWidth = 751
ExplicitHeight = 442
inline frViewIncidenciasProv: TfrViewIncidencias
Left = 0
Top = 0
Width = 751
Height = 442
Width = 865
Height = 458
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@ -230,30 +243,30 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ExplicitWidth = 751
ExplicitHeight = 442
inherited pnlSup: TPanel
Width = 751
Width = 865
ExplicitWidth = 751
inherited eIncidenciaActiva: TcxDBCheckBox
ExplicitHeight = 21
end
end
inherited GroupBox1: TGroupBox
Width = 751
Height = 414
Width = 865
Height = 430
ExplicitWidth = 751
ExplicitHeight = 414
inherited eIncidencias: TcxDBMemo
ExplicitWidth = 734
ExplicitHeight = 387
Height = 387
Width = 734
Height = 403
Width = 848
end
end
end
end
end
inherited StatusBar: TJvStatusBar
Top = 598
Width = 765
Top = 614
Width = 879
Panels = <
item
Width = 200
@ -263,8 +276,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
end
inline frViewTotales1: TfrViewTotales [4]
Left = 0
Top = 552
Width = 765
Top = 568
Width = 879
Height = 46
Align = alBottom
Font.Charset = DEFAULT_CHARSET
@ -275,11 +288,11 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ParentFont = False
TabOrder = 4
ReadOnly = False
ExplicitTop = 552
ExplicitWidth = 765
ExplicitTop = 568
ExplicitWidth = 879
ExplicitHeight = 46
inherited dxLayoutControl1: TdxLayoutControl
Width = 765
Width = 879
LookAndFeel = dxLayoutOfficeLookAndFeel1
ExplicitWidth = 765
inherited Bevel1: TBevel
@ -291,18 +304,18 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ExplicitWidth = 73
end
inherited Bevel3: TBevel
Left = 379
Left = 433
Top = 11
Height = 30
ExplicitLeft = 379
ExplicitLeft = 433
ExplicitTop = 11
ExplicitHeight = 30
end
inherited Bevel4: TBevel
Left = 491
Left = 545
Top = 92
Width = 21
ExplicitLeft = 491
ExplicitLeft = 545
ExplicitTop = 92
ExplicitWidth = 21
end
@ -312,26 +325,26 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
Style.IsFontAssigned = True
ExplicitLeft = 164
ExplicitTop = 112
ExplicitWidth = 93
Width = 93
ExplicitWidth = 199
Width = 199
end
inherited ImporteIVA: TcxDBCurrencyEdit
Left = 562
Left = 616
Top = 38
Style.IsFontAssigned = True
ExplicitLeft = 562
ExplicitLeft = 616
ExplicitTop = 38
ExplicitWidth = 137
Width = 137
ExplicitWidth = 192
Width = 192
end
inherited ImporteTotal: TcxDBCurrencyEdit
Left = 492
Left = 546
Top = 112
Style.IsFontAssigned = True
ExplicitLeft = 492
ExplicitLeft = 546
ExplicitTop = 112
ExplicitWidth = 137
Width = 137
ExplicitWidth = 262
Width = 262
end
inherited edtDescuento: TcxDBSpinEdit
Left = 93
@ -341,40 +354,40 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ExplicitTop = 112
end
inherited edtIVA: TcxDBSpinEdit
Left = 491
Left = 545
Top = 38
Style.IsFontAssigned = True
ExplicitLeft = 491
ExplicitLeft = 545
ExplicitTop = 38
end
inherited ImporteBase: TcxDBCurrencyEdit
Left = 491
Left = 545
Top = 11
Style.IsFontAssigned = True
ExplicitLeft = 491
ExplicitLeft = 545
ExplicitTop = 11
ExplicitWidth = 92
Width = 92
ExplicitWidth = 263
Width = 263
end
inherited edtRE: TcxDBSpinEdit
Left = 491
Left = 545
Top = 65
DataBinding.DataField = ''
DataBinding.DataSource = nil
Style.IsFontAssigned = True
ExplicitLeft = 491
ExplicitLeft = 545
ExplicitTop = 65
end
inherited ImporteRE: TcxDBCurrencyEdit
Left = 562
Left = 616
Top = 65
DataBinding.DataField = ''
DataBinding.DataSource = nil
Style.IsFontAssigned = True
ExplicitLeft = 562
ExplicitLeft = 616
ExplicitTop = 65
ExplicitWidth = 56
Width = 56
ExplicitWidth = 192
Width = 192
end
inherited eImporteNeto: TcxDBCurrencyEdit
Left = 93
@ -382,8 +395,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
Style.IsFontAssigned = True
ExplicitLeft = 93
ExplicitTop = 11
ExplicitWidth = 147
Width = 147
ExplicitWidth = 270
Width = 270
end
inherited ePorte: TcxDBCurrencyEdit
Left = 93
@ -392,8 +405,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
Style.IsFontAssigned = True
ExplicitLeft = 93
ExplicitTop = 139
ExplicitWidth = 147
Width = 147
ExplicitWidth = 270
Width = 270
end
inherited eIVA: TcxDBLookupComboBox
Left = 93
@ -402,13 +415,13 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
DataBinding.DataSource = nil
ExplicitLeft = 93
ExplicitTop = 38
ExplicitWidth = 81
Width = 81
ExplicitWidth = 132
Width = 132
end
inherited bTiposIVA: TButton
Left = 231
Left = 285
Top = 38
ExplicitLeft = 231
ExplicitLeft = 285
ExplicitTop = 38
end
inherited cbRecargoEquivalencia: TcxDBCheckBox
@ -417,8 +430,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
DataBinding.DataField = ''
ExplicitLeft = 93
ExplicitTop = 65
ExplicitWidth = 219
Width = 219
ExplicitWidth = 270
Width = 270
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group1: TdxLayoutGroup
@ -440,6 +453,9 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
inherited dxLayoutControl1Group7: TdxLayoutGroup
Visible = False
end
inherited dxLayoutControl1Item9: TdxLayoutItem
Visible = False
end
end
inherited dxLayoutControl1Group5: TdxLayoutGroup
inherited dxLayoutControl1Item13: TdxLayoutItem