[Frontaccounting-cvs_updates] /hgroot/frontaccounting/frontaccounting: Improvement of Customer...
Brought to you by:
frontaccounting,
itronics
From: FrontAccounting <fro...@us...> - 2013-02-16 22:24:24
|
details: http://frontaccounting.hg.sourceforge.net:8000/hgroot/frontaccounting/frontaccounting/hgroot/frontaccounting/frontaccounting/rev/1d7a51059f2f changeset: 3187:1d7a51059f2f user: Joe Hunt <joe...@gm...> date: Sat Feb 16 23:23:48 2013 +0100 description: Improvement of Customer Detail Listing and Supplier Detail Listing (General notes added) diffstat: reporting/rep103.php | 21 +++++++++++++++++---- reporting/rep205.php | 13 +++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diffs (112 lines): diff -r 310ad2659814 -r 1d7a51059f2f reporting/rep103.php --- a/reporting/rep103.php Sat Feb 16 23:22:54 2013 +0100 +++ b/reporting/rep103.php Sat Feb 16 23:23:48 2013 +0100 @@ -35,6 +35,7 @@ ".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, @@ -53,17 +54,18 @@ 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, @@ -186,6 +188,7 @@ } if ($printcustomer) { + $newrow = 0; if ($carea != $myrow['description']) { $rep->fontSize += 2; @@ -251,6 +254,14 @@ $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])) @@ -267,6 +278,8 @@ if (isset($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']); diff -r 310ad2659814 -r 1d7a51059f2f reporting/rep205.php --- a/reporting/rep205.php Sat Feb 16 23:22:54 2013 +0100 +++ b/reporting/rep205.php Sat Feb 16 23:23:48 2013 +0100 @@ -39,8 +39,10 @@ ".TB_PREF."suppliers.curr_code, ".TB_PREF."suppliers.dimension_id, ".TB_PREF."suppliers.dimension2_id, + ".TB_PREF."suppliers.notes, ".TB_PREF."suppliers.gst_no FROM ".TB_PREF."suppliers + WHERE inactive = 0 ORDER BY supp_name"; return db_query($sql,"No transactions were returned"); @@ -129,6 +131,7 @@ } if ($printsupplier) { + $newrow = 0; $rep->NewLine(); // Here starts the new report lines 2013-01-28 Joe Hunt $contacts = get_supplier_contacts($myrow['supplier_id']); @@ -168,6 +171,14 @@ { $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']); @@ -185,6 +196,8 @@ if (isset($adr2[$i])) $rep->TextCol(3, 4, $adr2[$i]); } + if ($newrow != 0 && $newrow < $rep->row) + $rep->row = $newrow; $rep->NewLine(); $rep->Line($rep->row + 8); $rep->NewLine(0, 3); |