Merged changes from main branch up to release 2.2.1

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e8708a7512e801a027e22c079a103b6abeeda4ed..c1e27e33a8ee760364c465275f746c7c58d228b3 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,67 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+02-Dec-2009 Janusz Dobrowolski
+! Merged changed from trunk up to 2.2.1 ---------------------------------------
+
+$ /sql/en_US-demo.sql
+# Fixed to store default null values on export
+$ /admin/db/maintenance_db.inc
+! Display sql in case of duplicate data error when go_debug=1 - redone
+$ /includes/errors.inc
+# Display settings are restored in every login in demo mode.
+$ /admin/display_prefs.php
+  /includes/current_user.inc
+# Fixed view/download backup
+$ /admin/backups.php
+
+$ config.default.php
+  /lang/new_language_template/LC_MESSAGES/empty.po
+  /lang/en_US/LC_MESSAGES/en_US.mo
+# More restrictions on deleting gl_accounts
+$ /gl/manage/gl_accounts.php
+! Changed 'delete' to 'deldump' in backups.php to better satisfy IE8 (Yes!)
+$ /admin/backups.php
+
+01-Dec-2009 Janusz Dobrowolski
+# Removing config.php after error during install. Otherwise misleading message is displayed.
+$ /install/save.php
+! Display sql in case of duplicate data error when go_debug=1.
+$ /includes/errors.inc
+! Next transaction numbers retrieved from transaction table instead of sys_types
+$ /includes/systypes.inc
+
+29-Nov-2009 Janusz Dobrowolski
+# Fixed change of language in display preferences. Removed sparse $_SESSION['languages'] variable
+$ /includes/lang/language.php
+  /includes/session.inc
+! Array helpers moved to current_user. Added array_search_key and array_search_key helpers.
+$ /includes/current_user.inc
+  /includes/main.inc
+
+28-Nov-2009 Chaitanya/Joe Hunt
+# Missing ajax trigger in stock_purchasable_items_list_cells. Prices not updated instantly.
+$ /purchasing/includes/ui/po_ui.inc
+
+26-Nov-2009 Joe Hunt
+# Round to nearest value of 0 produced a division by zero error
+$ /admin/company_preferences.php
+# When printing reference numbers instead of internal numbers on documents
+  it should also refer to reference numbers in deliveries and orders.
+$ /reporting/includes/header2.inc
+
+25-Nov-2009 Joe Hunt/Tom Hallman
+# Fixed so total amount cannot be 0 in Bank Payments/Deposits
+$ /gl/gl_bank.php
+
+21-Nov-2009 Janusz Dobrowolski
+# Fixed bug [0000178] data error in supplier allocations
+$ /includes/ui/allocation_cart.inc
+! Fixed type constant usage.
+$ /purchasing/includes/db/supp_trans_db.inc
+
+--------------
+
 01-Dec-2009 Joe Hunt
 ! Moved all SQL statements from PHP files into relevant *_db.inc files.
   included gl folder
@@ -65,9 +126,6 @@ $ /admin/attachments.php
   /includes/date_functions.inc
   /reporting/includes/excel_report.inc
   /reporting/includes/pdf_report.inc
-  
-  
-  
 
 ------------------------------- Release 2.2 ----------------------------------
 18-Nov-2009 Joe Hunt

diff --git a/admin/backups.php b/admin/backups.php
index efa78619d75a2fae547ad16be348bbf8b19a114e..a70a2846e55c96a7a8fcae67221f648d0da7b5fa 100644 (file)
--- a/admin/backups.php
+++ b/admin/backups.php
@@ -17,7 +17,7 @@ include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/admin/db/maintenance_db.inc");
 
 if (get_post('view')) {
-       $filename = BACKUP_PATH . get_post('cmb_backups');
+       $filename = BACKUP_PATH . get_post('backups');
        if (in_ajax()) 
                $Ajax->popup( $filename );
        else {
@@ -30,7 +30,7 @@ if (get_post('view')) {
 };
 
 if (get_post('download')) {
-       download_file(BACKUP_PATH . get_post('cmb_backups'));
+       download_file(BACKUP_PATH . get_post('backups'));
        exit;
 }
 
@@ -67,7 +67,7 @@ function get_backup_file_combo()
        global $path_to_root, $Ajax;
        
        $ar_files = array();
-    default_focus('cmb_backups');
+    default_focus('backups');
     $dh = opendir(BACKUP_PATH);
        while (($file = readdir($dh)) !== false)
                $ar_files[] = $file;
@@ -79,10 +79,10 @@ function get_backup_file_combo()
                if (preg_match("/.sql(.zip|.gz)?$/", $file))
                $opt_files .= "<option value='$file'>$file</option>";
 
-       $selector = "<select name='cmb_backups' size=2 style='height:160px;min-width:230px'>$opt_files</select>";
+       $selector = "<select name='backups' size=2 style='height:160px;min-width:230px'>$opt_files</select>";
 
-       $Ajax->addUpdate('cmd_backups', "_cmd_backups_sel", $selector);
-       $selector = "<span id='_cmd_backups_sel'>".$selector."</span>\n";
+       $Ajax->addUpdate('backups', "_backups_sel", $selector);
+       $selector = "<span id='_backups_sel'>".$selector."</span>\n";
 
        return $selector;
 }
@@ -121,19 +121,19 @@ $conn = $db_connections[$db_name];
 
 if (get_post('creat')) {
        generate_backup($conn, get_post('comp'), get_post('comments'));
-       $Ajax->activate('cmd_backups');
+       $Ajax->activate('backups');
 };
 
 if (get_post('restore')) {
-       if (db_import(BACKUP_PATH . get_post('cmb_backups'), $conn))
+       if (db_import(BACKUP_PATH . get_post('backups'), $conn))
                display_notification(_("Restore backup completed."));
 }
 
-if (get_post('delete')) {
-       if (unlink(BACKUP_PATH . get_post('cmb_backups'))) {
+if (get_post('deldump')) {
+       if (unlink(BACKUP_PATH . get_post('backups'))) {
                display_notification(_("File successfully deleted.")." "
-                               . _("Filename") . ": " . get_post('cmb_backups'));
-               $Ajax->activate('cmd_backups');
+                               . _("Filename") . ": " . get_post('backups'));
+               $Ajax->activate('backups');
        }
        else
                display_error(_("Can't delete backup file."));
@@ -149,7 +149,7 @@ if (get_post('upload'))
        elseif (is_uploaded_file($tmpname)) {
                rename($tmpname, BACKUP_PATH . $fname);
                display_notification( "File uploaded to backup directory");
-               $Ajax->activate('cmd_backups');
+               $Ajax->activate('backups');
        } else
                display_error(_("File was not uploaded into the system."));
 }
@@ -174,8 +174,9 @@ table_section_title(_("Backup scripts maintenance"));
        submit_row('restore',_("Restore Backup"), false, '','', 'process');
        submit_js_confirm('restore',_("You are about to restore database from backup file.\nDo you want to continue?"));
 
-       submit_row('delete', _("Delete Backup"), false, '','', true);
-       submit_js_confirm('delete', sprintf(_("You are about to remove selected backup file.\nDo you want to continue ?")));
+       submit_row('deldump', _("Delete Backup"), false, '','', true);
+       // don't use 'delete' name or IE js errors appear
+       submit_js_confirm('deldump', sprintf(_("You are about to remove selected backup file.\nDo you want to continue ?")));
        end_table();
        echo "</td>";
        end_row();

diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index 366fc852613328c472df27031ce3af399a249e8b..3ee19edbc7a493be95e19e3763c7ecd0d95cf7ef 100644 (file)
--- a/admin/company_preferences.php
+++ b/admin/company_preferences.php
@@ -102,6 +102,8 @@ if (isset($_POST['update']) && $_POST['update'] != "")
        }
        if ($_POST['add_pct'] == "")
                $_POST['add_pct'] = -1;
+       if ($_POST['round_to'] <= 0)
+               $_POST['round_to'] = 1;
        if ($input_error != 1)
        {
                update_company_setup($_POST['coy_name'], $_POST['coy_no'], 

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index 8ddbaebc395c9446188bdca7c51648a34de22e51..225d57f7827be4bc593e8494d3b9bb8fb1d90ef2 100644 (file)
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -617,11 +617,11 @@ function db_export($conn, $filename, $zip='no', $comment='', $tbpref = TB_PREF)
                                // check if field types are NULL or NOT NULL
                                $res3 = db_query("SHOW COLUMNS FROM `" . $tablename . "`");
 
-                               $field_type = array();
+                               $field_null = array();
                                for ($j = 0; $j < db_num_rows($res3); $j++)
                                {
                                        $row3 = db_fetch($res3);
-                                       $field_type[] = $row3[2];
+                                       $field_null[] = $row3[2]=='YES' && $row3[4]===null;
                                }
 
                                $res2 = db_query("SELECT * FROM `" . $tablename . "`");
@@ -632,7 +632,7 @@ function db_export($conn, $filename, $zip='no', $comment='', $tbpref = TB_PREF)
                                        // run through each field
                                        for ($k = 0; $k < $nf = db_num_fields($res2); $k++)
                                        {
-                                               $out .= db_escape(@html_entity_decode($row2[$k], ENT_QUOTES, $_SESSION['language']->encoding));
+                                               $out .= db_escape($row2[$k], $field_null[$k]);
                                                if ($k < ($nf - 1))
                                                        $out .= ", ";
                                        }

diff --git a/admin/display_prefs.php b/admin/display_prefs.php
index 1de931ebac1f3f0ff3d49389611b7ba045ce9be0..4374df3a6fcbab9dcf20b2ef0cc1a9a65a3675c4 100644 (file)
--- a/admin/display_prefs.php
+++ b/admin/display_prefs.php
@@ -56,7 +56,11 @@ if (isset($_POST['setprefs']))
                if ($chg_theme || $chg_lang)
                        meta_forward($_SERVER['PHP_SELF']);
 
-               display_notification_centered(_("Display settings have been updated."));
+               
+               if ($allow_demo_mode)  
+                       display_warning(_("Display settings have been updated. Keep in mind that changed settings are restored on every login in demo mode."));
+               else
+                       display_notification_centered(_("Display settings have been updated."));
        }
 }
 

diff --git a/config.default.php b/config.default.php
index 0acd7b83d0c38b7c6c4203425d4344f2e753abf6..6c3fbe406d829f3aff51a3861201e354c10c7e3f 100644 (file)
--- a/config.default.php
+++ b/config.default.php
@@ -56,7 +56,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
        // Main Title
        $app_title = "FrontAccounting";
        // application version
-       $version                = "2.2";
+       $version                = "2.2.1";
 
        // Build for development purposes
        $build_version  = date("d.m.Y", filemtime("$path_to_root/CHANGELOG.txt"));

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index baf7f8857f28c2245873b9f3d5e8c19a8e8c9614..3510dbd44c864e8a28d43a02170c8752063f71b3 100644 (file)
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.php
@@ -125,6 +125,12 @@ if (isset($_POST['Process']))
                $input_error = 1;
        }
 
