Changeset 693 for trunk/phpbms/modules/bms/products_saleshistory.php

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)

Files:

• trunk/phpbms/modules/bms/products_saleshistory.php (modified) (3 diffs)

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>