Skip to content

Commit

Permalink
Merge pull request #45 from kplian/master
Browse files Browse the repository at this point in the history 
kplian -> boa
  • Loading branch information
@rchumacero
rchumacero authored Nov 30, 2017
2 parents c9343fc + 89a1b60 commit 6f2dead
Show file tree
Hide file tree
Showing 9 changed files with 131 additions and 34 deletions.
12 changes: 6 additions & 6 deletions base/funciones/kaf.ft_activo_fijo_sel.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,8 @@ BEGIN
from kaf.tactivo_fijo afij
inner join segu.tusuario usu1 on usu1.id_usuario = afij.id_usuario_reg
left join segu.tusuario usu2 on usu2.id_usuario = afij.id_usuario_mod
inner join param.tcatalogo cat1 on cat1.id_catalogo = afij.id_cat_estado_fun
inner join param.tcatalogo cat2 on cat2.id_catalogo = afij.id_cat_estado_compra
left join param.tcatalogo cat1 on cat1.id_catalogo = afij.id_cat_estado_fun
left join param.tcatalogo cat2 on cat2.id_catalogo = afij.id_cat_estado_compra
inner join kaf.tclasificacion cla on cla.id_clasificacion = afij.id_clasificacion
left join param.vcentro_costo cc on cc.id_centro_costo = afij.id_centro_costo
inner join param.tdepto dpto on dpto.id_depto = afij.id_depto
Expand Down Expand Up @@ -472,8 +472,8 @@ BEGIN
uo.nombre_cargo
from kaf.tactivo_fijo afij
inner join segu.tusuario usu1 on usu1.id_usuario = afij.id_usuario_reg
inner join param.tcatalogo cat1 on cat1.id_catalogo = afij.id_cat_estado_fun
inner join param.tcatalogo cat2 on cat2.id_catalogo = afij.id_cat_estado_compra
left join param.tcatalogo cat1 on cat1.id_catalogo = afij.id_cat_estado_fun
left join param.tcatalogo cat2 on cat2.id_catalogo = afij.id_cat_estado_compra
inner join kaf.tclasificacion cla on cla.id_clasificacion = afij.id_clasificacion
inner join param.tdepto dpto on dpto.id_depto = afij.id_depto
inner join param.tmoneda mon on mon.id_moneda = afij.id_moneda_orig
Expand Down Expand Up @@ -532,8 +532,8 @@ BEGIN
v_consulta:='select count(afij.id_activo_fijo)
from kaf.tactivo_fijo afij
inner join segu.tusuario usu1 on usu1.id_usuario = afij.id_usuario_reg
inner join param.tcatalogo cat1 on cat1.id_catalogo = afij.id_cat_estado_fun
inner join param.tcatalogo cat2 on cat2.id_catalogo = afij.id_cat_estado_compra
left join param.tcatalogo cat1 on cat1.id_catalogo = afij.id_cat_estado_fun
left join param.tcatalogo cat2 on cat2.id_catalogo = afij.id_cat_estado_compra
inner join kaf.tclasificacion cla on cla.id_clasificacion = afij.id_clasificacion
inner join param.tdepto dpto on dpto.id_depto = afij.id_depto
inner join param.tmoneda mon on mon.id_moneda = afij.id_moneda_orig
Expand Down
3 changes: 3 additions & 0 deletions control/ACTReportes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,9 @@ function definirFiltros() {
if($this->objParam->getParametro('fecha_compra_max')!=''){
$this->objParam->addFiltro("afij.fecha_compra <= ''".$this->objParam->getParametro('fecha_compra_max')."''");
}
if($this->objParam->getParametro('nro_cbte_asociado')!=''){
$this->objParam->addFiltro("afij.nro_cbte_asociado = ''".$this->objParam->getParametro('nro_cbte_asociado')."''");
}
}