+       if ($_SESSION['pay_items']->gl_items_total() == 0.0) {
+               display_error(_("The total bank amount cannot be 0."));
+               set_focus('code_id');
+               $input_error = 1;
+       }
+
        if (!$Refs->is_valid($_POST['ref']))
        {
                display_error( _("You must enter a reference."));

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 99d314770b6f5952cd723d940ee2c19b24c02d9b..e9125bcd755fa1d0cfb0b637509f9c38311d7870 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -170,14 +170,29 @@ class current_user
        function update_prefs($price_dec, $qty_dec, $exrate_dec, $percent_dec, 
                $showgl, $showcodes, $date_format, $date_sep, $tho_sep, $dec_sep, 
                $theme, $pagesize, $show_hints, $profile, $rep_popup, $query_size, 
-               $graphic_links, $lang, $stickydate, $startup_tab) {
-               update_user_display_prefs($this->user, $price_dec, 
-                       $qty_dec, $exrate_dec, $percent_dec, $showgl, $showcodes, 
-                       $date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize, 
-                       $show_hints, $profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate, $startup_tab);
-
-               // re-read the prefs
-               $user = get_user($this->user);
+               $graphic_links, $lang, $stickydate, $startup_tab)
+       {
+               global $allow_demo_mode;
+
+               $user = array(
+                       'prices_dec' => $price_dec,     'qty_dec' => $qty_dec,
+                       'rates_dec' => $exrate_dec,             'percent_dec' => $percent_dec,
+                       'show_gl' => $showgl,                   'show_codes' => $showcodes,
+                       'date_format' => $date_format,  'date_sep' => $date_sep,
+                       'tho_sep' => $tho_sep,                  'dec_sep' => $dec_sep,
+                       'theme' => $theme,                              'page_size' => $pagesize,
+                       'show_hints' => $show_hints,    'print_profile' => $profile,
+                       'rep_popup' => $rep_popup,              'query_size' => $query_size,
+                       'graphic_links' => $graphic_links,      'language' => $lang,
+                       'sticky_doc_date' => $stickydate,       'startup_tab' => $startup_tab
+               );
+
+               if(!$allow_demo_mode) {
+                       update_user_display_prefs($this->user, $price_dec, 
+                               $qty_dec, $exrate_dec, $percent_dec, $showgl, $showcodes, 
+                               $date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize, 
+                               $show_hints, $profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate, $startup_tab);
+               }
                $this->prefs = new user_prefs($user);
        }
 }
@@ -424,4 +439,59 @@ function session_timeout()
        $tout = @get_company_pref('login_tout'); // mask warning for db ver. 2.2
        return $tout ? $tout : ini_get('session.gc_maxlifetime');
 }
+
+//-----------------------------------------------------------------------------
+//     Inserts $elements into $array at position $index.
+//     $elements is list of any objects
+//
+function array_insert(&$array, $index, $elements)
+{
+       if (!is_array($elements)) $elements = array($elements);
+
+       $head  = array_splice($array, 0, $index);
+       $array = array_merge($head, $elements, $array);
+}
+
+function array_remove(&$array, $index, $len=1)
+{
+       array_splice($array, $index, $len);
+}
+
+function array_substitute(&$array, $index, $len, $elements)
+{
+       array_splice($array, $index, $len);
+       array_insert($array, $index, $elements);
+}
+
+function array_append(&$array, $elements)
+{
+       foreach($elements as $key => $el) {
+               if(is_int($key))
+                       $array[] = $el;
+               else
+                       $array[$key] = $el;
+       }
+}
+
+function array_search_value($needle, $haystack, $valuekey=null)
+{
+       foreach($haystack as $key => $value) {
+               $val = isset($valuekey) ? $value[$valuekey] : $value;
+               if ($needle == $val){
+                       return $value;
+               }
+       }
+       return null;
+}
+
+function array_search_key($needle, $haystack, $valuekey=null)
+{
+       foreach($haystack as $key => $value) {
+               $val = isset($valuekey) ? $value[$valuekey] : $value;
+               if ($needle == $val){
+                       return $key;
+               }
+       }
+       return null;
+}
 ?>
\ No newline at end of file

diff --git a/includes/errors.inc b/includes/errors.inc
index bfa213d5514d96ab1ac59e87e22fa8ffcc2619ba..a9b68898498fb0e4f9854e678ad155b86a3bfa57 100644 (file)
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -135,7 +135,7 @@ function frindly_db_error($db_error)
        global $db_duplicate_error_code;
        
        if ($db_error == $db_duplicate_error_code) 
