Removed obsolete stock_moves.visible field; changed add_stock_move() prototype.

[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 9e8e9ae732a6be9421212439d1d9064075116044..75c91fe17d1b6b0bbff0b99711cd941eb7f5bf43 100644 (file)
--- a/sales/includes/db/sales_credit_db.inc
+++ b/sales/includes/db/sales_credit_db.inc
@@ -122,8 +122,10 @@ function write_credit_note(&$credit_note, $write_off_acc)
                        $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);
 
-               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, $credit_invoice);
 
                $total += add_gl_trans_credit_costs($credit_note, $credit_line, $credit_no,
                    $credit_date, $credit_type, $write_off_acc, $branch_data);
@@ -181,36 +183,19 @@ 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);
 
-       if ($credit_type == "Return") {
-
-               $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,
-               $curr_std_cost,  0, $price,
-               $credit_line->discount_percent);
-
+       $reference = _("Return");
+       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,
-        $curr_std_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,
+        $curr_std_cost, $price,
+           $credit_line->discount_percent);
 }
 
 //----------------------------------------------------------------------------------------