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

Cambios vrios

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@626 f4e31baf-9722-1c47-927c-6f952f962d4b
This commit is contained in:
roberto 2015-09-11 17:11:16 +00:00
parent b50f55ef68
commit 07604b7064
8 changed files with 186 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Informes/InfPedidoProveedor.fr3
View File

File diff suppressed because one or more lines are too long

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

@ -91,22 +91,22 @@ object RptPedidosProveedor: TRptPedidosProveedor
'SELECT'#10' V_PEDIDOS_PROVEEDOR.ID,'#10' V_PEDIDOS_PROVEEDOR.ID_EMPRES' + 'SELECT'#10' V_PEDIDOS_PROVEEDOR.ID,'#10' V_PEDIDOS_PROVEEDOR.ID_EMPRES' +
'A,'#10' V_PEDIDOS_PROVEEDOR.REFERENCIA,'#10' V_PEDIDOS_PROVEEDOR.FECHA' + 'A,'#10' V_PEDIDOS_PROVEEDOR.REFERENCIA,'#10' V_PEDIDOS_PROVEEDOR.FECHA' +
'_PEDIDO,'#10' V_PEDIDOS_PROVEEDOR.FECHA_ENTREGA,'#10' V_PEDIDOS_PROVEE' + '_PEDIDO,'#10' V_PEDIDOS_PROVEEDOR.FECHA_ENTREGA,'#10' V_PEDIDOS_PROVEE' +
'DOR.OBSERVACIONES,'#10' V_PROVEEDORES.NOMBRE,'#10' V_PROVEEDORES.FAX,'#10 + 'DOR.FECHA_ENVIO,'#10' V_PEDIDOS_PROVEEDOR.OBSERVACIONES,'#10' V_PROVEE' +
#10' V_CONTRATOS_CLIENTE.NOMBRE AS NOMBRE_CLIENTE,'#10' V_CONTRATOS_C' + 'DORES.NOMBRE,'#10' V_PROVEEDORES.FAX,'#10#10' V_CONTRATOS_CLIENTE.NOMBRE' +
'LIENTE.CALLE,'#10' V_CONTRATOS_CLIENTE.POBLACION,'#10' V_CONTRATOS_CLI' + ' AS NOMBRE_CLIENTE,'#10' V_CONTRATOS_CLIENTE.CALLE,'#10' V_CONTRATOS_C' +
'ENTE.PROVINCIA,'#10' V_CONTRATOS_CLIENTE.CODIGO_POSTAL,'#10' V_CONTRAT' + 'LIENTE.POBLACION,'#10' V_CONTRATOS_CLIENTE.PROVINCIA,'#10' V_CONTRATOS' +
'OS_CLIENTE.PERSONA_CONTACTO,'#10' V_CONTRATOS_CLIENTE.TELEFONO,'#10#10' ' + '_CLIENTE.CODIGO_POSTAL,'#10' V_CONTRATOS_CLIENTE.PERSONA_CONTACTO,'#10 +
'EMPRESAS.NIF_CIF AS NIF_CIF_EMPRESA,'#10' EMPRESAS.NOMBRE AS NOMBRE' + ' V_CONTRATOS_CLIENTE.TELEFONO,'#10#10' EMPRESAS.NIF_CIF AS NIF_CIF_E' +
'_EMPRESA,'#10' EMPRESAS.RAZON_SOCIAL AS RAZON_SOCIAL_EMPRESA,'#10' EMP' + 'MPRESA,'#10' EMPRESAS.NOMBRE AS NOMBRE_EMPRESA,'#10' EMPRESAS.RAZON_SO' +
'RESAS.TELEFONO_1 AS TELEFONO_1_EMPRESA,'#10' EMPRESAS.FAX AS FAX_EM' + 'CIAL AS RAZON_SOCIAL_EMPRESA,'#10' EMPRESAS.TELEFONO_1 AS TELEFONO_' +
'PRESA,'#10' EMPRESAS.MOVIL_1 AS MOVIL_1_EMPRESA,'#10' EMPRESAS.EMAIL_1' + '1_EMPRESA,'#10' EMPRESAS.FAX AS FAX_EMPRESA,'#10' EMPRESAS.MOVIL_1 AS ' +
' AS EMAIL_1_EMPRESA,'#10' EMPRESAS.PAGINA_WEB AS PAGINA_WEB_EMPRESA' + 'MOVIL_1_EMPRESA,'#10' EMPRESAS.EMAIL_1 AS EMAIL_1_EMPRESA,'#10' EMPRES' +
#10'FROM'#10' V_PEDIDOS_PROVEEDOR'#10' LEFT OUTER JOIN V_PROVEEDORES ON (' + 'AS.PAGINA_WEB AS PAGINA_WEB_EMPRESA'#10'FROM'#10' V_PEDIDOS_PROVEEDOR'#10' ' +
'V_PROVEEDORES.ID = V_PEDIDOS_PROVEEDOR.ID_PROVEEDOR)'#10' LEFT OUTE' + ' LEFT OUTER JOIN V_PROVEEDORES ON (V_PROVEEDORES.ID = V_PEDIDOS_' +
'R JOIN V_CONTRATOS_CLIENTE ON (V_CONTRATOS_CLIENTE.ID = V_PEDIDO' + 'PROVEEDOR.ID_PROVEEDOR)'#10' LEFT OUTER JOIN V_CONTRATOS_CLIENTE ON' +
'S_PROVEEDOR.ID_CONTRATO_CLIENTE)'#10' LEFT OUTER JOIN EMPRESAS ON (' + ' (V_CONTRATOS_CLIENTE.ID = V_PEDIDOS_PROVEEDOR.ID_CONTRATO_CLIEN' +
'EMPRESAS.ID = V_PEDIDOS_PROVEEDOR.ID_EMPRESA)'#10'WHERE V_PEDIDOS_PR' + 'TE)'#10' LEFT OUTER JOIN EMPRESAS ON (EMPRESAS.ID = V_PEDIDOS_PROVE' +
'OVEEDOR.ID = :ID'#10 'EDOR.ID_EMPRESA)'#10'WHERE V_PEDIDOS_PROVEEDOR.ID = :ID'#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = < ColumnMappings = <
item item
@ -201,6 +201,10 @@ object RptPedidosProveedor: TRptPedidosProveedor
item item
DatasetField = 'FECHA_ENTREGA' DatasetField = 'FECHA_ENTREGA'
TableField = 'FECHA_ENTREGA' TableField = 'FECHA_ENTREGA'
end
item
DatasetField = 'FECHA_ENVIO'
TableField = 'FECHA_ENVIO'
end> end>
end> end>
Name = 'Informe_Cabecera' Name = 'Informe_Cabecera'
@ -226,6 +230,10 @@ object RptPedidosProveedor: TRptPedidosProveedor
Name = 'FECHA_ENTREGA' Name = 'FECHA_ENTREGA'
DataType = datDateTime DataType = datDateTime
end end
item
Name = 'FECHA_ENVIO'
DataType = datDateTime
end
item item
Name = 'OBSERVACIONES' Name = 'OBSERVACIONES'
DataType = datMemo DataType = datMemo
@ -331,13 +339,14 @@ object RptPedidosProveedor: TRptPedidosProveedor
'SELECT PEDIDOS_PROVEEDOR_DETALLES.ID, PEDIDOS_PROVEEDOR_DETALLES' + 'SELECT PEDIDOS_PROVEEDOR_DETALLES.ID, PEDIDOS_PROVEEDOR_DETALLES' +
'.ID_PEDIDO,'#10' PEDIDOS_PROVEEDOR_DETALLES.POSICION, PEDIDOS_' + '.ID_PEDIDO,'#10' PEDIDOS_PROVEEDOR_DETALLES.POSICION, PEDIDOS_' +
'PROVEEDOR_DETALLES.TIPO_DETALLE,'#10' PEDIDOS_PROVEEDOR_DETALL' + 'PROVEEDOR_DETALLES.TIPO_DETALLE,'#10' PEDIDOS_PROVEEDOR_DETALL' +
'ES.CONCEPTO, PEDIDOS_PROVEEDOR_DETALLES.CANTIDAD,'#10' PEDIDOS' + 'ES.CONCEPTO as CONCEPTO_RTF, F_RTFTOTEXT(CONCEPTO) AS CONCEPTO, ' +
'_PROVEEDOR_DETALLES.IMPORTE_UNIDAD, PEDIDOS_PROVEEDOR_DETALLES.I' + 'PEDIDOS_PROVEEDOR_DETALLES.CANTIDAD,'#10' PEDIDOS_PROVEEDOR_DE' +
'MPORTE_TOTAL,'#10' ARTICULOS.REFERENCIA, ARTICULOS.FAMILIA, AR' + 'TALLES.IMPORTE_UNIDAD, PEDIDOS_PROVEEDOR_DETALLES.IMPORTE_TOTAL,' +
'TICULOS.REFERENCIA_PROV as REFERENCIA_PROVEEDOR'#10#10'FROM PEDIDOS_PR' + #10' ARTICULOS.REFERENCIA, ARTICULOS.FAMILIA, ARTICULOS.REFER' +
'OVEEDOR_DETALLES'#10'LEFT JOIN ARTICULOS ON (PEDIDOS_PROVEEDOR_DETAL' + 'ENCIA_PROV as REFERENCIA_PROVEEDOR'#10#10'FROM PEDIDOS_PROVEEDOR_DETAL' +
'LES.ID_ARTICULO = ARTICULOS.ID)'#10'WHERE ID_PEDIDO = :ID_PEDIDO'#10'ORD' + 'LES'#10'LEFT JOIN ARTICULOS ON (PEDIDOS_PROVEEDOR_DETALLES.ID_ARTICU' +
'ER BY POSICION' 'LO = ARTICULOS.ID)'#10'WHERE ID_PEDIDO = :ID_PEDIDO'#10'ORDER BY POSICIO' +
'N'#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = < ColumnMappings = <
item item
@ -383,6 +392,11 @@ object RptPedidosProveedor: TRptPedidosProveedor
item item
DatasetField = 'REFERENCIA_PROVEEDOR' DatasetField = 'REFERENCIA_PROVEEDOR'
TableField = 'REFERENCIA_PROVEEDOR' TableField = 'REFERENCIA_PROVEEDOR'
end
item
DatasetField = 'CONCEPTO_RTF'
TableField = '<unknown>'
SQLOrigin = 'CONCEPTO_RTF'
end> end>
end> end>
Name = 'Informe_Detalles' Name = 'Informe_Detalles'
@ -405,26 +419,31 @@ object RptPedidosProveedor: TRptPedidosProveedor
Size = 10 Size = 10
end end
item item
Name = 'REFERENCIA' Name = 'CONCEPTO_RTF'
DataType = datString
Size = 255
end
item
Name = 'CONCEPTO'
DataType = datString DataType = datString
Size = 2000 Size = 2000
end end
item
Name = 'CONCEPTO'
DataType = datString
Size = 32765
end
item item
Name = 'CANTIDAD' Name = 'CANTIDAD'
DataType = datInteger DataType = datCurrency
end end
item item
Name = 'IMPORTE_UNIDAD' Name = 'IMPORTE_UNIDAD'
DataType = datFloat DataType = datCurrency
end end
item item
Name = 'IMPORTE_TOTAL' Name = 'IMPORTE_TOTAL'
DataType = datFloat DataType = datCurrency
end
item
Name = 'REFERENCIA'
DataType = datString
Size = 255
end end
item item
Name = 'FAMILIA' Name = 'FAMILIA'
@ -461,7 +480,7 @@ object RptPedidosProveedor: TRptPedidosProveedor
PrintOptions.Printer = 'Por defecto' PrintOptions.Printer = 'Por defecto'
PrintOptions.PrintOnSheet = 0 PrintOptions.PrintOnSheet = 0
ReportOptions.CreateDate = 39065.872423495400000000 ReportOptions.CreateDate = 39065.872423495400000000
ReportOptions.LastChange = 42093.722987407400000000 ReportOptions.LastChange = 42258.790290613430000000
ScriptLanguage = 'PascalScript' ScriptLanguage = 'PascalScript'
ShowProgress = False ShowProgress = False
StoreInDFM = False StoreInDFM = False

