Changeset 62

Timestamp:

11/22/05 18:46:05

Author:

brieb

Message:

- Added DB file system.
- Added attachment sections to invoices, product, and clients.
- Fixed caching problem with graphics.
- Added default tax area to clients.

fixed currency formatting.

Files:

• trunk/changelog.txt (modified) (1 diff)
• trunk/common/javascript/fields.js (modified) (1 diff)
• trunk/common/stylesheet/mozilla/base.css (modified) (3 diffs)
• trunk/common/stylesheet/mozilla/button-download.png (added)
• trunk/dbgraphic.php (modified) (1 diff)
• trunk/include/common_functions.php (modified) (2 diffs)
• trunk/include/search_class.php (modified) (2 diffs)
• trunk/install/createtables.sql (modified) (3 diffs)
• trunk/install/files.sql (modified) (1 diff)
• trunk/install/updatev0.61.sql (modified) (2 diffs)
• trunk/modules/base/adminsettings.php (modified) (4 diffs)
• trunk/modules/base/attachments_records.php (added)
• trunk/modules/base/files_addedit.php (modified) (4 diffs)
• trunk/modules/base/include/adminsettings_include.php (modified) (1 diff)
• trunk/modules/base/include/attachments_addedit_include.php (added)
• trunk/modules/base/include/attachments_search_functions.php (added)
• trunk/modules/base/include/files_addedit_include.php (modified) (5 diffs)
• trunk/modules/base/include/files_search_functions.php (modified) (2 diffs)
• trunk/modules/base/include/reports_search_functions.php (modified) (1 diff)
• trunk/modules/base/include/tasks_search_functions.php (modified) (1 diff)
• trunk/modules/base/javascript/file.js (added)
• trunk/modules/base/notes_records.php (modified) (1 diff)
• trunk/modules/base/tabledefs_addedit.php (modified) (1 diff)
• trunk/modules/base/tabledefs_columns.php (modified) (1 diff)
• trunk/modules/bms/adminsettings.php (modified) (2 diffs)
• trunk/modules/bms/clients_addedit.php (modified) (6 diffs)
• trunk/modules/bms/clients_attachments.php (added)
• trunk/modules/bms/clients_notes.php (modified) (2 diffs)
• trunk/modules/bms/clients_purchasehistory.php (modified) (2 diffs)
• trunk/modules/bms/include/clientemailprojects_search_functions.php (modified) (1 diff)
• trunk/modules/bms/include/clients_addedit_include.php (modified) (5 diffs)
• trunk/modules/bms/include/clients_functions.php (modified) (2 diffs)
• trunk/modules/bms/include/clients_search_functions.php (modified) (1 diff)
• trunk/modules/bms/include/discounts_search_functions.php (modified) (1 diff)
• trunk/modules/bms/include/invoices_functions.php (modified) (2 diffs)
• trunk/modules/bms/include/invoices_search_functions.php (modified) (4 diffs)
• trunk/modules/bms/include/productcategories_search_functions.php (modified) (1 diff)
• trunk/modules/bms/include/products_functions.php (modified) (2 diffs)
• trunk/modules/bms/include/products_search_functions.php (modified) (1 diff)
• trunk/modules/bms/include/tax_search_functions.php (modified) (1 diff)
• trunk/modules/bms/install/createtables.sql (modified) (1 diff)
• trunk/modules/bms/install/updatev0.61.sql (modified) (1 diff)
• trunk/modules/bms/invoices_addedit.php (modified) (3 diffs)
• trunk/modules/bms/invoices_attachments.php (added)
• trunk/modules/bms/invoices_client_ajax.php (modified) (3 diffs)
• trunk/modules/bms/invoices_notes.php (modified) (1 diff)
• trunk/modules/bms/javascript/invoice.js (modified) (2 diffs)
• trunk/modules/bms/products_attachments.php (added)
• trunk/modules/bms/products_notes.php (modified) (1 diff)
• trunk/modules/bms/report/invoices_pdfinvoice.php (modified) (2 diffs)
• trunk/modules/bms/report/invoices_pdfpackinglist.php (modified) (2 diffs)
• trunk/modules/bms/report/invoices_pdfquote.php (modified) (2 diffs)
• trunk/modules/bms/report/invoices_pdfworkorder.php (modified) (2 diffs)
• trunk/servefile.php (modified) (1 diff)

trunk/changelog.txt

@@ -35 +35 @@
-- PDF reports are now printed directly, instead of writing to a temp file.
-- Fixed recording of times in database.
+- Added DB file system.
+- Added attachment sections to invoices, product, and clients.
+- Fixed caching problem with graphics.
+- Added default tax area to client.
-
-phpBMS v0.602/ BMS module v0.602

