Changeset 693

Timestamp:

12/31/09 13:36:45 (2 years ago)

Author:

brieb

Message:

• Introduced administratively changeable settings to indvidual reports
• Modified all reports to work with new settings system
• Altered invoice and line item total reports to accept parameters from reportsettings: You can now bypass the grouping/column dialog by providing the infrmation administratively
• Altered all sales order PDF reports to accept parameters from reportsettings: You can now administratively change certain aspects of the print outs, including what parts of the top of the report to show, and what to title the report
• Altered label reports to accept parameters from reportsettings: printed data as well

as label measurements and layout are now defined by administratively

• Altered export and tableprint reports to accept parameters from reportsettings: You can specify individual columns and from table instead of just the defaults (all fields, main table only)
• Added var_dump-esque 'debug' function for development purposes to common functions
• Integrated FPDI functionality with sales order PDF reports: It is now possible to use a PDF saved in the files table as a background template for your invoices (e.g. watermarks)

Location:

trunk/phpbms

Files:

• common/javascript/common.js (modified) (1 diff)
• common/stylesheet/mozilla/pages/base/reports.css (added)
• common/stylesheet/mozilla/pages/bms/clienthistoryreport.css (added)
• common/stylesheet/mozilla/pages/reports.css (deleted)
• fpdf/filters (added)
• fpdf/filters/FilterASCII85.php (added)
• fpdf/filters/FilterASCII85_FPDI.php (added)
• fpdf/filters/FilterLZW.php (added)
• fpdf/filters/FilterLZW_FPDI.php (added)
• fpdf/font/makefont/makefont.php (modified) (22 diffs)
• fpdf/fpdf.css (modified) (1 diff)
• fpdf/fpdf.php (modified) (63 diffs)
• fpdf/fpdi.php (added)
• fpdf/fpdi_pdf_parser.php (added)
• fpdf/mem_image.php (deleted)
• fpdf/pdf_context.php (added)
• fpdf/pdf_parser.php (added)
• fpdf/tpl_and_memimage.php (added)
• include/common_functions.php (modified) (17 diffs)
• install/createtables.sql (modified) (1 diff)
• install/reports.sql (modified) (1 diff)
• install/updatev0.98.sql (modified) (2 diffs)
• modules/base/include/reports.php (modified) (1 diff)
• modules/base/javascript/reports.js (added)
• modules/base/report/notes_summary.php (deleted)
• modules/base/report/tabledefs_sqlexport.php (modified) (1 diff)
• modules/base/reports_addedit.php (modified) (6 diffs)
• modules/bms/clients_purchasehistory.php (modified) (5 diffs)
• modules/bms/install/install.php (modified) (1 diff)
• modules/bms/install/reports.sql (modified) (1 diff)
• modules/bms/install/reportsettings.sql (added)
• modules/bms/install/updatev0.98.sql (modified) (2 diffs)
• modules/bms/products_saleshistory.php (modified) (3 diffs)
• modules/bms/report/aritems_clientstatement.php (modified) (8 diffs)
• modules/bms/report/aritems_summary.php (modified) (5 diffs)
• modules/bms/report/clients_folderlabels.php (deleted)
• modules/bms/report/clients_mailinglabels.php (deleted)
• modules/bms/report/clients_notesummary.php (deleted)
• modules/bms/report/clients_purchasehistory.php (modified) (2 diffs)
• modules/bms/report/clients_shippinglabels.php (deleted)
• modules/bms/report/incoming_cashflow.php (modified) (10 diffs)
• modules/bms/report/invoices_pdfinvoice.php (modified) (1 diff)
• modules/bms/report/invoices_pdfpackinglist.php (modified) (1 diff)
• modules/bms/report/invoices_pdfquote.php (modified) (1 diff)
• modules/bms/report/invoices_pdfworkorder.php (modified) (1 diff)
• modules/bms/report/invoices_pdf_class.php (modified) (1 diff)
• modules/bms/report/invoices_shippinglabels.php (deleted)
• modules/bms/report/invoices_totals.php (modified) (7 diffs)
• modules/bms/report/invoices_totals_acctmngers.php (deleted)
• modules/bms/report/invoices_totals_amtwinv.php (deleted)
• modules/bms/report/invoices_totals_amtwinvlineitems.php (deleted)
• modules/bms/report/invoices_totals_leadsource.php (deleted)
• modules/bms/report/invoices_totals_shippingmethod.php (deleted)
• modules/bms/report/invoices_totals_tax.php (deleted)
• modules/bms/report/lineitems_totals.php (modified) (6 diffs)
• modules/bms/report/lineitems_totals_leadsource.php (deleted)
• modules/bms/report/lineitems_totals_productcategories.php (deleted)
• modules/bms/report/lineitems_totals_products.php (deleted)
• modules/bms/report/products_saleshistory.php (modified) (3 diffs)
• modules/bms/report/receipts_pdf.php (modified) (1 diff)
• modules/bms/report/receipts_pttotals.php (modified) (3 diffs)
• print.php (modified) (1 diff)
• report/general_export.php (modified) (1 diff)
• report/general_labels.php (modified) (2 diffs)
• report/general_sql.php (modified) (1 diff)
• report/general_tableprint.php (modified) (1 diff)
• report/pdfreport_class.php (modified) (1 diff)
• report/report_class.php (modified) (1 diff)

trunk/phpbms/common/javascript/common.js

@@ -129 +129 @@
                         alert(error);
 
-        }//end method - reportError
+        },//end method - reportError
 
 

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

@@ -2 +2 @@
 /*******************************************************************************
 * Utility to generate font definition files                                    *
-* Version: 1.13                                                                *
-* Date:    2004-12-31                                                          *
+*                                                                              *
+* Version: 1.14                                                                *
+* Date:    2008-08-03                                                          *
+* Author:  Olivier PLATHEY                                                     *
 *******************************************************************************/
 
@@ -12 +14 @@
         $a=file($file);
         if(empty($a))
-                die('<B>Error:</B> encoding not found: '.$enc);
+                die('<b>Error:</b> encoding not found: '.$enc);
         $cc2gn=array();
         foreach($a as $l)
         {
-                if($l{0}=='!')
+                if($l[0]=='!')
                 {
                         $e=preg_split('/[ \\t]+/',rtrim($l));
@@ -32 +34 @@
 }
 
-function ReadAFM($file,&$map)
+function ReadAFM($file, &$map)
 {
         //Read a font metric file
@@ -115 +117 @@
                 if(!isset($widths['.notdef']))
                         $widths['.notdef']=600;
-                if(!isset($widths['Delta']) and isset($widths['increment']))
+                if(!isset($widths['Delta']) && isset($widths['increment']))
                         $widths['Delta']=$widths['increment'];
                 //Order widths according to map
@@ -122 +124 @@
                         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'];
                         }
@@ -133 +135 @@
 }
 
-function MakeFontDescriptor($fm,$symbolic)
+function MakeFontDescriptor($fm, $symbolic)
 {
         //Ascent
@@ -151 +153 @@
         //Flags
         $flags=0;
-        if(isset($fm['IsFixedPitch']) and $fm['IsFixedPitch'])
+        if(isset($fm['IsFixedPitch']) && $fm['IsFixedPitch'])
                 $flags+=1<<0;
         if($symbolic)
@@ -157 +159 @@
         if(!$symbolic)
                 $flags+=1<<5;
-        if(isset($fm['ItalicAngle']) and $fm['ItalicAngle']!=0)
+        if(isset($fm['ItalicAngle']) && $fm['ItalicAngle']!=0)
                 $flags+=1<<6;
         $fd.=",'Flags'=>".$flags;
@@ -164 +166 @@
                 $fbb=$fm['FontBBox'];
         else
-                $fbb=array(0,$des-100,1000,$asc+100);
+                $fbb=array(0,$desc-100,1000,$asc+100);
         $fd.=",'FontBBox'=>'[".$fbb[0].' '.$fbb[1].' '.$fbb[2].' '.$fbb[3]."]'";
         //ItalicAngle
@@ -172 +174 @@
         if(isset($fm['StdVW']))
                 $stemv=$fm['StdVW'];
-        elseif(isset($fm['Weight']) && preg_match('/(bold|black)/i',$fm['Weight']))
+        elseif(isset($fm['Weight']) && preg_match('/bold|black/i',$fm['Weight']))
                 $stemv=120;
         else
@@ -195 +197 @@
                 elseif(chr($i)=="\\")
                         $s.="'\\\\'";
-                elseif($i>=32 and $i<=126)
+                elseif($i>=32 && $i<=126)
                         $s.="'".chr($i)."'";
                 else
@@ -228 +230 @@
 }
 
-function SaveToFile($file,$s,$mode='t')
+function SaveToFile($file, $s, $mode)
 {
         $f=fopen($file,'w'.$mode);
@@ -254 +256 @@
         $f=fopen($file,'rb');
         if(!$f)
-                die('<B>Error:</B> Can\'t open '.$file);
+                die('<b>Error:</b> Can\'t open '.$file);
         //Extract number of tables
         fseek($f,4,SEEK_CUR);
@@ -285 +287 @@
         $e=($fsType & 0x08)!=0;
         fclose($f);
-        if($rl and !$pp and !$e)
-                echo '<B>Warning:</B> font license does not allow embedding';
+        if($rl && !$pp && !$e)
+                echo '<b>Warning:</b> font license does not allow embedding';
 }
 
 /*******************************************************************************
-* $fontfile : chemin du fichier TTF (ou chaîne vide si pas d'incorporation)    *
-* $afmfile :  chemin du fichier AFM                                            *
-* $enc :      encodage (ou chaîne vide si la police est symbolique)            *
-* $patch :    patch optionnel pour l'encodage                                  *
-* $type :     type de la police si $fontfile est vide                          *
+* fontfile: path to TTF file (or empty string if not to be embedded)           *
+* afmfile:  path to AFM file                                                   *
+* enc:      font encoding (or empty string for symbolic fonts)                 *
+* patch:    optional patch for encoding                                        *
+* type:     font type if fontfile is empty                                     *
 *******************************************************************************/
-function MakeFont($fontfile,$afmfile,$enc='cp1252',$patch=array(),$type='TrueType')
+function MakeFont($fontfile, $afmfile, $enc='cp1252', $patch=array(), $type='TrueType')
 {
         //Generate a font definition file
-        set_magic_quotes_runtime(0);
+        if(get_magic_quotes_runtime())
+                @set_magic_quotes_runtime(0);
         ini_set('auto_detect_line_endings','1');
         if($enc)
@@ -310 +313 @@
                 $map=array();
         if(!file_exists($afmfile))
-                die('<B>Error:</B> AFM file not found: '.$afmfile);
+                die('<b>Error:</b> AFM file not found: '.$afmfile);
         $fm=ReadAFM($afmfile,$map);
         if($enc)
@@ -326 +329 @@
                         $type='Type1';
                 else
-                        die('<B>Error:</B> unrecognized font file extension: '.$ext);
-        }
-        else
-        {
-                if($type!='TrueType' and $type!='Type1')
-                        die('<B>Error:</B> incorrect font type: '.$type);
+                        die('<b>Error:</b> unrecognized font file extension: '.$ext);
+        }
+        else
+        {
+                if($type!='TrueType' && $type!='Type1')
+                        die('<b>Error:</b> incorrect font type: '.$type);
         }
         //Start generation
@@ -353 +356 @@
                 //Embedded font
                 if(!file_exists($fontfile))
-                        die('<B>Error:</B> font file not found: '.$fontfile);
+                        die('<b>Error:</b> font file not found: '.$fontfile);
                 if($type=='TrueType')
                         CheckTTF($fontfile);
                 $f=fopen($fontfile,'rb');
                 if(!$f)
-                        die('<B>Error:</B> Can\'t open '.$fontfile);
+                        die('<b>Error:</b> Can\'t open '.$fontfile);
                 $file=fread($f,filesize($fontfile));
                 fclose($f);
@@ -364 +367 @@
                 {
                         //Find first two sections and discard third one
-                        $header=(ord($file{0})==128);
+                        $header=(ord($file[0])==128);
                         if($header)
                         {
@@ -372 +375 @@
                         $pos=strpos($file,'eexec');
                         if(!$pos)
-                                die('<B>Error:</B> font file does not seem to be valid Type1');
+                                die('<b>Error:</b> font file does not seem to be valid Type1');
                         $size1=$pos+6;
-                        if($header and ord($file{$size1})==128)
+                        if($header && ord($file[$size1])==128)
                         {
                                 //Strip second binary header
@@ -381 +384 @@
                         $pos=strpos($file,'00000000');
                         if(!$pos)
-                                die('<B>Error:</B> font file does not seem to be valid Type1');
+                                die('<b>Error:</b> font file does not seem to be valid Type1');
                         $size2=$pos-$size1;
                         $file=substr($file,0,$size1+$size2);
@@ -390 +393 @@
                         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')
@@ -411 +414 @@
         }
         $s.="?>\n";
-        SaveToFile($basename.'.php',$s);
-        echo 'Font definition file generated ('.$basename.'.php'.')<br />';
+        SaveToFile($basename.'.php',$s,'t');
+        echo 'Font definition file generated ('.$basename.'.php'.')<br>';
 }
 ?>

trunk/phpbms/fpdf/fpdf.css

@@ -1 @@
-BODY {font-family:times new roman,serif}
-H2 {color:#4000A0}
-P.demo {text-align:center; margin-top:-10px}
-A.demo {text-decoration:none; font-weight:bold; color:#0000CC}
-A.demo:link {text-decoration:none; font-weight:bold; color:#0000CC}
-A.demo:hover {text-decoration:none; font-weight:bold; color:#0000FF}
-A.demo:active {text-decoration:none; font-weight:bold; color:#0000FF}
-.st {font-weight:bold; color:#900000}
+body {font-family:"Times New Roman",serif}
+h1 {font:bold 135% Arial,sans-serif; color:#4000A0; margin-bottom:0.9em}
+h2 {font:bold 95% Arial,sans-serif; color:#900000; margin-top:1.5em; margin-bottom:1em}
+dl.param dt {text-decoration:underline}
+dl.param dd {margin-top:1em; margin-bottom:1em}
+dl.param ul {margin-top:1em; margin-bottom:1em}
+tt, code, kbd {font-family:"Courier New",Courier,monospace; font-size:82%}
+div.source {margin-top:1.4em; margin-bottom:1.3em}
+div.source pre {display:table; border:1px solid #24246A; width:100%; margin:0em; font-family:inherit; font-size:100%}
+div.source code {display:block; border:1px solid #C5C5EC; background-color:#F0F5FF; padding:6px; color:#000000}
+div.doc-source {margin-top:1.4em; margin-bottom:1.3em}
+div.doc-source pre {display:table; width:100%; margin:0em; font-family:inherit; font-size:100%}
+div.doc-source code {display:block; background-color:#E0E0E0; padding:4px}
 .kw {color:#000080; font-weight:bold}
 .str {color:#CC0000}
 .cmt {color:#008000}
+p.demo {text-align:center; margin-top:-0.9em}
+a.demo {text-decoration:none; font-weight:bold; color:#0000CC}
+a.demo:link {text-decoration:none; font-weight:bold; color:#0000CC}
+a.demo:hover {text-decoration:none; font-weight:bold; color:#0000FF}
+a.demo:active {text-decoration:none; font-weight:bold; color:#0000FF}

trunk/phpbms/fpdf/fpdf.php

@@ -1 +1 @@
 <?php
 /*******************************************************************************
-* Software: FPDF                                                               *
-* Version:  1.53                                                               *
-* Date:     2004-12-31                                                         *
-* Author:   Olivier PLATHEY                                                    *
-* License:  Freeware                                                           *
+* FPDF                                                                         *
 *                                                                              *
-* You may use and modify this software as you wish.                            *
+* Version: 1.6                                                                 *
+* Date:    2008-08-03                                                          *
+* Author:  Olivier PLATHEY                                                     *
 *******************************************************************************/
 
-if(!class_exists('FPDF'))
-{
-define('FPDF_VERSION','1.53');
+define('FPDF_VERSION','1.6');
 
 class FPDF
 {
-//Private properties
 var $page;               //current page number
 var $n;                  //current object number
@@ -24 +19 @@
 var $state;              //current document state
 var $compress;           //compression flag
+var $k;                  //scale factor (number of points in user unit)
 var $DefOrientation;     //default orientation
 var $CurOrientation;     //current orientation
-var $OrientationChanges; //array indicating orientation changes
-var $k;                  //scale factor (number of points in user unit)
-var $fwPt,$fhPt;         //dimensions of page format in points
-var $fw,$fh;             //dimensions of page format in user unit
-var $wPt,$hPt;           //current dimensions of page in points
-var $w,$h;               //current dimensions of page in user unit
+var $PageFormats;        //available page formats
+var $DefPageFormat;      //default page format
+var $CurPageFormat;      //current page format
+var $PageSizes;          //array storing non-default page sizes
+var $wPt,$hPt;           //dimensions of current page in points
+var $w,$h;               //dimensions of current page in user unit
 var $lMargin;            //left margin
 var $tMargin;            //top margin
@@ -37 +33 @@
 var $bMargin;            //page break margin
 var $cMargin;            //cell margin
-var $x,$y;               //current position in user unit for cell positioning
-var $lasth;              //height of last cell printed
+var $x,$y;               //current position in user unit
+var $lasth;              //height of last printed cell
 var $LineWidth;          //line width in user unit
 var $CoreFonts;          //array of standard font names
@@ -44 +40 @@
 var $FontFiles;          //array of font files
 var $diffs;              //array of encoding differences
-var $images;             //array of used images
-var $PageLinks;          //array of links in pages
-var $links;              //array of internal links
 var $FontFamily;         //current font family
 var $FontStyle;          //current font style
@@ -58 +51 @@
 var $ColorFlag;          //indicates whether fill and text colors are different
 var $ws;                 //word spacing
+var $images;             //array of used images
+var $PageLinks;          //array of links in pages
+var $links;              //array of internal links
 var $AutoPageBreak;      //automatic page breaking
 var $PageBreakTrigger;   //threshold used to trigger page breaks
+var $InHeader;           //flag set when processing header
 var $InFooter;           //flag set when processing footer
 var $ZoomMode;           //zoom display mode
@@ -76 +73 @@
 *                                                                              *
 *******************************************************************************/
-function FPDF($orientation='P',$unit='mm',$format='A4')
+function FPDF($orientation='P', $unit='mm', $format='A4')
 {
         //Some checks
@@ -85 +82 @@
         $this->buffer='';
         $this->pages=array();
-        $this->OrientationChanges=array();
+        $this->PageSizes=array();
         $this->state=0;
         $this->fonts=array();
@@ -92 +89 @@
         $this->images=array();
         $this->links=array();
+        $this->InHeader=false;
         $this->InFooter=false;
         $this->lasth=0;
@@ -104 +102 @@
         $this->ws=0;
         //Standard fonts
-        $this->CoreFonts=array('courier'=>'Courier','courierB'=>'Courier-Bold','courierI'=>'Courier-Oblique','courierBI'=>'Courier-BoldOblique',
-                'helvetica'=>'Helvetica','helveticaB'=>'Helvetica-Bold','helveticaI'=>'Helvetica-Oblique','helveticaBI'=>'Helvetica-BoldOblique',
-                'times'=>'Times-Roman','timesB'=>'Times-Bold','timesI'=>'Times-Italic','timesBI'=>'Times-BoldItalic',
-                'symbol'=>'Symbol','zapfdingbats'=>'ZapfDingbats');
+        $this->CoreFonts=array('courier'=>'Courier', 'courierB'=>'Courier-Bold', 'courierI'=>'Courier-Oblique', 'courierBI'=>'Courier-BoldOblique',
+                'helvetica'=>'Helvetica', 'helveticaB'=>'Helvetica-Bold', 'helveticaI'=>'Helvetica-Oblique', 'helveticaBI'=>'Helvetica-BoldOblique',
+                'times'=>'Times-Roman', 'timesB'=>'Times-Bold', 'timesI'=>'Times-Italic', 'timesBI'=>'Times-BoldItalic',
+                'symbol'=>'Symbol', 'zapfdingbats'=>'ZapfDingbats');
         //Scale factor
         if($unit=='pt')
@@ -120 +118 @@
                 $this->Error('Incorrect unit: '.$unit);
         //Page format
+        $this->PageFormats=array('a3'=>array(841.89,1190.55), 'a4'=>array(595.28,841.89), 'a5'=>array(420.94,595.28),
+                'letter'=>array(612,792), 'legal'=>array(612,1008));
         if(is_string($format))
-        {
-                $format=strtolower($format);
-                if($format=='a3')
-                        $format=array(841.89,1190.55);
-                elseif($format=='a4')
-                        $format=array(595.28,841.89);
-                elseif($format=='a5')
-                        $format=array(420.94,595.28);
-                elseif($format=='letter')
-                        $format=array(612,792);
-                elseif($format=='legal')
-                        $format=array(612,1008);
-                else
-                        $this->Error('Unknown page format: '.$format);
-                $this->fwPt=$format[0];
-                $this->fhPt=$format[1];
-        }
-        else
-        {
-                $this->fwPt=$format[0]*$this->k;
-                $this->fhPt=$format[1]*$this->k;
-        }
-        $this->fw=$this->fwPt/$this->k;
-        $this->fh=$this->fhPt/$this->k;
+                $format=$this->_getpageformat($format);
+        $this->DefPageFormat=$format;
+        $this->CurPageFormat=$format;
         //Page orientation
         $orientation=strtolower($orientation);
@@ -150 +129 @@
         {
                 $this->DefOrientation='P';
-                $this->wPt=$this->fwPt;
-                $this->hPt=$this->fhPt;
+                $this->w=$this->DefPageFormat[0];
+                $this->h=$this->DefPageFormat[1];
         }
         elseif($orientation=='l' || $orientation=='landscape')
         {
                 $this->DefOrientation='L';
-                $this->wPt=$this->fhPt;
-                $this->hPt=$this->fwPt;
+                $this->w=$this->DefPageFormat[1];
+                $this->h=$this->DefPageFormat[0];
         }
         else
                 $this->Error('Incorrect orientation: '.$orientation);
         $this->CurOrientation=$this->DefOrientation;
-        $this->w=$this->wPt/$this->k;
-        $this->h=$this->hPt/$this->k;
+        $this->wPt=$this->w*$this->k;
+        $this->hPt=$this->h*$this->k;
         //Page margins (1 cm)
         $margin=28.35/$this->k;
@@ -181 +160 @@
 }
 
-function SetMargins($left,$top,$right=-1)
+function SetMargins($left, $top, $right=null)
 {
         //Set left, top and right margins
         $this->lMargin=$left;
         $this->tMargin=$top;
-        if($right==-1)
+        if($right===null)
                 $right=$left;
         $this->rMargin=$right;
@@ -211 +190 @@
 }
 
-function SetAutoPageBreak($auto,$margin=0)
+function SetAutoPageBreak($auto, $margin=0)
 {
         //Set auto page break mode and triggering margin
@@ -219 +198 @@
 }
 
-function SetDisplayMode($zoom,$layout='continuous')
+function SetDisplayMode($zoom, $layout='continuous')
 {
         //Set display mode in viewer
@@ -241 +220 @@
 }
 
-function SetTitle($title)
+function SetTitle($title, $isUTF8=false)
 {
         //Title of document
+        if($isUTF8)
+                $title=$this->_UTF8toUTF16($title);
         $this->title=$title;
 }
 
-function SetSubject($subject)
+function SetSubject($subject, $isUTF8=false)
 {
         //Subject of document
+        if($isUTF8)
+                $subject=$this->_UTF8toUTF16($subject);
         $this->subject=$subject;
 }
 
-function SetAuthor($author)
+function SetAuthor($author, $isUTF8=false)
 {
         //Author of document
+        if($isUTF8)
+                $author=$this->_UTF8toUTF16($author);
         $this->author=$author;
 }
 
-function SetKeywords($keywords)
+function SetKeywords($keywords, $isUTF8=false)
 {
         //Keywords of document
+        if($isUTF8)
+                $keywords=$this->_UTF8toUTF16($keywords);
         $this->keywords=$keywords;
 }
 
-function SetCreator($creator)
+function SetCreator($creator, $isUTF8=false)
 {
         //Creator of document
+        if($isUTF8)
+                $creator=$this->_UTF8toUTF16($creator);
         $this->creator=$creator;
 }
@@ -280 +269 @@
 {
         //Fatal error
-        die('<B>FPDF error: </B>'.$msg);
+        die('<b>FPDF error:</b> '.$msg);
 }
 
@@ -306 +295 @@
 }
 
-function AddPage($orientation='')
+function AddPage($orientation='', $format='')
 {
         //Start a new page
@@ -329 +318 @@
         }
         //Start new page
-        $this->_beginpage($orientation);
+        $this->_beginpage($orientation,$format);
         //Set line cap style to square
         $this->_out('2 J');
         //Set line width
         $this->LineWidth=$lw;
-        $this->_out(sprintf('%.2f w',$lw*$this->k));
+        $this->_out(sprintf('%.2F w',$lw*$this->k));
         //Set font
         if($family)
@@ -348 +337 @@
         $this->ColorFlag=$cf;
         //Page header
+        $this->InHeader=true;
         $this->Header();
+        $this->InHeader=false;
         //Restore line width
         if($this->LineWidth!=$lw)
         {
                 $this->LineWidth=$lw;
-                $this->_out(sprintf('%.2f w',$lw*$this->k));
+                $this->_out(sprintf('%.2F w',$lw*$this->k));
         }
         //Restore font
@@ -389 +380 @@
 }
 
-function SetDrawColor($r,$g=-1,$b=-1)
+function SetDrawColor($r, $g=null, $b=null)
 {
         //Set color for all stroking operations
-        if(($r==0 && $g==0 && $b==0) || $g==-1)
-                $this->DrawColor=sprintf('%.3f G',$r/255);
-        else
-                $this->DrawColor=sprintf('%.3f %.3f %.3f RG',$r/255,$g/255,$b/255);
+        if(($r==0 && $g==0 && $b==0) || $g===null)
+                $this->DrawColor=sprintf('%.3F G',$r/255);
+        else
+                $this->DrawColor=sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
         if($this->page>0)
                 $this->_out($this->DrawColor);
 }
 
-function SetFillColor($r,$g=-1,$b=-1)
+function SetFillColor($r, $g=null, $b=null)
 {
         //Set color for all filling operations
-        if(($r==0 && $g==0 && $b==0) || $g==-1)
-                $this->FillColor=sprintf('%.3f g',$r/255);
-        else
-                $this->FillColor=sprintf('%.3f %.3f %.3f rg',$r/255,$g/255,$b/255);
+        if(($r==0 && $g==0 && $b==0) || $g===null)
+                $this->FillColor=sprintf('%.3F g',$r/255);
+        else
+                $this->FillColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
         $this->ColorFlag=($this->FillColor!=$this->TextColor);
         if($this->page>0)
@@ -412 +403 @@
 }
 
-function SetTextColor($r,$g=-1,$b=-1)
+function SetTextColor($r, $g=null, $b=null)
 {
         //Set color for text
-        if(($r==0 && $g==0 && $b==0) || $g==-1)
-                $this->TextColor=sprintf('%.3f g',$r/255);
-        else
-                $this->TextColor=sprintf('%.3f %.3f %.3f rg',$r/255,$g/255,$b/255);
+        if(($r==0 && $g==0 && $b==0) || $g===null)
+                $this->TextColor=sprintf('%.3F g',$r/255);
+        else
+                $this->TextColor=sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
         $this->ColorFlag=($this->FillColor!=$this->TextColor);
 }
@@ -430 +421 @@
         $l=strlen($s);
         for($i=0;$i<$l;$i++)
-                $w+=$cw[$s{$i}];
+                $w+=$cw[$s[$i]];
         return $w*$this->FontSize/1000;
 }
@@ -439 +430 @@
         $this->LineWidth=$width;
         if($this->page>0)
-                $this->_out(sprintf('%.2f w',$width*$this->k));
-}
-
-function Line($x1,$y1,$x2,$y2)
+                $this->_out(sprintf('%.2F w',$width*$this->k));
+}
+
+function Line($x1, $y1, $x2, $y2)
 {
         //Draw a line
-        $this->_out(sprintf('%.2f %.2f m %.2f %.2f l S',$x1*$this->k,($this->h-$y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k));
-}
-
-function Rect($x,$y,$w,$h,$style='')
+        $this->_out(sprintf('%.2F %.2F m %.2F %.2F l S',$x1*$this->k,($this->h-$y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k));
+}
+
+function Rect($x, $y, $w, $h, $style='')
 {
         //Draw a rectangle
@@ -457 +448 @@
         else
                 $op='S';
-        $this->_out(sprintf('%.2f %.2f %.2f %.2f re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
-}
-
-function AddFont($family,$style='',$file='')
+        $this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
+}
+
+function AddFont($family, $style='', $file='')
 {
         //Add a TrueType or Type1 font
@@ -473 +464 @@
         $fontkey=$family.$style;
         if(isset($this->fonts[$fontkey]))
-                $this->Error('Font already added: '.$family.' '.$style);
+                return;
         include($this->_getfontpath().$file);
         if(!isset($name))
                 $this->Error('Could not include font definition file');
         $i=count($this->fonts)+1;
-        $this->fonts[$fontkey]=array('i'=>$i,'type'=>$type,'name'=>$name,'desc'=>$desc,'up'=>$up,'ut'=>$ut,'cw'=>$cw,'enc'=>$enc,'file'=>$file);
+        $this->fonts[$fontkey]=array('i'=>$i, 'type'=>$type, 'name'=>$name, 'desc'=>$desc, 'up'=>$up, 'ut'=>$ut, 'cw'=>$cw, 'enc'=>$enc, 'file'=>$file);
         if($diff)
         {
@@ -504 +495 @@
                         $this->FontFiles[$file]=array('length1'=>$originalsize);
                 else
-                        $this->FontFiles[$file]=array('length1'=>$size1,'length2'=>$size2);
-        }
-}
-
-function SetFont($family,$style='',$size=0)
+                        $this->FontFiles[$file]=array('length1'=>$size1, 'length2'=>$size2);
+        }
+}
+
+function SetFont($family, $style='', $size=0)
 {
         //Select a font; size given in points
@@ -553 +544 @@
                         }
                         $i=count($this->fonts)+1;
-                        $this->fonts[$fontkey]=array('i'=>$i,'type'=>'core','name'=>$this->CoreFonts[$fontkey],'up'=>-100,'ut'=>50,'cw'=>$fpdf_charwidths[$fontkey]);
+                        $name=$this->CoreFonts[$fontkey];
+                        $cw=$fpdf_charwidths[$fontkey];
+                        $this->fonts[$fontkey]=array('i'=>$i, 'type'=>'core', 'name'=>$name, 'up'=>-100, 'ut'=>50, 'cw'=>$cw);
                 }
                 else
@@ -565 +558 @@
         $this->CurrentFont=&$this->fonts[$fontkey];
         if($this->page>0)
-                $this->_out(sprintf('BT /F%d %.2f Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
+                $this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
 }
 
@@ -576 +569 @@
         $this->FontSize=$size/$this->k;
         if($this->page>0)
-                $this->_out(sprintf('BT /F%d %.2f Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
+                $this->_out(sprintf('BT /F%d %.2F Tf ET',$this->CurrentFont['i'],$this->FontSizePt));
 }
 
@@ -583 +576 @@
         //Create a new internal link
         $n=count($this->links)+1;
-        $this->links[$n]=array(0,0);
+        $this->links[$n]=array(0, 0);
         return $n;
 }
 
-function SetLink($link,$y=0,$page=-1)
+function SetLink($link, $y=0, $page=-1)
 {
         //Set destination of internal link
@@ -594 +587 @@
         if($page==-1)
                 $page=$this->page;
-        $this->links[$link]=array($page,$y);
-}
-
-function Link($x,$y,$w,$h,$link)
+        $this->links[$link]=array($page, $y);
+}
+
+function Link($x, $y, $w, $h, $link)
 {
         //Put a link on the page
-        $this->PageLinks[$this->page][]=array($x*$this->k,$this->hPt-$y*$this->k,$w*$this->k,$h*$this->k,$link);
-}
-
-function Text($x,$y,$txt)
+        $this->PageLinks[$this->page][]=array($x*$this->k, $this->hPt-$y*$this->k, $w*$this->k, $h*$this->k, $link);
+}
+
+function Text($x, $y, $txt)
 {
         //Output a string
-        $s=sprintf('BT %.2f %.2f Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));
+        $s=sprintf('BT %.2F %.2F Td (%s) Tj ET',$x*$this->k,($this->h-$y)*$this->k,$this->_escape($txt));
         if($this->underline && $txt!='')
                 $s.=' '.$this->_dounderline($x,$y,$txt);
@@ -620 +613 @@
 }
 
-function Cell($w,$h=0,$txt='',$border="0",$ln=0,$align='',$fill=0,$link='')
+function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='')
 {
         //Output a cell
         $k=$this->k;
-        if($this->y+$h>$this->PageBreakTrigger && !$this->InFooter && $this->AcceptPageBreak())
+        if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
         {
                 //Automatic page break
@@ -634 +627 @@
                         $this->_out('0 Tw');
                 }
-                $this->AddPage($this->CurOrientation);
+                $this->AddPage($this->CurOrientation,$this->CurPageFormat);
                 $this->x=$x;
                 if($ws>0)
                 {
                         $this->ws=$ws;
-                        $this->_out(sprintf('%.3f Tw',$ws*$k));
+                        $this->_out(sprintf('%.3F Tw',$ws*$k));
                 }
         }
@@ -645 +638 @@
                 $w=$this->w-$this->rMargin-$this->x;
         $s='';
-        if($fill==1 || $border==1)
-        {
-                if($fill==1)
+        if($fill || $border==1)
+        {
+                if($fill)
                         $op=($border==1) ? 'B' : 'f';
                 else
                         $op='S';
-                $s=sprintf('%.2f %.2f %.2f %.2f re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);
+                $s=sprintf('%.2F %.2F %.2F %.2F re %s ',$this->x*$k,($this->h-$this->y)*$k,$w*$k,-$h*$k,$op);
         }
         if(is_string($border))
@@ -658 +651 @@
                 $y=$this->y;
                 if(strpos($border,'L')!==false)
-                        $s.=sprintf('%.2f %.2f m %.2f %.2f l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
+                        $s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,$x*$k,($this->h-($y+$h))*$k);
                 if(strpos($border,'T')!==false)
-                        $s.=sprintf('%.2f %.2f m %.2f %.2f l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
+                        $s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-$y)*$k);
                 if(strpos($border,'R')!==false)
-                        $s.=sprintf('%.2f %.2f m %.2f %.2f l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+                        $s.=sprintf('%.2F %.2F m %.2F %.2F l S ',($x+$w)*$k,($this->h-$y)*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
                 if(strpos($border,'B')!==false)
-                        $s.=sprintf('%.2f %.2f m %.2f %.2f l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
+                        $s.=sprintf('%.2F %.2F m %.2F %.2F l S ',$x*$k,($this->h-($y+$h))*$k,($x+$w)*$k,($this->h-($y+$h))*$k);
         }
         if($txt!=='')
@@ -677 +670 @@
                         $s.='q '.$this->TextColor.' ';
                 $txt2=str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$txt)));
-                $s.=sprintf('BT %.2f %.2f Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2);
+                $s.=sprintf('BT %.2F %.2F Td (%s) Tj ET',($this->x+$dx)*$k,($this->h-($this->y+.5*$h+.3*$this->FontSize))*$k,$txt2);
                 if($this->underline)
                         $s.=' '.$this->_dounderline($this->x+$dx,$this->y+.5*$h+.3*$this->FontSize,$txt);
@@ -699 +692 @@
 }
 
-function MultiCell($w,$h,$txt,$border="0",$align='J',$fill=0)
+function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false)
 {
         //Output text with automatic or explicit line breaks
@@ -738 +731 @@
         {
                 //Get next character
-                $c=$s{$i};
+                $c=$s[$i];
                 if($c=="\n")
                 {
@@ -784 +777 @@
                                 {
                                         $this->ws=($ns>1) ? ($wmax-$ls)/1000*$this->FontSize/($ns-1) : 0;
-                                        $this->_out(sprintf('%.3f Tw',$this->ws*$this->k));
+                                        $this->_out(sprintf('%.3F Tw',$this->ws*$this->k));
                                 }
                                 $this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill);
@@ -812 +805 @@
 }
 
-function Write($h,$txt,$link='')
+function Write($h, $txt, $link='')
 {
         //Output text in flowing mode
@@ -828 +821 @@
         {
                 //Get next character
-                $c=$s{$i};
+                $c=$s[$i];
                 if($c=="\n")
                 {
@@ -893 +886 @@
 }
 
-function Image($file,$x,$y,$w=0,$h=0,$type='',$link='')
+function Ln($h=null)
+{
+        //Line feed; default value is last cell height
+        $this->x=$this->lMargin;
+        if($h===null)
+                $this->y+=$this->lasth;
+        else
+                $this->y+=$h;
+}
+
+function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')
 {
         //Put an image on the page
         if(!isset($this->images[$file]))
         {
-                //First use of image, get info
+                //First use of this image, get info
                 if($type=='')
                 {
@@ -907 +910 @@
                 }
                 $type=strtolower($type);
-                $mqr=get_magic_quotes_runtime();
-                set_magic_quotes_runtime(0);
-                if($type=='jpg' || $type=='jpeg')
-                        $info=$this->_parsejpg($file);
-                elseif($type=='png')
-                        $info=$this->_parsepng($file);
-                else
-                {
-                        //Allow for additional formats
-                        $mtd='_parse'.$type;
-                        if(!method_exists($this,$mtd))
-                                $this->Error('Unsupported image type: '.$type);
-                        $info=$this->$mtd($file);
-                }
-                set_magic_quotes_runtime($mqr);
+                if($type=='jpeg')
+                        $type='jpg';
+                $mtd='_parse'.$type;
+                if(!method_exists($this,$mtd))
+                        $this->Error('Unsupported image type: '.$type);
+                $info=$this->$mtd($file);
                 $info['i']=count($this->images)+1;
                 $this->images[$file]=$info;
@@ -934 +928 @@
                 $h=$info['h']/$this->k;
         }
-        if($w==0)
+        elseif($w==0)
                 $w=$h*$info['w']/$info['h'];
-        if($h==0)
+        elseif($h==0)
                 $h=$w*$info['h']/$info['w'];
-        $this->_out(sprintf('q %.2f 0 0 %.2f %.2f %.2f cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));
+        //Flowing mode
+        if($y===null)
+        {
+                if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
+                {
+                        //Automatic page break
+                        $x2=$this->x;
+                        $this->AddPage($this->CurOrientation,$this->CurPageFormat);
+                        $this->x=$x2;
+                }
+                $y=$this->y;
+                $this->y+=$h;
+        }
+        if($x===null)
+                $x=$this->x;
+        $this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));
         if($link)
                 $this->Link($x,$y,$w,$h,$link);
-}
-
-function Ln($h='')
-{
-        //Line feed; default value is last cell height
-        $this->x=$this->lMargin;
-        if(is_string($h))
-                $this->y+=$this->lasth;
-        else
-                $this->y+=$h;
 }
 
@@ -984 +983 @@
 }
 
-function SetXY($x,$y)
+function SetXY($x, $y)
 {
         //Set x and y positions
@@ -991 +990 @@
 }
 
-function Output($name='',$dest='')
+function Output($name='', $dest='')
 {
         //Output PDF to some destination
-        //Finish document if necessary
         if($this->state<3)
                 $this->Close();
-        //Normalize parameters
-        if(is_bool($dest))
-                $dest=$dest ? 'D' : 'F';
         $dest=strtoupper($dest);
         if($dest=='')
@@ -1015 +1010 @@
                 case 'I':
                         //Send to standard output
-                        if(ob_get_contents())
+                        if(ob_get_length())
                                 $this->Error('Some data has already been output, can\'t send PDF file');
                         if(php_sapi_name()!='cli')
@@ -1022 +1017 @@
                                 header('Content-Type: application/pdf');
                                 if(headers_sent())
-                                        $this->Error('Some data has already been output to browser, can\'t send PDF file');
+                                        $this->Error('Some data has already been output, can\'t send PDF file');
                                 header('Content-Length: '.strlen($this->buffer));
-                                header('Content-disposition: inline; filename="'.$name.'"');
+                                header('Content-Disposition: inline; filename="'.$name.'"');
+                                header('Cache-Control: private, max-age=0, must-revalidate');
+                                header('Pragma: public');
+                                ini_set('zlib.output_compression','0');
                         }
                         echo $this->buffer;
@@ -1030 +1028 @@
                 case 'D':
                         //Download file
-                        if(ob_get_contents())
+                        if(ob_get_length())
                                 $this->Error('Some data has already been output, can\'t send PDF file');
-                        if(isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'],'MSIE'))
-                                header('Content-Type: application/force-download');
-                        else
-                                header('Content-Type: application/octet-stream');
+                        header('Content-Type: application/x-download');
                         if(headers_sent())
-                                $this->Error('Some data has already been output to browser, can\'t send PDF file');
+                                $this->Error('Some data has already been output, can\'t send PDF file');
                         header('Content-Length: '.strlen($this->buffer));
-                        header('Content-disposition: attachment; filename="'.$name.'"');
+                        header('Content-Disposition: attachment; filename="'.$name.'"');
+                        header('Cache-Control: private, max-age=0, must-revalidate');
+                        header('Pragma: public');
+                        ini_set('zlib.output_compression','0');
                         echo $this->buffer;
                         break;
@@ -1066 +1064 @@
 function _dochecks()
 {
-        //Check for locale-related bug
-        if(1.1==1)
-                $this->Error('Don\'t alter the locale before including class file');
-        //Check for decimal separator
-        if(sprintf('%.1f',1.0)!='1.0')
-                setlocale(LC_NUMERIC,'C');
+        //Check availability of %F
+        if(sprintf('%.1F',1.0)!='1.0')
+                $this->Error('This version of PHP is not supported');
+        //Check mbstring overloading
+        if(ini_get('mbstring.func_overload') & 2)
+                $this->Error('mbstring overloading must be disabled');
+        //Disable runtime magic quotes
+        if(get_magic_quotes_runtime())
+                @set_magic_quotes_runtime(0);
+}
+
+function _getpageformat($format)
+{
+        $format=strtolower($format);
+        if(!isset($this->PageFormats[$format]))
+                $this->Error('Unknown page format: '.$format);
+        $a=$this->PageFormats[$format];
+        return array($a[0]/$this->k, $a[1]/$this->k);
 }
 
@@ -1081 +1091 @@
 }
 
+function _beginpage($orientation, $format)
+{
+        $this->page++;
+        $this->pages[$this->page]='';
+        $this->state=2;
+        $this->x=$this->lMargin;
+        $this->y=$this->tMargin;
+        $this->FontFamily='';
+        //Check page size
+        if($orientation=='')
+                $orientation=$this->DefOrientation;
+        else
+                $orientation=strtoupper($orientation[0]);
+        if($format=='')
+                $format=$this->DefPageFormat;
+        else
+        {
+                if(is_string($format))
+                        $format=$this->_getpageformat($format);
+        }
+        if($orientation!=$this->CurOrientation || $format[0]!=$this->CurPageFormat[0] || $format[1]!=$this->CurPageFormat[1])
+        {
+                //New size
+                if($orientation=='P')
+                {
+                        $this->w=$format[0];
+                        $this->h=$format[1];
+                }
+                else
+                {
+                        $this->w=$format[1];
+                        $this->h=$format[0];
+                }
+                $this->wPt=$this->w*$this->k;
+                $this->hPt=$this->h*$this->k;
+                $this->PageBreakTrigger=$this->h-$this->bMargin;
+                $this->CurOrientation=$orientation;
+                $this->CurPageFormat=$format;
+        }
+        if($orientation!=$this->DefOrientation || $format[0]!=$this->DefPageFormat[0] || $format[1]!=$this->DefPageFormat[1])
+                $this->PageSizes[$this->page]=array($this->wPt, $this->hPt);
+}
+
+function _endpage()
+{
+        $this->state=1;
+}
+
+function _escape($s)
+{
+        //Escape special characters in strings
+        $s=str_replace('\\','\\\\',$s);
+        $s=str_replace('(','\\(',$s);
+        $s=str_replace(')','\\)',$s);
+        $s=str_replace("\r",'\\r',$s);
+        return $s;
+}
+
+function _textstring($s)
+{
+        //Format a text string
+        return '('.$this->_escape($s).')';
+}
+
+function _UTF8toUTF16($s)
+{
+        //Convert UTF-8 to UTF-16BE with BOM
+        $res="\xFE\xFF";
+        $nb=strlen($s);
+        $i=0;
+        while($i<$nb)
+        {
+                $c1=ord($s[$i++]);
+                if($c1>=224)
+                {
+                        //3-byte character
+                        $c2=ord($s[$i++]);
+                        $c3=ord($s[$i++]);
+                        $res.=chr((($c1 & 0x0F)<<4) + (($c2 & 0x3C)>>2));
+                        $res.=chr((($c2 & 0x03)<<6) + ($c3 & 0x3F));
+                }
+                elseif($c1>=192)
+                {
+                        //2-byte character
+                        $c2=ord($s[$i++]);
+                        $res.=chr(($c1 & 0x1C)>>2);
+                        $res.=chr((($c1 & 0x03)<<6) + ($c2 & 0x3F));
+                }
+                else
+                {
+                        //Single-byte character
+                        $res.="\0".chr($c1);
+                }
+        }
+        return $res;
+}
+
+function _dounderline($x, $y, $txt)
+{
+        //Underline text
+        $up=$this->CurrentFont['up'];
+        $ut=$this->CurrentFont['ut'];
+        $w=$this->GetStringWidth($txt)+$this->ws*substr_count($txt,' ');
+        return sprintf('%.2F %.2F %.2F %.2F re f',$x*$this->k,($this->h-($y-$up/1000*$this->FontSize))*$this->k,$w*$this->k,-$ut/1000*$this->FontSizePt);
+}
+
+function _parsejpg($file)
+{
+        //Extract info from a JPEG file
+        $a=GetImageSize($file);
+        if(!$a)
+                $this->Error('Missing or incorrect image file: '.$file);
+        if($a[2]!=2)
+                $this->Error('Not a JPEG file: '.$file);
+        if(!isset($a['channels']) || $a['channels']==3)
+                $colspace='DeviceRGB';
+        elseif($a['channels']==4)
+                $colspace='DeviceCMYK';
+        else
+                $colspace='DeviceGray';
+        $bpc=isset($a['bits']) ? $a['bits'] : 8;
+        //Read whole file
+        $f=fopen($file,'rb');
+        $data='';
+        while(!feof($f))
+                $data.=fread($f,8192);
+        fclose($f);
+        return array('w'=>$a[0], 'h'=>$a[1], 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'DCTDecode', 'data'=>$data);
+}
+
+function _parsepng($file)
+{
+        //Extract info from a PNG file
+        $f=fopen($file,'rb');
+        if(!$f)
+                $this->Error('Can\'t open image file: '.$file);
+        //Check signature
+        if($this->_readstream($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))
+                $this->Error('Not a PNG file: '.$file);
+        //Read header chunk
+        $this->_readstream($f,4);
+        if($this->_readstream($f,4)!='IHDR')
+                $this->Error('Incorrect PNG file: '.$file);
+        $w=$this->_readint($f);
+        $h=$this->_readint($f);
+        $bpc=ord($this->_readstream($f,1));
+        if($bpc>8)
+                $this->Error('16-bit depth not supported: '.$file);
+        $ct=ord($this->_readstream($f,1));
+        if($ct==0)
+                $colspace='DeviceGray';
+        elseif($ct==2)
+                $colspace='DeviceRGB';
+        elseif($ct==3)
+                $colspace='Indexed';
+        else
+                $this->Error('Alpha channel not supported: '.$file);
+        if(ord($this->_readstream($f,1))!=0)
+                $this->Error('Unknown compression method: '.$file);
+        if(ord($this->_readstream($f,1))!=0)
+                $this->Error('Unknown filter method: '.$file);
+        if(ord($this->_readstream($f,1))!=0)
+                $this->Error('Interlacing not supported: '.$file);
+        $this->_readstream($f,4);
+        $parms='/DecodeParms <</Predictor 15 /Colors '.($ct==2 ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w.'>>';
+        //Scan chunks looking for palette, transparency and image data
+        $pal='';
+        $trns='';
+        $data='';
+        do
+        {
+                $n=$this->_readint($f);
+                $type=$this->_readstream($f,4);
+                if($type=='PLTE')
+                {
+                        //Read palette
+                        $pal=$this->_readstream($f,$n);
+                        $this->_readstream($f,4);
+                }
+                elseif($type=='tRNS')
+                {
+                        //Read transparency info
+                        $t=$this->_readstream($f,$n);
+                        if($ct==0)
+                                $trns=array(ord(substr($t,1,1)));
+                        elseif($ct==2)
+                                $trns=array(ord(substr($t,1,1)), ord(substr($t,3,1)), ord(substr($t,5,1)));
+                        else
+                        {
+                                $pos=strpos($t,chr(0));
+                                if($pos!==false)
+                                        $trns=array($pos);
+                        }
+                        $this->_readstream($f,4);
+                }
+                elseif($type=='IDAT')
+                {
+                        //Read image data block
+                        $data.=$this->_readstream($f,$n);
+                        $this->_readstream($f,4);
+                }
+                elseif($type=='IEND')
+                        break;
+                else
+                        $this->_readstream($f,$n+4);
+        }
+        while($n);
+        if($colspace=='Indexed' && empty($pal))
+                $this->Error('Missing palette in '.$file);
+        fclose($f);
+        return array('w'=>$w, 'h'=>$h, 'cs'=>$colspace, 'bpc'=>$bpc, 'f'=>'FlateDecode', 'parms'=>$parms, 'pal'=>$pal, 'trns'=>$trns, 'data'=>$data);
+}
+
+function _readstream($f, $n)
+{
+        //Read n bytes from stream
+        $res='';
+        while($n>0 && !feof($f))
+        {
+                $s=fread($f,$n);
+                if($s===false)
+                        $this->Error('Error while reading stream');
+                $n-=strlen($s);
+                $res.=$s;
+        }
+        if($n>0)
+                $this->Error('Unexpected end of stream');
+        return $res;
+}
+
+function _readint($f)
+{
+        //Read a 4-byte integer from stream
+        $a=unpack('Ni',$this->_readstream($f,4));
+        return $a['i'];
+}
+
+function _parsegif($file)
+{
+        //Extract info from a GIF file (via PNG conversion)
+        if(!function_exists('imagepng'))
+                $this->Error('GD extension is required for GIF support');
+        if(!function_exists('imagecreatefromgif'))
+                $this->Error('GD has no GIF read support');
+        $im=imagecreatefromgif($file);
+        if(!$im)
+                $this->Error('Missing or incorrect image file: '.$file);
+        imageinterlace($im,0);
+        $tmp=tempnam('.','gif');
+        if(!$tmp)
+                $this->Error('Unable to create a temporary file');
+        if(!imagepng($im,$tmp))
+                $this->Error('Error while saving to temporary file');
+        imagedestroy($im);
+        $info=$this->_parsepng($tmp);
+        unlink($tmp);
+        return $info;
+}
+
+function _newobj()
+{
+        //Begin a new object
+        $this->n++;
+        $this->offsets[$this->n]=strlen($this->buffer);
+        $this->_out($this->n.' 0 obj');
+}
+
+function _putstream($s)
+{
+        $this->_out('stream');
+        $this->_out($s);
+        $this->_out('endstream');
+}
+
+function _out($s)
+{
+        //Add a line to the document
+        if($this->state==2)
+                $this->pages[$this->page].=$s."\n";
+        else
+                $this->buffer.=$s."\n";
+}
+
 function _putpages()
 {
@@ -1092 +1385 @@
         if($this->DefOrientation=='P')
         {
-                $wPt=$this->fwPt;
-                $hPt=$this->fhPt;
-        }
-        else
-        {
-                $wPt=$this->fhPt;
-                $hPt=$this->fwPt;
+                $wPt=$this->DefPageFormat[0]*$this->k;
+                $hPt=$this->DefPageFormat[1]*$this->k;
+        }
+        else
+        {
+                $wPt=$this->DefPageFormat[1]*$this->k;
+                $hPt=$this->DefPageFormat[0]*$this->k;
         }
         $filter=($this->compress) ? '/Filter /FlateDecode ' : '';
@@ -1107 +1400 @@
                 $this->_out('<</Type /Page');
                 $this->_out('/Parent 1 0 R');
-                if(isset($this->OrientationChanges[$n]))
-                        $this->_out(sprintf('/MediaBox [0 0 %.2f %.2f]',$hPt,$wPt));
+                if(isset($this->PageSizes[$n]))
+                        $this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$this->PageSizes[$n][0],$this->PageSizes[$n][1]));
                 $this->_out('/Resources 2 0 R');
                 if(isset($this->PageLinks[$n]))
@@ -1116 +1409 @@
                         foreach($this->PageLinks[$n] as $pl)
                         {
-                                $rect=sprintf('%.2f %.2f %.2f %.2f',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);
+                                $rect=sprintf('%.2F %.2F %.2F %.2F',$pl[0],$pl[1],$pl[0]+$pl[2],$pl[1]-$pl[3]);
                                 $annots.='<</Type /Annot /Subtype /Link /Rect ['.$rect.'] /Border [0 0 0] ';
                                 if(is_string($pl[4]))
@@ -1123 +1416 @@
                                 {
                                         $l=$this->links[$pl[4]];
-                                        $h=isset($this->OrientationChanges[$l[0]]) ? $wPt : $hPt;
-                                        $annots.=sprintf('/Dest [%d 0 R /XYZ 0 %.2f null]>>',1+2*$l[0],$h-$l[1]*$this->k);
+                                        $h=isset($this->PageSizes[$l[0]]) ? $this->PageSizes[$l[0]][1] : $hPt;
+                                        $annots.=sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]>>',1+2*$l[0],$h-$l[1]*$this->k);
                                 }
                         }
@@ -1147 +1440 @@
         $this->_out($kids.']');
         $this->_out('/Count '.$nb);
-        $this->_out(sprintf('/MediaBox [0 0 %.2f %.2f]',$wPt,$hPt));
+        $this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$wPt,$hPt));
         $this->_out('>>');
         $this->_out('endobj');
@@ -1162 +1455 @@
                 $this->_out('endobj');
         }
-        $mqr=get_magic_quotes_runtime();
-        @set_magic_quotes_runtime(0);
         foreach($this->FontFiles as $file=>$info)
         {
@@ -1179 +1470 @@
                 if(!$compressed && isset($info['length2']))
                 {
-                        $header=(ord($font{0})==128);
+                        $header=(ord($font[0])==128);
                         if($header)
                         {
@@ -1185 +1476 @@
                                 $font=substr($font,6);
                         }
-                        if($header && ord($font{$info['length1']})==128)
+                        if($header && ord($font[$info['length1']])==128)
                         {
                                 //Strip second binary header
@@ -1201 +1492 @@
                 $this->_out('endobj');
         }
-        @set_magic_quotes_runtime($mqr);
         foreach($this->fonts as $k=>$font)
         {
@@ -1361 +1651 @@
         if(!empty($this->creator))
                 $this->_out('/Creator '.$this->_textstring($this->creator));
-        $this->_out('/CreationDate '.$this->_textstring('D:'.date('YmdHis')));
+        $this->_out('/CreationDate '.$this->_textstring('D:'.@date('YmdHis')));
 }
 
@@ -1430 +1720 @@
         $this->state=3;
 }
-
-function _beginpage($orientation)
-{
-        $this->page++;
-        $this->pages[$this->page]='';
-        $this->state=2;
-        $this->x=$this->lMargin;
-        $this->y=$this->tMargin;
-        $this->FontFamily='';
-        //Page orientation
-        if(!$orientation)
-                $orientation=$this->DefOrientation;
-        else
-        {
-                $orientation=strtoupper($orientation{0});
-                if($orientation!=$this->DefOrientation)
-                        $this->OrientationChanges[$this->page]=true;
-        }
-        if($orientation!=$this->CurOrientation)
-        {
-                //Change orientation
-                if($orientation=='P')
-                {
-                        $this->wPt=$this->fwPt;
-                        $this->hPt=$this->fhPt;
-                        $this->w=$this->fw;
-                        $this->h=$this->fh;
-                }
-                else
-                {
-                        $this->wPt=$this->fhPt;
-                        $this->hPt=$this->fwPt;
-                        $this->w=$this->fh;
-                        $this->h=$this->fw;
-                }
-                $this->PageBreakTrigger=$this->h-$this->bMargin;
-                $this->CurOrientation=$orientation;
-        }
-}
-
-function _endpage()
-{
-        //End of page contents
-        $this->state=1;
-}
-
-function _newobj()
-{
-        //Begin a new object
-        $this->n++;
-        $this->offsets[$this->n]=strlen($this->buffer);
-        $this->_out($this->n.' 0 obj');
-}
-
-function _dounderline($x,$y,$txt)
-{
-        //Underline text
-        $up=$this->CurrentFont['up'];
-        $ut=$this->CurrentFont['ut'];
-        $w=$this->GetStringWidth($txt)+$this->ws*substr_count($txt,' ');
-        return sprintf('%.2f %.2f %.2f %.2f re f',$x*$this->k,($this->h-($y-$up/1000*$this->FontSize))*$this->k,$w*$this->k,-$ut/1000*$this->FontSizePt);
-}
-
-function _parsejpg($file)
-{
-        //Extract info from a JPEG file
-        $a=GetImageSize($file);
-        if(!$a)
-                $this->Error('Missing or incorrect image file: '.$file);
-        if($a[2]!=2)
-                $this->Error('Not a JPEG file: '.$file);
-        if(!isset($a['channels']) || $a['channels']==3)
-                $colspace='DeviceRGB';
-        elseif($a['channels']==4)
-                $colspace='DeviceCMYK';
-        else
-                $colspace='DeviceGray';
-        $bpc=isset($a['bits']) ? $a['bits'] : 8;
-        //Read whole file
-        $f=fopen($file,'rb');
-        $data='';
-        while(!feof($f))
-                $data.=fread($f,4096);
-        fclose($f);
-        return array('w'=>$a[0],'h'=>$a[1],'cs'=>$colspace,'bpc'=>$bpc,'f'=>'DCTDecode','data'=>$data);
-}
-
-function _parsepng($file)
-{
-        //Extract info from a PNG file
-        $f=fopen($file,'rb');
-        if(!$f)
-                $this->Error('Can\'t open image file: '.$file);
-        //Check signature
-        if(fread($f,8)!=chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10))
-                $this->Error('Not a PNG file: '.$file);
-        //Read header chunk
-        fread($f,4);
-        if(fread($f,4)!='IHDR')
-                $this->Error('Incorrect PNG file: '.$file);
-        $w=$this->_freadint($f);
-        $h=$this->_freadint($f);
-        $bpc=ord(fread($f,1));
-        if($bpc>8)
-                $this->Error('16-bit depth not supported: '.$file);
-        $ct=ord(fread($f,1));
-        if($ct==0)
-                $colspace='DeviceGray';
-        elseif($ct==2)
-                $colspace='DeviceRGB';
-        elseif($ct==3)
-                $colspace='Indexed';
-        else
-                $this->Error('Alpha channel not supported: '.$file);
-        if(ord(fread($f,1))!=0)
-                $this->Error('Unknown compression method: '.$file);
-        if(ord(fread($f,1))!=0)
-                $this->Error('Unknown filter method: '.$file);
-        if(ord(fread($f,1))!=0)
-                $this->Error('Interlacing not supported: '.$file);
-        fread($f,4);
-        $parms='/DecodeParms <</Predictor 15 /Colors '.($ct==2 ? 3 : 1).' /BitsPerComponent '.$bpc.' /Columns '.$w.'>>';
-        //Scan chunks looking for palette, transparency and image data
-        $pal='';
-        $trns='';
-        $data='';
-        do
-        {
-                $n=$this->_freadint($f);
-                $type=fread($f,4);
-                if($type=='PLTE')
-                {
-                        //Read palette
-                        $pal=fread($f,$n);
-                        fread($f,4);
-                }
-                elseif($type=='tRNS')
-                {
-                        //Read transparency info
-                        $t=fread($f,$n);
-                        if($ct==0)
-                                $trns=array(ord(substr($t,1,1)));
-                        elseif($ct==2)
-                                $trns=array(ord(substr($t,1,1)),ord(substr($t,3,1)),ord(substr($t,5,1)));
-                        else
-                        {
-                                $pos=strpos($t,chr(0));
-                                if($pos!==false)
-                                        $trns=array($pos);
-                        }
-                        fread($f,4);
-                }
-                elseif($type=='IDAT')
-                {
-                        //Read image data block
-                        $data.=fread($f,$n);
-                        fread($f,4);
-                }
-                elseif($type=='IEND')
-                        break;
-                else
-                        fread($f,$n+4);
-        }
-        while($n);
-        if($colspace=='Indexed' && empty($pal))
-                $this->Error('Missing palette in '.$file);
-        fclose($f);
-        return array('w'=>$w,'h'=>$h,'cs'=>$colspace,'bpc'=>$bpc,'f'=>'FlateDecode','parms'=>$parms,'pal'=>$pal,'trns'=>$trns,'data'=>$data);
-}
-
-function _freadint($f)
-{
-        //Read a 4-byte integer from file
-        $a=unpack('Ni',fread($f,4));
-        return $a['i'];
-}
-
-function _textstring($s)
-{
-        //Format a text string
-        return '('.$this->_escape($s).')';
-}
-
-function _escape($s)
-{
-        //Add \ before \, ( and )
-        return str_replace(')','\\)',str_replace('(','\\(',str_replace('\\','\\\\',$s)));
-}
-
-function _putstream($s)
-{
-        $this->_out('stream');
-        $this->_out($s);
-        $this->_out('endstream');
-}
-
-function _out($s)
-{
-        //Add a line to the document
-        if($this->state==2)
-                $this->pages[$this->page].=$s."\n";
-        else
-                $this->buffer.=$s."\n";
-}
 //End of class
 }
@@ -1644 +1730 @@
 }
 
-}
 ?>

trunk/phpbms/include/common_functions.php

@@ -549 +549 @@
 /**
   *  function makeDelimeterString
-  *  
+  *
   *  Creates a string with the same length as $string, with a delimeter where
   *  the corresponding part of the string is on or within that delimeter, and
@@ -565 +565 @@
   */
 function makeDelimeterString($string, $delimeters, $escapeCharacter = "\\"){
-        
+
         if(!$escapeCharacter)
                 $escapeCharacter = NULL;
-        
+
         if(strlen($escapeCharacter) > 1)
                 return false;
-        
+
         $returnString = "";
         $stringArray = str_split($string);
@@ -577 +577 @@
         $prevChar = "";
         foreach($stringArray as $char){
-                
+
                 if(!$inside){
                         if(in_array($char, $delimeters) && $prevChar != $escapeCharacter){
@@ -586 +586 @@
                                 $returnString .= "0";
                 }else{
-                        
+
                         if($char == $delimeter && $prevChar != $escapeCharacter){
                                 $inside = false;
@@ -592 +592 @@
                         }else
                                 $returnString .= $delimeter;
-                        
+
                 }//end if
-                
+
                 $prevChar = $char;
-                
+
         }//end foreach
-        
+
         return $returnString;
 
 }//end function
+
 
 /*
@@ -607 +608 @@
  * Returns the part of $querystatement from the general FROM to its ORDER BY or
  * the end of the querystatement if no ORDER BY exists.
- * 
+ *
  * @param $querystatement
  * @return string The part of $querystatement from the general FROM to its
  * ORDER BY.
  */
-
 function getSearchFrom($querystatement) {
-        
+
         $modstatement = $querystatement;
         $insideString = makeDelimeterString($querystatement, array("'", "\"", "`"));
         $insideArray = str_split($insideString);
-        
-        
+
+
         /**
           *  Check for SELECTs that are not inside quotes or tics.
@@ -628 +628 @@
         $offset = 0;
         do{
-                
+
                 $pos = stripos($querystatement, "select", $offset);
-                
+
                 if($pos !== false)
                         if(!$insideArray[$pos])
                                 $selectArray[] = $pos;
                 $offset = $pos+1;
-        
+
         }while($pos !== false);
-        
+
         /**
           *  Check for FROMSs that are not inside quotes or tics.
@@ -646 +646 @@
         $offset = 0;
         do{
-                
+
                 $pos = stripos($querystatement, "from", $offset);
-                
+
                 if($pos !== false)
                         if(!$insideArray[$pos])
                                 $fromArray[] = $pos;
                 $offset = $pos+1;
-        
+
         }while($pos !== false);
-        
+
         /**
           *  Check for ORDER BYs that are not inside quotes or tics.
@@ -664 +664 @@
         $offset = 0;
         do{
-                
+
                 $pos = stripos($querystatement, "order by", $offset);
-                
+
                 if($pos !== false)
                         if(!$insideArray[$pos])
                                 $orderArray[] = $pos;
                 $offset = $pos+1;
-        
+
         }while($pos !== false);
-        
-        
+
+
         /**
-          *  Pair the SELECTs with their appropriate FROMs 
+          *  Pair the SELECTs with their appropriate FROMs
           */
         $godArray = array();
@@ -682 +682 @@
         $j = 0;
         foreach($fromArray as $fromPos){
-                
+
                 $closest = 0;
                 $index = 0;
@@ -690 +690 @@
                                 $index = $i;
                         }//end if
-                        
+
                 unset($tempSelectArray[$index]);
                 $godArray[$j]["select"] = $closest;
                 $godArray[$j]["from"] = $fromPos;
                 $j++;
-                
+
         }//end foreach
-        
-        
+
+
         /**
           *  Pair the ORDER BYs with their approriate FROMs (and thus their
@@ -706 +706 @@
         $j = 0;
         foreach($orderArray as $orderPos){
-                
+
                 $closest = 0;
                 $index = 0;
@@ -714 +714 @@
                                 $index = $i;
                         }//end if
-                        
+
                 unset($tempFromArray[$index]);
                 for($k=0; $k < count($godArray); $k++)
                         if($godArray[$k]["from"] == $closest)
                                 $godArray[$k]["order"] = $orderPos;
-                
+
                 $j++;
-                
+
         }//end foreach
-        
-        
+
+
         /**
           *  The last entry in the $godArray should be the outermost / first
@@ -732 +732 @@
         if(!isset($godArray[$l]["order"]))
                 $godArray[$l]["order"] = strlen($querystatement);
-        
+
         if(!($godArray[$l]["order"]))
                 $godArray[$l]["order"] = strlen($querystatement);
-        
+
         return substr($querystatement, $godArray[$l]["from"], $godArray[$l]["order"] - $godArray[$l]["from"]);
-        
+
 }//end function
 
@@ -1125 +1125 @@
 
 /*
- * function cleanFilename       
+ * function cleanFilename
  * @param $string
  * @return string $string with only alpha-numeric characters, periods (.),
@@ -1132 +1132 @@
 
 function cleanFilename($string) {
-        
+
         $pattern = "/[^\w\d\.\-\_]/";
         $string = preg_replace($pattern, "", $string);
-        
+
         return $string;
-        
+
 }//end function --cleanFilename--
 
@@ -1246 +1246 @@
 
 
+/**
+ * function debug
+ *
+ * essentially provides a formatted var_dump with extra info for development purposes
+ */
+function debug($variable, $exit = false){
+
+        echo "<pre>";
+        var_dump($variable);
+        echo "</pre>";
+
+        $backtrace = debug_backtrace();
+
+        if(count($backtrace) > 1)
+            array_shift($backtrace);
+
+        foreach($backtrace as $trace){
+
+                echo "* ";
+
+                if(isset($trace["class"]))
+                    echo $trace["class"]."-&gt; ";
+
+                if(isset($trace["function"]))
+                    echo $trace["function"]." ";
+
+                echo "in ".$trace["file"]." ";
+                echo "on line ".$trace["line"]."<br />";
+
+        }//endforeach
+
+        if($exit)
+                exit();
+
+}//endif
+
 //for windows servers, we have no define time constants and nl_langinfo function
 //in a limited fashion; some windows servers still show that the function

trunk/phpbms/install/createtables.sql

@@ -124 +124 @@
 ) ENGINE=INNODB;
 
+CREATE TABLE `reportsettings` (
+  `id` int(11) NOT NULL auto_increment,
+  `reportuuid` varchar(64) NOT NULL,
+  `name` varchar(64) NOT NULL default '',
+  `value` text default '',
+  `type` varchar(32) NOT NULL default 'string',
+  `required` tinyint(4) NOT NULL default '0',
+  `defaultvalue` varchar(255) NOT NULL,
+  `description` text,
+  PRIMARY KEY  (`id`)
+) ENGINE=INNODB;
+
 CREATE TABLE `reports` (
   `id` int(11) NOT NULL auto_increment,

trunk/phpbms/install/reports.sql

@@ -1 @@
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:37cee478-b57e-2d53-d951-baf3937ba9e0', 'Raw Table Print', 'report', '', '0', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'report/general_tableprint.php', 'This report will print out of every field for the table for the given records.  The report is displayed in HTML format.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:37cee478-b57e-2d53-d951-baf3937ba9e0', 'Raw Table Print', 'report', '', '0', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'report/general_tableprint.php', 'This report will prints out of every field for the table for the given records.  The report is displayed HTML format.', 1, NOW(), 1, NOW());
 INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:dac75fb9-91d2-cb1e-9213-9fab6d32f4c8', 'Raw Table Export', 'export', '', '0', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'report/general_export.php', 'This report will generate a comma-delimited text file. Values are encapsulated in quotes, and the first line lists the field names.', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:a6999cc3-59bb-6af3-460e-d5d791afb842', 'Note Summary', 'PDF Report', 'tbld:a4cdd991-cf0a-916f-1240-49428ea1bdd1', '50', '', 'modules/base/report/notes_summary.php', 'PDF report giving basic note information (subject,dates,content) .  By default, the notes are shown in chronological order.', 1, NOW(), 1, NOW());
 INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:2944b204-5967-348a-8679-6835f45f0d79', 'SQL Export', 'export', '', '0', 'Admin', 'report/general_sql.php', 'Generate SQL INSERT statements for records.', 1, NOW(), 1, NOW());
 INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:37a299d1-d795-ad83-4b47-0778c16a381c', 'Support Tables SQL Export', 'export', 'tbld:5c9d645f-26ab-5003-b98e-89e9049f8ac3', '0', '', 'modules/base/report/tabledefs_sqlexport.php', 'Insert statements for all support table records for table definition records.', 1, NOW(), 1, NOW());

trunk/phpbms/install/updatev0.98.sql

@@ -42 +42 @@
 ) ENGINE=INNODB;
 --end widgets CREATE--
+--reportsettings CREATE--
+CREATE TABLE `reportsettings` (
+  `id` int(11) NOT NULL auto_increment,
+  `reportuuid` varchar(64) NOT NULL,
+  `name` varchar(64) NOT NULL default '',
+  `value` text default '',
+  `type` varchar(32) NOT NULL default 'string',
+  `required` tinyint(4) NOT NULL default '0',
+  `defaultvalue` varchar(255) NOT NULL,
+  `description` text,
+  PRIMARY KEY  (`id`)
+) ENGINE=INNODB;
+--end reportsettings CREATE--
 
 --attachments ALTER--
@@ -276 +289 @@
 INSERT INTO `menu` (`uuid`, `name`, `link`, `parentid`, `displayorder`, `createdby`, `modifiedby`, `creationdate`, `modifieddate`, `roleid`) VALUES ('menu:e8401ebb-c369-304f-053d-8195988e7faf', '----', 'N/A', 'menu:f07d910f-f56d-3d24-e74f-7a3b36b2d3c8', '30', 1, 1, NOW(), NOW(), '');
 --end menu INSERT--
---modules UPDATE--
-UPDATE `modules` SET `uuid`='mod:29873ee8-c12a-e3f6-9010-4cd24174ffd7' WHERE `id`='1';
---end modules UPDATE--
---reports UPDATE--
-UPDATE `reports` SET
-    `uuid`='rpt:37cee478-b57e-2d53-d951-baf3937ba9e0'
-WHERE
-    `name`='Raw Table Print';
-UPDATE `reports` SET
-    `uuid`='rpt:dac75fb9-91d2-cb1e-9213-9fab6d32f4c8',
-    `description` = 'This report will generate a comma-delimited text file. Values are encapsulated in quotes, and the first line lists the field names.'
-WHERE
-    `name`='Raw Table Export';
-UPDATE `reports` SET `uuid`='rpt:a6999cc3-59bb-6af3-460e-d5d791afb842' WHERE `name`='Note Summary';
-UPDATE `reports` SET `uuid`='rpt:2944b204-5967-348a-8679-6835f45f0d79' WHERE `name`='SQL Export';
-UPDATE `reports` SET `uuid`='rpt:37a299d1-d795-ad83-4b47-0778c16a381c' WHERE `name`='Support Tables SQL Export';
+--reports DELETE/INSERT--
+DELETE FROM `reports` WHERE `name` IN ('Raw Table Print', 'Raw Table Export', 'Note Summary', 'SQL Export', 'Support Tables SQL Export');
+INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:37cee478-b57e-2d53-d951-baf3937ba9e0', 'Raw Table Print', 'report', '', '0', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'report/general_tableprint.php', 'This report will prints out of every field for the table for the given records.  The report is displayed HTML format.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:dac75fb9-91d2-cb1e-9213-9fab6d32f4c8', 'Raw Table Export', 'export', '', '0', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'report/general_export.php', 'This report will generate a comma-delimited text file. Values are encapsulated in quotes, and the first line lists the field names.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:2944b204-5967-348a-8679-6835f45f0d79', 'SQL Export', 'export', '', '0', 'Admin', 'report/general_sql.php', 'Generate SQL INSERT statements for records.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:37a299d1-d795-ad83-4b47-0778c16a381c', 'Support Tables SQL Export', 'export', 'tbld:5c9d645f-26ab-5003-b98e-89e9049f8ac3', '0', '', 'modules/base/report/tabledefs_sqlexport.php', 'Insert statements for all support table records for table definition records.', 1, NOW(), 1, NOW());
 --end reports UPDATE--
 --scheduler INSERT--

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

@@ -38 +38 @@
 */
 if(class_exists("phpbmsTable")) {
-        class reports extends phpbmsTable{
-
-                var $_availableTabledefUUIDs = NULL;
-                var $_availableRoleUUIDs = NULL;
-
-                function getDefaults(){
-                        $therecord = parent::getDefaults();
-
-                        $therecord["type"]="report";
-                        $therecord["uuid"] = uuid("reports:");
-
-                        return $therecord;
-
-                }
-
-
-                function verifyVariables($variables){
-
-                        //cannot be table default ("")
-                        if(isset($variables["reportfile"])){
-                                if($variables["reportfile"] === "" || $variables["reportfile"] === NULL)
-                                        $this->verifyErrors[] = "The `reportfile` field must not be blank.";
-                        }else
-                                $this->verifyErrors[] = "The `reportfile` field must be set.";
-
-                        //Table default (NULL) OK
-                        if(isset($variables["type"]))
-                                if($variables["type"] !== "")//don't care if it's ""
-                                        switch($variables["type"]){
-                                                case "report":
-                                                case "PDF Report":
-                                                case "export":
-                                                        break;
-
-                                                default:
-                                                        $this->verifyErrors[] = "The `type` field is not an accepted value.  It must be 'report', 'PDF Report', or 'export.";
-                                                break;
-
-                                        }//end switch
-
-                        //Table Default ('') ok becuase it means report is globally available to any table
-                        if(isset($variables["tabledefid"])){
-
-                                if($this->_availableTabledefUUIDs === NULL){
-                                        $this->_availableTabledefUUIDs = $this->_loadUUIDList("tabledefs");
-                                        //add the global option
-                                        $this->_availableTabledefUUIDs[] = "";
-                                }//end if
-
-                                if( !in_array((string)$variables["tabledefid"], $this->_availableTabledefUUIDs) )
-                                        $this->verifyErrors[] = "The `tabledefid` field does not give an existing/acceptable table definition uuid.";
-
-                        }//end if
-
-                        //Table Default ('') ok becuase it means report is globally available to any user
-                        if(isset($variables["roleid"])){
-
-                                if($this->_availableRoleUUIDs === NULL){
-                                        $this->_availableRoleUUIDs = $this->_loadUUIDList("roles");
-                                        $this->_availableRoleUUIDs[] = ""; // for no role restrictions
-                                        $this->_availableRoleUUIDs[] = "Admin"; //for the Admin restriction
-                                }//end if
-
-                                if( !in_array((string)$variables["roleid"], $this->_availableRoleUUIDs) )
-                                        $this->verifyErrors[] = "The `roleid` field does not give an existing/acceptable to role id number.";
-
-                        }//end if
-
-                        return parent::verifyVariables($variables);
-
-                }//end method
-
-
-                function displayTables($fieldname,$selectedid){
-
-                        $querystatement="SELECT uuid, displayname FROM tabledefs ORDER BY displayname";
-                        $thequery=$this->db->query($querystatement);
-
-                        echo "<select id=\"".$fieldname."\" name=\"".$fieldname."\">\n";
-
-                        echo "<option value=\"\" ";
-                        if ($selectedid=="") echo "selected=\"selected\"";
-                        echo " style=\"font-weight:bold\">global</option>\n";
-
-                        while($therecord=$this->db->fetchArray($thequery)){
-                                echo "  <option value=\"".$therecord["uuid"]."\"";
-                                        if($selectedid==$therecord["uuid"]) echo " selected=\"selected\"";
-                                echo ">".$therecord["displayname"]."</option>\n";
-                        }
-
-                        echo "</select>\n";
-                }//end method
-
-        }//end class
+    class reports extends phpbmsTable{
+
+        var $_availableTabledefUUIDs = NULL;
+        var $_availableRoleUUIDs = NULL;
+
+        function getDefaults(){
+
+            $therecord = parent::getDefaults();
+
+            $therecord["type"] = "report";
+
+            return $therecord;
+
+        }//end function getDefaults
+
+
+        function verifyVariables($variables){
+
+            //cannot be table default ("")
+            if(isset($variables["reportfile"])){
+                if($variables["reportfile"] === "" || $variables["reportfile"] === NULL)
+                    $this->verifyErrors[] = "The `reportfile` field must not be blank.";
+            }else
+                $this->verifyErrors[] = "The `reportfile` field must be set.";
+
+            //Table default (NULL) OK
+            if(isset($variables["type"]))
+                if($variables["type"] !== "")//don't care if it's ""
+                    switch($variables["type"]){
+
+                            case "report":
+                            case "PDF Report":
+                            case "export":
+                                break;
+
+                            default:
+                                $this->verifyErrors[] = "The `type` field is not an accepted value.  It must be 'report', 'PDF Report', or 'export.";
+                            break;
+
+                    }//end switch
+
+            //Table Default ('') ok becuase it means report is globally available to any table
+            if(isset($variables["tabledefid"])){
+
+                if($this->_availableTabledefUUIDs === NULL){
+
+                    $this->_availableTabledefUUIDs = $this->_loadUUIDList("tabledefs");
+
+                    //add the global option
+                    $this->_availableTabledefUUIDs[] = "";
+
+                }//end if
+
+                if( !in_array((string)$variables["tabledefid"], $this->_availableTabledefUUIDs) )
+                    $this->verifyErrors[] = "The `tabledefid` field does not give an existing/acceptable table definition uuid.";
+
+            }//end if
+
+            //Table Default ('') ok becuase it means report is globally available to any user
+            if(isset($variables["roleid"])){
+
+                if($this->_availableRoleUUIDs === NULL){
+
+                    $this->_availableRoleUUIDs = $this->_loadUUIDList("roles");
+                    $this->_availableRoleUUIDs[] = ""; // for no role restrictions
+                    $this->_availableRoleUUIDs[] = "Admin"; //for the Admin restriction
+
+                }//end if
+
+                if( !in_array((string)$variables["roleid"], $this->_availableRoleUUIDs) )
+                    $this->verifyErrors[] = "The `roleid` field does not give an existing/acceptable to role id number.";
+
+            }//end if
+
+            return parent::verifyVariables($variables);
+
+        }//end method
+
+
+        function insertRecord($variables, $createdby = NULL, $overrideID = false, $replace = false, $useUuid = false){
+
+            $newid = parent::insertRecord($variables, $createdby, $overrideID, $replace, $useUuid);
+
+            $reportSettings = new reportSettings($this->db, $variables["uuid"]);
+            $reportSettings->createFromDefaults($variables["reportfile"]);
+
+            return $newid;
+
+        }//end method
+
+
+        function updateRecord($variables, $modifiedby = NULL, $useUuid = false){
+
+            parent::updateRecord($variables, $modifiedby, $useUuid);
+
+            $reportSettings = new reportSettings($this->db, $variables["uuid"]);
+            $reportSettings->save($variables["rsDelList"], $variables["rsUpdates"], $variables["rsAdds"]);
+
+        }//end method updateRecord
+
+
+        function displayTables($fieldname,$selectedid){
+
+            $querystatement="SELECT uuid, displayname FROM tabledefs ORDER BY displayname";
+            $thequery=$this->db->query($querystatement);
+
+            echo "<select id=\"".$fieldname."\" name=\"".$fieldname."\">\n";
+
+            echo "<option value=\"\" ";
+            if ($selectedid=="") echo "selected=\"selected\"";
+            echo " style=\"font-weight:bold\">global</option>\n";
+
+            while($therecord=$this->db->fetchArray($thequery)){
+                    echo "      <option value=\"".$therecord["uuid"]."\"";
+                            if($selectedid==$therecord["uuid"]) echo " selected=\"selected\"";
+                    echo ">".$therecord["displayname"]."</option>\n";
+            }
+
+            echo "</select>\n";
+
+        }//end method
+
+
+        /**
+         * function displayFiles
+         *
+         * Displays a list of possible report filenames.  This includes
+         * all PHP files in the main report folder, as well as in the report
+         * folder of any loaded module
+         */
+        function displayRerportFiles(){
+
+            $files = array();
+
+            $curDir = getcwd();
+
+            chdir("../..");
+
+            /**
+             * Load core reports
+             */
+            if(file_exists("report") && is_dir("report")){
+
+                $thedir = @ opendir("report");
+
+                    while($entry = @ readdir($thedir))
+                        if(@ strtolower(substr($entry, -4)) == ".php")
+                            $files[] = "report/".$entry;
+
+            }//endif
+
+            chdir("modules");
+
+            /**
+             * Get loaded modules
+             */
+            $querystatement = "
+                SELECT
+                    `name`
+                FROM
+                    `modules`";
+
+            $queryresult = $this->db->query($querystatement);
+
+            while($therecord = $this->db->fetchArray($queryresult)){
+
+                chdir($therecord["name"]);
+
+                $thedir = @ opendir("report");
+
+                    while($entry = @ readdir($thedir))
+                        if(@ strtolower(substr($entry, -4)) == ".php")
+                            $files[] = "modules/".$therecord["name"]."/report/".$entry;
+
+                chdir("..");
+
+            }//endwhile
+
+            chdir($curDir);
+
+            ?><label for="reportfile">report file</label><br />
+            <select id="reportfile" name="reportfile">
+                <?php foreach($files as $filename){?>
+                    <option value="<?php echo $filename; ?>"><?php echo $filename; ?></option>
+                <?php }//endforeach?>
+            </select><?php
+
+        }//end function displayReportFiles
+
+    }//end class
+
+
+
+    /**
+     * handles retrieval, display and saving of report settings records
+     */
+    class reportSettings{
+
+        /**
+         * $db
+         * @var object the database object
+         */
+        var $db;
+
+        /**
+         * $reportUUID
+         * @var string report UUID
+         */
+        var $reportUUID;
+
+        /**
+         * $settingsQueryResult
+         * @var int query result reference
+         */
+        var $settingsQueryResult;
+
+
+        /**
+         * function reportSettings
+         *
+         * Class initializer
+         *
+         * @param object $db database object
+         * @param string $reportUUID associated report's UUID
+         */
+        function reportSettings($db, $reportUUID){
+
+            $this->db = $db;
+            $this->reportUUID = $reportUUID;
+
+        }//end function reportSettings (init)
+
+
+        /**
+         * function get
+         *
+         * retrieves query result for all report settings asociated with report
+         */
+        function get(){
+
+            $querystatement = "
+                SELECT
+                    `id`,
+                    `name`,
+                    `value`,
+                    `type`,
+                    `required`,
+                    `description`
+                FROM
+                    `reportsettings`
+                WHERE
+                    `reportuuid` = '".$this->reportUUID."'";
+
+            $this->settingsQueryResult = $this->db->query($querystatement);
+
+        }//end function get
+
+
+        /**
+         * function display
+         *
+         * Display all settings records one TR for each
+         */
+        function display(){
+
+            if($this->db->numRows($this->settingsQueryResult) == 0){
+
+                ?><tr class="norecords" id="noSettings"><td colspan="5">No Settings</td></tr><?php
+
+                return;
+
+            }//endif
+
+            $row = 1;
+
+            while($therecord = $this->db->fetchArray($this->settingsQueryResult)){
+
+                ?>
+                <tr class="qr<?php echo $row; ?> rsRows" id="rsExRow<?php echo $therecord["id"] ?>">
+                    <td align="right">
+                        <strong><?php echo formatVariable($therecord["name"]) ?></strong>
+                        <input class="rsNames" id="rsName<?php echo $therecord["id"]?>" type="hidden" value="<?php echo formatVariable($therecord["name"]) ?>" />
+                    </td>
+                    <td>
+                        <?php if($therecord["type"] != "text") {?>
+                        <input class="rsValues" id="rsValue<?php echo $therecord["id"] ?>" type="text" size="32" value="<?php echo formatVariable(addcslashes($therecord["value"],"\\\n\t\r")) ?>" />
+                        <?php } else {
+                            ?>
+                            <textarea class="rsValues" id="rsValue<?php echo $therecord["id"] ?>" rows="2" cols="29"><?php echo formatVariable(addcslashes($therecord["value"],"\\\n\t\r")) ?></textarea>
+                            <?php
+                        }?>
+                    </td>
+                    <td><?php echo formatVariable($therecord["type"]) ?></td>
+                    <td><?php echo formatVariable($therecord["description"]) ?></td>
+                    <td><?php
+                        if($therecord["required"] != 1){
+
+                            ?><button type="button" id="rsDelButton<?php echo $therecord["id"]?>" class="graphicButtons buttonMinus rsDelButtons" title="Remove Setting"><span>-</span></button><?php
+
+                        }//endif
+                    ?></td>
+                </tr>
+                <?php
+
+                $row = ($row==1) ? 2 : 1;
+
+            }//endwhile
+
+        }//end function display
+
+
+        /**
+         * function save
+         *
+         * saves report settings changes
+         *
+         * @param string $delList JSON string of ids to be deleted
+         * @param string $updateList JSON string of updates to be made
+         * @param string $addList JSON string of name/value pairs to be added
+         */
+        function save($delList, $updateList, $addList){
+
+            $delList = json_decode(stripslashes($delList));
+            if(count($delList)){
+
+                $inClause = "";
+
+                foreach($delList as $id){
+
+                    $inClause .= ", ".$id;
+
+                }//endforeach
+
+                $deletestatement = "
+                    DELETE FROM
+                        `reportsettings`
+                    WHERE
+                        `id` IN (".substr($inClause, 1).")";
+
+                $this->db->query($deletestatement);
+
+            }//endif
+
+            $updateList = str_replace("\n", "\\\\n", $updateList);
+            $updateList = str_replace("\r", "", $updateList);
+            $updateList = json_decode(stripslashes($updateList));
+
+            foreach($updateList as $updateObj){
+
+                $updatestatement = '
+                    UPDATE
+                        `reportsettings`
+                    SET
+                        `value` = "'.mysql_real_escape_string($updateObj->value).'"
+                    WHERE
+                        `id` = '.((int) $updateObj->id);
+
+                $this->db->query($updatestatement);
+
+            }//endforeach
+
+
+            $addList = str_replace("\n", "\\\\n", $addList);
+            $addList = str_replace("\r", "", $addList);
+            $addList = json_decode(stripslashes($addList));
+
+            foreach($addList as $addObj){
+
+                $insertstatement = '
+                    INSERT INTO
+                        `reportsettings`
+                    (
+                        `reportuuid`,
+                        `name`,
+                         `value`
+                    ) VALUES (
+                        "'.$this->reportUUID.'",
+                        "'.mysql_real_escape_string($addObj->name).'",
+                        "'.mysql_real_escape_string($addObj->value).'"
+                    )';
+
+                $this->db->query($insertstatement);
+
+            }//endforeach
+
+        }//end function save
+
+
+        /**
+         * function createFromDefaults
+         *
+         * Creates reportsettings records for report based on defaults from the class
+         * instanciated by filename
+         *
+         * @param string $filename file name of report file to retrieve class from
+         */
+        function createFromDefaults($filename){
+
+            $addingReportRecord = true;
+            $noOutput = true;
+
+            include_once("report/report_class.php");
+
+            include($filename);
+
+            if(!isset($reportClass))
+                $error = new appError(200, "Report file is missing reportClass definition", "Report File Error");
+            else
+                $report = new $reportClass($this->db, $this->reportUUID, "tbld:d595ef42-db9d-2233-1b9b-11dfd0db9cbb");
+
+            $settings = $report->addingRecordDefaultSettings();
+
+            $startInsertStatement = "
+                    INSERT INTO
+                        `reportsettings`
+                    (
+                        `reportuuid`,
+                        `name`,
+                        `value`,
+                        `type`,
+                        `required`,
+                        `defaultvalue`,
+                        `description`
+                    ) VALUES (
+                        '".$this->reportUUID."',";
+
+            foreach($settings as $setting){
+
+                $insertstatement = $startInsertStatement;
+                $insertstatement .= "'".$setting["name"]."', " ;
+                $insertstatement .= "'".$setting["defaultValue"]."', " ;
+                $insertstatement .= "'".$setting["type"]."', " ;
+                $insertstatement .= ((int) $setting["required"]).", " ;
+                $insertstatement .= "'".$setting["defaultValue"]."', " ;
+                $insertstatement .= "'".$setting["description"]."')" ;
+
+                $this->db->query($insertstatement);
+
+            }//endforeach
+
+        }//end function createFromDefaults
+
+    }//end class
+
+}//end if
+
+if(class_exists("searchFunctions")){
+
+    class tabledefsSearchFunctions extends searchFunctions{
+
+        function delete_record($useUUID = false){
+
+            if(!$useUUID){
+
+                $whereclause = $this->buildWhereClause();
+                //support tables link to tabledefs using uuids not ids, so we must make sure that they are uuids.
+                $this->idsArray = getUuidArray($this->db, "tbld:d595ef42-db9d-2233-1b9b-11dfd0db9cbb", $this->idsArray);
+
+            }else
+                $whereclause = $this->buildWhereClause($this->maintable.".uuid");
+
+            $linkedwhereclause = $this->buildWhereClause("reportuuid");
+
+            $querystatement = "DELETE FROM reportsettings WHERE ".$linkedwhereclause.";";
+            $queryresult = $this->db->query($querystatement);
+
+            $querystatement = "DELETE FROM reports WHERE ".$whereclause.";";
+            $queryresult = $this->db->query($querystatement);
+
+            $message = $this->buildStatusMessage();
+            $message.=" deleted.";
+            return $message;
+
+        }//end function delete_record
+
+    }//end class
+
 }//end if
 ?>

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

@@ -38 +38 @@
 */
 
-        if(!isset($_SESSION["userinfo"])){
+if(!class_exists("phpbmsReport"))
+    include("../../../report/report_class.php");
 
-                session_cache_limiter('private');
+class tabledefSQLExport extends phpbmsReport{
 
-                require("../../../include/session.php");
+    function tabledefSQLExport($db, $reportUUID, $tabledefUUID){
 
-        }//end if
+        parent::phpbmsReport($db, $reportUUID, $tabledefUUID);
+
+    }//end method
 
 
-        if(!class_exists("phpbmsReport"))
-                include("report/report_class.php");
+    function generate(){
 
-        class tabledefSQLExport extends phpbmsReport{
+            $this->reportOutput .= $this->_addTableInfo("tablecolumns");
+            $this->reportOutput .= $this->_addTableInfo("tablefindoptions");
+            $this->reportOutput .= $this->_addTableInfo("tablegroupings");
+            $this->reportOutput .= $this->_addTableInfo("tableoptions");
+            $this->reportOutput .= $this->_addTableInfo("tablesearchablefields");
 
-                var $reportOutput = "";
-
-                function sqlExport($db){
-
-                        parent::phpbmsReport($db);
-
-                }//end method
+    }//end method
 
 
-                function generate(){
+    function _addTableInfo($tablename){
 
-                        $this->reportOutput .= $this->_addTableInfo("tablecolumns");
-                        $this->reportOutput .= $this->_addTableInfo("tablefindoptions");
-                        $this->reportOutput .= $this->_addTableInfo("tablegroupings");
-                        $this->reportOutput .= $this->_addTableInfo("tableoptions");
-                        $this->reportOutput .= $this->_addTableInfo("tablesearchablefields");
+        $querystatement = "
+            SELECT
+                    `uuid`
+            FROM
+                    `tabledefs`
+            WHERE
+                    ".$this->whereClause;
 
-                }//end method
+        $queryresult = $this->db->query($querystatement);
+
+        $whereclause = "";
+
+        while($therecord = $this->db->fetchArray($queryresult))
+            $whereclause .= " OR `tabledefid` = '".mysql_real_escape_string($therecord["uuid"])."'";
+
+        $whereclause = substr($whereclause, 4);
+
+        $output =       "/* Begin ".$tablename." */\n".
+                        "/* ====================================================================== */\n";
+
+        $querystatement = "
+                SELECT
+                        *
+                FROM
+                        `".$tablename."`
+                WHERE
+                        ".$whereclause."
+                ORDER BY
+                        ".$tablename.".tabledefid";
+
+        $queryresult = $this->db->query($querystatement);
+
+        $num_fields = $this->db->numFields($queryresult);
+
+        $statementstart = "INSERT INTO `".$tablename."` (";
+
+        for($i=0; $i<$num_fields ;$i++){
+
+            $fieldname = $this->db->fieldName($queryresult,$i);
+
+            if($fieldname != "id")
+                $statementstart .= "`".$fieldname."`, ";
+
+        }//endfor
+
+        $statementstart = substr($statementstart,0,strlen($statementstart)-2).") VALUES (";
+
+        while($therecord = $this->db->fetchArray($queryresult)){
+
+            $insertstatement = $statementstart;
+
+            foreach($therecord as $name => $field){
+
+                if($field === NULL)
+                    $addfield = "NULL, ";
+                else
+                    $addfield = "'".mysql_real_escape_string($field)."', ";
+
+                if($name != "id")
+                    $insertstatement .= $addfield;
+
+            }//endforeach
+
+            $insertstatement = substr($insertstatement,0,strlen($insertstatement)-2).");\n";
+
+            $output .= $insertstatement;
+
+        }//endwhile
 
 
-                function _addTableInfo($tablename){
+        $output .=      "/* ====================================================================== */\n".
+                        "/* END ".$tablename." - record count: ".$this->db->numRows($queryresult)."*/\n\n";
 
-                        $querystatement = "
-                                SELECT
-                                        `uuid`
-                                FROM
-                                        `tabledefs`
-                                WHERE
-                                        ".$this->whereclause."
-                                ";
+        return $output;
 
-                        $queryresult = $this->db->query($querystatement);
-
-                        $whereclause = "";
-                        while($therecord = $this->db->fetchArray($queryresult)){
-
-                                $whereclause .= " OR `tabledefid` = '".mysql_real_escape_string($therecord["uuid"])."'";
-
-                        }//end while
-
-                        $whereclause = substr($whereclause, 4);
-
-                        $output =       "/* Begin ".$tablename." */\n".
-                                                "/* ====================================================================== */\n";
-
-                        $querystatement = "
-                                SELECT
-                                        *
-                                FROM
-                                        `".$tablename."`
-                                WHERE
-                                        ".$whereclause."
-                                ORDER BY
-                                        ".$tablename.".tabledefid";
-
-                        $queryresult = $this->db->query($querystatement);
-
-                        $num_fields = $this->db->numFields($queryresult);
-
-                        $statementstart = "INSERT INTO `".$tablename."` (";
-
-                        for($i=0; $i<$num_fields ;$i++){
-
-                                $fieldname = $this->db->fieldName($queryresult,$i);
-
-                                if($fieldname != "id")
-                                        $statementstart .= "`".$fieldname."`, ";
-
-                        }//endfor
-
-                        $statementstart = substr($statementstart,0,strlen($statementstart)-2).") VALUES (";
-
-                        while($therecord = $this->db->fetchArray($queryresult)){
-
-                                $insertstatement = $statementstart;
-
-                                foreach($therecord as $name => $field){
-
-                                        if($field === NULL)
-                                                $addfield = "NULL, ";
-                                        else
-                                                $addfield = "'".mysql_real_escape_string($field)."', ";
-
-                                        if($name != "id")
-                                                $insertstatement .= $addfield;
-
-                                }//endforeach
-
-                                $insertstatement = substr($insertstatement,0,strlen($insertstatement)-2).");\n";
-
-                                $output .= $insertstatement;
-
-                        }//endwhile
+    }//end method
 
 
-                        $output .=      "/* ====================================================================== */\n".
-                                                "/* END ".$tablename." - record count: ".$this->db->numRows($queryresult)."*/\n\n";
+    function show(){
 
-                        return $output;
+        header("Content-type: text/plain");
+        header('Content-Disposition: attachment; filename="tableInfoSQL.sql"');
 
-                }//end method
+        echo $this->reportOutput;
+
+    }//end method
 
 
-                function show(){
+}//end class
 
-                        header("Content-type: text/plain");
-                        header('Content-Disposition: attachment; filename="tableInfoSQL.sql"');
+/**
+ * PROCESSING
+ * =============================================================================
+ */
+if(!isset($noOutput)){
 
-                        echo $this->reportOutput;
+    session_cache_limiter('private');
 
-                }//end method
+    require_once("../../../include/session.php");
 
+    checkForReportArguments();
 
-        }//end class
+    $report = new tabledefSQLExport($db, $_GET["rid"],$_GET["tid"]);
+    $report->setupFromPrintScreen();
+    $report->generate();
+    $report->show();
 
-        //PROCESSING
-        //========================================================================
+}//end if
 
-        if(!isset($noOutput)){
-
-                $report = new tabledefSQLExport($db);
-                $report->setupFromPrintScreen();
-                $report->generate();
-                $report->show();
-
-        }//end if
+/**
+ * When adding a new report record, the add/edit needs to know what the class
+ * name is so that it can instantiate it, and grab it's default settings.
+ */
+if(isset($addingReportRecord))
+    $reportClass ="tabledefSQLExport";
 ?>

trunk/phpbms/modules/base/reports_addedit.php

@@ -46 +46 @@
         $therecord = $thetable->processAddEditPage();
 
+        if($therecord["id"]){
+
+            $reportSettings = new reportSettings($db, $therecord["uuid"]);
+            $reportSettings->get();
+
+        }//endif
+
         if(isset($therecord["phpbmsStatus"]))
                 $statusmessage = $therecord["phpbmsStatus"];
@@ -51 +58 @@
         $pageTitle="Report";
 
-        $phpbms->cssIncludes[] = "pages/reports.css";
+        $phpbms->cssIncludes[] = "pages/base/reports.css";
+        $phpbms->jsIncludes[] = "modules/base/javascript/reports.js";
 
                 //Form Elements
                 //==============================================================
-                $theform = new phpbmsForm();
+                $theform = new phpbmsForm(NULL, "post", "record", NULL);
+                $theform->id = "record";
 
                 $theinput = new inputField("name",$therecord["name"],NULL,true,NULL,32,64);
@@ -70 +79 @@
                 $theform->addField($theinput);
 
-                $theinput = new inputField("reportfile",$therecord["reportfile"],"report file",true,NULL,64,128);
-                $theform->addField($theinput);
+                if($therecord["id"]){
+
+                    $theinput = new inputField("reportfile",$therecord["reportfile"],"report file",true,NULL,64,128);
+                    $theinput->setAttribute("readonly","readonly");
+                    $theinput->setAttribute("class","uneditable");
+
+                    $theform->addField($theinput);
+
+                }//endif
+
+                $theinput = new inputTextarea("description", $therecord["description"], NULL, false, 3, 48);
+                $theform->addField($theinput);
 
                 $thetable->getCustomFieldInfo();
@@ -82 +101 @@
 
 ?><div class="bodyline">
-        <?php $theform->startForm($pageTitle)?>
-
+<?php $theform->startForm($pageTitle) ?>
         <fieldset id="fsAttributes">
                 <legend>Attributes</legend>
+
+                <p><?php $theform->showField("type")?></p>
 
                 <p>
                         <label for="tabledefid">report table</label><br />
                         <?php $thetable->displayTables("tabledefid",$therecord["tabledefid"]);?><br />
-                        <span class="notes">Note: Use the global option to associate the report with every table in the system.</span>
                 </p>
 
                 <p>
                         <?php $theform->showField("displayorder"); ?><br />
-                        <span class="notes">Lower numbers are displayed first.  Reports with the same order are grouped together.</span>
                 </p>
 
@@ -108 +126 @@
                         <p class="big"><?php $theform->showField("name"); ?></p>
 
-                        <p><?php $theform->showField("type")?></p>
-
-                        <p><?php $theform->showField("reportfile")?></p>
 
                         <p>
-                                <label for="description">description</label><br />
-                                <textarea id="description" name="description"  cols="61" rows="5" tabindex="35"><?php echo htmlQuotes($therecord["description"])?></textarea>
-                        </p>
+                        <?php
+                            if($therecord["id"])
+                                $theform->showField("reportfile");
+                            else
+                                $thetable->displayRerportFiles();
+                        ?>
+                        </p>
+
+                        <p class="big"><?php $theform->showField("description"); ?></p>
+
                 </fieldset>
+
+                <fieldset>
+                    <legend>settings</legend>
+                    <?php if(!$therecord["id"]) {
+                        ?><p class="notes">Report settings are available after initial record creation.</p><?php
+                    } else {
+                      ?>
+
+
+                        <textarea class="hiddenTextAreas" id="rsUpdates" name="rsUpdates" rows="1" cols="5"></textarea>
+                        <textarea class="hiddenTextAreas" id="rsDelList" name="rsDelList" rows="1" cols="5"></textarea>
+                        <textarea class="hiddenTextAreas" id="rsAdds"    name="rsAdds" rows="1" cols="5"></textarea>
+                        <table class="querytable simple" id="settingsTable" cellspacing="0" cellpadding="0" border="0" summary="report settings">
+                            <thead>
+                                <tr>
+                                    <th align="right">name</th>
+                                    <th>value</th>
+                                    <th>type</th>
+                                    <th width="100%">description</th>
+                                    <th>&nbsp;</th>
+                                </tr>
+                            </thead>
+                            <tbody id="rsTbody">
+                                <tr id="addNewRow">
+                                    <td>
+                                        <input type="text" id="rsAddName"/>
+                                    </td>
+                                    <td>
+                                        <input type="text" id="rsAddValue" size="32"/>
+                                    </td>
+                                    <td>string</td>
+                                    <td>user added setting</td>
+                                    <td>
+                                        <button title="Add Setting" class="graphicButtons buttonPlus" id="rsButtonAdd" type="button"><span>+</span></button>
+                                    </td>
+                                </tr>
+                                <?php
+                                    $reportSettings->display();
+                                ?>
+                                <tr class="queryfooter" id="rsFooterTr">
+                                    <td colspan="5">&nbsp;</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                      <?php
+                    }//endif
+                    ?>
+                </fieldset>
 
                 <?php $theform->showCustomFields($db, $thetable->customFieldsQueryResult) ?>
@@ -124 +194 @@
         <?php
                 $theform->showGeneralInfo($phpbms,$therecord);
-                $theform->endForm();
+                $theform->endForm();
         ?>
 </div>

trunk/phpbms/modules/bms/clients_purchasehistory.php

@@ -52 +52 @@
         if(!isset($_POST["fromdate"])) $_POST["fromdate"]=dateToString(strtotime("-1 year"));
         if(!isset($_POST["todate"])) $_POST["todate"]=dateToString(mktime());
-        if(!isset($_POST["status"])) $_POST["status"]="Orders/Invoices";
+        if(!isset($_POST["status"])) $_POST["status"]="Orders and Invoices";
         if(!isset($_POST["command"])) $_POST["command"]="show";
 
         if($_POST["command"]=="print")  {
 
-                $_SESSION["printing"]["whereclause"]="WHERE clients.id=".$_GET["id"];
-                $_SESSION["printing"]["dataprint"]="Single Record";
-                $fromClient=true;
-                require("report/clients_purchasehistory.php");
+            $_SESSION["printing"]["whereclause"] = "clients.id=".$_GET["id"];
+            $_SESSION["printing"]["dataprint"] = "Single Record";
+
+            goURL("report/clients_purchasehistory.php?rid=".urlencode("rpt:1908b03c-cacc-f03a-6d22-21fdef123f65")."&tid=".urlencode("tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083")."&status=".urlencode($_POST["status"])."&fromdate=".urlencode($_POST["fromdate"])."&todate=".urlencode($_POST["todate"]));
 
         } else {
@@ -72 +72 @@
         $thestatus="(invoices.type =\"";
         switch($_POST["status"]){
-                case "Orders/Invoices":
+                case "Orders and Invoices":
                         $thestatus.="Order\" or invoices.type=\"Invoice\")";
                 break;
@@ -110 +110 @@
                 thedate,
                 invoices.id";
-                
+
         $queryresult=$db->query($querystatement);
 
@@ -142 +142 @@
                            <label for="status">type</label><br />
                            <select name="status" id="status">
-                                        <option value="Orders/Invoices" <?php if($_POST["status"]=="Orders/Invoices") echo "selected=\"selected\""?>>Orders/Invoices</option>
+                                        <option value="Orders abd Invoices" <?php if($_POST["status"]=="Orders and Invoices") echo "selected=\"selected\""?>>Orders and Invoices</option>
                                         <option value="Invoices" <?php if($_POST["status"]=="Invoices") echo "selected=\"selected\""?>>Invoices</option>
                                         <option value="Orders" <?php if($_POST["status"]=="Orders") echo "selected=\"selected\""?>>Orders</option>
@@ -153 +153 @@
 
                         <p id="printP"><br /><input id="print" name="command" type="submit" value="print" class="Buttons" /></p>
-                        <p id="changeTimelineP"><br /><input name="command" type="submit" value="change timeframe/view" class="smallButtons" /></p>
+                        <p id="changeTimelineP"><br /><input name="command" type="submit" value="update" class="smallButtons" /></p>
                 </div>
         </form>

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

@@ -47 +47 @@
                         "relationships",
                         "reports",
+                        "reportsettings",
                         "tablecolumns",
                         "tabledefs",

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

@@ -1 @@
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:bac1d6eb-b2bb-9aa0-77c0-ff7f9046ca75', 'Invoice', 'PDF Report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '100', '', 'modules/bms/report/invoices_pdfinvoice.php', 'This report will generate and display an invoice in PDF format (which can be printed or saved).  The PDF file will contain one page per invoice.', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:a34dd4b5-6942-2b14-4a58-74345dce48de', 'Work Order', 'PDF Report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '100', 'role:de7e6679-8bb2-29ee-4883-2fcd756fb120', 'modules/bms/report/invoices_pdfworkorder.php', 'This report will generate and display a work order in PDF format (which can be printed or saved).  The PDF file will contain one page per work order.', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:34a69580-6fbc-d04c-ed3e-f0e497a9a9b2', 'Packing List', 'PDF Report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '100', '', 'modules/bms/report/invoices_pdfpackinglist.php', 'This report will generate and display an invoice packing list in PDF format (which can be printed or saved).  The PDF file will contain one page per invoice packing list.', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:07f58303-d6e9-a032-01ad-0097d59b3c04', 'Labels - Folder', 'PDF Report', 'tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083', '50', '', 'modules/bms/report/clients_folderlabels.php', 'Avery 5160 or compatible (3x10) Instructor Folder labels. \r\n\r\n **MAKE SURE when printing the pdf file, to TURN OFF the option \"shrink oversized pages to paper size\".**', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:030e7d95-4542-b37c-3cac-a18ff5f4b8ff', 'Labels - Mailing', 'PDF Report', 'tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083', '50', '', 'modules/bms/report/clients_mailinglabels.php', 'Avery 5160 or compatible (3x10) Instructor Folder labels. \r\n\r\n **MAKE SURE when printing the pdf file, to TURN OFF the option \"shrink oversized pages to paper size\".**', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:c4a34fa0-16b5-dd85-cf63-5c8b543bb9c3', 'Labels - Shipping', 'PDF Report', 'tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083', '50', '', 'modules/bms/report/clients_shippinglabels.php', 'Avery 5160 or compatible (3x10) Instructor Folder labels. \r\n\r\n **MAKE SURE when printing the pdf file, to TURN OFF the option \"shrink oversized pages to paper size\".**', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:a502aa38-4ae8-9aa7-2795-4a05a4814637', 'Labels - Shipping', 'PDF Report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '60', '', 'modules/bms/report/invoices_shippinglabels.php', 'Avery 5160 or compatible (3x10) Instructor Folder labels. \r\n\r\n **MAKE SURE when printing the pdf file, to TURN OFF the option \"shrink oversized pages to paper size\".**', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:e3ef15d4-1bf5-36a1-cc05-ee44025ad619', 'Totals - Custom', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals.php', 'Creater your own custom invoice totaling report, specify groupings, totals, averages and whether to display summary, invoice, and invoice detail information.', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:5ec9b1fb-f3c6-26c7-f1bc-bec4ac8448fd', 'Totals - Amt. w/  Invoices', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals_amtwinv.php', 'Basic totals report. Shows invoice total, subtotal and amount due fields  and displaying indidivdual invoice information.', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:960ec744-4955-81d1-8170-e56251603e4b', 'Totals - Amt. w/ Invoices + Line Items', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals_amtwinvlineitems.php', 'Basic totals report. Shows invoice total, subtotal and amount due fields  and displaying indidivdual invoice and line item information.', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:47407854-cb7f-f1e3-bc44-1b3979eae9b0', 'Totals - Grouped by Acct. Manager', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals_acctmngers.php', 'Totals report grouping by client account manager', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:05de9afc-c82c-ed66-9403-184aa3f07a1c', 'Totals - Grouped by Shipping Method', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals_shippingmethod.php', 'Totals report including shipping ammount grouped by shipping method', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:60c71b67-5cf1-6d1b-6d96-a4dfe9bbd651', 'Totals - Grouped by Payment Method', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals_payment.php', 'Totals report grouped by payment method.', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:7a7672ef-f11c-9a6a-5640-708c50cadd29', 'Totals - Grouped by Invoice Lead Source', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals_leadsource.php', 'Totals - Grouped by invoice lead source', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:49c0907c-9253-4fcb-0717-37952dd0ef4e', 'Quote', 'PDF Report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '100', 'role:de7e6679-8bb2-29ee-4883-2fcd756fb120', 'modules/bms/report/invoices_pdfquote.php', 'PDF report for quote.  Does not include amount due.', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:a278af28-9c34-da2e-d81b-4caa36dfa29f', 'Sales History', 'report', 'tbld:7a9e87ed-d165-c4a4-d9b9-0a4adc3c5a34', '100', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/products_saleshistory.php', 'Sales History for product including costs, average price and quantities.', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:1908b03c-cacc-f03a-6d22-21fdef123f65', 'Purchase History', 'report', 'tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083', '10', '', 'modules/bms/report/clients_purchasehistory.php', 'Client purchase history', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:858702da-1b85-3a62-c20f-6b1593140a64', 'Totals - Custom', 'report', 'tbld:31423480-a9b0-f0ff-749e-b3b5e18ca93c', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/lineitems_totals.php', 'Create your own custom line item  totaling report, specify groupings, totals, averages and whether to display summary, invoice, and invoice detail information.', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:28cf69cb-60de-bbed-df15-ea98842b6924', 'Totals - Product Categories', 'report', 'tbld:31423480-a9b0-f0ff-749e-b3b5e18ca93c', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/lineitems_totals_productcategories.php', 'Totals report grouped first by product category and then by product.', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:274d3dfa-ec52-74d2-630f-0c432a6e1ea5', 'Totals - Product', 'report', 'tbld:31423480-a9b0-f0ff-749e-b3b5e18ca93c', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/lineitems_totals_products.php', 'Totals report grouped by product displaying line items', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:68b6258a-6902-f705-19f5-d2707bd78b35', 'Totals - Lead Source', 'report', 'tbld:31423480-a9b0-f0ff-749e-b3b5e18ca93c', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/lineitems_totals_leadsource.php', 'Totals grouped by invoice lead source and product', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:b552c34f-64b9-5a89-15b3-c5d717644b81', 'Client Notes Summary', 'PDF Report', 'tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083', '10', '', 'modules/bms/report/clients_notesummary.php', 'Print all notes associated with the client and any notes associated with client invoices.', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:aca42dbe-68c9-e966-c174-ed938e9b880a', 'Totals - Tax', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals_tax.php', 'Tax Totals', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:e54cee32-b3c9-82cc-50c8-14848ece8e90', 'Receipt', 'PDF Report', 'tbld:43678406-be25-909b-c715-7e2afc7db601', '10', 'role:c9439c3c-499b-7bcc-ee14-fec5bfcf5fc2', 'modules/bms/report/receipts_pdf.php', 'PDF print out of receipt for processing or client records', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:0df82ecf-5f05-56bd-18c3-e7cb27c0cf8a', 'Client Statements', 'PDF Report', 'tbld:c595dbe7-6c77-1e02-5e81-c2e215736e9c', '10', 'role:c9439c3c-499b-7bcc-ee14-fec5bfcf5fc2', 'modules/bms/report/aritems_clientstatement.php', 'Client AR statement balances and activity.', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:e25bdb7a-93be-b1d6-a292-cdec89c0c9fc', 'Summary', 'report', 'tbld:c595dbe7-6c77-1e02-5e81-c2e215736e9c', '10', 'role:c9439c3c-499b-7bcc-ee14-fec5bfcf5fc2', 'modules/bms/report/aritems_summary.php', 'Items grouped and totaled by clients, with grand totals.', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:916f34d8-0997-162c-4350-d93c3d283241', 'Payment Type Totals', 'report', 'tbld:43678406-be25-909b-c715-7e2afc7db601', '10', 'role:c9439c3c-499b-7bcc-ee14-fec5bfcf5fc2', 'modules/bms/report/receipts_pttotals.php', 'Totals grouped by payment method.', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:4851c350-4343-4dc3-4b7b-74c287de011b', 'Incoming Cash Flow', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '55', 'role:8f5fb368-e7d9-5010-d8f6-b4a78adc0520', 'modules/bms/report/incoming_cashflow.php', 'This report shows total incoming monies for a time period from both posted sales orders AND posted receipts. It can be grouped by week, month, quarter and year.\r\n\r\nThis report runs is unaffected by selected records, search or sort parameters.  It requires input of its own start and end dates.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('207', 'rpt:e3ef15d4-1bf5-36a1-cc05-ee44025ad619', 'Totals - Custom', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals.php', 'Creater your own custom invoice totaling report, specify groupings, totals, averages and whether to display summary, invoice, and invoice detail information.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('215', 'rpt:a278af28-9c34-da2e-d81b-4caa36dfa29f', 'Sales History', 'report', 'tbld:7a9e87ed-d165-c4a4-d9b9-0a4adc3c5a34', '100', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/products_saleshistory.php', 'Sales History for product including costs, average price and quantities.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('216', 'rpt:1908b03c-cacc-f03a-6d22-21fdef123f65', 'Purchase History', 'report', 'tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083', '10', '', 'modules/bms/report/clients_purchasehistory.php', 'Client purchase history', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('217', 'rpt:858702da-1b85-3a62-c20f-6b1593140a64', 'Totals - Custom', 'report', 'tbld:31423480-a9b0-f0ff-749e-b3b5e18ca93c', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/lineitems_totals.php', 'Creat your own custom line item  totaling report, specify groupings, totals, averages and whether to display summary, invoice, and invoice detail information.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('224', 'rpt:0df82ecf-5f05-56bd-18c3-e7cb27c0cf8a', 'Client Statements', 'PDF Report', 'tbld:c595dbe7-6c77-1e02-5e81-c2e215736e9c', '10', 'role:c9439c3c-499b-7bcc-ee14-fec5bfcf5fc2', 'modules/bms/report/aritems_clientstatement.php', 'Client AR statement balances and activity.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('225', 'rpt:e25bdb7a-93be-b1d6-a292-cdec89c0c9fc', 'Summary', 'report', 'tbld:c595dbe7-6c77-1e02-5e81-c2e215736e9c', '10', 'role:c9439c3c-499b-7bcc-ee14-fec5bfcf5fc2', 'modules/bms/report/aritems_summary.php', 'Items grouped and totaled by clients, with grand totals.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('226', 'rpt:916f34d8-0997-162c-4350-d93c3d283241', 'Payment Type Totals', 'report', 'tbld:43678406-be25-909b-c715-7e2afc7db601', '10', 'role:c9439c3c-499b-7bcc-ee14-fec5bfcf5fc2', 'modules/bms/report/receipts_pttotals.php', 'Totals grouped by payment method.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('227', 'rpt:4851c350-4343-4dc3-4b7b-74c287de011b', 'Incoming Cash Flow', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '55', 'role:8f5fb368-e7d9-5010-d8f6-b4a78adc0520', 'modules/bms/report/incoming_cashflow.php', 'This report shows total incoming monies for a time period from both posted sales orders AND posted receipts. It can be grouped by week, month, quarter and year.\r\n\r\nThis report runs is unaffected by selected records, search or sort parameters.  It requires input of its own start and end dates.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('233', 'reports:e3057c38-0f68-5d1d-a1b7-793183d951d2', 'Labels - Folder', 'PDF Report', 'tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083', '50', NULL, 'report/general_labels.php', 'Avery 5160 or compatible (3x10) Instructor Folder labels. \r\n\r\n **MAKE SURE when printing the pdf file, to TURN OFF the option \"shrink oversized pages to paper size\".**', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('234', 'rpt:1019eae2-50d4-e097-c73c-3748c2bd7840', 'Labels - Mailing', 'PDF Report', 'tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083', '50', NULL, 'report/general_labels.php', 'Avery 5160 or compatible (3x10) Instructor Folder labels. \r\n\r\n **MAKE SURE when printing the pdf file, to TURN OFF the option \"shrink oversized pages to paper size\".**', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('235', 'rpt:805fe2c4-a0d2-185a-5609-a444da07d61a', 'Labels - Shipping', 'PDF Report', 'tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083', '50', NULL, 'report/general_labels.php', 'Avery 5160 or compatible (3x10) Instructor Folder labels. \r\n\r\n **MAKE SURE when printing the pdf file, to TURN OFF the option \"shrink oversized pages to paper size\".**', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('236', 'rpt:7d461e1a-1bf3-b484-6b58-bf99126ad95f', 'Labels - Shipping', 'PDF Report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '60', 'role:de7e6679-8bb2-29ee-4883-2fcd756fb120', 'report/general_labels.php', 'Avery 5160 or compatible (3x10) Instructor Folder labels. \r\n\r\n **MAKE SURE when printing the pdf file, to TURN OFF the option \"shrink oversized pages to paper size\".**', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('240', 'rpt:435d3c34-0ca3-5d40-3488-e5593869c20c', 'Totals - Lead Source', 'report', 'tbld:31423480-a9b0-f0ff-749e-b3b5e18ca93c', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/lineitems_totals.php', 'Totals grouped by invoice lead source and product', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('241', 'rpt:157ec22d-14c2-64cc-486a-fedc9cfe7d39', 'Totals - Products', 'report', 'tbld:31423480-a9b0-f0ff-749e-b3b5e18ca93c', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/lineitems_totals.php', 'Totals report grouped by product displaying line items', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('242', 'rpt:b2402d8d-10e3-30b2-2c92-e6da9bd0093c', 'Totals - Product Categories', 'report', 'tbld:31423480-a9b0-f0ff-749e-b3b5e18ca93c', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/lineitems_totals.php', 'Totals report grouped first by product category and then by product.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('243', 'rpt:b934c506-ee84-f260-283b-9cb07050b197', 'Receipt', 'PDF Report', 'tbld:43678406-be25-909b-c715-7e2afc7db601', '10', 'role:c9439c3c-499b-7bcc-ee14-fec5bfcf5fc2', 'modules/bms/report/receipts_pdf.php', 'PDF print out of receipt for processing or client records', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('244', 'rpt:5ff03ba4-a310-524e-f3a3-05b6cadf820a', 'Totals - Account Manager', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals.php', 'Totals report grouping by client account manager', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('246', 'rpt:3e25c485-857d-1698-6c9b-03e3e8f4177b', 'Totals - Amount with Invoices', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals.php', 'Basic totals report. Shows invoice total, subtotal and amount due fields and displaying individual invoice information.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('247', 'rpt:8a9cf2d6-d5f0-54ca-1b89-8207dfa4c348', 'Totals - Amounts with Invoices and Line Items', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals.php', 'Basic totals report. Shows invoice total, subtotal and amount due fields and displaying individual invoice and line item information.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('248', 'rpt:3cb9ae81-0838-863e-0185-1f46224cbe00', 'Totals - Sales Order Lead Source', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals.php', 'Totals - Grouped by invoice lead source', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('249', 'rpt:67dca680-14ba-d4e7-4926-b90c65495f48', 'Totals - Pament Methods', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals.php', 'Totals report grouped by payment method.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('250', 'rpt:5dc66c67-1e98-7f85-6e89-5ab5d7795140', 'Totals - Shipping Methods', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals.php', 'Totals report including shipping amount grouped by shipping method', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('251', 'rpt:d97334ef-0139-f178-fe36-c38e151cc60e', 'Totals - Tax', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals.php', 'Sales order tax totals', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('256', 'rpt:44b21461-6e67-c284-0ccf-36ab1af47c9b', 'Invoice', 'PDF Report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '100', NULL, 'modules/bms/report/invoices_pdfinvoice.php', 'Printable/E-Mail Ready Invoice PDF', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('257', 'rpt:6bdef1ac-2f74-4d20-411a-3e48531dae73', 'Packing List', 'PDF Report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '100', NULL, 'modules/bms/report/invoices_pdfpackinglist.php', 'Packing (pick) List PDF', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('258', 'rpt:b683e2f0-e52b-4dd4-33e1-7566616893ca', 'Quote', 'PDF Report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '100', NULL, 'modules/bms/report/invoices_pdfquote.php', 'Quote PDF.  Does not include amount due.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('259', 'rpt:30a56a65-8673-b3c0-cd50-6546968b4d37', 'Work Order', 'PDF Report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '100', 'role:de7e6679-8bb2-29ee-4883-2fcd756fb120', 'modules/bms/report/invoices_pdfworkorder.php', 'Work Order PDF', 1, NOW(), 1, NOW());

trunk/phpbms/modules/bms/install/updatev0.98.sql

@@ -336 +336 @@
 INSERT INTO `relationships` (`uuid`, `tofield`, `name`, `fromfield`, `fromtableid`, `totableid`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`, `inherint`) VALUES ('rln:c003c109-b79b-eded-9acd-b251af8d92ec', 'postingsessionid', 'receipts', 'id', 'tbld:97760a4f-1c1a-a108-d05f-5fc4ec59583c', 'tbld:43678406-be25-909b-c715-7e2afc7db601', 1, NOW(), 1, NOW(), '0');
 --end relationships INSERT--
---reports INSERT--
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:0df82ecf-5f05-56bd-18c3-e7cb27c0cf8a', 'Client Statements', 'PDF Report', 'tbld:c595dbe7-6c77-1e02-5e81-c2e215736e9c', '10', 'role:c9439c3c-499b-7bcc-ee14-fec5bfcf5fc2', 'modules/bms/report/aritems_clientstatement.php', 'Client AR statement balances and activity.', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:e25bdb7a-93be-b1d6-a292-cdec89c0c9fc', 'Summary', 'report', 'tbld:c595dbe7-6c77-1e02-5e81-c2e215736e9c', '10', 'role:c9439c3c-499b-7bcc-ee14-fec5bfcf5fc2', 'modules/bms/report/aritems_summary.php', 'Items grouped and totaled by clients, with grand totals.', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:916f34d8-0997-162c-4350-d93c3d283241', 'Payment Type Totals', 'report', 'tbld:43678406-be25-909b-c715-7e2afc7db601', '10', 'role:c9439c3c-499b-7bcc-ee14-fec5bfcf5fc2', 'modules/bms/report/receipts_pttotals.php', 'Totals grouped by payment method.', 1, NOW(), 1, NOW());
-INSERT INTO `reports` (`uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('rpt:4851c350-4343-4dc3-4b7b-74c287de011b', 'Incoming Cash Flow', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '55', 'role:8f5fb368-e7d9-5010-d8f6-b4a78adc0520', 'modules/bms/report/incoming_cashflow.php', 'This report shows total incoming monies for a time period from both posted sales orders AND posted receipts. It can be grouped by week, month, quarter and year.\r\n\r\nThis report runs is unaffected by selected records, search or sort parameters.  It requires input of its own start and end dates.', 1, NOW(), 1, NOW());
---end reports INSERT--
---reports UPDATE--
-UPDATE `reports` SET `uuid`='rpt:bac1d6eb-b2bb-9aa0-77c0-ff7f9046ca75' WHERE `name`='Invoice';
-UPDATE `reports` SET `uuid`='rpt:a34dd4b5-6942-2b14-4a58-74345dce48de' WHERE `name`='Work Order';
-UPDATE `reports` SET `uuid`='rpt:34a69580-6fbc-d04c-ed3e-f0e497a9a9b2' WHERE `name`='Packing List';
-UPDATE `reports` SET `uuid`='rpt:07f58303-d6e9-a032-01ad-0097d59b3c04' WHERE `name`='Labels - Folder';
-UPDATE `reports` SET `uuid`='rpt:030e7d95-4542-b37c-3cac-a18ff5f4b8ff' WHERE `name`='Labels - Mailing';
-UPDATE `reports` SET `uuid`='rpt:c4a34fa0-16b5-dd85-cf63-5c8b543bb9c3' WHERE `name`='Labels - Shipping' AND `tabledefid`='2';
-UPDATE `reports` SET `uuid`='rpt:a502aa38-4ae8-9aa7-2795-4a05a4814637' WHERE `name`='Labels - Shipping' AND `tabledefid`='3';
-UPDATE `reports` SET `uuid`='rpt:e3ef15d4-1bf5-36a1-cc05-ee44025ad619' WHERE `name`='Totals - Custom' AND `tabledefid`='3';
-UPDATE `reports` SET `uuid`='rpt:5ec9b1fb-f3c6-26c7-f1bc-bec4ac8448fd' WHERE `name`='Totals - Amt. w/  Invoices';
-UPDATE `reports` SET `uuid`='rpt:960ec744-4955-81d1-8170-e56251603e4b' WHERE `name`='Totals - Amt. w/ Invoices + Line Items';
-UPDATE `reports` SET `uuid`='rpt:47407854-cb7f-f1e3-bc44-1b3979eae9b0' WHERE `name`='Totals - Grouped by Acct. Manager';
-UPDATE `reports` SET `uuid`='rpt:05de9afc-c82c-ed66-9403-184aa3f07a1c' WHERE `name`='Totals - Grouped by Shipping Method';
-UPDATE `reports` SET `uuid`='rpt:60c71b67-5cf1-6d1b-6d96-a4dfe9bbd651' WHERE `name`='Totals - Grouped by Payment Method';
-UPDATE `reports` SET `uuid`='rpt:7a7672ef-f11c-9a6a-5640-708c50cadd29' WHERE `name`='Totals - Grouped by Invoice Lead Source';
-UPDATE `reports` SET `uuid`='rpt:49c0907c-9253-4fcb-0717-37952dd0ef4e' WHERE `name`='Quote';
-UPDATE `reports` SET `uuid`='rpt:a278af28-9c34-da2e-d81b-4caa36dfa29f' WHERE `name`='Sales History';
-UPDATE `reports` SET `uuid`='rpt:1908b03c-cacc-f03a-6d22-21fdef123f65' WHERE `name`='Purchase History';
-UPDATE `reports` SET `uuid`='rpt:858702da-1b85-3a62-c20f-6b1593140a64' WHERE `name`='Totals - Custom' AND `tabledefid`='5';
-UPDATE `reports` SET `uuid`='rpt:28cf69cb-60de-bbed-df15-ea98842b6924' WHERE `name`='Totals - Product Categories';
-UPDATE `reports` SET `uuid`='rpt:274d3dfa-ec52-74d2-630f-0c432a6e1ea5' WHERE `name`='Totals - Product';
-UPDATE `reports` SET `uuid`='rpt:68b6258a-6902-f705-19f5-d2707bd78b35' WHERE `name`='Totals - Lead Source';
-UPDATE `reports` SET `uuid`='rpt:b552c34f-64b9-5a89-15b3-c5d717644b81' WHERE `name`='Client Notes Summary';
-UPDATE `reports` SET `uuid`='rpt:aca42dbe-68c9-e966-c174-ed938e9b880a' WHERE `name`='Totals - Tax';
-UPDATE `reports` SET `uuid`='rpt:e54cee32-b3c9-82cc-50c8-14848ece8e90' WHERE `name`='Receipt';
---end reports UPDATE--
+--reports DELETE/INSERT--
+DELETE FROM `reports` WHERE `name` IN ('Receipt', 'Totals - Tax', 'report', 'Client Notes Summary', 'Totals - Lead Source', 'Totals - Product', 'Totals - Product Categories', 'Totals - Custom', 'Purchase History', 'Sales History', 'Quote', 'Totals - Grouped by Invoice Lead Source', 'Totals - Grouped by Payment Method', 'Totals - Grouped by Shipping Method', 'Totals - Grouped by Acct. Manager', 'Totals - Amt. w/ Invoices + Line Items', 'Totals - Amt. w/  Invoices', 'Labels - Shipping', 'Labels - Mailing', 'Labels - Folder', 'Packing List', 'Work Order', 'Invoice')
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('207', 'rpt:e3ef15d4-1bf5-36a1-cc05-ee44025ad619', 'Totals - Custom', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals.php', 'Creater your own custom invoice totaling report, specify groupings, totals, averages and whether to display summary, invoice, and invoice detail information.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('215', 'rpt:a278af28-9c34-da2e-d81b-4caa36dfa29f', 'Sales History', 'report', 'tbld:7a9e87ed-d165-c4a4-d9b9-0a4adc3c5a34', '100', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/products_saleshistory.php', 'Sales History for product including costs, average price and quantities.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('216', 'rpt:1908b03c-cacc-f03a-6d22-21fdef123f65', 'Purchase History', 'report', 'tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083', '10', '', 'modules/bms/report/clients_purchasehistory.php', 'Client purchase history', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('217', 'rpt:858702da-1b85-3a62-c20f-6b1593140a64', 'Totals - Custom', 'report', 'tbld:31423480-a9b0-f0ff-749e-b3b5e18ca93c', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/lineitems_totals.php', 'Creat your own custom line item  totaling report, specify groupings, totals, averages and whether to display summary, invoice, and invoice detail information.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('224', 'rpt:0df82ecf-5f05-56bd-18c3-e7cb27c0cf8a', 'Client Statements', 'PDF Report', 'tbld:c595dbe7-6c77-1e02-5e81-c2e215736e9c', '10', 'role:c9439c3c-499b-7bcc-ee14-fec5bfcf5fc2', 'modules/bms/report/aritems_clientstatement.php', 'Client AR statement balances and activity.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('225', 'rpt:e25bdb7a-93be-b1d6-a292-cdec89c0c9fc', 'Summary', 'report', 'tbld:c595dbe7-6c77-1e02-5e81-c2e215736e9c', '10', 'role:c9439c3c-499b-7bcc-ee14-fec5bfcf5fc2', 'modules/bms/report/aritems_summary.php', 'Items grouped and totaled by clients, with grand totals.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('226', 'rpt:916f34d8-0997-162c-4350-d93c3d283241', 'Payment Type Totals', 'report', 'tbld:43678406-be25-909b-c715-7e2afc7db601', '10', 'role:c9439c3c-499b-7bcc-ee14-fec5bfcf5fc2', 'modules/bms/report/receipts_pttotals.php', 'Totals grouped by payment method.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('227', 'rpt:4851c350-4343-4dc3-4b7b-74c287de011b', 'Incoming Cash Flow', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '55', 'role:8f5fb368-e7d9-5010-d8f6-b4a78adc0520', 'modules/bms/report/incoming_cashflow.php', 'This report shows total incoming monies for a time period from both posted sales orders AND posted receipts. It can be grouped by week, month, quarter and year.\r\n\r\nThis report runs is unaffected by selected records, search or sort parameters.  It requires input of its own start and end dates.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('233', 'reports:e3057c38-0f68-5d1d-a1b7-793183d951d2', 'Labels - Folder', 'PDF Report', 'tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083', '50', NULL, 'report/general_labels.php', 'Avery 5160 or compatible (3x10) Instructor Folder labels. \r\n\r\n **MAKE SURE when printing the pdf file, to TURN OFF the option \"shrink oversized pages to paper size\".**', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('234', 'rpt:1019eae2-50d4-e097-c73c-3748c2bd7840', 'Labels - Mailing', 'PDF Report', 'tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083', '50', NULL, 'report/general_labels.php', 'Avery 5160 or compatible (3x10) Instructor Folder labels. \r\n\r\n **MAKE SURE when printing the pdf file, to TURN OFF the option \"shrink oversized pages to paper size\".**', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('235', 'rpt:805fe2c4-a0d2-185a-5609-a444da07d61a', 'Labels - Shipping', 'PDF Report', 'tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083', '50', NULL, 'report/general_labels.php', 'Avery 5160 or compatible (3x10) Instructor Folder labels. \r\n\r\n **MAKE SURE when printing the pdf file, to TURN OFF the option \"shrink oversized pages to paper size\".**', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('236', 'rpt:7d461e1a-1bf3-b484-6b58-bf99126ad95f', 'Labels - Shipping', 'PDF Report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '60', 'role:de7e6679-8bb2-29ee-4883-2fcd756fb120', 'report/general_labels.php', 'Avery 5160 or compatible (3x10) Instructor Folder labels. \r\n\r\n **MAKE SURE when printing the pdf file, to TURN OFF the option \"shrink oversized pages to paper size\".**', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('240', 'rpt:435d3c34-0ca3-5d40-3488-e5593869c20c', 'Totals - Lead Source', 'report', 'tbld:31423480-a9b0-f0ff-749e-b3b5e18ca93c', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/lineitems_totals.php', 'Totals grouped by invoice lead source and product', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('241', 'rpt:157ec22d-14c2-64cc-486a-fedc9cfe7d39', 'Totals - Products', 'report', 'tbld:31423480-a9b0-f0ff-749e-b3b5e18ca93c', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/lineitems_totals.php', 'Totals report grouped by product displaying line items', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('242', 'rpt:b2402d8d-10e3-30b2-2c92-e6da9bd0093c', 'Totals - Product Categories', 'report', 'tbld:31423480-a9b0-f0ff-749e-b3b5e18ca93c', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/lineitems_totals.php', 'Totals report grouped first by product category and then by product.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('243', 'rpt:b934c506-ee84-f260-283b-9cb07050b197', 'Receipt', 'PDF Report', 'tbld:43678406-be25-909b-c715-7e2afc7db601', '10', 'role:c9439c3c-499b-7bcc-ee14-fec5bfcf5fc2', 'modules/bms/report/receipts_pdf.php', 'PDF print out of receipt for processing or client records', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('244', 'rpt:5ff03ba4-a310-524e-f3a3-05b6cadf820a', 'Totals - Account Manager', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals.php', 'Totals report grouping by client account manager', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('246', 'rpt:3e25c485-857d-1698-6c9b-03e3e8f4177b', 'Totals - Amount with Invoices', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals.php', 'Basic totals report. Shows invoice total, subtotal and amount due fields and displaying individual invoice information.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('247', 'rpt:8a9cf2d6-d5f0-54ca-1b89-8207dfa4c348', 'Totals - Amounts with Invoices and Line Items', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals.php', 'Basic totals report. Shows invoice total, subtotal and amount due fields and displaying individual invoice and line item information.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('248', 'rpt:3cb9ae81-0838-863e-0185-1f46224cbe00', 'Totals - Sales Order Lead Source', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals.php', 'Totals - Grouped by invoice lead source', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('249', 'rpt:67dca680-14ba-d4e7-4926-b90c65495f48', 'Totals - Pament Methods', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals.php', 'Totals report grouped by payment method.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('250', 'rpt:5dc66c67-1e98-7f85-6e89-5ab5d7795140', 'Totals - Shipping Methods', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals.php', 'Totals report including shipping amount grouped by shipping method', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('251', 'rpt:d97334ef-0139-f178-fe36-c38e151cc60e', 'Totals - Tax', 'report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '50', 'role:259ead9f-100b-55b5-508a-27e33a6216bf', 'modules/bms/report/invoices_totals.php', 'Sales order tax totals', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('256', 'rpt:44b21461-6e67-c284-0ccf-36ab1af47c9b', 'Invoice', 'PDF Report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '100', NULL, 'modules/bms/report/invoices_pdfinvoice.php', 'Printable/E-Mail Ready Invoice PDF', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('257', 'rpt:6bdef1ac-2f74-4d20-411a-3e48531dae73', 'Packing List', 'PDF Report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '100', NULL, 'modules/bms/report/invoices_pdfpackinglist.php', 'Packing (pick) List PDF', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('258', 'rpt:b683e2f0-e52b-4dd4-33e1-7566616893ca', 'Quote', 'PDF Report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '100', NULL, 'modules/bms/report/invoices_pdfquote.php', 'Quote PDF.  Does not include amount due.', 1, NOW(), 1, NOW());
+INSERT INTO `reports` (`id`, `uuid`, `name`, `type`, `tabledefid`, `displayorder`, `roleid`, `reportfile`, `description`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES ('259', 'rpt:30a56a65-8673-b3c0-cd50-6546968b4d37', 'Work Order', 'PDF Report', 'tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883', '100', 'role:de7e6679-8bb2-29ee-4883-2fcd756fb120', 'modules/bms/report/invoices_pdfworkorder.php', 'Work Order PDF', 1, NOW(), 1, NOW());
+--end reports DELETE/INSERT--
+--reportsettings INSERT--
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:e3057c38-0f68-5d1d-a1b7-793183d951d2','maxRows','10','int',1,'10','Number of label rows per page');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:e3057c38-0f68-5d1d-a1b7-793183d951d2','maxColumns','3','int',1,'3','Number of label columns per page');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:e3057c38-0f68-5d1d-a1b7-793183d951d2','startTop','0.5','real',1,'0.5','Top Margin of page');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:e3057c38-0f68-5d1d-a1b7-793183d951d2','startLeft','0.1875','real',1,'0.1875','Left Margin of page');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:e3057c38-0f68-5d1d-a1b7-793183d951d2','columnMargin','0.125','real',1,'0.125','Distance between columns');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:e3057c38-0f68-5d1d-a1b7-793183d951d2','labelHeight','1','real',1,'1','Height of a single label');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:e3057c38-0f68-5d1d-a1b7-793183d951d2','labelHeight','2.625','real',1,'2.625','Width of a single label');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:e3057c38-0f68-5d1d-a1b7-793183d951d2','labelMarginLeft','0.0625','real',1,'0.0625','Distance from left between the start of an individual to the text being put on it');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:e3057c38-0f68-5d1d-a1b7-793183d951d2','labelMarginTop','0.125','real',1,'0.125','Distance from top between start of an individual to the text being put on it');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:e3057c38-0f68-5d1d-a1b7-793183d951d2','queryStatement','SELECT if(clients.lastname != \'\' || clients.lastname is not null, concat(clients.lastname, \', \', clients.firstname), \'\') as rowText1, clients.company as rowText2, concat(addresses.city, \', \', addresses.state) as rowText3 FROM ((clients INNER JOIN addresstorecord on clients.uuid = addresstorecord.recordid AND addresstorecord.tabledefid=\'tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083\' AND addresstorecord.primary=1) INNER JOIN addresses ON  addresstorecord.addressid = addresses.uuid)','text',1,'SELECT \"no data in first row\" AS `rowText1`,  \"no data in second row\" AS `rowText2` FROM `reports`','SQL SELECT and FROM clauses defining the data to be retrieved.  Each line printed should be selected as a column in the format `rowText(X)`, where (X) is the line number it will be printed on');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:e3057c38-0f68-5d1d-a1b7-793183d951d2','rowText1Font','Arial,B,9','string',0,'Arial,B,9','Comma separated list of FPF parameters defining font settings for the label text.  You can change the font on subsequent lines by adding an additional setting rowText(x)Font where (x) is the line number the font change occurs.');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:e3057c38-0f68-5d1d-a1b7-793183d951d2','rowText3Font','Arial,,8','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:1019eae2-50d4-e097-c73c-3748c2bd7840','maxRows','10','int',1,'10','Number of label rows per page');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:1019eae2-50d4-e097-c73c-3748c2bd7840','maxColumns','3','int',1,'3','Number of label columns per page');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:1019eae2-50d4-e097-c73c-3748c2bd7840','startTop','0.5','real',1,'0.5','Top Margin of page');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:1019eae2-50d4-e097-c73c-3748c2bd7840','startLeft','0.1875','real',1,'0.1875','Left Margin of page');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:1019eae2-50d4-e097-c73c-3748c2bd7840','columnMargin','0.125','real',1,'0.125','Distance between columns');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:1019eae2-50d4-e097-c73c-3748c2bd7840','labelHeight','1','real',1,'1','Height of a single label');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:1019eae2-50d4-e097-c73c-3748c2bd7840','labelHeight','2.625','real',1,'2.625','Width of a single label');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:1019eae2-50d4-e097-c73c-3748c2bd7840','labelMarginLeft','0.0625','real',1,'0.0625','Distance from left between the start of an individual to the text being put on it');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:1019eae2-50d4-e097-c73c-3748c2bd7840','labelMarginTop','0.125','real',1,'0.125','Distance from top between start of an individual to the text being put on it');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:1019eae2-50d4-e097-c73c-3748c2bd7840','queryStatement','SELECT clients.company AS rowText1, trim(concat(clients.firstname, \' \', clients.lastname)) AS rowText2, addresses.address1 AS rowText3, addresses.address2 AS rowText4, concat(addresses.city, \', \', addresses.state, \' \', addresses.postalcode) AS rowText5, addresses.country AS rowText6 FROM ((clients INNER JOIN addresstorecord on clients.uuid = addresstorecord.recordid AND addresstorecord.tabledefid=\'tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083\' AND addresstorecord.primary=1) INNER JOIN addresses ON  addresstorecord.addressid = addresses.uuid)','text',1,'SELECT \"no data in first row\" AS `rowText1`,  \"no data in second row\" AS `rowText2` FROM `reports`','SQL SELECT and FROM clauses defining the data to be retrieved.  Each line printed should be selected as a column in the format `rowText(X)`, where (X) is the line number it will be printed on');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:1019eae2-50d4-e097-c73c-3748c2bd7840','rowText1Font','Arial,B,9','string',0,'Arial,B,9','Comma separated list of FPDF font parameters defining font settings for the label text.  You can change the font on subsequent lines by adding an additional setting rowText(x)Font where (x) is the line number the font change occurs.');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:1019eae2-50d4-e097-c73c-3748c2bd7840','rowText3Font','Arial,,8','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:805fe2c4-a0d2-185a-5609-a444da07d61a','maxRows','10','int',1,'10','Number of label rows per page');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:805fe2c4-a0d2-185a-5609-a444da07d61a','maxColumns','3','int',1,'3','Number of label columns per page');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:805fe2c4-a0d2-185a-5609-a444da07d61a','startTop','0.5','real',1,'0.5','Top Margin of page');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:805fe2c4-a0d2-185a-5609-a444da07d61a','startLeft','0.1875','real',1,'0.1875','Left Margin of page');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:805fe2c4-a0d2-185a-5609-a444da07d61a','columnMargin','0.125','real',1,'0.125','Distance between columns');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:805fe2c4-a0d2-185a-5609-a444da07d61a','labelHeight','1','real',1,'1','Height of a single label');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:805fe2c4-a0d2-185a-5609-a444da07d61a','labelHeight','2.625','real',1,'2.625','Width of a single label');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:805fe2c4-a0d2-185a-5609-a444da07d61a','labelMarginLeft','0.0625','real',1,'0.0625','Distance from left between the start of an individual to the text being put on it');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:805fe2c4-a0d2-185a-5609-a444da07d61a','labelMarginTop','0.125','real',1,'0.125','Distance from top between start of an individual to the text being put on it');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:805fe2c4-a0d2-185a-5609-a444da07d61a','queryStatement','SELECT clients.company AS rowText1, if(shiptoname != \'\' && shiptoname is not null, trim(shiptoname), trim(concat(clients.firstname, \' \', clients.lastname))) AS rowText2, addresses.address1 AS rowText3, addresses.address2 AS rowText4, concat(addresses.city, \', \', addresses.state, \' \', addresses.postalcode) AS rowText5, addresses.country AS rowText6 FROM ((clients INNER JOIN addresstorecord on clients.uuid = addresstorecord.recordid AND addresstorecord.tabledefid=\'tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083\' AND addresstorecord.defaultshipto=1) INNER JOIN addresses ON  addresstorecord.addressid = addresses.uuid)','text',1,'SELECT \"no data in first row\" AS `rowText1`,  \"no data in second row\" AS `rowText2` FROM `reports`','SQL SELECT and FROM clauses defining the data to be retrieved.  Each line printed should be selected as a column in the format `rowText(X)`, where (X) is the line number it will be printed on');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:805fe2c4-a0d2-185a-5609-a444da07d61a','rowText1Font','Arial,B,9','string',0,'Arial,B,9','Comma separated list of FPDF font parameters defining font settings for the label text.  You can change the font on subsequent lines by adding an additional setting rowText(x)Font where (x) is the line number the font change occurs.');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:805fe2c4-a0d2-185a-5609-a444da07d61a','rowText3Font','Arial,,8','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:7d461e1a-1bf3-b484-6b58-bf99126ad95f','maxRows','10','int',1,'10','Number of label rows per page');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:7d461e1a-1bf3-b484-6b58-bf99126ad95f','maxColumns','3','int',1,'3','Number of label columns per page');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:7d461e1a-1bf3-b484-6b58-bf99126ad95f','startTop','0.5','real',1,'0.5','Top Margin of page');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:7d461e1a-1bf3-b484-6b58-bf99126ad95f','startLeft','0.1875','real',1,'0.1875','Left Margin of page');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:7d461e1a-1bf3-b484-6b58-bf99126ad95f','columnMargin','0.125','real',1,'0.125','Distance between columns');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:7d461e1a-1bf3-b484-6b58-bf99126ad95f','labelHeight','1','real',1,'1','Height of a single label');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:7d461e1a-1bf3-b484-6b58-bf99126ad95f','labelHeight','2.625','real',1,'2.625','Width of a single label');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:7d461e1a-1bf3-b484-6b58-bf99126ad95f','labelMarginLeft','0.0625','real',1,'0.0625','Distance from left between the start of an individual to the text being put on it');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:7d461e1a-1bf3-b484-6b58-bf99126ad95f','labelMarginTop','0.125','real',1,'0.125','Distance from top between start of an individual to the text being put on it');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:7d461e1a-1bf3-b484-6b58-bf99126ad95f','queryStatement','SELECT clients.company AS rowText1, if(shiptosameasbilling = 0 && shiptoname != \'\' && shiptoname IS NOT NULL, shiptoname, trim(concat(clients.firstname, \' \', clients.lastname))) AS rowText2, if(shiptosameasbilling = 0, shiptoaddress1, invoices.address1) AS rowText3, if(shiptosameasbilling = 0, shiptoaddress2, invoices.address2) AS rowText4, if(shiptosameasbilling = 0, concat(shiptocity, \', \',shiptostate,\' \',shiptopostalcode), concat(invoices.city,\', \',invoices.state,\' \',invoices.postalcode)) AS rowText5, if(shiptosameasbilling = 0, shiptocountry, invoices.country) AS rowText6 FROM invoices INNER JOIN clients ON invoices.clientid=clients.uuid','text',1,'SELECT \"no data in first row\" AS `rowText1`,  \"no data in second row\" AS `rowText2` FROM `reports`','SQL SELECT and FROM clauses defining the data to be retrieved.  Each line printed should be selected as a column in the format `rowText(X)`, where (X) is the line number it will be printed on');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:7d461e1a-1bf3-b484-6b58-bf99126ad95f','rowText1Font','Arial,B,9','string',0,'Arial,B,9','Comma separated list of FPDF font parameters defining font settings for the label text.  You can change the font on subsequent lines by adding an additional setting rowText(x)Font where (x) is the line number the font change occurs.');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:7d461e1a-1bf3-b484-6b58-bf99126ad95f','rowText3Font','Arial,,8','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:435d3c34-0ca3-5d40-3488-e5593869c20c','reportTitle','Totals Grouped by Invoice Lead Source and Product','string',0,'Report','Report Title');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:435d3c34-0ca3-5d40-3488-e5593869c20c','column1','1','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:435d3c34-0ca3-5d40-3488-e5593869c20c','column2','4','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:435d3c34-0ca3-5d40-3488-e5593869c20c','column4','8','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:435d3c34-0ca3-5d40-3488-e5593869c20c','column5','5','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:435d3c34-0ca3-5d40-3488-e5593869c20c','group1','14','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:435d3c34-0ca3-5d40-3488-e5593869c20c','group2','1','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:435d3c34-0ca3-5d40-3488-e5593869c20c','showWhat','totals','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:435d3c34-0ca3-5d40-3488-e5593869c20c','column3','9','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:157ec22d-14c2-64cc-486a-fedc9cfe7d39','reportTitle','Totals Grouped by Product','string',0,'Report','Report Title');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:157ec22d-14c2-64cc-486a-fedc9cfe7d39','column1','1','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:157ec22d-14c2-64cc-486a-fedc9cfe7d39','column2','4','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:157ec22d-14c2-64cc-486a-fedc9cfe7d39','column3','9','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:157ec22d-14c2-64cc-486a-fedc9cfe7d39','column4','8','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:157ec22d-14c2-64cc-486a-fedc9cfe7d39','column5','5','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:157ec22d-14c2-64cc-486a-fedc9cfe7d39','group1','1','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:157ec22d-14c2-64cc-486a-fedc9cfe7d39','showWhat','lineitems','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:b2402d8d-10e3-30b2-2c92-e6da9bd0093c','reportTitle','Totals Grouped by Product Categories and Product','string',0,'Report','Report Title');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:b2402d8d-10e3-30b2-2c92-e6da9bd0093c','column1','1','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:b2402d8d-10e3-30b2-2c92-e6da9bd0093c','column2','4','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:b2402d8d-10e3-30b2-2c92-e6da9bd0093c','column3','9','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:b2402d8d-10e3-30b2-2c92-e6da9bd0093c','column4','8','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:b2402d8d-10e3-30b2-2c92-e6da9bd0093c','column5','5','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:b2402d8d-10e3-30b2-2c92-e6da9bd0093c','group1','2','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:b2402d8d-10e3-30b2-2c92-e6da9bd0093c','group2','1','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:b2402d8d-10e3-30b2-2c92-e6da9bd0093c','showWhat','totals','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:b934c506-ee84-f260-283b-9cb07050b197','reportTitle','Receipt','string',1,'Receipts','Title printed in upper right hand of report.');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:5ff03ba4-a310-524e-f3a3-05b6cadf820a','reportTitle','Totals Grouped by Client Account Manager','string',0,'Report','Report Title');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:5ff03ba4-a310-524e-f3a3-05b6cadf820a','showWhat','invoices','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:5ff03ba4-a310-524e-f3a3-05b6cadf820a','column1','11','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:5ff03ba4-a310-524e-f3a3-05b6cadf820a','column2','1','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:5ff03ba4-a310-524e-f3a3-05b6cadf820a','column3','3','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:5ff03ba4-a310-524e-f3a3-05b6cadf820a','group1','13','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:5ff03ba4-a310-524e-f3a3-05b6cadf820a','group2','12','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:3e25c485-857d-1698-6c9b-03e3e8f4177b','reportTitle','Subtotals, Totals, and Amount Due','string',0,'Report','Report Title');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:3e25c485-857d-1698-6c9b-03e3e8f4177b','showWhat','invoices','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:3e25c485-857d-1698-6c9b-03e3e8f4177b','column1','11','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:3e25c485-857d-1698-6c9b-03e3e8f4177b','column2','1','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:3e25c485-857d-1698-6c9b-03e3e8f4177b','column3','3','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:8a9cf2d6-d5f0-54ca-1b89-8207dfa4c348','reportTitle','Subtotals, Totals, and Amount Due','string',0,'Report','Report Title');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:8a9cf2d6-d5f0-54ca-1b89-8207dfa4c348','showWhat','lineitems','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:8a9cf2d6-d5f0-54ca-1b89-8207dfa4c348','column1','11','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:8a9cf2d6-d5f0-54ca-1b89-8207dfa4c348','column2','1','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:8a9cf2d6-d5f0-54ca-1b89-8207dfa4c348','column3','3','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:3cb9ae81-0838-863e-0185-1f46224cbe00','reportTitle','Totals Grouped by Sales Order Lead Source','string',0,'Report','Report Title');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:3cb9ae81-0838-863e-0185-1f46224cbe00','showWhat','invoices','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:3cb9ae81-0838-863e-0185-1f46224cbe00','column1','11','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:3cb9ae81-0838-863e-0185-1f46224cbe00','column2','1','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:3cb9ae81-0838-863e-0185-1f46224cbe00','column3','3','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:3cb9ae81-0838-863e-0185-1f46224cbe00','group1','15','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:67dca680-14ba-d4e7-4926-b90c65495f48','reportTitle','Totals Grouped by Payment Method','string',0,'Report','Report Title');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:67dca680-14ba-d4e7-4926-b90c65495f48','showWhat','invoices','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:67dca680-14ba-d4e7-4926-b90c65495f48','column1','11','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:67dca680-14ba-d4e7-4926-b90c65495f48','column2','1','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:67dca680-14ba-d4e7-4926-b90c65495f48','column3','3','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:67dca680-14ba-d4e7-4926-b90c65495f48','group1','16','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:5dc66c67-1e98-7f85-6e89-5ab5d7795140','reportTitle','Totals Grouped by Shipping Method','string',0,'Report','Report Title');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:5dc66c67-1e98-7f85-6e89-5ab5d7795140','showWhat','invoices','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:5dc66c67-1e98-7f85-6e89-5ab5d7795140','column1','1','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:5dc66c67-1e98-7f85-6e89-5ab5d7795140','coumn2','7','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:5dc66c67-1e98-7f85-6e89-5ab5d7795140','group1','17','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:d97334ef-0139-f178-fe36-c38e151cc60e','reportTitle','Tax Totals','string',0,'Report','Report Title');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:d97334ef-0139-f178-fe36-c38e151cc60e','showWhat','invoices','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:d97334ef-0139-f178-fe36-c38e151cc60e','column1','11','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:d97334ef-0139-f178-fe36-c38e151cc60e','column2','1','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:d97334ef-0139-f178-fe36-c38e151cc60e','column3','5','string',0,'',NULL);
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:44b21461-6e67-c284-0ccf-36ab1af47c9b','reportTitle','Invoice','string',1,'Invoice','Title printed on reports');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:44b21461-6e67-c284-0ccf-36ab1af47c9b','printLogo','1','bool',1,'1','Should the logo print (1 = yes, 0 = no)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:44b21461-6e67-c284-0ccf-36ab1af47c9b','printCompanyInfo','1','bool',1,'1','Should the top company information print (1 = yes, 0 = no)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:44b21461-6e67-c284-0ccf-36ab1af47c9b','leftTopBox','billto','string',1,'billto','Contents of Right Top Header Box (can be `billto`, `shipto`, `invoiceinfo`, `companyinfo`, `nowshow` or `blank`)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:44b21461-6e67-c284-0ccf-36ab1af47c9b','leftTopBoxTitle','SOLD TO','string',1,'SOLD TO','Title of Left Top Header Box');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:44b21461-6e67-c284-0ccf-36ab1af47c9b','rightTopBox','shipto','string',1,'shipto','Contents of Right Top Header Box (can be `billto`, `shipto`, `invoiceinfo`, `companyinfo`, `nowshow` or `blank`)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:44b21461-6e67-c284-0ccf-36ab1af47c9b','rightTopBoxTitle','SHIP TO','string',1,'SHIP TO','Title of Right Top Header Box');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:44b21461-6e67-c284-0ccf-36ab1af47c9b','templateFormatting','0','bool',1,'0','Should PDF remove lines and dark titles (1 = remove, 0 = keep)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:44b21461-6e67-c284-0ccf-36ab1af47c9b','templateUUID','','string',0,'','Optional UUID of file record for PDF to be used as background template');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:6bdef1ac-2f74-4d20-411a-3e48531dae73','reportTitle','Packing List','string',1,'Packing List','Title printed on reports');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:6bdef1ac-2f74-4d20-411a-3e48531dae73','printLogo','1','bool',1,'1','Should the logo print (1 = yes, 0 = no)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:6bdef1ac-2f74-4d20-411a-3e48531dae73','printCompanyInfo','1','bool',1,'1','Should the top company information print (1 = yes, 0 = no)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:6bdef1ac-2f74-4d20-411a-3e48531dae73','leftTopBox','billto','string',1,'billto','Contents of Right Top Header Box (can be `billto`, `shipto`, `invoiceinfo`, `companyinfo`, `nowshow` or `blank`)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:6bdef1ac-2f74-4d20-411a-3e48531dae73','leftTopBoxTitle','SOLD TO','string',1,'SOLD TO','Title of Left Top Header Box');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:6bdef1ac-2f74-4d20-411a-3e48531dae73','rightTopBox','shipto','string',1,'shipto','Contents of Right Top Header Box (can be `billto`, `shipto`, `invoiceinfo`, `companyinfo`, `nowshow` or `blank`)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:6bdef1ac-2f74-4d20-411a-3e48531dae73','rightTopBoxTitle','SHIP TO','string',1,'SHIP TO','Title of Right Top Header Box');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:6bdef1ac-2f74-4d20-411a-3e48531dae73','templateFormatting','0','bool',1,'0','Should PDF remove lines and dark titles (1 = remove, 0 = keep)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:6bdef1ac-2f74-4d20-411a-3e48531dae73','templateUUID','','string',0,'','Optional UUID of file record for PDF to be used as background template');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:b683e2f0-e52b-4dd4-33e1-7566616893ca','reportTitle','Quote','string',1,'Quote','Title printed on reports');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:b683e2f0-e52b-4dd4-33e1-7566616893ca','printLogo','1','bool',1,'1','Should the logo print (1 = yes, 0 = no)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:b683e2f0-e52b-4dd4-33e1-7566616893ca','printCompanyInfo','1','bool',1,'1','Should the top company information print (1 = yes, 0 = no)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:b683e2f0-e52b-4dd4-33e1-7566616893ca','leftTopBox','billto','string',1,'billto','Contents of Right Top Header Box (can be `billto`, `shipto`, `invoiceinfo`, `companyinfo`, `nowshow` or `blank`)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:b683e2f0-e52b-4dd4-33e1-7566616893ca','leftTopBoxTitle','SOLD TO','string',1,'SOLD TO','Title of Left Top Header Box');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:b683e2f0-e52b-4dd4-33e1-7566616893ca','rightTopBox','shipto','string',1,'shipto','Contents of Right Top Header Box (can be `billto`, `shipto`, `invoiceinfo`, `companyinfo`, `nowshow` or `blank`)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:b683e2f0-e52b-4dd4-33e1-7566616893ca','rightTopBoxTitle','SHIP TO','string',1,'SHIP TO','Title of Right Top Header Box');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:b683e2f0-e52b-4dd4-33e1-7566616893ca','templateFormatting','0','bool',1,'0','Should PDF remove lines and dark titles (1 = remove, 0 = keep)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:b683e2f0-e52b-4dd4-33e1-7566616893ca','templateUUID','','string',0,'','Optional UUID of file record for PDF to be used as background template');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:30a56a65-8673-b3c0-cd50-6546968b4d37','reportTitle','Work Order','string',1,'Work Order','Title printed on reports');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:30a56a65-8673-b3c0-cd50-6546968b4d37','printLogo','1','bool',1,'1','Should the logo print (1 = yes, 0 = no)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:30a56a65-8673-b3c0-cd50-6546968b4d37','printCompanyInfo','1','bool',1,'1','Should the top company information print (1 = yes, 0 = no)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:30a56a65-8673-b3c0-cd50-6546968b4d37','leftTopBox','billto','string',1,'billto','Contents of Right Top Header Box (can be `billto`, `shipto`, `invoiceinfo`, `companyinfo`, `nowshow` or `blank`)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:30a56a65-8673-b3c0-cd50-6546968b4d37','leftTopBoxTitle','SOLD TO','string',1,'SOLD TO','Title of Left Top Header Box');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:30a56a65-8673-b3c0-cd50-6546968b4d37','rightTopBox','shipto','string',1,'shipto','Contents of Right Top Header Box (can be `billto`, `shipto`, `invoiceinfo`, `companyinfo`, `nowshow` or `blank`)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:30a56a65-8673-b3c0-cd50-6546968b4d37','rightTopBoxTitle','SHIP TO','string',1,'SHIP TO','Title of Right Top Header Box');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:30a56a65-8673-b3c0-cd50-6546968b4d37','templateFormatting','0','bool',1,'0','Should PDF remove lines and dark titles (1 = remove, 0 = keep)');
+INSERT INTO `reportsettings` (reportuuid, name, value, type, required, defaultvalue, description)  VALUES ('rpt:30a56a65-8673-b3c0-cd50-6546968b4d37','templateUUID','','string',0,'','Optional UUID of file record for PDF to be used as background template');
+--end reportsettings INSERT--
 --role UPDATE--
 UPDATE `roles` SET `uuid`='role:3403a7e0-adb1-4d0b-3c6e-6d6bbe177d52' WHERE `id`='10';
@@ -386 +536 @@
 UPDATE `shippingmethods` SET `uuid`='shp:f34a3e10-e782-2675-f041-71f5c88f5aa9' WHERE `name`='FedEx Priority Overnight AM';
 UPDATE `shippingmethods` SET `uuid`='shp:e2e43816-667a-fdf3-6bec-4456bcf8bef0' WHERE `name`='FedEx Standard Overnight';
-UPDATE `shippingmethods` SET `uuid`='shp:0f07f7fd-0352-8df7-8294-a57e5e375808' WHERE `name`='UPS 2nd Day Air'; 
+UPDATE `shippingmethods` SET `uuid`='shp:0f07f7fd-0352-8df7-8294-a57e5e375808' WHERE `name`='UPS 2nd Day Air';
 UPDATE `shippingmethods` SET `uuid`='shp:6ef11711-7335-3e90-cf27-df5ea23c1480' WHERE `name`='UPS 3 Day Select';
 UPDATE `shippingmethods` SET `uuid`='shp:1a0c53bd-6754-7d9f-4bea-bad57628187a' WHERE `name`='UPS Ground (Com)';

trunk/phpbms/modules/bms/products_saleshistory.php

@@ -40 +40 @@
         include("include/fields.php");
 
-        if(!hasRights("role:259ead9f-100b-55b5-508a-27e33a6216bf")) goURL(APP_PATH."noaccess.php");
-
-        if(!isset($_POST["fromdate"])) $_POST["fromdate"]=dateToString(strtotime("-1 year"));
-        if(!isset($_POST["todate"])) $_POST["todate"]=dateToString(mktime());
-        if(!isset($_POST["status"])) $_POST["status"]="Orders/Invoices";
-        if(!isset($_POST["command"])) $_POST["command"]="show";
-        if(!isset($_POST["date_order"])) $_POST["date_order"]="DESC";
+        if(!hasRights("role:259ead9f-100b-55b5-508a-27e33a6216bf"))
+            goURL(APP_PATH."noaccess.php");
+
+        if(!isset($_POST["fromdate"]))
+            $_POST["fromdate"] = dateToString(strtotime("-1 year"));
+
+        if(!isset($_POST["todate"]))
+            $_POST["todate"] = dateToString(mktime());
+
+        if(!isset($_POST["status"]))
+            $_POST["status"] = "Orders and Invoices";
+
+        if(!isset($_POST["command"]))
+            $_POST["command"] = "show";
+
+        if(!isset($_POST["date_order"]))
+            $_POST["date_order"] = "DESC";
 
         if($_POST["command"]=="print")  {
-                        $_SESSION["printing"]["whereclause"]="WHERE products.id=".$_GET["id"];
-                        $_SESSION["printing"]["dataprint"]="Single Record";
-                        $fromProduct=true;
-                        require("report/products_saleshistory.php");
+
+            $_SESSION["printing"]["whereclause"]="products.id=".$_GET["id"];
+            $_SESSION["printing"]["dataprint"]="Single Record";
+
+            goURL("report/products_saleshistory.php?rid=".urlencode("rpt:a278af28-9c34-da2e-d81b-4caa36dfa29f")."&tid=".urlencode("tbld:7a9e87ed-d165-c4a4-d9b9-0a4adc3c5a34")."&status=".urlencode($_POST["status"])."&fromdate=".urlencode($_POST["fromdate"])."&todate=".urlencode($_POST["todate"]));
+
         } else {
-        $thestatus="(invoices.type =\"";
-        switch($_POST["status"]){
-                case "Orders/Invoices":
-                        $thestatus.="Order\" or invoices.type=\"Invoice\")";
-                        $searchdate="orderdate";
-                break;
+
+            $thestatus="(invoices.type =\"";
+            switch($_POST["status"]){
+
+                case "Orders and Invoices":
+                    $thestatus.="Order\" or invoices.type=\"Invoice\")";
+                    $searchdate="orderdate";
+                    break;
+
                 case "Invoices":
-                        $thestatus.="Invoice\")";
-                        $searchdate="invoicedate";
-                break;
+                    $thestatus.="Invoice\")";
+                    $searchdate="invoicedate";
+                    break;
+
                 case "Orders":
-                        $thestatus.="Order\")";
-                        $searchdate="orderdate";
-                break;
-        }
+                    $thestatus.="Order\")";
+                    $searchdate="orderdate";
+                    break;
+
+            }//endswitch
         $dateOrder = ($_POST['date_order'] == 'DESC') ? 'ASC' : 'DESC';
 
@@ -132 +149 @@
                    <label for="status">type</label><br />
                    <select name="status" id="status">
-                                <option value="Orders/Invoices" <?php if($_POST["status"]=="Orders/Invoices") echo "selected=\"selected\""?>>Orders/Invoices</option>
+                                <option value="Orders and Invoices" <?php if($_POST["status"]=="Orders and Invoices") echo "selected=\"selected\""?>>Orders and Invoices</option>
                                 <option value="Invoices" <?php if($_POST["status"]=="Invoices") echo "selected=\"selected\""?>>Invoices</option>
                                 <option value="Orders" <?php if($_POST["status"]=="Orders") echo "selected=\"selected\""?>>Orders</option>
@@ -143 +160 @@
 
                 <p id="printP"><br /><input id="print" name="command" type="submit" value="print" class="Buttons" /></p>
-                <p id="changeTimelineP"><br /><input name="command" type="submit" value="change timeframe/view" class="smallButtons" /></p>
+                <p id="changeTimelineP"><br /><input name="command" type="submit" value="update" class="smallButtons" /></p>
                 <input name="date_order" id="date_order" type="hidden" value="<?php echo $_POST["date_order"]; ?>" />
         </div>

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

@@ -50 +50 @@
         var $showClosed = false;
 
-        function aritemsClientStatements($db, $statementDate = NULL, $showPayments = true, $showClosed = false){
-
-                parent::phpbmsReport($db);
+        function aritemsClientStatements($db, $reportUUID, $tabledefUUID, $statementDate = NULL, $showPayments = true, $showClosed = false){
+
+                parent::phpbmsReport($db, $reportUUID, $tabledefUUID);
 
                 if($statementDate)
@@ -69 +69 @@
 
                 if($whereclause)
-                        $this->whereclause = $whereclause;
-
-                if(!$this->whereclause)
-                        $this->whereclause = "
+                        $this->whereClause = $whereclause;
+
+                if(!$this->whereClause)
+                        $this->whereClause = "
                                 aritems.status = 'open'
                                 AND aritems.posted = 1";
@@ -108 +108 @@
                                         ON clients.salesmanagerid = users.uuid";
 
-                $this->sortorder = 'if(clients.lastname!="",concat(clients.lastname,", ",clients.firstname,if(clients.company!="",concat(" (",clients.company,")"),"")),clients.company)';
+                $this->sortOrder = 'if(clients.lastname!="",concat(clients.lastname,", ",clients.firstname,if(clients.company!="",concat(" (",clients.company,")"),"")),clients.company)';
 
                 $querystatement = $this->assembleSQL($querystatement);
@@ -134 +134 @@
                 //uncomment the following line to help troubleshoot formatting
                 //$pdf->borderDebug = 1;
-                $pdf->hasComapnyHeader = true;
+                $pdf->logoInHeader = true;
+                $pdf->companyInfoInHeader = true;
                 $pdf->SetMargins();
 
@@ -608 +609 @@
 if(!isset($noOutput)){
 
+    //IE needs caching to be set to private in order to display PDFS
+    session_cache_limiter('private');
+
+    //set encoding to latin1 (fpdf doesnt like utf8)
+    $sqlEncoding = "latin1";
+    require_once("../../../include/session.php");
+
+    checkForReportArguments();
+
+    $report = new aritemsClientStatements($db, $_GET["rid"], $_GET["tid"]);
+
         if(isset($_GET["cmd"])){
 
@@ -616 +628 @@
 
         if(isset($_POST["command"])) {
-
-                session_cache_limiter('private');
-
-                //set encoding to latin1 (fpdf doesnt like utf8)
-                $sqlEncoding = "latin1";
-                require_once("../../../include/session.php");
-
-                $report = new aritemsClientStatements($db);
 
                 switch($_POST["command"]){
@@ -635 +639 @@
         } else {
 
-                require_once("../../../include/session.php");
-
-                $report = new aritemsClientStatements($db);
-
                 $report->showOptions();
 
@@ -644 +644 @@
 
 }//end if
+
+/**
+ * When adding a new report record, the add/edit needs to know what the class
+ * name is so that it can instantiate it, and grab it's default settings.
+ */
+if(isset($addingReportRecord))
+    $reportClass ="aritemsClientStatements";
+
 ?>

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

@@ -59 +59 @@
 
 
-        function aritemsSummary($db, $statementDate = NULL, $showPayments = "new", $showClosed = false){
-
-                parent::phpbmsReport($db);
+        function aritemsSummary($db, $reportUUID, $tabledefUUID, $statementDate = NULL, $showPayments = "new", $showClosed = false){
+
+                parent::phpbmsReport($db, $reportUUID, $tabledefUUID);
 
                 if($statementDate)
@@ -78 +78 @@
 
                 if($whereclause)
-                        $this->whereclause = $whereclause;
-
-                if(!$this->whereclause)
-                        $this->whereclause = "
+                        $this->whereClause = $whereclause;
+
+                if(!$this->whereClause)
+                        $this->whereClause = "
                                 aritems.status = 'open'
                                 AND aritems.posted = 1";
@@ -116 +116 @@
                                         ON clients.salesmanagerid = users.uuid";
 
-                $this->sortorder = 'if(clients.lastname!="",concat(clients.lastname,", ",clients.firstname,if(clients.company!="",concat(" (",clients.company,")"),"")),clients.company)';
+                $this->sortOrder = 'if(clients.lastname!="",concat(clients.lastname,", ",clients.firstname,if(clients.company!="",concat(" (",clients.company,")"),"")),clients.company)';
 
                 $querystatement = $this->assembleSQL($querystatement);
@@ -573 +573 @@
         }//endif
 
+        session_cache_limiter('private');
+        //set encoding to latin1 (fpdf doesnt like utf8)
+        $sqlEncoding = "latin1";
+        require_once("../../../include/session.php");
+
+        checkForReportArguments();
+
+        $report = new aritemsSummary($db, $_GET["rid"], $_GET["tid"]);
+
         if(isset($_POST["command"])) {
-
-                session_cache_limiter('private');
-
-                //set encoding to latin1 (fpdf doesnt like utf8)
-                $sqlEncoding = "latin1";
-                require_once("../../../include/session.php");
-
-                $report = new aritemsSummary($db);
 
                 switch($_POST["command"]){
@@ -593 +594 @@
         } else {
 
-                require_once("../../../include/session.php");
-
-                $report = new aritemsSummary($db);
-
                 $report->showOptions();
 

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

@@ -38 +38 @@
 */
 
-if(!isset($fromClient)) {
-        require_once("../../../include/session.php");
-}
-
-class purchaseHistoryReport{
-
-        var $whereclause="";
-        var $sortorder=" ORDER BY IF(clients.lastname!=\"\",concat(clients.lastname,\", \",clients.firstname,if(clients.company!=\"\",concat(\" (\",clients.company,\")\"),\"\")),clients.company) ";
-        var $fromdate;
-        var $todate;
-        var $view;
-
-        var $clientQuery;
-
-        function initialize($variables,$db){
-
-                $this->db = $db;
-                $this->fromdate=$variables["fromdate"];
-                $this->todate=$variables["todate"];
-                $this->view=$variables["status"];
-
-                $this->whereclause=$_SESSION["printing"]["whereclause"];
-                if(isset($_SESSION["printing"]["sortorder"]))
-                        if ($_SESSION["printing"]["sortorder"])
-                                $this->sortorder=$_SESSION["printing"]["sortorder"];
-
-                if($this->whereclause=="") $this->whereclause="WHERE clients.id!=-1";
-                $this->whereclause=" WHERE (".substr($this->whereclause,6).") ";
-
-                $querystatement = "
-                        SELECT
-                                `clients`.`id`,
-                                IF(clients.lastname!=\"\",concat(clients.lastname,\", \",clients.firstname,if(clients.company!=\"\",concat(\" (\",clients.company,\")\"),\"\")),clients.company) as thename
-                     FROM
-                                `clients` ".$this->whereclause.$this->sortorder;
-
-                $queryresult=$this->db->query($querystatement);
-
-                $this->clientQuery=$queryresult;
-        }
-
-
-        function showPurchaseHistory($id){
-
-                $thestatus="(invoices.type =\"";
-                switch($this->view){
-                        case "Orders/Invoices":
-                                $thestatus.="Order\" or invoices.type=\"Invoice\")";
-                                $searchdate="orderdate";
-                        break;
-                        case "Invoices":
-                                $thestatus.="Invoice\")";
-                                $searchdate="invoicedate";
-                        break;
-                        case "Orders":
-                                $thestatus.="Order\")";
-                                $searchdate="orderdate";
-                        break;
-                }
-
-        $mysqlfromdate=sqlDateFromString($_POST["fromdate"]);
-        $mysqltodate=sqlDateFromString($_POST["todate"]);
+if(!class_exists("phpbmsReport"))
+    include("../../../report/report_class.php");
+
+class purchaseHistoryReport extends phpbmsReport{
+
+    var $fromDate;
+    var $toDate;
+    var $view;
+    var $clientQueryresult;
+    var $dataPrint;
+
+    function purchaseHistoryReport($db, $reportUUID, $tabledefUUID){
+
+        parent::phpbmsReport($db, $reportUUID, $tabledefUUID);
+
+        //$this->checkForDefaultSettings();
+
+    }//end function init
+
+
+    function initialize($variables){
+
+        if(!isset($variables["fromdate"]) || !isset($variables["todate"]) || !isset($variables["status"]))
+            $error = new appError(300, "Missing Passed Parameters");
+
+        $this->fromDate = $variables["fromdate"];
+        $this->toDate = $variables["todate"];
+        $this->view = $variables["status"];
+
+        $this->dataPrint = $_SESSION["printing"]["dataprint"];
+
+        if(!$this->sortOrder)
+            $this->sortOrder = " ORDER BY clients.company, clients.firstname, clients.lastname";
+
+        if(!$this->whereClause)
+            $this->whereClause = "clients.id!=-1";
+
+        $this->whereClause = " WHERE (".$this->whereClause.") ";
+
+        $querystatement = "
+            SELECT
+                `clients`.`uuid`,
+                IF(clients.company != '', CONCAT(clients.company,IF(clients.lastname != '' OR clients.firstname != '', CONCAT(' (',if(clients.lastname != '', clients.lastname, '{blank}'),', ',if(clients.firstname != '', clients.firstname, '{blank}'),')'), '')), IF(clients.lastname != '' OR clients.firstname != '', CONCAT(if(clients.lastname != '', clients.lastname, '{blank}'),', ',if(clients.firstname != '', clients.firstname, '{blank}')), '')) AS thename
+             FROM
+                `clients`
+            ".$this->whereClause.$this->sortOrder;
+
+        $this->clientQueryresult = $this->db->query($querystatement);
+
+    }//end function initialize
+
+
+    function generateSingleClientHistory($clientUUID){
+
+        $theStatus = "(invoices.type = '";
+
+        switch($this->view){
+
+            case "Orders and Invoices":
+                $theStatus .= "Order' OR invoices.type ='Invoice')";
+                $searchDate = "orderdate";
+                break;
+
+            case "Invoices":
+                $theStatus .= "Invoice')";
+                $searchDate = "invoicedate";
+                break;
+
+            case "Orders":
+                $theStatus .= "Order')";
+                $searchDate = "orderdate";
+                break;
+
+        }//endswitch
+
+        $mysqlFromDate = sqlDateFromString($this->fromDate);
+        $mysqlToDate = sqlDateFromString($this->toDate);
 
         $querystatement = "
-                SELECT
-                        invoices.id,
-                        if(invoices.type=\"Invoice\",invoices.invoicedate,invoices.orderdate) as thedate,
-                        if(invoices.type=\"Invoice\",invoices.invoicedate,invoices.orderdate) as formateddate,
-                        invoices.type,
-                        products.partname as partname,
-                        products.partnumber as partnumber,
-                        lineitems.quantity as qty,
-                        lineitems.unitprice*lineitems.quantity as extended,
-                        lineitems.unitprice as price
-                FROM
-                        ((`clients` INNER JOIN `invoices` ON `clients`.`uuid`=`invoices`.`clientid`)
-                                INNER JOIN `lineitems` ON `invoices`.`id`=`lineitems`.`invoiceid`)
-                                        INNER JOIN `products` ON `lineitems`.`productid`=`products`.`uuid`
-                WHERE `clients`.`id`='".$id."'
-                AND ".$thestatus."
-                HAVING
-                thedate >=\"".$mysqlfromdate."\"
-                and thedate <=\"".$mysqltodate."\"
-                ORDER BY thedate,invoices.id;";
-                $thequery=$this->db->query($querystatement);
-
-                $thequery? $numrows=$this->db->numRows($thequery): $numrows=0;
-?>
-        <table border="0" cellpadding="0" cellspacing="0" >
+            SELECT
+                invoices.id,
+                if(invoices.type = 'Invoice', invoices.invoicedate, invoices.orderdate) AS thedate,
+                invoices.type,
+                products.partname AS partname,
+                products.partnumber AS partnumber,
+                lineitems.quantity AS qty,
+                lineitems.unitprice*lineitems.quantity AS extended,
+                lineitems.unitprice AS price
+            FROM
+                ((`clients` INNER JOIN `invoices` ON `clients`.`uuid`=`invoices`.`clientid`)
+                    INNER JOIN `lineitems` ON `invoices`.`id`=`lineitems`.`invoiceid`)
+                    INNER JOIN `products` ON `lineitems`.`productid`=`products`.`uuid`
+            WHERE
+                `clients`.`uuid`='".$clientUUID."'
+                AND ".$theStatus."
+            HAVING
+                thedate >= '".$mysqlFromDate."'
+                AND thedate <= '".$mysqlToDate."'
+            ORDER BY
+                thedate,
+                invoices.id";
+
+        $queryresult = $this->db->query($querystatement);
+
+        ob_start();
+
+        ?>
+        <table border="0" cellpadding="0" cellspacing="0">
+            <thead>
                 <tr>
-                        <th align="left" nowrap="nowrap" colspan="3">invoice</th>
-                        <th align="left" nowrap="nowrap" colspan="3">product</th>
-                        <th align="left" nowrap="nowrap" colspan="2">line item</th>
+                        <th align="left" colspan="3">invoice</th>
+                        <th align="left" colspan="3">product</th>
+                        <th align="left" nowrap="nowrap" colspan="2" class="lastHeader">line item</th>
                 </tr>
                 <tr>
@@ -136 +156 @@
                         <th align="left" nowrap="nowrap" >type</th>
                         <th align="left" nowrap="nowrap" >date</th>
-                        <th align="left" nowrap="nowrap" >part num.</th>
+                        <th align="left" nowrap="nowrap" >part #</th>
                         <th width="100%" nowrap="nowrap" align="left">name</th>
                         <th align="right" nowrap="nowrap" >price</th>
-                        <th align="center" nowrap="nowrap" >qty.</th>
-                        <th align="right" nowrap="nowrap" >ext.</th>
-                </tr>
-    <?php
-        $totalextended=0;
-        while ($therecord=$this->db->fetchArray($thequery)){
-                $totalextended=$totalextended+$therecord["extended"];
-        ?>
-        <tr>
-                <td align="left" nowrap="nowrap"><?php echo $therecord["id"]?$therecord["id"]:"&nbsp;" ?></td>
-                <td align="left" nowrap="nowrap"><?php echo $therecord["type"]?$therecord["type"]:"&nbsp;" ?></td>
-                <td align="left" nowrap="nowrap"><?php echo $therecord["formateddate"]?$therecord["formateddate"]:"&nbsp;" ?></td>
-                <td nowrap="nowrap"><?php echo $therecord["partnumber"]?></td>
-                <td nowrap="nowrap"><?php echo $therecord["partname"]?></td>
-                <td align="right" nowrap="nowrap"><?php echo numberToCurrency($therecord["price"])?></td>
-                <td align="center" nowrap="nowrap"><?php echo $therecord["qty"]?></td>
-                <td align="right" nowrap="nowrap"><?php echo numberToCurrency($therecord["extended"])?></td>
-        </tr>
-        <?php }//end while ?>
-        <tr>
-         <td align="center" class="grandtotals">&nbsp;</td>
-         <td align="center" class="grandtotals">&nbsp;</td>
-         <td align="center" class="grandtotals">&nbsp;</td>
-         <td class="grandtotals">&nbsp;</td>
-         <td class="grandtotals">&nbsp;</td>
-         <td align="right" class="grandtotals">&nbsp;</td>
-         <td align="center" class="grandtotals">&nbsp;</td>
-         <td align="right" class="grandtotals"><?php echo numberToCurrency($totalextended)?></td>
-        </tr>
-   </table>     <?php
-        }//end fucntion showSalesHistory($id)
-
-        function showReport(){
-        ?>
-        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<title>Client Purchase History</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<style type="text/css">
-<!--
-BODY,TH,TD,H1,H2,h3{
-        font-size : 11px;
-        font-family : sans-serif;
-        color : Black;
-}
-H1,H2, LI{
-        font-size:18px;
-        border-bottom:4px solid black;
-        margin:0px;
-}
-H2, LI{ font-size:11px; border-bottom-width:2px; margin-bottom:10px;}
-H3{ font-size:14px; margin-bottom:2px;}
-div {padding:5px;}
-
-UL{margin:0;padding:0;}
-LI{float:left;display:inline;padding-left:10px;}
-
-TABLE{border:3px solid black;border-bottom-width:1px;border-right-width:1px;}
-TH, TD{ padding:2px; border-right:1px solid black;border-bottom:1px solid black;}
-TH {
-        background-color:#EEEEEE;
-        font-size:12px;
-        font-weight: bold;
-        border-bottom-width:3px;
-}
-
-.grandtotals{font-size:12px; border-top:3px double black; font-weight:bold; padding-top:8px;padding-bottom:8px; background-color:#EEEEEE;}
-
--->
-</style>
-</head>
-<body>
-<h1>Client Purchase History</h1>
+                        <th align="right" nowrap="nowrap" >qty.</th>
+                        <th align="right" nowrap="nowrap" class="lastHeader">ext.</th>
+                </tr>
+            </thead>
+            <tbody>
+        <?php
+
+            $totalextended = 0;
+
+            while($therecord = $this->db->fetchArray($queryresult)){
+
+                $totalextended += $therecord["extended"];
+
+                ?>
+                    <tr>
+                        <td align="left" nowrap="nowrap"><?php echo $therecord["id"]?$therecord["id"]:"&nbsp;" ?></td>
+                        <td align="left" nowrap="nowrap"><?php echo $therecord["type"]?formatVariable($therecord["type"]):"&nbsp;" ?></td>
+                        <td align="left" nowrap="nowrap"><?php echo $therecord["thedate"]?formatFromSQLDate($therecord["thedate"]):"&nbsp;" ?></td>
+                        <td nowrap="nowrap"><?php echo formatVariable($therecord["partnumber"]) ?></td>
+                        <td nowrap="nowrap"><?php echo formatVariable($therecord["partname"]) ?></td>
+                        <td align="right" nowrap="nowrap"><?php echo numberToCurrency($therecord["price"])?></td>
+                        <td align="right" nowrap="nowrap"><?php echo $therecord["qty"]?></td>
+                        <td align="right" nowrap="nowrap"><?php echo numberToCurrency($therecord["extended"])?></td>
+                    </tr>
+                <?php
+
+            }//endwhile
+        ?>
+                <tr class="grandTotals">
+                    <td colspan="7" align="right">total</td>
+                    <td align="right"><?php echo numberToCurrency($totalextended)?></td>
+                </tr>
+
+            </tbody>
+        </table><?php
+
+        $output = ob_get_contents();
+        ob_end_clean();
+
+        return $output;
+
+    }//end function generateSingleClientHistory
+
+
+
+    function generate(){
+
+
+        ob_start();
+        ?>
+
+        <h1>Client Purchase History</h1>
 
         <ul>
-                <li>
-                        <strong>
-                        source:<br />
-                        <?php echo $_SESSION["printing"]["dataprint"]?>
-                        </strong>
-                </li>
-                <li>
-                        <strong>
-                        date generated:<br />
-                        <?php echo dateToString(mktime())." ".timeToString(mktime());?>
-                        </strong>
-                </li>
-                <li style="padding-left:30px;padding-right:20px;">
-                        <strong>
-                        view:<br />
-                        <?php echo $this->view?>
-                        </strong>
-                </li>
-                <li>
-                        <strong>
-                        from:<br />
-                        <?php echo $this->fromdate?>
-                        </strong>
-                </li>
-                <li>
-                        <strong>
-                        to:<br />
-                        <?php echo $this->todate?>
-                        </strong>
-                </li>
-        </ul><br /><br />
-
-<?php while($therecord=$this->db->fetchArray($this->clientQuery)){?>
-        <h3><?php echo $therecord["thename"]?></h3>
-<?php $this->showPurchaseHistory($therecord["id"]);}//end while?>
-</body>
-</html>
-        <?php
-        }
-}//end class
-
-if(isset($_POST["command"])){
-        $myreport= new purchaseHistoryReport();
-        $myreport->initialize($_POST,$db);
-
-        $myreport->showReport();
-} else {
-                require("include/fields.php");
-
-                $pageTitle = "Client Purchase History";
-                $phpbms->cssIncludes[] = "pages/historyreports.css";
-                $phpbms->showMenu = false;
-
-                //Form Elements
-                //==============================================================
-                $theform = new phpbmsForm();
-
-
-                $thedate = dateToString( mktime(0,0,0,date("m"),1),"SQL" );
-                $theinput = new inputDatePicker("fromdate", $thedate, "from",true);
-                $theform->addField($theinput);
-
-                $thedate = dateToString( mktime(0,0,0,date("m")+1,0,date("Y")), "SQL" );
-                $theinput = new inputDatePicker("todate", $thedate, "to",true);
-                $theform->addField($theinput);
-
-                $theform->jsMerge();
-                //==============================================================
-                //End Form Elements
-
-                include("header.php");
-?>
-<form action="<?php echo $_SERVER["PHP_SELF"]?>" method="post" name="totals" onsubmit="return validateForm(this)">
-<div class="bodyline" id="reportOptions">
-        <h1 id="topTitle"><span>Product Sales History Options</span></h1>
-                <fieldset>
-                        <legend>time frame</legend>
-
-                        <p id="fromP"><?php $theform->showField("fromdate");?></p>
-
-                        <p><?php $theform->showField("todate");?></p>
-                </fieldset>
-
-                <p>
-                        <label for="status">include products from...<br /></label>
-                   <select id="status" name="status">
-                                <option value="Orders/Invoices" selected="selected">Orders/Invoices</option>
-                                <option value="Invoices">Invoices</option>
-                                <option value="Orders">Orders</option>
-                   </select>
-                </p>
-
-                <div align="right">
-                        <input name="command" type="submit" class="Buttons" id="print" value="print" />
-                        <input name="cancel" type="button" class="Buttons" id="cancel" value="cancel" onclick="window.close();" />
-                </div>
-</div>
-</form>
-<?php
-include("footer.php");
-}?>
+            <li>
+                source:<br />
+                <?php echo formatVariable($this->dataPrint); ?>
+            </li>
+            <li>
+                date generated:<br />
+                <?php echo dateToString(mktime())." ".timeToString(mktime()); ?>
+            </li>
+            <li>
+                view:<br />
+                <?php echo $this->view; ?>
+            </li>
+            <li>
+                from:<br />
+                <?php echo $this->fromDate; ?>
+            </li>
+            <li>
+                to:<br />
+                <?php echo $this->toDate; ?>
+            </li>
+        </ul>
+
+        <?php
+
+        $this->reportOutput = ob_get_contents();
+        ob_end_clean();
+
+        while($therecord = $this->db->fetchArray($this->clientQueryresult)){
+
+            $this->reportOutput .= '<h2>'.$therecord["thename"].'</h2>';
+
+            $this->reportOutput .= $this->generateSingleClientHistory($therecord["uuid"]);
+
+        }//endwhile
+
+    }//end function generate
+
+
+    function output(){
+
+        global $phpbms;
+        $db = &$this->db;
+
+        $phpbms->cssIncludes[] = "reports.css";
+        $phpbms->cssIncludes[] = "pages/bms/clienthistoryreport.css";
+
+        $phpbms->showMenu = false;
+        $phpbms->showFooter = false;
+
+        include("header.php");
+
+        echo $this->reportOutput;
+
+        include("footer.php");
+
+    }//end function output
+
+
+    function displayOptions(){
+
+        global $phpbms;
+        $db = &$this->db;
+
+        require("include/fields.php");
+
+        $pageTitle = "Client Purchase History";
+        $phpbms->cssIncludes[] = "pages/historyreports.css";
+        $phpbms->showMenu = false;
+
+        //Form Elements
+        //==============================================================
+        $theform = new phpbmsForm();
+
+        $thedate = dateToString( mktime(0,0,0,date("m"),1),"SQL" );
+        $theinput = new inputDatePicker("fromdate", $thedate, "from",true);
+        $theform->addField($theinput);
+
+        $thedate = dateToString( mktime(0,0,0,date("m")+1,0,date("Y")), "SQL" );
+        $theinput = new inputDatePicker("todate", $thedate, "to",true);
+        $theform->addField($theinput);
+
+        $theform->jsMerge();
+        //==============================================================
+        //End Form Elements
+
+        include("header.php");
+        ?>
+        <form action="<?php echo str_replace("&", "&amp;", $_SERVER["REQUEST_URI"]); ?>" method="post" name="totals" onsubmit="return validateForm(this)">
+
+            <div class="bodyline" id="reportOptions">
+
+                <h1 id="topTitle"><span>Client Purchase History Options</span></h1>
+
+                <fieldset>
+                    <legend>time frame</legend>
+
+                    <p id="fromP"><?php $theform->showField("fromdate");?></p>
+
+                    <p><?php $theform->showField("todate");?></p>
+                </fieldset>
+
+                <p>
+                    <label for="status">include products from...<br /></label>
+                    <select id="status" name="status">
+                        <option value="Orders and Invoices" selected="selected">Orders and Invoices</option>
+                        <option value="Invoices">Invoices</option>
+                        <option value="Orders">Orders</option>
+                    </select>
+                </p>
+
+                <div align="right">
+                    <input name="command" type="submit" class="Buttons" id="print" value="print" />
+                    <input name="cancel" type="button" class="Buttons" id="cancel" value="cancel" onclick="window.close();" />
+                </div>
+            </div>
+        </form>
+
+        <?php
+        include("footer.php");
+
+    }//end function displayOptions
+
+}//end class  purchaseHistoryReport
+
+
+/**
+ * PROCESSING
+ * =============================================================================
+ */
+if(!isset($noOutput)){
+
+    //IE needs caching to be set to private in order to display PDFS
+    session_cache_limiter('private');
+
+    require_once("../../../include/session.php");
+
+    checkForReportArguments();
+
+    $report = new purchaseHistoryReport($db, $_GET["rid"], $_GET["tid"]);
+
+    if(!isset($_POST["command"]) && !isset($_GET["status"]))
+        $report->displayOptions();
+    else{
+
+        if(isset($_GET["status"])){
+
+            $_POST["status"] = $_GET["status"];
+            $_POST["fromdate"] = $_GET["fromdate"];
+            $_POST["todate"] = $_GET["todate"];
+
+        }//endif
+
+        //need to set post variables here
+
+        $report->setupFromPrintScreen();
+        $report->initialize($_POST);
+        $report->generate();
+        $report->output();
+
+    }//endif
+
+
+}//end if
+
+/**
+ * When adding a new report record, the add/edit needs to know what the class
+ * name is so that it can instantiate it, and grab it's default settings.
+ */
+if(isset($addingReportRecord))
+    $reportClass ="purchaseHistoryReport";

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

@@ -38 +38 @@
 */
 
-require("../../../include/session.php");
-
-class totalReport{
+if(!class_exists("phpbmsReport"))
+    require("../../../report/report_class.php");
+
+class totalReport extends phpbmsReport{
 
         var $selectcolumns;
         var $tableClause = array();
-        var $whereClause = array();
+        var $whereClauses = array();
         var $group = "";
         var $showItems = false;
@@ -51 +52 @@
         var $toDate;
 
-        function totalReport($db,$variables = NULL){
-                $this->db = $db;
-
-                // first we define the available groups
-                $this->addGroup("Year","YEAR(docdate)"); //0
-                $this->addGroup("Quarter","QUARTER(docdate)"); //1
-                $this->addGroup("Month","DATE_FORMAT(docdate, '%m - %b')"); //2
-                $this->addGroup("Week","WEEK(docdate)"); //3
-                $this->addGroup("Payment Method","paymentmethods.name"); //4
-                $this->addGroup("Document Type","doctype"); //5
-
-
-                //next we do the columns
-                $this->addColumn("Record Count","COUNT(id)");//0
-                $this->addColumn("Total","SUM(doctotal)","currency");//1
-
-
-                if($variables){
-
-                        $this->selectcolumns = $this->columns;
-
-                        $this->fromDate = $variables["fromdate"];
-                        $this->toDate = $variables["todate"];
-
-                        $this->tableClause["invoices"] = "(invoices INNER JOIN paymentmethods ON invoices.paymentmethodid = paymentmethods.uuid)";
-                        $this->tableClause["receipts"] = "(receipts INNER JOIN paymentmethods ON receipts.paymentmethodid = paymentmethods.uuid)";
-
-                        if($variables["groupings"] !== ""){
-
-                                $this->group = explode("::",$variables["groupings"]);
-                                $this->group = array_reverse($this->group);
-
-                        } else
-                                $this->group = array();
-
-                        foreach($this->group as $grp){
-
-                                if($this->groupings[$grp]["table"]){
-
-                                        foreach($this->tableClause as $key => $value);
-                                            $this->tableClause[$key]="(".$this->tableClause[$key]." ".$this->groupings[$grp]["table"].")";
-
-                                }//endif
-
-                        }//endforeach
-
-//                      $this->whereclause = $_SESSION["printing"]["whereclause"];
-//                      if($this->whereclause=="") $this->whereclause="WHERE invoices.id!=-1";
-                        $this->whereClause["invoices"] = "
-                            WHERE
-                                (invoices.type = 'Invoice'
-                                AND paymentmethods.type != 'receivable'
-                                AND invoicedate >= '".sqlDateFromString($variables["fromdate"])."'
-                                AND invoicedate <= '".sqlDateFromString($variables["todate"])."')
-                            ";
-
-                        $this->whereClause["receipts"] = "
-                            WHERE
-                                (receipts.posted = 1
-                                AND receiptdate >= '".sqlDateFromString($variables["fromdate"])."'
-                                AND receiptdate <= '".sqlDateFromString($variables["todate"])."')
-                            ";
-
-                        $this->showItems = isset($variables["showitems"]);
-
-                }// endif
+
+        function totalReport($db, $reportUUID, $tabledefUUID){
+
+            $this->db = $db;
+
+            parent::phpbmsReport($db, $reportUUID, $tabledefUUID);
+
+            // first we define the available groups
+            $this->addGroup("Year","YEAR(docdate)"); //0
+            $this->addGroup("Quarter","QUARTER(docdate)"); //1
+            $this->addGroup("Month","DATE_FORMAT(docdate, '%m - %b')"); //2
+            $this->addGroup("Week","WEEK(docdate)"); //3
+            $this->addGroup("Payment Method","paymentmethods.name"); //4
+            $this->addGroup("Document Type","doctype"); //5
+
+            //next we do the columns
+            $this->addColumn("Record Count","COUNT(id)");//0
+            $this->addColumn("Total","SUM(doctotal)","currency");//1
+
+            $this->tableClause["invoices"] = "(invoices INNER JOIN paymentmethods ON invoices.paymentmethodid = paymentmethods.uuid)";
+            $this->tableClause["receipts"] = "(receipts INNER JOIN paymentmethods ON receipts.paymentmethodid = paymentmethods.uuid)";
+
         }//end method
+
+
+        function processFromPost($variables){
+
+            $this->selectcolumns = $this->columns;
+
+            $this->fromDate = $variables["fromdate"];
+            $this->toDate = $variables["todate"];
+
+            if($variables["groupings"] !== ""){
+
+                $this->group = explode("::",$variables["groupings"]);
+                $this->group = array_reverse($this->group);
+
+            } else
+                $this->group = array();
+
+            foreach($this->group as $grp){
+
+                if($this->groupings[$grp]["table"]){
+
+                    foreach($this->tableClause as $key => $value);
+                        $this->tableClause[$key] = "(".$this->tableClause[$key]." ".$this->groupings[$grp]["table"].")";
+
+                }//endif
+
+            }//endforeach
+
+            $this->whereClauses["invoices"] = "
+                WHERE
+                    (invoices.type = 'Invoice'
+                    AND paymentmethods.type != 'receivable'
+                    AND invoicedate >= '".sqlDateFromString($variables["fromdate"])."'
+                    AND invoicedate <= '".sqlDateFromString($variables["todate"])."')
+                ";
+
+            $this->whereClauses["receipts"] = "
+                WHERE
+                    (receipts.posted = 1
+                    AND receiptdate >= '".sqlDateFromString($variables["fromdate"])."'
+                    AND receiptdate <= '".sqlDateFromString($variables["todate"])."')
+                ";
+
+            $this->showItems = isset($variables["showitems"]);
+
+        }//end function processFromPost
+
+
+        function processFromSettings(){
+
+            $variables["fromdate"] = $this->settings["fromDate"];
+            $variables["todate"] = $this->settings["toDate"];
+
+            $variables["groupings"] = "";
+            foreach($this->settings as $key=>$value)
+                if(strpos($key, "group") === 0)
+                    $variables["groupings"] .= "::".$value;
+
+            if($variables["groupings"])
+                $variables["groupings"] = substr($variables["groupings"], 2);
+
+            $variables["showitems"] = isset($this->settings["showItems"]);
+
+            $this->processFromPost($variables);
+
+        }//end function processFromSettings
 
 
@@ -206 +229 @@
                 $querystatement = "(SELECT";
                 $querystatement .= $this->generateColumns("invoices").", COUNT(invoices.id) AS thecount ";
-                $querystatement .= "FROM ".$this->tableClause["invoices"]." ".$this->whereClause["invoices"].")";
+                $querystatement .= "FROM ".$this->tableClause["invoices"]." ".$this->whereClauses["invoices"].")";
                 $querystatement .= " UNION ";
                 $querystatement .= "(SELECT";
                 $querystatement .= $this->generateColumns("receipts").", COUNT(receipts.id) AS thecount ";
-                $querystatement .= "FROM ".$this->tableClause["receipts"]." ".$this->whereClause["receipts"].")";
+                $querystatement .= "FROM ".$this->tableClause["receipts"]." ".$this->whereClauses["receipts"].")";
 
 
@@ -257 +280 @@
                         $querystatement .= $this->generateColumns("invoices").", COUNT(invoices.id) AS `thecount` ";
                         $querystatement .= ", ".$this->typeSubstitute($this->groupings[$groupby]["field"], "invoices")." AS `thegroup`";
-                        $querystatement .= "FROM ".$this->tableClause["invoices"]." ".$this->whereClause["invoices"].$this->typeSubstitute($where, "invoices");
+                        $querystatement .= "FROM ".$this->tableClause["invoices"]." ".$this->whereClauses["invoices"].$this->typeSubstitute($where, "invoices");
                         $querystatement .= " GROUP BY `thegroup`)";
                         $querystatement .= " UNION ";
@@ -263 +286 @@
                         $querystatement .= $this->generateColumns("receipts").", COUNT(receipts.id) AS thecount ";
                         $querystatement .= ", ".$this->typeSubstitute($this->groupings[$groupby]["field"], "receipts")." AS `thegroup`";
-                        $querystatement .= "FROM ".$this->tableClause["receipts"]." ".$this->whereClause["receipts"].$this->typeSubstitute($where, "receipts");
+                        $querystatement .= "FROM ".$this->tableClause["receipts"]." ".$this->whereClauses["receipts"].$this->typeSubstitute($where, "receipts");
                         $querystatement .= " GROUP BY `thegroup`)";
                         $querystatement .= " ORDER BY `thegroup`";
@@ -421 +444 @@
                     FROM
                         (".$this->tableClause["invoices"].") INNER JOIN clients ON invoices.clientid = clients.uuid
-                        ".$this->whereClause["invoices"].$this->typeSubstitute($where, "invoices")."
+                        ".$this->whereClauses["invoices"].$this->typeSubstitute($where, "invoices")."
                     GROUP BY `theid`)
                     UNION
@@ -431 +454 @@
                     FROM
                         (".$this->tableClause["receipts"].") INNER JOIN clients ON receipts.clientid = clients.uuid
-                        ".$this->whereClause["receipts"].$this->typeSubstitute($where, "receipts")."
+                        ".$this->whereClauses["receipts"].$this->typeSubstitute($where, "receipts")."
                     GROUP BY `theid`)
                     ORDER BY `docdate`";
@@ -464 +487 @@
         function showReport(){
 
-            $pageTitle = "Incoming Cash Flow";
+            if(!isset($this->settings["reportTitle"]))
+                $this->settings["reportTitle"] = "Incoming Cash Flow";
 
 
@@ -477 +501 @@
 <body>
         <div id="toprint">
-                <h1><span><?php echo $pageTitle?></span></h1>
+                <h1><span><?php echo formatVariable($this->settings["reportTitle"]); ?></span></h1>
                 <h2>Dates: <?php echo $this->fromDate ?> - <?php echo $this->toDate ?></h2>
 
@@ -582 +606 @@
 }//endclass
 
-// Processing ===================================================================================================================
-if(!isset($dontProcess)){
-        if(isset($_POST["fromdate"])){
-                $myreport= new totalReport($db,$_POST);
-                $myreport->showReport();
-        } else {
-                $myreport = new totalReport($db);
-                $myreport->showSelectScreen();
-        }
-}?>
+
+/**
+ * PROCESSING
+ * =============================================================================
+ */
+if(!isset($noOutput)){
+
+    //IE needs caching to be set to private in order to display PDFS
+    session_cache_limiter('private');
+
+    //set encoding to latin1 (fpdf doesnt like utf8)
+    $sqlEncoding = "latin1";
+    require_once("../../../include/session.php");
+
+    checkForReportArguments();
+
+    $report = new totalReport($db, $_GET["rid"], $_GET["tid"]);
+
+    if(isset($_POST["fromdate"])){
+
+        $report->processFromPost($_POST);
+        $report->showReport();
+
+    } elseif(isset($report->settings["fromdate"]) && isset($report->settings["todate"]) && isset($report->settings["groupings"])){
+
+        $report->processFromSettings();
+        $report->showReport();
+
+    }else
+        $report->showSelectScreen();
+
+}//end if
+
+/**
+ * When adding a new report record, the add/edit needs to know what the class
+ * name is so that it can instantiate it, and grab it's default settings.
+ */
+if(isset($addingReportRecord))
+    $reportClass ="totalReport";
+
+?>

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

@@ -38 +38 @@
 */
 
-//PROCESSING
-//=============================================================================
+/**
+ * PROCESSING
+ * =============================================================================
+ */
 if(!isset($noOutput)){
 
-        //IE needs caching to be set to private in order to display PDFS
-        session_cache_limiter('private');
+    //IE needs caching to be set to private in order to display PDFS
+    session_cache_limiter('private');
 
-        //set encoding to latin1 (fpdf doesnt like utf8)
-        $sqlEncoding = "latin1";
-        require_once("../../../include/session.php");
+    //set encoding to latin1 (fpdf doesnt like utf8)
+    $sqlEncoding = "latin1";
+    require_once("../../../include/session.php");
 
-        include("modules/bms/report/invoices_pdf_class.php");
+    include("modules/bms/report/invoices_pdf_class.php");
 
-        $report = new invoicePDF($db, 'P', 'in', 'Letter');
-        $report->setupFromPrintScreen();
-        $report->generate();
-        
-        $filename = "Invoice";
-        if($report->count === 1){
-                
-                if($report->invoicerecord["company"])
-                        $filename .= "_".$report->invoicerecord["company"];
-                
-                $filename .= "_".$report->invoicerecord["id"];
-                
-        }elseif((int)$report->count)
-                $filename .= "_Multiple";
-        
-        $filename .= ".pdf";
-        $report->output('screen', $filename);
+    checkForReportArguments();
+
+    $report = new invoicePDF($db, $_GET["rid"], $_GET["tid"], 'P', 'in', 'Letter');
+    $report->setupFromPrintScreen();
+    $report->generate();
+
+    $filename = "Invoice";
+    if($report->count === 1){
+
+        if($report->invoicerecord["company"])
+            $filename .= "_".$report->invoicerecord["company"];
+
+        $filename .= "_".$report->invoicerecord["id"];
+
+    }elseif((int)$report->count)
+        $filename .= "_Multiple";
+
+    $filename .= ".pdf";
+
+    $report->output('screen', $filename);
 
 }//end if
 
+
+/**
+ * When adding a new report record, the add/edit needs to know what the class
+ * name is so that it can instantiate it, and grab it's default settings.
+ */
+if(isset($addingReportRecord)){
+
+    include("modules/bms/report/invoices_pdf_class.php");
+    $reportClass = "invoicePDF";
+
+}//endif
 ?>

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

@@ -38 +38 @@
 */
 
-        if(!isset($_SESSION["userinfo"]["id"])){
-
-                //IE needs caching to be set to private in order to display PDFS
-                session_cache_limiter('private');
-
-                //set encoding to latin1 (fpdf doesnt like utf8)
-                $sqlEncoding = "latin1";
-                require_once("../../../include/session.php");
-
-        }//end if
-
-        if(!class_exists("invoicePDF"))
-                include("invoices_pdf_class.php");
-
-        class  packinglistPDF extends invoicePDF{
-
-                var $title = "Packing List";
-                var $showShipNameInShipTo = false;
-
-                function packinglistPDF($db, $orientation='P', $unit='mm', $format='Letter'){
-
-                        $this->invoicePDF($db, $orientation, $unit, $format);
-
-                }//end method
-
-
-                function initialize(){
-                        //This function will set column headings, sizes and formatting
-
-                        $pdf = &$this->pdf;
-
-                        $topinfo = array();
-                        $topinfo[] = new pdfColumn("Order ID", "id", 0.75);
-                        $topinfo[] = new pdfColumn("Order Date", "orderdate", 1, "date");
-                        $topinfo[] = new pdfColumn("Client PO", "ponumber", 0);
-
-                        $size = 0;
-                        foreach($topinfo as $column)
-                                $size += $column->size;
-
-                        $topinfo[2]->size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
-
-                        $this->topinfo = $topinfo;
-
-                        $lineitems = array();
-                        $lineitems[] = new pdfColumn("Product / (Part Number)", "parts", 0);
-                        $lineitems[] = new pdfColumn("Prepackaged", "isprepackaged", 0.75, "boolean", "C");
-                        $lineitems[] = new pdfColumn("Oversized", "isoversized", 0.75, "boolean", "C");
-                        $lineitems[] = new pdfColumn("Unit Weight", "unitweight", 0.75, "real", "R");
-                        $lineitems[] = new pdfColumn("Qty", "quantity", 0.5, "real","R");
-                        $lineitems[] = new pdfColumn("Weight Ext.", "extended", 0.75, "real", "R");
-
-                        $size = 0;
-                        foreach($lineitems as $column)
-                                $size += $column->size;
-
-                        $lineitems[0]->size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
-
-                        $this->lineitems = $lineitems;
-
-                        $totalsinfo = array();
-                        $totalsinfo[] = new pdfColumn("Shipping Method", "shippingname", 0);
-                        $totalsinfo[] = new pdfColumn("Estimated Boxes", "estimatedboxes", 1, NULL, "C");
-                        $totalsinfo[] = new pdfColumn("Total Weight", "totalweight", 1, "real", "R");
-                        $totalsinfo[] = new pdfColumn("Shipping", "shipping", 1, "currency", "R");
-
-                        $size = 0;
-                        foreach($totalsinfo as $column)
-                                $size += $column->size;
-
-                        $totalsinfo[0]->size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
-
-                        $this->totalsinfo = $totalsinfo;
-
-                }//end method
-
-
-                function _addNotes(){
-
-                        $pdf = &$this->pdf;
-
-                        $height = 1;
-                        $nextPos = $pdf->GetY() + $height + 0.125;
-
-                        $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
-                        $pdf->setStyle("header");
-                        $pdf->Cell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, 0.18, "Special Instructions", 1, 2, "L", 1);
-
-                        $pdf->setStyle("normal");
-                        $pdf->SetXY($pdf->GetX() + .06125, $pdf->GetY() + .06125);
-                        $pdf->MultiCell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - 0.125, 0.18, $this->invoicerecord["specialinstructions"]);
-
-                        $pdf->SetXY($pdf->leftmargin, $nextPos);
-
-                }//end method
-
-
-                function _getLineItems(){
-
-                        $querystatement = "
-                        SELECT
-                                lineitems.*,
-                                lineitems.quantity*lineitems.unitweight as extended,
-                                products.partname,
-                                products.partnumber,
-                                products.isoversized,
-                                products.isprepackaged,
-                                products.packagesperitem
-                        FROM
-                                lineitems LEFT JOIN products ON lineitems.productid = products.id
-                        WHERE
-                                lineitems.invoiceid =".((int) $this->invoicerecord["id"])."
-                        ORDER BY
-                                displayorder";
-
-                        $queryresult = $this->db->query($querystatement);
-
-                        //determine estimated total boxes
-                        $this->invoicerecord["estimatedboxes"] = 0;
-                        while($therecord = $this->db->fetchArray($queryresult)){
-
-                                if($therecord["isprepackaged"])
-                                        $this->invoicerecord["estimatedboxes"] += $therecord["quantity"];
-                                else
-                                        $this->invoicerecord["estimatedboxes"] += $therecord["quantity"] * $therecord["packagesperitem"];
-
-                        }//endwhile
-
-                        $this->db->seek($queryresult, 0);
-
-                        return $queryresult;
-
-                }//end method
-
-                function _addTotals(){
-
-                        $pdf = &$this->pdf;
-
-                        $height = .5;
-                        $nextPos = $pdf->GetY() + $height + 0.125;
-
-                        $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
-
-                        $pdf->setStyle("header");
-                        foreach($this->totalsinfo as $column)
-                                $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
-
-                        $pdf->setStyle("normal");
-                        $pdf->SetFont("Arial", "B", 10);
-                        $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + 0.18 + 0.0625);
-
-                        foreach($this->totalsinfo as $column){
-
-                                if($column->format != "")
-                                        $value = formatVariable($this->invoicerecord[$column->fieldname], $column->format);
-                                else
-                                        $value = $this->invoicerecord[$column->fieldname];
-
-                                $pdf->Cell($column->size, 0.18, $value, $pdf->borderDebug, 0, $column->align);
-
-                        }//end foreach
-
-                }//end method
-
-        }//end class
-
-
-        //PROCESSING
-        //=============================================================================
-        if(!isset($noOutput)){
-
-                $report = new packinglistPDF($db, 'P', 'in', 'Letter');
-
-                $report->setupFromPrintScreen();
-                $report->generate();
-                $filename = "Packing_List";
-                
-                if($report->count === 1){
-                        
-                        if($report->invoicerecord["company"])
-                                $filename .= "_".$report->invoicerecord["company"];
-                        
-                        $filename .= "_".$report->invoicerecord["id"];
-                        
-                }elseif((int)$report->count)
-                        $filename .= "_Multiple";
-                
-                $report->output('screen', $filename);
-
-        }//end if
+if(!class_exists("invoicePDF"))
+    include("invoices_pdf_class.php");
+
+class  packinglistPDF extends invoicePDF{
+
+    var $showShipNameInShipTo = false;
+
+    function packinglistPDF($db, $reportUUID, $tabledefUUID, $orientation='P', $unit='mm', $format='Letter'){
+
+            $this->invoicePDF($db, $reportUUID, $tabledefUUID, $orientation, $unit, $format);
+
+    }//end method
+
+
+    /**
+     * function checkForDefaultSettings
+     *
+     * Checks to make sure loaded report Settings exist and are correct
+     */
+    function checkForDefaultSettings(){
+
+        if(!isset($this->settings["reportTitle"]))
+            $this->settings["reportTitle"] = "Packing List";
+
+        parent::checkForDefaultSettings();
+
+    }//end function checkForDefaultSettings
+
+
+    function initialize(){
+            //This function will set column headings, sizes and formatting
+
+            $pdf = &$this->pdf;
+
+            $topinfo = array();
+            $topinfo[] = new pdfColumn("Order ID", "id", 0.75);
+            $topinfo[] = new pdfColumn("Order Date", "orderdate", 1, "date");
+            $topinfo[] = new pdfColumn("Client PO", "ponumber", 0);
+
+            $size = 0;
+            foreach($topinfo as $column)
+                    $size += $column->size;
+
+            $topinfo[2]->size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
+
+            $this->topinfo = $topinfo;
+
+            $lineitems = array();
+            $lineitems[] = new pdfColumn("Product / (Part Number)", "parts", 0);
+            $lineitems[] = new pdfColumn("Prepackaged", "isprepackaged", 0.75, "boolean", "C");
+            $lineitems[] = new pdfColumn("Oversized", "isoversized", 0.75, "boolean", "C");
+            $lineitems[] = new pdfColumn("Unit Weight", "unitweight", 0.75, "real", "R");
+            $lineitems[] = new pdfColumn("Qty", "quantity", 0.5, "real","R");
+            $lineitems[] = new pdfColumn("Weight Ext.", "extended", 0.75, "real", "R");
+
+            $size = 0;
+            foreach($lineitems as $column)
+                    $size += $column->size;
+
+            $lineitems[0]->size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
+
+            $this->lineitems = $lineitems;
+
+            $totalsinfo = array();
+            $totalsinfo[] = new pdfColumn("Shipping Method", "shippingname", 0);
+            $totalsinfo[] = new pdfColumn("Estimated Boxes", "estimatedboxes", 1, NULL, "C");
+            $totalsinfo[] = new pdfColumn("Total Weight", "totalweight", 1, "real", "R");
+            $totalsinfo[] = new pdfColumn("Shipping", "shipping", 1, "currency", "R");
+
+            $size = 0;
+            foreach($totalsinfo as $column)
+                    $size += $column->size;
+
+            $totalsinfo[0]->size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
+
+            $this->totalsinfo = $totalsinfo;
+
+    }//end method
+
+
+    function _addNotes(){
+
+            $pdf = &$this->pdf;
+
+            $height = 1;
+            $nextPos = $pdf->GetY() + $height + 0.125;
+
+            if(!$this->settings["templateFormatting"]){
+
+                $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
+                $pdf->setStyle("header");
+                $pdf->Cell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, 0.18, "Special Instructions", 1, 2, "L", 1);
+
+            }//endif
+
+            $pdf->setStyle("normal");
+            $pdf->SetXY($pdf->GetX() + .06125, $pdf->GetY() + .06125);
+            $pdf->MultiCell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - 0.125, 0.18, $this->invoicerecord["specialinstructions"]);
+
+            $pdf->SetXY($pdf->leftmargin, $nextPos);
+
+    }//end method
+
+
+    function _getLineItems(){
+
+            $querystatement = "
+            SELECT
+                    lineitems.*,
+                    lineitems.quantity*lineitems.unitweight as extended,
+                    products.partname,
+                    products.partnumber,
+                    products.isoversized,
+                    products.isprepackaged,
+                    products.packagesperitem
+            FROM
+                    lineitems LEFT JOIN products ON lineitems.productid = products.id
+            WHERE
+                    lineitems.invoiceid =".((int) $this->invoicerecord["id"])."
+            ORDER BY
+                    displayorder";
+
+            $queryresult = $this->db->query($querystatement);
+
+            //determine estimated total boxes
+            $this->invoicerecord["estimatedboxes"] = 0;
+            while($therecord = $this->db->fetchArray($queryresult)){
+
+                    if($therecord["isprepackaged"])
+                            $this->invoicerecord["estimatedboxes"] += $therecord["quantity"];
+                    else
+                            $this->invoicerecord["estimatedboxes"] += $therecord["quantity"] * $therecord["packagesperitem"];
+
+            }//endwhile
+
+            $this->db->seek($queryresult, 0);
+
+            return $queryresult;
+
+    }//end method
+
+
+    function _addTotals(){
+
+            $pdf = &$this->pdf;
+
+            $height = .5;
+            $nextPos = $pdf->GetY() + $height + 0.125;
+
+            if(!$this->settings["templateFormatting"]){
+
+                $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
+
+                $pdf->setStyle("header");
+                foreach($this->totalsinfo as $column)
+                    $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
+
+            } else
+                $pdf->SetY($pdf->GetY() + 0.18);
+
+            $pdf->setStyle("normal");
+            $pdf->SetFont("Arial", "B", 10);
+            $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + 0.18 + 0.0625);
+
+            foreach($this->totalsinfo as $column){
+
+                    if($column->format != "")
+                            $value = formatVariable($this->invoicerecord[$column->fieldname], $column->format);
+                    else
+                            $value = $this->invoicerecord[$column->fieldname];
+
+                    $pdf->Cell($column->size, 0.18, $value, $pdf->borderDebug, 0, $column->align);
+
+            }//end foreach
+
+    }//end method
+
+
+    /**
+     * function addingRecordDefaultSettings
+     *
+     * Creates an array of settings associative arrays for use by the system when
+     * a new report record is added that references the file containing this class
+     *
+     * @retrun array of settings. Each setting should itself be
+     * an associative array containing the following
+     * name: name of the setting
+     * defaultvalue: default value for setting
+     * type: (string, int, real, bool) type for value of setting
+     * required: (0,1) whether the setting is required or not
+     * description: brief description for what this setting is used for.
+     */
+    function addingRecordDefaultSettings(){
+
+        $settings = parent::addingRecordDefaultSettings();
+
+        for($i=0; $i< count($settings); $i++){
+
+            switch($settings[$i]["name"]){
+
+                case "reportTitle":
+                    $settings[$i]["defaultValue"] = "Packing List";
+
+            }//endswitch
+
+        }//end foreach
+
+        return $settings;
+
+    }//endfunction addingRecordDefaultSettings
+
+}//end class
+
+
+/**
+ * PROCESSING
+ * =============================================================================
+ */
+if(!isset($noOutput)){
+
+    //IE needs caching to be set to private in order to display PDFS
+    session_cache_limiter('private');
+
+    //set encoding to latin1 (fpdf doesnt like utf8)
+    $sqlEncoding = "latin1";
+    require_once("../../../include/session.php");
+
+    checkForReportArguments();
+
+    $report = new packinglistPDF($db, $_GET["rid"], $_GET["tid"], 'P', 'in', 'Letter');
+
+    $report->setupFromPrintScreen();
+    $report->generate();
+    $filename = "Packing_List";
+
+    if($report->count === 1){
+
+        if($report->invoicerecord["company"])
+            $filename .= "_".$report->invoicerecord["company"];
+
+        $filename .= "_".$report->invoicerecord["id"];
+
+    }elseif((int)$report->count)
+        $filename .= "_Multiple";
+
+    $filename .=".pdf";
+
+    $report->output('screen', $filename);
+
+}//end if
+
+
+/**
+ * When adding a new report record, the add/edit needs to know what the class
+ * name is so that it can instantiate it, and grab it's default settings.
+ */
+if(isset($addingReportRecord))
+    $reportClass ="packinglistPDF";
 ?>

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

@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
-if(!isset($_SESSION["userinfo"]["id"])){
-
-        //IE needs caching to be set to private in order to display PDFS
-        session_cache_limiter('private');
-
-        //set encoding to latin1 (fpdf doesnt like utf8)
-        $sqlEncoding = "latin1";
-        require_once("../../../include/session.php");
-
-}//end if
-
 if(!class_exists("invoicePDF"))
-        include("invoices_pdf_class.php");
+    include("invoices_pdf_class.php");
 
 class  quotePDF extends invoicePDF{
 
-        var $title = "Quote";
+    function quotePDF($db, $reportUUID, $tabledefUUID, $orientation='P', $unit='mm', $format='Letter'){
 
-        function quotePDF($db, $orientation='P', $unit='mm', $format='Letter'){
+        $this->invoicePDF($db, $reportUUID, $tabledefUUID, $orientation, $unit, $format);
 
-                $this->invoicePDF($db, $orientation, $unit, $format);
+    }//end method
 
-        }//end method
 
-        function initialize(){
-                parent::initialize();
+    /**
+     * function checkForDefaultSettings
+     *
+     * Checks to make sure loaded report Settings exist and are correct
+     */
+    function checkForDefaultSettings(){
 
-                unset($this->totalsinfo[5]);
+        if(!isset($this->settings["reportTitle"]))
+            $this->settings["reportTitle"] = "Quote";
 
-        }//end method
+        parent::checkForDefaultSettings();
+
+    }//end function checkForDefaultSettings
+
+
+    function initialize(){
+
+        parent::initialize();
+
+        unset($this->totalsinfo[5]);
+
+    }//end method
+
+
+    /**
+     * function addingRecordDefaultSettings
+     *
+     * Creates an array of settings associative arrays for use by the system when
+     * a new report record is added that references the file containing this class
+     *
+     * @retrun array of settings. Each setting should itself be
+     * an associative array containing the following
+     * name: name of the setting
+     * defaultvalue: default value for setting
+     * type: (string, int, real, bool) type for value of setting
+     * required: (0,1) whether the setting is required or not
+     * description: brief description for what this setting is used for.
+     */
+    function addingRecordDefaultSettings(){
+
+        $settings = parent::addingRecordDefaultSettings();
+
+        for($i=0; $i< count($settings); $i++){
+
+            switch($settings[$i]["name"]){
+
+                case "reportTitle":
+                    $settings[$i]["defaultValue"] = "Quote";
+
+            }//endswitch
+
+        }//end foreach
+
+        return $settings;
+
+    }//endfunction addingRecordDefaultSettings
 
 }//end class
 
-//PROCESSING
-//=============================================================================
+
+/**
+ * PROCESSING
+ * =============================================================================
+ */
 if(!isset($noOutput)){
 
-        $report = new quotePDF($db, 'P', 'in', 'Letter');
-        $report->showShipNameInShipTo = false;
+    //IE needs caching to be set to private in order to display PDFS
+    session_cache_limiter('private');
 
-        $report->setupFromPrintScreen();
-        $report->generate();
-        
-        $filename = "Quote";
-        if($report->count === 1){
-                
-                if($report->invoicerecord["company"])
-                        $filename .= "_".$report->invoicerecord["company"];
-                
-                $filename .= "_".$report->invoicerecord["id"];
-                
-        }elseif((int)$report->count)
-                $filename .= "_Multiple";
-        
-        $filename .= ".pdf";
-        
-        $report->output('screen', $filename);
+    //set encoding to latin1 (fpdf doesnt like utf8)
+    $sqlEncoding = "latin1";
+    require_once("../../../include/session.php");
+
+    checkForReportArguments();
+
+    $report = new quotePDF($db, $_GET["rid"], $_GET["tid"], 'P', 'in', 'Letter');
+    $report->showShipNameInShipTo = false;
+
+    $report->setupFromPrintScreen();
+    $report->generate();
+
+    $filename = "Quote";
+    if($report->count === 1){
+
+        if($report->invoicerecord["company"])
+            $filename .= "_".$report->invoicerecord["company"];
+
+        $filename .= "_".$report->invoicerecord["id"];
+
+    }elseif((int)$report->count)
+        $filename .= "_Multiple";
+
+    $filename .= ".pdf";
+
+    $report->output('screen', $filename);
 
 }//end if
 
 
+/**
+ * When adding a new report record, the add/edit needs to know what the class
+ * name is so that it can instantiate it, and grab it's default settings.
+ */
+if(isset($addingReportRecord))
+    $reportClass ="quotePDF";
 ?>

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

@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
-        if(!isset($_SESSION["userinfo"]["id"])){
-
-                //IE needs caching to be set to private in order to display PDFS
-                session_cache_limiter('private');
-
-                //set encoding to latin1 (fpdf doesnt like utf8)
-                $sqlEncoding = "latin1";
-                require_once("../../../include/session.php");
-
-        }//end if
-
-        if(!class_exists("invoicePDF"))
-                include("invoices_pdf_class.php");
-
-        class  workorderPDF extends invoicePDF{
-
-                var $title = "Work Order";
-                var $lineitemBoxHeight = 3.75;
-
-                function workorderPDF($db, $orientation='P', $unit='mm', $format='Letter'){
-
-                        $this->invoicePDF($db, $orientation, $unit, $format);
-
-                }//end method
-
-
-                function _addNotes(){
-
-                        $pdf = &$this->pdf;
-
-                        $height = 1;
-                        $nextPos = $pdf->GetY() + $height + 0.125;
-
-                        $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
-                        $pdf->setStyle("header");
-                        $pdf->Cell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, 0.18, "Special Instructions", 1, 2, "L", 1);
-
-                        $pdf->setStyle("normal");
-                        $pdf->SetXY($pdf->GetX() + .06125, $pdf->GetY() + .06125);
-                        $pdf->MultiCell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - 0.125, 0.18, $this->invoicerecord["specialinstructions"]);
-
-                        $pdf->SetXY($pdf->leftmargin, $nextPos);
-
-                }//end method
-
-                function _addPaymentDetails(){
-
-                        $pdf = &$this->pdf;
-
-                        $columns = array();
-                        $columns[] = new pdfColumn("Payment Method", "paymentname", 0);
-
-                        switch($this->invoicerecord["paymenttype"]){
-
-                                case "draft":
-                                        $columns[0]->size = 1.5;
-                                        $columns[] = new pdfColumn("Check Number", "checkno", 1);
-                                        $columns[] = new pdfColumn("Bank Name", "bankname", 2);
-                                        break;
-
-                                case "charge":
-                                        $columns[0]->size = 1.5;
-                                        $columns[] = new pdfColumn("Number", "ccnumber", 1.5);
-                                        $columns[] = new pdfColumn("Exp.", "ccexpiration", 1);
-                                        $columns[] = new pdfColumn("Verification/Pin", "ccverification", 1);
-                                        break;
-
-                        }//end switch
-
-                        $size = 0;
-                        foreach($columns as $column)
-                                $size += $column->size;
-
-                        $i = count($columns) -1;
-
-                        $columns[$i]->size += $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
-
-                        $height = 0.5;
-                        $nextPos = $pdf->GetY() + $height + 0.125;
-
-                        $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
-
-                        $pdf->setStyle("header");
-
-                        foreach($columns as $column)
-                                $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
-
-                        $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + 0.18 + 0.0625);
-
-                        $pdf->setStyle("normal");
-                        $pdf->SetFont("Arial", "B", 10);
-                        foreach($columns as $column)
-                                $pdf->Cell($column->size, 0.18, $this->invoicerecord[$column->fieldname], $pdf->borderDebug, 0, $column->align);
-
-                }//end method
-
-        }//end class
-
-
-//PROCESSING
-//=============================================================================
+if(!class_exists("invoicePDF"))
+    include("invoices_pdf_class.php");
+
+class  workorderPDF extends invoicePDF{
+
+    var $lineitemBoxHeight = 3.75;
+
+
+    function workorderPDF($db, $reportUUID, $tabledefUUID, $orientation='P', $unit='mm', $format='Letter'){
+
+        $this->invoicePDF($db, $reportUUID, $tabledefUUID, $orientation, $unit, $format);
+
+    }//end method
+
+
+    /**
+     * function checkForDefaultSettings
+     *
+     * Checks to make sure loaded report Settings exist and are correct
+     */
+    function checkForDefaultSettings(){
+
+        if(!isset($this->settings["reportTitle"]))
+            $this->settings["reportTitle"] = "Work Order";
+
+        parent::checkForDefaultSettings();
+
+    }//end function checkForDefaultSettings
+
+
+    function _addNotes(){
+
+            $pdf = &$this->pdf;
+
+            $height = 1;
+            $nextPos = $pdf->GetY() + $height + 0.125;
+
+            if(!$this->settings["templateFormatting"]){
+
+                $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
+                $pdf->setStyle("header");
+                $pdf->Cell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, 0.18, "Special Instructions", 1, 2, "L", 1);
+
+            }else
+                $pdf->SetY($pdf->GetY() + 0.18);
+
+            $pdf->setStyle("normal");
+            $pdf->SetXY($pdf->GetX() + .06125, $pdf->GetY() + .06125);
+            $pdf->MultiCell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - 0.125, 0.18, $this->invoicerecord["specialinstructions"]);
+
+            $pdf->SetXY($pdf->leftmargin, $nextPos);
+
+    }//end method
+
+    function _addPaymentDetails(){
+
+            $pdf = &$this->pdf;
+
+            $columns = array();
+            $columns[] = new pdfColumn("Payment Method", "paymentname", 0);
+
+            switch($this->invoicerecord["paymenttype"]){
+
+                    case "draft":
+                            $columns[0]->size = 1.5;
+                            $columns[] = new pdfColumn("Check Number", "checkno", 1);
+                            $columns[] = new pdfColumn("Bank Name", "bankname", 2);
+                            break;
+
+                    case "charge":
+                            $columns[0]->size = 1.5;
+                            $columns[] = new pdfColumn("Number", "ccnumber", 1.5);
+                            $columns[] = new pdfColumn("Exp.", "ccexpiration", 1);
+                            $columns[] = new pdfColumn("Verification/Pin", "ccverification", 1);
+                            break;
+
+            }//end switch
+
+            $size = 0;
+            foreach($columns as $column)
+                    $size += $column->size;
+
+            $i = count($columns) -1;
+
+            $columns[$i]->size += $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
+
+            $height = 0.5;
+            $nextPos = $pdf->GetY() + $height + 0.125;
+
+            if(!$this->settings["templateFormatting"]){
+
+                $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
+
+                $pdf->setStyle("header");
+
+                foreach($columns as $column)
+                    $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
+
+            }//endif
+
+            $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + 0.18 + 0.0625);
+
+            $pdf->setStyle("normal");
+            $pdf->SetFont("Arial", "B", 10);
+            foreach($columns as $column)
+                    $pdf->Cell($column->size, 0.18, $this->invoicerecord[$column->fieldname], $pdf->borderDebug, 0, $column->align);
+
+    }//end method
+
+    /**
+     * function addingRecordDefaultSettings
+     *
+     * Creates an array of settings associative arrays for use by the system when
+     * a new report record is added that references the file containing this class
+     *
+     * @retrun array of settings. Each setting should itself be
+     * an associative array containing the following
+     * name: name of the setting
+     * defaultvalue: default value for setting
+     * type: (string, int, real, bool) type for value of setting
+     * required: (0,1) whether the setting is required or not
+     * description: brief description for what this setting is used for.
+     */
+    function addingRecordDefaultSettings(){
+
+        $settings = parent::addingRecordDefaultSettings();
+
+        for($i=0; $i< count($settings); $i++){
+
+            switch($settings[$i]["name"]){
+
+                case "reportTitle":
+                    $settings[$i]["defaultValue"] = "Work Order";
+
+            }//endswitch
+
+        }//end foreach
+
+        return $settings;
+
+    }//endfunction addingRecordDefaultSettings
+
+}//end class
+
+
+/**
+ * PROCESSING
+ * =============================================================================
+ */
 if(!isset($noOutput)){
 
-        $report = new workorderPDF($db, 'P', 'in', 'Letter');
-
-        $report->setupFromPrintScreen();
-        $report->generate();
-        $filename = 'Work_Order';
-        if($report->count === 1){
-                
-                if($report->invoicerecord["company"])
-                        $filename .= "_".$report->invoicerecord["company"];
-                
-                $filename .= "_".$report->invoicerecord["id"];
-                
-        }elseif((int)$report->count)
-                $filename .= "_Multiple";
-        
-        $filename .= ".pdf";
-        $report->output('screen', $filename);
+    //IE needs caching to be set to private in order to display PDFS
+    session_cache_limiter('private');
+
+    //set encoding to latin1 (fpdf doesnt like utf8)
+    $sqlEncoding = "latin1";
+    require_once("../../../include/session.php");
+
+    checkForReportArguments();
+
+    $report = new workorderPDF($db, $_GET["rid"], $_GET["tid"], 'P', 'in', 'Letter');
+
+    $report->setupFromPrintScreen();
+    $report->generate();
+
+    $filename = 'Work_Order';
+
+    if($report->count === 1){
+
+        if($report->invoicerecord["company"])
+            $filename .= "_".$report->invoicerecord["company"];
+
+        $filename .= "_".$report->invoicerecord["id"];
+
+    }elseif((int)$report->count)
+        $filename .= "_Multiple";
+
+    $filename .= ".pdf";
+
+    $report->output('screen', $filename);
 
 }//end if
 
+/**
+ * When adding a new report record, the add/edit needs to know what the class
+ * name is so that it can instantiate it, and grab it's default settings.
+ */
+if(isset($addingReportRecord))
+    $reportClass ="workorderPDF";
 ?>

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

@@ -38 +38 @@
 */
 
-        if(!class_exists("phpbmsReport"))
-                include("report/report_class.php");
-
-        class invoicePDF extends phpbmsReport{
-
-                var $title = "Invoice";
-                var $showShipNameInShipTo = true;
-                var $lineitemBoxHeight = 4.25;
-                
-                /**
-                  * $count
-                  * @var int The number of invoice records being displayed
-                  */
-                var $count;
-
-                function invoicePDF($db, $orientation='P', $unit='mm', $format='Letter'){
-
-                        $this->db = $db;
-
-                        if(!class_exists("phpbmsPDFReport"))
-                                include("report/pdfreport_class.php");
-
-                        $this->pdf = new phpbmsPDFReport($db, $orientation, $unit, $format);
-
-                        $this->initialize();
-
-                }//end method
-
-
-                function initialize(){
-                        //This function will set column headings, sizes and formatting
-
-                        $pdf = &$this->pdf;
-
-                        $topinfo = array();
-                        $topinfo[] = new pdfColumn("Order ID", "id", 0.75);
-                        $topinfo[] = new pdfColumn("Order Date", "orderdate", 1, "date");
-                        $topinfo[] = new pdfColumn("Client PO", "ponumber", 1);
-                        $topinfo[] = new pdfColumn("Processed By", "processedby", 0);
-                        $topinfo[] = new pdfColumn("Payment Method", "paymentname",2);
-
-                        $size = 0;
-                        foreach($topinfo as $column)
-                                $size += $column->size;
-
-                        $topinfo[3]->size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
-
-                        $this->topinfo = $topinfo;
-
-
-                        $lineitems = array();
-                        $lineitems[] = new pdfColumn("Product / (Part Number)", "parts", 0);
-                        $lineitems[] = new pdfColumn("Tax", "taxable", 0.5, "boolean", "C");
-                        $lineitems[] = new pdfColumn("Unit Price", "unitprice", 0.75, "currency", "R");
-                        $lineitems[] = new pdfColumn("Qty", "quantity", 0.5, "real","R");
-                        $lineitems[] = new pdfColumn("Extended", "extended", 0.75, "currency", "R");
-
-                        $size = 0;
-                        foreach($lineitems as $column)
-                                $size += $column->size;
-
-                        $lineitems[0]->size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
-
-                        $this->lineitems = $lineitems;
-
-                        $totalsinfo = array();
-                        $totalsinfo[] = new pdfColumn("Discount", "discountamount", 1, "currency", "R");
-                        $totalsinfo[] = new pdfColumn("Subtotal", "totaltni", 0, "currency", "R");
-                        $totalsinfo[] = new pdfColumn("Tax", "tax", 1, "currency", "R");
-                        $totalsinfo[] = new pdfColumn("Shipping", "shipping", 1, "currency", "R");
-                        $totalsinfo[] = new pdfColumn("Total", "totalti", 1, "currency", "R");
-                        $totalsinfo[] = new pdfColumn("Due", "amountdue", 1, "currency", "R");
-
-                        $this->totalsinfo = $totalsinfo;
-
-                }//end method
-
-
-                function generate($whereclause = NULL, $sortorder = "invoices.id"){
-
-                        $pdf = &$this->pdf;
-
-                        if($whereclause)
-                                $this->whereclause = $whereclause;
-                        elseif(!$this->whereclause)
-                                $this->whereclause = "invoices.id = -400";
-
-                        if($sortorder)
-                                $this->sortorder = $sortorder;
-                        elseif(!$this->sortorder)
-                                $this->sortorder = "invoices.id";
-
-                        $paymentFields = "";
-                        if(ENCRYPT_PAYMENT_FIELDS){
-
-                                $paymentFields = "
-                                        ".$this->db->decrypt("`ccnumber`")." AS `ccnumber`,
-                                        ".$this->db->decrypt("`ccverification`")." AS `ccverification`,
-                                        ".$this->db->decrypt("`ccexpiration`")." AS `ccexpiration`,
-                                        ".$this->db->decrypt("`routingnumber`")." AS `routingnumber`,
-                                        ".$this->db->decrypt("`accountnumber`")." AS `accountnumber`,
-                                ";
-
-                        }//end if
-
-                        $querystatement = "
-                                SELECT
-                                        invoices.*,
-                                        ".$paymentFields."
-
-                                        invoices.totalti - invoices.amountpaid AS amountdue,
-
-                                        clients.firstname,
-                                        clients.lastname,
-                                        clients.company,
-                                        clients.homephone,
-                                        clients.workphone,
-                                        clients.email,
-
-                                        shippingmethods.name AS shippingname,
-
-                                        paymentmethods.name AS paymentname,
-                                        paymentmethods.type AS paymenttype,
-
-                                        tax.name as taxname,
-
-                                        users.firstname AS processorfirst,
-                                        users.lastname AS processorlast
-
-                                FROM
-                                        invoices INNER JOIN clients ON invoices.clientid = clients.uuid
-                                        INNER JOIN users ON invoices.modifiedby = users.id
-                                        LEFT JOIN shippingmethods ON invoices.shippingmethodid = shippingmethods.uuid
-                                        LEFT JOIN paymentmethods ON invoices.paymentmethodid = paymentmethods.uuid
-                                        LEFT JOIN tax ON invoices.taxareaid = tax.uuid";
-
-                        $querystatement = $this->assembleSQL($querystatement);
-                        $queryresult = $this->db->query($querystatement);
-
-                        $this->count = $this->db->numRows($queryresult);
-                        if($this->count == 0){
-                                
-                                $this->_showNoRecords();
-                                exit;
-
-                        }//end if
-
-
-                        $pdf->hasComapnyHeader = true;
-                        $pdf->SetMargins();
-
-                        //iterate through each invoice record
-                        while($invoicerecord = $this->db->fetchArray($queryresult)){
-
-                                $this->page = 0;
-
-                                $this->invoicerecord = $invoicerecord;
-
-                                //adds top info
-                                $top = $this->_addPage();
-
-                                $this->_addLineItems($top);
-
-                                $pdf->SetXY($pdf->leftmargin, $top["y"] + $this->lineitemBoxHeight + 0.125);
-
-                                //Print any special/instructions and stuff
-                                $this->_addNotes();
-
-                                //totals
-                                $this->_addTotals();
-
-                                //payment details
-                                $this->_addPaymentDetails();
-
-                        }//end while;
-
-
-                }//end method
-
-
-                function _addPage(){
-
-                        $pdf = &$this->pdf;
-
-
-                        $pdf->AddPage();
-                        $this->page++;
-
-                        $nextY = $pdf->getY();
-
-                        //TITLE
-                        $title = "Statement";
-                        $titleWidth=2.375;
-                        $titleHeight=.25;
-                        $pdf->setStyle("title");
-                        $pdf->SetXY(-1*($titleWidth+$pdf->rightmargin), $pdf->topmargin);
-                        $pdf->Cell($titleWidth, $titleHeight,$this->title, $pdf->borderDebug,1,"R");
-
-                        $startY = $pdf->GetY() + 0.75;
-
-                        //page number?
-                        $pdf->setStyle("normal");
-                        $pageNoWidth = 1;
-                        $pdf->SetFontSize(8);
-                        $pdf->SetXY(-1*($pageNoWidth + $pdf->rightmargin), $pdf->topmargin + $titleHeight + 0.25);
-                        $pdf->Cell($pageNoWidth, 0.17, "page: ".$this->page, $pdf->borderDebug,1,"R");
-
-
-                        //SOLD TO
-                        $boxHeight = 1.75;
-                        $boxWidth = ($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin)/2 -0.0625;
-
-                        $pdf->setLineWidth(0.02);
-                        $pdf->Rect($pdf->leftmargin, $startY, $boxWidth, $boxHeight);
-                        $pdf->setLineWidth(0.01);
-
-                        $pdf->setStyle("header");
-                        $pdf->setY($startY);
-                        $pdf->Cell($boxWidth, 0.17, "SOLD TO", $pdf->borderDebug, 2, "L", 1);
-                        $pdf->setStyle("normal");
-
-                        //Company Name
-                        $companyDisplay = "";
-                        if($this->invoicerecord["company"]){
-                                $companyDisplay .= $this->invoicerecord["company"];
-                                if($this->invoicerecord["firstname"])
-                                        $companyDisplay .= " (".$this->invoicerecord["firstname"]." ".$this->invoicerecord["lastname"].")";
-                        } else
-                                $companyDisplay .= $this->invoicerecord["firstname"]." ".$this->invoicerecord["lastname"];
-
-                        $pdf->SetXY($pdf->GetX() + 0.0625, $pdf->GetY() + 0.0625);
-                        $pdf->SetFont("Arial", "B", 10);
-                        $pdf->Cell($boxWidth - 0.125, 0.17, $companyDisplay, $pdf->borderDebug, 2, "L");
-
-                        $billto = $this->_setBillTo();
-                        $pdf->SetFont("Arial", "", 10);
-                        $pdf->setXY($pdf->GetX(), $pdf->GetY() + 0.0625);
-                        $pdf->MultiCell($boxWidth - 0.125,.17,$billto, $pdf->borderDebug);
-
-                        //SHIP TO
-                        $pdf->setLineWidth(0.02);
-                        $pdf->Rect($pdf->leftmargin + $boxWidth + 0.125, $startY, $boxWidth, $boxHeight);
-                        $pdf->setLineWidth(0.01);
-
-                        $pdf->setStyle("header");
-                        $pdf->setXY($pdf->leftmargin + $boxWidth + 0.125, $startY);
-                        $pdf->Cell($boxWidth, 0.17, "SHIP TO", $pdf->borderDebug, 2, "L", 1);
-                        $pdf->setStyle("normal");
-
-                        $pdf->SetXY($pdf->GetX() + 0.0625, $pdf->GetY() + 0.0625);
-                        $pdf->SetFont("Arial", "B", 10);
-
-                        $shipDisplay = (!$this->invoicerecord["shiptosameasbilling"] && $this->invoicerecord["shiptoname"])? $this->invoicerecord["shiptoname"] :$companyDisplay;
-                        $pdf->Cell($boxWidth - 0.125, 0.17, $shipDisplay, $pdf->borderDebug, 2, "L");
-
-                        $shipto = $this->_setShipTo();
-                        $pdf->SetFont("Arial", "", 10);
-                        $pdf->setXY($pdf->GetX(), $pdf->GetY() + 0.0625);
-                        $pdf->MultiCell($boxWidth - 0.125,.17, $shipto, $pdf->borderDebug);
-
-                        $pdf->setXY($pdf->leftmargin, $startY + $boxHeight + 0.125);
-
-                        $this->_topInvoiceInfo();
-
-                        //line item headings
-                        $pdf->setStyle("header");
-                        $pdf->SetLineWidth(0.02);
-
-                        $coords["x"] = $pdf->GetX();
-                        $coords["y"] = $pdf->GetY();
-
-                        foreach($this->lineitems as $column)
-                                $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
-
-                        return $coords;
-
-                }//end method
-
-
-                function _setBillTo(){
-
-                        $billto = $this->invoicerecord["address1"];
-
-                        if($this->invoicerecord["address2"])
-                                $billto .= "\n".$this->invoicerecord["address2"];
-
-                        $billto .="\n".$this->invoicerecord["city"].", ".$this->invoicerecord["state"]." ".$this->invoicerecord["postalcode"];
-
-                        if($this->invoicerecord["country"])
-                                $billto .=" ".$this->invoicerecord["country"];
-
-                        $phoneemail = "";
-                        if($this->invoicerecord["workphone"] || $this->invoicerecord["homephone"]){
-
-                                if($this->invoicerecord["workphone"])
-                                        $phoneemail = $this->invoicerecord["workphone"]." (W)";
-                                else
-                                        $phoneemail = $this->invoicerecord["homephone"]." (H)";
-
-                                $phoneemail.="\n";
-
-                        }//end if
-
-                        if($this->invoicerecord["email"])
-                                $phoneemail .= $this->invoicerecord["email"];
-
-                        if($phoneemail)
-                                $billto .= "\n\n".$phoneemail;
-
-                        return $billto;
-
-                }//end method
-
-
-                function _setShipTo(){
-
-                        $added = ($this->invoicerecord["shiptosameasbilling"])? "" : "shipto";
-
-                        $shipto = "";
-
-                        $shipto .= $this->invoicerecord[$added."address1"];
-
-                        if($this->invoicerecord[$added."address2"])
-                                $shipto .= "\n".$this->invoicerecord[$added."address2"];
-
-                        $shipto .="\n".$this->invoicerecord[$added."city"].", ".$this->invoicerecord[$added."state"]." ".$this->invoicerecord[$added."postalcode"];
-
-                        if($this->invoicerecord[$added."country"])
-                                $shipto .=" ".$this->invoicerecord[$added."country"];
-
-                        if($this->showShipNameInShipTo)
-                                if($this->invoicerecord["shippingname"])
-                                        $shipto .="\n\nShipping Method:\n".$this->invoicerecord["shippingname"];
-
-                        return $shipto;
-
-                }//end method
-
-
-                function _topInvoiceInfo(){
-
-                        $pdf = &$this->pdf;
-
-                        $pdf->setStyle("header");
-                        $pdf->SetLineWidth(0.02);
-
-                        foreach($this->topinfo as $column)
-                                $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
-
-                        $pdf->Rect($pdf->leftmargin, $pdf->GetY(), ($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin), 0.39);
-
-                        $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + .2);
-
-
-                        $this->invoicerecord["processedby"] = $this->invoicerecord["processorfirst"]." ".$this->invoicerecord["processorlast"];
-                        $pdf->setStyle("normal");
-
-                        foreach($this->topinfo as $column){
-
-                                if($column->format != "")
-                                        $value = formatVariable($this->invoicerecord[$column->fieldname], $column->format);
-                                else
-                                        $value = $this->invoicerecord[$column->fieldname];
-
-                                $pdf->Cell($column->size, 0.18, $value, $pdf->borderDebug, 0, $column->align);
-
-                        }//end foreach
-
-                        $pdf->SetY($pdf->GetY() + 0.18 + 0.125);
-
-                }//end method
-
-
-                function _addLineItems($coords){
-
-                        $pdf = &$this->pdf;
-
-                        $lineitemresult = $this->_getLineItems();
-
-                        $pdf->setStyle("normal");
-
-                        $pdf->SetY($pdf->GetY() + 0.18 + 0.0625);
-
-                        while($line = $this->db->fetchArray($lineitemresult)){
-
-
-                        if($line["partname"] || $line["partnumber"] || $line["extended"]){
-
-                                if($pdf->GetY() + 0.17*3 > $coords["y"] + $this->lineitemBoxHeight){
-
-                                        $pdf->SetLineWidth(0.02);
-                                        $pdf->Rect($coords["x"], $coords["y"], $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $this->lineitemBoxHeight);
-                                        $pdf->SetLineWidth(0.01);
-
-                                        $this->_addPage();
-
-                                        $pdf->setStyle("normal");
-
-                                        $pdf->SetY($pdf->GetY() + 0.18 + 0.0625);
-
-                                }//end if
-
-                                foreach($this->lineitems as $column){
-
-                                        $ln = 0;
-
-
-                                        switch($column->fieldname){
-
-                                                case "parts":
-                                                        $pdf->SetFont("Arial", "B", 8);
-                                                        $pdf->Write(0.17, $line["partname"]);
-                                                        $pdf->setStyle("normal");
-                                                        $pdf->SetX($pdf->leftmargin + $column->size);
-                                                        break;
-
-                                                default:
-                                                        if($column->format != "")
-                                                                $value = formatVariable($line[$column->fieldname], $column->format);
-                                                        else
-                                                                $value = $line[$column->fieldname];
-
-                                                        if($value == "·")
-                                                                $value = " ";
-                                                        if($column->fieldname == $this->lineitems[count($this->lineitems)-1]->fieldname)
-                                                                $ln = 2;
-
-                                                        $pdf->Cell($column->size, 0.17, $value, $pdf->borderDebug, $ln, $column->align);
-                                                        break;
-
-                                        }//end switch
-
-                                }//end foreach
-
-                                $pdf->SetX($pdf->leftmargin);
-                                $pdf->Write(0.17, "(".$line["partnumber"].")");
-                                $pdf->Ln();
-
-                                }//endif
-
-                                if($line["memo"]){
-
-                                        $pdf->SetX($pdf->leftmargin + 0.0625);
-                                        $pdf->SetFont("Arial", "I", 8);
-                                        $pdf->MultiCell($this->lineitems[0]->size - 0.0625, 0.16, $line["memo"], $pdf->borderDebug);
-                                        $pdf->setStyle("normal");
-
-                                }//end if
-
-                                $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + 0.0625);
-                                $pdf->SetLineWidth(0.01);
-                                $pdf->SetDrawColor(180,180,180);
-                                $pdf->Line($pdf->leftmargin, $pdf->GetY(), $pdf->paperwidth - $pdf->rightmargin, $pdf->GetY());
-                                $pdf->SetDrawColor(0,0,0);
-                                $pdf->SetLineWidth(0.02);
-                                $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + 0.0625);
-
-                        }//end while
-
-                        $pdf->SetLineWidth(0.02);
-                        $pdf->Rect($coords["x"], $coords["y"], $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $this->lineitemBoxHeight);
-
-                }//end method
-
-
-                function _getLineItems(){
-
-                        $querystatement = "
-                        SELECT
-                                lineitems.*,
-                                lineitems.quantity * lineitems.unitprice AS extended,
-                                products.partname,
-                                products.partnumber
-                        FROM
-                                lineitems LEFT JOIN products ON lineitems.productid = products.uuid
-                        WHERE
-                                lineitems.invoiceid ='".((int) $this->invoicerecord["id"])."'
-                        ORDER BY
-                                displayorder";
-
-                        $queryresult = $this->db->query($querystatement);
-
-                        return $queryresult;
-
-                }//end method
-
-
-                function _addNotes(){
-
-                        $pdf = &$this->pdf;
-
-                        $height = 1;
-                        $nextPos = $pdf->GetY() + $height + 0.125;
-
-                        $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
-                        $pdf->setStyle("header");
-                        $pdf->Cell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, 0.18, "Notes/Instructions", 1, 2, "L", 1);
-
-                        $pdf->setStyle("normal");
-                        $pdf->SetXY($pdf->GetX() + .06125, $pdf->GetY() + .06125);
-                        $pdf->MultiCell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - 0.125, 0.18, $this->invoicerecord["printedinstructions"]);
-
-                        $pdf->SetXY($pdf->leftmargin, $nextPos);
-
-                }//end method
-
-
-                function _addTotals(){
-
-                        $pdf = &$this->pdf;
-
-                        $size = 0;
-                        foreach($this->totalsinfo as $column)
-                                switch($column->fieldname){
-                                        case "shipping":
-                                        case "discountamount":
-                                                if($this->invoicerecord[$column->fieldname])
-                                                        $size += $column->size;
-                                                break;
-                                        default:
-                                                $size += $column->size;
-                                }//endswitch
-                        $this->totalsinfo[1]->size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
-
-                        $height = .5;
-                        $nextPos = $pdf->GetY() + $height + 0.125;
-
-                        $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
-
-                        $pdf->setStyle("header");
-                        foreach($this->totalsinfo as $column)
-                                switch($column->fieldname){
-                                        case "shipping":
-                                        case "discountamount":
-                                                if($this->invoicerecord[$column->fieldname])
-                                                        $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
-                                                break;
-                                        default:
-                                                $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
-                                }//endswitch
-
-                        $pdf->setStyle("normal");
-                        $pdf->SetFont("Arial", "B", 10);
-                        $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + 0.18 + 0.0625);
-
-                        foreach($this->totalsinfo as $column){
-
-                                if($column->format != "")
-                                        $value = formatVariable($this->invoicerecord[$column->fieldname], $column->format);
-                                else
-                                        $value = $this->invoicerecord[$column->fieldname];
-
-                                switch($column->fieldname){
-                                        case "shipping":
-                                        case "discountamount":
-                                                if($this->invoicerecord[$column->fieldname])
-                                                        $pdf->Cell($column->size, 0.18, $value, $pdf->borderDebug, 0, $column->align);
-                                                break;
-                                        default:
-                                                $pdf->Cell($column->size, 0.18, $value, $pdf->borderDebug, 0, $column->align);
-                                }//endswitch
-                        }//end foreach
-                        $this->totalsinfo[1]->size = 0;
-
-                        $pdf->SetXY($pdf->leftmargin, $nextPos);
-
-                }//end method
-
-
-                function _addPaymentDetails(){
-                }//end method
-
-
-                function output($destination = "screen" , $userinfo = NULL){
-
-                        switch($destination){
-
-                                case "screen":
-                                        $userinfo = cleanFilename((string)$userinfo);
-                                        $this->pdf->Output($userinfo, 'D');
-                                        break;
-
-                                case "email":
-
-                                        if(!$userinfo)
-                                                $userinfo = $_SESSION["userinfo"];
-
-                                        if(!$userinfo["email"] || !$this->invoicerecord["email"])
-                                                return false;
-
-                                        $pdf = $this->pdf->Output(NULL, "S");
-
-                                        $to =           $this->invoicerecord["email"];
-                                        $from =         $userinfo["email"];
-                                        $subject =      "Your ".$this->title." from ".COMPANY_NAME;
-                                        $message =      "Attached is your ".$this->title." from ".COMPANY_NAME."\n\n" .
-                                                                "The attachment requires Adobe Acrobat Reader to view. \n If you do not " .
-                                                                "have Acrobat Reader, you can download it at http://www.adobe.com  \n\n" .
-                                                                COMPANY_NAME."\n".
-                                                                COMPANY_ADDRESS."\n".COMPANY_CSZ."\n".COMPANY_PHONE;
-
-                                        $headers = "From: $from";
-
-                                        $semi_rand = md5( time() );
-                                        $mime_boundary = "==Multipart_Boundary_x{$semi_rand}x";
-
-                                        $headers .= "\nMIME-Version: 1.0\n" .
-                                                                "Content-Type: multipart/mixed;\n" .
-                                                                " boundary=\"{$mime_boundary}\"";
-
-                                        $message = "This is a multi-part message in MIME format.\n\n" .
-                                                        "--{$mime_boundary}\n" .
-                                                        "Content-Type: text/plain; charset=\"iso-8859-1\"\n" .
-                                                        "Content-Transfer-Encoding: 7bit\n\n" .
-                                                        $message . "\n\n";
-
-                                        $pdf = chunk_split( base64_encode( $pdf ) );
-
-                                        $message .= "--{$mime_boundary}\n" .
-                                                         "Content-Type: {application/pdf};\n" .
-                                                         " name=\"".$this->title.$this->invoicerecord["id"].".pdf\"\n" .
-                                                         "Content-Disposition: attachment;\n" .
-                                                         " filename=\"".$this->title.$this->invoicerecord["id"].".pdf\"\n" .
-                                                         "Content-Transfer-Encoding: base64\n\n" .
-                                                         $pdf . "\n\n" .
-                                                         "--{$mime_boundary}--\n";
-
-                                        return @ mail($to, $subject, $message, $headers);
-
-                                        break;
-
-                        }//endswitch
-
-                }//end method
-
-        }//end class
+if(!class_exists("phpbmsReport"))
+    include("../../../report/report_class.php");
+
+class invoicePDF extends phpbmsReport{
+
+    var $showShipNameInShipTo = true;
+    var $lineitemBoxHeight = 4.25;
+    var $templateUUID = NULL;
+
+    /**
+      * $count
+      * @var int The number of invoice records being displayed
+      */
+    var $count;
+
+
+    function invoicePDF($db, $reportUUID, $tabledefUUID, $orientation='P', $unit='mm', $format='Letter'){
+
+        parent::phpbmsReport($db, $reportUUID, $tabledefUUID);
+
+        if(!class_exists("phpbmsPDFReport"))
+            include("report/pdfreport_class.php");
+
+        $this->pdf = new phpbmsPDFReport($db, $orientation, $unit, $format);
+
+        $this->checkForDefaultSettings();
+        $this->initialize();
+
+    }//end method
+
+
+    /**
+     * function checkForDefaultSettings
+     *
+     * Checks to make sure loaded report Settings exist and are correct
+     */
+    function checkForDefaultSettings(){
+
+        if(!isset($this->settings["reportTitle"]))
+            $this->settings["reportTitle"] = "Invoice";
+
+        if(!isset($this->settings["printLogo"]))
+            $this->settings["printLogo"] = 1;
+
+        if(!isset($this->settings["printCompanyInfo"]))
+            $this->settings["printCompanyInfo"] = 1;
+
+        if(!isset($this->settings["leftTopBox"]))
+            $this->settings["leftTopBox"] = "billto";
+
+        if(!isset($this->settings["leftTopBoxTitle"]))
+            $this->settings["leftTopBoxTitle"] = "SOLD TO";
+
+        if(!isset($this->settings["rightTopBox"]))
+            $this->settings["rightTopBox"] = "shipto";
+
+        if(!isset($this->settings["rightTopBoxTitle"]))
+            $this->settings["rightTopBoxTitle"] = "SHIP TO";
+
+        if(!isset($this->settings["templateFormatting"]))
+            $this->settings["templateFormatting"] = 0;
+
+        if(!isset($this->settings["templateUUID"]))
+            $this->settings["templateUUID"] = "";
+
+    }//end function checkForDefaultSettings
+
+
+    function initialize(){
+            //This function will set column headings, sizes and formatting
+
+            $pdf = &$this->pdf;
+
+            $topinfo = array();
+            $topinfo[] = new pdfColumn("Order ID", "id", 0.75);
+            $topinfo[] = new pdfColumn("Order Date", "orderdate", 1, "date");
+            $topinfo[] = new pdfColumn("Client PO", "ponumber", 1);
+            $topinfo[] = new pdfColumn("Processed By", "processedby", 0);
+            $topinfo[] = new pdfColumn("Payment Method", "paymentname",2);
+
+            $size = 0;
+            foreach($topinfo as $column)
+                    $size += $column->size;
+
+            $topinfo[3]->size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
+
+            $this->topinfo = $topinfo;
+
+
+            $lineitems = array();
+            $lineitems[] = new pdfColumn("Product / (Part Number)", "parts", 0);
+            $lineitems[] = new pdfColumn("Tax", "taxable", 0.5, "boolean", "C");
+            $lineitems[] = new pdfColumn("Unit Price", "unitprice", 0.75, "currency", "R");
+            $lineitems[] = new pdfColumn("Qty", "quantity", 0.5, "real","R");
+            $lineitems[] = new pdfColumn("Extended", "extended", 0.75, "currency", "R");
+
+            $size = 0;
+            foreach($lineitems as $column)
+                    $size += $column->size;
+
+            $lineitems[0]->size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
+
+            $this->lineitems = $lineitems;
+
+            $totalsinfo = array();
+            $totalsinfo[] = new pdfColumn("Discount", "discountamount", 1, "currency", "R");
+            $totalsinfo[] = new pdfColumn("Subtotal", "totaltni", 0, "currency", "R");
+            $totalsinfo[] = new pdfColumn("Tax", "tax", 1, "currency", "R");
+            $totalsinfo[] = new pdfColumn("Shipping", "shipping", 1, "currency", "R");
+            $totalsinfo[] = new pdfColumn("Total", "totalti", 1, "currency", "R");
+            $totalsinfo[] = new pdfColumn("Due", "amountdue", 1, "currency", "R");
+
+            $this->totalsinfo = $totalsinfo;
+
+    }//end method
+
+
+    function generate($whereclause = NULL, $sortorder = "invoices.id"){
+
+            $pdf = &$this->pdf;
+
+            if($whereclause)
+                    $this->whereClause = $whereclause;
+            elseif(!$this->whereClause)
+                    $this->whereClause = "invoices.id = -400";
+
+            if($sortorder)
+                    $this->sortOrder = $sortorder;
+            elseif(!$this->sortOrder)
+                    $this->sortOrder = "invoices.id";
+
+            $paymentFields = "";
+            if(ENCRYPT_PAYMENT_FIELDS){
+
+                    $paymentFields = "
+                            ".$this->db->decrypt("`ccnumber`")." AS `ccnumber`,
+                            ".$this->db->decrypt("`ccverification`")." AS `ccverification`,
+                            ".$this->db->decrypt("`ccexpiration`")." AS `ccexpiration`,
+                            ".$this->db->decrypt("`routingnumber`")." AS `routingnumber`,
+                            ".$this->db->decrypt("`accountnumber`")." AS `accountnumber`,
+                    ";
+
+            }//end if
+
+            $querystatement = "
+                    SELECT
+                            invoices.*,
+                            ".$paymentFields."
+
+                            invoices.totalti - invoices.amountpaid AS amountdue,
+
+                            clients.firstname,
+                            clients.lastname,
+                            clients.company,
+                            clients.homephone,
+                            clients.workphone,
+                            clients.email,
+
+                            shippingmethods.name AS shippingname,
+
+                            paymentmethods.name AS paymentname,
+                            paymentmethods.type AS paymenttype,
+
+                            tax.name as taxname,
+
+                            users.firstname AS processorfirst,
+                            users.lastname AS processorlast
+
+                    FROM
+                            invoices INNER JOIN clients ON invoices.clientid = clients.uuid
+                            INNER JOIN users ON invoices.modifiedby = users.id
+                            LEFT JOIN shippingmethods ON invoices.shippingmethodid = shippingmethods.uuid
+                            LEFT JOIN paymentmethods ON invoices.paymentmethodid = paymentmethods.uuid
+                            LEFT JOIN tax ON invoices.taxareaid = tax.uuid";
+
+            $querystatement = $this->assembleSQL($querystatement);
+
+            $queryresult = $this->db->query($querystatement);
+
+            $this->count = $this->db->numRows($queryresult);
+            if($this->count == 0){
+
+                    $this->showNoRecords();
+                    exit;
+
+            }//end if
+
+            $pdf->logoInHeader = $this->settings["printLogo"];
+            $pdf->companyInfoInHeader = $this->settings["printCompanyInfo"];
+
+            $pdf->SetMargins();
+
+            //iterate through each invoice record
+            while($invoicerecord = $this->db->fetchArray($queryresult)){
+
+                    $this->page = 0;
+
+                    $this->invoicerecord = $invoicerecord;
+
+                    //adds top info
+                    $top = $this->_addPage();
+
+                    $this->_addLineItems($top);
+
+                    $pdf->SetXY($pdf->leftmargin, $top["y"] + $this->lineitemBoxHeight + 0.125);
+
+                    //Print any special/instructions and stuff
+                    $this->_addNotes();
+
+                    //totals
+                    $this->_addTotals();
+
+                    //payment details
+                    $this->_addPaymentDetails();
+
+            }//end while;
+
+
+    }//end method
+
+
+    function _addPage(){
+
+            $pdf = &$this->pdf;
+
+            $pdf->AddPage();
+
+            if($this->settings["templateUUID"]){
+
+                if(!isset($GLOBALS["pdfDoc"])){
+
+                    $querystatement = "
+                        SELECT
+                            `file`
+                        FROM
+                            `files`
+                        WHERE
+                            `uuid` = '".$this->settings["templateUUID"]."'";
+
+                    $queryresult = $this->db->query($querystatement);
+
+                    $therecord = $this->db->fetchArray($queryresult);
+
+                    $GLOBALS["pdfDoc"] = $therecord["file"];
+                    $pdf->setSourceFile("global://pdfDoc");
+                    $this->tplIdx = $pdf->importPage(1);
+
+                }//endif
+
+                $pdf->useTemplate($this->tplIdx);
+
+            }//endif
+
+
+            $this->page++;
+
+            $nextY = $pdf->getY();
+
+            //TITLE
+            $title = "Statement";
+            $titleWidth=2.375;
+            $titleHeight=.25;
+            $pdf->setStyle("title");
+            $pdf->SetXY(-1*($titleWidth+$pdf->rightmargin), $pdf->topmargin);
+            $pdf->Cell($titleWidth, $titleHeight, $this->settings["reportTitle"], $pdf->borderDebug,1,"R");
+
+            $startY = $pdf->GetY() + 0.75;
+
+            //page number?
+            $pdf->setStyle("normal");
+            $pageNoWidth = 1;
+            $pdf->SetFontSize(8);
+            $pdf->SetXY(-1*($pageNoWidth + $pdf->rightmargin), $pdf->topmargin + $titleHeight + 0.25);
+            $pdf->Cell($pageNoWidth, 0.17, "page: ".$this->page, $pdf->borderDebug,1,"R");
+
+            $boxHeight = 1.75;
+            $boxWidth = ($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin)/2 -0.0625;
+
+            //Left Top Box
+            $this->_addTopBox($this->settings["leftTopBox"], $this->settings["leftTopBoxTitle"], $pdf->leftmargin, $startY, $boxWidth, $boxHeight);
+
+            //Right Top Box
+            $this->_addTopBox($this->settings["rightTopBox"], $this->settings["rightTopBoxTitle"], $pdf->leftmargin + $boxWidth + 0.125, $startY, $boxWidth, $boxHeight);
+
+            $pdf->setXY($pdf->leftmargin, $startY + $boxHeight + 0.125);
+
+            $this->_topInvoiceInfo();
+
+
+            $coords["x"] = $pdf->GetX();
+            $coords["y"] = $pdf->GetY();
+
+            if(!$this->settings["templateFormatting"]){
+
+                //line item headings
+                $pdf->setStyle("header");
+                $pdf->SetLineWidth(0.02);
+
+                foreach($this->lineitems as $column)
+                    $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
+
+            }//endif
+
+            return $coords;
+
+    }//end method
+
+
+    function _addTopBox($areaToPrint, $title, $x, $y, $boxWidth, $boxHeight){
+
+        if($areaToPrint != "noshow"){
+
+            $pdf = &$this->pdf;
+
+            if(!$this->settings["templateFormatting"]){
+
+                $pdf->setLineWidth(0.02);
+                $pdf->Rect($x, $y, $boxWidth, $boxHeight);
+                $pdf->setLineWidth(0.01);
+
+                $pdf->setStyle("header");
+                $pdf->setXY($x, $y);
+                $pdf->Cell($boxWidth, 0.17, $title, $pdf->borderDebug, 2, "L", 1);
+                $pdf->setStyle("normal");
+
+            } else
+                $pdf->SetXY($x ,$y + 0.17);
+
+            $pdf->setXY($pdf->GetX(), $pdf->GetY() + 0.0625);
+
+            switch($areaToPrint){
+
+                case "billto":
+
+                    $companyDisplay = "";
+                    if($this->invoicerecord["company"]){
+
+                            $companyDisplay .= $this->invoicerecord["company"];
+                            if($this->invoicerecord["firstname"])
+                                    $companyDisplay .= " (".$this->invoicerecord["firstname"]." ".$this->invoicerecord["lastname"].")";
+
+                    } else
+                            $companyDisplay .= $this->invoicerecord["firstname"]." ".$this->invoicerecord["lastname"];
+
+                    $pdf->SetXY($pdf->GetX() + 0.0625, $pdf->GetY() + 0.0625);
+                    $pdf->SetFont("Arial", "B", 10);
+                    $pdf->Cell($boxWidth - 0.125, 0.17, $companyDisplay, $pdf->borderDebug, 2, "L");
+
+                    $billto = $this->_setBillTo();
+                    $pdf->SetFont("Arial", "", 10);
+                    $pdf->setXY($pdf->GetX(), $pdf->GetY() + 0.0625);
+                    $pdf->MultiCell($boxWidth - 0.125,.17,$billto, $pdf->borderDebug);
+                    break;
+
+                case "shipto":
+
+                    $pdf->SetXY($pdf->GetX() + 0.0625, $pdf->GetY() + 0.0625);
+                    $pdf->SetFont("Arial", "B", 10);
+
+                    $shipDisplay = (!$this->invoicerecord["shiptosameasbilling"] && $this->invoicerecord["shiptoname"])? $this->invoicerecord["shiptoname"] :$companyDisplay;
+                    $pdf->Cell($boxWidth - 0.125, 0.17, $shipDisplay, $pdf->borderDebug, 2, "L");
+
+                    $shipto = $this->_setShipTo();
+                    $pdf->SetFont("Arial", "", 10);
+                    $pdf->setXY($pdf->GetX(), $pdf->GetY() + 0.0625);
+                    $pdf->MultiCell($boxWidth - 0.125,.17, $shipto, $pdf->borderDebug);
+                    break;
+
+                case "companyinfo":
+
+                    $cname = COMPANY_NAME;
+                    $caddress = COMPANY_ADDRESS."\n".COMPANY_CSZ."\n".COMPANY_PHONE;
+
+                    $pdf->SetXY($pdf->GetX() + 0.0625, $pdf->GetY() + 0.0625);
+                    $pdf->SetFont("Arial","B",10);
+                    $pdf->Cell($boxWidth - 0.125, 0.17, $cname, $pdf->borderDebug, 2, "L");
+
+                    //and last, company address
+                    $pdf->setXY($pdf->GetX(), $pdf->GetY() + 0.0625);
+                    $pdf->SetFont("Arial", "", 10);
+                    $pdf->MultiCell($boxWidth - 0.125,.17 , $caddress, $pdf->borderDebug);
+                    break;
+
+                case "invoiceinfo":
+
+                    $pdf->SetXY($pdf->GetX() + 0.0625, $pdf->GetY() + 0.0625);
+                    $pdf->SetFont("Arial","B",14);
+                    $pdf->Cell($boxWidth - 0.125, 0.25, $this->invoicerecord["id"], $pdf->borderDebug, 2, "R");
+
+
+                    $details = "payment method\n".$this->invoicerecord["paymentname"];
+                    $pdf->setXY($pdf->GetX(), $pdf->GetY() + 0.125);
+                    $pdf->SetFont("Arial", "", 8);
+                    $pdf->MultiCell($boxWidth - 0.125,.17, $details, $pdf->borderDebug, "R");
+
+                    break;
+
+            }//endswitch
+
+        }//endif
+
+    }//end function _addTopBox
+
+
+    function _setBillTo(){
+
+            $billto = $this->invoicerecord["address1"];
+
+            if($this->invoicerecord["address2"])
+                    $billto .= "\n".$this->invoicerecord["address2"];
+
+            $billto .="\n".$this->invoicerecord["city"].", ".$this->invoicerecord["state"]." ".$this->invoicerecord["postalcode"];
+
+            if($this->invoicerecord["country"])
+                    $billto .=" ".$this->invoicerecord["country"];
+
+            $phoneemail = "";
+            if($this->invoicerecord["workphone"] || $this->invoicerecord["homephone"]){
+
+                    if($this->invoicerecord["workphone"])
+                            $phoneemail = $this->invoicerecord["workphone"]." (W)";
+                    else
+                            $phoneemail = $this->invoicerecord["homephone"]." (H)";
+
+                    $phoneemail.="\n";
+
+            }//end if
+
+            if($this->invoicerecord["email"])
+                    $phoneemail .= $this->invoicerecord["email"];
+
+            if($phoneemail)
+                    $billto .= "\n\n".$phoneemail;
+
+            return $billto;
+
+    }//end method
+
+
+    function _setShipTo(){
+
+            $added = ($this->invoicerecord["shiptosameasbilling"])? "" : "shipto";
+
+            $shipto = "";
+
+            $shipto .= $this->invoicerecord[$added."address1"];
+
+            if($this->invoicerecord[$added."address2"])
+                    $shipto .= "\n".$this->invoicerecord[$added."address2"];
+
+            $shipto .="\n".$this->invoicerecord[$added."city"].", ".$this->invoicerecord[$added."state"]." ".$this->invoicerecord[$added."postalcode"];
+
+            if($this->invoicerecord[$added."country"])
+                    $shipto .=" ".$this->invoicerecord[$added."country"];
+
+            if($this->showShipNameInShipTo)
+                    if($this->invoicerecord["shippingname"])
+                            $shipto .="\n\nShipping Method:\n".$this->invoicerecord["shippingname"];
+
+            return $shipto;
+
+    }//end method
+
+
+    function _topInvoiceInfo(){
+
+            $pdf = &$this->pdf;
+
+            if(!$this->settings["templateFormatting"]){
+
+                $pdf->setStyle("header");
+                $pdf->SetLineWidth(0.02);
+
+                foreach($this->topinfo as $column)
+                        $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
+
+                $pdf->Rect($pdf->leftmargin, $pdf->GetY(), ($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin), 0.39);
+
+            }//endif
+
+            $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + .2);
+
+
+            $this->invoicerecord["processedby"] = $this->invoicerecord["processorfirst"]." ".$this->invoicerecord["processorlast"];
+            $pdf->setStyle("normal");
+
+            foreach($this->topinfo as $column){
+
+                    if($column->format != "")
+                            $value = formatVariable($this->invoicerecord[$column->fieldname], $column->format);
+                    else
+                            $value = $this->invoicerecord[$column->fieldname];
+
+                    $pdf->Cell($column->size, 0.18, $value, $pdf->borderDebug, 0, $column->align);
+
+            }//end foreach
+
+            $pdf->SetY($pdf->GetY() + 0.18 + 0.125);
+
+    }//end method
+
+
+    function _addLineItems($coords){
+
+            $pdf = &$this->pdf;
+
+            $lineitemresult = $this->_getLineItems();
+
+            $pdf->setStyle("normal");
+
+            $pdf->SetY($pdf->GetY() + 0.18 + 0.0625);
+
+            while($line = $this->db->fetchArray($lineitemresult)){
+
+
+                if($line["partname"] || $line["partnumber"] || $line["extended"]){
+
+                    if($pdf->GetY() + 0.17*3 > $coords["y"] + $this->lineitemBoxHeight){
+
+                        if(!$this->settings["templateFormatting"]){
+
+                            $pdf->SetLineWidth(0.02);
+                            $pdf->Rect($coords["x"], $coords["y"], $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $this->lineitemBoxHeight);
+                            $pdf->SetLineWidth(0.01);
+
+                        }//endif
+
+                        $this->_addPage();
+
+                        $pdf->setStyle("normal");
+
+                        $pdf->SetY($pdf->GetY() + 0.18 + 0.0625);
+
+                    }//end if
+
+                    foreach($this->lineitems as $column){
+
+                            $ln = 0;
+
+
+                            switch($column->fieldname){
+
+                                    case "parts":
+                                            $pdf->SetFont("Arial", "B", 8);
+                                            $pdf->Write(0.17, $line["partname"]);
+                                            $pdf->setStyle("normal");
+                                            $pdf->SetX($pdf->leftmargin + $column->size);
+                                            break;
+
+                                    default:
+                                            if($column->format != "")
+                                                    $value = formatVariable($line[$column->fieldname], $column->format);
+                                            else
+                                                    $value = $line[$column->fieldname];
+
+                                            if($value == "·")
+                                                    $value = " ";
+                                            if($column->fieldname == $this->lineitems[count($this->lineitems)-1]->fieldname)
+                                                    $ln = 2;
+
+                                            $pdf->Cell($column->size, 0.17, $value, $pdf->borderDebug, $ln, $column->align);
+                                            break;
+
+                            }//end switch
+
+                    }//end foreach
+
+                    $pdf->SetX($pdf->leftmargin);
+                    $pdf->Write(0.17, "(".$line["partnumber"].")");
+                    $pdf->Ln();
+
+                }//endif
+
+                if($line["memo"]){
+
+                    $pdf->SetX($pdf->leftmargin + 0.0625);
+                    $pdf->SetFont("Arial", "I", 8);
+                    $pdf->MultiCell($this->lineitems[0]->size - 0.0625, 0.16, $line["memo"], $pdf->borderDebug);
+                    $pdf->setStyle("normal");
+
+                }//end if
+
+                if(!$this->settings["templateFormatting"]){
+
+                    $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + 0.0625);
+                    $pdf->SetLineWidth(0.01);
+                    $pdf->SetDrawColor(180,180,180);
+                    $pdf->Line($pdf->leftmargin, $pdf->GetY(), $pdf->paperwidth - $pdf->rightmargin, $pdf->GetY());
+                    $pdf->SetDrawColor(0,0,0);
+                    $pdf->SetLineWidth(0.02);
+
+                }//endif
+
+                $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + 0.0625);
+
+            }//end while
+
+            if(!$this->settings["templateFormatting"]){
+
+                $pdf->SetLineWidth(0.02);
+                $pdf->Rect($coords["x"], $coords["y"], $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $this->lineitemBoxHeight);
+                $pdf->SetLineWidth(0.01);
+
+            }//endif
+
+    }//end method
+
+
+    function _getLineItems(){
+
+            $querystatement = "
+            SELECT
+                    lineitems.*,
+                    lineitems.quantity * lineitems.unitprice AS extended,
+                    products.partname,
+                    products.partnumber
+            FROM
+                    lineitems LEFT JOIN products ON lineitems.productid = products.uuid
+            WHERE
+                    lineitems.invoiceid ='".((int) $this->invoicerecord["id"])."'
+            ORDER BY
+                    displayorder";
+
+            $queryresult = $this->db->query($querystatement);
+
+            return $queryresult;
+
+    }//end method
+
+
+    function _addNotes(){
+
+            $pdf = &$this->pdf;
+
+            $height = 1;
+            $nextPos = $pdf->GetY() + $height + 0.125;
+
+            if(!$this->settings["templateFormatting"]){
+
+                $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
+                $pdf->setStyle("header");
+                $pdf->Cell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, 0.18, "Notes/Instructions", 1, 2, "L", 1);
+                $pdf->setStyle("normal");
+
+            } else
+                $pdf->SetY($pdf->GetY() + 0.18);
+
+            $pdf->SetXY($pdf->GetX() + .06125, $pdf->GetY() + .06125);
+            $pdf->MultiCell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - 0.125, 0.18, $this->invoicerecord["printedinstructions"]);
+
+            $pdf->SetXY($pdf->leftmargin, $nextPos);
+
+    }//end method
+
+
+    function _addTotals(){
+
+            $pdf = &$this->pdf;
+
+            $size = 0;
+            foreach($this->totalsinfo as $column)
+                    switch($column->fieldname){
+                            case "shipping":
+                            case "discountamount":
+                                    if($this->invoicerecord[$column->fieldname])
+                                            $size += $column->size;
+                                    break;
+                            default:
+                                    $size += $column->size;
+                    }//endswitch
+            $this->totalsinfo[1]->size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
+
+            $height = .5;
+            $nextPos = $pdf->GetY() + $height + 0.125;
+
+            if(!$this->settings["templateFormatting"]){
+
+                $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
+
+                $pdf->setStyle("header");
+                foreach($this->totalsinfo as $column)
+                    switch($column->fieldname){
+
+                        case "shipping":
+                        case "discountamount":
+                            if($this->invoicerecord[$column->fieldname])
+                                $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
+                            break;
+
+                        default:
+                            $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
+
+                    }//endswitch
+
+            }//endif
+
+            $pdf->setStyle("normal");
+            $pdf->SetFont("Arial", "B", 10);
+            $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + 0.18 + 0.0625);
+
+            foreach($this->totalsinfo as $column){
+
+                    if($column->format != "")
+                            $value = formatVariable($this->invoicerecord[$column->fieldname], $column->format);
+                    else
+                            $value = $this->invoicerecord[$column->fieldname];
+
+                    switch($column->fieldname){
+                            case "shipping":
+                            case "discountamount":
+                                    if($this->invoicerecord[$column->fieldname])
+                                            $pdf->Cell($column->size, 0.18, $value, $pdf->borderDebug, 0, $column->align);
+                                    break;
+                            default:
+                                    $pdf->Cell($column->size, 0.18, $value, $pdf->borderDebug, 0, $column->align);
+                    }//endswitch
+            }//end foreach
+            $this->totalsinfo[1]->size = 0;
+
+            $pdf->SetXY($pdf->leftmargin, $nextPos);
+
+    }//end method
+
+
+    function _addPaymentDetails(){
+    }//end method
+
+
+    function output($destination = "screen" , $userinfo = NULL){
+
+            switch($destination){
+
+                    case "screen":
+                            $userinfo = cleanFilename((string)$userinfo);
+                            $this->pdf->Output($userinfo, 'D');
+                            break;
+
+                    case "email":
+
+                            if(!$userinfo)
+                                    $userinfo = $_SESSION["userinfo"];
+
+                            if(!$userinfo["email"] || !$this->invoicerecord["email"])
+                                    return false;
+
+                            $pdf = $this->pdf->Output(NULL, "S");
+
+                            $to =               $this->invoicerecord["email"];
+                            $from =     $userinfo["email"];
+                            $subject =  "Your ".$this->title." from ".COMPANY_NAME;
+                            $message =  "Attached is your ".$this->title." from ".COMPANY_NAME."\n\n" .
+                                                    "The attachment requires Adobe Acrobat Reader to view. \n If you do not " .
+                                                    "have Acrobat Reader, you can download it at http://www.adobe.com  \n\n" .
+                                                    COMPANY_NAME."\n".
+                                                    COMPANY_ADDRESS."\n".COMPANY_CSZ."\n".COMPANY_PHONE;
+
+                            $headers = "From: $from";
+
+                            $semi_rand = md5( time() );
+                            $mime_boundary = "==Multipart_Boundary_x{$semi_rand}x";
+
+                            $headers .= "\nMIME-Version: 1.0\n" .
+                                                    "Content-Type: multipart/mixed;\n" .
+                                                    " boundary=\"{$mime_boundary}\"";
+
+                            $message = "This is a multi-part message in MIME format.\n\n" .
+                                            "--{$mime_boundary}\n" .
+                                            "Content-Type: text/plain; charset=\"iso-8859-1\"\n" .
+                                            "Content-Transfer-Encoding: 7bit\n\n" .
+                                            $message . "\n\n";
+
+                            $pdf = chunk_split( base64_encode( $pdf ) );
+
+                            $message .= "--{$mime_boundary}\n" .
+                                             "Content-Type: {application/pdf};\n" .
+                                             " name=\"".$this->title.$this->invoicerecord["id"].".pdf\"\n" .
+                                             "Content-Disposition: attachment;\n" .
+                                             " filename=\"".$this->title.$this->invoicerecord["id"].".pdf\"\n" .
+                                             "Content-Transfer-Encoding: base64\n\n" .
+                                             $pdf . "\n\n" .
+                                             "--{$mime_boundary}--\n";
+
+                            return @ mail($to, $subject, $message, $headers);
+
+                            break;
+
+            }//endswitch
+
+    }//end method
+
+
+    /**
+     * function addingRecordDefaultSettings
+     *
+     * Creates an array of settings associative arrays for use by the system when
+     * a new report record is added that references the file containing this class
+     *
+     * @retrun array of settings. Each setting should itself be
+     * an associative array containing the following
+     * name: name of the setting
+     * defaultvalue: default value for setting
+     * type: (string, int, real, bool) type for value of setting
+     * required: (0,1) whether the setting is required or not
+     * description: brief description for what this setting is used for.
+     */
+    function addingRecordDefaultSettings(){
+
+        $settings[] = array(
+            "name"=>"reportTitle",
+            "defaultValue"=>"Invoice",
+            "type"=>"string",
+            "required"=>1,
+            "description"=>"Title printed on reports"
+        );
+
+        $settings[] = array(
+            "name"=>"printLogo",
+            "defaultValue"=>1,
+            "type"=>"bool",
+            "required"=>1,
+            "description"=>"Should the logo print (1 = yes, 0 = no)"
+        );
+
+        $settings[] = array(
+            "name"=>"printCompanyInfo",
+            "defaultValue"=>1,
+            "type"=>"bool",
+            "required"=>1,
+            "description"=>"Should the top company information print (1 = yes, 0 = no)"
+        );
+
+        $settings[] = array(
+            "name"=>"leftTopBox",
+            "defaultValue"=>"billto",
+            "type"=>"string",
+            "required"=>1,
+            "description"=>"Contents of Right Top Header Box (can be `billto`, `shipto`, `invoiceinfo`, `companyinfo`, `nowshow` or `blank`)"
+        );
+
+        $settings[] = array(
+            "name"=>"leftTopBoxTitle",
+            "defaultValue"=>"SOLD TO",
+            "type"=>"string",
+            "required"=>1,
+            "description"=>"Title of Left Top Header Box"
+        );
+
+        $settings[] = array(
+            "name"=>"rightTopBox",
+            "defaultValue"=>"shipto",
+            "type"=>"string",
+            "required"=>1,
+            "description"=>"Contents of Right Top Header Box (can be `billto`, `shipto`, `invoiceinfo`, `companyinfo`, `nowshow` or `blank`)"
+        );
+
+        $settings[] = array(
+            "name"=>"rightTopBoxTitle",
+            "defaultValue"=>"SHIP TO",
+            "type"=>"string",
+            "required"=>1,
+            "description"=>"Title of Right Top Header Box"
+        );
+
+        $settings[] = array(
+            "name"=>"templateFormatting",
+            "defaultValue"=>"0",
+            "type"=>"bool",
+            "required"=>1,
+            "description"=>"Should PDF remove lines and dark titles (1 = remove, 0 = keep)"
+        );
+
+        $settings[] = array(
+            "name"=>"templateUUID",
+            "defaultValue"=>"",
+            "type"=>"string",
+            "required"=>0,
+            "description"=>"Optional UUID of file record for PDF to be used as background template"
+        );
+
+        return $settings;
+
+    }//endfunction addingRecordDefaultSettings
+
+}//end class
 
 

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

@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
-
-require("../../../include/session.php");
-
-class totalReport{
-
-        var $selectcolumns;
-        var $selecttable;
-        var $whereclause="";
-        var $group="";
-        var $showinvoices=false;
-        var $showlineitems=false;
-        var $padamount=20;
-
-        function totalReport($db,$variables = NULL){
-                $this->db = $db;
-
-                // first we define the available groups
-                $this->addGroup("Invoice Date - Year","YEAR(invoices.invoicedate)"); //0
-                $this->addGroup("Invoice Date - Quarter","QUARTER(invoices.invoicedate)"); //1
-                $this->addGroup("Invoice Date - Month","MONTH(invoices.invoicedate)"); //2
-                $this->addGroup("Invoice Date","invoices.invoicedate","date"); //3
-
-                $this->addGroup("Order Date - Year","YEAR(invoices.orderdate)"); //4
-                $this->addGroup("Order Date - Quarter","QUARTER(invoices.orderdate)");//5
-                $this->addGroup("Order Date - Month","MONTH(invoices.orderdate)");//6
-                $this->addGroup("Order Date","invoices.orderdate","date");//7
-
-                $this->addGroup("Required Date - Year","YEAR(invoices.requireddate)");//8
-                $this->addGroup("Required Date - Quarter","QUARTER(invoices.requireddate)");//9
-                $this->addGroup("Required Date - Month","MONTH(invoices.requireddate)");//10
-                $this->addGroup("Required Date","invoices.requireddate","date");//11
-
-                $this->addGroup("Client","if(clients.lastname!='',concat(clients.lastname,', ',clients.firstname,if(clients.company!='',concat(' (',clients.company,')'),'')),clients.company)");//12
-
-                $this->addGroup("Client Sales Person","concat(salesPerson.firstname,' ',salesPerson.lastname)",NULL, "LEFT JOIN users AS salesPerson ON clients.salesmanagerid = salesPerson.uuid");//13
-
-                $this->addGroup("Client Lead Source","clients.leadsource");//14
-
-                $this->addGroup("Invoice Lead Source","invoices.leadsource");//15
-
-                $this->addGroup("Payment Method","paymentmethods.name");//16
-
-                $this->addGroup("Shipping Method","shippingmethods.name");//17
-                $this->addGroup("Invoice Shipping Country","invoices.shiptocountry");//18
-                $this->addGroup("Invoice Shipping State / Province","invoices.shiptostate");//19
-                $this->addGroup("Invoice Shipping Postal Code","invoices.shiptopostalcode");//20
-                $this->addGroup("Invoice Shipping City","invoices.shiptocity");//21
-
-                $this->addGroup("Web Order","invoices.weborder","boolean");//22
-
-                $this->addGroup("Invoice billing Country","invoices.country");//23
-                $this->addGroup("Invoice Billing State / Province","invoices.state");//24
-                $this->addGroup("Invoice Billing Postal Code","invoices.postalcode");//25
-                $this->addGroup("Invoice Billing City","invoices.city");//26
-
-
-                //next we do the columns
-                $this->addColumn("Record Count","count(invoices.id)");//0
-                $this->addColumn("Invoice Total","sum(invoices.totalti)","currency");//1
-                $this->addColumn("Average Invoice Total","avg(invoices.totalti)","currency");//2
-
-                $this->addColumn("Subtotal","sum(invoices.totaltni)","currency");//3
-                $this->addColumn("Average Subtotal","avg(invoices.totaltni)","currency");//4
-
-                $this->addColumn("Tax","sum(invoices.tax)","currency");//5
-                $this->addColumn("Average Tax","avg(invoices.tax)","currency");//6
-
-                $this->addColumn("Shipping","sum(invoices.shipping)","currency");//7
-                $this->addColumn("Average Shipping","avg(invoices.shipping)","currency");//8
-
-                $this->addColumn("Amount Paid","sum(invoices.amountpaid)","currency");//9
-                $this->addColumn("Average Amount Paid","avg(invoices.amountpaid)","currency");//10
-
-                $this->addColumn("Amount Due","sum(invoices.totalti - invoices.amountpaid)","currency");//11
-                $this->addColumn("Average Amount Due","avg(invoices.totalti - invoices.amountpaid)","currency");//12
-
-                $this->addColumn("Cost","sum(invoices.totalcost)","currency");//13
-                $this->addColumn("Average Cost","avg(invoices.totalcost)","currency");//14
-
-                $this->addColumn("Total Weight","sum(invoices.totalweight)","real");//15
-                $this->addColumn("Average Total Weight","avg(invoices.totalweight)","real");//16
-
-
-                if($variables){
-                        $tempArray = explode("::", $variables["columns"]);
-
-                        foreach($tempArray as $id)
-                                $this->selectcolumns[] = $this->columns[$id];
-                        $this->selectcolumns = array_reverse($this->selectcolumns);
-
-                        $this->selecttable="((`invoices` INNER JOIN `clients` ON `invoices`.`clientid`=`clients`.`uuid`) LEFT JOIN `shippingmethods` ON `shippingmethods`.`uuid` = `invoices`.`shippingmethodid`) LEFT JOIN `paymentmethods` ON `paymentmethods`.`id`=`invoices`.`paymentmethodid`";
-
-                        if($variables["groupings"] !== ""){
-                                $this->group = explode("::",$variables["groupings"]);
-                                $this->group = array_reverse($this->group);
-                        } else
-                                $this->group = array();
-
-                        foreach($this->group as $grp){
-                                if($this->groupings[$grp]["table"])
-                                        $this->selecttable="(".$this->selecttable." ".$this->groupings[$grp]["table"].")";
-                        }
-
-                        $this->whereclause=$_SESSION["printing"]["whereclause"];
-                        if($this->whereclause=="") $this->whereclause="WHERE invoices.id!=-1";
-
-                        switch($variables["showwhat"]){
-                                case "invoices":
-                                        $this->showinvoices = true;
-                                        $this->showlineitems = false;
-                                        break;
-
-                                case "lineitems":
-                                        $this->showinvoices = true;
-                                        $this->showlineitems = true;
-                                        break;
-
-                                default:
-                                        $this->showinvoices = false;
-                                        $this->showlineitems = false;
-                        }// endswitch
-
-                        if($this->whereclause!="") $this->whereclause=" WHERE (".substr($this->whereclause,6).") ";
-                }// endif
+if(!class_exists("phpbmsReport"))
+    include("../../../report/report_class.php");
+
+class totalReport extends phpbmsReport{
+
+    var $selectcolumns;
+    var $selecttable;
+    var $group = "";
+    var $showinvoices = false;
+    var $showlineitems = false;
+    var $padamount = 20;
+    var $title = "Totals";
+
+        function totalReport($db, $reportUUID, $tabledefUUID, $variables = NULL){
+
+            parent::phpbmsReport($db, $reportUUID, $tabledefUUID);
+
+            // first we define the available groups
+            $this->addGroup("Invoice Date - Year","YEAR(invoices.invoicedate)"); //0
+            $this->addGroup("Invoice Date - Quarter","QUARTER(invoices.invoicedate)"); //1
+            $this->addGroup("Invoice Date - Month","MONTH(invoices.invoicedate)"); //2
+            $this->addGroup("Invoice Date","invoices.invoicedate","date"); //3
+
+            $this->addGroup("Order Date - Year","YEAR(invoices.orderdate)"); //4
+            $this->addGroup("Order Date - Quarter","QUARTER(invoices.orderdate)");//5
+            $this->addGroup("Order Date - Month","MONTH(invoices.orderdate)");//6
+            $this->addGroup("Order Date","invoices.orderdate","date");//7
+
+            $this->addGroup("Required Date - Year","YEAR(invoices.requireddate)");//8
+            $this->addGroup("Required Date - Quarter","QUARTER(invoices.requireddate)");//9
+            $this->addGroup("Required Date - Month","MONTH(invoices.requireddate)");//10
+            $this->addGroup("Required Date","invoices.requireddate","date");//11
+
+            $this->addGroup("Client","if(clients.lastname!='',concat(clients.lastname,', ',clients.firstname,if(clients.company!='',concat(' (',clients.company,')'),'')),clients.company)");//12
+
+            $this->addGroup("Client Sales Person","concat(salesPerson.firstname,' ',salesPerson.lastname)",NULL, "LEFT JOIN users AS salesPerson ON clients.salesmanagerid = salesPerson.uuid");//13
+
+            $this->addGroup("Client Lead Source","clients.leadsource");//14
+
+            $this->addGroup("Invoice Lead Source","invoices.leadsource");//15
+
+            $this->addGroup("Payment Method","paymentmethods.name");//16
+
+            $this->addGroup("Shipping Method","shippingmethods.name");//17
+            $this->addGroup("Invoice Shipping Country","invoices.shiptocountry");//18
+            $this->addGroup("Invoice Shipping State / Province","invoices.shiptostate");//19
+            $this->addGroup("Invoice Shipping Postal Code","invoices.shiptopostalcode");//20
+            $this->addGroup("Invoice Shipping City","invoices.shiptocity");//21
+
+            $this->addGroup("Web Order","invoices.weborder","boolean");//22
+
+            $this->addGroup("Invoice billing Country","invoices.country");//23
+            $this->addGroup("Invoice Billing State / Province","invoices.state");//24
+            $this->addGroup("Invoice Billing Postal Code","invoices.postalcode");//25
+            $this->addGroup("Invoice Billing City","invoices.city");//26
+
+
+            //next we do the columns
+            $this->addColumn("Record Count","count(invoices.id)");//0
+            $this->addColumn("Invoice Total","sum(invoices.totalti)","currency");//1
+            $this->addColumn("Average Invoice Total","avg(invoices.totalti)","currency");//2
+
+            $this->addColumn("Subtotal","sum(invoices.totaltni)","currency");//3
+            $this->addColumn("Average Subtotal","avg(invoices.totaltni)","currency");//4
+
+            $this->addColumn("Tax","sum(invoices.tax)","currency");//5
+            $this->addColumn("Average Tax","avg(invoices.tax)","currency");//6
+
+            $this->addColumn("Shipping","sum(invoices.shipping)","currency");//7
+            $this->addColumn("Average Shipping","avg(invoices.shipping)","currency");//8
+
+            $this->addColumn("Amount Paid","sum(invoices.amountpaid)","currency");//9
+            $this->addColumn("Average Amount Paid","avg(invoices.amountpaid)","currency");//10
+
+            $this->addColumn("Amount Due","sum(invoices.totalti - invoices.amountpaid)","currency");//11
+            $this->addColumn("Average Amount Due","avg(invoices.totalti - invoices.amountpaid)","currency");//12
+
+            $this->addColumn("Cost","sum(invoices.totalcost)","currency");//13
+            $this->addColumn("Average Cost","avg(invoices.totalcost)","currency");//14
+
+            $this->addColumn("Total Weight","sum(invoices.totalweight)","real");//15
+            $this->addColumn("Average Total Weight","avg(invoices.totalweight)","real");//16
+
+            $this->selecttable="((`invoices` INNER JOIN `clients` ON `invoices`.`clientid`=`clients`.`uuid`)
+                                LEFT JOIN `shippingmethods` ON `shippingmethods`.`uuid` = `invoices`.`shippingmethodid`)
+                                LEFT JOIN `paymentmethods` ON `paymentmethods`.`id`=`invoices`.`paymentmethodid`";
+
         }//end method
 
 
+        function processFromPost($variables){
+
+            $tempArray = explode("::", $variables["columns"]);
+
+            foreach($tempArray as $id)
+                $this->selectcolumns[] = $this->columns[$id];
+
+            $this->selectcolumns = array_reverse($this->selectcolumns);
+
+            if($variables["groupings"] !== ""){
+
+                $this->group = explode("::",$variables["groupings"]);
+                $this->group = array_reverse($this->group);
+
+            } else
+                $this->group = array();
+
+            foreach($this->group as $grp)
+                if($this->groupings[$grp]["table"])
+                    $this->selecttable="(".$this->selecttable." ".$this->groupings[$grp]["table"].")";
+
+            switch($variables["showwhat"]){
+
+                case "invoices":
+                    $this->showinvoices = true;
+                    $this->showlineitems = false;
+                    break;
+
+                case "lineitems":
+                    $this->showinvoices = true;
+                    $this->showlineitems = true;
+                    break;
+
+                default:
+                    $this->showinvoices = false;
+                    $this->showlineitems = false;
+
+            }// endswitch
+
+            if($variables["reporttitle"])
+                $this->title = $variables["reporttitle"];
+
+        }//end function processFromPost
+
+
+        function processFromSettings(){
+
+            foreach($this->settings as $key=>$value)
+                if(strpos($key, "column") === 0)
+                    $this->selectcolumns[substr($key,6)-1] = $this->columns[$value];
+
+            ksort($this->selectcolumns);
+            $this->selectcolumns = array_reverse($this->selectcolumns);
+
+            $this->group = array();
+
+            foreach($this->settings as $key=>$value)
+                if(strpos($key, "group") === 0)
+                    $this->group[substr($key,5)-1] = $value;
+
+            ksort($this->group);
+            $this->group = array_reverse($this->group);
+
+            foreach($this->group as $grp)
+                if($this->groupings[$grp]["table"])
+                    $this->selecttable="(".$this->selecttable." ".$this->groupings[$grp]["table"].")";
+
+
+            if(isset($this->settings["showWhat"]))
+                $showWhat = $this->settings["showWhat"];
+            else
+                $showWhat = "";
+
+            switch($showWhat){
+
+                case "invoices":
+                    $this->showinvoices = true;
+                    $this->showlineitems = false;
+                    break;
+
+                case "lineitems":
+                    $this->showinvoices = true;
+                    $this->showlineitems = true;
+                    break;
+
+                default:
+                    $this->showinvoices = false;
+                    $this->showlineitems = false;
+
+            }// endswitch
+
+            if(isset($this->settings["reportTitle"]))
+                $this->title = $this->settings["reportTitle"];
+
+        }//end function processFromSettings
+
+
         function addGroup($name, $field, $format = NULL, $tableAddition = NULL){
-                $temp = array();
-                $temp["name"] = $name;
-                $temp["field"] = $field;
-                $temp["format"] = $format;
-                $temp["table"] = $tableAddition;
-
-                $this->groupings[] = $temp;
+
+            $temp = array();
+            $temp["name"] = $name;
+            $temp["field"] = $field;
+            $temp["format"] = $format;
+            $temp["table"] = $tableAddition;
+
+            $this->groupings[] = $temp;
+
         }//end method
 
 
         function addColumn($name, $field, $format = NULL){
-                $temp = array();
-                $temp["name"] = $name;
-                $temp["field"] = $field;
-                $temp["format"] = $format;
-
-                $this->columns[] = $temp;
+
+            $temp = array();
+            $temp["name"] = $name;
+            $temp["field"] = $field;
+            $temp["format"] = $format;
+
+            $this->columns[] = $temp;
+
         }//end method
 
 
         function showReportTable(){
+
                 ?><table border="0" cellspacing="0" cellpadding="0">
                 <tr>
@@ -207 +272 @@
                         $querystatement.=$thecolumn["field"]." AS `".$thecolumn["name"]."`,";
                 $querystatement.=" count(invoices.id) as thecount ";
-                $querystatement.=" FROM ".$this->selecttable.$this->whereclause;
+                $querystatement.=" FROM ".$this->selecttable.$this->whereClause;
                 $queryresult=$this->db->query($querystatement);
 
@@ -236 +301 @@
                                 $querystatement.=$thecolumn["field"]." AS `".$thecolumn["name"]."`,";
                         $querystatement .= $this->groupings[$groupby]["field"]." AS thegroup, count(invoices.id) as thecount ";
-                        $querystatement .= " FROM ".$this->selecttable.$this->whereclause.$where." GROUP BY ".$this->groupings[$groupby]["field"];
+                        $querystatement .= " FROM ".$this->selecttable.$this->whereClause.$where." GROUP BY ".$this->groupings[$groupby]["field"];
                         $queryresult=$this->db->query($querystatement);
 
@@ -288 +353 @@
                 $querystatement.=" invoices.id as theid, if(clients.lastname!=\"\",concat(clients.lastname,\", \",clients.firstname,if(clients.company!=\"\",concat(\" (\",clients.company,\")\"),\"\")),clients.company) as thename,
                                                         invoices.orderdate,invoices.invoicedate";
-                $querystatement.=" FROM ".$this->selecttable.$this->whereclause.$where." GROUP BY invoices.id";
+                $querystatement.=" FROM ".$this->selecttable.$this->whereClause.$where." GROUP BY invoices.id";
                 $queryresult=$this->db->query($querystatement);
 
@@ -370 +435 @@
         function showReport(){
 
-                if($_POST["reporttitle"])
-                        $pageTitle = $_POST["reporttitle"];
-                else
-                        $pageTitle = "Invoice Totals";
-
+            if(!$this->whereClause)
+                $this->whereClause = "invoices.id!=-1";
+
+            $this->whereClause = " WHERE ".$this->whereClause;
+
+            $pageTitle = $this->title;
 
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -427 +493 @@
         <div class="bodyline">
             <h1>Invoice Total Options</h1>
-            <form id="GroupForm" action="<?php echo $_SERVER["PHP_SELF"]?>" method="post" name="GroupForm">
+            <form id="GroupForm" action="<?php echo str_replace("&", "&amp;", $_SERVER["REQUEST_URI"]) ?>" method="post" name="GroupForm">
 
                 <fieldset>
@@ -495 +561 @@
     }//end method
 
-}//endclass
-
-// Processing ===================================================================================================================
-if(!isset($dontProcess)){
-        if(isset($_POST["columns"])){
-                $myreport= new totalReport($db,$_POST);
-                $myreport->showReport();
-        } else {
-                $myreport = new totalReport($db);
-                $myreport->showSelectScreen();
-        }
-}?>
+}//end class totalReport
+
+
+/**
+ * PROCESSING
+ * =============================================================================
+ */
+if(!isset($noOutput)){
+
+    require("../../../include/session.php");
+
+    checkForReportArguments();
+
+    $report = new totalReport($db, $_GET["rid"], $_GET["tid"]);
+
+    if(isset($_POST["columns"])){
+
+        $report->setupFromPrintScreen();
+        $report->processFromPost($_POST);
+        $report->showReport();
+
+    } elseif(isset($report->settings["column1"])){
+
+        $report->setupFromPrintScreen();
+        $report->processFromSettings();
+        $report->showReport();
+
+    } else {
+
+        $report->showSelectScreen();
+
+    }//endif
+
+}//endif
+
+/**
+ * When adding a new report record, the add/edit needs to know what the class
+ * name is so that it can instantiate it, and grab it's default settings.
+ */
+if(isset($addingReportRecord))
+    $reportClass ="totalReport";
+
+?>

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

@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
-
-require("../../../include/session.php");
-
-class totalReport{
+if(!class_exists("phpbmsReport"))
+    include("../../../report/report_class.php");
+
+class totalReport extends phpbmsReport{
 
         var $selectcolumns;
         var $selecttable;
-        var $whereclause="";
-        var $group="";
-        var $showinvoices=false;
-        var $showlineitems=false;
-        var $padamount=20;
-
-        function totalReport($db,$variables = NULL){
-                $this->db = $db;
-
-                // first we define the available groups
-                $this->addGroup("Invoice ID","invoices.id"); //0
-                $this->addGroup("Product","concat(products.partnumber,' - ',products.partname)"); //1
-                $this->addGroup("Product Category","concat(productcategories.id,' - ',productcategories.name)",NULL,"INNER JOIN productcategories ON products.categoryid=productcategories.uuid"); //2
-
-                $this->addGroup("Invoice Date - Year","YEAR(invoices.invoicedate)"); //3
-                $this->addGroup("Invoice Date - Quarter","QUARTER(invoices.invoicedate)"); //4
-                $this->addGroup("Invoice Date - Month","MONTH(invoices.invoicedate)"); //5
-                $this->addGroup("Invoice Date","invoices.invoicedate","date"); //6
-
-                $this->addGroup("Order Date - Year","YEAR(invoices.orderdate)"); //7
-                $this->addGroup("Order Date - Quarter","QUARTER(invoices.orderdate)");//8
-                $this->addGroup("Order Date - Month","MONTH(invoices.orderdate)");//9
-                $this->addGroup("Order Date","invoices.orderdate","date");//10
-
-                $this->addGroup("Client","if(clients.lastname!='',concat(clients.lastname,', ',clients.firstname,if(clients.company!='',concat(' (',clients.company,')'),'')),clients.company)");//11
-
-                $this->addGroup("Client Sales Person","concat(salesPerson.firstname,' ',salesPerson.lastname)",NULL, "LEFT JOIN users AS salesPerson ON clients.salesmanagerid = salesPerson.id");//12
-
-                $this->addGroup("Client Lead Source","clients.leadsource");//13
-
-                $this->addGroup("Invoice Lead Source","invoices.leadsource");//14
-
-                $this->addGroup("Payment Method","paymentmethods.name");//15
-
-                $this->addGroup("Shipping Method","shippingmethods.name");//16
-                $this->addGroup("Invoice Shipping Country","invoices.shiptocountry");//17
-                $this->addGroup("Invoice Shipping State / Province","invoices.shiptostate");//18
-                $this->addGroup("Invoice Shipping Postal Code","invoices.shiptopostalcode");//19
-                $this->addGroup("Invoice Shipping City","invoices.shiptocity");//20
-
-                $this->addGroup("Web Order","invoices.weborder","boolean");//21
-
-                $this->addGroup("Invoice billing Country","invoices.country");//22
-                $this->addGroup("Invoice Billing State / Province","invoices.state");//23
-                $this->addGroup("Invoice Billing Postal Code","invoices.postalcode");//24
-                $this->addGroup("Invoice Billing City","invoices.city");//25
-
-                //next we do the columns
-                $this->addColumn("Record Count","count(lineitems.id)");//0
-                $this->addColumn("Extended Price","sum(lineitems.unitprice*lineitems.quantity)","currency");//1
-                $this->addColumn("Average Extended Price","avg(lineitems.unitprice*lineitems.quantity)","currency");//2
-                $this->addColumn("Unit Price","sum(lineitems.unitprice)","currency");//3
-                $this->addColumn("Average Unit Price","avg(lineitems.unitprice)","currency");//4
-                $this->addColumn("Quantity","sum(lineitems.quantity)","real");//5
-                $this->addColumn("Average Quantity","avg(lineitems.quantity)","real");//6
-                $this->addColumn("Unit Cost","sum(lineitems.unitcost)","currency");//7
-                $this->addColumn("Average Unit Cost","avg(lineitems.unitcost)","currency");//8
-                $this->addColumn("Extended Cost","sum(lineitems.unitcost*lineitems.quantity)","currency");//9
-                $this->addColumn("Average Extended Cost","avg(lineitems.unitcost*lineitems.quantity)","currency");//10
-                $this->addColumn("Unit Weight","sum(lineitems.unitweight)","real");//11
-                $this->addColumn("Average Unit Weight","avg(lineitems.unitweight)","real");//12
-                $this->addColumn("Extended Unit Weight","sum(lineitems.unitweight*lineitems.quantity)","real");//13
-                $this->addColumn("Extended Average Unit Weight","avg(lineitems.unitweight*lineitems.quantity)","real");//14
-
-
-                if($variables){
-                        $tempArray = explode("::", $variables["columns"]);
-
-                        foreach($tempArray as $id)
-                                $this->selectcolumns[] = $this->columns[$id];
-                        $this->selectcolumns = array_reverse($this->selectcolumns);
-
-                        //change
-                        $this->selecttable="(((((lineitems LEFT JOIN products ON lineitems.productid=products.uuid)
-                                                                        INNER JOIN invoices ON lineitems.invoiceid=invoices.id)
-                                                                        INNER JOIN clients ON invoices.clientid=clients.uuid)
-                                                                        LEFT JOIN shippingmethods ON shippingmethods.uuid=invoices.shippingmethodid)
-                                                                        LEFT JOIN paymentmethods ON paymentmethods.uuid=invoices.paymentmethodid)
-                                                                        ";
-
-                        if($variables["groupings"] !== ""){
-                                $this->group = explode("::",$variables["groupings"]);
-                                $this->group = array_reverse($this->group);
-                        } else
-                                $this->group = array();
-
-                        foreach($this->group as $grp){
-                                if($this->groupings[$grp]["table"])
-                                        $this->selecttable="(".$this->selecttable." ".$this->groupings[$grp]["table"].")";
-                        }
-
-                        $this->whereclause=$_SESSION["printing"]["whereclause"];
-                        if($this->whereclause=="") $this->whereclause="WHERE invoices.id!=-1";
-
-                        switch($variables["showwhat"]){
-                                case "invoices":
-                                        $this->showinvoices = true;
-                                        $this->showlineitems = false;
-                                        break;
-
-                                case "lineitems":
-                                        $this->showinvoices = true;
-                                        $this->showlineitems = true;
-                                        break;
-
-                                default:
-                                        $this->showinvoices = false;
-                                        $this->showlineitems = false;
-                        }// endswitch
-
-                        if($this->whereclause!="") $this->whereclause=" WHERE (".substr($this->whereclause,6).") ";
-                }// endif
+        var $group = "";
+        var $showinvoices = false;
+        var $showlineitems = false;
+        var $padamount = 20;
+        var $title = "Totals";
+
+        function totalReport($db, $reportUUID, $tabledefUUID, $variables = NULL){
+
+            parent::phpbmsReport($db, $reportUUID, $tabledefUUID);
+
+            // first we define the available groups
+            $this->addGroup("Invoice ID","invoices.id"); //0
+            $this->addGroup("Product","concat(products.partnumber,' - ',products.partname)"); //1
+            $this->addGroup("Product Category","concat(productcategories.id,' - ',productcategories.name)",NULL,"INNER JOIN productcategories ON products.categoryid=productcategories.uuid"); //2
+
+            $this->addGroup("Invoice Date - Year","YEAR(invoices.invoicedate)"); //3
+            $this->addGroup("Invoice Date - Quarter","QUARTER(invoices.invoicedate)"); //4
+            $this->addGroup("Invoice Date - Month","MONTH(invoices.invoicedate)"); //5
+            $this->addGroup("Invoice Date","invoices.invoicedate","date"); //6
+
+            $this->addGroup("Order Date - Year","YEAR(invoices.orderdate)"); //7
+            $this->addGroup("Order Date - Quarter","QUARTER(invoices.orderdate)");//8
+            $this->addGroup("Order Date - Month","MONTH(invoices.orderdate)");//9
+            $this->addGroup("Order Date","invoices.orderdate","date");//10
+
+            $this->addGroup("Client","if(clients.lastname!='',concat(clients.lastname,', ',clients.firstname,if(clients.company!='',concat(' (',clients.company,')'),'')),clients.company)");//11
+
+            $this->addGroup("Client Sales Person","concat(salesPerson.firstname,' ',salesPerson.lastname)",NULL, "LEFT JOIN users AS salesPerson ON clients.salesmanagerid = salesPerson.id");//12
+
+            $this->addGroup("Client Lead Source","clients.leadsource");//13
+
+            $this->addGroup("Invoice Lead Source","invoices.leadsource");//14
+
+            $this->addGroup("Payment Method","paymentmethods.name");//15
+
+            $this->addGroup("Shipping Method","shippingmethods.name");//16
+            $this->addGroup("Invoice Shipping Country","invoices.shiptocountry");//17
+            $this->addGroup("Invoice Shipping State / Province","invoices.shiptostate");//18
+            $this->addGroup("Invoice Shipping Postal Code","invoices.shiptopostalcode");//19
+            $this->addGroup("Invoice Shipping City","invoices.shiptocity");//20
+
+            $this->addGroup("Web Order","invoices.weborder","boolean");//21
+
+            $this->addGroup("Invoice billing Country","invoices.country");//22
+            $this->addGroup("Invoice Billing State / Province","invoices.state");//23
+            $this->addGroup("Invoice Billing Postal Code","invoices.postalcode");//24
+            $this->addGroup("Invoice Billing City","invoices.city");//25
+
+            //next we do the columns
+            $this->addColumn("Record Count","count(lineitems.id)");//0
+            $this->addColumn("Extended Price","sum(lineitems.unitprice*lineitems.quantity)","currency");//1
+            $this->addColumn("Average Extended Price","avg(lineitems.unitprice*lineitems.quantity)","currency");//2
+            $this->addColumn("Unit Price","sum(lineitems.unitprice)","currency");//3
+            $this->addColumn("Average Unit Price","avg(lineitems.unitprice)","currency");//4
+            $this->addColumn("Quantity","sum(lineitems.quantity)","real");//5
+            $this->addColumn("Average Quantity","avg(lineitems.quantity)","real");//6
+            $this->addColumn("Unit Cost","sum(lineitems.unitcost)","currency");//7
+            $this->addColumn("Average Unit Cost","avg(lineitems.unitcost)","currency");//8
+            $this->addColumn("Extended Cost","sum(lineitems.unitcost*lineitems.quantity)","currency");//9
+            $this->addColumn("Average Extended Cost","avg(lineitems.unitcost*lineitems.quantity)","currency");//10
+            $this->addColumn("Unit Weight","sum(lineitems.unitweight)","real");//11
+            $this->addColumn("Average Unit Weight","avg(lineitems.unitweight)","real");//12
+            $this->addColumn("Extended Unit Weight","sum(lineitems.unitweight*lineitems.quantity)","real");//13
+            $this->addColumn("Extended Average Unit Weight","avg(lineitems.unitweight*lineitems.quantity)","real");//14
+
+            //change
+            $this->selecttable="(((((lineitems LEFT JOIN products ON lineitems.productid=products.uuid)
+                                                            INNER JOIN invoices ON lineitems.invoiceid=invoices.id)
+                                                            INNER JOIN clients ON invoices.clientid=clients.uuid)
+                                                            LEFT JOIN shippingmethods ON shippingmethods.uuid=invoices.shippingmethodid)
+                                                            LEFT JOIN paymentmethods ON paymentmethods.uuid=invoices.paymentmethodid)
+                                                            ";
+
+        }//end function totalReport
+
+
+        function processFromPost($variables){
+
+            $tempArray = explode("::", $variables["columns"]);
+
+            foreach($tempArray as $id)
+                    $this->selectcolumns[] = $this->columns[$id];
+
+            $this->selectcolumns = array_reverse($this->selectcolumns);
+
+            if($variables["groupings"] !== ""){
+
+                $this->group = explode("::",$variables["groupings"]);
+                $this->group = array_reverse($this->group);
+
+            } else
+                $this->group = array();
+
+            foreach($this->group as $grp)
+                if($this->groupings[$grp]["table"])
+                    $this->selecttable="(".$this->selecttable." ".$this->groupings[$grp]["table"].")";
+
+            switch($variables["showwhat"]){
+
+                case "invoices":
+                    $this->showinvoices = true;
+                    $this->showlineitems = false;
+                    break;
+
+                case "lineitems":
+                    $this->showinvoices = true;
+                    $this->showlineitems = true;
+                    break;
+
+                default:
+                    $this->showinvoices = false;
+                    $this->showlineitems = false;
+
+            }// endswitch
+
+            if($variables["reporttitle"])
+                $this->title = $variables["reporttitle"];
+
+        }//end function processFromPost
+
+
+        function processFromSettings(){
+
+            foreach($this->settings as $key=>$value)
+                if(strpos($key, "column") === 0)
+                    $this->selectcolumns[substr($key,6)-1] = $this->columns[$value];
+
+            ksort($this->selectcolumns);
+            $this->selectcolumns = array_reverse($this->selectcolumns);
+
+            $this->group = array();
+
+            foreach($this->settings as $key=>$value)
+                if(strpos($key, "group") === 0)
+                    $this->group[substr($key,5)-1] = $value;
+
+            ksort($this->group);
+            $this->group = array_reverse($this->group);
+
+            foreach($this->group as $grp)
+                if($this->groupings[$grp]["table"])
+                    $this->selecttable="(".$this->selecttable." ".$this->groupings[$grp]["table"].")";
+
+
+            if(isset($this->settings["showWhat"]))
+                $showWhat = $this->settings["showWhat"];
+            else
+                $showWhat = "";
+
+            switch($showWhat){
+
+                case "invoices":
+                    $this->showinvoices = true;
+                    $this->showlineitems = false;
+                    break;
+
+                case "lineitems":
+                    $this->showinvoices = true;
+                    $this->showlineitems = true;
+                    break;
+
+                default:
+                    $this->showinvoices = false;
+                    $this->showlineitems = false;
+
+            }// endswitch
+
+            if(isset($this->settings["reportTitle"]))
+                $this->title = $this->settings["reportTitle"];
+
+        }//end function processFromSettings
+
+
+        function addGroup($name, $field, $format = NULL, $tableAddition = NULL){
+
+            $temp = array();
+            $temp["name"] = $name;
+            $temp["field"] = $field;
+            $temp["format"] = $format;
+            $temp["table"] = $tableAddition;
+
+            $this->groupings[] = $temp;
+
         }//end method
 
 
-        function addGroup($name, $field, $format = NULL, $tableAddition = NULL){
-                $temp = array();
-                $temp["name"] = $name;
-                $temp["field"] = $field;
-                $temp["format"] = $format;
-                $temp["table"] = $tableAddition;
-
-                $this->groupings[] = $temp;
+        function addColumn($name, $field, $format = NULL){
+
+            $temp = array();
+            $temp["name"] = $name;
+            $temp["field"] = $field;
+            $temp["format"] = $format;
+
+            $this->columns[] = $temp;
+
         }//end method
 
 
-        function addColumn($name, $field, $format = NULL){
-                $temp = array();
-                $temp["name"] = $name;
-                $temp["field"] = $field;
-                $temp["format"] = $format;
-
-                $this->columns[] = $temp;
-        }//end method
-
-
         function showReportTable(){
-                ?><table border="0" cellspacing="0" cellpadding="0">
-                <tr>
-                        <th>&nbsp;</th>
-                <?php
-                        foreach($this->selectcolumns as $thecolumn){
-                                ?><th align="right"><?php echo $thecolumn["name"]?></th><?php
-                        }//end foreach
-                ?>
-                </tr>
-                <?php $this->showGroup($this->group,"",10);?>
-                <?php $this->showGrandTotals();?>
-                </table>
-                <?php
-        }
+
+            ?><table border="0" cellspacing="0" cellpadding="0">
+            <tr>
+                    <th>&nbsp;</th>
+            <?php
+                    foreach($this->selectcolumns as $thecolumn){
+                            ?><th align="right"><?php echo $thecolumn["name"]?></th><?php
+                    }//end foreach
+            ?>
+            </tr>
+            <?php $this->showGroup($this->group,"",10);?>
+            <?php $this->showGrandTotals();?>
+            </table>
+            <?php
+
+        }//end function showReportTable();
+
 
         function showGrandTotals(){
 
-                $querystatement="SELECT ";
-                foreach($this->selectcolumns as $thecolumn)
-                        $querystatement.=$thecolumn["field"]." AS `".$thecolumn["name"]."`,";
-                $querystatement.=" count(lineitems.id) as thecount ";
-                $querystatement.=" FROM ".$this->selecttable.$this->whereclause;
-                $queryresult=$this->db->query($querystatement);
-
-                $therecord=$this->db->fetchArray($queryresult);
-                ?>
-                <tr>
-                        <td class="grandtotals" align="right">Totals: (<?php echo $therecord["thecount"]?>)</td>
-                        <?php
-                                foreach($this->selectcolumns as $thecolumn){
-                                        ?><td align="right" class="grandtotals"><?php echo formatVariable($therecord[$thecolumn["name"]],$thecolumn["format"])?></td><?php
-                                }//end foreach
-                        ?>
-                </tr>
-                <?php
-        }
+            $querystatement="SELECT ";
+            foreach($this->selectcolumns as $thecolumn)
+                    $querystatement.=$thecolumn["field"]." AS `".$thecolumn["name"]."`,";
+            $querystatement.=" count(lineitems.id) as thecount ";
+            $querystatement.=" FROM ".$this->selecttable.$this->whereClause;
+            $queryresult=$this->db->query($querystatement);
+
+            $therecord=$this->db->fetchArray($queryresult);
+            ?>
+            <tr>
+                    <td class="grandtotals" align="right">Totals: (<?php echo $therecord["thecount"]?>)</td>
+                    <?php
+                            foreach($this->selectcolumns as $thecolumn){
+                                    ?><td align="right" class="grandtotals"><?php echo formatVariable($therecord[$thecolumn["name"]],$thecolumn["format"])?></td><?php
+                            }//end foreach
+                    ?>
+            </tr>
+            <?php
+
+        }//end function showGrandTotals
+
 
         function showGroup($group,$where,$indent){
@@ -231 +298 @@
                                 $querystatement.=$thecolumn["field"]." AS `".$thecolumn["name"]."`,";
                         $querystatement .= $this->groupings[$groupby]["field"]." AS thegroup, count(lineitems.id) as thecount ";
-                        $querystatement .= " FROM ".$this->selecttable.$this->whereclause.$where." GROUP BY ".$this->groupings[$groupby]["field"];
+                        $querystatement .= " FROM ".$this->selecttable.$this->whereClause.$where." GROUP BY ".$this->groupings[$groupby]["field"];
                         $queryresult=$this->db->query($querystatement);
 
@@ -290 +357 @@
                                 `lineitems`.`unitprice`,
                                 `quantity`*`lineitems`.`unitprice` AS `extended`
-                        FROM ".$this->selecttable.$this->whereclause.$where." GROUP BY lineitems.id
+                        FROM ".$this->selecttable.$this->whereClause.$where." GROUP BY lineitems.id
                 ";
 
@@ -337 +404 @@
         function showReport(){
 
-                if($_POST["reporttitle"])
-                        $pageTitle = $_POST["reporttitle"];
-                else
-                        $pageTitle = "Line Item Totals";
-
+            if(!$this->whereClause)
+                $this->whereClause = "invoices.id!=-1";
+
+            $this->whereClause = " WHERE ".$this->whereClause;
+
+            $pageTitle = $this->title;
 
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -394 +462 @@
         <div class="bodyline">
             <h1>Line Items Total Options</h1>
-            <form id="GroupForm" action="<?php echo $_SERVER["PHP_SELF"]?>" method="post" name="GroupForm">
+            <form id="GroupForm" action="<?php echo str_replace("&", "&amp;", $_SERVER["REQUEST_URI"]) ?>" method="post" name="GroupForm">
 
                 <fieldset>
@@ -465 +533 @@
 
 
-// Processing ===================================================================================================================
-if(!isset($dontProcess)){
-        if(isset($_POST["columns"])){
-                $myreport= new totalReport($db,$_POST);
-                $myreport->showReport();
-        } else {
-                $myreport = new totalReport($db);
-                $myreport->showSelectScreen();
-        }
-}?>
+/**
+ * PROCESSING
+ * =============================================================================
+ */
+if(!isset($noOutput)){
+
+    require("../../../include/session.php");
+
+    checkForReportArguments();
+
+    $report = new totalReport($db, $_GET["rid"], $_GET["tid"]);
+
+    if(isset($_POST["columns"])){
+
+        $report->setupFromPrintScreen();
+        $report->processFromPost($_POST);
+        $report->showReport();
+
+    } elseif(isset($report->settings["column1"])){
+
+        $report->setupFromPrintScreen();
+        $report->processFromSettings();
+        $report->showReport();
+
+    } else {
+
+        $report->showSelectScreen();
+
+    }//endif
+
+}//endif
+
+/**
+ * When adding a new report record, the add/edit needs to know what the class
+ * name is so that it can instantiate it, and grab it's default settings.
+ */
+if(isset($addingReportRecord))
+    $reportClass ="totalReport";
+
+?>

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

@@ -38 +38 @@
 */
 
-if(!isset($fromProduct)) {
-        require_once("../../../include/session.php");
-}
-
-class salesHistoryReport{
+if(!class_exists("phpbmsReport"))
+    include("../../../report/report_class.php");
+
+class salesHistoryReport extends phpbmsReport{
+
+    var $fromDate;
+    var $toDate;
+    var $view;
+    var $productQueryresult;
+    var $dataPrint;
+
+    function salesHistoryReport($db, $reportUUID, $tabledefUUID){
+
+        parent::phpbmsReport($db, $reportUUID, $tabledefUUID);
+
+        //$this->checkForDefaultSettings();
+
+    }//end function init
+
+
+    function initialize($variables){
+
+        if(!isset($variables["fromdate"]) || !isset($variables["todate"]) || !isset($variables["status"]))
+            $error = new appError(300, "Missing Passed Parameters");
+
+        $this->fromDate = $variables["fromdate"];
+        $this->toDate = $variables["todate"];
+        $this->view = $variables["status"];
+
+        $this->dataPrint = $_SESSION["printing"]["dataprint"];
+
+        if(!$this->sortOrder)
+            $this->sortOrder = "  ORDER BY products.partnumber ";
+
+        if(!$this->whereClause)
+            $this->whereClause = "products.id!=-1";
+
+        $this->whereClause = " WHERE (".$this->whereClause.") ";
+
+        $querystatement = "
+            SELECT
+                products.uuid,
+                products.partnumber,
+                products.partname
+            FROM
+                products
+            ".$this->whereClause.$this->sortOrder;
+
+        $this->productQueryresult = $this->db->query($querystatement);
+
+    }//end function initialize
+
+
+    function generateSingleHistory($productUUID){
+
+        $theStatus = "(invoices.type = '";
+
+        switch($this->view){
+
+            case "Orders and Invoices":
+                $theStatus .= "Order' OR invoices.type ='Invoice')";
+                $searchDate = "orderdate";
+                break;
+
+            case "Invoices":
+                $theStatus .= "Invoice')";
+                $searchDate = "invoicedate";
+                break;
+
+            case "Orders":
+                $theStatus .= "Order')";
+                $searchDate = "orderdate";
+                break;
+
+        }//endswitch
+
+        $mysqlFromDate = sqlDateFromString($this->fromDate);
+        $mysqlToDate = sqlDateFromString($this->toDate);
+
+        $querystatement = "
+            SELECT
+                `invoices`.`id`,
+                `invoices`.`orderdate`,
+                `invoices`.`invoicedate`,
+                IF(clients.lastname!=\"\",concat(clients.lastname,\", \",clients.firstname,if(clients.company!=\"\",concat(\" (\",clients.company,\")\"),\"\")),clients.company) AS `client`,
+                `lineitems`.`quantity` AS `qty`,
+                `lineitems`.`unitprice`*`lineitems`.`quantity` AS `extended`,
+                `lineitems`.`unitprice` AS `price`,
+                `lineitems`.`unitcost` AS `cost`,
+                `lineitems`.`unitcost`*`lineitems`.`quantity` AS extendedcost
+            FROM
+                ((products INNER JOIN lineitems on products.uuid=lineitems.productid)
+                INNER JOIN `invoices` ON lineitems.invoiceid=invoices.id)
+                INNER JOIN `clients` on `invoices`.`clientid`=`clients`.`uuid`
+            WHERE
+                `products`.`uuid`='".$productUUID."'
+                AND
+                `invoices`.".$searchDate.">='".$mysqlFromDate."'
+                AND
+                `invoices`.".$searchDate."<='".$mysqlToDate."'
+                AND
+                ".$theStatus."
+            ORDER BY
+                `invoices`.`invoicedate`,
+                `invoices`.`orderdate`
+            ";
+
+        $queryresult = $this->db->query($querystatement);
+
+        ob_start();
+
+        ?>
+        <table border="0" cellpadding="3" cellspacing="0">
+            <thead>
+                <tr>
+                    <th align="center" nowrap="nowrap" >ID</th>
+                    <th align="center" nowrap="nowrap" >Order Date</th>
+                    <th align="center" nowrap="nowrap" >Invoice. Date</th>
+                    <th nowrap="nowrap"  width="100%" align="left">Client</th>
+                    <th align="center" nowrap="nowrap" >Qty.</th>
+                    <th align="right" nowrap="nowrap" >Unit Cost</th>
+                    <th align="right" nowrap="nowrap" >Cost Ext.</th>
+                    <th align="right" nowrap="nowrap" >Unit Price</th>
+                    <th align="right" nowrap="nowrap">Price Ext.</th>
+                </tr>
+            </thead>
+        <?php
+
+            $totalextended = 0;
+            $totalcostextended = 0;
+            $totalquantity = 0;
+            $avgprice = 0;
+            $avgcost = 0;
+
+            $numrows = $this->db->numRows($queryresult);
+
+            while ($therecord = $this->db->fetchArray($queryresult)){
+
+                $avgcost += $therecord["cost"];
+                $avgprice += $therecord["price"];
+                $totalquantity += $therecord["qty"];
+                $totalextended += $therecord["extended"];
+                $totalcostextended += $therecord["extendedcost"];
+        ?>
+            <tr>
+                <td align="center" nowrap="nowrap"><?php echo $therecord["id"]?></td>
+                <td align="center" nowrap="nowrap"><?php echo $therecord["orderdate"]?formatFromSQLDate($therecord["orderdate"]):"&nbsp;" ?></td>
+                <td align="center" nowrap="nowrap"><?php echo $therecord["invoicedate"]?formatFromSQLDate($therecord["invoicedate"]):"&nbsp;" ?></td>
+                <td nowrap="nowrap"><?php echo $therecord["client"]?></td>
+                <td align="center" nowrap="nowrap"><?php echo number_format($therecord["qty"],2)?></td>
+                <td align="right" nowrap="nowrap"><?php echo numberToCurrency($therecord["cost"])?></td>
+                <td align="right" nowrap="nowrap"><?php echo numberToCurrency($therecord["extendedcost"])?></td>
+                <td align="right" nowrap="nowrap"><?php echo numberToCurrency($therecord["price"])?></td>
+                <td align="right" nowrap="nowrap"><?php echo numberToCurrency($therecord["extended"])?></td>
+            </tr>
+          <?php }//endwhile ?>
+            <tr>
+                <td align="center" class="grandtotals">&nbsp;</td>
+                <td align="center" class="grandtotals">&nbsp;</td>
+                <td class="grandtotals">&nbsp;</td>
+                <td class="grandtotals">&nbsp;</td>
+                <td align="center" class="grandtotals"><?php echo number_format($totalquantity,2)?></td>
+                <td align="right" nowrap="nowrap"class="grandtotals">avg. = <?php $numrows?$avgcost=$avgcost/$numrows:$avgcost=0; echo numberToCurrency($avgcost)?></td>
+                <td align="right" class="grandtotals"><?php echo numberToCurrency($totalcostextended)?></td>
+                <td align="right" nowrap="nowrap" class="grandtotals">avg. = <?php $numrows?$avgprice=$avgprice/$numrows:$avgprice=0; echo numberToCurrency($avgprice)?></td>
+                <td align="right" class="grandtotals"><?php echo numberToCurrency($totalextended)?></td>
+            </tr>
+         </table>
+        <?php
+
+        $output = ob_get_contents();
+        ob_end_clean();
+
+        return $output;
+
+    }//end function generateSingleHistory
+
+
+
+    function generate(){
+
+
+        ob_start();
+        ?>
+
+        <h1>Product Sales History</h1>
+
+        <ul>
+            <li>
+                source:<br />
+                <?php echo formatVariable($this->dataPrint); ?>
+            </li>
+            <li>
+                date generated:<br />
+                <?php echo dateToString(mktime())." ".timeToString(mktime()); ?>
+            </li>
+            <li>
+                view:<br />
+                <?php echo $this->view; ?>
+            </li>
+            <li>
+                from:<br />
+                <?php echo $this->fromDate; ?>
+            </li>
+            <li>
+                to:<br />
+                <?php echo $this->toDate; ?>
+            </li>
+        </ul>
+
+        <?php
+
+        $this->reportOutput = ob_get_contents();
+        ob_end_clean();
+
+        while($therecord = $this->db->fetchArray($this->productQueryresult)){
+
+            $this->reportOutput .= '<h2>'.$therecord["partnumber"].'<br />'.$therecord["partname"].'</h2>';
+
+            $this->reportOutput .= $this->generateSingleHistory($therecord["uuid"]);
+
+        }//endwhile
+
+    }//end function generate
+
+
+    function output(){
+
+        global $phpbms;
+        $db = &$this->db;
+
+        $phpbms->cssIncludes[] = "reports.css";
+        $phpbms->cssIncludes[] = "pages/bms/clienthistoryreport.css";
+
+        $phpbms->showMenu = false;
+        $phpbms->showFooter = false;
+
+        include("header.php");
+
+        echo $this->reportOutput;
+
+        include("footer.php");
+
+    }//end function output
+
+
+    function displayOptions(){
+
+        global $phpbms;
+        $db = &$this->db;
+
+        require("include/fields.php");
+
+        $pageTitle = "Product Sales History";
+        $phpbms->cssIncludes[] = "pages/historyreports.css";
+        $phpbms->showMenu = false;
+
+        //Form Elements
+        //==============================================================
+        $theform = new phpbmsForm();
+
+        $thedate = dateToString( mktime(0,0,0,date("m"),1),"SQL" );
+        $theinput = new inputDatePicker("fromdate", $thedate, "from",true);
+        $theform->addField($theinput);
+
+        $thedate = dateToString( mktime(0,0,0,date("m")+1,0,date("Y")), "SQL" );
+        $theinput = new inputDatePicker("todate", $thedate, "to",true);
+        $theform->addField($theinput);
+
+        $theform->jsMerge();
+        //==============================================================
+        //End Form Elements
+
+        include("header.php");
+        ?>
+        <form action="<?php echo str_replace("&", "&amp;", $_SERVER["REQUEST_URI"]); ?>" method="post" name="totals" onsubmit="return validateForm(this)">
+
+            <div class="bodyline" id="reportOptions">
+
+                <h1 id="topTitle"><span>Product Sales History Options</span></h1>
+
+                <fieldset>
+                    <legend>time frame</legend>
+
+                    <p id="fromP"><?php $theform->showField("fromdate");?></p>
+
+                    <p><?php $theform->showField("todate");?></p>
+                </fieldset>
+
+                <p>
+                    <label for="status">include products from...<br /></label>
+                    <select id="status" name="status">
+                        <option value="Orders and Invoices" selected="selected">Orders and Invoices</option>
+                        <option value="Invoices">Invoices</option>
+                        <option value="Orders">Orders</option>
+                    </select>
+                </p>
+
+                <div align="right">
+                    <input name="command" type="submit" class="Buttons" id="print" value="print" />
+                    <input name="cancel" type="button" class="Buttons" id="cancel" value="cancel" onclick="window.close();" />
+                </div>
+            </div>
+        </form>
+
+        <?php
+        include("footer.php");
+
+    }//end function displayOptions
+
+}//end class  salesHistoryReport
+
+
+/**
+ * PROCESSING
+ * =============================================================================
+ */
+if(!isset($noOutput)){
+
+    //IE needs caching to be set to private in order to display PDFS
+    session_cache_limiter('private');
+
+    require_once("../../../include/session.php");
+
+    checkForReportArguments();
+
+    $report = new salesHistoryReport($db, $_GET["rid"], $_GET["tid"]);
+
+    if(!isset($_POST["command"]) && !isset($_GET["status"]))
+        $report->displayOptions();
+    else{
+
+        if(isset($_GET["status"])){
+
+            $_POST["status"] = $_GET["status"];
+            $_POST["fromdate"] = $_GET["fromdate"];
+            $_POST["todate"] = $_GET["todate"];
+
+        }//endif
+
+        //need to set post variables here
+
+        $report->setupFromPrintScreen();
+        $report->initialize($_POST);
+        $report->generate();
+        $report->output();
+
+    }//endif
+
+
+}//end if
+
+/**
+ * When adding a new report record, the add/edit needs to know what the class
+ * name is so that it can instantiate it, and grab it's default settings.
+ */
+if(isset($addingReportRecord))
+    $reportClass ="salesHistoryReport";
+
+
+
+
+
+
+
+
+
+class s_salesHistoryReport{
 
         var $whereclause="";
@@ -187 +550 @@
 
         function showReport(){
-                
+
         ?>
 <head>
@@ -261 +624 @@
         }//end method
 }//end class
-
-if(isset($_POST["command"])){
-        $myreport= new salesHistoryReport();
-        $myreport->initialize($_POST,$db);
-
-        $myreport->showReport();
-} else {
-
-                require("include/fields.php");
-
-                $pageTitle = "Product Sales History";
-                $phpbms->cssIncludes[] = "pages/historyreports.css";
-                $phpbms->showMenu = false;
-
-                //Form Elements
-                //==============================================================
-                $theform = new phpbmsForm();
-
-
-                $thedate = dateToString( mktime(0,0,0,date("m"),1),"SQL" );
-                $theinput = new inputDatePicker("fromdate", $thedate, "from",true);
-                $theform->addField($theinput);
-
-                $thedate = dateToString( mktime(0,0,0,date("m")+1,0,date("Y")), "SQL" );
-                $theinput = new inputDatePicker("todate", $thedate, "to",true);
-                $theform->addField($theinput);
-
-                $theform->jsMerge();
-                //==============================================================
-                //End Form Elements
-
-                include("header.php");
 ?>
-<form action="<?php echo $_SERVER["PHP_SELF"]?>" method="post" name="totals" onsubmit="return validateForm(this)">
-<div class="bodyline" id="reportOptions">
-        <h1 id="topTitle"><span>Product Sales History Options</span></h1>
-                <fieldset>
-                        <legend>time frame</legend>
-
-                        <p id="fromP"><?php $theform->showField("fromdate");?></p>
-
-                        <p><?php $theform->showField("todate");?></p>
-                </fieldset>
-
-                <p>
-                        <label for="status">include line items from...<br /></label>
-                   <select id="status" name="status">
-                                <option value="Orders/Invoices" selected="selected">Orders/Invoices</option>
-                                <option value="Invoices">Invoices</option>
-                                <option value="Orders">Orders</option>
-                   </select>
-                </p>
-
-                <div align="right">
-                        <input name="command" type="submit" class="Buttons" id="print" value="print" />
-                        <input name="cancel" type="button" class="Buttons" id="cancel" value="cancel" onclick="window.close();" />
-                </div>
-</div>
-</form>
-<?php
-include("footer.php");
-}?>

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

@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
-
-        if(!isset($_SESSION["userinfo"])){
-
-                //set encoding to latin1 (fpdf doesnt like utf8)
-                $sqlEncoding = "latin1";
-                require_once("../../../include/session.php");
-
-        }
-
-        if(!class_exists("phpbmsReport"))
-                include("report/report_class.php");
-
-        class receiptPDF extends phpbmsReport{
-
-                var $title = "Receipt";
-                var $lineitemBoxHeight = 4.25;
-                /**
-                  * $count
-                  * @var int The number of invoice records being displayed
-                  */
-                var $count;
-
-                function receiptPDF($db, $orientation='P', $unit='mm', $format='Letter'){
-
-                        $this->db = $db;
-
-                        if(!class_exists("phpbmsPDFReport"))
-                                include("report/pdfreport_class.php");
-
-                        $this->pdf = new phpbmsPDFReport($db, $orientation, $unit, $format);
-
-                        $this->initialize();
-
-                }//end method
-
-
-                function initialize(){
-                        //This function will set column headings, sizes and formatting
-
-                        $pdf = &$this->pdf;
-
-                        $topinfo = array();
-                        $topinfo[] = new pdfColumn("ID", "id", 0.75);
-                        $topinfo[] = new pdfColumn("Date", "receiptdate", 1, "date");
-                        $topinfo[] = new pdfColumn("Processed By", "processedby", 0);
-
-                        $size = 0;
-                        foreach($topinfo as $column)
-                                $size += $column->size;
-
-                        $topinfo[2]->size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
-
-                        $this->topinfo = $topinfo;
-
-
-                        $lineitems = array();
-                        $lineitems[] = new pdfColumn("Doc Ref", "relatedid", 0.5);
-                        $lineitems[] = new pdfColumn("Type", "type", 0.75);
-                        $lineitems[] = new pdfColumn("Doc Date", "itemdate", 0.75, "date");
-                        $lineitems[] = new pdfColumn("Due Date", "duedate", 0.75, "date");
-
-                        $lineitems[] = new pdfColumn("Doc Amount", "amount", 0, "currency", "R");
-                        $lineitems[] = new pdfColumn("Applied", "applied", 0.75, "currency", "R");
-                        $lineitems[] = new pdfColumn("Discount", "discount", 0.75, "currency", "R");
-                        $lineitems[] = new pdfColumn("Tax Adj", "taxadjustment", 0.75, "currency", "R");
-
-                        $size = 0;
-                        foreach($lineitems as $column)
-                                $size += $column->size;
-
-                        $lineitems[4]->size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
-
-                        $this->lineitems = $lineitems;
-
-                        $totalsinfo = array();
-                        $totalsinfo[] = new pdfColumn("Distribution Remaining", "remaining", 0, "currency", "R");
-                        $totalsinfo[] = new pdfColumn("Receipt Total", "amount", 0, "currency", "R");
-
-                        $this->totalsinfo = $totalsinfo;
-
-                }//end method
-
-
-                function generate($whereclause = NULL, $sortorder = "receipts.id"){
-
-                        $pdf = &$this->pdf;
-
-                        if($whereclause)
-                                $this->whereclause = $whereclause;
-                        elseif(!$this->whereclause)
-                                $this->whereclause = "receipts.id = -400";
-
-                        if($sortorder)
-                                $this->sortorder = $sortorder;
-                        elseif(!$this->sortorder)
-                                $this->sortorder = "receipts.id";
-
-                        $paymentFields = "";
-                        if(ENCRYPT_PAYMENT_FIELDS){
-
-                                $paymentFields = "
-                                        ".$this->db->decrypt("`ccnumber`")." AS `ccnumber`,
-                                        ".$this->db->decrypt("`ccverification`")." AS `ccverification`,
-                                        ".$this->db->decrypt("`ccexpiration`")." AS `ccexpiration`,
-                                        ".$this->db->decrypt("`routingnumber`")." AS `routingnumber`,
-                                        ".$this->db->decrypt("`accountnumber`")." AS `accountnumber`,
-                                ";
-
-                        }//end if
-
-                        $querystatement = "
-                                SELECT
-                                        receipts.*,
-                                        ".$paymentFields."
-
-                                        clients.firstname,
-                                        clients.lastname,
-                                        clients.company,
-                                        addresses.address1,
-                                        addresses.address2,
-                                        addresses.city,
-                                        addresses.state,
-                                        addresses.postalcode,
-                                        addresses.country,
-                                        clients.homephone,
-                                        clients.workphone,
-                                        clients.email,
-
-                                        paymentmethods.name AS paymentname,
-                                        paymentmethods.type AS paymenttype,
-
-                                        users.firstname AS processorfirst,
-                                        users.lastname AS processorlast
-
-                                FROM
-                                        receipts INNER JOIN clients ON receipts.clientid = clients.uuid
-                                        INNER JOIN users ON receipts.modifiedby = users.id INNER JOIN
-                                        addresstorecord ON addresstorecord.tabledefid = 'tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083' AND addresstorecord.primary = 1
-                                        AND addresstorecord.recordid = clients.uuid INNER JOIN addresses
-                                        ON addresstorecord.addressid = addresses.uuid
-                                        LEFT JOIN paymentmethods ON receipts.paymentmethodid = paymentmethods.uuid";
-
-                        $querystatement = $this->assembleSQL($querystatement);
-                        $queryresult = $this->db->query($querystatement);
-
-                        
-                        $this->count = $this->db->numRows($queryresult);
-                        if($this->count == 0){
-
-                                $this->_showNoRecords();
-                                exit;
-
-                        }//end if
-
-                        $pdf->hasComapnyHeader = true;
-                        $pdf->SetMargins();
-
-                        //iterate through each invoice record
-                        while($receiptrecord = $this->db->fetchArray($queryresult)){
-
-                                $querystatement = "
-                                        SELECT
-                                                SUM(applied) AS thesum
-                                        FROM
-                                                receiptitems
-                                        WHERE
-                                                receiptid ='".$receiptrecord["uuid"]."'
-                                ";
-
-                                $sumresult = $this->db->query($querystatement);
-                                $sumrecord = $this->db->fetchArray($sumresult);
-
-                                $receiptrecord["remaining"] = $receiptrecord["amount"] - $sumrecord["thesum"];
-
-                                $this->page = 0;
-
-                                $this->receiptrecord = $receiptrecord;
-
-                                //adds top info
-                                $top = $this->_addPage();
-
-                                $this->_addLineItems($top);
-
-                                $pdf->SetXY($pdf->leftmargin, $top["y"] + $this->lineitemBoxHeight + 0.125);
-
-                                //totals
-                                $this->_addTotals();
-
-                                //Print any special/instructions and stuff
-                                $this->_addNotes();
-
-                        }//end while;
-
-
-                }//end method
-
-
-                function _addPage(){
-
-                        $pdf = &$this->pdf;
-
-                        $pdf->AddPage();
-                        $this->page++;
-
-                        $nextY = $pdf->getY();
-
-                        //TITLE
-                        $titleWidth=2.375;
-                        $titleHeight=.25;
-                        $pdf->setStyle("title");
-                        $pdf->SetXY(-1*($titleWidth+$pdf->rightmargin), $pdf->topmargin);
-                        $pdf->Cell($titleWidth, $titleHeight,$this->title, $pdf->borderDebug,1,"R");
-
-                        //CLIENT
-                        $startY = $pdf->GetY() + 0.75;
-
-                        $boxHeight = 1.75;
-                        $boxWidth = ($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin)/2 -0.0625;
-
-                        $pdf->setLineWidth(0.02);
-                        $pdf->Rect($pdf->leftmargin, $startY, $boxWidth, $boxHeight);
-                        $pdf->setLineWidth(0.01);
-
-                        $pdf->setStyle("header");
-                        $pdf->setY($startY);
-                        $pdf->Cell($boxWidth, 0.17, "CLIENT", $pdf->borderDebug, 2, "L", 1);
-                        $pdf->setStyle("normal");
-
-                        //Company Name
-                        $companyDisplay = "";
-                        if($this->receiptrecord["company"]){
-                                $companyDisplay .= $this->receiptrecord["company"];
-                                if($this->receiptrecord["firstname"])
-                                        $companyDisplay .= " (".$this->receiptrecord["firstname"]." ".$this->receiptrecord["lastname"].")";
-                        } else
-                                $companyDisplay .= $this->receiptrecord["firstname"]." ".$this->receiptrecord["lastname"];
-
-                        $pdf->SetXY($pdf->GetX() + 0.0625, $pdf->GetY() + 0.0625);
-                        $pdf->SetFont("Arial", "B", 10);
-                        $pdf->Cell($boxWidth - 0.125, 0.17, $companyDisplay, $pdf->borderDebug, 2, "L");
-
-                        $client = $this->_setClientInfo();
-
-                        $pdf->SetFont("Arial", "", 10);
-                        $pdf->setXY($pdf->GetX(), $pdf->GetY() + 0.0625);
-                        $pdf->MultiCell($boxWidth - 0.125,.17,$client, $pdf->borderDebug);
-
-                        //PAYMENT
-                        $pdf->setLineWidth(0.02);
-                        $pdf->Rect($pdf->leftmargin + $boxWidth + 0.125, $startY, $boxWidth, $boxHeight);
-                        $pdf->setLineWidth(0.01);
-
-                        $pdf->setStyle("header");
-                        $pdf->setXY($pdf->leftmargin + $boxWidth + 0.125, $startY);
-                        $pdf->Cell($boxWidth, 0.17, "PAYMENT", $pdf->borderDebug, 2, "L", 1);
-                        $pdf->setStyle("normal");
-
-                        if(!$this->receiptrecord["paymentname"])
-                                $this->receiptrecord["paymentname"] = "Other";
-
-                        $pdf->SetXY($pdf->GetX() + 0.0625, $pdf->GetY() + 0.0625);
-                        $pdf->SetFont("Arial", "B", 10);
-                        $pdf->Cell($boxWidth - 0.125, 0.17, $this->receiptrecord["paymentname"], $pdf->borderDebug, 2, "L");
-
-
-                        $paymentInfo = $this->_getPaymentInfo();
-                        $pdf->SetFont("Arial", "", 10);
-                        $pdf->setXY($pdf->GetX(), $pdf->GetY() + 0.0625);
-                        $pdf->MultiCell($boxWidth - 0.125,.17, $paymentInfo, $pdf->borderDebug);
-
-                        $pdf->setXY($pdf->leftmargin, $startY + $boxHeight + 0.125);
-
-                        $this->_addTopInfo();
-
-                        //line item headings
-                        $pdf->setStyle("header");
-                        $pdf->SetLineWidth(0.02);
-
-                        $coords["x"] = $pdf->GetX();
-                        $coords["y"] = $pdf->GetY();
-
-                        foreach($this->lineitems as $column)
-                                $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
-
-
-                        return $coords;
-
-                }//end method
-
-
-                function _setClientInfo(){
-
-                        $client = $this->receiptrecord["address1"];
-
-                        if($this->receiptrecord["address2"])
-                                $client .= "\n".$this->receiptrecord["address2"];
-
-                        $client .="\n".$this->receiptrecord["city"].", ".$this->receiptrecord["state"]." ".$this->receiptrecord["postalcode"];
-
-                        if($this->receiptrecord["country"])
-                                $client .=" ".$this->receiptrecord["country"];
-
-                        $phoneemail = "";
-                        if($this->receiptrecord["workphone"] || $this->receiptrecord["homephone"]){
-
-                                if($this->receiptrecord["workphone"])
-                                        $phoneemail = $this->receiptrecord["workphone"]." (W)";
-                                else
-                                        $phoneemail = $this->receiptrecord["homephone"]." (H)";
-
-                                $phoneemail.="\n";
-
-                        }//end if
-
-                        if($this->receiptrecord["email"])
-                                $phoneemail .= $this->receiptrecord["email"];
-
-                        if($phoneemail)
-                                $client .= "\n\n".$phoneemail;
-
-                        return $client;
-
-                }//end method
-
-
-                function _getPaymentInfo(){
-
-                        $info = "";
-
-                        switch($this->receiptrecord["paymenttype"]){
-
-                                case "charge":
-
-                                        $info .= $this->receiptrecord["ccnumber"];
-                                        $info .= "\n Expires: ".$this->receiptrecord["ccexpiration"];
-                                        if($this->receiptrecord["ccverification"])
-                                                $info .= "\n Verification/Pin: ".$this->receiptrecord["ccverification"];
-                                        break;
-
-                                case "draft":
-
-                                        $info .= $this->receiptrecord["bankname"];
-                                        $info .= "\n Check No: ".$this->receiptrecord["checkno"];
-
-                                        if($this->receiptrecord["accountnumber"] || $this->receiptrecord["routingnumber"])
-                                                $info .= "\n";
-
-                                        if($this->receiptrecord["accountnumber"])
-                                                $info .="\n".$this->receiptrecord["accountnumber"];
-
-                                        if($this->receiptrecord["routingnumber"])
-                                                $info .="\n".$this->receiptrecord["routingnumber"];
-
-                                        break;
-
-                                default:
-
-                                        if(!$this->receiptrecord["paymentmethodid"])
-                                                $info .= $this->receiptrecord["paymentother"];
-
-                        }//endswitch
-
-                        if($this->receiptrecord["transactionid"])
-                                $info .= "\nTransaction ID: ".$this->receiptrecord["transactionid"];
-
-                        return $info;
-
-                }//end method
-
-
-                function _addTopInfo(){
-
-                        $pdf = &$this->pdf;
-
-                        $pdf->setStyle("header");
-                        $pdf->SetLineWidth(0.02);
-
-                        foreach($this->topinfo as $column)
-                                $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
-
-                        $pdf->Rect($pdf->leftmargin, $pdf->GetY(), ($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin), 0.39);
-
-                        $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + .2);
-
-
-                        $this->receiptrecord["processedby"] = $this->receiptrecord["processorfirst"]." ".$this->receiptrecord["processorlast"];
-                        $pdf->setStyle("normal");
-
-                        foreach($this->topinfo as $column){
-
-                                if($column->format != "")
-                                        $value = formatVariable($this->receiptrecord[$column->fieldname], $column->format);
-                                else
-                                        $value = $this->receiptrecord[$column->fieldname];
-
-                                $pdf->Cell($column->size, 0.18, $value, $pdf->borderDebug, 0, $column->align);
-
-                        }//end foreach
-
-                        $pdf->SetY($pdf->GetY() + 0.18 + 0.125);
-
-                }//end method
-
-
-                function _addLineItems($coords){
-
-                        $pdf = &$this->pdf;
-
-                        $lineitemresult = $this->_getLineItems();
-
-                        $pdf->setStyle("normal");
-
-                        $pdf->SetY($pdf->GetY() + 0.18 + 0.0625);
-
-                        while($line = $this->db->fetchArray($lineitemresult)){
-
-                                if($pdf->GetY() + 0.17*3 > $coords["y"] + $this->lineitemBoxHeight){
-
-                                        $pdf->SetLineWidth(0.02);
-                                        $pdf->Rect($coords["x"], $coords["y"], $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $this->lineitemBoxHeight);
-                                        $pdf->SetLineWidth(0.01);
-
-                                        $this->_addPage();
-
-                                }//end if
-
-                                if($line["type"] == "invoice"){
-
-                                        $tempDate = stringToDate($line["itemdate"], "SQL");
-                                        $line["duedate"] = dateToString( strtotime(TERM1_DAYS." days", $tempDate), "SQL" );
-
-                                } else
-                                        $line["duedate"] = "";
-
-                                if($line["type"] == "deposit" && $line["relatedid"] == $this->receiptrecord["id"]){
-                                        $line["relatedid"] = "";
-                                        $line["amount"] = 0;
-                                        $line["aritemid"] = 0;
-                                }
-
-                                if($this->receiptrecord["posted"])
-                                        $line["docdue"] = $line["amount"] - $line["paid"];
-                                elseif($line["relatedid"])
-                                        $line["docdue"] = $line["amount"] - $line["paid"] - $line["applied"] - $line["discount"] - $line["taxadjustment"];
-                                else
-                                        $line["docDue"] = 0;
-
-
-                                foreach($this->lineitems as $column){
-
-                                        $ln = 0;
-
-
-                                        switch($column->fieldname){
-
-                                                case "parts":
-                                                        $pdf->SetFont("Arial", "B", 8);
-                                                        $pdf->Write(0.17, $line["partname"]);
-                                                        $pdf->setStyle("normal");
-                                                        $pdf->SetX($pdf->leftmargin + $column->size);
-                                                        break;
-
-                                                default:
-                                                        if($column->format != "")
-                                                                $value = formatVariable($line[$column->fieldname], $column->format);
-                                                        else
-                                                                $value = $line[$column->fieldname];
-
-                                                        if($value == "·")
-                                                                $value = " ";
-
-                                                        if($column->fieldname == $this->lineitems[count($this->lineitems)-1]->fieldname)
-                                                                $ln = 2;
-
-                                                        $pdf->Cell($column->size, 0.17, $value, $pdf->borderDebug, $ln, $column->align);
-                                                        break;
-
-                                        }//end switch
-
-                                }//end foreach
-
-                                $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + 0.0625);
-                                $pdf->SetLineWidth(0.01);
-                                $pdf->SetDrawColor(180,180,180);
-                                $pdf->Line($pdf->leftmargin, $pdf->GetY(), $pdf->paperwidth - $pdf->rightmargin, $pdf->GetY());
-                                $pdf->SetDrawColor(0,0,0);
-                                $pdf->SetLineWidth(0.02);
-                                $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + 0.0625);
-
-                        }//end while
-
-                        $pdf->SetLineWidth(0.02);
-                        $pdf->Rect($coords["x"], $coords["y"], $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $this->lineitemBoxHeight);
-
-                }//end method
-
-
-                function _getLineItems(){
-
-                        $querystatement = "
-                                SELECT
-                                        receiptitems.aritemid,
-                                        receiptitems.applied,
-                                        receiptitems.discount,
-                                        receiptitems.taxadjustment,
-                                        aritems.type,
-                                        IF(`invoices`.`id`,`invoices`.`id`,`receipts`.`id`) AS `relatedid`,
-                                        aritems.itemdate,
-                                        aritems.amount,
-                                        aritems.paid
-                                FROM
-                                        ((receiptitems INNER JOIN aritems ON receiptitems.aritemid = aritems.uuid)LEFT JOIN `invoices` ON `aritems`.`relatedid` = `invoices`.`uuid`) LEFT JOIN `receipts` ON `aritems`.`relatedid` = `receipts`.`uuid`
-                                WHERE
-                                        receiptitems.receiptid = '".mysql_real_escape_string($this->receiptrecord["uuid"])."'
-                                ORDER BY
-                                        aritems.type,
-                                        aritems.itemdate";
-
-                                return $this->db->query($querystatement);
-
-                }//end method
-
-
-                function _addNotes(){
-
-                        $pdf = &$this->pdf;
-
-                        $height = 1;
-                        $nextPos = $pdf->GetY() + $height + 0.125;
-
-                        $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
-                        $pdf->setStyle("header");
-                        $pdf->Cell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, 0.18, "Notes", 1, 2, "L", 1);
-
-                        $pdf->setStyle("normal");
-                        $pdf->SetXY($pdf->GetX() + .06125, $pdf->GetY() + .06125);
-                        $pdf->MultiCell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - 0.125, 0.18, $this->receiptrecord["memo"]);
-
-                        $pdf->SetXY($pdf->leftmargin, $nextPos);
-
-                }//end method
-
-
-                function _addTotals(){
-
-                        $pdf = &$this->pdf;
-
-                        $size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin;
-
-                        $tempTotalsinfo = $this->totalsinfo;
-
-                        if($this->receiptrecord["remaining"]){
-
-                                $this->totalsinfo[1]->size = 1;
-                                $size -= 1;
-
-                        } else
-                                array_shift($this->totalsinfo);
-
-                        $this->totalsinfo[0]->size = $size;
-
-                        $height = .5;
-                        $nextPos = $pdf->GetY() + $height + 0.125;
-
-                        $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
-
-                        $pdf->setStyle("header");
-
-                        foreach($this->totalsinfo as $column)
-                                $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
-
-                        $pdf->setStyle("normal");
-                        $pdf->SetFont("Arial", "B", 10);
-                        $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + 0.18 + 0.0625);
-
-                        foreach($this->totalsinfo as $column){
-
-                                if($column->format != "")
-                                        $value = formatVariable($this->receiptrecord[$column->fieldname], $column->format);
-                                else
-                                        $value = $this->receiptrecord[$column->fieldname];
-
-                                $pdf->Cell($column->size, 0.18, $value, $pdf->borderDebug, 0, $column->align);
-
-                        }//end foreach
-
-                        if(isset($this->totalsinfo[1]))
-                                $this->totalsinfo[1]->size = 0;
-
-                        $pdf->SetXY($pdf->leftmargin, $nextPos);
-
-                        $this->totalsinfo = $tempTotalsinfo;
-
-                }//end method
-
-
-
-                function output($destination = "screen" , $userinfo = NULL){
-
-                        switch($destination){
-
-                                case "screen":
-                                        $userinfo = cleanFilename((string)$userinfo);
-                                        $this->pdf->Output($userinfo, 'D');
-                                        break;
-
-                                case "email":
-
-                                        if(!$userinfo)
-                                                $userinfo = $_SESSION["userinfo"];
-
-                                        if(!$userinfo["email"] || !$this->receiptrecord["email"])
-                                                return false;
-
-                                        $pdf = $this->pdf->Output(NULL, "S");
-
-                                        $to =           $this->receiptrecord["email"];
-                                        $from =         $userinfo["email"];
-                                        $subject =      "Your ".$this->title." from ".COMPANY_NAME;
-                                        $message =      "Attached is your ".$this->title." from ".COMPANY_NAME."\n\n" .
-                                                                "The attachment requires Adobe Acrobat Reader to view. \n If you do not " .
-                                                                "have Acrobat Reader, you can download it at http://www.adobe.com  \n\n" .
-                                                                COMPANY_NAME."\n".
-                                                                COMPANY_ADDRESS."\n".COMPANY_CSZ."\n".COMPANY_PHONE;
-
-                                        $headers = "From: $from";
-
-                                        $semi_rand = md5( time() );
-                                        $mime_boundary = "==Multipart_Boundary_x{$semi_rand}x";
-
-                                        $headers .= "\nMIME-Version: 1.0\n" .
-                                                                "Content-Type: multipart/mixed;\n" .
-                                                                " boundary=\"{$mime_boundary}\"";
-
-                                        $message = "This is a multi-part message in MIME format.\n\n" .
-                                                        "--{$mime_boundary}\n" .
-                                                        "Content-Type: text/plain; charset=\"iso-8859-1\"\n" .
-                                                        "Content-Transfer-Encoding: 7bit\n\n" .
-                                                        $message . "\n\n";
-
-                                        $pdf = chunk_split( base64_encode( $pdf ) );
-
-                                        $message .= "--{$mime_boundary}\n" .
-                                                         "Content-Type: {application/pdf};\n" .
-                                                         " name=\"".$this->title.$this->receiptrecord["id"]."\"\n" .
-                                                         "Content-Disposition: attachment;\n" .
-                                                         " filename=\"".$this->title.$this->receiptrecord["id"].".pdf\"\n" .
-                                                         "Content-Transfer-Encoding: base64\n\n" .
-                                                         $pdf . "\n\n" .
-                                                         "--{$mime_boundary}--\n";
-
-                                        return @ mail($to, $subject, $message, $headers);
-
-                                        break;
-
-                        }//endswitch
-
-                }//end method
-
-        }//end class
-
-
-//PROCESSING
-//=============================================================================
+if(!class_exists("phpbmsReport"))
+    include("../../../report/report_class.php");
+
+class receiptPDF extends phpbmsReport{
+
+    var $lineitemBoxHeight = 4.25;
+
+    /**
+      * $count
+      * @var int The number of invoice records being displayed
+      */
+    var $count;
+
+
+    function receiptPDF($db, $reportUUID, $tabledefUUID, $orientation='P', $unit='mm', $format='Letter'){
+
+        parent::phpbmsReport($db, $reportUUID, $tabledefUUID);
+
+        if(!class_exists("phpbmsPDFReport"))
+            include("report/pdfreport_class.php");
+
+        $this->pdf = new phpbmsPDFReport($db, $orientation, $unit, $format);
+
+        $this->checkForDefaultSettings();
+
+        $this->initialize();
+
+        $this->pdf->borderDebug = $this->settings["borderDebug"];
+
+    }//end method
+
+
+    /**
+     * function checkForDefaultSettings
+     *
+     * Checks to make sure loaded report Settings exist and are correct
+     */
+    function checkForDefaultSettings(){
+
+        if(!isset($this->settings["reportTitle"]))
+            $this->settings["reportTitle"] = "Receipt";
+
+        if(!isset($this->settings["borderDebug"]))
+            $this->settings["borderDebug"] = 0;
+
+    }//end function checkForDefaultSettings
+
+
+    /**
+     * function initialize
+     *
+     * This function sets column headings sizes, and formatting
+     */
+    function initialize(){
+
+        $pdf = &$this->pdf;
+
+        $topinfo = array();
+        $topinfo[] = new pdfColumn("ID", "id", 0.75);
+        $topinfo[] = new pdfColumn("Date", "receiptdate", 1, "date");
+        $topinfo[] = new pdfColumn("Processed By", "processedby", 0);
+
+        $size = 0;
+        foreach($topinfo as $column)
+                $size += $column->size;
+
+        $topinfo[2]->size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
+
+        $this->topinfo = $topinfo;
+
+
+        $lineitems = array();
+        $lineitems[] = new pdfColumn("Doc Ref", "relatedid", 0.5);
+        $lineitems[] = new pdfColumn("Type", "type", 0.75);
+        $lineitems[] = new pdfColumn("Doc Date", "itemdate", 0.75, "date");
+        $lineitems[] = new pdfColumn("Due Date", "duedate", 0.75, "date");
+
+        $lineitems[] = new pdfColumn("Doc Amount", "amount", 0, "currency", "R");
+        $lineitems[] = new pdfColumn("Applied", "applied", 0.75, "currency", "R");
+        $lineitems[] = new pdfColumn("Discount", "discount", 0.75, "currency", "R");
+        $lineitems[] = new pdfColumn("Tax Adj", "taxadjustment", 0.75, "currency", "R");
+
+        $size = 0;
+        foreach($lineitems as $column)
+                $size += $column->size;
+
+        $lineitems[4]->size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - $size;
+
+        $this->lineitems = $lineitems;
+
+        $totalsinfo = array();
+        $totalsinfo[] = new pdfColumn("Distribution Remaining", "remaining", 0, "currency", "R");
+        $totalsinfo[] = new pdfColumn("Receipt Total", "amount", 0, "currency", "R");
+
+        $this->totalsinfo = $totalsinfo;
+
+    }//end method
+
+
+        function generate($whereclause = NULL, $sortorder = "receipts.id"){
+
+                $pdf = &$this->pdf;
+
+                if($whereclause)
+                        $this->whereClause= $whereclause;
+                elseif(!$this->whereClause)
+                        $this->whereClause = "receipts.id = -400";
+
+                if($sortorder)
+                        $this->sortOrder = $sortorder;
+                elseif(!$this->sortOrder)
+                        $this->sortOrder = "receipts.id";
+
+                $paymentFields = "";
+                if(ENCRYPT_PAYMENT_FIELDS){
+
+                        $paymentFields = "
+                                ".$this->db->decrypt("`ccnumber`")." AS `ccnumber`,
+                                ".$this->db->decrypt("`ccverification`")." AS `ccverification`,
+                                ".$this->db->decrypt("`ccexpiration`")." AS `ccexpiration`,
+                                ".$this->db->decrypt("`routingnumber`")." AS `routingnumber`,
+                                ".$this->db->decrypt("`accountnumber`")." AS `accountnumber`,
+                        ";
+
+                }//end if
+
+                $querystatement = "
+                        SELECT
+                                receipts.*,
+                                ".$paymentFields."
+
+                                clients.firstname,
+                                clients.lastname,
+                                clients.company,
+                                addresses.address1,
+                                addresses.address2,
+                                addresses.city,
+                                addresses.state,
+                                addresses.postalcode,
+                                addresses.country,
+                                clients.homephone,
+                                clients.workphone,
+                                clients.email,
+
+                                paymentmethods.name AS paymentname,
+                                paymentmethods.type AS paymenttype,
+
+                                users.firstname AS processorfirst,
+                                users.lastname AS processorlast
+
+                        FROM
+                                receipts INNER JOIN clients ON receipts.clientid = clients.uuid
+                                INNER JOIN users ON receipts.modifiedby = users.id INNER JOIN
+                                addresstorecord ON addresstorecord.tabledefid = 'tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083' AND addresstorecord.primary = 1
+                                AND addresstorecord.recordid = clients.uuid INNER JOIN addresses
+                                ON addresstorecord.addressid = addresses.uuid
+                                LEFT JOIN paymentmethods ON receipts.paymentmethodid = paymentmethods.uuid";
+
+                $querystatement = $this->assembleSQL($querystatement);
+                $queryresult = $this->db->query($querystatement);
+
+
+                $this->count = $this->db->numRows($queryresult);
+                if($this->count == 0){
+
+                        $this->showNoRecords();
+                        exit;
+
+                }//end if
+
+                $pdf->logoInHeader = true;
+                $pdf->companyInfoInHeader = true;
+                $pdf->SetMargins();
+
+                //iterate through each invoice record
+                while($receiptrecord = $this->db->fetchArray($queryresult)){
+
+                        $querystatement = "
+                                SELECT
+                                        SUM(applied) AS thesum
+                                FROM
+                                        receiptitems
+                                WHERE
+                                        receiptid ='".$receiptrecord["uuid"]."'
+                        ";
+
+                        $sumresult = $this->db->query($querystatement);
+                        $sumrecord = $this->db->fetchArray($sumresult);
+
+                        $receiptrecord["remaining"] = $receiptrecord["amount"] - $sumrecord["thesum"];
+
+                        $this->page = 0;
+
+                        $this->receiptrecord = $receiptrecord;
+
+                        //adds top info
+                        $top = $this->_addPage();
+
+                        $this->_addLineItems($top);
+
+                        $pdf->SetXY($pdf->leftmargin, $top["y"] + $this->lineitemBoxHeight + 0.125);
+
+                        //totals
+                        $this->_addTotals();
+
+                        //Print any special/instructions and stuff
+                        $this->_addNotes();
+
+                        $this->receiptrecord = $receiptrecord;
+
+                }//end while;
+
+
+        }//end method
+
+
+        function _addPage(){
+
+                $pdf = &$this->pdf;
+
+                $pdf->AddPage();
+                $this->page++;
+
+                $nextY = $pdf->getY();
+
+                //TITLE
+                $titleWidth=2.375;
+                $titleHeight=.25;
+                $pdf->setStyle("title");
+                $pdf->SetXY(-1*($titleWidth+$pdf->rightmargin), $pdf->topmargin);
+                $pdf->Cell($titleWidth, $titleHeight, $this->settings["reportTitle"], $pdf->borderDebug,1,"R");
+
+                //CLIENT
+                $startY = $pdf->GetY() + 0.75;
+
+                $boxHeight = 1.75;
+                $boxWidth = ($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin)/2 -0.0625;
+
+                $pdf->setLineWidth(0.02);
+                $pdf->Rect($pdf->leftmargin, $startY, $boxWidth, $boxHeight);
+                $pdf->setLineWidth(0.01);
+
+                $pdf->setStyle("header");
+                $pdf->setY($startY);
+                $pdf->Cell($boxWidth, 0.17, "CLIENT", $pdf->borderDebug, 2, "L", 1);
+                $pdf->setStyle("normal");
+
+                //Company Name
+                $companyDisplay = "";
+                if($this->receiptrecord["company"]){
+                        $companyDisplay .= $this->receiptrecord["company"];
+                        if($this->receiptrecord["firstname"])
+                                $companyDisplay .= " (".$this->receiptrecord["firstname"]." ".$this->receiptrecord["lastname"].")";
+                } else
+                        $companyDisplay .= $this->receiptrecord["firstname"]." ".$this->receiptrecord["lastname"];
+
+                $pdf->SetXY($pdf->GetX() + 0.0625, $pdf->GetY() + 0.0625);
+                $pdf->SetFont("Arial", "B", 10);
+                $pdf->Cell($boxWidth - 0.125, 0.17, $companyDisplay, $pdf->borderDebug, 2, "L");
+
+                $client = $this->_setClientInfo();
+
+                $pdf->SetFont("Arial", "", 10);
+                $pdf->setXY($pdf->GetX(), $pdf->GetY() + 0.0625);
+                $pdf->MultiCell($boxWidth - 0.125,.17,$client, $pdf->borderDebug);
+
+                //PAYMENT
+                $pdf->setLineWidth(0.02);
+                $pdf->Rect($pdf->leftmargin + $boxWidth + 0.125, $startY, $boxWidth, $boxHeight);
+                $pdf->setLineWidth(0.01);
+
+                $pdf->setStyle("header");
+                $pdf->setXY($pdf->leftmargin + $boxWidth + 0.125, $startY);
+                $pdf->Cell($boxWidth, 0.17, "PAYMENT", $pdf->borderDebug, 2, "L", 1);
+                $pdf->setStyle("normal");
+
+                if(!$this->receiptrecord["paymentname"])
+                        $this->receiptrecord["paymentname"] = "Other";
+
+                $pdf->SetXY($pdf->GetX() + 0.0625, $pdf->GetY() + 0.0625);
+                $pdf->SetFont("Arial", "B", 10);
+                $pdf->Cell($boxWidth - 0.125, 0.17, $this->receiptrecord["paymentname"], $pdf->borderDebug, 2, "L");
+
+
+                $paymentInfo = $this->_getPaymentInfo();
+                $pdf->SetFont("Arial", "", 10);
+                $pdf->setXY($pdf->GetX(), $pdf->GetY() + 0.0625);
+                $pdf->MultiCell($boxWidth - 0.125,.17, $paymentInfo, $pdf->borderDebug);
+
+                $pdf->setXY($pdf->leftmargin, $startY + $boxHeight + 0.125);
+
+                $this->_addTopInfo();
+
+                //line item headings
+                $pdf->setStyle("header");
+                $pdf->SetLineWidth(0.02);
+
+                $coords["x"] = $pdf->GetX();
+                $coords["y"] = $pdf->GetY();
+
+                foreach($this->lineitems as $column)
+                        $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
+
+
+                return $coords;
+
+        }//end method
+
+
+        function _setClientInfo(){
+
+                $client = $this->receiptrecord["address1"];
+
+                if($this->receiptrecord["address2"])
+                        $client .= "\n".$this->receiptrecord["address2"];
+
+                $client .="\n".$this->receiptrecord["city"].", ".$this->receiptrecord["state"]." ".$this->receiptrecord["postalcode"];
+
+                if($this->receiptrecord["country"])
+                        $client .=" ".$this->receiptrecord["country"];
+
+                $phoneemail = "";
+                if($this->receiptrecord["workphone"] || $this->receiptrecord["homephone"]){
+
+                        if($this->receiptrecord["workphone"])
+                                $phoneemail = $this->receiptrecord["workphone"]." (W)";
+                        else
+                                $phoneemail = $this->receiptrecord["homephone"]." (H)";
+
+                        $phoneemail.="\n";
+
+                }//end if
+
+                if($this->receiptrecord["email"])
+                        $phoneemail .= $this->receiptrecord["email"];
+
+                if($phoneemail)
+                        $client .= "\n\n".$phoneemail;
+
+                return $client;
+
+        }//end method
+
+
+        function _getPaymentInfo(){
+
+                $info = "";
+
+                switch($this->receiptrecord["paymenttype"]){
+
+                        case "charge":
+
+                                $info .= $this->receiptrecord["ccnumber"];
+                                $info .= "\n Expires: ".$this->receiptrecord["ccexpiration"];
+                                if($this->receiptrecord["ccverification"])
+                                        $info .= "\n Verification/Pin: ".$this->receiptrecord["ccverification"];
+                                break;
+
+                        case "draft":
+
+                                $info .= $this->receiptrecord["bankname"];
+                                $info .= "\n Check No: ".$this->receiptrecord["checkno"];
+
+                                if($this->receiptrecord["accountnumber"] || $this->receiptrecord["routingnumber"])
+                                        $info .= "\n";
+
+                                if($this->receiptrecord["accountnumber"])
+                                        $info .="\n".$this->receiptrecord["accountnumber"];
+
+                                if($this->receiptrecord["routingnumber"])
+                                        $info .="\n".$this->receiptrecord["routingnumber"];
+
+                                break;
+
+                        default:
+
+                                if(!$this->receiptrecord["paymentmethodid"])
+                                        $info .= $this->receiptrecord["paymentother"];
+
+                }//endswitch
+
+                if($this->receiptrecord["transactionid"])
+                        $info .= "\nTransaction ID: ".$this->receiptrecord["transactionid"];
+
+                return $info;
+
+        }//end method
+
+
+        function _addTopInfo(){
+
+                $pdf = &$this->pdf;
+
+                $pdf->setStyle("header");
+                $pdf->SetLineWidth(0.02);
+
+                foreach($this->topinfo as $column)
+                        $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
+
+                $pdf->Rect($pdf->leftmargin, $pdf->GetY(), ($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin), 0.39);
+
+                $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + .2);
+
+
+                $this->receiptrecord["processedby"] = $this->receiptrecord["processorfirst"]." ".$this->receiptrecord["processorlast"];
+                $pdf->setStyle("normal");
+
+                foreach($this->topinfo as $column){
+
+                        if($column->format != "")
+                                $value = formatVariable($this->receiptrecord[$column->fieldname], $column->format);
+                        else
+                                $value = $this->receiptrecord[$column->fieldname];
+
+                        $pdf->Cell($column->size, 0.18, $value, $pdf->borderDebug, 0, $column->align);
+
+                }//end foreach
+
+                $pdf->SetY($pdf->GetY() + 0.18 + 0.125);
+
+        }//end method
+
+
+        function _addLineItems($coords){
+
+                $pdf = &$this->pdf;
+
+                $lineitemresult = $this->_getLineItems();
+
+                $pdf->setStyle("normal");
+
+                $pdf->SetY($pdf->GetY() + 0.18 + 0.0625);
+
+                while($line = $this->db->fetchArray($lineitemresult)){
+
+                        if($pdf->GetY() + 0.17*3 > $coords["y"] + $this->lineitemBoxHeight){
+
+                                $pdf->SetLineWidth(0.02);
+                                $pdf->Rect($coords["x"], $coords["y"], $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $this->lineitemBoxHeight);
+                                $pdf->SetLineWidth(0.01);
+
+                                $this->_addPage();
+
+                        }//end if
+
+                        if($line["type"] == "invoice"){
+
+                                $tempDate = stringToDate($line["itemdate"], "SQL");
+                                $line["duedate"] = dateToString( strtotime(TERM1_DAYS." days", $tempDate), "SQL" );
+
+                        } else
+                                $line["duedate"] = "";
+
+                        if($line["type"] == "deposit" && $line["relatedid"] == $this->receiptrecord["id"]){
+                                $line["relatedid"] = "";
+                                $line["amount"] = 0;
+                                $line["aritemid"] = 0;
+                        }
+
+                        if($this->receiptrecord["posted"])
+                                $line["docdue"] = $line["amount"] - $line["paid"];
+                        elseif($line["relatedid"])
+                                $line["docdue"] = $line["amount"] - $line["paid"] - $line["applied"] - $line["discount"] - $line["taxadjustment"];
+                        else
+                                $line["docDue"] = 0;
+
+
+                        foreach($this->lineitems as $column){
+
+                                $ln = 0;
+
+
+                                switch($column->fieldname){
+
+                                        case "parts":
+                                                $pdf->SetFont("Arial", "B", 8);
+                                                $pdf->Write(0.17, $line["partname"]);
+                                                $pdf->setStyle("normal");
+                                                $pdf->SetX($pdf->leftmargin + $column->size);
+                                                break;
+
+                                        default:
+                                                if($column->format != "")
+                                                        $value = formatVariable($line[$column->fieldname], $column->format);
+                                                else
+                                                        $value = $line[$column->fieldname];
+
+                                                if($value == "·")
+                                                        $value = " ";
+
+                                                if($column->fieldname == $this->lineitems[count($this->lineitems)-1]->fieldname)
+                                                        $ln = 2;
+
+                                                $pdf->Cell($column->size, 0.17, $value, $pdf->borderDebug, $ln, $column->align);
+                                                break;
+
+                                }//end switch
+
+                        }//end foreach
+
+                        $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + 0.0625);
+                        $pdf->SetLineWidth(0.01);
+                        $pdf->SetDrawColor(180,180,180);
+                        $pdf->Line($pdf->leftmargin, $pdf->GetY(), $pdf->paperwidth - $pdf->rightmargin, $pdf->GetY());
+                        $pdf->SetDrawColor(0,0,0);
+                        $pdf->SetLineWidth(0.02);
+                        $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + 0.0625);
+
+                }//end while
+
+                $pdf->SetLineWidth(0.02);
+                $pdf->Rect($coords["x"], $coords["y"], $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $this->lineitemBoxHeight);
+
+        }//end method
+
+
+        function _getLineItems(){
+
+                $querystatement = "
+                        SELECT
+                                receiptitems.aritemid,
+                                receiptitems.applied,
+                                receiptitems.discount,
+                                receiptitems.taxadjustment,
+                                aritems.type,
+                                IF(`invoices`.`id`,`invoices`.`id`,`receipts`.`id`) AS `relatedid`,
+                                aritems.itemdate,
+                                aritems.amount,
+                                aritems.paid
+                        FROM
+                                ((receiptitems INNER JOIN aritems ON receiptitems.aritemid = aritems.uuid)LEFT JOIN `invoices` ON `aritems`.`relatedid` = `invoices`.`uuid`) LEFT JOIN `receipts` ON `aritems`.`relatedid` = `receipts`.`uuid`
+                        WHERE
+                                receiptitems.receiptid = '".mysql_real_escape_string($this->receiptrecord["uuid"])."'
+                        ORDER BY
+                                aritems.type,
+                                aritems.itemdate";
+
+                        return $this->db->query($querystatement);
+
+        }//end method
+
+
+        function _addNotes(){
+
+                $pdf = &$this->pdf;
+
+                $height = 1;
+                $nextPos = $pdf->GetY() + $height + 0.125;
+
+                $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
+                $pdf->setStyle("header");
+                $pdf->Cell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, 0.18, "Notes", 1, 2, "L", 1);
+
+                $pdf->setStyle("normal");
+                $pdf->SetXY($pdf->GetX() + .06125, $pdf->GetY() + .06125);
+                $pdf->MultiCell($pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin - 0.125, 0.18, $this->receiptrecord["memo"]);
+
+                $pdf->SetXY($pdf->leftmargin, $nextPos);
+
+        }//end method
+
+
+        function _addTotals(){
+
+                $pdf = &$this->pdf;
+
+                $size = $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin;
+
+                $tempTotalsinfo = $this->totalsinfo;
+
+                if($this->receiptrecord["remaining"]){
+
+                        $this->totalsinfo[1]->size = 1;
+                        $size -= 1;
+
+                } else
+                        array_shift($this->totalsinfo);
+
+                $this->totalsinfo[0]->size = $size;
+
+                $height = .5;
+                $nextPos = $pdf->GetY() + $height + 0.125;
+
+                $pdf->Rect($pdf->GetX(), $pdf->GetY(), $pdf->paperwidth - $pdf->leftmargin - $pdf->rightmargin, $height);
+
+                $pdf->setStyle("header");
+
+                foreach($this->totalsinfo as $column)
+                        $pdf->Cell($column->size, 0.18, $column->title, 1, 0, $column->align, 1);
+
+                $pdf->setStyle("normal");
+                $pdf->SetFont("Arial", "B", 10);
+                $pdf->SetXY($pdf->leftmargin, $pdf->GetY() + 0.18 + 0.0625);
+
+                foreach($this->totalsinfo as $column){
+
+                        if($column->format != "")
+                                $value = formatVariable($this->receiptrecord[$column->fieldname], $column->format);
+                        else
+                                $value = $this->receiptrecord[$column->fieldname];
+
+                        $pdf->Cell($column->size, 0.18, $value, $pdf->borderDebug, 0, $column->align);
+
+                }//end foreach
+
+                if(isset($this->totalsinfo[1]))
+                        $this->totalsinfo[1]->size = 0;
+
+                $pdf->SetXY($pdf->leftmargin, $nextPos);
+
+                $this->totalsinfo = $tempTotalsinfo;
+
+        }//end method
+
+
+
+        function output($destination = "screen" , $userinfo = NULL){
+
+                switch($destination){
+
+                        case "screen":
+                                $userinfo = cleanFilename((string)$userinfo);
+                                $this->pdf->Output($userinfo, 'D');
+                                break;
+
+                        case "email":
+
+                                if(!$userinfo)
+                                        $userinfo = $_SESSION["userinfo"];
+
+                                if(!$userinfo["email"] || !$this->receiptrecord["email"])
+                                        return false;
+
+                                $pdf = $this->pdf->Output(NULL, "S");
+
+                                $to =           $this->receiptrecord["email"];
+                                $from =         $userinfo["email"];
+                                $subject =      "Your ".$this->settings["reportTitle"]." from ".COMPANY_NAME;
+                                $message =      "Attached is your ".$this->settings["reportTitle"]." from ".COMPANY_NAME."\n\n" .
+                                                        "The attachment requires Adobe Acrobat Reader to view. \n If you do not " .
+                                                        "have Acrobat Reader, you can download it at http://www.adobe.com  \n\n" .
+                                                        COMPANY_NAME."\n".
+                                                        COMPANY_ADDRESS."\n".COMPANY_CSZ."\n".COMPANY_PHONE;
+
+                                $headers = "From: $from";
+
+                                $semi_rand = md5( time() );
+                                $mime_boundary = "==Multipart_Boundary_x{$semi_rand}x";
+
+                                $headers .= "\nMIME-Version: 1.0\n" .
+                                                        "Content-Type: multipart/mixed;\n" .
+                                                        " boundary=\"{$mime_boundary}\"";
+
+                                $message = "This is a multi-part message in MIME format.\n\n" .
+                                                "--{$mime_boundary}\n" .
+                                                "Content-Type: text/plain; charset=\"iso-8859-1\"\n" .
+                                                "Content-Transfer-Encoding: 7bit\n\n" .
+                                                $message . "\n\n";
+
+                                $pdf = chunk_split( base64_encode( $pdf ) );
+
+                                $message .= "--{$mime_boundary}\n" .
+                                                 "Content-Type: {application/pdf};\n" .
+                                                 " name=\"".$this->settings["reportTitle"].$this->receiptrecord["id"]."\"\n" .
+                                                 "Content-Disposition: attachment;\n" .
+                                                 " filename=\"".$this->settings["reportTitle"].$this->receiptrecord["id"].".pdf\"\n" .
+                                                 "Content-Transfer-Encoding: base64\n\n" .
+                                                 $pdf . "\n\n" .
+                                                 "--{$mime_boundary}--\n";
+
+                                return @ mail($to, $subject, $message, $headers);
+
+                                break;
+
+                }//endswitch
+
+        }//end method
+
+   /**
+     * function addingRecordDefaultSettings
+     *
+     * Creates an array of settings associative arrays for use by the system when
+     * a new report record is added that references the file containing this class
+     *
+     * @retrun array of settings. Each setting should itself be
+     * an associative array containing the following
+     * name: name of the setting
+     * defaultvalue: default value for setting
+     * type: (string, int, real, bool) type for value of setting
+     * required: (0,1) whether the setting is required or not
+     * description: brief description for what this setting is used for.
+     */
+    function addingRecordDefaultSettings(){
+
+        $settings[] = array(
+            "name"=>"reportTitle",
+            "defaultValue"=>"Receipt",
+            "type"=>"string",
+            "required"=>1,
+            "description"=>"Title printed in upper right hand of report."
+        );
+
+        return $settings;
+
+    }//endfunction addingRecordDefaultSettings
+
+}//end class
+
+
+/**
+ * PROCESSING
+ * =============================================================================
+ */
 if(!isset($noOutput)){
 
-        //IE needs caching to be set to private in order to display PDFS
-        session_cache_limiter('private');
-
-
-
-        $report = new receiptPDF($db, 'P', 'in', 'Letter');
-        $report->setupFromPrintScreen();
-        $report->generate();
-        
-        $filename = 'Receipts_';
-        if($report->count === 1){
-                
-                if($report->invoicerecord["company"])
-                        $filename .= "_".$report->invoicerecord["company"];
-                
-                $filename .= "_".$report->invoicerecord["id"];
-                
-        }elseif((int)$report->count)
-                $filename .= "_Multiple";
-        
-        $filename .= ".pdf";
-        $report->output('screen', $filename);
+    //IE needs caching to be set to private in order to display PDFS
+    session_cache_limiter('private');
+
+    //set encoding to latin1 (fpdf doesnt like utf8)
+    $sqlEncoding = "latin1";
+    require_once("../../../include/session.php");
+
+    checkForReportArguments();
+
+    $report = new receiptPDF($db, $_GET["rid"], $_GET["tid"], 'P', 'in', 'Letter');
+    $report->setupFromPrintScreen();
+    $report->generate();
+
+    $filename = 'Receipts';
+
+    if($report->count === 1){
+
+        if($report->receiptrecord["company"])
+            $filename .= "_".$report->receiptrecord["company"];
+        else
+            $filename .= "_".$report->receiptrecord["firstname"]."_".$report->receiptrecord["lastname"];
+
+        $filename .= "_".$report->receiptrecord["id"];
+
+    }elseif((int)$report->count)
+        $filename .= "_MultiClient";
+
+    $filename .= ".pdf";
+    $report->output('screen', $filename);
 
 }//end if
 
+/**
+ * When adding a new report record, the add/edit needs to know what the class
+ * name is so that it can instantiate it, and grab it's default settings.
+ */
+if(isset($addingReportRecord))
+    $reportClass ="receiptPDF";
 ?>

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

@@ -39 +39 @@
 
 if(!class_exists("phpbmsReport"))
-        include("../../../report/report_class.php");
+    include("../../../report/report_class.php");
 
 class receiptsPTTotals extends phpbmsReport{
 
-        function receiptsPTTotals($db){
-
-                parent::phpbmsReport($db);
+        function receiptsPTTotals($db, $reportUUID, $tabledefUUID){
+
+            parent::phpbmsReport($db, $reportUUID, $tabledefUUID);
 
         }//end method
@@ -67 +67 @@
                                 LEFT JOIN paymentmethods ON receipts.paymentmethodid = paymentmethods.uuid)";
 
-                if($this->sortorder)
-                        $this->sortorder = "paymentmethods.id DESC, ".$this->sortorder;
+                if($this->sortOrder)
+                        $this->sortOrder= "paymentmethods.id DESC, ".$this->sortorder;
                 else
-                        $this->sortorder = "paymentmethods.id DESC, receipts.receiptdate";
+                        $this->sortOrder= "paymentmethods.id DESC, receipts.receiptdate";
 
                 $querystatement = $this->assembleSQL($querystatement);
@@ -216 +216 @@
         }//end method
 
-}//end method
-
-
-        //PROCESSING
-        //========================================================================
-
-        if(!isset($noOutput)){
-
-                session_cache_limiter('private');
-
-                require("../../../include/session.php");
-
-                $report = new receiptsPTTotals($db);
-                $report->setupFromPrintScreen();
-                $report->generate();
-                $report->show();
-
-        }//end if
-
+}//end class
+
+
+/**
+ * PROCESSING
+ * =============================================================================
+ */
+if(!isset($noOutput)){
+
+    session_cache_limiter('private');
+
+    require("../../../include/session.php");
+
+    checkForReportArguments();
+
+    $report = new receiptsPTTotals($db, $_GET["rid"], $_GET["tid"]);
+    $report->setupFromPrintScreen();
+    $report->generate();
+    $report->show();
+
+}//end if
+
+/**
+ * When adding a new report record, the add/edit needs to know what the class
+ * name is so that it can instantiate it, and grab it's default settings.
+ */
+if(isset($addingReportRecord))
+    $reportClass ="generalExport";
 ?>

trunk/phpbms/print.php

@@ -100 +100 @@
 
                         if(isset($_POST["choosereport"])){
+
                                 $tablePrinter->openwindows="";
+
                                 for($i=0;$i<count($_POST["choosereport"]);$i++){
+
                                         if($_POST["choosereport"][$i]){
-                                                $querystatement="SELECT reportfile,type from reports where id=".$_POST["choosereport"][$i].";";
-                                                $queryresult=$db->query($querystatement);
-                                                if(!$queryresult) $error = new appError(100,"Could not Retrieve Report Information");
-                                                $reportrecord=$db->fetchArray($queryresult);
+
+                                                $querystatement = "
+                                                    SELECT
+                                                        `uuid`,
+                                                        `reportfile`,
+                                                        `type`
+                                                    FROM
+                                                        `reports`
+                                                    WHERE
+                                                        id = ".$_POST["choosereport"][$i];
+
+                                                $queryresult = $db->query($querystatement);
+
+                                                if(!$queryresult)
+                                                    $error = new appError(100,"Could not Retrieve Report Information");
+
+                                                $reportrecord = $db->fetchArray($queryresult);
+
                                                 $fakeExtForIE="";
-                                                if($reportrecord["type"]=="PDF Report")
-                                                        $fakeExtForIE="&amp;ext=.pdf";
-                                                $dateTimeStamp="&amp;ts=".mktime(); // make the url unique to avoid using browser cache
+
+                                                if($reportrecord["type"] == "PDF Report")
+                                                        $fakeExtForIE = "' + String.fromCharCode(38) + ' &amp;ext=.pdf";
+
+                                                // make the url unique to avoid using browser cache
+                                                $dateTimeStamp = "' + String.fromCharCode(38) + 'ts=".mktime();
+
                                                 //javascript open each report in new window
-                                                $tablePrinter->openwindows.="window.open('".APP_PATH.$reportrecord["reportfile"]."?tid=".urlencode($tablePrinter->tableid).$dateTimeStamp.$fakeExtForIE."','print".$i."');\n";
-                                        }
-                                }
-                        }
+                                                $tablePrinter->openwindows .= "window.open('".APP_PATH.$reportrecord["reportfile"]."?rid=".urlencode($reportrecord["uuid"])."' + String.fromCharCode(38) + 'tid=".urlencode($tablePrinter->tableid).$dateTimeStamp.$fakeExtForIE."','print".$i."');\n";
+
+                                        }//endif
+
+                                }//endfor
+
+                        }//endif
+
                 break;
         }

trunk/phpbms/report/general_export.php

@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
-        if(!class_exists("phpbmsReport"))
-                include("report_class.php");
-
-        class generalExport extends phpbmsReport {
-
-                var $maintable = "";
-                var $resultOutput = "";
-                var $tabledefuuid;
-
-                function generalExport($db, $tabledefuuid){
-
-                        $this->tabledefuuid = mysql_real_escape_string($tabledefuuid);
-
-                        parent::phpbmsReport($db);
-
-                        $querystatement = "
-                                SELECT
-                                        maintable
-                                FROM
-                                        tabledefs
-                                WHERE
-                                        uuid = '".$this->tabledefuuid."'";
-
-                        $queryresult = $db->query($querystatement);
-                        $therecord=$db->fetchArray($queryresult);
-
-                        $this->maintable = $therecord["maintable"];
-
-                }//end method
-
-
-                function generate(){
-
-                        $querystatement = "
-                                SELECT
-                                        *
-                                FROM
-                                        ".$this->maintable;
-
-                        $querystatement = $this->assembleSQL($querystatement);
-
-                        $queryresult = $this->db->query($querystatement);
-
-                        $num_fields = $this->db->numFields($queryresult);
-
-                        for($i=0;$i<$num_fields;$i++)
-                                $this->reportOutput .= ",".$this->db->fieldName($queryresult, $i);
-
-                        $this->reportOutput = substr($this->reportOutput, 1)."\n";
-
-                        while($therecord = $this->db->fetchArray($queryresult)){
-
-                                $line = "";
-
-                                foreach($therecord as $value)
-                                        $line .= ',"'.mysql_real_escape_string($value).'"';
-
-                                $line = substr($line, 1)."\n";
-
-                                $this->reportOutput .= $line;
-
-                        }//endwhile
-
-                        $this->reportOutput = substr($this->reportOutput, 0, strlen($this->reportOutput)-1);
-
-                }//end method
-
-
-                function show(){
-
-                        header("Content-type: text/plain");
-                        header('Content-Disposition: attachment; filename="export.txt"');
-
-                        echo $this->reportOutput;
-
-                }//end method
-
-        }//end class
-
-
-        //PROCESSING
-        //========================================================================
-
-        if(!isset($noOutput)){
-
-                session_cache_limiter('private');
-
-                require("../include/session.php");
-                if(!isset($_GET["tid"]))
-                        $error = new appError(200,"URL variable missing: tid");
-
-                $report = new generalExport($db, $_GET["tid"]);
-                $report->setupFromPrintScreen();
-                $report->generate();
-                $report->show();
-
-        }//end if
-
+if(!class_exists("phpbmsReport"))
+    include("report_class.php");
+
+/**
+ * Basic CSV output report
+ *
+ * This class implements a report used for creating a CSV file through reporting
+ */
+class generalExport extends phpbmsReport {
+
+    /**
+     * $maintable
+     * @var string the SQL name of the main table to print.
+     */
+    var $maintable = "";
+
+
+    /**
+     * function generalExport
+     *
+     * Initialization function
+     *
+     * @param object $db database object
+     * @param string $reportUUID UUID of report record
+     * @param string $tabledefUUID UUID of table definition intializing print
+     */
+    function generalExport($db, $reportUUID, $tabledefUUID){
+
+        parent::phpbmsReport($db, $reportUUID, $tabledefUUID);
+
+        $this->checkForDefaultSettings();
+
+        $therecord = $this->getTableDefInfo();
+
+        $this->maintable = $therecord["maintable"];
+
+    }//end function init
+
+
+    /**
+     * function checkForDefaultSettings
+     *
+     * Checks to make sure loaded report Settings exist and are correct
+     */
+    function checkForDefaultSettings(){
+
+        if(!isset($this->settings["showHeader"]))
+            $this->settings["showHeader"] = 1;
+
+        if(!isset($this->settings["fieldDelimiter"]))
+            $this->settings["fieldDelimiter"] = ",";
+
+        if(!isset($this->settings["recordDelimiter"]))
+            $this->settings["recordDelimiter"] = "\n";
+
+        if(!isset($this->settings["fieldEncapsulation"]))
+            $this->settings["fieldEncapsulation"] = "\"";
+
+    }//end function checkForDefaultSettings
+
+
+    /**
+     * function generate
+     *
+     * Creates body of the file.
+     */
+    function generate(){
+
+        $fromFields = "*";
+
+        $columns = array();
+        foreach($this->settings as $key=>$value){
+
+            if(strpos($key, "column") === 0){
+
+                $pos = substr($key,6)-1;
+                $columns[$pos]["field"] = $value;
+
+                if(isset($this->settings["titleColumn".($pos + 1)]))
+                    $columns[$pos]["title"] = $this->settings["titleColumn".($pos +1)];
+                else
+                    $columns[$pos]["title"] = "";
+
+            }//endif
+
+        }//endforeach
+
+        if(count($columns)){
+
+            ksort($columns);
+
+            $fromFields = "";
+            foreach($columns as $column){
+
+                $fromFields .= ", ".$column["field"];
+                if($column["title"])
+                    $fromFields .= " AS `".$column["title"]."`";
+
+                $fromFields.="\n";
+
+            }//endforeach
+
+            $fromFields = substr($fromFields, 1);
+
+        }//endif
+
+        if(isset($this->settings["fromTable"]))
+            $querytable = $this->settings["fromTable"];
+        else
+            $querytable = $this->maintable;
+
+        $querystatement = "
+            SELECT
+                ".$fromFields."
+            FROM
+                ".$querytable;
+
+        $querystatement = $this->assembleSQL($querystatement);
+
+        $queryresult = $this->db->query($querystatement);
+
+        $num_fields = $this->db->numFields($queryresult);
+
+        /**
+         * generating column names.  First row is just field names
+         */
+        if($this->settings["showHeader"])
+            for($i=0;$i<$num_fields;$i++)
+                $this->reportOutput .= $this->settings["fieldDelimiter"].$this->db->fieldName($queryresult, $i);
+
+        $this->reportOutput = substr($this->reportOutput, strlen($this->settings["fieldDelimiter"])).$this->settings["recordDelimiter"];
+
+        /**
+         * Looping through retrieved records.
+         */
+        while($therecord = $this->db->fetchArray($queryresult)){
+
+            $line = "";
+
+            foreach($therecord as $value)
+               $line .= $this->settings["fieldDelimiter"].$this->settings["fieldEncapsulation"].mysql_real_escape_string($value).$this->settings["fieldEncapsulation"];
+
+            $line = substr($line, strlen($this->settings["fieldDelimiter"])).$this->settings["recordDelimiter"];
+
+            $this->reportOutput .= $line;
+
+        }//endwhile
+
+        /**
+         * removing last \n
+         */
+        $this->reportOutput = substr($this->reportOutput, 0, strlen($this->reportOutput) - strlen($this->settings["recordDelimiter"]));
+
+    }//end function generate
+
+
+    /**
+     * function show
+     *
+     * Outputing generated data
+     */
+    function show(){
+
+        if(!isset($this->settings["filename"]))
+           $this->settings["filename"] = $this->maintable."-export.txt";
+echo "<pre>";
+        //header("Content-type: text/plain");
+        //header('Content-Disposition: attachment; filename="'.$this->settings["filename"].'"');
+
+        echo $this->reportOutput;
+
+    }//end function show
+
+}//end class
+
+
+/**
+ * PROCESSING
+ * =============================================================================
+ */
+if(!isset($noOutput)){
+
+    session_cache_limiter('private');
+
+    require_once("../include/session.php");
+
+    checkForReportArguments();
+
+    $report = new generalExport($db, $_GET["rid"],$_GET["tid"]);
+    $report->setupFromPrintScreen();
+    $report->generate();
+    $report->show();
+
+}//end if
+
+/**
+ * When adding a new report record, the add/edit needs to know what the class
+ * name is so that it can instantiate it, and grab it's default settings.
+ */
+if(isset($addingReportRecord))
+    $reportClass ="generalExport";
 ?>

trunk/phpbms/report/general_labels.php

@@ -38 +38 @@
 */
 
-        //set mysql encoding to latin1 (fpdf doesn't like utf)
-        $db->setEncoding("latin1");
-
-        // The label report requires the following variables to be set before creating the PDF
-        //maxrows
-        //maxcolumns
-        //columnmargin
-        //labelheight
-        //labelwidth
-        //top_start
-        //left_start
-        //border debug
-        //reportquerystatement
-        if(!isset($border_debug)) $border_debug=0;
-
-        //Also, it requires the definition of the function printLabel($pdf,$therecord,$thex,$they,$border_debug) which prints the actual
-        //contectens of the label
-
-        if(isset($_POST["command"])) {
-
-                if(!is_numeric($_POST["skiplabels"])) $_POST["skiplabels"]=0;
-                if ($_POST["skiplabels"]>$maxrows*$maxcolumns) $_POST["skiplabels"]=0;
-
-
-
-                //Generate the invoice Query
-                $reportquerystatement.=$_SESSION["printing"]["whereclause"].$sortorder;
-                $thequery=$db->query($reportquerystatement);
-                if(!$thequery) die("No records, or invalid SQL statement:<br />".$reportquerystatement);
-                //===================================================================================================
-                // Generating PDF File.
-                //===================================================================================================
-
-                //define the documents and margins
-                $pdf=new FPDF("P","in","Letter");
-                $pdf->Open();
-                $pdf->SetMargins(0,0);
-
-                $pdf->AddPage();
-
-                $thex=$leftstart;
-                $they=$topstart;
-                $rowcount=1;
-                $totalcount=1;
-                $column=1;
-                //this first while skips records
-
-                while($totalcount<=$_POST["skiplabels"]){
-                        if($rowcount>$maxrows) {
-                           $column++;
-                           $they=$topstart;
-                           $thex+=$labelwidth+$columnmargin;
-                           $rowcount=1;
-                        }
-                        $they+=$labelheight;
-                        $rowcount++;
-                        $totalcount++;
-                }
-
-                $thisCount = $db->numRows($thequery);
-                while($therecord=$db->fetchArray($thequery)) {
-
-                        if($rowcount>$maxrows) {
-                           $column++;
-                           $they=$topstart;
-                           $thex+=$labelwidth+$columnmargin;
-                           $rowcount=1;
-                        }
-                        if($column>$maxcolumns){
-                                $pdf->AddPage();
-                                $thex=$leftstart;
-                                $they=$topstart;
-                                $rowcount=1;
-                                $column=1;
-                        }
-                        $pdf=printLabel($pdf,$therecord,$thex,$they,$border_debug);
-
-                        $they+=$labelheight;
-                        $rowcount++;
-                        
-                        $company = $therecord["company"];
-                        
-                }// end fetch_array while loop
-
-                if($thisCount === 1){
-                        if($company)
-                                $filename .= "_".$company;
-                }elseif((int)$thisCount)
-                        $filename .= "_Multiple";
-                                
-                                
-                $filename = cleanFilename($filename);
-                $filename .= ".pdf";
-                $pdf->Output($filename, 'D');
-                exit();
-        } else {
+if(!class_exists("phpbmsReport"))
+    include("report_class.php");
+
+/**
+ * Handles Label Printing
+ */
+class pdfLabels extends phpbmsReport{
+
+    /**
+     * $maintable
+     * @var string the SQL name of the main table to print.
+     */
+    var $maintable = "";
+
+    /**
+     * $skipLabels
+     * @var int number of lables to skip before printing.
+     */
+    var $skipLabels = 0;
+
+
+    /**
+     * function pdfLabels
+     *
+     * initialization function
+     */
+    function pdfLabels($db, $reportUUID, $tabledefUUID){
+
+        parent::phpbmsReport($db, $reportUUID, $tabledefUUID);
+
+        $therecord = $this->getTableDefInfo();
+
+        $this->maintable = $therecord["maintable"];
+
+        $this->checkForDefaultSettings();
+
+    }//end function init
+
+
+    /**
+     * function checkForDefaultSettings
+     *
+     * Checks to make sure loaded report Settings exist and are correct
+     */
+    function checkForDefaultSettings(){
+
+        if(!isset($this->settings["maxRows"]))
+            $this->settings["maxRows"] = 10;
+
+        if(!isset($this->settings["maxColumns"]))
+            $this->settings["maxColumns"] = 3;
+
+        if(!isset($this->settings["columnMargin"]))
+            $this->settings["columnMargin"] = 1/8;
+
+        if(!isset($this->settings["labelHeight"]))
+            $this->settings["labelHeight"] = 1;
+
+        if(!isset($this->settings["labelWidth"]))
+            $this->settings["labelWidth"] = 2 + (5/8);
+
+        if(!isset($this->settings["startTop"]))
+            $this->settings["startTop"] = 1/2;
+
+        if(!isset($this->settings["startLeft"]))
+            $this->settings["startLeft"] = 3/16;
+
+        if(!isset($this->settings["borderDebug"]))
+            $this->settings["borderDebug"] = 0;
+
+        if(!isset($this->settings["queryStatement"]))
+            $this->settings["queryStatement"] = 'SELECT "no data in first row" AS `rowText1`,  "no data in second row" AS `rowText2` FROM `'.$this->maintable.'`';
+
+        if(!isset($this->settings["defaultSortOrder"]))
+            $this->settings["defaultSortOrder"] = '';
+
+        if(!isset($this->settings["fileName"]))
+            $this->settings["fileName"] = $this->maintable.'-labels.pdf';
+
+        if(!isset($this->settings["labelMarginTop"]))
+            $this->settings["labelMarginTop"] = 1/8;
+
+        if(!isset($this->settings["labelMarginLeft"]))
+            $this->settings["labelMarginLeft"] = 1/16;
+
+        if(!isset($this->settings["rowText1Font"]))
+            $this->settings["rowText1Font"] = "Arial,B,9";
+
+    }//end function checkForDefaultSettings
+
+
+    /**
+     * function siplaySkipLabels
+     *
+     * Displays dialog so that people can skip labels when printing
+     */
+    function displaySkipLabels(){
+
+        global $phpbms;
 
         $pageTitle = "Label Options";
@@ -140 +143 @@
         include("header.php");
 
+        ?>
+        <form action="<?php echo str_replace("&", "&amp;", $_SERVER["REQUEST_URI"])?>" method="post" name="print_form">
+            <div class="bodyline" id="reportOptions">
+
+                <h1 id="topTitle"><span>Label Options</span></h1>
+
+                <p>
+                    <label for="skipLabels">skip first labels</label><br />
+                    <input name="skipLabels" id="skipLabels" value="0" size="3" maxlength="3" />
+                </p>
+                <p align="right">
+                    <input name="command" type="submit" class="Buttons" id="print" value="print" />
+                    <input name="cancel" type="button" class="Buttons" id="cancel" value="cancel" onclick="window.close();" />
+                </p>
+
+            </div>
+        </form>
+        <?php
+
+        include("footer.php");
+
+    }//end function displaySkipLabels
+
+
+    /**
+     * function generate
+     *
+     * Generates the PDF report
+     */
+    function generate(){
+
+        if($this->skipLabels >= $this->settings["maxRows"] * $this->settings["maxColumns"])
+            $this->skipLabels = 0;
+
+        if($this->settings["defaultSortOrder"] && !$this->sortOrder)
+            $this->sortOrder = $this->settings["defaultSortOrder"];
+
+        $querystatement = $this->assembleSQL($this->settings["queryStatement"]);
+
+        $queryresult = $this->db->query($querystatement);
+
+        if(!class_exists("phpbmsPDFReport"))
+            include("pdfreport_class.php");
+
+        $pdf = new phpbmsPDFReport($this->db, "P", "in");
+
+        $pdf->Open();
+        $pdf->SetMargins(0,0);
+
+        $pdf->AddPage();
+
+        $thex = $this->settings["startLeft"];
+        $they = $this->settings["startTop"];
+        $rowcount = 1;
+        $totalcount = 1;
+        $column = 1;
+        $textRows = 0;
+
+        /**
+         * skipping labels
+         */
+        while($totalcount <= $this->skipLabels){
+
+            if($rowcount > $this->settings["maxRows"]){
+
+                $column++;
+                $they = $this->settings["startTop"];
+                $thex += $this->settings["labelWidth"] + $this->settings["columnMargin"];
+                $rowcount = 1;
+
+            }//endif
+
+            $they += $this->settings["labelHeight"];
+            $rowcount++;
+            $totalcount++;
+
+        }//endwhile
+
+        $thisCount = $this->db->numRows($queryresult);
+
+        while($therecord = $this->db->fetchArray($queryresult)){
+
+            //initialize amount of text rows
+            if(!$textRows){
+
+                $textRows = 0;
+
+                foreach($therecord as $key=>$value)
+                    if(strpos($key, "rowText") === 0)
+                        $textRows++;
+
+            }//endif
+
+            if($rowcount > $this->settings["maxRows"]){
+
+                $column++;
+                $they = $this->settings["startTop"];
+                $thex += $this->settings["labelWidth"] + $this->settings["columnMargin"];
+                $rowcount = 1;
+
+            }//endif
+
+            if($column > $this->settings["maxColumns"]){
+
+                $pdf->AddPage();
+                $thex = $this->settings["startLeft"];
+                $they = $this->settings["startTop"];
+                $rowcount = 1;
+                $column = 1;
+
+            }//endif
+
+            $pdf = $this->printLabel($pdf, $therecord, $thex, $they, $textRows);
+
+            $they += $this->settings["labelHeight"];
+            $rowcount++;
+
+
+        }//endwhile $therecord
+
+        $this->reportOutput = $pdf;
+
+    }//end function generate
+
+
+    /**
+     * function printLabel
+     *
+     * generates the contents on an individual label, and adds them to the PDF
+     *
+     * @param object $pdf the PDF object
+     * @param array $therecord the data record
+     * @param int $thex x corrdinate of current PDF
+     * @param int $they y coordinate of current PDF
+     * @param int $textRows number of text rows that will be printed
+     *
+     * @return object returns the modified PDF object
+     */
+    function printLabel($pdf, $therecord, $thex, $they, $textRows){
+
+        $pdf->SetXY($thex + $this->settings["labelMarginLeft"], $they + $this->settings["labelMarginTop"]);
+
+
+        $textHeight = 0.135;
+
+        for($i=1; $i<= $textRows; $i++){
+
+            if(isset($this->settings["rowText".$i."Font"]))
+                $pdf = $this->setFont($pdf, $this->settings["rowText".$i."Font"]);
+
+            if(isset($this->settings["rowText".$i."Height"]))
+                $textHeight = $this->settings["rowText".$i."Height"];
+
+            if($therecord["rowText".$i])
+                $pdf->Cell($this->settings["labelWidth"] - $this->settings["labelMarginLeft"], $textHeight, $therecord["rowText".$i], $this->settings["borderDebug"], 2, "L");
+
+            //$pdf->SetX($thex + $this->settings["labelMarginLeft"]);
+
+        }//endfor
+
+        return $pdf;
+
+    }//end function printLabel
+
+
+    /**
+     * function setFont
+     *
+     * Sets the current PDF font stle based on the passed setting
+     *
+     * @param object $pdf PDF object
+     * @param string $setting comma separated list of FPDF font paramaters
+     *
+     * @return object PDF object with font set appropriately
+     */
+    function setFont($pdf, $setting){
+
+        $settings = explode(",", $setting);
+
+        if(!isset($settings[1]))
+            $settings[1] = "";
+
+        if(!isset($settings[2]))
+            $settings[2] ="";
+
+        $pdf->SetFont($settings[0], $settings[1], $settings[2]);
+
+        return $pdf;
+
+    }//end function setfont
+
+
+    /**
+     * function output
+     *
+     * sends the generated PDF through the browser
+     */
+     function output(){
+
+        $filename = cleanFilename($this->settings["fileName"]);
+        $this->reportOutput->Output($filename, "D");
+
+     }//end function output
+
+
+    /**
+     * function addingRecordDefaultSettings
+     *
+     * Creates an array of settings associative arrays for use by the system when
+     * a new report record is added that references the file containing this class
+     *
+     * @retrun array of settings. Each setting should itself be
+     * an associative array containing the following
+     * name: name of the setting
+     * defaultvalue: default value for setting
+     * type: (string, int, real, bool) type for value of setting
+     * required: (0,1) whether the setting is required or not
+     * description: brief description for what this setting is used for.
+     */
+    function addingRecordDefaultSettings(){
+
+        $settings[] = array(
+            "name"=>"maxRows",
+            "defaultValue"=>10,
+            "type"=>"int",
+            "required"=>1,
+            "description"=>"Number of label rows per page"
+        );
+
+        $settings[] = array(
+            "name"=>"maxColumns",
+            "defaultValue"=>3,
+            "type"=>"int",
+            "required"=>1,
+            "description"=>"Number of label columns per page"
+        );
+
+        $settings[] = array(
+            "name"=>"startTop",
+            "defaultValue"=>1/2,
+            "type"=>"real",
+            "required"=>1,
+            "description"=>"Top Margin of page"
+        );
+
+        $settings[] = array(
+            "name"=>"startLeft",
+            "defaultValue"=>3/16,
+            "type"=>"real",
+            "required"=>1,
+            "description"=>"Left Margin of page"
+        );
+
+        $settings[] = array(
+            "name"=>"columnMargin",
+            "defaultValue"=>1/8,
+            "type"=>"real",
+            "required"=>1,
+            "description"=>"Distance between columns"
+        );
+
+        $settings[] = array(
+            "name"=>"labelHeight",
+            "defaultValue"=>1,
+            "type"=>"real",
+            "required"=>1,
+            "description"=>"Height of a single label"
+        );
+
+        $settings[] = array(
+            "name"=>"labelHeight",
+            "defaultValue"=>2 + 5/8,
+            "type"=>"real",
+            "required"=>1,
+            "description"=>"Width of a single label"
+        );
+
+        $settings[] = array(
+            "name"=>"labelMarginLeft",
+            "defaultValue"=>1/16,
+            "type"=>"real",
+            "required"=>1,
+            "description"=>"Distance from left between the start of an individual to the text being put on it"
+        );
+
+        $settings[] = array(
+            "name"=>"labelMarginTop",
+            "defaultValue"=>1/8,
+            "type"=>"real",
+            "required"=>1,
+            "description"=>"Distance from top between start of an individual to the text being put on it"
+        );
+
+        $settings[] = array(
+            "name"=>"queryStatement",
+            "defaultValue"=>'SELECT "no data in first row" AS `rowText1`,  "no data in second row" AS `rowText2` FROM `'.$this->maintable.'`',
+            "type"=>"text",
+            "required"=>1,
+            "description"=>"SQL SELECT and FROM clauses defining the data to be retrieved.  Each line printed should be selected as a column in the format `rowText(X)`, where (X) is the line number it will be printed on"
+        );
+
+        $settings[] = array(
+            "name"=>"rowText1Font",
+            "defaultValue"=>"Arial,B,9",
+            "type"=>"string",
+            "required"=>0,
+            "description"=>"Comma separated list of FPDF font parameters defining font settings for the label text.  You can change the font on subsequent lines by adding an additional setting rowText(x)Font where (x) is the line number the font change occurs."
+        );
+
+        return $settings;
+
+    }//endfunction addingRecordDefaultSettings
+
+}//end class pdfLabels
+
+
+/**
+ * PROCESSING
+ * =============================================================================
+ */
+if(!isset($noOutput)){
+
+    //IE needs caching to be set to private in order to display PDFS
+    session_cache_limiter('private');
+
+    //set encoding to latin1 (fpdf doesnt like utf8)
+    $sqlEncoding = "latin1";
+    require_once("../include/session.php");
+
+    checkForReportArguments();
+
+    $report = new pdfLabels($db, $_GET["rid"], $_GET["tid"]);
+    
+    if(!isset($_POST["skipLabels"]))
+        $report->displaySkipLabels();
+    else{
+
+        $report->skipLabels = (int) $_POST["skipLabels"];
+
+        $report->setupFromPrintScreen();
+        $report->generate();
+        $report->output();
+
+    }//endif
+
+
+}//end if
+
+/**
+ * When adding a new report record, the add/edit needs to know what the class
+ * name is so that it can instantiate it, and grab it's default settings.
+ */
+if(isset($addingReportRecord))
+    $reportClass ="pdfLabels";
+
 ?>
-
-<form action="<?php echo $_SERVER["PHP_SELF"]?>" method="post" name="print_form">
-<div class="bodyline" id="reportOptions">
-        <h1 id="topTitle"><span>Label Options</span></h1>
-
-                <p>
-                        skip first labels<br />
-                        <input name="skiplabels" value="0" size="3" maxlength="3" />
-                </p>
-                <p align="right">
-                        <input name="command" type="submit" class="Buttons" id="print" value="print" />
-                        <input name="cancel" type="button" class="Buttons" id="cancel" value="cancel" onclick="window.close();" />
-                </p>
-</div>
-</form>
-<?php include("footer.php"); }//end if ?>

trunk/phpbms/report/general_sql.php

@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
+if(!class_exists("phpbmsReport"))
+    include("report_class.php");
 
-        if(!class_exists("phpbmsReport"))
-                include("report_class.php");
+/**
+ * Handles creation of SQL insert records
+ *
+ * This class handles the file creation of SQL Insert records that
+ * correspond to the table definition main table that intializes a print of this
+ * report
+ */
+class sqlExport extends phpbmsReport{
 
-        class sqlExport extends phpbmsReport{
+    /**
+     * $maintable
+     * @var string the SQL name of the main table to print.
+     */
+    var $maintable = "";
 
-                var $maintable = "";
-                var $reportOutput = "";
-                var $tabledefuuid;
+    /**
+     * function generalTablePrint
+     *
+     * Initialization function
+     *
+     * @param object $db database object
+     * @param string $reportUUID UUID of report record
+     * @param string $tabledefUUID UUID of table definition intializing print
+     */
+    function sqlExport($db, $reportUUID, $tabledefUUID){
 
-                function sqlExport($db, $tabledefuuid){
+        parent::phpbmsReport($db, $reportUUID, $tabledefUUID);
 
-                        $this->tabledefuuid = mysql_real_escape_string($tabledefuuid);
+        $therecord = $this->getTableDefInfo();
 
-                        parent::phpbmsReport($db);
+        $this->maintable = $therecord["maintable"];
 
-                        $querystatement = "
-                                SELECT
-                                        maintable
-                                FROM
-                                        tabledefs
-                                WHERE
-                                        uuid = '".$this->tabledefuuid."'";
-
-                        $queryresult = $db->query($querystatement);
-                        $therecord=$db->fetchArray($queryresult);
-
-                        $this->maintable = $therecord["maintable"];
-
-                }//end method
+    }//end function init
 
 
-                function generate(){
+    /**
+     * function generate
+     *
+     * Generates the SQL Insert statements for each record
+     */
+    function generate(){
 
-                        $querystatement = "
-                                SELECT
-                                        *
-                                FROM
-                                        ".$this->maintable;
+        $querystatement = "
+            SELECT
+                *
+            FROM
+                ".$this->maintable;
 
-                        $querystatement = $this->assembleSQL($querystatement);
+        $querystatement = $this->assembleSQL($querystatement);
 
-                        $queryresult = $this->db->query($querystatement);
+        $queryresult = $this->db->query($querystatement);
 
-                        $num_fields = $this->db->numFields($queryresult);
+        $num_fields = $this->db->numFields($queryresult);
 
-                        $statementstart = "INSERT INTO `".$this->maintable."` (";
+        $statementstart = "INSERT INTO `".$this->maintable."` (";
 
-                        for($i=0; $i<$num_fields ;$i++)
-                                $statementstart .= "`".$this->db->fieldName($queryresult,$i)."`, ";
+        for($i=0; $i<$num_fields ;$i++)
+             $statementstart .= "`".$this->db->fieldName($queryresult,$i)."`, ";
 
-                        $statementstart = substr($statementstart,0,strlen($statementstart)-2).") VALUES (";
+        $statementstart = substr($statementstart,0,strlen($statementstart)-2).") VALUES (";
 
-                        while($therecord = $this->db->fetchArray($queryresult)){
+        while($therecord = $this->db->fetchArray($queryresult)){
 
-                                $insertstatement = $statementstart;
+            $insertstatement = $statementstart;
 
-                                foreach($therecord as $name => $field){
+            foreach($therecord as $name => $field){
 
-                                        if($field === NULL)
-                                                $addfield = "NULL, ";
-                                        else
-                                                $addfield = "'".mysql_real_escape_string($field)."', ";
+                if($field === NULL)
+                     $addfield = "NULL, ";
+                else
+                     $addfield = "'".mysql_real_escape_string($field)."', ";
 
-                                        //this is in temp for intallation exporting
-                                        if(hasRights("Admin")){
+                //this is in temp for intallation exporting
+                if(hasRights("Admin")){
 
-                                                switch($name){
+                    switch($name){
 
-                                                        case "createdby":
-                                                        case "modifiedby":
-                                                                $addfield = "1, ";
-                                                                break;
+                        case "createdby":
+                        case "modifiedby":
+                            $addfield = "1, ";
+                            break;
 
-                                                        case "creationdate":
-                                                        case "modifieddate":
-                                                                $addfield = "NOW(), ";
-                                                                break;
+                        case "creationdate":
+                        case "modifieddate":
+                            $addfield = "NOW(), ";
+                            break;
 
-                                                }//end switch
+                    }//end switch
 
-                                        }//endif
+                }//endif
 
-                                        $insertstatement .= $addfield;
+                $insertstatement .= $addfield;
 
-                                }//endforeach
+            }//endforeach
 
-                                $insertstatement = substr($insertstatement,0,strlen($insertstatement)-2).");\n";
+            $insertstatement = substr($insertstatement,0,strlen($insertstatement)-2).");\n";
 
-                                $this->reportOutput .= $insertstatement;
+            $this->reportOutput .= $insertstatement;
 
-                        }//endwhile
+        }//endwhile
 
-                }//end method
+    }//end function generate
+
+    /**
+     * function show
+     *
+     * outputs the report to a .sql file
+     */
+    function show(){
+
+        if(!isset($this->settings["filename"]))
+           $this->settings["filename"] = $this->maintable."-export.sql";
+
+        header("Content-type: text/plain");
+        header('Content-Disposition: attachment; filename="'.$this->settings["filename"].'"');
+
+        echo $this->reportOutput;
+
+    }//end function show
+
+}//end class sqlExport
 
 
-                function show(){
+/**
+ * PROCESSING
+ * =============================================================================
+ */
+if(!isset($noOutput)){
 
-                        header("Content-type: text/plain");
-                        header('Content-Disposition: attachment; filename="export.sql"');
+    session_cache_limiter('private');
 
-                        echo $this->reportOutput;
+    require_once("../include/session.php");
 
-                }//end method
+    checkForReportArguments();
 
+    $report = new sqlExport($db, $_GET["rid"],$_GET["tid"]);
+    $report->setupFromPrintScreen();
+    $report->generate();
+    $report->show();
 
-        }//end class
+}//end if
 
-        //PROCESSING
-        //========================================================================
+/**
+ * When adding a new report record, the add/edit needs to know what the class
+ * name is so that it can instantiate it, and grab it's default settings.
+ */
+if(isset($addingReportRecord))
+    $reportClass ="pdfLabels";
 
-        if(!isset($noOutput)){
-
-                session_cache_limiter('private');
-
-                require("../include/session.php");
-                if(!isset($_GET["tid"]))
-                        $error = new appError(200,"URL variable missing: tid");
-
-                $report = new sqlExport($db, $_GET["tid"]);
-                $report->setupFromPrintScreen();
-                $report->generate();
-                $report->show();
-
-        }//end if
 ?>

trunk/phpbms/report/general_tableprint.php

@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
-        if(!class_exists("phpbmsReport"))
-                include("report_class.php");
-
-        class generalTablePrint extends phpbmsReport {
-
-                var $maintable = "";
-                var $resultOutput = "";
-                var $tabledefuuid;
-
-                function generalTablePrint($db, $tabledefuuid){
-
-                        $this->tabledefuuid = mysql_real_escape_string($tabledefuuid);
-
-                        parent::phpbmsReport($db);
-
-                        $querystatement = "
-                                SELECT
-                                        maintable, displayname
-                                FROM
-                                        tabledefs
-                                WHERE
-                                        uuid = '".$this->tabledefuuid."'";
-
-                        $queryresult = $db->query($querystatement);
-                        $therecord=$db->fetchArray($queryresult);
-
-                        $this->maintable = $therecord["maintable"];
-                        $this->displayname = $therecord["displayname"];
-
-                }//end method
-
-
-                function generate(){
-
-                        $querystatement = "
-                                SELECT
-                                        *
-                                FROM
-                                        ".$this->maintable;
-
-                        $querystatement = $this->assembleSQL($querystatement);
-
-                        $queryresult = $this->db->query($querystatement);
-
-                        $num_fields = $this->db->numFields($queryresult);
-
-                        ob_start();
-
-                        ?>
-                        <div id="container">
-                                <h1><?php echo formatVariable($this->displayname)?></h1>
-                                <table id="results">
-                                        <thead>
-                                                <tr>
-                        <?php
-
-                        for($i=0;$i<$num_fields;$i++){
-
-                                ?>
-                                        <th <?php if($i == $num_fields-1) echo 'id="lastHeader"' ?>><?php echo $this->db->fieldName($queryresult, $i); ?></th>
-
-                                <?php
-
-                        }//end for
-
-                        ?>
-                                                </tr>
-                                        </thead>
-
-                                        <tbody>
-                        <?php
-
-                        while($therecord = $this->db->fetchArray($queryresult)){
-
-                                ?><tr><?php
-
-                                foreach($therecord as $value){
-
-                                        ?><td><?php echo formatVariable($value)?></td><?php
-
-                                }//end foreach
-
-                                ?></tr><?php
-
-                        }//endwhile
-
-                        ?>
-                                        </tbody>
-
-                                </table>
-                        </div>
-                        <?php
-
-                        $this->reportOutput = ob_get_contents();
-                        ob_end_clean();
-
-                }//end method
-
-
-                function show(){
-
-                        global $phpbms;
-                        $db = &$this->db;
-
-                        $phpbms->cssIncludes[] = "reports.css";
-                        $phpbms->cssIncludes[] = "pages/generaltableprint.css";
-
-                        $phpbms->showMenu = false;
-                        $phpbms->showFooter = false;
-
-                        include("header.php");
-
-                        echo $this->reportOutput;
-
-                        include("footer.php");
-
-                }//end method
-
-        }//end class
-
-
-        //PROCESSING
-        //========================================================================
-
-        if(!isset($noOutput)){
-
-                session_cache_limiter('private');
-
-                require("../include/session.php");
-                if(!isset($_GET["tid"]))
-                        $error = new appError(200,"URL variable missing: tid");
-
-                $report = new generalTablePrint($db, $_GET["tid"]);
-                $report->setupFromPrintScreen();
-                $report->generate();
-                $report->show();
-
-        }//end if
+
+if(!class_exists("phpbmsReport"))
+    include("report_class.php");
+
+/**
+ * Record Reporting in HTML table format
+ *
+ * This class implements a report used for printing out general table information
+ * in HTML table format
+ */
+class generalTablePrint extends phpbmsReport {
+
+    /**
+     * $maintable
+     * @var string the SQL name of the main table to print.
+     */
+    var $maintable = "";
+
+    /**
+     * $displayname
+     * @var string display name of table definition
+     */
+    var $displayname = "";
+
+
+    /**
+     * function generalTablePrint
+     *
+     * Initialization function
+     *
+     * @param object $db database object
+     * @param string $reportUUID UUID of report record
+     * @param string $tabledefUUID UUID of table definition intializing print
+     */
+    function generalTablePrint($db, $reportUUID, $tabledefUUID){
+
+        parent::phpbmsReport($db, $reportUUID, $tabledefUUID);
+
+        $therecord = $this->getTableDefInfo();
+
+        $this->maintable = $therecord["maintable"];
+        $this->displayname = $therecord["displayname"];
+
+    }//end function init
+
+
+    /**
+     * function generate
+     *
+     * Creates the main part of the report (table)
+     */
+    function generate(){
+
+        $fromFields = "*";
+
+        $columns = array();
+        foreach($this->settings as $key=>$value){
+
+            if(strpos($key, "column") === 0){
+
+                $pos = substr($key,6)-1;
+                $columns[$pos]["field"] = $value;
+
+                if(isset($this->settings["titleColumn".($pos + 1)]))
+                    $columns[$pos]["title"] = $this->settings["titleColumn".($pos +1)];
+                else
+                    $columns[$pos]["title"] = "";
+
+            }//endif
+
+        }//endforeach
+
+        if(count($columns)){
+
+            ksort($columns);
+            $columns = array_reverse($columns);
+
+            $fromFields = "";
+            foreach($columns as $column){
+
+                $fromFields .= ", ".$column["field"];
+                if($column["title"])
+                    $fromFields .= " AS `".$column["title"]."`";
+
+                $fromFields.="\n";
+
+            }//endforeach
+
+            $fromFields = substr($fromFields, 1);
+
+        }//endif
+
+        if(isset($this->settings["fromTable"]))
+            $querytable = $this->settings["fromTable"];
+        else
+            $querytable = $this->maintable;
+
+        $querystatement = "
+            SELECT
+                ".$fromFields."
+            FROM
+                ".$querytable;
+
+        $querystatement = $this->assembleSQL($querystatement);
+
+        $queryresult = $this->db->query($querystatement);
+
+        $num_fields = $this->db->numFields($queryresult);
+
+
+        if(!isset($this->settings["reportTitle"]))
+            $this->settings["reportTitle"] = $this->displayname;
+
+        ob_start();
+
+        ?>
+        <div id="container">
+            <h1><?php echo formatVariable($this->settings["reportTitle"])?></h1>
+            <table id="results">
+                <thead>
+                    <tr>
+        <?php
+
+        for($i=0;$i<$num_fields;$i++){
+
+                ?>
+                    <th <?php if($i == $num_fields-1) echo 'id="lastHeader"' ?>><?php echo $this->db->fieldName($queryresult, $i); ?></th>
+                <?php
+
+        }//end for
+
+        ?>
+                    </tr>
+                </thead>
+
+                <tbody>
+        <?php
+
+        while($therecord = $this->db->fetchArray($queryresult)){
+
+            ?><tr><?php
+
+            foreach($therecord as $value){
+
+                ?><td><?php echo formatVariable($value)?></td><?php
+
+            }//end foreach
+
+            ?></tr><?php
+
+        }//endwhile
+
+        ?>
+                </tbody>
+            </table>
+        </div>
+        <?php
+
+        $this->reportOutput = ob_get_contents();
+        ob_end_clean();
+
+    }//end function generate
+
+
+    /**
+     * function show
+     *
+     * outputs HTML report
+     */
+    function show(){
+
+        global $phpbms;
+        $db = &$this->db;
+
+        $phpbms->cssIncludes[] = "reports.css";
+        $phpbms->cssIncludes[] = "pages/generaltableprint.css";
+
+        $phpbms->showMenu = false;
+        $phpbms->showFooter = false;
+
+        include("header.php");
+
+        echo $this->reportOutput;
+
+        include("footer.php");
+
+    }//end method
+
+}//end class
+
+
+/**
+ * PROCESSING
+ * =============================================================================
+ */
+if(!isset($noOutput)){
+
+    session_cache_limiter('private');
+
+    require_once("../include/session.php");
+
+    checkForReportArguments();
+
+    $report = new generalTablePrint($db, $_GET["rid"], $_GET["tid"]);
+    $report->setupFromPrintScreen();
+    $report->generate();
+    $report->show();
+
+}//end if
+
+/**
+ * When adding a new report record, the add/edit needs to know what the class
+ * name is so that it can instantiate it, and grab it's default settings.
+ */
+if(isset($addingReportRecord))
+    $reportClass ="generalTablePrint";
 
 ?>

trunk/phpbms/report/pdfreport_class.php

@@ -37 +37 @@
  +-------------------------------------------------------------------------+
 */
-        class pdfColumn{
-
-                var $title;
-                var $fieldname;
-                var $size = 1;
-                var $format;
-                var $align = "L";
-
-                function pdfColumn($title, $fieldname, $size = 1, $format = "", $align = "L"){
-
-                        $this->title = $title;
-                        $this->fieldname = $fieldname;
-                        $this->size = ((real) $size);
-                        $this->format = $format;
-                        $this->align = $align;
-
-                }//end method
-
-        }//end class
-
-        class pdfColor{
-
-                var $r = 0;
-                var $g = 0;
-                var $b = 0;
-
-                function pdfColor($r = 0,$g = 0,$b = 0){
-
-                        $this->r = $r;
-                        $this->g = $g;
-                        $this->b = $b;
-
-                }//end method
-
-        }//end class
-
-
-        class pdfFont {
-
-                var $family = "Arial";
-                var $style = "";
-                var $size = 8;
-
-                function pdfFont($family = "Arial", $style ="", $size = 8){
-
-                        $this->family = $family;
-                        $this->style = $style;
-                        $this->size = $size;
-
-                }//end method
-
-        }//end class
-
-
-        class pdfStyle{
-
-                var $font = NULL;
-                var $textColor = NULL;
-                var $backgroundColor = NULL;
-
-                function pdfStyle($font = NULL, $textColor = NULL, $backgroundColor = NULL){
-
-                        if($font) $this->font = $font;
-                        if($textColor) $this->textColor = $textColor;
-                        if($backgroundColor) $this->backgroundColor = $backgroundColor;
-
-                }//end method
-
-        }//end class
-
-
-        if(!class_exists("MEM_IMAGE")){
-
-                include("fpdf/fpdf.php");
-                include("fpdf/mem_image.php");
-
-        }//end if
-
-        class phpbmsPDFReport extends MEM_IMAGE {
-
-                var $borderDebug = 0;
-
-                var $leftmargin = 0.5;
-                var $rightmargin = 0.5;
-                var $topmargin = 0.75;
-                var $paperwidth = 8.5;
-                var $paperlength = 11;
-
-                var $hasComapnyHeader = false;
-                var $companyImageWidth = 1;
-
-                var $styles = array();
-
-
-                function phpbmsPDFReport($db, $orientation='P', $unit='mm', $format='Letter'){
-
-                        $this->db = $db;
-
-                        parent::MEM_IMAGE($orientation, $unit, $format);
-
-                        $this->initStyles();
-                        $this->SetLineWidth(0.01);
-
-                }//end method
-
-
-                function initStyles(){
-
-                        //here we set the standard styles
-
-                        // NORMAL
-                        $font = new pdfFont("Arial", "", 8);
-                        $style = new pdfStyle($font);
-
-                        $this->styles["normal"] = $style;
-
-
-                        // TITLES
-                        $font = new pdfFont("Arial", "B", 16);
-                        $style = new pdfStyle($font);
-
-                        $this->styles["title"] = $style;
-
-
-                        // HEADER
-                        $font = new pdfFont("Arial", "B", 8);
-                        $bgC = new pdfColor(0,0,0);
-                        $txtC = new pdfColor(255,255,255);
-                        $style = new pdfStyle($font, $txtC, $bgC);
-
-                        $this->styles["header"] = $style;
-
-                }//end method
-
-
-                function defineStyle($name, $pdfStyleObj){
-
-                        if(get_class($pdfStyleObj) != "pdfStyle")
-                                $error = new appError(1400,"defineStyle Method needs pdfStyle object as parameter 2","PDF Error",true,true,false);
-
-                        $this->styles[$name] = $pdfStyleObj;
-
-                }//end if
-
-
-                function setStyle($name){
-
-                        if(!isset($this->styles[$name]))
-                                $name = "normal";
-
-                        $newStyle = $this->styles[$name];
-
-                        if(isset($newStyle->font))
-                                $this->SetFont($newStyle->font->family, $newStyle->font->style, $newStyle->font->size);
-                        else
-                                $this->SetFont("Arial", "", 8);
-
-                        if(isset($newStyle->textColor))
-                                $this->SetTextColor($newStyle->textColor->r, $newStyle->textColor->g, $newStyle->textColor->b);
-                        else
-                                $this->SetTextColor(0,0,0);
-
-                        if(isset($newStyle->backgroundColor))
-                                $this->SetFillColor($newStyle->backgroundColor->r, $newStyle->backgroundColor->g, $newStyle->backgroundColor->b);
-                        else
-                                $this->SetFillColor(255,255,255);
-
-                }//end if
-
-
-                function SetMargins(){
-
-                        parent::SetMargins($this->leftmargin, $this->topmargin, $this->rightmargin);
-
-                }//end method
-
-
-                function Header(){
-                        if($this->hasComapnyHeader){
-
-                                $cname = COMPANY_NAME;
-                                $caddress = COMPANY_ADDRESS."\n".COMPANY_CSZ."\n".COMPANY_PHONE;
-
-                                $querystatement = "
-                                        SELECT
-                                                `file`,
-                                                UPPER(`type`) AS `type`
-                                        FROM
-                                                files
-                                        WHERE
-                                                id=1";
-
-                                $pictureresult = $this->db->query($querystatement);
-
-                                $thepicture = $this->db->fetchArray($pictureresult);
-
-                                if($thepicture["type"]=="IMAGE/JPEG"){
-
-                                        global $image;
-                                        $image = $thepicture["file"];
-                                        $this->Image('var://image', $this->leftmargin,$this->topmargin, $this->companyImageWidth, 0, "JPEG");
-
-                                } elseif($thepicture["type"]=="IMAGE/PNG")
-                                        $this->MemImage($thepicture["file"], $this->leftmargin, $this->topmargin, $this->companyImageWidth);
-
-                                //company name
-                                $this->SetXY($this->companyImageWidth + $this->leftmargin, $this->topmargin);
-                                $this->SetFont("Times","B",12);
-                                $this->Cell(4, 0.25, $cname, $this->borderDebug, 2, "L");
-
-                                //and last, company address
-                                $this->SetFont("Times","",8);
-                                $this->MultiCell(4, .125 , $caddress, $this->borderDebug);
-
-                        }//end if
-
-                }//end method
-
-        }//end class
+class pdfColumn{
+
+    var $title;
+    var $fieldname;
+    var $size = 1;
+    var $format;
+    var $align = "L";
+
+    function pdfColumn($title, $fieldname, $size = 1, $format = "", $align = "L"){
+
+        $this->title = $title;
+        $this->fieldname = $fieldname;
+        $this->size = ((real) $size);
+        $this->format = $format;
+        $this->align = $align;
+
+    }//end method
+
+}//end class
+
+
+class pdfColor{
+
+    var $r = 0;
+    var $g = 0;
+    var $b = 0;
+
+    function pdfColor($r = 0,$g = 0,$b = 0){
+
+        $this->r = $r;
+        $this->g = $g;
+        $this->b = $b;
+
+    }//end method
+
+}//end class
+
+
+class pdfFont {
+
+    var $family = "Arial";
+    var $style = "";
+    var $size = 8;
+
+    function pdfFont($family = "Arial", $style ="", $size = 8){
+
+        $this->family = $family;
+        $this->style = $style;
+        $this->size = $size;
+
+    }//end method
+
+}//end class
+
+
+class pdfStyle{
+
+    var $font = NULL;
+    var $textColor = NULL;
+    var $backgroundColor = NULL;
+
+    function pdfStyle($font = NULL, $textColor = NULL, $backgroundColor = NULL){
+
+        if($font) $this->font = $font;
+        if($textColor) $this->textColor = $textColor;
+        if($backgroundColor) $this->backgroundColor = $backgroundColor;
+
+    }//end method
+
+}//end class
+
+
+if(!class_exists("FPDI")){
+
+    require_once("fpdf/fpdf.php");
+    require_once("fpdf/tpl_and_memimage.php");
+    require_once("fpdf/fpdi.php");
+    require_once('fpdf/fpdi_pdf_parser.php');
+
+}//end if
+
+
+class phpbmsPDFReport extends FPDI {
+
+    var $borderDebug = 0;
+
+    var $leftmargin = 0.5;
+    var $rightmargin = 0.5;
+    var $topmargin = 0.75;
+    var $paperwidth = 8.5;
+    var $paperlength = 11;
+
+    var $logoInHeader = false;
+    var $companyInfoInHeader = false;
+
+    var $companyImageWidth = 1;
+
+    var $styles = array();
+
+
+    function phpbmsPDFReport($db, $orientation='P', $unit='mm', $format='Letter'){
+
+            $this->db = $db;
+
+            parent::FPDF_TPL($orientation, $unit, $format);
+
+            $this->initStyles();
+            $this->SetLineWidth(0.01);
+
+    }//end method
+
+
+    function initStyles(){
+
+            //here we set the standard styles
+
+            // NORMAL
+            $font = new pdfFont("Arial", "", 8);
+            $style = new pdfStyle($font);
+
+            $this->styles["normal"] = $style;
+
+
+            // TITLES
+            $font = new pdfFont("Arial", "B", 16);
+            $style = new pdfStyle($font);
+
+            $this->styles["title"] = $style;
+
+
+            // HEADER
+            $font = new pdfFont("Arial", "B", 8);
+            $bgC = new pdfColor(0,0,0);
+            $txtC = new pdfColor(255,255,255);
+            $style = new pdfStyle($font, $txtC, $bgC);
+
+            $this->styles["header"] = $style;
+
+    }//end method
+
+
+    function defineStyle($name, $pdfStyleObj){
+
+            if(get_class($pdfStyleObj) != "pdfStyle")
+                    $error = new appError(1400,"defineStyle Method needs pdfStyle object as parameter 2","PDF Error",true,true,false);
+
+            $this->styles[$name] = $pdfStyleObj;
+
+    }//end if
+
+
+    function setStyle($name){
+
+            if(!isset($this->styles[$name]))
+                    $name = "normal";
+
+            $newStyle = $this->styles[$name];
+
+            if(isset($newStyle->font))
+                    $this->SetFont($newStyle->font->family, $newStyle->font->style, $newStyle->font->size);
+            else
+                    $this->SetFont("Arial", "", 8);
+
+            if(isset($newStyle->textColor))
+                    $this->SetTextColor($newStyle->textColor->r, $newStyle->textColor->g, $newStyle->textColor->b);
+            else
+                    $this->SetTextColor(0,0,0);
+
+            if(isset($newStyle->backgroundColor))
+                    $this->SetFillColor($newStyle->backgroundColor->r, $newStyle->backgroundColor->g, $newStyle->backgroundColor->b);
+            else
+                    $this->SetFillColor(255,255,255);
+
+    }//end if
+
+
+    function SetMargins(){
+
+            parent::SetMargins($this->leftmargin, $this->topmargin, $this->rightmargin);
+
+    }//end method
+
+
+    function Header(){
+
+        if($this->logoInHeader){
+
+            $querystatement = "
+                SELECT
+                    `file`,
+                    UPPER(`type`) AS `type`
+                FROM
+                    files
+                WHERE
+                    id=1";
+
+            $pictureresult = $this->db->query($querystatement);
+
+            $thepicture = $this->db->fetchArray($pictureresult);
+
+            if($thepicture["type"]=="IMAGE/JPEG"){
+
+                global $image;
+                $image = $thepicture["file"];
+                $this->Image('var://image', $this->leftmargin,$this->topmargin, $this->companyImageWidth, 0, "JPEG");
+
+            } elseif($thepicture["type"]=="IMAGE/PNG")
+                $this->MemImage($thepicture["file"], $this->leftmargin, $this->topmargin, $this->companyImageWidth);
+
+        }//end if
+
+        if($this->companyInfoInHeader){
+
+            $cname = COMPANY_NAME;
+            $caddress = COMPANY_ADDRESS."\n".COMPANY_CSZ."\n".COMPANY_PHONE;
+
+            //company name
+            $width = $this->leftmargin;
+            if($this->logoInHeader)
+                $width += $this->companyImageWidth;
+
+            $this->SetXY($width, $this->topmargin);
+            $this->SetFont("Times","B",12);
+            $this->Cell(4, 0.25, $cname, $this->borderDebug, 2, "L");
+
+            //and last, company address
+            $this->SetFont("Times","",8);
+            $this->MultiCell(4, .125 , $caddress, $this->borderDebug);
+
+        }//end if
+
+    }//end method
+
+}//end class
 
 ?>

trunk/phpbms/report/report_class.php

@@ -38 +38 @@
 */
 
-        class phpbmsReport{
-                
-                var $db;
-                var $whereclause ="";
-                var $sortorder = "";
-                var $reportOutput = "";
-                var $groupBy = "";
-                
-                function phpBMSReport($db){
-                
-                        $this->db = $db;
-                
-                }//end method
-
-                
-                function setupFromPrintScreen(){
-                
-                        if(isset($_SESSION["printing"]["sortorder"]))
-                                $this->sortorder = $_SESSION["printing"]["sortorder"];
-                                
-                        if(isset($_SESSION["printing"]["whereclause"])){
-                                
-                                if(strpos($_SESSION["printing"]["whereclause"],"WHERE") === 0)
-                                        $this->whereclause = substr($this->whereclause, 5);
-                                        
-                                $this->whereclause = $_SESSION["printing"]["whereclause"];
-                                
-                        }//endif
-                        
-                        //backwards compatibility
-                        if(strpos($this->whereclause, "where ") === 0)
-                                $this->whereclause = substr($this->whereclause, 6);                     
-                
-                }//end method
-
-                
-                function assembleSQL($querystatement){
-                        
-                        if($this->whereclause)
-                                $querystatement .= "
-                                        WHERE
-                                                ".$this->whereclause;
-                        
-                        if($this->groupBy)
-                                $querystatement .= "
-                                        GROUP BY
-                                                ".$this->groupBy;                       
-                        
-                        if($this->sortorder)
-                                $querystatement .= "
-                                        ORDER BY
-                                                ".$this->sortorder;
-
-                        return $querystatement;
-                        
-                }//end method
-                
-                function _showNoRecords(){
-                        
-                        ?>
-                        <h1 id="noRecord">No Records</h1>
-                        <p>No valid records for this report.</p>
-                        <?php
-                        
-                }//end method --_showNoRecords--
-        
-        }//end class
-
+/**
+ * Basic reporting class
+ *
+ * The phpbmsReport class handles basic processing of reports and report type
+ * functions. It is designed to be extended by a specifc report. It provides
+ * functions for retrieving the where clause, sort order and group by fields
+ * as well as retrieving report settings
+ * @author Brian Rieb <brieb@kreotek.com>
+ */
+class phpbmsReport{
+
+    /**
+     * $db
+     * @var object the database object
+     */
+    var $db;
+
+    /**
+     * $whereClasue
+     * @var string whereclause used to filter results
+     */
+    var $whereClause = "";
+
+    /**
+     * $sortOrder
+     * @var string sortorder for results
+     */
+    var $sortOrder = "";
+
+    /**
+     * $groupBy
+     * @var string sort order for result SQL
+     */
+    var $groupBy = "";
+
+    /**
+     * $reportOutput
+     * @var string output generated by report
+     */
+    var $reportOutput = "";
+
+    /**
+     * $settings
+     * @var array array of report settings
+     */
+    var $settings = array();
+
+    /**
+     * $reportUUID;
+     * @var string UUID of report record
+     */
+    var $reportUUID = "";
+
+    /**
+     * $tabledefUUID
+     * @var string UUID of table definition that initiated report
+     */
+    var $tabledefUUID = "";
+
+
+    /**
+     * function phpbmsReport
+     *
+     * Initialization Function
+     *
+     * @param object $db database object
+     * @param string $reportUUID UUID of report record
+     * @param string $tabledefUUID UUID of table definition that initiated report
+     */
+    function phpBMSReport($db, $reportUUID, $tabledefUUID){
+
+        $this->db = $db;
+
+        $this->reportUUID = mysql_real_escape_string($reportUUID);
+
+        $this->tabledefUUID = mysql_real_escape_string($tabledefUUID);
+
+        if($reportUUID)
+            $this->retrieveReportSettings();
+
+    }//end function init
+
+
+    /**
+     * function retrieveReportSettings()
+     *
+     * Retrieves settings for specific report from database and stores them in
+     *  settings array.
+     */
+    function retrieveReportSettings(){
+
+        $querystatement = "
+            SELECT
+                `name`,
+                `value`,
+                `type`
+            FROM
+                reportsettings
+            WHERE
+                reportuuid = '".$this->reportUUID."'";
+
+        $queryresult = $this->db->query($querystatement);
+
+        while($therecord = $this->db->fetchArray($queryresult)){
+
+            switch($therecord["type"]){
+
+                case "int":
+                    $therecord["value"] = (int) $therecord["value"];
+                    break;
+
+                case "bool":
+                    $therecord["value"] = (bool) $therecord["value"];
+                    break;
+
+                case "real":
+                    $therecord["value"] = (real) $therecord["value"];
+                    break;
+
+            }//endswitch
+
+            $this->settings[$therecord["name"]] = $therecord["value"];
+
+        }//endwhile
+
+    }//end function retrieveReportSettings
+
+    /**
+     * function setupFromPrintScreen
+     *
+     * Retrieves session information pertaining to printing as set by the print
+     * screen.
+     */
+    function setupFromPrintScreen(){
+
+        if(isset($_SESSION["printing"]["sortorder"]))
+            $this->sortOrder = $_SESSION["printing"]["sortorder"];
+
+        if(isset($_SESSION["printing"]["whereclause"])){
+
+            if(strpos($_SESSION["printing"]["whereclause"],"WHERE") === 0)
+                $this->whereClause = substr($this->whereClause, 5);
+
+            $this->whereClause = $_SESSION["printing"]["whereclause"];
+
+        }//endif
+
+        //backwards compatibility
+        if(strpos($this->whereClause, "where ") === 0)
+            $this->whereClause = substr($this->whereClause, 6);
+
+    }//end function setupFromPrintScreen
+
+    /**
+     * function getTableDefInfo
+     *
+     * Retrieves pertinent table definition information
+     * @return array table definition record information
+     */
+    function getTableDefInfo(){
+
+        $querystatement = "
+            SELECT
+                *
+            FROM
+                tabledefs
+            WHERE
+                uuid = '".$this->tabledefUUID."'";
+
+        $queryresult = $this->db->query($querystatement);
+
+        return $this->db->fetchArray($queryresult);
+
+    }//end function getTableDefInfo
+
+    /**
+     * function assembleSQL
+     *
+     * assembles record query
+     *
+     * @param string $querystatement SELECT and FROM clauses of SQL statement
+     *
+     * @return string Retruns full SQL statement
+     */
+    function assembleSQL($querystatement){
+
+        if($this->whereClause)
+            $querystatement .= "
+                WHERE
+                    ".$this->whereClause;
+
+        if($this->groupBy)
+            $querystatement .= "
+                GROUP BY
+                    ".$this->groupBy;
+
+        if($this->sortOrder)
+            $querystatement .= "
+                ORDER BY
+                    ".$this->sortOrder;
+            return $querystatement;
+
+    }//end function assembleSQL
+
+
+    /**
+     * function showNoRecords
+     *
+     * Outputs simple no records error
+     */
+    function showNoRecords(){
+
+        ?>
+        <h1 id="noRecord">No Records</h1>
+        <p>No valid records for this report.</p>
+        <?php
+
+    }//end function showNoRecords
+
+
+    /**
+     * function addingRecordDefaultSettings
+     *
+     * Creates an array of settings associative arrays for use by the system when
+     * a new report record is added that references the file containing this class
+     *
+     * @retrun array of settings. Each setting should itself be
+     * an associative array containing the following
+     * name: name of the setting
+     * defaultvalue: default value for setting
+     * type: (string, text, int, real, bool) type for value of setting
+     * required: (0,1) whether the setting is required or not
+     * description: brief description for what this setting is used for.
+     */
+    function addingRecordDefaultSettings(){
+
+        $settings[] = array(
+            "name"=>"reportTitle",
+            "defaultValue"=>"Report",
+            "type"=>"string",
+            "required"=>0,
+            "description"=>"Report Title"
+        );
+
+        return $settings;
+
+    }//endfunction addingRecordDefaultSettings
+
+}//end class
+
+/**
+ * function checkForReportArguments
+ *
+ * used before class instatiation to make sure POST arguments are set correctly
+ */
+function checkForReportArguments(){
+
+    if(!isset($_GET["tid"]))
+            $error = new appError(200,"URL variable missing: tid");
+
+    if(!isset($_GET["rid"]))
+            $error = new appError(200,"URL variable missing: rid");
+
+}//end function checkForReportArguments
 ?>