Merged changes in main trunk up to 2.0.6 (see CHANGELOG)

[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 2f56e9012d03548015ab02a7fffdb17aa5da7351..16efab69a4883868e252ba221a5548b6c20a308d 100644 (file)
--- a/sales/includes/db/sales_credit_db.inc
+++ b/sales/includes/db/sales_credit_db.inc
@@ -61,7 +61,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);
@@ -97,7 +98,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 +120,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,14 +129,14 @@ 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");
        }
@@ -146,11 +147,14 @@ function write_credit_note($credit_note, $write_off_acc)
                        add_customer_trans_tax_detail_item(11, $credit_no, $taxitem['tax_type_id'],
                                $taxitem['rate'], $credit_note->tax_included, $taxitem['Value']);
 
-                       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) {
@@ -207,15 +211,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 +235,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 +260,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