function ReporteRespInventario(){
Expand Down
74 changes: 53 additions & 21 deletions vista/reportes/ParametrosBase.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,15 @@
data: []
}),
valueField: 'key',
displayField: 'value'
displayField: 'value',
style: this.setBackgroundColor('cmbResponsable')
});
this.dteFechaDesde = new Ext.form.DateField({
id: this.idContenedor+'_dteFechaDesde',
fieldLabel: 'Fecha',
vtype: 'daterange',
endDateField: this.idContenedor+'_dteFechaHasta'
endDateField: this.idContenedor+'_dteFechaHasta',
style: this.setBackgroundColor('dteFechaDesde')
});
this.lblDesde = new Ext.form.Label({
text: 'Desde: '
Expand All @@ -53,7 +55,8 @@
id: this.idContenedor+'_dteFechaHasta',
fieldLabel: 'Hasta',
vtype: 'daterange',
startDateField: this.idContenedor+'_dteFechaDesde'
startDateField: this.idContenedor+'_dteFechaDesde',
style: this.setBackgroundColor('dteFechaHasta')
});
this.lblHasta = new Ext.form.Label({
text: 'Hasta: '
Expand Down Expand Up @@ -90,7 +93,8 @@
pageSize: 15,
queryDelay: 1000,
anchor: '100%',
minChars: 2
minChars: 2,
style: this.setBackgroundColor('cmbClasificacion')
});
this.cmbActivo = new Ext.form.ComboBox({
fieldLabel: 'Activo Fijo',
Expand Down Expand Up @@ -123,20 +127,24 @@
anchor: '100%',
minChars: 2,
tpl:'<tpl for="."><div class="x-combo-list-item"><p><b>Código:</b> {codigo}</p><p>{denominacion}</p> </div></tpl>',
style: this.setBackgroundColor('cmbActivo')
});
this.txtDenominacion = new Ext.form.TextField({
fieldLabel: 'Denominación',
width: '100%'
width: '100%',
style: this.setBackgroundColor('txtDenominacion')
});
this.dteFechaCompra = new Ext.form.DateField({
fieldLabel: 'Fecha Compra Inf.',
//format: 'd/m/Y',
dateFormat:'Y-m-d'
dateFormat:'Y-m-d',
style: this.setBackgroundColor('dteFechaCompra')
});
this.dteFechaCompraMax = new Ext.form.DateField({
fieldLabel: 'Fecha Compra Sup.',
//format: 'd/m/Y',
dateFormat:'Y-m-d'
dateFormat:'Y-m-d',
style: this.setBackgroundColor('dteFechaCompraMax')
});
this.lblFechaCompraInf = new Ext.form.Label({
text: '>= '
Expand All @@ -151,6 +159,7 @@
this.dteFechaIniDep = new Ext.form.DateField({
fieldLabel: 'Fecha Ini.Dep.',
format: 'd/m/Y',
style: this.setBackgroundColor('dteFechaIniDep')
});
this.cmbEstado = new Ext.form.ComboBox({
fieldLabel: 'Estado',
Expand Down Expand Up @@ -183,16 +192,19 @@
pageSize:10,
queryDelay:1000,
width:250,
minChars:2
minChars:2,
style: this.setBackgroundColor('cmbEstado')
});
this.cmbCentroCosto = new Ext.form.ComboBox({
fieldLabel: 'Centro Costo',
anchor: '100%'
anchor: '100%',
style: this.setBackgroundColor('cmbCentroCosto')
});
this.txtUbicacionFisica = new Ext.form.TextField({
fieldLabel: 'Ubicación Física',
width: '100%',
maxLength: 1000
maxLength: 1000,
style: this.setBackgroundColor('txtUbicacionFisica')
});
this.cmbOficina = new Ext.form.ComboBox({
fieldLabel: 'Oficina',
Expand All @@ -219,8 +231,10 @@
mode: 'remote',
pageSize: 15,
queryDelay: 1000,
minChars: 2
minChars: 2,
style: this.setBackgroundColor('cmbOficina')
});

this.cmbResponsable = new Ext.form.ComboBox({
fieldLabel: 'Responsable',
anchor: '100%',
Expand All @@ -240,6 +254,7 @@
baseParams: {par_filtro:'desc_funcionario1#email_empresa#codigo#nombre_cargo'}

}),
style: this.setBackgroundColor('cmbResponsable'),
valueField: 'id_funcionario',
displayField: 'desc_funcionario1',
tpl: '<tpl for="."><div class="x-combo-list-item"><p><b>{desc_funcionario1}</b></p><p>{codigo}</p><p>{nombre_cargo}</p><p>{email_empresa}</p><p>{oficina_nombre} - {lugar_nombre}</p> </div></tpl>',
Expand All @@ -256,19 +271,23 @@
});
this.txtObservaciones = new Ext.form.TextField({
fieldLabel: 'Observaciones',
width: '100%'
width: '100%',
style: this.setBackgroundColor('txtObservaciones')
});
this.cmbUnidSolic = new Ext.form.ComboBox({
fieldLabel: 'Unidad Solicitante',
anchor: '100%'
anchor: '100%',
style: this.setBackgroundColor('cmbUnidSolic')
});
this.cmbResponsableCompra = new Ext.form.ComboBox({
fieldLabel: 'Responsable Compra',
anchor: '100%'
anchor: '100%',
style: this.setBackgroundColor('cmbResponsableCompra')
});
this.cmbLugar = new Ext.form.ComboBox({
fieldLabel: 'Lugar',
anchor: '100%'
anchor: '100%',
style: this.setBackgroundColor('cmbLugar')
});
this.radGroupTangible = new Ext.form.RadioGroup({
fieldLabel: '1',
Expand Down Expand Up @@ -328,7 +347,8 @@
pageSize: 10,
queryDelay: 1000,
gwidth: 250,
minChars: 2
minChars: 2,
style: this.setBackgroundColor('cmbDepto')
});
this.cmbDeposito = new Ext.form.ComboBox({
fieldLabel: 'Deposito',
Expand Down Expand Up @@ -356,7 +376,8 @@
pageSize: 15,
queryDelay: 1000,
gwidth: 150,
minChars: 2
minChars: 2,
style: this.setBackgroundColor('cmbDeposito')
});

