[0004904] Customer Credit Note: fixed invalid inventory GL postings for service items.

[fa-stable.git] / sales / includes / db / sales_credit_db.inc

diff --git a/sales/includes/db/sales_credit_db.inc b/sales/includes/db/sales_credit_db.inc
index b23b96001b0113f564294dcfb620b4dd909cbefc..171c0a7e86a78711039b5c73443d8237966a8998 100644 (file)
--- a/sales/includes/db/sales_credit_db.inc
+++ b/sales/includes/db/sales_credit_db.inc
@@ -61,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;
 
@@ -82,7 +80,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);
@@ -117,12 +114,13 @@ 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, $credit_line->src_id, $trans_no==0 ? 0:  $credit_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);
@@ -184,17 +182,16 @@ 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);
+    $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 +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"]));
@@ -213,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");
 
@@ -231,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");
 
@@ -249,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'];