From c3150efad567ee87c5523700bebd128c8a1893d5 Mon Sep 17 00:00:00 2001
From: WebShells <Admin@WShells.ws>
Date: Mon, 30 Nov 2020 23:23:25 +0200
Subject: [PATCH] Minor changes

divs and tds fixing
---
 application/views/sales/invoice.php          | 51 +++++++++----------
 application/views/sales/invoice_email.php    | 20 +++-----
 application/views/sales/quote.php            | 38 +++++++-------
 application/views/sales/quote_email.php      |  6 +--
 application/views/sales/tax_invoice.php      | 53 +++++++++-----------
 application/views/sales/work_order.php       | 36 ++++++-------
 application/views/sales/work_order_email.php |  6 +--
 7 files changed, 98 insertions(+), 112 deletions(-)

diff --git a/application/views/sales/invoice.php b/application/views/sales/invoice.php
index 6d7dc04af..c62e4c43f 100755
--- a/application/views/sales/invoice.php
+++ b/application/views/sales/invoice.php
@@ -83,15 +83,15 @@ $(document).ready(function()
 		<table id="meta">
 			<tr>
 				<td class="meta-head"><?php echo $this->lang->line('sales_invoice_number');?> </td>
-				<td><div><?php echo $invoice_number; ?></div></td>
+				<td><?php echo $invoice_number; ?></td>
 			</tr>
 			<tr>
 				<td class="meta-head"><?php echo $this->lang->line('common_date'); ?></td>
-				<td><div><?php echo $transaction_date; ?></div></td>
+				<td><?php echo $transaction_date; ?></td>
 			</tr>
 			<tr>
 				<td class="meta-head"><?php echo $this->lang->line('sales_invoice_total'); ?></td>
-				<td><div><?php echo to_currency($total); ?></div></td>
+				<td><?php echo to_currency($total); ?></td>
 			</tr>
 		</table>
 	</div>
@@ -134,21 +134,16 @@ $(document).ready(function()
 				<tr class="item-row">
 					<td><?php echo $item['item_number']; ?></td>
 					<?php if($include_hsn): ?>
-						<td style='text-align:center;'><div><?php echo $item['hsn_code']; ?></div>
-						</td>
+						<td style='text-align:center;'><?php echo $item['hsn_code']; ?></td>
 					<?php endif; ?>
-					<td class="item-name"><div><?php echo ($item['is_serialized'] || $item['allow_alt_description']) && !empty($item['description']) ? $item['description'] : $item['name'] . ' ' . $item['attribute_values']; ?></div></td>
-					<td style='text-align:center;'><div><?php echo to_quantity_decimals($item['quantity']); ?></div>
-					</td>
-					<td><div><?php echo to_currency($item['price']); ?></div></td>
-					<td style='text-align:center;'><div><?php echo ($item['discount_type']==FIXED)?to_currency($item['discount']):$item['discount'] . '%';?></div>
-					</td>
+					<td class="item-name"><?php echo ($item['is_serialized'] || $item['allow_alt_description']) && !empty($item['description']) ? $item['description'] : $item['name'] . ' ' . $item['attribute_values']; ?></td>
+					<td style='text-align:center;'><?php echo to_quantity_decimals($item['quantity']); ?></td>
+					<td><?php echo to_currency($item['price']); ?></td>
+					<td style='text-align:center;'><?php echo ($item['discount_type']==FIXED)?to_currency($item['discount']):$item['discount'] . '%';?></td>
 					<?php if($discount > 0): ?>
-						<td style='text-align:center;'><div><?php echo to_currency($item['discounted_total'] / $item['quantity']); ?></div>
-						</td>
+					<td style='text-align:center;'><?php echo to_currency($item['discounted_total'] / $item['quantity']); ?></td>
 					<?php endif; ?>
-					<td style='border-right: solid 1px; text-align:right;'><div><?php echo to_currency($item['discounted_total']); ?></div>
-					</td>
+					<td style='border-right: solid 1px; text-align:right;'><?php echo to_currency($item['discounted_total']); ?></td>
 				</tr>
 				<?php
 				if($item['is_serialized'])
@@ -156,7 +151,7 @@ $(document).ready(function()
 				?>
 					<tr class="item-row">
 						<td class="item-description" colspan="<?php echo $invoice_columns-1; ?>"></td>
-						<td style='text-align:center;'><div><?php echo $item['serialnumber']; ?></div></td>
+						<td style='text-align:center;'><?php echo $item['serialnumber']; ?></td>
 					</tr>
 				<?php
 				}
@@ -170,8 +165,8 @@ $(document).ready(function()
 
 		<tr>
 			<td colspan="<?php echo $invoice_columns-3; ?>" class="blank-bottom"> </td>
-			<td colspan="2" class="total-line"><div><?php echo $this->lang->line('sales_sub_total'); ?></div></td>
-			<td class="total-value"><div id="subtotal"><?php echo to_currency($subtotal); ?></div></td>
+			<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_sub_total'); ?></td>
+			<td class="total-value" id="subtotal"><?php echo to_currency($subtotal); ?></td>
 		</tr>
 
 		<?php
@@ -180,8 +175,8 @@ $(document).ready(function()
 		?>
 			<tr>
 				<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><div><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group']; ?></div></td>
-				<td class="total-value"><div id="taxes"><?php echo to_currency_tax($tax['sale_tax_amount']); ?></div></td>
+				<td colspan="2" class="total-line"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group']; ?></td>
+				<td class="total-value" id="taxes"><?php echo to_currency_tax($tax['sale_tax_amount']); ?></td>
 			</tr>
 		<?php
 		}
@@ -189,8 +184,8 @@ $(document).ready(function()
 
 		<tr>
 			<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-			<td colspan="2" class="total-line"><div><?php echo $this->lang->line('sales_total'); ?></div></td>
-			<td class="total-value"><div id="total"><?php echo to_currency($total); ?></div></td>
+			<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_total'); ?></td>
+			<td class="total-value" id="total"><?php echo to_currency($total); ?></td>
 		</tr>
 
 		<?php
@@ -204,8 +199,8 @@ $(document).ready(function()
 		?>
 			<tr>
 				<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><div><?php echo $splitpayment[0]; ?></div></td>
-				<td class="total-value"><div id="paid"><?php echo to_currency( $payment['payment_amount'] * -1 ); ?></div></td>
+				<td colspan="2" class="total-line"><?php echo $splitpayment[0]; ?></td>
+				<td class="total-value" id="paid"><?php echo to_currency( $payment['payment_amount'] * -1 ); ?></td>
 			</tr>
 		<?php
 		}
@@ -215,8 +210,8 @@ $(document).ready(function()
 		?>
 			<tr>
 				<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><div><?php echo $this->lang->line('sales_giftcard_balance'); ?></div></td>
-				<td class="total-value"><div id="giftcard"><?php echo to_currency($cur_giftcard_value); ?></div></td>
+				<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_giftcard_balance'); ?></td>
+				<td class="total-value" id="giftcard"><?php echo to_currency($cur_giftcard_value); ?></td>
 			</tr>
 			<?php
 		}
@@ -226,8 +221,8 @@ $(document).ready(function()
 		?>
 		<tr>
 			<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-			<td colspan="2" class="total-line"> <div><?php echo $this->lang->line($amount_change >= 0 ? ($only_sale_check ? 'sales_check_balance' : 'sales_change_due') : 'sales_amount_due') ; ?></div></td>
-			<td class="total-value"><div id="change"><?php echo to_currency($amount_change); ?></div></td>
+			<td colspan="2" class="total-line"><?php echo $this->lang->line($amount_change >= 0 ? ($only_sale_check ? 'sales_check_balance' : 'sales_change_due') : 'sales_amount_due') ; ?></td>
+			<td class="total-value" id="change"><?php echo to_currency($amount_change); ?></td>
 		</tr>
 		<?php
 		}
diff --git a/application/views/sales/invoice_email.php b/application/views/sales/invoice_email.php
index 262349e51..cd4b85f55 100644
--- a/application/views/sales/invoice_email.php
+++ b/application/views/sales/invoice_email.php
@@ -28,26 +28,22 @@ if(isset($error_message))
 				}
 				?>
 			</td>
-			<td id="customer-title">
-				<div id="customer"><?php if(isset($customer)) { echo nl2br($customer_info); } ?></div>
-			</td>
+			<td id="customer-title" id="customer"><?php if(isset($customer)) { echo nl2br($customer_info); } ?></td>
 		</tr>
 		<tr>
-			<td id="company-title">
-				<div id="company">
+			<td id="company-title" id="company">
 				<?php echo $this->config->item('company'); ?><br/>
 				<?php echo nl2br($company_info); ?>
-				</div>
 			</td>
 			<td id="meta">
 				<table id="meta-content"  align="right">
 				<tr>
-					<td class="meta-head"><?php echo $this->lang->line('sales_invoice_number');?> </td>
-					<td><div><?php echo $invoice_number; ?></div></td>
+					<td class="meta-head"><?php echo $this->lang->line('sales_invoice_number');?></td>
+					<td><?php echo $invoice_number; ?></td>
 				</tr>
 				<tr>
 					<td class="meta-head"><?php echo $this->lang->line('common_date'); ?></td>
-					<td><div><?php echo $transaction_date; ?></div></td>
+					<td><?php echo $transaction_date; ?></td>
 				</tr>
 				<?php
 				if($amount_due > 0)
@@ -55,7 +51,7 @@ if(isset($error_message))
 				?>
 					<tr>
 						<td class="meta-head"><?php echo $this->lang->line('sales_amount_due'); ?></td>
-						<td><div class="due"><?php echo to_currency($total); ?></div></td>
+						<td class="due"><?php echo to_currency($total); ?></td>
 					</tr>
 				<?php
 				}
@@ -161,8 +157,8 @@ if(isset($error_message))
 		?>
 			<tr>
 				<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><div><?php echo $this->lang->line('sales_giftcard_balance'); ?></div></td>
-				<td class="total-value"><div id="giftcard"><?php echo to_currency($cur_giftcard_value); ?></div></td>
+				<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_giftcard_balance'); ?></td>
+				<td class="total-value" id="giftcard"><?php echo to_currency($cur_giftcard_value); ?></td>
 			</tr>
 		<?php
 		}
diff --git a/application/views/sales/quote.php b/application/views/sales/quote.php
index 6daec433f..b439a2f7c 100644
--- a/application/views/sales/quote.php
+++ b/application/views/sales/quote.php
@@ -82,16 +82,16 @@ if (isset($error_message))
 		<div id="company-title"><?php echo nl2br($company_info) ?></div>
 		<table id="meta">
 			<tr>
-				<td class="meta-head"><?php echo $this->lang->line('sales_quote_number');?> </td>
-				<td><div><?php echo $quote_number; ?></div></td>
+				<td class="meta-head"><?php echo $this->lang->line('sales_quote_number');?></td>
+				<td><?php echo $quote_number; ?></td>
 			</tr>
 			<tr>
 				<td class="meta-head"><?php echo $this->lang->line('common_date'); ?></td>
-				<td><div><?php echo $transaction_date; ?></div></td>
+				<td><?php echo $transaction_date; ?></td>
 			</tr>
 			<tr>
 				<td class="meta-head"><?php echo $this->lang->line('sales_invoice_total'); ?></td>
-				<td><div><?php echo to_currency($total); ?></div></td>
+				<td><?php echo to_currency($total); ?></td>
 			</tr>
 		</table>
 	</div>
@@ -124,14 +124,14 @@ if (isset($error_message))
 			?>
 				<tr class="item-row">
 					<td><?php echo $item['item_number']; ?></td>
-					<td class="item-name"><div><?php echo $item['name']; ?></div></td>
-					<td style='text-align:center;'><div><?php echo to_quantity_decimals($item['quantity']); ?></div></td>
-					<td><div><?php echo to_currency($item['price']); ?></div></td>
-					<td style='text-align:center;'><div><?php echo ($item['discount_type']==FIXED)?to_currency($item['discount']):$item['discount'] . '%';?></div></td>
+					<td class="item-name"><?php echo $item['name']; ?></td>
+					<td style='text-align:center;'><?php echo to_quantity_decimals($item['quantity']); ?></td>
+					<td><?php echo to_currency($item['price']); ?></td>
+					<td style='text-align:center;'><?php echo ($item['discount_type']==FIXED)?to_currency($item['discount']):$item['discount'] . '%';?></td>
 					<?php if($discount > 0): ?>
-						<td style='text-align:center;'><div><?php echo to_currency($item['discounted_total'] / $item['quantity']); ?></div></td>
+						<td style='text-align:center;'><?php echo to_currency($item['discounted_total'] / $item['quantity']); ?></td>
 					<?php endif; ?>
-					<td style='border-right: solid 1px; text-align:right;'><div><?php echo to_currency($item['discounted_total']); ?></div></td>
+					<td style='border-right: solid 1px; text-align:right;'><?php echo to_currency($item['discounted_total']); ?></td>
 				</tr>
 
 				<?php if($item['is_serialized'])
@@ -139,7 +139,7 @@ if (isset($error_message))
 				?>
 					<tr class="item-row">
 						<td class="item-name" colspan="<?php echo $quote_columns-1; ?>"></td>
-						<td style='text-align:center;'><div><?php echo $item['serialnumber']; ?></div></td>
+						<td style='text-align:center;'><?php echo $item['serialnumber']; ?></td>
 					</tr>
 				<?php
 				}