138
Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm
View File

@ -19,7 +19,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
934 934
594) 594)
inline frViewProveedorPedido: TfrViewDatosYSeleccionProveedor inline frViewProveedorPedido: TfrViewDatosYSeleccionProveedor
Left = 424 Left = 435
Top = 28 Top = 28
Width = 357 Width = 357
Height = 215 Height = 215
@ -29,9 +29,9 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Font.Name = 'Tahoma' Font.Name = 'Tahoma'
Font.Style = [] Font.Style = []
ParentFont = False ParentFont = False
TabOrder = 11 TabOrder = 12
ReadOnly = False ReadOnly = False
ExplicitLeft = 424 ExplicitLeft = 435
ExplicitTop = 28 ExplicitTop = 28
ExplicitWidth = 357 ExplicitWidth = 357
ExplicitHeight = 215 ExplicitHeight = 215
@ -39,7 +39,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Width = 357 Width = 357
Height = 215 Height = 215
Align = alClient Align = alClient
ExplicitWidth = 488 ExplicitWidth = 357
ExplicitHeight = 215 ExplicitHeight = 215
inherited edtlNombre: TcxDBTextEdit inherited edtlNombre: TcxDBTextEdit
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -82,23 +82,23 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Width = 283 Width = 283
end end
inherited edtCodigoPostal: TcxDBTextEdit inherited edtCodigoPostal: TcxDBTextEdit
Left = 407 Left = 396
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 = 407 ExplicitLeft = 396
ExplicitWidth = 71 ExplicitWidth = 71
Width = 71 Width = 71
end end
inherited Button3: TBitBtn inherited Button3: TBitBtn
Left = 280 Left = 269
ExplicitLeft = 280 ExplicitLeft = 269
end end
end end
end end
object edtFechaPedido: TcxDBDateEdit object edtFechaPedido: TcxDBDateEdit
Left = 137 Left = 158
Top = 55 Top = 55
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'FECHA_PEDIDO' DataBinding.DataField = 'FECHA_PEDIDO'
@ -124,8 +124,8 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Width = 158 Width = 158
end end
object edtFechaConfirmacion: TcxDBDateEdit object edtFechaConfirmacion: TcxDBDateEdit
Left = 137 Left = 158
Top = 249 Top = 276
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'FECHA_CONFIRMACION' DataBinding.DataField = 'FECHA_CONFIRMACION'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -146,12 +146,12 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 9 TabOrder = 10
Width = 158 Width = 158
end end
object edtFechaEntrega: TcxDBDateEdit object edtFechaEntrega: TcxDBDateEdit
Left = 137 Left = 158
Top = 82 Top = 109
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'FECHA_ENTREGA' DataBinding.DataField = 'FECHA_ENTREGA'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -169,11 +169,11 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 2 TabOrder = 3
Width = 158 Width = 158
end end
object eReferencia: TcxDBTextEdit object eReferencia: TcxDBTextEdit
Left = 137 Left = 158
Top = 28 Top = 28
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'REFERENCIA' DataBinding.DataField = 'REFERENCIA'
@ -200,7 +200,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
end end
inline frViewDireccionEntregaPedidoProv1: TfrViewDireccionEntregaPedidoProv inline frViewDireccionEntregaPedidoProv1: TfrViewDireccionEntregaPedidoProv
Left = 22 Left = 22
Top = 334 Top = 354
Width = 273 Width = 273
Height = 166 Height = 166
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -209,17 +209,17 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Font.Name = 'Tahoma' Font.Name = 'Tahoma'
Font.Style = [] Font.Style = []
ParentFont = False ParentFont = False
TabOrder = 10 TabOrder = 11
ReadOnly = False ReadOnly = False
ExplicitLeft = 22 ExplicitLeft = 22
ExplicitTop = 334 ExplicitTop = 354
ExplicitWidth = 273 ExplicitWidth = 273
ExplicitHeight = 166 ExplicitHeight = 166
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 273 Width = 273
Height = 166 Height = 166
ExplicitWidth = 372 ExplicitWidth = 273
ExplicitHeight = 238 ExplicitHeight = 166
inherited rdxDestino1: TRadioButton inherited rdxDestino1: TRadioButton
Width = 255 Width = 255
ExplicitWidth = 255 ExplicitWidth = 255
@ -233,10 +233,10 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Width = 425 Width = 425
end end
inherited bModificar: TBitBtn inherited bModificar: TBitBtn
Left = 234 Left = 245
Top = 203 Top = 183
ExplicitLeft = 234 ExplicitLeft = 245
ExplicitTop = 203 ExplicitTop = 183
end end
end end
inherited ActionList1: TActionList inherited ActionList1: TActionList
@ -249,8 +249,8 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
end end
end end
object cbFormaPago: TcxDBLookupComboBox object cbFormaPago: TcxDBLookupComboBox
Left = 137 Left = 158
Top = 136 Top = 163
DataBinding.DataField = 'ID_FORMA_PAGO' DataBinding.DataField = 'ID_FORMA_PAGO'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
Enabled = False Enabled = False
@ -280,22 +280,22 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 4 TabOrder = 5
Width = 20 Width = 20
end end
object bFormasPago: TButton object bFormasPago: TButton
Left = 262 Left = 273
Top = 136 Top = 163
Width = 132 Width = 132
Height = 21 Height = 21
Caption = 'Ver las formas de pago...' Caption = 'Ver las formas de pago...'
Enabled = False Enabled = False
TabOrder = 5 TabOrder = 6
OnClick = bFormasPagoClick OnClick = bFormasPagoClick
end end
object edtFechaEnvio: TcxDBDateEdit object edtFechaEnvio: TcxDBDateEdit
Left = 137 Left = 158
Top = 222 Top = 249
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'FECHA_ENVIO' DataBinding.DataField = 'FECHA_ENVIO'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -316,12 +316,12 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 8 TabOrder = 9
Width = 158 Width = 158
end end
object eReferenciaContratoCli: TcxTextEdit object eReferenciaContratoCli: TcxTextEdit
Left = 137 Left = 158
Top = 163 Top = 190
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
Properties.ReadOnly = False Properties.ReadOnly = False
Properties.ValidateOnEnter = True Properties.ValidateOnEnter = True
@ -342,19 +342,19 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 6 TabOrder = 7
Width = 20 Width = 20
end end
object Button1: TButton object Button1: TButton
Left = 262 Left = 273
Top = 163 Top = 190
Width = 132 Width = 132
Height = 23 Height = 23
Action = actVerContratoCli Action = actVerContratoCli
TabOrder = 7 TabOrder = 8
end end
inline frViewTienda1: TfrViewTienda inline frViewTienda1: TfrViewTienda
Left = 424 Left = 435
Top = 279 Top = 279
Width = 357 Width = 357
Height = 46 Height = 46
@ -366,15 +366,15 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Font.Name = 'Tahoma' Font.Name = 'Tahoma'
Font.Style = [] Font.Style = []
ParentFont = False ParentFont = False
TabOrder = 12 TabOrder = 13
ReadOnly = False ReadOnly = False
ExplicitLeft = 424 ExplicitLeft = 435
ExplicitTop = 279 ExplicitTop = 279
ExplicitWidth = 357 ExplicitWidth = 357
ExplicitHeight = 46 ExplicitHeight = 46
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 357 Width = 357
ExplicitWidth = 488 ExplicitWidth = 357
inherited cbTienda: TcxComboBox inherited cbTienda: TcxComboBox
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
@ -384,31 +384,28 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
end end
end end
inline frViewObservaciones1: TfrViewObservaciones inline frViewObservaciones1: TfrViewObservaciones
Left = 424 Left = 435
Top = 361 Top = 361
Width = 521 Width = 521
Height = 150 Height = 150
Enabled = False
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
Font.Height = -11 Font.Height = -11
Font.Name = 'Tahoma' Font.Name = 'Tahoma'
Font.Style = [] Font.Style = []
ParentFont = False ParentFont = False
TabOrder = 13 TabOrder = 14
ReadOnly = False ReadOnly = False
ExplicitLeft = 424 ExplicitLeft = 435
ExplicitTop = 361 ExplicitTop = 361
inherited memObservaciones: TcxDBMemo inherited memObservaciones: TcxDBMemo
DataBinding.DataField = 'OBSERVACIONES' DataBinding.DataField = 'OBSERVACIONES'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
ExplicitWidth = 488
ExplicitHeight = 211
end end
end end
object edtlDescripcion: TcxDBTextEdit object edtlDescripcion: TcxDBTextEdit
Left = 137 Left = 158
Top = 109 Top = 136
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
AutoSize = False AutoSize = False
DataBinding.DataField = 'DESCRIPCION_GENERAL' DataBinding.DataField = 'DESCRIPCION_GENERAL'
@ -428,10 +425,36 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 3 TabOrder = 4
Height = 21 Height = 21
Width = 283 Width = 283
end end
object edtFechaEnvio2: TcxDBDateEdit
Left = 158
Top = 82
Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'FECHA_ENVIO'
DataBinding.DataSource = DADataSource
Properties.ImmediatePost = True
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
Style.Color = clInfoBk
Style.HotTrack = False
Style.LookAndFeel.NativeStyle = True
Style.LookAndFeel.SkinName = ''
Style.Shadow = False
Style.ButtonStyle = bts3D
Style.ButtonTransparency = ebtNone
Style.PopupBorderStyle = epbsFrame3D
StyleDisabled.LookAndFeel.NativeStyle = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.NativeStyle = True
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 2
Width = 257
end
object dxLayoutControl1Group_Root: TdxLayoutGroup object dxLayoutControl1Group_Root: TdxLayoutGroup
ShowCaption = False ShowCaption = False
Hidden = True Hidden = True
@ -457,8 +480,13 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Control = edtFechaPedido Control = edtFechaPedido
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
object dxLayoutControl1Item15: TdxLayoutItem
Caption = 'Fecha prevista de entrega:'
Control = edtFechaEnvio2
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item5: TdxLayoutItem object dxLayoutControl1Item5: TdxLayoutItem
Caption = 'Entrega de entrega:' Caption = 'Fecha de recepci'#243'n:'
Control = edtFechaEntrega Control = edtFechaEntrega
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
@ -580,8 +608,6 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
AutoAligns = [aaHorizontal] AutoAligns = [aaHorizontal]
AlignVert = avClient AlignVert = avClient
Caption = 'Observaciones' Caption = 'Observaciones'
Enabled = False
Visible = False
object dxLayoutControl1Item6: TdxLayoutItem object dxLayoutControl1Item6: TdxLayoutItem
AutoAligns = [] AutoAligns = []
AlignHorz = ahClient AlignHorz = ahClient

