X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_credit_db.inc;h=171c0a7e86a78711039b5c73443d8237966a8998;hb=13fae1ba1d78cff66e326a006be2f538dd404248;hp=efb743cd073824bdb48c606149f5d74230ef51e6;hpb=dc99a4af783003bbabddd59e87db18a8af4476cb;p=fa-stable.git diff --git a/sales/includes/db/sales_credit_db.inc b/sales/includes/db/sales_credit_db.inc index efb743cd..171c0a7e 100644 --- a/sales/includes/db/sales_credit_db.inc +++ b/sales/includes/db/sales_credit_db.inc @@ -13,12 +13,17 @@ // if ($writeoff_acc==0) return goods into $cart->Location // if src_docs!=0 => credit invoice else credit note // -function write_credit_note($credit_note, $write_off_acc) +function write_credit_note(&$credit_note, $write_off_acc) { global $Refs; - $credit_invoice = is_array($credit_note->src_docs) ? - reset(array_keys($credit_note->src_docs)) : $credit_note->src_docs; + if (is_array($credit_note->src_docs)) + { + $docs = array_keys($credit_note->src_docs); + $credit_invoice = reset($docs); + } + else + $credit_invoice = $credit_note->src_docs; $credit_date = $credit_note->document_date; $tax_group_id = $credit_note->tax_group_id; @@ -31,10 +36,13 @@ 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(); $branch_data = get_branch_accounts($credit_note->Branch); + add_new_exchange_rate(get_customer_currency($credit_note->customer_id), $credit_date, $credit_note->ex_rate); + $credit_note_total = $credit_note->get_items_total_dispatch(); $freight_tax = $credit_note->get_shipping_tax(); @@ -53,15 +61,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; @@ -71,15 +77,12 @@ function write_credit_note($credit_note, $write_off_acc) $credit_note->Branch, $credit_date, $credit_note->reference, $credit_note_total, 0, $items_added_tax, $credit_note->freight_cost, $freight_added_tax, - $credit_note->sales_type, - $credit_note->order_no, $credit_invoice, $credit_note->ship_via, + $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); - // 2008-06-14 extra $alloc, 2008-11-12 dimension_id Joe Hunt + $credit_note->payment, $credit_note->tax_included); if ($trans_no==0) { $credit_note->trans_no = array($credit_no=>0); - set_document_parent($credit_note); } else { delete_comments(ST_CUSTCREDIT, $credit_no); void_cust_allocations(ST_CUSTCREDIT, $credit_no, $credit_date); @@ -88,27 +91,13 @@ function write_credit_note($credit_note, $write_off_acc) void_trans_tax_details(ST_CUSTCREDIT, $credit_no); } if ($credit_invoice) { - $invoice_alloc_balance = get_DebtorTrans_allocation_balance(ST_SALESINVOICE, $credit_invoice); update_customer_trans_version(get_parent_type(ST_CUSTCREDIT), $credit_note->src_docs ); - if ($invoice_alloc_balance > 0) { //the invoice is not already fully allocated - $total = $credit_note_total + $credit_note->freight_cost + - $items_added_tax + $freight_added_tax; - - $allocate_amount = ($invoice_alloc_balance > $total) ? $total : $invoice_alloc_balance; - /*Now insert the allocation record if > 0 */ - if ($allocate_amount != 0) { - update_debtor_trans_allocation(ST_SALESINVOICE, $credit_invoice, $allocate_amount); - update_debtor_trans_allocation(ST_CUSTCREDIT, $credit_no, $allocate_amount); // *** - add_cust_allocation($allocate_amount, ST_CUSTCREDIT, $credit_no, ST_SALESINVOICE, $credit_invoice); - // Exchange Variations Joe Hunt 2008-09-20 //////////////////////////////////////// - - exchange_variation(ST_CUSTCREDIT, $credit_no, ST_SALESINVOICE, $credit_invoice, $credit_date, - $allocate_amount, PT_CUSTOMER); - /////////////////////////////////////////////////////////////////////////// + $total = $credit_note_total + $credit_note->freight_cost + $items_added_tax + + $freight_added_tax; - } - } + if (!credit_sales_invoice_allocate($credit_invoice, $credit_no, $total, $credit_date)) + return false; } $total = 0; @@ -125,13 +114,16 @@ function write_credit_note($credit_note, $write_off_acc) $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; + $credit_line->standard_cost = get_unit_cost($credit_line->stock_id); + 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, $trans_no==0 ? 0: $credit_line->id); + $credit_line->standard_cost, $credit_line->src_id, $trans_no==0 ? 0: $credit_line->id); - add_credit_movements_item($credit_note, $credit_line, - $credit_type, $line_taxfree_price+$line_tax, $credit_invoice); + 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); $total += add_gl_trans_credit_costs($credit_note, $credit_line, $credit_no, $credit_date, $credit_type, $write_off_acc, $branch_data); @@ -161,7 +153,7 @@ 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); + $credit_note->document_date, $credit_note->reference, TR_OUTPUT); $total += add_gl_trans_customer(ST_CUSTCREDIT, $credit_no, $credit_date, $taxitem['sales_gl_code'], 0, 0, $taxitem['Value'], $credit_note->customer_id, @@ -176,7 +168,7 @@ function write_credit_note($credit_note, $write_off_acc) if ($trans_no == 0) { $Refs->save(ST_CUSTCREDIT, $credit_no, $credit_note->reference); } - + hook_db_postwrite($credit_note, ST_CUSTCREDIT); commit_transaction(); return $credit_no; @@ -189,34 +181,18 @@ 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_unit_cost($credit_line->stock_id); - if ($credit_type == "Return") { - - $reference = "Return "; - if ($credited_invoice) { - $reference .= "Ex Inv: " . $credited_invoice; - } + $reference = _("Return"); + if ($credited_invoice) + $reference .= ' '._("Ex Inv:").' ' . $credited_invoice; - } elseif ($credit_type == "WriteOff") { - - $reference = "WriteOff "; - if ($credited_invoice) - $reference .= "Ex Inv: " . $credited_invoice; - - add_stock_move_customer(ST_CUSTCREDIT, $credit_line->stock_id, - key($credit_note->trans_no), $credit_note->Location, - $credit_note->document_date, $reference, -$credit_line->qty_dispatched, - $credit_line->standard_cost, 0, $price, - $credit_line->discount_percent); - - } - add_stock_move_customer(ST_CUSTCREDIT, $credit_line->stock_id, - key($credit_note->trans_no), $credit_note->Location, - $credit_note->document_date, $reference, $credit_line->qty_dispatched, - $credit_line->standard_cost, 0, $price, - $credit_line->discount_percent); - - } + 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); +} //---------------------------------------------------------------------------------------- @@ -225,7 +201,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"])); @@ -234,12 +210,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 ($stock_gl_codes['mb_flag'] != 'D' && $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), + $dim, $dim2, "", -($unit_cost * $order_line->qty_dispatched), PT_CUSTOMER, $order->customer_id, "The cost of sales GL posting could not be inserted"); @@ -252,7 +229,7 @@ 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), + "", ($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"); @@ -270,7 +247,7 @@ function add_gl_trans_credit_costs($order, $order_line, $credit_no, $date_, //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']; @@ -292,4 +269,3 @@ function add_gl_trans_credit_costs($order, $order_line, $credit_no, $date_, return $total; } -?> \ No newline at end of file