this.cmbMoneda = new Ext.form.ComboBox({
Expand Down Expand Up @@ -386,22 +407,25 @@
queryDelay: 1000,
gwidth: 150,
minChars: 2,
allowBlank: false
allowBlank: false,
style: this.setBackgroundColor('cmbMoneda')
});
//Para el rango de montos
this.lblMontoInf = new Ext.form.Label({
text: '>= '
});
this.txtMontoInf = new Ext.form.NumberField({
allowDecimals: true,
decimalPrecision: 2
decimalPrecision: 2,
style: this.setBackgroundColor('txtMontoInf')
});
this.lblMontoSup = new Ext.form.Label({
text: 'y <= '
});
this.txtMontoSup = new Ext.form.NumberField({
allowDecimals: true,
decimalPrecision: 2
decimalPrecision: 2,
style: this.setBackgroundColor('txtMontoSup')
});
this.cmpMontos = new Ext.form.CompositeField({
fieldLabel: 'Importe Compra ',
Expand All @@ -410,7 +434,8 @@
//Num. C31
this.txtNroCbteAsociado = new Ext.form.TextField({
fieldLabel: 'C31',
width: '100%'
width: '100%',
style: this.setBackgroundColor('txtNroCbteAsociado')
});
//Depreciación: totales o totales + detalle
this.radGroupDeprec = new Ext.form.RadioGroup({
Expand Down Expand Up @@ -707,6 +732,13 @@
nomRep = Phx.CP.CRIPT.Encriptar(nomRep);
}
window.open('../../../lib/lib_control/Intermediario.php?r='+nomRep+'&t='+new Date().toLocaleTimeString())
},
setBackgroundColor: function(elm){
return String.format('background-color: {0}; background-image: none;', this.setPersonalBackgroundColor(elm));
},
setPersonalBackgroundColor: function(elm){
//Para sobreescribir
return '#FFF';
}
});
</script>
14 changes: 13 additions & 1 deletion vista/reportes/ParametrosRepAsignados.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
this.claseReporte = 'ReporteAsignados';
this.titleReporte = 'Reportes asignados';
},
definirBackground: function(){
this.Atributos[0].config.style = 'background-color: #ddd; background-image: none;';
},
definirParametros: function(report){
this.inicializarParametros();

Expand Down Expand Up @@ -108,7 +111,16 @@
repOficina: this.repOficina
}
return params;
}
},
setPersonalBackgroundColor: function(elm){
//Para sobreescribir
var color='#FFF',
obligatorio='#ffffb3';
if(elm=='cmbResponsable'){
color = obligatorio;
}
return color;
}

}
</script>
12 changes: 11 additions & 1 deletion vista/reportes/ParametrosRepDepreciacion.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,17 @@
repOficina: this.repOficina
}
return params;
}
},
setPersonalBackgroundColor: function(elm){
//Para sobreescribir
var color='#FFF',
obligatorio='#ffffb3';

if(elm=='dteFechaHasta'||elm=='cmbMoneda'){
color = obligatorio;
}
return color;
}

}
</script>
12 changes: 11 additions & 1 deletion vista/reportes/ParametrosRepEnDeposito.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,17 @@
repDeposito: this.repDeposito
}
return params;
}
},
setPersonalBackgroundColor: function(elm){
//Para sobreescribir
var color='#FFF',
obligatorio='#ffffb3';

if(elm=='cmbDeposito'){
color = obligatorio;
}
return color;
}

}
</script>
13 changes: 11 additions & 2 deletions vista/reportes/ParametrosRepKardex.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
this.configElement(this.dteFechaHasta,true,false);
this.configElement(this.cmbActivo,true,false);

this.configElement(this.cmbClasificacion,true,true);
this.configElement(this.cmbClasificacion,false,true);
this.configElement(this.txtDenominacion,false,true);
this.configElement(this.dteFechaCompra,false,true);
this.configElement(this.dteFechaIniDep,false,true);
Expand Down Expand Up @@ -108,7 +108,16 @@
repDeposito: this.repDeposito
}
return params;
}
},
setPersonalBackgroundColor: function(elm){
//Para sobreescribir
var color='#FFF',
obligatorio='#ffffb3';
if(elm=='dteFechaDesde'||elm=='dteFechaHasta'||elm=='cmbActivo'||elm=='cmbMoneda'){
color = obligatorio;
}
return color;
}

}
</script>
12 changes: 11 additions & 1 deletion vista/reportes/ParametrosRepRespInventario.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,17 @@
repOficina: this.repOficina
}
return params;
}
},
setPersonalBackgroundColor: function(elm){
//Para sobreescribir
var color='#FFF',
obligatorio='#ffffb3';

if(elm=='cmbResponsable'||elm=='cmbDepto'){
color = obligatorio;
}
return color;
}

}
</script>
Loading

0 comments on commit 6f2dead

Please sign in to comment.