-       {
+       {       
                display_error(_("The entered information is a duplicate. Please go back and enter different values."));
                return true;
        }
@@ -145,13 +145,13 @@ function frindly_db_error($db_error)
 
 function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_error=true)
 {
-       global $db;
+       global $db, $go_debug;
        $db_error = db_error_no();
        
        if ($db_error != 0) 
        {
                
-               if (!frindly_db_error($db_error)) {
+               if ($go_debug || !frindly_db_error($db_error)) {
                                display_db_error($msg, $sql_statement, false);
                }
                

diff --git a/includes/lang/language.php b/includes/lang/language.php
index f9b86b17ceaf2bfb84cfb10a54c87b893315dca1..8960928377024f8071c6cf0e0b1dfaaab1eb4e29 100644 (file)
--- a/includes/lang/language.php
+++ b/includes/lang/language.php
@@ -24,12 +24,12 @@ class language
                                                // Right-To-Left (rtl)
        var $is_locale_file;
        
-       function language($name, $code, $encoding) 
+       function language($name, $code, $encoding, $dir = 'ltr') 
        {
                $this->name = $name;
                $this->code = $code;
                $this->encoding = $encoding;
-               $this->dir = "ltr";
+               $this->dir = $dir;
        }
 
        function get_language_dir() 
@@ -45,51 +45,35 @@ class language
 
        function set_language($code) 
        {
-           global $comp_path, $path_to_root;
-               
-               $changed = $_SESSION['language']->code != $code;
-               if (isset($_SESSION['languages'][$code]) && $changed)
+           global $comp_path, $path_to_root, $installed_languages;
+
+               $changed = $this->code != $code;
+               $lang = array_search_value($code, $installed_languages, 'code');
+
+               if ($lang && $changed)
                {
                // flush cache as we can use several languages in one account
-                   flush_dir($comp_path.'/'.user_company().'/js_cache');
-                   $_SESSION['language'] = $_SESSION['languages'][$code];
-                       $locale = $path_to_root . "/lang/" . $_SESSION['language']->code . "/locale.inc";
-                       // check id file exists only once for session
-                       $_SESSION['language']->is_locale_file = file_exists($locale);
+                       flush_dir($comp_path.'/'.user_company().'/js_cache');
+
+                       $this->name = $lang['name'];
+                       $this->code = $lang['code'];
+                       $this->encoding = $lang['encoding'];
+                       $this->dir = isset($lang['rtl']) ? 'rtl' : 'ltr';
+                       $locale = $path_to_root . "/lang/" . $this->code . "/locale.inc";
+                       $this->is_locale_file = file_exists($locale);
                }
-               $lang = $_SESSION['language'];
-               $_SESSION['get_text']->set_language($lang->code, $lang->encoding);
-               $_SESSION['get_text']->add_domain($lang->code, $path_to_root . "/lang");
-               
+
+               $_SESSION['get_text']->set_language($this->code, $this->encoding);
+               $_SESSION['get_text']->add_domain($this->code, $path_to_root . "/lang");
+
                // Necessary for ajax calls. Due to bug in php 4.3.10 for this 
                // version set globally in php.ini
-               ini_set('default_charset', $lang->encoding);
+               ini_set('default_charset', $this->encoding);
 
                if (isset($_SESSION['App']) && $changed)
                        $_SESSION['App']->init(); // refresh menu
        }
 }
-       /**
-        * This method loads an array of language objects into a session variable
-     * called $_SESSIONS['languages']. Only supported languages are added.
-     */
-       function load_languages() 
-       {
-               global $installed_languages, $dflt_lang;
-
-               $_SESSION['languages'] = array();
-
-        foreach ($installed_languages as $lang) 
-        {
-                       $l = new language($lang['name'],$lang['code'],$lang['encoding']);
-                       if (isset($lang['rtl']))
-                               $l->dir = "rtl";
-                       $_SESSION['languages'][$l->code] = $l;
-        }
-
-               if (!isset($_SESSION['language']))
-                       $_SESSION['language'] = $_SESSION['languages'][$dflt_lang];
-       }
 
 function _set($key,$value) 
 {

diff --git a/includes/main.inc b/includes/main.inc
index fcb8b99ac5ac4c7ce4ac4fbb3fe073e64bba5a01..b0878fb5004450b941b39fe611ad9fa81b2ef3d9 100644 (file)
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -259,37 +259,5 @@ function js_compress($sJS)
        }
        return $sJS;
 }
-//-----------------------------------------------------------------------------
-//     Inserts $elements into $array at position $index.
-//     $elements is list of any objects
-//
-function array_insert(&$array, $index, $elements)
-{
-       if (!is_array($elements)) $elements = array($elements);
-
-       $head  = array_splice($array, 0, $index);
-       $array = array_merge($head, $elements, $array);
-}
-
-function array_remove(&$array, $index, $len=1)
-{
-       array_splice($array, $index, $len);
-}
-
-function array_substitute(&$array, $index, $len, $elements)
-{
-       array_splice($array, $index, $len);
-       array_insert($array, $index, $elements);
-}
-
-function array_append(&$array, $elements)
-{
-       foreach($elements as $key => $el) {
-               if(is_int($key))
-                       $array[] = $el;
-               else
-                       $array[$key] = $el;
-       }
-}
 
 ?>
\ No newline at end of file

diff --git a/includes/session.inc b/includes/session.inc
index 8f780caa3220a1aba764784f0310d9101110af29..ea1c12a54367e978845e0c99f4370ab7a2a571b0 100644 (file)
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -162,12 +162,15 @@ session_start();
 // this is to fix the "back-do-you-want-to-refresh" issue - thanx PHPFreaks
 header("Cache-control: private");
 
+
 get_text_init();
 
 // Page Initialisation
 if (!isset($_SESSION['language'])) 
 {
-       load_languages(); // sets also default $_SESSION['language']
+       $l = array_search_value($dflt_lang, $installed_languages,  'code');
+       $_SESSION['language'] = new language($l['name'], $l['code'], $l['encoding'],
+        isset($l['rtl']) ? 'rtl' : 'ltr');
 }
 
 $_SESSION['language']->set_language($_SESSION['language']->code);

diff --git a/includes/systypes.inc b/includes/systypes.inc
index 9f93fd541aeb4afbc38c05c0a0f782a6cb2ac452..969960cd3a4c8e11c857c3e54d3b2cbbd6121cc0 100644 (file)
--- a/includes/systypes.inc
+++ b/includes/systypes.inc
@@ -9,26 +9,29 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-Function get_next_trans_no ($trans_type){
 
-    // sql to get the next display transaction number
-       //these are maintained in the table sys_types
-    // Also updates the transaction number
+//-----------------------------------------------------------------------------------------
+//     Returns next transaction number.
+//     Used only for transactions stored in tables without autoincremented key.
+//
+function get_next_trans_no ($trans_type){
 
-    $sql = "SELECT type_no FROM ".TB_PREF."sys_types WHERE type_id = " . $trans_type;
+       $st = get_systype_db_info($trans_type);
 
-    $result = db_query($sql,"The next transaction number for $trans_type could not be retrieved");
-
-    $myrow = db_fetch_row($result);
-
-    $next_number = $myrow[0] + 1;
+       if (!($st && $st[0] && $st[2])) {
+               // this is in fact internal error condition.
+               display_error('Internal error: invalid type passed to get_next_trans_no()');
+               return 0;
+       }
+       $sql = "SELECT MAX(`$st[2]`) FROM $st[0]";
 
-    $sql = "UPDATE ".TB_PREF."sys_types SET type_no = $next_number WHERE type_id = $trans_type
-       AND type_no = ". $myrow[0]; //concurrency paranoic protection
+       if ($st[1] != null)
+                $sql .= " WHERE `$st[1]`=$trans_type";
 
-    db_query($sql,"The next transaction number for $trans_type could not be updated");
+    $result = db_query($sql,"The next transaction number for $trans_type could not be retrieved");
+    $myrow = db_fetch_row($result);
 
-    return $next_number;
+    return $myrow[0] + 1;
 }
 
 //-----------------------------------------------------------------------------
@@ -60,7 +63,7 @@ function get_systype_db_info($type)
         case     31              : return array("".TB_PREF."service_orders", null, "order_no", "cust_ref", "date");
         case     ST_SALESQUOTE   : return array("".TB_PREF."sales_orders", "trans_type", "order_no", "reference", "ord_date");
         case    ST_DIMENSION    : return array("".TB_PREF."dimensions", null, "id", "reference", "date_");
-        case     ST_COSTUPDATE   : return null;
+        case     ST_COSTUPDATE   : return array("".TB_PREF."gl_trans", "type", "type_no", null, "tran_date");
        }
 
        display_db_error("invalid type ($type) sent to get_systype_db_info", "", true);

diff --git a/includes/ui/allocation_cart.inc b/includes/ui/allocation_cart.inc
index 45bc0e8239d8955b36b5f46e4c069461c9d1514e..e6163392b877497cfc3cc273d89168b35cc3fc71 100644 (file)
--- a/includes/ui/allocation_cart.inc
+++ b/includes/ui/allocation_cart.inc
@@ -22,6 +22,7 @@ class allocation
        var $type;
        var $person_id = '';
        var $person_name = '';
+       var $person_type;
        var $date_;
        var $amount = 0; /*Total amount of the transaction in FX */
        
@@ -91,29 +92,32 @@ class allocation
                        $type = $this->type;
                        $trans_no = $this->trans_no;
                }
-               
-               $sup = $type == ST_SUPPCREDIT || $type == ST_SUPPAYMENT;
+               if ($type == ST_BANKPAYMENT || $type == ST_BANKDEPOSIT) {
+                       $bank_trans = db_fetch(get_bank_trans($type, $trans_no));
+                       $this->person_type = $bank_trans['person_type_id'] == PT_SUPPLIER;
+               } else
+                       $this->person_type = $type == ST_SUPPCREDIT || $type == ST_SUPPAYMENT;
                $this->allocs = array();
 
                if ($trans_no) {
-                       $trans = $sup ? get_supp_trans($trans_no, $type) 
+                       $trans = $this->person_type ? get_supp_trans($trans_no, $type) 
                                : get_customer_trans($trans_no, $type);
 
-                       $this->person_id = $trans[$sup ? 'supplier_id':'debtor_no'];
-                       $this->person_name = $trans[$sup ? "supplier_name":"DebtorName"];
+                       $this->person_id = $trans[$this->person_type ? 'supplier_id':'debtor_no'];
+                       $this->person_name = $trans[$this->person_type ? "supplier_name":"DebtorName"];
                        $this->amount = $trans["Total"];
                        $this->date_ = sql2date($trans["tran_date"]);
                } 
                else {
-                       $this->person_id = get_post($sup ? 'supplier_id':'customer_id');
-                       $this->date_ = get_post($sup ? 'DatePaid':'DateBanked', Today());
+                       $this->person_id = get_post($this->person_type ? 'supplier_id':'customer_id');
+                       $this->date_ = get_post($this->person_type ? 'DatePaid':'DateBanked', Today());
                }
 
        /* Now populate the array of possible (and previous actual) allocations 
                for this customer/supplier. First get the transactions that have 
                outstanding balances ie Total-alloc >0 */
 
-               if ($sup)
+               if ($this->person_type)
                        $trans_items = get_allocatable_to_supp_transactions($this->person_id);
                else
                        $trans_items = get_allocatable_to_cust_transactions($this->person_id);
@@ -134,7 +138,7 @@ class allocation
        NB existing entries where still some of the trans outstanding entered from
        above logic will be overwritten with the prev alloc detail below */
 
-               if ($sup)
+               if ($this->person_type)
                        $trans_items = get_allocatable_to_supp_transactions($this->person_id, 
                                $trans_no, $type);
                else
