Merge pull request #380 from wrongecho/fixes

General fixes

client_contacts.php

@@ -139,7 +139,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             if($contact_id == $primary_contact){
                 $primary_contact_display = "<small class='text-success'>Primary Contact</small>";
             }else{
-              $primary_contact_display = "<small class='text-danger'>Needs approval</small>";
+              $primary_contact_display = FALSE;
             }
             $contact_location_id = $row['contact_location_id'];
             $location_name = $row['location_name'];

invoice.php

@@ -299,7 +299,7 @@ if(isset($_GET['invoice_id'])){
                     <td><input type="text" class="form-control" id="name" name="name" placeholder="Item" required></td>
                     <td><textarea class="form-control" rows="2" id="desc" name="description" placeholder="Description"></textarea></td>
                     <td><input type="number" step="0.01" min="0" class="form-control" style="text-align: center;" id="qty" name="qty" placeholder="QTY"></td>
-                    <td><input type="number" step="0.01" class="form-control" style="text-align: right;" id="price" name="price" placeholder="Price (<?php echo $client_currency_symbol; ?>)"></td>
+                    <td><input type="number" step="0.01" class="form-control" style="text-align: right;" id="price" name="price" placeholder="Price (<?php echo $invoice_currency_code; ?>)"></td>
                     <td>             
                       <select class="form-control select2" name="tax_id" required>
                         <option value="0">None</option>

quote.php

@@ -263,7 +263,7 @@ if(isset($_GET['quote_id'])){
                     <td><input type="text" class="form-control" name="name" id="name" placeholder="Item" required></td>
                     <td><textarea class="form-control" rows="2" name="description" id="desc" placeholder="Description"></textarea></td>
                     <td><input type="number" step="0.01" min="0" class="form-control" id="qty" style="text-align: center;" name="qty" placeholder="QTY"></td>
-                    <td><input type="number" step="0.01" min="0" class="form-control" id="price" style="text-align: right;" name="price" placeholder="Price (<?php echo $client_currency_symbol; ?>)"></td>
+                    <td><input type="number" step="0.01" min="0" class="form-control" id="price" style="text-align: right;" name="price" placeholder="Price (<?php echo $quote_currency_code; ?>)"></td>
                     <td>
                       <select class="form-control select2" id="tax" name="tax_id" required>
                         <option value="0">None</option>