@@ -153,8 +153,8 @@ if (isset($error_message))
 
 		<tr>
 			<td colspan="<?php echo $quote_columns-3; ?>" class="blank-bottom"> </td>
-			<td colspan="2" class="total-line"><div><?php echo $this->lang->line('sales_sub_total'); ?></div></td>
-			<td class="total-value"><div id="subtotal"><?php echo to_currency($subtotal); ?></div></td>
+			<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_sub_total'); ?></td>
+			<td class="total-value" id="subtotal"><?php echo to_currency($subtotal); ?></td>
 		</tr>
 
 		<?php
@@ -163,8 +163,8 @@ if (isset($error_message))
 		?>
 			<tr>
 				<td colspan="<?php echo $quote_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><div><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group']; ?></div></td>
-				<td class="total-value"><div id="taxes"><?php echo to_currency_tax($tax['sale_tax_amount']); ?></div></td>
+				<td colspan="2" class="total-line"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group']; ?></td>
+				<td class="total-value" id="taxes"><?php echo to_currency_tax($tax['sale_tax_amount']); ?></td>
 			</tr>
 		<?php
 		}
@@ -172,8 +172,8 @@ if (isset($error_message))
 
 		<tr>
 			<td colspan="<?php echo $quote_columns-3; ?>" class="blank"> </td>
