X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_credit_db.inc;h=105007bdb06bb616159fd6dd867b55507bbe354d;hb=89e8ca2be9235215ac2e2bf5e58d7eedd2dda84d;hp=b23b96001b0113f564294dcfb620b4dd909cbefc;hpb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;p=fa-stable.git diff --git a/sales/includes/db/sales_credit_db.inc b/sales/includes/db/sales_credit_db.inc index b23b9600..105007bd 100644 --- a/sales/includes/db/sales_credit_db.inc +++ b/sales/includes/db/sales_credit_db.inc @@ -17,6 +17,8 @@ function write_credit_note(&$credit_note, $write_off_acc) { global $Refs; + begin_transaction(__FUNCTION__, func_get_args()); + if (is_array($credit_note->src_docs)) { $docs = array_keys($credit_note->src_docs); @@ -35,7 +37,6 @@ function write_credit_note(&$credit_note, $write_off_acc) $credit_type = $write_off_acc == 0 ? 'Return' : 'WriteOff'; - begin_transaction(); hook_db_prewrite($credit_note, ST_CUSTCREDIT); $company_data = get_company_prefs(); @@ -61,15 +62,13 @@ function write_credit_note(&$credit_note, $write_off_acc) $items_added_tax = 0; $freight_added_tax = 0; } - // 2006-06-14. If the Customer Branch AR Account is set to a Bank Account, + // If the Customer Branch AR Account is set to a Bank Account, // the transaction will be settled at once. if (is_bank_account($branch_data['receivables_account'])) $alloc = $credit_note_total + $items_added_tax + $credit_note->freight_cost + $freight_added_tax; else $alloc = 0; -// $sales_order=$invoice->order_no; //? -// if (is_array($sales_order)) $sales_order = $sales_order[0]; //? if (!isset($credit_note->order_no)) $credit_note->order_no = 0; @@ -82,7 +81,6 @@ function write_credit_note(&$credit_note, $write_off_acc) $credit_note->sales_type, $credit_note->order_no, $credit_note->ship_via, null, $alloc, 0, $credit_note->dimension_id, $credit_note->dimension2_id, $credit_note->payment, $credit_note->tax_included); - // 2008-06-14 extra $alloc, 2008-11-12 dimension_id Joe Hunt if ($trans_no==0) { $credit_note->trans_no = array($credit_no=>0); @@ -104,30 +102,30 @@ function write_credit_note(&$credit_note, $write_off_acc) } $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_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; + $line_taxfree_price = $line->gl_amounts['Net']; - 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 */ @@ -138,14 +136,14 @@ function write_credit_note(&$credit_note, $write_off_acc) $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); } + $freight = get_item($credit_note->ship_via); + 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"); + $total += add_gl_trans_customer(ST_CUSTCREDIT, $credit_no, $credit_date, $freight["freight_act"], 0, 0, + $credit_note->get_tax_free_shipping(), $credit_note->customer_id); } foreach ($taxes as $taxitem) { @@ -155,11 +153,10 @@ function write_credit_note(&$credit_note, $write_off_acc) 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 */ @@ -171,8 +168,8 @@ function write_credit_note(&$credit_note, $write_off_acc) $Refs->save(ST_CUSTCREDIT, $credit_no, $credit_note->reference); } hook_db_postwrite($credit_note, ST_CUSTCREDIT); - commit_transaction(); + commit_transaction(); return $credit_no; } @@ -183,18 +180,17 @@ function write_credit_note(&$credit_note, $write_off_acc) 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 - $curr_std_cost = get_standard_cost($credit_line->stock_id); + //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); } //---------------------------------------------------------------------------------------- @@ -204,7 +200,7 @@ function add_gl_trans_credit_costs($order, $order_line, $credit_no, $date_, { $stock_gl_codes = get_stock_gl_code($order_line->stock_id); $customer = get_customer($order->customer_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 = ($order->dimension_id != $customer['dimension_id'] ? $order->dimension_id : ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_codes["dimension_id"])); @@ -213,14 +209,13 @@ function add_gl_trans_credit_costs($order, $order_line, $credit_no, $date_, $total = 0; /* insert gl_trans to credit stock and debit cost of sales at standard cost*/ - $standard_cost = get_standard_cost($order_line->stock_id); - if ($standard_cost != 0) { + $unit_cost = get_unit_cost($order_line->stock_id); + if ($unit_cost != 0) { /*first the cost of sales entry*/ $total += add_gl_trans_std_cost(ST_CUSTCREDIT, $credit_no, $date_, $stock_gl_codes["cogs_account"], - $dim, $dim2, "", -($standard_cost * $order_line->qty_dispatched), - PT_CUSTOMER, $order->customer_id, - "The cost of sales GL posting could not be inserted"); + $dim, $dim2, "", -($unit_cost * $order_line->qty_dispatched), + PT_CUSTOMER, $order->customer_id); /*now the stock entry*/ if ($credit_type == "WriteOff") { @@ -231,40 +226,34 @@ function add_gl_trans_credit_costs($order, $order_line, $credit_no, $date_, } $total += add_gl_trans_std_cost(ST_CUSTCREDIT, $credit_no, $date_, $stock_entry_account, 0, 0, - "", ($standard_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"); + "", ($unit_cost * $order_line->qty_dispatched), + 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 - // 2008-06-14. If there is a Branch Sales Account, then override with this, + // If there is a Branch Sales Account, then override with this, // else take the Item Sales Account if ($branch_data['sales_account'] != "") $sales_account = $branch_data['sales_account']; 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 */