Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 186

Timestamp:

02/16/07 11:59:50

Author:

brieb

Message:

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

Files:

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

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/phpbms/changepassword.php

r145	r186
57	57	if($queryresult)
58	58	echo "ok";
59		else echo mysql_error($dblink)."<br~~><br~~>".$querystatement;
	59	else echo mysql_error($dblink)."<br /><br />".$querystatement;
60	60	}
61	61

trunk/phpbms/common/javascript/fields.js

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

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

r1	r186
122	122	if(!isset($widths[$map[$i]]))
123	123	{
124		echo '<B>Warning:</B> character '.$map[$i].' is missing<BR>';
	124	echo '<B>Warning:</B> character '.$map[$i].' is missing<br />';
125	125	$widths[$i]=$widths['.notdef'];
126	126	}
…	…
390	390	SaveToFile($cmp,gzcompress($file),'b');
391	391	$s.='$file=\''.$cmp."';\n";
392		echo 'Font file compressed ('.$cmp.')<BR>';
	392	echo 'Font file compressed ('.$cmp.')<br />';
393	393	}
394	394	else
395	395	{
396	396	$s.='$file=\''.basename($fontfile)."';\n";
397		echo '<B>Notice:</B> font file could not be compressed (zlib extension not available)<BR>';
	397	echo '<B>Notice:</B> font file could not be compressed (zlib extension not available)<br />';
398	398	}
399	399	if($type=='Type1')
…	…
412	412	$s.="?>\n";
413	413	SaveToFile($basename.'.php',$s);
414		echo 'Font definition file generated ('.$basename.'.php'.')<BR>';
	414	echo 'Font definition file generated ('.$basename.'.php'.')<br />';
415	415	}
416	416	?>

trunk/phpbms/head.php

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

trunk/phpbms/include/fields.php

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

trunk/phpbms/include/search_class.php

r184	r186
293	293
294	294	$queryresult=mysql_query($querystatement,$dblink);
295		if(!$queryresult) reportError(100,"Error Retrieving Initial Rowset: ".mysql_error($dblink)."<br>".$querystatement);
	295	if(!$queryresult) reportError(100,"Error Retrieving Initial Rowset: ".mysql_error($dblink)."<br />".$querystatement);
296	296
297	297	return $queryresult;

trunk/phpbms/install/settings.sql

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

trunk/phpbms/modules/base/adminsettings.php

r155	r186
157	157	<div class="fauxP">
158	158	<br />Printed Logo
159		<div id="graphicHolder"><img ~~src="<?php echo $_SESSION["app_path"]?>dbgraphic.php?t=files&f=file&mf=type&r=1"~~></div>
	159	<div id="graphicHolder"><img alt="logo" src="<?php echo $_SESSION["app_path"]?>dbgraphic.php?t=files&f=file&mf=type&r=1" /></div>
160	160	</div>
161	161
…	…
181	181	if ($entry!="." and $entry!=".." and is_dir($thedir."/".$entry)) {
182	182	echo "<option value=\"".$entry."\"";
183		if($entry==$_SESSION["stylesheet"]) echo " selected ";
	183	if($entry==$_SESSION["stylesheet"]) echo " selected=\selected\" ";
184	184	echo ">".$entry."</option>";
185	185	}
…	…
190	190	</p>
191	191	</fieldset>
192
	192	<fieldset>
	193	<legend>Localization</legend>
	194	<p>
	195	<label for="">phone format</label><br />
	196	<select id="sphone_format" name="sphone_format">
	197	<option value="US - Strict" <?php if($_SESSION["phone_format"]=="US - Strict") echo "selected=\selected\"";?>>US - Strict</option>
	198	<option value="US - Loose" <?php if($_SESSION["phone_format"]=="US - Loose") echo "selected=\selected\"";?>>US - Loose</option>
	199	</select>
	200	</p>
	201	</fieldset>
193	202	<?php
194	203	$querystatement="SELECT name FROM modules WHERE name!=\"base\" ORDER BY name";

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

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

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

r170	r186
79	79	$querystatement="SELECT distinct notes.parentid FROM notes where notes.parentid is not null and notes.completed=0 and (".$whereclause.")";
80	80	$repeatqueryresult = mysql_query($querystatement,$dblink);
81		if (!$repeatqueryresult) reportError(300,"Couldn't Delete: ".mysql_error($dblink)."<BR>\n SQL STATEMENT [".$querystatement."]");
	81	if (!$repeatqueryresult) reportError(300,"Couldn't Delete: ".mysql_error($dblink)."<br />\n SQL STATEMENT [".$querystatement."]");
