".TB_PREF."debtors_master.curr_code,
".TB_PREF."debtors_master.dimension_id,
".TB_PREF."debtors_master.dimension2_id,
+ ".TB_PREF."debtors_master.notes,
".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.br_post_address,
".TB_PREF."cust_branch.contact_name,
".TB_PREF."cust_branch.area,
".TB_PREF."cust_branch.salesman,
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";
+ ON ".TB_PREF."cust_branch.salesman=".TB_PREF."salesman.salesman_code
+ WHERE ".TB_PREF."debtors_master.inactive = 0";
if ($area != 0)
{
if ($salesid != 0)
- $sql .= " WHERE ".TB_PREF."salesman.salesman_code=".db_escape($salesid)."
+ $sql .= " AND ".TB_PREF."salesman.salesman_code=".db_escape($salesid)."
AND ".TB_PREF."areas.area_code=".db_escape($area);
else
- $sql .= " WHERE ".TB_PREF."areas.area_code=".db_escape($area);
+ $sql .= " AND ".TB_PREF."areas.area_code=".db_escape($area);
}
elseif ($salesid != 0)
- $sql .= " WHERE ".TB_PREF."salesman.salesman_code=".db_escape($salesid);
+ $sql .= " AND ".TB_PREF."salesman.salesman_code=".db_escape($salesid);
$sql .= " ORDER BY description,
".TB_PREF."salesman.salesman_name,
".TB_PREF."debtors_master.debtor_no,
}
if ($printcustomer)
{
+ $newrow = 0;
if ($carea != $myrow['description'])
{
$rep->fontSize += 2;
$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]);
$rep->TextCol(1, 2, _('Currency') . ": " . $myrow['curr_code']);
$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, _("Gereral 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->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 (isset($contacts[0]) && isset($contacts[0]['email']))
- {
- $rep->NewLine();
- $rep->TextCol(2, 4, _('Email') . ": " . $contacts[0]['email']);
- }
+ if ($newrow != 0 && $newrow < $rep->row)
+ $rep->row = $newrow;
$rep->NewLine();
/*
$rep->TextCol(0, 1, $myrow['name']);