Changeset 186

Timestamp:

02/16/07 11:59:50 (5 years ago)

Author:

brieb

Message:

Implemented #3. Fixed XHTML compliance of some <br> tags. Fixed invoice report errors. Fixed update.sql naming problem (had leading space)

Location:

trunk/phpbms

Files:

• changepassword.php (modified) (1 diff)
• common/javascript/fields.js (modified) (1 diff)
• fpdf/font/makefont/makefont.php (modified) (3 diffs)
• head.php (modified) (1 diff)
• include/fields.php (modified) (1 diff)
• include/jstransport.php (added)
• include/search_class.php (modified) (1 diff)
• install/ updatev0.7.sql (deleted)
• install/settings.sql (modified) (1 diff)
• install/updatev0.7.sql (added)
• modules/base/adminsettings.php (modified) (3 diffs)
• modules/base/include/notes_records_process.php (modified) (1 diff)
• modules/base/include/notes_search_functions.php (modified) (1 diff)
• modules/base/include/tabledefs_columns_include.php (modified) (2 diffs)
• modules/base/include/tasks_search_functions.php (modified) (2 diffs)
• modules/base/javascript/snapshot.js (modified) (1 diff)
• modules/base/report/notes_summary.php (modified) (1 diff)
• modules/bms/adminsettings.php (modified) (1 diff)
• modules/bms/install/settings.sql (modified) (1 diff)
• modules/bms/install/uninstall.php (modified) (2 diffs)
• modules/bms/report/clients_purchasehistory.php (modified) (1 diff)
• modules/bms/report/invoices_pdfinvoice.php (modified) (2 diffs)
• modules/bms/report/invoices_pdfpackinglist.php (modified) (1 diff)
• modules/bms/report/invoices_pdfquote.php (modified) (2 diffs)
• modules/bms/report/invoices_pdfworkorder.php (modified) (2 diffs)
• modules/bms/report/invoices_totals.php (modified) (10 diffs)
• modules/bms/report/lineitems_totals.php (modified) (9 diffs)
• modules/bms/report/products_saleshistory.php (modified) (1 diff)
• report/general_labels.php (modified) (1 diff)

trunk/phpbms/changepassword.php

@@ -57 +57 @@
         if($queryresult)
                         echo "ok";
-        else echo mysql_error($dblink)."<br><br>".$querystatement;
+        else echo mysql_error($dblink)."<br /><br />".$querystatement;
 }
                 

trunk/phpbms/common/javascript/fields.js

@@ -210 +210 @@
 // validate phone number
 function validatePhone(thevalue){
-        var pattern= /^(?:[\+]?(?:[\d]{1,3})?(?:\s*[\(\.-]?(\d{3})[\)\.-])?\s*(\d{3})[\.-](\d{4}))(?:(?:[ ]+(?:[xX]|(?:[eE][xX][tT][\.]?)))[ ]?[\d]{1,5})?$/;
-        return !(pattern.exec(thevalue)==null);
+        return !(phoneRegExpression.exec(thevalue)==null);
 }
 

trunk/phpbms/fpdf/font/makefont/makefont.php

@@ -122 +122 @@
                         if(!isset($widths[$map[$i]]))
                         {
-                                echo '<B>Warning:</B> character '.$map[$i].' is missing<BR>';
+                                echo '<B>Warning:</B> character '.$map[$i].' is missing<br />';
                                 $widths[$i]=$widths['.notdef'];
                         }
@@ -390 +390 @@
                         SaveToFile($cmp,gzcompress($file),'b');
                         $s.='$file=\''.$cmp."';\n";
-                        echo 'Font file compressed ('.$cmp.')<BR>';
+                        echo 'Font file compressed ('.$cmp.')<br />';
                 }
                 else
                 {
                         $s.='$file=\''.basename($fontfile)."';\n";
-                        echo '<B>Notice:</B> font file could not be compressed (zlib extension not available)<BR>';
+                        echo '<B>Notice:</B> font file could not be compressed (zlib extension not available)<br />';
                 }
                 if($type=='Type1')
@@ -412 +412 @@
         $s.="?>\n";
         SaveToFile($basename.'.php',$s);
-        echo 'Font definition file generated ('.$basename.'.php'.')<BR>';
+        echo 'Font definition file generated ('.$basename.'.php'.')<br />';
 }
 ?>