82	82
83	83	$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);";
84	84	$queryresult = mysql_query($querystatement,$dblink);
85		if (!$queryresult) reportError(300,"Couldn't Delete: ".mysql_error($dblink)."<BR>\n SQL STATEMENT [".$querystatement."]");
	85	if (!$queryresult) reportError(300,"Couldn't Delete: ".mysql_error($dblink)."<br />\n SQL STATEMENT [".$querystatement."]");
86	86
87	87	$message=buildStatusMessage(mysql_affected_rows($dblink),count($theids));

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

r170	r186
88	88	$querystatement.=" ".$variables["wrap"]." )";
89	89
90		if(mysql_query($querystatement,$dblink)) $thereturn ="Column Added"; else $thereturn=mysql_error($dblink)." <BR>".$querystatement;
	90	if(mysql_query($querystatement,$dblink)) $thereturn ="Column Added"; else $thereturn=mysql_error($dblink)." <br />".$querystatement;
91	91
92	92	return $thereturn;
…	…
110	110	$querystatement.="wrap=".$variables["wrap"]." ";
111	111	$querystatement.="WHERE id=".$variables["columnid"];
112		if(mysql_query($querystatement,$dblink)) $thereturn ="Column Updated"; else $thereturn=mysql_error($dblink)." <br>".$querystatement;
	112	if(mysql_query($querystatement,$dblink)) $thereturn ="Column Updated"; else $thereturn=mysql_error($dblink)." <br />".$querystatement;
113	113
114	114	return $thereturn;

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

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

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

r145	r186
82	82	loadXMLDoc(theURL,null,false);
83	83	if(req.responseText!="success")
84		alert("Error: <br>"+req.responseText);
	84	alert("Error: <br />"+req.responseText);
85	85
86	86	}

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

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

trunk/phpbms/modules/bms/adminsettings.php

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

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

r145	r186
1		INSERT INTO `settings` ~~VALUES (9, 'shipping_markup',~~ '1.1');
2		INSERT INTO `settings` ~~VALUES (10,'shipping_postalcode', '87124~~');
3		INSERT INTO `settings` ~~VALUES (12,'invoice_default_printinstruc', 'Thank You For Your Order.');~~
	1	INSERT INTO `settings` (`name`, `value`) VALUES ('shipping_markup','1.1');
	2	INSERT INTO `settings` (`name`, `value`) VALUES ('shipping_postalcode','87124\"');
	3	INSERT INTO `settings` (`name`, `value`) VALUES ('invoice_default_printinstruc','Thank You For Your Order.');

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

