From 85983cd17a8ca4228aa8b123d3cbba9524c90468 Mon Sep 17 00:00:00 2001
From: Steve Ireland <stevei@ruledomain.com>
Date: Mon, 30 Jan 2017 19:03:57 -0500
Subject: [PATCH] Fix merge issues related to line_sequence for receipts and
 invoices

---
 application/libraries/Sale_lib.php           | 1 -
 application/models/Sale.php                  | 6 +++---
 application/views/configs/invoice_config.php | 7 -------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/application/libraries/Sale_lib.php b/application/libraries/Sale_lib.php
index a3d04586a..82a303fda 100644
--- a/application/libraries/Sale_lib.php
+++ b/application/libraries/Sale_lib.php
@@ -3,7 +3,6 @@
 class Sale_lib
 {
 	private $CI;
-	private $line_sequence_options = array('0' => 'Standard', '1' => 'Entry', '2' => 'Group by Type', '3' => 'Group by Category');
 
 	public function __construct()
 	{
diff --git a/application/models/Sale.php b/application/models/Sale.php
index ba7b229a9..d4150521d 100644
--- a/application/models/Sale.php
+++ b/application/models/Sale.php
@@ -688,19 +688,19 @@ class Sale extends CI_Model
 		$this->db->where('sale_id', $sale_id);
 
 		// Entry sequence (this will render kits in the expected sequence)
-		if($this->config->item('line_sequence') == '1')
+		if($this->config->item('line_sequence') == '0')
 		{
 			$this->db->order_by('line', 'asc');
 		}
 		// Group by Stock Type (nonstock first - type 1, stock next - type 0)
-		elseif($this->config->item('line_sequence') == '2')
+		elseif($this->config->item('line_sequence') == '1')
 		{
 			$this->db->order_by('stock_type', 'desc');
 			$this->db->order_by('sales_items.description', 'asc');
 			$this->db->order_by('items.name', 'asc');
 		}
 		// Group by Item Category
-		elseif($this->config->item('line_sequence') == '3')
+		elseif($this->config->item('line_sequence') == '2')
 		{
 			$this->db->order_by('category', 'asc');
 			$this->db->order_by('sales_items.description', 'asc');
diff --git a/application/views/configs/invoice_config.php b/application/views/configs/invoice_config.php
index 98871c107..adf8b09dd 100644
--- a/application/views/configs/invoice_config.php
+++ b/application/views/configs/invoice_config.php
@@ -66,13 +66,6 @@
 				</div>
 			</div>
 
-			<div class="form-group form-group-sm">
-				<?php echo form_label($this->lang->line('config_line_sequence'), 'line_sequence', array('class' => 'control-label col-xs-2')); ?>
-				<div class='col-xs-2'>
-					<?php echo form_dropdown('line_sequence', $line_sequence_options, $this->config->item('line_sequence'), array('class' => 'form-control input-sm')); ?>
-				</div>
-			</div>
-
 			<?php echo form_submit(array(
 				'name' => 'submit_form',
 				'id' => 'submit_form',