Merge branch 'master' of codecrew.fi:bortal

Conflicts:
	code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties

code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave.java

@@ -54,9 +54,6 @@ public class FoodWave extends GenericEntity {
     @OneToMany(mappedBy = "foodwave")
     @OneToMany(mappedBy = "foodwave")
     private List<BillLine> billLines;
     private List<BillLine> billLines;
 
 
-    @OneToMany(mappedBy = "foodwave")
-    private List<BillLine> unpaidBills;
-
     @ManyToOne
     @ManyToOne
     @JoinColumn(name = "template_id", referencedColumnName = "id", nullable = false)
     @JoinColumn(name = "template_id", referencedColumnName = "id", nullable = false)
     private FoodWaveTemplate template;
     private FoodWaveTemplate template;
@@ -197,12 +194,4 @@ public class FoodWave extends GenericEntity {
         this.maximumFoods = maximumFoods;
         this.maximumFoods = maximumFoods;
     }
     }
 
 
-    public List<BillLine> getUnpaidBills() {
-        return unpaidBills;
-    }
-
-    public void setUnpaidBills(List<BillLine> unpaidBills) {
-        this.unpaidBills = unpaidBills;
-    }
-
 }
 }

code/LanBortalWeb/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml

-<root>
-  <facet id="jst.jsf">
-    <node name="libprov">
-      <attribute name="provider-id" value="jsf-no-op-library-provider"/>
-    </node>
-  </facet>
-</root>
+<root>
+  <facet id="jst.jsf">
+    <node name="libprov">
+      <attribute name="provider-id" value="jsf-no-op-library-provider"/>
+    </node>
+  </facet>
+</root>

code/LanBortalWeb/WebContent/foodmanager/listFoodwaves.xhtml

@@ -56,7 +56,7 @@
 					<f:facet name="header">
 					<f:facet name="header">
 						<h:outputText value="${i18n['foodWave.unconfirmedOrders']}" />
 						<h:outputText value="${i18n['foodWave.unconfirmedOrders']}" />
 					</f:facet>
 					</f:facet>
-					<h:outputText value="#{foodwave.unpaidBills.size()}" />
+					<h:outputText value="#{foodwave.billLines.size()}" />
 				</p:column>
 				</p:column>
 				<p:column>
 				<p:column>
 					<f:facet name="header">
 					<f:facet name="header">