X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fsales_db.inc;h=b7e168320d2e63af6c56bd993982746e917bfb3e;hb=a5516c489de9179966d0874047bc44ba32c0a765;hp=5e6913d16b730795459d21f9d3c706ff68e9767b;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git diff --git a/sales/includes/sales_db.inc b/sales/includes/sales_db.inc index 5e6913d1..b7e16832 100644 --- a/sales/includes/sales_db.inc +++ b/sales/includes/sales_db.inc @@ -10,7 +10,8 @@ See the License here . ***********************************************************************/ include_once($path_to_root . "/includes/banking.inc"); -include_once($path_to_root . "/includes/db/inventory_db.inc"); +include_once($path_to_root . "/includes/inventory.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"); @@ -26,21 +27,6 @@ include_once($path_to_root . "/sales/includes/db/payment_db.inc"); include_once($path_to_root . "/sales/includes/db/branches_db.inc"); include_once($path_to_root . "/sales/includes/db/customers_db.inc"); -//---------------------------------------------------------------------------------------- -// $price in customer's currency -// $quantity is used as is (if it's neg it's neg, if it's pos it's pos) -// $std_cost is in home currency -// $show_or_hide 1 show this item in invoice/credit views, 0 to hide it (used for write-off items) -// $type is 10 (invoice) or 11 (credit) - -function add_stock_move_customer($type, $stock_id, $trans_id, $location, $date_, $reference, - $quantity, $std_cost, $show_or_hide=1, $price=0, $discount_percent=0) -{ - return add_stock_move($type, $stock_id, $trans_id, $location, $date_, $reference, - $quantity, $std_cost, 0, $show_or_hide, $price, $discount_percent, - "The customer stock movement record cannot be inserted"); -} - //---------------------------------------------------------------------------------------- // add a debtor-related gl transaction // $date_ is display date (non-sql) @@ -61,7 +47,7 @@ function add_gl_trans_customer($type, $type_no, $date_, $account, $dimension, $d function get_calculated_price($stock_id, $add_pct) { - $avg = get_standard_cost($stock_id); + $avg = get_unit_cost($stock_id); if ($avg == 0) return 0; return round2($avg * (1 + $add_pct / 100), user_price_dec()); @@ -131,20 +117,6 @@ function get_price ($stock_id, $currency, $sales_type_id, $factor=null, $date=nu { $price = $prices[$base_id][$home_curr] * $factor / $rate; } -/* - if (isset($prices[$sales_type_id][$home_curr])) - { - $price = $prices[$sales_type_id][$home_curr] / $rate; - } - elseif (isset($prices[$base_id][$currency])) - { - $price = $prices[$base_id][$currency] * $factor; - } - elseif (isset($prices[$base_id][$home_curr])) - { - $price = $prices[$base_id][$home_curr] * $factor / $rate; - } -*/ elseif ($num_rows == 0 && $add_pct != -1) { $price = get_calculated_price($stock_id, $add_pct); @@ -203,18 +175,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 @@ -229,14 +200,15 @@ function update_parent_line($doc_type, $line_id, $qty_dispatched, $auto=false) // function get_location(&$cart) { - $sql = "SELECT ".TB_PREF."locations.* FROM ".TB_PREF."stock_moves," - .TB_PREF."locations". + $sql = "SELECT location.* + FROM ".TB_PREF."stock_moves move," + .TB_PREF."locations location". " WHERE type=".db_escape($cart->trans_type). " AND trans_no=".key($cart->trans_no). " AND qty!=0 ". - " AND ".TB_PREF."locations.loc_code=".TB_PREF."stock_moves.loc_code"; - $result = db_query($sql, 'Retreiving inventory location'); + " AND location.loc_code=move.loc_code"; + $result = db_query($sql, 'Retreiving inventory location'); if (db_num_rows($result)) { return db_fetch($result); @@ -251,7 +223,7 @@ function get_location(&$cart) function read_sales_trans($doc_type, $trans_no, &$cart) { if (!is_array($trans_no) && $trans_no) - $trans_no = array($trans_no); + $trans_no = array($trans_no); $cart->trans_type = $doc_type; if (!$trans_no) { // new document @@ -259,20 +231,22 @@ function read_sales_trans($doc_type, $trans_no, &$cart) } else { // read header data from first document $myrow = get_customer_trans($trans_no[0],$doc_type); - if (count($trans_no)>1) + $debtor_no = $myrow['debtor_no']; + if (count_array($trans_no)>1) $cart->trans_no = get_customer_trans_version($doc_type, $trans_no); else $cart->trans_no = array($trans_no[0]=>$myrow["version"]); $cart->set_sales_type($myrow["tpe"], $myrow["sales_type"], $myrow["tax_included"],0); - $cart->set_customer($myrow["debtor_no"], $myrow["DebtorName"], + $cart->set_customer($debtor_no, $myrow["DebtorName"], $myrow["curr_code"], $myrow["discount"], $myrow["payment_terms"]); $cart->set_branch($myrow["branch_code"], $myrow["tax_group_id"], $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 +280,8 @@ function read_sales_trans($doc_type, $trans_no, &$cart) @$myrow["src_id"]); } } + $cart->prepayments = get_payments_for($trans_no[0], $doc_type, $debtor_no); + } // !newdoc return true; @@ -393,10 +369,10 @@ function get_sales_child_documents($trans_type, $trans_no) // FIXME - credit notes retrieved here should be those linked to invoices containing // at least one line from related invoice - if (!count($trans_no)) + if (!count_array($trans_no)) return false; $childs = get_sales_child_numbers($trans_type, $trans_no, false); - if (!count($childs)) + if (!count_array($childs)) return false; $sql = "SELECT * FROM ".TB_PREF."debtor_trans @@ -405,5 +381,3 @@ 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