X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_credit_db.inc;h=3a81094490fa06aa7a69d63c89782929739cab72;hb=fd59c60718609c1bf3240a303030167a4f1b1885;hp=a7f41e33d551f12e4adcc7151b159aad9c88f551;hpb=bc426821d8ae6319bd9394ac275bb700e6394fc3;p=fa-stable.git diff --git a/sales/includes/db/sales_credit_db.inc b/sales/includes/db/sales_credit_db.inc index a7f41e33..3a810944 100644 --- a/sales/includes/db/sales_credit_db.inc +++ b/sales/includes/db/sales_credit_db.inc @@ -6,8 +6,8 @@ // function write_credit_note($credit_note, $write_off_acc) { - $credit_invoice = count($credit_note->src_docs) ? key($credit_note->src_docs) : 0; - + $credit_invoice = is_array($credit_note->src_docs) ? + reset(array_keys($credit_note->src_docs)) : $credit_note->src_docs; $credit_date = $credit_note->document_date; $tax_group_id = $credit_note->tax_group_id; @@ -17,7 +17,7 @@ function write_credit_note($credit_note, $write_off_acc) $trans_no = key($trans_no); } - $credit_type = $write_off_acc == 0 ? 'Return' : 'Writeoff'; + $credit_type = $write_off_acc == 0 ? 'Return' : 'WriteOff'; begin_transaction(); @@ -41,6 +41,12 @@ 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, + // 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]; //? @@ -54,25 +60,24 @@ function write_credit_note($credit_note, $write_off_acc) $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->due_date - ); + $credit_note->order_no, $credit_invoice, $credit_note->ship_via, + null, $alloc, $credit_note->dimension_id, $credit_note->dimension2_id); + // 2008-06-14 extra $alloc, 2008-11-12 dimension_id Joe Hunt if ($trans_no==0) { $credit_note->trans_no = array($credit_no=>0); set_document_parent($credit_note); } else { delete_comments(11, $credit_no); - void_cust_allocations(11, $credit_no); + void_cust_allocations(11, $credit_no, $credit_date); void_gl_trans(11, $credit_no, true); void_stock_move(11, $credit_no); void_customer_trans_tax_details(11, $credit_no); } - if ($credit_invoice) { $invoice_alloc_balance = get_DebtorTrans_allocation_balance(10, $credit_invoice); update_customer_trans_version(get_parent_type(11), $credit_note->src_docs ); - if ($invoice_alloc_balance > 0) { /*the invoice is not already fully allocated */ + 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; @@ -82,14 +87,22 @@ function write_credit_note($credit_note, $write_off_acc) update_debtor_trans_allocation(10, $credit_invoice, $allocate_amount); update_debtor_trans_allocation(11, $credit_no, $allocate_amount); // *** add_cust_allocation($allocate_amount, 11, $credit_no, 10, $credit_invoice); + // Exchange Variations Joe Hunt 2008-09-20 //////////////////////////////////////// + + exchange_variation(11, $credit_no, 10, $credit_invoice, $credit_date, + $allocate_amount, payment_person_types::customer()); + + /////////////////////////////////////////////////////////////////////////// + } } } + foreach ($credit_note->line_items as $credit_line) { if ($credit_invoice && $credit_line->qty_dispatched!=$credit_line->qty_old ) { - update_parent_line(11, $credit_line->id,($credit_line->qty_dispatched + update_parent_line(11, $credit_line->src_id,($credit_line->qty_dispatched -$credit_line->qty_old)); } @@ -139,7 +152,6 @@ function write_credit_note($credit_note, $write_off_acc) "A tax GL posting for this credit note could not be inserted"); } } - add_comments(11, $credit_no, $credit_date, $credit_note->Comments); if ($trans_no == 0) { @@ -193,14 +205,19 @@ function add_gl_trans_credit_costs($order, $order_line, $credit_no, $date_, $credit_type, $write_off_gl_code, &$branch_data) { $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, + // else take the Item Dimension (if any) + $dim = ($order->dimension_id > 0 ? $order->dimension_id : ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_codes["dimension_id"])); + $dim2 = ($order->dimension2_id > 0 ? $order->dimension2_id : ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_codes["dimension2_id"])); /* insert gl_trans to credit stock and debit cost of sales at standard cost*/ - if ($order_line->standard_cost != 0) { + $standard_cost = get_standard_cost($order_line->stock_id); + if ($standard_cost != 0) { /*first the cost of sales entry*/ add_gl_trans_std_cost(11, $credit_no, $date_, $stock_gl_codes["cogs_account"], - $stock_gl_codes["dimension_id"], $stock_gl_codes["dimension2_id"], "", - -($order_line->standard_cost * $order_line->qty_dispatched), + $dim, $dim2, "", -($standard_cost * $order_line->qty_dispatched), payment_person_types::customer(), $order->customer_id, "The cost of sales GL posting could not be inserted"); @@ -213,7 +230,7 @@ function add_gl_trans_credit_costs($order, $order_line, $credit_no, $date_, } add_gl_trans_std_cost(11, $credit_no, $date_, $stock_entry_account, 0, 0, - "", ($order_line->standard_cost * $order_line->qty_dispatched), + "", ($standard_cost * $order_line->qty_dispatched), payment_person_types::customer(), $order->customer_id, "The stock side (or write off) of the cost of sales GL posting could not be inserted"); @@ -231,14 +248,20 @@ function add_gl_trans_credit_costs($order, $order_line, $credit_no, $date_, //Post sales transaction to GL credit sales - add_gl_trans_customer(11, $credit_no, $date_, $stock_gl_codes["sales_account"], 0, 0, + // 2008-06-14. 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']; + add_gl_trans_customer(11, $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"); if ($order_line->discount_percent != 0) { - add_gl_trans_customer(11, $credit_no, $date_, $branch_data["sales_discount_account"], 0, 0, - -($line_taxfree_price * $order_line->qty_dispatched * $order_line->discount_percent), + add_gl_trans_customer(11, $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");