2
Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.pas
View File

@ -77,6 +77,8 @@ type
dxLayoutControl1Item6: TdxLayoutItem; dxLayoutControl1Item6: TdxLayoutItem;
dxLayoutControl1Item14: TdxLayoutItem; dxLayoutControl1Item14: TdxLayoutItem;
edtlDescripcion: TcxDBTextEdit; edtlDescripcion: TcxDBTextEdit;
dxLayoutControl1Item15: TdxLayoutItem;
edtFechaEnvio2: TcxDBDateEdit;
procedure CustomViewCreate(Sender: TObject); procedure CustomViewCreate(Sender: TObject);
procedure CustomViewDestroy(Sender: TObject); procedure CustomViewDestroy(Sender: TObject);
procedure bFormasPagoClick(Sender: TObject); procedure bFormasPagoClick(Sender: TObject);

13
Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm
View File

@ -94,8 +94,13 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor
DataBinding.FieldName = 'FECHA_PEDIDO' DataBinding.FieldName = 'FECHA_PEDIDO'
Width = 46 Width = 46
end end
object cxGridViewFECHA_ENVIO: TcxGridDBColumn
Caption = 'Fecha prevista de entrega'
DataBinding.FieldName = 'FECHA_ENVIO'
Width = 57
end
object cxGridViewFECHA_ENTREGA: TcxGridDBColumn object cxGridViewFECHA_ENTREGA: TcxGridDBColumn
Caption = 'Fecha de entrega' Caption = 'Fecha de recepci'#243'n'
DataBinding.FieldName = 'FECHA_ENTREGA' DataBinding.FieldName = 'FECHA_ENTREGA'
Width = 47 Width = 47
end end
@ -156,12 +161,6 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor
VisibleForCustomization = False VisibleForCustomization = False
Width = 41 Width = 41
end end
object cxGridViewFECHA_ENVIO: TcxGridDBColumn
DataBinding.FieldName = 'FECHA_ENVIO'
Visible = False
VisibleForCustomization = False
Width = 57
end
object cxGridViewFECHA_CONFIRMACION: TcxGridDBColumn object cxGridViewFECHA_CONFIRMACION: TcxGridDBColumn
DataBinding.FieldName = 'FECHA_CONFIRMACION' DataBinding.FieldName = 'FECHA_CONFIRMACION'
Visible = False Visible = False

