diff --git a/print/templates/reports/buy-label/sql/buy.sql b/print/templates/reports/buy-label/sql/buy.sql
index 72765baa97..26efeb06ef 100644
--- a/print/templates/reports/buy-label/sql/buy.sql
+++ b/print/templates/reports/buy-label/sql/buy.sql
@@ -22,7 +22,7 @@ labels AS (
 			b.id,
 			b.itemFk,
 			p.name producer,
-			IF(i2.id, i2.comment, i.comment) comment
+			IFNULL(i2.comment, i.comment) comment
 		FROM buy b
 			JOIN item i ON i.id = b.itemFk
 			LEFT JOIN producer p ON p.id = i.producerFk
diff --git a/print/templates/reports/entry-order/entry-order.html b/print/templates/reports/entry-order/entry-order.html
index 420ccee9b9..e5d3bfb6de 100644
--- a/print/templates/reports/entry-order/entry-order.html
+++ b/print/templates/reports/entry-order/entry-order.html
@@ -20,7 +20,7 @@
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase padding nowrap">{{$t('ref')}}</td>
-                                    <th>{{entry.invoiceNumber || '---'}}</th>
+                                    <th>{{entry.invoiceNumber | dashIfEmpty}}</th>
                                 </tr>
                             </tbody>
                         </table>
@@ -59,7 +59,7 @@
                         <td class="number">{{buy.stickers}}</td>
                         <td width="5%" class="number">x</td>
                         <td class="number">{{buy.packing}}</td>
-                        <td width="40%" class="nowrap">{{buy.itemName}}</td>
+                        <td width="40%" class="nowrap">{{buy.name}}</td>
                         <td width="10%">{{buy.comment}}</td>
                         <td width="10%" class="font light-gray tags">
                             <span v-if="buy.value5" class="nowrap"><strong>{{buy.tag5}} → </strong>{{buy.value5}} </span>
diff --git a/print/templates/reports/entry-order/sql/buys.sql b/print/templates/reports/entry-order/sql/buys.sql
index b0f414a9db..92c055483c 100644
--- a/print/templates/reports/entry-order/sql/buys.sql
+++ b/print/templates/reports/entry-order/sql/buys.sql
@@ -3,8 +3,8 @@ SELECT b.itemFk,
 		b.buyingValue,
 		b.stickers,
 		b.packing,
-		i.name itemName,
-		IF(i2.id, i2.comment, i.comment) comment,
+		i.name,
+		IFNULL(i2.comment, i.comment) comment,
 		i.tag5,
 		i.value5,
 		i.tag6,