trunk/phpbms/head.php

@@ -1 +1 @@
 <link href="<?php echo $_SESSION["app_path"] ?>common/stylesheet/<?php echo $_SESSION["stylesheet"] ?>/base.css" rel="stylesheet" type="text/css" />
 <script language="JavaScript" src="<?php echo $_SESSION["app_path"]?>common/javascript/common.js" type="text/javascript" ></script>
+<script language="JavaScript" src="<?php echo $_SESSION["app_path"]?>include/jstransport.php" type="text/javascript" ></script>
 <script language="JavaScript" src="<?php echo $_SESSION["app_path"]?>common/javascript/menu.js" type="text/javascript" ></script>
 <script language="JavaScript" src="<?php echo $_SESSION["app_path"]?>common/javascript/moo/prototype.lite.js" type="text/javascript" ></script>

trunk/phpbms/include/fields.php

@@ -338 +338 @@
         $querystatement="SELECT ".$displayfield." AS display FROM ".$tableinfo["maintable"]." WHERE ".$getfield."=\"".$initialvalue."\" LIMIT 1;";
         $queryresult = mysql_query($querystatement,$dblink);
-        if(!$queryresult) reportError(100,"Could not retrieve autofill inital data.<br>".$querystatement);
+        if(!$queryresult) reportError(100,"Could not retrieve autofill inital data.<br />".$querystatement);
         if(mysql_num_rows($queryresult))
                 $displayresult = mysql_fetch_array($queryresult);

trunk/phpbms/include/search_class.php

@@ -293 +293 @@
                         
                         $queryresult=mysql_query($querystatement,$dblink);
-                        if(!$queryresult) reportError(100,"Error Retrieving Initial Rowset: ".mysql_error($dblink)."<br>".$querystatement);
+                        if(!$queryresult) reportError(100,"Error Retrieving Initial Rowset: ".mysql_error($dblink)."<br />".$querystatement);
                         
                         return $queryresult;

trunk/phpbms/install/settings.sql

@@ -1 @@
-INSERT INTO `settings` VALUES (1, 'application_name', 'phpBMS');
-INSERT INTO `settings` VALUES (2, 'encryption_seed', 'freeble');
-INSERT INTO `settings` VALUES (3, 'record_limit', '50');
-INSERT INTO `settings` VALUES (4, 'default_load_page', 'modules/base/snapshot.php');
-INSERT INTO `settings` VALUES (5, 'company_name', 'Kreotek LLC');
-INSERT INTO `settings` VALUES (6, 'company_address', '481 Rio Rancho Blvd. NE');
-INSERT INTO `settings` VALUES (7, 'company_csz', 'Rio Rancho, NM 87124');
-INSERT INTO `settings` VALUES (8, 'company_phone', '505.994.6388');
-INSERT INTO `settings` VALUES (11,'stylesheet', 'mozilla'); 
+INSERT INTO `settings` (`name`, `value`) VALUES ('application_name','phpBMS');
+INSERT INTO `settings` (`name`, `value`) VALUES ('encryption_seed','freeble');
+INSERT INTO `settings` (`name`, `value`) VALUES ('record_limit','45');
+INSERT INTO `settings` (`name`, `value`) VALUES ('default_load_page','modules/base/snapshot.php');
+INSERT INTO `settings` (`name`, `value`) VALUES ('company_name','Kreotek LLC');
+INSERT INTO `settings` (`name`, `value`) VALUES ('company_address','481 Rio Rancho Blvd. NE ');
+INSERT INTO `settings` (`name`, `value`) VALUES ('company_csz','Rio Rancho, NM 87124');
+INSERT INTO `settings` (`name`, `value`) VALUES ('company_phone','505.994.6388');
+INSERT INTO `settings` (`name`, `value`) VALUES ('stylesheet','mozilla');
+INSERT INTO `settings` (`name`, `value`) VALUES ('phone_format','US - Loose');

trunk/phpbms/modules/base/adminsettings.php

@@ -157 +157 @@
                 <div class="fauxP">
                         <br />Printed Logo
-                        <div id="graphicHolder"><img src="<?php echo $_SESSION["app_path"]?>dbgraphic.php?t=files&f=file&mf=type&r=1"></div>
+                        <div id="graphicHolder"><img alt="logo" src="<?php echo $_SESSION["app_path"]?>dbgraphic.php?t=files&amp;f=file&amp;mf=type&amp;r=1" /></div>
                 </div>
                 
