X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fsales_credit_db.inc;h=a7f41e33d551f12e4adcc7151b159aad9c88f551;hb=7b0f3f68c9aaeffec2f57af1160efaabf7a5abcb;hp=f5d66505b42ee6c403c2cd468da2725bb8b08fd9;hpb=0c1bcd8ce3c089d7ddb3722a097f8fc8417f41e6;p=fa-stable.git

diff --git a/sales/includes/db/sales_credit_db.inc b/sales/includes/db/sales_credit_db.inc
index f5d66505..a7f41e33 100644
--- a/sales/includes/db/sales_credit_db.inc
+++ b/sales/includes/db/sales_credit_db.inc
@@ -44,6 +44,8 @@ function write_credit_note($credit_note, $write_off_acc)
 
 //	$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;
 
 	/*Now insert the Credit Note into the debtor_trans table with the allocations as calculated above*/
 	// all amounts in debtor's currency
@@ -51,7 +53,7 @@ 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->default_sales_type,
+		$credit_note->sales_type,
 		$credit_note->order_no, $credit_invoice, $credit_note->ship_via
 		//, $credit_note->due_date
 		);
@@ -102,7 +104,7 @@ function write_credit_note($credit_note, $write_off_acc)
 			$credit_line->line_price(), $line_tax, $credit_line->discount_percent,
 			$credit_line->standard_cost, $trans_no==0 ? 0:  $credit_line->id);
 
-		add_credit_movements_item(&$credit_note, &$credit_line, $credit_date,
+		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,
@@ -132,7 +134,7 @@ 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, $date_, $taxitem['sales_gl_code'], 0, 0,
+			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");
 		}
@@ -153,7 +155,7 @@ function write_credit_note($credit_note, $write_off_acc)
 // Insert a stock movement coming back in to show the credit note and
 // 	a reversing stock movement to show the write off
 //
-function add_credit_movements_item(&$credit_note, &$credit_line, $date_,
+function add_credit_movements_item(&$credit_note, &$credit_line,
 	$credit_type, $price, $credited_invoice=0)
 {