Additional conflict fixes after merge.

[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 ed22cba2bec1d56cea3332349c3b1202e421209d..94dbe8a235b291a0edd7becd0f4ad331772b0b59 100644 (file)
--- a/sales/includes/db/sales_credit_db.inc
+++ b/sales/includes/db/sales_credit_db.inc
@@ -61,7 +61,7 @@ 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, $credit_note->dimension_id, $credit_note->dimension2_id); 
+               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) {