if (is_array($trans_no)) $trans_no = key($trans_no);
begin_transaction();
+ $delivery->bo_policy = $bo_policy;
+ hook_db_prewrite($delivery, ST_CUSTDELIVERY);
$customer = get_customer($delivery->customer_id);
$delivery_items_total = $delivery->get_items_total_dispatch();
$delivery->tax_included ? 0 : $tax_total-$freight_tax,
$delivery->freight_cost,
$delivery->tax_included ? 0 : $freight_tax,
- $delivery->sales_type, $delivery->order_no, 0,
- $delivery->ship_via, $delivery->due_date, 0, 0, $delivery->dimension_id, $delivery->dimension2_id);
+ $delivery->sales_type, $delivery->order_no,
+ $delivery->ship_via, $delivery->due_date, 0, 0, $delivery->dimension_id,
+ $delivery->dimension2_id, $delivery->payment);
if ($trans_no == 0) {
$delivery->trans_no = array($delivery_no=>0);
delete_comments(ST_CUSTDELIVERY, $delivery_no);
}
- foreach ($delivery->line_items as $delivery_line) {
+ foreach ($delivery->line_items as $line_no => $delivery_line) {
+
$line_price = $delivery_line->line_price();
$line_taxfree_price = get_tax_free_price_for_item($delivery_line->stock_id,
$delivery_line->price, 0, $delivery->tax_included,
write_customer_trans_detail_item(ST_CUSTDELIVERY, $delivery_no, $delivery_line->stock_id,
$delivery_line->item_description, $delivery_line->qty_dispatched,
$delivery_line->line_price(), $line_tax,
- $delivery_line->discount_percent, $delivery_line->standard_cost,
+ $delivery_line->discount_percent, $delivery_line->standard_cost, $delivery_line->src_id,
$trans_no ? $delivery_line->id : 0);
// Now update sales_order_details for the quantity delivered
$stock_gl_code = get_stock_gl_code($delivery_line->stock_id);
/* insert gl_trans to credit stock and debit cost of sales at standard cost*/
- if ($delivery_line->standard_cost != 0) {
+ if (is_inventory_item($delivery_line->stock_id) && $delivery_line->standard_cost != 0) {
/*first the cost of sales entry*/
// 2008-08-01. If there is a Customer Dimension, then override with this,
"The cost of sales GL posting could not be inserted");
/*now the stock entry*/
- //$stock_gl_code = get_stock_gl_code($order_line->stock_id);
add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
$stock_gl_code["inventory_account"], 0, 0, "",
$Refs->save(ST_CUSTDELIVERY, $delivery_no, $delivery->reference);
}
+ hook_db_postwrite($delivery, ST_CUSTDELIVERY);
commit_transaction();
return $delivery_no;
//--------------------------------------------------------------------------------------------------
-function void_sales_delivery($type, $type_no)
+function void_sales_delivery($type, $type_no, $transactions=true)
{
- begin_transaction();
+ if ($transactions)
+ begin_transaction();
+ hook_db_prevoid($type, $type_no);
+
void_gl_trans($type, $type_no, true);
// reverse all the changes in the sales order
$order = get_customer_trans_order($type, $type_no);
if ($order) {
+ $auto = (get_reference(ST_SALESORDER, $order) == "auto");
$order_items = get_sales_order_details($order, ST_SALESORDER);
while ($row = db_fetch($items_result)) {
$order_line = db_fetch($order_items);
- update_parent_line(ST_CUSTDELIVERY, $order_line['id'], -$row['quantity']);
+ update_parent_line(ST_CUSTDELIVERY, $order_line['id'], -$row['quantity'], $auto);
}
}
// DO NOT MOVE THIS ABOVE VOIDING or we can end up with trans with alloc < 0
void_customer_trans($type, $type_no);
- commit_transaction();
+ if ($transactions)
+ commit_transaction();
}
?>
\ No newline at end of file