X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fsales_db.inc;h=08175b186e7fddf9db0dc560491e654f1c67f918;hb=1b9351ae81a67726e757eba55895a4f059c7f128;hp=5e6913d16b730795459d21f9d3c706ff68e9767b;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git diff --git a/sales/includes/sales_db.inc b/sales/includes/sales_db.inc index 5e6913d1..08175b18 100644 --- a/sales/includes/sales_db.inc +++ b/sales/includes/sales_db.inc @@ -11,6 +11,7 @@ ***********************************************************************/ include_once($path_to_root . "/includes/banking.inc"); include_once($path_to_root . "/includes/db/inventory_db.inc"); +include_once($path_to_root . "/includes/db/allocations_db.inc"); include_once($path_to_root . "/sales/includes/db/sales_order_db.inc"); include_once($path_to_root . "/sales/includes/db/sales_credit_db.inc"); include_once($path_to_root . "/sales/includes/db/sales_invoice_db.inc"); @@ -204,17 +205,17 @@ function update_parent_line($doc_type, $line_id, $qty_dispatched, $auto=false) $qty_dispatched = (float)$qty_dispatched; // echo "update line: $line_id, $doc_type, $qty_dispatched"; - if ($doc_type==0) + if ($doc_type == 0) return false; else { - if ($doc_type==ST_SALESORDER) + if ($doc_type==ST_SALESORDER || $doc_type==ST_SALESQUOTE) { $sql = "UPDATE ".TB_PREF."sales_order_details SET qty_sent = qty_sent + $qty_dispatched"; if ($auto) $sql .= ", quantity = quantity + $qty_dispatched"; $sql .= " WHERE id=".db_escape($line_id); - } + } else $sql = "UPDATE ".TB_PREF."debtor_trans_details SET qty_done = qty_done + $qty_dispatched @@ -273,6 +274,7 @@ function read_sales_trans($doc_type, $trans_no, &$cart) $myrow["tax_group_name"]); $cart->reference = $myrow["reference"]; + $cart->prepaid = $myrow["prepaid"]; $cart->order_no = $myrow["order_"]; $cart->due_date = sql2date($myrow["due_date"]); $cart->document_date = sql2date($myrow["tran_date"]); @@ -306,6 +308,8 @@ function read_sales_trans($doc_type, $trans_no, &$cart) @$myrow["src_id"]); } } + $cart->prepayments = get_payments_for($trans_no, $doc_type); + } // !newdoc return true; @@ -405,5 +409,4 @@ function get_sales_child_documents($trans_type, $trans_no) return db_query($sql,"The related credit notes could not be retreived"); } - ?> \ No newline at end of file