Sql TB_PREF corrections

diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index ac8923947385896c6408588944530753ff327f85..c97930ee7cfd032462329e03caa0f5407704f8f5 100644 (file)
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -179,7 +179,6 @@ if (isset($_GET['InvoiceNumber']) && $_GET['InvoiceNumber'] > 0)
                                        $myrow["FullUnitPrice"],$myrow["discount_percent"],$myrow["qty_done"],
                                        $myrow["standard_cost"],$myrow["description"],$myrow["id"]);
 
-                               $_SESSION['Items']->line_items[$_SESSION['Items']->lines_on_order]->standard_cost = $myrow["standard_cost"];
 
                        }
 

diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc
index 5ab4180b9ed39d9f16cc9ad460fb330fd41fba28..a53a8de0ffe9145e3a72a2ac40df64953a1e77ea 100644 (file)
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -123,7 +123,8 @@ function void_sales_delivery($type, $type_no)
 
 function get_sales_delivery($trans_no)
 {
-       $sql = "SELECT ".TB_PREF."debtor_trans.*, cust_branch.*,
+       $sql = "SELECT ".TB_PREF."debtor_trans.*,
+       ".TB_PREF."cust_branch.*,
        ".TB_PREF."debtors_master.name, 
        ".TB_PREF."debtors_master.curr_code, 
        ".TB_PREF."debtors_master.payment_terms, 

diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc
index 49f9252f4808696fa57fe4ddd1a1c32a6d6454a6..55dc0bb0308d2473753448f32b85d57cfc7e01ab 100644 (file)
--- a/sales/includes/db/sales_invoice_db.inc
+++ b/sales/includes/db/sales_invoice_db.inc
@@ -4,7 +4,7 @@ function set_invoice_links(&$cart, $invoice) {
          
          $del = $cart->trans_no;
          if(is_array($del)) $del = $del[0]; 
-         $sql = 'UPDATE debtor_trans SET trans_link = ' . $del .
+         $sql = 'UPDATE '.TB_PREF.'debtor_trans SET trans_link = ' . $del .
                  ' WHERE type=10 AND trans_no='.$invoice;
          db_query($sql, 'Invoice link cannot be updated');    
 
@@ -17,7 +17,7 @@ function set_invoice_links(&$cart, $invoice) {
        
        }
 
-    $sql = 'UPDATE debtor_trans SET trans_link = ' . $invoice .
+    $sql = 'UPDATE '.TB_PREF.'debtor_trans SET trans_link = ' . $invoice .
        ' WHERE type=13 AND (';
 
     $deliveries = $cart->trans_no;