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())
{
$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. This condition is removed after experience by Chaitanya
- $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->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, material_cost=0
+ 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);
- // 2008-08-01. If there is a Customer Dimension, then override with this,
+ // 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"]));
$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 (is_inventory_item($delivery_line->stock_id) && $delivery_line->standard_cost != 0) {
-
- /*first the cost of sales entry*/
-
- add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no,
- $delivery->document_date, $stock_gl_code["cogs_account"], $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");
-
- /*now the stock entry*/
-
- add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
- $stock_gl_code["inventory_account"], 0, 0, "",
- (-$delivery_line->standard_cost * $delivery_line->qty_dispatched),
- PT_CUSTOMER, $delivery->customer_id,
- "The stock side of the cost of sales GL posting could not be inserted");
+
+ if (is_inventory_item($delivery_line->stock_id)) {
+ // Fixed Assets
+ if ($delivery->fixed_asset) {
+ $fa_purchase_cost = get_purchase_cost($delivery_line->stock_id);
+ $fa_depreciation = $fa_purchase_cost - $delivery_line->standard_cost;
+ /*first remove depreciation*/
+ add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no,
+ $delivery->document_date, $stock_gl_code["adjustment_account"], $dim, $dim2, "",
+ $fa_depreciation,
+ PT_CUSTOMER, $delivery->customer_id,
+ "The cost of sales GL posting could not be inserted");
+ /*then remove asset*/
+ add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
+ $stock_gl_code["inventory_account"], 0, 0, "",
+ -$fa_purchase_cost,
+ PT_CUSTOMER, $delivery->customer_id,
+ "The stock side of the cost of sales GL posting could not be inserted");
+ /*finally adjust sales account with the remaining*/
+ add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
+ $stock_gl_code["cogs_account"], 0, 0, "",
+ ($fa_purchase_cost - $fa_depreciation),
+ PT_CUSTOMER, $delivery->customer_id,
+ "The stock side of the cost of sales GL posting could not be inserted");
+ }
+ // Invetory Items
+ else if ($delivery_line->standard_cost != 0) {
+ /*first the cost of sales entry*/
+ add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no,
+ $delivery->document_date, $stock_gl_code["cogs_account"], $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");
+
+ /*now the stock entry*/
+ add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
+ $stock_gl_code["inventory_account"], 0, 0, "",
+ (-$delivery_line->standard_cost * $delivery_line->qty_dispatched),
+ PT_CUSTOMER, $delivery->customer_id,
+ "The stock side of the cost of sales GL posting could not be inserted");
+ }
} /* end of if GL and stock integrated and standard cost !=0 */
$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);
}
-//_vd(get_gl(ST_CUSTDELIVERY, $delivery_no));
-//exit;
hook_db_postwrite($delivery, ST_CUSTDELIVERY);
commit_transaction();
if ($transactions)
commit_transaction();
}
-?>
\ No newline at end of file
+
projects / fa-stable.git / blobdiff