rodrigo 2013-03-01 19:06:07 +00:00
parent 621b3d7e21
commit 73740b7b78
4 changed files with 219 additions and 217 deletions

View File

@ -101,7 +101,7 @@
<classpathentry kind="lib" path="/LibreriasAdmVenta/jasperreports-4.5.0.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/jasperreports-4.5.0.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/jfreechart-1.0.12.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/jfreechart-1.0.12.jar"/>
<classpathentry kind="lib" path="/LibreriasAdmVenta/poi-3.8-20120326.jar"/> <classpathentry kind="lib" path="/LibreriasAdmVenta/poi-3.8-20120326.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre6">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="JBoss 6.x Runtime"/> <runtime name="JBoss 6.0 Runtime"/>
<fixed facet="jst.utility"/> <fixed facet="jst.utility"/>
<fixed facet="java"/> <fixed facet="java"/>
<installed facet="java" version="1.6"/> <installed facet="java" version="1.6"/>

View File

@ -29,7 +29,7 @@ import javax.persistence.SequenceGenerator;
@SequenceGenerator(name = "CATEGORIA_SEQ", sequenceName = "CATEGORIA_SEQ", allocationSize = 1) @SequenceGenerator(name = "CATEGORIA_SEQ", sequenceName = "CATEGORIA_SEQ", allocationSize = 1)
@Table(name = "CATEGORIA") @Table(name = "CATEGORIA")
public class Categoria implements Serializable { public class Categoria implements Serializable {
public static Integer CATEGORIA_NORMAL = 1;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false) @Basic(optional = false)
@ -141,7 +141,8 @@ public class Categoria implements Serializable {
@Override @Override
public boolean equals(Object object) { public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set // TODO: Warning - this method won't work in the case the id fields are
// not set
if (!(object instanceof Categoria)) { if (!(object instanceof Categoria)) {
return false; return false;
} }

View File

@ -57,6 +57,7 @@ public class CategoriaCtrlServiceImpl implements CategoriaCtrlService {
/** /**
* Verifica se existe la categoria adulto. Sino existe, la adicciona. * Verifica se existe la categoria adulto. Sino existe, la adicciona.
*
* @param categoriaCtrl * @param categoriaCtrl
*/ */
private void checarCategoriaAdulto(CategoriaCtrl categoriaCtrl) { private void checarCategoriaAdulto(CategoriaCtrl categoriaCtrl) {
@ -118,7 +119,6 @@ public class CategoriaCtrlServiceImpl implements CategoriaCtrlService {
entidad.setFecmodif(Calendar.getInstance().getTime()); entidad.setFecmodif(Calendar.getInstance().getTime());
entidad.setActivo(Boolean.FALSE); entidad.setActivo(Boolean.FALSE);
categoriaCtrlDAO.actualizacion(entidad); categoriaCtrlDAO.actualizacion(entidad);
} }
@ -154,6 +154,7 @@ public class CategoriaCtrlServiceImpl implements CategoriaCtrlService {
cd.setFecmodif(new java.util.Date()); cd.setFecmodif(new java.util.Date());
cd.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); cd.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId());
cd.setIndAplicaFeriado(CategoriaDescuento.DisponibilidadeFeriado.GERARSEMPRE.valor());
return cd; return cd;
} }