trunk/common/javascript/fields.js

@@ -282 +282 @@
-function formatCurrency(thenumber){
-        var newdollar,retval
-
+thenumber=thenumber.toString();        
-        //check for number              
-        if (isNaN(parseFloat(thenumber)) || thenumber.length!=((parseFloat(thenumber)).toString()).length) thenumber="0.00";
+
-        // add the dollar sign... remember that if it is a negative number, the minus sign goes in front
-        if(thenumber.charAt(0)=="-") {

trunk/common/stylesheet/mozilla/base.css

@@ -81 +81 @@
-.huge{font-size : 17px;}
-.large{font-size : 16px;}
-
+,.notes
-.tiny { font-size : 10px}
-.mono {font-family:'Courier New', Courier, mono;}
-
-.standout,#statusmessage{ background-color:#0B63A2; color:white; font-weight:bold; font-size:15px; padding:4px;}
+
+.notes {color:#DF0005}
-
-.important {font-weight:bold;}
@@ -293 +295 @@
-.qh1, .qh2{background-color:black; cursor: pointer; cursor: hand;}
-.qh1 td, .qh2 td{color:white; border-right-color: white; border-bottom-color: white;}
+.qh1, .qh2{background-color:black; cursor: pointer; cursor: hand;}
+.qh1 a, .qh2 a{color:white;}
-
-
@@ -312 +316 @@
-.smallQueryTable td{background-color:white;border-bottom:1px solid #CCCCCC; border-right:1px solid #CCCCCC; padding:2px;padding-left:4px; padding-right:4px;cursor:pointer;}
-.smallQueryTable tr:Hover td{background-color:#999999;color:white;text-decoration:none;}
+.smallQueryTable tr:Hover td a{color:white;}
-.smallQueryTableSelected td{background-color:black;color:white}
+.smallQueryTableSelected a{color:white}
-.smallQueryTable tr.smallQueryTableSelected:Hover  td{background-color:black;color:white}
-/* ============================================================================== */

trunk/dbgraphic.php

@@ -35 +35 @@
- +-------------------------------------------------------------------------+
-*/
+        session_cache_limiter('private');
-        require_once("include/session.php");
-        if(!isset($_GET["t"]) or !isset($_GET["r"]) or !isset($_GET["f"]) or !isset($_GET["mf"])) die("Invlaid Paramateers Set");

trunk/include/common_functions.php

@@ -57 +57 @@
-                else echo "<a href=\"".$theitem["href"]."\">".$theitem["name"]."</a>";
-                if ($theitem["notify"]) {
-
+ 
-                }
-                ?></td><?php 
@@ -272 +272 @@
-                        $value=formatDateTime($value);
-                break;
+                case "filelink":
+                        $value="<a href=\"".$_SESSION["app_path"]."servefile.php?i=".$value."\" style=\"display:block;\"><img src=\"".$_SESSION["app_path"]."common/stylesheet/".$_SESSION["stylesheet"]."/button-download.png\" align=\"middle\" alt=\"view\" width=\"16\" height=\"16\" border=\"0\" /></a>";
-        }
-        return $value;

trunk/include/search_class.php

@@ -116 +116 @@
-                        mysql_data_seek($this->queryresult,0);
-                        while($therecord = mysql_fetch_array($this->queryresult)){
-
+the
-
-                                if ($this->options["select"]) {
@@ -689 +689 @@
-                                                
-                        $this->therecords=$this->thetabledef["querytable"]." ".$this->queryjoinclause." WHERE ".$this->querywhereclause." ORDER BY ".$this->querysortorder;
-
+this->thetabledef["maintable"].".id as theid,".$
-
-                        parent::issueQuery();

trunk/install/createtables.sql

@@ -98 +98 @@
-
-
-tablecolumns
-id
-tabledefid
-name
+`tablecolumns`
+`id`
+`tabledefid`
+`name`
-  `column` varchar(255) NOT NULL default '',
-align
-footerquery
-displayorder
-sortorder
-wrap
-size
-format enum('date','time','currency','boolean','datetime
-id
-tabledef (tabledefid
-displayorder (displayorder
+`align`
+`footerquery`
+`displayorder`
+`sortorder`
+`wrap`
+`size`
+`format` enum('date','time','currency','boolean','datetime','filelink
+`id`
+`tabledef` (`tabledefid`
+`displayorder` (`displayorder`
-) TYPE=MyISAM;
-
@@ -214 +214 @@
-  `id` int(11) NOT NULL auto_increment,
-  `name` varchar(128) NOT NULL default '',
-
-
+
-  `file` longblob,
-  `type` varchar(100) default '',
@@ -222 +221 @@
-  `modifiedby` int(11) default '0',
-  `modifieddate` timestamp(14) NOT NULL,
+  `accesslevel` int(11) NOT NULL default '0',
-  PRIMARY KEY  (`id`)
-) TYPE=MyISAM; 

trunk/install/files.sql

@@ -1 @@
-Printed Logo','logo.png','‰PNG\r\n\Z\n\0\0\0\rIHDR\0\0
+logo.png','Company Logo Used in PDF reports','‰PNG\r\n\Z\n\0\0\0\rIHDR\0\0

trunk/install/updatev0.61.sql

@@ -5 +5 @@
-
-ALTER TABLE tabledefs CHANGE defaultwhereclause defaultwhereclause varchar(255);
-
+
+
+
-
-UPDATE tabledefs SET defaultwhereclause="notes.type='EV' AND notes.createdby = {{$_SESSION['userinfo']['id']}} AND ((notes.startdate = year(notes.startdate)=year(curdate()) and week(notes.startdate)=week(curdate())) OR notes.`repeat`=1)" WHERE id=24;
@@ -15 +17 @@
-CREATE TABLE `settings` (`id` int(11) NOT NULL auto_increment, `name` varchar(64) NOT NULL default '',`value` varchar(255) default '', PRIMARY KEY  (`id`)) TYPE=MyISAM; 
-
-accesslevel` int(11) NOT NULL default '0',`servename` varchar(64) NOT NULL default '',`file` longblob,`type` varchar(100) default '',`createdby` int(11) default '0',`creationdate` datetime default '0000-00-00 00:00:00',`modifiedby` int(11) default '0',`modifieddate` timestamp(14) NOT NULL
+description` text,`file` longblob,`type` varchar(100) default '',`createdby` int(11) default '0',`creationdate` datetime default '0000-00-00 00:00:00',`modifiedby` int(11) default '0',`modifieddate` timestamp(14) NOT NULL,`accesslevel` int(11) NOT NULL default '0'
-
-CREATE TABLE `filetorecord` (`id` int(11) NOT NULL auto_increment,`fileid` int(11) NOT NULL default '0',`tabledefid` int(11) NOT NULL default '0',`recordid` int(11) NOT NULL default '0',`createdby` int(11) default '0',`creationdate` datetime default '0000-00-00 00:00:00',`modifiedby` int(11) default '0',`modifieddate` timestamp(14) NOT NULL,PRIMARY KEY  (`id`),KEY `therecord` (`recordid`),KEY `thetable` (`tabledefid`),KEY `thefile` (`fileid`)) TYPE=MyISAM;

trunk/modules/base/adminsettings.php

@@ -77 +77 @@
-                        <?PHP field_text("sapplication_name",$_SESSION["application_name"],1,"Application name cannot be blank.","",Array("size"=>"32","maxlength"=>"128")); ?>                         
-                </label>
-small
-em>Replace this with your comapny name + BMS (e.g. "Kreotek BMS")</em>
+notes
+strong>Example:</strong> Replace this with your comapny name + BMS (e.g. "Kreotek BMS")
-                </div>
-                <label for="sencryption_seed">
@@ -84 +84 @@
-                        <?PHP field_text("sencryption_seed",$_SESSION["encryption_seed"],1,"Application name cannot be blank.","",Array("size"=>"32","maxlength"=>"128")); ?>                           
-                </label>
-
-
+
+
+
-                </div>
-                <label for="srecord_limit">
@@ -97 +98 @@
-        </fieldset>
-                
-        <fieldset>
-                <legend>My<span style="text-transform:capitalize;">SQL</span></legend>
-                <div class="small important">
-                        <em>MysSQL settings must be updated manually by editing the settings.php file</em>
-                </div>
-                <label for="smysql_server">
-                        server name<br />
-                        <input size="32" maxlength="128" value="<?php echo htmlQuotes($_SESSION["mysql_server"])?>" readonly class="uneditable"/>
-                </label>
-                <label for="smysql_database">
-                        database name<br />
-                        <input size="32" maxlength="128" value="<?php echo htmlQuotes($_SESSION["mysql_database"])?>" readonly class="uneditable"/>
-                </label>
-                <label for="smysql_user">
-                        mysql username<br />
-                        <input size="32" maxlength="128" value="<?php echo htmlQuotes($_SESSION["mysql_user"])?>" readonly class="uneditable"/>
-                </label>
-                <label for="smysql_userpass">
-                        mysql user password<br />
-                        <input size="32" maxlength="128" value="<?php echo htmlQuotes($_SESSION["mysql_userpass"])?>" readonly class="uneditable"/>
-                </label>
-        </fieldset>
-
-        <fieldset>
-                <legend>company</legend>
@@ -150 +128 @@
-                        <input id="printedlogo" name="printedlogo" type="file" size="40" accept="image/x-png" />
-                </label>
-
-
+
+
+
+
-                </div>
-                <label for="sstylesheet">

trunk/modules/base/files_addedit.php

@@ -40 +40 @@
-        include("../../include/fields.php");
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
@@ -50 +64 @@
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="<?php echo $_SESSION["app_path"] ?>common/stylesheet/<?php echo $_SESSION["stylesheet"] ?>/base.css" rel="stylesheet" type="text/css">
-
+
-<script language="JavaScript" src="../../common/javascript/fields.js"></script>
+<script language="JavaScript" src="../../common/javascript/autofill.js"></script>
+<script language="JavaScript" src="../base/javascript/file.js"></script>
-</head>
-<body><?php include("../../menu.php")?>
@@ -71 +87 @@
-                        <input id="id" name="id" type="text" value="<?php echo $therecord["id"]; ?>" size="5" maxlength="5" readonly="true" class="uneditable" style="width:99%" />
-                </label>
-
+ id="accesslevellabel"
-                        minimum access level<br />
-                        <?php 
@@ -92 +108 @@
-        </fieldset>
-        <fieldset>
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                </label>
-                <label for="servename" class="important">
-                        serve name<br />
-                        <?PHP field_text("servename",$therecord["servename"],1,"Serve name cannot be blank.","",Array("size"=>"40","maxlength"=>"64","style"=>"","class"=>"important","tabindex"=>"5")); ?>
-                </label>
-                <div class="small" style="padding-top:6px;padding-bottom:6px;"><em>
-                        Serve name is the file name, including extension that will be used when the file is sent through the web server to the client.  
-                        If the extension does not match the type (mime file type) the client browser may misinterpret the file.
-                </em></div>
-        </fieldset>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        <?php include("../../include/createmodifiedby.php"); ?>
-</div>

trunk/modules/base/include/adminsettings_include.php

@@ -85 +85 @@
-                        if(!$queryresult) reportError(300,"Error Uploading Graphic File");
-                }
-        }
-                        
-        return true;

trunk/modules/base/include/files_addedit_include.php

@@ -50 +50 @@
-        
-        $querystatement="SELECT
-servename,type,accesslevel,ISNULL(file) as nofile
+description,type,accesslevel
-                                
-                                createdby, creationdate, 
@@ -69 +69 @@
-
-        $therecord["name"]="";
-servename
+description
-        $therecord["type"]="";
-        $therecord["accesslevel"]=0;
-        $therecord["nofile"]=1;
-        
-        $therecord["createdby"]=$_SESSION["userinfo"]["id"];
@@ -89 +88 @@
-        
-        $querystatement="UPDATE files SET ";
-
-querystatement.="name=\"".$variables["name"]."\", "; 
-servename=\"".$variables["servename
+
+name=$variables["name"];
+description=\"".$variables["description
-                        $querystatement.="accesslevel=".$variables["accesslevel"].", "; 
-                        if($_FILES['upload']["name"]){
+                                $name=$_FILES['upload']["name"];
-                                if (function_exists('file_get_contents')) {
-                                        $file = addslashes(file_get_contents($_FILES['upload']['tmp_name']));
@@ -103 +103 @@
-                                $querystatement.="file=\"".$file."\", ";
-                        }
+                        $querystatement.="name=\"".$name."\", "; 
-
-        //==== Almost all records should have this =========
@@ -129 +130 @@
-        $querystatement="INSERT INTO files ";
-        
-servename
+description
-                                                createdby,creationdate,modifiedby) VALUES (";
-        
-variables
-servename
+_FILES['upload']
+description
-                        $querystatement.=$variables["accesslevel"].", "; 
-                        $querystatement.="\"".$_FILES['upload']['type']."\", ";

trunk/modules/base/include/files_search_functions.php

@@ -44 +44 @@
-//delete reports
-function delete_record($theids){
-
-
+
-
-
+
+
+
+
+
+
+
+
-        $queryresult = mysql_query($querystatement,$dblink);
-        if (!$queryresult) reportError(300,"Couldn't Delete: ".mysql_error($dblink)." -- ".$querystatement);            
@@ -61 +67 @@
-$has_header=true;
-function display_header(){
-
-
-
-
+
-};
-?>

trunk/modules/base/include/reports_search_functions.php

@@ -44 +44 @@
-//delete reports
-function delete_record($theids){
-
+