From b1f1feda483f1743be28336ec6be44423f8b56a6 Mon Sep 17 00:00:00 2001
From: jekkos <jeroen.peelaerts@gmail.com>
Date: Wed, 1 Jul 2015 08:29:53 +0200
Subject: [PATCH] Show alternative description on invoice only if not empty

---
 application/views/sales/invoice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/sales/invoice.php b/application/views/sales/invoice.php
index fc146f8cc..3e5038acd 100755
--- a/application/views/sales/invoice.php
+++ b/application/views/sales/invoice.php
@@ -75,7 +75,7 @@ if (isset($error_message))
 		?>
 			<tr class="item-row">
 				<td><?php echo $item['item_number']; ?></td>
-				<td class="item-name"><textarea rows="5" cols="6" class='long_name'><?php echo $item['is_serialized'] ? $item['description'] : $item['name']; ?></textarea></td>
+				<td class="item-name"><textarea rows="5" cols="6" class='long_name'><?php echo $item['is_serialized'] || $item['allow_alt_description'] && !empty($item['description']) ? $item['description'] : $item['name']; ?></textarea></td>
 				<td style='text-align:center;'><textarea rows="5" cols="6"><?php echo $item['quantity']; ?></textarea></td>
 				<td><textarea rows="5" cols="6"><?php echo to_currency($item['price']); ?></textarea></td>
 				<td style='text-align:center;'><textarea rows="5" cols="6"><?php echo $item['discount'] .'%'; ?></textarea></td>