r150	r186
65	65	$theresult=mysql_query(trim($deletestatement),$dbtlink);
66	66	if(!$theresult){
67		echo "<div style=\"font-size:10px;\">".mysql_error($dbtlink)." -- '".$deletestatement."'<br> </div>";
	67	echo "<div style=\"font-size:10px;\">".mysql_error($dbtlink)." -- '".$deletestatement."'<br /> </div>";
68	68	$thereturn="false";
69	69	}
…	…
162	162	<?php if (!$_POST["command"]){?>
163	163	<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>
164		<div align="center"><strong class="large">Before clicking the uninstall module, make certain this the action you want to take.</strong><br>
	164	<div align="center"><strong class="large">Before clicking the uninstall module, make certain this the action you want to take.</strong><br />
165	165	<form name="form1" method="post" action="<?php echo $_SERVER["PHP_SELF"]?>">
166	166	<input name="command" type="submit" class="Buttons" value="Uninstall BMS Module">

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

r170	r186
207	207	<ul>
208	208	<li>
209		source:<br>
	209	source:<br />
210	210	<?php echo $_SESSION["printing"]["dataprint"]?>
211	211	</li>
212	212	<li>
213		date generated:<br>
	213	date generated:<br />
214	214	<?php echo date("m/d/Y H:i");?>
215	215	</li>
216	216	<li style="padding-left:30px;padding-right:20px;">
217		view:<br>
	217	view:<br />
218	218	<?php echo $this->view?>
219	219	</li>
220	220	<li>
221		from:<br>
	221	from:<br />
222	222	<?php echo $this->fromdate?>
223	223	</li>
224	224	<li>
225		to:<br>
	225	to:<br />
226	226	<?php echo $this->todate?>
227	227	</li>
228		</ul><br~~><br~~>
	228	</ul><br /><br />
229	229	</h2>
230	230	<?php while($therecord=mysql_fetch_array($this->clientQuery)){?>

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

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

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

r176	r186
61	61	date_Format(invoicedate,\"%c/%e/%Y\") as invoicedate,
62	62	date_Format(orderdate,\"%c/%e/%Y\") as orderdate,
63		~~date_Format(shippeddate,\"%c/%e/%Y\") as shippeddate,~~
64	63	invoices.totalti-invoices.amountpaid as amountdue,
65	64	invoices.ponumber,invoices.discountamount,invoices.discountid,

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

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

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

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

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

r184	r186
108	108	$querystatement.=" FROM ".$this->selecttable.$this->whereclause;
109	109	$queryresult=mysql_query($querystatement,$dblink);
110		if(!$queryresult) reportError(500,"Bad SQL:".mysql_error($dblink)."<br~~><br~~>".$querystatement);
	110	if(!$queryresult) reportError(500,"Bad SQL:".mysql_error($dblink)."<br /><br />".$querystatement);
111	111	$therecord=mysql_fetch_array($queryresult);
112	112	?>
…	…
136	136	$querystatement.=" FROM ".$this->selecttable.$this->whereclause.$where." GROUP BY ".$groupby;
137	137	$queryresult=mysql_query($querystatement,$dblink);
138		if(!$queryresult) reportError(500,"Bad SQL:".mysql_error($dblink)."<br~~><br~~>".$querystatement);
	138	if(!$queryresult) reportError(500,"Bad SQL:".mysql_error($dblink)."<br /><br />".$querystatement);
139	139
140	140	while($therecord=mysql_fetch_array($queryresult)){
…	…
182	182	$querystatement.=" FROM ".$this->selecttable.$this->whereclause.$where." GROUP BY invoices.id";
183	183	$queryresult=mysql_query($querystatement,$dblink);
184		if(!$queryresult) reportError(500,"Bad SQL:".mysql_error($dblink)."<br~~><br~~>".$querystatement);
	184	if(!$queryresult) reportError(500,"Bad SQL:".mysql_error($dblink)."<br /><br />".$querystatement);
185	185
186	186	while($therecord=mysql_fetch_array($queryresult)){
…	…
214	214	WHERE lineitems.invoiceid=".$invoiceid;
215	215	$queryresult=mysql_query($querystatement,$dblink);
216		if(!$queryresult) reportError(500,"Bad SQL:".mysql_error($dblink)."<br~~><br~~>".$querystatement);
	216	if(!$queryresult) reportError(500,"Bad SQL:".mysql_error($dblink)."<br /><br />".$querystatement);
217	217
218	218	?>
…	…
282	282	<h2>
283	283	<div>
284		source:<br>
	284	source:<br />
285	285	<?php echo $_SESSION["printing"]["dataprint"]?>
286	286	</div>
287	287	<div>
288		date generated:<br>
	288	date generated:<br />
289	289	<?php echo date("m/d/Y H:i");?>
290	290	</div>
…	…
370	370	<form action="<?php echo $_SERVER["PHP_SELF"]?>" method="post" name="totals" onSubmit="return submitForm(this)">
371	371	<div>
372		report title<br>
	372	report title<br />
373	373	<input type="text" name="reporttitle" value="" style="width:100%">
374	374	</div>
375	375	<div class="box">
376		<strong>Grouping</strong><br>
	376	<strong>Grouping</strong><br />
377	377	<table border=0 cellspacing=0 cellpadding=0>
378	378	<tr>
379	379	<td width="50%">
380		selected groupings<br>
	380	selected groupings<br />
381	381	<select name="selectedgroupings" size="5" style="width:100%" multiple>
382	382	</select>
…	…
384	384	</td>
385	385	<td>
386		<div><br>
387		<input type="button" value="<<" class="Buttons" onClick="moveItem('groupings','to',this.form);"><br~~><br~~>
	386	<div><br />
	387	<input type="button" value="<<" class="Buttons" onClick="moveItem('groupings','to',this.form);"><br /><br />
388	388	<input type="button" value=">>" class="Buttons" onClick="moveItem('groupings','from',this.form);">
389	389	</div>
390	390	</td>
391	391	<td width="50%">
392		available groupings<br>
	392	available groupings<br />
393	393	<select name="availablegroupings" size="5" style="width:100%" multiple>
394	394	<option value="invoices.invoicedate">Invoice Date</option>
…	…
419	419	</div>
420	420	<div class="box">
421		<strong>Columns</strong><br>
	421	<strong>Columns</strong><br />
422	422	<table border=0 cellspacing=0 cellpadding=0>
423	423	<tr>
424	424	<td width="50%">
425		shown columns<br>
	425	shown columns<br />
426	426	<select name="selectedcolumns" size="7" style="width:100%">
427	427	<option value="concat('$',format(sum(invoices.totalti),2))">Invoice Total</option>
…	…
430	430	</td>
431	431	<td>
432		<div><br>
433		<input type="button" value="<<" class="Buttons" onClick="moveItem('columns','to',this.form);"><br~~><br~~>
	432	<div><br />
	433	<input type="button" value="<<" class="Buttons" onClick="moveItem('columns','to',this.form);"><br /><br />
434	434	<input type="button" value=">>" class="Buttons" onClick="moveItem('columns','from',this.form);">
435	435	</div>
436	436	</td>
437	437	<td width="50%">
438		available columns<br>
	438	available columns<br />
439	439	<select name="availablecolumns" size="7" style="width:100%">
440	440	<option value="count(invoices.id)">count</option>
…	…
462	462	</div>
463	463	<div class=box>
464		<strong>Additional Options</strong><br>
465		information shown<br>
	464	<strong>Additional Options</strong><br />
	465	information shown<br />
466	466	<select name="showwhat">
467	467	<option selected value="totals">Totals Only</option>

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

r176	r186
115	115	$querystatement.=" FROM ".$this->selecttable.$this->whereclause;
116	116	$queryresult=mysql_query($querystatement,$dblink);
117		if(!$queryresult) reportError(500,"showGrandTotals - Bad SQL:".mysql_error($dblink)."<br~~><br~~>".$querystatement);
	117	if(!$queryresult) reportError(500,"showGrandTotals - Bad SQL:".mysql_error($dblink)."<br /><br />".$querystatement);
118	118	$therecord=mysql_fetch_array($queryresult);
119	119	?>
…	…
143	143	$querystatement.=" FROM ".$this->selecttable.$this->whereclause.$where." GROUP BY ".$groupby;
144	144	$queryresult=mysql_query($querystatement,$dblink);
145		if(!$queryresult) reportError(500,"showGroup - Bad SQL:".mysql_error($dblink)."<br~~><br~~>".$querystatement);
	145	if(!$queryresult) reportError(500,"showGroup - Bad SQL:".mysql_error($dblink)."<br /><br />".$querystatement);
146	146
147	147	while($therecord=mysql_fetch_array($queryresult)){
…	…
189	189	FROM ".$this->selecttable.$this->whereclause.$where." GROUP BY lineitems.id ";
190	190	$queryresult=mysql_query($querystatement,$dblink);
191		if(!$queryresult) reportError(500,"showLineItems Bad SQL:".mysql_error($dblink)."<br~~><br~~>".$querystatement);
	191	if(!$queryresult) reportError(500,"showLineItems Bad SQL:".mysql_error($dblink)."<br /><br />".$querystatement);
192	192
193	193	?>
…	…
260	260	<h2>
261	261	<div>
262		source:<br>
	262	source:<br />
263	263	<?php echo $_SESSION["printing"]["dataprint"]?>
264	264	</div>
265	265	<div>
266		date generated:<br>
	266	date generated:<br />
267	267	<?php echo date("m/d/Y H:i");?>
268	268	</div>
…	…
346	346	<form action="<?php echo $_SERVER["PHP_SELF"]?>" method="post" name="totals" onSubmit="return submitForm(this)">
347	347	<div>
348		report title<br>
	348	report title<br />
349	349	<input type="text" name="reporttitle" value="" style="width:100%">
350	350	</div>
351	351	<div class="box">
352		<strong>Grouping</strong><br>
	352	<strong>Grouping</strong><br />
353	353	<table border=0 cellspacing=0 cellpadding=0>
354	354	<tr>
355	355	<td width="50%">
356		selected groupings<br>
	356	selected groupings<br />
357	357	<select name="selectedgroupings" size="5" style="width:100%" multiple>
358	358	</select>
…	…
360	360	</td>
361	361	<td>
362		<div><br>
363		<input type="button" value="<<" class="Buttons" onClick="moveItem('groupings','to',this.form);"><br~~><br~~>
	362	<div><br />
	363	<input type="button" value="<<" class="Buttons" onClick="moveItem('groupings','to',this.form);"><br /><br />
364	364	<input type="button" value=">>" class="Buttons" onClick="moveItem('groupings','from',this.form);">
365	365	</div>
366	366	</td>
367	367	<td width="50%">
368		available groupings<br>
	368	available groupings<br />
369	369	<select name="availablegroupings" size="5" style="width:100%" multiple>
370	370	<option value="invoices.id">Invoice ID</option>
…	…
399	399	</div>
400	400	<div class="box">
401		<strong>Columns</strong><br>
	401	<strong>Columns</strong><br />
402	402	<table border=0 cellspacing=0 cellpadding=0>
403	403	<tr>
404	404	<td width="50%">
405		shown columns<br>
	405	shown columns<br />
406	406	<select name="selectedcolumns" size="7" style="width:100