X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fsales_db.inc;h=465002303887c7ca2659ea5ec8aa9b34865e360c;hb=f11b39846d81bd043490ba9596224b859e47467c;hp=c350642ad05c605d792bf51bf0bfae1050c5a9d1;hpb=8127089373814523c323e3e60cd48ea547c1c0f5;p=fa-stable.git diff --git a/sales/includes/sales_db.inc b/sales/includes/sales_db.inc index c350642a..46500230 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()); @@ -115,14 +101,18 @@ function get_price ($stock_id, $currency, $sales_type_id, $factor=null, $date=nu $prices[$myrow['sales_type_id']][$myrow['curr_abrev']] = $myrow['price']; } $price = false; - if (isset($prices[$sales_type_id][$home_curr])) + if (isset($prices[$sales_type_id][$currency])) { - $price = $prices[$sales_type_id][$home_curr] / $rate; + $price = $prices[$sales_type_id][$currency]; } elseif (isset($prices[$base_id][$currency])) { $price = $prices[$base_id][$currency] * $factor; } + elseif (isset($prices[$sales_type_id][$home_curr])) + { + $price = $prices[$sales_type_id][$home_curr] / $rate; + } elseif (isset($prices[$base_id][$home_curr])) { $price = $prices[$base_id][$home_curr] * $factor / $rate; @@ -156,7 +146,7 @@ function get_kit_price($item_code, $currency, $sales_type_id, $factor=null, $kit_price = get_price( $item_code, $currency, $sales_type_id, $factor, $date); - if ($kit_price !== false) { + if ($kit_price !== 0) { return $kit_price; } } @@ -178,68 +168,24 @@ function get_kit_price($item_code, $currency, $sales_type_id, $factor=null, return $kit_price; } -//----------------------------------------------------------------------------- - -function set_document_parent($cart) -{ - $inv_no = key($cart->trans_no); - - if (count($cart->src_docs) == 1) { - - // if this child document has only one parent - update child link - $src = array_keys($cart->src_docs); - $del_no = reset($src); - - $sql = 'UPDATE '.TB_PREF.'debtor_trans SET trans_link = ' . $del_no . - ' WHERE type='.db_escape($cart->trans_type).' AND trans_no='. $inv_no ; - db_query($sql, 'Child document link cannot be updated'); - - } - if ($cart->trans_type != ST_SALESINVOICE) - return 0; - - // the rest is batch invoice specific - - foreach ($cart->line_items as $line) { - if ($line->quantity != $line->qty_dispatched) { - return 1; // this is partial invoice - } - } - - $sql = 'UPDATE '.TB_PREF.'debtor_trans SET trans_link = ' . $inv_no . - ' WHERE type='.get_parent_type($cart->trans_type).' AND ('; - - $deliveries = array_keys($cart->src_docs); - - foreach ($deliveries as $key=>$del) - $deliveries[$key] = 'trans_no='.$del; - - $sql .= implode(' OR ', $deliveries) . ')'; - db_query($sql, 'Delivery links cannot be updated'); - - return 0; // batch or complete invoice -} - -//-------------------------------------------------------------------------------------------------- -function get_parent_type($type) -{ - $parent_types = array( ST_CUSTCREDIT => ST_SALESINVOICE, ST_SALESINVOICE => ST_CUSTDELIVERY, ST_CUSTDELIVERY => ST_SALESORDER ); - return isset($parent_types[$type]) ? $parent_types[$type] : 0; -} - //-------------------------------------------------------------------------------------------------- -function update_parent_line($doc_type, $line_id, $qty_dispatched) +function update_parent_line($doc_type, $line_id, $qty_dispatched, $auto=false) { $doc_type = get_parent_type($doc_type); -// echo "update line: $line_id, $doc_type, $qty_dispatched"; - if ($doc_type==0) + $qty_dispatched = (float)$qty_dispatched; + + 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 - WHERE id=".db_escape($line_id); + 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 @@ -254,14 +200,15 @@ function update_parent_line($doc_type, $line_id, $qty_dispatched) // 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); @@ -276,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 @@ -295,11 +242,11 @@ function read_sales_trans($doc_type, $trans_no, &$cart) $myrow["curr_code"], $myrow["discount"], $myrow["payment_terms"]); $cart->set_branch($myrow["branch_code"], $myrow["tax_group_id"], - $myrow["tax_group_name"], $myrow["phone"], $myrow["email"]); + $myrow["tax_group_name"]); $cart->reference = $myrow["reference"]; + $cart->prepaid = $myrow["prepaid"]; $cart->order_no = $myrow["order_"]; - $cart->trans_link = $myrow["trans_link"]; $cart->due_date = sql2date($myrow["due_date"]); $cart->document_date = sql2date($myrow["tran_date"]); $cart->dimension_id = $myrow['dimension_id']; // added 2.1 Joe Hunt 2008-11-12 @@ -328,12 +275,108 @@ function read_sales_trans($doc_type, $trans_no, &$cart) $myrow["stock_id"],$myrow["quantity"], $myrow["unit_price"], $myrow["discount_percent"], $myrow["qty_done"], $myrow["standard_cost"], - $myrow["StockDescription"],$myrow["id"], $myrow["debtor_trans_no"]); + $myrow["StockDescription"],$myrow["id"], $myrow["debtor_trans_no"], + @$myrow["src_id"]); } } + $cart->prepayments = get_payments_for($trans_no, $doc_type, $myrow["debtor_no"]); + } // !newdoc return true; } //---------------------------------------------------------------------------------------- -?> \ No newline at end of file + +function get_sales_child_lines($trans_type, $trans_no, $lines=true) +{ + if (!($ctype = get_child_type($trans_type))) + return false; + if (!is_array($trans_no)) { + $trans_no = array($trans_no); + } + + $par_tbl = $trans_type == ST_SALESORDER ? "sales_order_details" : "debtor_trans_details"; + $par_no = $trans_type == ST_SALESORDER ? "trans.order_no" : "trans.debtor_trans_no"; + + foreach($trans_no as $n => $trans) { + $trans_no[$n] = db_escape($trans); + } + $sql = "SELECT child.* + FROM + ".TB_PREF."debtor_trans_details child + LEFT JOIN ".TB_PREF."$par_tbl trans + ON child.src_id=trans.id AND child.debtor_trans_type=$ctype + WHERE $par_no IN(". implode(',', array_values($trans_no)).")"; + + if (!$lines) + $sql .= " GROUP BY child.debtor_trans_no"; + + $sql .= " ORDER BY child.debtor_trans_no"; + + return db_query($sql, "can't retrieve child trans"); +} + +function get_sales_child_numbers($trans_type, $trans_no) +{ + $trans = array(); + $res = get_sales_child_lines($trans_type, $trans_no, false); + while ($line = db_fetch($res)) { + $trans[] = $line['debtor_trans_no']; + } + return $trans; +} + +function get_sales_parent_lines($trans_type, $trans_no, $lines=true) +{ + $partype = get_parent_type($trans_type); + + if (!$partype) + return false; + + $par_tbl = $partype == ST_SALESORDER ? "sales_order_details" : "debtor_trans_details"; + $par_no = $partype == ST_SALESORDER ? "parent.order_no" : "parent.debtor_trans_no"; + $sql = "SELECT parent.* + FROM + ".TB_PREF."$par_tbl parent + LEFT JOIN ".TB_PREF."debtor_trans_details trans + ON trans.src_id=parent.id + WHERE + trans.debtor_trans_type=".db_escape($trans_type) + ." AND trans.debtor_trans_no=".db_escape($trans_no); + if (!$lines) + $sql .= " GROUP BY $par_no"; + + $sql .= " ORDER BY $par_no"; + + return db_query($sql, "can't retrieve child trans"); + +} + +function get_sales_parent_numbers($trans_type, $trans_no) +{ + $trans = array(); + $res = get_sales_parent_lines($trans_type, $trans_no, false); + while ($line = db_fetch($res)) + $trans[] = $line[$trans_type==ST_CUSTDELIVERY ? 'order_no' : 'debtor_trans_no']; + return $trans; +} + +//---------------------------------------------------------------------------------------- + +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)) + return false; + $childs = get_sales_child_numbers($trans_type, $trans_no, false); + if (!count($childs)) + return false; + + $sql = "SELECT * FROM ".TB_PREF."debtor_trans + WHERE type=".get_child_type($trans_type)." AND trans_no IN(". implode(',', array_values($childs)).")"; + + return db_query($sql,"The related credit notes could not be retreived"); +} +