@@ -181 +181 @@
                                         if ($entry!="." and  $entry!=".." and is_dir($thedir."/".$entry)) {
                                                 echo "<option value=\"".$entry."\"";
-                                                        if($entry==$_SESSION["stylesheet"]) echo " selected ";
+                                                        if($entry==$_SESSION["stylesheet"]) echo " selected=\selected\" ";
                                                 echo ">".$entry."</option>";
                                         }
@@ -190 +190 @@
                 </p>
         </fieldset>
-
+        <fieldset>
+                <legend>Localization</legend>
+                <p>
+                        <label for="">phone format</label><br />
+                        <select id="sphone_format" name="sphone_format">
+                                <option value="US - Strict" <?php if($_SESSION["phone_format"]=="US - Strict")  echo "selected=\selected\"";?>>US - Strict</option>
+                                <option value="US - Loose" <?php if($_SESSION["phone_format"]=="US - Loose")  echo "selected=\selected\"";?>>US - Loose</option>
+                        </select>
+                </p>
+        </fieldset>
         <?php 
         $querystatement="SELECT name FROM modules WHERE name!=\"base\" ORDER BY name";

trunk/phpbms/modules/base/include/notes_records_process.php

@@ -66 +66 @@
                         $thequery = "delete from notes where (createdby=".$_SESSION["userinfo"]["id"]." or assignedtoid=".$_SESSION["userinfo"]["id"].") and (".$dwhereclause.");";
                         $theresult = mysql_query($thequery);
-                        if (!$theresult) die ("Couldn't Update: ".mysql_error($dblink)."<BR>\n SQL STATEMENT [".$thequery."]");         
+                        if (!$theresult) die ("Couldn't Update: ".mysql_error($dblink)."<br />\n SQL STATEMENT [".$thequery."]");               
         break;
         case "edit/view":

trunk/phpbms/modules/base/include/notes_search_functions.php

@@ -79 +79 @@
         $querystatement="SELECT distinct notes.parentid FROM notes where notes.parentid is not null and notes.completed=0 and (".$whereclause.")";
         $repeatqueryresult = mysql_query($querystatement,$dblink);
-        if (!$repeatqueryresult) reportError(300,"Couldn't Delete: ".mysql_error($dblink)."<BR>\n SQL STATEMENT [".$querystatement."]");                
+        if (!$repeatqueryresult) reportError(300,"Couldn't Delete: ".mysql_error($dblink)."<br />\n SQL STATEMENT [".$querystatement."]");              
 
         $querystatement = "DELETE FROM notes WHERE ((notes.createdby=".$_SESSION["userinfo"]["id"]." or notes.assignedtoid=".$_SESSION["userinfo"]["id"].") OR (".$_SESSION["userinfo"]["admin"]." =1)) and (".$whereclause.") and (notes.`repeat`!=1);";
         $queryresult = mysql_query($querystatement,$dblink);
-        if (!$queryresult) reportError(300,"Couldn't Delete: ".mysql_error($dblink)."<BR>\n SQL STATEMENT [".$querystatement."]");              
+        if (!$queryresult) reportError(300,"Couldn't Delete: ".mysql_error($dblink)."<br />\n SQL STATEMENT [".$querystatement."]");            
 
         $message=buildStatusMessage(mysql_affected_rows($dblink),count($theids));

trunk/phpbms/modules/base/include/tabledefs_columns_include.php

@@ -88 +88 @@
                 $querystatement.=" ".$variables["wrap"]." )";           
 
-                if(mysql_query($querystatement,$dblink)) $thereturn ="Column Added"; else $thereturn=mysql_error($dblink)." <BR>".$querystatement;
+                if(mysql_query($querystatement,$dblink)) $thereturn ="Column Added"; else $thereturn=mysql_error($dblink)." <br />".$querystatement;
                 
                 return $thereturn;
@@ -110 +110 @@
                 $querystatement.="wrap=".$variables["wrap"]." ";                
                 $querystatement.="WHERE id=".$variables["columnid"];
-                if(mysql_query($querystatement,$dblink)) $thereturn ="Column Updated"; else $thereturn=mysql_error($dblink)." <br>".$querystatement;
+                if(mysql_query($querystatement,$dblink)) $thereturn ="Column Updated"; else $thereturn=mysql_error($dblink)." <br />".$querystatement;
                 
                 return $thereturn;

