X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_credit_db.inc;h=8e3cd494b47c9a7992d0cd9db23f6f5285e19cb0;hb=5dec41f0d87e407e1c9ffcb8eb63b92e4e471a9b;hp=2f56e9012d03548015ab02a7fffdb17aa5da7351;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git diff --git a/sales/includes/db/sales_credit_db.inc b/sales/includes/db/sales_credit_db.inc index 2f56e901..8e3cd494 100644 --- a/sales/includes/db/sales_credit_db.inc +++ b/sales/includes/db/sales_credit_db.inc @@ -1,5 +1,14 @@ . +***********************************************************************/ //---------------------------------------------------------------------------------------- // if ($writeoff_acc==0) return goods into $cart->Location // if src_docs!=0 => credit invoice else credit note @@ -31,7 +40,8 @@ function write_credit_note($credit_note, $write_off_acc) $tax_total = 0; foreach ($taxes as $taxitem) { - $tax_total += $taxitem['Value']; + $taxitem['Value'] = round2($taxitem['Value'], user_price_dec()); + $tax_total += $taxitem['Value']; } if ($credit_note->tax_included == 0) { @@ -61,7 +71,8 @@ function write_credit_note($credit_note, $write_off_acc) $credit_note->freight_cost, $freight_added_tax, $credit_note->sales_type, $credit_note->order_no, $credit_invoice, $credit_note->ship_via, - null, $alloc); // 2008-06-14 extra $alloc + null, $alloc, 0, $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); @@ -71,7 +82,7 @@ function write_credit_note($credit_note, $write_off_acc) 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); + void_trans_tax_details(11, $credit_no); } if ($credit_invoice) { $invoice_alloc_balance = get_DebtorTrans_allocation_balance(10, $credit_invoice); @@ -97,7 +108,7 @@ function write_credit_note($credit_note, $write_off_acc) } } - + $total = 0; foreach ($credit_note->line_items as $credit_line) { if ($credit_invoice && $credit_line->qty_dispatched!=$credit_line->qty_old ) { @@ -119,7 +130,7 @@ function write_credit_note($credit_note, $write_off_acc) add_credit_movements_item($credit_note, $credit_line, $credit_type, $line_taxfree_price+$line_tax, $credit_invoice); - add_gl_trans_credit_costs($credit_note, $credit_line, $credit_no, + $total += add_gl_trans_credit_costs($credit_note, $credit_line, $credit_no, $credit_date, $credit_type, $write_off_acc, $branch_data); } /*end of credit_line loop */ @@ -128,33 +139,39 @@ function write_credit_note($credit_note, $write_off_acc) if (($credit_note_total + $credit_note->freight_cost) != 0) { - add_gl_trans_customer(11, $credit_no, $credit_date, $branch_data["receivables_account"], 0, 0, + $total += add_gl_trans_customer(11, $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"); } if ($credit_note->freight_cost !=0) { - add_gl_trans_customer(11, $credit_no, $credit_date, $company_data["freight_act"], 0, 0, + $total += add_gl_trans_customer(11, $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"); } foreach ($taxes as $taxitem) { - if ($taxitem['Value'] != 0) { + if ($taxitem['Net'] != 0) { - add_customer_trans_tax_detail_item(11, $credit_no, $taxitem['tax_type_id'], - $taxitem['rate'], $credit_note->tax_included, $taxitem['Value']); + $ex_rate = get_exchange_rate_from_home_currency(get_customer_currency($credit_note->customer_id), $credit_note->document_date); + add_trans_tax_details(11, $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); - add_gl_trans_customer(11, $credit_no, $credit_date, $taxitem['sales_gl_code'], 0, 0, + $total += add_gl_trans_customer(11, $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"); } } + /*Post a balance post if $total != 0 */ + add_gl_balance(11, $credit_no, $credit_date, -$total, payment_person_types::customer(), $credit_note->customer_id); + add_comments(11, $credit_no, $credit_date, $credit_note->Comments); if ($trans_no == 0) { - references::save_last($credit_note->reference, 11); + references::save(11, $credit_no, $credit_note->reference); } commit_transaction(); @@ -207,15 +224,18 @@ function add_gl_trans_credit_costs($order, $order_line, $credit_no, $date_, $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 = ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_codes["dimension_id"]); - $dim2 = ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_codes["dimension2_id"]); + $dim = ($order->dimension_id != $customer['dimension_id'] ? $order->dimension_id : + ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_codes["dimension_id"])); + $dim2 = ($order->dimension2_id != $customer['dimension2_id'] ? $order->dimension2_id : + ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_codes["dimension2_id"])); + $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) { /*first the cost of sales entry*/ - add_gl_trans_std_cost(11, $credit_no, $date_, $stock_gl_codes["cogs_account"], + $total += add_gl_trans_std_cost(11, $credit_no, $date_, $stock_gl_codes["cogs_account"], $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"); @@ -228,7 +248,7 @@ function add_gl_trans_credit_costs($order, $order_line, $credit_no, $date_, $stock_entry_account = $stock_gl_code["inventory_account"]; } - add_gl_trans_std_cost(11, $credit_no, $date_, $stock_entry_account, 0, 0, + $total += add_gl_trans_std_cost(11, $credit_no, $date_, $stock_entry_account, 0, 0, "", ($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"); @@ -253,19 +273,20 @@ function add_gl_trans_credit_costs($order, $order_line, $credit_no, $date_, $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, + $total += 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"], + $total += 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"); } /*end of if discount !=0 */ } /*if line_price!=0 */ + return $total; } ?> \ No newline at end of file