@@ -155,11 +159,9 @@ class allocation
        //
        function write()
        {
-               $sup = $this->type == ST_SUPPCREDIT || $this->type == ST_SUPPAYMENT;
-
                begin_transaction();
 
-               if ($sup)
+               if ($this->person_type)
                        clear_supp_alloctions($this->type, $this->trans_no, $this->date_);
                else
                        clear_cust_alloctions($this->type, $this->trans_no, $this->date_);
@@ -170,7 +172,7 @@ class allocation
                {
                        if ($alloc_item->current_allocated > 0)
                        {
-                               if ($sup) {
+                               if ($this->person_type) {
                                        add_supp_allocation($alloc_item->current_allocated,
                                                $this->type, $this->trans_no,
                                        $alloc_item->type, $alloc_item->type_no, $this->date_);
@@ -199,7 +201,7 @@ class allocation
                        }
 
                }  /*end of the loop through the array of allocations made */
-               if ($sup)
+               if ($this->person_type)
                        update_supp_trans_allocation($this->type, $this->trans_no, 
                                $total_allocated);
                else
@@ -289,7 +291,9 @@ function show_allocatable($show_totals) {
                        "colspan=6 align=right", "align=right id='total_allocated'", 3);
                        $amount = $_SESSION['alloc']->amount;
 
-                       if ($_SESSION['alloc']->type == 21 || $_SESSION['alloc']->type == 22) 
+                       if ($_SESSION['alloc']->type == ST_SUPPCREDIT
+                               || $_SESSION['alloc']->type == ST_SUPPAYMENT
+                               ||  $_SESSION['alloc']->type == ST_BANKPAYMENT)
                                $amount = -$amount;
                        
                        if ($amount - $total_allocated < 0)

diff --git a/install/save.php b/install/save.php
index b11263a3e3d2836ac75ae25fa4d495e9ecaeb1e8..98b1191e6d59c594f82307f79a85cb73c96d78ad 100644 (file)
--- a/install/save.php
+++ b/install/save.php
@@ -27,7 +27,8 @@ if (!function_exists("_")) {
 //
 function display_error($message)
 {
-       global $_POST;
+       global $_POST, $path_to_root;
+
        if(isset($message) AND $message != '')
        {
                // Copy values entered into session so user doesn't have to re-enter everything
@@ -53,6 +54,7 @@ function display_error($message)
                // Specify that session support is enabled
                $_SESSION['session_support'] = '<font class="good">Enabled</font>';
                // Redirect to first page again and exit
+               @unlink($path_to_root."/config.php"); // remove just created config file
                header('Location: index.php?sessions_checked=true');
                exit();
        }
@@ -295,9 +297,7 @@ if ($admin_password != $admin_repassword)
 }
 // End admin user details code
 
-if (!file_exists($path_to_root . "/config.php")) {
-       copy($path_to_root. "/config.default.php", $path_to_root. "/config.php");
-}
+copy($path_to_root. "/config.default.php", $path_to_root. "/config.php");
 
 include_once($path_to_root . "/includes/db/connect_db.inc");
 include_once($path_to_root . "/admin/db/maintenance_db.inc");
@@ -382,8 +382,10 @@ if (!$db)
 }
 
 session_unset();
+session_regenerate_id();
 session_destroy();
 $_SESSION = array();
+
 header("Location: ".$path_to_root."/index.php");
 exit();
 

diff --git a/lang/en_US/LC_MESSAGES/en_US.mo b/lang/en_US/LC_MESSAGES/en_US.mo
index 37d63d9a2dca71a5871dfb95bc7716742024f051..18f90cc1b3c1b81cda4fb30421ebdfe6b1734bcb 100644 (file)
Binary files a/lang/en_US/LC_MESSAGES/en_US.mo and b/lang/en_US/LC_MESSAGES/en_US.mo differ

diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po
index 803e282ebdd2b1f2d8618ec41c348054913beff2..fe6ec6fb209119e90498ef296faa90f6728e942a 100644 (file)
--- a/lang/new_language_template/LC_MESSAGES/empty.po
+++ b/lang/new_language_template/LC_MESSAGES/empty.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FrontAccounting\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-17 22:28+0100\n"
-"PO-Revision-Date: 2009-11-17 22:34+0100\n"
-"Last-Translator: FrontAccounting <info@frontaccounting.com>\n"
+"POT-Creation-Date: 2009-11-30 16:45+0100\n"
+"PO-Revision-Date: 2009-11-30 17:11+0100\n"
+"Last-Translator: Translation Team <info@frontaccounting.net>\n"
 "Language-Team: Translators\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: English\n"
 "X-Poedit-Country: UNITED KINGDOM\n"
@@ -25,34 +25,23 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account22/frontaccounting.php:82
 #: c:\Apache2\htdocs\account22/access/logout.php:17
-#: c:\Apache2\htdocs\account22/access/backup/logout1.php:17
 msgid "Logout"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/access/login.php:13
-#: c:\Apache2\htdocs\account22/access/backup/login1.php:13
-#: c:\Apache2\htdocs\account22/access/backup/login2.php:13
 msgid "Restricted access"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/access/login.php:33
-#: c:\Apache2\htdocs\account22/access/backup/login1.php:18
-#: c:\Apache2\htdocs\account22/access/backup/login2.php:32
 msgid "Login as user: demouser and password: password"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/access/login.php:37
-#: c:\Apache2\htdocs\account22/access/backup/login1.php:22
-#: c:\Apache2\htdocs\account22/access/backup/login2.php:36
 msgid "Please login here"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/access/login.php:45
 #: c:\Apache2\htdocs\account22/access/login.php:74
-#: c:\Apache2\htdocs\account22/access/backup/login1.php:57
-#: c:\Apache2\htdocs\account22/access/backup/login1.php:69
-#: c:\Apache2\htdocs\account22/access/backup/login2.php:44
-#: c:\Apache2\htdocs\account22/access/backup/login2.php:56
 msgid "Authorization timeout"
 msgstr ""
 
@@ -62,32 +51,24 @@ msgid "Login"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/access/login.php:81
-#: c:\Apache2\htdocs\account22/access/backup/login1.php:80
-#: c:\Apache2\htdocs\account22/access/backup/login2.php:63
 msgid "Version"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/access/login.php:84
-#: c:\Apache2\htdocs\account22/access/backup/login1.php:105
-#: c:\Apache2\htdocs\account22/access/backup/login2.php:73
 msgid "User name"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/access/login.php:88
-#: c:\Apache2\htdocs\account22/access/backup/login1.php:107
-#: c:\Apache2\htdocs\account22/access/backup/login2.php:77
 msgid "Password"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/access/login.php:97
-#: c:\Apache2\htdocs\account22/access/backup/login1.php:116
-#: c:\Apache2\htdocs\account22/access/backup/login2.php:86
+#: c:\Apache2\htdocs\account22/admin/create_coy.php:217
+#: c:\Apache2\htdocs\account22/admin/create_coy.php:306
 msgid "Company"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/access/login.php:106
-#: c:\Apache2\htdocs\account22/access/backup/login1.php:133
-#: c:\Apache2\htdocs\account22/access/backup/login2.php:95
 msgid "Login -->"
 msgstr ""
 
@@ -96,12 +77,10 @@ msgid "Theme:"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/access/logout.php:28
-#: c:\Apache2\htdocs\account22/access/backup/logout1.php:31
 msgid "Thank you for using"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/access/logout.php:39
-#: c:\Apache2\htdocs\account22/access/backup/logout1.php:43
 msgid "Click here to Login Again."
 msgstr ""
 
@@ -153,6 +132,7 @@ msgid "Date Uploaded"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/admin/attachments.php:212
+#: c:\Apache2\htdocs\account22/admin/create_coy.php:241
 msgid "Edit"
 msgstr ""
 
@@ -165,6 +145,7 @@ msgid "Download"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/admin/attachments.php:215
+#: c:\Apache2\htdocs\account22/admin/create_coy.php:242
 msgid "Delete"
 msgstr ""
 
@@ -202,6 +183,7 @@ msgid "Database backup failed."
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/admin/backups.php:92
+#: c:\Apache2\htdocs\account22/admin/create_coy.php:229
 msgid "No"
 msgstr ""
 
@@ -352,133 +334,127 @@ msgstr ""
 msgid "Error uploading logo file"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:117
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:119
 msgid "Company setup has been updated."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:160
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:162
 msgid "Name (to appear on reports):"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:161
-#: c:\Apache2\htdocs\account22/admin/shipping_companies.php:171
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:163
 msgid "Address:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:162
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:164
 msgid "Domicile:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:164
-#: c:\Apache2\htdocs\account22/admin/shipping_companies.php:167
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:166
 msgid "Phone Number:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:165
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:167
 msgid "Fax Number:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:166
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:168
 msgid "Email Address:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:168
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:170
 msgid "Official Company Number:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:169
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:171
 msgid "GSTNo:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:171
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:173
 msgid "Home Currency:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:172
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:174
 msgid "Fiscal Year:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:176
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:178
 msgid "Tax Periods:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:176
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:178
 msgid "Months."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:177
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:179
 msgid "Tax Last Period:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:177
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:179
 msgid "Months back."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:179
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:181
 msgid "Company Logo:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:180
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:182
 msgid "New Company Logo (.jpg)"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:181
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:183
 msgid "Delete Company Logo:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:183
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:185
 msgid "Use Dimensions:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:184
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:186
 msgid "Base for auto price calculations:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:185
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:187
 msgid "No base price list"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:186
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:188
 msgid "Add Price from Std Cost:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:188
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:190
 msgid "Round to nearest:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:190
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:192
 msgid "Search Item List"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:191
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:193
 msgid "Search Customer List"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:192
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:194
 msgid "Search Supplier List"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:194
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:196
 msgid "Time Zone on Reports"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:195
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:197
 msgid "Login Timeout:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:195
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:197
 msgid "seconds"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:196
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:198
 msgid "Version Id"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/admin/company_preferences.php:201
-#: c:\Apache2\htdocs\account22/admin/display_prefs.php:140
-#: c:\Apache2\htdocs\account22/admin/forms_setup.php:61
-#: c:\Apache2\htdocs\account22/admin/gl_setup.php:220
-#: c:\Apache2\htdocs\account22/admin/inst_module.php:267
+#: c:\Apache2\htdocs\account22/admin/company_preferences.php:203
 msgid "Update"
 msgstr ""
 
@@ -568,15 +544,10 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account22/admin/create_coy.php:218
 #: c:\Apache2\htdocs\account22/admin/create_coy.php:316
-#: c:\Apache2\htdocs\account22/admin/inst_lang.php:139
-#: c:\Apache2\htdocs\account22/admin/print_profiles.php:164
 msgid "Default"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/admin/create_coy.php:227
-#: c:\Apache2\htdocs\account22/admin/fiscalyears.php:417
-#: c:\Apache2\htdocs\account22/admin/inst_lang.php:156
-#: c:\Apache2\htdocs\account22/admin/inst_lang.php:160
 msgid "Yes"
 msgstr ""
 
@@ -585,7 +556,6 @@ msgid "The marked company is the current company which cannot be deleted."
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/admin/create_coy.php:307
-#: c:\Apache2\htdocs\account22/admin/printers.php:88
 msgid "Host"
 msgstr ""
 
@@ -594,7 +564,6 @@ msgid "Database Password"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/admin/create_coy.php:313
-#: c:\Apache2\htdocs\account22/admin/inst_upgrade.php:184
 msgid "None"
 msgstr ""
 
@@ -611,7 +580,6 @@ msgid "Choose from Database scripts in SQL folder. No Database is created withou
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/admin/create_coy.php:327
-#: c:\Apache2\htdocs\account22/admin/inst_lang.php:226
 msgid "Save"
 msgstr ""
 
@@ -677,6 +645,7 @@ msgid "Language"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/admin/display_prefs.php:98
+#: c:\Apache2\htdocs\account22/admin/users.php:211
 msgid "Language:"
 msgstr ""
 
@@ -705,10 +674,12 @@ msgid "Start-up Tab"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/admin/display_prefs.php:124
+#: c:\Apache2\htdocs\account22/admin/users.php:215
 msgid "Printing profile"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/admin/display_prefs.php:125
+#: c:\Apache2\htdocs\account22/admin/users.php:216
 msgid "Browser printing support"
 msgstr ""
 
@@ -717,6 +688,7 @@ msgid "Use popup window to display reports:"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/admin/display_prefs.php:128
+#: c:\Apache2\htdocs\account22/admin/users.php:219
 msgid "Set this option to on if your browser directly supports pdf files"
 msgstr ""
 
@@ -2344,6 +2316,8 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account22/dimensions/dimension_entry.php:123
 #: c:\Apache2\htdocs\account22/gl/bank_transfer.php:146
+#: c:\Apache2\htdocs\account22/gl/gl_bank.php:142
+#: c:\Apache2\htdocs\account22/gl/gl_journal.php:174
 msgid "The entered reference is already in use."
 msgstr ""
 
@@ -2376,7 +2350,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:75
 #: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:173
 #: c:\Apache2\htdocs\account22/dimensions/view/view_dimension.php:54
-#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:258
+#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:261
 msgid "Type"
 msgstr ""
 
@@ -2463,7 +2437,7 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account22/dimensions/inquiry/search_dimensions.php:174
 #: c:\Apache2\htdocs\account22/dimensions/view/view_dimension.php:54
-#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:261
+#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:264
 msgid "Date"
 msgstr ""
 
@@ -2510,6 +2484,7 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:35
 #: c:\Apache2\htdocs\account22/gl/bank_transfer.php:30
+#: c:\Apache2\htdocs\account22/gl/gl_bank.php:43
 msgid "There are no bank accounts defined in the system."
 msgstr ""
 
@@ -2521,59 +2496,59 @@ msgstr ""
 msgid "Reconcile this transaction"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:172
+#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:173
 msgid "Account:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:174
+#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:175
 msgid "Bank Statement:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:175
+#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:176
 msgid "New"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:217
+#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:220
 msgid "Reconcile Date"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:217
+#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:220
 msgid "Beginning<br>Balance"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:218
+#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:221
 msgid "Ending<br>Balance"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:218
+#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:221
 msgid "Account<br>Total"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:218
+#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:221
 msgid "Reconciled<br>Amount"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:218
+#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:221
 msgid "Difference"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:222
+#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:225
 msgid "Date of bank statement to reconcile"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:262
+#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:265
 msgid "Debit"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:263
+#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:266
 msgid "Credit"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:264
+#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:267
 msgid "Person/Item"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:274
+#: c:\Apache2\htdocs\account22/gl/bank_account_reconcile.php:277
 msgid "Reconcile"
 msgstr ""
 
@@ -2629,6 +2604,8 @@ msgid "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/bank_transfer.php:139
+#: c:\Apache2\htdocs\account22/gl/gl_bank.php:136
+#: c:\Apache2\htdocs\account22/gl/gl_journal.php:166
 msgid "You must enter a reference."
 msgstr ""
 
@@ -2680,27 +2657,31 @@ msgstr ""
 msgid "You must enter at least one payment line."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/gl_bank.php:142
+#: c:\Apache2\htdocs\account22/gl/gl_bank.php:129
+msgid "The total bank amount cannot be 0."
+msgstr ""
+
+#: c:\Apache2\htdocs\account22/gl/gl_bank.php:148
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/gl_bank.php:191
+#: c:\Apache2\htdocs\account22/gl/gl_bank.php:197
 msgid "The source and destination accouts cannot be the same."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/gl_bank.php:273
+#: c:\Apache2\htdocs\account22/gl/gl_bank.php:279
 msgid "Payment Items"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/gl_bank.php:273
+#: c:\Apache2\htdocs\account22/gl/gl_bank.php:279
 msgid "Deposit Items"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/gl_bank.php:281
+#: c:\Apache2\htdocs\account22/gl/gl_bank.php:287
 msgid "Process Payment"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/gl_bank.php:281
+#: c:\Apache2\htdocs\account22/gl/gl_bank.php:287
 msgid "Process Deposit"
 msgstr ""
 
@@ -2727,15 +2708,10 @@ msgstr ""
 #: c:\Apache2\htdocs\account22/gl/gl_budget.php:128
 #: c:\Apache2\htdocs\account22/gl/gl_budget.php:129
 #: c:\Apache2\htdocs\account22/gl/gl_budget.php:133
-#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:80
-#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:82
-#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:135
-#: c:\Apache2\htdocs\account22/gl/inquiry/gl_account_inquiry.php:137
 msgid "Dimension"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/gl_budget.php:141
-#: c:\Apache2\htdocs\account22/gl/manage/exchange_rates.php:136
 msgid "Get"
 msgstr ""
 
@@ -2746,8 +2722,6 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/gl_budget.php:148
 #: c:\Apache2\htdocs\account22/gl/gl_budget.php:150
-#: c:\Apache2\htdocs\account22/gl/inquiry/journal_inquiry.php:160
-#: c:\Apache2\htdocs\account22/gl/inquiry/tax_inquiry.php:85
 msgid "Amount"
 msgstr ""
 
@@ -2761,7 +2735,6 @@ msgid "Last Year"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/gl/gl_budget.php:188
-#: c:\Apache2\htdocs\account22/gl/inquiry/gl_trial_balance.php:135
 msgid "Total"
 msgstr ""
 
@@ -3563,9 +3536,9 @@ msgstr ""
 #: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:98
 #: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:101
 #: c:\Apache2\htdocs\account22/gl/view/gl_payment_view.php:104
-#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:72
-#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:75
-#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:78
+#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:71
+#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:74
+#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:77
 msgid "Account Code"
 msgstr ""
 
@@ -3615,15 +3588,15 @@ msgstr ""
 msgid "The script must be called with a valid transaction type and transaction number to review the general ledger postings for."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:63
+#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:62
 msgid "No general ledger transactions have been created for"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:63
+#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:62
 msgid "number"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:112
+#: c:\Apache2\htdocs\account22/gl/view/gl_trans_view.php:111
 msgid "This transaction has been voided."
 msgstr ""
 
@@ -3719,6 +3692,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account22/inventory/purchasing_data.php:117
 #: c:\Apache2\htdocs\account22/inventory/reorder_level.php:43
 #: c:\Apache2\htdocs\account22/inventory/inquiry/stock_movements.php:49
+#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_status.php:41
 msgid "Item:"
 msgstr ""
 
@@ -3740,6 +3714,7 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account22/inventory/prices.php:27
 #: c:\Apache2\htdocs\account22/inventory/inquiry/stock_movements.php:30
+#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_status.php:34
 msgid "There are no items defined in the system."
 msgstr ""
 
@@ -3884,15 +3859,19 @@ msgid "There are no inventory items defined in the system (Purchased or manufact
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/inventory/reorder_level.php:57
+#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_status.php:65
+#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_status.php:69
 msgid "Location"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/inventory/reorder_level.php:57
 #: c:\Apache2\htdocs\account22/inventory/inquiry/stock_movements.php:78
+#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_status.php:69
 msgid "Quantity On Hand"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/inventory/reorder_level.php:57
+#: c:\Apache2\htdocs\account22/inventory/inquiry/stock_status.php:69
 msgid "Re-Order Level"
 msgstr ""
 
@@ -3925,6 +3904,7 @@ msgid "The quantity entered must be a positive number."
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/inventory/transfers.php:230
+#: c:\Apache2\htdocs\account22/inventory/manage/items.php:16
 msgid "Items"
 msgstr ""
 
@@ -4015,8 +3995,6 @@ msgid "The item code cannot contain any of the following characters -  & + OR a
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/inventory/manage/items.php:150
-#: c:\Apache2\htdocs\account22/inventory/manage/item_codes.php:55
-#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:90
 msgid "This item code is already assigned to stock item or sale kit."
 msgstr ""
 
@@ -4061,9 +4039,6 @@ msgid "New item"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/inventory/manage/items.php:310
-#: c:\Apache2\htdocs\account22/inventory/view/view_adjustment.php:56
-#: c:\Apache2\htdocs\account22/inventory/view/view_transfer.php:39
-#: c:\Apache2\htdocs\account22/inventory/view/view_transfer.php:57
 msgid "Item"
 msgstr ""
 
@@ -4073,32 +4048,22 @@ msgid "Item Code:"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/inventory/manage/items.php:349
-#: c:\Apache2\htdocs\account22/inventory/manage/item_codes.php:177
-#: c:\Apache2\htdocs\account22/inventory/manage/movement_types.php:134
-#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:207
-#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:231
 msgid "Description:"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/inventory/manage/items.php:351
-#: c:\Apache2\htdocs\account22/inventory/manage/item_codes.php:178
-#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:208
-#: c:\Apache2\htdocs\account22/inventory/manage/sales_kits.php:232
 msgid "Category:"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/inventory/manage/items.php:372
-#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:191
 msgid "Item Tax Type:"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/inventory/manage/items.php:374
-#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:193
 msgid "Item Type:"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/inventory/manage/items.php:376
-#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:195
 msgid "Units of Measure:"
 msgstr ""
 
@@ -4127,7 +4092,6 @@ msgid "Delete Image:"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/inventory/manage/items.php:442
-#: c:\Apache2\htdocs\account22/inventory/manage/item_categories.php:197
 msgid "Exclude from sales:"
 msgstr ""
 
@@ -4894,12 +4858,10 @@ msgid "Release Work Order"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/manufacturing/inquiry/bom_cost_inquiry.php:24
-#: c:\Apache2\htdocs\account22/manufacturing/manage/bom_edit.php:24
 msgid "There are no manufactured or kit items defined in the system."
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/manufacturing/inquiry/bom_cost_inquiry.php:35
-#: c:\Apache2\htdocs\account22/manufacturing/manage/bom_edit.php:220
 msgid "Select a manufacturable item:"
 msgstr ""
 
@@ -5564,6 +5526,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search.php:173
 #: c:\Apache2\htdocs\account22/purchasing/inquiry/po_search_completed.php:157
 #: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:213
+#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_credit.php:45
 msgid "Supplier's Reference"
 msgstr ""
 
@@ -5616,6 +5579,7 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_allocation_inquiry.php:197
 #: c:\Apache2\htdocs\account22/purchasing/inquiry/supplier_inquiry.php:233
+#: c:\Apache2\htdocs\account22/purchasing/view/view_po.php:90
 msgid "Marked items are overdue."
 msgstr ""
 
@@ -5880,12 +5844,10 @@ msgid "SUPPLIER CREDIT NOTE"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/purchasing/view/view_supp_credit.php:48
-#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_invoice.php:51
 msgid "Invoice Date"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/purchasing/view/view_supp_credit.php:61
-#: c:\Apache2\htdocs\account22/purchasing/view/view_supp_invoice.php:66
 msgid "Sub Total"
 msgstr ""
 
@@ -5939,14 +5901,17 @@ msgid "Balances in Home Currency"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/reporting/rep101.php:123
+#: c:\Apache2\htdocs\account22/reporting/rep201.php:114
 msgid "Trans Type"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/reporting/rep101.php:123
+#: c:\Apache2\htdocs\account22/reporting/rep201.php:114
 msgid "Charges"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/reporting/rep101.php:123
+#: c:\Apache2\htdocs\account22/reporting/rep201.php:115
 msgid "Credits"
 msgstr ""
 
@@ -5965,6 +5930,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account22/reporting/rep101.php:231
 #: c:\Apache2\htdocs\account22/reporting/rep102.php:207
 #: c:\Apache2\htdocs\account22/reporting/rep106.php:177
+#: c:\Apache2\htdocs\account22/reporting/rep201.php:224
 msgid "Grand Total"
 msgstr ""
 
@@ -6387,32 +6353,32 @@ msgstr ""
 msgid "GL Account Transactions"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:151
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:163
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:173
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:152
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:164
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:174
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:232
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:275
 #: c:\Apache2\htdocs\account22/reporting/reports_main.php:313
 msgid "Year"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:157
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:167
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:175
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:158
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:168
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:176
 msgid "Info"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:157
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:167
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:175
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:158
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:168
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:176
 msgid "Amounts in thousands"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:179
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:180
 msgid "Annual Expense Breakdown"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/rep705.php:365
+#: c:\Apache2\htdocs\account22/reporting/rep705.php:366
 #: c:\Apache2\htdocs\account22/reporting/rep706.php:319
 #: c:\Apache2\htdocs\account22/reporting/rep706.php:325
 #: c:\Apache2\htdocs\account22/reporting/rep707.php:336
@@ -7850,6 +7816,7 @@ msgid "Customer Allocations"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/sales/allocations/customer_allocation_main.php:32
+#: c:\Apache2\htdocs\account22/sales/inquiry/customer_allocation_inquiry.php:42
 msgid "Select a customer: "
 msgstr ""
 
@@ -8575,9 +8542,6 @@ msgid "There are no line items on this credit note."
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/sales/view/view_credit.php:138
-#: c:\Apache2\htdocs\account22/sales/view/view_dispatch.php:156
-#: c:\Apache2\htdocs\account22/sales/view/view_invoice.php:158
-#: c:\Apache2\htdocs\account22/sales/view/view_sales_order.php:230
 msgid "Shipping"
 msgstr ""
 
@@ -8950,15 +8914,6 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account22/themes/aqua/renderer.php:16
 #: c:\Apache2\htdocs\account22/themes/cool/renderer.php:16
-#: c:\Apache2\htdocs\account22/themes/default/renderer.php:17
-#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:17
-#: c:\Apache2\htdocs\account22/themes/fancy/renderer.php:17
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:17
-#: c:\Apache2\htdocs\account22/themes/go/themes/fancy/renderer.php:17
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:17
-#: c:\Apache2\htdocs\account22/themes/go/themes/newwave/renderer.php:6
-#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:17
-#: c:\Apache2\htdocs\account22/themes/newwave/renderer.php:6
 msgid "Main Menu"
 msgstr ""
 
@@ -8966,155 +8921,114 @@ msgstr ""
 #: c:\Apache2\htdocs\account22/themes/aqua/renderer.php:70
 #: c:\Apache2\htdocs\account22/themes/cool/renderer.php:46
 #: c:\Apache2\htdocs\account22/themes/cool/renderer.php:70
-#: c:\Apache2\htdocs\account22/themes/default/renderer.php:47
-#: c:\Apache2\htdocs\account22/themes/default/renderer.php:71
-#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:45
-#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:52
-#: c:\Apache2\htdocs\account22/themes/fancy/renderer.php:43
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:45
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:52
-#: c:\Apache2\htdocs\account22/themes/go/themes/fancy/renderer.php:43
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:40
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:47
-#: c:\Apache2\htdocs\account22/themes/go/themes/newwave/renderer.php:37
-#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:40
-#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:47
-#: c:\Apache2\htdocs\account22/themes/newwave/renderer.php:37
 msgid "Help"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/themes/aqua/renderer.php:65
 #: c:\Apache2\htdocs\account22/themes/cool/renderer.php:65
-#: c:\Apache2\htdocs\account22/themes/default/renderer.php:66
-#: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:48
-#: c:\Apache2\htdocs\account22/themes/fancy/renderer.php:40
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:48
-#: c:\Apache2\htdocs\account22/themes/go/themes/fancy/renderer.php:40
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:43
-#: c:\Apache2\htdocs\account22/themes/go/themes/newwave/renderer.php:48
-#: c:\Apache2\htdocs\account22/themes/modern/renderer.php:43
-#: c:\Apache2\htdocs\account22/themes/newwave/renderer.php:48
 msgid "Preferences"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:76
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:76
 msgid "Shortcuts"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:81
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:81
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:69
 #: c:\Apache2\htdocs\account22/themes/modern/renderer.php:69
+#: c:\Apache2\htdocs\account22/themes/studio/renderer.php:70
 msgid "Direct Invoice"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:82
 #: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:93
 #: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:118
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:82
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:93
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:118
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:70
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:81
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:106
 #: c:\Apache2\htdocs\account22/themes/modern/renderer.php:70
 #: c:\Apache2\htdocs\account22/themes/modern/renderer.php:81
 #: c:\Apache2\htdocs\account22/themes/modern/renderer.php:106
+#: c:\Apache2\htdocs\account22/themes/studio/renderer.php:71
+#: c:\Apache2\htdocs\account22/themes/studio/renderer.php:82
+#: c:\Apache2\htdocs\account22/themes/studio/renderer.php:107
 msgid "Payments"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:83
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:83
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:71
 #: c:\Apache2\htdocs\account22/themes/modern/renderer.php:71
+#: c:\Apache2\htdocs\account22/themes/studio/renderer.php:72
 msgid "Sales Order Inquiry"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:92
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:92
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:80
 #: c:\Apache2\htdocs\account22/themes/modern/renderer.php:80
+#: c:\Apache2\htdocs\account22/themes/studio/renderer.php:81
 msgid "Supplier Invoice"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:99
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:99
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:87
 #: c:\Apache2\htdocs\account22/themes/modern/renderer.php:87
+#: c:\Apache2\htdocs\account22/themes/studio/renderer.php:88
 msgid "Inventory Adjustments"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:100
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:100
 msgid "Inventory Movements"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:102
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:102
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:90
 #: c:\Apache2\htdocs\account22/themes/modern/renderer.php:90
+#: c:\Apache2\htdocs\account22/themes/studio/renderer.php:91
 msgid "Sales Pricing"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:107
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:107
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:95
 #: c:\Apache2\htdocs\account22/themes/modern/renderer.php:95
+#: c:\Apache2\htdocs\account22/themes/studio/renderer.php:96
 msgid "Ourstanding Work Orders"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:108
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:108
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:96
 #: c:\Apache2\htdocs\account22/themes/modern/renderer.php:96
+#: c:\Apache2\htdocs\account22/themes/studio/renderer.php:97
 msgid "Work Order Inquiry"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:109
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:109
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:97
 #: c:\Apache2\htdocs\account22/themes/modern/renderer.php:97
+#: c:\Apache2\htdocs\account22/themes/studio/renderer.php:98
 msgid "Bills Of Material"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:114
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:114
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:102
 #: c:\Apache2\htdocs\account22/themes/modern/renderer.php:102
+#: c:\Apache2\htdocs\account22/themes/studio/renderer.php:103
 msgid "Dimension Inquiry"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:119
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:119
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:107
 #: c:\Apache2\htdocs\account22/themes/modern/renderer.php:107
+#: c:\Apache2\htdocs\account22/themes/studio/renderer.php:108
 msgid "Deposits"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:121
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:121
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:109
 #: c:\Apache2\htdocs\account22/themes/modern/renderer.php:109
+#: c:\Apache2\htdocs\account22/themes/studio/renderer.php:110
 msgid "Bank Account Inquiry"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:122
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:122
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:110
 #: c:\Apache2\htdocs\account22/themes/modern/renderer.php:110
+#: c:\Apache2\htdocs\account22/themes/studio/renderer.php:111
 msgid "GL Account Inquiry"
 msgstr ""
 
 #: c:\Apache2\htdocs\account22/themes/elegant/renderer.php:131
-#: c:\Apache2\htdocs\account22/themes/go/themes/elegant/renderer.php:131
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:119
 #: c:\Apache2\htdocs\account22/themes/modern/renderer.php:119
+#: c:\Apache2\htdocs\account22/themes/studio/renderer.php:120
 msgid "Taxes"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/themes/go/themes/modern/renderer.php:88
 #: c:\Apache2\htdocs\account22/themes/modern/renderer.php:88
+#: c:\Apache2\htdocs\account22/themes/studio/renderer.php:89
 msgid "Inventory Item Movements"
 msgstr ""
 
@@ -10018,24 +9932,23 @@ msgstr ""
 msgid "Some transactions journal GL postings were not indexed due to lack of audit trail record."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/allocation_cart.inc:259
+#: c:\Apache2\htdocs\account22/includes/ui/allocation_cart.inc:261
 msgid "Other Allocations"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/allocation_cart.inc:259
-#: c:\Apache2\htdocs\account22/includes/ui/ui_view.inc:453
+#: c:\Apache2\htdocs\account22/includes/ui/allocation_cart.inc:261
 msgid "This Allocation"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/allocation_cart.inc:288
+#: c:\Apache2\htdocs\account22/includes/ui/allocation_cart.inc:290
 msgid "Total Allocated"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/allocation_cart.inc:323
+#: c:\Apache2\htdocs\account22/includes/ui/allocation_cart.inc:327
 msgid "The entry for one or more amounts is invalid or negative."
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/includes/ui/allocation_cart.inc:346
+#: c:\Apache2\htdocs\account22/includes/ui/allocation_cart.inc:350
 msgid "These allocations cannot be processed because the amount allocated is more than the total amount left to allocate."
 msgstr ""
 
@@ -10784,6 +10697,7 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account22/reporting/includes/header2.inc:150
 #: c:\Apache2\htdocs\account22/reporting/includes/pdf_report.inc:245
+#: c:\Apache2\htdocs\account22/reporting/includes/backup/header2.inc:158
 msgid "Page"
 msgstr ""
 
@@ -10930,11 +10844,11 @@ msgstr ""
 msgid "No Sales Folk Filter"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:360
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:357
 msgid "No Users Filter"
 msgstr ""
 
-#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:368
+#: c:\Apache2\htdocs\account22/reporting/includes/reports_classes.inc:365
 msgid "No tags"
 msgstr ""
 

diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc
index 4ba8d7bac65d57517c4f6f1eb41f595c418e17a5..2aa6d0b420dd954b756648804313ba23ca5464f8 100644 (file)
--- a/purchasing/includes/db/supp_trans_db.inc
+++ b/purchasing/includes/db/supp_trans_db.inc
@@ -37,6 +37,7 @@ function add_supp_trans($type, $supplier_id, $date_, $due_date, $reference, $sup
 
        if ($err_msg == "")
                $err_msg = "Cannot insert a supplier transaction record";
+error_log($sql);
 
        db_query($sql, $err_msg);
        add_audit_trail($type, $trans_no, $date_);
@@ -104,7 +105,7 @@ function get_supp_trans($trans_no, $trans_type=-1)
 
 function exists_supp_trans($type, $type_no)
 {
-       if ($type == 25)
+       if ($type == ST_SUPPRECEIVE)
                return exists_grn($type_no);
 
        $sql = "SELECT trans_no FROM ".TB_PREF."supp_trans WHERE type=".db_escape($type)."

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index dcc5f0583bb239c6796322012802f983ac3b9c3f..042c06400547e11a1b85204a0e0301897c25b85b 100644 (file)
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -304,7 +304,7 @@ function po_item_controls(&$order, $stock_id=null)
        {
                hidden('line_no', ($_SESSION['PO']->lines_on_order + 1));
 
-               stock_purchasable_items_list_cells(null, 'stock_id', null, false, false, true);
+               stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, true);
                if (list_updated('stock_id')) {
                            $Ajax->activate('price');
                            $Ajax->activate('units');

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index f98c3ffacd14235f3bb92727a76bb85554c826e1..c3fd180b9baab9f7b6f98efadee875b038390b56 100644 (file)
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -236,10 +236,16 @@
                $col += $width; 
                if ($doctype == 10)
                {
-                       $deliveries = get_parent_trans(10,$myrow['trans_no']);
+                       $deliveries = get_parent_trans(ST_SALESINVOICE, $myrow['trans_no']);
                        $line = "";
                        foreach ($deliveries as $delivery)
                        {
+                               if ($print_invoice_no == 0)
+                               {
+                                       $ref = get_reference(ST_CUSTDELIVERY, $delivery);
+                                       if ($ref)
+                                               $delivery = $ref;
+                               }               
                                if ($line == "")
                                        $line .= "$delivery";
                                else
@@ -247,6 +253,17 @@
                        }               
                        $this->TextWrap($col, $this->row, $width, $line, 'C');
                }
+               elseif ($doctype == 13)
+               {
+                       $ref = $myrow['order_'];
+                       if ($print_invoice_no == 0)
+                       {
+                               $ref = get_reference(ST_SALESORDER, $myrow['order_']);
+                               if (!$ref)
+                                       $ref = $myrow['order_'];
+                       }               
+                       $this->TextWrap($col, $this->row, $width, $ref, 'C');
+               }
                elseif ($doctype == 26)
                        $this->TextWrap($col, $this->row, $width, $myrow["location_name"], 'C');
                elseif (isset($myrow['order_']))

diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql
index 56275332b20c22c255b38d197967dbcf3afb6f43..eca1048f1fc865e5f78a54ce7134435a616d7d4c 100644 (file)
--- a/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@ -122,17 +122,17 @@ CREATE TABLE `0_bank_trans` (
 
 ### Data of table `0_bank_trans` ###
 
-INSERT INTO `0_bank_trans` VALUES ('1', '22', '4', '1', '1', '2009-06-21', '-3465', '0', '0', '3', '2', '');
-INSERT INTO `0_bank_trans` VALUES ('2', '26', '1', '1', '', '2009-06-21', '-10', '0', '0', '1', '1', '');
-INSERT INTO `0_bank_trans` VALUES ('3', '26', '1', '1', '', '2009-06-21', '-20', '0', '0', '1', '0', '');
-INSERT INTO `0_bank_trans` VALUES ('4', '0', '18', '1', '1', '2009-02-20', '1000', '0', '0', '0', '', '');
-INSERT INTO `0_bank_trans` VALUES ('5', '0', '19', '1', '2', '2009-02-21', '4000', '0', '0', '0', '', '');
-INSERT INTO `0_bank_trans` VALUES ('6', '2', '5', '1', '1', '2009-06-21', '100', '0', '0', '4', '3', '');
-INSERT INTO `0_bank_trans` VALUES ('7', '1', '8', '1', '1', '2009-06-21', '-50', '0', '0', '4', '1', '');
-INSERT INTO `0_bank_trans` VALUES ('8', '26', '5', '1', '', '2009-06-21', '-10', '0', '0', '1', '1', '');
-INSERT INTO `0_bank_trans` VALUES ('9', '26', '5', '1', '', '2009-06-21', '-20', '0', '0', '1', '0', '');
-INSERT INTO `0_bank_trans` VALUES ('10', '26', '7', '1', '', '2009-06-21', '-10', '0', '0', '1', '1', '');
-INSERT INTO `0_bank_trans` VALUES ('11', '26', '7', '1', '', '2009-06-21', '-20', '0', '0', '1', '0', '');
+INSERT INTO `0_bank_trans` VALUES ('1', '22', '4', '1', '1', '2009-06-21', '-3465', '0', '0', '3', '2', NULL);
+INSERT INTO `0_bank_trans` VALUES ('2', '26', '1', '1', '', '2009-06-21', '-10', '0', '0', '1', '1', NULL);
+INSERT INTO `0_bank_trans` VALUES ('3', '26', '1', '1', '', '2009-06-21', '-20', '0', '0', '1', '0', NULL);
+INSERT INTO `0_bank_trans` VALUES ('4', '0', '18', '1', '1', '2009-02-20', '1000', '0', '0', '0', '', NULL);
+INSERT INTO `0_bank_trans` VALUES ('5', '0', '19', '1', '2', '2009-02-21', '4000', '0', '0', '0', '', NULL);
+INSERT INTO `0_bank_trans` VALUES ('6', '2', '5', '1', '1', '2009-06-21', '100', '0', '0', '4', '3', NULL);
+INSERT INTO `0_bank_trans` VALUES ('7', '1', '8', '1', '1', '2009-06-21', '-50', '0', '0', '4', '1', NULL);
+INSERT INTO `0_bank_trans` VALUES ('8', '26', '5', '1', '', '2009-06-21', '-10', '0', '0', '1', '1', NULL);
+INSERT INTO `0_bank_trans` VALUES ('9', '26', '5', '1', '', '2009-06-21', '-20', '0', '0', '1', '0', NULL);
+INSERT INTO `0_bank_trans` VALUES ('10', '26', '7', '1', '', '2009-06-21', '-10', '0', '0', '1', '1', NULL);
+INSERT INTO `0_bank_trans` VALUES ('11', '26', '7', '1', '', '2009-06-21', '-20', '0', '0', '1', '0', NULL);
 
 
 ### Structure of table `0_bom` ###
@@ -728,14 +728,14 @@ INSERT INTO `0_gl_trans` VALUES ('4', '20', '7', '2009-06-21', '1510', '', '1200
 INSERT INTO `0_gl_trans` VALUES ('5', '20', '7', '2009-06-21', '2150', '', '165', '0', '0', '3', '2');
 INSERT INTO `0_gl_trans` VALUES ('6', '22', '4', '2009-06-21', '2100', '', '3465', '0', '0', '3', '2');
 INSERT INTO `0_gl_trans` VALUES ('7', '22', '4', '2009-06-21', '1060', '', '-3465', '0', '0', '3', '2');
-INSERT INTO `0_gl_trans` VALUES ('8', '26', '1', '2009-06-21', '1510', '', '-100', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('9', '26', '1', '2009-06-21', '1510', '', '-110', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('10', '26', '1', '2009-06-21', '1510', '', '-120', '0', '0', '', '');
+INSERT INTO `0_gl_trans` VALUES ('8', '26', '1', '2009-06-21', '1510', '', '-100', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('9', '26', '1', '2009-06-21', '1510', '', '-110', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('10', '26', '1', '2009-06-21', '1510', '', '-120', '0', '0', NULL, '');
 INSERT INTO `0_gl_trans` VALUES ('11', '26', '1', '2009-06-21', '1060', 'Overhead Cost', '-10', '0', '0', '1', '1');
 INSERT INTO `0_gl_trans` VALUES ('12', '26', '1', '2009-06-21', '1530', 'Overhead Cost', '10', '0', '0', '1', '1');
 INSERT INTO `0_gl_trans` VALUES ('13', '26', '1', '2009-06-21', '1060', 'Labour Cost', '-20', '0', '0', '1', '0');
 INSERT INTO `0_gl_trans` VALUES ('14', '26', '1', '2009-06-21', '1530', 'Labour Cost', '20', '0', '0', '1', '0');
-INSERT INTO `0_gl_trans` VALUES ('15', '26', '1', '2009-06-21', '1510', '', '330', '0', '0', '', '');
+INSERT INTO `0_gl_trans` VALUES ('15', '26', '1', '2009-06-21', '1510', '', '330', '0', '0', NULL, '');
 INSERT INTO `0_gl_trans` VALUES ('16', '13', '2', '2009-06-21', '5010', '', '20', '0', '0', '2', '1');
 INSERT INTO `0_gl_trans` VALUES ('17', '13', '2', '2009-06-21', '1510', '', '-20', '0', '0', '2', '1');
 INSERT INTO `0_gl_trans` VALUES ('18', '13', '3', '2009-06-21', '5010', '', '10', '0', '0', '2', '2');
@@ -748,14 +748,14 @@ INSERT INTO `0_gl_trans` VALUES ('24', '13', '4', '2009-06-21', '1510', '', '-10
 INSERT INTO `0_gl_trans` VALUES ('25', '10', '18', '2009-06-21', '4010', '', '-50', '2', '0', '2', '3');
 INSERT INTO `0_gl_trans` VALUES ('26', '10', '18', '2009-06-21', '1200', '', '52.5', '0', '0', '2', '3');
 INSERT INTO `0_gl_trans` VALUES ('27', '10', '18', '2009-06-21', '2150', '', '-2.5', '0', '0', '2', '3');
-INSERT INTO `0_gl_trans` VALUES ('28', '0', '18', '2009-02-20', '1060', '', '1000', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('29', '0', '18', '2009-02-20', '3350', '', '-1000', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('30', '0', '19', '2009-02-21', '1060', '', '4000', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('31', '0', '19', '2009-02-21', '3350', '', '-4000', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('32', '26', '3', '2009-06-21', '1510', '', '-20', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('33', '26', '3', '2009-06-21', '1510', '', '-22', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('34', '26', '3', '2009-06-21', '1510', '', '-24', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('35', '26', '3', '2009-06-21', '1540', '', '66', '0', '0', '', '');
+INSERT INTO `0_gl_trans` VALUES ('28', '0', '18', '2009-02-20', '1060', '', '1000', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('29', '0', '18', '2009-02-20', '3350', '', '-1000', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('30', '0', '19', '2009-02-21', '1060', '', '4000', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('31', '0', '19', '2009-02-21', '3350', '', '-4000', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('32', '26', '3', '2009-06-21', '1510', '', '-20', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('33', '26', '3', '2009-06-21', '1510', '', '-22', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('34', '26', '3', '2009-06-21', '1510', '', '-24', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('35', '26', '3', '2009-06-21', '1540', '', '66', '0', '0', NULL, '');
 INSERT INTO `0_gl_trans` VALUES ('36', '2', '5', '2009-06-21', '2150', 'Cash Sales', '-4.76', '0', '0', '4', '3');
 INSERT INTO `0_gl_trans` VALUES ('37', '2', '5', '2009-06-21', '4010', 'Cash Sales', '-95.24', '0', '0', '4', '3');
 INSERT INTO `0_gl_trans` VALUES ('38', '2', '5', '2009-06-21', '1060', '', '100', '0', '0', '4', '3');
@@ -765,34 +765,34 @@ INSERT INTO `0_gl_trans` VALUES ('41', '1', '8', '2009-06-21', '1060', '', '-50'
 INSERT INTO `0_gl_trans` VALUES ('42', '20', '8', '2009-06-21', '2100', '', '-20', '0', '0', '3', '2');
 INSERT INTO `0_gl_trans` VALUES ('43', '20', '8', '2009-06-21', '2150', '', '0.95', '0', '0', '3', '2');
 INSERT INTO `0_gl_trans` VALUES ('44', '20', '8', '2009-06-21', '5780', '', '19.05', '0', '0', '3', '2');
-INSERT INTO `0_gl_trans` VALUES ('45', '26', '4', '2009-06-21', '1510', '', '-40', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('46', '26', '4', '2009-06-21', '1510', '', '-44', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('47', '26', '4', '2009-06-21', '1510', '', '-48', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('48', '26', '4', '2009-06-21', '1540', '', '132', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('49', '26', '2', '2009-06-21', '1510', '', '-20', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('50', '26', '2', '2009-06-21', '1510', '', '-22', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('51', '26', '2', '2009-06-21', '1510', '', '-24', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('52', '26', '2', '2009-06-21', '1540', '', '66', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('53', '26', '5', '2009-06-21', '1510', '', '-50', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('54', '26', '5', '2009-06-21', '1510', '', '-55', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('55', '26', '5', '2009-06-21', '1510', '', '-60', '0', '0', '', '');
+INSERT INTO `0_gl_trans` VALUES ('45', '26', '4', '2009-06-21', '1510', '', '-40', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('46', '26', '4', '2009-06-21', '1510', '', '-44', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('47', '26', '4', '2009-06-21', '1510', '', '-48', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('48', '26', '4', '2009-06-21', '1540', '', '132', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('49', '26', '2', '2009-06-21', '1510', '', '-20', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('50', '26', '2', '2009-06-21', '1510', '', '-22', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('51', '26', '2', '2009-06-21', '1510', '', '-24', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('52', '26', '2', '2009-06-21', '1540', '', '66', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('53', '26', '5', '2009-06-21', '1510', '', '-50', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('54', '26', '5', '2009-06-21', '1510', '', '-55', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('55', '26', '5', '2009-06-21', '1510', '', '-60', '0', '0', NULL, '');
 INSERT INTO `0_gl_trans` VALUES ('56', '26', '5', '2009-06-21', '1060', 'Overhead Cost', '-10', '0', '0', '1', '1');
 INSERT INTO `0_gl_trans` VALUES ('57', '26', '5', '2009-06-21', '1530', 'Overhead Cost', '10', '0', '0', '1', '1');
 INSERT INTO `0_gl_trans` VALUES ('58', '26', '5', '2009-06-21', '1060', 'Labour Cost', '-20', '0', '0', '1', '0');
 INSERT INTO `0_gl_trans` VALUES ('59', '26', '5', '2009-06-21', '1530', 'Labour Cost', '20', '0', '0', '1', '0');
-INSERT INTO `0_gl_trans` VALUES ('60', '26', '5', '2009-06-21', '1540', '', '165', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('61', '26', '6', '2009-06-21', '1510', '', '50', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('62', '26', '6', '2009-06-21', '1510', '', '55', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('63', '26', '6', '2009-06-21', '1510', '', '60', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('64', '26', '6', '2009-06-21', '1540', '', '-165', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('65', '26', '7', '2009-06-21', '1510', '', '20', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('66', '26', '7', '2009-06-21', '1510', '', '22', '0', '0', '', '');
-INSERT INTO `0_gl_trans` VALUES ('67', '26', '7', '2009-06-21', '1510', '', '24', '0', '0', '', '');
+INSERT INTO `0_gl_trans` VALUES ('60', '26', '5', '2009-06-21', '1540', '', '165', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('61', '26', '6', '2009-06-21', '1510', '', '50', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('62', '26', '6', '2009-06-21', '1510', '', '55', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('63', '26', '6', '2009-06-21', '1510', '', '60', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('64', '26', '6', '2009-06-21', '1540', '', '-165', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('65', '26', '7', '2009-06-21', '1510', '', '20', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('66', '26', '7', '2009-06-21', '1510', '', '22', '0', '0', NULL, '');
+INSERT INTO `0_gl_trans` VALUES ('67', '26', '7', '2009-06-21', '1510', '', '24', '0', '0', NULL, '');
 INSERT INTO `0_gl_trans` VALUES ('68', '26', '7', '2009-06-21', '1060', 'Overhead Cost', '-10', '0', '0', '1', '1');
 INSERT INTO `0_gl_trans` VALUES ('69', '26', '7', '2009-06-21', '1530', 'Overhead Cost', '10', '0', '0', '1', '1');
 INSERT INTO `0_gl_trans` VALUES ('70', '26', '7', '2009-06-21', '1060', 'Labour Cost', '-20', '0', '0', '1', '0');
 INSERT INTO `0_gl_trans` VALUES ('71', '26', '7', '2009-06-21', '1530', 'Labour Cost', '20', '0', '0', '1', '0');
-INSERT INTO `0_gl_trans` VALUES ('72', '26', '7', '2009-06-21', '1540', '', '-66', '0', '0', '', '');
+INSERT INTO `0_gl_trans` VALUES ('72', '26', '7', '2009-06-21', '1540', '', '-66', '0', '0', NULL, '');
 INSERT INTO `0_gl_trans` VALUES ('73', '13', '5', '2009-06-21', '5010', '', '10', '0', '0', '2', '2');
 INSERT INTO `0_gl_trans` VALUES ('74', '13', '5', '2009-06-21', '1510', '', '-10', '0', '0', '2', '2');
 INSERT INTO `0_gl_trans` VALUES ('75', '10', '19', '2009-06-21', '4010', '', '-47.62', '0', '0', '2', '2');