Fixed sales database design to ensure document relations consistency on line level.

[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 1d44fcb641380765a6047f2bb53e9fcf63a737f0..6f188153330e23374797b913212968cd06066fe6 100644 (file)
--- a/sales/includes/db/sales_credit_db.inc
+++ b/sales/includes/db/sales_credit_db.inc
@@ -71,15 +71,13 @@ function write_credit_note(&$credit_note, $write_off_acc)
                $credit_note->Branch, $credit_date, $credit_note->reference,
                $credit_note_total, 0, $items_added_tax,
                $credit_note->freight_cost, $freight_added_tax,
-               $credit_note->sales_type,
-               $credit_note->order_no, $credit_invoice, $credit_note->ship_via,
+               $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); 
                // 2008-06-14 extra $alloc, 2008-11-12 dimension_id Joe Hunt
 
        if ($trans_no==0) {
                $credit_note->trans_no = array($credit_no=>0);
-               set_document_parent($credit_note);
        } else {
                delete_comments(ST_CUSTCREDIT, $credit_no);
                void_cust_allocations(ST_CUSTCREDIT, $credit_no, $credit_date);
@@ -114,7 +112,7 @@ function write_credit_note(&$credit_note, $write_off_acc)
                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, $trans_no==0 ? 0:  $credit_line->id);
+                       $credit_line->src_id, $credit_line->standard_cost, $trans_no==0 ? 0:  $credit_line->id);
 
                add_credit_movements_item($credit_note, $credit_line,
                        $credit_type, $line_taxfree_price+$line_tax, $credit_invoice);