}
$total = 0;
- foreach ($credit_note->line_items as $credit_line) {
+ $credit_note->split_line_values();
+ foreach ($credit_note->line_items as $line) {
- if ($credit_invoice && $credit_line->qty_dispatched!=$credit_line->qty_old ) {
- update_parent_line(ST_CUSTCREDIT, $credit_line->src_id,($credit_line->qty_dispatched
- -$credit_line->qty_old));
+ if ($credit_invoice && $line->qty_dispatched!=$line->qty_old ) {
+ update_parent_line(ST_CUSTCREDIT, $line->src_id,($line->qty_dispatched
+ -$line->qty_old));
}
- $line_taxfree_price = get_tax_free_price_for_item($credit_line->stock_id, $credit_line->price,
- 0, $credit_note->tax_included, $credit_note->tax_group_array);
+ $line_taxfree_price = $line->gl_amounts['Net'];
- $line_tax = get_full_price_for_item($credit_line->stock_id, $credit_line->price,
- 0, $credit_note->tax_included, $credit_note->tax_group_array) - $line_taxfree_price;
-
- write_customer_trans_detail_item(ST_CUSTCREDIT, $credit_no, $credit_line->stock_id,
- $credit_line->item_description, $credit_line->qty_dispatched,
- $credit_line->line_price(), $line_tax, $credit_line->discount_percent,
- $credit_line->standard_cost, $credit_line->src_id, $trans_no==0 ? 0: $credit_line->id);
+ $line_tax = $line->gl_amounts['Net'];
+ $line->unit_cost = get_unit_cost($line->stock_id);
+
+ write_customer_trans_detail_item(ST_CUSTCREDIT, $credit_no, $line->stock_id,
+ $line->item_description, $line->qty_dispatched,
+ $line->line_price(), $line_tax, $line->discount_percent,
+ $line->unit_cost, $line->src_id, $trans_no==0 ? 0: $line->id);
if ($credit_type == 'Return')
- add_credit_movements_item($credit_note, $credit_line,
- $credit_type, ($line_taxfree_price+$line_tax)*(1-$credit_line->discount_percent), $credit_invoice);
+ add_credit_movements_item($credit_note, $line,
+ $credit_type, ($line_taxfree_price+$line_tax)*(1-$line->discount_percent), $credit_invoice);
- $total += add_gl_trans_credit_costs($credit_note, $credit_line, $credit_no,
+ $total += add_gl_trans_credit_costs($credit_note, $line, $credit_no,
$credit_date, $credit_type, $write_off_acc, $branch_data);
} /*end of credit_line loop */
$total += add_gl_trans_customer(ST_CUSTCREDIT, $credit_no, $credit_date, $branch_data["receivables_account"], 0, 0,
-($credit_note_total + $credit_note->freight_cost + $items_added_tax + $freight_added_tax),
- $credit_note->customer_id,
- "The total debtor GL posting for the credit note could not be inserted");
+ $credit_note->customer_id);
}
if ($credit_note->freight_cost != 0) {
$total += add_gl_trans_customer(ST_CUSTCREDIT, $credit_no, $credit_date, $company_data["freight_act"], 0, 0,
- $credit_note->get_tax_free_shipping(), $credit_note->customer_id,
- "The freight GL posting for this credit note could not be inserted");
+ $credit_note->get_tax_free_shipping(), $credit_note->customer_id);
}
foreach ($taxes as $taxitem) {
add_trans_tax_details(ST_CUSTCREDIT, $credit_no, $taxitem['tax_type_id'],
$taxitem['rate'], $credit_note->tax_included, $taxitem['Value'],
$taxitem['Net'], $ex_rate,
- $credit_note->document_date, $credit_note->reference, TR_OUTPUT);
+ $credit_note->document_date, $credit_note->reference, TR_OUTPUT, $credit_note->tax_group_id);
$total += add_gl_trans_customer(ST_CUSTCREDIT, $credit_no, $credit_date, $taxitem['sales_gl_code'], 0, 0,
- $taxitem['Value'], $credit_note->customer_id,
- "A tax GL posting for this credit note could not be inserted");
+ $taxitem['Value'], $credit_note->customer_id);
}
}
/*Post a balance post if $total != 0 */
$Refs->save(ST_CUSTCREDIT, $credit_no, $credit_note->reference);
}
hook_db_postwrite($credit_note, ST_CUSTCREDIT);
- commit_transaction();
+ commit_transaction();
return $credit_no;
}
function add_credit_movements_item(&$credit_note, &$credit_line,
$credit_type, $price, $credited_invoice=0)
{
- //Chaitanya : Stamp current cost in stock moves $credit_line does not fetch cost
+ //Chaitanya : Stamp current cost in stock moves $line does not fetch cost
$curr_std_cost = get_unit_cost($credit_line->stock_id);
$reference = _("Return");
- if ($credited_invoice) {
+ if ($credited_invoice)
$reference .= ' '._("Ex Inv:").' ' . $credited_invoice;
- add_stock_move(ST_CUSTCREDIT, $credit_line->stock_id,
- key($credit_note->trans_no), $credit_note->Location,
- $credit_note->document_date, $reference, $credit_line->qty_dispatched,
- $curr_std_cost, $price);
- }
+ add_stock_move(ST_CUSTCREDIT, $credit_line->stock_id,
+ key($credit_note->trans_no), $credit_note->Location,
+ $credit_note->document_date, $reference, $credit_line->qty_dispatched,
+ $curr_std_cost, $price);
}
//----------------------------------------------------------------------------------------
$total += add_gl_trans_std_cost(ST_CUSTCREDIT, $credit_no, $date_, $stock_gl_codes["cogs_account"],
$dim, $dim2, "", -($unit_cost * $order_line->qty_dispatched),
- PT_CUSTOMER, $order->customer_id,
- "The cost of sales GL posting could not be inserted");
+ PT_CUSTOMER, $order->customer_id);
/*now the stock entry*/
if ($credit_type == "WriteOff") {
$total += add_gl_trans_std_cost(ST_CUSTCREDIT, $credit_no, $date_, $stock_entry_account, 0, 0,
"", ($unit_cost * $order_line->qty_dispatched),
- PT_CUSTOMER, $order->customer_id,
- "The stock side (or write off) of the cost of sales GL posting could not be inserted");
+ PT_CUSTOMER, $order->customer_id);
} /* end of if GL and stock integrated and standard cost !=0 */
if ($order_line->line_price() != 0) {
- $line_taxfree_price =
- get_tax_free_price_for_item($order_line->stock_id, $order_line->price,
- 0, $order->tax_included, $order->tax_group_array);
+ $line_taxfree_price = $order_line->gl_amounts['Net'];
- $line_tax = get_full_price_for_item($order_line->stock_id, $order_line->price,
- 0, $order->tax_included, $order->tax_group_array) - $line_taxfree_price;
+ $line_tax = $order_line->gl_amounts['Tax'];
//Post sales transaction to GL credit sales
else
$sales_account = $stock_gl_codes['sales_account'];
$total += add_gl_trans_customer(ST_CUSTCREDIT, $credit_no, $date_, $sales_account, $dim, $dim2,
- ($line_taxfree_price * $order_line->qty_dispatched), $order->customer_id,
- "The credit note GL posting could not be inserted");
+ ($line_taxfree_price * $order_line->qty_dispatched), $order->customer_id);
if ($order_line->discount_percent != 0) {
$total += add_gl_trans_customer(ST_CUSTCREDIT, $credit_no, $date_, $branch_data["sales_discount_account"],
$dim, $dim2, -($line_taxfree_price * $order_line->qty_dispatched * $order_line->discount_percent),
- $order->customer_id,
- "The credit note discount GL posting could not be inserted");
+ $order->customer_id);
} /*end of if discount !=0 */
} /*if line_price!=0 */
projects / fa-stable.git / blobdiff