-			<td colspan="2" class="total-line"><div><?php echo $this->lang->line('sales_total'); ?></div></td>
-			<td class="total-value"><div id="total"><?php echo to_currency($total); ?></div></td>
+			<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_total'); ?></td>
+			<td class="total-value" id="total"><?php echo to_currency($total); ?></td>
 		</tr>
 
 		<?php
@@ -187,8 +187,8 @@ if (isset($error_message))
 		?>
 			<tr>
 				<td colspan="<?php echo $quote_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><div><?php echo $splitpayment[0]; ?></div></td>
-				<td class="total-value"><div id="paid"><?php echo to_currency( $payment['payment_amount'] ); ?></div></td>
+				<td colspan="2" class="total-line"><?php echo $splitpayment[0]; ?></td>
+				<td class="total-value" id="paid"><?php echo to_currency( $payment['payment_amount'] ); ?></td>
 			</tr>
 		<?php
 		}
diff --git a/application/views/sales/quote_email.php b/application/views/sales/quote_email.php
index a15f33a68..e370852cd 100644
--- a/application/views/sales/quote_email.php
+++ b/application/views/sales/quote_email.php
@@ -42,11 +42,11 @@
 				<table id="meta-content"  align="right">
 					<tr>
 						<td class="meta-head"><?php echo $this->lang->line('sales_quote_number');?> </td>
