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);
+
+ add_new_exchange_rate($customer['curr_code'], $delivery->document_date, $delivery->ex_rate);
+
$delivery_items_total = $delivery->get_items_total_dispatch();
$freight_tax = $delivery->get_shipping_tax();
$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, $delivery->tax_included, $delivery->prep_amount);
if ($trans_no == 0) {
$delivery->trans_no = array($delivery_no=>0);
} else {
+ move_trans_attachments(ST_CUSTDELIVERY, $trans_no, $delivery_no);
void_gl_trans(ST_CUSTDELIVERY, $delivery_no, true);
void_stock_move(ST_CUSTDELIVERY, $delivery_no);
void_trans_tax_details(ST_CUSTDELIVERY, $delivery_no);
delete_comments(ST_CUSTDELIVERY, $delivery_no);
}
+
+ // for prepaid delivery repost income from deffered account
+ if ($delivery->is_prepaid())
+ {
+ $branch_data = get_branch_accounts($delivery->Branch);
+ $total = 0;
+ }
foreach ($delivery->line_items as $line_no => $delivery_line) {
- if ($delivery_line->qty_dispatched == 0) {
- unset($delivery->line_items[$line_no]);
- continue;
- }
+
$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,
$line_tax = get_full_price_for_item($delivery_line->stock_id, $delivery_line->price,
0, $delivery->tax_included, $delivery->tax_group_array) - $line_taxfree_price;
- if ($trans_no != 0) // Inserted 2008-09-25 Joe Hunt
- $delivery_line->standard_cost = get_standard_cost($delivery_line->stock_id);
+ $delivery_line->standard_cost = get_unit_cost($delivery_line->stock_id);
/* add delivery details for all lines */
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
$delivery_line->qty_dispatched-$delivery_line->qty_old);
if ($delivery_line->qty_dispatched != 0) {
- add_stock_move_customer(ST_CUSTDELIVERY, $delivery_line->stock_id, $delivery_no,
+ add_stock_move(ST_CUSTDELIVERY, $delivery_line->stock_id, $delivery_no,
$delivery->Location, $delivery->document_date, $delivery->reference,
- -$delivery_line->qty_dispatched, $delivery_line->standard_cost,1,
- $line_price, $delivery_line->discount_percent);
+ -$delivery_line->qty_dispatched, $delivery_line->standard_cost,
+ $line_price*(1-$delivery_line->discount_percent));
+
+ $mb_flag = get_mb_flag($delivery_line->stock_id);
+ if (is_fixed_asset($mb_flag)) {
+ $sql = "UPDATE ".TB_PREF."stock_master SET inactive=1
+ WHERE stock_id=".db_escape($delivery_line->stock_id);
+ db_query($sql,"The cost details for the fixed asset could not be updated");
+ }
$stock_gl_code = get_stock_gl_code($delivery_line->stock_id);
+ // If there is a Customer Dimension, then override with this,
+ // else take the Item Dimension (if any)
+ $dim = ($delivery->dimension_id != $customer['dimension_id'] ? $delivery->dimension_id :
+ ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_code["dimension_id"]));
+ $dim2 = ($delivery->dimension2_id != $customer['dimension2_id'] ? $delivery->dimension2_id :
+ ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_code["dimension2_id"]));
+ if ($delivery->is_prepaid())
+ {
+ $sales_account = ($branch_data['sales_account'] != "" ? $branch_data['sales_account'] : $stock_gl_code['sales_account']);
+
+ $total += add_gl_trans_customer(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date, $sales_account, $dim, $dim2,
+ -$line_taxfree_price*$delivery_line->qty_dispatched, // FIXME - calculation order should be exactly like in invoice to minimalize roundings
+ $delivery->customer_id, "The sales price GL posting could not be inserted");
+ }
/* 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,
- // else take the Item Dimension (if any)
- $dim = ($delivery->dimension_id != $customer['dimension_id'] ? $delivery->dimension_id :
- ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_code["dimension_id"]));
- $dim2 = ($delivery->dimension2_id != $customer['dimension2_id'] ? $delivery->dimension2_id :
- ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_code["dimension2_id"]));
+
+ $delivery_gl_code = $stock_gl_code["cogs_account"];
+ if ($delivery->fixed_asset)
+ $delivery_gl_code = $stock_gl_code["adjustment_account"];
add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no,
- $delivery->document_date, $stock_gl_code["cogs_account"], $dim, $dim2, "",
+ $delivery->document_date, $delivery_gl_code, $dim, $dim2, "",
$delivery_line->standard_cost * $delivery_line->qty_dispatched,
PT_CUSTOMER, $delivery->customer_id,
"The cost of sales GL posting could not be inserted");
} /*quantity dispatched is more than 0 */
} /*end of order_line loop */
+ if ($delivery->is_prepaid())
+ {
+ $deferred_act = get_company_pref('deferred_income_act');
+ add_gl_trans_customer(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date, $deferred_act, 0, 0,
+ -$total, $delivery->customer_id, "The deferred income GL posting could not be inserted");
+ }
+
if ($bo_policy == 0) {
// if cancelling any remaining quantities
close_sales_order($delivery->order_no);
$ex_rate = get_exchange_rate_from_home_currency(get_customer_currency($delivery->customer_id), $delivery->document_date);
add_trans_tax_details(ST_CUSTDELIVERY, $delivery_no, $taxitem['tax_type_id'],
$taxitem['rate'], $delivery->tax_included, $taxitem['Value'],
- $taxitem['Net'], $ex_rate, $delivery->document_date, $delivery->reference );
+ $taxitem['Net'], $ex_rate, $delivery->document_date, $delivery->reference, null);
}
}
if ($trans_no == 0) {
$Refs->save(ST_CUSTDELIVERY, $delivery_no, $delivery->reference);
}
-
+ hook_db_postwrite($delivery, ST_CUSTDELIVERY);
commit_transaction();
return $delivery_no;
}
//--------------------------------------------------------------------------------------------------
+function adjust_shipping_charge(&$delivery, $trans_no)
+{
+ $sql = "SELECT sum(ov_freight) as freight FROM ".TB_PREF."debtor_trans WHERE order_ = $trans_no AND type = " . ST_CUSTDELIVERY . " AND debtor_no = " . $delivery->customer_id;
+ $result = db_query($sql, "Can not find delivery notes");
+ $row = db_fetch_row($result);
+ if (!$row[0]) $freight = 0;
+ else $freight = $row[0];
+ if ($freight < $delivery->freight_cost) $delivery->freight_cost = $delivery->freight_cost - $freight;
+ else $delivery->freight_cost = 0;
+}
-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) {
- $order_items = get_sales_order_details($order, ST_SALESORDER);
+ $auto = (get_reference(ST_SALESORDER, $order) == "auto");
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, $row['src_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
+
projects / fa-stable.git / blobdiff