X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fheader2.inc;h=64f391de30daf9e1f6501871aa551601d2d208d0;hb=95303d7b5280820af76ddbd8908b120813f1e763;hp=6298149b2317940814228707438a2ffe1228440b;hpb=5db6030e4d0126be8883347574111be381478256;p=fa-stable.git

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index 6298149b..64f391de 100644
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -9,6 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
+		// New version (without vertical lines)
 
 		$this->row = $this->pageHeight - $this->topMargin;
 
@@ -57,7 +58,7 @@
 		if ($this->company['coy_logo'] != '')
 		{
 			$logo = $comp_path .'/'. user_company() . "/images/" . $this->company['coy_logo'];
-			$this->AddImage($logo, $ccol, $this->row - 10, 0, 40);
+			$this->AddImage($logo, $ccol, $this->row, 0, 40);
 		}
 		else
 		{
@@ -120,12 +121,16 @@
 		$this->Text($mcol + 100, $doc_Date.":");
 		if ($doctype == 8 || $doctype == 9)
 			$this->Text($mcol + 180, sql2date($myrow['ord_date']));
+		elseif ($doctype == 26)	
+			$this->Text($mcol + 180, sql2date($myrow['date_']));
 		else
 			$this->Text($mcol + 180, sql2date($myrow['tran_date']));
 		$this->NewLine();
 		$this->Text($mcol + 100, $doc_Invoice_no);
 		if ($doctype == 8 || $doctype == 9) // PO or SO
 			$this->Text($mcol + 180, $myrow['order_no']);
+		elseif ($doctype == 26)	
+			$this->Text($mcol + 180, $myrow['id']);
 		else if (isset($myrow['trans_no']) && isset($myrow['reference'])) // INV/CRE/STA
 		{
 			if ($print_invoice_no == 1)
@@ -149,6 +154,12 @@
 		{
 			$this->Text($ccol, $myrow['name'], $icol);
 		}
+		elseif ($doctype == 26)
+		{
+			$this->Text($ccol, $myrow['location_name'], $icol);
+			$this->NewLine();
+			$this->TextWrapLines($ccol, $icol - $ccol, $myrow['delivery_address']);
+		}
 		else
 		{
 			if ($doctype == 8) {
@@ -197,6 +208,8 @@
 		$col = $this->leftMargin;
 		if ($doctype == 8)
 			$this->TextWrap($col, $this->row, $width, $myrow['supp_account_no'], 'C');
+		elseif ($doctype == 26)
+			$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');
 		$col += $width;	
@@ -208,8 +221,12 @@
 			$row = db_fetch($result);
 			$this->TextWrap($col, $this->row, $width, $row['salesman_name'], 'C');
 		}		
+		elseif ($doctype == 26)
+			$this->TextWrap($col, $this->row, $width, wo_types::name($myrow["type"]), 'C');
 		$col += $width;	
-		if ($doctype != 8 && isset($myrow['tax_id']))
+		if ($doctype == 26)
+			$this->TextWrap($col, $this->row, $width, $myrow["StockItemName"], 'C');
+		elseif ($doctype != 8 && isset($myrow['tax_id']))
 			$this->TextWrap($col, $this->row, $width, $myrow['tax_id'], 'C');
 		$col += $width;	
 		if ($doctype == 10)
@@ -225,17 +242,26 @@
 			}		
 			$this->TextWrap($col, $this->row, $width, $line, 'C');
 		}
+		elseif ($doctype == 26)
+			$this->TextWrap($col, $this->row, $width, $myrow["location_name"], 'C');
 		elseif (isset($myrow['order_']))
 			$this->TextWrap($col, $this->row, $width, $myrow['order_'], 'C');
-		$col += $width;	
-		$id = $myrow['payment_terms'];
-		$sql = "SELECT terms FROM ".TB_PREF."payment_terms WHERE terms_indicator='$id'";
-		$result = db_query($sql,"could not get paymentterms");
-		$row = db_fetch($result);
-		$this->TextWrap($col, $this->row, $width, $row["terms"], 'C');
+		$col += $width;
+		if ($doctype == 26)
+			$this->TextWrap($col, $this->row, $width, sql2date($myrow["required_by"]), 'C');
+		else
+		{
+			$id = $myrow['payment_terms'];
+			$sql = "SELECT terms FROM ".TB_PREF."payment_terms WHERE terms_indicator='$id'";
+			$result = db_query($sql,"could not get paymentterms");
+			$row = db_fetch($result);
+			$this->TextWrap($col, $this->row, $width, $row["terms"], 'C');
+		}	
 		$col += $width;	
 		if ($doctype == 9)
 			$this->TextWrap($col, $this->row, $width, sql2date($myrow['delivery_date']), 'C');
+		elseif ($doctype == 26)	
+			$this->TextWrap($col, $this->row, $width, $myrow["units_issued"], 'C');
 		else if ($doctype != 8 && $doctype != 11 && isset($myrow['due_date']))
 			$this->TextWrap($col, $this->row, $width, sql2date($myrow['due_date']), 'C');
 		
@@ -248,7 +274,8 @@
 		$this->Font();
 		$this->Font('italic');
 		$this->row = $iline7 - $this->lineHeight - 6;
-		$this->TextWrap($ccol, $this->row, $right - $ccol, $doc_Please_Quote . " - " . $myrow['curr_code'], 'C');
+		if ($doctype != 26)
+			$this->TextWrap($ccol, $this->row, $right - $ccol, $doc_Please_Quote . " - " . $myrow['curr_code'], 'C');
 		$this->NewLine();
 
 		if (isset($bankaccount['bank_name']))
@@ -285,7 +312,7 @@
 		if (($doctype == 10 || $doctype == 12) && $this->company['legal_text'] != "") 
 		{
 			$this->TextWrap($ccol, $this->row, $right - $ccol, $this->company['legal_text'], 'C');
-			$this->NewLine();
+//			$this->NewLine();
 		}
 		$this->Font();
 		$temp = $iline6 - $this->lineHeight - 2;