Commit 86c4af24 by System Administrator

Pikkuviilauksia

1 parent 77536a37
......@@ -38,6 +38,9 @@ public class AccessRight implements ModelInterface {
@Column(name = "right_name", nullable = false)
private String name;
/**
* Decribes the access right...
*/
@Lob
@Column(name = "right_description")
private String description;
......@@ -48,9 +51,11 @@ public class AccessRight implements ModelInterface {
@OneToMany(mappedBy = "accessRight")
private List<RoleRight> roleRights;
@Override
public Integer getId() {
return id;
}
@Override
......
......@@ -47,7 +47,7 @@ public class BillLine implements ModelInterface {
@Column(name = "unit_price", nullable = false, precision=24,scale=4)
private BigDecimal unitPrice;
@Column(name = "vat", nullable = false,precision=3,scale=2)
@Column(name = "vat", nullable = false,precision=3,scale=2, columnDefinition = "numeric(3,2) default 0.22")
private BigDecimal vat=DEFAULT_VAT;
@JoinColumn(name = "bills_id", referencedColumnName = "bills_id")
......
......@@ -25,7 +25,7 @@ import javax.persistence.Version;
*/
@Entity
@Table(name = "discount_instances")
@NamedQueries( { @NamedQuery(name = "DiscountInstance.findAll", query = "SELECT d FROM DiscountInstance d"), })
@NamedQueries( { @NamedQuery(name = "DiscountInstance.findAll", query = "SELECT d FROM DiscountInstance d") })
public class DiscountInstance implements ModelInterface {
private static final long serialVersionUID = 1L;
......
......@@ -6,10 +6,10 @@
version="2.0">
<application>
<resource-bundle>
<base-name>resources.i18n</base-name>
<base-name>i18n</base-name>
<var>i18n</var>
</resource-bundle>
<message-bundle>i18n</message-bundle>
<message-bundle>resources.i18n</message-bundle>
<!-- Legal Country codes: http://www.iso.org/iso/country_codes/iso_3166_code_lists/english_country_names_and_code_elements.htm -->
<!-- Assigned Country codes: -->
<!-- Insomnia: IN (INDIA) -->
......
......@@ -22,7 +22,7 @@
<a href="http://www.insomnia.fi">www.insomnia.fi</a>
</ui:insert>
</div>
<div id="logo"><h1><ui:insert name="globaltitle">Y<span>ks </span>P<span>ikku </span>J<span>uttu </span></ui:insert></h1></div>
<div id="logo"><h1><ui:insert name="globaltitle">Lan Bortal</ui:insert></h1></div>
<div id="menu">
<ui:insert name="toplinks"><ui:include src="/layout/toplinks.xhtml" /></ui:insert>
......
......@@ -14,7 +14,7 @@
<ui:define name="content">
<h:form>
<h:panelGrid comlumns="2">
<h:panelGrid columns="2">
<h:outputLabel value="Nick:" /><h:inputText value="#{userView.nick}" />
<h:outputLabel value="Password:" /><h:inputSecret value="#{userView.password}" />
<h:commandButton action="#{userView.createUser()}" value="Create" />
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!