trunk/phpbms/modules/base/include/tasks_search_functions.php

@@ -54 +54 @@
         $thequery = "update notes set notes.beenread=1 where (".$whereclause.") and type!=\"System\";";
         $theresult = mysql_query($thequery);
-        if (!$theresult) die ("Couldn't mark as read: ".mysql_error($dblink)."<BR>\n SQL STATEMENT [".$thequery."]");           
+        if (!$theresult) die ("Couldn't mark as read: ".mysql_error($dblink)."<br />\n SQL STATEMENT [".$thequery."]");         
 }
 
@@ -70 +70 @@
         $querystatement = "delete from notes where (createdby=".$_SESSION["userinfo"]["id"]." or assignedtoid=".$_SESSION["userinfo"]["id"].") and (".$whereclause.");";
         $queryresult = mysql_query($querystatement,$dblink);
-        if (!$queryresult) reportError(1,"Couldn't Update: ".mysql_error($dblink)."<BR>\n SQL STATEMENT [".$querystatement."]");                
+        if (!$queryresult) reportError(1,"Couldn't Update: ".mysql_error($dblink)."<br />\n SQL STATEMENT [".$querystatement."]");              
 }
 

trunk/phpbms/modules/base/javascript/snapshot.js

@@ -82 +82 @@
         loadXMLDoc(theURL,null,false);
         if(req.responseText!="success")
-                alert("Error: <br>"+req.responseText);  
+                alert("Error: <br />"+req.responseText);        
         
 }

trunk/phpbms/modules/base/report/notes_summary.php

@@ -54 +54 @@
                                                 FROM notes INNER JOIN users on notes.createdby=users.id ".$_SESSION["printing"]["whereclause"].$sortorder;
         $thequery=mysql_query($querystatement,$dblink);
-        if(!$thequery) die("No records, or invlaid SQL statement:<BR>".$querystatement);
+        if(!$thequery) die("No records, or invlaid SQL statement:<br />".$querystatement);
         //===================================================================================================
         // Generating PDF File.

trunk/phpbms/modules/bms/adminsettings.php

@@ -10 +10 @@
         <p>
                 <label for="sshipping_markup">markup</label><br />
-                <?php field_text("sshipping_markup",$_SESSION["shipping_markup"],0,"","real",Array("size"=>"10","maxlength"=>"10")); ?><br>
-                <span class="notes"><strong>Note:</strong> Enter the number to multiply the calculated shipping cost. <br>
+                <?php field_text("sshipping_markup",$_SESSION["shipping_markup"],0,"","real",Array("size"=>"10","maxlength"=>"10")); ?><br />
+                <span class="notes"><strong>Note:</strong> Enter the number to multiply the calculated shipping cost. <br />
                 For example to mark up shipping costs by 10%, enter 1.1</span>
         </p>

trunk/phpbms/modules/bms/install/settings.sql

@@ -1 @@
-INSERT INTO `settings` VALUES (9, 'shipping_markup', '1.1');
-INSERT INTO `settings` VALUES (10,'shipping_postalcode', '87124');
-INSERT INTO `settings` VALUES (12,'invoice_default_printinstruc', 'Thank You For Your Order.'); 
+INSERT INTO `settings` (`name`, `value`) VALUES ('shipping_markup','1.1');
+INSERT INTO `settings` (`name`, `value`) VALUES ('shipping_postalcode','87124\"');
+INSERT INTO `settings` (`name`, `value`) VALUES ('invoice_default_printinstruc','Thank You For Your Order.');

trunk/phpbms/modules/bms/install/uninstall.php

@@ -65 +65 @@
                         $theresult=mysql_query(trim($deletestatement),$dbtlink); 
                         if(!$theresult){
-                                echo "<div style=\"font-size:10px;\">".mysql_error($dbtlink)." -- '".$deletestatement."'<br>&nbsp;</div>";
+                                echo "<div style=\"font-size:10px;\">".mysql_error($dbtlink)." -- '".$deletestatement."'<br />&nbsp;</div>";
                                 $thereturn="false";
                         }