-						<td><div><?php echo $quote_number; ?></div></td>
+						<td><?php echo $quote_number; ?></td>
 					</tr>
 					<tr>
 						<td class="meta-head"><?php echo $this->lang->line('common_date'); ?></td>
-						<td><div><?php echo $transaction_date; ?></div></td>
+						<td><?php echo $transaction_date; ?></td>
 					</tr>
 					<?php
 					if($amount_due > 0)
@@ -54,7 +54,7 @@
 					?>
 						<tr>
 							<td class="meta-head"><?php echo $this->lang->line('sales_amount_due'); ?></td>
-							<td><div class="due"><?php echo to_currency($total); ?></div></td>
+							<td class="due"><?php echo to_currency($total); ?></td>
 						</tr>
 					<?php
 					}
diff --git a/application/views/sales/tax_invoice.php b/application/views/sales/tax_invoice.php
index 441c761ca..732f3a857 100644
--- a/application/views/sales/tax_invoice.php
+++ b/application/views/sales/tax_invoice.php
@@ -83,15 +83,15 @@ $(document).ready(function()
 		<table id="meta">
 			<tr>
 				<td class="meta-head"><?php echo $this->lang->line('sales_invoice_number');?> </td>
-				<td><div><?php echo $invoice_number; ?></div></td>
+				<td><?php echo $invoice_number; ?></td>
 			</tr>
 			<tr>
 				<td class="meta-head"><?php echo $this->lang->line('common_date'); ?></td>
-				<td><div><?php echo $transaction_date; ?></div></td>
+				<td><?php echo $transaction_date; ?></td>
 			</tr>
 			<tr>
 				<td class="meta-head"><?php echo $this->lang->line('sales_amount_due'); ?></td>
-				<td><div><?php echo to_currency($total); ?></div></td>
+				<td><?php echo to_currency($total); ?></td>
 			</tr>
 		</table>
 	</div>
@@ -134,21 +134,16 @@ $(document).ready(function()
 				<tr class="item-row">
 					<td><?php echo $item['item_number']; ?></td>
 					<?php if($include_hsn): ?>
-						<td style='text-align:center;'><div><?php echo $item['hsn_code']; ?></div>
-						</td>
+						<td style='text-align:center;'><?php echo $item['hsn_code']; ?></td>
 					<?php endif; ?>
-					<td class="item-name"><div><?php echo $item['name']; ?></div></td>
-					<td style='text-align:center;'><div><?php echo to_quantity_decimals($item['quantity']); ?></div>
-					</td>
-					<td><div><?php echo to_currency($item['price']); ?></div></td>
-					<td style='text-align:center;'><div><?php echo $item['discount'] . '%'; ?></div>
-					</td>
+					<td class="item-name"><?php echo $item['name']; ?></td>
+					<td style='text-align:center;'><?php echo to_quantity_decimals($item['quantity']); ?></td>
+					<td><?php echo to_currency($item['price']); ?></td>
+					<td style='text-align:center;'><?php echo $item['discount'] . '%'; ?></td>
 					<?php if($discount > 0): ?>
-						<td style='text-align:center;'><div><?php echo to_currency($item['discounted_total'] / $item['quantity']); ?></div>
-						</td>
+						<td style='text-align:center;'><?php echo to_currency($item['discounted_total'] / $item['quantity']); ?></td>
 					<?php endif; ?>
-					<td style='border-right: solid 1px; text-align:right;'><div><?php echo to_currency($item['discounted_total']); ?></div>
-					</td>
+					<td style='border-right: solid 1px; text-align:right;'><?php echo to_currency($item['discounted_total']); ?></td>
 				</tr>
 				<?php
 				if($item['is_serialized'] || $item['allow_alt_description'] && !empty($item['description']))
@@ -157,9 +152,9 @@ $(document).ready(function()
 					<tr class="item-row">
 						<td><?php echo $item['hsn_code']; ?></td>
 						<td class="item-description" colspan="<?php echo $invoice_columns-2; ?>">
-							<div><?php echo $item['description']; ?></div>
+							<?php echo $item['description']; ?>
 						</td>
-						<td style='text-align:center;'><div><?php echo $item['serialnumber']; ?></div></td>
+						<td style='text-align:center;'><?php echo $item['serialnumber']; ?></td>
 					</tr>
 				<?php
 				}
@@ -173,8 +168,8 @@ $(document).ready(function()
 
 		<tr>
 			<td colspan="<?php echo $invoice_columns-3; ?>" class="blank-bottom"> </td>
-			<td colspan="2" class="total-line"><div><?php echo $this->lang->line('sales_sub_total'); ?></div></td>
-			<td class="total-value"><div id="subtotal"><?php echo to_currency($subtotal); ?></div></td>
+			<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_sub_total'); ?></td>
+			<td class="total-value" id="subtotal"><?php echo to_currency($subtotal); ?></td>
 		</tr>
 
 		<?php
@@ -183,8 +178,8 @@ $(document).ready(function()
 		?>
 			<tr>
 				<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><div><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group']; ?></div></td>
-				<td class="total-value"><div id="taxes"><?php echo to_currency_tax($tax['sale_tax_amount']); ?></div></td>
+				<td colspan="2" class="total-line"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group']; ?></td>
+				<td class="total-value" id="taxes"><?php echo to_currency_tax($tax['sale_tax_amount']); ?></td>
 			</tr>
 		<?php
 		}
@@ -192,8 +187,8 @@ $(document).ready(function()
 
 		<tr>
 			<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-			<td colspan="2" class="total-line"><div><?php echo $this->lang->line('sales_total'); ?></div></td>
-			<td class="total-value"><div id="total"><?php echo to_currency($total); ?></div></td>
+			<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_total'); ?></td>
+			<td class="total-value" id="total"><?php echo to_currency($total); ?></td>
 		</tr>
 
 		<?php
@@ -207,8 +202,8 @@ $(document).ready(function()
 		?>
 			<tr>
 				<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><div><?php echo $splitpayment[0]; ?></div></td>
-				<td class="total-value"><div id="paid"><?php echo to_currency( $payment['payment_amount'] * -1 ); ?></div></td>
+				<td colspan="2" class="total-line"><?php echo $splitpayment[0]; ?></td>
+				<td class="total-value" id="paid"><?php echo to_currency( $payment['payment_amount'] * -1 ); ?></td>
 			</tr>
 		<?php
 		}
@@ -218,8 +213,8 @@ $(document).ready(function()
 		?>
 			<tr>
 				<td colspan="<?php echo $invoice_columns-3; ?>" class="blank"> </td>
-				<td colspan="2" class="total-line"><div><?php echo $this->lang->line('sales_giftcard_balance'); ?></div></td>
-				<td class="total-value"><div id="giftcard"><?php echo to_currency($cur_giftcard_value); ?></div></td>
+				<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_giftcard_balance'); ?>/td>
+				<td class="total-value" id="giftcard"><?php echo to_currency($cur_giftcard_value); ?></td>
 			</tr>
 			<?php
 		}
@@ -229,8 +224,8 @@ $(document).ready(function()
 		?>
 		<tr>
 			<td colspan="<?php echo $invoice_columns-3; ?>" ><?php echo $this->lang->line('sales_authorized_signature');?>:</td>
-			<td colspan="2" class="total-line"><div><?php echo $this->lang->line($amount_change >= 0 ? ($only_sale_check ? 'sales_check_balance' : 'sales_change_due') : 'sales_amount_due') ; ?></div></td>
-			<td class="total-value"><div id="change"><?php echo to_currency($amount_change); ?></div></td>
+			<td colspan="2" class="total-line"><?php echo $this->lang->line($amount_change >= 0 ? ($only_sale_check ? 'sales_check_balance' : 'sales_change_due') : 'sales_amount_due') ; ?></td>
+			<td class="total-value" id="change"><?php echo to_currency($amount_change); ?></td>
 		</tr>
 		<?php
 		}
diff --git a/application/views/sales/work_order.php b/application/views/sales/work_order.php
index 98b2b4d5c..cf482c5e2 100644
--- a/application/views/sales/work_order.php
+++ b/application/views/sales/work_order.php
@@ -83,11 +83,11 @@ if(isset($error_message))
 		<table id="meta">
 			<tr>
 				<td class="meta-head"><?php echo $work_order_number_label;?> </td>
-				<td><div><?php echo $work_order_number; ?></div></td>
+				<td><?php echo $work_order_number; ?></td>
 			</tr>
 			<tr>
 				<td class="meta-head"><?php echo $this->lang->line('common_date'); ?></td>
-				<td><div><?php echo $transaction_date; ?></div></td>
+				<td><?php echo $transaction_date; ?></td>
 			</tr>
 			<?php
 			if($print_price_info)
@@ -95,7 +95,7 @@ if(isset($error_message))
 			?>
 				<tr>
 					<td class="meta-head"><?php echo $this->lang->line('sales_amount_due'); ?></td>
-					<td><div><?php echo to_currency($total); ?></div></td>
+					<td><?php echo to_currency($total); ?></td>
 				</tr>
 			<?php
 			}
@@ -120,11 +120,11 @@ if(isset($error_message))
 			?>
 				<tr class="item-row">
 					<td><?php echo $item['item_number']; ?></td>
-					<td class="item-name"><div><?php echo $item['name']; ?></div></td>
-					<td style='text-align:center;'><div><?php echo to_quantity_decimals($item['quantity']); ?></div></td>
-					<td><div><?php if($print_price_info) echo to_currency($item['price']); ?></div></td>
-					<td style='text-align:center;'><div><?php echo ($item['discount_type']==FIXED)?to_currency($item['discount']):$item['discount'] . '%';?></div></td>
-					<td style='border-right: solid 1px; text-align:right;'><div><?php if($print_price_info) echo to_currency($item['discounted_total']); ?></div></td>
+					<td class="item-name"><?php echo $item['name']; ?></td>
+					<td style='text-align:center;'><?php echo to_quantity_decimals($item['quantity']); ?></td>
+					<td><?php if($print_price_info) echo to_currency($item['price']); ?></td>
+					<td style='text-align:center;'><?php echo ($item['discount_type']==FIXED)?to_currency($item['discount']):$item['discount'] . '%';?></td>
+					<td style='border-right: solid 1px; text-align:right;'><?php if($print_price_info) echo to_currency($item['discounted_total']); ?></td>
 				</tr>
 
 				<?php
@@ -133,8 +133,8 @@ if(isset($error_message))
 				?>
 					<tr class="item-row">
 						<td></td>
-						<td class="item-name" colspan="4"><div><?php echo $item['description']; ?></div></td>
-						<td style='text-align:center;'><div><?php echo $item['serialnumber']; ?></div></td>
+						<td class="item-name" colspan="4"><?php echo $item['description']; ?></td>
+						<td style='text-align:center;'><?php echo $item['serialnumber']; ?></td>
 					</tr>
 				<?php
 				}
@@ -147,8 +147,8 @@ if(isset($error_message))
 		<?php if($print_price_info) { ?>
 			<tr>
 				<td colspan="3" class="blank-bottom"> </td>
-				<td colspan="2" class="total-line"><div><?php echo $this->lang->line('sales_sub_total'); ?></div></td>
-				<td class="total-value"><div id="subtotal"><?php echo to_currency($subtotal); ?></div></td>
+				<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_sub_total'); ?></td>
+				<td class="total-value" id="subtotal"><?php echo to_currency($subtotal); ?></td>
 			</tr>
 			<?php
 			foreach($taxes as $tax_group_index=>$tax)
@@ -156,16 +156,16 @@ if(isset($error_message))
 				?>
 				<tr>
 					<td colspan="3" class="blank"> </td>
-					<td colspan="2" class="total-line"><div><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group']; ?></div></td>
-					<td class="total-value"><div id="taxes"><?php echo to_currency_tax($tax['sale_tax_amount']); ?></div></td>
+					<td colspan="2" class="total-line"><?php echo (float)$tax['tax_rate'] . '% ' . $tax['tax_group']; ?></td>
+					<td class="total-value" id="taxes"><?php echo to_currency_tax($tax['sale_tax_amount']); ?></td>
 				</tr>
 				<?php
 			}
 			?>
 			<tr>
 				<td colspan="3" class="blank"> </td>
-				<td colspan="2" class="total-line"><div><?php echo $this->lang->line('sales_total'); ?></div></td>
-				<td class="total-value"><div id="total"><?php echo to_currency($total); ?></div></td>
+				<td colspan="2" class="total-line"><?php echo $this->lang->line('sales_total'); ?></td>
+				<td class="total-value" id="total"><?php echo to_currency($total); ?></td>
 			</tr>
 		<?php } ?>
 		<?php
@@ -179,8 +179,8 @@ if(isset($error_message))
 			?>
 			<tr>
 				<td colspan="3" class="blank"> </td>
-				<td colspan="2" class="total-line"><div><?php echo $splitpayment[0]; ?></div></td>
-				<td class="total-value"><div id="paid"><?php echo to_currency( $payment['payment_amount'] ); ?></div></td>
+				<td colspan="2" class="total-line"><?php echo $splitpayment[0]; ?></td>
+				<td class="total-value" id="paid"><?php echo to_currency( $payment['payment_amount'] ); ?></td>
 			</tr>
 			<?php
 		}
diff --git a/application/views/sales/work_order_email.php b/application/views/sales/work_order_email.php
index afa0b8e4b..d646ef336 100644
--- a/application/views/sales/work_order_email.php
+++ b/application/views/sales/work_order_email.php
@@ -41,11 +41,11 @@
 				<table align="right">
 					<tr>
 						<td class="meta-head"><?php echo $this->lang->line('sales_work_order_number');?> </td>
-						<td><div><?php echo $work_order_number; ?></div></td>
+						<td><?php echo $work_order_number; ?></td>
 					</tr>
 					<tr>
 						<td class="meta-head"><?php echo $this->lang->line('common_date'); ?></td>
-						<td><div><?php echo $transaction_date; ?></div></td>
+						<td><?php echo $transaction_date; ?></td>
 					</tr>
 					<?php
 					if($amount_due > 0)
@@ -53,7 +53,7 @@
 					?>
 						<tr>
 							<td class="meta-head"><?php echo $this->lang->line('sales_amount_due'); ?></td>
-							<td><div class="due"><?php echo to_currency($total); ?></div></td>
+							<td class="due"><?php echo to_currency($total); ?></td>
 						</tr>
 					<?php
 					}