X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep103.php;fp=reporting%2Frep103.php;h=3a5fa14493a632f9e2dc20a1c0b7dee8dfd04129;hb=46c5f7a65a7659a44ae8254c63152074363d3987;hp=8ee0abbe62971dcf34bee9d819566a171822829e;hpb=35f482e2a9246960de37e5f1d975c734e08951e6;p=fa-stable.git diff --git a/reporting/rep103.php b/reporting/rep103.php index 8ee0abbe..3a5fa144 100644 --- a/reporting/rep103.php +++ b/reporting/rep103.php @@ -1,12 +1,12 @@ . ***********************************************************************/ $page_security = 'SA_CUSTBULKREP'; @@ -27,7 +27,7 @@ include_once($path_to_root . "/gl/includes/gl_db.inc"); print_customer_details_listing(); -function get_customer_details_for_report($area=0, $salesid=0) +function get_customer_details_for_report($area=0, $salesid=0) { $sql = "SELECT ".TB_PREF."debtors_master.debtor_no, ".TB_PREF."debtors_master.name, @@ -37,14 +37,11 @@ function get_customer_details_for_report($area=0, $salesid=0) ".TB_PREF."cust_branch.br_name, ".TB_PREF."cust_branch.br_address, ".TB_PREF."cust_branch.contact_name, - ".TB_PREF."cust_branch.phone, - ".TB_PREF."cust_branch.fax, - ".TB_PREF."cust_branch.email, ".TB_PREF."cust_branch.area, ".TB_PREF."cust_branch.salesman, ".TB_PREF."areas.description, ".TB_PREF."salesman.salesman_name - FROM ".TB_PREF."debtors_master + FROM ".TB_PREF."debtors_master INNER JOIN ".TB_PREF."cust_branch ON ".TB_PREF."debtors_master.debtor_no=".TB_PREF."cust_branch.debtor_no INNER JOIN ".TB_PREF."sales_types @@ -56,9 +53,9 @@ function get_customer_details_for_report($area=0, $salesid=0) if ($area != 0) { if ($salesid != 0) - $sql .= " WHERE ".TB_PREF."salesman.salesman_code=".db_escape($salesid)." + $sql .= " WHERE ".TB_PREF."salesman.salesman_code=".db_escape($salesid)." AND ".TB_PREF."areas.area_code=".db_escape($area); - else + else $sql .= " WHERE ".TB_PREF."areas.area_code=".db_escape($area); } elseif ($salesid != 0) @@ -71,7 +68,7 @@ function get_customer_details_for_report($area=0, $salesid=0) return db_query($sql,"No transactions were returned"); } - + function getTransactions($debtorno, $branchcode, $date) { $date = date2sql($date); @@ -81,7 +78,7 @@ function getTransactions($debtorno, $branchcode, $date) WHERE debtor_no=".db_escape($debtorno)." AND branch_code=".db_escape($branchcode)." AND (type=".ST_SALESINVOICE." OR type=".ST_CUSTCREDIT.") - AND trandate >='$date'"; + AND tran_date >='$date'"; $result = db_query($sql,"No transactions were returned"); @@ -106,7 +103,7 @@ function print_customer_details_listing() include_once($path_to_root . "/reporting/includes/excel_report.inc"); else include_once($path_to_root . "/reporting/includes/pdf_report.inc"); - + $dec = 0; if ($area == ALL_NUMERIC) @@ -130,8 +127,8 @@ function print_customer_details_listing() $lessstr = _('Less than ') . number_format2($less, $dec); else $lessstr = ''; - - $more = (double)$more; + + $more = (double)$more; $less = (double)$less; $cols = array(0, 150, 300, 400, 550); @@ -151,13 +148,13 @@ function print_customer_details_listing() $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); - $rep->Header(); + $rep->NewPage(); $result = get_customer_details_for_report($area, $folk); - + $carea = ''; $sman = ''; - while ($myrow=db_fetch($result)) + while ($myrow=db_fetch($result)) { $printcustomer = true; if ($more != '' || $less != '') @@ -167,25 +164,25 @@ function print_customer_details_listing() $printcustomer = false; if ($less != 0.0 && $turnover >= (double)$less) $printcustomer = false; - } + } if ($printcustomer) { if ($carea != $myrow['description']) { $rep->fontSize += 2; $rep->NewLine(2, 7); - $rep->Font('bold'); + $rep->Font('bold'); $rep->TextCol(0, 3, _('Customers in') . " " . $myrow['description']); $carea = $myrow['description']; $rep->fontSize -= 2; $rep->Font(); $rep->NewLine(); - } + } if ($sman != $myrow['salesman_name']) { $rep->fontSize += 2; $rep->NewLine(1, 7); - $rep->Font('bold'); + $rep->Font('bold'); $rep->TextCol(0, 3, $myrow['salesman_name']); $sman = $myrow['salesman_name']; $rep->fontSize -= 2; @@ -193,28 +190,77 @@ function print_customer_details_listing() $rep->NewLine(); } $rep->NewLine(); + // Here starts the new report lines 2010-11-02 Joe Hunt + $contacts = get_branch_contacts($myrow['branch_code']); + $rep->TextCol(0, 1, $myrow['name']); + $rep->TextCol(1, 2, _('Price List') . ": " . $myrow['sales_type']); + $rep->TextCol(2, 3, $myrow['br_name']); + $rep->NewLine(); + $adr = Explode("\n", $myrow['address']); + $adr2 = Explode("\n", $myrow['br_address']); + $count1 = count($adr); + $count2 = count($adr2); + $count1 = max($count1, $count2); + if (isset($adr[0])) + $rep->TextCol(0, 1, $adr[0]); + if ($more != 0.0 || $less != 0.0) + $rep->TextCol(1, 2, _('Turnover') . ": " . number_format2($turnover, $dec)); + if (isset($contacts[0])) + $rep->TextCol(2, 3, $contacts[0]['name']); + if (isset($adr2[0])) + $rep->TextCol(3, 4, $adr2[0]); + $rep->NewLine(); + if (isset($adr[1])) + $rep->TextCol(0, 1, $adr[1]); + if (isset($contacts[0])) + $rep->TextCol(2, 3, _('Ph') . ": " . $contacts[0]['phone']); + if (isset($adr2[1])) + $rep->TextCol(3, 4, $adr2[1]); + $rep->NewLine(); + if (isset($adr[2])) + $rep->TextCol(0, 1, $adr[2]); + if (isset($contacts[0])) + $rep->TextCol(2, 3, _('Fax') . ": " . $contacts[0]['fax']); + if (isset($adr2[2])) + $rep->TextCol(3, 4, $adr2[2]); + for ($i = 3; $i < $count1; $i++) + { + $rep->NewLine(); + if (isset($adr[$i])) + $rep->TextCol(0, 1, $adr[$i]); + if (isset($adr2[$i])) + $rep->TextCol(0, 1, $adr2[$i]); + } + $rep->NewLine(); + /* $rep->TextCol(0, 1, $myrow['name']); $adr = Explode("\n", $myrow['address']); $count1 = count($adr); for ($i = 0; $i < $count1; $i++) $rep->TextCol(0, 1, $adr[$i], 0, ($i + 1) * $rep->lineHeight); - $count1++; + $count1++; $rep->TextCol(1, 2, _('Price List') . ": " . $myrow['sales_type']); if ($more != 0.0 || $less != 0.0) $rep->TextCol(1, 2, _('Turnover') . ": " . number_format2($turnover, $dec), 0, $rep->lineHeight); $rep->TextCol(2, 3, $myrow['br_name']); - $rep->TextCol(2, 3, $myrow['contact_name'], 0, $rep->lineHeight); - $rep->TextCol(2, 3, _('Ph') . ": " . $myrow['phone'], 0, 2 * $rep->lineHeight); - $rep->TextCol(2, 3, _('Fax') . ": " . $myrow['fax'], 0, 3 * $rep->lineHeight); + + $contacts = get_branch_contacts($myrow['branch_code']); + if (isset($contacts[0])) + { + $rep->TextCol(2, 3, $contacts[0]['name'], 0, $rep->lineHeight); + $rep->TextCol(2, 3, _('Ph') . ": " . $contacts[0]['phone'], 0, 2 * $rep->lineHeight); + $rep->TextCol(2, 3, _('Fax') . ": " . $contacts[0]['fax'], 0, 3 * $rep->lineHeight); + } $adr = Explode("\n", $myrow['br_address']); $count2 = count($adr); for ($i = 0; $i < $count2; $i++) $rep->TextCol(3, 4, $adr[$i], 0, ($i + 1) * $rep->lineHeight); - $rep->TextCol(3, 4, $myrow['email'], 0, ($count2 + 1) * $rep->lineHeight); + //$rep->TextCol(3, 4, $myrow['email'], 0, ($count2 + 1) * $rep->lineHeight); $count2++; $count1 = Max($count1, $count2); $count1 = Max($count1, 4); - $rep->NewLine($count1); + $rep->NewLine($count3); + */ $rep->Line($rep->row + 8); $rep->NewLine(0, 3); }