@@ -162 +162 @@
                 <?php if (!$_POST["command"]){?>
                 <p>Uninstalling the BMS module will <strong>not</strong> delete the module directory module or files form the server, but it will uninstall the entries from the phpBMS applications and drop all the tables that were installed by the module.</p>
-            <div align="center"><strong class="large">Before clicking the uninstall module, make certain this the action you want to take.</strong><br>
+            <div align="center"><strong class="large">Before clicking the uninstall module, make certain this the action you want to take.</strong><br />
             <form name="form1" method="post" action="<?php echo $_SERVER["PHP_SELF"]?>">
                         <input name="command" type="submit" class="Buttons" value="Uninstall BMS Module">

trunk/phpbms/modules/bms/report/clients_purchasehistory.php

@@ -207 +207 @@
         <ul>
                 <li>
-                        source:<br>
+                        source:<br />
                         <?php echo $_SESSION["printing"]["dataprint"]?>
                 </li>
                 <li>
-                        date generated:<br>
+                        date generated:<br />
                         <?php echo date("m/d/Y H:i");?>
                 </li>
                 <li style="padding-left:30px;padding-right:20px;">
-                        view:<br>
+                        view:<br />
                         <?php echo $this->view?>
                 </li>
                 <li>
-                        from:<br>
+                        from:<br />
                         <?php echo $this->fromdate?>
                 </li>
                 <li>
-                        to:<br>
+                        to:<br />
                         <?php echo $this->todate?>
                 </li>
-        </ul><br><br>
+        </ul><br /><br />
 </h2>
 <?php while($therecord=mysql_fetch_array($this->clientQuery)){?>

trunk/phpbms/modules/bms/report/invoices_pdfinvoice.php

@@ -62 +62 @@
                                         date_Format(invoicedate,\"%c/%e/%Y\") as invoicedate,
                                         date_Format(orderdate,\"%c/%e/%Y\") as orderdate,
-                                        date_Format(shippeddate,\"%c/%e/%Y\") as shippeddate,
                                         invoices.totalti-invoices.amountpaid as amountdue,
                                         invoices.ponumber,invoices.discountamount,invoices.discountid,
@@ -344 +343 @@
                         $taxstatement="SELECT id, name, percentage FROM tax WHERE id=".$therecord["taxareaid"];
                         $taxquery=mysql_query($taxstatement,$dblink);
-                        if(!$taxquery) die ("cannot get tax: ".mysql_error($dblink)."<br>".$taxstatement);
+                        if(!$taxquery) die ("cannot get tax: ".mysql_error($dblink)."<br />".$taxstatement);
                         $taxrecord=mysql_fetch_array($taxquery);
                         $pdf->SetFont("Arial","",7);

trunk/phpbms/modules/bms/report/invoices_pdfpackinglist.php

@@ -61 +61 @@
                                         date_Format(invoicedate,\"%c/%e/%Y\") as invoicedate,
                                         date_Format(orderdate,\"%c/%e/%Y\") as orderdate,
-                                        date_Format(shippeddate,\"%c/%e/%Y\") as shippeddate,
                                         invoices.totalti-invoices.amountpaid as amountdue,
                                         invoices.ponumber,invoices.discountamount,invoices.discountid,

trunk/phpbms/modules/bms/report/invoices_pdfquote.php

@@ -61 +61 @@
                                         date_Format(invoicedate,\"%c/%e/%Y\") as invoicedate,
                                         date_Format(orderdate,\"%c/%e/%Y\") as orderdate,
-                                        date_Format(shippeddate,\"%c/%e/%Y\") as shippeddate,
                                         invoices.totalti-invoices.amountpaid as amountdue,
                                         invoices.ponumber,invoices.discountamount,invoices.discountid,
@@ -333 +332 @@
                         $taxstatement="select id, name, percentage from tax where id=".$therecord["taxareaid"];
                         $taxquery=mysql_query($taxstatement,$dblink);
-                        if(!$taxquery) die ("cannot get tax: ".mysql_error($dblink)."<br>".$taxstatement);
+                        if(!$taxquery) die ("cannot get tax: ".mysql_error($dblink)."<br />".$taxstatement);
                         $taxrecord=mysql_fetch_array($taxquery);
                         $pdf->SetFont("Arial","",8);

trunk/phpbms/modules/bms/report/invoices_pdfworkorder.php

@@ -61 +61 @@
                                         date_Format(invoicedate,\"%c/%e/%Y\") as invoicedate,
                                         date_Format(orderdate,\"%c/%e/%Y\") as orderdate,
-                                        date_Format(shippeddate,\"%c/%e/%Y\") as shippeddate,
                                         invoices.totalti-invoices.amountpaid as amountdue,
                                         invoices.ponumber,invoices.discountamount,invoices.discountid,
@@ -355 +354 @@
                         $taxstatement="SELECT id, name, percentage FROM tax WHERE id=".$therecord["taxareaid"];
                         $taxquery=mysql_query($taxstatement,$dblink);
-                        if(!$taxquery) die ("cannot get tax: ".mysql_error($dblink)."<br>".$taxstatement);
+                        if(!$taxquery) die ("cannot get tax: ".mysql_error($dblink)."<br />".$taxstatement);
                         $taxrecord=mysql_fetch_array($taxquery);
                         $pdf->SetFont("Arial","",7);

trunk/phpbms/modules/bms/report/invoices_totals.php

@@ -108 +108 @@
                 $querystatement.=" FROM ".$this->selecttable.$this->whereclause;                
                 $queryresult=mysql_query($querystatement,$dblink);
-                if(!$queryresult) reportError(500,"Bad SQL:".mysql_error($dblink)."<br><br>".$querystatement);
+                if(!$queryresult) reportError(500,"Bad SQL:".mysql_error($dblink)."<br /><br />".$querystatement);
                 $therecord=mysql_fetch_array($queryresult);
                 ?>
@@ -136 +136 @@
                         $querystatement.=" FROM ".$this->selecttable.$this->whereclause.$where." GROUP BY ".$groupby;
                         $queryresult=mysql_query($querystatement,$dblink);
-                        if(!$queryresult) reportError(500,"Bad SQL:".mysql_error($dblink)."<br><br>".$querystatement);
+                        if(!$queryresult) reportError(500,"Bad SQL:".mysql_error($dblink)."<br /><br />".$querystatement);
                         
                         while($therecord=mysql_fetch_array($queryresult)){
@@ -182 +182 @@
                 $querystatement.=" FROM ".$this->selecttable.$this->whereclause.$where." GROUP BY invoices.id";         
                 $queryresult=mysql_query($querystatement,$dblink);
-                if(!$queryresult) reportError(500,"Bad SQL:".mysql_error($dblink)."<br><br>".$querystatement);  
+                if(!$queryresult) reportError(500,"Bad SQL:".mysql_error($dblink)."<br /><br />".$querystatement);      
 
                 while($therecord=mysql_fetch_array($queryresult)){                      
@@ -214 +214 @@
                                                 WHERE lineitems.invoiceid=".$invoiceid;
                 $queryresult=mysql_query($querystatement,$dblink);
-                if(!$queryresult) reportError(500,"Bad SQL:".mysql_error($dblink)."<br><br>".$querystatement);  
+                if(!$queryresult) reportError(500,"Bad SQL:".mysql_error($dblink)."<br /><br />".$querystatement);      
                                 
                 ?>
@@ -282 +282 @@
 <h2>
         <div>
-        source:<br>
+        source:<br />
         <?php echo $_SESSION["printing"]["dataprint"]?>
         </div>
         <div>
-        date generated:<br>
+        date generated:<br />
         <?php echo date("m/d/Y H:i");?>
         </div>
@@ -370 +370 @@
         <form action="<?php echo $_SERVER["PHP_SELF"]?>" method="post" name="totals" onSubmit="return submitForm(this)">
                 <div>
-                        report title<br>                        
+                        report title<br />                      
                         <input type="text" name="reporttitle" value="" style="width:100%">
                 </div>
                 <div class="box">
-                        <strong>Grouping</strong><br>
+                        <strong>Grouping</strong><br />
                         <table border=0 cellspacing=0 cellpadding=0>
                                 <tr>
                                         <td width="50%">
-                                                selected groupings<br>
+                                                selected groupings<br />
                                                 <select name="selectedgroupings" size="5" style="width:100%" multiple>
                                                 </select>
@@ -384 +384 @@
                                         </td>
                                         <td>
-                                                <div><br>
-                                                        <input type="button" value="&lt;&lt;" class="Buttons" onClick="moveItem('groupings','to',this.form);"><br><br>
+                                                <div><br />
+                                                        <input type="button" value="&lt;&lt;" class="Buttons" onClick="moveItem('groupings','to',this.form);"><br /><br />
                                                         <input type="button" value="&gt;&gt;" class="Buttons" onClick="moveItem('groupings','from',this.form);">                                                        
                                                 </div>
                                         </td>
                                         <td width="50%">
-                                                available groupings<br>
+                                                available groupings<br />
                                                 <select name="availablegroupings" size="5" style="width:100%" multiple>
                                                         <option value="invoices.invoicedate">Invoice Date</option>
@@ -419 +419 @@
                 </div>
                 <div class="box">
-                        <strong>Columns</strong><br>
+                        <strong>Columns</strong><br />
                         <table border=0 cellspacing=0 cellpadding=0>
                                 <tr>
                                         <td width="50%">
-                                                shown columns<br>
+                                                shown columns<br />
                                                 <select name="selectedcolumns" size="7" style="width:100%">
                                                         <option value="concat('$',format(sum(invoices.totalti),2))">Invoice Total</option>                                              
@@ -430 +430 @@
                                         </td>
                                         <td>
-                                                <div><br>
-                                                        <input type="button" value="&lt;&lt;" class="Buttons" onClick="moveItem('columns','to',this.form);"><br><br>
+                                                <div><br />
+                                                        <input type="button" value="&lt;&lt;" class="Buttons" onClick="moveItem('columns','to',this.form);"><br /><br />
                                                         <input type="button" value="&gt;&gt;" class="Buttons" onClick="moveItem('columns','from',this.form);">                                                  
                                                 </div>
                                         </td>
                                         <td width="50%">
-                                                available columns<br>
+                                                available columns<br />
                                                 <select name="availablecolumns" size="7" style="width:100%">
                                                         <option value="count(invoices.id)">count</option>                                               
@@ -462 +462 @@
                 </div>
                 <div class=box>
-                        <strong>Additional Options</strong><br>
-                        information shown<br>
+                        <strong>Additional Options</strong><br />
+                        information shown<br />
                         <select name="showwhat">
                                 <option selected value="totals">Totals Only</option>

trunk/phpbms/modules/bms/report/lineitems_totals.php

@@ -115 +115 @@
                 $querystatement.=" FROM ".$this->selecttable.$this->whereclause;                
                 $queryresult=mysql_query($querystatement,$dblink);
-                if(!$queryresult) reportError(500,"showGrandTotals - Bad SQL:".mysql_error($dblink)."<br><br>".$querystatement);
+                if(!$queryresult) reportError(500,"showGrandTotals - Bad SQL:".mysql_error($dblink)."<br /><br />".$querystatement);
                 $therecord=mysql_fetch_array($queryresult);
                 ?>
@@ -143 +143 @@
                         $querystatement.=" FROM ".$this->selecttable.$this->whereclause.$where." GROUP BY ".$groupby;
                         $queryresult=mysql_query($querystatement,$dblink);
-                        if(!$queryresult) reportError(500,"showGroup - Bad SQL:".mysql_error($dblink)."<br><br>".$querystatement);
+                        if(!$queryresult) reportError(500,"showGroup - Bad SQL:".mysql_error($dblink)."<br /><br />".$querystatement);
                         
                         while($therecord=mysql_fetch_array($queryresult)){
@@ -189 +189 @@
                                                 FROM ".$this->selecttable.$this->whereclause.$where." GROUP BY lineitems.id ";
                 $queryresult=mysql_query($querystatement,$dblink);
-                if(!$queryresult) reportError(500,"showLineItems Bad SQL:".mysql_error($dblink)."<br><br>".$querystatement);    
+                if(!$queryresult) reportError(500,"showLineItems Bad SQL:".mysql_error($dblink)."<br /><br />".$querystatement);        
                                 
                 ?>
@@ -260 +260 @@
 <h2>
         <div>
-        source:<br>
+        source:<br />
         <?php echo $_SESSION["printing"]["dataprint"]?>
         </div>
         <div>
-        date generated:<br>
+        date generated:<br />
         <?php echo date("m/d/Y H:i");?>
         </div>
@@ -346 +346 @@
         <form action="<?php echo $_SERVER["PHP_SELF"]?>" method="post" name="totals" onSubmit="return submitForm(this)">
                 <div>
-                        report title<br>                        
+                        report title<br />                      
                         <input type="text" name="reporttitle" value="" style="width:100%">
                 </div>
                 <div class="box">
-                        <strong>Grouping</strong><br>
+                        <strong>Grouping</strong><br />
                         <table border=0 cellspacing=0 cellpadding=0>
                                 <tr>
                                         <td width="50%">
-                                                selected groupings<br>
+                                                selected groupings<br />
                                                 <select name="selectedgroupings" size="5" style="width:100%" multiple>
                                                 </select>
@@ -360 +360 @@
                                         </td>
                                         <td>
-                                                <div><br>
-                                                        <input type="button" value="&lt;&lt;" class="Buttons" onClick="moveItem('groupings','to',this.form);"><br><br>
+                                                <div><br />
+                                                        <input type="button" value="&lt;&lt;" class="Buttons" onClick="moveItem('groupings','to',this.form);"><br /><br />
                                                         <input type="button" value="&gt;&gt;" class="Buttons" onClick="moveItem('groupings','from',this.form);">                                                        
                                                 </div>
                                         </td>
                                         <td width="50%">
-                                                available groupings<br>
+                                                available groupings<br />
                                                 <select name="availablegroupings" size="5" style="width:100%" multiple>
                                                         <option value="invoices.id">Invoice ID</option>
@@ -399 +399 @@
                 </div>
                 <div class="box">
-                        <strong>Columns</strong><br>
+                        <strong>Columns</strong><br />
                         <table border=0 cellspacing=0 cellpadding=0>
                                 <tr>
                                         <td width="50%">
-                                                shown columns<br>
+                                                shown columns<br />
                                                 <select name="selectedcolumns" size="7" style="width:100%">
                                                         <option value="concat('$',format(sum(lineitems.unitprice*lineitems.quantity),2))">Extended Price</option>                                               
@@ -410 +410 @@
                                         </td>
                                         <td>
-                                                <div><br>
-                                                        <input type="button" value="&lt;&lt;" class="Buttons" onClick="moveItem('columns','to',this.form);"><br><br>
+                                                <div><br />
+                                                        <input type="button" value="&lt;&lt;" class="Buttons" onClick="moveItem('columns','to',this.form);"><br /><br />
                                                         <input type="button" value="&gt;&gt;" class="Buttons" onClick="moveItem('columns','from',this.form);">                                                  
                                                 </div>
                                         </td>
                                         <td width="50%">
-                                                available columns<br>
+                                                available columns<br />
                                                 <select name="availablecolumns" size="7" style="width:100%">
                                                         <option value="count(lineitems.id)">count</option>                                              
@@ -437 +437 @@
                 </div>
                 <div class=box>
-                        <strong>Additional Options</strong><br>
-                        information shown<br>
+                        <strong>Additional Options</strong><br />
+                        information shown<br />
                         <select name="showwhat">
                                 <option selected value="totals">Totals Only</option>

trunk/phpbms/modules/bms/report/products_saleshistory.php

@@ -212 +212 @@
         <ul>
                 <li>
-                        source:<br>
+                        source:<br />
                         <?php echo $_SESSION["printing"]["dataprint"]?>
                 </li>
                 <li>
-                        date generated:<br>
+                        date generated:<br />
                         <?php echo date("m/d/Y H:i");?>
                 </li>
                 <li style="padding-left:30px;padding-right:20px;">
-                        view:<br>
+                        view:<br />
                         <?php echo $this->view?>
                 </li>
                 <li>
-                        from:<br>
+                        from:<br />
                         <?php echo $this->fromdate?>
                 </li>
                 <li>
-                        to:<br>
+                        to:<br />
                         <?php echo $this->todate?>
                 </li>
-        </ul><br><br>
+        </ul><br /><br />
 </h2>
 <?php while($therecord=mysql_fetch_array($this->productQuery)){?>

trunk/phpbms/report/general_labels.php

@@ -63 +63 @@
                 $reportquerystatement.=$_SESSION["printing"]["whereclause"].$sortorder;
                 $thequery=mysql_query($reportquerystatement,$dblink);
-                if(!$thequery) die("No records, or invlaid SQL statement:<BR>".$reportquerystatement);
+                if(!$thequery) die("No records, or invlaid SQL statement:<br />".$reportquerystatement);
                 //===================================================================================================
                 // Generating PDF File.