X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fheader2.inc;h=64f391de30daf9e1f6501871aa551601d2d208d0;hb=95303d7b5280820af76ddbd8908b120813f1e763;hp=6c4e08a1058997d3d34aad6b7573287dfcb53be9;hpb=ba80e275bd7d437b92dd62eec01d97e461c74bce;p=fa-stable.git diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc index 6c4e08a1..64f391de 100644 --- a/reporting/includes/header2.inc +++ b/reporting/includes/header2.inc @@ -1,10 +1,21 @@ . +***********************************************************************/ + // New version (without vertical lines) $this->row = $this->pageHeight - $this->topMargin; $upper = $this->row - 2 * $this->lineHeight; $lower = $this->bottomMargin + 6 * $this->lineHeight; - $iline1 = $upper - 7 * $this->lineHeight; + $iline1 = $upper - 7.5 * $this->lineHeight; $iline2 = $iline1 - 8 * $this->lineHeight; $iline3 = $iline2 - 1.5 * $this->lineHeight; $iline4 = $iline3 - 1.5 * $this->lineHeight; @@ -47,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 { @@ -97,19 +108,29 @@ $this->Text($ccol, $doc_Our_VAT_no, $c2col); $this->Text($c2col, $this->company['gst_no'], $mcol); $this->NewLine(); - } + } + if (($doctype == 10 || $doctype == 12) && $this->company['domicile'] != "") + { + $this->Text($ccol, $doc_Domicile, $c2col); + $this->Text($c2col, $this->company['domicile'], $mcol); + $this->NewLine(); + } $this->Font(); $this->row = $adrline; $this->NewLine(3); $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) @@ -133,14 +154,29 @@ { $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) - $this->Text($ccol, $myrow['supp_name'], $icol); - else - $this->Text($ccol, $myrow['DebtorName'], $icol); + if ($doctype == 8) { + $name = $myrow['supp_name']; + $addr = $myrow['address']; + } else { + if (trim($branch['br_address']) != '') { + $name = $branch['br_name']; + $addr = $branch['br_address']; + } else { + $name = $myrow['DebtorName']; + $addr = $myrow['address']; + } + } + $this->Text($ccol, $name, $icol); $this->NewLine(); - $this->TextWrapLines($ccol, $icol - $ccol, $myrow['address']); + $this->TextWrapLines($ccol, $icol - $ccol, $addr); } if ($sales_order != NULL) { @@ -160,14 +196,21 @@ $col += $width; $this->TextWrap($col, $this->row, $width, $doc_Your_VAT_no, 'C'); $col += $width; - $this->TextWrap($col, $this->row, $width, $doc_Our_Order_No, 'C'); + if ($doctype == 10) + $this->TextWrap($col, $this->row, $width, $doc_Delivery_no, 'C'); + else + $this->TextWrap($col, $this->row, $width, $doc_Our_Order_No, 'C'); $col += $width; $this->TextWrap($col, $this->row, $width, $doc_Payment_Terms, 'C'); $col += $width; $this->TextWrap($col, $this->row, $width, $doc_Due_Date, 'C'); $this->row = $iline3 - $this->lineHeight - 1; $col = $this->leftMargin; - if ($sales_order != NULL) + 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; if ($branch != null) @@ -178,37 +221,61 @@ $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 (isset($myrow['order_'])) + if ($doctype == 10) + { + $deliveries = get_parent_trans(10,$myrow['trans_no']); + $line = ""; + foreach ($deliveries as $delivery) + { + if ($line == "") + $line .= "$delivery"; + else + $line .= ",$delivery"; + } + $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'); $this->row = $iline5 - $this->lineHeight - 1; $this->Font('bold'); $count = count($this->headers); - if (user_pagesize() == "Letter") - $this->cols[$count] += 40; - else - $this->cols[$count] += 5; + $this->cols[$count] = $right - 3; for ($i = 0; $i < $count; $i++) $this->TextCol($i, $i + 1, $this->headers[$i], -2); $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'])) @@ -242,6 +309,11 @@ $this->TextWrap($ccol, $this->row, $right - $ccol, $this->params['comments'], 'C'); $this->NewLine(); } + if (($doctype == 10 || $doctype == 12) && $this->company['legal_text'] != "") + { + $this->TextWrap($ccol, $this->row, $right - $ccol, $this->company['legal_text'], 'C'); +// $this->NewLine(); + } $this->Font(); $temp = $iline6 - $this->lineHeight - 2; ?> \ No newline at end of file