Placing a print link in all view windows (without menus)

Preparing for new recursive balance sheet/PL Statements

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0cc2de49c0c10270ef55ead2c1ac982958fecedd..d6b10a90bb0c62c93eac28ec42862d579a731f4d 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,14 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+05-Feb-2010 Joe Hunt/Kalido
++ Placing a print link in all view windows (without menus).
+$ /includes/main.inc
+  /includes/ui_controls.inc
+! Preparing for new recursive balance sheet/PL Statements
+$ /gl/includes/db/gl_db_accounts.inc
+  /gl/includes/db/gl_db_account_types.inc
+  
 05-Feb-2010 Janusz Dobrowolski
 # Fixed get_standard_cost()for dummy items
 $ /includes/db/inventory_db.inc

diff --git a/gl/includes/db/gl_db_account_types.inc b/gl/includes/db/gl_db_account_types.inc
index 1c25db71a5a7e8fc140ee655fac052f72c84aae6..6dd5a5db422ae21cb531bdc789386f15be5e5c92 100644 (file)
--- a/gl/includes/db/gl_db_account_types.inc
+++ b/gl/includes/db/gl_db_account_types.inc
@@ -26,11 +26,18 @@ function update_account_type($id, $name, $class_id, $parent)
        return db_query($sql, "could not update account type");
 }
 
-function get_account_types($all=false)
+function get_account_types($all=false, $class_id=false, $parent=false)
 {
        $sql = "SELECT * FROM ".TB_PREF."chart_types";
 
-       if (!$all) $sql .= " WHERE !inactive";
+       if (!$all) 
+               $sql .= " WHERE !inactive";
+       if ($class_id != false) 
+               $sql .= " AND class_id=".db_escape($class_id);
+       if ($parent == -1) 
+               $sql .= " AND parent <= 0";
+       elseif ($parent != false) 
+               $sql .= " AND parent=".db_escape($parent);
        $sql .= " ORDER BY class_id, id";
 
        return db_query($sql, "could not get account types");
@@ -78,13 +85,18 @@ function update_account_class($id, $name, $ctype)
        return db_query($sql);
 }
 
-function get_account_classes($all=false)
+function get_account_classes($all=false, $balance=-1)
 {
        $sql = "SELECT * FROM ".TB_PREF."chart_class";
-       if (!$all) $sql .= " WHERE !inactive";
+       if (!$all) 
+               $sql .= " WHERE !inactive";
+       if ($balance == 0) 
+               $sql .= " AND ctype>".CL_EQUITY." OR ctype=0";
+       elseif ($balance == 1) 
+               $sql .= " AND ctype>0 AND ctype<".CL_INCOME; 
        $sql .= " ORDER BY cid";
 
-       return db_query($sql, "could not get account types");
+       return db_query($sql, "could not get account classes");
 }
 
 function get_account_class($id)

diff --git a/gl/includes/db/gl_db_accounts.inc b/gl/includes/db/gl_db_accounts.inc
index ee4d4c73bef7ee8bf6863a38a1df19c0def7d1ab..c3d2e9787a256b1de8486f0bc22507fc9d2021f2 100644 (file)
--- a/gl/includes/db/gl_db_accounts.inc
+++ b/gl/includes/db/gl_db_accounts.inc
@@ -34,7 +34,7 @@ function delete_gl_account($code)
        db_query($sql, "could not delete gl account");
 }
 
-function get_gl_accounts($from=null, $to=null)
+function get_gl_accounts($from=null, $to=null, $type=null)
 {
        $sql = "SELECT ".TB_PREF."chart_master.*,".TB_PREF."chart_types.name AS AccountTypeName
                FROM ".TB_PREF."chart_master,".TB_PREF."chart_types
@@ -43,6 +43,8 @@ function get_gl_accounts($from=null, $to=null)
                $sql .= " AND ".TB_PREF."chart_master.account_code >= ".db_escape($from);
        if ($to != null)
                $sql .= " AND ".TB_PREF."chart_master.account_code <= ".db_escape($to);
+       if ($type != null)
+               $sql .= " AND account_type=".db_escape($type);
        $sql .= " ORDER BY account_code";
 
        return db_query($sql, "could not get gl accounts");

diff --git a/includes/main.inc b/includes/main.inc
index 0a63e397571a00555979716730d367f832848a52..016102a58325c28800694fff05a919fd103cd1a5 100644 (file)
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -53,7 +53,7 @@ function end_page($no_menu=false, $is_index=false, $hide_back_link=false)
        global $path_to_root;
 
        if (!$is_index && !$hide_back_link && function_exists('hyperlink_back'))
-               hyperlink_back();
+               hyperlink_back(true, $no_menu);
        div_end();      // end of _page_body section
 
        include($path_to_root . "/includes/page/footer.inc");

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 9848761e263ac7e95eed708823810caf85d75d34..e809042e093fa3df0b0dbaf50934bf6ed983e2ba 100644 (file)
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -124,11 +124,17 @@ function access_string($label, $clean=false)
        return $clean ? $label : array($label, $access);
 }
 
-function hyperlink_back($center=true)
+function hyperlink_back($center=true, $no_menu=true)
 {
        if ($center)
                echo "<center>";
-       echo "<p><a href='javascript:goBack();'>"._("Back")."</a></p>\n";
+       start_table("width=20%");
+       start_row();
+       if ($no_menu)
+               echo "<td align=center><a href='javascript:window.print();'>"._("Print")."</a></td>\n";
+       echo "<td align=center><a href='javascript:goBack();'>".($no_menu ? _("Close") : _("Back"))."</a></td>\n";
+       end_row();
+       end_table();
        if ($center)
                echo "</center>";
        echo "<br>";