45
Source/Modulos/Relaciones/Contratos de cliente - Pedidos de proveedor/uGenerarPedidosProvUtils.pas
View File

@ -115,28 +115,31 @@ begin
AArticulos.DataTable.First; AArticulos.DataTable.First;
for i := 0 to AArticulos.DataTable.RecordCount - 1 do for i := 0 to AArticulos.DataTable.RecordCount - 1 do
begin begin
ADetallesController.Add(ADetalles, AArticulos.TIPO_DETALLE); if (AArticulos.TIPO_DETALLE = TIPO_DETALLE_CONCEPTO) then
ADetalles.Edit; begin
// ADetalles.REFERENCIA := AArticulos.REFERENCIA; ADetallesController.Add(ADetalles, AArticulos.TIPO_DETALLE);
ADetalles.ID_ARTICULO := AArticulos.ID_ARTICULO; ADetalles.Edit;
if (AArticulos.PROPIEDAD <> '') then // ADetalles.REFERENCIA := AArticulos.REFERENCIA;
ADetalles.CONCEPTO := AArticulos.PROPIEDAD + ': '+ AArticulos.CONCEPTO ADetalles.ID_ARTICULO := AArticulos.ID_ARTICULO;
else if (AArticulos.PROPIEDAD <> '') then
ADetalles.CONCEPTO := AArticulos.CONCEPTO; ADetalles.CONCEPTO := AArticulos.PROPIEDAD + ': '+ AArticulos.CONCEPTO
else
ADetalles.CONCEPTO := AArticulos.CONCEPTO;
if not AArticulos.CANTIDADIsNull then if not AArticulos.CANTIDADIsNull then
ADetalles.CANTIDAD := AArticulos.CANTIDAD; ADetalles.CANTIDAD := AArticulos.CANTIDAD;
if not AArticulos.IMPORTE_UNIDADIsNull then if not AArticulos.IMPORTE_UNIDADIsNull then
ADetalles.IMPORTE_UNIDAD := AArticulos.IMPORTE_UNIDAD; ADetalles.IMPORTE_UNIDAD := AArticulos.IMPORTE_UNIDAD;
if not AArticulos.IMPORTE_TOTALIsNull then if not AArticulos.IMPORTE_TOTALIsNull then
ADetalles.IMPORTE_TOTAL := AArticulos.IMPORTE_TOTAL; ADetalles.IMPORTE_TOTAL := AArticulos.IMPORTE_TOTAL;
if not AArticulos.DESCUENTOIsNull then if not AArticulos.DESCUENTOIsNull then
ADetalles.DESCUENTO := AArticulos.DESCUENTO; ADetalles.DESCUENTO := AArticulos.DESCUENTO;
if not AArticulos.IMPORTE_PORTEIsNull then if not AArticulos.IMPORTE_PORTEIsNull then
ADetalles.IMPORTE_PORTE := AArticulos.IMPORTE_PORTE; ADetalles.IMPORTE_PORTE := AArticulos.IMPORTE_PORTE;
ADetalles.VISIBLE := AArticulos.VISIBLE; ADetalles.VISIBLE := AArticulos.VISIBLE;
// ADetalles.REFERENCIA_PROVEEDOR := AArticulos.REFERENCIA_PROVEEDOR; // ADetalles.REFERENCIA_PROVEEDOR := AArticulos.REFERENCIA_PROVEEDOR;
ADetalles.Post; ADetalles.Post;
end;
AArticulos.Next; AArticulos.Next;
end; end;
finally finally

10
Source/Servidor/FactuGES_Server.rc
View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico" MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 2,6,4,0 FILEVERSION 2,6,6,0
PRODUCTVERSION 2,6,4,0 PRODUCTVERSION 2,6,6,0
FILEFLAGSMASK 0x3FL FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L FILEFLAGS 0x00L
FILEOS 0x40004L FILEOS 0x40004L
@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4" BLOCK "0C0A04E4"
BEGIN BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0" VALUE "CompanyName", "Rodax Software S.L.\0"
VALUE "FileVersion", "2.6.4.0\0" VALUE "FileVersion", "2.6.6.0\0"
VALUE "ProductName", "FactuGES (Servidor)\0" VALUE "ProductName", "FactuGES (Servidor)\0"
VALUE "ProductVersion", "2.6.4.0\0" VALUE "ProductVersion", "2.6.6.0\0"
VALUE "CompileDate", "jueves, 10 de septiembre de 2015 17:53\0" VALUE "CompileDate", "jueves, 10 de septiembre de 2015 18:31\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

BIN
Source/Servidor/FactuGES_Server.res
View File

Binary file not shown.