X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep103.php;h=271d6818c8453e8b8943c4c0d4a7f2dbcc41d525;hb=7e6e0807990447d2977b970c3a0fd28dc9250194;hp=3a5fa14493a632f9e2dc20a1c0b7dee8dfd04129;hpb=bac6bc5d595dab716bb3c65e451e81d724b8de2d;p=fa-stable.git diff --git a/reporting/rep103.php b/reporting/rep103.php index 3a5fa144..271d6818 100644 --- a/reporting/rep103.php +++ b/reporting/rep103.php @@ -29,45 +29,59 @@ print_customer_details_listing(); function get_customer_details_for_report($area=0, $salesid=0) { - $sql = "SELECT ".TB_PREF."debtors_master.debtor_no, - ".TB_PREF."debtors_master.name, - ".TB_PREF."debtors_master.address, - ".TB_PREF."sales_types.sales_type, - ".TB_PREF."cust_branch.branch_code, - ".TB_PREF."cust_branch.br_name, - ".TB_PREF."cust_branch.br_address, - ".TB_PREF."cust_branch.contact_name, - ".TB_PREF."cust_branch.area, - ".TB_PREF."cust_branch.salesman, - ".TB_PREF."areas.description, - ".TB_PREF."salesman.salesman_name - 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 - ON ".TB_PREF."debtors_master.sales_type=".TB_PREF."sales_types.id - INNER JOIN ".TB_PREF."areas - ON ".TB_PREF."cust_branch.area = ".TB_PREF."areas.area_code - INNER JOIN ".TB_PREF."salesman - ON ".TB_PREF."cust_branch.salesman=".TB_PREF."salesman.salesman_code"; + $sql = "SELECT debtor.debtor_no, + debtor.name, + debtor.address, + debtor.curr_code, + debtor.dimension_id, + debtor.dimension2_id, + debtor.notes, + pricelist.sales_type, + branch.branch_code, + branch.br_name, + branch.br_address, + branch.br_post_address, + branch.area, + branch.salesman, + area.description, + salesman.salesman_name + FROM ".TB_PREF."debtors_master debtor + INNER JOIN ".TB_PREF."cust_branch branch ON debtor.debtor_no=branch.debtor_no + INNER JOIN ".TB_PREF."sales_types pricelist ON debtor.sales_type=pricelist.id + INNER JOIN ".TB_PREF."areas area ON branch.area = area.area_code + INNER JOIN ".TB_PREF."salesman salesman ON branch.salesman=salesman.salesman_code + WHERE debtor.inactive = 0"; if ($area != 0) { if ($salesid != 0) - $sql .= " WHERE ".TB_PREF."salesman.salesman_code=".db_escape($salesid)." - AND ".TB_PREF."areas.area_code=".db_escape($area); + $sql .= " AND salesman.salesman_code=".db_escape($salesid)." + AND area.area_code=".db_escape($area); else - $sql .= " WHERE ".TB_PREF."areas.area_code=".db_escape($area); + $sql .= " AND area.area_code=".db_escape($area); } elseif ($salesid != 0) - $sql .= " WHERE ".TB_PREF."salesman.salesman_code=".db_escape($salesid); + $sql .= " AND salesman.salesman_code=".db_escape($salesid); $sql .= " ORDER BY description, - ".TB_PREF."salesman.salesman_name, - ".TB_PREF."debtors_master.debtor_no, - ".TB_PREF."cust_branch.branch_code"; + salesman.salesman_name, + debtor.debtor_no, + branch.branch_code"; return db_query($sql,"No transactions were returned"); } +function get_contacts_for_branch($branch) +{ + $sql = "SELECT p.*, r.action, r.type, CONCAT(r.type,'.',r.action) as ext_type + FROM ".TB_PREF."crm_persons p," + .TB_PREF."crm_contacts r + WHERE r.person_id=p.id AND r.type='cust_branch' + AND r.entity_id=".db_escape($branch); + $res = db_query($sql, "can't retrieve branch contacts"); + $results = array(); + while($contact = db_fetch($res)) + $results[] = $contact; + return $results; +} function getTransactions($debtorno, $branchcode, $date) { @@ -98,12 +112,14 @@ function print_customer_details_listing() $more = $_POST['PARAM_3']; $less = $_POST['PARAM_4']; $comments = $_POST['PARAM_5']; - $destination = $_POST['PARAM_6']; + $orientation = $_POST['PARAM_6']; + $destination = $_POST['PARAM_7']; if ($destination) include_once($path_to_root . "/reporting/includes/excel_report.inc"); else include_once($path_to_root . "/reporting/includes/pdf_report.inc"); + $orientation = ($orientation ? 'L' : 'P'); $dec = 0; if ($area == ALL_NUMERIC) @@ -131,7 +147,7 @@ function print_customer_details_listing() $more = (double)$more; $less = (double)$less; - $cols = array(0, 150, 300, 400, 550); + $cols = array(0, 150, 300, 425, 550); $headers = array(_('Customer Postal Address'), _('Price/Turnover'), _('Branch Contact Information'), _('Branch Delivery Address')); @@ -142,9 +158,11 @@ function print_customer_details_listing() 1 => array('text' => _('Activity Since'), 'from' => $from, 'to' => ''), 2 => array('text' => _('Sales Areas'), 'from' => $sarea, 'to' => ''), 3 => array('text' => _('Sales Folk'), 'from' => $salesfolk, 'to' => ''), - 4 => array('text' => _('Activity'), 'from' => $morestr, 'to' => $lessstr)); + 4 => array('text' => _('Activity'), 'from' => $morestr, 'to' => $lessstr . " " . get_company_pref("curr_default"))); - $rep = new FrontReport(_('Customer Details Listing'), "CustomerDetailsListing", user_pagesize()); + $rep = new FrontReport(_('Customer Details Listing'), "CustomerDetailsListing", user_pagesize(), 9, $orientation); + if ($orientation == 'L') + recalculate_cols($cols); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); @@ -167,6 +185,7 @@ function print_customer_details_listing() } if ($printcustomer) { + $newrow = 0; if ($carea != $myrow['description']) { $rep->fontSize += 2; @@ -190,28 +209,36 @@ 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']); + // Here starts the new report lines + $contacts = get_contacts_for_branch($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']); + if ($myrow['br_post_address'] == '') + $adr2 = Explode("\n", $myrow['br_address']); + else + $adr2 = Explode("\n", $myrow['br_post_address']); $count1 = count($adr); $count2 = count($adr2); $count1 = max($count1, $count2); + $count1 = max($count1, 4); 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)); + $rep->TextCol(1, 2, _('Currency') . ": " . $myrow['curr_code']); if (isset($contacts[0])) - $rep->TextCol(2, 3, $contacts[0]['name']); + $rep->TextCol(2, 3, $contacts[0]['name']. " " .$contacts[0]['name2']); if (isset($adr2[0])) $rep->TextCol(3, 4, $adr2[0]); $rep->NewLine(); if (isset($adr[1])) $rep->TextCol(0, 1, $adr[1]); + if ($myrow['dimension_id'] != 0) + { + $dim = get_dimension($myrow['dimension_id']); + $rep->TextCol(1, 2, _('Dimension') . ": " . $dim['name']); + } if (isset($contacts[0])) $rep->TextCol(2, 3, _('Ph') . ": " . $contacts[0]['phone']); if (isset($adr2[1])) @@ -219,48 +246,38 @@ function print_customer_details_listing() $rep->NewLine(); if (isset($adr[2])) $rep->TextCol(0, 1, $adr[2]); + if ($myrow['dimension2_id'] != 0) + { + $dim = get_dimension($myrow['dimension2_id']); + $rep->TextCol(1, 2, _('Dimension') . " 2: " . $dim['name']); + } + if ($myrow['notes'] != '') + { + $oldrow = $rep->row; + $rep->NewLine(); + $rep->TextColLines(1, 2, _("General Notes:")." ".$myrow['notes'], -2); + $newrow = $rep->row; + $rep->row = $oldrow; + } if (isset($contacts[0])) $rep->TextCol(2, 3, _('Fax') . ": " . $contacts[0]['fax']); if (isset($adr2[2])) $rep->TextCol(3, 4, $adr2[2]); + if ($more != 0.0 || $less != 0.0) + $rep->TextCol(1, 2, _('Turnover') . ": " . number_format2($turnover, $dec)); for ($i = 3; $i < $count1; $i++) { $rep->NewLine(); if (isset($adr[$i])) $rep->TextCol(0, 1, $adr[$i]); + if ($i == 3 && isset($contacts[0]) && isset($contacts[0]['email'])) + $rep->TextCol(2, 3, _('Email') . ": " . $contacts[0]['email']); if (isset($adr2[$i])) - $rep->TextCol(0, 1, $adr2[$i]); + $rep->TextCol(3, 4, $adr2[$i]); } + if ($newrow != 0 && $newrow < $rep->row) + $rep->row = $newrow; $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++; - $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']); - - $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); - $count2++; - $count1 = Max($count1, $count2); - $count1 = Max($count1, 4); - $rep->NewLine($count3); - */ $rep->Line($rep->row + 8); $rep->NewLine(0, 3); } @@ -268,4 +285,3 @@ function print_customer_details_listing() $rep->End(); } -?> \ No newline at end of file