Version 2.5.0

Peticiones relacionadas Tareas #868: Imprimir con el presupuesto los ficheros de imágenes adjuntos
Tareas #894: al hacer los presupuestos y contratos en vez de que salgan las propiedades que salgan los articulos
Tareas #911: Error al pasar un presupuesto a contrato no me copia las propiedades
Tareas #912: Establecer condiciones para cada tipo de presupuesto, configurables por ellos y que salgan en los contratos si estan rellenas
Tareas #913: En las lineas de detalles de presupuestos y contratos y no hay propiedad seleccionada que me deje texto libre con intros

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@565 f4e31baf-9722-1c47-927c-6f952f962d4b
This commit is contained in:
roberto 2012-06-21 17:24:01 +00:00
parent bd3df15454
commit b5d7cc2ae6
27 changed files with 567 additions and 784 deletions

View File

@ -79,6 +79,9 @@ VARCHAR(30);
CREATE DOMAIN TIPO_CANTIDAD AS
NUMERIC(11,2);
CREATE DOMAIN TIPO_FAMILIA AS
VARCHAR(255) CHARACTER SET ISO8859_1
COLLATE ISO8859_1;
/******************************************************************************/
/**** Generators ****/
@ -273,6 +276,9 @@ SET GENERATOR GEN_UNIDADES_MEDIDA_ID TO 1;
CREATE GENERATOR GEN_USUARIOS_ID;
SET GENERATOR GEN_USUARIOS_ID TO 1;
CREATE GENERATOR GEN_PRESUPUESTOS_CLIENTE_CAPITU;
SET GENERATOR GEN_PRESUPUESTOS_CLIENTE_CAPITU TO 1;
SET TERM ^ ;
@ -991,7 +997,7 @@ CREATE TABLE FACTURAS_PROVEEDOR_CONTRATOS (
CREATE TABLE FAMILIAS (
ID TIPO_ID NOT NULL,
DESCRIPCION VARCHAR(255)
DESCRIPCION TIPO_FAMILIA
);
CREATE TABLE FORMAS_PAGO (
@ -1197,20 +1203,7 @@ CREATE TABLE PRESUPUESTOS_CLIENTE_CAPITULOS (
POSICION INTEGER,
TIPO_DETALLE VARCHAR(10),
TIPO_ARTICULO VARCHAR(2) COLLATE ES_ES,
ID_ARTICULO TIPO_ID,
CONCEPTO TIPO_CONCEPTO
);
CREATE TABLE PRESUPUESTOS_VALORES (
ID TIPO_ID NOT NULL,
ID_PROPIEDAD TIPO_ID,
DESCRIPCION TIPO_CONCEPTO
);
CREATE TABLE PRESUPUESTOS_PROPIEDADES (
ID TIPO_ID NOT NULL,
DESCRIPCION VARCHAR(50),
ID_PADRE TIPO_ID
CONCEPTO TIPO_FAMILIA
);
CREATE TABLE PRESUPUESTOS_CLIENTE (
@ -1257,9 +1250,10 @@ CREATE TABLE PRESUPUESTOS_CLIENTE_DETALLES (
ID_PRESUPUESTO TIPO_ID NOT NULL,
POSICION INTEGER,
TIPO_DETALLE VARCHAR(10),
ID_ARTICULO TIPO_ID,
TIPO_ARTICULO VARCHAR(2) COLLATE ES_ES,
CONCEPTO TIPO_CONCEPTO,
ID_ARTICULO TIPO_ID,
TIPO_ARTICULO VARCHAR(2) COLLATE ES_ES,
PROPIEDAD TIPO_FAMILIA,
CONCEPTO TIPO_CONCEPTO,
CANTIDAD TIPO_CANTIDAD,
IMPORTE_UNIDAD TIPO_IMPORTE,
DESCUENTO TIPO_PORCENTAJE,
@ -1319,8 +1313,9 @@ CREATE TABLE CONTRATOS_CLIENTE_DETALLES (
POSICION INTEGER,
TIPO_DETALLE VARCHAR(10),
ID_ARTICULO TIPO_ID,
TIPO_ARTICULO VARCHAR(2) COLLATE ES_ES,
CONCEPTO TIPO_CONCEPTO,
TIPO_ARTICULO VARCHAR(2) COLLATE ES_ES,
PROPIEDAD TIPO_FAMILIA,
CONCEPTO TIPO_CONCEPTO,
CANTIDAD TIPO_CANTIDAD,
IMPORTE_UNIDAD TIPO_IMPORTE,
DESCUENTO TIPO_PORCENTAJE,
@ -5529,7 +5524,7 @@ ID_CAPITULO = -1;
if (TIPO = 'Presupuesto') then
begin
for select pre.id, pre.id_presupuesto, pre.posicion, pre.tipo_detalle,
coalesce(pre.tipo_articulo,'NA'), pre.id_articulo, presupuestos_propiedades.descripcion,
coalesce(pre.tipo_articulo,'NA'), pre.id_articulo, pre.propiedad,
/* F_RTFTOTEXT(F_RTFTOTEXT(pre.CONCEPTO)) as CONCEPTO,*/
pre.CONCEPTO,
pre.cantidad,
@ -5540,7 +5535,6 @@ begin
pre.descuento, pre.importe_porte,
pre.importe_total, coalesce(pre.visible, 1)
from presupuestos_cliente_detalles pre
left join presupuestos_propiedades on (pre.id_articulo = presupuestos_propiedades.id)
where pre.id_presupuesto = :AID
order by pre.id_presupuesto, pre.posicion
into :ID, :ID_PRE_CON, :POSICION, :TIPO_DETALLE,
@ -5568,7 +5562,7 @@ end
else if (TIPO = 'Contrato') then
begin
for select pre.id, pre.id_contrato, pre.posicion, pre.tipo_detalle,
coalesce(pre.tipo_articulo,'NA'), pre.id_articulo, presupuestos_propiedades.descripcion,
coalesce(pre.tipo_articulo,'NA'), pre.id_articulo, pre.propiedad,
/* F_RTFTOTEXT(F_RTFTOTEXT(pre.CONCEPTO)) as CONCEPTO,*/
pre.CONCEPTO,
pre.cantidad,
@ -5579,7 +5573,6 @@ begin
pre.descuento, pre.importe_porte,
pre.importe_total, coalesce(pre.visible, 1)
from contratos_cliente_detalles pre
left join presupuestos_propiedades on (pre.id_articulo = presupuestos_propiedades.id)
where pre.id_contrato = :AID
order by pre.id_contrato, pre.posicion
into :ID, :ID_PRE_CON, :POSICION, :TIPO_DETALLE,

View File

@ -52,7 +52,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">9</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.4.9.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.4.9.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">5</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.5.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.5.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>

View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico"
1 VERSIONINFO
FILEVERSION 2,4,9,0
PRODUCTVERSION 2,4,9,0
FILEVERSION 2,5,0,0
PRODUCTVERSION 2,5,0,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4"
BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0"
VALUE "FileVersion", "2.4.9.0\0"
VALUE "FileVersion", "2.5.0.0\0"
VALUE "InternalName", "FactuGES\0"
VALUE "ProductName", "FactuGES\0"
VALUE "ProductVersion", "2.4.9.0\0"
VALUE "ProductVersion", "2.5.0.0\0"
END
END
BLOCK "VarFileInfo"

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@ -177,16 +177,18 @@ object RptContratosCliente: TRptContratosCliente
end>
end
item
Params = <>
Params = <
item
Name = 'CODIGO'
Value = ''
end>
Statements = <
item
Connection = 'IBX'
ConnectionType = 'Interbase'
Default = True
Name = 'IBX'
SQL =
'SELECT VALOR_BLOB'#10'FROM CONFIGURACION'#10'WHERE CODIGO = '#39'CONDICIONES' +
'_COCINA'#39#10
SQL = 'SELECT VALOR_BLOB'#10'FROM CONFIGURACION'#10'WHERE CODIGO = :CODIGO'#10
StatementType = stSQL
ColumnMappings = <
item
@ -227,9 +229,9 @@ object RptContratosCliente: TRptContratosCliente
','#10' V_CONTRATOS_CLIENTE.CODIGO_POSTAL,'#10' V_CONTRATOS_CLIENTE' +
'.TELEFONO,'#10' V_CONTRATOS_CLIENTE.MOVIL,'#10' V_CONTRATOS_CLIENT' +
'E.IMPORTE_IVA, V_CONTRATOS_CLIENTE.IMPORTE_TOTAL,'#10' V_CONTRATO' +
'S_CLIENTE.PERSONA_CONTACTO,'#10' V_CONTRATOS_CLIENTE.VENDEDOR'#10'FRO' +
'M'#10' V_CONTRATOS_CLIENTE'#10'WHERE'#10' V_CONTRATOS_CLIENTE.ID = :ID' +
#10
'S_CLIENTE.PERSONA_CONTACTO,'#10' V_CONTRATOS_CLIENTE.VENDEDOR,'#10' ' +
' V_CONTRATOS_CLIENTE.TIPO_CONTRATO'#10'FROM'#10' V_CONTRATOS_CLIENTE' +
#10'WHERE'#10' V_CONTRATOS_CLIENTE.ID = :ID'#10
StatementType = stSQL
ColumnMappings = <
item
@ -347,6 +349,10 @@ object RptContratosCliente: TRptContratosCliente
item
DatasetField = 'MOVIL'
TableField = 'MOVIL'
end
item
DatasetField = 'TIPO_CONTRATO'
TableField = 'TIPO_CONTRATO'
end>
end>
Name = 'Informe_Cabecera'
@ -478,6 +484,11 @@ object RptContratosCliente: TRptContratosCliente
Name = 'VENDEDOR'
DataType = datString
Size = 255
end
item
Name = 'TIPO_CONTRATO'
DataType = datString
Size = 255
end>
ReadOnly = True
end
@ -1016,7 +1027,7 @@ object RptContratosCliente: TRptContratosCliente
PrintOptions.Printer = 'Por defecto'
PrintOptions.PrintOnSheet = 0
ReportOptions.CreateDate = 39065.872423495400000000
ReportOptions.LastChange = 41012.566414745370000000
ReportOptions.LastChange = 41081.761483032410000000
ScriptLanguage = 'PascalScript'
ShowProgress = False
StoreInDFM = False
@ -1171,6 +1182,11 @@ object RptContratosCliente: TRptContratosCliente
Name = 'VENDEDOR'
DataType = datString
Size = 255
end
item
Name = 'TIPO_CONTRATO'
DataType = datString
Size = 255
end>
Params = <
item
@ -1719,7 +1735,11 @@ object RptContratosCliente: TRptContratosCliente
Name = 'VALOR_BLOB'
DataType = datBlob
end>
Params = <>
Params = <
item
Name = 'CODIGO'
Value = ''
end>
MasterMappingMode = mmWhere
MasterParamsMappings.Strings = (
'ID_PRESUPUESTO=ID')

View File

@ -67,11 +67,11 @@ type
frxDBCondiciones: TfrxDBDataset;
DADSCondiciones: TDADataSource;
tbl_Condiciones: TDAMemDataTable;
schReport: TDASchema;
DataDictionary: TDADataDictionary;
tbl_DetallesArticulos: TDAMemDataTable;
DADSDetallesArticulos: TDADataSource;
frxDBDetallesArticulos: TfrxDBDataset;
schReport: TDASchema;
DataDictionary: TDADataDictionary;
procedure DataModuleCreate(Sender: TObject);
procedure DataModuleDestroy(Sender: TObject);
function frxReportUserFunction(const MethodName: string;
@ -536,7 +536,23 @@ begin
tbl_Cabecera.Active := True;
tbl_Capitulos.Active := True;
tbl_Detalles.Active := True;
if (tbl_Cabecera.FieldByName('TIPO_CONTRATO').AsString = 'Cocina') then
tbl_Condiciones.ParamByName('CODIGO').AsString := 'CONDICIONES_COCINA'
else if (tbl_Cabecera.FieldByName('TIPO_CONTRATO').AsString = 'Baño') then
tbl_Condiciones.ParamByName('CODIGO').AsString := 'CONDICIONES_BANO'
else if (tbl_Cabecera.FieldByName('TIPO_CONTRATO').AsString = 'Armarios') then
tbl_Condiciones.ParamByName('CODIGO').AsString := 'CONDICIONES_ARMARIO'
else if (tbl_Cabecera.FieldByName('TIPO_CONTRATO').AsString = 'Electrodomésticos') then
tbl_Condiciones.ParamByName('CODIGO').AsString := 'CONDICIONES_ELECTRODOMESTICO'
else if (tbl_Cabecera.FieldByName('TIPO_CONTRATO').AsString = 'Obra') then
tbl_Condiciones.ParamByName('CODIGO').AsString := 'CONDICIONES_OBRA'
else if (tbl_Cabecera.FieldByName('TIPO_CONTRATO').AsString = 'Varios') then
tbl_Condiciones.ParamByName('CODIGO').AsString := 'CONDICIONES_VARIOS'
else
tbl_Condiciones.ParamByName('CODIGO').AsString := '';
tbl_Condiciones.Active := True;
tbl_DetallesArticulos.Active := True;
AInforme := DarRutaFichero(DarRutaInformes, rptInforme, tbl_Cabecera.FieldByName('ID_EMPRESA').AsString);

View File

@ -1,89 +1,5 @@
inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
Width = 905
Height = 475
inherited ToolBar1: TToolBar
Width = 905
Height = 24
inherited ToolButton4: TToolButton
Wrap = False
end
inherited ToolButton14: TToolButton
Left = 334
Top = 0
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox
Left = 368
Top = 0
ExplicitLeft = 368
ExplicitTop = 0
end
inherited FontSize: TEdit
Left = 513
Top = 0
ExplicitLeft = 513
ExplicitTop = 0
end
inherited UpDown1: TUpDown
Left = 555
Top = 0
ExplicitLeft = 555
ExplicitTop = 0
end
inherited ToolButton13: TToolButton
Left = 572
Top = 0
ExplicitLeft = 572
ExplicitTop = 0
end
inherited ToolButton6: TToolButton
Left = 580
Top = 0
ExplicitLeft = 580
ExplicitTop = 0
end
inherited ToolButton7: TToolButton
Left = 614
Top = 0
ExplicitLeft = 614
ExplicitTop = 0
end
inherited ToolButton8: TToolButton
Left = 648
Top = 0
ExplicitLeft = 648
ExplicitTop = 0
end
inherited ToolButton12: TToolButton
Left = 682
Top = 0
ExplicitLeft = 682
ExplicitTop = 0
end
inherited ToolButton9: TToolButton
Left = 690
Top = 0
ExplicitLeft = 690
ExplicitTop = 0
end
inherited ToolButton10: TToolButton
Left = 724
Top = 0
ExplicitLeft = 724
ExplicitTop = 0
end
inherited ToolButton11: TToolButton
Left = 758
Top = 0
ExplicitLeft = 758
ExplicitTop = 0
end
end
inherited cxGrid: TcxGrid
Top = 50
Width = 905
Height = 425
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewID_ARTICULO: TcxGridDBColumn
Width = 57
@ -138,10 +54,7 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
end
end
inherited TBXDock1: TTBXDock
Top = 24
Width = 905
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 665
object TBXSubmenuItem1: TTBXSubmenuItem [0]
Caption = 'A'#241'adir cap'#237'tulo'
DisplayMode = nbdmImageAndText

View File

@ -273,9 +273,8 @@ begin
//OJO sin esto no se refresca el filtro en tabla detalle "VALORES".
DAPropiedades.DataTable.Locate(fld_PropiedadesDESCRIPCION, cxGridViewPROPIEDAD.DataBinding.Field.AsVariant,[]);
if (ARecord.DisplayTexts[cxGridViewTIPO.Index] = TIPO_DETALLE_CONCEPTO)
then
and (ARecord.DisplayTexts[cxGridViewPROPIEDAD.Index] <> '') then
AProperties := cxLookupComboBox1.Properties
else
AProperties := cxRichEdit1.Properties;

View File

@ -1,33 +1,33 @@
inherited frViewConfiguracionDocArmario: TfrViewConfiguracionDocArmario
Width = 838
Height = 634
ExplicitWidth = 838
ExplicitHeight = 634
Width = 566
Height = 494
inherited Panel1: TPanel
Width = 828
Width = 556
TabOrder = 1
ExplicitWidth = 530
inherited Label3: TLabel
Width = 816
Width = 544
Visible = False
end
end
inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel
Width = 838
Width = 566
LabelCaption = 'Configuraci'#243'n de los documentos de armario'
TabOrder = 0
ExplicitWidth = 540
end
object Paginas: TPageControl
Left = 0
Top = 68
Width = 838
Height = 566
Width = 566
Height = 426
ActivePage = pagNotas
Align = alClient
TabOrder = 2
ExplicitWidth = 451
ExplicitHeight = 236
object pagNotas: TTabSheet
Caption = 'Notas'
ExplicitWidth = 443
ExplicitHeight = 208
object Label1: TLabel
Left = 11
Top = 22
@ -49,17 +49,6 @@ inherited frViewConfiguracionDocArmario: TfrViewConfiguracionDocArmario
Height = 13
Caption = 'Observaciones:'
end
object eCondiciones: TcxRichEdit
Left = 11
Top = 391
Properties.ScrollBars = ssVertical
Lines.Strings = (
'eCondiciones')
TabOrder = 0
Visible = False
Height = 57
Width = 529
end
object ePlazosEntrega: TMemo
Left = 11
Top = 168
@ -70,7 +59,7 @@ inherited frViewConfiguracionDocArmario: TfrViewConfiguracionDocArmario
Ctl3D = True
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 1
TabOrder = 0
end
object eFormaPago: TMemo
Left = 11
@ -80,7 +69,7 @@ inherited frViewConfiguracionDocArmario: TfrViewConfiguracionDocArmario
Ctl3D = True
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 2
TabOrder = 1
end
object eObservaciones: TMemo
Left = 11
@ -92,17 +81,19 @@ inherited frViewConfiguracionDocArmario: TfrViewConfiguracionDocArmario
Ctl3D = True
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 3
TabOrder = 2
end
end
object pagCapituloFrente: TTabSheet
Caption = 'Cap'#237'tulo frente'
ImageIndex = 1
ExplicitWidth = 443
ExplicitHeight = 208
inline frViewConfiguracionCapituloFrente: TfrViewConfiguracionCapitulo
Left = 0
Top = 0
Width = 830
Height = 538
Width = 558
Height = 398
Align = alClient
BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET
@ -114,102 +105,61 @@ inherited frViewConfiguracionDocArmario: TfrViewConfiguracionDocArmario
ParentFont = False
TabOrder = 0
ReadOnly = False
ExplicitWidth = 838
ExplicitHeight = 634
ExplicitWidth = 443
ExplicitHeight = 208
inherited ToolBar1: TToolBar
Width = 830
Height = 24
ExplicitWidth = 830
ExplicitHeight = 24
inherited ToolButton4: TToolButton
Wrap = False
end
inherited ToolButton14: TToolButton
Left = 334
Top = 0
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox
Left = 368
Top = 0
ExplicitLeft = 368
ExplicitTop = 0
end
Width = 558
ExplicitWidth = 443
inherited FontSize: TEdit
Left = 513
Top = 0
ExplicitLeft = 513
ExplicitTop = 0
Width = 58
ExplicitWidth = 58
end
inherited UpDown1: TUpDown
Left = 555
Top = 0
ExplicitLeft = 555
ExplicitTop = 0
Left = 237
ExplicitLeft = 237
end
inherited ToolButton13: TToolButton
Left = 572
Top = 0
ExplicitLeft = 572
ExplicitTop = 0
Left = 254
ExplicitLeft = 254
end
inherited ToolButton6: TToolButton
Left = 580
Top = 0
ExplicitLeft = 580
ExplicitTop = 0
Left = 262
ExplicitLeft = 262
end
inherited ToolButton7: TToolButton
Left = 614
Top = 0
ExplicitLeft = 614
ExplicitTop = 0
Left = 296
ExplicitLeft = 296
end
inherited ToolButton8: TToolButton
Left = 648
Top = 0
ExplicitLeft = 648
ExplicitTop = 0
Left = 330
ExplicitLeft = 330
end
inherited ToolButton12: TToolButton
Left = 682
Top = 0
ExplicitLeft = 682
ExplicitTop = 0
Left = 364
ExplicitLeft = 364
end
inherited ToolButton9: TToolButton
Left = 690
Top = 0
ExplicitLeft = 690
ExplicitTop = 0
Left = 372
ExplicitLeft = 372
end
inherited ToolButton10: TToolButton
Left = 724
Top = 0
ExplicitLeft = 724
ExplicitTop = 0
Left = 406
ExplicitLeft = 406
end
inherited ToolButton11: TToolButton
Left = 758
Top = 0
ExplicitLeft = 758
ExplicitTop = 0
Left = 440
ExplicitLeft = 440
end
end
inherited cxGrid: TcxGrid
Top = 50
Width = 830
Height = 488
ExplicitTop = 50
ExplicitWidth = 838
ExplicitHeight = 584
Width = 558
Height = 326
ExplicitWidth = 443
ExplicitHeight = 136
end
inherited TBXDock1: TTBXDock
Top = 24
Width = 830
ExplicitTop = 24
ExplicitWidth = 838
Width = 558
ExplicitWidth = 443
end
inherited cxLookupComboBox: TcxLookupComboBox
Style.IsFontAssigned = True
@ -219,11 +169,13 @@ inherited frViewConfiguracionDocArmario: TfrViewConfiguracionDocArmario
object pagCapituloInterior: TTabSheet
Caption = 'Cap'#237'tulo interior'
ImageIndex = 2
ExplicitWidth = 443
ExplicitHeight = 208
inline frViewConfiguracionCapituloInterior: TfrViewConfiguracionCapitulo
Left = 0
Top = 0
Width = 830
Height = 538
Width = 558
Height = 398
Align = alClient
BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET
@ -235,107 +187,85 @@ inherited frViewConfiguracionDocArmario: TfrViewConfiguracionDocArmario
ParentFont = False
TabOrder = 0
ReadOnly = False
ExplicitWidth = 838
ExplicitHeight = 634
ExplicitWidth = 443
ExplicitHeight = 208
inherited ToolBar1: TToolBar
Width = 830
Height = 24
ExplicitWidth = 830
ExplicitHeight = 24
inherited ToolButton4: TToolButton
Wrap = False
end
inherited ToolButton14: TToolButton
Left = 334
Top = 0
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox
Left = 368
Top = 0
ExplicitLeft = 368
ExplicitTop = 0
end
Width = 558
ExplicitWidth = 443
inherited FontSize: TEdit
Left = 513
Top = 0
ExplicitLeft = 513
ExplicitTop = 0
Width = 58
ExplicitWidth = 58
end
inherited UpDown1: TUpDown
Left = 555
Top = 0
ExplicitLeft = 555
ExplicitTop = 0
Left = 237
ExplicitLeft = 237
end
inherited ToolButton13: TToolButton
Left = 572
Top = 0
ExplicitLeft = 572
ExplicitTop = 0
Left = 254
ExplicitLeft = 254
end
inherited ToolButton6: TToolButton
Left = 580
Top = 0
ExplicitLeft = 580
ExplicitTop = 0
Left = 262
ExplicitLeft = 262
end
inherited ToolButton7: TToolButton
Left = 614
Top = 0
ExplicitLeft = 614
ExplicitTop = 0
Left = 296
ExplicitLeft = 296
end
inherited ToolButton8: TToolButton
Left = 648
Top = 0
ExplicitLeft = 648
ExplicitTop = 0
Left = 330
ExplicitLeft = 330
end
inherited ToolButton12: TToolButton
Left = 682
Top = 0
ExplicitLeft = 682
ExplicitTop = 0
Left = 364
ExplicitLeft = 364
end
inherited ToolButton9: TToolButton
Left = 690
Top = 0
ExplicitLeft = 690
ExplicitTop = 0
Left = 372
ExplicitLeft = 372
end
inherited ToolButton10: TToolButton
Left = 724
Top = 0
ExplicitLeft = 724
ExplicitTop = 0
Left = 406
ExplicitLeft = 406
end
inherited ToolButton11: TToolButton
Left = 758
Top = 0
ExplicitLeft = 758
ExplicitTop = 0
Left = 440
ExplicitLeft = 440
end
end
inherited cxGrid: TcxGrid
Top = 50
Width = 830
Height = 488
ExplicitTop = 50
ExplicitWidth = 838
ExplicitHeight = 584
Width = 558
Height = 326
ExplicitWidth = 443
ExplicitHeight = 136
end
inherited TBXDock1: TTBXDock
Top = 24
Width = 830
ExplicitTop = 24
ExplicitWidth = 838
Width = 558
ExplicitWidth = 443
end
inherited cxLookupComboBox: TcxLookupComboBox
Style.IsFontAssigned = True
end
end
end
object pagCondiciones: TTabSheet
Caption = 'Condiciones'
ImageIndex = 3
ExplicitWidth = 443
ExplicitHeight = 208
object eCondiciones: TcxRichEdit
Left = 0
Top = 0
Align = alClient
Properties.ScrollBars = ssVertical
Lines.Strings = (
'eCondiciones')
TabOrder = 0
ExplicitWidth = 443
ExplicitHeight = 208
Height = 398
Width = 558
end
end
end
end

View File

@ -16,7 +16,6 @@ type
Label1: TLabel;
Label2: TLabel;
Label4: TLabel;
eCondiciones: TcxRichEdit;
ePlazosEntrega: TMemo;
eFormaPago: TMemo;
eObservaciones: TMemo;
@ -24,6 +23,8 @@ type
frViewConfiguracionCapituloFrente: TfrViewConfiguracionCapitulo;
pagCapituloInterior: TTabSheet;
frViewConfiguracionCapituloInterior: TfrViewConfiguracionCapitulo;
pagCondiciones: TTabSheet;
eCondiciones: TcxRichEdit;
public
class function GetViewClass : TClass; override;
class function DarEtiqueta : String; override;

View File

@ -1,24 +1,24 @@
inherited frViewConfiguracionDocBANO: TfrViewConfiguracionDocBANO
Width = 876
Height = 651
Width = 554
Height = 486
inherited Panel1: TPanel
Width = 866
Width = 544
TabOrder = 1
inherited Label3: TLabel
Width = 854
Width = 532
Visible = False
end
end
inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel
Width = 876
Width = 554
LabelCaption = 'Configuraci'#243'n de los documentos de ba'#241'o'
TabOrder = 0
end
object paginas: TPageControl
Left = 0
Top = 68
Width = 876
Height = 583
Width = 554
Height = 418
ActivePage = pagNotas
Align = alClient
TabOrder = 2
@ -49,17 +49,6 @@ inherited frViewConfiguracionDocBANO: TfrViewConfiguracionDocBANO
Height = 13
Caption = 'Observaciones:'
end
object eCondiciones: TcxRichEdit
Left = 11
Top = 385
Properties.ScrollBars = ssVertical
Lines.Strings = (
'eCondiciones')
TabOrder = 0
Visible = False
Height = 57
Width = 529
end
object ePlazosEntrega: TMemo
Left = 11
Top = 162
@ -68,7 +57,7 @@ inherited frViewConfiguracionDocBANO: TfrViewConfiguracionDocBANO
Ctl3D = True
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 1
TabOrder = 0
end
object eFormaPago: TMemo
Left = 11
@ -78,7 +67,7 @@ inherited frViewConfiguracionDocBANO: TfrViewConfiguracionDocBANO
Ctl3D = True
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 2
TabOrder = 1
end
object eObservaciones: TMemo
Left = 11
@ -88,7 +77,7 @@ inherited frViewConfiguracionDocBANO: TfrViewConfiguracionDocBANO
Ctl3D = True
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 3
TabOrder = 2
end
end
object pagCapitulo: TTabSheet
@ -99,8 +88,8 @@ inherited frViewConfiguracionDocBANO: TfrViewConfiguracionDocBANO
inline frViewConfiguracionCapitulo: TfrViewConfiguracionCapitulo
Left = 0
Top = 0
Width = 868
Height = 555
Width = 546
Height = 390
Align = alClient
BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET
@ -115,95 +104,57 @@ inherited frViewConfiguracionDocBANO: TfrViewConfiguracionDocBANO
ExplicitWidth = 443
ExplicitHeight = 208
inherited ToolBar1: TToolBar
Width = 868
Height = 24
Width = 546
ExplicitWidth = 443
inherited ToolButton4: TToolButton
Wrap = False
end
inherited ToolButton14: TToolButton
Left = 334
Top = 0
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox
Left = 368
Top = 0
ExplicitLeft = 368
ExplicitTop = 0
end
inherited FontSize: TEdit
Left = 513
Top = 0
ExplicitLeft = 513
ExplicitTop = 0
Width = 58
ExplicitWidth = 58
end
inherited UpDown1: TUpDown
Left = 555
Top = 0
ExplicitLeft = 555
ExplicitTop = 0
Left = 237
ExplicitLeft = 237
end
inherited ToolButton13: TToolButton
Left = 572
Top = 0
ExplicitLeft = 572
ExplicitTop = 0
Left = 254
ExplicitLeft = 254
end
inherited ToolButton6: TToolButton
Left = 580
Top = 0
ExplicitLeft = 580
ExplicitTop = 0
Left = 262
ExplicitLeft = 262
end
inherited ToolButton7: TToolButton
Left = 614
Top = 0
ExplicitLeft = 614
ExplicitTop = 0
Left = 296
ExplicitLeft = 296
end
inherited ToolButton8: TToolButton
Left = 648
Top = 0
ExplicitLeft = 648
ExplicitTop = 0
Left = 330
ExplicitLeft = 330
end
inherited ToolButton12: TToolButton
Left = 682
Top = 0
ExplicitLeft = 682
ExplicitTop = 0
Left = 364
ExplicitLeft = 364
end
inherited ToolButton9: TToolButton
Left = 690
Top = 0
ExplicitLeft = 690
ExplicitTop = 0
Left = 372
ExplicitLeft = 372
end
inherited ToolButton10: TToolButton
Left = 724
Top = 0
ExplicitLeft = 724
ExplicitTop = 0
Left = 406
ExplicitLeft = 406
end
inherited ToolButton11: TToolButton
Left = 758
Top = 0
ExplicitLeft = 758
ExplicitTop = 0
Left = 440
ExplicitLeft = 440
end
end
inherited cxGrid: TcxGrid
Top = 50
Width = 868
Height = 505
Width = 546
Height = 318
ExplicitWidth = 443
ExplicitHeight = 136
end
inherited TBXDock1: TTBXDock
Top = 24
Width = 868
Width = 546
ExplicitWidth = 443
end
inherited cxLookupComboBox: TcxLookupComboBox
@ -211,5 +162,23 @@ inherited frViewConfiguracionDocBANO: TfrViewConfiguracionDocBANO
end
end
end
object pagCondiciones: TTabSheet
Caption = 'Condiciones'
ImageIndex = 2
ExplicitWidth = 443
ExplicitHeight = 208
object eCondiciones: TcxRichEdit
Left = 0
Top = 0
Align = alClient
Properties.ScrollBars = ssVertical
Lines.Strings = (
'eCondiciones')
TabOrder = 0
ExplicitLeft = 1
Height = 390
Width = 546
end
end
end
end

View File

@ -16,12 +16,13 @@ type
Label1: TLabel;
Label2: TLabel;
Label4: TLabel;
eCondiciones: TcxRichEdit;
ePlazosEntrega: TMemo;
eFormaPago: TMemo;
eObservaciones: TMemo;
pagCapitulo: TTabSheet;
frViewConfiguracionCapitulo: TfrViewConfiguracionCapitulo;
pagCondiciones: TTabSheet;
eCondiciones: TcxRichEdit;
public
class function GetViewClass : TClass; override;
class function DarEtiqueta : String; override;

View File

@ -1,34 +1,33 @@
inherited frViewConfiguracionDocCocina: TfrViewConfiguracionDocCocina
Width = 792
Height = 651
ExplicitWidth = 792
ExplicitHeight = 651
Width = 561
Height = 490
inherited Panel1: TPanel
Width = 782
Width = 551
TabOrder = 1
ExplicitWidth = 530
inherited Label3: TLabel
Width = 770
Width = 539
Visible = False
end
end
inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel
Width = 792
Width = 561
LabelCaption = 'Configuraci'#243'n de los documentos de cocina'
TabOrder = 0
ExplicitWidth = 540
end
object Paginas: TPageControl
Left = 0
Top = 68
Width = 792
Height = 583
Width = 561
Height = 422
ActivePage = pagNotas
Align = alClient
TabOrder = 2
ExplicitWidth = 684
ExplicitHeight = 540
object pagNotas: TTabSheet
Caption = 'Notas'
ExplicitLeft = 3
ExplicitWidth = 676
ExplicitHeight = 512
object Label1: TLabel
Left = 11
Top = 23
@ -80,26 +79,17 @@ inherited frViewConfiguracionDocCocina: TfrViewConfiguracionDocCocina
ScrollBars = ssVertical
TabOrder = 2
end
object eCondiciones: TcxRichEdit
Left = 11
Top = 392
Properties.ScrollBars = ssVertical
Lines.Strings = (
'eCondiciones')
TabOrder = 3
Visible = False
Height = 57
Width = 529
end
end
object pagCapitulo: TTabSheet
Caption = 'Cap'#237'tulo'
ImageIndex = 1
ExplicitWidth = 443
ExplicitHeight = 208
inline frViewConfiguracionCapitulo: TfrViewConfiguracionCapitulo
Left = 0
Top = 0
Width = 784
Height = 555
Width = 553
Height = 394
Align = alClient
BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET
@ -111,114 +101,87 @@ inherited frViewConfiguracionDocCocina: TfrViewConfiguracionDocCocina
ParentFont = False
TabOrder = 0
ReadOnly = False
ExplicitWidth = 792
ExplicitHeight = 651
ExplicitWidth = 443
ExplicitHeight = 208
inherited ToolBar1: TToolBar
Width = 784
ExplicitWidth = 784
inherited FontSize: TEdit [1]
Left = 109
Top = 0
ExplicitLeft = 109
ExplicitTop = 0
Width = 553
ExplicitWidth = 443
inherited FontSize: TEdit
Width = 58
ExplicitWidth = 58
end
inherited UpDown1: TUpDown [2]
Left = 151
Top = 0
ExplicitLeft = 151
ExplicitTop = 0
end
inherited ToolButton2: TToolButton [3]
Left = 168
ExplicitLeft = 168
end
inherited ToolButton3: TToolButton [4]
Left = 282
ExplicitLeft = 282
end
inherited ToolButton4: TToolButton [5]
Left = 337
Wrap = False
ExplicitLeft = 337
end
inherited ToolButton14: TToolButton [6]
Left = 393
Top = 0
Enabled = True
ExplicitLeft = 393
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox [7]
Left = 427
Top = 0
ExplicitLeft = 427
ExplicitTop = 0
inherited UpDown1: TUpDown
Left = 237
ExplicitLeft = 237
end
inherited ToolButton13: TToolButton
Left = 572
Top = 0
ExplicitLeft = 572
ExplicitTop = 0
Left = 254
ExplicitLeft = 254
end
inherited ToolButton6: TToolButton
Left = 580
Top = 0
ExplicitLeft = 580
ExplicitTop = 0
Left = 262
ExplicitLeft = 262
end
inherited ToolButton7: TToolButton
Left = 614
Top = 0
ExplicitLeft = 614
ExplicitTop = 0
Left = 296
ExplicitLeft = 296
end
inherited ToolButton8: TToolButton
Left = 648
Top = 0
ExplicitLeft = 648
ExplicitTop = 0
Left = 330
ExplicitLeft = 330
end
inherited ToolButton12: TToolButton
Left = 682
Top = 0
ExplicitLeft = 682
ExplicitTop = 0
Left = 364
ExplicitLeft = 364
end
inherited ToolButton9: TToolButton
Left = 690
Top = 0
ExplicitLeft = 690
ExplicitTop = 0
Left = 372
ExplicitLeft = 372
end
inherited ToolButton10: TToolButton
Left = 724
Top = 0
ExplicitLeft = 724
ExplicitTop = 0
Left = 406
ExplicitLeft = 406
end
inherited ToolButton11: TToolButton
Left = 758
Top = 0
ExplicitLeft = 758
ExplicitTop = 0
Left = 440
ExplicitLeft = 440
end
end
inherited cxGrid: TcxGrid
Width = 784
Height = 483
ExplicitTop = 50
ExplicitWidth = 792
ExplicitHeight = 601
Width = 553
Height = 322
ExplicitWidth = 443
ExplicitHeight = 136
end
inherited TBXDock1: TTBXDock
Width = 784
ExplicitTop = 24
ExplicitWidth = 792
Width = 553
ExplicitWidth = 443
end
inherited cxLookupComboBox: TcxLookupComboBox
Style.IsFontAssigned = True
end
end
end
object pagCondiciones: TTabSheet
Caption = 'Condiciones contrato'
ImageIndex = 2
ExplicitWidth = 676
ExplicitHeight = 512
object eCondiciones: TcxRichEdit
Left = 0
Top = 0
Align = alClient
Properties.ScrollBars = ssVertical
Lines.Strings = (
'eCondiciones')
TabOrder = 0
ExplicitLeft = 11
ExplicitTop = 392
ExplicitWidth = 529
ExplicitHeight = 57
Height = 394
Width = 553
end
end
end
end

View File

@ -19,9 +19,10 @@ type
ePlazosEntrega: TMemo;
eFormaPago: TMemo;
eObservaciones: TMemo;
eCondiciones: TcxRichEdit;
pagCapitulo: TTabSheet;
frViewConfiguracionCapitulo: TfrViewConfiguracionCapitulo;
pagCondiciones: TTabSheet;
eCondiciones: TcxRichEdit;
public
class function GetViewClass : TClass; override;
class function DarEtiqueta : String; override;

View File

@ -1,33 +1,33 @@
inherited frViewConfiguracionDocElectrodomestico: TfrViewConfiguracionDocElectrodomestico
Width = 821
Height = 564
ExplicitWidth = 821
ExplicitHeight = 564
Width = 554
Height = 492
inherited Panel1: TPanel
Width = 811
Width = 544
TabOrder = 1
ExplicitWidth = 530
inherited Label3: TLabel
Width = 799
Width = 532
Visible = False
end
end
inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel
Width = 821
Width = 554
LabelCaption = 'Configuraci'#243'n de los documentos de electrodom'#233'sticos'
TabOrder = 0
ExplicitWidth = 540
end
object Paginas: TPageControl
Left = 0
Top = 68
Width = 821
Height = 496
Width = 554
Height = 424
ActivePage = pagNotas
Align = alClient
TabOrder = 2
ExplicitWidth = 612
ExplicitHeight = 526
object pagNotas: TTabSheet
Caption = 'Notas'
ExplicitWidth = 443
ExplicitHeight = 208
object Label1: TLabel
Left = 11
Top = 20
@ -49,17 +49,6 @@ inherited frViewConfiguracionDocElectrodomestico: TfrViewConfiguracionDocElectro
Height = 13
Caption = 'Observaciones:'
end
object eCondiciones: TcxRichEdit
Left = 11
Top = 352
Properties.ScrollBars = ssVertical
Lines.Strings = (
'eCondiciones')
TabOrder = 0
Visible = False
Height = 57
Width = 529
end
object ePlazosEntrega: TMemo
Left = 11
Top = 166
@ -68,7 +57,7 @@ inherited frViewConfiguracionDocElectrodomestico: TfrViewConfiguracionDocElectro
Ctl3D = True
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 1
TabOrder = 0
end
object eFormaPago: TMemo
Left = 11
@ -78,7 +67,7 @@ inherited frViewConfiguracionDocElectrodomestico: TfrViewConfiguracionDocElectro
Ctl3D = True
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 2
TabOrder = 1
end
object eObservaciones: TMemo
Left = 11
@ -88,17 +77,19 @@ inherited frViewConfiguracionDocElectrodomestico: TfrViewConfiguracionDocElectro
Ctl3D = True
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 3
TabOrder = 2
end
end
object pagCapitulo: TTabSheet
Caption = 'Cap'#237'tulo'
ImageIndex = 1
ExplicitWidth = 443
ExplicitHeight = 208
inline frViewConfiguracionCapitulo: TfrViewConfiguracionCapitulo
Left = 0
Top = 0
Width = 813
Height = 468
Width = 546
Height = 396
Align = alClient
BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET
@ -110,107 +101,85 @@ inherited frViewConfiguracionDocElectrodomestico: TfrViewConfiguracionDocElectro
ParentFont = False
TabOrder = 0
ReadOnly = False
ExplicitWidth = 821
ExplicitHeight = 564
ExplicitWidth = 443
ExplicitHeight = 208
inherited ToolBar1: TToolBar
Width = 813
Height = 24
ExplicitWidth = 813
ExplicitHeight = 24
inherited ToolButton4: TToolButton
Wrap = False
end
inherited ToolButton14: TToolButton
Left = 334
Top = 0
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox
Left = 368
Top = 0
ExplicitLeft = 368
ExplicitTop = 0
end
Width = 546
ExplicitWidth = 443
inherited FontSize: TEdit
Left = 513
Top = 0
ExplicitLeft = 513
ExplicitTop = 0
Width = 58
ExplicitWidth = 58
end
inherited UpDown1: TUpDown
Left = 555
Top = 0
ExplicitLeft = 555
ExplicitTop = 0
Left = 237
ExplicitLeft = 237
end
inherited ToolButton13: TToolButton
Left = 572
Top = 0
ExplicitLeft = 572
ExplicitTop = 0
Left = 254
ExplicitLeft = 254
end
inherited ToolButton6: TToolButton
Left = 580
Top = 0
ExplicitLeft = 580
ExplicitTop = 0
Left = 262
ExplicitLeft = 262
end
inherited ToolButton7: TToolButton
Left = 614
Top = 0
ExplicitLeft = 614
ExplicitTop = 0
Left = 296
ExplicitLeft = 296
end
inherited ToolButton8: TToolButton
Left = 648
Top = 0
ExplicitLeft = 648
ExplicitTop = 0
Left = 330
ExplicitLeft = 330
end
inherited ToolButton12: TToolButton
Left = 682
Top = 0
ExplicitLeft = 682
ExplicitTop = 0
Left = 364
ExplicitLeft = 364
end
inherited ToolButton9: TToolButton
Left = 690
Top = 0
ExplicitLeft = 690
ExplicitTop = 0
Left = 372
ExplicitLeft = 372
end
inherited ToolButton10: TToolButton
Left = 724
Top = 0
ExplicitLeft = 724
ExplicitTop = 0
Left = 406
ExplicitLeft = 406
end
inherited ToolButton11: TToolButton
Left = 758
Top = 0
ExplicitLeft = 758
ExplicitTop = 0
Left = 440
ExplicitLeft = 440
end
end
inherited cxGrid: TcxGrid
Top = 50
Width = 813
Height = 418
ExplicitTop = 50
ExplicitWidth = 821
ExplicitHeight = 514
Width = 546
Height = 324
ExplicitWidth = 443
ExplicitHeight = 136
end
inherited TBXDock1: TTBXDock
Top = 24
Width = 813
ExplicitTop = 24
ExplicitWidth = 821
Width = 546
ExplicitWidth = 443
end
inherited cxLookupComboBox: TcxLookupComboBox
Style.IsFontAssigned = True
end
end
end
object pagCondiciones: TTabSheet
Caption = 'Condiciones'
ImageIndex = 2
ExplicitWidth = 443
ExplicitHeight = 208
object eCondiciones: TcxRichEdit
Left = 0
Top = 0
Align = alClient
Properties.ScrollBars = ssVertical
Lines.Strings = (
'eCondiciones')
TabOrder = 0
ExplicitWidth = 443
ExplicitHeight = 208
Height = 396
Width = 546
end
end
end
end

View File

@ -16,12 +16,13 @@ type
Label1: TLabel;
Label2: TLabel;
Label4: TLabel;
eCondiciones: TcxRichEdit;
ePlazosEntrega: TMemo;
eFormaPago: TMemo;
eObservaciones: TMemo;
pagCapitulo: TTabSheet;
frViewConfiguracionCapitulo: TfrViewConfiguracionCapitulo;
pagCondiciones: TTabSheet;
eCondiciones: TcxRichEdit;
public
class function GetViewClass : TClass; override;
class function DarEtiqueta : String; override;

View File

@ -1,33 +1,32 @@
inherited frViewConfiguracionDocObra: TfrViewConfiguracionDocObra
Width = 824
Height = 580
ExplicitWidth = 824
ExplicitHeight = 580
Width = 557
Height = 489
inherited Panel1: TPanel
Width = 814
Width = 547
TabOrder = 1
ExplicitWidth = 530
inherited Label3: TLabel
Width = 802
Width = 535
end
end
inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel
Width = 824
Width = 557
LabelCaption = 'Configuraci'#243'n de los documentos de obra'
TabOrder = 0
ExplicitWidth = 540
end
object paginas: TPageControl
Left = 0
Top = 68
Width = 824
Height = 512
Width = 557
Height = 421
ActivePage = pagNotas
Align = alClient
TabOrder = 2
ExplicitWidth = 451
ExplicitHeight = 236
object pagNotas: TTabSheet
Caption = 'Notas'
ExplicitLeft = 3
ExplicitWidth = 443
ExplicitHeight = 208
object Label1: TLabel
Left = 11
Top = 20
@ -49,17 +48,6 @@ inherited frViewConfiguracionDocObra: TfrViewConfiguracionDocObra
Height = 13
Caption = 'Observaciones:'
end
object eCondiciones: TcxRichEdit
Left = 11
Top = 368
Properties.ScrollBars = ssVertical
Lines.Strings = (
'eCondiciones')
TabOrder = 0
Visible = False
Height = 57
Width = 529
end
object ePlazosEntrega: TMemo
Left = 11
Top = 166
@ -68,7 +56,7 @@ inherited frViewConfiguracionDocObra: TfrViewConfiguracionDocObra
Ctl3D = True
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 1
TabOrder = 0
end
object eFormaPago: TMemo
Left = 11
@ -78,7 +66,7 @@ inherited frViewConfiguracionDocObra: TfrViewConfiguracionDocObra
Ctl3D = True
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 2
TabOrder = 1
end
object eObservaciones: TMemo
Left = 11
@ -88,17 +76,19 @@ inherited frViewConfiguracionDocObra: TfrViewConfiguracionDocObra
Ctl3D = True
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 3
TabOrder = 2
end
end
object pagCapitulo: TTabSheet
Caption = 'Cap'#237'tulo'
ImageIndex = 1
ExplicitWidth = 443
ExplicitHeight = 208
inline frViewConfiguracionCapitulo: TfrViewConfiguracionCapitulo
Left = 0
Top = 0
Width = 816
Height = 484
Width = 549
Height = 393
Align = alClient
BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET
@ -110,107 +100,85 @@ inherited frViewConfiguracionDocObra: TfrViewConfiguracionDocObra
ParentFont = False
TabOrder = 0
ReadOnly = False
ExplicitWidth = 824
ExplicitHeight = 580
ExplicitWidth = 443
ExplicitHeight = 208
inherited ToolBar1: TToolBar
Width = 816
Height = 24
ExplicitWidth = 816
ExplicitHeight = 24
inherited ToolButton4: TToolButton
Wrap = False
end
inherited ToolButton14: TToolButton
Left = 334
Top = 0
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox
Left = 368
Top = 0
ExplicitLeft = 368
ExplicitTop = 0
end
Width = 549
ExplicitWidth = 443
inherited FontSize: TEdit
Left = 513
Top = 0
ExplicitLeft = 513
ExplicitTop = 0
Width = 58
ExplicitWidth = 58
end
inherited UpDown1: TUpDown
Left = 555
Top = 0
ExplicitLeft = 555
ExplicitTop = 0
Left = 237
ExplicitLeft = 237
end
inherited ToolButton13: TToolButton
Left = 572
Top = 0
ExplicitLeft = 572
ExplicitTop = 0
Left = 254
ExplicitLeft = 254
end
inherited ToolButton6: TToolButton
Left = 580
Top = 0
ExplicitLeft = 580
ExplicitTop = 0
Left = 262
ExplicitLeft = 262
end
inherited ToolButton7: TToolButton
Left = 614
Top = 0
ExplicitLeft = 614
ExplicitTop = 0
Left = 296
ExplicitLeft = 296
end
inherited ToolButton8: TToolButton
Left = 648
Top = 0
ExplicitLeft = 648
ExplicitTop = 0
Left = 330
ExplicitLeft = 330
end
inherited ToolButton12: TToolButton
Left = 682
Top = 0
ExplicitLeft = 682
ExplicitTop = 0
Left = 364
ExplicitLeft = 364
end
inherited ToolButton9: TToolButton
Left = 690
Top = 0
ExplicitLeft = 690
ExplicitTop = 0
Left = 372
ExplicitLeft = 372
end
inherited ToolButton10: TToolButton
Left = 724
Top = 0
ExplicitLeft = 724
ExplicitTop = 0
Left = 406
ExplicitLeft = 406
end
inherited ToolButton11: TToolButton
Left = 758
Top = 0
ExplicitLeft = 758
ExplicitTop = 0
Left = 440
ExplicitLeft = 440
end
end
inherited cxGrid: TcxGrid
Top = 50
Width = 816
Height = 434
ExplicitTop = 50
ExplicitWidth = 824
ExplicitHeight = 530
Width = 549
Height = 321
ExplicitWidth = 443
ExplicitHeight = 136
end
inherited TBXDock1: TTBXDock
Top = 24
Width = 816
ExplicitTop = 24
ExplicitWidth = 824
Width = 549
ExplicitWidth = 443
end
inherited cxLookupComboBox: TcxLookupComboBox
Style.IsFontAssigned = True
end
end
end
object pagCondiciones: TTabSheet
Caption = 'Condiciones'
ImageIndex = 2
ExplicitWidth = 443
ExplicitHeight = 208
object eCondiciones: TcxRichEdit
Left = 0
Top = 0
Align = alClient
Properties.ScrollBars = ssVertical
Lines.Strings = (
'eCondiciones')
TabOrder = 0
ExplicitWidth = 443
ExplicitHeight = 208
Height = 393
Width = 549
end
end
end
end

View File

@ -16,12 +16,13 @@ type
Label1: TLabel;
Label2: TLabel;
Label4: TLabel;
eCondiciones: TcxRichEdit;
ePlazosEntrega: TMemo;
eFormaPago: TMemo;
eObservaciones: TMemo;
pagCapitulo: TTabSheet;
frViewConfiguracionCapitulo: TfrViewConfiguracionCapitulo;
pagCondiciones: TTabSheet;
eCondiciones: TcxRichEdit;
public
class function GetViewClass : TClass; override;
class function DarEtiqueta : String; override;

View File

@ -1,79 +1,108 @@
inherited frViewConfiguracionDocVarios: TfrViewConfiguracionDocVarios
Width = 913
Height = 669
object Label1: TLabel [0]
Left = 11
Top = 79
Width = 76
Height = 13
Caption = 'Forma de pago:'
end
object Label2: TLabel [1]
Left = 11
Top = 204
Width = 90
Height = 13
Caption = 'Plazos de entrega:'
end
object Label4: TLabel [2]
Left = 11
Top = 326
Width = 75
Height = 13
Caption = 'Observaciones:'
end
Width = 567
Height = 499
ExplicitWidth = 898
ExplicitHeight = 591
inherited Panel1: TPanel
Width = 903
TabOrder = 2
Width = 557
TabOrder = 1
ExplicitWidth = 530
inherited Label3: TLabel
Width = 891
Width = 545
end
end
inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel
Width = 913
Width = 567
LabelCaption = 'Configuraci'#243'n de los documentos de varios'
TabOrder = 0
ExplicitWidth = 540
end
object eCondiciones: TcxRichEdit
Left = 11
Top = 448
Properties.ScrollBars = ssVertical
Lines.Strings = (
'eCondiciones')
TabOrder = 0
Visible = False
Height = 57
Width = 529
end
object ePlazosEntrega: TMemo
Left = 11
Top = 225
Width = 529
Height = 90
Ctl3D = True
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 3
end
object eFormaPago: TMemo
Left = 11
Top = 100
Width = 529
Height = 90
Ctl3D = True
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 4
end
object eObservaciones: TMemo
Left = 11
Top = 346
Width = 529
Height = 90
Ctl3D = True
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 5
object PageControl1: TPageControl
Left = 0
Top = 68
Width = 567
Height = 431
ActivePage = pagNotas
Align = alClient
TabOrder = 2
ExplicitWidth = 898
ExplicitHeight = 523
object pagNotas: TTabSheet
Caption = 'Notas'
ExplicitWidth = 890
ExplicitHeight = 495
object Label1: TLabel
Left = 11
Top = 13
Width = 76
Height = 13
Caption = 'Forma de pago:'
end
object Label2: TLabel
Left = 11
Top = 138
Width = 90
Height = 13
Caption = 'Plazos de entrega:'
end
object Label4: TLabel
Left = 11
Top = 260
Width = 75
Height = 13
Caption = 'Observaciones:'
end
object ePlazosEntrega: TMemo
Left = 11
Top = 159
Width = 529
Height = 90
Ctl3D = True
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 0
end
object eFormaPago: TMemo
Left = 11
Top = 34
Width = 529
Height = 90
Ctl3D = True
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 1
end
object eObservaciones: TMemo
Left = 11
Top = 280
Width = 529
Height = 90
Ctl3D = True
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 2
end
end
object pagCondiciones: TTabSheet
Caption = 'Condiciones'
ImageIndex = 1
ExplicitWidth = 890
ExplicitHeight = 495
object eCondiciones: TcxRichEdit
Left = 0
Top = 0
Align = alClient
Properties.ScrollBars = ssVertical
Lines.Strings = (
'eCondiciones')
TabOrder = 0
ExplicitLeft = 11
ExplicitTop = 372
ExplicitWidth = 529
ExplicitHeight = 57
Height = 403
Width = 559
end
end
end
end

View File

@ -5,17 +5,21 @@ interface
uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, uViewConfiguracionBase, cxControls, cxContainer, cxEdit, cxTextEdit, cxMemo,
cxRichEdit, uViewBase, JvExControls, JvGradientHeaderPanel, StdCtrls, ExtCtrls;
cxRichEdit, uViewBase, JvExControls, JvGradientHeaderPanel, StdCtrls, ExtCtrls,
ComCtrls;
type
TfrViewConfiguracionDocVarios = class(TfrViewConfiguracionBase)
eCondiciones: TcxRichEdit;
ePlazosEntrega: TMemo;
eFormaPago: TMemo;
eObservaciones: TMemo;
PageControl1: TPageControl;
pagNotas: TTabSheet;
pagCondiciones: TTabSheet;
Label1: TLabel;
Label2: TLabel;
Label4: TLabel;
ePlazosEntrega: TMemo;
eFormaPago: TMemo;
eObservaciones: TMemo;
eCondiciones: TcxRichEdit;
public
class function GetViewClass : TClass; override;
class function DarEtiqueta : String; override;

View File

@ -273,7 +273,7 @@ begin
DAPropiedades.DataTable.Locate(fld_PropiedadesDESCRIPCION, cxGridViewPROPIEDAD.DataBinding.Field.AsVariant,[]);
if (ARecord.DisplayTexts[cxGridViewTIPO.Index] = TIPO_DETALLE_CONCEPTO)
and ((ARecord.DisplayTexts[cxGridViewTIPO_ARTICULO.Index] <> TIPO_CAPITULO_C_VACIO)) then
and (ARecord.DisplayTexts[cxGridViewPROPIEDAD.Index] <> '') then
AProperties := cxLookupComboBox1.Properties
else
AProperties := cxRichEdit1.Properties;

View File

@ -174,6 +174,7 @@ begin
ADetalles.REFERENCIA := AArticulos.REFERENCIA;
ADetalles.ID_ARTICULO := AArticulos.ID_ARTICULO;
ADetalles.TIPO_ARTICULO := AArticulos.TIPO_ARTICULO;
ADetalles.PROPIEDAD := AArticulos.PROPIEDAD;
ADetalles.CONCEPTO := AArticulos.CONCEPTO;
if not AArticulos.CANTIDADIsNull then
ADetalles.CANTIDAD := AArticulos.CANTIDAD;

View File

@ -60,7 +60,12 @@ begin
ADataSet.Open;
if ADataSet.Dataset.RecordCount > 0 then
begin
if CODIGO = 'CONDICIONES_COCINA' then
if ((CODIGO = 'CONDICIONES_COCINA') OR
(CODIGO = 'CONDICIONES_ARMARIO') OR
(CODIGO = 'CONDICIONES_BANO') OR
(CODIGO = 'CONDICIONES_ELECTRODOMESTICO') OR
(CODIGO = 'CONDICIONES_OBRA') OR
(CODIGO = 'CONDICIONES_VARIOS')) then
Result := ADataSet.Dataset.Fields[1].AsVariant
else
Result := ADataSet.Dataset.Fields[0].AsVariant
@ -114,19 +119,18 @@ begin
ParamByName('CODIGO').Value := CODIGO;
ParamByName('VALOR').Value := Valor;
if CODIGO = 'CONDICIONES_COCINA' then
//Las condiciones se guardan en el valor bolb en lugar del varchar
if ((CODIGO = 'CONDICIONES_COCINA') OR
(CODIGO = 'CONDICIONES_ARMARIO') OR
(CODIGO = 'CONDICIONES_BANO') OR
(CODIGO = 'CONDICIONES_ELECTRODOMESTICO') OR
(CODIGO = 'CONDICIONES_OBRA') OR
(CODIGO = 'CONDICIONES_VARIOS')) then
begin
// st := TStringStream.Create(Valor);
// st.Position := 0;
// st2 := TROStream.create(st, true);
//
//
// ParamByName('VALOR_BLOB').LoadFromStream(st2);
ParamByName('VALOR').Value := Null;
ParamByName('VALOR_BLOB').Value := Valor;
end;
// ParamByName('ID_EMPRESA').Value := Null;
Execute;
ACurrentConn.CommitTransaction;
end;

View File

@ -28,7 +28,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType/>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">9</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.4.9.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.4.9.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 22 de mayo de 2012 11:18</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">5</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.5.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.5.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 23 de mayo de 2012 13:56</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>

View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico"
1 VERSIONINFO
FILEVERSION 2,4,9,0
PRODUCTVERSION 2,4,9,0
FILEVERSION 2,5,0,0
PRODUCTVERSION 2,5,0,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4"
BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0"
VALUE "FileVersion", "2.4.9.0\0"
VALUE "FileVersion", "2.5.0.0\0"
VALUE "ProductName", "FactuGES (Servidor)\0"
VALUE "ProductVersion", "2.4.9.0\0"
VALUE "CompileDate", "miércoles, 23 de mayo de 2012 13:56\0"
VALUE "ProductVersion", "2.5.0.0\0"
VALUE "CompileDate", "jueves, 21 de junio de 2012 19:00\0"
END
END
BLOCK "VarFileInfo"

Binary file not shown.