diff --git a/application/models/Tax.php b/application/models/Tax.php index e65dd8a47..9df461acd 100644 --- a/application/models/Tax.php +++ b/application/models/Tax.php @@ -87,8 +87,7 @@ class Tax extends CI_Model public function get_rate_info($tax_code, $tax_category_id) { $this->db->from('tax_code_rates'); - $this->db->join('tax_categories', - 'rate_tax_category_id = tax_category_id'); + $this->db->join('tax_categories', 'rate_tax_category_id = tax_category_id'); $this->db->where('rate_tax_code', $tax_code); $this->db->where('rate_tax_category_id', $tax_category_id); diff --git a/application/views/sales/invoice.php b/application/views/sales/invoice.php index 3bb7993ad..c0634e2c0 100755 --- a/application/views/sales/invoice.php +++ b/application/views/sales/invoice.php @@ -119,14 +119,15 @@ $(document).ready(function() - - - - - - + + + + + + @@ -183,6 +185,7 @@ $(document).ready(function() @@ -227,6 +230,7 @@ $(window).on("load", function() jsPrintSetup.setOption('headerStrRight', ''); Appconfig->get('print_footer')) { ?>