diff --git a/src/main/webapp/WEB-INF/reports/order.jasper b/src/main/webapp/WEB-INF/reports/order.jasper
index add4a2e7..fc9bb6cd 100644
Binary files a/src/main/webapp/WEB-INF/reports/order.jasper and b/src/main/webapp/WEB-INF/reports/order.jasper differ
diff --git a/src/main/webapp/WEB-INF/reports/order.jrxml b/src/main/webapp/WEB-INF/reports/order.jrxml
index ffaaf19e..0561e57d 100644
--- a/src/main/webapp/WEB-INF/reports/order.jrxml
+++ b/src/main/webapp/WEB-INF/reports/order.jrxml
@@ -2,201 +2,94 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -337,12 +230,12 @@
-
+
-
+
@@ -368,9 +261,9 @@
-
+
-
+
@@ -378,7 +271,7 @@
-
+
@@ -413,11 +306,16 @@
-
+
-
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/reports/orderItems.jasper b/src/main/webapp/WEB-INF/reports/orderItems.jasper
index c172fe8f..2ad94d32 100644
Binary files a/src/main/webapp/WEB-INF/reports/orderItems.jasper and b/src/main/webapp/WEB-INF/reports/orderItems.jasper differ
diff --git a/src/main/webapp/WEB-INF/reports/orderItems.jrxml b/src/main/webapp/WEB-INF/reports/orderItems.jrxml
index 7e940561..b1adf29d 100644
--- a/src/main/webapp/WEB-INF/reports/orderItems.jrxml
+++ b/src/main/webapp/WEB-INF/reports/orderItems.jrxml
@@ -1,44 +1,22 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -85,13 +63,13 @@
-
+
-
+
-
+
@@ -115,7 +93,7 @@
-
+
@@ -128,14 +106,14 @@
-
+
-
+
@@ -159,7 +137,7 @@
-
+
@@ -167,7 +145,7 @@
-
+
@@ -191,7 +169,7 @@
-
+
@@ -227,7 +205,7 @@
-
+