From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Mon, 25 Jan 2010 13:31:59 +0000 (+0000)
Subject: Rerun. Reports checked for warnings.
X-Git-Tag: 2.3-final~1014
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=f2059a43d9e6098722f28cb623d863cdf9748f75;p=fa-stable.git

Rerun. Reports checked for warnings.
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 97e87261..6a6dbddb 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -22,7 +22,6 @@ $ -> Affected files
 25-Jan-2010 Joe Hunt
 # Bug in the sequence in sales price pickup
 $ /sales/includes/sales_db.inc
-
 + Added document Receipt and small rearrangements and bugfixes
 $ /includes/types.inc
   /includes/ui/ui_view.inc
diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index e15a5df9..c76cfed9 100644
--- a/reporting/includes/doctext.inc
+++ b/reporting/includes/doctext.inc
@@ -56,12 +56,11 @@ if (isset($header2type))
 	}
 	$doc_Our_VAT_no = _("Our VAT No.");
 	$doc_Domicile = _("Domicile");
+	$doc_Extra = "";
 	if($doctype == ST_CUSTDELIVERY || $doctype == ST_SALESQUOTE || $doctype == ST_PURCHORDER || $doctype == ST_SALESORDER ||
 		$doctype == ST_SUPPAYMENT || $doctype == ST_CUSTPAYMENT) {
 		if ($doctype == ST_CUSTPAYMENT)
 	 		$doc_Extra = _("* Subject to Realisation of the Cheque.");
-	 	else	
-	 		$doc_Extra = "";
  		$doc_Bank_Account = '';
 	 	$doc_Please_Quote = _("All amounts stated in");
   } else {
diff --git a/reporting/includes/doctext2.inc b/reporting/includes/doctext2.inc
index 2550dbb7..761f60f7 100644
--- a/reporting/includes/doctext2.inc
+++ b/reporting/includes/doctext2.inc
@@ -54,14 +54,13 @@ if (isset($header2type))
 		$doc_Customers_Ref = "Customers Reference";
 		$doc_Our_Order_No = "Our Order No";
 	}
+	$doc_Extra = "";
 	$doc_Our_VAT_no = "Our VAT No.";
 	$doc_Domicile = "Domicile";
 	if($doctype == ST_CUSTDELIVERY || $doctype == ST_SALESQUOTE || $doctype == ST_PURCHORDER || $doctype == ST_SALESORDER ||
 		$doctype == ST_SUPPAYMENT || $doctype == ST_CUSTPAYMENT) {
 		if ($doctype == ST_CUSTPAYMENT)
 			$doc_Extra = "* Subject to Realisation of the Cheque.";
-		else	
-			$doc_Extra = "";
 		$doc_Bank_Account = '';
 	 	$doc_Please_Quote = "All amounts stated in";
   } else {
diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index ab21d9f2..6a8c3b8e 100644
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -190,10 +190,10 @@
 			$this->row = $temp;
 			if ($doctype == ST_PURCHORDER)
 				$this->Text($mcol, $this->company['coy_name']);
-			elseif ($doctype != ST_SUPPAYMENT)
+			elseif ($doctype != ST_SUPPAYMENT && isset($sales_order['deliver_to']))
 				$this->Text($mcol, $sales_order['deliver_to']);
 			$this->NewLine();
-			if ($doctype != ST_SUPPAYMENT)
+			if ($doctype != ST_SUPPAYMENT && isset($sales_order['deliver_to']))
 				$this->TextWrapLines($mcol, $this->rightMargin - $mcol, $sales_order['delivery_address']);
 		}
 		$this->row = $iline2 - $this->lineHeight - 1;
@@ -218,7 +218,7 @@
 			$this->TextWrap($col, $this->row, $width, $myrow['wo_ref'], 'C');
 		elseif (isset($sales_order["customer_ref"]))
 			$this->TextWrap($col, $this->row, $width, $sales_order["customer_ref"], 'C');
-		else
+		elseif (isset($myrow["debtor_ref"]))
 			$this->TextWrap($col, $this->row, $width, $myrow["debtor_ref"], 'C');
 		$col += $width;	
 		if ($branch != null)
diff --git a/reporting/rep109.php b/reporting/rep109.php
index a6a4a434..2c3bb116 100644
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -158,7 +158,7 @@ function print_sales_orders()
 		else	
 			$rep->TextCol(3, 6, $doc_TOTAL_ORDER2, - 2);
 		$rep->TextCol(6, 7,	$DisplayTotal, -2);
-		$words = price_in_words($myrow['Total'], ST_SALESORDER);
+		$words = price_in_words($myrow["freight_cost"] + $SubTotal, ST_SALESORDER);
 		if ($words != "")
 		{
 			$rep->NewLine(1);
diff --git a/reporting/rep111.php b/reporting/rep111.php
index a8440dfd..5db2f9d0 100644
--- a/reporting/rep111.php
+++ b/reporting/rep111.php
@@ -142,7 +142,7 @@ function print_sales_quotations()
 		else	
 			$rep->TextCol(3, 6, $doc_TOTAL_ORDER2, - 2);
 		$rep->TextCol(6, 7,	$DisplayTotal, -2);
-		$words = price_in_words($myrow['Total'], ST_SALESQUOTE);
+		$words = price_in_words($myrow["freight_cost"] + $SubTotal, ST_SALESQUOTE);
 		if ($words != "")
 		{
 			$rep->NewLine(1);
diff --git a/reporting/rep112.php b/reporting/rep112.php
index 07e312cd..87d87ce5 100644
--- a/reporting/rep112.php
+++ b/reporting/rep112.php
@@ -88,13 +88,10 @@ function print_receipts()
 
 	$cur = get_company_Pref('curr_default');
 
-	if ($email == 0)
-	{
-		$rep = new FrontReport(_('RECEIPT'), "ReceiptBulk", user_pagesize());
-		$rep->currency = $cur;
-		$rep->Font();
-		$rep->Info($params, $cols, null, $aligns);
-	}
+	$rep = new FrontReport(_('RECEIPT'), "ReceiptBulk", user_pagesize());
+	$rep->currency = $cur;
+	$rep->Font();
+	$rep->Info($params, $cols, null, $aligns);
 
 	for ($i = $fno[0]; $i <= $tno[0]; $i++)
 	{
@@ -178,8 +175,7 @@ function print_receipts()
 			$rep->TextCol(6, 7, "__________________");
 		}	
 	}
-	if ($email == 0)
-		$rep->End();
+	$rep->End();
 }
 
 ?>
\ No newline at end of file
diff --git a/reporting/rep209.php b/reporting/rep209.php
index cbdf485f..87b9f559 100644
--- a/reporting/rep209.php
+++ b/reporting/rep209.php
@@ -167,7 +167,7 @@ function print_po()
 		$rep->Font('bold');
 		$rep->TextCol(3, 6, $doc_TOTAL_PO, - 2);
 		$rep->TextCol(6, 7,	$DisplayTotal, -2);
-		$words = price_in_words($myrow['Total'], ST_PURCHORDER);
+		$words = price_in_words($SubTotal, ST_PURCHORDER);
 		if ($words != "")
 		{
 			$rep->NewLine(1);