See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
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");
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)
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());
{
$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);
$kit_price = get_price( $item_code, $currency, $sales_type_id,
$factor, $date);
- if ($kit_price !== false) {
+ if ($kit_price !== 0) {
return $kit_price;
}
}
{
$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";
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
//
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);
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
} 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->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
$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[0], $doc_type, $debtor_no);
+
} // !newdoc
return true;
function get_sales_child_lines($trans_type, $trans_no, $lines=true)
{
- if (!get_child_type($trans_type))
+ if (!($ctype = get_child_type($trans_type)))
return false;
if (!is_array($trans_no)) {
$trans_no = array($trans_no);
}
-
- $trtbl = $trans_type == ST_SALESORDER ? "sales_order_details" : "debtor_trans_details";
-
- $rel = $trans_type == ST_SALESORDER ? "trans.trans_type=$trans_type"
- . " AND trans.order_no IN(". implode(',', array_values($trans_no)).")"
- : "trans.debtor_trans_type=$trans_type"
- . " AND trans.debtor_trans_no IN(". implode(',', array_values($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,
- ".TB_PREF."$trtbl trans
- WHERE
- $rel AND trans.id=child.src_id";
+ ".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");
}
if (!$partype)
return false;
- $partbl = $partype == ST_SALESORDER ? "sales_order_details" : "debtor_trans_details";
- $parent_no = $partype == ST_SALESORDER ? "parent.order_no" : "parent.debtor_trans_no";
+ $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."$partbl parent
+ ".TB_PREF."$par_tbl parent
LEFT JOIN ".TB_PREF."debtor_trans_details trans
ON trans.src_id=parent.id
WHERE
- trans.debtor_trans_type=$trans_type AND trans.debtor_trans_no=$trans_no";
+ trans.debtor_trans_type=".db_escape($trans_type)
+ ." AND trans.debtor_trans_no=".db_escape($trans_no);
if (!$lines)
- $sql .= " GROUP BY $parent_no";
+ $sql .= " GROUP BY $par_no";
- $sql .= " ORDER BY $parent_no";
+ $sql .= " ORDER BY $par_no";
return db_query($sql, "can't retrieve child trans");
// 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
return db_query($sql,"The related credit notes could not be retreived");
}
-
-?>
\ No newline at end of file