Merged changes up to 2.3.16 into unstable

diff --cc .hgtags
index 1f9c57437c71713a2f34bee8d96297035164fb62,ee59e5d37c32db06fcf72bd2071bc1c4075157ed..19512328102e431aa7228f5d3345da8436aeaac3
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -57,4 -57,5 +57,6 @@@ a8b119b77f054c85223eb3a256268a3d5a61b3c
  b2ead0b2a3e30c13254288eddf587b5d8140d731 version_2_3_8
  06e6f1abb26edd035aa34a5180da99ca72fce5dd version_2_3_11
  05b037ff3c0b294819843e6bc5ca6ee7b6555176 version_2_3_12
 +180d185518cfc3e4fbb6b9ba2279436145c30ebc unstable_2.3.13
+ a253b76db0fb0a972672c174f4af7a7ad85df066 version_2_3_13
+ 2515a2808a2de65f2eeed795b98e3ef7dbf328ea version_2_3_14

diff --cc admin/gl_setup.php
Simple merge

diff --cc config.default.php
Simple merge

diff --cc dimensions/view/view_dimension.php
Simple merge

diff --cc gl/gl_bank.php
Simple merge

diff --cc gl/includes/db/gl_db_bank_accounts.inc
Simple merge

diff --cc gl/includes/db/gl_db_trans.inc
Simple merge

diff --cc gl/includes/ui/gl_bank_ui.inc
Simple merge

diff --cc gl/inquiry/gl_trial_balance.php
index 484ba459f5364dd90155332cee6c0a360641a9d1,0ca22c2e5bc592f2f45e8ffd4cb4f98bf95b359b..dfdda2f1282be7634cee1aa41aa703228716b24e
--- 1/gl/inquiry/gl_trial_balance.php
--- 2/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@@ -83,13 -90,22 +83,22 @@@ function display_trial_balance($type, $
        {
                //Print Type Title if it has atleast one non-zero account       
                if (!$printtitle)
 -              {       
 +              {
                        start_row("class='inquirybg' style='font-weight:bold'");
                        label_cell(_("Group")." - ".$type ." - ".$typename, "colspan=8");
 -                      end_row();              
 -                      $printtitle = 1;                
 -              }       
 -      
 +                      end_row();
 +                      $printtitle = 1;
 +              }
 +
+               // FA doesn't really clear the closed year, therefore the brought forward balance includes all the transactions from the past, even though the balance is null.
+               // If we want to remove the balanced part for the past years, this option removes the common part from from the prev and tot figures.
+               if (@$clear_trial_balance_opening)
+               {
+                       $open = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $begin,  $begin, false, true);
+                       $offset = min($open['debit'], $open['credit']);
+               } else
+                       $offset = 0;
+ 
                $prev = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $begin, $_POST['TransFromDate'], false, false);
                $curr = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $_POST['TransFromDate'], $_POST['TransToDate'], true, true);
                $tot = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $begin, $_POST['TransToDate'], false, true);

diff --cc includes/current_user.inc
Simple merge

diff --cc includes/date_functions.inc
Simple merge

diff --cc includes/db/inventory_db.inc
Simple merge

diff --cc includes/db_pager.inc
Simple merge

diff --cc includes/errors.inc
Simple merge

diff --cc includes/hooks.inc
Simple merge

diff --cc includes/main.inc
Simple merge

diff --cc includes/prefs/userprefs.inc
index 400ef1e16903dbf06d2f24d39d22f718033a0581,e14c08b5cf06bea77bb93e0578507d73e93cb23f..422c741bfa9f96470e34d640d83c582030eda120
--- 1/includes/prefs/userprefs.inc
--- 2/includes/prefs/userprefs.inc
+++ b/includes/prefs/userprefs.inc
@@@ -50,9 -49,9 +50,10 @@@ class user_pref
                        $this->price_dec = 2;
                        $this->language = $dflt_lang;
                        $this->theme = 'default';
 -                      
 +                      $this->transaction_days = -30;
 +
                } else {
+                       global $path_to_root;
                        $this->language = $user["language"];
                        $_SESSION['language']->set_language($this->language);
  
@@@ -84,7 -83,8 +85,9 @@@
                                $this->sticky_date = 0;
                                $this->startup_tab = "orders";
                        }
 +                      $this->transaction_days = $user['transaction_days'];
+                       if (!file_exists("$path_to_root/themes/$this->theme"))
+                               $this->theme = "default";
                }
        }
        

diff --cc includes/references.inc
Simple merge

diff --cc includes/session.inc
index 9a3efc267fd696e5206ede57d78a6c29dc56d7fc,27e6f8e6746e407ebc98471d7891b007aff20d7e..da23735e62df03ebaafded64fef8d3b5e72412c5
--- 1/includes/session.inc
--- 2/includes/session.inc
+++ b/includes/session.inc
@@@ -354,10 -354,7 +354,9 @@@ foreach ($installed_extensions as $ext
  // ini_set('session.save_path', dirname(__FILE__).'/../tmp/');
  
  ini_set('session.gc_maxlifetime', 36000); // 10hrs
- ini_set('session.cache_limiter', 'private'); // prevent 'page expired' errors
  
 +hook_session_start(@$_POST["company_login_name"]);
 +
  $Session_manager = new SessionManager();
  $Session_manager->sessionStart('FA'.md5(dirname(__FILE__)));
  
@@@ -456,12 -451,19 +455,22 @@@ if (strstr($_SERVER['PHP_SELF'], 'logou
                        // Incorrect password
                                login_fail();
                        }
+                       elseif(isset($_SESSION['timeout']) && !$_SESSION['timeout']['post'])
+                       {
+                               // in case of GET request redirect to avoid confirmation dialog 
+                               // after return from menu option
+                               header("HTTP/1.1 303 See Other");
+                               header("Location: ".$_SESSION['timeout']['uri']);
+                               exit();
+                       }
+                       $lang = &$_SESSION['language'];
+                       $lang->set_language($_SESSION['language']->code);
                }
        } else
 -              set_global_connection();
 +      {       set_global_connection();
 +                      if (db_fixed())
 +                              db_set_encoding($_SESSION['language']->encoding);
 +      }
  
        if (!isset($_SESSION["App"])) {
                $_SESSION["App"] = new front_accounting();

diff --cc includes/ui/ui_input.inc
Simple merge

diff --cc includes/ui/ui_lists.inc
Simple merge

diff --cc includes/ui/ui_view.inc
Simple merge

diff --cc install/lang/new_language_template/LC_MESSAGES/empty.po
index 4c2227d738f1230b4b6b1d5580f0c61c85a8750d,e0fac6cf10bbc6bfeaa49308a49cb549bde4959c..c7807254b1c0e2ff571c6db8d0509b2c3a36f56e
--- 1/install/lang/new_language_template/LC_MESSAGES/empty.po
--- 2/install/lang/new_language_template/LC_MESSAGES/empty.po
+++ b/install/lang/new_language_template/LC_MESSAGES/empty.po
@@@ -8,17 -7,17 +8,16 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2012-09-18 14:11+0200\n"
 -"POT-Creation-Date: 2012-03-07 20:46+0100\n"
 -"PO-Revision-Date: 2013-01-17 11:34+0100\n"
 -"Last-Translator: Translation Team <info@frontaccounting.net>\n"
++"POT-Creation-Date: 2013-05-09 21:43+0200\n"
 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
  "Language: \n"
  "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-2\n"
 -"Content-Type: text/plain; charset=iso-8859-1\n"
++"Content-Type: text/plain; charset=ISO-8859-1\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:20
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:41
 -#: install/index.php:20
 -#: install/index.php:41
++#: install/index.php:20 install/index.php:41
  msgid "FrontAccouting ERP Installation Wizard"
  msgstr ""
  
@@@ -31,23 -30,23 +30,19 @@@ msgstr "
  msgid "Chart of accounts"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:49
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:76
 -#: install/index.php:49
 -#: install/index.php:76
++#: install/index.php:49 install/index.php:76
  msgid "Encoding"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:49
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:76
 -#: install/index.php:49
 -#: install/index.php:76
++#: install/index.php:49 install/index.php:76
  msgid "Description"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:49
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:76
 -#: install/index.php:49
 -#: install/index.php:76
++#: install/index.php:49 install/index.php:76
  msgid "Install"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:66
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:94
 -#: install/index.php:66
 -#: install/index.php:94
++#: install/index.php:66 install/index.php:94
  msgid "Installed"
  msgstr ""
  
@@@ -55,13 -54,11 +50,13 @@@
  msgid "Language"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:124
+ #: install/index.php:124
 -msgid "Cannot connect to database. User or password is invalid or you have no permittions to create database."
 +msgid ""
 +"Cannot connect to database. User or password is invalid or you have no "
 +"permittions to create database."
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:160
+ #: install/index.php:160
  msgid "Cannot save system configuration file 'config.php'."
  msgstr ""
  
@@@ -73,13 -70,11 +68,13 @@@ msgstr "
  msgid "Cannot write to the 'config_db.php' configuration file."
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:173
+ #: install/index.php:173
 -msgid "Configuration file 'config_db.php' is not writable. Change its permissions so it is, then re-run installation step."
 +msgid ""
 +"Configuration file 'config_db.php' is not writable. Change its permissions "
 +"so it is, then re-run installation step."
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:211
+ #: install/index.php:211
  msgid "Host name cannot be empty."
  msgstr ""
  
@@@ -115,27 -110,23 +110,24 @@@ msgstr "
  msgid "Select install wizard language:"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:324
+ #: install/index.php:324
 -msgid "All application preliminary requirements seems to be correct. Please press Continue button below."
 +msgid ""
 +"All application preliminary requirements seems to be correct. Please press "
 +"Continue button below."
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:325
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:351
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:358
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:365
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:389
 -#: install/index.php:325
 -#: install/index.php:351
 -#: install/index.php:358
 -#: install/index.php:365
 -#: install/index.php:389
++#: install/index.php:325 install/index.php:351 install/index.php:358
++#: install/index.php:365 install/index.php:389
  msgid "Continue >>"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:327
+ #: install/index.php:327
 -msgid "Application cannot be installed. Please fix problems listed below in red, and press Refresh button."
 +msgid ""
 +"Application cannot be installed. Please fix problems listed below in red, "
 +"and press Refresh button."
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:328
+ #: install/index.php:328
  msgid "Refresh"
  msgstr ""
  
@@@ -163,17 -154,17 +155,13 @@@ msgstr "
  msgid "Use '0_' Table Prefix:"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:344
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:38
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:113
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:126
 -#: install/index.php:344
 -#: includes/system_tests.inc:38
 -#: includes/system_tests.inc:113
 -#: includes/system_tests.inc:126
++#: install/index.php:344 includes/system_tests.inc:38
++#: includes/system_tests.inc:113 includes/system_tests.inc:126
  msgid "Yes"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:344
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:38
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:113
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:126
 -#: install/index.php:344
 -#: includes/system_tests.inc:38
 -#: includes/system_tests.inc:113
 -#: includes/system_tests.inc:126
++#: install/index.php:344 includes/system_tests.inc:38
++#: includes/system_tests.inc:113 includes/system_tests.inc:126
  msgid "No"
  msgstr ""
  
@@@ -185,21 -176,18 +173,19 @@@ msgstr "
  msgid "Install Additional COAs from FA Repository:"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:348
+ #: install/index.php:348
 -msgid "Use table prefix if you share selected database for more than one FA company."
 +msgid ""
 +"Use table prefix if you share selected database for more than one FA company."
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:349
+ #: install/index.php:349
 -msgid "Do not select additional langs nor COAs if you have no working internet connection right now. You can install them later."
 +msgid ""
 +"Do not select additional langs nor COAs if you have no working internet "
 +"connection right now. You can install them later."
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:350
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:357
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:364
- #: /tmp/fa_unstable.sav3/devel/../install/index.php:388
 -#: install/index.php:350
 -#: install/index.php:357
 -#: install/index.php:364
++#: install/index.php:350 install/index.php:357 install/index.php:364
+ #: install/index.php:388
  msgid "<< Back"
  msgstr ""
  
@@@ -371,14 -359,13 +357,10 @@@ msgstr "
  msgid "Company subdirectories consistency"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:193
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:200
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:208
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:225
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:340
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:349
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:358
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:366
 -#: includes/system_tests.inc:193
 -#: includes/system_tests.inc:200
 -#: includes/system_tests.inc:208
 -#: includes/system_tests.inc:225
 -#: includes/system_tests.inc:340
 -#: includes/system_tests.inc:349
 -#: includes/system_tests.inc:358
++#: includes/system_tests.inc:193 includes/system_tests.inc:200
++#: includes/system_tests.inc:208 includes/system_tests.inc:225
++#: includes/system_tests.inc:340 includes/system_tests.inc:349
++#: includes/system_tests.inc:358 includes/system_tests.inc:366
  #, php-format
  msgid "'%s' is not writeable"
  msgstr ""
@@@ -413,14 -400,14 +395,12 @@@ msgstr "
  msgid "Main config file"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:295
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:317
 -#: includes/system_tests.inc:295
 -#: includes/system_tests.inc:317
++#: includes/system_tests.inc:295 includes/system_tests.inc:317
  #, php-format
  msgid "Can't write '%s' file. Check FA directory write permissions."
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:296
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:318
 -#: includes/system_tests.inc:296
 -#: includes/system_tests.inc:318
++#: includes/system_tests.inc:296 includes/system_tests.inc:318
  #, php-format
  msgid "'%s' file exists."
  msgstr ""
@@@ -434,91 -421,84 +414,98 @@@ msgstr "
  msgid "Database auth file"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:322
+ #: includes/system_tests.inc:322
  #, php-format
 -msgid "'%s' file should be read-only if you do not plan to add or change companies"
 +msgid ""
 +"'%s' file should be read-only if you do not plan to add or change companies"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:333
+ #: includes/system_tests.inc:333
  msgid "Extensions system"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:371
 -#: includes/system_tests.inc:363
++#: includes/system_tests.inc:371
  msgid "Extensions configuration files and directories should be writeable"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:384
 -#: includes/system_tests.inc:375
++#: includes/system_tests.inc:384
  #, php-format
  msgid "Non-standard theme directory '%s' is not writable"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:394
 -#: includes/system_tests.inc:385
 -msgid "OpenSSL PHP extension have to be enabled to use extension repository system."
++#: includes/system_tests.inc:394
 +msgid ""
 +"OpenSSL PHP extension have to be enabled to use extension repository system."
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:397
 -#: includes/system_tests.inc:388
 -msgid "OpenSSL have to be available on your server to use extension repository system."
++#: includes/system_tests.inc:397
 +msgid ""
 +"OpenSSL have to be available on your server to use extension repository "
 +"system."
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420
 -#: includes/system_tests.inc:411
++#: includes/system_tests.inc:420
  msgid "Test"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420
 -#: includes/system_tests.inc:411
++#: includes/system_tests.inc:420
  msgid "Test type"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420
 -#: includes/system_tests.inc:411
++#: includes/system_tests.inc:420
  msgid "Value"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420
 -#: includes/system_tests.inc:411
++#: includes/system_tests.inc:420
  msgid "Comments"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:444
 -#: includes/system_tests.inc:435
++#: includes/system_tests.inc:444
  msgid "Ok"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:190
 -#: includes/packages.inc:190
++#: includes/packages.inc:189
  #, php-format
  msgid "No key field '%s' in file '%s'"
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:295
- #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:329
 -#: includes/packages.inc:295
 -#: includes/packages.inc:329
++#: includes/packages.inc:294
++msgid "Cannot download repo index file."
++msgstr ""
++
++#: includes/packages.inc:306 includes/packages.inc:343
  #, php-format
  msgid "Cannot delete outdated '%s' file."
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:299
 -#: includes/packages.inc:299
++#: includes/packages.inc:310
  msgid "Release file in repository is invalid, or public key is outdated."
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:316
 -#: includes/packages.inc:316
++#: includes/packages.inc:327
  msgid "Repository version does not match application version."
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:333
 -#: includes/packages.inc:333
++#: includes/packages.inc:335 includes/packages.inc:377
+ #, php-format
 -msgid "Security alert: broken index file in repository '%s'. Please inform repository administrator about this issue."
++msgid "Cannot download '%s' file."
+ msgstr ""
+ 
 -#: includes/packages.inc:366
++#: includes/packages.inc:347
  #, php-format
 -msgid "Security alert: broken package '%s' in repository. Please inform repository administrator about this issue."
 +msgid ""
 +"Security alert: broken index file in repository '%s'. Please inform "
 +"repository administrator about this issue."
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:366
 -#: includes/packages.inc:621
 -#: includes/packages.inc:672
++#: includes/packages.inc:383
  #, php-format
 -msgid "Package '%s' not found."
 +msgid ""
 +"Security alert: broken package '%s' in repository. Please inform repository "
 +"administrator about this issue."
  msgstr ""
  
- #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:621
- #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:672
++#: includes/packages.inc:638 includes/packages.inc:699
 +#, php-format
 +msgid "Package '%s' not found."
 +msgstr ""

diff --cc inventory/cost_update.php
Simple merge

diff --cc inventory/includes/db/items_trans_db.inc
index 923d18c4f79f5dc65690186196360203e78f1f16,a7591dd3d30f66ebc4a7b4bd3857f1cc3319dfda..b54c1980748d8e7e06e4076c4789d3c416d9ad87
--- 1/inventory/includes/db/items_trans_db.inc
--- 2/inventory/includes/db/items_trans_db.inc
+++ b/inventory/includes/db/items_trans_db.inc
@@@ -69,10 -64,11 +70,11 @@@ function stock_cost_update($stock_id, $
  
                        add_gl_trans_std_cost(ST_COSTUPDATE, $update_no, $date_, $stock_gl_code["inventory_account"], 0, 0, $memo_, 
                                $value_of_change);
 -              }               
 +              }
        }
  
-       add_audit_trail(ST_COSTUPDATE, $update_no, $date_);
+       if ($update_no != -1)
+               add_audit_trail(ST_COSTUPDATE, $update_no, $date_);
        commit_transaction();
  
        return $update_no;

diff --cc inventory/inquiry/stock_movements.php
index a18f9a7936287835c00ba1630972f1fe7837d48f,df25e10208c2be5c8d7bfe5a5f4bcd77756b3880..2c2e0974225965cbc2764b141a2835308c051a17
--- 1/inventory/inquiry/stock_movements.php
--- 2/inventory/inquiry/stock_movements.php
+++ b/inventory/inquiry/stock_movements.php
@@@ -53,9 -57,9 +53,9 @@@ end_table()
  start_table(TABLESTYLE_NOBORDER);
  start_row();
  
- locations_list_cells(_("From Location:"), 'StockLocation', null);
+ locations_list_cells(_("From Location:"), 'StockLocation', null, true);
  
 -date_cells(_("From:"), 'AfterDate', '', null, -30);
 +date_cells(_("From:"), 'AfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
  date_cells(_("To:"), 'BeforeDate');
  
  submit_cells('ShowMoves',_("Show Movements"),'',_('Refresh Inquiry'), 'default');

diff --cc inventory/manage/items.php
Simple merge

diff --cc inventory/transfers.php
Simple merge

diff --cc lang/new_language_template/LC_MESSAGES/empty.po
index 39e655ec3c0380206533391d84694ea9b0135ff1,3ffab61b42165e5582602d73f74fecae26e86656..bb6bfc206c6c59fb68991c66939ea79e22a8825c
--- 1/lang/new_language_template/LC_MESSAGES/empty.po
--- 2/lang/new_language_template/LC_MESSAGES/empty.po
+++ b/lang/new_language_template/LC_MESSAGES/empty.po
@@@ -8,17 -8,16 +8,16 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2012-09-18 14:10+0200\n"
 -"POT-Creation-Date: 2013-04-18 12:36+0200\n"
++"POT-Creation-Date: 2013-05-09 21:40+0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
  "Language: \n"
  "MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=ISO-8859-2\n"
++"Content-Type: text/plain; charset=ISO-8859-1\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: ../frontaccounting.php:73
- #: ../frontaccounting.php:74
+ #: frontaccounting.php:73 frontaccounting.php:74
  msgid "Main  Menu"
  msgstr ""
  
@@@ -55,8 -50,7 +50,7 @@@ msgstr "
  msgid "Login"
  msgstr ""
  
- #: ../access/login.php:86
- #: ../admin/inst_upgrade.php:141
 -#: access/login.php:87 admin/inst_upgrade.php:137
++#: access/login.php:87 admin/inst_upgrade.php:141
  msgid "Version"
  msgstr ""
  
@@@ -70,11 -63,8 +63,8 @@@ msgstr "
  msgid "Password:"
  msgstr ""
  
- #: ../access/login.php:103
- #: ../access/login.php:110
- #: ../admin/create_coy.php:253
- #: ../admin/create_coy.php:336
- #: ../includes/sysnames.inc:194
+ #: access/login.php:104 access/login.php:111 admin/create_coy.php:253
 -#: admin/create_coy.php:336
++#: admin/create_coy.php:336 includes/sysnames.inc:194
  msgid "Company"
  msgstr ""
  
@@@ -120,271 -109,173 +109,164 @@@ msgstr "
  msgid "Attachment has been deleted."
  msgstr ""
  
- #: ../admin/attachments.php:158
- #: ../admin/view_print_transaction.php:72
- #: ../gl/inquiry/journal_inquiry.php:47
- #: ../inventory/includes/item_adjustments_ui.inc:47
- #: ../manufacturing/work_order_add_finished.php:203
- #: ../manufacturing/work_order_costs.php:136
- #: ../manufacturing/work_order_entry.php:379
- #: ../manufacturing/work_order_entry.php:387
- #: ../manufacturing/includes/work_order_issue_ui.inc:161
- #: ../sales/inquiry/customer_allocation_inquiry.php:47
+ #: admin/attachments.php:164 admin/view_print_transaction.php:72
 -#: admin/void_transaction.php:157 gl/inquiry/journal_inquiry.php:47
++#: gl/inquiry/journal_inquiry.php:47
+ #: inventory/includes/item_adjustments_ui.inc:47
+ #: manufacturing/work_order_add_finished.php:203
 -#: manufacturing/work_order_costs.php:150
 -#: manufacturing/work_order_entry.php:379
 -#: manufacturing/work_order_entry.php:387
++#: manufacturing/work_order_costs.php:136
+ #: manufacturing/includes/work_order_issue_ui.inc:161
+ #: sales/inquiry/customer_allocation_inquiry.php:47
  msgid "Type:"
  msgstr ""
  
- #: ../admin/attachments.php:170
- #: ../admin/view_print_transaction.php:126
- #: ../admin/void_transaction.php:181
- #: ../dimensions/inquiry/search_dimensions.php:127
- #: ../dimensions/view/view_dimension.php:54
- #: ../gl/bank_account_reconcile.php:232
- #: ../gl/inquiry/bank_inquiry.php:70
- #: ../gl/inquiry/gl_account_inquiry.php:126
- #: ../gl/inquiry/journal_inquiry.php:127
- #: ../gl/inquiry/journal_inquiry.php:140
- #: ../includes/ui/allocation_cart.inc:264
- #: ../inventory/inquiry/stock_movements.php:77
- #: ../inventory/inquiry/stock_movements.php.orig:79
- #: ../manufacturing/search_work_orders.php:159
- #: ../manufacturing/includes/manufacturing_ui.inc:157
- #: ../manufacturing/includes/manufacturing_ui.inc:200
- #: ../manufacturing/includes/manufacturing_ui.inc:236
- #: ../manufacturing/includes/manufacturing_ui.inc:276
- #: ../manufacturing/includes/manufacturing_ui.inc:280
- #: ../manufacturing/includes/manufacturing_ui.inc:331
- #: ../purchasing/view/view_po.php:115
- #: ../purchasing/view/view_po.php:140
- #: ../purchasing/inquiry/po_search_completed.php:120
- #: ../purchasing/inquiry/po_search_completed.php.orig:119
- #: ../purchasing/inquiry/po_search.php:130
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:126
- #: ../purchasing/inquiry/supplier_inquiry.php:174
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:171
- #: ../purchasing/allocations/supplier_allocation_main.php:95
- #: ../reporting/rep101.php:130
- #: ../reporting/rep201.php:118
- #: ../reporting/rep203.php:91
- #: ../reporting/rep601.php:76
- #: ../reporting/rep602.php:80
- #: ../reporting/rep704.php:79
- #: ../reporting/rep704.php:82
- #: ../reporting/rep704.php:85
- #: ../reporting/rep710.php:76
- #: ../reporting/includes/doctext.inc:167
- #: ../reporting/includes/doctext.inc:208
- #: ../reporting/includes/doctext.inc:246
- #: ../sales/allocations/customer_allocation_main.php:94
- #: ../sales/view/view_sales_order.php:109
- #: ../sales/view/view_sales_order.php:142
- #: ../sales/view/view_sales_order.php:179
- #: ../sales/view/view_sales_order.php.orig:96
- #: ../sales/view/view_sales_order.php.orig:129
- #: ../sales/view/view_sales_order.php.orig:161
- #: ../sales/inquiry/customer_allocation_inquiry.php:145
- #: ../sales/inquiry/customer_inquiry.php:201
- msgid "#"
+ #: admin/attachments.php:180 admin/create_coy.php:277
+ #: admin/crm_categories.php:106 admin/fiscalyears.php:164
+ #: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96
+ #: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:144
+ #: dimensions/inquiry/search_dimensions.php:120
 -#: gl/inquiry/journal_inquiry.php:118 gl/manage/bank_accounts.php:130
 -#: gl/manage/bank_accounts.php.orig:130 gl/manage/currencies.php:164
 -#: gl/manage/exchange_rates.php:94 gl/manage/gl_account_classes.php:132
 -#: gl/manage/gl_account_types.php:154 gl/manage/gl_quick_entries.php:196
 -#: gl/manage/gl_quick_entries.php:295 gl/includes/ui/gl_bank_ui.inc:185
 -#: gl/includes/ui/gl_bank_ui.inc.orig:166 gl/includes/ui/gl_journal_ui.inc:122
++#: gl/inquiry/journal_inquiry.php:118 gl/manage/bank_accounts.php:133
++#: gl/manage/currencies.php:164 gl/manage/exchange_rates.php:94
++#: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:154
++#: gl/manage/gl_quick_entries.php:196 gl/manage/gl_quick_entries.php:295
++#: gl/includes/ui/gl_bank_ui.inc:185 gl/includes/ui/gl_journal_ui.inc:134
+ #: includes/ui/contacts_view.inc:64 includes/ui/simple_crud_class.inc:52
 -#: inventory/prices.php:161 inventory/purchasing_data.php:166
++#: includes/ui/ui_input.inc:961 inventory/prices.php:161
++#: inventory/purchasing_data.php:166
+ #: inventory/includes/item_adjustments_ui.inc:87
+ #: inventory/includes/stock_transfers_ui.inc:79
+ #: inventory/manage/item_categories.php:121
+ #: inventory/manage/item_codes.php:140 inventory/manage/item_units.php:110
+ #: inventory/manage/locations.php:161 inventory/manage/movement_types.php:106
+ #: inventory/manage/sales_kits.php:55 manufacturing/search_work_orders.php:109
+ #: manufacturing/manage/bom_edit.php:86
+ #: manufacturing/manage/work_centres.php:114
+ #: manufacturing/includes/work_order_issue_ui.inc:58
 -#: purchasing/includes/ui/invoice_ui.inc:520
 -#: purchasing/includes/ui/po_ui.inc:265
 -#: purchasing/inquiry/po_search_completed.php:106
++#: purchasing/includes/ui/invoice_ui.inc:542
++#: purchasing/inquiry/po_search_completed.php:105
+ #: purchasing/inquiry/po_search.php:87 sales/manage/credit_status.php:119
+ #: sales/manage/customer_branches.php:159
+ #: sales/manage/recurrent_invoices.php:130 sales/manage/sales_areas.php:103
+ #: sales/manage/sales_groups.php:99 sales/manage/sales_people.php:119
+ #: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121
 -#: sales/inquiry/customer_inquiry.php:198
+ #: sales/inquiry/sales_deliveries_view.php:154
 -#: sales/inquiry/sales_orders_view.php:128
+ #: sales/includes/ui/sales_credit_ui.inc:197
 -#: sales/includes/ui/sales_order_ui.inc:207 taxes/item_tax_types.php:139
 -#: taxes/tax_groups.php:142 taxes/tax_types.php:132
++#: sales/includes/ui/sales_order_ui.inc:209 taxes/item_tax_types.php:139
++#: taxes/tax_groups.php:137 taxes/tax_types.php:132
+ msgid "Edit"
  msgstr ""
  
- #: ../admin/attachments.php:170
- #: ../admin/attachments.php:220
- #: ../admin/crm_categories.php:88
- #: ../admin/inst_upgrade.php:141
- #: ../admin/payment_terms.php:127
- #: ../admin/printers.php:84
- #: ../admin/print_profiles.php:148
- #: ../gl/inquiry/tax_inquiry.php:82
- #: ../gl/manage/gl_quick_entries.php:186
- #: ../gl/manage/gl_quick_entries.php:224
- #: ../includes/ui/view_package.php:22
- #: ../inventory/manage/item_codes.php:125
- #: ../inventory/manage/item_units.php:94
- #: ../inventory/manage/movement_types.php:95
- #: ../inventory/manage/sales_kits.php:40
- #: ../inventory/view/view_adjustment.php:56
- #: ../inventory/view/view_transfer.php:56
- #: ../manufacturing/manage/bom_edit.php:70
- #: ../manufacturing/includes/manufacturing_ui.inc:28
- #: ../purchasing/includes/ui/invoice_ui.inc:492
- #: ../purchasing/includes/ui/invoice_ui.inc:504
- #: ../purchasing/po_receive_items.php:62
- #: ../reporting/rep104.php:109
- #: ../reporting/rep105.php:112
- #: ../reporting/rep204.php:82
- #: ../reporting/rep303.php:109
- #: ../reporting/rep303.php:115
- #: ../reporting/rep304.php:112
- #: ../reporting/rep305.php:98
- #: ../reporting/rep401.php:69
- #: ../sales/create_recurrent_invoices.php:132
- #: ../sales/manage/credit_status.php:97
- #: ../sales/manage/recurrent_invoices.php:102
- #: ../sales/inquiry/sales_orders_view.php:317
- #: ../sales/inquiry/sales_orders_view.php:321
- #: ../taxes/tax_groups.php:123
- #: ../taxes/tax_groups.php.orig:125
- #: ../taxes/tax_groups.php.sav:125
- #: ../taxes/tax_types.php:115
- msgid "Description"
+ #: admin/attachments.php:185 gl/inquiry/journal_inquiry.php:135
+ msgid "View"
  msgstr ""
  
- #: ../admin/attachments.php:170
- #: ../admin/backups.php:63
- #: ../admin/backups.php:149
- msgid "Filename"
+ #: admin/attachments.php:190
+ msgid "Download"
  msgstr ""
  
- #: ../admin/attachments.php:170
- msgid "Size"
+ #: admin/attachments.php:195 admin/create_coy.php:278
+ #: admin/crm_categories.php:110 admin/fiscalyears.php:166
+ #: admin/inst_chart.php:80 admin/inst_lang.php:109 admin/inst_module.php:143
+ #: admin/inst_theme.php:102 admin/payment_terms.php:143 admin/printers.php:97
+ #: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:146
 -#: gl/gl_budget.php:137 gl/manage/bank_accounts.php:131
 -#: gl/manage/bank_accounts.php.orig:131 gl/manage/currencies.php:166
 -#: gl/manage/exchange_rates.php:99 gl/manage/gl_account_classes.php:133
 -#: gl/manage/gl_account_types.php:155 gl/manage/gl_quick_entries.php:197
 -#: gl/manage/gl_quick_entries.php:296 gl/includes/ui/gl_bank_ui.inc:187
 -#: gl/includes/ui/gl_bank_ui.inc.orig:168 gl/includes/ui/gl_journal_ui.inc:124
 -#: includes/ui/contacts_view.inc:67 includes/ui/radio.ui_input.inc:284
 -#: includes/ui/simple_crud_class.inc:54 includes/ui/ui_input.inc:285
 -#: inventory/prices.php:162 inventory/purchasing_data.php:167
++#: gl/gl_budget.php:137 gl/manage/bank_accounts.php:134
++#: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:99
++#: gl/manage/gl_account_classes.php:133 gl/manage/gl_account_types.php:155
++#: gl/manage/gl_quick_entries.php:197 gl/manage/gl_quick_entries.php:296
++#: gl/includes/ui/gl_bank_ui.inc:187 gl/includes/ui/gl_journal_ui.inc:136
++#: includes/ui/contacts_view.inc:67 includes/ui/simple_crud_class.inc:54
++#: includes/ui/ui_input.inc:286 inventory/prices.php:162
++#: inventory/purchasing_data.php:167
+ #: inventory/includes/item_adjustments_ui.inc:89
+ #: inventory/includes/stock_transfers_ui.inc:81
+ #: inventory/manage/item_categories.php:122
+ #: inventory/manage/item_codes.php:141 inventory/manage/item_units.php:111
+ #: inventory/manage/locations.php:162 inventory/manage/movement_types.php:107
+ #: inventory/manage/sales_kits.php:56 manufacturing/manage/bom_edit.php:87
+ #: manufacturing/manage/work_centres.php:115
+ #: manufacturing/includes/work_order_issue_ui.inc:60
 -#: purchasing/includes/ui/invoice_ui.inc:284
 -#: purchasing/includes/ui/po_ui.inc:267 sales/manage/credit_status.php:120
 -#: sales/manage/customer_branches.php:163
++#: purchasing/includes/ui/invoice_ui.inc:304
++#: sales/manage/credit_status.php:120 sales/manage/customer_branches.php:163
+ #: sales/manage/recurrent_invoices.php:131 sales/manage/sales_areas.php:104
+ #: sales/manage/sales_groups.php:100 sales/manage/sales_people.php:120
+ #: sales/manage/sales_points.php:100 sales/manage/sales_types.php:122
+ #: sales/includes/ui/sales_credit_ui.inc:199
 -#: sales/includes/ui/sales_order_ui.inc:209 taxes/item_tax_types.php:140
 -#: taxes/tax_groups.php:143 taxes/tax_types.php:133
++#: sales/includes/ui/sales_order_ui.inc:211 taxes/item_tax_types.php:140
++#: taxes/tax_groups.php:138 taxes/tax_types.php:133
+ msgid "Delete"
  msgstr ""
  
- #: ../admin/attachments.php:170
- msgid "Filetype"
+ #: admin/attachments.php:202 admin/view_print_transaction.php:126
+ #: admin/void_transaction.php:181 dimensions/inquiry/search_dimensions.php:127
 -#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:234
++#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:232
+ #: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
+ #: gl/inquiry/journal_inquiry.php:127 gl/inquiry/journal_inquiry.php:140
 -#: includes/ui/allocation_cart.inc:263
 -#: inventory/inquiry/stock_movements.php:81
++#: includes/ui/allocation_cart.inc:264
++#: inventory/inquiry/stock_movements.php:78
+ #: manufacturing/search_work_orders.php:159
+ #: manufacturing/includes/manufacturing_ui.inc:157
+ #: manufacturing/includes/manufacturing_ui.inc:200
+ #: manufacturing/includes/manufacturing_ui.inc:236
+ #: manufacturing/includes/manufacturing_ui.inc:276
+ #: manufacturing/includes/manufacturing_ui.inc:280
+ #: manufacturing/includes/manufacturing_ui.inc:331
+ #: purchasing/view/view_po.php:115 purchasing/view/view_po.php:140
 -#: purchasing/inquiry/po_search_completed.php:121
++#: purchasing/inquiry/po_search_completed.php:120
+ #: purchasing/inquiry/po_search.php:130
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:127
 -#: purchasing/inquiry/supplier_inquiry.php:169
++#: purchasing/inquiry/supplier_allocation_inquiry.php:126
++#: purchasing/inquiry/supplier_inquiry.php:174
+ #: purchasing/allocations/supplier_allocation_main.php:95
 -#: reporting/rep101.php:132 reporting/rep201.php:120 reporting/rep203.php:93
 -#: reporting/rep306.php:141 reporting/rep601.php:79 reporting/rep704.php:83
 -#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep710.php:78
 -#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
 -#: reporting/includes/doctext.inc:224
++#: reporting/rep203.php:93 reporting/rep306.php:141 reporting/rep601.php:79
++#: reporting/rep602.php:80 reporting/rep704.php:83 reporting/rep704.php:86
++#: reporting/rep704.php:89 reporting/rep710.php:78
++#: reporting/includes/doctext.inc:167 reporting/includes/doctext.inc:208
++#: reporting/includes/doctext.inc:246
+ #: sales/allocations/customer_allocation_main.php:94
 -#: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129
 -#: sales/view/view_sales_order.php:161
++#: sales/view/view_sales_order.php:109 sales/view/view_sales_order.php:142
++#: sales/view/view_sales_order.php:179
+ #: sales/inquiry/customer_allocation_inquiry.php:144
 -#: sales/inquiry/customer_inquiry.php:225
++#: sales/inquiry/customer_inquiry.php:201
+ msgid "#"
  msgstr ""
  
- #: ../admin/attachments.php:170
- msgid "Date Uploaded"
+ #: admin/attachments.php:203 admin/attachments.php:247
 -#: admin/crm_categories.php:88 admin/inst_upgrade.php:137
++#: admin/crm_categories.php:88 admin/inst_upgrade.php:141
+ #: admin/payment_terms.php:127 admin/printers.php:84
+ #: admin/print_profiles.php:148 gl/inquiry/tax_inquiry.php:82
+ #: gl/manage/gl_quick_entries.php:186 gl/manage/gl_quick_entries.php:224
+ #: includes/ui/view_package.php:32 inventory/manage/item_codes.php:125
+ #: inventory/manage/item_units.php:94 inventory/manage/movement_types.php:95
+ #: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:56
+ #: inventory/view/view_transfer.php:56 manufacturing/manage/bom_edit.php:70
+ #: manufacturing/includes/manufacturing_ui.inc:28
 -#: purchasing/includes/ui/invoice_ui.inc:471
 -#: purchasing/includes/ui/invoice_ui.inc:483
++#: purchasing/includes/ui/invoice_ui.inc:492
++#: purchasing/includes/ui/invoice_ui.inc:504
+ #: purchasing/po_receive_items.php:62 reporting/rep104.php:111
 -#: reporting/rep105.php:114 reporting/rep204.php:84 reporting/rep303.php:111
 -#: reporting/rep303.php:117 reporting/rep304.php:114 reporting/rep305.php:100
 -#: reporting/rep306.php:141 reporting/rep307.php:117 reporting/rep308.php:149
 -#: reporting/rep401.php:71 sales/create_recurrent_invoices.php:134
 -#: sales/manage/credit_status.php:97 sales/manage/recurrent_invoices.php:102
 -#: sales/inquiry/sales_orders_view.php:295
 -#: sales/inquiry/sales_orders_view.php:299 taxes/tax_groups.php:124
++#: reporting/rep105.php:114 reporting/rep204.php:84 reporting/rep304.php:114
++#: reporting/rep305.php:100 reporting/rep306.php:141 reporting/rep307.php:117
++#: reporting/rep308.php:149 reporting/rep309.php:98 reporting/rep401.php:71
++#: sales/create_recurrent_invoices.php:134 sales/manage/credit_status.php:97
++#: sales/manage/recurrent_invoices.php:102 taxes/tax_groups.php:123
+ #: taxes/tax_types.php:115
+ msgid "Description"
  msgstr ""
  
- #: ../admin/attachments.php:185
- #: ../admin/create_coy.php:277
- #: ../admin/crm_categories.php:106
- #: ../admin/fiscalyears.php:164
- #: ../admin/inst_lang.php:100
- #: ../admin/payment_terms.php:142
- #: ../admin/printers.php:96
- #: ../admin/shipping_companies.php:106
- #: ../admin/tags.php:140
- #: ../admin/users.php:144
- #: ../dimensions/inquiry/search_dimensions.php:120
- #: ../gl/inquiry/journal_inquiry.php:118
- #: ../gl/manage/bank_accounts.php:133
- #: ../gl/manage/currencies.php:164
- #: ../gl/manage/exchange_rates.php:94
- #: ../gl/manage/gl_account_classes.php:132
- #: ../gl/manage/gl_account_types.php:154
- #: ../gl/manage/gl_quick_entries.php:196
- #: ../gl/manage/gl_quick_entries.php:295
- #: ../gl/includes/ui/gl_bank_ui.inc:184
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:158
- #: ../gl/includes/ui/gl_journal_ui.inc:134
- #: ../includes/ui/contacts_view.inc:64
- #: ../includes/ui/simple_crud_class.inc:52
- #: ../includes/ui/ui_input.inc:960
- #: ../inventory/prices.php:145
- #: ../inventory/purchasing_data.php:146
- #: ../inventory/purchasing_data.php.orig:75
- #: ../inventory/includes/item_adjustments_ui.inc:87
- #: ../inventory/includes/stock_transfers_ui.inc:79
- #: ../inventory/manage/item_categories.php:121
- #: ../inventory/manage/item_codes.php:140
- #: ../inventory/manage/item_units.php:110
- #: ../inventory/manage/locations.php:161
- #: ../inventory/manage/movement_types.php:106
- #: ../inventory/manage/sales_kits.php:55
- #: ../manufacturing/search_work_orders.php:109
- #: ../manufacturing/manage/bom_edit.php:86
- #: ../manufacturing/manage/work_centres.php:114
- #: ../manufacturing/includes/work_order_issue_ui.inc:58
- #: ../purchasing/includes/ui/invoice_ui.inc:542
- #: ../purchasing/includes/ui/po_ui.inc:273
- #: ../purchasing/includes/ui/po_ui.inc.orig:273
- #: ../purchasing/inquiry/po_search_completed.php:105
- #: ../purchasing/inquiry/po_search_completed.php.orig:104
- #: ../purchasing/inquiry/po_search.php:87
- #: ../sales/manage/credit_status.php:119
- #: ../sales/manage/customer_branches.php:159
- #: ../sales/manage/recurrent_invoices.php:130
- #: ../sales/manage/sales_areas.php:103
- #: ../sales/manage/sales_groups.php:99
- #: ../sales/manage/sales_people.php:119
- #: ../sales/manage/sales_points.php:99
- #: ../sales/manage/sales_types.php:121
- #: ../sales/inquiry/sales_deliveries_view.php:154
- #: ../sales/inquiry/sales_orders_view.php:136
- #: ../sales/includes/ui/sales_credit_ui.inc:197
- #: ../sales/includes/ui/sales_order_ui.inc.orig:202
- #: ../taxes/item_tax_types.php:139
- #: ../taxes/tax_groups.php:137
- #: ../taxes/tax_groups.php.orig:139
- #: ../taxes/tax_groups.php.sav:139
- #: ../taxes/tax_types.php:132
- msgid "Edit"
+ #: admin/attachments.php:204 admin/backups.php:63 admin/backups.php:149
+ msgid "Filename"
  msgstr ""
  
- #: ../admin/attachments.php:186
- #: ../gl/inquiry/journal_inquiry.php:135
- msgid "View"
+ #: admin/attachments.php:205
+ msgid "Size"
  msgstr ""
  
- #: ../admin/attachments.php:187
- msgid "Download"
+ #: admin/attachments.php:206
+ msgid "Filetype"
  msgstr ""
  
- #: ../admin/attachments.php:188
- #: ../admin/create_coy.php:278
- #: ../admin/crm_categories.php:110
- #: ../admin/fiscalyears.php:166
- #: ../admin/inst_chart.php:80
- #: ../admin/inst_lang.php:109
- #: ../admin/inst_module.php:144
- #: ../admin/inst_theme.php:102
- #: ../admin/payment_terms.php:143
- #: ../admin/printers.php:97
- #: ../admin/shipping_companies.php:107
- #: ../admin/tags.php:141
- #: ../admin/users.php:146
- #: ../gl/gl_budget.php:137
- #: ../gl/manage/bank_accounts.php:134
- #: ../gl/manage/currencies.php:166
- #: ../gl/manage/exchange_rates.php:99
- #: ../gl/manage/gl_account_classes.php:133
- #: ../gl/manage/gl_account_types.php:155
- #: ../gl/manage/gl_quick_entries.php:197
- #: ../gl/manage/gl_quick_entries.php:296
- #: ../gl/includes/ui/gl_bank_ui.inc:186
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:160
- #: ../gl/includes/ui/gl_journal_ui.inc:136
- #: ../includes/ui/contacts_view.inc:67
- #: ../includes/ui/simple_crud_class.inc:54
- #: ../includes/ui/ui_input.inc:286
- #: ../inventory/prices.php:146
- #: ../inventory/purchasing_data.php:147
- #: ../inventory/purchasing_data.php.orig:80
- #: ../inventory/includes/item_adjustments_ui.inc:89
- #: ../inventory/includes/stock_transfers_ui.inc:81
- #: ../inventory/manage/item_categories.php:122
- #: ../inventory/manage/item_codes.php:141
- #: ../inventory/manage/item_units.php:111
- #: ../inventory/manage/locations.php:162
- #: ../inventory/manage/movement_types.php:107
- #: ../inventory/manage/sales_kits.php:56
- #: ../manufacturing/manage/bom_edit.php:87
- #: ../manufacturing/manage/work_centres.php:115
- #: ../manufacturing/includes/work_order_issue_ui.inc:60
- #: ../purchasing/includes/ui/invoice_ui.inc:304
- #: ../purchasing/includes/ui/po_ui.inc:275
- #: ../purchasing/includes/ui/po_ui.inc.orig:275
- #: ../sales/manage/credit_status.php:120
- #: ../sales/manage/customer_branches.php:163
- #: ../sales/manage/recurrent_invoices.php:131
- #: ../sales/manage/sales_areas.php:104
- #: ../sales/manage/sales_groups.php:100
- #: ../sales/manage/sales_people.php:120
- #: ../sales/manage/sales_points.php:100
- #: ../sales/manage/sales_types.php:122
- #: ../sales/includes/ui/sales_credit_ui.inc:199
- #: ../sales/includes/ui/sales_order_ui.inc.orig:204
- #: ../taxes/item_tax_types.php:140
- #: ../taxes/tax_groups.php:138
- #: ../taxes/tax_groups.php.orig:140
- #: ../taxes/tax_groups.php.sav:140
- #: ../taxes/tax_types.php:133
- msgid "Delete"
+ #: admin/attachments.php:207
+ msgid "Date Uploaded"
  msgstr ""
  
- #: ../admin/attachments.php:214
- #: ../admin/attachments.php:219
+ #: admin/attachments.php:241 admin/attachments.php:246
  msgid "Transaction #"
  msgstr ""
  
@@@ -425,39 -312,22 +303,19 @@@ msgstr "
  msgid "Database backup failed."
  msgstr ""
  
- #: ../admin/backups.php:98
- #: ../admin/create_coy.php:265
- #: ../admin/fiscalyears.php:155
- #: ../admin/inst_lang.php:85
- #: ../admin/inst_lang.php:97
- #: ../dimensions/inquiry/search_dimensions.php:107
- #: ../gl/manage/bank_accounts.php:130
- #: ../gl/manage/currencies.php:162
- #: ../gl/manage/gl_account_classes.php:127
- #: ../gl/manage/gl_quick_entries.php:230
- #: ../includes/system_tests.inc:38
- #: ../includes/system_tests.inc:113
- #: ../includes/system_tests.inc:126
- #: ../includes/ui/ui_lists.inc:1674
- #: ../purchasing/manage/suppliers.php:122
- #: ../purchasing/manage/suppliers.php.orig:132
- #: ../reporting/rep101.php:126
- #: ../reporting/rep102.php:112
- #: ../reporting/rep102.php:114
- #: ../reporting/rep104.php:103
- #: ../reporting/rep106.php:73
- #: ../reporting/rep114.php:73
- #: ../reporting/rep201.php:114
- #: ../reporting/rep202.php:116
- #: ../reporting/rep202.php:118
- #: ../reporting/rep203.php:87
- #: ../reporting/rep303.php:101
- #: ../reporting/rep303.php:105
- #: ../reporting/rep501.php:109
- #: ../sales/manage/sales_points.php:94
- #: ../sales/manage/sales_points.php:95
- #: ../sales/manage/sales_types.php:119
- #: ../taxes/item_tax_types.php:129
+ #: admin/backups.php:98 admin/create_coy.php:265 admin/fiscalyears.php:155
+ #: admin/inst_lang.php:85 admin/inst_lang.php:97
 -#: admin/void_transaction.php:125 dimensions/inquiry/search_dimensions.php:107
 -#: gl/manage/bank_accounts.php:127 gl/manage/bank_accounts.php.orig:127
 -#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:127
 -#: gl/manage/gl_quick_entries.php:230 includes/system_tests.inc:38
 -#: includes/system_tests.inc:113 includes/system_tests.inc:126
 -#: includes/ui/sav.ui_lists.inc:1649 includes/ui/ui_lists.inc:1672
 -#: purchasing/manage/suppliers.php:120 reporting/rep101.php:128
 -#: reporting/rep102.php:114 reporting/rep102.php:116 reporting/rep104.php:105
 -#: reporting/rep106.php:75 reporting/rep114.php:74 reporting/rep201.php:116
 -#: reporting/rep202.php:118 reporting/rep202.php:120 reporting/rep203.php:89
 -#: reporting/rep303.php:103 reporting/rep303.php:107 reporting/rep501.php:113
++#: dimensions/inquiry/search_dimensions.php:107
++#: gl/manage/bank_accounts.php:130 gl/manage/currencies.php:162
++#: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230
++#: includes/system_tests.inc:38 includes/system_tests.inc:113
++#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1676
++#: purchasing/manage/suppliers.php:122 reporting/rep102.php:114
++#: reporting/rep102.php:116 reporting/rep104.php:105 reporting/rep106.php:75
++#: reporting/rep114.php:74 reporting/rep202.php:118 reporting/rep202.php:120
++#: reporting/rep203.php:89 reporting/rep501.php:113
+ #: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
+ #: sales/manage/sales_types.php:119 taxes/item_tax_types.php:129
 -#: taxes/tax_groups.php:139
  msgid "No"
  msgstr ""
  
@@@ -485,9 -359,8 +347,8 @@@ msgstr "
  msgid "Create backup"
  msgstr ""
  
- #: ../admin/backups.php:181
- #: ../sales/includes/ui/sales_order_ui.inc.orig:589
- #: ../sales/includes/ui/sales_order_ui.inc.orig:645
 -#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:594
 -#: sales/includes/ui/sales_order_ui.inc:642
++#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:596
++#: sales/includes/ui/sales_order_ui.inc:652
  msgid "Comments:"
  msgstr ""
  
@@@ -596,24 -464,17 +452,16 @@@ msgid "
  "expected"
  msgstr ""
  
- #: ../admin/company_preferences.php:59
- #: ../inventory/manage/items.php:87
- #: ../inventory/manage/items.php.orig:85
 -#: admin/company_preferences.php:59 inventory/manage/items.php:85
++#: admin/company_preferences.php:59
  msgid ""
  "The file size is over the maximum allowed. The maximum size allowed in KB is"
  msgstr ""
  
- #: ../admin/company_preferences.php:64
- #: ../inventory/manage/items.php:77
- #: ../inventory/manage/items.php:92
- #: ../inventory/manage/items.php.orig:75
 -#: admin/company_preferences.php:64 inventory/manage/items.php:75
++#: admin/company_preferences.php:64
  msgid "Only graphics files can be uploaded"
  msgstr ""
  
- #: ../admin/company_preferences.php:72
- #: ../admin/company_preferences.php:93
- #: ../inventory/manage/items.php:100
- #: ../inventory/manage/items.php.orig:93
+ #: admin/company_preferences.php:72 admin/company_preferences.php:93
 -#: inventory/manage/items.php:93
  msgid "The existing image could not be removed"
  msgstr ""
  
@@@ -629,13 -490,9 +477,9 @@@ msgstr "
  msgid "Name (to appear on reports):"
  msgstr ""
  
- #: ../admin/company_preferences.php:160
- #: ../admin/shipping_companies.php:142
- #: ../includes/ui/contacts_view.inc:109
- #: ../inventory/manage/locations.php:202
- #: ../sales/manage/customers.php:231
- #: ../sales/manage/sav.customers.php:231
- #: ../sales/includes/ui/sales_order_ui.inc.orig:636
+ #: admin/company_preferences.php:165 admin/shipping_companies.php:142
+ #: includes/ui/contacts_view.inc:109 inventory/manage/locations.php:202
 -#: sales/manage/customers.php:231 sales/includes/ui/sales_order_ui.inc:633
++#: sales/manage/customers.php:231 sales/includes/ui/sales_order_ui.inc:643
  msgid "Address:"
  msgstr ""
  
@@@ -643,21 -500,14 +487,14 @@@
  msgid "Domicile:"
  msgstr ""
  
- #: ../admin/company_preferences.php:163
- #: ../admin/shipping_companies.php:138
- #: ../purchasing/manage/suppliers.php:135
- #: ../purchasing/manage/suppliers.php.orig:114
- #: ../sales/manage/customer_branches.php:262
+ #: admin/company_preferences.php:168 admin/shipping_companies.php:138
 -#: purchasing/manage/suppliers.php:129 sales/manage/customer_branches.php:260
++#: purchasing/manage/suppliers.php:135 sales/manage/customer_branches.php:262
  msgid "Phone Number:"
  msgstr ""
  
- #: ../admin/company_preferences.php:164
- #: ../includes/ui/contacts_view.inc:104
- #: ../purchasing/manage/suppliers.php:138
- #: ../purchasing/manage/suppliers.php.orig:116
- #: ../sales/manage/customer_branches.php:264
- #: ../sales/manage/customers.php:254
- #: ../sales/manage/sav.customers.php:254
+ #: admin/company_preferences.php:169 includes/ui/contacts_view.inc:104
 -#: purchasing/manage/suppliers.php:159 sales/manage/customer_branches.php:262
++#: purchasing/manage/suppliers.php:138 sales/manage/customer_branches.php:264
+ #: sales/manage/customers.php:254
  msgid "Fax Number:"
  msgstr ""
  
@@@ -670,11 -523,8 +510,8 @@@ msgstr "
  msgid "Official Company Number:"
  msgstr ""
  
- #: ../admin/company_preferences.php:168
- #: ../purchasing/manage/suppliers.php:96
- #: ../purchasing/manage/suppliers.php.orig:97
- #: ../sales/manage/customers.php:233
- #: ../sales/manage/sav.customers.php:233
 -#: admin/company_preferences.php:175 purchasing/manage/suppliers.php:94
++#: admin/company_preferences.php:175 purchasing/manage/suppliers.php:96
+ #: sales/manage/customers.php:233
  msgid "GSTNo:"
  msgstr ""
  
@@@ -767,49 -616,29 +603,26 @@@ msgstr "
  msgid "Version Id"
  msgstr ""
  
- #: ../admin/company_preferences.php:201
- #: ../admin/display_prefs.php:144
- #: ../admin/forms_setup.php:61
- #: ../admin/gl_setup.php.orig:235
- #: ../admin/inst_chart.php:74
- #: ../admin/inst_lang.php:103
- #: ../admin/inst_module.php:138
- #: ../admin/inst_module.php:156
- #: ../admin/inst_module.php:199
- #: ../admin/inst_theme.php:96
- #: ../dimensions/dimension_entry.php:293
- #: ../gl/gl_bank.php:406
- #: ../gl/gl_budget.php:135
- #: ../gl/manage/gl_quick_entries.php:60
- #: ../gl/includes/ui/gl_bank_ui.inc:275
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:249
- #: ../gl/includes/ui/gl_journal_ui.inc:257
- #: ../includes/ui/db_pager_view.inc:174
- #: ../includes/ui/simple_crud_class.inc:56
- #: ../includes/ui/simple_crud_class.inc:227
- #: ../includes/ui/ui_input.inc:208
- #: ../includes/ui/ui_input.inc:905
- #: ../inventory/adjustments.php:235
- #: ../inventory/cost_update.php:116
- #: ../inventory/reorder_level.php:97
- #: ../inventory/transfers.php:236
- #: ../inventory/includes/item_adjustments_ui.inc:157
- #: ../inventory/includes/stock_transfers_ui.inc:137
- #: ../inventory/manage/sales_kits.php:208
- #: ../manufacturing/work_order_entry.php:459
- #: ../manufacturing/includes/work_order_issue_ui.inc:131
- #: ../purchasing/includes/ui/po_ui.inc:306
- #: ../purchasing/includes/ui/po_ui.inc.orig:306
- #: ../purchasing/includes/ui/po_ui.inc.orig:457
- #: ../purchasing/po_receive_items.php:331
- #: ../sales/credit_note_entry.php:284
- #: ../sales/customer_credit_invoice.php:380
- #: ../sales/customer_delivery.php.orig:536
- #: ../sales/customer_invoice.php:684
- #: ../sales/inquiry/sales_orders_view.php:349
- #: ../sales/includes/ui/sales_credit_ui.inc:293
- #: ../sales/includes/ui/sales_order_ui.inc.orig:237
- #: ../sales/includes/ui/sales_order_ui.inc.orig:555
 -#: admin/company_preferences.php:208 admin/display_prefs.php:143
 -#: admin/forms_setup.php:61 admin/gl_setup.php:226 admin/inst_chart.php:74
++#: admin/company_preferences.php:208 admin/display_prefs.php:145
++#: admin/forms_setup.php:61 admin/gl_setup.php:241 admin/inst_chart.php:74
+ #: admin/inst_lang.php:103 admin/inst_module.php:137 admin/inst_module.php:155
+ #: admin/inst_module.php:198 admin/inst_theme.php:96
 -#: dimensions/dimension_entry.php:293 gl/gl_bank.php:403 gl/gl_budget.php:135
++#: dimensions/dimension_entry.php:293 gl/gl_bank.php:406 gl/gl_budget.php:135
+ #: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:276
 -#: gl/includes/ui/gl_bank_ui.inc.orig:257 gl/includes/ui/gl_journal_ui.inc:221
 -#: includes/ui/db_pager_view.inc:174 includes/ui/radio.ui_input.inc:206
 -#: includes/ui/radio.ui_input.inc:901 includes/ui/simple_crud_class.inc:56
 -#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:207
 -#: includes/ui/ui_input.inc:905 inventory/adjustments.php:233
 -#: inventory/cost_update.php:138 inventory/reorder_level.php:114
 -#: inventory/transfers.php:234 inventory/includes/item_adjustments_ui.inc:157
++#: gl/includes/ui/gl_journal_ui.inc:257 includes/ui/db_pager_view.inc:174
++#: includes/ui/simple_crud_class.inc:56 includes/ui/simple_crud_class.inc:227
++#: includes/ui/ui_input.inc:208 includes/ui/ui_input.inc:906
++#: inventory/adjustments.php:233 inventory/cost_update.php:138
++#: inventory/reorder_level.php:114 inventory/transfers.php:234
++#: inventory/includes/item_adjustments_ui.inc:157
+ #: inventory/includes/stock_transfers_ui.inc:137
 -#: inventory/manage/sales_kits.php:208 manufacturing/work_order_entry.php:459
++#: inventory/manage/sales_kits.php:208
+ #: manufacturing/includes/work_order_issue_ui.inc:131
 -#: purchasing/includes/ui/po_ui.inc:298 purchasing/includes/ui/po_ui.inc:441
 -#: purchasing/po_receive_items.php:333 sales/credit_note_entry.php:284
 -#: sales/customer_credit_invoice.php:380 sales/customer_delivery.php:523
 -#: sales/customer_invoice.php:582 sales/inquiry/sales_orders_view.php:323
 -#: sales/includes/ui/sales_credit_ui.inc:293
 -#: sales/includes/ui/sales_order_ui.inc:242
 -#: sales/includes/ui/sales_order_ui.inc:560
++#: purchasing/po_receive_items.php:331 sales/credit_note_entry.php:284
++#: sales/customer_credit_invoice.php:380 sales/customer_delivery.php:545
++#: sales/customer_invoice.php:684 sales/includes/ui/sales_credit_ui.inc:293
++#: sales/includes/ui/sales_order_ui.inc:244
++#: sales/includes/ui/sales_order_ui.inc:562
  msgid "Update"
  msgstr ""
  
@@@ -939,38 -753,21 +737,18 @@@ msgstr "
  msgid "Default"
  msgstr ""
  
- #: ../admin/create_coy.php:263
- #: ../admin/fiscalyears.php:159
- #: ../admin/inst_lang.php:85
- #: ../admin/inst_lang.php:97
- #: ../dimensions/inquiry/search_dimensions.php:107
- #: ../gl/manage/bank_accounts.php:128
- #: ../gl/manage/currencies.php:162
- #: ../gl/manage/gl_account_classes.php:127
- #: ../gl/manage/gl_quick_entries.php:230
- #: ../includes/system_tests.inc:38
- #: ../includes/system_tests.inc:113
- #: ../includes/system_tests.inc:126
- #: ../includes/ui/ui_lists.inc:1675
- #: ../purchasing/manage/suppliers.php:122
- #: ../purchasing/manage/suppliers.php.orig:132
- #: ../reporting/rep101.php:125
- #: ../reporting/rep102.php:111
- #: ../reporting/rep102.php:113
- #: ../reporting/rep104.php:105
- #: ../reporting/rep106.php:75
- #: ../reporting/rep114.php:75
- #: ../reporting/rep201.php:113
- #: ../reporting/rep202.php:115
- #: ../reporting/rep202.php:117
- #: ../reporting/rep203.php:86
- #: ../reporting/rep303.php:96
- #: ../reporting/rep303.php:104
- #: ../reporting/rep501.php:107
- #: ../sales/manage/sales_points.php:94
- #: ../sales/manage/sales_points.php:95
- #: ../sales/manage/sales_types.php:119
- #: ../taxes/item_tax_types.php:133
+ #: admin/create_coy.php:263 admin/fiscalyears.php:159 admin/inst_lang.php:85
+ #: admin/inst_lang.php:97 dimensions/inquiry/search_dimensions.php:107
 -#: gl/manage/bank_accounts.php:125 gl/manage/bank_accounts.php.orig:125
 -#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:127
 -#: gl/manage/gl_quick_entries.php:230 includes/system_tests.inc:38
 -#: includes/system_tests.inc:113 includes/system_tests.inc:126
 -#: includes/ui/sav.ui_lists.inc:1650 includes/ui/ui_lists.inc:1673
 -#: purchasing/manage/suppliers.php:120 reporting/rep101.php:127
 -#: reporting/rep102.php:113 reporting/rep102.php:115 reporting/rep104.php:107
 -#: reporting/rep106.php:77 reporting/rep114.php:76 reporting/rep201.php:115
 -#: reporting/rep202.php:117 reporting/rep202.php:119 reporting/rep203.php:88
 -#: reporting/rep303.php:98 reporting/rep303.php:106 reporting/rep501.php:111
++#: gl/manage/bank_accounts.php:128 gl/manage/currencies.php:162
++#: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230
++#: includes/system_tests.inc:38 includes/system_tests.inc:113
++#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1677
++#: purchasing/manage/suppliers.php:122 reporting/rep102.php:113
++#: reporting/rep102.php:115 reporting/rep104.php:107 reporting/rep106.php:77
++#: reporting/rep114.php:76 reporting/rep202.php:117 reporting/rep202.php:119
++#: reporting/rep203.php:88 reporting/rep501.php:111
+ #: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
+ #: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133
 -#: taxes/tax_groups.php:137
  msgid "Yes"
  msgstr ""
  
@@@ -994,17 -789,10 +770,10 @@@ msgstr "
  msgid "Database Password"
  msgstr ""
  
- #: ../admin/create_coy.php:344
- #: ../admin/inst_chart.php:68
- #: ../admin/inst_chart.php:70
- #: ../admin/inst_lang.php:87
- #: ../admin/inst_lang.php:90
- #: ../admin/inst_module.php:127
- #: ../admin/inst_theme.php:91
- #: ../admin/inst_theme.php:93
- #: ../admin/inst_upgrade.php:153
- #: ../gl/manage/gl_account_types.php:190
- #: ../includes/ui/allocation_cart.inc:288
+ #: admin/create_coy.php:344 admin/inst_chart.php:68 admin/inst_chart.php:70
+ #: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:126
 -#: admin/inst_theme.php:91 admin/inst_theme.php:93 admin/inst_upgrade.php:149
 -#: gl/manage/gl_account_types.php:190 includes/ui/allocation_cart.inc:286
++#: admin/inst_theme.php:91 admin/inst_theme.php:93 admin/inst_upgrade.php:153
++#: gl/manage/gl_account_types.php:190 includes/ui/allocation_cart.inc:288
  msgid "None"
  msgstr ""
  
@@@ -1057,8 -844,7 +825,7 @@@ msgstr "
  msgid "Action id"
  msgstr ""
  
- #: ../admin/crm_categories.php:88
- #: ../sales/manage/customer_branches.php:295
 -#: admin/crm_categories.php:88 sales/manage/customer_branches.php:293
++#: admin/crm_categories.php:88 sales/manage/customer_branches.php:295
  msgid "Short Name"
  msgstr ""
  
@@@ -1215,11 -993,7 +974,11 @@@ msgid "
  "default is current date"
  msgstr ""
  
- #: ../admin/display_prefs.php:140
++#: admin/display_prefs.php:141
 +msgid "Transaction days:"
 +msgstr ""
 +
- #: ../admin/fiscalyears.php:25
+ #: admin/fiscalyears.php:25
  msgid "Fiscal Years"
  msgstr ""
  
@@@ -1278,16 -1052,12 +1037,11 @@@ msgstr "
  msgid "Fiscal Year End"
  msgstr ""
  
- #: ../admin/fiscalyears.php:138
- #: ../dimensions/inquiry/search_dimensions.php:133
- #: ../dimensions/inquiry/search_dimensions.php:139
- #: ../includes/ui/ui_input.inc:958
- #: ../includes/ui/ui_lists.inc:675
- #: ../manufacturing/search_work_orders.php:108
- #: ../reporting/rep501.php:85
- #: ../reporting/rep710.php:109
- #: ../reporting/includes/excel_report.inc:234
- #: ../reporting/includes/pdf_report.inc:266
+ #: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:133
 -#: dimensions/inquiry/search_dimensions.php:139
 -#: includes/ui/sav.ui_lists.inc:659 includes/ui/ui_lists.inc:676
 -#: manufacturing/search_work_orders.php:108 reporting/rep501.php:87
 -#: reporting/rep710.php:113 reporting/includes/excel_report.inc:234
++#: dimensions/inquiry/search_dimensions.php:139 includes/ui/ui_input.inc:959
++#: includes/ui/ui_lists.inc:675 manufacturing/search_work_orders.php:108
++#: reporting/rep501.php:87 reporting/includes/excel_report.inc:234
+ #: reporting/includes/pdf_report.inc:266
  msgid "Closed"
  msgstr ""
  
@@@ -1363,202 -1132,163 +1116,175 @@@ msgstr "
  msgid "The general GL setup has been updated."
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:138
 -#: admin/gl_setup.php:137
++#: admin/gl_setup.php:144
  msgid "General GL"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:140
 -#: admin/gl_setup.php:139
++#: admin/gl_setup.php:146
  msgid "Past Due Days Interval:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:140
- #: ../admin/gl_setup.php.orig:180
- #: ../admin/gl_setup.php.orig:188
- #: ../admin/gl_setup.php.orig:206
- #: ../admin/gl_setup.php.orig:228
- #: ../admin/payment_terms.php:140
 -#: admin/gl_setup.php:139 admin/gl_setup.php:174 admin/gl_setup.php:182
 -#: admin/gl_setup.php:219 admin/payment_terms.php:140
++#: admin/gl_setup.php:146 admin/gl_setup.php:186 admin/gl_setup.php:194
++#: admin/gl_setup.php:212 admin/gl_setup.php:234 admin/payment_terms.php:140
  msgid "days"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:142
 -#: admin/gl_setup.php:141
++#: admin/gl_setup.php:148
  msgid "Retained Earnings:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:144
 -#: admin/gl_setup.php:143
++#: admin/gl_setup.php:150
  msgid "Profit/Loss Year:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:146
 -#: admin/gl_setup.php:145
++#: admin/gl_setup.php:152
  msgid "Exchange Variances Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:148
- #: ../gl/manage/bank_accounts.php:193
 -#: admin/gl_setup.php:147
++#: admin/gl_setup.php:154 gl/manage/bank_accounts.php:193
  msgid "Bank Charges Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:150
 -#: admin/gl_setup.php:151
++#: admin/gl_setup.php:156
 +msgid "Tax Algorithm:"
 +msgstr ""
 +
- #: ../admin/gl_setup.php.orig:154
++#: admin/gl_setup.php:160
  msgid "Customers and Sales"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:156
 -#: admin/gl_setup.php:153
++#: admin/gl_setup.php:162
  msgid "Default Credit Limit:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:158
 -#: admin/gl_setup.php:155
++#: admin/gl_setup.php:164
  msgid "Accumulate batch shipping:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:160
 -#: admin/gl_setup.php:157
++#: admin/gl_setup.php:166
  msgid "Legal Text on Invoice:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:162
 -#: admin/gl_setup.php:159
++#: admin/gl_setup.php:168
  msgid "Shipping Charged Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:164
 -#: admin/gl_setup.php:163
++#: admin/gl_setup.php:170
 +msgid "Deferred Income Account:"
 +msgstr ""
 +
- #: ../admin/gl_setup.php.orig:165
++#: admin/gl_setup.php:171
 +msgid "Not used"
 +msgstr ""
 +
- #: ../admin/gl_setup.php.orig:169
++#: admin/gl_setup.php:175
  msgid "Customers and Sales Defaults"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:171
 -#: admin/gl_setup.php:165
++#: admin/gl_setup.php:177
  msgid "Receivable Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:173
- #: ../admin/gl_setup.php.orig:214
- #: ../inventory/manage/item_categories.php:192
- #: ../inventory/manage/items.php:361
- #: ../inventory/manage/items.php.orig:354
- #: ../sales/manage/customer_branches.php:251
 -#: admin/gl_setup.php:167 admin/gl_setup.php:205
 -#: inventory/manage/item_categories.php:192 inventory/manage/items.php:354
 -#: sales/manage/customer_branches.php:250
++#: admin/gl_setup.php:179 admin/gl_setup.php:220
++#: inventory/manage/item_categories.php:196
++#: sales/manage/customer_branches.php:251
  msgid "Sales Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:176
- #: ../sales/manage/customer_branches.php:252
 -#: admin/gl_setup.php:170 sales/manage/customer_branches.php:251
++#: admin/gl_setup.php:182 sales/manage/customer_branches.php:252
  msgid "Sales Discount Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:178
- #: ../sales/manage/customer_branches.php:254
 -#: admin/gl_setup.php:172 sales/manage/customer_branches.php:253
++#: admin/gl_setup.php:184 sales/manage/customer_branches.php:254
  msgid "Prompt Payment Discount Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:180
 -#: admin/gl_setup.php:174
++#: admin/gl_setup.php:186
  msgid "Delivery Required By:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:186
 -#: admin/gl_setup.php:180
++#: admin/gl_setup.php:192
  msgid "Dimension Defaults"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:188
 -#: admin/gl_setup.php:182
++#: admin/gl_setup.php:194
  msgid "Dimension Required By After:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:192
 -#: admin/gl_setup.php:185
++#: admin/gl_setup.php:198
  msgid "Suppliers and Purchasing"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:194
 -#: admin/gl_setup.php:187
++#: admin/gl_setup.php:200
  msgid "Delivery Over-Receive Allowance:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:196
 -#: admin/gl_setup.php:189
++#: admin/gl_setup.php:202
  msgid "Invoice Over-Charge Allowance:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:198
 -#: admin/gl_setup.php:191
++#: admin/gl_setup.php:204
  msgid "Suppliers and Purchasing Defaults"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:200
 -#: admin/gl_setup.php:193
++#: admin/gl_setup.php:206
  msgid "Payable Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:202
- #: ../purchasing/manage/suppliers.php:132
- #: ../purchasing/manage/suppliers.php.orig:142
 -#: admin/gl_setup.php:195 purchasing/manage/suppliers.php:126
++#: admin/gl_setup.php:208 purchasing/manage/suppliers.php:132
  msgid "Purchase Discount Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:204
 -#: admin/gl_setup.php:197
++#: admin/gl_setup.php:210
  msgid "GRN Clearing Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:204
 -#: admin/gl_setup.php:197
++#: admin/gl_setup.php:210
  msgid "No postings on GRN"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:206
 -#: admin/gl_setup.php:199 reporting/reports_main.php:202
++#: admin/gl_setup.php:212
 +msgid "Receival Required By:"
 +msgstr ""
 +
- #: ../admin/gl_setup.php.orig:208
- #: ../reporting/reports_main.php:175
++#: admin/gl_setup.php:214
  msgid "Inventory"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:210
 -#: admin/gl_setup.php:201
++#: admin/gl_setup.php:216
  msgid "Allow Negative Inventory:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:211
 -#: admin/gl_setup.php:202
++#: admin/gl_setup.php:217
  msgid "Warning:  This may cause a delay in GL postings"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:213
 -#: admin/gl_setup.php:204
++#: admin/gl_setup.php:219
  msgid "Items Defaults"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:216
- #: ../inventory/manage/item_categories.php:202
- #: ../inventory/manage/items.php:365
- #: ../inventory/manage/items.php.orig:358
 -#: admin/gl_setup.php:207 inventory/manage/item_categories.php:202
 -#: inventory/manage/items.php:358
++#: admin/gl_setup.php:222 inventory/manage/item_categories.php:206
  msgid "Inventory Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:218
- #: ../inventory/manage/item_categories.php:196
- #: ../inventory/manage/item_categories.php:204
- #: ../inventory/manage/items.php:366
- #: ../inventory/manage/items.php:371
- #: ../inventory/manage/items.php.orig:359
- #: ../inventory/manage/items.php.orig:364
 -#: admin/gl_setup.php:209 inventory/manage/item_categories.php:196
 -#: inventory/manage/item_categories.php:204 inventory/manage/items.php:359
 -#: inventory/manage/items.php:364
++#: admin/gl_setup.php:224 inventory/manage/item_categories.php:200
++#: inventory/manage/item_categories.php:208
  msgid "C.O.G.S. Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:220
- #: ../inventory/manage/item_categories.php:205
- #: ../inventory/manage/items.php:367
- #: ../inventory/manage/items.php.orig:360
 -#: admin/gl_setup.php:211 inventory/manage/item_categories.php:205
 -#: inventory/manage/items.php:360
++#: admin/gl_setup.php:226 inventory/manage/item_categories.php:209
  msgid "Inventory Adjustments Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:222
- #: ../inventory/manage/item_categories.php:209
- #: ../inventory/manage/items.php:378
- #: ../inventory/manage/items.php.orig:371
 -#: admin/gl_setup.php:213 inventory/manage/item_categories.php:209
 -#: inventory/manage/items.php:371
++#: admin/gl_setup.php:228 inventory/manage/item_categories.php:213
  msgid "Item Assembly Costs Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:226
 -#: admin/gl_setup.php:217
++#: admin/gl_setup.php:232
  msgid "Manufacturing Defaults"
  msgstr ""
  
- #: ../admin/gl_setup.php.orig:228
 -#: admin/gl_setup.php:219
++#: admin/gl_setup.php:234
  msgid "Work Order Required By After:"
  msgstr ""
  
@@@ -1574,21 -1304,14 +1300,13 @@@ msgstr "
  msgid "Chart"
  msgstr ""
  
- #: ../admin/inst_chart.php:50
- #: ../admin/inst_lang.php:36
- #: ../admin/inst_module.php:105
- #: ../admin/inst_theme.php:74
- #: ../admin/inst_upgrade.php:159
+ #: admin/inst_chart.php:50 admin/inst_lang.php:36 admin/inst_module.php:105
 -#: admin/inst_theme.php:74 admin/inst_upgrade.php:155
++#: admin/inst_theme.php:74 admin/inst_upgrade.php:159
  msgid "Installed"
  msgstr ""
  
- #: ../admin/inst_chart.php:50
- #: ../admin/inst_lang.php:36
- #: ../admin/inst_module.php:105
- #: ../admin/inst_theme.php:74
- #: ../inventory/inquiry/stock_status.php:71
- #: ../inventory/inquiry/stock_status.php.orig:77
- #: ../reporting/rep303.php:102
+ #: admin/inst_chart.php:50 admin/inst_lang.php:36 admin/inst_module.php:105
 -#: admin/inst_theme.php:74 inventory/inquiry/stock_status.php:77
 -#: reporting/rep303.php:104
++#: admin/inst_theme.php:74 inventory/inquiry/stock_status.php:71
  msgid "Available"
  msgstr ""
  
@@@ -1598,22 -1319,14 +1314,15 @@@
  msgid "Encoding"
  msgstr ""
  
- #: ../admin/inst_chart.php:69
- #: ../admin/inst_chart.php:71
- #: ../admin/inst_lang.php:88
- #: ../admin/inst_module.php:128
- #: ../admin/inst_module.php:129
- #: ../admin/inst_theme.php:92
- #: ../includes/sysnames.inc:193
+ #: admin/inst_chart.php:69 admin/inst_chart.php:71 admin/inst_lang.php:88
+ #: admin/inst_module.php:127 admin/inst_module.php:128 admin/inst_theme.php:92
++#: includes/sysnames.inc:193
  msgid "Unknown"
  msgstr ""
  
- #: ../admin/inst_chart.php:74
- #: ../admin/inst_lang.php:103
- #: ../admin/inst_module.php:133
- #: ../admin/inst_module.php:138
- #: ../admin/inst_theme.php:96
- #: ../admin/inst_upgrade.php:141
+ #: admin/inst_chart.php:74 admin/inst_lang.php:103 admin/inst_module.php:132
+ #: admin/inst_module.php:137 admin/inst_theme.php:96
 -#: admin/inst_upgrade.php:137
++#: admin/inst_upgrade.php:141
  msgid "Install"
  msgstr ""
  
@@@ -1636,23 -1345,18 +1341,18 @@@ msgstr "
  msgid "Install/Update Languages"
  msgstr ""
  
- #: ../admin/inst_lang.php:35
- #: ../admin/printers.php:84
- #: ../admin/shipping_companies.php:91
- #: ../dimensions/dimension_entry.php:271
- #: ../dimensions/inquiry/search_dimensions.php:129
- #: ../dimensions/view/view_dimension.php:54
- #: ../inventory/manage/item_categories.php:98
- #: ../manufacturing/manage/work_centres.php:101
- #: ../purchasing/includes/ui/invoice_ui.inc:265
- #: ../purchasing/includes/ui/invoice_ui.inc:267
- #: ../purchasing/includes/ui/invoice_ui.inc:269
- #: ../reporting/rep501.php:85
- #: ../reporting/rep709.php:109
- #: ../reporting/rep709.php:110
- #: ../sales/manage/customer_branches.php:296
- #: ../sales/manage/sales_people.php:99
- #: ../taxes/item_tax_types.php:117
+ #: admin/inst_lang.php:35 admin/printers.php:84
+ #: admin/shipping_companies.php:91 dimensions/dimension_entry.php:271
+ #: dimensions/inquiry/search_dimensions.php:129
+ #: dimensions/view/view_dimension.php:55
+ #: inventory/manage/item_categories.php:98
+ #: manufacturing/manage/work_centres.php:101
 -#: purchasing/includes/ui/invoice_ui.inc:245
 -#: purchasing/includes/ui/invoice_ui.inc:247
 -#: purchasing/includes/ui/invoice_ui.inc:249 reporting/rep501.php:87
++#: purchasing/includes/ui/invoice_ui.inc:265
++#: purchasing/includes/ui/invoice_ui.inc:267
++#: purchasing/includes/ui/invoice_ui.inc:269 reporting/rep501.php:87
+ #: reporting/rep709.php:111 reporting/rep709.php:112
 -#: sales/manage/customer_branches.php:294 sales/manage/sales_people.php:99
++#: sales/manage/customer_branches.php:296 sales/manage/sales_people.php:99
+ #: taxes/item_tax_types.php:117
  msgid "Name"
  msgstr ""
  
@@@ -1754,11 -1453,10 +1449,9 @@@ msgstr "
  msgid "Install third-party extension."
  msgstr ""
  
- #: ../admin/inst_module.php:169
- #: ../includes/ui/ui_lists.inc:675
- #: ../includes/ui/ui_lists.inc:2156
- #: ../reporting/includes/excel_report.inc:232
- #: ../reporting/includes/pdf_report.inc:264
 -#: admin/inst_module.php:168 includes/ui/sav.ui_lists.inc:659
 -#: includes/ui/sav.ui_lists.inc:2131 includes/ui/ui_lists.inc:676
 -#: includes/ui/ui_lists.inc:2153 reporting/includes/excel_report.inc:232
++#: admin/inst_module.php:168 includes/ui/ui_lists.inc:675
++#: includes/ui/ui_lists.inc:2157 reporting/includes/excel_report.inc:232
+ #: reporting/includes/pdf_report.inc:264
  msgid "Active"
  msgstr ""
  
@@@ -1795,47 -1493,47 +1488,47 @@@ msgstr "
  msgid "Database upgrade for company '%s' (%s:%s*) started..."
  msgstr ""
  
- #: ../admin/inst_upgrade.php:83
 -#: admin/inst_upgrade.php:80
++#: admin/inst_upgrade.php:83
  msgid "Database upgrade finished."
  msgstr ""
  
- #: ../admin/inst_upgrade.php:86
 -#: admin/inst_upgrade.php:84
++#: admin/inst_upgrade.php:86
  msgid ""
  "Upgrade cannot be done because database has been already partially upgraded. "
  "Please downgrade database to clean previous version or try forced upgrade."
  msgstr ""
  
- #: ../admin/inst_upgrade.php:104
 -#: admin/inst_upgrade.php:102
++#: admin/inst_upgrade.php:104
  msgid "Cannot connect to database for company"
  msgstr ""
  
- #: ../admin/inst_upgrade.php:117
 -#: admin/inst_upgrade.php:114
++#: admin/inst_upgrade.php:117
  #, php-format
  msgid "Database upgrade to version %s failed for company '%s'."
  msgstr ""
  
- #: ../admin/inst_upgrade.php:120
 -#: admin/inst_upgrade.php:117
++#: admin/inst_upgrade.php:120
  msgid "You should restore company database from latest backup file"
  msgstr ""
  
- #: ../admin/inst_upgrade.php:133
 -#: admin/inst_upgrade.php:129
++#: admin/inst_upgrade.php:133
  msgid "All companies data has been successfully updated"
  msgstr ""
  
- #: ../admin/inst_upgrade.php:141
 -#: admin/inst_upgrade.php:137
++#: admin/inst_upgrade.php:141
  msgid "Sql file"
  msgstr ""
  
- #: ../admin/inst_upgrade.php:142
 -#: admin/inst_upgrade.php:138
++#: admin/inst_upgrade.php:142
  msgid "Force upgrade"
  msgstr ""
  
- #: ../admin/inst_upgrade.php:165
 -#: admin/inst_upgrade.php:161
++#: admin/inst_upgrade.php:165
  #, php-format
  msgid "Partially installed (%s)"
  msgstr ""
  
- #: ../admin/inst_upgrade.php:174
 -#: admin/inst_upgrade.php:170
++#: admin/inst_upgrade.php:174
  msgid ""
  "Database upgrades marked as partially installed cannot be installed "
  "automatically.\n"
@@@ -1843,20 -1541,16 +1536,17 @@@
  "upgrade."
  msgstr ""
  
- #: ../admin/inst_upgrade.php:178
 -#: admin/inst_upgrade.php:174
++#: admin/inst_upgrade.php:178
  msgid "Upgrade system"
  msgstr ""
  
- #: ../admin/inst_upgrade.php:178
 -#: admin/inst_upgrade.php:174
++#: admin/inst_upgrade.php:178
  msgid "Save database and perform upgrade"
  msgstr ""
  
- #: ../admin/payment_terms.php:16
- #: ../reporting/includes/doctext.inc:41
- #: ../sales/view/view_invoice.php:76
- #: ../sales/view/view_sales_order.php:82
- #: ../sales/view/view_sales_order.php:90
- #: ../sales/view/view_sales_order.php.orig:78
 -#: admin/payment_terms.php:16 reporting/includes/doctext.inc:242
 -#: sales/view/view_invoice.php:74 sales/view/view_sales_order.php:78
++#: admin/payment_terms.php:16 reporting/includes/doctext.inc:41
++#: sales/view/view_invoice.php:76 sales/view/view_sales_order.php:82
++#: sales/view/view_sales_order.php:90
  msgid "Payment Terms"
  msgstr ""
  
@@@ -1892,53 -1586,32 +1582,32 @@@ msgstr "
  msgid "Selected payment terms have been deleted"
  msgstr ""
  
- #: ../admin/payment_terms.php:127
- #: ../dimensions/dimension_entry.php:275
- #: ../dimensions/inquiry/search_dimensions.php:75
- #: ../dimensions/inquiry/search_dimensions.php:130
- #: ../dimensions/view/view_dimension.php:54
- #: ../gl/bank_account_reconcile.php:231
- #: ../gl/inquiry/bank_inquiry.php:70
- #: ../gl/inquiry/gl_account_inquiry.php:126
- #: ../gl/inquiry/journal_inquiry.php:129
- #: ../gl/inquiry/tax_inquiry.php:82
- #: ../gl/manage/bank_accounts.php:109
- #: ../gl/manage/gl_quick_entries.php:186
- #: ../gl/view/accrual_trans.php:52
- #: ../gl/includes/ui/gl_bank_ui.inc:92
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:83
- #: ../includes/ui/ui_view.inc:488
- #: ../inventory/inquiry/stock_movements.php:77
- #: ../inventory/inquiry/stock_movements.php.orig:79
- #: ../inventory/manage/item_categories.php:98
- #: ../manufacturing/search_work_orders.php:161
- #: ../manufacturing/view/wo_costs_view.php:46
- #: ../manufacturing/includes/manufacturing_ui.inc:236
- #: ../manufacturing/includes/manufacturing_ui.inc:276
- #: ../manufacturing/includes/manufacturing_ui.inc:280
- #: ../manufacturing/includes/manufacturing_ui.inc:331
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:125
- #: ../purchasing/inquiry/supplier_inquiry.php:173
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:170
- #: ../reporting/rep102.php:132
- #: ../reporting/rep202.php:137
- #: ../reporting/rep501.php:85
- #: ../reporting/rep601.php:76
- #: ../reporting/rep602.php:80
- #: ../reporting/rep702.php:58
- #: ../reporting/rep704.php:79
- #: ../reporting/rep704.php:82
- #: ../reporting/rep704.php:85
- #: ../reporting/rep709.php:105
- #: ../reporting/rep710.php:76
- #: ../reporting/rep710.php:84
- #: ../reporting/reports_main.php:252
- #: ../reporting/reports_main.php:399
- #: ../reporting/includes/doctext.inc:162
- #: ../reporting/includes/doctext.inc:203
- #: ../reporting/includes/doctext.inc:222
- #: ../sales/inquiry/customer_allocation_inquiry.php:144
- #: ../sales/inquiry/customer_inquiry.php:200
+ #: admin/payment_terms.php:127 dimensions/dimension_entry.php:275
+ #: dimensions/inquiry/search_dimensions.php:75
+ #: dimensions/inquiry/search_dimensions.php:130
 -#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:233
++#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:231
+ #: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
+ #: gl/inquiry/journal_inquiry.php:129 gl/inquiry/tax_inquiry.php:82
 -#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
 -#: gl/manage/gl_quick_entries.php:186 gl/view/accrual_trans.php:52
 -#: gl/includes/ui/gl_bank_ui.inc:92 gl/includes/ui/gl_bank_ui.inc.orig:80
 -#: includes/ui/ui_view.inc:489 inventory/inquiry/stock_movements.php:81
++#: gl/manage/bank_accounts.php:109 gl/manage/gl_quick_entries.php:186
++#: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:92
++#: includes/ui/ui_view.inc:489 inventory/inquiry/stock_movements.php:78
+ #: inventory/manage/item_categories.php:98
+ #: manufacturing/search_work_orders.php:161
++#: manufacturing/view/wo_costs_view.php:46
+ #: manufacturing/includes/manufacturing_ui.inc:236
+ #: manufacturing/includes/manufacturing_ui.inc:276
+ #: manufacturing/includes/manufacturing_ui.inc:280
+ #: manufacturing/includes/manufacturing_ui.inc:331
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:126
 -#: purchasing/inquiry/supplier_inquiry.php:168 reporting/rep102.php:134
++#: purchasing/inquiry/supplier_allocation_inquiry.php:125
++#: purchasing/inquiry/supplier_inquiry.php:173 reporting/rep102.php:134
+ #: reporting/rep202.php:139 reporting/rep501.php:87 reporting/rep601.php:79
 -#: reporting/rep702.php:60 reporting/rep704.php:83 reporting/rep704.php:86
 -#: reporting/rep704.php:89 reporting/rep709.php:107 reporting/rep710.php:78
 -#: reporting/rep710.php:86 reporting/reports_main.php:308
 -#: reporting/reports_main.php:472 reporting/includes/doctext.inc:140
 -#: reporting/includes/doctext.inc:181 reporting/includes/doctext.inc:200
++#: reporting/rep602.php:80 reporting/rep702.php:60 reporting/rep704.php:83
++#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep709.php:107
++#: reporting/rep710.php:78 reporting/rep710.php:86
++#: reporting/includes/doctext.inc:162 reporting/includes/doctext.inc:203
++#: reporting/includes/doctext.inc:222
+ #: sales/inquiry/customer_allocation_inquiry.php:143
 -#: sales/inquiry/customer_inquiry.php:224
++#: sales/inquiry/customer_inquiry.php:200
  msgid "Type"
  msgstr ""
  
@@@ -1946,8 -1619,7 +1615,7 @@@
  msgid "Due After/Days"
  msgstr ""
  
- #: ../admin/payment_terms.php:140
- #: ../admin/void_transaction.php:125
 -#: admin/payment_terms.php:140
++#: admin/payment_terms.php:140 admin/void_transaction.php:125
  msgid "N/A"
  msgstr ""
  
@@@ -2133,14 -1803,9 +1799,8 @@@ msgstr "
  msgid "Role:"
  msgstr ""
  
- #: ../admin/security_roles.php:180
- #: ../gl/manage/gl_accounts.php:198
- #: ../inventory/manage/items.php:440
- #: ../inventory/manage/items.php.orig:433
- #: ../purchasing/manage/suppliers.php:291
- #: ../purchasing/manage/suppliers.php.orig:294
- #: ../sales/manage/customers.php:326
- #: ../sales/manage/sav.customers.php:324
 -#: admin/security_roles.php:180 gl/manage/gl_accounts.php:199
 -#: gl/manage/gl_accounts.php.orig:198 inventory/manage/items.php:433
 -#: purchasing/manage/suppliers.php:289 sales/manage/customers.php:326
++#: admin/security_roles.php:180 gl/manage/gl_accounts.php:198
++#: sales/manage/customers.php:326
  msgid "Show inactive:"
  msgstr ""
  
@@@ -2181,40 -1845,29 +1840,26 @@@ msgstr "
  msgid "Delete This Role"
  msgstr ""
  
- #: ../admin/security_roles.php:249
- #: ../admin/void_transaction.php:229
- #: ../gl/manage/gl_quick_entries.php:61
- #: ../gl/includes/ui/gl_bank_ui.inc:277
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:251
- #: ../gl/includes/ui/gl_journal_ui.inc:259
- #: ../includes/ui/simple_crud_class.inc:58
- #: ../includes/ui/simple_crud_class.inc:231
- #: ../includes/ui/ui_controls.inc:594
- #: ../includes/ui/ui_input.inc:211
- #: ../inventory/includes/item_adjustments_ui.inc:159
- #: ../inventory/includes/stock_transfers_ui.inc:139
- #: ../inventory/manage/items.php:423
- #: ../inventory/manage/items.php.orig:416
- #: ../manufacturing/includes/work_order_issue_ui.inc:133
- #: ../purchasing/includes/ui/po_ui.inc.orig:459
- #: ../sales/includes/ui/sales_credit_ui.inc:295
- #: ../sales/includes/ui/sales_order_ui.inc.orig:557
+ #: admin/security_roles.php:249 admin/void_transaction.php:229
+ #: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:278
 -#: gl/includes/ui/gl_bank_ui.inc.orig:259 gl/includes/ui/gl_journal_ui.inc:223
 -#: includes/ui/radio.ui_input.inc:209 includes/ui/simple_crud_class.inc:58
 -#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_controls.inc:587
 -#: includes/ui/ui_input.inc:210 inventory/includes/item_adjustments_ui.inc:159
++#: gl/includes/ui/gl_journal_ui.inc:259 includes/ui/simple_crud_class.inc:58
++#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_controls.inc:594
++#: includes/ui/ui_input.inc:211 inventory/includes/item_adjustments_ui.inc:159
+ #: inventory/includes/stock_transfers_ui.inc:139
 -#: inventory/manage/items.php:416
+ #: manufacturing/includes/work_order_issue_ui.inc:133
 -#: purchasing/includes/ui/po_ui.inc:443
+ #: sales/includes/ui/sales_credit_ui.inc:295
 -#: sales/includes/ui/sales_order_ui.inc:562
++#: sales/includes/ui/sales_order_ui.inc:564
  msgid "Cancel"
  msgstr ""
  
- #: ../admin/security_roles.php:249
- #: ../inventory/manage/items.php:423
- #: ../inventory/manage/items.php.orig:416
 -#: admin/security_roles.php:249 inventory/manage/items.php:416
++#: admin/security_roles.php:249
  msgid "Cancel Edition"
  msgstr ""
  
- #: ../admin/shipping_companies.php:15
- #: ../sales/customer_credit_invoice.php:254
- #: ../sales/customer_delivery.php.orig:381
- #: ../sales/customer_invoice.php:488
- #: ../sales/view/view_credit.php:74
- #: ../sales/view/view_dispatch.php:92
- #: ../sales/view/view_invoice.php:92
+ #: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:254
 -#: sales/customer_delivery.php:368 sales/customer_invoice.php:422
++#: sales/customer_delivery.php:382 sales/customer_invoice.php:488
+ #: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92
 -#: sales/view/view_invoice.php:91
++#: sales/view/view_invoice.php:92
  msgid "Shipping Company"
  msgstr ""
  
@@@ -2264,30 -1915,20 +1907,18 @@@ msgstr "
  msgid "Address"
  msgstr ""
  
- #: ../admin/shipping_companies.php:134
- #: ../gl/manage/gl_account_types.php:188
- #: ../gl/includes/ui/gl_bank_ui.inc:56
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:58
- #: ../inventory/manage/items.php:306
- #: ../inventory/manage/items.php.orig:299
- #: ../manufacturing/manage/work_centres.php:137
+ #: admin/shipping_companies.php:134 gl/manage/gl_account_types.php:188
 -#: gl/includes/ui/gl_bank_ui.inc:56 gl/includes/ui/gl_bank_ui.inc.orig:55
 -#: inventory/manage/items.php:299 manufacturing/manage/work_centres.php:137
++#: gl/includes/ui/gl_bank_ui.inc:56 manufacturing/manage/work_centres.php:137
  msgid "Name:"
  msgstr ""
  
- #: ../admin/shipping_companies.php:136
- #: ../purchasing/manage/suppliers.php.orig:113
- #: ../sales/manage/customer_branches.php:261
 -#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:158
 -#: sales/manage/customer_branches.php:259
++#: admin/shipping_companies.php:136 sales/manage/customer_branches.php:261
  msgid "Contact Person:"
  msgstr ""
  
- #: ../admin/shipping_companies.php:140
- #: ../includes/ui/contacts_view.inc:103
- #: ../inventory/manage/locations.php:205
- #: ../purchasing/manage/suppliers.php:136
- #: ../purchasing/manage/suppliers.php.orig:115
- #: ../sales/manage/customer_branches.php:263
- #: ../sales/manage/customers.php:253
- #: ../sales/manage/sav.customers.php:253
+ #: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:103
 -#: inventory/manage/locations.php:205 purchasing/manage/suppliers.php:130
 -#: sales/manage/customer_branches.php:261 sales/manage/customers.php:253
++#: inventory/manage/locations.php:205 purchasing/manage/suppliers.php:136
++#: sales/manage/customer_branches.php:263 sales/manage/customers.php:253
  msgid "Secondary Phone Number:"
  msgstr ""
  
@@@ -2299,16 -1940,11 +1930,7 @@@ msgstr "
  msgid "Unspecified tag type"
  msgstr ""
  
- #: ../admin/tags.php:40
- #: ../reporting/reports_main.php:273
- #: ../reporting/reports_main.php:281
- #: ../reporting/reports_main.php:292
- #: ../reporting/reports_main.php:320
- #: ../reporting/reports_main.php:327
- #: ../reporting/reports_main.php:337
- #: ../reporting/reports_main.php:362
- #: ../reporting/reports_main.php:368
- #: ../reporting/reports_main.php:377
 -#: admin/tags.php:40 reporting/reports_main.php:331
 -#: reporting/reports_main.php:340 reporting/reports_main.php:352
 -#: reporting/reports_main.php:383 reporting/reports_main.php:391
 -#: reporting/reports_main.php:402 reporting/reports_main.php:430
 -#: reporting/reports_main.php:437 reporting/reports_main.php:447
++#: admin/tags.php:40
  msgid "Account Tags"
  msgstr ""
  
@@@ -2392,10 -2023,8 +2009,8 @@@ msgstr "
  msgid "Phone"
  msgstr ""
  
- #: ../admin/users.php:115
- #: ../sales/manage/customer_branches.php:302
- #: ../sales/view/view_sales_order.php:96
- #: ../sales/view/view_sales_order.php.orig:83
 -#: admin/users.php:115 sales/manage/customer_branches.php:300
 -#: sales/view/view_sales_order.php:83
++#: admin/users.php:115 sales/manage/customer_branches.php:302
++#: sales/view/view_sales_order.php:96
  msgid "E-mail"
  msgstr ""
  
@@@ -2435,16 -2064,12 +2050,12 @@@ msgstr "
  msgid "View or Print Transactions"
  msgstr ""
  
- #: ../admin/view_print_transaction.php:43
- #: ../admin/view_print_transaction.php:45
- #: ../admin/view_print_transaction.php:129
- #: ../includes/ui/ui_controls.inc:195
- #: ../purchasing/inquiry/po_search_completed.php:112
- #: ../purchasing/inquiry/po_search_completed.php.orig:111
- #: ../purchasing/inquiry/po_search.php:93
- #: ../sales/inquiry/customer_inquiry.php:185
- #: ../sales/inquiry/sales_deliveries_view.php:160
- #: ../sales/inquiry/sales_orders_view.php:125
+ #: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
 -#: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:188
 -#: purchasing/inquiry/po_search_completed.php:113
 -#: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:209
++#: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:195
++#: purchasing/inquiry/po_search_completed.php:112
++#: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:185
+ #: sales/inquiry/sales_deliveries_view.php:160
 -#: sales/inquiry/sales_orders_view.php:119
++#: sales/inquiry/sales_orders_view.php:125
  msgid "Print"
  msgstr ""
  
@@@ -2462,22 -2085,18 +2071,17 @@@ msgstr "
  msgid "to #:"
  msgstr ""
  
- #: ../admin/view_print_transaction.php:83
- #: ../admin/void_transaction.php:170
- #: ../dimensions/inquiry/search_dimensions.php:88
- #: ../gl/inquiry/journal_inquiry.php:53
- #: ../manufacturing/search_work_orders.php:78
- #: ../purchasing/includes/ui/invoice_ui.inc:474
- #: ../purchasing/inquiry/po_search_completed.php:74
- #: ../purchasing/inquiry/po_search_completed.php.orig:75
- #: ../purchasing/inquiry/po_search.php:76
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
- #: ../purchasing/inquiry/supplier_inquiry.php:55
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:55
- #: ../sales/inquiry/customer_allocation_inquiry.php:51
- #: ../sales/inquiry/customer_inquiry.php:54
- #: ../sales/inquiry/sales_deliveries_view.php:116
- #: ../sales/inquiry/sales_orders_view.php:269
+ #: admin/view_print_transaction.php:83 admin/void_transaction.php:170
+ #: dimensions/inquiry/search_dimensions.php:88
+ #: gl/inquiry/journal_inquiry.php:53 manufacturing/search_work_orders.php:78
 -#: purchasing/includes/ui/invoice_ui.inc:453
 -#: purchasing/inquiry/po_search_completed.php:77
++#: purchasing/includes/ui/invoice_ui.inc:474
++#: purchasing/inquiry/po_search_completed.php:74
+ #: purchasing/inquiry/po_search.php:76
+ #: purchasing/inquiry/supplier_allocation_inquiry.php:57
 -#: purchasing/inquiry/supplier_inquiry.php:58
++#: purchasing/inquiry/supplier_inquiry.php:55
+ #: sales/inquiry/customer_allocation_inquiry.php:51
 -#: sales/inquiry/customer_inquiry.php:58
++#: sales/inquiry/customer_inquiry.php:54
+ #: sales/inquiry/sales_deliveries_view.php:116
 -#: sales/inquiry/sales_orders_view.php:247
  msgid "Search"
  msgstr ""
  
@@@ -2493,138 -2112,87 +2097,83 @@@ msgid "
  "zero."
  msgstr ""
  
- #: ../admin/view_print_transaction.php:127
- #: ../admin/void_transaction.php:182
- #: ../dimensions/inquiry/search_dimensions.php:128
- #: ../dimensions/view/view_dimension.php:54
- #: ../gl/bank_account_reconcile.php:233
- #: ../gl/inquiry/bank_inquiry.php:70
- #: ../gl/inquiry/journal_inquiry.php:131
- #: ../gl/view/bank_transfer_view.php:86
- #: ../gl/view/gl_deposit_view.php:75
- #: ../gl/view/gl_payment_view.php:73
- #: ../gl/view/gl_trans_view.php:35
- #: ../includes/ui/contacts_view.inc:41
- #: ../inventory/inquiry/stock_movements.php:77
- #: ../inventory/inquiry/stock_movements.php.orig:79
- #: ../inventory/view/view_adjustment.php:44
- #: ../inventory/view/view_transfer.php:44
- #: ../manufacturing/search_work_orders.php:160
- #: ../manufacturing/view/wo_issue_view.php:43
- #: ../manufacturing/view/wo_production_view.php:44
- #: ../manufacturing/includes/manufacturing_ui.inc:157
- #: ../manufacturing/includes/manufacturing_ui.inc:200
- #: ../manufacturing/includes/manufacturing_ui.inc:276
- #: ../manufacturing/includes/manufacturing_ui.inc:280
- #: ../manufacturing/includes/manufacturing_ui.inc:331
- #: ../purchasing/includes/ui/grn_ui.inc:36
- #: ../purchasing/includes/ui/grn_ui.inc:53
- #: ../purchasing/includes/ui/po_ui.inc:321
- #: ../purchasing/includes/ui/po_ui.inc.orig:321
- #: ../purchasing/view/view_po.php:115
- #: ../purchasing/view/view_supp_credit.php:43
- #: ../purchasing/view/view_supp_invoice.php:47
- #: ../purchasing/view/view_supp_payment.php:73
- #: ../purchasing/inquiry/po_search_completed.php:121
- #: ../purchasing/inquiry/po_search_completed.php.orig:120
- #: ../purchasing/inquiry/po_search.php:131
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:127
- #: ../purchasing/inquiry/supplier_inquiry.php:175
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:172
- #: ../purchasing/allocations/supplier_allocation_main.php:96
- #: ../reporting/rep501.php:85
- #: ../reporting/rep601.php:76
- #: ../reporting/rep602.php:80
- #: ../reporting/rep702.php:51
- #: ../reporting/includes/doctext.inc:221
- #: ../sales/customer_credit_invoice.php:245
- #: ../sales/customer_credit_invoice.php:247
- #: ../sales/customer_delivery.php.orig:361
- #: ../sales/customer_delivery.php.orig:363
- #: ../sales/customer_invoice.php:460
- #: ../sales/customer_invoice.php:462
- #: ../sales/allocations/customer_allocation_main.php:95
- #: ../sales/view/view_dispatch.php:85
- #: ../sales/view/view_invoice.php:85
- #: ../sales/view/view_receipt.php:50
- #: ../sales/view/view_sales_order.php:94
- #: ../sales/view/view_sales_order.php.orig:81
- #: ../sales/inquiry/customer_allocation_inquiry.php:146
- #: ../sales/inquiry/customer_inquiry.php:203
- #: ../sales/inquiry/sales_deliveries_view.php:184
- #: ../sales/includes/ui/sales_credit_ui.inc:85
- #: ../sales/includes/ui/sales_credit_ui.inc:87
- #: ../sales/includes/ui/sales_order_ui.inc.orig:373
+ #: admin/view_print_transaction.php:127 admin/void_transaction.php:182
+ #: dimensions/inquiry/search_dimensions.php:128
 -#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:235
++#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:233
+ #: gl/inquiry/bank_inquiry.php:70 gl/inquiry/journal_inquiry.php:131
+ #: gl/view/bank_transfer_view.php:86 gl/view/gl_deposit_view.php:75
+ #: gl/view/gl_payment_view.php:73 gl/view/gl_trans_view.php:35
 -#: includes/ui/contacts_view.inc:41 inventory/inquiry/stock_movements.php:81
++#: includes/ui/contacts_view.inc:41 inventory/inquiry/stock_movements.php:78
+ #: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:44
+ #: manufacturing/search_work_orders.php:160
+ #: manufacturing/view/wo_issue_view.php:43
+ #: manufacturing/view/wo_production_view.php:44
+ #: manufacturing/includes/manufacturing_ui.inc:157
+ #: manufacturing/includes/manufacturing_ui.inc:200
+ #: manufacturing/includes/manufacturing_ui.inc:276
+ #: manufacturing/includes/manufacturing_ui.inc:280
+ #: manufacturing/includes/manufacturing_ui.inc:331
+ #: purchasing/includes/ui/grn_ui.inc:36 purchasing/includes/ui/grn_ui.inc:53
 -#: purchasing/includes/ui/po_ui.inc:313 purchasing/view/view_po.php:115
 -#: purchasing/view/view_supp_credit.php:43
 -#: purchasing/view/view_supp_invoice.php:46
++#: purchasing/view/view_po.php:115 purchasing/view/view_supp_credit.php:43
++#: purchasing/view/view_supp_invoice.php:47
+ #: purchasing/view/view_supp_payment.php:73
 -#: purchasing/inquiry/po_search_completed.php:122
++#: purchasing/inquiry/po_search_completed.php:121
+ #: purchasing/inquiry/po_search.php:131
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:128
 -#: purchasing/inquiry/supplier_inquiry.php:170
++#: purchasing/inquiry/supplier_allocation_inquiry.php:127
++#: purchasing/inquiry/supplier_inquiry.php:175
+ #: purchasing/allocations/supplier_allocation_main.php:96
 -#: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep702.php:53
 -#: reporting/includes/doctext.inc:199 sales/customer_credit_invoice.php:245
 -#: sales/customer_credit_invoice.php:247 sales/customer_delivery.php:348
 -#: sales/customer_delivery.php:350 sales/customer_invoice.php:394
 -#: sales/customer_invoice.php:396
++#: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep602.php:80
++#: reporting/rep702.php:53 reporting/includes/doctext.inc:221
++#: sales/customer_credit_invoice.php:245 sales/customer_credit_invoice.php:247
++#: sales/customer_delivery.php:362 sales/customer_delivery.php:364
++#: sales/customer_invoice.php:460 sales/customer_invoice.php:462
+ #: sales/allocations/customer_allocation_main.php:95
 -#: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:84
 -#: sales/view/view_receipt.php:50 sales/view/view_sales_order.php:81
++#: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:85
++#: sales/view/view_receipt.php:50 sales/view/view_sales_order.php:94
+ #: sales/inquiry/customer_allocation_inquiry.php:145
 -#: sales/inquiry/customer_inquiry.php:227
++#: sales/inquiry/customer_inquiry.php:203
+ #: sales/inquiry/sales_deliveries_view.php:184
+ #: sales/includes/ui/sales_credit_ui.inc:85
+ #: sales/includes/ui/sales_credit_ui.inc:87
 -#: sales/includes/ui/sales_order_ui.inc:378
++#: sales/includes/ui/sales_order_ui.inc:380
  msgid "Reference"
  msgstr ""
  
- #: ../admin/view_print_transaction.php:128
- #: ../admin/void_transaction.php:183
- #: ../dimensions/inquiry/search_dimensions.php:131
- #: ../dimensions/view/view_dimension.php:54
- #: ../gl/accruals.php:94
- #: ../gl/accruals.php:199
- #: ../gl/bank_account_reconcile.php:234
- #: ../gl/inquiry/bank_inquiry.php:70
- #: ../gl/inquiry/gl_account_inquiry.php:126
- #: ../gl/inquiry/journal_inquiry.php:128
- #: ../gl/view/accrual_trans.php:52
- #: ../gl/view/bank_transfer_view.php:83
- #: ../gl/view/gl_deposit_view.php:68
- #: ../gl/view/gl_payment_view.php:66
- #: ../gl/view/gl_trans_view.php:36
- #: ../includes/ui/allocation_cart.inc:264
- #: ../includes/ui/ui_view.inc:488
- #: ../inventory/inquiry/stock_movements.php:77
- #: ../inventory/inquiry/stock_movements.php.orig:79
- #: ../inventory/view/view_adjustment.php:45
- #: ../inventory/view/view_transfer.php:47
- #: ../manufacturing/search_work_orders.php:166
- #: ../manufacturing/work_order_entry.php:419
- #: ../manufacturing/work_order_entry.php:425
- #: ../manufacturing/view/wo_costs_view.php:46
- #: ../manufacturing/view/wo_production_view.php:45
- #: ../manufacturing/includes/manufacturing_ui.inc:157
- #: ../manufacturing/includes/manufacturing_ui.inc:200
- #: ../manufacturing/includes/manufacturing_ui.inc:236
- #: ../manufacturing/includes/manufacturing_ui.inc:277
- #: ../manufacturing/includes/manufacturing_ui.inc:281
- #: ../manufacturing/includes/manufacturing_ui.inc:332
- #: ../purchasing/includes/ui/invoice_ui.inc:114
- #: ../purchasing/includes/ui/po_ui.inc:335
- #: ../purchasing/includes/ui/po_ui.inc.orig:335
- #: ../purchasing/view/view_po.php:140
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:130
- #: ../purchasing/inquiry/supplier_inquiry.php:178
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:175
- #: ../purchasing/allocations/supplier_allocation_main.php:97
- #: ../reporting/rep101.php:130
- #: ../reporting/rep107.php:192
- #: ../reporting/rep201.php:118
- #: ../reporting/rep501.php:85
- #: ../reporting/rep601.php:76
- #: ../reporting/rep602.php:80
- #: ../reporting/rep704.php:79
- #: ../reporting/rep704.php:82
- #: ../reporting/rep704.php:85
- #: ../reporting/rep709.php:109
- #: ../reporting/rep710.php:75
- #: ../reporting/includes/doctext.inc:167
- #: ../reporting/includes/doctext.inc:208
- #: ../reporting/includes/doctext.inc:246
- #: ../reporting/includes/header2.inc:135
- #: ../sales/customer_delivery.php.orig:391
- #: ../sales/customer_invoice.php:503
- #: ../sales/allocations/customer_allocation_main.php:96
- #: ../sales/view/view_credit.php:69
- #: ../sales/view/view_sales_order.php:109
- #: ../sales/view/view_sales_order.php:142
- #: ../sales/view/view_sales_order.php:179
- #: ../sales/view/view_sales_order.php.orig:96
- #: ../sales/view/view_sales_order.php.orig:129
- #: ../sales/view/view_sales_order.php.orig:161
- #: ../sales/inquiry/customer_allocation_inquiry.php:148
- #: ../sales/inquiry/customer_inquiry.php:204
+ #: admin/view_print_transaction.php:128 admin/void_transaction.php:183
+ #: dimensions/inquiry/search_dimensions.php:131
 -#: dimensions/view/view_dimension.php:55 gl/accruals.php:90
 -#: gl/accruals.php:195 gl/bank_account_reconcile.php:236
++#: dimensions/view/view_dimension.php:55 gl/accruals.php:94
++#: gl/accruals.php:199 gl/bank_account_reconcile.php:234
+ #: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
+ #: gl/inquiry/journal_inquiry.php:128 gl/view/accrual_trans.php:52
+ #: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68
+ #: gl/view/gl_payment_view.php:66 gl/view/gl_trans_view.php:36
 -#: includes/ui/allocation_cart.inc:263 includes/ui/ui_view.inc:489
 -#: inventory/inquiry/stock_movements.php:81
++#: includes/ui/allocation_cart.inc:264 includes/ui/ui_view.inc:489
++#: inventory/inquiry/stock_movements.php:80
+ #: inventory/view/view_adjustment.php:45 inventory/view/view_transfer.php:47
+ #: manufacturing/search_work_orders.php:166
 -#: manufacturing/work_order_entry.php:419
 -#: manufacturing/work_order_entry.php:425
++#: manufacturing/view/wo_costs_view.php:46
+ #: manufacturing/view/wo_production_view.php:45
+ #: manufacturing/includes/manufacturing_ui.inc:157
+ #: manufacturing/includes/manufacturing_ui.inc:200
+ #: manufacturing/includes/manufacturing_ui.inc:236
+ #: manufacturing/includes/manufacturing_ui.inc:277
+ #: manufacturing/includes/manufacturing_ui.inc:281
+ #: manufacturing/includes/manufacturing_ui.inc:332
 -#: purchasing/includes/ui/invoice_ui.inc:103
 -#: purchasing/includes/ui/po_ui.inc:327 purchasing/view/view_po.php:140
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:131
 -#: purchasing/inquiry/supplier_inquiry.php:173
++#: purchasing/includes/ui/invoice_ui.inc:114 purchasing/view/view_po.php:140
++#: purchasing/inquiry/supplier_allocation_inquiry.php:130
++#: purchasing/inquiry/supplier_inquiry.php:178
+ #: purchasing/allocations/supplier_allocation_main.php:97
 -#: reporting/rep101.php:132 reporting/rep201.php:120 reporting/rep306.php:141
 -#: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep704.php:83
 -#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep709.php:111
 -#: reporting/rep710.php:77 reporting/includes/doctext.inc:145
 -#: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:224
 -#: reporting/includes/header2.inc:135 sales/customer_delivery.php:378
 -#: sales/customer_invoice.php:432
++#: reporting/rep306.php:141 reporting/rep501.php:87 reporting/rep601.php:79
++#: reporting/rep602.php:80 reporting/rep704.php:83 reporting/rep704.php:86
++#: reporting/rep704.php:89 reporting/rep709.php:111 reporting/rep710.php:77
++#: reporting/includes/doctext.inc:167 reporting/includes/doctext.inc:208
++#: reporting/includes/doctext.inc:246 reporting/includes/header2.inc:135
++#: sales/customer_delivery.php:392 sales/customer_invoice.php:503
+ #: sales/allocations/customer_allocation_main.php:96
 -#: sales/view/view_credit.php:69 sales/view/view_sales_order.php:96
 -#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
++#: sales/view/view_credit.php:69 sales/view/view_sales_order.php:109
++#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
+ #: sales/inquiry/customer_allocation_inquiry.php:147
 -#: sales/inquiry/customer_inquiry.php:228
++#: sales/inquiry/customer_inquiry.php:204
  msgid "Date"
  msgstr ""
  
@@@ -2638,19 -2205,14 +2186,17 @@@ msgstr "
  msgid "Void a Transaction"
  msgstr ""
  
- #: ../admin/void_transaction.php:126
- #: ../admin/void_transaction.php:185
- #: ../includes/ui/ui_input.inc:138
- #: ../includes/ui/ui_input.inc:282
- #: ../includes/ui/ui_lists.inc:20
+ #: admin/void_transaction.php:126 admin/void_transaction.php:185
 -#: includes/ui/radio.ui_input.inc:136 includes/ui/radio.ui_input.inc:280
 -#: includes/ui/sav.ui_lists.inc:20 includes/ui/ui_input.inc:137
 -#: includes/ui/ui_input.inc:281 includes/ui/ui_lists.inc:20
++#: includes/ui/ui_input.inc:138 includes/ui/ui_input.inc:282
++#: includes/ui/ui_lists.inc:20
  msgid "Select"
  msgstr ""
  
- #: ../admin/void_transaction.php:157
++#: admin/void_transaction.php:157
 +msgid "Transaction Type:"
 +msgstr ""
 +
- #: ../admin/void_transaction.php:204
+ #: admin/void_transaction.php:204
  msgid "Transaction #:"
  msgstr ""
  
@@@ -2658,22 -2220,14 +2204,14 @@@
  msgid "Voiding Date:"
  msgstr ""
  
- #: ../admin/void_transaction.php:208
- #: ../dimensions/dimension_entry.php:283
- #: ../gl/bank_transfer.php:98
- #: ../gl/inquiry/journal_inquiry.php:56
- #: ../gl/manage/revaluate_currencies.php:106
- #: ../includes/ui/ui_view.inc:308
- #: ../manufacturing/work_order_add_finished.php:210
- #: ../manufacturing/work_order_costs.php:146
- #: ../manufacturing/work_order_entry.php:451
- #: ../manufacturing/work_order_release.php:100
- #: ../purchasing/includes/ui/invoice_ui.inc:180
- #: ../purchasing/includes/ui/po_ui.inc.orig:492
- #: ../purchasing/po_entry_items.php.orig:558
- #: ../purchasing/supplier_payment.php:316
- #: ../sales/customer_invoice.php:680
- #: ../sales/customer_payments.php:413
+ #: admin/void_transaction.php:208 dimensions/dimension_entry.php:283
+ #: gl/bank_transfer.php:98 gl/inquiry/journal_inquiry.php:56
+ #: gl/manage/revaluate_currencies.php:106 includes/ui/ui_view.inc:308
+ #: manufacturing/work_order_add_finished.php:210
 -#: manufacturing/work_order_entry.php:451
++#: manufacturing/work_order_costs.php:146
+ #: manufacturing/work_order_release.php:103
 -#: purchasing/includes/ui/invoice_ui.inc:161 purchasing/po_entry_items.php:523
 -#: purchasing/supplier_payment.php:317 sales/customer_payments.php:398
++#: purchasing/includes/ui/invoice_ui.inc:180 purchasing/po_entry_items.php:563
++#: purchasing/supplier_payment.php:321 sales/customer_invoice.php:680
  msgid "Memo:"
  msgstr ""
  
@@@ -2693,8 -2245,7 +2229,7 @@@ msgid "
  "undone."
  msgstr ""
  
- #: ../admin/void_transaction.php:228
- #: ../includes/ui/ui_controls.inc:593
 -#: admin/void_transaction.php:228 includes/ui/ui_controls.inc:586
++#: admin/void_transaction.php:228 includes/ui/ui_controls.inc:593
  msgid "Proceed"
  msgstr ""
  
@@@ -2702,27 -2253,28 +2237,19 @@@
  msgid "The selected transaction was closed for edition and cannot be voided."
  msgstr ""
  
- #: ../admin/void_transaction.php:248
- #: ../gl/accruals.php:32
- #: ../gl/bank_transfer.php:115
- #: ../gl/gl_journal.php:161
- #: ../gl/manage/close_period.php:34
- #: ../gl/manage/close_period.php.orig:34
- #: ../gl/manage/exchange_rates.php:33
- #: ../gl/manage/revaluate_currencies.php:53
- #: ../manufacturing/work_order_add_finished.php:98
- #: ../manufacturing/work_order_costs.php:80
- #: ../purchasing/po_receive_items.php:174
- #: ../purchasing/supplier_payment.php:174
- #: ../sales/customer_credit_invoice.php:91
- #: ../sales/sales_order_entry.php:359
- #: ../sales/manage/recurrent_invoices.php:41
- #: ../sales/manage/recurrent_invoices.php:46
- #: ../sales/manage/recurrent_invoices.php:51
+ #: admin/void_transaction.php:248 gl/accruals.php:32 gl/bank_transfer.php:115
 -#: gl/gl_journal.php:156 gl/manage/exchange_rates.php:33
 -#: gl/manage/revaluate_currencies.php:53
++#: gl/gl_journal.php:161 gl/manage/close_period.php:34
++#: gl/manage/exchange_rates.php:33 gl/manage/revaluate_currencies.php:53
+ #: manufacturing/work_order_add_finished.php:98
 -#: manufacturing/work_order_costs.php:83 purchasing/po_receive_items.php:174
++#: manufacturing/work_order_costs.php:80 purchasing/po_receive_items.php:174
+ #: purchasing/supplier_payment.php:175 sales/customer_credit_invoice.php:91
 -#: sales/sales_order_entry.php:349 sales/manage/recurrent_invoices.php:41
++#: sales/sales_order_entry.php:359 sales/manage/recurrent_invoices.php:41
+ #: sales/manage/recurrent_invoices.php:46
+ #: sales/manage/recurrent_invoices.php:51
  msgid "The entered date is invalid."
  msgstr ""
  
- #: ../admin/void_transaction.php:254
 -#: admin/void_transaction.php:254 gl/accruals.php:38 gl/bank_transfer.php:121
 -#: gl/gl_bank.php:267 gl/gl_journal.php:162
 -#: gl/manage/revaluate_currencies.php:59 inventory/adjustments.php:114
 -#: inventory/transfers.php:109 manufacturing/work_order_add_finished.php:104
 -#: manufacturing/work_order_costs.php:89
 -#: manufacturing/work_order_entry.php:160
 -#: manufacturing/work_order_issue.php:83 purchasing/supplier_credit.php:176
 -#: purchasing/supplier_invoice.php:174 purchasing/supplier_payment.php:181
 -#: sales/create_recurrent_invoices.php:121 sales/credit_note_entry.php:157
 -#: sales/customer_credit_invoice.php:95 sales/customer_payments.php:151
++#: admin/void_transaction.php:254
  msgid "The entered date is not in fiscal year."
  msgstr ""
  
@@@ -2756,10 -2300,8 +2275,7 @@@ msgstr "
  msgid "Closing Year"
  msgstr ""
  
- #: ../admin/db/fiscalyears_db.inc:214
- #: ../reporting/rep101.php:175
- #: ../reporting/rep201.php:167
- #: ../reporting/rep706.php:181
 -#: admin/db/fiscalyears_db.inc:214 reporting/rep101.php:179
 -#: reporting/rep201.php:171 reporting/rep706.php:185
++#: admin/db/fiscalyears_db.inc:214 reporting/rep706.php:185
  msgid "Open Balance"
  msgstr ""
  
@@@ -2794,13 -2336,7 +2310,13 @@@ msgstr "
  msgid "The language files folder "
  msgstr ""
  
- #: ../admin/db/maintenance_db.inc:389
+ #: admin/db/maintenance_db.inc:389
 +msgid ""
 +"This is new format backup file which cannot be restored on database not "
 +"migrated to utf8."
 +msgstr ""
 +
- #: ../admin/db/maintenance_db.inc:471
++#: admin/db/maintenance_db.inc:471
  #, php-format
  msgid "SQL script execution failed in line %d: %s"
  msgstr ""
@@@ -2813,8 -2349,10 +2329,7 @@@ msgstr "
  msgid "users online"
  msgstr ""
  
- #: ../admin/db/voiding_db.inc:114
- #: ../sales/includes/db/sales_invoice_db.inc.orig:249
+ #: admin/db/voiding_db.inc:114
 -#: manufacturing/includes/db/work_orders_db.inc:446
 -#: manufacturing/includes/db/work_orders_db.inc:462
 -#: sales/includes/db/sales_invoice_db.inc:206
  msgid "Voided."
  msgstr ""
  
@@@ -2872,86 -2406,76 +2383,80 @@@ msgstr "
  msgid "Customer &Payments"
  msgstr ""
  
- #: ../applications/customers.php:42
+ #: applications/customers.php:42
 -msgid "Customer &Credit Notes"
 +msgid "Invoice &Prepaid Orders"
  msgstr ""
  
- #: ../applications/customers.php:44
+ #: applications/customers.php:44
 +msgid "Customer &Credit Notes"
 +msgstr ""
 +
- #: ../applications/customers.php:46
++#: applications/customers.php:46
  msgid "&Allocate Customer Payments or Credit Notes"
  msgstr ""
  
- #: ../applications/customers.php:49
- #: ../applications/dimensions.php:27
- #: ../applications/generalledger.php:34
- #: ../applications/inventory.php:24
- #: ../applications/manufacturing.php:24
- #: ../applications/suppliers.php:38
 -#: applications/customers.php:47 applications/dimensions.php:27
++#: applications/customers.php:49 applications/dimensions.php:27
+ #: applications/generalledger.php:34 applications/inventory.php:24
+ #: applications/manufacturing.php:24 applications/suppliers.php:38
  msgid "Inquiries and Reports"
  msgstr ""
  
- #: ../applications/customers.php:50
 -#: applications/customers.php:48
++#: applications/customers.php:50
  msgid "Sales Quotation I&nquiry"
  msgstr ""
  
- #: ../applications/customers.php:52
 -#: applications/customers.php:50
++#: applications/customers.php:52
  msgid "Sales Order &Inquiry"
  msgstr ""
  
- #: ../applications/customers.php:54
 -#: applications/customers.php:52
++#: applications/customers.php:54
  msgid "Customer Transaction &Inquiry"
  msgstr ""
  
- #: ../applications/customers.php:56
 -#: applications/customers.php:55
++#: applications/customers.php:56
  msgid "Customer Allocation &Inquiry"
  msgstr ""
  
- #: ../applications/customers.php:59
 -#: applications/customers.php:58
++#: applications/customers.php:59
  msgid "Customer and Sales &Reports"
  msgstr ""
  
- #: ../applications/customers.php:62
- #: ../applications/dimensions.php:34
- #: ../applications/generalledger.php:55
- #: ../applications/inventory.php:32
- #: ../applications/manufacturing.php:34
- #: ../applications/setup.php:54
- #: ../applications/suppliers.php:49
 -#: applications/customers.php:61 applications/dimensions.php:34
++#: applications/customers.php:62 applications/dimensions.php:34
+ #: applications/generalledger.php:55 applications/inventory.php:32
+ #: applications/manufacturing.php:34 applications/setup.php:54
 -#: applications/suppliers.php:50
++#: applications/suppliers.php:49
  msgid "Maintenance"
  msgstr ""
  
- #: ../applications/customers.php:63
 -#: applications/customers.php:62
++#: applications/customers.php:63
  msgid "Add and Manage &Customers"
  msgstr ""
  
- #: ../applications/customers.php:65
 -#: applications/customers.php:64
++#: applications/customers.php:65
  msgid "Customer &Branches"
  msgstr ""
  
- #: ../applications/customers.php:67
 -#: applications/customers.php:66
++#: applications/customers.php:67
  msgid "Sales &Groups"
  msgstr ""
  
- #: ../applications/customers.php:69
 -#: applications/customers.php:68
++#: applications/customers.php:69
  msgid "Recurrent &Invoices"
  msgstr ""
  
- #: ../applications/customers.php:71
 -#: applications/customers.php:70
++#: applications/customers.php:71
  msgid "Sales T&ypes"
  msgstr ""
  
- #: ../applications/customers.php:73
 -#: applications/customers.php:72
++#: applications/customers.php:73
  msgid "Sales &Persons"
  msgstr ""
  
- #: ../applications/customers.php:75
 -#: applications/customers.php:74
++#: applications/customers.php:75
  msgid "Sales &Areas"
  msgstr ""
  
- #: ../applications/customers.php:77
 -#: applications/customers.php:76
++#: applications/customers.php:77
  msgid "Credit &Status Setup"
  msgstr ""
  
@@@ -3027,10 -2551,8 +2532,7 @@@ msgstr "
  msgid "Ta&x Inquiry"
  msgstr ""
  
- #: ../applications/generalledger.php:44
- #: ../reporting/reports_main.php:297
- #: ../reporting/reports_main.php:342
- #: ../reporting/reports_main.php:382
 -#: applications/generalledger.php:44 reporting/reports_main.php:358
 -#: reporting/reports_main.php:408 reporting/reports_main.php:453
++#: applications/generalledger.php:44
  msgid "Trial &Balance"
  msgstr ""
  
@@@ -3082,11 -2604,7 +2584,11 @@@ msgstr "
  msgid "GL Account &Classes"
  msgstr ""
  
- #: ../applications/generalledger.php:74
 -#: applications/generalledger.php:75
++#: applications/generalledger.php:74
 +msgid "&Closing GL Transactions"
 +msgstr ""
 +
- #: ../applications/generalledger.php:76
++#: applications/generalledger.php:76
  msgid "&Revaluation of Currency Accounts"
  msgstr ""
  
@@@ -3142,7 -2660,7 +2644,7 @@@ msgstr "
  msgid "&Units of Measure"
  msgstr ""
  
- #: ../applications/inventory.php:47
 -#: applications/inventory.php:47 inventory/manage/items.php:458
++#: applications/inventory.php:47
  msgid "&Reorder Levels"
  msgstr ""
  
@@@ -3158,7 -2676,7 +2660,7 @@@ msgstr "
  msgid "Purchasing &Pricing"
  msgstr ""
  
- #: ../applications/inventory.php:55
 -#: applications/inventory.php:55 inventory/manage/items.php:457
++#: applications/inventory.php:55
  msgid "Standard &Costs"
  msgstr ""
  
@@@ -3166,8 -2684,7 +2668,7 @@@
  msgid "&Manufacturing"
  msgstr ""
  
- #: ../applications/manufacturing.php:19
- #: ../sales/sales_order_entry.php:126
 -#: applications/manufacturing.php:19 sales/sales_order_entry.php:120
++#: applications/manufacturing.php:19 sales/sales_order_entry.php:126
  msgid "Work &Order Entry"
  msgstr ""
  
@@@ -3352,15 -2869,15 +2853,15 @@@ msgstr "
  msgid "Supplier Transaction &Inquiry"
  msgstr ""
  
- #: ../applications/suppliers.php:43
 -#: applications/suppliers.php:44
++#: applications/suppliers.php:43
  msgid "Supplier Allocation &Inquiry"
  msgstr ""
  
- #: ../applications/suppliers.php:46
 -#: applications/suppliers.php:47
++#: applications/suppliers.php:46
  msgid "Supplier and Purchasing &Reports"
  msgstr ""
  
- #: ../applications/suppliers.php:50
 -#: applications/suppliers.php:51
++#: applications/suppliers.php:50
  msgid "&Suppliers"
  msgstr ""
  
@@@ -3400,31 -2917,18 +2901,17 @@@ msgstr "
  msgid "The dimension reference must be entered."
  msgstr ""
  
- #: ../dimensions/dimension_entry.php:123
- #: ../gl/bank_transfer.php:176
- #: ../gl/gl_bank.php:258
- #: ../gl/gl_journal.php:181
- #: ../gl/manage/revaluate_currencies.php:72
- #: ../inventory/adjustments.php:103
- #: ../inventory/transfers.php:99
- #: ../manufacturing/work_order_add_finished.php:84
- #: ../manufacturing/work_order_entry.php:139
- #: ../manufacturing/work_order_issue.php:97
- #: ../purchasing/po_entry_items.php:368
- #: ../purchasing/po_entry_items.php.orig:365
- #: ../purchasing/po_receive_items.php:193
- #: ../purchasing/supplier_credit.php:173
- #: ../purchasing/supplier_invoice.php:179
- #: ../purchasing/supplier_payment.php:203
- #: ../sales/create_recurrent_invoices.php:55
- #: ../sales/credit_note_entry.php:181
- #: ../sales/customer_credit_invoice.php:205
- #: ../sales/customer_delivery.php.orig:184
- #: ../sales/customer_invoice.php:379
- #: ../sales/customer_payments.php:158
- #: ../sales/customer_payments.php:165
- #: ../sales/customer_payments.php:248
- #: ../sales/sales_order_entry.php:457
+ #: dimensions/dimension_entry.php:123 gl/bank_transfer.php:176
 -#: gl/gl_bank.php:255 gl/gl_journal.php:176
++#: gl/gl_bank.php:258 gl/gl_journal.php:181
+ #: gl/manage/revaluate_currencies.php:72 inventory/adjustments.php:101
+ #: inventory/transfers.php:97 manufacturing/work_order_add_finished.php:84
 -#: manufacturing/work_order_entry.php:139
 -#: manufacturing/work_order_issue.php:96 purchasing/po_entry_items.php:366
 -#: purchasing/po_receive_items.php:195 purchasing/supplier_credit.php:156
 -#: purchasing/supplier_invoice.php:154 purchasing/supplier_payment.php:204
++#: manufacturing/work_order_issue.php:97 purchasing/po_entry_items.php:368
++#: purchasing/po_receive_items.php:193 purchasing/supplier_credit.php:173
++#: purchasing/supplier_invoice.php:179 purchasing/supplier_payment.php:204
+ #: sales/create_recurrent_invoices.php:57 sales/credit_note_entry.php:181
 -#: sales/customer_credit_invoice.php:205 sales/customer_delivery.php:312
 -#: sales/customer_invoice.php:319 sales/customer_payments.php:164
 -#: sales/customer_payments.php:171 sales/sales_order_entry.php:441
++#: sales/customer_credit_invoice.php:205 sales/customer_delivery.php:324
++#: sales/customer_invoice.php:379 sales/customer_payments.php:164
++#: sales/customer_payments.php:171 sales/sales_order_entry.php:457
  msgid "The entered reference is already in use."
  msgstr ""
  
@@@ -3432,11 -2936,8 +2919,7 @@@
  msgid "The dimension name must be entered."
  msgstr ""
  
- #: ../dimensions/dimension_entry.php:138
- #: ../manufacturing/work_order_entry.php:154
- #: ../manufacturing/work_order_entry.php:234
- #: ../purchasing/po_entry_items.php:241
- #: ../purchasing/po_entry_items.php.orig:238
 -#: dimensions/dimension_entry.php:138 manufacturing/work_order_entry.php:154
 -#: manufacturing/work_order_entry.php:234 purchasing/po_entry_items.php:238
++#: dimensions/dimension_entry.php:138 purchasing/po_entry_items.php:241
  msgid "The date entered is in an invalid format."
  msgstr ""
  
@@@ -3457,35 -2957,23 +2939,13 @@@ msgstr "
  msgid "Dimension Reference:"
  msgstr ""
  
- #: ../dimensions/dimension_entry.php:277
- #: ../reporting/reports_main.php:34
- #: ../reporting/reports_main.php:60
- #: ../reporting/reports_main.php:74
- #: ../reporting/reports_main.php:82
- #: ../reporting/reports_main.php:134
- #: ../reporting/reports_main.php:199
- #: ../reporting/reports_main.php:207
- #: ../reporting/reports_main.php:239
- #: ../reporting/reports_main.php:250
- #: ../reporting/reports_main.php:261
- #: ../reporting/reports_main.php:277
- #: ../reporting/reports_main.php:287
- #: ../reporting/reports_main.php:298
- #: ../reporting/reports_main.php:310
- #: ../reporting/reports_main.php:324
- #: ../reporting/reports_main.php:333
- #: ../reporting/reports_main.php:343
- #: ../reporting/reports_main.php:354
- #: ../reporting/reports_main.php:366
- #: ../reporting/reports_main.php:374
- #: ../reporting/reports_main.php:383
- #: ../reporting/reports_main.php:391
- #: ../reporting/reports_main.php:397
+ #: dimensions/dimension_entry.php:277 reporting/reports_main.php:34
 -#: reporting/reports_main.php:63 reporting/reports_main.php:79
 -#: reporting/reports_main.php:88 reporting/reports_main.php:148
 -#: reporting/reports_main.php:229 reporting/reports_main.php:237
 -#: reporting/reports_main.php:246 reporting/reports_main.php:252
 -#: reporting/reports_main.php:292 reporting/reports_main.php:306
 -#: reporting/reports_main.php:318 reporting/reports_main.php:336
 -#: reporting/reports_main.php:347 reporting/reports_main.php:359
 -#: reporting/reports_main.php:372 reporting/reports_main.php:388
 -#: reporting/reports_main.php:398 reporting/reports_main.php:409
 -#: reporting/reports_main.php:421 reporting/reports_main.php:435
 -#: reporting/reports_main.php:444 reporting/reports_main.php:454
 -#: reporting/reports_main.php:463 reporting/reports_main.php:470
++#: reporting/reports_main.php:64 reporting/reports_main.php:80
++#: reporting/reports_main.php:89
  msgid "Start Date"
  msgstr ""
  
- #: ../dimensions/dimension_entry.php:279
- #: ../manufacturing/work_order_entry.php:420
 -#: dimensions/dimension_entry.php:279 manufacturing/work_order_entry.php:420
++#: dimensions/dimension_entry.php:279
  msgid "Date Required By"
  msgstr ""
  
@@@ -3525,11 -3013,10 +2985,10 @@@ msgstr "
  msgid "Delete unused dimension"
  msgstr ""
  
- #: ../dimensions/dimension_entry.php:302
- #: ../includes/ui/simple_crud_class.inc:225
- #: ../purchasing/includes/ui/invoice_ui.inc:206
- #: ../purchasing/includes/ui/invoice_ui.inc:412
- #: ../purchasing/includes/ui/invoice_ui.inc:414
+ #: dimensions/dimension_entry.php:302 includes/ui/simple_crud_class.inc:225
 -#: purchasing/includes/ui/invoice_ui.inc:186
 -#: purchasing/includes/ui/invoice_ui.inc:392
 -#: purchasing/includes/ui/invoice_ui.inc:394
++#: purchasing/includes/ui/invoice_ui.inc:206
++#: purchasing/includes/ui/invoice_ui.inc:412
++#: purchasing/includes/ui/invoice_ui.inc:414
  msgid "Add"
  msgstr ""
  
@@@ -3541,105 -3028,60 +3000,60 @@@ msgstr "
  msgid "Balance for this Dimension"
  msgstr ""
  
- #: ../dimensions/includes/dimensions_ui.inc:31
- #: ../gl/accruals.php:94
- #: ../gl/inquiry/gl_account_inquiry.php:129
- #: ../gl/inquiry/gl_trial_balance.php:170
- #: ../gl/manage/gl_quick_entries.php:241
- #: ../gl/manage/gl_quick_entries.php:333
- #: ../includes/sysnames.inc:165
- #: ../purchasing/includes/ui/invoice_ui.inc:265
- #: ../purchasing/includes/ui/invoice_ui.inc:267
- #: ../purchasing/includes/ui/invoice_ui.inc:269
- #: ../reporting/rep701.php:109
- #: ../reporting/rep705.php:234
- #: ../reporting/rep706.php:181
- #: ../reporting/rep707.php:206
- #: ../reporting/rep708.php:179
 -#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:90
 -#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:176
++#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:94
++#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:179
+ #: gl/manage/gl_quick_entries.php:241 gl/manage/gl_quick_entries.php:333
 -#: includes/sysnames.inc:164 purchasing/includes/ui/invoice_ui.inc:245
 -#: purchasing/includes/ui/invoice_ui.inc:247
 -#: purchasing/includes/ui/invoice_ui.inc:249 reporting/rep701.php:111
++#: includes/sysnames.inc:165 purchasing/includes/ui/invoice_ui.inc:265
++#: purchasing/includes/ui/invoice_ui.inc:267
++#: purchasing/includes/ui/invoice_ui.inc:269 reporting/rep701.php:111
+ #: reporting/rep705.php:238 reporting/rep706.php:185 reporting/rep707.php:210
 -#: reporting/rep708.php:183
++#: reporting/rep708.php:192
  msgid "Account"
  msgstr ""
  
- #: ../dimensions/includes/dimensions_ui.inc:31
- #: ../gl/accruals.php:102
- #: ../gl/bank_account_reconcile.php:235
- #: ../gl/inquiry/bank_inquiry.php:71
- #: ../gl/inquiry/gl_account_inquiry.php:141
- #: ../gl/inquiry/gl_account_inquiry.php:143
- #: ../gl/inquiry/gl_trial_balance.php:176
- #: ../gl/inquiry/gl_trial_balance.php:178
- #: ../gl/inquiry/gl_trial_balance.php:180
- #: ../gl/view/accrual_trans.php:60
- #: ../gl/view/gl_trans_view.php:69
- #: ../gl/view/gl_trans_view.php:72
- #: ../gl/view/gl_trans_view.php:75
- #: ../gl/includes/ui/gl_journal_ui.inc:87
- #: ../gl/includes/ui/gl_journal_ui.inc:90
- #: ../gl/includes/ui/gl_journal_ui.inc:93
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:133
- #: ../purchasing/inquiry/supplier_inquiry.php:181
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:178
- #: ../reporting/rep601.php:77
- #: ../reporting/rep602.php:81
- #: ../reporting/rep702.php:52
- #: ../reporting/rep704.php:80
- #: ../reporting/rep704.php:83
- #: ../reporting/rep704.php:86
- #: ../reporting/rep708.php:179
- #: ../reporting/rep708.php:180
- #: ../sales/inquiry/customer_allocation_inquiry.php:152
- #: ../sales/inquiry/customer_inquiry.php:209
 -#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
 -#: gl/bank_account_reconcile.php:237 gl/inquiry/bank_inquiry.php:71
++#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:102
++#: gl/bank_account_reconcile.php:235 gl/inquiry/bank_inquiry.php:71
+ #: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
 -#: gl/inquiry/gl_trial_balance.php:182 gl/inquiry/gl_trial_balance.php:184
 -#: gl/inquiry/gl_trial_balance.php:186 gl/view/accrual_trans.php:60
 -#: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
 -#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
 -#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:134
 -#: purchasing/inquiry/supplier_inquiry.php:176 reporting/rep601.php:80
 -#: reporting/rep702.php:54 reporting/rep704.php:84 reporting/rep704.php:87
 -#: reporting/rep704.php:90 reporting/rep708.php:183 reporting/rep708.php:184
 -#: sales/inquiry/customer_allocation_inquiry.php:151
 -#: sales/inquiry/customer_inquiry.php:233
++#: gl/inquiry/gl_trial_balance.php:185 gl/inquiry/gl_trial_balance.php:187
++#: gl/inquiry/gl_trial_balance.php:189 gl/view/accrual_trans.php:60
++#: gl/view/gl_trans_view.php:69 gl/view/gl_trans_view.php:72
++#: gl/view/gl_trans_view.php:75 gl/includes/ui/gl_journal_ui.inc:87
++#: gl/includes/ui/gl_journal_ui.inc:90 gl/includes/ui/gl_journal_ui.inc:93
++#: purchasing/inquiry/supplier_allocation_inquiry.php:133
++#: purchasing/inquiry/supplier_inquiry.php:181 reporting/rep601.php:80
++#: reporting/rep602.php:81 reporting/rep702.php:54 reporting/rep704.php:84
++#: reporting/rep704.php:87 reporting/rep704.php:90 reporting/rep708.php:192
++#: reporting/rep708.php:193 sales/inquiry/customer_allocation_inquiry.php:151
++#: sales/inquiry/customer_inquiry.php:209
  msgid "Debit"
  msgstr ""
  
- #: ../dimensions/includes/dimensions_ui.inc:31
- #: ../gl/accruals.php:102
- #: ../gl/bank_account_reconcile.php:236
- #: ../gl/inquiry/bank_inquiry.php:71
- #: ../gl/inquiry/gl_account_inquiry.php:141
- #: ../gl/inquiry/gl_account_inquiry.php:143
- #: ../gl/inquiry/gl_trial_balance.php:177
- #: ../gl/inquiry/gl_trial_balance.php:179
- #: ../gl/inquiry/gl_trial_balance.php:181
- #: ../gl/view/accrual_trans.php:60
- #: ../gl/view/gl_trans_view.php:69
- #: ../gl/view/gl_trans_view.php:72
- #: ../gl/view/gl_trans_view.php:75
- #: ../gl/includes/ui/gl_journal_ui.inc:87
- #: ../gl/includes/ui/gl_journal_ui.inc:90
- #: ../gl/includes/ui/gl_journal_ui.inc:93
- #: ../includes/sysnames.inc:85
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:134
- #: ../purchasing/inquiry/supplier_inquiry.php:182
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:179
- #: ../reporting/rep601.php:77
- #: ../reporting/rep602.php:81
- #: ../reporting/rep702.php:52
- #: ../reporting/rep704.php:80
- #: ../reporting/rep704.php:83
- #: ../reporting/rep704.php:86
- #: ../reporting/rep708.php:179
- #: ../reporting/rep708.php:180
- #: ../sales/inquiry/customer_allocation_inquiry.php:153
- #: ../sales/inquiry/customer_inquiry.php:210
 -#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
 -#: gl/bank_account_reconcile.php:238 gl/inquiry/bank_inquiry.php:71
++#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:102
++#: gl/bank_account_reconcile.php:236 gl/inquiry/bank_inquiry.php:71
+ #: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
 -#: gl/inquiry/gl_trial_balance.php:183 gl/inquiry/gl_trial_balance.php:185
 -#: gl/inquiry/gl_trial_balance.php:187 gl/view/accrual_trans.php:60
 -#: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
 -#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
 -#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
++#: gl/inquiry/gl_trial_balance.php:186 gl/inquiry/gl_trial_balance.php:188
++#: gl/inquiry/gl_trial_balance.php:190 gl/view/accrual_trans.php:60
++#: gl/view/gl_trans_view.php:69 gl/view/gl_trans_view.php:72
++#: gl/view/gl_trans_view.php:75 gl/includes/ui/gl_journal_ui.inc:87
++#: gl/includes/ui/gl_journal_ui.inc:90 gl/includes/ui/gl_journal_ui.inc:93
+ #: includes/sysnames.inc:85
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:135
 -#: purchasing/inquiry/supplier_inquiry.php:177 reporting/rep601.php:80
 -#: reporting/rep702.php:54 reporting/rep704.php:84 reporting/rep704.php:87
 -#: reporting/rep704.php:90 reporting/rep708.php:183 reporting/rep708.php:184
 -#: sales/inquiry/customer_allocation_inquiry.php:152
 -#: sales/inquiry/customer_inquiry.php:234
++#: purchasing/inquiry/supplier_allocation_inquiry.php:134
++#: purchasing/inquiry/supplier_inquiry.php:182 reporting/rep601.php:80
++#: reporting/rep602.php:81 reporting/rep702.php:54 reporting/rep704.php:84
++#: reporting/rep704.php:87 reporting/rep704.php:90 reporting/rep708.php:192
++#: reporting/rep708.php:193 sales/inquiry/customer_allocation_inquiry.php:152
++#: sales/inquiry/customer_inquiry.php:210
  msgid "Credit"
  msgstr ""
  
- #: ../dimensions/includes/dimensions_ui.inc:45
- #: ../dimensions/inquiry/search_dimensions.php:134
- #: ../gl/inquiry/bank_inquiry.php:71
- #: ../gl/inquiry/gl_account_inquiry.php:141
- #: ../gl/inquiry/gl_trial_balance.php:174
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:136
- #: ../reporting/rep203.php:92
- #: ../reporting/rep204.php:82
- #: ../reporting/rep601.php:77
- #: ../reporting/rep602.php:81
- #: ../reporting/rep701.php:109
- #: ../reporting/rep704.php:80
- #: ../reporting/rep704.php:83
- #: ../reporting/rep704.php:86
- #: ../reporting/rep708.php:172
- #: ../sales/inquiry/customer_allocation_inquiry.php:155
+ #: dimensions/includes/dimensions_ui.inc:45
+ #: dimensions/inquiry/search_dimensions.php:134 gl/inquiry/bank_inquiry.php:71
 -#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_trial_balance.php:180
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:137
++#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_trial_balance.php:183
++#: purchasing/inquiry/supplier_allocation_inquiry.php:136
+ #: reporting/rep203.php:94 reporting/rep204.php:84 reporting/rep307.php:117
 -#: reporting/rep601.php:80 reporting/rep701.php:111 reporting/rep704.php:84
 -#: reporting/rep704.php:87 reporting/rep704.php:90 reporting/rep708.php:176
 -#: sales/inquiry/customer_allocation_inquiry.php:154
++#: reporting/rep601.php:80 reporting/rep602.php:81 reporting/rep701.php:111
++#: reporting/rep704.php:84 reporting/rep704.php:87 reporting/rep704.php:90
++#: reporting/rep708.php:185 sales/inquiry/customer_allocation_inquiry.php:154
  msgid "Balance"
  msgstr ""
  
@@@ -3651,91 -3093,58 +3065,51 @@@ msgstr "
  msgid "Search Dimensions"
  msgstr ""
  
- #: ../dimensions/inquiry/search_dimensions.php:73
- #: ../gl/bank_transfer.php:79
- #: ../gl/inquiry/journal_inquiry.php:45
- #: ../gl/manage/revaluate_currencies.php:105
- #: ../gl/includes/ui/gl_bank_ui.inc:26
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:104
- #: ../gl/includes/ui/gl_journal_ui.inc:30
- #: ../includes/ui/contacts_view.inc:94
- #: ../inventory/includes/item_adjustments_ui.inc:35
- #: ../inventory/includes/stock_transfers_ui.inc:40
- #: ../manufacturing/search_work_orders.php:67
- #: ../manufacturing/work_order_add_finished.php:198
- #: ../manufacturing/work_order_costs.php:134
- #: ../manufacturing/work_order_entry.php:378
- #: ../manufacturing/work_order_entry.php:385
- #: ../manufacturing/includes/work_order_issue_ui.inc:156
- #: ../purchasing/includes/ui/invoice_ui.inc:104
- #: ../purchasing/includes/ui/po_ui.inc:166
- #: ../purchasing/includes/ui/po_ui.inc:171
- #: ../purchasing/includes/ui/po_ui.inc.orig:166
- #: ../purchasing/includes/ui/po_ui.inc.orig:171
- #: ../purchasing/supplier_payment.php:289
- #: ../sales/customer_payments.php:382
+ #: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:79
+ #: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:105
 -#: gl/includes/ui/gl_bank_ui.inc:26 gl/includes/ui/gl_bank_ui.inc.orig:25
 -#: gl/includes/ui/gl_journal_ui.inc:30 includes/ui/contacts_view.inc:94
++#: gl/includes/ui/gl_bank_ui.inc:26 gl/includes/ui/gl_journal_ui.inc:30
++#: includes/ui/contacts_view.inc:94
+ #: inventory/includes/item_adjustments_ui.inc:35
+ #: inventory/includes/stock_transfers_ui.inc:40
+ #: manufacturing/search_work_orders.php:67
+ #: manufacturing/work_order_add_finished.php:198
 -#: manufacturing/work_order_entry.php:378
 -#: manufacturing/work_order_entry.php:385
++#: manufacturing/work_order_costs.php:134
+ #: manufacturing/includes/work_order_issue_ui.inc:156
 -#: purchasing/includes/ui/invoice_ui.inc:92
 -#: purchasing/includes/ui/po_ui.inc:158 purchasing/includes/ui/po_ui.inc:163
 -#: purchasing/supplier_payment.php:290 sales/customer_payments.php:367
++#: purchasing/includes/ui/invoice_ui.inc:104
++#: purchasing/supplier_payment.php:294
  msgid "Reference:"
  msgstr ""
  
- #: ../dimensions/inquiry/search_dimensions.php:75
- #: ../includes/ui/allocation_cart.inc:286
- #: ../includes/ui/ui_lists.inc:1923
- #: ../reporting/rep101.php:112
- #: ../reporting/rep102.php:94
- #: ../reporting/rep104.php:95
- #: ../reporting/rep104.php:99
- #: ../reporting/rep105.php:93
- #: ../reporting/rep105.php:97
- #: ../reporting/rep201.php:100
- #: ../reporting/rep202.php:98
- #: ../reporting/rep203.php:72
- #: ../reporting/rep204.php:75
- #: ../reporting/rep301.php:90
- #: ../reporting/rep301.php:97
- #: ../reporting/rep302.php:103
- #: ../reporting/rep302.php:110
- #: ../reporting/rep303.php:84
- #: ../reporting/rep303.php:91
- #: ../reporting/rep304.php:96
- #: ../reporting/rep304.php:101
- #: ../reporting/rep304.php:106
- #: ../reporting/rep702.php:59
- #: ../reporting/rep710.php:84
- #: ../reporting/rep710.php:85
+ #: dimensions/inquiry/search_dimensions.php:75
 -#: includes/ui/allocation_cart.inc:284 includes/ui/sav.ui_lists.inc:1898
 -#: includes/ui/ui_lists.inc:1920 reporting/rep101.php:114
++#: includes/ui/allocation_cart.inc:286 includes/ui/ui_lists.inc:1924
+ #: reporting/rep102.php:96 reporting/rep104.php:97 reporting/rep104.php:101
 -#: reporting/rep105.php:95 reporting/rep105.php:99 reporting/rep201.php:102
 -#: reporting/rep202.php:100 reporting/rep203.php:74 reporting/rep204.php:77
 -#: reporting/rep301.php:92 reporting/rep301.php:99 reporting/rep302.php:105
 -#: reporting/rep302.php:112 reporting/rep303.php:86 reporting/rep303.php:93
++#: reporting/rep105.php:95 reporting/rep105.php:99 reporting/rep202.php:100
++#: reporting/rep203.php:74 reporting/rep204.php:77 reporting/rep301.php:92
++#: reporting/rep301.php:99 reporting/rep302.php:105 reporting/rep302.php:112
+ #: reporting/rep304.php:98 reporting/rep304.php:103 reporting/rep304.php:108
+ #: reporting/rep306.php:120 reporting/rep306.php:125 reporting/rep306.php:130
+ #: reporting/rep306.php:135 reporting/rep307.php:103 reporting/rep307.php:110
 -#: reporting/rep308.php:135 reporting/rep308.php:142 reporting/rep702.php:61
 -#: reporting/rep710.php:86 reporting/rep710.php:87
++#: reporting/rep308.php:138 reporting/rep308.php:143 reporting/rep309.php:92
++#: reporting/rep702.php:61 reporting/rep710.php:86 reporting/rep710.php:87
  msgid "All"
  msgstr ""
  
- #: ../dimensions/inquiry/search_dimensions.php:76
- #: ../gl/inquiry/bank_inquiry.php:49
- #: ../gl/inquiry/gl_trial_balance.php:49
- #: ../gl/inquiry/journal_inquiry.php:48
- #: ../gl/inquiry/profit_loss.php:163
- #: ../gl/includes/ui/gl_bank_ui.inc:51
- #: ../gl/includes/ui/gl_bank_ui.inc:117
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:23
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:53
- #: ../inventory/inquiry/stock_movements.php:58
- #: ../inventory/inquiry/stock_movements.php.orig:60
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:50
- #: ../purchasing/inquiry/supplier_inquiry.php:50
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:50
- #: ../sales/inquiry/customer_inquiry.php:46
+ #: dimensions/inquiry/search_dimensions.php:76 gl/inquiry/bank_inquiry.php:49
 -#: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/journal_inquiry.php:48
 -#: gl/inquiry/profit_loss.php:168 gl/includes/ui/gl_bank_ui.inc:51
 -#: gl/includes/ui/gl_bank_ui.inc:118 gl/includes/ui/gl_bank_ui.inc.orig:50
 -#: gl/includes/ui/gl_bank_ui.inc.orig:105
 -#: inventory/inquiry/stock_movements.php:62
++#: gl/inquiry/gl_trial_balance.php:49 gl/inquiry/journal_inquiry.php:48
++#: gl/inquiry/profit_loss.php:163 gl/includes/ui/gl_bank_ui.inc:51
++#: gl/includes/ui/gl_bank_ui.inc:118 inventory/inquiry/stock_movements.php:58
+ #: purchasing/inquiry/supplier_allocation_inquiry.php:50
 -#: purchasing/inquiry/supplier_inquiry.php:53
 -#: sales/inquiry/customer_inquiry.php:50
++#: purchasing/inquiry/supplier_inquiry.php:50
++#: sales/inquiry/customer_inquiry.php:46
  msgid "From:"
  msgstr ""
  
- #: ../dimensions/inquiry/search_dimensions.php:77
- #: ../gl/inquiry/bank_inquiry.php:50
- #: ../gl/inquiry/gl_trial_balance.php:50
- #: ../gl/inquiry/journal_inquiry.php:49
- #: ../gl/inquiry/profit_loss.php:164
- #: ../gl/includes/ui/gl_bank_ui.inc:117
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:23
- #: ../inventory/inquiry/stock_movements.php:59
- #: ../inventory/inquiry/stock_movements.php.orig:61
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:51
- #: ../purchasing/inquiry/supplier_inquiry.php:51
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:51
- #: ../sales/inquiry/customer_inquiry.php:47
+ #: dimensions/inquiry/search_dimensions.php:77 gl/inquiry/bank_inquiry.php:50
 -#: gl/inquiry/gl_trial_balance.php:55 gl/inquiry/journal_inquiry.php:49
 -#: gl/inquiry/profit_loss.php:169 gl/includes/ui/gl_bank_ui.inc.orig:105
 -#: inventory/inquiry/stock_movements.php:63
++#: gl/inquiry/gl_trial_balance.php:50 gl/inquiry/journal_inquiry.php:49
++#: gl/inquiry/profit_loss.php:164 inventory/inquiry/stock_movements.php:59
+ #: purchasing/inquiry/supplier_allocation_inquiry.php:51
 -#: purchasing/inquiry/supplier_inquiry.php:54
 -#: sales/inquiry/customer_inquiry.php:51
++#: purchasing/inquiry/supplier_inquiry.php:51
++#: sales/inquiry/customer_inquiry.php:47
  msgid "To:"
  msgstr ""
  
@@@ -3749,32 -3158,22 +3123,21 @@@ msgstr "
  msgid "Only Open:"
  msgstr ""
  
- #: ../dimensions/inquiry/search_dimensions.php:132
- #: ../dimensions/view/view_dimension.php:54
- #: ../includes/ui/allocation_cart.inc:264
- #: ../purchasing/includes/ui/invoice_ui.inc:123
- #: ../purchasing/view/view_supp_credit.php:48
- #: ../purchasing/view/view_supp_invoice.php:52
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:131
- #: ../purchasing/inquiry/supplier_inquiry.php:179
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:176
- #: ../reporting/rep101.php:130
- #: ../reporting/rep201.php:118
- #: ../reporting/rep203.php:91
- #: ../reporting/rep501.php:85
- #: ../reporting/includes/doctext.inc:112
- #: ../reporting/includes/doctext.inc:144
- #: ../reporting/includes/doctext.inc:165
- #: ../reporting/includes/doctext.inc:167
- #: ../reporting/includes/doctext.inc:188
- #: ../reporting/includes/doctext.inc:206
- #: ../reporting/includes/doctext.inc:208
- #: ../sales/customer_invoice.php:510
- #: ../sales/view/view_dispatch.php:97
- #: ../sales/view/view_invoice.php:96
- #: ../sales/inquiry/customer_allocation_inquiry.php:149
- #: ../sales/inquiry/customer_inquiry.php:205
- #: ../sales/includes/ui/sales_order_ui.inc.orig:596
+ #: dimensions/inquiry/search_dimensions.php:132
 -#: dimensions/view/view_dimension.php:55 includes/ui/allocation_cart.inc:263
 -#: purchasing/includes/ui/invoice_ui.inc:112
++#: dimensions/view/view_dimension.php:55 includes/ui/allocation_cart.inc:264
++#: purchasing/includes/ui/invoice_ui.inc:123
+ #: purchasing/view/view_supp_credit.php:48
 -#: purchasing/view/view_supp_invoice.php:51
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:132
 -#: purchasing/inquiry/supplier_inquiry.php:174 reporting/rep101.php:132
 -#: reporting/rep201.php:120 reporting/rep203.php:93 reporting/rep501.php:87
 -#: reporting/includes/doctext.inc:100 reporting/includes/doctext.inc:122
 -#: reporting/includes/doctext.inc:143 reporting/includes/doctext.inc:145
 -#: reporting/includes/doctext.inc:184 reporting/includes/doctext.inc:186
 -#: sales/customer_invoice.php:439 sales/view/view_dispatch.php:97
 -#: sales/view/view_invoice.php:96
++#: purchasing/view/view_supp_invoice.php:52
++#: purchasing/inquiry/supplier_allocation_inquiry.php:131
++#: purchasing/inquiry/supplier_inquiry.php:179 reporting/rep203.php:93
++#: reporting/rep501.php:87 reporting/includes/doctext.inc:112
++#: reporting/includes/doctext.inc:144 reporting/includes/doctext.inc:165
++#: reporting/includes/doctext.inc:167 reporting/includes/doctext.inc:206
++#: reporting/includes/doctext.inc:208 sales/customer_invoice.php:510
++#: sales/view/view_dispatch.php:97 sales/view/view_invoice.php:96
+ #: sales/inquiry/customer_allocation_inquiry.php:148
 -#: sales/inquiry/customer_inquiry.php:229
 -#: sales/includes/ui/sales_order_ui.inc:601
++#: sales/inquiry/customer_inquiry.php:205
++#: sales/includes/ui/sales_order_ui.inc:603
  msgid "Due Date"
  msgstr ""
  
@@@ -3794,75 -3193,36 +3157,49 @@@ msgstr "
  msgid "This dimension is closed."
  msgstr ""
  
- #: ../dimensions/view/view_dimension.php:84
- #: ../gl/inquiry/gl_account_inquiry.php:71
- #: ../gl/inquiry/tax_inquiry.php:61
- #: ../purchasing/inquiry/po_search_completed.php:62
- #: ../purchasing/inquiry/po_search_completed.php.orig:63
- #: ../purchasing/inquiry/po_search.php:64
- #: ../sales/inquiry/customer_allocation_inquiry.php:44
- #: ../sales/inquiry/sales_deliveries_view.php:104
- #: ../sales/inquiry/sales_orders_view.php:251
+ #: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:71
 -#: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:65
++#: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:62
+ #: purchasing/inquiry/po_search.php:64
+ #: sales/inquiry/customer_allocation_inquiry.php:44
+ #: sales/inquiry/sales_deliveries_view.php:104
 -#: sales/inquiry/sales_orders_view.php:229
  msgid "from:"
  msgstr ""
  
- #: ../dimensions/view/view_dimension.php:85
- #: ../gl/inquiry/gl_account_inquiry.php:72
- #: ../gl/inquiry/tax_inquiry.php:62
- #: ../purchasing/inquiry/po_search_completed.php:63
- #: ../purchasing/inquiry/po_search_completed.php.orig:64
- #: ../purchasing/inquiry/po_search.php:65
- #: ../sales/inquiry/customer_allocation_inquiry.php:45
- #: ../sales/inquiry/sales_deliveries_view.php:105
- #: ../sales/inquiry/sales_orders_view.php:252
+ #: dimensions/view/view_dimension.php:86 gl/inquiry/gl_account_inquiry.php:72
 -#: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:66
++#: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:63
+ #: purchasing/inquiry/po_search.php:65
+ #: sales/inquiry/customer_allocation_inquiry.php:45
+ #: sales/inquiry/sales_deliveries_view.php:105
 -#: sales/inquiry/sales_orders_view.php:230
  msgid "to:"
  msgstr ""
  
- #: ../dimensions/view/view_dimension.php:86
- #: ../gl/inquiry/balance_sheet.php:131
- #: ../gl/inquiry/bank_inquiry.php:52
- #: ../gl/inquiry/gl_account_inquiry.php:85
- #: ../gl/inquiry/gl_trial_balance.php:58
- #: ../gl/inquiry/profit_loss.php:178
- #: ../gl/inquiry/tax_inquiry.php:63
+ #: dimensions/view/view_dimension.php:87 gl/inquiry/balance_sheet.php:131
+ #: gl/inquiry/bank_inquiry.php:52 gl/inquiry/gl_account_inquiry.php:85
 -#: gl/inquiry/gl_trial_balance.php:63 gl/inquiry/profit_loss.php:183
++#: gl/inquiry/gl_trial_balance.php:58 gl/inquiry/profit_loss.php:178
+ #: gl/inquiry/tax_inquiry.php:63
  msgid "Show"
  msgstr ""
  
- #: ../gl/accruals.php:20
- #: ../includes/access_levels.inc:245
 -#: gl/accruals.php:20 includes/access_levels.inc:243
++#: gl/accruals.php:20 includes/access_levels.inc:245
  msgid "Revenue / Cost Accruals"
  msgstr ""
  
- #: ../gl/accruals.php:38
- #: ../gl/bank_transfer.php:121
- #: ../gl/gl_bank.php:270
- #: ../gl/gl_journal.php:167
- #: ../gl/manage/revaluate_currencies.php:59
- #: ../inventory/adjustments.php:116
- #: ../inventory/transfers.php:111
- #: ../manufacturing/work_order_add_finished.php:104
- #: ../manufacturing/work_order_costs.php:86
- #: ../manufacturing/work_order_entry.php:160
- #: ../manufacturing/work_order_issue.php:84
- #: ../purchasing/po_entry_items.php:345
- #: ../purchasing/po_entry_items.php.orig:342
- #: ../purchasing/po_receive_items.php:179
- #: ../purchasing/supplier_credit.php:193
- #: ../purchasing/supplier_invoice.php:199
- #: ../purchasing/supplier_payment.php:180
- #: ../sales/create_recurrent_invoices.php:119
- #: ../sales/credit_note_entry.php:157
- #: ../sales/customer_credit_invoice.php:95
- #: ../sales/customer_delivery.php:165
- #: ../sales/customer_delivery.php.orig:165
- #: ../sales/customer_invoice.php:318
- #: ../sales/customer_payments.php:145
- #: ../sales/sales_order_entry.php:364
++#: gl/accruals.php:38 gl/bank_transfer.php:121 gl/gl_bank.php:270
++#: gl/gl_journal.php:167 gl/manage/revaluate_currencies.php:59
++#: inventory/adjustments.php:114 inventory/transfers.php:109
++#: manufacturing/work_order_add_finished.php:104
++#: manufacturing/work_order_costs.php:86 manufacturing/work_order_issue.php:84
++#: purchasing/po_entry_items.php:345 purchasing/po_receive_items.php:179
++#: purchasing/supplier_credit.php:193 purchasing/supplier_invoice.php:199
++#: purchasing/supplier_payment.php:181 sales/create_recurrent_invoices.php:121
++#: sales/credit_note_entry.php:157 sales/customer_credit_invoice.php:95
++#: sales/customer_delivery.php:165 sales/customer_invoice.php:318
++#: sales/customer_payments.php:151 sales/sales_order_entry.php:364
 +msgid ""
 +"The entered date is out of fiscal year or is closed for further data entry."
 +msgstr ""
 +
- #: ../gl/accruals.php:44
+ #: gl/accruals.php:44
  msgid "The amount can not be 0."
  msgstr ""
  
@@@ -3870,271 -3230,180 +3207,163 @@@
  msgid "The periods must be greater than 0."
  msgstr ""
  
- #: ../gl/accruals.php:71
 -#: gl/accruals.php:67
++#: gl/accruals.php:71
  msgid ""
 -"Some of the period dates are outside the fiscal year. Create a new fiscal "
 -"year first!"
 +"Some of the period dates are outside the fiscal year or are closed for "
 +"further data entry. Create a new fiscal year first!"
  msgstr ""
  
- #: ../gl/accruals.php:86
 -#: gl/accruals.php:82
++#: gl/accruals.php:86
  #, php-format
  msgid "Accruals for %s"
  msgstr ""
  
- #: ../gl/accruals.php:96
- #: ../gl/accruals.php:98
- #: ../gl/accruals.php:207
- #: ../gl/accruals.php:209
- #: ../gl/gl_budget.php:71
- #: ../gl/gl_budget.php:72
- #: ../gl/gl_budget.php:76
- #: ../gl/inquiry/balance_sheet.php:128
- #: ../gl/inquiry/balance_sheet.php:130
- #: ../gl/inquiry/gl_account_inquiry.php:79
- #: ../gl/inquiry/gl_account_inquiry.php:81
- #: ../gl/inquiry/gl_account_inquiry.php:134
- #: ../gl/inquiry/gl_account_inquiry.php:136
- #: ../gl/inquiry/gl_trial_balance.php:52
- #: ../gl/inquiry/gl_trial_balance.php:54
- #: ../gl/inquiry/profit_loss.php:174
- #: ../gl/inquiry/profit_loss.php:176
- #: ../gl/manage/gl_quick_entries.php:261
- #: ../gl/manage/gl_quick_entries.php:263
- #: ../gl/manage/gl_quick_entries.php:343
- #: ../gl/manage/gl_quick_entries.php:345
- #: ../gl/view/accrual_trans.php:54
- #: ../gl/view/accrual_trans.php:56
- #: ../gl/view/gl_deposit_view.php:99
- #: ../gl/view/gl_deposit_view.php:102
- #: ../gl/view/gl_payment_view.php:98
- #: ../gl/view/gl_payment_view.php:101
- #: ../gl/view/gl_trans_view.php:68
- #: ../gl/view/gl_trans_view.php:71
- #: ../gl/includes/ui/gl_bank_ui.inc:150
- #: ../gl/includes/ui/gl_bank_ui.inc:151
- #: ../gl/includes/ui/gl_bank_ui.inc:153
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:124
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:125
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:127
- #: ../gl/includes/ui/gl_journal_ui.inc:86
- #: ../gl/includes/ui/gl_journal_ui.inc:87
- #: ../gl/includes/ui/gl_journal_ui.inc:89
- #: ../includes/sysnames.inc:43
- #: ../includes/sysnames.inc:166
- #: ../inventory/manage/item_categories.php:216
- #: ../inventory/manage/item_categories.php:218
- #: ../inventory/manage/items.php:350
- #: ../inventory/manage/items.php:352
- #: ../inventory/manage/items.php.orig:343
- #: ../inventory/manage/items.php.orig:345
- #: ../purchasing/includes/ui/invoice_ui.inc:265
- #: ../purchasing/includes/ui/invoice_ui.inc:267
- #: ../purchasing/manage/suppliers.php:145
- #: ../purchasing/manage/suppliers.php:146
- #: ../purchasing/manage/suppliers.php:148
- #: ../purchasing/manage/suppliers.php.orig:148
- #: ../purchasing/manage/suppliers.php.orig:149
- #: ../purchasing/manage/suppliers.php.orig:151
- #: ../reporting/rep501.php:90
- #: ../reporting/rep704.php:79
- #: ../reporting/rep704.php:82
- #: ../reporting/rep704.php:93
- #: ../reporting/rep704.php:95
- #: ../reporting/rep704.php:103
- #: ../reporting/rep705.php:245
- #: ../reporting/rep705.php:247
- #: ../reporting/rep705.php:258
- #: ../reporting/rep706.php:190
- #: ../reporting/rep706.php:192
- #: ../reporting/rep706.php:200
- #: ../reporting/rep707.php:214
- #: ../reporting/rep707.php:216
- #: ../reporting/rep707.php:224
- #: ../reporting/rep708.php:188
- #: ../reporting/rep708.php:190
- #: ../reporting/rep708.php:197
- #: ../reporting/reports_main.php:265
- #: ../reporting/reports_main.php:266
- #: ../reporting/reports_main.php:271
- #: ../reporting/reports_main.php:272
- #: ../reporting/reports_main.php:279
- #: ../reporting/reports_main.php:280
- #: ../reporting/reports_main.php:290
- #: ../reporting/reports_main.php:291
- #: ../reporting/reports_main.php:302
- #: ../reporting/reports_main.php:303
- #: ../reporting/reports_main.php:314
- #: ../reporting/reports_main.php:319
- #: ../reporting/reports_main.php:326
- #: ../reporting/reports_main.php:336
- #: ../reporting/reports_main.php:347
- #: ../sales/customer_delivery.php.orig:408
- #: ../sales/customer_delivery.php.orig:416
- #: ../sales/customer_invoice.php:475
- #: ../sales/customer_invoice.php:518
- #: ../sales/manage/customers.php:270
- #: ../sales/manage/customers.php:272
- #: ../sales/manage/sav.customers.php:269
- #: ../sales/manage/sav.customers.php:271
- #: ../sales/includes/ui/sales_credit_ui.inc:132
- #: ../sales/includes/ui/sales_credit_ui.inc:137
- #: ../sales/includes/ui/sales_order_ui.inc.orig:451
- #: ../sales/includes/ui/sales_order_ui.inc.orig:456
 -#: gl/accruals.php:92 gl/accruals.php:94 gl/accruals.php:203
 -#: gl/accruals.php:205 gl/gl_budget.php:71 gl/gl_budget.php:72
++#: gl/accruals.php:96 gl/accruals.php:98 gl/accruals.php:207
++#: gl/accruals.php:209 gl/gl_budget.php:71 gl/gl_budget.php:72
+ #: gl/gl_budget.php:76 gl/inquiry/balance_sheet.php:128
+ #: gl/inquiry/balance_sheet.php:130 gl/inquiry/gl_account_inquiry.php:79
+ #: gl/inquiry/gl_account_inquiry.php:81 gl/inquiry/gl_account_inquiry.php:134
 -#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_trial_balance.php:57
 -#: gl/inquiry/gl_trial_balance.php:59 gl/inquiry/profit_loss.php:179
 -#: gl/inquiry/profit_loss.php:181 gl/manage/gl_quick_entries.php:261
++#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_trial_balance.php:52
++#: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/profit_loss.php:174
++#: gl/inquiry/profit_loss.php:176 gl/manage/gl_quick_entries.php:261
+ #: gl/manage/gl_quick_entries.php:263 gl/manage/gl_quick_entries.php:343
+ #: gl/manage/gl_quick_entries.php:345 gl/view/accrual_trans.php:54
+ #: gl/view/accrual_trans.php:56 gl/view/gl_deposit_view.php:99
+ #: gl/view/gl_deposit_view.php:102 gl/view/gl_payment_view.php:98
 -#: gl/view/gl_payment_view.php:101 gl/view/gl_trans_view.php:63
 -#: gl/view/gl_trans_view.php:66 gl/includes/ui/gl_bank_ui.inc:151
++#: gl/view/gl_payment_view.php:101 gl/view/gl_trans_view.php:68
++#: gl/view/gl_trans_view.php:71 gl/includes/ui/gl_bank_ui.inc:151
+ #: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_bank_ui.inc:154
 -#: gl/includes/ui/gl_bank_ui.inc.orig:132
 -#: gl/includes/ui/gl_bank_ui.inc.orig:133
 -#: gl/includes/ui/gl_bank_ui.inc.orig:135 gl/includes/ui/gl_journal_ui.inc:83
 -#: gl/includes/ui/gl_journal_ui.inc:84 gl/includes/ui/gl_journal_ui.inc:86
 -#: includes/sysnames.inc:43 includes/sysnames.inc:165
 -#: inventory/manage/item_categories.php:216
 -#: inventory/manage/item_categories.php:218 inventory/manage/items.php:343
 -#: inventory/manage/items.php:345 purchasing/includes/ui/invoice_ui.inc:245
 -#: purchasing/includes/ui/invoice_ui.inc:247
 -#: purchasing/manage/suppliers.php:137 purchasing/manage/suppliers.php:138
 -#: purchasing/manage/suppliers.php:140 reporting/rep103.php:243
 -#: reporting/rep103.php:255 reporting/rep205.php:161 reporting/rep205.php:173
 -#: reporting/rep501.php:92 reporting/rep704.php:83 reporting/rep704.php:86
 -#: reporting/rep704.php:97 reporting/rep704.php:99 reporting/rep704.php:107
 -#: reporting/rep705.php:249 reporting/rep705.php:251 reporting/rep705.php:262
 -#: reporting/rep706.php:194 reporting/rep706.php:196 reporting/rep706.php:204
 -#: reporting/rep707.php:218 reporting/rep707.php:220 reporting/rep707.php:228
 -#: reporting/rep708.php:192 reporting/rep708.php:194 reporting/rep708.php:201
 -#: reporting/reports_main.php:322 reporting/reports_main.php:323
 -#: reporting/reports_main.php:329 reporting/reports_main.php:330
 -#: reporting/reports_main.php:338 reporting/reports_main.php:339
 -#: reporting/reports_main.php:350 reporting/reports_main.php:351
 -#: reporting/reports_main.php:363 reporting/reports_main.php:364
 -#: reporting/reports_main.php:376 reporting/reports_main.php:382
 -#: reporting/reports_main.php:390 reporting/reports_main.php:401
 -#: reporting/reports_main.php:413 sales/customer_delivery.php:395
 -#: sales/customer_delivery.php:403 sales/customer_invoice.php:409
 -#: sales/customer_invoice.php:447 sales/manage/customers.php:270
++#: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:87
++#: gl/includes/ui/gl_journal_ui.inc:89 includes/sysnames.inc:43
++#: includes/sysnames.inc:166 inventory/manage/item_categories.php:220
++#: inventory/manage/item_categories.php:222
++#: purchasing/includes/ui/invoice_ui.inc:265
++#: purchasing/includes/ui/invoice_ui.inc:267
++#: purchasing/manage/suppliers.php:145 purchasing/manage/suppliers.php:146
++#: purchasing/manage/suppliers.php:148 reporting/rep205.php:161
++#: reporting/rep205.php:173 reporting/rep501.php:92 reporting/rep704.php:83
++#: reporting/rep704.php:86 reporting/rep704.php:97 reporting/rep704.php:99
++#: reporting/rep704.php:107 reporting/rep705.php:249 reporting/rep705.php:251
++#: reporting/rep705.php:262 reporting/rep706.php:194 reporting/rep706.php:196
++#: reporting/rep706.php:204 reporting/rep707.php:218 reporting/rep707.php:220
++#: reporting/rep707.php:228 reporting/rep708.php:201 reporting/rep708.php:203
++#: reporting/rep708.php:210 sales/customer_delivery.php:409
++#: sales/customer_delivery.php:417 sales/customer_invoice.php:475
++#: sales/customer_invoice.php:518 sales/manage/customers.php:270
+ #: sales/manage/customers.php:272 sales/includes/ui/sales_credit_ui.inc:132
+ #: sales/includes/ui/sales_credit_ui.inc:137
 -#: sales/includes/ui/sales_order_ui.inc:456
 -#: sales/includes/ui/sales_order_ui.inc:461
++#: sales/includes/ui/sales_order_ui.inc:458
++#: sales/includes/ui/sales_order_ui.inc:463
  msgid "Dimension"
  msgstr ""
  
- #: ../gl/accruals.php:102
- #: ../gl/accruals.php:217
- #: ../gl/inquiry/gl_account_inquiry.php:141
- #: ../gl/inquiry/gl_account_inquiry.php:143
- #: ../gl/inquiry/journal_inquiry.php:133
- #: ../gl/view/accrual_trans.php:60
- #: ../gl/view/gl_deposit_view.php:100
- #: ../gl/view/gl_deposit_view.php:103
- #: ../gl/view/gl_deposit_view.php:106
- #: ../gl/view/gl_payment_view.php:99
- #: ../gl/view/gl_payment_view.php:102
- #: ../gl/view/gl_payment_view.php:105
- #: ../gl/view/gl_trans_view.php:69
- #: ../gl/view/gl_trans_view.php:72
- #: ../gl/view/gl_trans_view.php:75
- #: ../gl/includes/ui/gl_bank_ui.inc:151
- #: ../gl/includes/ui/gl_bank_ui.inc:154
- #: ../gl/includes/ui/gl_bank_ui.inc:157
- #: ../gl/includes/ui/gl_bank_ui.inc:297
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:125
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:128
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:131
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:271
- #: ../gl/includes/ui/gl_journal_ui.inc:87
- #: ../gl/includes/ui/gl_journal_ui.inc:90
- #: ../gl/includes/ui/gl_journal_ui.inc:93
- #: ../gl/includes/ui/gl_journal_ui.inc:276
- #: ../inventory/includes/item_adjustments_ui.inc:181
- #: ../inventory/includes/stock_transfers_ui.inc:161
- #: ../manufacturing/view/wo_costs_view.php:46
- #: ../manufacturing/includes/work_order_issue_ui.inc:169
- #: ../purchasing/includes/ui/invoice_ui.inc:265
- #: ../purchasing/includes/ui/invoice_ui.inc:267
- #: ../purchasing/includes/ui/invoice_ui.inc:269
- #: ../sales/customer_credit_invoice.php:364
- #: ../sales/customer_delivery.php.orig:532
- #: ../sales/includes/ui/sales_credit_ui.inc:339
 -#: gl/accruals.php:98 gl/accruals.php:213 gl/inquiry/bank_inquiry.php:71
++#: gl/accruals.php:102 gl/accruals.php:217 gl/inquiry/bank_inquiry.php:71
+ #: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
+ #: gl/inquiry/journal_inquiry.php:133 gl/view/accrual_trans.php:60
+ #: gl/view/gl_deposit_view.php:100 gl/view/gl_deposit_view.php:103
+ #: gl/view/gl_deposit_view.php:106 gl/view/gl_payment_view.php:99
+ #: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105
 -#: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
 -#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_bank_ui.inc:152
++#: gl/view/gl_trans_view.php:69 gl/view/gl_trans_view.php:72
++#: gl/view/gl_trans_view.php:75 gl/includes/ui/gl_bank_ui.inc:152
+ #: gl/includes/ui/gl_bank_ui.inc:155 gl/includes/ui/gl_bank_ui.inc:158
 -#: gl/includes/ui/gl_bank_ui.inc:298 gl/includes/ui/gl_bank_ui.inc.orig:133
 -#: gl/includes/ui/gl_bank_ui.inc.orig:136
 -#: gl/includes/ui/gl_bank_ui.inc.orig:139
 -#: gl/includes/ui/gl_bank_ui.inc.orig:279 gl/includes/ui/gl_journal_ui.inc:84
 -#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
 -#: gl/includes/ui/gl_journal_ui.inc:240
++#: gl/includes/ui/gl_bank_ui.inc:298 gl/includes/ui/gl_journal_ui.inc:87
++#: gl/includes/ui/gl_journal_ui.inc:90 gl/includes/ui/gl_journal_ui.inc:93
++#: gl/includes/ui/gl_journal_ui.inc:276
+ #: inventory/includes/item_adjustments_ui.inc:181
+ #: inventory/includes/stock_transfers_ui.inc:161
++#: manufacturing/view/wo_costs_view.php:46
+ #: manufacturing/includes/work_order_issue_ui.inc:169
 -#: purchasing/includes/ui/invoice_ui.inc:245
 -#: purchasing/includes/ui/invoice_ui.inc:247
 -#: purchasing/includes/ui/invoice_ui.inc:249
 -#: sales/customer_credit_invoice.php:364 sales/customer_delivery.php:519
 -#: sales/customer_invoice.php:578 sales/includes/ui/sales_credit_ui.inc:339
++#: purchasing/includes/ui/invoice_ui.inc:265
++#: purchasing/includes/ui/invoice_ui.inc:267
++#: purchasing/includes/ui/invoice_ui.inc:269
++#: sales/customer_credit_invoice.php:364 sales/customer_delivery.php:541
++#: sales/includes/ui/sales_credit_ui.inc:339
  msgid "Memo"
  msgstr ""
  
- #: ../gl/accruals.php:166
 -#: gl/accruals.php:162
++#: gl/accruals.php:166
  msgid "Revenue / Cost Accruals have been processed."
  msgstr ""
  
- #: ../gl/accruals.php:172
 -#: gl/accruals.php:168
++#: gl/accruals.php:172
  msgid "Showing GL Transactions."
  msgstr ""
  
- #: ../gl/accruals.php:184
 -#: gl/accruals.php:180
++#: gl/accruals.php:184
  msgid "Weekly"
  msgstr ""
  
- #: ../gl/accruals.php:185
 -#: gl/accruals.php:181
++#: gl/accruals.php:185
  msgid "Bi-weekly"
  msgstr ""
  
- #: ../gl/accruals.php:186
- #: ../gl/manage/gl_quick_entries.php:240
- #: ../gl/includes/ui/gl_journal_ui.inc:57
- #: ../sales/create_recurrent_invoices.php:132
- #: ../sales/manage/recurrent_invoices.php:102
 -#: gl/accruals.php:182 gl/manage/gl_quick_entries.php:240
++#: gl/accruals.php:186 gl/manage/gl_quick_entries.php:240
+ #: gl/includes/ui/gl_journal_ui.inc:57 sales/create_recurrent_invoices.php:134
+ #: sales/manage/recurrent_invoices.php:102
  msgid "Monthly"
  msgstr ""
  
- #: ../gl/accruals.php:187
 -#: gl/accruals.php:183
++#: gl/accruals.php:187
  msgid "Quarterly"
  msgstr ""
  
- #: ../gl/accruals.php:199
 -#: gl/accruals.php:195
++#: gl/accruals.php:199
  msgid "First date of Accruals"
  msgstr ""
  
- #: ../gl/accruals.php:201
 -#: gl/accruals.php:197
++#: gl/accruals.php:201
  msgid "Accrued Balance Account"
  msgstr ""
  
- #: ../gl/accruals.php:204
 -#: gl/accruals.php:200
++#: gl/accruals.php:204
  msgid "Revenue / Cost Account"
  msgstr ""
  
- #: ../gl/accruals.php:212
- #: ../gl/gl_budget.php:91
- #: ../gl/gl_budget.php:93
- #: ../gl/inquiry/journal_inquiry.php:132
- #: ../gl/inquiry/tax_inquiry.php:82
- #: ../gl/manage/gl_quick_entries.php:261
- #: ../gl/manage/gl_quick_entries.php:263
- #: ../gl/manage/gl_quick_entries.php:265
- #: ../gl/manage/gl_quick_entries.php:339
- #: ../gl/view/bank_transfer_view.php:70
- #: ../gl/view/bank_transfer_view.php:80
- #: ../gl/view/gl_deposit_view.php:67
- #: ../gl/view/gl_deposit_view.php:100
- #: ../gl/view/gl_deposit_view.php:103
- #: ../gl/view/gl_deposit_view.php:106
- #: ../gl/view/gl_payment_view.php:65
- #: ../gl/view/gl_payment_view.php:99
- #: ../gl/view/gl_payment_view.php:102
- #: ../gl/view/gl_payment_view.php:105
- #: ../gl/includes/ui/gl_bank_ui.inc:151
- #: ../gl/includes/ui/gl_bank_ui.inc:154
- #: ../gl/includes/ui/gl_bank_ui.inc:157
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:125
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:128
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:131
- #: ../includes/sysnames.inc:133
- #: ../includes/ui/allocation_cart.inc:264
- #: ../includes/ui/ui_lists.inc:1182
- #: ../manufacturing/view/wo_costs_view.php:46
- #: ../manufacturing/includes/manufacturing_ui.inc:236
- #: ../purchasing/includes/ui/invoice_ui.inc:265
- #: ../purchasing/includes/ui/invoice_ui.inc:267
- #: ../purchasing/includes/ui/invoice_ui.inc:269
- #: ../purchasing/view/view_supp_payment.php:60
- #: ../purchasing/view/view_supp_payment.php:72
- #: ../reporting/rep102.php:241
- #: ../reporting/rep107.php:194
- #: ../reporting/rep107.php:251
- #: ../reporting/rep109.php:192
- #: ../reporting/rep110.php:195
- #: ../reporting/rep111.php:177
- #: ../reporting/rep113.php:181
- #: ../reporting/rep202.php:249
- #: ../reporting/rep209.php:200
- #: ../reporting/rep706.php:303
- #: ../reporting/rep707.php:321
- #: ../reporting/rep710.php:76
- #: ../sales/view/view_receipt.php:44
 -#: gl/accruals.php:208 gl/gl_budget.php:91 gl/gl_budget.php:93
++#: gl/accruals.php:212 gl/gl_budget.php:91 gl/gl_budget.php:93
+ #: gl/inquiry/journal_inquiry.php:132 gl/inquiry/tax_inquiry.php:82
+ #: gl/manage/gl_quick_entries.php:261 gl/manage/gl_quick_entries.php:263
+ #: gl/manage/gl_quick_entries.php:265 gl/manage/gl_quick_entries.php:339
+ #: gl/view/bank_transfer_view.php:70 gl/view/bank_transfer_view.php:80
+ #: gl/view/gl_deposit_view.php:67 gl/view/gl_deposit_view.php:100
+ #: gl/view/gl_deposit_view.php:103 gl/view/gl_deposit_view.php:106
+ #: gl/view/gl_payment_view.php:65 gl/view/gl_payment_view.php:99
+ #: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105
+ #: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_bank_ui.inc:155
 -#: gl/includes/ui/gl_bank_ui.inc:158 gl/includes/ui/gl_bank_ui.inc.orig:133
 -#: gl/includes/ui/gl_bank_ui.inc.orig:136
 -#: gl/includes/ui/gl_bank_ui.inc.orig:139 includes/sysnames.inc:132
 -#: includes/ui/allocation_cart.inc:263 includes/ui/sav.ui_lists.inc:1163
 -#: includes/ui/ui_lists.inc:1184
++#: gl/includes/ui/gl_bank_ui.inc:158 includes/sysnames.inc:133
++#: includes/ui/allocation_cart.inc:264 includes/ui/ui_lists.inc:1182
++#: manufacturing/view/wo_costs_view.php:46
+ #: manufacturing/includes/manufacturing_ui.inc:236
 -#: purchasing/includes/ui/invoice_ui.inc:245
 -#: purchasing/includes/ui/invoice_ui.inc:247
 -#: purchasing/includes/ui/invoice_ui.inc:249
++#: purchasing/includes/ui/invoice_ui.inc:265
++#: purchasing/includes/ui/invoice_ui.inc:267
++#: purchasing/includes/ui/invoice_ui.inc:269
+ #: purchasing/view/view_supp_payment.php:60
 -#: purchasing/view/view_supp_payment.php:72 reporting/rep102.php:245
 -#: reporting/rep107.php:179 reporting/rep109.php:189 reporting/rep110.php:193
 -#: reporting/rep111.php:174 reporting/rep113.php:178 reporting/rep202.php:253
 -#: reporting/rep209.php:192 reporting/rep706.php:309 reporting/rep707.php:327
 -#: reporting/rep710.php:78 sales/view/view_receipt.php:44
++#: purchasing/view/view_supp_payment.php:72 reporting/rep202.php:253
++#: reporting/rep209.php:195 reporting/rep706.php:309 reporting/rep710.php:78
++#: sales/view/view_receipt.php:44
  msgid "Amount"
  msgstr ""
  
- #: ../gl/accruals.php:212
 -#: gl/accruals.php:208
++#: gl/accruals.php:212
  msgid "Search Amount"
  msgstr ""
  
- #: ../gl/accruals.php:214
 -#: gl/accruals.php:210
++#: gl/accruals.php:214
  msgid "Frequency"
  msgstr ""
  
- #: ../gl/accruals.php:216
 -#: gl/accruals.php:212
++#: gl/accruals.php:216
  msgid "Periods"
  msgstr ""
  
- #: ../gl/accruals.php:220
 -#: gl/accruals.php:216
++#: gl/accruals.php:220
  msgid "Show GL Rows"
  msgstr ""
  
- #: ../gl/accruals.php:221
 -#: gl/accruals.php:217
++#: gl/accruals.php:221
  msgid "Process Accruals"
  msgstr ""
  
- #: ../gl/accruals.php:222
 -#: gl/accruals.php:218
++#: gl/accruals.php:222
  msgid "Are you sure you want to post accruals?"
  msgstr ""
  
@@@ -4159,64 -3425,56 +3385,56 @@@ msgstr "
  msgid "Reconcile this transaction"
  msgstr ""
  
- #: ../gl/bank_account_reconcile.php:164
- #: ../gl/inquiry/bank_inquiry.php:47
- #: ../gl/inquiry/gl_account_inquiry.php:70
 -#: gl/bank_account_reconcile.php:166 gl/inquiry/bank_inquiry.php:47
++#: gl/bank_account_reconcile.php:164 gl/inquiry/bank_inquiry.php:47
+ #: gl/inquiry/gl_account_inquiry.php:70
  msgid "Account:"
  msgstr ""
  
- #: ../gl/bank_account_reconcile.php:166
 -#: gl/bank_account_reconcile.php:168
++#: gl/bank_account_reconcile.php:166
  msgid "Bank Statement:"
  msgstr ""
  
- #: ../gl/bank_account_reconcile.php:167
- #: ../inventory/purchasing_data.php.orig:235
 -#: gl/bank_account_reconcile.php:169
++#: gl/bank_account_reconcile.php:167
  msgid "New"
  msgstr ""
  
- #: ../gl/bank_account_reconcile.php:196
 -#: gl/bank_account_reconcile.php:198
++#: gl/bank_account_reconcile.php:196
  msgid "Reconcile Date"
  msgstr ""
  
- #: ../gl/bank_account_reconcile.php:196
 -#: gl/bank_account_reconcile.php:198
++#: gl/bank_account_reconcile.php:196
  msgid "Beginning<br>Balance"
  msgstr ""
  
- #: ../gl/bank_account_reconcile.php:197
 -#: gl/bank_account_reconcile.php:199
++#: gl/bank_account_reconcile.php:197
  msgid "Ending<br>Balance"
  msgstr ""
  
- #: ../gl/bank_account_reconcile.php:197
 -#: gl/bank_account_reconcile.php:199
++#: gl/bank_account_reconcile.php:197
  msgid "Account<br>Total"
  msgstr ""
  
- #: ../gl/bank_account_reconcile.php:197
 -#: gl/bank_account_reconcile.php:199
++#: gl/bank_account_reconcile.php:197
  msgid "Reconciled<br>Amount"
  msgstr ""
  
- #: ../gl/bank_account_reconcile.php:197
- #: ../reporting/rep602.php:205
 -#: gl/bank_account_reconcile.php:199
++#: gl/bank_account_reconcile.php:197 reporting/rep602.php:205
  msgid "Difference"
  msgstr ""
  
- #: ../gl/bank_account_reconcile.php:201
 -#: gl/bank_account_reconcile.php:203
++#: gl/bank_account_reconcile.php:201
  msgid "Date of bank statement to reconcile"
  msgstr ""
  
- #: ../gl/bank_account_reconcile.php:237
- #: ../gl/inquiry/bank_inquiry.php:71
- #: ../gl/inquiry/gl_account_inquiry.php:141
- #: ../gl/inquiry/gl_account_inquiry.php:143
- #: ../gl/view/accrual_trans.php:60
- #: ../reporting/rep601.php:76
- #: ../reporting/rep602.php:80
- #: ../reporting/rep704.php:80
- #: ../reporting/rep704.php:82
- #: ../reporting/rep704.php:85
 -#: gl/bank_account_reconcile.php:239 gl/inquiry/bank_inquiry.php:71
++#: gl/bank_account_reconcile.php:237 gl/inquiry/bank_inquiry.php:71
+ #: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
 -#: gl/view/accrual_trans.php:60 gl/view/gl_trans_view.php:36
 -#: reporting/rep601.php:79 reporting/rep704.php:84 reporting/rep704.php:86
++#: gl/view/accrual_trans.php:60 reporting/rep601.php:79
++#: reporting/rep602.php:80 reporting/rep704.php:84 reporting/rep704.php:86
+ #: reporting/rep704.php:89
  msgid "Person/Item"
  msgstr ""
  
- #: ../gl/bank_account_reconcile.php:247
 -#: gl/bank_account_reconcile.php:249
++#: gl/bank_account_reconcile.php:247
  msgid "Reconcile"
  msgstr ""
  
@@@ -4250,16 -3506,13 +3466,12 @@@ msgstr "
  msgid "Transfer Date:"
  msgstr ""
  
- #: ../gl/bank_transfer.php:87
- #: ../gl/bank_transfer.php:94
- #: ../sales/customer_payments.php:411
+ #: gl/bank_transfer.php:87 gl/bank_transfer.php:94
 -#: sales/customer_payments.php:396
  msgid "Amount:"
  msgstr ""
  
- #: ../gl/bank_transfer.php:88
- #: ../gl/bank_transfer.php:95
- #: ../purchasing/supplier_payment.php:302
- #: ../sales/customer_payments.php:396
+ #: gl/bank_transfer.php:88 gl/bank_transfer.php:95
 -#: purchasing/supplier_payment.php:303 sales/customer_payments.php:381
++#: purchasing/supplier_payment.php:307
  msgid "Bank Charge:"
  msgstr ""
  
@@@ -4274,8 -3525,7 +3484,7 @@@ msgstr "
  msgid "The entered amount is invalid or less than zero."
  msgstr ""
  
- #: ../gl/bank_transfer.php:133
- #: ../gl/gl_bank.php:228
 -#: gl/bank_transfer.php:133 gl/gl_bank.php:225
++#: gl/bank_transfer.php:133 gl/gl_bank.php:228
  msgid "The total bank amount cannot be 0."
  msgstr ""
  
@@@ -4284,8 -3534,7 +3493,7 @@@
  msgid "The total bank amount exceeds allowed limit (%s) for source account."
  msgstr ""
  
- #: ../gl/bank_transfer.php:150
- #: ../gl/gl_bank.php:245
 -#: gl/bank_transfer.php:150 gl/gl_bank.php:242
++#: gl/bank_transfer.php:150 gl/gl_bank.php:245
  #, php-format
  msgid ""
  "The bank transaction would result in exceed of authorized overdraft limit "
@@@ -4299,24 -3547,15 +3506,14 @@@ msgid "
  "The Bank Charge Account has not been set in System and General GL Setup."
  msgstr ""
  
- #: ../gl/bank_transfer.php:169
- #: ../gl/gl_bank.php:252
- #: ../gl/gl_journal.php:173
- #: ../gl/manage/revaluate_currencies.php:65
- #: ../inventory/adjustments.php:96
- #: ../inventory/transfers.php:93
- #: ../manufacturing/work_order_add_finished.php:77
- #: ../manufacturing/work_order_entry.php:132
- #: ../manufacturing/work_order_issue.php:90
- #: ../purchasing/po_receive_items.php:186
- #: ../purchasing/supplier_payment.php:196
- #: ../sales/credit_note_entry.php:147
- #: ../sales/customer_credit_invoice.php:102
- #: ../sales/customer_delivery.php:178
- #: ../sales/customer_delivery.php.orig:178
- #: ../sales/customer_invoice.php:332
- #: ../sales/customer_payments.php:151
- #: ../sales/sales_order_entry.php:428
 -#: gl/bank_transfer.php:169 gl/gl_bank.php:249 gl/gl_journal.php:168
++#: gl/bank_transfer.php:169 gl/gl_bank.php:252 gl/gl_journal.php:173
+ #: gl/manage/revaluate_currencies.php:65 inventory/adjustments.php:94
+ #: inventory/transfers.php:91 manufacturing/work_order_add_finished.php:77
 -#: manufacturing/work_order_entry.php:132
 -#: manufacturing/work_order_issue.php:89 purchasing/po_receive_items.php:188
++#: manufacturing/work_order_issue.php:90 purchasing/po_receive_items.php:186
+ #: purchasing/supplier_payment.php:197 sales/credit_note_entry.php:147
 -#: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:166
 -#: sales/customer_invoice.php:280 sales/customer_payments.php:157
 -#: sales/sales_order_entry.php:412
++#: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:178
++#: sales/customer_invoice.php:332 sales/customer_payments.php:157
++#: sales/sales_order_entry.php:428
  msgid "You must enter a reference."
  msgstr ""
  
@@@ -4340,116 -3579,109 +3537,108 @@@ msgstr "
  msgid "Modify Bank Deposit Entry"
  msgstr ""
  
- #: ../gl/gl_bank.php:76
 -#: gl/gl_bank.php:73
++#: gl/gl_bank.php:76
  #, php-format
  msgid "Payment %d has been entered"
  msgstr ""
  
- #: ../gl/gl_bank.php:78
- #: ../gl/gl_bank.php:96
 -#: gl/gl_bank.php:75 gl/gl_bank.php:93
++#: gl/gl_bank.php:78 gl/gl_bank.php:96
  msgid "&View the GL Postings for this Payment"
  msgstr ""
  
- #: ../gl/gl_bank.php:80
- #: ../gl/gl_bank.php:98
 -#: gl/gl_bank.php:77 gl/gl_bank.php:95
++#: gl/gl_bank.php:80 gl/gl_bank.php:98
  msgid "Enter Another &Payment"
  msgstr ""
  
- #: ../gl/gl_bank.php:82
- #: ../gl/gl_bank.php:100
 -#: gl/gl_bank.php:79 gl/gl_bank.php:97
++#: gl/gl_bank.php:82 gl/gl_bank.php:100
  msgid "Enter A &Deposit"
  msgstr ""
  
- #: ../gl/gl_bank.php:84
- #: ../gl/gl_journal.php:63
- #: ../inventory/adjustments.php:50
- #: ../manufacturing/work_order_entry.php:68
- #: ../purchasing/po_entry_items.php:115
- #: ../purchasing/po_entry_items.php:139
- #: ../purchasing/po_entry_items.php.orig:112
- #: ../purchasing/po_entry_items.php.orig:136
- #: ../purchasing/supplier_credit.php:84
- #: ../purchasing/supplier_invoice.php:75
- #: ../sales/credit_note_entry.php:77
- #: ../sales/customer_credit_invoice.php:62
- #: ../sales/customer_invoice.php:69
- #: ../sales/sales_order_entry.php:240
 -#: gl/gl_bank.php:81 gl/gl_journal.php:61 inventory/adjustments.php:50
 -#: manufacturing/work_order_entry.php:68 purchasing/po_entry_items.php:112
 -#: purchasing/po_entry_items.php:136 purchasing/supplier_credit.php:49
 -#: purchasing/supplier_invoice.php:52 sales/credit_note_entry.php:77
 -#: sales/customer_credit_invoice.php:62 sales/customer_invoice.php:66
 -#: sales/sales_order_entry.php:234
++#: gl/gl_bank.php:84 gl/gl_journal.php:63 inventory/adjustments.php:50
++#: purchasing/po_entry_items.php:115 purchasing/po_entry_items.php:139
++#: purchasing/supplier_credit.php:84 purchasing/supplier_invoice.php:75
++#: sales/credit_note_entry.php:77 sales/customer_credit_invoice.php:62
++#: sales/customer_invoice.php:69 sales/sales_order_entry.php:240
  msgid "Add an Attachment"
  msgstr ""
  
- #: ../gl/gl_bank.php:110
 -#: gl/gl_bank.php:91
++#: gl/gl_bank.php:94
+ #, php-format
+ msgid "Payment %d has been modified"
+ msgstr ""
+ 
 -#: gl/gl_bank.php:107
++#: gl/gl_bank.php:110
  #, php-format
  msgid "Deposit %d has been entered"
  msgstr ""
  
- #: ../gl/gl_bank.php:112
 -#: gl/gl_bank.php:109
++#: gl/gl_bank.php:112
  msgid "View the GL Postings for this Deposit"
  msgstr ""
  
- #: ../gl/gl_bank.php:114
 -#: gl/gl_bank.php:111
++#: gl/gl_bank.php:114
  msgid "Enter Another Deposit"
  msgstr ""
  
- #: ../gl/gl_bank.php:116
 -#: gl/gl_bank.php:113
++#: gl/gl_bank.php:116
  msgid "Enter A Payment"
  msgstr ""
  
- #: ../gl/gl_bank.php:125
 -#: gl/gl_bank.php:122
++#: gl/gl_bank.php:125
  #, php-format
  msgid "Deposit %d has been modified"
  msgstr ""
  
- #: ../gl/gl_bank.php:127
 -#: gl/gl_bank.php:124
++#: gl/gl_bank.php:127
  msgid "&View the GL Postings for this Deposit"
  msgstr ""
  
- #: ../gl/gl_bank.php:129
 -#: gl/gl_bank.php:126
++#: gl/gl_bank.php:129
  msgid "Enter Another &Deposit"
  msgstr ""
  
- #: ../gl/gl_bank.php:131
 -#: gl/gl_bank.php:128
++#: gl/gl_bank.php:131
  msgid "Enter A &Payment"
  msgstr ""
  
- #: ../gl/gl_bank.php:222
 -#: gl/gl_bank.php:219
++#: gl/gl_bank.php:222
  msgid "You must enter at least one payment line."
  msgstr ""
  
- #: ../gl/gl_bank.php:239
- #: ../purchasing/supplier_payment.php:189
 -#: gl/gl_bank.php:236 purchasing/supplier_payment.php:190
++#: gl/gl_bank.php:239 purchasing/supplier_payment.php:190
  #, php-format
  msgid "The total bank amount exceeds allowed limit (%s)."
  msgstr ""
  
- #: ../gl/gl_bank.php:264
 -#: gl/gl_bank.php:261
++#: gl/gl_bank.php:264
  msgid "The entered date for the payment is invalid."
  msgstr ""
  
- #: ../gl/gl_bank.php:276
 -#: gl/gl_bank.php:273
++#: gl/gl_bank.php:276
  msgid "You have to select customer and customer branch."
  msgstr ""
  
- #: ../gl/gl_bank.php:280
 -#: gl/gl_bank.php:277
++#: gl/gl_bank.php:280
  msgid "You have to select supplier."
  msgstr ""
  
- #: ../gl/gl_bank.php:328
 -#: gl/gl_bank.php:325
++#: gl/gl_bank.php:328
  msgid "The amount entered is not a valid number or is less than zero."
  msgstr ""
  
- #: ../gl/gl_bank.php:400
 -#: gl/gl_bank.php:397
++#: gl/gl_bank.php:400
  msgid "Payment Items"
  msgstr ""
  
- #: ../gl/gl_bank.php:400
 -#: gl/gl_bank.php:397
++#: gl/gl_bank.php:400
  msgid "Deposit Items"
  msgstr ""
  
- #: ../gl/gl_bank.php:408
 -#: gl/gl_bank.php:405
++#: gl/gl_bank.php:408
  msgid "Process Payment"
  msgstr ""
  
- #: ../gl/gl_bank.php:408
 -#: gl/gl_bank.php:405
++#: gl/gl_bank.php:408
  msgid "Process Deposit"
  msgstr ""
  
@@@ -4457,8 -3689,8 +3646,7 @@@
  msgid "Budget Entry"
  msgstr ""
  
- #: ../gl/gl_budget.php:26
- #: ../gl/manage/gl_accounts.php:23
+ #: gl/gl_budget.php:26 gl/manage/gl_accounts.php:23
 -#: gl/manage/gl_accounts.php.orig:23
  msgid ""
  "There are no account groups defined. Please define at least one account "
  "group before entering accounts."
@@@ -4472,9 -3704,9 +3660,8 @@@ msgstr "
  msgid "The Budget has been deleted."
  msgstr ""
  
- #: ../gl/gl_budget.php:64
- #: ../gl/manage/gl_accounts.php:230
- #: ../gl/manage/gl_accounts.php:240
 -#: gl/gl_budget.php:64 gl/manage/gl_accounts.php:231
 -#: gl/manage/gl_accounts.php:241 gl/manage/gl_accounts.php.orig:230
 -#: gl/manage/gl_accounts.php.orig:240
++#: gl/gl_budget.php:64 gl/manage/gl_accounts.php:230
++#: gl/manage/gl_accounts.php:240
  msgid "Account Code:"
  msgstr ""
  
@@@ -4483,36 -3714,17 +3669,17 @@@
  msgid "Get"
  msgstr ""
  
- #: ../gl/gl_budget.php:91
- #: ../gl/gl_budget.php:93
- #: ../gl/inquiry/profit_loss.php:231
- #: ../gl/manage/gl_quick_entries.php:240
- #: ../reporting/rep101.php:136
- #: ../reporting/rep105.php:116
- #: ../reporting/rep106.php:90
- #: ../reporting/rep114.php:88
- #: ../reporting/rep201.php:124
- #: ../reporting/rep304.php:119
- #: ../reporting/rep305.php:103
- #: ../reporting/rep601.php:82
- #: ../reporting/rep602.php:86
- #: ../reporting/rep702.php:57
- #: ../reporting/rep704.php:91
- #: ../reporting/rep704.php:101
- #: ../reporting/rep704.php:109
- #: ../reporting/rep706.php:181
- #: ../reporting/rep706.php:189
- #: ../reporting/rep706.php:199
- #: ../reporting/rep706.php:207
- #: ../reporting/rep707.php:206
- #: ../reporting/rep707.php:213
- #: ../reporting/rep707.php:223
- #: ../reporting/rep707.php:231
- #: ../reporting/rep708.php:187
- #: ../reporting/rep708.php:196
- #: ../reporting/rep708.php:203
- #: ../reporting/rep709.php:104
- #: ../reporting/rep710.php:83
 -#: gl/gl_budget.php:91 gl/gl_budget.php:93 gl/inquiry/profit_loss.php:236
 -#: gl/manage/gl_quick_entries.php:240 reporting/rep101.php:138
 -#: reporting/rep105.php:118 reporting/rep106.php:92 reporting/rep114.php:90
 -#: reporting/rep201.php:126 reporting/rep304.php:121 reporting/rep305.php:105
 -#: reporting/rep306.php:148 reporting/rep307.php:122 reporting/rep308.php:154
 -#: reporting/rep601.php:85 reporting/rep702.php:59 reporting/rep704.php:95
++#: gl/gl_budget.php:91 gl/gl_budget.php:93 gl/inquiry/profit_loss.php:231
++#: gl/manage/gl_quick_entries.php:240 reporting/rep105.php:118
++#: reporting/rep106.php:92 reporting/rep114.php:90 reporting/rep304.php:121
++#: reporting/rep305.php:105 reporting/rep306.php:148 reporting/rep307.php:122
++#: reporting/rep308.php:155 reporting/rep309.php:103 reporting/rep601.php:85
++#: reporting/rep602.php:86 reporting/rep702.php:59 reporting/rep704.php:95
+ #: reporting/rep704.php:105 reporting/rep704.php:113 reporting/rep706.php:185
+ #: reporting/rep706.php:193 reporting/rep706.php:203 reporting/rep706.php:211
+ #: reporting/rep707.php:210 reporting/rep707.php:217 reporting/rep707.php:227
 -#: reporting/rep707.php:235 reporting/rep708.php:191 reporting/rep708.php:200
 -#: reporting/rep708.php:207 reporting/rep709.php:106 reporting/rep710.php:85
++#: reporting/rep707.php:235 reporting/rep708.php:200 reporting/rep708.php:209
++#: reporting/rep708.php:216 reporting/rep709.php:106 reporting/rep710.php:85
  msgid "Period"
  msgstr ""
  
@@@ -4525,74 -3736,42 +3691,40 @@@ msgstr "
  msgid "Last Year"
  msgstr ""
  
- #: ../gl/gl_budget.php:127
- #: ../gl/inquiry/balance_sheet.php:98
- #: ../gl/inquiry/balance_sheet.php:205
- #: ../gl/inquiry/balance_sheet.php:236
- #: ../gl/inquiry/gl_trial_balance.php:209
- #: ../gl/inquiry/profit_loss.php:115
- #: ../gl/inquiry/profit_loss.php:283
- #: ../gl/view/gl_deposit_view.php:132
- #: ../gl/view/gl_payment_view.php:131
- #: ../gl/view/gl_trans_view.php:115
- #: ../gl/includes/ui/gl_bank_ui.inc:200
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:174
- #: ../gl/includes/ui/gl_journal_ui.inc:153
- #: ../inventory/includes/item_adjustments_ui.inc:63
- #: ../inventory/includes/item_adjustments_ui.inc:102
- #: ../manufacturing/includes/manufacturing_ui.inc:178
- #: ../purchasing/includes/ui/invoice_ui.inc:329
- #: ../purchasing/includes/ui/invoice_ui.inc:495
- #: ../purchasing/includes/ui/invoice_ui.inc:566
- #: ../purchasing/po_receive_items.php:63
- #: ../purchasing/view/view_po.php:140
- #: ../purchasing/allocations/supplier_allocation_main.php:100
- #: ../reporting/rep101.php:237
- #: ../reporting/rep106.php:82
- #: ../reporting/rep106.php:115
- #: ../reporting/rep106.php:158
- #: ../reporting/rep114.php:156
- #: ../reporting/rep201.php:221
- #: ../reporting/rep203.php:92
- #: ../reporting/rep203.php:167
- #: ../reporting/rep204.php:109
- #: ../reporting/rep204.php:137
- #: ../reporting/rep301.php:130
- #: ../reporting/rep301.php:167
- #: ../reporting/rep304.php:142
- #: ../reporting/rep304.php:184
- #: ../reporting/rep305.php:98
- #: ../reporting/rep305.php:122
- #: ../reporting/rep305.php:178
- #: ../reporting/rep702.php:138
- #: ../reporting/rep705.php:152
- #: ../reporting/rep705.php:309
- #: ../reporting/rep706.php:106
- #: ../reporting/rep706.php:249
- #: ../reporting/rep706.php:284
- #: ../reporting/rep707.php:115
- #: ../reporting/rep707.php:291
- #: ../reporting/rep708.php:235
- #: ../reporting/includes/doctext.inc:30
- #: ../reporting/includes/doctext.inc:192
- #: ../sales/customer_credit_invoice.php:281
- #: ../sales/customer_delivery.php.orig:446
- #: ../sales/customer_invoice.php:542
- #: ../sales/customer_invoice.php:545
- #: ../sales/allocations/customer_allocation_main.php:99
- #: ../sales/view/view_credit.php:91
- #: ../sales/view/view_dispatch.php:113
- #: ../sales/view/view_invoice.php:116
- #: ../sales/view/view_sales_order.php:109
- #: ../sales/view/view_sales_order.php:142
- #: ../sales/view/view_sales_order.php:179
- #: ../sales/view/view_sales_order.php:220
- #: ../sales/view/view_sales_order.php.orig:96
- #: ../sales/view/view_sales_order.php.orig:129
- #: ../sales/view/view_sales_order.php.orig:161
- #: ../sales/view/view_sales_order.php.orig:202
- #: ../sales/includes/ui/sales_credit_ui.inc:168
- #: ../sales/includes/ui/sales_order_ui.inc.orig:142
+ #: gl/gl_budget.php:127 gl/inquiry/balance_sheet.php:98
+ #: gl/inquiry/balance_sheet.php:205 gl/inquiry/balance_sheet.php:236
 -#: gl/inquiry/gl_trial_balance.php:215 gl/inquiry/profit_loss.php:115
 -#: gl/inquiry/profit_loss.php:288 gl/view/gl_deposit_view.php:132
 -#: gl/view/gl_payment_view.php:131 gl/view/gl_trans_view.php:106
 -#: gl/includes/ui/gl_bank_ui.inc:201 gl/includes/ui/gl_bank_ui.inc.orig:182
 -#: gl/includes/ui/gl_journal_ui.inc:141
++#: gl/inquiry/gl_trial_balance.php:218 gl/inquiry/profit_loss.php:115
++#: gl/inquiry/profit_loss.php:283 gl/view/gl_deposit_view.php:132
++#: gl/view/gl_payment_view.php:131 gl/view/gl_trans_view.php:115
++#: gl/includes/ui/gl_bank_ui.inc:201 gl/includes/ui/gl_journal_ui.inc:153
+ #: inventory/includes/item_adjustments_ui.inc:63
+ #: inventory/includes/item_adjustments_ui.inc:102
+ #: manufacturing/includes/manufacturing_ui.inc:178
 -#: purchasing/includes/ui/invoice_ui.inc:309
 -#: purchasing/includes/ui/invoice_ui.inc:474
 -#: purchasing/includes/ui/invoice_ui.inc:544
++#: purchasing/includes/ui/invoice_ui.inc:329
++#: purchasing/includes/ui/invoice_ui.inc:495
++#: purchasing/includes/ui/invoice_ui.inc:566
+ #: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140
+ #: purchasing/allocations/supplier_allocation_main.php:100
 -#: reporting/rep101.php:241 reporting/rep106.php:84 reporting/rep106.php:119
 -#: reporting/rep106.php:162 reporting/rep114.php:161 reporting/rep201.php:225
++#: reporting/rep106.php:84 reporting/rep106.php:119 reporting/rep106.php:162
+ #: reporting/rep203.php:94 reporting/rep203.php:171 reporting/rep204.php:113
+ #: reporting/rep204.php:141 reporting/rep301.php:133 reporting/rep301.php:170
+ #: reporting/rep304.php:146 reporting/rep304.php:188 reporting/rep305.php:100
+ #: reporting/rep305.php:126 reporting/rep305.php:182 reporting/rep306.php:141
+ #: reporting/rep306.php:177 reporting/rep306.php:197 reporting/rep306.php:213
+ #: reporting/rep306.php:262 reporting/rep306.php:277 reporting/rep306.php:288
 -#: reporting/rep702.php:142 reporting/rep705.php:152 reporting/rep705.php:315
 -#: reporting/rep706.php:106 reporting/rep706.php:255 reporting/rep706.php:290
 -#: reporting/rep707.php:115 reporting/rep707.php:297 reporting/rep708.php:244
 -#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170
 -#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:433
 -#: sales/customer_invoice.php:470
++#: reporting/rep309.php:126 reporting/rep309.php:153 reporting/rep702.php:142
++#: reporting/rep705.php:152 reporting/rep706.php:106 reporting/rep706.php:255
++#: reporting/rep706.php:290 reporting/rep707.php:115
++#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:192
++#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:447
++#: sales/customer_invoice.php:542 sales/customer_invoice.php:545
+ #: sales/allocations/customer_allocation_main.php:99
+ #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
 -#: sales/view/view_invoice.php:114 sales/view/view_sales_order.php:96
 -#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
 -#: sales/view/view_sales_order.php:202
++#: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:109
++#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
++#: sales/view/view_sales_order.php:220
+ #: sales/includes/ui/sales_credit_ui.inc:168
 -#: sales/includes/ui/sales_order_ui.inc:146
++#: sales/includes/ui/sales_order_ui.inc:147
  msgid "Total"
  msgstr ""
  
@@@ -4601,92 -3780,85 +3733,85 @@@
  msgid "Modifying Journal Transaction # %d."
  msgstr ""
  
- #: ../gl/gl_journal.php:36
- #: ../includes/sysnames.inc:22
- #: ../includes/sysnames.inc:150
 -#: gl/gl_journal.php:36 includes/sysnames.inc:22 includes/sysnames.inc:149
++#: gl/gl_journal.php:36 includes/sysnames.inc:22 includes/sysnames.inc:150
  msgid "Journal Entry"
  msgstr ""
  
- #: ../gl/gl_journal.php:56
 -#: gl/gl_journal.php:54
++#: gl/gl_journal.php:56
  msgid "Journal entry has been entered"
  msgstr ""
  
- #: ../gl/gl_journal.php:58
- #: ../gl/gl_journal.php:73
 -#: gl/gl_journal.php:56 gl/gl_journal.php:71
++#: gl/gl_journal.php:58 gl/gl_journal.php:73
  msgid "&View this Journal Entry"
  msgstr ""
  
- #: ../gl/gl_journal.php:61
 -#: gl/gl_journal.php:59
++#: gl/gl_journal.php:61
  msgid "Enter &New Journal Entry"
  msgstr ""
  
- #: ../gl/gl_journal.php:71
 -#: gl/gl_journal.php:69
++#: gl/gl_journal.php:71
  msgid "Journal entry has been updated"
  msgstr ""
  
- #: ../gl/gl_journal.php:75
 -#: gl/gl_journal.php:73
++#: gl/gl_journal.php:75
  msgid "Return to Journal &Inquiry"
  msgstr ""
  
- #: ../gl/gl_journal.php:90
 -#: gl/gl_journal.php:86
++#: gl/gl_journal.php:90
  msgid ""
  "You can edit directly only journal entries created via Journal Entry page."
  msgstr ""
  
- #: ../gl/gl_journal.php:91
 -#: gl/gl_journal.php:87
++#: gl/gl_journal.php:91
  msgid "Entry &New Journal Entry"
  msgstr ""
  
- #: ../gl/gl_journal.php:148
 -#: gl/gl_journal.php:143
++#: gl/gl_journal.php:148
  msgid "You must enter at least one journal line."
  msgstr ""
  
- #: ../gl/gl_journal.php:154
- #: ../includes/ui/gl_cart.inc:128
 -#: gl/gl_journal.php:149
++#: gl/gl_journal.php:154
  msgid ""
  "The journal must balance (debits equal to credits) before it can be "
  "processed."
  msgstr ""
  
- #: ../gl/gl_journal.php:216
- #: ../gl/gl_journal.php:223
 -#: gl/gl_journal.php:211 gl/gl_journal.php:218
++#: gl/gl_journal.php:216 gl/gl_journal.php:223
  msgid "Dimension is closed."
  msgstr ""
  
- #: ../gl/gl_journal.php:230
 -#: gl/gl_journal.php:225
++#: gl/gl_journal.php:230
  msgid "You must enter either a debit amount or a credit amount."
  msgstr ""
  
- #: ../gl/gl_journal.php:237
 -#: gl/gl_journal.php:232
++#: gl/gl_journal.php:237
  msgid "The debit amount entered is not a valid number or is less than zero."
  msgstr ""
  
- #: ../gl/gl_journal.php:242
 -#: gl/gl_journal.php:237
++#: gl/gl_journal.php:242
  msgid "The credit amount entered is not a valid number or is less than zero."
  msgstr ""
  
- #: ../gl/gl_journal.php:248
- #: ../includes/ui/ui_view.inc:674
- #: ../purchasing/supplier_credit.php:136
- #: ../purchasing/supplier_invoice.php:144
 -#: gl/gl_journal.php:243 includes/ui/ui_view.inc:674
 -#: purchasing/supplier_credit.php:119 purchasing/supplier_invoice.php:119
++#: gl/gl_journal.php:248 includes/ui/ui_view.inc:675
++#: purchasing/supplier_credit.php:136 purchasing/supplier_invoice.php:144
  msgid "Cannot post to GL account used by more than one tax type."
  msgstr ""
  
- #: ../gl/gl_journal.php:255
 -#: gl/gl_journal.php:250
++#: gl/gl_journal.php:255
  msgid ""
  "You cannot make a journal entry for a bank account. Please use one of the "
  "banking functions for bank transactions."
  msgstr ""
  
- #: ../gl/gl_journal.php:334
 -#: gl/gl_journal.php:329
++#: gl/gl_journal.php:334
  msgid "Rows"
  msgstr ""
  
- #: ../gl/gl_journal.php:340
 -#: gl/gl_journal.php:335
++#: gl/gl_journal.php:340
  msgid "Process Journal Entry"
  msgstr ""
  
- #: ../gl/gl_journal.php:341
 -#: gl/gl_journal.php:336
++#: gl/gl_journal.php:341
  msgid "Process journal entry only if debits equal to credits"
  msgstr ""
  
@@@ -4698,19 -3870,14 +3823,13 @@@ msgstr "
  msgid "As at:"
  msgstr ""
  
- #: ../gl/inquiry/balance_sheet.php:228
- #: ../gl/inquiry/profit_loss.php:294
- #: ../reporting/rep705.php:319
- #: ../reporting/rep706.php:272
- #: ../reporting/rep706.php:297
- #: ../reporting/rep707.php:303
- #: ../reporting/rep707.php:309
 -#: gl/inquiry/balance_sheet.php:228 gl/inquiry/profit_loss.php:299
 -#: reporting/rep705.php:325 reporting/rep706.php:278 reporting/rep706.php:303
 -#: reporting/rep707.php:309 reporting/rep707.php:315
++#: gl/inquiry/balance_sheet.php:228 gl/inquiry/profit_loss.php:294
++#: reporting/rep706.php:278 reporting/rep706.php:303
  msgid "Calculated Return"
  msgstr ""
  
- #: ../gl/inquiry/balance_sheet.php:236
- #: ../includes/sysnames.inc:121
- #: ../reporting/rep706.php:284
 -#: gl/inquiry/balance_sheet.php:236 includes/sysnames.inc:120
++#: gl/inquiry/balance_sheet.php:236 includes/sysnames.inc:121
+ #: reporting/rep706.php:290
  msgid "Liabilities"
  msgstr ""
  
@@@ -4729,21 -3893,14 +3845,14 @@@ msgstr "
  msgid "Bank Statement"
  msgstr ""
  
- #: ../gl/inquiry/bank_inquiry.php:78
- #: ../gl/inquiry/gl_account_inquiry.php:162
- #: ../reporting/rep601.php:99
- #: ../reporting/rep602.php:103
- #: ../reporting/rep704.php:138
+ #: gl/inquiry/bank_inquiry.php:78 gl/inquiry/gl_account_inquiry.php:162
 -#: reporting/rep601.php:104 reporting/rep704.php:144
++#: reporting/rep601.php:104 reporting/rep602.php:103 reporting/rep704.php:144
  msgid "Opening Balance"
  msgstr ""
  
- #: ../gl/inquiry/bank_inquiry.php:123
- #: ../gl/inquiry/gl_account_inquiry.php:211
- #: ../gl/inquiry/gl_trial_balance.php:219
- #: ../reporting/rep601.php:150
- #: ../reporting/rep602.php:157
- #: ../reporting/rep704.php:186
- #: ../reporting/rep708.php:244
+ #: gl/inquiry/bank_inquiry.php:124 gl/inquiry/gl_account_inquiry.php:211
 -#: gl/inquiry/gl_trial_balance.php:225 reporting/rep601.php:157
 -#: reporting/rep704.php:192 reporting/rep708.php:253
++#: gl/inquiry/gl_trial_balance.php:228 reporting/rep601.php:157
++#: reporting/rep602.php:157 reporting/rep704.php:192
  msgid "Ending Balance"
  msgstr ""
  
@@@ -4768,67 -3925,51 +3877,50 @@@ msgid "
  "No general ledger transactions have been created for the specified criteria."
  msgstr ""
  
- #: ../gl/inquiry/gl_trial_balance.php:28
- #: ../reporting/rep708.php:206
 -#: gl/inquiry/gl_trial_balance.php:28 reporting/rep708.php:210
++#: gl/inquiry/gl_trial_balance.php:28 reporting/rep708.php:219
  msgid "Trial Balance"
  msgstr ""
  
- #: ../gl/inquiry/gl_trial_balance.php:55
 -#: gl/inquiry/gl_trial_balance.php:60
++#: gl/inquiry/gl_trial_balance.php:55
  msgid "No zero values"
  msgstr ""
  
- #: ../gl/inquiry/gl_trial_balance.php:56
- #: ../reporting/reports_main.php:301
- #: ../reporting/reports_main.php:346
- #: ../reporting/reports_main.php:386
 -#: gl/inquiry/gl_trial_balance.php:61 reporting/reports_main.php:362
 -#: reporting/reports_main.php:412 reporting/reports_main.php:457
++#: gl/inquiry/gl_trial_balance.php:56
  msgid "Only balances"
  msgstr ""
  
- #: ../gl/inquiry/gl_trial_balance.php:88
- #: ../gl/inquiry/gl_trial_balance.php:140
- #: ../reporting/rep706.php:302
- #: ../reporting/rep707.php:320
- #: ../reporting/rep708.php:51
- #: ../reporting/rep708.php:117
- #: ../sales/create_recurrent_invoices.php:132
- #: ../sales/manage/recurrent_invoices.php:102
 -#: gl/inquiry/gl_trial_balance.php:95 gl/inquiry/gl_trial_balance.php:147
 -#: reporting/rep706.php:308 reporting/rep707.php:326 reporting/rep708.php:51
 -#: reporting/rep708.php:117 sales/create_recurrent_invoices.php:134
++#: gl/inquiry/gl_trial_balance.php:88 gl/inquiry/gl_trial_balance.php:149
++#: reporting/rep706.php:308 reporting/rep708.php:51 reporting/rep708.php:126
++#: sales/create_recurrent_invoices.php:134
+ #: sales/manage/recurrent_invoices.php:102
  msgid "Group"
  msgstr ""
  
- #: ../gl/inquiry/gl_trial_balance.php:158
 -#: gl/inquiry/gl_trial_balance.php:164
++#: gl/inquiry/gl_trial_balance.php:167
  msgid "The from date cannot be bigger than the fiscal year end."
  msgstr ""
  
- #: ../gl/inquiry/gl_trial_balance.php:171
- #: ../gl/manage/bank_accounts.php:109
- #: ../gl/view/gl_trans_view.php:68
- #: ../gl/view/gl_trans_view.php:71
- #: ../gl/view/gl_trans_view.php:74
- #: ../reporting/rep701.php:109
- #: ../reporting/rep702.php:51
- #: ../reporting/rep705.php:234
- #: ../reporting/rep706.php:181
- #: ../reporting/rep707.php:206
- #: ../reporting/rep708.php:179
 -#: gl/inquiry/gl_trial_balance.php:177 gl/manage/bank_accounts.php:106
 -#: gl/manage/bank_accounts.php.orig:106 gl/view/gl_trans_view.php:63
 -#: gl/view/gl_trans_view.php:66 gl/view/gl_trans_view.php:69
 -#: reporting/rep701.php:111 reporting/rep702.php:53 reporting/rep705.php:238
 -#: reporting/rep706.php:185 reporting/rep707.php:210 reporting/rep708.php:183
++#: gl/inquiry/gl_trial_balance.php:180 gl/manage/bank_accounts.php:109
++#: gl/view/gl_trans_view.php:68 gl/view/gl_trans_view.php:71
++#: gl/view/gl_trans_view.php:74 reporting/rep701.php:111
++#: reporting/rep702.php:53 reporting/rep705.php:238 reporting/rep706.php:185
++#: reporting/rep707.php:210 reporting/rep708.php:192
  msgid "Account Name"
  msgstr ""
  
- #: ../gl/inquiry/gl_trial_balance.php:172
- #: ../reporting/rep708.php:172
 -#: gl/inquiry/gl_trial_balance.php:178 reporting/rep708.php:176
++#: gl/inquiry/gl_trial_balance.php:181 reporting/rep708.php:185
  msgid "Brought Forward"
  msgstr ""
  
- #: ../gl/inquiry/gl_trial_balance.php:173
- #: ../reporting/rep708.php:172
 -#: gl/inquiry/gl_trial_balance.php:179 reporting/rep708.php:176
++#: gl/inquiry/gl_trial_balance.php:182 reporting/rep708.php:185
  msgid "This Period"
  msgstr ""
  
- #: ../gl/inquiry/gl_trial_balance.php:192
 -#: gl/inquiry/gl_trial_balance.php:198 gl/manage/gl_account_types.php:128
++#: gl/inquiry/gl_trial_balance.php:201 gl/manage/gl_account_types.php:128
  msgid "Class"
  msgstr ""
  
- #: ../gl/inquiry/gl_trial_balance.php:227
- #: ../reporting/rep708.php:265
 -#: gl/inquiry/gl_trial_balance.php:233 reporting/rep708.php:274
++#: gl/inquiry/gl_trial_balance.php:236
  msgid ""
  "The Opening Balance is not in balance, probably due to a non closed Previous "
  "Fiscalyear."
@@@ -4854,10 -3995,8 +3946,8 @@@ msgstr "
  msgid "Trans #"
  msgstr ""
  
- #: ../gl/inquiry/journal_inquiry.php:134
- #: ../reporting/rep710.php:75
- #: ../reporting/rep710.php:85
- #: ../reporting/reports_main.php:400
+ #: gl/inquiry/journal_inquiry.php:134 reporting/rep710.php:77
 -#: reporting/rep710.php:87 reporting/reports_main.php:473
++#: reporting/rep710.php:87
  msgid "User"
  msgstr ""
  
@@@ -4865,37 -4004,31 +3955,30 @@@
  msgid "Profit & Loss Drilldown"
  msgstr ""
  
- #: ../gl/inquiry/profit_loss.php:168
- #: ../reporting/rep707.php:206
- #: ../reporting/includes/reports_classes.inc:238
 -#: gl/inquiry/profit_loss.php:173 reporting/rep707.php:210
++#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:210
+ #: reporting/includes/reports_classes.inc:245
  msgid "Accumulated"
  msgstr ""
  
- #: ../gl/inquiry/profit_loss.php:168
- #: ../reporting/rep707.php:251
- #: ../reporting/includes/reports_classes.inc:238
 -#: gl/inquiry/profit_loss.php:173 reporting/rep707.php:255
++#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:255
+ #: reporting/includes/reports_classes.inc:245
  msgid "Period Y-1"
  msgstr ""
  
- #: ../gl/inquiry/profit_loss.php:168
- #: ../reporting/rep707.php:242
- #: ../reporting/includes/reports_classes.inc:238
 -#: gl/inquiry/profit_loss.php:173 reporting/rep707.php:246
++#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:246
+ #: reporting/includes/reports_classes.inc:245
  msgid "Budget"
  msgstr ""
  
- #: ../gl/inquiry/profit_loss.php:169
- #: ../reporting/reports_main.php:289
- #: ../reporting/reports_main.php:335
- #: ../reporting/reports_main.php:376
 -#: gl/inquiry/profit_loss.php:174 reporting/reports_main.php:349
 -#: reporting/reports_main.php:400 reporting/reports_main.php:446
++#: gl/inquiry/profit_loss.php:169
  msgid "Compare to"
  msgstr ""
  
- #: ../gl/inquiry/profit_loss.php:230
 -#: gl/inquiry/profit_loss.php:235
++#: gl/inquiry/profit_loss.php:230
  msgid "Group/Account Name"
  msgstr ""
  
- #: ../gl/inquiry/profit_loss.php:233
- #: ../reporting/rep707.php:206
 -#: gl/inquiry/profit_loss.php:238 reporting/rep707.php:210
++#: gl/inquiry/profit_loss.php:233 reporting/rep707.php:210
  msgid "Achieved %"
  msgstr ""
  
@@@ -4903,13 -4036,11 +3986,11 @@@
  msgid "Tax Inquiry"
  msgstr ""
  
- #: ../gl/inquiry/tax_inquiry.php:82
- #: ../reporting/rep709.php:176
 -#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:183
++#: gl/inquiry/tax_inquiry.php:82
  msgid "Outputs"
  msgstr ""
  
- #: ../gl/inquiry/tax_inquiry.php:82
- #: ../reporting/rep709.php:176
 -#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:183
++#: gl/inquiry/tax_inquiry.php:82
  msgid "Inputs"
  msgstr ""
  
@@@ -4917,8 -4048,7 +3998,7 @@@
  msgid "Charged on sales"
  msgstr ""
  
- #: ../gl/inquiry/tax_inquiry.php:100
- #: ../reporting/rep709.php:176
 -#: gl/inquiry/tax_inquiry.php:100 reporting/rep709.php:183
++#: gl/inquiry/tax_inquiry.php:100
  msgid "Output Tax"
  msgstr ""
  
@@@ -4926,8 -4056,7 +4006,7 @@@
  msgid "Paid on purchases"
  msgstr ""
  
- #: ../gl/inquiry/tax_inquiry.php:106
- #: ../reporting/rep709.php:176
 -#: gl/inquiry/tax_inquiry.php:106 reporting/rep709.php:183
++#: gl/inquiry/tax_inquiry.php:106
  msgid "Input Tax"
  msgstr ""
  
@@@ -4935,204 -4064,140 +4014,170 @@@
  msgid "Net payable or collectible"
  msgstr ""
  
- #: ../gl/inquiry/tax_inquiry.php:119
- #: ../reporting/rep709.php:207
 -#: gl/inquiry/tax_inquiry.php:119 reporting/rep709.php:214
++#: gl/inquiry/tax_inquiry.php:119
  msgid "Total payable or refund"
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:16
- #: ../reporting/reports_main.php:238
 -#: gl/manage/bank_accounts.php:16 gl/manage/bank_accounts.php.orig:16
 -#: reporting/reports_main.php:291
++#: gl/manage/bank_accounts.php:16
  msgid "Bank Accounts"
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:33
 -#: gl/manage/bank_accounts.php:33 gl/manage/bank_accounts.php.orig:33
++#: gl/manage/bank_accounts.php:33
  msgid "The bank account name cannot be empty."
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:39
 -#: gl/manage/bank_accounts.php:39 gl/manage/bank_accounts.php.orig:39
++#: gl/manage/bank_accounts.php:39
  msgid "The GL account selected is already in use. Select another GL account."
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:52
 -#: gl/manage/bank_accounts.php:52 gl/manage/bank_accounts.php.orig:52
++#: gl/manage/bank_accounts.php:52
  msgid "Bank account has been updated"
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:61
 -#: gl/manage/bank_accounts.php:61 gl/manage/bank_accounts.php.orig:61
++#: gl/manage/bank_accounts.php:61
  msgid "New bank account has been added"
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:76
 -#: gl/manage/bank_accounts.php:76 gl/manage/bank_accounts.php.orig:76
++#: gl/manage/bank_accounts.php:76
  msgid ""
  "Cannot delete this bank account because transactions have been created using "
  "this account."
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:82
 -#: gl/manage/bank_accounts.php:82 gl/manage/bank_accounts.php.orig:82
++#: gl/manage/bank_accounts.php:82
  msgid ""
  "Cannot delete this bank account because POS definitions have been created "
  "using this account."
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:87
 -#: gl/manage/bank_accounts.php:87 gl/manage/bank_accounts.php.orig:87
++#: gl/manage/bank_accounts.php:87
  msgid "Selected bank account has been deleted"
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:109
- #: ../gl/view/bank_transfer_view.php:69
- #: ../gl/view/bank_transfer_view.php:78
- #: ../gl/view/gl_deposit_view.php:66
- #: ../gl/view/gl_payment_view.php:64
- #: ../inventory/prices.php:133
- #: ../inventory/purchasing_data.php:129
- #: ../purchasing/view/view_supp_credit.php:49
- #: ../purchasing/view/view_supp_invoice.php:54
- #: ../purchasing/inquiry/po_search_completed.php:126
- #: ../purchasing/inquiry/po_search_completed.php.orig:125
- #: ../purchasing/inquiry/po_search.php:136
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:132
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:142
- #: ../purchasing/inquiry/supplier_inquiry.php:73
- #: ../purchasing/inquiry/supplier_inquiry.php:180
- #: ../purchasing/inquiry/supplier_inquiry.php:192
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:73
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:177
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:189
- #: ../purchasing/allocations/supplier_allocation_main.php:99
- #: ../purchasing/allocations/supplier_allocation_main.php:107
- #: ../reporting/rep101.php:138
- #: ../reporting/rep102.php:131
- #: ../reporting/rep102.php:137
- #: ../reporting/rep104.php:114
- #: ../reporting/rep201.php:126
- #: ../reporting/rep202.php:136
- #: ../reporting/rep203.php:99
- #: ../sales/customer_credit_invoice.php:237
- #: ../sales/customer_delivery.php.orig:353
- #: ../sales/customer_invoice.php:470
- #: ../sales/allocations/customer_allocation_main.php:98
- #: ../sales/allocations/customer_allocation_main.php:106
- #: ../sales/view/view_credit.php:70
- #: ../sales/view/view_dispatch.php:86
- #: ../sales/view/view_invoice.php:86
- #: ../sales/inquiry/customer_allocation_inquiry.php:151
- #: ../sales/inquiry/customer_allocation_inquiry.php:161
- #: ../sales/inquiry/customer_inquiry.php:76
- #: ../sales/inquiry/customer_inquiry.php:208
- #: ../sales/inquiry/customer_inquiry.php:221
- #: ../sales/inquiry/sales_deliveries_view.php:189
- #: ../sales/inquiry/sales_orders_view.php:294
- #: ../sales/inquiry/sales_orders_view.php:308
 -#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
 -#: gl/view/bank_transfer_view.php:69 gl/view/bank_transfer_view.php:78
 -#: gl/view/gl_deposit_view.php:66 gl/view/gl_payment_view.php:64
 -#: inventory/prices.php:149 inventory/purchasing_data.php:149
 -#: purchasing/view/view_supp_credit.php:49
 -#: purchasing/view/view_supp_invoice.php:53
 -#: purchasing/inquiry/po_search_completed.php:127
++#: gl/manage/bank_accounts.php:109 gl/view/bank_transfer_view.php:69
++#: gl/view/bank_transfer_view.php:78 gl/view/gl_deposit_view.php:66
++#: gl/view/gl_payment_view.php:64 inventory/prices.php:149
++#: inventory/purchasing_data.php:149 purchasing/view/view_supp_credit.php:49
++#: purchasing/view/view_supp_invoice.php:54
++#: purchasing/inquiry/po_search_completed.php:126
+ #: purchasing/inquiry/po_search.php:136
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:133
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:143
 -#: purchasing/inquiry/supplier_inquiry.php:76
 -#: purchasing/inquiry/supplier_inquiry.php:175
 -#: purchasing/inquiry/supplier_inquiry.php:186
++#: purchasing/inquiry/supplier_allocation_inquiry.php:132
++#: purchasing/inquiry/supplier_allocation_inquiry.php:142
++#: purchasing/inquiry/supplier_inquiry.php:73
++#: purchasing/inquiry/supplier_inquiry.php:180
++#: purchasing/inquiry/supplier_inquiry.php:192
+ #: purchasing/allocations/supplier_allocation_main.php:99
+ #: purchasing/allocations/supplier_allocation_main.php:107
 -#: reporting/rep101.php:140 reporting/rep102.php:133 reporting/rep102.php:139
 -#: reporting/rep103.php:232 reporting/rep104.php:116 reporting/rep201.php:128
++#: reporting/rep102.php:133 reporting/rep102.php:139 reporting/rep104.php:116
+ #: reporting/rep202.php:138 reporting/rep203.php:101 reporting/rep205.php:150
 -#: sales/customer_credit_invoice.php:237 sales/customer_delivery.php:340
 -#: sales/customer_invoice.php:404
++#: sales/customer_credit_invoice.php:237 sales/customer_delivery.php:354
++#: sales/customer_invoice.php:470
+ #: sales/allocations/customer_allocation_main.php:98
+ #: sales/allocations/customer_allocation_main.php:106
+ #: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86
 -#: sales/view/view_invoice.php:85
++#: sales/view/view_invoice.php:86
+ #: sales/inquiry/customer_allocation_inquiry.php:150
+ #: sales/inquiry/customer_allocation_inquiry.php:160
 -#: sales/inquiry/customer_inquiry.php:80
 -#: sales/inquiry/customer_inquiry.php:232
 -#: sales/inquiry/customer_inquiry.php:245
++#: sales/inquiry/customer_inquiry.php:76
++#: sales/inquiry/customer_inquiry.php:208
++#: sales/inquiry/customer_inquiry.php:221
+ #: sales/inquiry/sales_deliveries_view.php:189
 -#: sales/inquiry/sales_orders_view.php:272
 -#: sales/inquiry/sales_orders_view.php:286
  msgid "Currency"
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:109
 -#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
++#: gl/manage/bank_accounts.php:109
  msgid "GL Account"
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:110
- #: ../reporting/includes/doctext.inc:260
 -#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
 -#: reporting/includes/doctext.inc:247
++#: gl/manage/bank_accounts.php:110 reporting/includes/doctext.inc:260
  msgid "Bank"
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:110
- #: ../includes/ui/ui_view.inc:488
 -#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
 -#: includes/ui/ui_view.inc:489
++#: gl/manage/bank_accounts.php:110 includes/ui/ui_view.inc:489
  msgid "Number"
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:110
 -#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
++#: gl/manage/bank_accounts.php:110
  msgid "Bank Address"
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:110
 -#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
++#: gl/manage/bank_accounts.php:110
  msgid "Dflt"
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:167
 -#: gl/manage/bank_accounts.php:163 gl/manage/bank_accounts.php.orig:163
++#: gl/manage/bank_accounts.php:167
  msgid "Bank Account Name:"
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:171
- #: ../gl/manage/bank_accounts.php:175
 -#: gl/manage/bank_accounts.php:167 gl/manage/bank_accounts.php:171
 -#: gl/manage/bank_accounts.php.orig:167 gl/manage/bank_accounts.php.orig:171
++#: gl/manage/bank_accounts.php:171 gl/manage/bank_accounts.php:175
  msgid "Account Type:"
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:179
- #: ../gl/manage/bank_accounts.php:183
 -#: gl/manage/bank_accounts.php:175 gl/manage/bank_accounts.php:179
 -#: gl/manage/bank_accounts.php.orig:175 gl/manage/bank_accounts.php.orig:179
++#: gl/manage/bank_accounts.php:179 gl/manage/bank_accounts.php:183
  msgid "Bank Account Currency:"
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:186
 -#: gl/manage/bank_accounts.php:182 gl/manage/bank_accounts.php.orig:182
++#: gl/manage/bank_accounts.php:186
  msgid "Default currency account:"
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:189
- #: ../gl/manage/bank_accounts.php:191
 -#: gl/manage/bank_accounts.php:185 gl/manage/bank_accounts.php:187
 -#: gl/manage/bank_accounts.php.orig:185 gl/manage/bank_accounts.php.orig:187
++#: gl/manage/bank_accounts.php:189 gl/manage/bank_accounts.php:191
  msgid "Bank Account GL Code:"
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:194
 -#: gl/manage/bank_accounts.php:189 gl/manage/bank_accounts.php.orig:189
++#: gl/manage/bank_accounts.php:194
  msgid "Bank Name:"
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:195
- #: ../sales/manage/customer_branches.php:255
 -#: gl/manage/bank_accounts.php:190 gl/manage/bank_accounts.php.orig:190
++#: gl/manage/bank_accounts.php:195 sales/manage/customer_branches.php:255
  msgid "Bank Account Number:"
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:196
 -#: gl/manage/bank_accounts.php:191 gl/manage/bank_accounts.php.orig:191
++#: gl/manage/bank_accounts.php:196
  msgid "Bank Address:"
  msgstr ""
  
- #: ../gl/manage/close_period.php:25
- #: ../gl/manage/close_period.php.orig:25
++#: gl/manage/close_period.php:25
 +msgid "Closing GL Transactions"
 +msgstr ""
 +
- #: ../gl/manage/close_period.php:40
- #: ../gl/manage/close_period.php.orig:40
++#: gl/manage/close_period.php:40
 +msgid "Selected date is not in fiscal year or the year is closed."
 +msgstr ""
 +
- #: ../gl/manage/close_period.php:47
- #: ../gl/manage/close_period.php.orig:47
++#: gl/manage/close_period.php:47
 +msgid "The entered date is earlier than date already selected as closing date."
 +msgstr ""
 +
- #: ../gl/manage/close_period.php:51
- #: ../gl/manage/close_period.php.orig:51
++#: gl/manage/close_period.php:51
 +msgid "You are not allowed to reopen already closed transactions."
 +msgstr ""
 +
- #: ../gl/manage/close_period.php:69
- #: ../gl/manage/close_period.php.orig:69
++#: gl/manage/close_period.php:69
 +#, php-format
 +msgid ""
 +"All transactions resulting in GL accounts changes up to %s has been closed "
 +"for further edition."
 +msgstr ""
 +
- #: ../gl/manage/close_period.php:88
- #: ../gl/manage/close_period.php.orig:88
++#: gl/manage/close_period.php:88
 +msgid ""
 +"Using this feature you can prevent entering new transactions <br>\n"
 +"\tand disable edition of already entered transactions up to specified date."
 +"<br>\n"
 +"\tOnly transactions which can generate GL postings are subject to the "
 +"constraint."
 +msgstr ""
 +
- #: ../gl/manage/close_period.php:101
- #: ../gl/manage/close_period.php.orig:101
++#: gl/manage/close_period.php:101
 +msgid "End date of closing period:"
 +msgstr ""
 +
- #: ../gl/manage/close_period.php:104
- #: ../gl/manage/close_period.php.orig:104
++#: gl/manage/close_period.php:104
 +msgid "Close Transactions"
 +msgstr ""
 +
- #: ../gl/manage/currencies.php:16
- #: ../includes/access_levels.inc:223
+ #: gl/manage/currencies.php:16 includes/access_levels.inc:223
  msgid "Currencies"
  msgstr ""
  
@@@ -5357,32 -4415,32 +4395,31 @@@ msgstr "
  msgid "Class Type:"
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:16
- #: ../reporting/rep701.php:115
 -#: gl/manage/gl_accounts.php:16 gl/manage/gl_accounts.php.orig:16
 -#: reporting/rep701.php:117
++#: gl/manage/gl_accounts.php:16 reporting/rep701.php:117
  msgid "Chart of Accounts"
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:53
 -#: gl/manage/gl_accounts.php:53 gl/manage/gl_accounts.php.orig:53
++#: gl/manage/gl_accounts.php:53
  msgid "The account code must be entered."
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:59
 -#: gl/manage/gl_accounts.php:59 gl/manage/gl_accounts.php.orig:59
++#: gl/manage/gl_accounts.php:59
  msgid "The account name cannot be empty."
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:65
 -#: gl/manage/gl_accounts.php:65 gl/manage/gl_accounts.php.orig:65
++#: gl/manage/gl_accounts.php:65
  msgid "The account code must be numeric."
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:80
 -#: gl/manage/gl_accounts.php:80 gl/manage/gl_accounts.php.orig:81
++#: gl/manage/gl_accounts.php:80
  msgid "The account belongs to a bank account and cannot be inactivated."
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:89
 -#: gl/manage/gl_accounts.php:89 gl/manage/gl_accounts.php.orig:90
++#: gl/manage/gl_accounts.php:89
  msgid "Account data has been updated."
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:98
 -#: gl/manage/gl_accounts.php:98 gl/manage/gl_accounts.php.orig:99
++#: gl/manage/gl_accounts.php:98
  msgid "New account has been added."
  msgstr ""
  
@@@ -5390,88 -4448,88 +4427,88 @@@
  msgid "Account not added, possible duplicate Account Code."
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:117
 -#: gl/manage/gl_accounts.php:117 gl/manage/gl_accounts.php.orig:116
++#: gl/manage/gl_accounts.php:117
  msgid ""
  "Cannot delete this account because transactions have been created using this "
  "account."
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:123
 -#: gl/manage/gl_accounts.php:123 gl/manage/gl_accounts.php.orig:122
++#: gl/manage/gl_accounts.php:123
  msgid ""
  "Cannot delete this account because it is used as one of the company default "
  "GL accounts."
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:129
 -#: gl/manage/gl_accounts.php:129 gl/manage/gl_accounts.php.orig:128
++#: gl/manage/gl_accounts.php:129
  msgid "Cannot delete this account because it is used by a bank account."
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:135
 -#: gl/manage/gl_accounts.php:135 gl/manage/gl_accounts.php.orig:134
++#: gl/manage/gl_accounts.php:135
  msgid ""
  "Cannot delete this account because it is used by one or more Item Categories."
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:141
 -#: gl/manage/gl_accounts.php:141 gl/manage/gl_accounts.php.orig:140
++#: gl/manage/gl_accounts.php:141
  msgid "Cannot delete this account because it is used by one or more Items."
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:147
 -#: gl/manage/gl_accounts.php:147 gl/manage/gl_accounts.php.orig:146
++#: gl/manage/gl_accounts.php:147
  msgid "Cannot delete this account because it is used by one or more Taxes."
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:153
 -#: gl/manage/gl_accounts.php:153 gl/manage/gl_accounts.php.orig:152
++#: gl/manage/gl_accounts.php:153
  msgid ""
  "Cannot delete this account because it is used by one or more Customer "
  "Branches."
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:158
 -#: gl/manage/gl_accounts.php:159 gl/manage/gl_accounts.php.orig:158
++#: gl/manage/gl_accounts.php:158
  msgid "Cannot delete this account because it is used by one or more suppliers."
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:164
 -#: gl/manage/gl_accounts.php:165 gl/manage/gl_accounts.php.orig:164
++#: gl/manage/gl_accounts.php:164
  msgid ""
  "Cannot delete this account because it is used by one or more Quick Entry "
  "Lines."
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:182
 -#: gl/manage/gl_accounts.php:183 gl/manage/gl_accounts.php.orig:182
++#: gl/manage/gl_accounts.php:182
  msgid "Selected account has been deleted"
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:197
 -#: gl/manage/gl_accounts.php:198 gl/manage/gl_accounts.php.orig:197
++#: gl/manage/gl_accounts.php:197
  msgid "New account"
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:243
 -#: gl/manage/gl_accounts.php:244 gl/manage/gl_accounts.php.orig:243
++#: gl/manage/gl_accounts.php:243
  msgid "Account Code 2:"
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:245
 -#: gl/manage/gl_accounts.php:246 gl/manage/gl_accounts.php.orig:245
++#: gl/manage/gl_accounts.php:245
  msgid "Account Name:"
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:247
 -#: gl/manage/gl_accounts.php:248 gl/manage/gl_accounts.php.orig:247
++#: gl/manage/gl_accounts.php:247
  msgid "Account Group:"
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:249
 -#: gl/manage/gl_accounts.php:250 gl/manage/gl_accounts.php.orig:249
++#: gl/manage/gl_accounts.php:249
  msgid "Account Tags:"
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:251
 -#: gl/manage/gl_accounts.php:252 gl/manage/gl_accounts.php.orig:251
++#: gl/manage/gl_accounts.php:251
  msgid "Account status:"
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:256
 -#: gl/manage/gl_accounts.php:257 gl/manage/gl_accounts.php.orig:256
++#: gl/manage/gl_accounts.php:256
  msgid "Add Account"
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:260
 -#: gl/manage/gl_accounts.php:261 gl/manage/gl_accounts.php.orig:260
++#: gl/manage/gl_accounts.php:260
  msgid "Update Account"
  msgstr ""
  
- #: ../gl/manage/gl_accounts.php:261
 -#: gl/manage/gl_accounts.php:262 gl/manage/gl_accounts.php.orig:261
++#: gl/manage/gl_accounts.php:261
  msgid "Delete account"
  msgstr ""
  
@@@ -5544,9 -4605,8 +4584,8 @@@ msgstr "
  msgid "Quick Entries"
  msgstr ""
  
- #: ../gl/manage/gl_quick_entries.php:58
- #: ../includes/ui/simple_crud_class.inc:221
- #: ../includes/ui/ui_input.inc:206
 -#: gl/manage/gl_quick_entries.php:58 includes/ui/radio.ui_input.inc:204
 -#: includes/ui/simple_crud_class.inc:221 includes/ui/ui_input.inc:205
++#: gl/manage/gl_quick_entries.php:58 includes/ui/simple_crud_class.inc:221
++#: includes/ui/ui_input.inc:206
  msgid "Add new"
  msgstr ""
  
@@@ -5635,10 -4692,8 +4671,8 @@@ msgstr "
  msgid "Posted"
  msgstr ""
  
- #: ../gl/manage/gl_quick_entries.php:329
- #: ../sales/customer_delivery.php.orig:446
- #: ../sales/customer_invoice.php:542
- #: ../sales/customer_invoice.php:545
 -#: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:433
 -#: sales/customer_invoice.php:470
++#: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:447
++#: sales/customer_invoice.php:542 sales/customer_invoice.php:545
  msgid "Tax Type"
  msgstr ""
  
@@@ -5710,17 -4761,12 +4740,8 @@@ msgstr "
  msgid "GL Deposit"
  msgstr ""
  
- #: ../gl/view/gl_deposit_view.php:71
- #: ../gl/includes/db/gl_db_banking.inc:211
- #: ../reporting/reports_main.php:88
- #: ../reporting/reports_main.php:95
- #: ../reporting/reports_main.php:102
- #: ../reporting/reports_main.php:114
- #: ../reporting/reports_main.php:121
- #: ../reporting/reports_main.php:127
- #: ../reporting/reports_main.php:163
- #: ../reporting/reports_main.php:169
- #: ../reporting/reports_main.php:219
 -#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:212
 -#: reporting/reports_main.php:95 reporting/reports_main.php:103
 -#: reporting/reports_main.php:111 reporting/reports_main.php:125
 -#: reporting/reports_main.php:133 reporting/reports_main.php:140
 -#: reporting/reports_main.php:188 reporting/reports_main.php:195
 -#: reporting/reports_main.php:270
++#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:211
++#: reporting/reports_main.php:96
  msgid "From"
  msgstr ""
  
@@@ -5745,43 -4790,28 +4765,23 @@@ msgstr "
  msgid "Item Amounts are Shown in :"
  msgstr ""
  
- #: ../gl/view/gl_deposit_view.php:99
- #: ../gl/view/gl_deposit_view.php:102
- #: ../gl/view/gl_deposit_view.php:105
- #: ../gl/view/gl_payment_view.php:98
- #: ../gl/view/gl_payment_view.php:101
- #: ../gl/view/gl_payment_view.php:104
- #: ../gl/view/gl_trans_view.php:68
- #: ../gl/view/gl_trans_view.php:71
- #: ../gl/view/gl_trans_view.php:74
- #: ../gl/includes/ui/gl_bank_ui.inc:150
- #: ../gl/includes/ui/gl_bank_ui.inc:153
- #: ../gl/includes/ui/gl_bank_ui.inc:156
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:124
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:127
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:130
- #: ../gl/includes/ui/gl_journal_ui.inc:86
- #: ../gl/includes/ui/gl_journal_ui.inc:89
- #: ../gl/includes/ui/gl_journal_ui.inc:92
- #: ../reporting/rep701.php:109
+ #: gl/view/gl_deposit_view.php:99 gl/view/gl_deposit_view.php:102
+ #: gl/view/gl_deposit_view.php:105 gl/view/gl_payment_view.php:98
+ #: gl/view/gl_payment_view.php:101 gl/view/gl_payment_view.php:104
 -#: gl/view/gl_trans_view.php:63 gl/view/gl_trans_view.php:66
 -#: gl/view/gl_trans_view.php:69 gl/includes/ui/gl_bank_ui.inc:151
++#: gl/view/gl_trans_view.php:68 gl/view/gl_trans_view.php:71
++#: gl/view/gl_trans_view.php:74 gl/includes/ui/gl_bank_ui.inc:151
+ #: gl/includes/ui/gl_bank_ui.inc:154 gl/includes/ui/gl_bank_ui.inc:157
 -#: gl/includes/ui/gl_bank_ui.inc.orig:132
 -#: gl/includes/ui/gl_bank_ui.inc.orig:135
 -#: gl/includes/ui/gl_bank_ui.inc.orig:138 gl/includes/ui/gl_journal_ui.inc:83
+ #: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
 -#: reporting/rep701.php:111
++#: gl/includes/ui/gl_journal_ui.inc:92 reporting/rep701.php:111
  msgid "Account Code"
  msgstr ""
  
- #: ../gl/view/gl_deposit_view.php:99
- #: ../gl/view/gl_deposit_view.php:102
- #: ../gl/view/gl_deposit_view.php:105
- #: ../gl/view/gl_payment_view.php:98
- #: ../gl/view/gl_payment_view.php:101
- #: ../gl/view/gl_payment_view.php:104
- #: ../gl/includes/ui/gl_bank_ui.inc:150
- #: ../gl/includes/ui/gl_bank_ui.inc:153
- #: ../gl/includes/ui/gl_bank_ui.inc:156
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:124
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:127
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:130
- #: ../gl/includes/ui/gl_journal_ui.inc:86
- #: ../gl/includes/ui/gl_journal_ui.inc:89
- #: ../gl/includes/ui/gl_journal_ui.inc:92
+ #: gl/view/gl_deposit_view.php:99 gl/view/gl_deposit_view.php:102
+ #: gl/view/gl_deposit_view.php:105 gl/view/gl_payment_view.php:98
+ #: gl/view/gl_payment_view.php:101 gl/view/gl_payment_view.php:104
+ #: gl/includes/ui/gl_bank_ui.inc:151 gl/includes/ui/gl_bank_ui.inc:154
 -#: gl/includes/ui/gl_bank_ui.inc:157 gl/includes/ui/gl_bank_ui.inc.orig:132
 -#: gl/includes/ui/gl_bank_ui.inc.orig:135
 -#: gl/includes/ui/gl_bank_ui.inc.orig:138 gl/includes/ui/gl_journal_ui.inc:83
 -#: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
++#: gl/includes/ui/gl_bank_ui.inc:157 gl/includes/ui/gl_journal_ui.inc:86
++#: gl/includes/ui/gl_journal_ui.inc:89 gl/includes/ui/gl_journal_ui.inc:92
  msgid "Account Description"
  msgstr ""
  
@@@ -5822,20 -4848,15 +4818,19 @@@ msgstr "
  msgid "General Ledger Transaction Details"
  msgstr ""
  
- #: ../gl/view/gl_trans_view.php:39
- #: ../gl/includes/ui/gl_journal_ui.inc:97
 -#: gl/view/gl_trans_view.php:54
++#: gl/view/gl_trans_view.php:39 gl/includes/ui/gl_journal_ui.inc:97
 +msgid "Counterparty"
 +msgstr ""
 +
- #: ../gl/view/gl_trans_view.php:59
++#: gl/view/gl_trans_view.php:59
  msgid "No general ledger transactions have been created for"
  msgstr ""
  
- #: ../gl/view/gl_trans_view.php:59
 -#: gl/view/gl_trans_view.php:54
++#: gl/view/gl_trans_view.php:59
  msgid "number"
  msgstr ""
  
- #: ../gl/view/gl_trans_view.php:129
 -#: gl/view/gl_trans_view.php:120
++#: gl/view/gl_trans_view.php:129
  msgid "This transaction has been voided."
  msgstr ""
  
@@@ -5846,21 -4865,15 +4839,12 @@@
  msgid "Exchange Variance"
  msgstr ""
  
- #: ../gl/includes/db/gl_db_banking.inc:211
- #: ../reporting/reports_main.php:89
- #: ../reporting/reports_main.php:96
- #: ../reporting/reports_main.php:103
- #: ../reporting/reports_main.php:115
- #: ../reporting/reports_main.php:122
- #: ../reporting/reports_main.php:128
- #: ../reporting/reports_main.php:164
- #: ../reporting/reports_main.php:170
- #: ../reporting/reports_main.php:220
 -#: gl/includes/db/gl_db_banking.inc:212 reporting/reports_main.php:96
 -#: reporting/reports_main.php:104 reporting/reports_main.php:112
 -#: reporting/reports_main.php:126 reporting/reports_main.php:134
 -#: reporting/reports_main.php:141 reporting/reports_main.php:189
 -#: reporting/reports_main.php:196 reporting/reports_main.php:271
++#: gl/includes/db/gl_db_banking.inc:211 reporting/reports_main.php:97
  msgid "To"
  msgstr ""
  
- #: ../gl/includes/db/gl_db_banking.inc:427
- #: ../purchasing/includes/db/invoice_db.inc:136
 -#: gl/includes/db/gl_db_banking.inc:428
++#: gl/includes/db/gl_db_banking.inc:427
++#: purchasing/includes/db/invoice_db.inc:143
  msgid "Document reentered."
  msgstr ""
  
@@@ -5870,149 -4883,132 +4854,118 @@@ msgid "
  "Cannot retrieve currency rate from %s page. Please set the rate manually."
  msgstr ""
  
- #: ../gl/includes/ui/gl_bank_ui.inc:24
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:28
- #: ../gl/includes/ui/gl_journal_ui.inc:27
- #: ../inventory/includes/item_adjustments_ui.inc:39
- #: ../inventory/includes/stock_transfers_ui.inc:42
- #: ../manufacturing/work_order_add_finished.php:208
- #: ../manufacturing/work_order_costs.php:133
- #: ../purchasing/allocations/supplier_allocate.php:54
- #: ../sales/allocations/customer_allocate.php:53
- #: ../sales/includes/ui/sales_credit_ui.inc:121
 -#: gl/includes/db/gl_db_trans.inc:93
++#: gl/includes/db/gl_db_trans.inc:96
+ #, php-format
+ msgid "Rounding error %s encountered for trans_type:%s,trans_no:%s"
+ msgstr ""
+ 
 -#: gl/includes/ui/gl_bank_ui.inc:24 gl/includes/ui/gl_bank_ui.inc.orig:23
 -#: gl/includes/ui/gl_journal_ui.inc:27
++#: gl/includes/ui/gl_bank_ui.inc:24 gl/includes/ui/gl_journal_ui.inc:27
+ #: inventory/includes/item_adjustments_ui.inc:39
+ #: inventory/includes/stock_transfers_ui.inc:42
+ #: manufacturing/work_order_add_finished.php:208
 -#: manufacturing/work_order_costs.php:152
++#: manufacturing/work_order_costs.php:133
+ #: purchasing/allocations/supplier_allocate.php:53
+ #: sales/allocations/customer_allocate.php:52
+ #: sales/includes/ui/sales_credit_ui.inc:121
  msgid "Date:"
  msgstr ""
  
- #: ../gl/includes/ui/gl_bank_ui.inc:51
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:53
 -#: gl/includes/ui/gl_bank_ui.inc:51 gl/includes/ui/gl_bank_ui.inc.orig:50
++#: gl/includes/ui/gl_bank_ui.inc:51
  msgid "Pay To:"
  msgstr ""
  
- #: ../gl/includes/ui/gl_bank_ui.inc:56
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:58
 -#: gl/includes/ui/gl_bank_ui.inc:56 gl/includes/ui/gl_bank_ui.inc.orig:55
++#: gl/includes/ui/gl_bank_ui.inc:56
  msgid "To the Order of:"
  msgstr ""
  
- #: ../gl/includes/ui/gl_bank_ui.inc:63
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:65
- #: ../inventory/purchasing_data.php:184
- #: ../inventory/purchasing_data.php:188
- #: ../inventory/purchasing_data.php.orig:112
- #: ../purchasing/includes/ui/invoice_ui.inc:80
- #: ../purchasing/includes/ui/invoice_ui.inc:88
- #: ../purchasing/includes/ui/invoice_ui.inc:90
- #: ../purchasing/includes/ui/po_ui.inc:125
- #: ../purchasing/includes/ui/po_ui.inc:130
- #: ../purchasing/includes/ui/po_ui.inc.orig:125
- #: ../purchasing/includes/ui/po_ui.inc.orig:130
 -#: gl/includes/ui/gl_bank_ui.inc:63 gl/includes/ui/gl_bank_ui.inc.orig:62
 -#: inventory/purchasing_data.php:210 inventory/purchasing_data.php:214
 -#: purchasing/includes/ui/invoice_ui.inc:73
 -#: purchasing/includes/ui/invoice_ui.inc:80
 -#: purchasing/includes/ui/po_ui.inc:119 purchasing/includes/ui/po_ui.inc:124
++#: gl/includes/ui/gl_bank_ui.inc:63 inventory/purchasing_data.php:210
++#: inventory/purchasing_data.php:214 purchasing/includes/ui/invoice_ui.inc:80
++#: purchasing/includes/ui/invoice_ui.inc:88
++#: purchasing/includes/ui/invoice_ui.inc:90
  msgid "Supplier:"
  msgstr ""
  
- #: ../gl/includes/ui/gl_bank_ui.inc:66
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:68
- #: ../sales/manage/recurrent_invoices.php:169
- #: ../sales/includes/ui/sales_credit_ui.inc:29
- #: ../sales/includes/ui/sales_order_ui.inc.orig:278
 -#: gl/includes/ui/gl_bank_ui.inc:66 gl/includes/ui/gl_bank_ui.inc.orig:65
 -#: sales/manage/recurrent_invoices.php:169
++#: gl/includes/ui/gl_bank_ui.inc:66 sales/manage/recurrent_invoices.php:169
+ #: sales/includes/ui/sales_credit_ui.inc:29
 -#: sales/includes/ui/sales_order_ui.inc:283
++#: sales/includes/ui/sales_order_ui.inc:285
  msgid "Customer:"
  msgstr ""
  
- #: ../gl/includes/ui/gl_bank_ui.inc:70
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:72
- #: ../sales/customer_payments.php:363
- #: ../sales/manage/recurrent_invoices.php:172
- #: ../sales/includes/ui/sales_credit_ui.inc:37
- #: ../sales/includes/ui/sales_order_ui.inc.orig:285
 -#: gl/includes/ui/gl_bank_ui.inc:70 gl/includes/ui/gl_bank_ui.inc.orig:69
 -#: sales/customer_payments.php:347 sales/manage/recurrent_invoices.php:172
++#: gl/includes/ui/gl_bank_ui.inc:70 sales/manage/recurrent_invoices.php:172
+ #: sales/includes/ui/sales_credit_ui.inc:37
 -#: sales/includes/ui/sales_order_ui.inc:290
++#: sales/includes/ui/sales_order_ui.inc:292
  msgid "Branch:"
  msgstr ""
  
- #: ../gl/includes/ui/gl_bank_ui.inc:84
- #: ../gl/includes/ui/gl_bank_ui.inc:87
- #: ../sales/customer_payments.php:372
+ #: gl/includes/ui/gl_bank_ui.inc:84 gl/includes/ui/gl_bank_ui.inc:87
 -#: sales/customer_payments.php:356
  msgid "This customer account is on hold."
  msgstr ""
  
- #: ../gl/includes/ui/gl_bank_ui.inc:99
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:90
- #: ../gl/includes/ui/gl_journal_ui.inc:58
- #: ../gl/includes/ui/gl_journal_ui.inc:62
- #: ../purchasing/includes/ui/invoice_ui.inc:251
 -#: gl/includes/ui/gl_bank_ui.inc:99 gl/includes/ui/gl_bank_ui.inc.orig:87
 -#: gl/includes/ui/gl_journal_ui.inc:58 gl/includes/ui/gl_journal_ui.inc:62
 -#: purchasing/includes/ui/invoice_ui.inc:231
++#: gl/includes/ui/gl_bank_ui.inc:99 gl/includes/ui/gl_journal_ui.inc:58
++#: gl/includes/ui/gl_journal_ui.inc:62
++#: purchasing/includes/ui/invoice_ui.inc:251
  msgid "Go"
  msgstr ""
  
- #: ../gl/includes/ui/gl_bank_ui.inc:185
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:159
- #: ../includes/ui/simple_crud_class.inc:52
- #: ../inventory/includes/item_adjustments_ui.inc:88
- #: ../inventory/includes/stock_transfers_ui.inc:80
- #: ../manufacturing/includes/work_order_issue_ui.inc:59
- #: ../purchasing/includes/ui/invoice_ui.inc:542
- #: ../purchasing/includes/ui/po_ui.inc:274
- #: ../purchasing/includes/ui/po_ui.inc.orig:274
- #: ../sales/includes/ui/sales_credit_ui.inc:198
- #: ../sales/includes/ui/sales_order_ui.inc.orig:203
+ #: gl/includes/ui/gl_bank_ui.inc:118
+ msgid "Into:"
+ msgstr ""
+ 
 -#: gl/includes/ui/gl_bank_ui.inc:186 gl/includes/ui/gl_bank_ui.inc.orig:167
 -#: includes/ui/simple_crud_class.inc:52
++#: gl/includes/ui/gl_bank_ui.inc:186 includes/ui/simple_crud_class.inc:52
+ #: inventory/includes/item_adjustments_ui.inc:88
+ #: inventory/includes/stock_transfers_ui.inc:80
+ #: manufacturing/includes/work_order_issue_ui.inc:59
 -#: purchasing/includes/ui/invoice_ui.inc:520
 -#: purchasing/includes/ui/po_ui.inc:266
++#: purchasing/includes/ui/invoice_ui.inc:542
+ #: sales/includes/ui/sales_credit_ui.inc:198
 -#: sales/includes/ui/sales_order_ui.inc:208
++#: sales/includes/ui/sales_order_ui.inc:210
  msgid "Edit document line"
  msgstr ""
  
- #: ../gl/includes/ui/gl_bank_ui.inc:187
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:161
- #: ../includes/ui/simple_crud_class.inc:54
- #: ../inventory/includes/item_adjustments_ui.inc:90
- #: ../inventory/includes/stock_transfers_ui.inc:82
- #: ../manufacturing/includes/work_order_issue_ui.inc:61
- #: ../purchasing/includes/ui/invoice_ui.inc:305
- #: ../purchasing/includes/ui/po_ui.inc:276
- #: ../purchasing/includes/ui/po_ui.inc.orig:276
- #: ../sales/includes/ui/sales_credit_ui.inc:200
- #: ../sales/includes/ui/sales_order_ui.inc.orig:205
 -#: gl/includes/ui/gl_bank_ui.inc:188 gl/includes/ui/gl_bank_ui.inc.orig:169
 -#: includes/ui/simple_crud_class.inc:54
++#: gl/includes/ui/gl_bank_ui.inc:188 includes/ui/simple_crud_class.inc:54
+ #: inventory/includes/item_adjustments_ui.inc:90
+ #: inventory/includes/stock_transfers_ui.inc:82
+ #: manufacturing/includes/work_order_issue_ui.inc:61
 -#: purchasing/includes/ui/invoice_ui.inc:285
 -#: purchasing/includes/ui/po_ui.inc:268
++#: purchasing/includes/ui/invoice_ui.inc:305
+ #: sales/includes/ui/sales_credit_ui.inc:200
 -#: sales/includes/ui/sales_order_ui.inc:210
++#: sales/includes/ui/sales_order_ui.inc:212
  msgid "Remove line from document"
  msgstr ""
  
- #: ../gl/includes/ui/gl_bank_ui.inc:276
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:250
- #: ../gl/includes/ui/gl_journal_ui.inc:258
- #: ../includes/ui/simple_crud_class.inc:56
- #: ../inventory/includes/item_adjustments_ui.inc:158
- #: ../inventory/includes/stock_transfers_ui.inc:138
- #: ../manufacturing/includes/work_order_issue_ui.inc:132
- #: ../purchasing/includes/ui/po_ui.inc.orig:458
- #: ../sales/includes/ui/sales_credit_ui.inc:294
- #: ../sales/includes/ui/sales_order_ui.inc.orig:556
 -#: gl/includes/ui/gl_bank_ui.inc:277 gl/includes/ui/gl_bank_ui.inc.orig:258
 -#: gl/includes/ui/gl_journal_ui.inc:222 includes/ui/simple_crud_class.inc:56
++#: gl/includes/ui/gl_bank_ui.inc:277 gl/includes/ui/gl_journal_ui.inc:258
++#: includes/ui/simple_crud_class.inc:56
+ #: inventory/includes/item_adjustments_ui.inc:158
+ #: inventory/includes/stock_transfers_ui.inc:138
+ #: manufacturing/includes/work_order_issue_ui.inc:132
 -#: purchasing/includes/ui/po_ui.inc:442
+ #: sales/includes/ui/sales_credit_ui.inc:294
 -#: sales/includes/ui/sales_order_ui.inc:561
++#: sales/includes/ui/sales_order_ui.inc:563
  msgid "Confirm changes"
  msgstr ""
  
- #: ../gl/includes/ui/gl_bank_ui.inc:278
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:252
- #: ../gl/includes/ui/gl_journal_ui.inc:260
- #: ../includes/ui/simple_crud_class.inc:58
- #: ../inventory/includes/item_adjustments_ui.inc:160
- #: ../inventory/includes/stock_transfers_ui.inc:140
- #: ../manufacturing/includes/work_order_issue_ui.inc:134
- #: ../purchasing/includes/ui/po_ui.inc.orig:460
- #: ../sales/includes/ui/sales_credit_ui.inc:296
- #: ../sales/includes/ui/sales_order_ui.inc.orig:558
 -#: gl/includes/ui/gl_bank_ui.inc:279 gl/includes/ui/gl_bank_ui.inc.orig:260
 -#: gl/includes/ui/gl_journal_ui.inc:224 includes/ui/simple_crud_class.inc:58
++#: gl/includes/ui/gl_bank_ui.inc:279 gl/includes/ui/gl_journal_ui.inc:260
++#: includes/ui/simple_crud_class.inc:58
+ #: inventory/includes/item_adjustments_ui.inc:160
+ #: inventory/includes/stock_transfers_ui.inc:140
+ #: manufacturing/includes/work_order_issue_ui.inc:134
 -#: purchasing/includes/ui/po_ui.inc:444
+ #: sales/includes/ui/sales_credit_ui.inc:296
 -#: sales/includes/ui/sales_order_ui.inc:563
++#: sales/includes/ui/sales_order_ui.inc:565
  msgid "Cancel changes"
  msgstr ""
  
- #: ../gl/includes/ui/gl_bank_ui.inc:283
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:257
- #: ../gl/includes/ui/gl_journal_ui.inc:264
- #: ../inventory/includes/item_adjustments_ui.inc:166
- #: ../inventory/includes/stock_transfers_ui.inc:146
- #: ../manufacturing/includes/work_order_issue_ui.inc:140
- #: ../purchasing/includes/ui/po_ui.inc.orig:466
- #: ../sales/includes/ui/sales_credit_ui.inc:302
- #: ../sales/includes/ui/sales_order_ui.inc.orig:564
 -#: gl/includes/ui/gl_bank_ui.inc:284 gl/includes/ui/gl_bank_ui.inc.orig:265
 -#: gl/includes/ui/gl_journal_ui.inc:228
++#: gl/includes/ui/gl_bank_ui.inc:284 gl/includes/ui/gl_journal_ui.inc:264
+ #: inventory/includes/item_adjustments_ui.inc:166
+ #: inventory/includes/stock_transfers_ui.inc:146
+ #: manufacturing/includes/work_order_issue_ui.inc:140
 -#: purchasing/includes/ui/po_ui.inc:450
+ #: sales/includes/ui/sales_credit_ui.inc:302
 -#: sales/includes/ui/sales_order_ui.inc:569
++#: sales/includes/ui/sales_order_ui.inc:571
  msgid "Add Item"
  msgstr ""
  
- #: ../gl/includes/ui/gl_bank_ui.inc:284
- #: ../gl/includes/ui/gl_bank_ui.inc.orig:258
- #: ../inventory/includes/item_adjustments_ui.inc:167
- #: ../inventory/includes/stock_transfers_ui.inc:147
- #: ../manufacturing/includes/work_order_issue_ui.inc:141
- #: ../purchasing/includes/ui/po_ui.inc.orig:467
- #: ../sales/includes/ui/sales_credit_ui.inc:303
- #: ../sales/includes/ui/sales_order_ui.inc.orig:565
 -#: gl/includes/ui/gl_bank_ui.inc:285 gl/includes/ui/gl_bank_ui.inc.orig:266
++#: gl/includes/ui/gl_bank_ui.inc:285
+ #: inventory/includes/item_adjustments_ui.inc:167
+ #: inventory/includes/stock_transfers_ui.inc:147
+ #: manufacturing/includes/work_order_issue_ui.inc:141
 -#: purchasing/includes/ui/po_ui.inc:451
+ #: sales/includes/ui/sales_credit_ui.inc:303
 -#: sales/includes/ui/sales_order_ui.inc:570
++#: sales/includes/ui/sales_order_ui.inc:572
  msgid "Add new item to document"
  msgstr ""
  
@@@ -6029,20 -5024,15 +4981,19 @@@ msgstr "
  msgid "balance from account"
  msgstr ""
  
- #: ../gl/includes/ui/gl_journal_ui.inc:135
 -#: gl/includes/ui/gl_journal_ui.inc:123
++#: gl/includes/ui/gl_journal_ui.inc:135
  msgid "Edit journal line"
  msgstr ""
  
- #: ../gl/includes/ui/gl_journal_ui.inc:137
 -#: gl/includes/ui/gl_journal_ui.inc:125
++#: gl/includes/ui/gl_journal_ui.inc:137
  msgid "Remove line from journal"
  msgstr ""
  
- #: ../gl/includes/ui/gl_journal_ui.inc:200
- #: ../gl/includes/ui/gl_journal_ui.inc:232
 -#: gl/includes/ui/gl_journal_ui.inc:229
++#: gl/includes/ui/gl_journal_ui.inc:200 gl/includes/ui/gl_journal_ui.inc:232
 +msgid "[Select account]"
 +msgstr ""
 +
- #: ../gl/includes/ui/gl_journal_ui.inc:265
++#: gl/includes/ui/gl_journal_ui.inc:265
  msgid "Add new line to journal"
  msgstr ""
  
@@@ -6110,10 -5100,8 +5061,7 @@@ msgstr "
  msgid "Dimensions configuration"
  msgstr ""
  
- #: ../includes/access_levels.inc:72
- #: ../inventory/manage/items.php:348
- #: ../inventory/manage/items.php.orig:341
- #: ../reporting/reports_main.php:223
 -#: includes/access_levels.inc:72 inventory/manage/items.php:341
 -#: reporting/reports_main.php:275
++#: includes/access_levels.inc:72
  msgid "Dimensions"
  msgstr ""
  
@@@ -6225,11 -5213,7 +5173,11 @@@ msgstr "
  msgid "Password changes"
  msgstr ""
  
- #: ../includes/access_levels.inc:123
++#: includes/access_levels.inc:123
 +msgid "Edit other users transactions"
 +msgstr ""
 +
- #: ../includes/access_levels.inc:127
+ #: includes/access_levels.inc:127
  msgid "Sales types"
  msgstr ""
  
@@@ -6525,75 -5509,67 +5473,75 @@@ msgstr "
  msgid "GL Account tags"
  msgstr ""
  
- #: ../includes/access_levels.inc:230
+ #: includes/access_levels.inc:230
 -msgid "Allow entry on non closed Fiscal years"
 +msgid "Closing GL transactions"
 +msgstr ""
 +
- #: ../includes/access_levels.inc:231
++#: includes/access_levels.inc:231
 +msgid "Reopening GL transactions"
  msgstr ""
  
- #: ../includes/access_levels.inc:232
+ #: includes/access_levels.inc:232
 +msgid "Allow entry on non closed Fiscal years"
 +msgstr ""
 +
- #: ../includes/access_levels.inc:234
++#: includes/access_levels.inc:234
  msgid "Bank transactions view"
  msgstr ""
  
- #: ../includes/access_levels.inc:235
 -#: includes/access_levels.inc:233
++#: includes/access_levels.inc:235
  msgid "GL postings view"
  msgstr ""
  
- #: ../includes/access_levels.inc:236
 -#: includes/access_levels.inc:234
++#: includes/access_levels.inc:236
  msgid "Exchange rate table changes"
  msgstr ""
  
- #: ../includes/access_levels.inc:237
 -#: includes/access_levels.inc:235
++#: includes/access_levels.inc:237
  msgid "Bank payments"
  msgstr ""
  
- #: ../includes/access_levels.inc:238
 -#: includes/access_levels.inc:236
++#: includes/access_levels.inc:238
  msgid "Bank deposits"
  msgstr ""
  
- #: ../includes/access_levels.inc:239
 -#: includes/access_levels.inc:237
++#: includes/access_levels.inc:239
  msgid "Bank account transfers"
  msgstr ""
  
- #: ../includes/access_levels.inc:240
 -#: includes/access_levels.inc:238
++#: includes/access_levels.inc:240
  msgid "Bank reconciliation"
  msgstr ""
  
- #: ../includes/access_levels.inc:241
 -#: includes/access_levels.inc:239
++#: includes/access_levels.inc:241
  msgid "Manual journal entries"
  msgstr ""
  
- #: ../includes/access_levels.inc:242
 -#: includes/access_levels.inc:240
++#: includes/access_levels.inc:242
  msgid "Journal entries to bank related accounts"
  msgstr ""
  
- #: ../includes/access_levels.inc:243
 -#: includes/access_levels.inc:241
++#: includes/access_levels.inc:243
  msgid "Budget edition"
  msgstr ""
  
- #: ../includes/access_levels.inc:244
 -#: includes/access_levels.inc:242
++#: includes/access_levels.inc:244
  msgid "Item standard costs"
  msgstr ""
  
- #: ../includes/access_levels.inc:247
 -#: includes/access_levels.inc:245
++#: includes/access_levels.inc:247
  msgid "GL analytical reports and inquiries"
  msgstr ""
  
- #: ../includes/access_levels.inc:248
 -#: includes/access_levels.inc:246
++#: includes/access_levels.inc:248
  msgid "Tax reports and inquiries"
  msgstr ""
  
- #: ../includes/access_levels.inc:249
 -#: includes/access_levels.inc:247
++#: includes/access_levels.inc:249
  msgid "Bank reports and inquiries"
  msgstr ""
  
- #: ../includes/access_levels.inc:250
 -#: includes/access_levels.inc:248
++#: includes/access_levels.inc:250
  msgid "GL reports and inquiries"
  msgstr ""
  
@@@ -6605,36 -5580,26 +5552,35 @@@ msgid "
  "rate manually on Exchange Rates page."
  msgstr ""
  
- #: ../includes/current_user.inc.orig:97
 -#: includes/current_user.inc:91 includes/ldap.current_user.inc:96
++#: includes/current_user.inc:101
  msgid ""
  "Before software upgrade you have to include old $security_groups and "
  "$security_headings arrays from old config.php file to the new one."
  msgstr ""
  
- #: ../includes/current_user.inc.orig:98
- #: ../includes/ui/ui_controls.inc:197
- #: ../includes/ui/ui_view.inc:845
 -#: includes/current_user.inc:92 includes/ldap.current_user.inc:97
 -#: includes/ui/ui_controls.inc:190 includes/ui/ui_view.inc:845
++#: includes/current_user.inc:102 includes/ui/ui_controls.inc:197
++#: includes/ui/ui_view.inc:846
  msgid "Back"
  msgstr ""
  
- #: ../includes/current_user.inc.orig:108
 -#: includes/current_user.inc:102 includes/ldap.current_user.inc:107
++#: includes/current_user.inc:112
  msgid "System is available for site admin only until full database upgrade"
  msgstr ""
  
- #: ../includes/current_user.inc.orig:471
 -#: includes/current_user.inc:523 includes/ldap.current_user.inc:544
++#: includes/current_user.inc:544
  msgid "Requesting data..."
  msgstr ""
  
- #: ../includes/data_checks.inc:508
++#: includes/data_checks.inc:508
 +#, php-format
 +msgid "%s #%s is closed for further edition."
 +msgstr ""
 +
- #: ../includes/data_checks.inc:534
++#: includes/data_checks.inc:534
 +msgid "You have no edit access to transactions created by other users."
 +msgstr ""
 +
- #: ../includes/errors.inc:123
+ #: includes/errors.inc:125
  msgid "in file"
  msgstr ""
  
@@@ -6656,7 -5621,7 +5602,7 @@@ msgid "
  "values."
  msgstr ""
  
- #: ../includes/main.inc:44
 -#: includes/main.inc:41
++#: includes/main.inc:44
  msgid "This page is usable only with javascript enabled browsers."
  msgstr ""
  
@@@ -6699,21 -5671,21 +5652,21 @@@ msgstr "
  msgid "Package '%s' not found."
  msgstr ""
  
- #: ../includes/session.inc:133
 -#: includes/session.inc:132 includes/session.inc.ldap.inc:39
++#: includes/session.inc:132
  msgid "Incorrect Password"
  msgstr ""
  
- #: ../includes/session.inc:134
 -#: includes/session.inc:133 includes/session.inc.ldap.inc:40
++#: includes/session.inc:133
  msgid "The user and password combination is not valid for the system."
  msgstr ""
  
- #: ../includes/session.inc:136
 -#: includes/session.inc:135 includes/session.inc.ldap.inc:42
++#: includes/session.inc:135
  msgid ""
  "If you are not an authorized user, please contact your system administrator "
  "to obtain an account to enable you to use the system."
  msgstr ""
  
- #: ../includes/session.inc:137
 -#: includes/session.inc:136 includes/session.inc.ldap.inc:43
++#: includes/session.inc:136
  msgid "Try again"
  msgstr ""
  
@@@ -6724,45 -5696,43 +5677,43 @@@ msgid "
  "temporarily blocked."
  msgstr ""
  
- #: ../includes/session.inc:216
 -#: includes/session.inc:207 includes/session.inc.ldap.inc:62
++#: includes/session.inc:207
  msgid "Security settings have not been defined for your user account."
  msgstr ""
  
- #: ../includes/session.inc:217
 -#: includes/session.inc:208 includes/session.inc.ldap.inc:63
++#: includes/session.inc:208
  msgid "Please contact your system administrator."
  msgstr ""
  
- #: ../includes/session.inc:218
 -#: includes/session.inc:209 includes/session.inc.ldap.inc:64
++#: includes/session.inc:209
  msgid ""
  "Please remove $security_groups and $security_headings arrays from config.php "
  "file!"
  msgstr ""
  
- #: ../includes/session.inc:220
 -#: includes/session.inc:211 includes/session.inc.ldap.inc:66
++#: includes/session.inc:211
  msgid ""
  "Access to application has been blocked until database upgrade is completed "
  "by system administrator."
  msgstr ""
  
- #: ../includes/session.inc:234
 -#: includes/session.inc:225 includes/session.inc.ldap.inc:80
++#: includes/session.inc:225
  msgid ""
  "The security settings on your account do not permit you to access this "
  "function"
  msgstr ""
  
- #: ../includes/session.inc:243
 -#: includes/session.inc:234 includes/session.inc.ldap.inc:89
++#: includes/session.inc:234
  msgid ""
  "System is blocked after source upgrade until database is updated on System/"
  "Software Upgrade page"
  msgstr ""
  
- #: ../includes/sysnames.inc:23
- #: ../includes/sysnames.inc:149
 -#: includes/sysnames.inc:23 includes/sysnames.inc:148
++#: includes/sysnames.inc:23 includes/sysnames.inc:149
  msgid "Bank Payment"
  msgstr ""
  
- #: ../includes/sysnames.inc:24
- #: ../includes/sysnames.inc:148
 -#: includes/sysnames.inc:24 includes/sysnames.inc:147
++#: includes/sysnames.inc:24 includes/sysnames.inc:148
  msgid "Bank Deposit"
  msgstr ""
  
@@@ -6795,10 -5764,8 +5745,7 @@@ msgstr "
  msgid "Inventory Adjustment"
  msgstr ""
  
- #: ../includes/sysnames.inc:32
- #: ../purchasing/includes/ui/po_ui.inc:330
- #: ../purchasing/includes/ui/po_ui.inc.orig:330
- #: ../purchasing/view/view_po.php:30
 -#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:322
 -#: purchasing/view/view_po.php:30
++#: includes/sysnames.inc:32 purchasing/view/view_po.php:30
  msgid "Purchase Order"
  msgstr ""
  
@@@ -6806,8 -5773,7 +5753,7 @@@
  msgid "Supplier Invoice"
  msgstr ""
  
- #: ../includes/sysnames.inc:34
- #: ../purchasing/supplier_credit.php:58
 -#: includes/sysnames.inc:34 purchasing/supplier_credit.php:28
++#: includes/sysnames.inc:34 purchasing/supplier_credit.php:58
  msgid "Supplier Credit Note"
  msgstr ""
  
@@@ -6833,14 -5797,12 +5777,11 @@@ msgstr "
  msgid "Work Order Production"
  msgstr ""
  
- #: ../includes/sysnames.inc:40
- #: ../sales/inquiry/sales_orders_view.php:151
- #: ../sales/inquiry/sales_orders_view.php:173
 -#: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:139
 -#: sales/inquiry/sales_orders_view.php:161
++#: includes/sysnames.inc:40
  msgid "Sales Order"
  msgstr ""
  
- #: ../includes/sysnames.inc:41
- #: ../sales/sales_order_entry.php:645
 -#: includes/sysnames.inc:41 sales/sales_order_entry.php:636
++#: includes/sysnames.inc:41 sales/sales_order_entry.php:652
  msgid "Sales Quotation"
  msgstr ""
  
@@@ -6876,8 -5838,7 +5817,7 @@@ msgstr "
  msgid "CP"
  msgstr ""
  
- #: ../includes/sysnames.inc:54
- #: ../sales/customer_invoice.php:547
 -#: includes/sysnames.inc:54 sales/customer_invoice.php:473
++#: includes/sysnames.inc:54 sales/customer_invoice.php:547
  msgid "DN"
  msgstr ""
  
@@@ -6947,8 -5906,7 +5885,7 @@@ msgstr "
  msgid "Chequing Account"
  msgstr ""
  
- #: ../includes/sysnames.inc:78
- #: ../manufacturing/work_order_costs.php:145
 -#: includes/sysnames.inc:78 manufacturing/work_order_costs.php:161
++#: includes/sysnames.inc:78 manufacturing/work_order_costs.php:145
  msgid "Credit Account"
  msgstr ""
  
@@@ -6964,74 -5922,50 +5901,43 @@@ msgstr "
  msgid "Cheque"
  msgstr ""
  
- #: ../includes/sysnames.inc:86
- #: ../includes/sysnames.inc:181
 -#: includes/sysnames.inc:86 includes/sysnames.inc:180
++#: includes/sysnames.inc:86 includes/sysnames.inc:181
  msgid "Cash"
  msgstr ""
  
- #: ../includes/sysnames.inc:96
- #: ../includes/sysnames.inc:195
- #: ../reporting/rep101.php:137
- #: ../reporting/rep102.php:123
- #: ../reporting/rep102.php:130
- #: ../reporting/rep105.php:107
- #: ../reporting/rep106.php:81
- #: ../reporting/rep114.php:93
- #: ../reporting/rep304.php:112
- #: ../reporting/rep304.php:122
- #: ../reporting/reports_main.php:32
- #: ../reporting/reports_main.php:36
- #: ../reporting/reports_main.php:43
- #: ../reporting/reports_main.php:108
- #: ../reporting/reports_main.php:203
- #: ../sales/create_recurrent_invoices.php:132
- #: ../sales/customer_credit_invoice.php:235
- #: ../sales/customer_delivery.php.orig:351
- #: ../sales/customer_invoice.php:446
- #: ../sales/allocations/customer_allocation_main.php:97
- #: ../sales/allocations/customer_allocation_main.php:105
- #: ../sales/manage/recurrent_invoices.php:102
- #: ../sales/view/view_credit.php:47
- #: ../sales/inquiry/customer_allocation_inquiry.php:150
- #: ../sales/inquiry/customer_allocation_inquiry.php:160
- #: ../sales/inquiry/customer_inquiry.php:206
- #: ../sales/inquiry/customer_inquiry.php:220
- #: ../sales/inquiry/sales_deliveries_view.php:180
- #: ../sales/inquiry/sales_orders_view.php:286
- #: ../sales/inquiry/sales_orders_view.php:300
 -#: includes/sysnames.inc:96 reporting/rep101.php:139 reporting/rep102.php:125
++#: includes/sysnames.inc:96 includes/sysnames.inc:195 reporting/rep102.php:125
+ #: reporting/rep102.php:132 reporting/rep105.php:109 reporting/rep106.php:83
+ #: reporting/rep114.php:95 reporting/rep304.php:114 reporting/rep304.php:124
+ #: reporting/reports_main.php:32 reporting/reports_main.php:36
 -#: reporting/reports_main.php:44 reporting/reports_main.php:118
 -#: reporting/reports_main.php:241 sales/create_recurrent_invoices.php:134
 -#: sales/customer_credit_invoice.php:235 sales/customer_delivery.php:338
 -#: sales/customer_invoice.php:380
++#: reporting/reports_main.php:45 sales/create_recurrent_invoices.php:134
++#: sales/customer_credit_invoice.php:235 sales/customer_delivery.php:352
++#: sales/customer_invoice.php:446
+ #: sales/allocations/customer_allocation_main.php:97
+ #: sales/allocations/customer_allocation_main.php:105
+ #: sales/manage/recurrent_invoices.php:102 sales/view/view_credit.php:47
+ #: sales/inquiry/customer_allocation_inquiry.php:149
+ #: sales/inquiry/customer_allocation_inquiry.php:159
 -#: sales/inquiry/customer_inquiry.php:230
 -#: sales/inquiry/customer_inquiry.php:244
++#: sales/inquiry/customer_inquiry.php:206
++#: sales/inquiry/customer_inquiry.php:220
+ #: sales/inquiry/sales_deliveries_view.php:180
 -#: sales/inquiry/sales_orders_view.php:264
 -#: sales/inquiry/sales_orders_view.php:278
  msgid "Customer"
  msgstr ""
  
- #: ../includes/sysnames.inc:97
- #: ../includes/sysnames.inc:173
- #: ../includes/sysnames.inc:196
- #: ../inventory/purchasing_data.php:129
- #: ../purchasing/includes/ui/grn_ui.inc:20
- #: ../purchasing/includes/ui/po_ui.inc:323
- #: ../purchasing/includes/ui/po_ui.inc.orig:323
- #: ../purchasing/view/view_supp_credit.php:42
- #: ../purchasing/view/view_supp_invoice.php:46
- #: ../purchasing/inquiry/po_search_completed.php:122
- #: ../purchasing/inquiry/po_search_completed.php.orig:121
- #: ../purchasing/inquiry/po_search.php:132
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:128
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:141
- #: ../purchasing/inquiry/supplier_inquiry.php:176
- #: ../purchasing/inquiry/supplier_inquiry.php:191
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:173
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:188
- #: ../purchasing/allocations/supplier_allocation_main.php:98
- #: ../purchasing/allocations/supplier_allocation_main.php:106
- #: ../reporting/rep201.php:125
- #: ../reporting/rep202.php:128
- #: ../reporting/rep202.php:135
- #: ../reporting/rep203.php:98
- #: ../reporting/rep204.php:88
- #: ../reporting/reports_main.php:132
- #: ../reporting/reports_main.php:136
- #: ../reporting/reports_main.php:143
- #: ../reporting/reports_main.php:153
- #: ../reporting/reports_main.php:159
 -#: includes/sysnames.inc:97 includes/sysnames.inc:172
 -#: inventory/purchasing_data.php:149 purchasing/includes/ui/grn_ui.inc:20
 -#: purchasing/includes/ui/po_ui.inc:315
++#: includes/sysnames.inc:97 includes/sysnames.inc:173
++#: includes/sysnames.inc:196 inventory/purchasing_data.php:149
++#: purchasing/includes/ui/grn_ui.inc:20
+ #: purchasing/view/view_supp_credit.php:42
 -#: purchasing/view/view_supp_invoice.php:45
 -#: purchasing/inquiry/po_search_completed.php:123
++#: purchasing/view/view_supp_invoice.php:46
++#: purchasing/inquiry/po_search_completed.php:122
+ #: purchasing/inquiry/po_search.php:132
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:129
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:142
 -#: purchasing/inquiry/supplier_inquiry.php:171
 -#: purchasing/inquiry/supplier_inquiry.php:185
++#: purchasing/inquiry/supplier_allocation_inquiry.php:128
++#: purchasing/inquiry/supplier_allocation_inquiry.php:141
++#: purchasing/inquiry/supplier_inquiry.php:176
++#: purchasing/inquiry/supplier_inquiry.php:191
+ #: purchasing/allocations/supplier_allocation_main.php:98
+ #: purchasing/allocations/supplier_allocation_main.php:106
 -#: reporting/rep201.php:127 reporting/rep202.php:130 reporting/rep202.php:137
 -#: reporting/rep203.php:100 reporting/rep204.php:90 reporting/rep306.php:141
 -#: reporting/rep306.php:151 reporting/reports_main.php:146
 -#: reporting/reports_main.php:150 reporting/reports_main.php:158
 -#: reporting/reports_main.php:169 reporting/reports_main.php:176
 -#: reporting/reports_main.php:256
++#: reporting/rep202.php:130 reporting/rep202.php:137 reporting/rep203.php:100
++#: reporting/rep204.php:90 reporting/rep306.php:141 reporting/rep306.php:151
  msgid "Supplier"
  msgstr ""
  
@@@ -7055,133 -5989,165 +5961,177 @@@ msgstr "
  msgid "Overhead Cost"
  msgstr ""
  
- #: ../includes/sysnames.inc:113
 -#: includes/sysnames.inc:119
++#: includes/sysnames.inc:113
 +msgid "Materials"
 +msgstr ""
 +
- #: ../includes/sysnames.inc:120
++#: includes/sysnames.inc:120
  msgid "Assets"
  msgstr ""
  
- #: ../includes/sysnames.inc:122
 -#: includes/sysnames.inc:121
++#: includes/sysnames.inc:122
  msgid "Equity"
  msgstr ""
  
- #: ../includes/sysnames.inc:123
 -#: includes/sysnames.inc:122
++#: includes/sysnames.inc:123
  msgid "Income"
  msgstr ""
  
- #: ../includes/sysnames.inc:124
 -#: includes/sysnames.inc:123
++#: includes/sysnames.inc:124
  msgid "Cost of Goods Sold"
  msgstr ""
  
- #: ../includes/sysnames.inc:125
 -#: includes/sysnames.inc:124
++#: includes/sysnames.inc:125
  msgid "Expense"
  msgstr ""
  
- #: ../includes/sysnames.inc:132
 -#: includes/sysnames.inc:131
++#: includes/sysnames.inc:132
  msgid "Remainder"
  msgstr ""
  
- #: ../includes/sysnames.inc:134
 -#: includes/sysnames.inc:133
++#: includes/sysnames.inc:134
  msgid "Amount, increase base"
  msgstr ""
  
- #: ../includes/sysnames.inc:135
 -#: includes/sysnames.inc:134
++#: includes/sysnames.inc:135
  msgid "Amount, reduce base"
  msgstr ""
  
- #: ../includes/sysnames.inc:136
 -#: includes/sysnames.inc:135
++#: includes/sysnames.inc:136
  msgid "% amount of base"
  msgstr ""
  
- #: ../includes/sysnames.inc:137
 -#: includes/sysnames.inc:136
++#: includes/sysnames.inc:137
  msgid "% amount of base, increase base"
  msgstr ""
  
- #: ../includes/sysnames.inc:138
 -#: includes/sysnames.inc:137
++#: includes/sysnames.inc:138
  msgid "% amount of base, reduce base"
  msgstr ""
  
- #: ../includes/sysnames.inc:139
 -#: includes/sysnames.inc:138
++#: includes/sysnames.inc:139
  msgid "Taxes added"
  msgstr ""
  
- #: ../includes/sysnames.inc:140
 -#: includes/sysnames.inc:139
++#: includes/sysnames.inc:140
  msgid "Taxes added, increase base"
  msgstr ""
  
- #: ../includes/sysnames.inc:141
 -#: includes/sysnames.inc:140
++#: includes/sysnames.inc:141
  msgid "Taxes added, reduce base"
  msgstr ""
  
- #: ../includes/sysnames.inc:142
 -#: includes/sysnames.inc:141
++#: includes/sysnames.inc:142
  msgid "Taxes included"
  msgstr ""
  
- #: ../includes/sysnames.inc:143
 -#: includes/sysnames.inc:142
++#: includes/sysnames.inc:143
  msgid "Taxes included, increase base"
  msgstr ""
  
- #: ../includes/sysnames.inc:144
 -#: includes/sysnames.inc:143
++#: includes/sysnames.inc:144
  msgid "Taxes included, reduce base"
  msgstr ""
  
- #: ../includes/sysnames.inc:151
 -#: includes/sysnames.inc:150
++#: includes/sysnames.inc:151
  msgid "Supplier Invoice/Credit"
  msgstr ""
  
- #: ../includes/sysnames.inc:157
- #: ../manufacturing/search_work_orders.php:165
- #: ../manufacturing/includes/manufacturing_ui.inc:278
 -#: includes/sysnames.inc:156 manufacturing/search_work_orders.php:165
++#: includes/sysnames.inc:157 manufacturing/search_work_orders.php:165
+ #: manufacturing/includes/manufacturing_ui.inc:278
  msgid "Manufactured"
  msgstr ""
  
- #: ../includes/sysnames.inc:158
 -#: includes/sysnames.inc:157
++#: includes/sysnames.inc:158
  msgid "Purchased"
  msgstr ""
  
- #: ../includes/sysnames.inc:159
 -#: includes/sysnames.inc:158
++#: includes/sysnames.inc:159
  msgid "Service"
  msgstr ""
  
- #: ../includes/sysnames.inc:172
 -#: includes/sysnames.inc:171
++#: includes/sysnames.inc:172
  msgid "Customer branch"
  msgstr ""
  
- #: ../includes/sysnames.inc:174
 -#: includes/sysnames.inc:173
++#: includes/sysnames.inc:174
  msgid "Shipper"
  msgstr ""
  
- #: ../includes/sysnames.inc:175
 -#: includes/sysnames.inc:174
++#: includes/sysnames.inc:175
  msgid "Company internal"
  msgstr ""
  
- #: ../includes/sysnames.inc:180
 -#: includes/sysnames.inc:179
++#: includes/sysnames.inc:180
  msgid "Prepayment"
  msgstr ""
  
- #: ../includes/sysnames.inc:182
 -#: includes/sysnames.inc:181
++#: includes/sysnames.inc:182
  msgid "After No. of Days"
  msgstr ""
  
- #: ../includes/sysnames.inc:183
 -#: includes/sysnames.inc:182
++#: includes/sysnames.inc:183
  msgid "Day In Following Month"
  msgstr ""
  
- #: ../includes/sysnames.inc:187
+ #: includes/sysnames.inc:187
 +msgid "Sum per line taxes"
 +msgstr ""
 +
- #: ../includes/sysnames.inc:188
++#: includes/sysnames.inc:188
 +msgid "Taxes from totals"
 +msgstr ""
 +
- #: ../includes/system_tests.inc:15
- #: ../includes/ui/ui_view.inc:210
- #: ../reporting/rep705.php:250
- #: ../reporting/rep705.php:261
- #: ../reporting/rep705.php:270
++#: includes/sysnames.inc:200
+ msgid "Jan"
+ msgstr ""
+ 
 -#: includes/sysnames.inc:187
++#: includes/sysnames.inc:200
+ msgid "Feb"
+ msgstr ""
+ 
 -#: includes/sysnames.inc:187
++#: includes/sysnames.inc:200
+ msgid "Mar"
+ msgstr ""
+ 
 -#: includes/sysnames.inc:187
++#: includes/sysnames.inc:200
+ msgid "Apr"
+ msgstr ""
+ 
 -#: includes/sysnames.inc:187 includes/ui/ui_view.inc:842
++#: includes/sysnames.inc:200 includes/ui/ui_view.inc:843
+ msgid "May"
+ msgstr ""
+ 
 -#: includes/sysnames.inc:187
++#: includes/sysnames.inc:200
+ msgid "Jun"
+ msgstr ""
+ 
 -#: includes/sysnames.inc:187
++#: includes/sysnames.inc:200
+ msgid "Jul"
+ msgstr ""
+ 
 -#: includes/sysnames.inc:187
++#: includes/sysnames.inc:200
+ msgid "Aug"
+ msgstr ""
+ 
 -#: includes/sysnames.inc:187
++#: includes/sysnames.inc:200
+ msgid "Sep"
+ msgstr ""
+ 
 -#: includes/sysnames.inc:187
++#: includes/sysnames.inc:200
+ msgid "Oct"
+ msgstr ""
+ 
 -#: includes/sysnames.inc:187
++#: includes/sysnames.inc:200
+ msgid "Nov"
+ msgstr ""
+ 
 -#: includes/sysnames.inc:187
++#: includes/sysnames.inc:200
+ msgid "Dec"
+ msgstr ""
+ 
+ #: includes/system_tests.inc:15 includes/ui/ui_view.inc:210
+ #: reporting/rep705.php:254 reporting/rep705.php:265 reporting/rep705.php:274
  msgid "Info"
  msgstr ""
  
@@@ -7402,68 -6362,41 +6346,19 @@@ msgstr "
  msgid "Test type"
  msgstr ""
  
- #: ../includes/system_tests.inc:420
- #: ../includes/ui/view_package.php:37
- #: ../reporting/rep204.php:83
- #: ../reporting/rep301.php:103
+ #: includes/system_tests.inc:420 includes/ui/view_package.php:47
 -#: reporting/rep204.php:85 reporting/rep301.php:105
++#: reporting/rep204.php:85 reporting/rep301.php:105 reporting/rep308.php:150
  msgid "Value"
  msgstr ""
  
- #: ../includes/system_tests.inc:420
- #: ../reporting/reports_main.php:39
- #: ../reporting/reports_main.php:49
- #: ../reporting/reports_main.php:57
- #: ../reporting/reports_main.php:63
- #: ../reporting/reports_main.php:71
- #: ../reporting/reports_main.php:79
- #: ../reporting/reports_main.php:85
- #: ../reporting/reports_main.php:93
- #: ../reporting/reports_main.php:100
- #: ../reporting/reports_main.php:106
- #: ../reporting/reports_main.php:112
- #: ../reporting/reports_main.php:119
- #: ../reporting/reports_main.php:125
- #: ../reporting/reports_main.php:130
- #: ../reporting/reports_main.php:139
- #: ../reporting/reports_main.php:149
- #: ../reporting/reports_main.php:156
- #: ../reporting/reports_main.php:160
- #: ../reporting/reports_main.php:167
- #: ../reporting/reports_main.php:173
- #: ../reporting/reports_main.php:182
- #: ../reporting/reports_main.php:187
- #: ../reporting/reports_main.php:196
- #: ../reporting/reports_main.php:204
- #: ../reporting/reports_main.php:209
- #: ../reporting/reports_main.php:216
- #: ../reporting/reports_main.php:222
- #: ../reporting/reports_main.php:230
- #: ../reporting/reports_main.php:241
- #: ../reporting/reports_main.php:247
- #: ../reporting/reports_main.php:253
- #: ../reporting/reports_main.php:267
- #: ../reporting/reports_main.php:274
- #: ../reporting/reports_main.php:284
- #: ../reporting/reports_main.php:295
- #: ../reporting/reports_main.php:304
- #: ../reporting/reports_main.php:315
- #: ../reporting/reports_main.php:321
- #: ../reporting/reports_main.php:330
- #: ../reporting/reports_main.php:340
- #: ../reporting/reports_main.php:348
- #: ../reporting/reports_main.php:358
- #: ../reporting/reports_main.php:363
- #: ../reporting/reports_main.php:371
- #: ../reporting/reports_main.php:380
- #: ../reporting/reports_main.php:387
- #: ../reporting/reports_main.php:394
- #: ../reporting/reports_main.php:401
- #: ../reporting/includes/excel_report.inc:295
- #: ../reporting/includes/excel_report.inc:428
- #: ../reporting/includes/pdf_report.inc:346
- #: ../reporting/includes/pdf_report.inc:619
- #: ../sales/view/view_sales_order.php:98
- #: ../sales/view/view_sales_order.php.orig:85
 -#: includes/system_tests.inc:420 reporting/reports_main.php:39
 -#: reporting/reports_main.php:50 reporting/reports_main.php:59
 -#: reporting/reports_main.php:66 reporting/reports_main.php:75
 -#: reporting/reports_main.php:84 reporting/reports_main.php:91
 -#: reporting/reports_main.php:100 reporting/reports_main.php:108
 -#: reporting/reports_main.php:115 reporting/reports_main.php:122
 -#: reporting/reports_main.php:130 reporting/reports_main.php:137
 -#: reporting/reports_main.php:143 reporting/reports_main.php:153
 -#: reporting/reports_main.php:164 reporting/reports_main.php:172
 -#: reporting/reports_main.php:177 reporting/reports_main.php:184
 -#: reporting/reports_main.php:192 reporting/reports_main.php:199
 -#: reporting/reports_main.php:209 reporting/reports_main.php:215
 -#: reporting/reports_main.php:225 reporting/reports_main.php:233
 -#: reporting/reports_main.php:242 reporting/reports_main.php:248
 -#: reporting/reports_main.php:258 reporting/reports_main.php:266
 -#: reporting/reports_main.php:273 reporting/reports_main.php:282
 -#: reporting/reports_main.php:295 reporting/reports_main.php:302
 -#: reporting/reports_main.php:309 reporting/reports_main.php:324
 -#: reporting/reports_main.php:332 reporting/reports_main.php:343
 -#: reporting/reports_main.php:355 reporting/reports_main.php:365
 -#: reporting/reports_main.php:377 reporting/reports_main.php:384
 -#: reporting/reports_main.php:394 reporting/reports_main.php:405
 -#: reporting/reports_main.php:414 reporting/reports_main.php:425
 -#: reporting/reports_main.php:431 reporting/reports_main.php:440
 -#: reporting/reports_main.php:450 reporting/reports_main.php:458
 -#: reporting/reports_main.php:466 reporting/reports_main.php:474
 -#: reporting/includes/excel_report.inc:295
++#: includes/system_tests.inc:420 reporting/reports_main.php:40
++#: reporting/reports_main.php:51 reporting/reports_main.php:60
++#: reporting/reports_main.php:67 reporting/reports_main.php:76
++#: reporting/reports_main.php:85 reporting/reports_main.php:92
++#: reporting/reports_main.php:101 reporting/includes/excel_report.inc:295
+ #: reporting/includes/excel_report.inc:428
+ #: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:619
 -#: sales/view/view_sales_order.php:85
++#: sales/view/view_sales_order.php:98
  msgid "Comments"
  msgstr ""
  
@@@ -7471,90 -6404,70 +6366,65 @@@
  msgid "Ok"
  msgstr ""
  
- #: ../includes/db/audit_trail_db.inc:99
 -#: includes/db/audit_trail_db.inc:93
++#: includes/db/audit_trail_db.inc:99
  msgid ""
  "Some transactions journal GL postings were not indexed due to lack of audit "
  "trail record."
  msgstr ""
  
- #: ../includes/db/inventory_db.inc:252
- msgid "Cost was "
- msgstr ""
- 
- #: ../includes/db/inventory_db.inc:252
- msgid " changed to "
- msgstr ""
- 
- #: ../includes/db/inventory_db.inc:252
- msgid " for item "
+ #: includes/db/inventory_db.inc:252
 -#: inventory/includes/db/items_trans_db.inc:60
++#: inventory/includes/db/items_trans_db.inc:66
+ #, php-format
+ msgid "Cost was %s changed to %s x quantity on hand for item '%s'"
  msgstr ""
  
- #: ../includes/db/inventory_db.inc:292
+ #: includes/db/inventory_db.inc:293
  msgid "Zero/negative inventory handling"
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:264
- #: ../purchasing/allocations/supplier_allocation_main.php:94
- #: ../sales/allocations/customer_allocation_main.php:93
 -#: includes/ui/allocation_cart.inc:263
++#: includes/ui/allocation_cart.inc:264
+ #: purchasing/allocations/supplier_allocation_main.php:94
+ #: sales/allocations/customer_allocation_main.php:93
  msgid "Transaction Type"
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:264
- #: ../reporting/rep704.php:79
- #: ../reporting/rep704.php:82
- #: ../reporting/rep704.php:85
- #: ../reporting/rep709.php:109
- #: ../sales/view/view_credit.php:68
- #: ../sales/view/view_sales_order.php:109
- #: ../sales/view/view_sales_order.php:142
- #: ../sales/view/view_sales_order.php:179
- #: ../sales/view/view_sales_order.php.orig:96
- #: ../sales/view/view_sales_order.php.orig:129
- #: ../sales/view/view_sales_order.php.orig:161
- #: ../sales/inquiry/sales_orders_view.php:248
- #: ../sales/inquiry/sales_orders_view.php:285
- #: ../sales/inquiry/sales_orders_view.php:299
 -#: includes/ui/allocation_cart.inc:263 reporting/rep704.php:83
++#: includes/ui/allocation_cart.inc:264 reporting/rep704.php:83
+ #: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep709.php:111
 -#: sales/view/view_credit.php:68 sales/view/view_sales_order.php:96
 -#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
 -#: sales/inquiry/sales_orders_view.php:226
 -#: sales/inquiry/sales_orders_view.php:263
 -#: sales/inquiry/sales_orders_view.php:277
++#: sales/view/view_credit.php:68 sales/view/view_sales_order.php:109
++#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
  msgid "Ref"
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:265
 -#: includes/ui/allocation_cart.inc:264
++#: includes/ui/allocation_cart.inc:265
  msgid "Other Allocations"
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:265
- #: ../includes/ui/ui_view.inc:489
- #: ../reporting/includes/doctext.inc:167
- #: ../reporting/includes/doctext.inc:208
 -#: includes/ui/allocation_cart.inc:264 includes/ui/ui_view.inc:490
 -#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
++#: includes/ui/allocation_cart.inc:265 includes/ui/ui_view.inc:490
++#: reporting/includes/doctext.inc:167 reporting/includes/doctext.inc:208
  msgid "This Allocation"
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:265
- #: ../includes/ui/allocation_cart.inc:314
- #: ../includes/ui/ui_view.inc:489
- #: ../purchasing/allocations/supplier_allocation_main.php:101
- #: ../reporting/rep112.php:141
- #: ../reporting/rep210.php:154
- #: ../reporting/includes/doctext.inc:167
- #: ../reporting/includes/doctext.inc:208
- #: ../sales/allocations/customer_allocation_main.php:100
 -#: includes/ui/allocation_cart.inc:264 includes/ui/allocation_cart.inc:311
++#: includes/ui/allocation_cart.inc:265 includes/ui/allocation_cart.inc:314
+ #: includes/ui/ui_view.inc:490
+ #: purchasing/allocations/supplier_allocation_main.php:101
 -#: reporting/rep112.php:156 reporting/rep210.php:163
 -#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
++#: reporting/includes/doctext.inc:167 reporting/includes/doctext.inc:208
+ #: sales/allocations/customer_allocation_main.php:100
  msgid "Left to Allocate"
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:297
- #: ../reporting/rep112.php:138
- #: ../reporting/rep210.php:151
 -#: includes/ui/allocation_cart.inc:294 reporting/rep112.php:153
 -#: reporting/rep210.php:160
++#: includes/ui/allocation_cart.inc:297
  msgid "Total Allocated"
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:334
 -#: includes/ui/allocation_cart.inc:331
++#: includes/ui/allocation_cart.inc:334
  msgid "The entry for one or more amounts is invalid or negative."
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:343
 -#: includes/ui/allocation_cart.inc:340
++#: includes/ui/allocation_cart.inc:343
  msgid "At least one transaction is overallocated."
  msgstr ""
  
- #: ../includes/ui/allocation_cart.inc:361
 -#: includes/ui/allocation_cart.inc:358
++#: includes/ui/allocation_cart.inc:361
  msgid ""
  "These allocations cannot be processed because the amount allocated is more "
  "than the total amount left to allocate."
@@@ -7568,10 -6481,9 +6438,8 @@@ msgstr "
  msgid "Sec Phone"
  msgstr ""
  
- #: ../includes/ui/contacts_view.inc:41
- #: ../reporting/rep103.php:223
- #: ../reporting/includes/header2.inc:104
- #: ../sales/manage/sales_people.php:99
 -#: includes/ui/contacts_view.inc:41 reporting/rep103.php:266
 -#: reporting/rep205.php:184 reporting/includes/header2.inc:104
 -#: sales/manage/sales_people.php:99
++#: includes/ui/contacts_view.inc:41 reporting/rep205.php:184
++#: reporting/includes/header2.inc:104 sales/manage/sales_people.php:99
  msgid "Fax"
  msgstr ""
  
@@@ -7601,26 -6511,18 +6467,18 @@@ msgstr "
  msgid "Phone:"
  msgstr ""
  
- #: ../includes/ui/contacts_view.inc:105
- #: ../inventory/manage/locations.php:207
- #: ../purchasing/manage/suppliers.php:139
- #: ../purchasing/manage/suppliers.php.orig:117
- #: ../sales/manage/customer_branches.php:265
- #: ../sales/manage/customers.php:255
- #: ../sales/manage/sales_people.php:158
- #: ../sales/manage/sav.customers.php:255
+ #: includes/ui/contacts_view.inc:105 inventory/manage/locations.php:207
 -#: purchasing/manage/suppliers.php:160 sales/manage/customer_branches.php:263
++#: purchasing/manage/suppliers.php:139 sales/manage/customer_branches.php:265
+ #: sales/manage/customers.php:255 sales/manage/sales_people.php:158
  msgid "E-mail:"
  msgstr ""
  
- #: ../includes/ui/contacts_view.inc:110
- #: ../purchasing/manage/suppliers.php:140
- #: ../purchasing/manage/suppliers.php.orig:118
- #: ../sales/manage/customer_branches.php:266
 -#: includes/ui/contacts_view.inc:110 purchasing/manage/suppliers.php:161
 -#: sales/manage/customer_branches.php:264
++#: includes/ui/contacts_view.inc:110 purchasing/manage/suppliers.php:140
++#: sales/manage/customer_branches.php:266
  msgid "Document Language:"
  msgstr ""
  
- #: ../includes/ui/contacts_view.inc:110
- #: ../sales/manage/customer_branches.php:266
 -#: includes/ui/contacts_view.inc:110 sales/manage/customer_branches.php:264
++#: includes/ui/contacts_view.inc:110 sales/manage/customer_branches.php:266
  msgid "Customer default"
  msgstr ""
  
@@@ -7640,8 -6542,8 +6498,7 @@@ msgstr "
  msgid "You have to select at least one category."
  msgstr ""
  
- #: ../includes/ui/db_pager_view.inc:166
- #: ../includes/ui/ui_input.inc:903
 -#: includes/ui/db_pager_view.inc:166 includes/ui/radio.ui_input.inc:899
 -#: includes/ui/ui_input.inc:903
++#: includes/ui/db_pager_view.inc:166 includes/ui/ui_input.inc:904
  msgid "Show also Inactive"
  msgstr ""
  
@@@ -7670,280 -6572,267 +6527,249 @@@ msgstr "
  msgid "No records"
  msgstr ""
  
- #: ../includes/ui/simple_crud_class.inc:227
- #: ../includes/ui/ui_input.inc:208
 -#: includes/ui/radio.ui_input.inc:206 includes/ui/simple_crud_class.inc:227
 -#: includes/ui/ui_input.inc:207
++#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:208
  msgid "Submit changes"
  msgstr ""
  
- #: ../includes/ui/simple_crud_class.inc:229
- #: ../includes/ui/ui_input.inc:209
 -#: includes/ui/radio.ui_input.inc:207 includes/ui/simple_crud_class.inc:229
 -#: includes/ui/ui_input.inc:208
++#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:209
  msgid "Clone"
  msgstr ""
  
- #: ../includes/ui/simple_crud_class.inc:229
- #: ../includes/ui/ui_input.inc:210
 -#: includes/ui/radio.ui_input.inc:208 includes/ui/simple_crud_class.inc:229
 -#: includes/ui/ui_input.inc:209
++#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:210
  msgid "Edit new record with current data"
  msgstr ""
  
- #: ../includes/ui/simple_crud_class.inc:231
- #: ../includes/ui/ui_input.inc:211
 -#: includes/ui/radio.ui_input.inc:209 includes/ui/simple_crud_class.inc:231
 -#: includes/ui/ui_input.inc:210
++#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_input.inc:211
  msgid "Cancel edition"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:79
 -#: includes/ui/radio.ui_input.inc:628 includes/ui/ui_input.inc:631
 -#: reporting/includes/reports_classes.inc:219
 -msgid "Click Here to Pick up the date"
++#: includes/ui/ui_controls.inc:79
 +msgid "Request from outside of this page is forbidden."
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:80
 -#: includes/ui/radio.ui_input.inc:911 includes/ui/sav.ui_lists.inc:2131
 -#: includes/ui/ui_input.inc:915 includes/ui/ui_lists.inc:2153
 -#: reporting/rep301.php:155 reporting/rep302.php:170 reporting/rep303.php:174
 -#: reporting/rep304.php:170 reporting/rep304.php:174 reporting/rep306.php:236
 -#: reporting/rep306.php:243 sales/manage/customer_branches.php:302
 -msgid "Inactive"
++#: includes/ui/ui_controls.inc:80
 +msgid "CSRF attack detected from: "
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:146
 -#: includes/ui/radio.ui_input.inc:921 includes/ui/radio.ui_input.inc:933
 -#: includes/ui/ui_input.inc:925 includes/ui/ui_input.inc:937
 -msgid "Current Credit:"
++#: includes/ui/ui_controls.inc:146
 +msgid "You should automatically be forwarded."
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:147
 -#: includes/ui/radio.ui_input.inc:947 includes/ui/ui_input.inc:951
 -msgid "Bank Balance:"
++#: includes/ui/ui_controls.inc:147
 +msgid "If this does not happen"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:147
 -#: includes/ui/sav.ui_lists.inc:17 includes/ui/ui_lists.inc:17
 -msgid "Set filter"
++#: includes/ui/ui_controls.inc:147
 +msgid "click here"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:147
 -#: includes/ui/sav.ui_lists.inc:100 includes/ui/ui_lists.inc:100
 -msgid "Press Space tab for search pattern entry"
++#: includes/ui/ui_controls.inc:147
 +msgid "to continue"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:194
 -#: includes/ui/sav.ui_lists.inc:104 includes/ui/ui_lists.inc:104
 -msgid "Enter code fragment to search or * for all"
++#: includes/ui/ui_controls.inc:194
 +msgid "View Attachment"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:197
 -#: includes/ui/sav.ui_lists.inc:105 includes/ui/ui_lists.inc:105
 -msgid "Enter description fragment to search or * for all"
++#: includes/ui/ui_controls.inc:197
 +msgid "Close"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:457
- #: ../sales/manage/customers.php:23
- #: ../sales/manage/sav.customers.php:23
 -#: includes/ui/sav.ui_lists.inc:449 includes/ui/sav.ui_lists.inc:1367
 -#: includes/ui/ui_lists.inc:453 includes/ui/ui_lists.inc:1388
 -msgid "All Suppliers"
++#: includes/ui/ui_controls.inc:457 sales/manage/customers.php:23
 +msgid "Customers"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:459
 -#: includes/ui/sav.ui_lists.inc:453 includes/ui/ui_lists.inc:457
 -msgid "Press Space tab to filter by name fragment"
++#: includes/ui/ui_controls.inc:459
 +msgid "Branches"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:461
- #: ../purchasing/manage/suppliers.php:22
- #: ../purchasing/manage/suppliers.php.orig:23
 -#: includes/ui/sav.ui_lists.inc:454 includes/ui/ui_lists.inc:458
 -msgid "Select supplier"
++#: includes/ui/ui_controls.inc:461 purchasing/manage/suppliers.php:22
 +msgid "Suppliers"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:463
- #: ../inventory/transfers.php:230
- #: ../inventory/manage/items.php:22
- #: ../inventory/manage/items.php.orig:21
 -#: includes/ui/sav.ui_lists.inc:498 includes/ui/ui_lists.inc:505
 -msgid "All Customers"
++#: includes/ui/ui_controls.inc:463 inventory/transfers.php:228
++#: inventory/manage/items.php:22
 +msgid "Items"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:608
 -#: includes/ui/sav.ui_lists.inc:502 includes/ui/ui_lists.inc:509
 -msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
++#: includes/ui/ui_controls.inc:608
 +msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
  msgstr ""
  
- #: ../includes/ui/ui_input.inc:632
- #: ../reporting/includes/reports_classes.inc:219
 -#: includes/ui/sav.ui_lists.inc:503 includes/ui/ui_lists.inc:510
 -msgid "Select customer"
++#: includes/ui/ui_input.inc:632 reporting/includes/reports_classes.inc:219
 +msgid "Click Here to Pick up the date"
  msgstr ""
  
- #: ../includes/ui/ui_input.inc:915
- #: ../includes/ui/ui_lists.inc:2156
- #: ../reporting/rep301.php:152
- #: ../reporting/rep302.php:166
- #: ../reporting/rep303.php:170
- #: ../reporting/rep304.php:166
- #: ../reporting/rep304.php:170
- #: ../sales/manage/customer_branches.php:304
 -#: includes/ui/sav.ui_lists.inc:546 includes/ui/ui_lists.inc:558
 -msgid "All branches"
++#: includes/ui/ui_input.inc:916 includes/ui/ui_lists.inc:2157
++#: reporting/rep301.php:155 reporting/rep302.php:170 reporting/rep304.php:170
++#: reporting/rep304.php:174 reporting/rep306.php:236 reporting/rep306.php:243
++#: sales/manage/customer_branches.php:304
 +msgid "Inactive"
  msgstr ""
  
- #: ../includes/ui/ui_input.inc:925
- #: ../includes/ui/ui_input.inc:937
 -#: includes/ui/sav.ui_lists.inc:549 includes/ui/ui_lists.inc:561
 -msgid "Select customer branch"
++#: includes/ui/ui_input.inc:926 includes/ui/ui_input.inc:938
 +msgid "Current Credit:"
  msgstr ""
  
- #: ../includes/ui/ui_input.inc:971
 -#: includes/ui/sav.ui_lists.inc:584 includes/ui/ui_lists.inc:601
 -msgid "All Locations"
++#: includes/ui/ui_input.inc:972
 +msgid "Bank Balance:"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:17
 -#: includes/ui/sav.ui_lists.inc:736 includes/ui/sav.ui_lists.inc:801
 -#: includes/ui/ui_lists.inc:753 includes/ui/ui_lists.inc:822
 -msgid "All Items"
++#: includes/ui/ui_lists.inc:17
 +msgid "Set filter"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:100
 -#: includes/ui/sav.ui_lists.inc:1274 includes/ui/ui_lists.inc:1295
 -msgid "All Sales Types"
++#: includes/ui/ui_lists.inc:100
 +msgid "Press Space tab for search pattern entry"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:104
 -#: includes/ui/sav.ui_lists.inc:1603 includes/ui/ui_lists.inc:1626
 -msgid "Use Item Sales Accounts"
++#: includes/ui/ui_lists.inc:104
 +msgid "Enter code fragment to search or * for all"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:105
 -#: includes/ui/sav.ui_lists.inc:1915 includes/ui/sav.ui_lists.inc:1932
 -#: includes/ui/sav.ui_lists.inc:1949 includes/ui/ui_lists.inc:1937
 -#: includes/ui/ui_lists.inc:1954 includes/ui/ui_lists.inc:1971
 -msgid "All Types"
++#: includes/ui/ui_lists.inc:105
 +msgid "Enter description fragment to search or * for all"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:453
- #: ../includes/ui/ui_lists.inc:1386
 -#: includes/ui/sav.ui_lists.inc:1916 includes/ui/ui_lists.inc:1938
 -#: sales/view/view_sales_order.php:127
 -msgid "Sales Invoices"
++#: includes/ui/ui_lists.inc:453 includes/ui/ui_lists.inc:1386
 +msgid "All Suppliers"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:457
 -#: includes/ui/sav.ui_lists.inc:1917 includes/ui/sav.ui_lists.inc:1934
 -#: includes/ui/sav.ui_lists.inc:1952 includes/ui/ui_lists.inc:1939
 -#: includes/ui/ui_lists.inc:1956 includes/ui/ui_lists.inc:1974
 -msgid "Overdue Invoices"
++#: includes/ui/ui_lists.inc:457
 +msgid "Press Space tab to filter by name fragment"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:458
 -#: includes/ui/sav.ui_lists.inc:1918 includes/ui/sav.ui_lists.inc:1935
 -#: includes/ui/sav.ui_lists.inc:1953 includes/ui/ui_lists.inc:1940
 -#: includes/ui/ui_lists.inc:1957 includes/ui/ui_lists.inc:1975
 -#: includes/ui/ui_view.inc:485
 -msgid "Payments"
++#: includes/ui/ui_lists.inc:458
 +msgid "Select supplier"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:505
 -#: includes/ui/sav.ui_lists.inc:1919 includes/ui/sav.ui_lists.inc:1936
 -#: includes/ui/sav.ui_lists.inc:1954 includes/ui/ui_lists.inc:1941
 -#: includes/ui/ui_lists.inc:1958 includes/ui/ui_lists.inc:1976
 -#: sales/view/view_sales_order.php:158
 -msgid "Credit Notes"
++#: includes/ui/ui_lists.inc:505
 +msgid "All Customers"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:509
 -#: includes/ui/sav.ui_lists.inc:1920 includes/ui/ui_lists.inc:1942
 -#: sales/view/view_sales_order.php:93
 -msgid "Delivery Notes"
++#: includes/ui/ui_lists.inc:509
 +msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:510
 -#: includes/ui/sav.ui_lists.inc:1933 includes/ui/sav.ui_lists.inc:1951
 -#: includes/ui/ui_lists.inc:1955 includes/ui/ui_lists.inc:1973
 -msgid "Invoices"
++#: includes/ui/ui_lists.inc:510
 +msgid "Select customer"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:557
 -#: includes/ui/sav.ui_lists.inc:1937 includes/ui/sav.ui_lists.inc:1955
 -#: includes/ui/ui_lists.inc:1959 includes/ui/ui_lists.inc:1977
 -msgid "Overdue Credit Notes"
++#: includes/ui/ui_lists.inc:557
 +msgid "All branches"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:560
 -#: includes/ui/sav.ui_lists.inc:1950 includes/ui/ui_lists.inc:1972
 -msgid "GRNs"
++#: includes/ui/ui_lists.inc:560
 +msgid "Select customer branch"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:600
 -#: includes/ui/sav.ui_lists.inc:1968 includes/ui/ui_lists.inc:1990
 -msgid "Automatically put balance on back order"
++#: includes/ui/ui_lists.inc:600
 +msgid "All Locations"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:752
- #: ../includes/ui/ui_lists.inc:820
 -#: includes/ui/sav.ui_lists.inc:1969 includes/ui/ui_lists.inc:1991
 -msgid "Cancel any quantites not delivered"
++#: includes/ui/ui_lists.inc:752 includes/ui/ui_lists.inc:820
 +msgid "All Items"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1293
 -#: includes/ui/sav.ui_lists.inc:1986 includes/ui/ui_lists.inc:2008
 -msgid "Items Returned to Inventory Location"
++#: includes/ui/ui_lists.inc:1293
 +msgid "All Sales Types"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1628
 -#: includes/ui/sav.ui_lists.inc:1987 includes/ui/ui_lists.inc:2009
 -msgid "Items Written Off"
++#: includes/ui/ui_lists.inc:1630
 +msgid "Use Item Sales Accounts"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1940
- #: ../includes/ui/ui_lists.inc:1957
- #: ../includes/ui/ui_lists.inc:1974
 -#: includes/ui/sav.ui_lists.inc:2157 includes/ui/ui_lists.inc:2179
 -msgid "New role"
++#: includes/ui/ui_lists.inc:1941 includes/ui/ui_lists.inc:1958
++#: includes/ui/ui_lists.inc:1975
 +msgid "All Types"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1941
- #: ../sales/view/view_sales_order.php:140
- #: ../sales/view/view_sales_order.php.orig:127
 -#: includes/ui/sav.ui_lists.inc:2215 includes/ui/ui_lists.inc:2231
 -msgid "No tags defined."
++#: includes/ui/ui_lists.inc:1942 sales/view/view_sales_order.php:140
 +msgid "Sales Invoices"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1942
- #: ../includes/ui/ui_lists.inc:1959
- #: ../includes/ui/ui_lists.inc:1977
 -#: includes/ui/sav.ui_lists.inc:2215 includes/ui/ui_lists.inc:2231
 -msgid "No active tags defined."
++#: includes/ui/ui_lists.inc:1943 includes/ui/ui_lists.inc:1960
++#: includes/ui/ui_lists.inc:1978
 +msgid "Overdue Invoices"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1943
- #: ../includes/ui/ui_lists.inc:1960
- #: ../includes/ui/ui_lists.inc:1978
- #: ../includes/ui/ui_view.inc:551
- #: ../includes/ui/ui_view.inc:555
 -#: includes/ui/sav.ui_lists.inc:2253 includes/ui/ui_lists.inc:2269
 -#, php-format
 -msgid "Activated for '%s'"
++#: includes/ui/ui_lists.inc:1944 includes/ui/ui_lists.inc:1961
++#: includes/ui/ui_lists.inc:1979 includes/ui/ui_view.inc:552
++#: includes/ui/ui_view.inc:556
 +msgid "Payments"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1944
- #: ../includes/ui/ui_lists.inc:1961
- #: ../includes/ui/ui_lists.inc:1979
- #: ../sales/view/view_sales_order.php:176
- #: ../sales/view/view_sales_order.php.orig:158
 -#: includes/ui/sav.ui_lists.inc:2256 includes/ui/ui_lists.inc:2272
 -msgid "Available and/or installed"
++#: includes/ui/ui_lists.inc:1945 includes/ui/ui_lists.inc:1962
++#: includes/ui/ui_lists.inc:1980 sales/view/view_sales_order.php:176
 +msgid "Credit Notes"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1945
- #: ../sales/view/view_sales_order.php:106
- #: ../sales/view/view_sales_order.php.orig:93
 -#: includes/ui/sav.ui_lists.inc:2326 includes/ui/ui_lists.inc:2342
 -msgid "Standard new company American COA (4 digit)"
++#: includes/ui/ui_lists.inc:1946 sales/view/view_sales_order.php:106
 +msgid "Delivery Notes"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1958
- #: ../includes/ui/ui_lists.inc:1976
 -#: includes/ui/sav.ui_lists.inc:2328 includes/ui/ui_lists.inc:2344
 -msgid "Standard American COA (4 digit) with demo data"
++#: includes/ui/ui_lists.inc:1959 includes/ui/ui_lists.inc:1977
 +msgid "Invoices"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1962
- #: ../includes/ui/ui_lists.inc:1980
 -#: includes/ui/sav.ui_lists.inc:2349 includes/ui/ui_lists.inc:2365
 -msgid "No payment Link"
++#: includes/ui/ui_lists.inc:1963 includes/ui/ui_lists.inc:1981
 +msgid "Overdue Credit Notes"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1975
 -#: includes/ui/ui_controls.inc:72
 -msgid "Request from outside of this page is forbidden."
++#: includes/ui/ui_lists.inc:1976
 +msgid "GRNs"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1993
 -#: includes/ui/ui_controls.inc:73
 -msgid "CSRF attack detected from: "
++#: includes/ui/ui_lists.inc:1994
 +msgid "Automatically put balance on back order"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1994
 -#: includes/ui/ui_controls.inc:139
 -msgid "You should automatically be forwarded."
++#: includes/ui/ui_lists.inc:1995
 +msgid "Cancel any quantites not delivered"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2011
 -#: includes/ui/ui_controls.inc:140
 -msgid "If this does not happen"
++#: includes/ui/ui_lists.inc:2012
 +msgid "Items Returned to Inventory Location"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2012
 -#: includes/ui/ui_controls.inc:140
 -msgid "click here"
++#: includes/ui/ui_lists.inc:2013
 +msgid "Items Written Off"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2182
 -#: includes/ui/ui_controls.inc:140
 -msgid "to continue"
++#: includes/ui/ui_lists.inc:2183
 +msgid "New role"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2240
 -#: includes/ui/ui_controls.inc:187
 -msgid "View Attachment"
++#: includes/ui/ui_lists.inc:2235
 +msgid "No tags defined."
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2240
 -#: includes/ui/ui_controls.inc:190
 -msgid "Close"
++#: includes/ui/ui_lists.inc:2235
 +msgid "No active tags defined."
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2278
 -#: includes/ui/ui_controls.inc:450 sales/manage/customers.php:23
 -msgid "Customers"
++#: includes/ui/ui_lists.inc:2273
 +#, php-format
 +msgid "Activated for '%s'"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2281
 -#: includes/ui/ui_controls.inc:452
 -msgid "Branches"
++#: includes/ui/ui_lists.inc:2276
 +msgid "Available and/or installed"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2351
 -#: includes/ui/ui_controls.inc:454 purchasing/manage/suppliers.php:22
 -msgid "Suppliers"
++#: includes/ui/ui_lists.inc:2346
 +msgid "Standard new company American COA (4 digit)"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2353
 -#: includes/ui/ui_controls.inc:456 inventory/transfers.php:228
 -#: inventory/manage/items.php:21 reporting/reports_main.php:257
 -msgid "Items"
++#: includes/ui/ui_lists.inc:2348
 +msgid "Standard American COA (4 digit) with demo data"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2374
 -#: includes/ui/ui_controls.inc:601
 -msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
++#: includes/ui/ui_lists.inc:2369
 +msgid "No payment Link"
  msgstr ""
  
- #: ../includes/ui/ui_msgs.inc:63
+ #: includes/ui/ui_msgs.inc:63
  msgid "in units of : "
  msgstr ""
  
@@@ -7951,143 -6840,122 +6777,122 @@@
  msgid "Date Voided:"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:407
- #: ../reporting/rep107.php:242
- #: ../reporting/rep109.php:183
- #: ../reporting/rep110.php:186
- #: ../reporting/rep111.php:168
- #: ../reporting/rep113.php:172
- #: ../reporting/rep209.php:191
 -#: includes/ui/ui_view.inc:407 reporting/rep107.php:170
 -#: reporting/rep109.php:180 reporting/rep110.php:184 reporting/rep111.php:165
 -#: reporting/rep113.php:169 reporting/rep209.php:183
++#: includes/ui/ui_view.inc:407 reporting/rep209.php:186
  msgid "Total Tax Excluded"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:413
- #: ../includes/ui/ui_view.inc:432
- #: ../includes/ui/ui_view.inc:451
- #: ../reporting/rep107.php:251
- #: ../reporting/rep109.php:192
- #: ../reporting/rep110.php:195
- #: ../reporting/rep111.php:177
- #: ../reporting/rep113.php:181
- #: ../reporting/rep209.php:200
+ #: includes/ui/ui_view.inc:413 includes/ui/ui_view.inc:432
 -#: includes/ui/ui_view.inc:451 reporting/rep107.php:179
 -#: reporting/rep109.php:189 reporting/rep110.php:193 reporting/rep111.php:174
 -#: reporting/rep113.php:178 reporting/rep209.php:192
++#: includes/ui/ui_view.inc:451 reporting/rep209.php:195
  msgid "Included"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:488
- #: ../reporting/includes/doctext.inc:167
- #: ../reporting/includes/doctext.inc:208
 -#: includes/ui/ui_view.inc:485
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:100
 -msgid "Allocations"
 -msgstr ""
 -
 -#: includes/ui/ui_view.inc:489 reporting/includes/doctext.inc:145
 -#: reporting/includes/doctext.inc:186
++#: includes/ui/ui_view.inc:489 reporting/includes/doctext.inc:167
++#: reporting/includes/doctext.inc:208
  msgid "Total Amount"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:512
 -#: includes/ui/ui_view.inc:514
++#: includes/ui/ui_view.inc:513
  msgid "Total Allocated:"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:518
 -#: includes/ui/ui_view.inc:518
++#: includes/ui/ui_view.inc:519
  msgid "Left to Allocate:"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:534
- #: ../includes/ui/ui_view.inc:538
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:99
 -#: includes/ui/ui_view.inc:571
++#: includes/ui/ui_view.inc:535 includes/ui/ui_view.inc:539
++#: purchasing/inquiry/supplier_allocation_inquiry.php:99
 +msgid "Allocations"
 +msgstr ""
 +
- #: ../includes/ui/ui_view.inc:551
- #: ../includes/ui/ui_view.inc:555
++#: includes/ui/ui_view.inc:552 includes/ui/ui_view.inc:556
 +msgid "Pre-Payments"
 +msgstr ""
 +
- #: ../includes/ui/ui_view.inc:571
++#: includes/ui/ui_view.inc:572
  msgid "No Quick Entries are defined."
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:599
 -#: includes/ui/ui_view.inc:599
++#: includes/ui/ui_view.inc:600
  msgid "No Quick Entry lines are defined."
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:781
- #: ../purchasing/includes/ui/invoice_ui.inc:473
 -#: includes/ui/ui_view.inc:781 purchasing/includes/ui/invoice_ui.inc:452
++#: includes/ui/ui_view.inc:782 purchasing/includes/ui/invoice_ui.inc:473
  msgid "and"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:842
 -#: includes/ui/ui_view.inc:842
++#: includes/ui/ui_view.inc:843
  msgid "January"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:842
 -#: includes/ui/ui_view.inc:842
++#: includes/ui/ui_view.inc:843
  msgid "February"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:842
 -#: includes/ui/ui_view.inc:842
++#: includes/ui/ui_view.inc:843
  msgid "March"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:842
 -#: includes/ui/ui_view.inc:842
++#: includes/ui/ui_view.inc:843
  msgid "April"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:842
- msgid "May"
- msgstr ""
- 
- #: ../includes/ui/ui_view.inc:842
 -#: includes/ui/ui_view.inc:842
++#: includes/ui/ui_view.inc:843
  msgid "June"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:842
 -#: includes/ui/ui_view.inc:842
++#: includes/ui/ui_view.inc:843
  msgid "July"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:842
 -#: includes/ui/ui_view.inc:842
++#: includes/ui/ui_view.inc:843
  msgid "August"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:842
 -#: includes/ui/ui_view.inc:842
++#: includes/ui/ui_view.inc:843
  msgid "September"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:842
 -#: includes/ui/ui_view.inc:842
++#: includes/ui/ui_view.inc:843
  msgid "October"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:842
 -#: includes/ui/ui_view.inc:842
++#: includes/ui/ui_view.inc:843
  msgid "November"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:842
 -#: includes/ui/ui_view.inc:842
++#: includes/ui/ui_view.inc:843
  msgid "December"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:843
 -#: includes/ui/ui_view.inc:843
++#: includes/ui/ui_view.inc:844
  msgid "Su"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:843
 -#: includes/ui/ui_view.inc:843
++#: includes/ui/ui_view.inc:844
  msgid "Mo"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:843
 -#: includes/ui/ui_view.inc:843
++#: includes/ui/ui_view.inc:844
  msgid "Tu"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:843
 -#: includes/ui/ui_view.inc:843
++#: includes/ui/ui_view.inc:844
  msgid "We"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:843
 -#: includes/ui/ui_view.inc:843
++#: includes/ui/ui_view.inc:844
  msgid "Th"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:843
 -#: includes/ui/ui_view.inc:843
++#: includes/ui/ui_view.inc:844
  msgid "Fr"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:843
 -#: includes/ui/ui_view.inc:843
++#: includes/ui/ui_view.inc:844
  msgid "Sa"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:844
 -#: includes/ui/ui_view.inc:844
++#: includes/ui/ui_view.inc:845
  msgid "W"
  msgstr ""
  
@@@ -8182,14 -7049,12 +6986,12 @@@ msgstr "
  msgid "Enter &Another Adjustment"
  msgstr ""
  
- #: ../inventory/adjustments.php:90
- #: ../inventory/transfers.php:87
- #: ../sales/sales_order_entry.php:369
+ #: inventory/adjustments.php:88 inventory/transfers.php:85
 -#: sales/sales_order_entry.php:359
++#: sales/sales_order_entry.php:369
  msgid "You must enter at least one non empty item line."
  msgstr ""
  
- #: ../inventory/adjustments.php:110
- #: ../inventory/transfers.php:105
 -#: inventory/adjustments.php:108 inventory/transfers.php:103
++#: inventory/adjustments.php:108
  msgid "The entered date for the adjustment is invalid."
  msgstr ""
  
@@@ -8199,13 -7064,11 +7001,11 @@@ msgid "
  "negative inventory balance :"
  msgstr ""
  
- #: ../inventory/adjustments.php:154
- #: ../manufacturing/work_order_issue.php:141
 -#: inventory/adjustments.php:152 manufacturing/work_order_issue.php:139
++#: inventory/adjustments.php:152 manufacturing/work_order_issue.php:141
  msgid "The quantity entered is negative or invalid."
  msgstr ""
  
- #: ../inventory/adjustments.php:161
- #: ../manufacturing/work_order_issue.php:148
 -#: inventory/adjustments.php:159 manufacturing/work_order_issue.php:146
++#: inventory/adjustments.php:159 manufacturing/work_order_issue.php:148
  msgid "The entered standard cost is negative or invalid."
  msgstr ""
  
@@@ -8243,20 -7106,14 +7043,12 @@@ msgstr "
  msgid "View the GL Journal Entries for this Cost Update"
  msgstr ""
  
- #: ../inventory/cost_update.php:85
- #: ../inventory/prices.php:56
- #: ../inventory/purchasing_data.php:101
- #: ../inventory/reorder_level.php:43
- #: ../inventory/inquiry/stock_movements.php:49
- #: ../inventory/inquiry/stock_movements.php.orig:51
- #: ../inventory/inquiry/stock_status.php:41
- #: ../inventory/inquiry/stock_status.php.orig:47
- #: ../inventory/manage/item_codes.php:105
- #: ../manufacturing/work_order_entry.php:396
- #: ../manufacturing/work_order_entry.php:401
- #: ../purchasing/inquiry/po_search.php:74
- #: ../sales/inquiry/sales_deliveries_view.php:114
- #: ../sales/inquiry/sales_orders_view.php:263
+ #: inventory/cost_update.php:97 inventory/prices.php:64
+ #: inventory/purchasing_data.php:119 inventory/reorder_level.php:51
 -#: inventory/inquiry/stock_movements.php:53
 -#: inventory/inquiry/stock_status.php:47 inventory/manage/item_codes.php:105
 -#: manufacturing/work_order_entry.php:396
 -#: manufacturing/work_order_entry.php:401 purchasing/inquiry/po_search.php:74
++#: inventory/inquiry/stock_movements.php:49
++#: inventory/inquiry/stock_status.php:41 inventory/manage/item_codes.php:105
++#: purchasing/inquiry/po_search.php:74
+ #: sales/inquiry/sales_deliveries_view.php:114
 -#: sales/inquiry/sales_orders_view.php:241
  msgid "Item:"
  msgstr ""
  
@@@ -8276,14 -7133,10 +7068,10 @@@ msgstr "
  msgid "Inventory Item Sales prices"
  msgstr ""
  
- #: ../inventory/prices.php:27
- #: ../inventory/inquiry/stock_movements.php:29
- #: ../inventory/inquiry/stock_movements.php.orig:31
- #: ../inventory/inquiry/stock_status.php:32
- #: ../inventory/inquiry/stock_status.php.orig:37
- #: ../inventory/manage/sales_kits.php:24
- #: ../manufacturing/inquiry/where_used_inquiry.php:21
- #: ../sales/credit_note_entry.php:49
 -#: inventory/prices.php:30 inventory/inquiry/stock_movements.php:32
 -#: inventory/inquiry/stock_status.php:37 inventory/manage/sales_kits.php:24
++#: inventory/prices.php:30 inventory/inquiry/stock_movements.php:29
++#: inventory/inquiry/stock_status.php:32 inventory/manage/sales_kits.php:24
+ #: manufacturing/inquiry/where_used_inquiry.php:21
+ #: sales/credit_note_entry.php:49
  msgid "There are no items defined in the system."
  msgstr ""
  
@@@ -8309,37 -7168,23 +7103,23 @@@ msgstr "
  msgid "The selected price has been deleted."
  msgstr ""
  
- #: ../inventory/prices.php:133
- #: ../reporting/rep104.php:116
- #: ../sales/customer_delivery.php.orig:368
- #: ../sales/customer_invoice.php:468
- #: ../sales/view/view_credit.php:73
- #: ../sales/view/view_dispatch.php:93
- #: ../sales/view/view_invoice.php:93
- #: ../sales/includes/ui/sales_credit_ui.inc:102
+ #: inventory/prices.php:149 reporting/rep104.php:118
 -#: sales/customer_delivery.php:355 sales/customer_invoice.php:402
++#: sales/customer_delivery.php:369 sales/customer_invoice.php:468
+ #: sales/view/view_credit.php:73 sales/view/view_dispatch.php:93
 -#: sales/view/view_invoice.php:92 sales/includes/ui/sales_credit_ui.inc:102
++#: sales/view/view_invoice.php:93 sales/includes/ui/sales_credit_ui.inc:102
  msgid "Sales Type"
  msgstr ""
  
- #: ../inventory/prices.php:133
- #: ../inventory/purchasing_data.php:129
- #: ../inventory/purchasing_data.php.orig:224
- #: ../purchasing/includes/ui/invoice_ui.inc:505
- #: ../purchasing/po_receive_items.php:63
- #: ../purchasing/view/view_grn.php:41
- #: ../purchasing/view/view_po.php:45
- #: ../reporting/rep104.php:109
- #: ../reporting/includes/doctext.inc:30
- #: ../reporting/includes/doctext.inc:192
- #: ../sales/customer_credit_invoice.php:281
- #: ../sales/customer_delivery.php.orig:446
- #: ../sales/customer_invoice.php:542
- #: ../sales/customer_invoice.php:545
- #: ../sales/view/view_credit.php:91
- #: ../sales/view/view_dispatch.php:113
- #: ../sales/view/view_invoice.php:116
- #: ../sales/view/view_sales_order.php:220
- #: ../sales/view/view_sales_order.php.orig:202
- #: ../sales/includes/ui/sales_credit_ui.inc:168
+ #: inventory/prices.php:149 inventory/purchasing_data.php:149
 -#: purchasing/includes/ui/invoice_ui.inc:484
++#: purchasing/includes/ui/invoice_ui.inc:505
+ #: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41
+ #: purchasing/view/view_po.php:45 reporting/rep104.php:111
 -#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170
 -#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:433
 -#: sales/customer_invoice.php:470 sales/view/view_credit.php:91
 -#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
 -#: sales/view/view_sales_order.php:202
++#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:192
++#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:447
++#: sales/customer_invoice.php:542 sales/customer_invoice.php:545
++#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
++#: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:220
+ #: sales/includes/ui/sales_credit_ui.inc:168
  msgid "Price"
  msgstr ""
  
@@@ -8375,20 -7216,13 +7151,13 @@@ msgstr "
  msgid "Supplier Purchasing Data"
  msgstr ""
  
- #: ../inventory/purchasing_data.php:23
- #: ../inventory/purchasing_data.php.orig:24
- #: ../purchasing/po_entry_items.php:70
- #: ../purchasing/po_entry_items.php.orig:67
 -#: inventory/purchasing_data.php:27 purchasing/po_entry_items.php:67
++#: inventory/purchasing_data.php:27 purchasing/po_entry_items.php:70
  msgid "There are no purchasable inventory items defined in the system."
  msgstr ""
  
- #: ../inventory/purchasing_data.php:24
- #: ../inventory/purchasing_data.php.orig:25
- #: ../purchasing/po_entry_items.php:68
- #: ../purchasing/po_entry_items.php.orig:65
- #: ../purchasing/supplier_credit.php:31
- #: ../purchasing/supplier_invoice.php:30
- #: ../purchasing/supplier_payment.php:40
 -#: inventory/purchasing_data.php:28 purchasing/po_entry_items.php:65
 -#: purchasing/supplier_credit.php:32 purchasing/supplier_invoice.php:32
++#: inventory/purchasing_data.php:28 purchasing/po_entry_items.php:68
++#: purchasing/supplier_credit.php:31 purchasing/supplier_invoice.php:30
+ #: purchasing/supplier_payment.php:40
  msgid "There are no suppliers defined in the system."
  msgstr ""
  
@@@ -8537,53 -7299,33 +7234,29 @@@ msgid "
  "manufactured items)."
  msgstr ""
  
- #: ../inventory/reorder_level.php:57
- #: ../inventory/inquiry/stock_status.php:66
- #: ../inventory/inquiry/stock_status.php:70
- #: ../inventory/inquiry/stock_status.php.orig:72
- #: ../inventory/inquiry/stock_status.php.orig:76
- #: ../manufacturing/search_work_orders.php:162
- #: ../manufacturing/inquiry/where_used_inquiry.php:45
- #: ../manufacturing/manage/bom_edit.php:70
- #: ../purchasing/inquiry/po_search_completed.php:123
- #: ../purchasing/inquiry/po_search_completed.php:133
- #: ../purchasing/inquiry/po_search_completed.php.orig:122
- #: ../purchasing/inquiry/po_search_completed.php.orig:132
- #: ../purchasing/inquiry/po_search.php:133
- #: ../purchasing/inquiry/po_search.php:144
- #: ../reporting/rep105.php:118
- #: ../reporting/rep301.php:110
- #: ../reporting/rep302.php:130
- #: ../reporting/rep303.php:122
- #: ../reporting/rep304.php:121
- #: ../reporting/reports_main.php:180
- #: ../reporting/reports_main.php:186
- #: ../reporting/reports_main.php:191
- #: ../reporting/reports_main.php:202
- #: ../sales/manage/sales_points.php:84
 -#: inventory/reorder_level.php:68 inventory/inquiry/stock_status.php:72
 -#: inventory/inquiry/stock_status.php:76
++#: inventory/reorder_level.php:68 inventory/inquiry/stock_movements.php:79
++#: inventory/inquiry/stock_status.php:66 inventory/inquiry/stock_status.php:70
+ #: manufacturing/search_work_orders.php:162
+ #: manufacturing/inquiry/where_used_inquiry.php:45
+ #: manufacturing/manage/bom_edit.php:70
 -#: purchasing/inquiry/po_search_completed.php:124
 -#: purchasing/inquiry/po_search_completed.php:134
++#: purchasing/inquiry/po_search_completed.php:123
++#: purchasing/inquiry/po_search_completed.php:133
+ #: purchasing/inquiry/po_search.php:133 purchasing/inquiry/po_search.php:144
+ #: reporting/rep105.php:120 reporting/rep301.php:112 reporting/rep302.php:132
 -#: reporting/rep303.php:124 reporting/rep304.php:123 reporting/rep306.php:150
 -#: reporting/rep307.php:124 reporting/rep308.php:156
 -#: reporting/reports_main.php:207 reporting/reports_main.php:214
 -#: reporting/reports_main.php:220 reporting/reports_main.php:232
 -#: reporting/reports_main.php:240 reporting/reports_main.php:255
 -#: sales/manage/sales_points.php:84
++#: reporting/rep304.php:123 reporting/rep306.php:150 reporting/rep307.php:124
++#: reporting/rep308.php:157 sales/manage/sales_points.php:84
  msgid "Location"
  msgstr ""
  
- #: ../inventory/reorder_level.php:57
- #: ../inventory/inquiry/stock_movements.php:78
- #: ../inventory/inquiry/stock_movements.php.orig:80
- #: ../inventory/inquiry/stock_status.php:70
- #: ../inventory/inquiry/stock_status.php.orig:76
- #: ../purchasing/supplier_credit.php:220
- #: ../sales/sales_order_entry.php:523
- #: ../sales/includes/ui/sales_order_ui.inc.orig:175
 -#: inventory/reorder_level.php:68 inventory/inquiry/stock_movements.php:82
 -#: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:203
 -#: sales/sales_order_entry.php:514 sales/includes/ui/sales_order_ui.inc:180
++#: inventory/reorder_level.php:68 inventory/inquiry/stock_movements.php:80
++#: inventory/inquiry/stock_status.php:70 purchasing/supplier_credit.php:220
++#: sales/sales_order_entry.php:530 sales/includes/ui/sales_order_ui.inc:182
  msgid "Quantity On Hand"
  msgstr ""
  
- #: ../inventory/reorder_level.php:57
- #: ../inventory/inquiry/stock_status.php:70
- #: ../inventory/inquiry/stock_status.php.orig:76
- #: ../sales/includes/db/old.sales_order_db.inc:110
- #: ../sales/includes/db/old.sales_order_db.inc:263
- #: ../sales/includes/db/sales_order_db.inc:112
- #: ../sales/includes/db/sales_order_db.inc:275
- #: ../sales/includes/db/sales_order_db.inc.orig:112
- #: ../sales/includes/db/sales_order_db.inc.orig:275
 -#: inventory/reorder_level.php:68 inventory/inquiry/stock_status.php:76
 -#: sales/includes/db/sales_order_db.inc:110
 -#: sales/includes/db/sales_order_db.inc:263
++#: inventory/reorder_level.php:68 inventory/inquiry/stock_status.php:70
++#: sales/includes/db/sales_order_db.inc:112
++#: sales/includes/db/sales_order_db.inc:275
  msgid "Re-Order Level"
  msgstr ""
  
@@@ -8607,7 -7349,7 +7280,11 @@@ msgstr "
  msgid "Enter &Another Inventory Transfer"
  msgstr ""
  
- #: ../inventory/transfers.php:117
++#: inventory/transfers.php:103
++msgid "The entered transfer date is invalid."
++msgstr ""
++
+ #: inventory/transfers.php:115
  msgid "The locations to transfer from and to must be different."
  msgstr ""
  
@@@ -8633,11 -7374,10 +7309,9 @@@ msgstr "
  msgid "For Part :"
  msgstr ""
  
- #: ../inventory/includes/item_adjustments_ui.inc:34
- #: ../manufacturing/work_order_entry.php:210
- #: ../purchasing/inquiry/po_search.php:67
- #: ../sales/inquiry/sales_deliveries_view.php:107
- #: ../sales/inquiry/sales_orders_view.php:254
+ #: inventory/includes/item_adjustments_ui.inc:34
 -#: manufacturing/work_order_entry.php:210 purchasing/inquiry/po_search.php:67
++#: purchasing/inquiry/po_search.php:67
+ #: sales/inquiry/sales_deliveries_view.php:107
 -#: sales/inquiry/sales_orders_view.php:232
  msgid "Location:"
  msgstr ""
  
@@@ -8653,58 -7393,70 +7327,68 @@@ msgstr "
  msgid "Negative Adjustment"
  msgstr ""
  
- #: ../inventory/includes/item_adjustments_ui.inc:62
- #: ../inventory/includes/stock_transfers_ui.inc:60
- #: ../inventory/manage/item_codes.php:124
- #: ../inventory/manage/sales_kits.php:40
- #: ../inventory/view/view_adjustment.php:56
- #: ../inventory/view/view_transfer.php:56
- #: ../manufacturing/view/wo_issue_view.php:77
- #: ../manufacturing/manage/bom_edit.php:71
- #: ../manufacturing/includes/manufacturing_ui.inc:29
- #: ../manufacturing/includes/manufacturing_ui.inc:157
- #: ../manufacturing/includes/manufacturing_ui.inc:332
- #: ../manufacturing/includes/work_order_issue_ui.inc:33
- #: ../purchasing/includes/ui/invoice_ui.inc:505
- #: ../purchasing/includes/ui/po_ui.inc:243
- #: ../purchasing/includes/ui/po_ui.inc.orig:243
- #: ../purchasing/view/view_grn.php:40
- #: ../purchasing/view/view_po.php:45
- #: ../reporting/rep301.php:103
- #: ../reporting/rep303.php:109
- #: ../reporting/rep303.php:115
- #: ../reporting/rep401.php:69
- #: ../reporting/includes/doctext.inc:29
- #: ../reporting/includes/doctext.inc:192
- #: ../reporting/includes/doctext.inc:225
- #: ../sales/customer_invoice.php:541
- #: ../sales/view/view_credit.php:90
- #: ../sales/view/view_dispatch.php:112
- #: ../sales/view/view_invoice.php:115
- #: ../sales/view/view_sales_order.php:219
- #: ../sales/view/view_sales_order.php.orig:201
- #: ../sales/includes/ui/sales_credit_ui.inc:167
- #: ../sales/includes/ui/sales_order_ui.inc.orig:140
+ #: inventory/includes/item_adjustments_ui.inc:62
+ #: inventory/includes/stock_transfers_ui.inc:60
+ #: manufacturing/includes/work_order_issue_ui.inc:33
 -#: purchasing/includes/ui/po_ui.inc:235 purchasing/po_receive_items.php:62
 -#: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45
 -#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:169
 -#: reporting/includes/doctext.inc:206 sales/customer_credit_invoice.php:280
 -#: sales/customer_delivery.php:431 sales/customer_invoice.php:469
++#: purchasing/po_receive_items.php:62 purchasing/view/view_grn.php:40
++#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:29
++#: reporting/includes/doctext.inc:191 reporting/includes/doctext.inc:228
++#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:445
++#: sales/customer_invoice.php:541 sales/customer_invoice.php:544
+ #: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
 -#: sales/view/view_invoice.php:113 sales/view/view_sales_order.php:201
++#: sales/view/view_invoice.php:115 sales/view/view_sales_order.php:219
+ #: sales/includes/ui/sales_credit_ui.inc:167
 -#: sales/includes/ui/sales_order_ui.inc:144
++#: sales/includes/ui/sales_order_ui.inc:145
+ msgid "Item Code"
+ msgstr ""
+ 
+ #: inventory/includes/item_adjustments_ui.inc:62
+ #: inventory/includes/stock_transfers_ui.inc:60
+ #: manufacturing/includes/work_order_issue_ui.inc:33
 -#: purchasing/includes/ui/po_ui.inc:235 purchasing/view/view_grn.php:40
 -#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:29
 -#: reporting/includes/doctext.inc:169 reporting/includes/doctext.inc:206
 -#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:431
 -#: sales/customer_invoice.php:469 sales/view/view_credit.php:90
 -#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
 -#: sales/view/view_sales_order.php:201
++#: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45
++#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:191
++#: reporting/includes/doctext.inc:228 sales/customer_credit_invoice.php:280
++#: sales/customer_delivery.php:445 sales/customer_invoice.php:541
++#: sales/customer_invoice.php:544 sales/view/view_credit.php:90
++#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:115
++#: sales/view/view_sales_order.php:219
+ #: sales/includes/ui/sales_credit_ui.inc:167
 -#: sales/includes/ui/sales_order_ui.inc:144
++#: sales/includes/ui/sales_order_ui.inc:145
+ msgid "Item Description"
+ msgstr ""
+ 
+ #: inventory/includes/item_adjustments_ui.inc:62
+ #: inventory/includes/stock_transfers_ui.inc:60
+ #: inventory/manage/item_codes.php:124 inventory/manage/sales_kits.php:40
+ #: inventory/view/view_adjustment.php:56 inventory/view/view_transfer.php:56
+ #: manufacturing/view/wo_issue_view.php:77
+ #: manufacturing/manage/bom_edit.php:71
+ #: manufacturing/includes/manufacturing_ui.inc:29
+ #: manufacturing/includes/manufacturing_ui.inc:157
+ #: manufacturing/includes/manufacturing_ui.inc:332
+ #: manufacturing/includes/work_order_issue_ui.inc:33
 -#: purchasing/includes/ui/invoice_ui.inc:484
 -#: purchasing/includes/ui/po_ui.inc:235 purchasing/view/view_grn.php:40
++#: purchasing/includes/ui/invoice_ui.inc:505 purchasing/view/view_grn.php:40
+ #: purchasing/view/view_po.php:45 reporting/rep301.php:105
 -#: reporting/rep303.php:111 reporting/rep303.php:117 reporting/rep401.php:71
 -#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:170
 -#: reporting/includes/doctext.inc:203 sales/view/view_credit.php:90
 -#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
 -#: sales/view/view_sales_order.php:201
++#: reporting/rep401.php:71 reporting/includes/doctext.inc:29
++#: reporting/includes/doctext.inc:192 reporting/includes/doctext.inc:225
++#: sales/customer_invoice.php:541 sales/view/view_credit.php:90
++#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:115
++#: sales/view/view_sales_order.php:219
+ #: sales/includes/ui/sales_credit_ui.inc:167
 -#: sales/includes/ui/sales_order_ui.inc:144
++#: sales/includes/ui/sales_order_ui.inc:145
  msgid "Quantity"
  msgstr ""
  
- #: ../inventory/includes/item_adjustments_ui.inc:63
- #: ../inventory/includes/stock_transfers_ui.inc:60
- #: ../inventory/manage/item_units.php:94
- #: ../manufacturing/includes/work_order_issue_ui.inc:34
- #: ../purchasing/includes/ui/po_ui.inc:244
- #: ../purchasing/includes/ui/po_ui.inc.orig:244
- #: ../purchasing/view/view_grn.php:41
- #: ../purchasing/view/view_po.php:45
- #: ../reporting/includes/doctext.inc:30
- #: ../reporting/includes/doctext.inc:192
- #: ../sales/view/view_credit.php:91
- #: ../sales/view/view_dispatch.php:113
- #: ../sales/view/view_invoice.php:116
- #: ../sales/view/view_sales_order.php:219
- #: ../sales/view/view_sales_order.php.orig:201
- #: ../sales/includes/ui/sales_credit_ui.inc:167
- #: ../sales/includes/ui/sales_order_ui.inc.orig:142
+ #: inventory/includes/item_adjustments_ui.inc:63
+ #: inventory/includes/stock_transfers_ui.inc:60
+ #: inventory/manage/item_units.php:94
+ #: manufacturing/includes/work_order_issue_ui.inc:34
 -#: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:41
 -#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:30
 -#: reporting/includes/doctext.inc:170 sales/view/view_credit.php:91
 -#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
 -#: sales/view/view_sales_order.php:201
++#: purchasing/view/view_grn.php:41 purchasing/view/view_po.php:45
++#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:192
++#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
++#: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:219
+ #: sales/includes/ui/sales_credit_ui.inc:167
 -#: sales/includes/ui/sales_order_ui.inc:146
++#: sales/includes/ui/sales_order_ui.inc:147
  msgid "Unit"
  msgstr ""
  
@@@ -8716,10 -7467,9 +7399,9 @@@
  msgid "Unit Cost"
  msgstr ""
  
- #: ../inventory/includes/stock_transfers_ui.inc:35
- #: ../inventory/inquiry/stock_movements.php:56
- #: ../inventory/inquiry/stock_movements.php.orig:58
- #: ../manufacturing/includes/work_order_issue_ui.inc:164
+ #: inventory/includes/stock_transfers_ui.inc:35
 -#: inventory/inquiry/stock_movements.php:60
++#: inventory/inquiry/stock_movements.php:56
+ #: manufacturing/includes/work_order_issue_ui.inc:164
  msgid "From Location:"
  msgstr ""
  
@@@ -8731,65 -7481,58 +7413,58 @@@ msgstr "
  msgid "Transfer Type:"
  msgstr ""
  
- #: ../inventory/includes/db/items_db.inc:119
 -#: inventory/includes/db/items_db.inc:119
++#: inventory/includes/db/items_db.inc:121
  msgid ""
  "Cannot delete this item because there are stock movements that refer to this "
  "item."
  msgstr ""
  
- #: ../inventory/includes/db/items_db.inc:122
 -#: inventory/includes/db/items_db.inc:122
++#: inventory/includes/db/items_db.inc:124
  msgid ""
  "Cannot delete this item record because there are bills of material that "
  "require this part as a component."
  msgstr ""
  
- #: ../inventory/includes/db/items_db.inc:125
- #: ../inventory/includes/db/items_db.inc:128
 -#: inventory/includes/db/items_db.inc:125
 -#: inventory/includes/db/items_db.inc:128
++#: inventory/includes/db/items_db.inc:127
++#: inventory/includes/db/items_db.inc:130
  msgid ""
  "Cannot delete this item because there are existing purchase order items for "
  "it."
  msgstr ""
  
- #: ../inventory/includes/db/items_db.inc:146
 -#: inventory/includes/db/items_db.inc:146
++#: inventory/includes/db/items_db.inc:148
  msgid ""
  "This item cannot be deleted because some code aliases \n"
  "\t\t\t\tor foreign codes was entered for it, or there are kits defined \n"
  "\t\t\t\tusing this item as component"
  msgstr ""
  
- #: ../inventory/inquiry/stock_movements.php:26
- #: ../inventory/inquiry/stock_movements.php.orig:27
 -#: inventory/inquiry/stock_movements.php:28
++#: inventory/inquiry/stock_movements.php:26
  msgid "Inventory Item Movement"
  msgstr ""
  
- #: ../inventory/inquiry/stock_movements.php:61
- #: ../inventory/inquiry/stock_movements.php.orig:63
 -#: inventory/inquiry/stock_movements.php:65
++#: inventory/inquiry/stock_movements.php:61
  msgid "Show Movements"
  msgstr ""
  
- #: ../inventory/inquiry/stock_movements.php:61
- #: ../inventory/inquiry/stock_movements.php.orig:63
- #: ../purchasing/includes/ui/invoice_ui.inc:474
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
- #: ../purchasing/inquiry/supplier_inquiry.php:55
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:55
- #: ../sales/inquiry/customer_allocation_inquiry.php:51
- #: ../sales/inquiry/customer_inquiry.php:54
 -#: inventory/inquiry/stock_movements.php:65
 -#: purchasing/includes/ui/invoice_ui.inc:453
++#: inventory/inquiry/stock_movements.php:61
++#: purchasing/includes/ui/invoice_ui.inc:474
+ #: purchasing/inquiry/supplier_allocation_inquiry.php:57
 -#: purchasing/inquiry/supplier_inquiry.php:58
++#: purchasing/inquiry/supplier_inquiry.php:55
+ #: sales/inquiry/customer_allocation_inquiry.php:51
 -#: sales/inquiry/customer_inquiry.php:58
++#: sales/inquiry/customer_inquiry.php:54
  msgid "Refresh Inquiry"
  msgstr ""
  
- #: ../inventory/inquiry/stock_movements.php:77
- #: ../inventory/inquiry/stock_movements.php.orig:79
 -#: inventory/inquiry/stock_movements.php:81
++#: inventory/inquiry/stock_movements.php:80
  msgid "Detail"
  msgstr ""
  
- #: ../inventory/inquiry/stock_movements.php:78
- #: ../inventory/inquiry/stock_movements.php.orig:80
 -#: inventory/inquiry/stock_movements.php:82 reporting/rep307.php:117
++#: inventory/inquiry/stock_movements.php:80 reporting/rep307.php:117
  msgid "Quantity In"
  msgstr ""
  
- #: ../inventory/inquiry/stock_movements.php:78
- #: ../inventory/inquiry/stock_movements.php.orig:80
 -#: inventory/inquiry/stock_movements.php:82 reporting/rep307.php:117
++#: inventory/inquiry/stock_movements.php:80 reporting/rep307.php:117
  msgid "Quantity Out"
  msgstr ""
  
@@@ -8798,37 -7540,27 +7472,25 @@@
  msgid "Quantity on hand before"
  msgstr ""
  
- #: ../inventory/inquiry/stock_movements.php:181
- #: ../inventory/inquiry/stock_movements.php.orig:183
 -#: inventory/inquiry/stock_movements.php:185
++#: inventory/inquiry/stock_movements.php:188
  msgid "Quantity on hand after"
  msgstr ""
  
- #: ../inventory/inquiry/stock_status.php:16
- #: ../inventory/inquiry/stock_status.php.orig:19
- #: ../inventory/inquiry/stock_status.php.orig:21
 -#: inventory/inquiry/stock_status.php:19 inventory/inquiry/stock_status.php:21
++#: inventory/inquiry/stock_status.php:16
  msgid "Inventory Item Status"
  msgstr ""
  
- #: ../inventory/inquiry/stock_status.php:56
- #: ../inventory/inquiry/stock_status.php.orig:62
 -#: inventory/inquiry/stock_status.php:62
++#: inventory/inquiry/stock_status.php:56
  msgid ""
  "This is a service and cannot have a stock holding, only the total quantity "
  "on outstanding sales orders is shown."
  msgstr ""
  
- #: ../inventory/inquiry/stock_status.php:66
- #: ../inventory/inquiry/stock_status.php:71
- #: ../inventory/inquiry/stock_status.php.orig:72
- #: ../inventory/inquiry/stock_status.php.orig:77
- #: ../reporting/rep303.php:109
- #: ../reporting/rep303.php:115
 -#: inventory/inquiry/stock_status.php:72 inventory/inquiry/stock_status.php:77
 -#: reporting/rep303.php:111 reporting/rep303.php:117
++#: inventory/inquiry/stock_status.php:66 inventory/inquiry/stock_status.php:71
  msgid "Demand"
  msgstr ""
  
- #: ../inventory/inquiry/stock_status.php:71
- #: ../inventory/inquiry/stock_status.php.orig:77
- #: ../reporting/rep303.php:109
- #: ../reporting/rep303.php:115
 -#: inventory/inquiry/stock_status.php:77 reporting/rep303.php:111
 -#: reporting/rep303.php:117
++#: inventory/inquiry/stock_status.php:71
  msgid "On Order"
  msgstr ""
  
@@@ -8862,18 -7594,12 +7524,12 @@@ msgstr "
  msgid "Tax type"
  msgstr ""
  
- #: ../inventory/manage/item_categories.php:98
- #: ../inventory/manage/item_codes.php:124
- #: ../inventory/manage/sales_kits.php:40
- #: ../inventory/view/view_adjustment.php:57
- #: ../inventory/view/view_transfer.php:56
- #: ../manufacturing/view/wo_issue_view.php:77
- #: ../manufacturing/manage/bom_edit.php:71
- #: ../purchasing/po_receive_items.php:62
- #: ../sales/customer_credit_invoice.php:280
- #: ../sales/customer_delivery.php.orig:445
- #: ../sales/customer_invoice.php:541
- #: ../sales/customer_invoice.php:544
+ #: inventory/manage/item_categories.php:98 inventory/manage/item_codes.php:124
+ #: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:57
+ #: inventory/view/view_transfer.php:56 manufacturing/view/wo_issue_view.php:77
+ #: manufacturing/manage/bom_edit.php:71 purchasing/po_receive_items.php:62
 -#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:432
 -#: sales/customer_invoice.php:469
++#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:446
++#: sales/customer_invoice.php:541 sales/customer_invoice.php:544
  msgid "Units"
  msgstr ""
  
@@@ -8897,44 -7623,35 +7553,39 @@@ msgstr "
  msgid "Assembly Account"
  msgstr ""
  
- #: ../inventory/manage/item_categories.php:180
 -#: inventory/manage/item_categories.php:180
++#: inventory/manage/item_categories.php:182
  msgid "Category Name:"
  msgstr ""
  
- #: ../inventory/manage/item_categories.php:182
 -#: inventory/manage/item_categories.php:182
++#: inventory/manage/item_categories.php:184
  msgid "Default values for new items"
  msgstr ""
  
- #: ../inventory/manage/item_categories.php:184
- #: ../inventory/manage/items.php:333
- #: ../inventory/manage/items.php.orig:326
 -#: inventory/manage/item_categories.php:184 inventory/manage/items.php:326
++#: inventory/manage/item_categories.php:186
  msgid "Item Tax Type:"
  msgstr ""
  
- #: ../inventory/manage/item_categories.php:186
- #: ../inventory/manage/items.php:335
- #: ../inventory/manage/items.php.orig:328
 -#: inventory/manage/item_categories.php:186 inventory/manage/items.php:328
++#: inventory/manage/item_categories.php:188
  msgid "Item Type:"
  msgstr ""
  
- #: ../inventory/manage/item_categories.php:188
- #: ../inventory/manage/items.php:337
- #: ../inventory/manage/items.php.orig:330
 -#: inventory/manage/item_categories.php:188 inventory/manage/items.php:330
++#: inventory/manage/item_categories.php:190
  msgid "Units of Measure:"
  msgstr ""
  
- #: ../inventory/manage/item_categories.php:190
- #: ../inventory/manage/items.php:341
- #: ../inventory/manage/items.php.orig:334
 -#: inventory/manage/item_categories.php:190 inventory/manage/items.php:334
++#: inventory/manage/item_categories.php:192
  msgid "Exclude from sales:"
  msgstr ""
  
- #: ../inventory/manage/item_codes.php:16
++#: inventory/manage/item_categories.php:194
++msgid "Exclude from purchases:"
++msgstr ""
++
+ #: inventory/manage/item_codes.php:16
  msgid "Foreign Item Codes"
  msgstr ""
  
- #: ../inventory/manage/item_codes.php:23
- #: ../sales/sales_order_entry.php:690
 -#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:681
++#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:697
  msgid "There are no inventory items defined in the system."
  msgstr ""
  
@@@ -8947,10 -7663,8 +7597,7 @@@ msgstr "
  msgid "Item code description cannot be empty."
  msgstr ""
  
- #: ../inventory/manage/item_codes.php:55
- #: ../inventory/manage/items.php:163
- #: ../inventory/manage/items.php.orig:156
- #: ../inventory/manage/sales_kits.php:88
 -#: inventory/manage/item_codes.php:55 inventory/manage/items.php:156
 -#: inventory/manage/sales_kits.php:88
++#: inventory/manage/item_codes.php:55 inventory/manage/sales_kits.php:88
  msgid "This item code is already assigned to stock item or sale kit."
  msgstr ""
  
@@@ -8970,16 -7684,12 +7617,12 @@@ msgstr "
  msgid "EAN/UPC Code"
  msgstr ""
  
- #: ../inventory/manage/item_codes.php:125
- #: ../reporting/rep104.php:115
- #: ../reporting/rep105.php:117
- #: ../reporting/rep301.php:103
- #: ../reporting/rep301.php:109
- #: ../reporting/rep302.php:122
- #: ../reporting/rep302.php:129
- #: ../reporting/rep303.php:121
- #: ../reporting/rep304.php:112
- #: ../reporting/rep304.php:120
+ #: inventory/manage/item_codes.php:125 reporting/rep104.php:117
+ #: reporting/rep105.php:119 reporting/rep301.php:105 reporting/rep301.php:111
 -#: reporting/rep302.php:124 reporting/rep302.php:131 reporting/rep303.php:123
 -#: reporting/rep304.php:114 reporting/rep304.php:122 reporting/rep306.php:141
 -#: reporting/rep306.php:149 reporting/rep307.php:117 reporting/rep307.php:123
 -#: reporting/rep308.php:149 reporting/rep308.php:155
++#: reporting/rep302.php:124 reporting/rep302.php:131 reporting/rep304.php:114
++#: reporting/rep304.php:122 reporting/rep306.php:141 reporting/rep306.php:149
++#: reporting/rep307.php:117 reporting/rep307.php:123 reporting/rep308.php:149
++#: reporting/rep308.php:156 reporting/rep309.php:104
  msgid "Category"
  msgstr ""
  
@@@ -8987,209 -7697,166 +7630,27 @@@
  msgid "UPC/EAN code:"
  msgstr ""
  
- #: ../inventory/manage/item_codes.php:179
- #: ../inventory/manage/sales_kits.php:245
- #: ../manufacturing/work_order_add_finished.php:206
- #: ../manufacturing/work_order_entry.php:424
- #: ../manufacturing/manage/bom_edit.php:228
+ #: inventory/manage/item_codes.php:179 inventory/manage/sales_kits.php:245
+ #: manufacturing/work_order_add_finished.php:206
 -#: manufacturing/work_order_entry.php:424
+ #: manufacturing/manage/bom_edit.php:228
  msgid "Quantity:"
  msgstr ""
  
- #: ../inventory/manage/item_codes.php:180
- #: ../inventory/manage/items.php:308
- #: ../inventory/manage/items.php.orig:301
- #: ../inventory/manage/movement_types.php:129
- #: ../inventory/manage/sales_kits.php:206
- #: ../inventory/manage/sales_kits.php:232
- #: ../manufacturing/manage/work_centres.php:138
- #: ../sales/manage/credit_status.php:145
- #: ../sales/manage/recurrent_invoices.php:165
- #: ../taxes/item_tax_types.php:173
- #: ../taxes/tax_groups.php:162
- #: ../taxes/tax_groups.php.orig:164
- #: ../taxes/tax_groups.php.sav:164
- #: ../taxes/tax_types.php:158
 -#: inventory/manage/item_codes.php:180 inventory/manage/items.php:301
 -#: inventory/manage/movement_types.php:129 inventory/manage/sales_kits.php:206
 -#: inventory/manage/sales_kits.php:232
++#: inventory/manage/item_codes.php:180 inventory/manage/movement_types.php:129
++#: inventory/manage/sales_kits.php:206 inventory/manage/sales_kits.php:232
+ #: manufacturing/manage/work_centres.php:138
+ #: sales/manage/credit_status.php:145 sales/manage/recurrent_invoices.php:165
 -#: taxes/item_tax_types.php:173 taxes/tax_groups.php:167
++#: taxes/item_tax_types.php:173 taxes/tax_groups.php:162
+ #: taxes/tax_types.php:158
  msgid "Description:"
  msgstr ""
  
- #: ../inventory/manage/item_codes.php:181
- #: ../inventory/manage/items.php:310
- #: ../inventory/manage/items.php.orig:303
- #: ../inventory/manage/sales_kits.php:207
- #: ../inventory/manage/sales_kits.php:233
 -#: inventory/manage/item_codes.php:181 inventory/manage/items.php:303
 -#: inventory/manage/sales_kits.php:207 inventory/manage/sales_kits.php:233
++#: inventory/manage/item_codes.php:181 inventory/manage/sales_kits.php:207
++#: inventory/manage/sales_kits.php:233
  msgid "Category:"
  msgstr ""
  
- #: ../inventory/manage/items.php:82
- #: ../inventory/manage/items.php.orig:80
 -#: inventory/manage/items.php:80
--msgid ""
--"Only graphics files are supported - a file extension of .jpg, .png or .gif "
--"is expected"
--msgstr ""
--
- #: ../inventory/manage/items.php:113
- #: ../inventory/manage/items.php.orig:106
 -#: inventory/manage/items.php:106
--msgid ""
--"There are no item categories defined in the system. At least one item "
--"category is required to add a item."
--msgstr ""
--
- #: ../inventory/manage/items.php:115
- #: ../inventory/manage/items.php.orig:108
 -#: inventory/manage/items.php:108
--msgid ""
--"There are no item tax types defined in the system. At least one item tax "
--"type is required to add a item."
--msgstr ""
--
- #: ../inventory/manage/items.php:142
- #: ../inventory/manage/items.php.orig:135
 -#: inventory/manage/items.php:135
--msgid "The item name must be entered."
--msgstr ""
--
- #: ../inventory/manage/items.php:148
- #: ../inventory/manage/items.php.orig:141
 -#: inventory/manage/items.php:141
--msgid "The item code cannot be empty"
--msgstr ""
--
- #: ../inventory/manage/items.php:156
- #: ../inventory/manage/items.php.orig:149
 -#: inventory/manage/items.php:149
--msgid ""
--"The item code cannot contain any of the following characters -  & + OR a "
--"space OR quotes"
--msgstr ""
--
- #: ../inventory/manage/items.php:192
- #: ../inventory/manage/items.php.orig:185
 -#: inventory/manage/items.php:185
--msgid "Item has been updated."
--msgstr ""
--
- #: ../inventory/manage/items.php:205
- #: ../inventory/manage/items.php.orig:198
 -#: inventory/manage/items.php:198
--msgid "A new item has been added."
--msgstr ""
--
- #: ../inventory/manage/items.php:248
- #: ../inventory/manage/items.php.orig:241
 -#: inventory/manage/items.php:241
--msgid "Selected item has been deleted."
--msgstr ""
--
- #: ../inventory/manage/items.php:265
- #: ../inventory/manage/items.php.orig:258
- #: ../inventory/view/view_adjustment.php:56
- #: ../inventory/view/view_transfer.php:39
- #: ../inventory/view/view_transfer.php:56
- #: ../manufacturing/search_work_orders.php:163
- #: ../manufacturing/view/wo_issue_view.php:44
- #: ../manufacturing/view/wo_production_view.php:45
- #: ../purchasing/includes/ui/invoice_ui.inc:492
- #: ../purchasing/includes/ui/invoice_ui.inc:504
- #: ../reporting/rep204.php:82
 -#: inventory/manage/items.php:258 inventory/view/view_adjustment.php:56
 -#: inventory/view/view_transfer.php:39 inventory/view/view_transfer.php:56
 -#: manufacturing/search_work_orders.php:163
 -#: manufacturing/view/wo_issue_view.php:44
 -#: manufacturing/view/wo_production_view.php:45
 -#: purchasing/includes/ui/invoice_ui.inc:471
 -#: purchasing/includes/ui/invoice_ui.inc:483 reporting/rep204.php:84
 -#: reporting/rep306.php:152
--msgid "Item"
--msgstr ""
--
- #: ../inventory/manage/items.php:270
- #: ../inventory/manage/items.php:301
- #: ../inventory/manage/items.php.orig:263
- #: ../inventory/manage/items.php.orig:294
 -#: inventory/manage/items.php:263 inventory/manage/items.php:294
--msgid "Item Code:"
--msgstr ""
--
- #: ../inventory/manage/items.php:339
- #: ../inventory/manage/items.php.orig:332
 -#: inventory/manage/items.php:332
--msgid "Editable description:"
--msgstr ""
--
- #: ../inventory/manage/items.php:359
- #: ../inventory/manage/items.php.orig:352
- #: ../sales/manage/customer_branches.php:249
 -#: inventory/manage/items.php:352 sales/manage/customer_branches.php:248
--msgid "GL Accounts"
--msgstr ""
--
- #: ../inventory/manage/items.php:382
- #: ../inventory/manage/items.php.orig:375
 -#: inventory/manage/items.php:375
--msgid "Other"
--msgstr ""
--
- #: ../inventory/manage/items.php:385
- #: ../inventory/manage/items.php.orig:378
 -#: inventory/manage/items.php:378
--msgid "Image File (.jpg)"
--msgstr ""
--
- #: ../inventory/manage/items.php:400
- #: ../inventory/manage/items.php.orig:393
 -#: inventory/manage/items.php:393
--msgid "No image"
--msgstr ""
--
- #: ../inventory/manage/items.php:405
- #: ../inventory/manage/items.php.orig:398
 -#: inventory/manage/items.php:398
--msgid "Delete Image:"
--msgstr ""
--
- #: ../inventory/manage/items.php:407
- #: ../inventory/manage/items.php.orig:400
 -#: inventory/manage/items.php:400
--msgid "Item status:"
--msgstr ""
--
- #: ../inventory/manage/items.php:413
- #: ../inventory/manage/items.php.orig:406
 -#: inventory/manage/items.php:406
--msgid "Insert New Item"
--msgstr ""
--
- #: ../inventory/manage/items.php:417
- #: ../inventory/manage/items.php.orig:410
 -#: inventory/manage/items.php:410
--msgid "Update Item"
--msgstr ""
--
- #: ../inventory/manage/items.php:420
- #: ../inventory/manage/items.php.orig:413
 -#: inventory/manage/items.php:413
--msgid "Select this items and return to document entry."
--msgstr ""
--
- #: ../inventory/manage/items.php:421
- #: ../inventory/manage/items.php.orig:414
 -#: inventory/manage/items.php:414
--msgid "Clone This Item"
--msgstr ""
--
- #: ../inventory/manage/items.php:422
- #: ../inventory/manage/items.php.orig:415
 -#: inventory/manage/items.php:415
--msgid "Delete This Item"
--msgstr ""
--
- #: ../inventory/manage/items.php:437
- #: ../inventory/manage/items.php.orig:430
 -#: inventory/manage/items.php:430
--msgid "Select an item:"
--msgstr ""
--
- #: ../inventory/manage/items.php:438
- #: ../inventory/manage/items.php.orig:431
 -#: inventory/manage/items.php:431
--msgid "New item"
--msgstr ""
--
- #: ../inventory/manage/items.php:461
- #: ../inventory/manage/items.php.orig:454
- #: ../purchasing/manage/suppliers.php:308
- #: ../purchasing/manage/suppliers.php.orig:311
- #: ../sales/manage/customer_branches.php:324
- #: ../sales/manage/customers.php:344
- #: ../sales/manage/sav.customers.php:342
 -#: inventory/manage/items.php:454 purchasing/manage/suppliers.php:306
 -#: sales/manage/customer_branches.php:322 sales/manage/customers.php:344
--msgid "&General settings"
--msgstr ""
--
- #: ../inventory/manage/items.php:462
- #: ../inventory/manage/items.php.orig:455
- #: ../purchasing/manage/suppliers.php:310
- #: ../purchasing/manage/suppliers.php.orig:313
- #: ../sales/manage/customers.php:346
- #: ../sales/manage/sav.customers.php:344
 -#: inventory/manage/items.php:455
 -msgid "S&ales Pricing"
 -msgstr ""
 -
 -#: inventory/manage/items.php:456
 -msgid "&Purchasing Pricing"
 -msgstr ""
 -
 -#: inventory/manage/items.php:459 purchasing/manage/suppliers.php:308
 -#: sales/manage/customers.php:346
--msgid "&Transactions"
--msgstr ""
--
- #: ../inventory/manage/items.php:463
- #: ../inventory/manage/items.php.orig:456
 -#: inventory/manage/items.php:460
--msgid "&Status"
--msgstr ""
--
- #: ../inventory/manage/item_units.php:16
+ #: inventory/manage/item_units.php:16
  msgid "Units of Measure"
  msgstr ""
  
@@@ -9452,7 -8110,7 +7904,18 @@@ msgstr "
  msgid "Adjustment Type"
  msgstr ""
  
- #: ../inventory/view/view_adjustment.php:73
++#: inventory/view/view_adjustment.php:56 inventory/view/view_transfer.php:39
++#: inventory/view/view_transfer.php:56
++#: manufacturing/search_work_orders.php:163
++#: manufacturing/view/wo_issue_view.php:44
++#: manufacturing/view/wo_production_view.php:45
++#: purchasing/includes/ui/invoice_ui.inc:492
++#: purchasing/includes/ui/invoice_ui.inc:504 reporting/rep204.php:84
++#: reporting/rep306.php:152
++msgid "Item"
++msgstr ""
++
+ #: inventory/view/view_adjustment.php:73
  msgid "This adjustment has been voided."
  msgstr ""
  
@@@ -9460,11 -8118,10 +7923,10 @@@
  msgid "View Inventory Transfer"
  msgstr ""
  
- #: ../inventory/view/view_transfer.php:40
- #: ../manufacturing/view/wo_issue_view.php:44
- #: ../manufacturing/includes/manufacturing_ui.inc:29
- #: ../manufacturing/includes/manufacturing_ui.inc:83
- #: ../reporting/includes/doctext.inc:229
+ #: inventory/view/view_transfer.php:40 manufacturing/view/wo_issue_view.php:44
+ #: manufacturing/includes/manufacturing_ui.inc:29
+ #: manufacturing/includes/manufacturing_ui.inc:83
 -#: reporting/includes/doctext.inc:207
++#: reporting/includes/doctext.inc:229
  msgid "From Location"
  msgstr ""
  
@@@ -9484,18 -8141,16 +7946,15 @@@ msgstr "
  msgid "at Location:"
  msgstr ""
  
- #: ../manufacturing/search_work_orders.php:76
- #: ../purchasing/inquiry/po_search_completed.php:72
- #: ../purchasing/inquiry/po_search_completed.php.orig:73
+ #: manufacturing/search_work_orders.php:76
 -#: purchasing/inquiry/po_search_completed.php:75
++#: purchasing/inquiry/po_search_completed.php:72
  msgid "for item:"
  msgstr ""
  
- #: ../manufacturing/search_work_orders.php:78
- #: ../purchasing/inquiry/po_search_completed.php:74
- #: ../purchasing/inquiry/po_search_completed.php.orig:75
- #: ../purchasing/inquiry/po_search.php:76
- #: ../sales/inquiry/sales_deliveries_view.php:116
- #: ../sales/inquiry/sales_orders_view.php:269
+ #: manufacturing/search_work_orders.php:78
 -#: purchasing/inquiry/po_search_completed.php:77
++#: purchasing/inquiry/po_search_completed.php:74
+ #: purchasing/inquiry/po_search.php:76
+ #: sales/inquiry/sales_deliveries_view.php:116
 -#: sales/inquiry/sales_orders_view.php:247
  msgid "Select documents"
  msgstr ""
  
@@@ -9519,11 -8174,10 +7978,10 @@@ msgstr "
  msgid "Required"
  msgstr ""
  
- #: ../manufacturing/search_work_orders.php:167
- #: ../manufacturing/includes/manufacturing_ui.inc:277
- #: ../manufacturing/includes/manufacturing_ui.inc:281
- #: ../reporting/includes/doctext.inc:227
- #: ../sales/inquiry/sales_orders_view.php:290
+ #: manufacturing/search_work_orders.php:167
+ #: manufacturing/includes/manufacturing_ui.inc:277
+ #: manufacturing/includes/manufacturing_ui.inc:281
 -#: reporting/includes/doctext.inc:205 sales/inquiry/sales_orders_view.php:268
++#: reporting/includes/doctext.inc:227
  msgid "Required By"
  msgstr ""
  
@@@ -9539,36 -8193,34 +7997,31 @@@ msgstr "
  msgid "The manufacturing process has been entered."
  msgstr ""
  
- #: ../manufacturing/work_order_add_finished.php:46
- #: ../manufacturing/work_order_costs.php:45
- #: ../manufacturing/work_order_entry.php:56
- #: ../manufacturing/work_order_issue.php:40
- #: ../manufacturing/work_order_release.php:72
+ #: manufacturing/work_order_add_finished.php:46
+ #: manufacturing/work_order_costs.php:45 manufacturing/work_order_entry.php:56
 -#: manufacturing/work_order_issue.php:38
++#: manufacturing/work_order_issue.php:40
+ #: manufacturing/work_order_release.php:75
  msgid "View this Work Order"
  msgstr ""
  
- #: ../manufacturing/work_order_add_finished.php:48
- #: ../manufacturing/work_order_entry.php:65
- #: ../manufacturing/work_order_issue.php:42
+ #: manufacturing/work_order_add_finished.php:48
 -#: manufacturing/work_order_costs.php:47 manufacturing/work_order_entry.php:64
 -#: manufacturing/work_order_issue.php:40
++#: manufacturing/work_order_issue.php:42
  msgid "View the GL Journal Entries for this Work Order"
  msgstr ""
  
- #: ../manufacturing/work_order_add_finished.php:50
- #: ../manufacturing/work_order_entry.php:67
+ #: manufacturing/work_order_add_finished.php:50
 -#: manufacturing/work_order_entry.php:67
  msgid "Print the GL Journal Entries for this Work Order"
  msgstr ""
  
- #: ../manufacturing/work_order_add_finished.php:52
- #: ../manufacturing/work_order_costs.php:49
- #: ../manufacturing/work_order_issue.php:44
+ #: manufacturing/work_order_add_finished.php:52
 -#: manufacturing/work_order_costs.php:51 manufacturing/work_order_issue.php:42
++#: manufacturing/work_order_costs.php:49 manufacturing/work_order_issue.php:44
  msgid "Select another &Work Order to Process"
  msgstr ""
  
- #: ../manufacturing/work_order_add_finished.php:65
- #: ../manufacturing/work_order_costs.php:62
- #: ../manufacturing/work_order_entry.php:341
- #: ../manufacturing/includes/db/work_order_issues_db.inc:30
- #: ../manufacturing/includes/db/work_order_produce_items_db.inc:27
+ #: manufacturing/work_order_add_finished.php:65
 -#: manufacturing/work_order_costs.php:64
 -#: manufacturing/work_order_entry.php:341
++#: manufacturing/work_order_costs.php:62
+ #: manufacturing/includes/db/work_order_issues_db.inc:30
+ #: manufacturing/includes/db/work_order_produce_items_db.inc:27
  msgid "The order number sent is not valid."
  msgstr ""
  
@@@ -9623,28 -8275,28 +8076,28 @@@ msgstr "
  msgid "The additional cost has been entered."
  msgstr ""
  
- #: ../manufacturing/work_order_costs.php:47
 -#: manufacturing/work_order_costs.php:49
++#: manufacturing/work_order_costs.php:47
  msgid "Enter another additional cost."
  msgstr ""
  
- #: ../manufacturing/work_order_costs.php:73
 -#: manufacturing/work_order_costs.php:76
++#: manufacturing/work_order_costs.php:73
  msgid "The amount entered is not a valid number or less then zero."
  msgstr ""
  
- #: ../manufacturing/work_order_costs.php:92
 -#: manufacturing/work_order_costs.php:95
++#: manufacturing/work_order_costs.php:92
  msgid ""
  "The additional cost date cannot be before the release date of the work order."
  msgstr ""
  
- #: ../manufacturing/work_order_costs.php:143
 -#: manufacturing/work_order_costs.php:159
++#: manufacturing/work_order_costs.php:143
  msgid "Additional Costs:"
  msgstr ""
  
- #: ../manufacturing/work_order_costs.php:144
 -#: manufacturing/work_order_costs.php:160
++#: manufacturing/work_order_costs.php:144
  msgid "Debit Account"
  msgstr ""
  
- #: ../manufacturing/work_order_costs.php:151
 -#: manufacturing/work_order_costs.php:167
++#: manufacturing/work_order_costs.php:151
  msgid "Process Additional Cost"
  msgstr ""
  
@@@ -9660,207 -8312,198 +8113,95 @@@ msgstr "
  msgid "The work order been added."
  msgstr ""
  
- #: ../manufacturing/work_order_entry.php:62
- msgid "Print this Work Order"
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:64
- msgid "Email this Work Order"
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:80
- msgid "The work order been updated."
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:90
- msgid "Work order has been deleted."
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:100
- msgid ""
- "This work order has been closed. There can be no more issues against it."
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:110
- msgid "Enter a new work order"
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:111
- msgid "Select an existing work order"
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:147
- msgid "The quantity entered is invalid or less than zero."
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:169
- msgid "The selected item to manufacture does not have a bom."
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:178
- msgid "The labour cost entered is invalid or less than zero."
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:186
- msgid "The cost entered is invalid or less than zero."
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:209
- msgid ""
- "The work order cannot be processed because there is an insufficient quantity "
- "for component:"
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:223
- msgid ""
- "The selected item cannot be unassembled because there is insufficient stock."
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:249
- msgid ""
- "The quantity cannot be changed to be less than the quantity already "
- "manufactured for this order."
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:298
- msgid ""
- "This work order cannot be deleted because it has already been processed."
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:349
- msgid "This work order is closed and cannot be edited."
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:397
- #: ../manufacturing/work_order_entry.php:405
- msgid "Destination Location:"
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:416
- msgid "Quantity Required:"
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:418
- msgid "Quantity Manufactured:"
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:437
- msgid "Credit Labour Account"
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:444
- msgid "Credit Overhead Account"
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:449
- msgid "Released On:"
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:459
- msgid "Save changes to work order"
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:462
- msgid "Close This Work Order"
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:464
- msgid "Delete This Work Order"
- msgstr ""
- 
- #: ../manufacturing/work_order_entry.php:470
- msgid "Add Workorder"
- msgstr ""
- 
- #: ../manufacturing/work_order_issue.php:31
 -#: manufacturing/work_order_entry.php:62
 -msgid "&Print This Work Order"
++#: manufacturing/work_order_issue.php:31
 +msgid "Issue Items to Work Order"
  msgstr ""
  
- #: ../manufacturing/work_order_issue.php:38
 -#: manufacturing/work_order_entry.php:63
 -msgid "&Email This Work Order"
++#: manufacturing/work_order_issue.php:38
 +msgid "The work order issue has been entered."
  msgstr ""
  
- #: ../manufacturing/work_order_issue.php:78
 -#: manufacturing/work_order_entry.php:80
 -msgid "The work order been updated."
++#: manufacturing/work_order_issue.php:78
 +msgid "The entered date for the issue is invalid."
  msgstr ""
  
- #: ../manufacturing/work_order_issue.php:106
 -#: manufacturing/work_order_entry.php:90
 -msgid "Work order has been deleted."
++#: manufacturing/work_order_issue.php:106
 +msgid ""
 +"The issue cannot be processed because an entered item would cause a negative "
 +"inventory balance :"
  msgstr ""
  
- #: ../manufacturing/work_order_issue.php:124
 -#: manufacturing/work_order_entry.php:100
++#: manufacturing/work_order_issue.php:124
  msgid ""
 -"This work order has been closed. There can be no more issues against it."
 +"The process cannot be completed because there is an insufficient total "
 +"quantity for a component."
  msgstr ""
  
- #: ../manufacturing/work_order_issue.php:125
 -#: manufacturing/work_order_entry.php:110
 -msgid "Enter a new work order"
++#: manufacturing/work_order_issue.php:125
 +msgid "Component is :"
  msgstr ""
  
- #: ../manufacturing/work_order_issue.php:126
 -#: manufacturing/work_order_entry.php:111
 -msgid "Select an existing work order"
++#: manufacturing/work_order_issue.php:126
 +msgid "From location :"
  msgstr ""
  
- #: ../manufacturing/work_order_issue.php:219
 -#: manufacturing/work_order_entry.php:147
 -msgid "The quantity entered is invalid or less than zero."
++#: manufacturing/work_order_issue.php:219
 +msgid "Items to Issue"
  msgstr ""
  
- #: ../manufacturing/work_order_issue.php:225
 -#: manufacturing/work_order_entry.php:169
 -msgid "The selected item to manufacture does not have a bom."
++#: manufacturing/work_order_issue.php:225
 +msgid "Process Issue"
  msgstr ""
  
- #: ../manufacturing/work_order_release.php:27
 -#: manufacturing/work_order_entry.php:178
 -msgid "The labour cost entered is invalid or less than zero."
++#: manufacturing/work_order_release.php:27
 +msgid "Work Order Release to Manufacturing"
  msgstr ""
  
- #: ../manufacturing/work_order_release.php:49
 -#: manufacturing/work_order_entry.php:186
 -msgid "The cost entered is invalid or less than zero."
++#: manufacturing/work_order_release.php:49
 +msgid "This work order has already been released."
  msgstr ""
  
- #: ../manufacturing/work_order_release.php:57
 -#: manufacturing/work_order_entry.php:209
++#: manufacturing/work_order_release.php:60
  msgid ""
 -"The work order cannot be processed because there is an insufficient quantity "
 -"for component:"
 +"This Work Order cannot be released. The selected item to manufacture does "
 +"not have a bom."
  msgstr ""
  
- #: ../manufacturing/work_order_release.php:70
 -#: manufacturing/work_order_entry.php:223
 -msgid ""
 -"The selected item cannot be unassembled because there is insufficient stock."
++#: manufacturing/work_order_release.php:73
 +msgid "The work order has been released to manufacturing."
  msgstr ""
  
- #: ../manufacturing/work_order_release.php:74
 -#: manufacturing/work_order_entry.php:249
 -msgid ""
 -"The quantity cannot be changed to be less than the quantity already "
 -"manufactured for this order."
++#: manufacturing/work_order_release.php:77
 +msgid "Select another &work order"
  msgstr ""
  
- #: ../manufacturing/work_order_release.php:95
 -#: manufacturing/work_order_entry.php:298
 -msgid ""
 -"This work order cannot be deleted because it has already been processed."
++#: manufacturing/work_order_release.php:98
 +msgid "Work Order #:"
  msgstr ""
  
- #: ../manufacturing/work_order_release.php:96
 -#: manufacturing/work_order_entry.php:349
 -msgid "This work order is closed and cannot be edited."
++#: manufacturing/work_order_release.php:99
 +msgid "Work Order Reference:"
  msgstr ""
  
- #: ../manufacturing/work_order_release.php:98
- #: ../manufacturing/includes/manufacturing_ui.inc:278
 -#: manufacturing/work_order_entry.php:397
 -#: manufacturing/work_order_entry.php:405
 -msgid "Destination Location:"
++#: manufacturing/work_order_release.php:101
++#: manufacturing/includes/manufacturing_ui.inc:278
 +msgid "Released Date"
  msgstr ""
  
- #: ../manufacturing/work_order_release.php:104
 -#: manufacturing/work_order_entry.php:416
 -msgid "Quantity Required:"
++#: manufacturing/work_order_release.php:107
 +msgid "Release Work Order"
  msgstr ""
  
- #: ../manufacturing/view/wo_costs_view.php:20
 -#: manufacturing/work_order_entry.php:418
 -msgid "Quantity Manufactured:"
++#: manufacturing/view/wo_costs_view.php:20
 +msgid "View Work Order Costs"
  msgstr ""
  
- #: ../manufacturing/view/wo_costs_view.php:62
 -#: manufacturing/work_order_entry.php:437
 -msgid "Credit Labour Account"
 -msgstr ""
 -
 -#: manufacturing/work_order_entry.php:444
 -msgid "Credit Overhead Account"
 -msgstr ""
 -
 -#: manufacturing/work_order_entry.php:449
 -msgid "Released On:"
 -msgstr ""
 -
 -#: manufacturing/work_order_entry.php:459
 -msgid "Save changes to work order"
 -msgstr ""
 -
 -#: manufacturing/work_order_entry.php:462
 -msgid "Close This Work Order"
 -msgstr ""
 -
 -#: manufacturing/work_order_entry.php:464
 -msgid "Delete This Work Order"
 -msgstr ""
 -
 -#: manufacturing/work_order_entry.php:470
 -msgid "Add Workorder"
 -msgstr ""
 -
 -#: manufacturing/work_order_issue.php:29
 -msgid "Issue Items to Work Order"
 -msgstr ""
 -
 -#: manufacturing/work_order_issue.php:36
 -msgid "The work order issue has been entered."
 -msgstr ""
 -
 -#: manufacturing/work_order_issue.php:77
 -msgid "The entered date for the issue is invalid."
 -msgstr ""
 -
 -#: manufacturing/work_order_issue.php:104
 -msgid ""
 -"The issue cannot be processed because an entered item would cause a negative "
 -"inventory balance :"
 -msgstr ""
 -
 -#: manufacturing/work_order_issue.php:122
 -msgid ""
 -"The process cannot be completed because there is an insufficient total "
 -"quantity for a component."
 -msgstr ""
 -
 -#: manufacturing/work_order_issue.php:123
 -msgid "Component is :"
 -msgstr ""
 -
 -#: manufacturing/work_order_issue.php:124
 -msgid "From location :"
 -msgstr ""
 -
 -#: manufacturing/work_order_issue.php:217
 -msgid "Items to Issue"
 -msgstr ""
 -
 -#: manufacturing/work_order_issue.php:223
 -msgid "Process Issue"
 -msgstr ""
 -
 -#: manufacturing/work_order_release.php:27
 -msgid "Work Order Release to Manufacturing"
 -msgstr ""
 -
 -#: manufacturing/work_order_release.php:49
 -msgid "This work order has already been released."
 -msgstr ""
 -
 -#: manufacturing/work_order_release.php:60
 -msgid ""
 -"This Work Order cannot be released. The selected item to manufacture does "
 -"not have a bom."
 -msgstr ""
 -
 -#: manufacturing/work_order_release.php:73
 -msgid "The work order has been released to manufacturing."
 -msgstr ""
 -
 -#: manufacturing/work_order_release.php:77
 -msgid "Select another &work order"
 -msgstr ""
 -
 -#: manufacturing/work_order_release.php:98
 -msgid "Work Order #:"
 -msgstr ""
 -
 -#: manufacturing/work_order_release.php:99
 -msgid "Work Order Reference:"
 -msgstr ""
 -
 -#: manufacturing/work_order_release.php:101
 -#: manufacturing/includes/manufacturing_ui.inc:278
 -msgid "Released Date"
 -msgstr ""
 -
 -#: manufacturing/work_order_release.php:107
 -msgid "Release Work Order"
++#: manufacturing/view/wo_costs_view.php:62
 +#, php-format
 +msgid "Production Costs for Work Order # %d"
  msgstr ""
  
- #: ../manufacturing/view/wo_issue_view.php:19
+ #: manufacturing/view/wo_issue_view.php:19
  msgid "View Work Order Issue"
  msgstr ""
  
@@@ -9925,8 -8567,7 +8265,7 @@@ msgstr "
  msgid "BOM for item:"
  msgstr ""
  
- #: ../manufacturing/view/work_order_view.php:56
- #: ../reporting/rep409.php:91
 -#: manufacturing/view/work_order_view.php:56 reporting/rep409.php:88
++#: manufacturing/view/work_order_view.php:56
  msgid "Work Order Requirements"
  msgstr ""
  
@@@ -9973,11 -8614,11 +8312,11 @@@ msgstr "
  msgid "Parent Item"
  msgstr ""
  
- #: ../manufacturing/inquiry/where_used_inquiry.php:44
- #: ../manufacturing/manage/bom_edit.php:71
- #: ../manufacturing/includes/manufacturing_ui.inc:28
- #: ../manufacturing/includes/manufacturing_ui.inc:83
- #: ../reporting/includes/doctext.inc:229
+ #: manufacturing/inquiry/where_used_inquiry.php:44
+ #: manufacturing/manage/bom_edit.php:71
+ #: manufacturing/includes/manufacturing_ui.inc:28
+ #: manufacturing/includes/manufacturing_ui.inc:83
 -#: reporting/includes/doctext.inc:207
++#: reporting/includes/doctext.inc:229
  msgid "Work Centre"
  msgstr ""
  
@@@ -10080,18 -8720,18 +8418,18 @@@ msgstr "
  msgid "There are no Requirements for this Order."
  msgstr ""
  
- #: ../manufacturing/includes/manufacturing_ui.inc:84
- #: ../reporting/includes/doctext.inc:229
+ #: manufacturing/includes/manufacturing_ui.inc:84
 -#: reporting/includes/doctext.inc:207
++#: reporting/includes/doctext.inc:229
  msgid "Unit Quantity"
  msgstr ""
  
- #: ../manufacturing/includes/manufacturing_ui.inc:84
- #: ../reporting/includes/doctext.inc:229
+ #: manufacturing/includes/manufacturing_ui.inc:84
 -#: reporting/includes/doctext.inc:207
++#: reporting/includes/doctext.inc:229
  msgid "Total Quantity"
  msgstr ""
  
- #: ../manufacturing/includes/manufacturing_ui.inc:84
- #: ../reporting/includes/doctext.inc:229
+ #: manufacturing/includes/manufacturing_ui.inc:84
 -#: reporting/includes/doctext.inc:207
++#: reporting/includes/doctext.inc:229
  msgid "Units Issued"
  msgstr ""
  
@@@ -10120,17 -8760,17 +8458,17 @@@ msgstr "
  msgid "The work order number sent is not valid."
  msgstr ""
  
- #: ../manufacturing/includes/manufacturing_ui.inc:276
- #: ../manufacturing/includes/manufacturing_ui.inc:280
- #: ../manufacturing/includes/manufacturing_ui.inc:331
- #: ../reporting/includes/doctext.inc:223
+ #: manufacturing/includes/manufacturing_ui.inc:276
+ #: manufacturing/includes/manufacturing_ui.inc:280
+ #: manufacturing/includes/manufacturing_ui.inc:331
 -#: reporting/includes/doctext.inc:201
++#: reporting/includes/doctext.inc:223
  msgid "Manufactured Item"
  msgstr ""
  
- #: ../manufacturing/includes/manufacturing_ui.inc:277
- #: ../manufacturing/includes/manufacturing_ui.inc:281
- #: ../manufacturing/includes/manufacturing_ui.inc:332
- #: ../reporting/includes/doctext.inc:224
+ #: manufacturing/includes/manufacturing_ui.inc:277
+ #: manufacturing/includes/manufacturing_ui.inc:281
+ #: manufacturing/includes/manufacturing_ui.inc:332
 -#: reporting/includes/doctext.inc:202
++#: reporting/includes/doctext.inc:224
  msgid "Into Location"
  msgstr ""
  
@@@ -10171,60 -8811,59 +8509,21 @@@ msgstr "
  msgid "Reversed the issue to"
  msgstr ""
  
- #: ../manufacturing/includes/db/work_order_produce_items_db.inc:73
 -#: manufacturing/includes/db/work_order_produce_items_db.inc:74
++#: manufacturing/includes/db/work_order_produce_items_db.inc:73
  msgid "Production."
  msgstr ""
  
- #: ../manufacturing/includes/db/work_order_produce_items_db.inc:157
 -#: manufacturing/includes/db/work_order_produce_items_db.inc:158
++#: manufacturing/includes/db/work_order_produce_items_db.inc:157
  msgid "Reversed the production "
  msgstr ""
  
- #: ../manufacturing/includes/db/work_orders_db.inc:79
- #: ../purchasing/includes/db/po_db.inc:123
- #: ../sales/includes/db/cust_trans_db.inc:114
- #: ../sales/includes/db/old.sales_order_db.inc:249
- #: ../sales/includes/db/sales_order_db.inc:261
- #: ../sales/includes/db/sales_order_db.inc.orig:261
 -#: manufacturing/includes/db/work_orders_db.inc:278
 -#: purchasing/includes/db/po_db.inc:116
 -#: sales/includes/db/cust_trans_db.inc:111
 -#: sales/includes/db/sales_order_db.inc:249
++#: purchasing/includes/db/po_db.inc:123
++#: sales/includes/db/cust_trans_db.inc:118
++#: sales/includes/db/sales_order_db.inc:261
  msgid "Updated."
  msgstr ""
  
- #: ../manufacturing/includes/db/work_orders_db.inc:100
 -#: manufacturing/includes/db/work_orders_db.inc:297
--msgid "Canceled."
--msgstr ""
--
- #: ../manufacturing/includes/db/work_orders_db.inc:176
 -#: manufacturing/includes/db/work_orders_db.inc:373
--msgid "Released."
--msgstr ""
--
- #: ../manufacturing/includes/db/work_orders_quick_db.inc:89
 -#: manufacturing/includes/db/work_orders_db.inc:445
 -#: manufacturing/includes/db/work_orders_db.inc:461
 -msgid "Voiding Work Order Trans # "
 -msgstr ""
 -
 -#: manufacturing/includes/db/work_orders_quick_db.inc:106
--msgid "Quick production."
--msgstr ""
--
- #: ../manufacturing/includes/db/work_orders_quick_db.inc:169
 -#: manufacturing/includes/db/work_orders_quick_db.inc:220
--msgid "Produced"
--msgstr ""
--
- #: ../purchasing/includes/db/invoice_db.inc:298
 -#: purchasing/includes/db/invoice_db.inc:282
--msgid "Supplier invoice adjustment for zero inventory of "
--msgstr ""
--
- #: ../purchasing/includes/db/invoice_db.inc:298
- #: ../reporting/rep106.php:81
- #: ../sales/inquiry/sales_deliveries_view.php:166
- #: ../sales/inquiry/sales_orders_view.php:159
 -#: purchasing/includes/db/invoice_db.inc:282 reporting/rep106.php:83
 -#: sales/inquiry/sales_deliveries_view.php:166
 -#: sales/inquiry/sales_orders_view.php:147
--msgid "Invoice"
--msgstr ""
--
- #: ../purchasing/includes/db/invoice_db.inc:716
- #: ../purchasing/includes/db/invoice_db.inc:718
 -#: purchasing/includes/db/invoice_db.inc:681
 -#: purchasing/includes/db/invoice_db.inc:683
--msgid "GRN Removal"
--msgstr ""
--
- #: ../purchasing/includes/ui/grn_ui.inc:23
- #: ../purchasing/includes/ui/po_ui.inc:326
- #: ../purchasing/includes/ui/po_ui.inc.orig:326
- #: ../sales/view/view_sales_order.php:74
- #: ../sales/view/view_sales_order.php.orig:74
 -#: purchasing/includes/ui/grn_ui.inc:23 purchasing/includes/ui/po_ui.inc:318
 -#: sales/view/view_sales_order.php:74
++#: purchasing/includes/ui/grn_ui.inc:23 sales/view/view_sales_order.php:74
  msgid "Order Currency"
  msgstr ""
  
@@@ -10238,12 -8875,8 +8535,7 @@@ msgstr "
  msgid "Ordered On"
  msgstr ""
  
- #: ../purchasing/includes/ui/grn_ui.inc:40
- #: ../purchasing/includes/ui/grn_ui.inc:54
- #: ../purchasing/includes/ui/po_ui.inc:341
- #: ../purchasing/includes/ui/po_ui.inc:346
- #: ../purchasing/includes/ui/po_ui.inc.orig:341
- #: ../purchasing/includes/ui/po_ui.inc.orig:346
+ #: purchasing/includes/ui/grn_ui.inc:40 purchasing/includes/ui/grn_ui.inc:54
 -#: purchasing/includes/ui/po_ui.inc:333 purchasing/includes/ui/po_ui.inc:338
  msgid "Deliver Into Location"
  msgstr ""
  
@@@ -10251,662 -8884,505 +8543,445 @@@
  msgid "Date Items Received"
  msgstr ""
  
- #: ../purchasing/includes/ui/grn_ui.inc:49
- #: ../purchasing/includes/ui/grn_ui.inc:55
- #: ../purchasing/includes/ui/po_ui.inc:351
- #: ../purchasing/includes/ui/po_ui.inc.orig:351
- #: ../purchasing/view/view_supp_credit.php:44
- #: ../purchasing/view/view_supp_invoice.php:48
- #: ../purchasing/inquiry/po_search_completed.php:124
- #: ../purchasing/inquiry/po_search_completed.php.orig:123
- #: ../purchasing/inquiry/po_search.php:134
- #: ../purchasing/inquiry/supplier_inquiry.php:177
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:174
+ #: purchasing/includes/ui/grn_ui.inc:49 purchasing/includes/ui/grn_ui.inc:55
 -#: purchasing/includes/ui/po_ui.inc:343
+ #: purchasing/view/view_supp_credit.php:44
 -#: purchasing/view/view_supp_invoice.php:47
 -#: purchasing/inquiry/po_search_completed.php:125
++#: purchasing/view/view_supp_invoice.php:48
++#: purchasing/inquiry/po_search_completed.php:124
+ #: purchasing/inquiry/po_search.php:134
 -#: purchasing/inquiry/supplier_inquiry.php:172
 -#: reporting/includes/doctext.inc:142 reporting/includes/doctext.inc:165
++#: purchasing/inquiry/supplier_inquiry.php:177
++#: reporting/includes/doctext.inc:164 reporting/includes/doctext.inc:187
  msgid "Supplier's Reference"
  msgstr ""
  
- #: ../purchasing/includes/ui/grn_ui.inc:62
- #: ../purchasing/includes/ui/po_ui.inc:355
- #: ../purchasing/includes/ui/po_ui.inc.orig:355
- #: ../sales/view/view_sales_order.php:92
- #: ../sales/view/view_sales_order.php.orig:79
 -#: purchasing/includes/ui/grn_ui.inc:62 purchasing/includes/ui/po_ui.inc:347
 -#: sales/view/view_sales_order.php:79
++#: purchasing/includes/ui/grn_ui.inc:62 sales/view/view_sales_order.php:92
  msgid "Delivery Address"
  msgstr ""
  
- #: ../purchasing/includes/ui/grn_ui.inc:65
- #: ../purchasing/includes/ui/po_ui.inc:367
- #: ../purchasing/includes/ui/po_ui.inc.orig:367
 -#: purchasing/includes/ui/grn_ui.inc:65 purchasing/includes/ui/po_ui.inc:351
++#: purchasing/includes/ui/grn_ui.inc:65
  msgid "Order Comments"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:108
 -#: purchasing/includes/ui/invoice_ui.inc:96
 -#: purchasing/includes/ui/invoice_ui.inc:99
++#: purchasing/includes/ui/invoice_ui.inc:108
 +msgid "Source Invoices:"
 +msgstr ""
 +
- #: ../purchasing/includes/ui/invoice_ui.inc:110
++#: purchasing/includes/ui/invoice_ui.inc:110
  msgid "Supplier's Ref.:"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:125
 -#: purchasing/includes/ui/invoice_ui.inc:114
++#: purchasing/includes/ui/invoice_ui.inc:125
  msgid "Terms:"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:137
- #: ../purchasing/manage/suppliers.php:100
- #: ../purchasing/manage/suppliers.php:105
- #: ../purchasing/manage/suppliers.php.orig:101
- #: ../purchasing/manage/suppliers.php.orig:106
 -#: purchasing/includes/ui/invoice_ui.inc:126
 -#: purchasing/manage/suppliers.php:98 purchasing/manage/suppliers.php:103
++#: purchasing/includes/ui/invoice_ui.inc:137
++#: purchasing/manage/suppliers.php:100 purchasing/manage/suppliers.php:105
  msgid "Supplier's Currency:"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:141
- #: ../purchasing/manage/suppliers.php:107
- #: ../purchasing/manage/suppliers.php.orig:108
- #: ../sales/manage/customer_branches.php:247
- #: ../sales/manage/customers.php:294
- #: ../sales/manage/sav.customers.php:292
 -#: purchasing/includes/ui/invoice_ui.inc:130
 -#: purchasing/manage/suppliers.php:105 sales/manage/customer_branches.php:246
++#: purchasing/includes/ui/invoice_ui.inc:141
++#: purchasing/manage/suppliers.php:107 sales/manage/customer_branches.php:247
+ #: sales/manage/customers.php:294
  msgid "Tax Group:"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:159
 -#: purchasing/includes/ui/invoice_ui.inc:145
++#: purchasing/includes/ui/invoice_ui.inc:159
  msgid "Sub-total:"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:167
 -#: purchasing/includes/ui/invoice_ui.inc:153
++#: purchasing/includes/ui/invoice_ui.inc:167
  msgid "Invoice Total:"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:170
- #: ../sales/customer_credit_invoice.php:330
- #: ../sales/includes/ui/sales_credit_ui.inc:233
 -#: purchasing/includes/ui/invoice_ui.inc:156
++#: purchasing/includes/ui/invoice_ui.inc:170
+ #: sales/customer_credit_invoice.php:330
+ #: sales/includes/ui/sales_credit_ui.inc:233
  msgid "Credit Note Total"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:175
- #: ../purchasing/includes/ui/po_ui.inc.orig:487
- #: ../purchasing/po_entry_items.php.orig:554
 -#: purchasing/includes/ui/invoice_ui.inc:187
++#: purchasing/includes/ui/invoice_ui.inc:175 purchasing/po_entry_items.php:559
 +msgid "Tax algorithm:"
 +msgstr ""
 +
- #: ../purchasing/includes/ui/invoice_ui.inc:207
++#: purchasing/includes/ui/invoice_ui.inc:207
  msgid "Add GL Line"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:208
 -#: purchasing/includes/ui/invoice_ui.inc:188
++#: purchasing/includes/ui/invoice_ui.inc:208
  msgid "Reset"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:209
- #: ../purchasing/po_receive_items.php:332
 -#: purchasing/includes/ui/invoice_ui.inc:189
 -#: purchasing/po_receive_items.php:334
++#: purchasing/includes/ui/invoice_ui.inc:209
++#: purchasing/po_receive_items.php:332
  msgid "Clear all GL entry fields"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:227
 -#: purchasing/includes/ui/invoice_ui.inc:207
++#: purchasing/includes/ui/invoice_ui.inc:227
  msgid "GL Items for this Invoice"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:229
 -#: purchasing/includes/ui/invoice_ui.inc:209
++#: purchasing/includes/ui/invoice_ui.inc:229
  msgid "GL Items for this Credit Note"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:239
 -#: purchasing/includes/ui/invoice_ui.inc:219
++#: purchasing/includes/ui/invoice_ui.inc:239
  msgid "Quick Entry:"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:412
 -#: purchasing/includes/ui/invoice_ui.inc:392
++#: purchasing/includes/ui/invoice_ui.inc:412
  msgid "Add to Invoice"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:414
 -#: purchasing/includes/ui/invoice_ui.inc:394
++#: purchasing/includes/ui/invoice_ui.inc:414
  msgid "Add to Credit Note"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:416
- #: ../sales/customer_invoice.php:603
 -#: purchasing/includes/ui/invoice_ui.inc:396 sales/customer_invoice.php:524
++#: purchasing/includes/ui/invoice_ui.inc:416 sales/customer_invoice.php:603
  msgid "Remove"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:416
- #: ../purchasing/includes/ui/invoice_ui.inc:451
 -#: purchasing/includes/ui/invoice_ui.inc:396
 -#: purchasing/includes/ui/invoice_ui.inc:431
++#: purchasing/includes/ui/invoice_ui.inc:416
++#: purchasing/includes/ui/invoice_ui.inc:451
  msgid ""
  "WARNING! Be careful with removal. The operation is executed immediately and "
  "cannot be undone !!!"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:418
 -#: purchasing/includes/ui/invoice_ui.inc:398
++#: purchasing/includes/ui/invoice_ui.inc:418
 +#, php-format
  msgid ""
 -"You are about to remove all yet non-invoiced items from selected delivery "
 -"line. This operation also irreversibly changes related order line. Do you "
 -"want to continue ?"
 +"You are about to remove all yet non-invoiced items from delivery line #%d. "
 +"This operation also irreversibly changes related order line. Do you want to "
 +"continue ?"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:449
 -#: purchasing/includes/ui/invoice_ui.inc:429
++#: purchasing/includes/ui/invoice_ui.inc:449
  msgid "Items Received Yet to be Invoiced"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:454
 -#: purchasing/includes/ui/invoice_ui.inc:434
++#: purchasing/includes/ui/invoice_ui.inc:454
  msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:459
 -#: purchasing/includes/ui/invoice_ui.inc:439
++#: purchasing/includes/ui/invoice_ui.inc:459
  msgid "Received Items Charged on this Invoice"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:461
 -#: purchasing/includes/ui/invoice_ui.inc:441
++#: purchasing/includes/ui/invoice_ui.inc:461
  msgid "Received Items Credited on this Note"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:471
 -#: purchasing/includes/ui/invoice_ui.inc:451
++#: purchasing/includes/ui/invoice_ui.inc:471
  msgid "Received between"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:483
 -#: purchasing/includes/ui/invoice_ui.inc:462
++#: purchasing/includes/ui/invoice_ui.inc:483
  msgid "Add All Items"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:492
- #: ../purchasing/includes/ui/invoice_ui.inc:504
- #: ../sales/inquiry/sales_orders_view.php:167
 -#: purchasing/includes/ui/invoice_ui.inc:471
 -#: purchasing/includes/ui/invoice_ui.inc:483 reporting/rep308.php:149
 -#: sales/inquiry/sales_orders_view.php:155
++#: purchasing/includes/ui/invoice_ui.inc:492
++#: purchasing/includes/ui/invoice_ui.inc:504 reporting/rep308.php:149
  msgid "Delivery"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:492
 -#: purchasing/includes/ui/invoice_ui.inc:471
++#: purchasing/includes/ui/invoice_ui.inc:492
 +msgid "Sequence #"
 +msgstr ""
 +
- #: ../purchasing/includes/ui/invoice_ui.inc:492
++#: purchasing/includes/ui/invoice_ui.inc:492
  msgid "P.O."
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:493
 -#: purchasing/includes/ui/invoice_ui.inc:472
++#: purchasing/includes/ui/invoice_ui.inc:493
  msgid "Received On"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:493
- #: ../purchasing/view/view_po.php:46
 -#: purchasing/includes/ui/invoice_ui.inc:472 purchasing/view/view_po.php:46
++#: purchasing/includes/ui/invoice_ui.inc:493 purchasing/view/view_po.php:46
  msgid "Quantity Received"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:493
- #: ../purchasing/view/view_grn.php:41
- #: ../purchasing/view/view_po.php:46
 -#: purchasing/includes/ui/invoice_ui.inc:472 purchasing/view/view_grn.php:41
++#: purchasing/includes/ui/invoice_ui.inc:493 purchasing/view/view_grn.php:41
+ #: purchasing/view/view_po.php:46
  msgid "Quantity Invoiced"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:494
 -#: purchasing/includes/ui/invoice_ui.inc:473
++#: purchasing/includes/ui/invoice_ui.inc:494
  msgid "Qty Yet To Invoice"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:494
- #: ../purchasing/includes/ui/po_ui.inc:245
- #: ../purchasing/includes/ui/po_ui.inc.orig:245
- #: ../sales/includes/ui/sales_order_ui.inc.orig:142
 -#: purchasing/includes/ui/invoice_ui.inc:473
 -#: purchasing/includes/ui/po_ui.inc:237
 -#: sales/includes/ui/sales_order_ui.inc:146
++#: purchasing/includes/ui/invoice_ui.inc:494
++#: sales/includes/ui/sales_order_ui.inc:147
  msgid "Price after Tax"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:494
- #: ../purchasing/includes/ui/po_ui.inc:245
- #: ../purchasing/includes/ui/po_ui.inc.orig:245
- #: ../sales/includes/ui/sales_order_ui.inc.orig:142
 -#: purchasing/includes/ui/invoice_ui.inc:473
 -#: purchasing/includes/ui/po_ui.inc:237
 -#: sales/includes/ui/sales_order_ui.inc:146
++#: purchasing/includes/ui/invoice_ui.inc:494
++#: sales/includes/ui/sales_order_ui.inc:147
  msgid "Price before Tax"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:500
 -#: purchasing/includes/ui/invoice_ui.inc:479
++#: purchasing/includes/ui/invoice_ui.inc:500
  msgid "Qty Yet To Credit"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:505
 -#: purchasing/includes/ui/invoice_ui.inc:484
++#: purchasing/includes/ui/invoice_ui.inc:505
  msgid "Line Value"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:573
 -#: purchasing/includes/ui/invoice_ui.inc:551
++#: purchasing/includes/ui/invoice_ui.inc:573
  msgid ""
  "There are no outstanding items received from this supplier that have not "
  "been invoiced by them."
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:576
 -#: purchasing/includes/ui/invoice_ui.inc:554
++#: purchasing/includes/ui/invoice_ui.inc:576
  msgid ""
  "There are no received items for the selected supplier that have been "
  "invoiced."
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:577
 -#: purchasing/includes/ui/invoice_ui.inc:555
++#: purchasing/includes/ui/invoice_ui.inc:577
  msgid "Credits can only be applied to invoiced items."
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:156
- #: ../purchasing/includes/ui/po_ui.inc.orig:156
 -#: purchasing/includes/ui/po_ui.inc:148
--msgid "Supplier Currency:"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:177 sales/sales_order_entry.php:705
 -msgid "Order Date:"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:692
 -msgid "Delivery Date:"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:686
 -msgid "Invoice Date:"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:189
 -msgid "Due Date:"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:191
 -msgid "Supplier's Reference:"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:192
 -msgid "Receive Into:"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:217
 -msgid ""
 -"The default stock location set up for this user is not a currently defined "
 -"stock location. Your system administrator needs to amend your user record."
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:221
 -msgid "Deliver to:"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:230
 -msgid "Order Items"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:236 purchasing/po_receive_items.php:62
 -msgid "Received"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:237
 -#: sales/includes/ui/sales_order_ui.inc:616
 -msgid "Required Delivery Date"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:237 purchasing/view/view_grn.php:41
 -#: purchasing/view/view_po.php:46
 -msgid "Line Total"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:288 purchasing/po_receive_items.php:114
 -#: reporting/rep107.php:145 reporting/rep109.php:149 reporting/rep110.php:159
 -#: reporting/rep111.php:134 reporting/rep113.php:144 reporting/rep209.php:162
 -#: sales/customer_credit_invoice.php:322 sales/customer_delivery.php:501
 -#: sales/customer_invoice.php:565 sales/view/view_dispatch.php:146
 -#: sales/view/view_invoice.php:148 sales/includes/ui/sales_credit_ui.inc:217
 -#: sales/includes/ui/sales_order_ui.inc:234
 -msgid "Sub-total"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:297 purchasing/po_receive_items.php:122
 -#: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93
 -#: sales/customer_delivery.php:508 sales/view/view_sales_order.php:244
 -#: sales/includes/ui/sales_order_ui.inc:241
 -msgid "Amount Total"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:298
 -#: purchasing/allocations/supplier_allocate.php:63
 -#: sales/allocations/customer_allocate.php:62
 -#: sales/includes/ui/sales_order_ui.inc:242
 -msgid "Refresh"
 -msgstr ""
 -
+ #: purchasing/po_entry_items.php:41
+ msgid "Modify Purchase Order #"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:185
- #: ../purchasing/includes/ui/po_ui.inc.orig:185
- #: ../sales/sales_order_entry.php:714
- msgid "Order Date:"
+ #: purchasing/po_entry_items.php:46
+ msgid "Purchase Order Entry"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:186
- #: ../purchasing/includes/ui/po_ui.inc.orig:186
- #: ../sales/sales_order_entry.php:701
- msgid "Delivery Date:"
+ #: purchasing/po_entry_items.php:51
+ msgid "Direct GRN Entry"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:186
- #: ../purchasing/includes/ui/po_ui.inc.orig:186
- #: ../sales/sales_order_entry.php:695
- msgid "Invoice Date:"
+ #: purchasing/po_entry_items.php:56
+ msgid "Direct Purchase Invoice Entry"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:197
- #: ../purchasing/includes/ui/po_ui.inc.orig:197
- msgid "Due Date:"
 -#: purchasing/po_entry_items.php:77
++#: purchasing/po_entry_items.php:80
+ msgid "Purchase Order has been entered"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:199
- #: ../purchasing/includes/ui/po_ui.inc.orig:199
- msgid "Supplier's Reference:"
 -#: purchasing/po_entry_items.php:79
++#: purchasing/po_entry_items.php:82
+ msgid "Purchase Order has been updated"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:200
- #: ../purchasing/includes/ui/po_ui.inc.orig:200
- msgid "Receive Into:"
 -#: purchasing/po_entry_items.php:80
++#: purchasing/po_entry_items.php:83
+ msgid "&View this order"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:225
- #: ../purchasing/includes/ui/po_ui.inc.orig:225
- msgid ""
- "The default stock location set up for this user is not a currently defined "
- "stock location. Your system administrator needs to amend your user record."
 -#: purchasing/po_entry_items.php:82 sales/sales_order_entry.php:113
 -#: sales/sales_order_entry.php:133
++#: purchasing/po_entry_items.php:85 sales/sales_order_entry.php:119
++#: sales/sales_order_entry.php:139
+ msgid "&Print This Order"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:229
- #: ../purchasing/includes/ui/po_ui.inc.orig:229
- msgid "Deliver to:"
- msgstr ""
- 
- #: ../purchasing/includes/ui/po_ui.inc:238
- #: ../purchasing/includes/ui/po_ui.inc.orig:238
- msgid "Order Items"
- msgstr ""
- 
- #: ../purchasing/includes/ui/po_ui.inc:244
- #: ../purchasing/includes/ui/po_ui.inc.orig:244
- #: ../purchasing/po_receive_items.php:62
- msgid "Received"
- msgstr ""
- 
- #: ../purchasing/includes/ui/po_ui.inc:245
- #: ../purchasing/includes/ui/po_ui.inc.orig:245
- #: ../sales/includes/ui/sales_order_ui.inc.orig:611
- msgid "Required Delivery Date"
- msgstr ""
- 
- #: ../purchasing/includes/ui/po_ui.inc:245
- #: ../purchasing/includes/ui/po_ui.inc.orig:245
- #: ../purchasing/view/view_grn.php:41
- #: ../purchasing/view/view_po.php:46
- msgid "Line Total"
- msgstr ""
- 
- #: ../purchasing/includes/ui/po_ui.inc:296
- #: ../purchasing/includes/ui/po_ui.inc.orig:296
- #: ../purchasing/po_receive_items.php:114
- #: ../reporting/rep107.php:217
- #: ../reporting/rep109.php:152
- #: ../reporting/rep110.php:161
- #: ../reporting/rep111.php:137
- #: ../reporting/rep113.php:147
- #: ../reporting/rep209.php:167
- #: ../sales/customer_credit_invoice.php:322
- #: ../sales/customer_delivery.php.orig:514
- #: ../sales/customer_invoice.php:647
- #: ../sales/view/view_dispatch.php:146
- #: ../sales/view/view_invoice.php:150
- #: ../sales/includes/ui/sales_credit_ui.inc:217
- #: ../sales/includes/ui/sales_order_ui.inc.orig:229
- msgid "Sub-total"
- msgstr ""
- 
- #: ../purchasing/includes/ui/po_ui.inc:305
- #: ../purchasing/includes/ui/po_ui.inc.orig:305
- #: ../purchasing/po_receive_items.php:122
- #: ../purchasing/view/view_grn.php:79
- #: ../purchasing/view/view_po.php:93
- #: ../sales/customer_delivery.php.orig:521
- #: ../sales/view/view_sales_order.php:262
- #: ../sales/view/view_sales_order.php.orig:244
- #: ../sales/includes/ui/sales_order_ui.inc.orig:236
- msgid "Amount Total"
- msgstr ""
- 
- #: ../purchasing/includes/ui/po_ui.inc:306
- #: ../purchasing/includes/ui/po_ui.inc.orig:306
- #: ../purchasing/allocations/supplier_allocate.php:64
- #: ../sales/allocations/customer_allocate.php:63
- #: ../sales/includes/ui/sales_order_ui.inc.orig:237
- msgid "Refresh"
- msgstr ""
- 
- #: ../purchasing/includes/ui/po_ui.inc:361
- #: ../purchasing/includes/ui/po_ui.inc.orig:361
- #: ../sales/view/view_sales_order.php:83
- msgid "Required Pre-Payment"
- msgstr ""
- 
- #: ../purchasing/includes/ui/po_ui.inc:362
- #: ../purchasing/includes/ui/po_ui.inc.orig:362
- msgid "Pre-Payments Allocated"
- msgstr ""
- 
- #: ../purchasing/includes/ui/po_ui.inc.orig:488
- #: ../purchasing/po_entry_items.php.orig:555
- #: ../sales/customer_invoice.php:454
- #: ../sales/includes/ui/sales_order_ui.inc.orig:407
- #: ../sales/includes/ui/sales_order_ui.inc.orig:409
- msgid "Payment:"
- msgstr ""
- 
- #: ../purchasing/includes/ui/po_ui.inc.orig:488
- #: ../purchasing/po_entry_items.php.orig:555
- msgid "Delayed"
- msgstr ""
- 
- #: ../purchasing/includes/ui/po_ui.inc.orig:490
- #: ../sales/includes/ui/sales_order_ui.inc.orig:622
- #: ../sales/includes/ui/sales_order_ui.inc.orig:624
- msgid "Pre-Payment Required:"
- msgstr ""
- 
- #: ../purchasing/po_entry_items.php:41
- #: ../purchasing/po_entry_items.php.orig:38
- msgid "Modify Purchase Order #"
- msgstr ""
- 
- #: ../purchasing/po_entry_items.php:46
- #: ../purchasing/po_entry_items.php.orig:43
- msgid "Purchase Order Entry"
- msgstr ""
- 
- #: ../purchasing/po_entry_items.php:51
- #: ../purchasing/po_entry_items.php.orig:48
- msgid "Direct GRN Entry"
- msgstr ""
- 
- #: ../purchasing/po_entry_items.php:56
- #: ../purchasing/po_entry_items.php.orig:53
- msgid "Direct Purchase Invoice Entry"
- msgstr ""
- 
- #: ../purchasing/po_entry_items.php:80
- #: ../purchasing/po_entry_items.php.orig:77
- msgid "Purchase Order has been entered"
- msgstr ""
- 
- #: ../purchasing/po_entry_items.php:82
- #: ../purchasing/po_entry_items.php.orig:79
- msgid "Purchase Order has been updated"
- msgstr ""
- 
- #: ../purchasing/po_entry_items.php:83
- #: ../purchasing/po_entry_items.php.orig:80
- msgid "&View this order"
- msgstr ""
- 
- #: ../purchasing/po_entry_items.php:85
- #: ../purchasing/po_entry_items.php.orig:82
- #: ../sales/sales_order_entry.php:119
- #: ../sales/sales_order_entry.php:139
- msgid "&Print This Order"
- msgstr ""
- 
- #: ../purchasing/po_entry_items.php:87
- #: ../purchasing/po_entry_items.php.orig:84
- #: ../sales/sales_order_entry.php:120
- #: ../sales/sales_order_entry.php:140
 -#: purchasing/po_entry_items.php:84 sales/sales_order_entry.php:114
 -#: sales/sales_order_entry.php:134
++#: purchasing/po_entry_items.php:87 sales/sales_order_entry.php:120
++#: sales/sales_order_entry.php:140
  msgid "&Email This Order"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:89
- #: ../purchasing/po_entry_items.php.orig:86
 -#: purchasing/po_entry_items.php:86
++#: purchasing/po_entry_items.php:89
  msgid "&Receive Items on this Purchase Order"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:91
- #: ../purchasing/po_entry_items.php.orig:88
 -#: purchasing/po_entry_items.php:88
++#: purchasing/po_entry_items.php:91
  msgid "Enter &Another Purchase Order"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:93
- #: ../purchasing/po_entry_items.php.orig:90
 -#: purchasing/po_entry_items.php:90
++#: purchasing/po_entry_items.php:93
  msgid "Select An &Outstanding Purchase Order"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:102
- #: ../purchasing/po_entry_items.php.orig:99
 -#: purchasing/po_entry_items.php:99
++#: purchasing/po_entry_items.php:102
  msgid "Direct GRN has been entered"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:104
- #: ../purchasing/po_entry_items.php.orig:101
 -#: purchasing/po_entry_items.php:101
++#: purchasing/po_entry_items.php:104
  msgid "&View this GRN"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:108
- #: ../purchasing/po_entry_items.php.orig:105
- #: ../purchasing/po_receive_items.php:40
 -#: purchasing/po_entry_items.php:105 purchasing/po_receive_items.php:40
++#: purchasing/po_entry_items.php:108 purchasing/po_receive_items.php:40
  msgid "View the GL Journal Entries for this Delivery"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:113
- #: ../purchasing/po_entry_items.php.orig:110
- #: ../purchasing/po_receive_items.php:42
 -#: purchasing/po_entry_items.php:110 purchasing/po_receive_items.php:42
++#: purchasing/po_entry_items.php:113 purchasing/po_receive_items.php:42
  msgid "Entry purchase &invoice for this receival"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:118
- #: ../purchasing/po_entry_items.php.orig:115
 -#: purchasing/po_entry_items.php:115
++#: purchasing/po_entry_items.php:118
  msgid "Enter &Another GRN"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:127
- #: ../purchasing/po_entry_items.php.orig:124
 -#: purchasing/po_entry_items.php:124
++#: purchasing/po_entry_items.php:127
  msgid "Direct Purchase Invoice has been entered"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:129
- #: ../purchasing/po_entry_items.php.orig:126
 -#: purchasing/po_entry_items.php:126
++#: purchasing/po_entry_items.php:129
  msgid "&View this Invoice"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:134
- #: ../purchasing/po_entry_items.php.orig:131
- #: ../purchasing/supplier_invoice.php:69
 -#: purchasing/po_entry_items.php:131 purchasing/supplier_invoice.php:46
++#: purchasing/po_entry_items.php:134 purchasing/supplier_invoice.php:69
  msgid "View the GL Journal Entries for this Invoice"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:136
- #: ../purchasing/po_entry_items.php.orig:133
- #: ../purchasing/supplier_invoice.php:71
 -#: purchasing/po_entry_items.php:133 purchasing/supplier_invoice.php:48
++#: purchasing/po_entry_items.php:136 purchasing/supplier_invoice.php:71
  msgid "Entry supplier &payment for this invoice"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:142
- #: ../purchasing/po_entry_items.php.orig:139
 -#: purchasing/po_entry_items.php:139
++#: purchasing/po_entry_items.php:142
  msgid "Enter &Another Direct Invoice"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:174
- #: ../purchasing/po_entry_items.php.orig:171
 -#: purchasing/po_entry_items.php:171
++#: purchasing/po_entry_items.php:174
  msgid ""
  "This item cannot be deleted because some of it has already been received."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:189
- #: ../purchasing/po_entry_items.php.orig:186
 -#: purchasing/po_entry_items.php:186
++#: purchasing/po_entry_items.php:189
  msgid ""
  "This order cannot be cancelled because some of it has already been received."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:190
- #: ../purchasing/po_entry_items.php.orig:187
 -#: purchasing/po_entry_items.php:187
++#: purchasing/po_entry_items.php:190
  msgid ""
  "The line item quantities may be modified to quantities more than already "
  "received. prices cannot be altered for lines that have already been received "
  "and quantities cannot be reduced below the quantity already received."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:205
- #: ../purchasing/po_entry_items.php.orig:202
 -#: purchasing/po_entry_items.php:202
++#: purchasing/po_entry_items.php:205
  msgid "This purchase order has been cancelled."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:207
- #: ../purchasing/po_entry_items.php.orig:204
 -#: purchasing/po_entry_items.php:204
++#: purchasing/po_entry_items.php:207
  msgid "Enter a new purchase order"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:219
- #: ../purchasing/po_entry_items.php.orig:216
- #: ../sales/sales_order_entry.php:495
 -#: purchasing/po_entry_items.php:216 sales/sales_order_entry.php:486
++#: purchasing/po_entry_items.php:219 sales/sales_order_entry.php:502
  msgid "Item description cannot be empty."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:229
- #: ../purchasing/po_entry_items.php.orig:226
 -#: purchasing/po_entry_items.php:226
++#: purchasing/po_entry_items.php:229
  msgid "The quantity of the order item must be numeric and not less than "
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:236
- #: ../purchasing/po_entry_items.php.orig:233
 -#: purchasing/po_entry_items.php:233
++#: purchasing/po_entry_items.php:236
  msgid "The price entered must be numeric and not less than zero."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:260
- #: ../purchasing/po_entry_items.php.orig:257
 -#: purchasing/po_entry_items.php:257
++#: purchasing/po_entry_items.php:260
  msgid ""
  "You are attempting to make the quantity ordered a quantity less than has "
  "already been invoiced or received.  This is prohibited."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:261
- #: ../purchasing/po_entry_items.php.orig:258
 -#: purchasing/po_entry_items.php:258
++#: purchasing/po_entry_items.php:261
  msgid ""
  "The quantity received can only be modified by entering a negative receipt "
  "and the quantity invoiced can only be reduced by entering a credit note "
  "against this item."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:289
- #: ../purchasing/po_entry_items.php.orig:286
 -#: purchasing/po_entry_items.php:286
++#: purchasing/po_entry_items.php:289
  msgid "The selected item is already on this order."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:316
- #: ../purchasing/po_entry_items.php.orig:313
 -#: purchasing/po_entry_items.php:313
++#: purchasing/po_entry_items.php:316
  msgid ""
  "The selected item does not exist or it is a kit part and therefore cannot be "
  "purchased."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:332
- #: ../purchasing/po_entry_items.php.orig:329
- #: ../purchasing/supplier_invoice.php:382
- #: ../purchasing/supplier_payment.php:113
 -#: purchasing/po_entry_items.php:329 purchasing/supplier_invoice.php:343
++#: purchasing/po_entry_items.php:332 purchasing/supplier_invoice.php:382
+ #: purchasing/supplier_payment.php:114
  msgid "There is no supplier selected."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:339
- #: ../purchasing/po_entry_items.php.orig:336
 -#: purchasing/po_entry_items.php:336
++#: purchasing/po_entry_items.php:339
  msgid "The entered order date is invalid."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:352
- #: ../purchasing/po_entry_items.php.orig:349
 -#: purchasing/po_entry_items.php:343 purchasing/po_receive_items.php:181
 -#: sales/sales_order_entry.php:354
 -msgid "The entered date is not in fiscal year"
 -msgstr ""
 -
 -#: purchasing/po_entry_items.php:350
++#: purchasing/po_entry_items.php:352
  msgid "The entered due date is invalid."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:361
- #: ../purchasing/po_entry_items.php.orig:358
 -#: purchasing/po_entry_items.php:359
++#: purchasing/po_entry_items.php:361
  msgid "There is no reference entered for this purchase order."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:376
- #: ../purchasing/po_entry_items.php.orig:373
- #: ../purchasing/supplier_invoice.php:186
 -#: purchasing/po_entry_items.php:374 purchasing/supplier_invoice.php:161
++#: purchasing/po_entry_items.php:376 purchasing/supplier_invoice.php:186
  msgid "You must enter a supplier's invoice reference."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:383
- #: ../purchasing/po_entry_items.php.orig:380
- #: ../purchasing/supplier_invoice.php:212
 -#: purchasing/po_entry_items.php:381 purchasing/supplier_invoice.php:187
++#: purchasing/po_entry_items.php:383 purchasing/supplier_invoice.php:212
  msgid ""
  "This invoice number has already been entered. It cannot be entered again."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:389
- #: ../purchasing/po_entry_items.php.orig:386
 -#: purchasing/po_entry_items.php:387
++#: purchasing/po_entry_items.php:389
  msgid "There is no delivery address specified."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:395
- #: ../purchasing/po_entry_items.php.orig:392
 -#: purchasing/po_entry_items.php:393
++#: purchasing/po_entry_items.php:395
  msgid "There is no location specified to move any items into."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:403
- #: ../purchasing/po_entry_items.php.orig:399
 -#: purchasing/po_entry_items.php:401
++#: purchasing/po_entry_items.php:403
  msgid ""
  "The order cannot be placed because there are no lines entered on this order."
  msgstr ""
  
- #: ../purchasing/po_entry_items.php:408
- #: ../purchasing/po_entry_items.php.orig:404
 -#: purchasing/po_entry_items.php:528 sales/sales_order_entry.php:709
++#: purchasing/po_entry_items.php:408
 +msgid "Required prepayment is greater than total invoice value."
 +msgstr ""
 +
- #: ../purchasing/po_entry_items.php.orig:492
++#: purchasing/po_entry_items.php:497
 +msgid "Payment for:"
 +msgstr ""
 +
- #: ../purchasing/po_entry_items.php.orig:563
- #: ../sales/sales_order_entry.php:718
++#: purchasing/po_entry_items.php:560 sales/customer_invoice.php:454
++#: sales/includes/ui/sales_order_ui.inc:414
++#: sales/includes/ui/sales_order_ui.inc:416
++msgid "Payment:"
++msgstr ""
++
++#: purchasing/po_entry_items.php:560
++msgid "Delayed"
++msgstr ""
++
++#: purchasing/po_entry_items.php:568 sales/sales_order_entry.php:725
  msgid "Place Order"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php.orig:564
 -#: purchasing/po_entry_items.php:529
++#: purchasing/po_entry_items.php:569
  msgid "Update Order"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php.orig:565
- #: ../sales/sales_order_entry.php:717
 -#: purchasing/po_entry_items.php:530 sales/sales_order_entry.php:708
++#: purchasing/po_entry_items.php:570 sales/sales_order_entry.php:724
  msgid "Cancel Order"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php.orig:567
 -#: purchasing/po_entry_items.php:532
++#: purchasing/po_entry_items.php:572
  msgid "Process GRN"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php.orig:568
 -#: purchasing/po_entry_items.php:533
++#: purchasing/po_entry_items.php:573
  msgid "Update GRN"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php.orig:569
 -#: purchasing/po_entry_items.php:534
++#: purchasing/po_entry_items.php:574
  msgid "Cancel GRN"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php.orig:572
- #: ../sales/customer_invoice.php:686
 -#: purchasing/po_entry_items.php:537 sales/customer_invoice.php:584
++#: purchasing/po_entry_items.php:577 sales/customer_invoice.php:686
  msgid "Process Invoice"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php.orig:573
 -#: purchasing/po_entry_items.php:538
++#: purchasing/po_entry_items.php:578
  msgid "Update Invoice"
  msgstr ""
  
- #: ../purchasing/po_entry_items.php.orig:574
- #: ../sales/sales_order_entry.php:698
 -#: purchasing/po_entry_items.php:539 sales/sales_order_entry.php:689
++#: purchasing/po_entry_items.php:579 sales/sales_order_entry.php:705
  msgid "Cancel Invoice"
  msgstr ""
  
@@@ -10932,45 -9408,39 +9007,57 @@@ msgid "
  "select a purchase order first."
  msgstr ""
  
- #: ../purchasing/po_receive_items.php:62
- #: ../reporting/rep105.php:112
- #: ../sales/customer_delivery.php.orig:445
+ #: purchasing/po_receive_items.php:62 reporting/rep105.php:114
 -#: sales/customer_delivery.php:432
++#: sales/customer_delivery.php:446
  msgid "Ordered"
  msgstr ""
  
- #: ../purchasing/po_receive_items.php:63
- #: ../reporting/rep101.php:131
- #: ../reporting/rep105.php:113
- #: ../reporting/rep105.php:162
- #: ../reporting/rep201.php:119
- #: ../reporting/includes/doctext.inc:247
 -#: purchasing/po_receive_items.php:63 reporting/rep101.php:133
 -#: reporting/rep105.php:115 reporting/rep105.php:166 reporting/rep201.php:121
 -#: reporting/includes/doctext.inc:225
++#: purchasing/po_receive_items.php:62
++msgid "Received"
++msgstr ""
++
++#: purchasing/po_receive_items.php:63 reporting/rep105.php:115
++#: reporting/rep105.php:166 reporting/includes/doctext.inc:247
  msgid "Outstanding"
  msgstr ""
  
- #: ../purchasing/po_receive_items.php:63
- #: ../sales/customer_delivery.php.orig:446
 -#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:433
++#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:447
  msgid "This Delivery"
  msgstr ""
  
- #: ../purchasing/po_receive_items.php:168
- #: ../purchasing/po_receive_items.php:222
 -#: purchasing/po_receive_items.php:168 purchasing/po_receive_items.php:224
++#: purchasing/po_receive_items.php:114 reporting/rep209.php:162
++#: sales/customer_credit_invoice.php:322 sales/customer_delivery.php:523
++#: sales/customer_invoice.php:647 sales/view/view_dispatch.php:146
++#: sales/view/view_invoice.php:150 sales/includes/ui/sales_credit_ui.inc:217
++#: sales/includes/ui/sales_order_ui.inc:236
++msgid "Sub-total"
++msgstr ""
++
++#: purchasing/po_receive_items.php:122 purchasing/view/view_grn.php:79
++#: purchasing/view/view_po.php:93 sales/customer_delivery.php:530
++#: sales/view/view_sales_order.php:262
++#: sales/includes/ui/sales_order_ui.inc:243
++msgid "Amount Total"
++msgstr ""
++
++#: purchasing/po_receive_items.php:168 purchasing/po_receive_items.php:222
  msgid ""
  "There is nothing to process. Please enter valid quantities greater than zero."
  msgstr ""
  
- #: ../purchasing/po_receive_items.php:227
 -#: purchasing/po_receive_items.php:229
++#: purchasing/po_receive_items.php:227
  msgid ""
  "Entered quantities cannot be greater than the quantity entered on the "
  "purchase order including the allowed over-receive percentage"
  msgstr ""
  
- #: ../purchasing/po_receive_items.php:229
 -#: purchasing/po_receive_items.php:231
++#: purchasing/po_receive_items.php:229
  msgid ""
  "Modify the ordered items on the purchase order if you wish to increase the "
  "quantities."
  msgstr ""
  
- #: ../purchasing/po_receive_items.php:247
 -#: purchasing/po_receive_items.php:249
++#: purchasing/po_receive_items.php:247
  msgid ""
  "This order has been changed or invoiced since this delivery was started to "
  "be actioned. Processing halted. To enter a delivery against this purchase "
@@@ -10978,167 -9448,153 +9065,163 @@@
  "by the other user."
  msgstr ""
  
- #: ../purchasing/po_receive_items.php:250
 -#: purchasing/po_receive_items.php:252
++#: purchasing/po_receive_items.php:250
  msgid "Select a different purchase order for receiving goods against"
  msgstr ""
  
- #: ../purchasing/po_receive_items.php:253
 -#: purchasing/po_receive_items.php:255
++#: purchasing/po_receive_items.php:253
  msgid "Re-Read the updated purchase order for receiving goods against"
  msgstr ""
  
- #: ../purchasing/po_receive_items.php:327
 -#: purchasing/po_receive_items.php:329
++#: purchasing/po_receive_items.php:327
  msgid "Items to Receive"
  msgstr ""
  
- #: ../purchasing/po_receive_items.php:332
 -#: purchasing/po_receive_items.php:334
++#: purchasing/po_receive_items.php:332
  msgid "Process Receive Items"
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:63
 -#: purchasing/supplier_credit.php:43
++#: purchasing/supplier_credit.php:63
 +#, php-format
 +msgid "Modifying Supplier Credit # %d"
 +msgstr ""
 +
- #: ../purchasing/supplier_credit.php:78
++#: purchasing/supplier_credit.php:78
  msgid "Supplier credit note has been processed."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:79
 -#: purchasing/supplier_credit.php:44
++#: purchasing/supplier_credit.php:79
  msgid "View this Credit Note"
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:81
 -#: purchasing/supplier_credit.php:46
++#: purchasing/supplier_credit.php:81
  msgid "View the GL Journal Entries for this Credit Note"
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:83
 -#: purchasing/supplier_credit.php:48
++#: purchasing/supplier_credit.php:83
  msgid "Enter Another Credit Note"
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:119
- #: ../purchasing/supplier_invoice.php:127
 -#: purchasing/supplier_credit.php:102 purchasing/supplier_invoice.php:102
++#: purchasing/supplier_credit.php:119 purchasing/supplier_invoice.php:127
  msgid ""
  "The account code entered is not a valid code, this line cannot be added to "
  "the transaction."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:129
- #: ../purchasing/supplier_invoice.php:137
 -#: purchasing/supplier_credit.php:112 purchasing/supplier_invoice.php:112
++#: purchasing/supplier_credit.php:129 purchasing/supplier_invoice.php:137
  msgid ""
  "The amount entered is not numeric. This line cannot be added to the "
  "transaction."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:159
 -#: purchasing/supplier_credit.php:142
++#: purchasing/supplier_credit.php:159
  msgid ""
  "The credit note cannot be processed because the there are no items or values "
  "on the invoice.  Credit notes are expected to have a charge."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:166
 -#: purchasing/supplier_credit.php:149
++#: purchasing/supplier_credit.php:166
  msgid "You must enter an credit note reference."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:180
 -#: purchasing/supplier_credit.php:163
++#: purchasing/supplier_credit.php:180
  msgid "You must enter a supplier's credit note reference."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:187
 -#: purchasing/supplier_credit.php:170
++#: purchasing/supplier_credit.php:187
  msgid ""
  "The credit note as entered cannot be processed because the date entered is "
  "not valid."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:199
- #: ../purchasing/supplier_invoice.php:205
 -#: purchasing/supplier_credit.php:182 purchasing/supplier_invoice.php:180
++#: purchasing/supplier_credit.php:199 purchasing/supplier_invoice.php:205
  msgid ""
  "The invoice as entered cannot be processed because the due date is in an "
  "incorrect format."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:206
 -#: purchasing/supplier_credit.php:189
++#: purchasing/supplier_credit.php:206
  msgid ""
  "The credit note total as entered is less than the sum of the the general "
  "ledger entires (if any) and the charges for goods received. There must be a "
  "mistake somewhere, the credit note as entered will not be processed."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:218
 -#: purchasing/supplier_credit.php:201
++#: purchasing/supplier_credit.php:218
  msgid ""
  "The return cannot be processed because there is an insufficient quantity for "
  "item:"
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:262
 -#: purchasing/supplier_credit.php:245
++#: purchasing/supplier_credit.php:261
  msgid "The quantity to credit must be numeric and greater than zero."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:269
 -#: purchasing/supplier_credit.php:252
++#: purchasing/supplier_credit.php:268
  msgid "The price is either not numeric or negative."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:371
 -#: purchasing/supplier_credit.php:354
++#: purchasing/supplier_credit.php:370
  msgid "Enter Credit Note"
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:43
 -#: purchasing/supplier_invoice.php:28
++#: purchasing/supplier_invoice.php:43
  msgid "Enter Supplier Invoice"
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:48
 -#: purchasing/supplier_invoice.php:43
++#: purchasing/supplier_invoice.php:48
 +#, php-format
 +msgid "Modifying Purchase Invoice # %d"
 +msgstr ""
 +
- #: ../purchasing/supplier_invoice.php:66
++#: purchasing/supplier_invoice.php:66
  msgid "Supplier invoice has been processed."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:67
 -#: purchasing/supplier_invoice.php:44
++#: purchasing/supplier_invoice.php:67
  msgid "View this Invoice"
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:73
 -#: purchasing/supplier_invoice.php:50
++#: purchasing/supplier_invoice.php:73
  msgid "Enter Another Invoice"
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:166
 -#: purchasing/supplier_invoice.php:141
++#: purchasing/supplier_invoice.php:166
  msgid ""
  "The invoice cannot be processed because the there are no items or values on "
  "the invoice.  Invoices are expected to have a charge."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:172
 -#: purchasing/supplier_invoice.php:147
++#: purchasing/supplier_invoice.php:172
  msgid "You must enter an invoice reference."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:193
 -#: purchasing/supplier_invoice.php:168
++#: purchasing/supplier_invoice.php:193
  msgid ""
  "The invoice as entered cannot be processed because the invoice date is in an "
  "incorrect format."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:254
 -#: purchasing/supplier_invoice.php:224
++#: purchasing/supplier_invoice.php:254
  msgid "The quantity to invoice must be numeric and greater than zero."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:261
 -#: purchasing/supplier_invoice.php:231
++#: purchasing/supplier_invoice.php:261
  msgid "The price is not numeric."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:274
 -#: purchasing/supplier_invoice.php:244
++#: purchasing/supplier_invoice.php:274
  msgid ""
  "The price being invoiced is more than the purchase order price by more than "
  "the allowed over-charge percentage. The system is set up to prohibit this. "
  "See the system administrator to modify the set up parameters if necessary."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:275
- #: ../purchasing/supplier_invoice.php:288
 -#: purchasing/supplier_invoice.php:245 purchasing/supplier_invoice.php:258
++#: purchasing/supplier_invoice.php:275 purchasing/supplier_invoice.php:288
  msgid "The over-charge percentage allowance is :"
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:287
 -#: purchasing/supplier_invoice.php:257
++#: purchasing/supplier_invoice.php:287
  msgid ""
  "The quantity being invoiced is more than the outstanding quantity by more "
  "than the allowed over-charge percentage. The system is set up to prohibit "
@@@ -11146,12 -9602,12 +9229,12 @@@
  "necessary."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:364
 -#: purchasing/supplier_invoice.php:325
++#: purchasing/supplier_invoice.php:364
  #, php-format
  msgid "All yet non-invoiced items on delivery line # %d has been removed."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:406
 -#: purchasing/supplier_invoice.php:367
++#: purchasing/supplier_invoice.php:406
  msgid "Enter Invoice"
  msgstr ""
  
@@@ -11198,33 -9657,32 +9284,32 @@@ msgid "
  "positive values."
  msgstr ""
  
- #: ../purchasing/supplier_payment.php:270
 -#: purchasing/supplier_payment.php:271
++#: purchasing/supplier_payment.php:275
  msgid "Payment To:"
  msgstr ""
  
- #: ../purchasing/supplier_payment.php:283
 -#: purchasing/supplier_payment.php:284
++#: purchasing/supplier_payment.php:288
  msgid "From Bank Account:"
  msgstr ""
  
- #: ../purchasing/supplier_payment.php:291
- #: ../purchasing/view/view_supp_payment.php:55
 -#: purchasing/supplier_payment.php:292
++#: purchasing/supplier_payment.php:296
+ #: purchasing/view/view_supp_payment.php:55
  msgid "Date Paid"
  msgstr ""
  
- #: ../purchasing/supplier_payment.php:314
- #: ../sales/customer_payments.php:409
 -#: purchasing/supplier_payment.php:315 sales/customer_payments.php:394
++#: purchasing/supplier_payment.php:319
  msgid "Amount of Discount:"
  msgstr ""
  
- #: ../purchasing/supplier_payment.php:315
 -#: purchasing/supplier_payment.php:316
++#: purchasing/supplier_payment.php:320
  msgid "Amount of Payment:"
  msgstr ""
  
- #: ../purchasing/supplier_payment.php:321
 -#: purchasing/supplier_payment.php:322
++#: purchasing/supplier_payment.php:326
  msgid "The amount and discount are in the bank account's currency."
  msgstr ""
  
- #: ../purchasing/supplier_payment.php:324
 -#: purchasing/supplier_payment.php:325
++#: purchasing/supplier_payment.php:329
  msgid "Enter Payment"
  msgstr ""
  
@@@ -11237,28 -9695,21 +9322,25 @@@ msgid "
  "This page must be called with a Purchase Order Delivery number to review."
  msgstr ""
  
- #: ../purchasing/view/view_grn.php:37
- #: ../purchasing/view/view_po.php:41
- #: ../sales/view/view_sales_order.php:216
- #: ../sales/view/view_sales_order.php.orig:198
+ #: purchasing/view/view_grn.php:37 purchasing/view/view_po.php:41
 -#: sales/view/view_sales_order.php:198
++#: sales/view/view_sales_order.php:216
  msgid "Line Details"
  msgstr ""
  
- #: ../purchasing/view/view_grn.php:40
- #: ../reporting/includes/doctext.inc:77
- #: ../reporting/includes/doctext.inc:192
- #: ../reporting/includes/doctext.inc:244
- #: ../sales/inquiry/sales_deliveries_view.php:186
 -#: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:65
 -#: reporting/includes/doctext.inc:170 reporting/includes/doctext.inc:222
++#: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:77
++#: reporting/includes/doctext.inc:192 reporting/includes/doctext.inc:244
+ #: sales/inquiry/sales_deliveries_view.php:186
  msgid "Delivery Date"
  msgstr ""
  
- #: ../purchasing/view/view_grn.php:70
- #: ../purchasing/view/view_po.php:84
- #: ../purchasing/view/view_supp_credit.php:60
- #: ../purchasing/view/view_supp_invoice.php:66
- #: ../sales/view/view_credit.php:136
- #: ../sales/view/view_sales_order.php:252
- #: ../sales/view/view_sales_order.php.orig:234
++#: purchasing/view/view_grn.php:41 purchasing/view/view_po.php:46
++msgid "Line Total"
++msgstr ""
++
+ #: purchasing/view/view_grn.php:70 purchasing/view/view_po.php:84
+ #: purchasing/view/view_supp_credit.php:60
 -#: purchasing/view/view_supp_invoice.php:65 sales/view/view_credit.php:136
 -#: sales/view/view_sales_order.php:234
++#: purchasing/view/view_supp_invoice.php:66 sales/view/view_credit.php:136
++#: sales/view/view_sales_order.php:252
  msgid "Sub Total"
  msgstr ""
  
@@@ -11278,21 -9729,18 +9360,17 @@@ msgstr "
  msgid "Requested By"
  msgstr ""
  
- #: ../purchasing/view/view_po.php:100
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:147
- #: ../purchasing/inquiry/supplier_inquiry.php:197
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:196
- #: ../sales/inquiry/customer_allocation_inquiry.php:165
- #: ../sales/inquiry/customer_inquiry.php:227
- #: ../sales/inquiry/sales_deliveries_view.php:206
- #: ../sales/inquiry/sales_orders_view.php:344
+ #: purchasing/view/view_po.php:100
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:148
 -#: purchasing/inquiry/supplier_inquiry.php:193
++#: purchasing/inquiry/supplier_allocation_inquiry.php:147
++#: purchasing/inquiry/supplier_inquiry.php:197
+ #: sales/inquiry/customer_allocation_inquiry.php:164
 -#: sales/inquiry/customer_inquiry.php:251
++#: sales/inquiry/customer_inquiry.php:227
+ #: sales/inquiry/sales_deliveries_view.php:206
 -#: sales/inquiry/sales_orders_view.php:318
  msgid "Marked items are overdue."
  msgstr ""
  
- #: ../purchasing/view/view_po.php:113
- #: ../sales/view/view_invoice.php:98
- #: ../sales/view/view_sales_order.php:51
- #: ../sales/view/view_sales_order.php.orig:51
 -#: purchasing/view/view_po.php:113 sales/view/view_invoice.php:97
++#: purchasing/view/view_po.php:113 sales/view/view_invoice.php:98
+ #: sales/view/view_sales_order.php:51
  msgid "Deliveries"
  msgstr ""
  
@@@ -11314,11 -9760,9 +9390,9 @@@ msgstr "
  msgid "SUPPLIER CREDIT NOTE"
  msgstr ""
  
- #: ../purchasing/view/view_supp_credit.php:47
- #: ../purchasing/view/view_supp_invoice.php:51
- #: ../reporting/includes/doctext.inc:141
- #: ../sales/customer_credit_invoice.php:268
- #: ../sales/view/view_invoice.php:100
+ #: purchasing/view/view_supp_credit.php:47
 -#: purchasing/view/view_supp_invoice.php:50
 -#: sales/customer_credit_invoice.php:268 sales/view/view_invoice.php:95
++#: purchasing/view/view_supp_invoice.php:51 reporting/includes/doctext.inc:141
++#: sales/customer_credit_invoice.php:268 sales/view/view_invoice.php:100
  msgid "Invoice Date"
  msgstr ""
  
@@@ -11331,23 -9774,20 +9404,19 @@@ msgstr "
  msgid "This credit note has been voided."
  msgstr ""
  
- #: ../purchasing/view/view_supp_invoice.php:24
 -#: purchasing/view/view_supp_invoice.php:23
++#: purchasing/view/view_supp_invoice.php:24
  msgid "View Supplier Invoice"
  msgstr ""
  
- #: ../purchasing/view/view_supp_invoice.php:41
 -#: purchasing/view/view_supp_invoice.php:40
++#: purchasing/view/view_supp_invoice.php:41
  msgid "SUPPLIER INVOICE"
  msgstr ""
  
- #: ../purchasing/view/view_supp_invoice.php:73
- #: ../reporting/rep107.php:266
- #: ../reporting/rep107.php:272
- #: ../sales/view/view_invoice.php:166
 -#: purchasing/view/view_supp_invoice.php:72 reporting/rep107.php:193
 -#: sales/view/view_invoice.php:164
++#: purchasing/view/view_supp_invoice.php:73 sales/view/view_invoice.php:166
  msgid "TOTAL INVOICE"
  msgstr ""
  
- #: ../purchasing/view/view_supp_invoice.php:77
- #: ../sales/view/view_invoice.php:170
 -#: purchasing/view/view_supp_invoice.php:76 sales/view/view_invoice.php:168
++#: purchasing/view/view_supp_invoice.php:77 sales/view/view_invoice.php:170
  msgid "This invoice has been voided."
  msgstr ""
  
@@@ -11368,13 -9807,9 +9436,9 @@@ msgstr "
  msgid "Payment Currency"
  msgstr ""
  
- #: ../purchasing/view/view_supp_payment.php:62
- #: ../sales/customer_delivery.php.orig:446
- #: ../sales/customer_invoice.php:542
- #: ../sales/customer_invoice.php:545
- #: ../sales/view/view_receipt.php:45
- #: ../sales/view/view_sales_order.php:220
- #: ../sales/view/view_sales_order.php.orig:202
 -#: purchasing/view/view_supp_payment.php:62 sales/customer_delivery.php:433
 -#: sales/customer_invoice.php:470 sales/view/view_receipt.php:45
 -#: sales/view/view_sales_order.php:202
++#: purchasing/view/view_supp_payment.php:62 sales/customer_delivery.php:447
++#: sales/customer_invoice.php:542 sales/customer_invoice.php:545
++#: sales/view/view_receipt.php:45 sales/view/view_sales_order.php:220
  msgid "Discount"
  msgstr ""
  
@@@ -11390,253 -9823,191 +9452,154 @@@ msgid "
  "required before proceeding."
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:91
- #: ../purchasing/manage/suppliers.php.orig:92
 -#: purchasing/manage/suppliers.php:89
++#: purchasing/manage/suppliers.php:91
  msgid "Basic Data"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:93
- #: ../purchasing/manage/suppliers.php.orig:94
 -#: purchasing/manage/suppliers.php:91
++#: purchasing/manage/suppliers.php:93
  msgid "Supplier Name:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:94
- #: ../purchasing/manage/suppliers.php.orig:95
 -#: purchasing/manage/suppliers.php:92
++#: purchasing/manage/suppliers.php:94
  msgid "Supplier Short Name:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:97
- #: ../purchasing/manage/suppliers.php.orig:98
 -#: purchasing/manage/suppliers.php:95
++#: purchasing/manage/suppliers.php:97
  msgid "Website:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:108
- #: ../purchasing/manage/suppliers.php.orig:109
 -#: purchasing/manage/suppliers.php:106
++#: purchasing/manage/suppliers.php:108
  msgid "Our Customer No:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:110
- #: ../purchasing/manage/suppliers.php.orig:120
 -#: purchasing/manage/suppliers.php:108
++#: purchasing/manage/suppliers.php:110
  msgid "Purchasing"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:111
- #: ../purchasing/manage/suppliers.php.orig:121
 -#: purchasing/manage/suppliers.php:109
++#: purchasing/manage/suppliers.php:111
  msgid "Bank Name/Account:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:112
- #: ../purchasing/manage/suppliers.php.orig:122
- #: ../sales/manage/customers.php:264
- #: ../sales/manage/sav.customers.php:263
 -#: purchasing/manage/suppliers.php:110 sales/manage/customers.php:264
++#: purchasing/manage/suppliers.php:112 sales/manage/customers.php:264
  msgid "Credit Limit:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:113
- #: ../purchasing/manage/suppliers.php.orig:123
- #: ../sales/manage/customers.php:266
- #: ../sales/manage/sav.customers.php:265
 -#: purchasing/manage/suppliers.php:111 sales/manage/customers.php:266
++#: purchasing/manage/suppliers.php:113 sales/manage/customers.php:266
  msgid "Payment Terms:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:119
- #: ../purchasing/manage/suppliers.php:122
- #: ../purchasing/manage/suppliers.php.orig:129
- #: ../purchasing/manage/suppliers.php.orig:132
 -#: purchasing/manage/suppliers.php:117 purchasing/manage/suppliers.php:120
++#: purchasing/manage/suppliers.php:119 purchasing/manage/suppliers.php:122
  msgid "Prices contain tax included:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:124
- #: ../purchasing/manage/suppliers.php.orig:134
 -#: purchasing/manage/suppliers.php:122 reporting/rep704.php:96
++#: purchasing/manage/suppliers.php:124
 +msgid "Tax Calculation Algorithm:"
 +msgstr ""
 +
- #: ../purchasing/manage/suppliers.php:128
- #: ../purchasing/manage/suppliers.php.orig:138
- #: ../reporting/rep704.php:92
- #: ../reporting/rep704.php:102
- #: ../reporting/rep704.php:110
++#: purchasing/manage/suppliers.php:128 reporting/rep704.php:96
+ #: reporting/rep704.php:106 reporting/rep704.php:114
  msgid "Accounts"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:129
- #: ../purchasing/manage/suppliers.php.orig:139
 -#: purchasing/manage/suppliers.php:123
++#: purchasing/manage/suppliers.php:129
  msgid "Accounts Payable Account:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:130
- #: ../purchasing/manage/suppliers.php.orig:140
 -#: purchasing/manage/suppliers.php:124
++#: purchasing/manage/suppliers.php:130
  msgid "Purchase Account:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:131
- #: ../purchasing/manage/suppliers.php.orig:141
 -#: purchasing/manage/suppliers.php:125
++#: purchasing/manage/suppliers.php:131
  msgid "Use Item Inventory/COGS Account"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:134
- #: ../purchasing/manage/suppliers.php:137
- #: ../purchasing/manage/suppliers.php.orig:112
 -#: purchasing/manage/suppliers.php:128 purchasing/manage/suppliers.php:157
++#: purchasing/manage/suppliers.php:134 purchasing/manage/suppliers.php:137
  msgid "Contact Data"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:140
- #: ../purchasing/manage/suppliers.php.orig:118
 -#: purchasing/manage/suppliers.php:148 sales/manage/customer_branches.php:266
++#: purchasing/manage/suppliers.php:140
 +msgid "System default"
 +msgstr ""
 +
- #: ../purchasing/manage/suppliers.php:157
- #: ../purchasing/manage/suppliers.php.orig:159
- #: ../sales/manage/customer_branches.php:268
++#: purchasing/manage/suppliers.php:157 sales/manage/customer_branches.php:268
  msgid "Addresses"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:158
- #: ../purchasing/manage/suppliers.php.orig:160
- #: ../sales/manage/customer_branches.php:269
 -#: purchasing/manage/suppliers.php:149 reporting/rep205.php:102
 -#: sales/manage/customer_branches.php:267
++#: purchasing/manage/suppliers.php:158 reporting/rep205.php:102
++#: sales/manage/customer_branches.php:269
  msgid "Mailing Address:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:159
- #: ../purchasing/manage/suppliers.php.orig:161
 -#: purchasing/manage/suppliers.php:150
++#: purchasing/manage/suppliers.php:159
  msgid "Physical Address:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:161
- #: ../purchasing/manage/suppliers.php.orig:163
 -#: purchasing/manage/suppliers.php:152
++#: purchasing/manage/suppliers.php:161
  msgid "General"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:162
- #: ../purchasing/manage/suppliers.php.orig:164
- #: ../sales/manage/customer_branches.php:271
- #: ../sales/manage/customers.php:287
- #: ../sales/manage/sav.customers.php:286
 -#: purchasing/manage/suppliers.php:153 sales/manage/customer_branches.php:269
++#: purchasing/manage/suppliers.php:162 sales/manage/customer_branches.php:271
+ #: sales/manage/customers.php:287
  msgid "General Notes:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:164
- #: ../purchasing/manage/suppliers.php.orig:166
 -#: purchasing/manage/suppliers.php:155
++#: purchasing/manage/suppliers.php:164
  msgid "Supplier status:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:170
- #: ../purchasing/manage/suppliers.php.orig:173
 -#: purchasing/manage/suppliers.php:161
 -msgid "System default"
 -msgstr ""
 -
 -#: purchasing/manage/suppliers.php:168
++#: purchasing/manage/suppliers.php:170
  msgid "Update Supplier"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:171
- #: ../purchasing/manage/suppliers.php.orig:174
 -#: purchasing/manage/suppliers.php:169
++#: purchasing/manage/suppliers.php:171
  msgid "Update supplier data"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:172
- #: ../purchasing/manage/suppliers.php.orig:175
 -#: purchasing/manage/suppliers.php:170
++#: purchasing/manage/suppliers.php:172
  msgid "Select this supplier and return to document entry."
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:173
- #: ../purchasing/manage/suppliers.php.orig:176
 -#: purchasing/manage/suppliers.php:171
++#: purchasing/manage/suppliers.php:173
  msgid "Delete Supplier"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:174
- #: ../purchasing/manage/suppliers.php.orig:177
 -#: purchasing/manage/suppliers.php:172
++#: purchasing/manage/suppliers.php:174
  msgid "Delete supplier data if have been never used"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:178
- #: ../purchasing/manage/suppliers.php.orig:181
 -#: purchasing/manage/suppliers.php:176
++#: purchasing/manage/suppliers.php:178
  msgid "Add New Supplier Details"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:197
- #: ../purchasing/manage/suppliers.php.orig:200
 -#: purchasing/manage/suppliers.php:195
++#: purchasing/manage/suppliers.php:197
  msgid "The supplier name must be entered."
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:204
- #: ../purchasing/manage/suppliers.php.orig:207
 -#: purchasing/manage/suppliers.php:202
++#: purchasing/manage/suppliers.php:204
  msgid "The supplier short name must be entered."
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:224
- #: ../purchasing/manage/suppliers.php.orig:227
 -#: purchasing/manage/suppliers.php:222
--msgid "Supplier has been updated."
--msgstr ""
--
- #: ../purchasing/manage/suppliers.php:242
- #: ../purchasing/manage/suppliers.php.orig:245
 -#: purchasing/manage/suppliers.php:240
--msgid "A new supplier has been added."
--msgstr ""
--
- #: ../purchasing/manage/suppliers.php:260
- #: ../purchasing/manage/suppliers.php.orig:263
 -#: purchasing/manage/suppliers.php:258
--msgid ""
--"Cannot delete this supplier because there are transactions that refer to "
--"this supplier."
--msgstr ""
--
- #: ../purchasing/manage/suppliers.php:268
- #: ../purchasing/manage/suppliers.php.orig:271
 -#: purchasing/manage/suppliers.php:266
--msgid ""
--"Cannot delete the supplier record because purchase orders have been created "
--"against this supplier."
--msgstr ""
--
- #: ../purchasing/manage/suppliers.php:289
- #: ../purchasing/manage/suppliers.php.orig:292
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:48
 -#: purchasing/manage/suppliers.php:287
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:48
--msgid "Select a supplier: "
--msgstr ""
--
- #: ../purchasing/manage/suppliers.php:290
- #: ../purchasing/manage/suppliers.php.orig:293
 -#: purchasing/manage/suppliers.php:288
--msgid "New supplier"
--msgstr ""
--
- #: ../purchasing/manage/suppliers.php:309
- #: ../purchasing/manage/suppliers.php.orig:312
- #: ../sales/manage/customer_branches.php:325
- #: ../sales/manage/customers.php:345
- #: ../sales/manage/sav.customers.php:343
 -#: purchasing/manage/suppliers.php:307 sales/manage/customer_branches.php:323
 -#: sales/manage/customers.php:345
--msgid "&Contacts"
--msgstr ""
--
- #: ../purchasing/manage/suppliers.php:311
- #: ../purchasing/manage/suppliers.php.orig:314
 -#: purchasing/manage/suppliers.php:309
--msgid "Purchase &Orders"
--msgstr ""
--
- #: ../purchasing/inquiry/po_search_completed.php:24
- #: ../purchasing/inquiry/po_search_completed.php.orig:25
 -#: purchasing/inquiry/po_search_completed.php:26
++#: purchasing/inquiry/po_search_completed.php:24
  msgid "Search Purchase Orders"
  msgstr ""
  
- #: ../purchasing/inquiry/po_search_completed.php:60
- #: ../purchasing/inquiry/po_search_completed.php.orig:61
- #: ../purchasing/inquiry/po_search.php:62
- #: ../sales/inquiry/sales_deliveries_view.php:103
- #: ../sales/inquiry/sales_orders_view.php:247
 -#: purchasing/inquiry/po_search_completed.php:63
++#: purchasing/inquiry/po_search_completed.php:60
+ #: purchasing/inquiry/po_search.php:62
+ #: sales/inquiry/sales_deliveries_view.php:103
 -#: sales/inquiry/sales_orders_view.php:225
  msgid "#:"
  msgstr ""
  
- #: ../purchasing/inquiry/po_search_completed.php:65
- #: ../purchasing/inquiry/po_search_completed.php.orig:66
 -#: purchasing/inquiry/po_search_completed.php:68
++#: purchasing/inquiry/po_search_completed.php:65
  msgid "into location:"
  msgstr ""
  
- #: ../purchasing/inquiry/po_search_completed.php:125
- #: ../purchasing/inquiry/po_search_completed.php.orig:124
- #: ../purchasing/inquiry/po_search.php:135
- #: ../sales/inquiry/sales_orders_view.php:289
 -#: purchasing/inquiry/po_search_completed.php:126
 -#: purchasing/inquiry/po_search.php:135 reporting/includes/doctext.inc:166
 -#: sales/inquiry/sales_orders_view.php:267
++#: purchasing/inquiry/po_search_completed.php:125
++#: purchasing/inquiry/po_search.php:135 reporting/includes/doctext.inc:188
  msgid "Order Date"
  msgstr ""
  
- #: ../purchasing/inquiry/po_search_completed.php:127
- #: ../purchasing/inquiry/po_search_completed.php.orig:126
- #: ../purchasing/inquiry/po_search.php:137
- #: ../sales/inquiry/sales_orders_view.php:292
 -#: purchasing/inquiry/po_search_completed.php:128
++#: purchasing/inquiry/po_search_completed.php:127
+ #: purchasing/inquiry/po_search.php:137
 -#: sales/inquiry/sales_orders_view.php:270
  msgid "Order Total"
  msgstr ""
  
@@@ -11656,100 -10027,73 +9619,70 @@@ msgstr "
  msgid "Supplier Allocation Inquiry"
  msgstr ""
  
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:55
- #: ../sales/inquiry/customer_allocation_inquiry.php:49
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:55
 -#: sales/inquiry/customer_allocation_inquiry.php:49
 -msgid "show settled:"
++#: purchasing/inquiry/supplier_allocation_inquiry.php:48
++msgid "Select a supplier: "
+ msgstr ""
+ 
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:103
 -msgid "Pay"
++#: purchasing/inquiry/supplier_allocation_inquiry.php:55
++#: sales/inquiry/customer_allocation_inquiry.php:49
 +msgid "show settled:"
  msgstr ""
  
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:129
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:130
++#: purchasing/inquiry/supplier_allocation_inquiry.php:129
  msgid "Supp Reference"
  msgstr ""
  
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:135
- #: ../reporting/rep101.php:131
- #: ../reporting/rep201.php:119
- #: ../reporting/includes/doctext.inc:247
- #: ../sales/inquiry/customer_allocation_inquiry.php:154
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:136
 -#: reporting/rep101.php:133 reporting/rep201.php:121
 -#: reporting/includes/doctext.inc:225
++#: purchasing/inquiry/supplier_allocation_inquiry.php:135
++#: reporting/includes/doctext.inc:247
+ #: sales/inquiry/customer_allocation_inquiry.php:153
  msgid "Allocated"
  msgstr ""
  
- #: ../purchasing/inquiry/supplier_inquiry.php:25
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:25
 -#: purchasing/inquiry/supplier_inquiry.php:27
++#: purchasing/inquiry/supplier_inquiry.php:25
  msgid "Supplier Inquiry"
  msgstr ""
  
- #: ../purchasing/inquiry/supplier_inquiry.php:48
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:48
 -#: purchasing/inquiry/supplier_inquiry.php:51
++#: purchasing/inquiry/supplier_inquiry.php:48
  msgid "Select a supplier:"
  msgstr ""
  
- #: ../purchasing/inquiry/supplier_inquiry.php:67
- #: ../purchasing/inquiry/supplier_inquiry.php:68
- #: ../purchasing/inquiry/supplier_inquiry.php:69
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:67
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:68
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:69
- #: ../reporting/rep102.php:118
- #: ../reporting/rep102.php:119
- #: ../reporting/rep102.php:120
- #: ../reporting/rep102.php:240
- #: ../reporting/rep108.php:150
- #: ../reporting/rep108.php:151
- #: ../reporting/rep108.php:152
- #: ../reporting/rep202.php:122
- #: ../reporting/rep202.php:123
- #: ../reporting/rep202.php:124
- #: ../reporting/rep202.php:154
- #: ../reporting/rep202.php:155
- #: ../reporting/rep202.php:156
- #: ../reporting/rep202.php:248
- #: ../sales/create_recurrent_invoices.php:132
- #: ../sales/manage/recurrent_invoices.php:102
- #: ../sales/inquiry/customer_inquiry.php:71
- #: ../sales/inquiry/customer_inquiry.php:72
- #: ../sales/inquiry/customer_inquiry.php:73
 -#: purchasing/inquiry/supplier_inquiry.php:70
 -#: purchasing/inquiry/supplier_inquiry.php:71
 -#: purchasing/inquiry/supplier_inquiry.php:72 reporting/rep102.php:120
 -#: reporting/rep102.php:121 reporting/rep102.php:122 reporting/rep102.php:244
 -#: reporting/rep108.php:149 reporting/rep108.php:150 reporting/rep108.php:151
 -#: reporting/rep202.php:124 reporting/rep202.php:125 reporting/rep202.php:126
 -#: reporting/rep202.php:158 reporting/rep202.php:159 reporting/rep202.php:160
 -#: reporting/rep202.php:252 sales/create_recurrent_invoices.php:134
++#: purchasing/inquiry/supplier_inquiry.php:67
++#: purchasing/inquiry/supplier_inquiry.php:68
++#: purchasing/inquiry/supplier_inquiry.php:69 reporting/rep102.php:120
++#: reporting/rep102.php:121 reporting/rep102.php:122 reporting/rep202.php:124
++#: reporting/rep202.php:125 reporting/rep202.php:126 reporting/rep202.php:158
++#: reporting/rep202.php:159 reporting/rep202.php:160 reporting/rep202.php:252
++#: sales/create_recurrent_invoices.php:134
+ #: sales/manage/recurrent_invoices.php:102
 -#: sales/inquiry/customer_inquiry.php:75 sales/inquiry/customer_inquiry.php:76
 -#: sales/inquiry/customer_inquiry.php:77
++#: sales/inquiry/customer_inquiry.php:71 sales/inquiry/customer_inquiry.php:72
++#: sales/inquiry/customer_inquiry.php:73
  msgid "Days"
  msgstr ""
  
- #: ../purchasing/inquiry/supplier_inquiry.php:69
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:69
- #: ../reporting/rep102.php:120
- #: ../reporting/rep108.php:152
- #: ../reporting/rep202.php:124
- #: ../reporting/rep202.php:156
- #: ../sales/inquiry/customer_inquiry.php:73
 -#: purchasing/inquiry/supplier_inquiry.php:72 reporting/rep102.php:122
 -#: reporting/rep108.php:151 reporting/rep202.php:126 reporting/rep202.php:160
 -#: sales/inquiry/customer_inquiry.php:77
++#: purchasing/inquiry/supplier_inquiry.php:69 reporting/rep102.php:122
++#: reporting/rep202.php:126 reporting/rep202.php:160
++#: sales/inquiry/customer_inquiry.php:73
  msgid "Over"
  msgstr ""
  
- #: ../purchasing/inquiry/supplier_inquiry.php:73
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:73
- #: ../sales/inquiry/customer_inquiry.php:76
 -#: purchasing/inquiry/supplier_inquiry.php:76
 -#: sales/inquiry/customer_inquiry.php:80
++#: purchasing/inquiry/supplier_inquiry.php:73
++#: sales/inquiry/customer_inquiry.php:76
  msgid "Terms"
  msgstr ""
  
- #: ../purchasing/inquiry/supplier_inquiry.php:73
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:73
- #: ../reporting/rep102.php:123
- #: ../reporting/rep102.php:238
- #: ../reporting/rep108.php:154
- #: ../reporting/rep202.php:128
- #: ../reporting/rep202.php:246
- #: ../sales/inquiry/customer_inquiry.php:76
 -#: purchasing/inquiry/supplier_inquiry.php:76 reporting/rep102.php:125
 -#: reporting/rep102.php:242 reporting/rep108.php:153 reporting/rep202.php:130
 -#: reporting/rep202.php:250 sales/inquiry/customer_inquiry.php:80
++#: purchasing/inquiry/supplier_inquiry.php:73 reporting/rep102.php:125
++#: reporting/rep202.php:130 reporting/rep202.php:250
++#: sales/inquiry/customer_inquiry.php:76
  msgid "Current"
  msgstr ""
  
- #: ../purchasing/inquiry/supplier_inquiry.php:74
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:74
- #: ../reporting/rep102.php:124
- #: ../reporting/rep108.php:154
- #: ../reporting/rep202.php:129
- #: ../sales/inquiry/customer_inquiry.php:77
 -#: purchasing/inquiry/supplier_inquiry.php:77 reporting/rep102.php:126
 -#: reporting/rep108.php:153 reporting/rep202.php:131
 -#: sales/inquiry/customer_inquiry.php:81
++#: purchasing/inquiry/supplier_inquiry.php:74 reporting/rep102.php:126
++#: reporting/rep202.php:131 sales/inquiry/customer_inquiry.php:77
  msgid "Total Balance"
  msgstr ""
  
- #: ../purchasing/inquiry/supplier_inquiry.php:133
- #: ../purchasing/inquiry/supplier_inquiry.php.orig:130
- #: ../sales/inquiry/customer_inquiry.php:162
+ #: purchasing/inquiry/supplier_inquiry.php:133
 -#: sales/inquiry/customer_inquiry.php:164
++#: sales/inquiry/customer_inquiry.php:162
  msgid "Credit This"
  msgstr ""
  
@@@ -11771,8 -10114,8 +9703,14 @@@ msgstr "
  msgid "Total:"
  msgstr ""
  
- #: ../purchasing/allocations/supplier_allocate.php:64
- #: ../sales/allocations/customer_allocate.php:63
++#: purchasing/allocations/supplier_allocate.php:63
++#: sales/allocations/customer_allocate.php:62
++#: sales/includes/ui/sales_order_ui.inc:244
++msgid "Refresh"
++msgstr ""
++
+ #: purchasing/allocations/supplier_allocate.php:63
+ #: sales/allocations/customer_allocate.php:62
  msgid "Start again allocation of selected amount"
  msgstr ""
  
@@@ -11823,77 -10166,50 +9761,9 @@@ msgstr "
  msgid "Marked items are settled."
  msgstr ""
  
- #: ../reporting/rep101.php:120
- #: ../reporting/rep102.php:106
- #: ../reporting/rep114.php:103
- #: ../reporting/rep202.php:110
- #: ../reporting/rep203.php:81
 -#: reporting/rep101.php:122 reporting/rep102.php:108 reporting/rep114.php:108
 -#: reporting/rep202.php:112 reporting/rep203.php:83
--msgid "Balances in Home Currency"
--msgstr ""
--
- #: ../reporting/rep101.php:130
- #: ../reporting/rep201.php:118
- #: ../reporting/rep203.php:91
- #: ../reporting/rep709.php:109
- #: ../reporting/includes/doctext.inc:167
- #: ../reporting/includes/doctext.inc:208
- #: ../reporting/includes/doctext.inc:246
 -#: reporting/rep101.php:132 reporting/rep201.php:120 reporting/rep203.php:93
 -#: reporting/rep709.php:111 reporting/includes/doctext.inc:145
 -#: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:224
--msgid "Trans Type"
--msgstr ""
--
- #: ../reporting/rep101.php:130
- #: ../reporting/rep201.php:118
- #: ../reporting/includes/doctext.inc:246
 -#: reporting/rep101.php:132 reporting/rep201.php:120
 -#: reporting/includes/doctext.inc:224
--msgid "Charges"
--msgstr ""
--
- #: ../reporting/rep101.php:130
- #: ../reporting/rep201.php:119
- #: ../reporting/includes/doctext.inc:247
 -#: reporting/rep101.php:132 reporting/rep201.php:121
 -#: reporting/includes/doctext.inc:225
--msgid "Credits"
--msgstr ""
--
- #: ../reporting/rep101.php:139
- #: ../reporting/rep102.php:134
- #: ../reporting/rep201.php:127
- #: ../reporting/rep202.php:139
- #: ../reporting/rep203.php:100
- #: ../reporting/rep303.php:124
- #: ../reporting/reports_main.php:38
- #: ../reporting/reports_main.php:47
- #: ../reporting/reports_main.php:138
- #: ../reporting/reports_main.php:147
- #: ../reporting/reports_main.php:155
- #: ../reporting/reports_main.php:195
 -#: reporting/rep101.php:141 reporting/rep102.php:136 reporting/rep201.php:129
 -#: reporting/rep202.php:141 reporting/rep203.php:102 reporting/rep303.php:126
 -#: reporting/reports_main.php:38 reporting/reports_main.php:48
 -#: reporting/reports_main.php:152 reporting/reports_main.php:162
 -#: reporting/reports_main.php:171 reporting/reports_main.php:224
--msgid "Suppress Zeros"
--msgstr ""
--
- #: ../reporting/rep101.php:141
 -#: reporting/rep101.php:143
--msgid "Customer Balances"
--msgstr ""
--
- #: ../reporting/rep101.php:244
- #: ../reporting/rep102.php:224
- #: ../reporting/rep106.php:167
- #: ../reporting/rep201.php:231
- #: ../reporting/rep202.php:231
- #: ../reporting/rep203.php:177
- #: ../reporting/rep204.php:144
- #: ../reporting/rep301.php:176
- #: ../reporting/rep304.php:191
- #: ../reporting/rep305.php:183
 -#: reporting/rep101.php:248 reporting/rep102.php:228 reporting/rep106.php:171
 -#: reporting/rep201.php:235 reporting/rep202.php:235 reporting/rep203.php:181
 -#: reporting/rep204.php:148 reporting/rep301.php:179 reporting/rep304.php:195
 -#: reporting/rep305.php:187 reporting/rep306.php:294
--msgid "Grand Total"
--msgstr ""
--
- #: ../reporting/rep102.php:100
- #: ../reporting/rep106.php:91
- #: ../reporting/rep202.php:104
- #: ../reporting/rep709.php:93
- #: ../reporting/reports_main.php:46
- #: ../reporting/reports_main.php:84
- #: ../reporting/reports_main.php:146
- #: ../reporting/reports_main.php:181
- #: ../reporting/reports_main.php:393
+ #: reporting/rep102.php:102 reporting/rep106.php:93 reporting/rep202.php:106
 -#: reporting/rep709.php:95 reporting/reports_main.php:47
 -#: reporting/reports_main.php:90 reporting/reports_main.php:161
 -#: reporting/reports_main.php:208 reporting/reports_main.php:465
++#: reporting/rep709.php:95 reporting/reports_main.php:48
++#: reporting/reports_main.php:91
  msgid "Summary Only"
  msgstr ""
  
@@@ -11903,132 -10217,120 +9771,37 @@@
  msgid "Detailed Report"
  msgstr ""
  
- #: ../reporting/rep102.php:129
- #: ../reporting/rep202.php:134
- #: ../reporting/rep203.php:97
- #: ../reporting/rep301.php:108
- #: ../reporting/reports_main.php:35
- #: ../reporting/reports_main.php:42
- #: ../reporting/reports_main.php:61
- #: ../reporting/reports_main.php:75
- #: ../reporting/reports_main.php:83
- #: ../reporting/reports_main.php:135
- #: ../reporting/reports_main.php:142
- #: ../reporting/reports_main.php:152
- #: ../reporting/reports_main.php:178
- #: ../reporting/reports_main.php:200
- #: ../reporting/reports_main.php:208
- #: ../reporting/reports_main.php:240
- #: ../reporting/reports_main.php:251
- #: ../reporting/reports_main.php:262
- #: ../reporting/reports_main.php:278
- #: ../reporting/reports_main.php:288
- #: ../reporting/reports_main.php:299
- #: ../reporting/reports_main.php:311
- #: ../reporting/reports_main.php:325
- #: ../reporting/reports_main.php:334
- #: ../reporting/reports_main.php:344
- #: ../reporting/reports_main.php:355
- #: ../reporting/reports_main.php:367
- #: ../reporting/reports_main.php:375
- #: ../reporting/reports_main.php:384
- #: ../reporting/reports_main.php:392
- #: ../reporting/reports_main.php:398
- msgid "End Date"
- msgstr ""
- 
- #: ../reporting/rep102.php:133
- #: ../reporting/rep202.php:138
- #: ../reporting/reports_main.php:45
- #: ../reporting/reports_main.php:110
- #: ../reporting/reports_main.php:145
- msgid "Show Also Allocated"
- msgstr ""
- 
- #: ../reporting/rep102.php:138
- msgid "Aged Customer Analysis"
- msgstr ""
- 
- #: ../reporting/rep103.php:115
- msgid "All Areas"
- msgstr ""
- 
- #: ../reporting/rep103.php:119
- msgid "All Sales Folk"
- msgstr ""
- 
- #: ../reporting/rep103.php:123
- msgid "Greater than "
- msgstr ""
- 
- #: ../reporting/rep103.php:127
- msgid "Less than "
- msgstr ""
- 
- #: ../reporting/rep103.php:136
- msgid "Customer Postal Address"
- msgstr ""
- 
- #: ../reporting/rep103.php:136
- msgid "Price/Turnover"
- msgstr ""
- 
- #: ../reporting/rep103.php:136
- msgid "Branch Contact Information"
- msgstr ""
- 
- #: ../reporting/rep103.php:137
- msgid "Branch Delivery Address"
- msgstr ""
- 
- #: ../reporting/rep103.php:142
- #: ../reporting/reports_main.php:52
- msgid "Activity Since"
- msgstr ""
- 
- #: ../reporting/rep103.php:143
- #: ../reporting/reports_main.php:53
- #: ../sales/manage/sales_areas.php:16
- msgid "Sales Areas"
- msgstr ""
- 
- #: ../reporting/rep103.php:144
- #: ../reporting/reports_main.php:54
- msgid "Sales Folk"
- msgstr ""
- 
- #: ../reporting/rep103.php:145
- msgid "Activity"
- msgstr ""
- 
- #: ../reporting/rep103.php:147
- msgid "Customer Details Listing"
++#: reporting/rep102.php:108 reporting/rep202.php:112 reporting/rep203.php:83
++msgid "Balances in Home Currency"
 +msgstr ""
 +
- #: ../reporting/rep103.php:175
- msgid "Customers in"
+ #: reporting/rep102.php:131 reporting/rep202.php:136 reporting/rep203.php:99
+ #: reporting/rep301.php:110 reporting/reports_main.php:35
 -#: reporting/reports_main.php:43 reporting/reports_main.php:64
 -#: reporting/reports_main.php:80 reporting/reports_main.php:89
 -#: reporting/reports_main.php:149 reporting/reports_main.php:157
 -#: reporting/reports_main.php:168 reporting/reports_main.php:205
 -#: reporting/reports_main.php:230 reporting/reports_main.php:238
 -#: reporting/reports_main.php:247 reporting/reports_main.php:253
 -#: reporting/reports_main.php:293 reporting/reports_main.php:307
 -#: reporting/reports_main.php:319 reporting/reports_main.php:337
 -#: reporting/reports_main.php:348 reporting/reports_main.php:360
 -#: reporting/reports_main.php:373 reporting/reports_main.php:389
 -#: reporting/reports_main.php:399 reporting/reports_main.php:410
 -#: reporting/reports_main.php:422 reporting/reports_main.php:436
 -#: reporting/reports_main.php:445 reporting/reports_main.php:455
 -#: reporting/reports_main.php:464 reporting/reports_main.php:471
++#: reporting/reports_main.php:44 reporting/reports_main.php:65
++#: reporting/reports_main.php:81 reporting/reports_main.php:90
+ msgid "End Date"
  msgstr ""
  
- #: ../reporting/rep103.php:196
- msgid "Price List"
+ #: reporting/rep102.php:135 reporting/rep202.php:140
 -#: reporting/reports_main.php:46 reporting/reports_main.php:120
 -#: reporting/reports_main.php:160
++#: reporting/reports_main.php:47
+ msgid "Show Also Allocated"
  msgstr ""
  
- #: ../reporting/rep103.php:207
 -#: reporting/rep102.php:140
 -msgid "Aged Customer Analysis"
 -msgstr ""
 -
 -#: reporting/rep103.php:134
 -msgid "All Areas"
 -msgstr ""
 -
 -#: reporting/rep103.php:138
 -msgid "All Sales Folk"
 -msgstr ""
 -
 -#: reporting/rep103.php:142 reporting/rep205.php:89
 -msgid "Greater than "
 -msgstr ""
 -
 -#: reporting/rep103.php:146 reporting/rep205.php:93
 -msgid "Less than "
 -msgstr ""
 -
 -#: reporting/rep103.php:155
 -msgid "Customer Postal Address"
 -msgstr ""
 -
 -#: reporting/rep103.php:155
 -msgid "Price/Turnover"
 -msgstr ""
 -
 -#: reporting/rep103.php:155
 -msgid "Branch Contact Information"
 -msgstr ""
 -
 -#: reporting/rep103.php:156
 -msgid "Branch Delivery Address"
 -msgstr ""
 -
 -#: reporting/rep103.php:161 reporting/rep205.php:108
 -#: reporting/reports_main.php:54 reporting/reports_main.php:181
 -msgid "Activity Since"
 -msgstr ""
 -
 -#: reporting/rep103.php:162 reporting/reports_main.php:55
 -#: sales/manage/sales_areas.php:16
 -msgid "Sales Areas"
 -msgstr ""
 -
 -#: reporting/rep103.php:163 reporting/reports_main.php:56
 -msgid "Sales Folk"
 -msgstr ""
 -
 -#: reporting/rep103.php:164 reporting/rep205.php:109
 -msgid "Activity"
 -msgstr ""
 -
 -#: reporting/rep103.php:166
 -msgid "Customer Details Listing"
 -msgstr ""
 -
 -#: reporting/rep103.php:197
 -msgid "Customers in"
 -msgstr ""
 -
 -#: reporting/rep103.php:218
 -msgid "Price List"
 -msgstr ""
 -
 -#: reporting/rep103.php:246 reporting/rep205.php:164
 -msgid "Ph"
 -msgstr ""
 -
 -#: reporting/rep103.php:261 reporting/rep205.php:179
 -msgid "Gereral Notes:"
 -msgstr ""
 -
 -#: reporting/rep103.php:270 reporting/rep205.php:102 reporting/rep205.php:188
--msgid "Turnover"
++#: reporting/rep102.php:136 reporting/rep202.php:141 reporting/rep203.php:102
++#: reporting/reports_main.php:39 reporting/reports_main.php:49
++msgid "Suppress Zeros"
  msgstr ""
  
- #: ../reporting/rep103.php:216
- msgid "Ph"
 -#: reporting/rep103.php:277 reporting/rep106.php:88 reporting/rep205.php:195
 -#: reporting/includes/header2.inc:110 sales/manage/sales_people.php:99
 -msgid "Email"
++#: reporting/rep102.php:140
++msgid "Aged Customer Analysis"
  msgstr ""
  
- #: ../reporting/rep104.php:109
+ #: reporting/rep104.php:111
  msgid "Category/Items"
  msgstr ""
  
- #: ../reporting/rep104.php:109
- #: ../reporting/rep301.php:103
- #: ../reporting/rep303.php:109
- #: ../reporting/rep303.php:115
 -#: reporting/rep104.php:111 reporting/rep301.php:105 reporting/rep303.php:111
 -#: reporting/rep303.php:117 reporting/rep307.php:117
++#: reporting/rep104.php:111 reporting/rep301.php:105 reporting/rep307.php:117
++#: reporting/rep308.php:149
  msgid "UOM"
  msgstr ""
  
@@@ -12036,8 -10338,7 +9809,7 @@@
  msgid "GP %"
  msgstr ""
  
- #: ../reporting/rep104.php:117
- #: ../reporting/reports_main.php:70
 -#: reporting/rep104.php:119 reporting/reports_main.php:74
++#: reporting/rep104.php:119 reporting/reports_main.php:75
  msgid "Show GP %"
  msgstr ""
  
@@@ -12053,35 -10354,25 +9825,23 @@@ msgstr "
  msgid "All Orders"
  msgstr ""
  
- #: ../reporting/rep105.php:103
- #: ../reporting/reports_main.php:78
 -#: reporting/rep105.php:105 reporting/reports_main.php:83
++#: reporting/rep105.php:105 reporting/reports_main.php:84
  msgid "Back Orders Only"
  msgstr ""
  
- #: ../reporting/rep105.php:107
- #: ../reporting/rep204.php:82
- #: ../sales/inquiry/customer_allocation_inquiry.php:147
- #: ../sales/inquiry/customer_inquiry.php:202
+ #: reporting/rep105.php:109 reporting/rep204.php:84
+ #: sales/inquiry/customer_allocation_inquiry.php:146
 -#: sales/inquiry/customer_inquiry.php:226
++#: sales/inquiry/customer_inquiry.php:202
  msgid "Order"
  msgstr ""
  
- #: ../reporting/rep105.php:107
- #: ../reporting/rep106.php:81
- #: ../reporting/rep112.php:164
- #: ../sales/create_recurrent_invoices.php:132
- #: ../sales/customer_credit_invoice.php:236
- #: ../sales/customer_delivery.php.orig:352
- #: ../sales/customer_invoice.php:447
- #: ../sales/manage/customers.php:251
- #: ../sales/manage/customers.php:290
- #: ../sales/manage/recurrent_invoices.php:102
- #: ../sales/manage/sav.customers.php:251
- #: ../sales/manage/sav.customers.php:289
- #: ../sales/view/view_credit.php:58
- #: ../sales/inquiry/customer_inquiry.php:207
- #: ../sales/inquiry/sales_deliveries_view.php:182
- #: ../sales/inquiry/sales_orders_view.php:287
- #: ../sales/inquiry/sales_orders_view.php:301
 -#: reporting/rep105.php:109 reporting/rep106.php:83 reporting/rep112.php:179
++#: reporting/rep105.php:109 reporting/rep106.php:83
+ #: sales/create_recurrent_invoices.php:134
 -#: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:339
 -#: sales/customer_invoice.php:381 sales/manage/customers.php:251
++#: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:353
++#: sales/customer_invoice.php:447 sales/manage/customers.php:251
+ #: sales/manage/customers.php:290 sales/manage/recurrent_invoices.php:102
 -#: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:231
++#: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:207
+ #: sales/inquiry/sales_deliveries_view.php:182
 -#: sales/inquiry/sales_orders_view.php:265
 -#: sales/inquiry/sales_orders_view.php:279
  msgid "Branch"
  msgstr ""
  
@@@ -12103,9 -10392,8 +9861,8 @@@ msgstr "
  msgid "Loc"
  msgstr ""
  
- #: ../reporting/rep105.php:112
- #: ../sales/customer_delivery.php.orig:445
- #: ../sales/customer_invoice.php:544
 -#: reporting/rep105.php:114 sales/customer_delivery.php:432
 -#: sales/customer_invoice.php:469
++#: reporting/rep105.php:114 sales/customer_delivery.php:446
++#: sales/customer_invoice.php:544
  msgid "Invoiced"
  msgstr ""
  
@@@ -12117,7 -10405,7 +9874,11 @@@ msgstr "
  msgid "Order Status Listing"
  msgstr ""
  
- #: ../reporting/rep106.php:82
++#: reporting/rep106.php:83 sales/inquiry/sales_deliveries_view.php:166
++msgid "Invoice"
++msgstr ""
++
+ #: reporting/rep106.php:84
  msgid "Inv Date"
  msgstr ""
  
@@@ -12134,14 -10419,7 +9892,12 @@@ msgstr "
  msgid "Salesman"
  msgstr ""
  
- #: ../reporting/rep106.php:86
- #: ../reporting/includes/header2.inc:110
- #: ../sales/manage/sales_people.php:99
++#: reporting/rep106.php:88 reporting/rep205.php:195
++#: reporting/includes/header2.inc:110 sales/manage/sales_people.php:99
 +msgid "Email"
 +msgstr ""
 +
- #: ../reporting/rep106.php:87
- #: ../sales/manage/sales_people.php:99
+ #: reporting/rep106.php:89 sales/manage/sales_people.php:99
  msgid "Break Pt."
  msgstr ""
  
@@@ -12149,160 -10427,117 +9905,55 @@@
  msgid "Salesman Listing"
  msgstr ""
  
- #: ../reporting/rep107.php:85
- #: ../reporting/rep107.php:105
- #: ../reporting/includes/doctext.inc:118
 -#: reporting/rep107.php:67 reporting/rep107.php:84
 -#: reporting/includes/doctext.inc:105
--msgid "INVOICE"
- msgstr ""
- 
- #: ../reporting/rep107.php:186
- msgid "Prepayments invoiced to this order up to day:"
- msgstr ""
- 
- #: ../reporting/rep107.php:193
- msgid "Invoice reference"
- msgstr ""
- 
- #: ../reporting/rep107.php:210
- msgid "Total payments:"
--msgstr ""
--
- #: ../reporting/rep107.php:220
- #: ../reporting/rep109.php:155
- #: ../reporting/rep110.php:164
- #: ../reporting/rep111.php:140
- #: ../reporting/rep113.php:150
- #: ../sales/view/view_credit.php:138
- #: ../sales/view/view_dispatch.php:155
- #: ../sales/view/view_invoice.php:159
- #: ../sales/view/view_sales_order.php:245
- #: ../sales/view/view_sales_order.php.orig:227
- #: ../sales/includes/ui/sales_credit_ui.inc:222
 -#: reporting/rep107.php:148 reporting/rep109.php:152 reporting/rep110.php:162
 -#: reporting/rep111.php:137 reporting/rep113.php:147
 -#: sales/view/view_credit.php:138 sales/view/view_dispatch.php:155
 -#: sales/view/view_invoice.php:157 sales/view/view_sales_order.php:227
 -#: sales/includes/ui/sales_credit_ui.inc:222
--msgid "Shipping"
- msgstr ""
- 
- #: ../reporting/rep107.php:266
- #: ../reporting/rep109.php:207
- #: ../reporting/rep111.php:192
- msgid "TOTAL ORDER VAT INCL."
- msgstr ""
- 
- #: ../reporting/rep107.php:272
- msgid "THIS INVOICE"
++#: reporting/rep106.php:171 reporting/rep202.php:235 reporting/rep203.php:181
++#: reporting/rep204.php:148 reporting/rep301.php:179 reporting/rep304.php:195
++#: reporting/rep305.php:187 reporting/rep306.php:294 reporting/rep309.php:158
++msgid "Grand Total"
  msgstr ""
  
- #: ../reporting/rep108.php:84
- #: ../reporting/rep108.php:115
- #: ../reporting/includes/doctext.inc:238
 -#: reporting/rep108.php:85 reporting/rep108.php:110
 -#: reporting/includes/doctext.inc:216
++#: reporting/rep108.php:85 reporting/includes/doctext.inc:238
  msgid "STATEMENT"
  msgstr ""
  
- #: ../reporting/rep108.php:126
 -#: reporting/rep108.php:125
--msgid "Outstanding Transactions"
--msgstr ""
--
- #: ../reporting/rep108.php:169
 -#: reporting/rep108.php:168
--msgid "Statement"
--msgstr ""
--
- #: ../reporting/rep108.php:169
 -#: reporting/rep108.php:168
--msgid "as of"
--msgstr ""
--
- #: ../reporting/rep109.php:66
- #: ../reporting/rep109.php:94
- #: ../reporting/rep109.php:100
- #: ../reporting/includes/doctext.inc:65
 -#: reporting/rep109.php:65 reporting/rep109.php:88 reporting/rep109.php:93
 -#: reporting/includes/doctext.inc:53
++#: reporting/rep109.php:66 reporting/includes/doctext.inc:65
  msgid "SALES ORDER"
  msgstr ""
  
- #: ../reporting/rep109.php:68
- #: ../reporting/rep109.php:89
- #: ../reporting/rep109.php:100
- #: ../reporting/includes/doctext.inc:65
 -#: reporting/rep109.php:67 reporting/rep109.php:83 reporting/rep109.php:93
 -#: reporting/includes/doctext.inc:53
++#: reporting/rep109.php:68 reporting/includes/doctext.inc:65
  msgid "QUOTE"
  msgstr ""
  
- #: ../reporting/rep109.php:161
- #: ../reporting/rep111.php:146
 -#: reporting/rep109.php:158 reporting/rep111.php:143
--msgid "TOTAL ORDER EX VAT"
--msgstr ""
--
- #: ../reporting/rep110.php:68
 -#: reporting/rep109.php:204 reporting/rep111.php:189
 -msgid "TOTAL ORDER VAT INCL."
 -msgstr ""
 -
+ #: reporting/rep110.php:70
  msgid "DELIVERY"
  msgstr ""
  
- #: ../reporting/rep110.php:70
- #: ../reporting/rep110.php:97
- #: ../reporting/includes/doctext.inc:82
+ #: reporting/rep110.php:72 reporting/rep110.php:93
 -#: reporting/includes/doctext.inc:70
++#: reporting/includes/doctext.inc:82
  msgid "PACKING SLIP"
  msgstr ""
  
- #: ../reporting/rep110.php:92
- #: ../reporting/rep110.php:103
- #: ../reporting/includes/doctext.inc:82
 -#: reporting/rep110.php:88 reporting/includes/doctext.inc:70
++#: reporting/rep110.php:88 reporting/includes/doctext.inc:82
  msgid "DELIVERY NOTE"
  msgstr ""
  
- #: ../reporting/rep110.php:208
 -#: reporting/rep110.php:206
--msgid "TOTAL DELIVERY INCL. VAT"
--msgstr ""
--
- #: ../reporting/rep111.php:61
- #: ../reporting/rep111.php:86
- #: ../reporting/includes/doctext.inc:50
 -#: reporting/rep111.php:60 reporting/includes/doctext.inc:38
++#: reporting/rep111.php:60 reporting/includes/doctext.inc:50
  msgid "SALES QUOTATION"
  msgstr ""
  
- #: ../reporting/rep112.php:80
- #: ../reporting/rep112.php:101
- #: ../reporting/includes/doctext.inc:198
 -#: reporting/rep112.php:94 reporting/includes/doctext.inc:176
++#: reporting/rep112.php:82 reporting/includes/doctext.inc:198
  msgid "RECEIPT"
  msgstr ""
  
- #: ../reporting/rep112.php:110
- #: ../reporting/rep210.php:124
 -#: reporting/rep112.php:125 reporting/rep210.php:133
--msgid "As advance / full / part / payment towards:"
--msgstr ""
--
- #: ../reporting/rep112.php:145
 -#: reporting/rep112.php:160
--msgid "TOTAL RECEIPT"
--msgstr ""
--
- #: ../reporting/rep112.php:155
 -#: reporting/rep112.php:170
--msgid "Received / Sign"
--msgstr ""
--
- #: ../reporting/rep112.php:157
 -#: reporting/rep112.php:172
--msgid "By Cash / Cheque* / Draft No."
--msgstr ""
--
- #: ../reporting/rep112.php:159
 -#: reporting/rep112.php:174
--msgid "Dated"
--msgstr ""
--
- #: ../reporting/rep112.php:162
 -#: reporting/rep112.php:177
--msgid "Drawn on Bank"
--msgstr ""
--
- #: ../reporting/rep113.php:66
- #: ../reporting/rep113.php:91
- #: ../reporting/rep113.php:96
- #: ../reporting/includes/doctext.inc:103
+ #: reporting/rep113.php:67 reporting/rep113.php:86
 -#: reporting/includes/doctext.inc:91
++#: reporting/includes/doctext.inc:103
  msgid "CREDIT NOTE"
  msgstr ""
  
- #: ../reporting/rep113.php:194
- #: ../sales/view/view_credit.php:143
 -#: reporting/rep113.php:191 sales/view/view_credit.php:143
--msgid "TOTAL CREDIT"
--msgstr ""
--
- #: ../reporting/rep114.php:85
+ #: reporting/rep114.php:87
  msgid "Sales Summary Report"
  msgstr ""
  
- #: ../reporting/rep114.php:89
- #: ../reporting/reports_main.php:62
 -#: reporting/rep114.php:91 reporting/reports_main.php:65
++#: reporting/rep114.php:91 reporting/reports_main.php:66
  msgid "Tax Id Only"
  msgstr ""
  
@@@ -12314,23 -10549,19 +9965,11 @@@ msgstr "
  msgid "Total ex. Tax"
  msgstr ""
  
- #: ../reporting/rep114.php:93
- #: ../reporting/rep709.php:110
- #: ../taxes/tax_groups.php:171
- #: ../taxes/tax_groups.php.orig:173
- #: ../taxes/tax_groups.php.sav:173
 -#: reporting/rep114.php:95 reporting/rep709.php:112 taxes/tax_groups.php:177
++#: reporting/rep114.php:95 reporting/rep709.php:112 taxes/tax_groups.php:171
  msgid "Tax"
  msgstr ""
  
- #: ../reporting/rep201.php:108
 -#: reporting/rep201.php:110
--msgid "Balances in Home currency"
--msgstr ""
--
- #: ../reporting/rep201.php:129
 -#: reporting/rep201.php:131
--msgid "Supplier Balances"
--msgstr ""
--
- #: ../reporting/rep202.php:142
+ #: reporting/rep202.php:144
  msgid "currency"
  msgstr ""
  
@@@ -12338,7 -10569,7 +9977,13 @@@
  msgid "Aged Supplier Analysis"
  msgstr ""
  
- #: ../reporting/rep203.php:102
++#: reporting/rep203.php:93 reporting/rep709.php:111
++#: reporting/includes/doctext.inc:167 reporting/includes/doctext.inc:208
++#: reporting/includes/doctext.inc:246
++msgid "Trans Type"
++msgstr ""
++
+ #: reporting/rep203.php:104
  msgid "Payment Report"
  msgstr ""
  
@@@ -12350,652 -10581,649 +9995,423 @@@ msgstr "
  msgid "qty Inv"
  msgstr ""
  
- #: ../reporting/rep204.php:83
- msgid "Act Price"
- msgstr ""
- 
- #: ../reporting/rep204.php:90
- msgid "Outstanding GRNs Report"
- msgstr ""
- 
- #: ../reporting/rep209.php:88
- #: ../reporting/rep209.php:107
- #: ../reporting/rep209.php:112
- #: ../reporting/includes/doctext.inc:171
- msgid "PURCHASE ORDER"
- msgstr ""
- 
- #: ../reporting/rep209.php:214
- msgid "TOTAL PO"
- msgstr ""
- 
- #: ../reporting/rep210.php:82
- #: ../reporting/rep210.php:110
- #: ../reporting/rep210.php:115
- #: ../reporting/includes/doctext.inc:151
- msgid "REMITTANCE"
- msgstr ""
- 
- #: ../reporting/rep210.php:159
- msgid "TOTAL REMITTANCE"
- msgstr ""
- 
- #: ../reporting/rep301.php:112
- msgid "Inventory Valuation Report"
- msgstr ""
- 
- #: ../reporting/rep302.php:123
- msgid "QOH"
- msgstr ""
- 
- #: ../reporting/rep302.php:123
- msgid "Cust Ord"
- msgstr ""
- 
- #: ../reporting/rep302.php:123
- msgid "Supp Ord"
- msgstr ""
- 
- #: ../reporting/rep302.php:123
- msgid "Sugg Ord"
- msgstr ""
- 
- #: ../reporting/rep302.php:132
- msgid "Inventory Planning Report"
- msgstr ""
- 
- #: ../reporting/rep303.php:97
- msgid "Shortage"
- msgstr ""
- 
- #: ../reporting/rep303.php:109
- #: ../reporting/rep303.php:115
- #: ../reporting/rep305.php:98
- msgid "Stock ID"
- msgstr ""
- 
- #: ../reporting/rep303.php:109
- msgid "Check"
- msgstr ""
- 
- #: ../reporting/rep303.php:123
- msgid "Only Shortage"
- msgstr ""
- 
- #: ../reporting/rep303.php:131
- msgid "Stock Check Sheets"
- msgstr ""
- 
- #: ../reporting/rep304.php:112
- #: ../reporting/rep305.php:98
- msgid "Qty"
- msgstr ""
- 
- #: ../reporting/rep304.php:112
- #: ../sales/manage/customer_branches.php:241
- #: ../sales/manage/customers.php:260
- #: ../sales/manage/sav.customers.php:259
- msgid "Sales"
- msgstr ""
- 
- #: ../reporting/rep304.php:112
- msgid "Cost"
- msgstr ""
- 
- #: ../reporting/rep304.php:112
- msgid "Contribution"
- msgstr ""
- 
- #: ../reporting/rep304.php:124
- msgid "Inventory Sales Report"
- msgstr ""
- 
- #: ../reporting/rep305.php:98
- msgid "PO No"
- msgstr ""
- 
- #: ../reporting/rep305.php:98
- msgid "Inv"
- msgstr ""
- 
- #: ../reporting/rep305.php:98
- msgid "Inv Price"
- msgstr ""
- 
- #: ../reporting/rep305.php:98
- msgid "PO Price"
- msgstr ""
- 
- #: ../reporting/rep305.php:105
- msgid "GRN Valuation Report"
- msgstr ""
- 
- #: ../reporting/rep401.php:69
- msgid "Wrk Ctr"
- msgstr ""
- 
- #: ../reporting/rep401.php:76
- msgid "Bill of Material Listing"
- msgstr ""
- 
- #: ../reporting/rep409.php:58
- #: ../reporting/rep409.php:77
- #: ../reporting/rep409.php:82
- #: ../reporting/includes/doctext.inc:214
- msgid "WORK ORDER"
+ #: reporting/rep204.php:85
+ msgid "Act Price"
  msgstr ""
  
- #: ../reporting/rep409.php:132
- msgid "Insufficient stock"
+ #: reporting/rep204.php:92
+ msgid "Outstanding GRNs Report"
  msgstr ""
  
- #: ../reporting/rep501.php:85
- msgid "YTD"
++#: reporting/rep205.php:89
++msgid "Greater than "
 +msgstr ""
 +
- #: ../reporting/rep501.php:92
- msgid "Dimension Summary"
++#: reporting/rep205.php:93
++msgid "Less than "
 +msgstr ""
 +
- #: ../reporting/rep601.php:83
- #: ../reporting/rep602.php:87
- #: ../reporting/includes/doctext.inc:260
- msgid "Bank Account"
++#: reporting/rep205.php:102 reporting/rep205.php:188
++msgid "Turnover"
 +msgstr ""
 +
- #: ../reporting/rep601.php:144
- #: ../reporting/rep602.php:151
- msgid "Total Debit / Credit"
+ #: reporting/rep205.php:102
+ msgid "Contact Information"
  msgstr ""
  
- #: ../reporting/rep601.php:161
- #: ../reporting/rep602.php:167
- msgid "Net Change"
+ #: reporting/rep205.php:103
+ msgid "Physical Address"
  msgstr ""
  
- #: ../reporting/rep602.php:73
- msgid "Bank Statement w/Reconcile"
++#: reporting/rep205.php:108 reporting/reports_main.php:55
++msgid "Activity Since"
 +msgstr ""
 +
- #: ../reporting/rep602.php:81
- msgid "Reco Date"
++#: reporting/rep205.php:109
++msgid "Activity"
 +msgstr ""
 +
- #: ../reporting/rep602.php:81
- msgid "Narration"
+ #: reporting/rep205.php:111
+ msgid "Supplier Details Listing"
  msgstr ""
  
- #: ../reporting/rep602.php:195
- msgid "Bank Balance"
+ #: reporting/rep205.php:139
+ msgid "Tax_Id"
  msgstr ""
  
- #: ../reporting/rep702.php:51
- msgid "Type/Account"
++#: reporting/rep205.php:164
++msgid "Ph"
 +msgstr ""
 +
- #: ../reporting/rep702.php:51
- msgid "Date/Dim."
++#: reporting/rep205.php:179
++msgid "Gereral Notes:"
 +msgstr ""
 +
- #: ../reporting/rep702.php:52
- msgid "Person/Item/Memo"
+ #: reporting/rep209.php:87 reporting/rep209.php:100
 -#: reporting/includes/doctext.inc:149
++#: reporting/includes/doctext.inc:171
+ msgid "PURCHASE ORDER"
  msgstr ""
  
- #: ../reporting/rep702.php:62
- msgid "List of Journal Entries"
 -#: reporting/rep209.php:206
++#: reporting/rep209.php:209
+ msgid "TOTAL PO"
  msgstr ""
  
- #: ../reporting/rep704.php:67
- msgid "GL Account Transactions"
 -#: reporting/rep210.php:95 reporting/rep210.php:117
 -#: reporting/includes/doctext.inc:129
++#: reporting/rep210.php:83 reporting/rep210.php:105
++#: reporting/includes/doctext.inc:151
+ msgid "REMITTANCE"
  msgstr ""
  
- #: ../reporting/rep705.php:243
- #: ../reporting/rep705.php:256
- #: ../reporting/rep705.php:267
- #: ../reporting/reports_main.php:270
- #: ../reporting/reports_main.php:318
- #: ../reporting/reports_main.php:361
- msgid "Year"
 -#: reporting/rep210.php:168
 -msgid "TOTAL REMITTANCE"
 -msgstr ""
 -
+ #: reporting/rep301.php:114
+ msgid "Inventory Valuation Report"
  msgstr ""
  
- #: ../reporting/rep705.php:249
- #: ../reporting/rep705.php:260
- #: ../reporting/rep705.php:269
- #: ../reporting/rep706.php:194
- #: ../reporting/rep706.php:202
- #: ../reporting/rep706.php:208
- #: ../reporting/rep707.php:218
- #: ../reporting/rep707.php:226
- #: ../reporting/rep707.php:232
- msgid "Tags"
+ #: reporting/rep302.php:125
+ msgid "QOH"
  msgstr ""
  
- #: ../reporting/rep705.php:250
- #: ../reporting/rep705.php:261
- #: ../reporting/rep705.php:270
- msgid "Amounts in thousands"
+ #: reporting/rep302.php:125
+ msgid "Cust Ord"
  msgstr ""
  
- #: ../reporting/rep705.php:274
- msgid "Annual Expense Breakdown"
+ #: reporting/rep302.php:125
+ msgid "Supp Ord"
  msgstr ""
  
- #: ../reporting/rep706.php:182
- msgid "Close Balance"
+ #: reporting/rep302.php:125
+ msgid "Sugg Ord"
  msgstr ""
  
- #: ../reporting/rep707.php:254
- msgid "Profit and Loss Statement"
+ #: reporting/rep302.php:134
+ msgid "Inventory Planning Report"
  msgstr ""
  
- #: ../reporting/rep709.php:91
- msgid "Tax Report"
 -#: reporting/rep303.php:99
 -msgid "Shortage"
 -msgstr ""
 -
 -#: reporting/rep303.php:111 reporting/rep303.php:117 reporting/rep305.php:100
 -msgid "Stock ID"
 -msgstr ""
 -
 -#: reporting/rep303.php:111
 -msgid "Check"
 -msgstr ""
 -
 -#: reporting/rep303.php:125
 -msgid "Only Shortage"
 -msgstr ""
 -
 -#: reporting/rep303.php:133
 -msgid "Stock Check Sheets"
 -msgstr ""
 -
+ #: reporting/rep304.php:114 reporting/rep305.php:100 reporting/rep306.php:141
++#: reporting/rep309.php:98
+ msgid "Qty"
  msgstr ""
  
- #: ../reporting/rep709.php:109
- msgid "Branch Name"
 -#: reporting/rep304.php:114 sales/manage/customer_branches.php:240
 -#: sales/manage/customers.php:260
++#: reporting/rep304.php:114 reporting/rep309.php:98
++#: sales/manage/customer_branches.php:241 sales/manage/customers.php:260
+ msgid "Sales"
  msgstr ""
  
- #: ../reporting/rep709.php:110
- msgid "Net"
+ #: reporting/rep304.php:114
+ msgid "Cost"
  msgstr ""
  
- #: ../reporting/rep709.php:110
- #: ../taxes/item_tax_types.php:185
- msgid "Rate"
+ #: reporting/rep304.php:114
+ msgid "Contribution"
  msgstr ""
  
- #: ../reporting/rep709.php:176
- msgid "Tax Rate"
+ #: reporting/rep304.php:126
+ msgid "Inventory Sales Report"
  msgstr ""
  
- #: ../reporting/rep709.php:176
- msgid "Net Tax"
++#: reporting/rep305.php:100
++msgid "Stock ID"
 +msgstr ""
 +
- #: ../reporting/rep710.php:75
- msgid "Time"
+ #: reporting/rep305.php:100
+ msgid "PO No"
  msgstr ""
  
- #: ../reporting/rep710.php:75
- msgid "Trans Date"
+ #: reporting/rep305.php:100
+ msgid "Inv"
  msgstr ""
  
- #: ../reporting/rep710.php:76
- msgid "Action"
+ #: reporting/rep305.php:100
+ msgid "Inv Price"
  msgstr ""
  
- #: ../reporting/rep710.php:87
- #: ../reporting/reports_main.php:396
- msgid "Audit Trail"
+ #: reporting/rep305.php:100
+ msgid "PO Price"
  msgstr ""
  
- #: ../reporting/rep710.php:107
- msgid "Changed"
+ #: reporting/rep305.php:107
+ msgid "GRN Valuation Report"
  msgstr ""
  
- #: ../reporting/reports_main.php:26
- msgid "Reports and Analysis"
 -#: reporting/rep306.php:141
++#: reporting/rep306.php:141 reporting/rep309.php:98
+ msgid "Unit Price"
  msgstr ""
  
- #: ../reporting/reports_main.php:33
- msgid "Customer &Balances"
+ #: reporting/rep306.php:154
+ msgid "Inventory Purchasing Report"
  msgstr ""
  
- #: ../reporting/reports_main.php:37
- #: ../reporting/reports_main.php:44
- #: ../reporting/reports_main.php:66
- #: ../reporting/reports_main.php:90
- #: ../reporting/reports_main.php:97
- #: ../reporting/reports_main.php:109
- #: ../reporting/reports_main.php:116
- #: ../reporting/reports_main.php:123
- #: ../reporting/reports_main.php:129
- #: ../reporting/reports_main.php:137
- #: ../reporting/reports_main.php:144
- #: ../reporting/reports_main.php:154
- #: ../reporting/reports_main.php:165
- #: ../reporting/reports_main.php:171
- msgid "Currency Filter"
+ #: reporting/rep307.php:117
+ msgid "Opening"
  msgstr ""
  
- #: ../reporting/reports_main.php:40
- #: ../reporting/reports_main.php:50
- #: ../reporting/reports_main.php:58
- #: ../reporting/reports_main.php:64
- #: ../reporting/reports_main.php:72
- #: ../reporting/reports_main.php:80
- #: ../reporting/reports_main.php:86
- #: ../reporting/reports_main.php:140
- #: ../reporting/reports_main.php:150
- #: ../reporting/reports_main.php:157
- #: ../reporting/reports_main.php:161
- #: ../reporting/reports_main.php:183
- #: ../reporting/reports_main.php:188
- #: ../reporting/reports_main.php:197
- #: ../reporting/reports_main.php:205
- #: ../reporting/reports_main.php:210
- #: ../reporting/reports_main.php:217
- #: ../reporting/reports_main.php:231
- #: ../reporting/reports_main.php:242
- #: ../reporting/reports_main.php:248
- #: ../reporting/reports_main.php:254
- #: ../reporting/reports_main.php:268
- #: ../reporting/reports_main.php:275
- #: ../reporting/reports_main.php:285
- #: ../reporting/reports_main.php:296
- #: ../reporting/reports_main.php:305
- #: ../reporting/reports_main.php:316
- #: ../reporting/reports_main.php:322
- #: ../reporting/reports_main.php:331
- #: ../reporting/reports_main.php:341
- #: ../reporting/reports_main.php:349
- #: ../reporting/reports_main.php:359
- #: ../reporting/reports_main.php:364
- #: ../reporting/reports_main.php:372
- #: ../reporting/reports_main.php:381
- #: ../reporting/reports_main.php:388
- #: ../reporting/reports_main.php:395
- #: ../reporting/reports_main.php:402
- msgid "Destination"
 -#: reporting/rep307.php:126 reporting/rep308.php:159
++#: reporting/rep307.php:126
+ msgid "Inventory Movements"
  msgstr ""
  
- #: ../reporting/reports_main.php:41
- msgid "&Aged Customer Analysis"
+ #: reporting/rep308.php:149
+ msgid "OpeningStock"
  msgstr ""
  
- #: ../reporting/reports_main.php:48
- #: ../reporting/reports_main.php:148
- #: ../reporting/reports_main.php:283
- #: ../reporting/reports_main.php:294
- #: ../reporting/reports_main.php:329
- #: ../reporting/reports_main.php:339
- #: ../reporting/reports_main.php:370
- #: ../reporting/reports_main.php:379
- msgid "Graphics"
 -#: reporting/rep308.php:149
 -msgid " "
 -msgstr ""
 -
+ #: reporting/rep308.php:149
+ msgid "StockIn"
  msgstr ""
  
- #: ../reporting/reports_main.php:51
- msgid "Customer &Detail Listing"
+ #: reporting/rep308.php:149
+ msgid "ClosingStock"
  msgstr ""
  
- #: ../reporting/reports_main.php:55
- msgid "Activity Greater Than"
 -#: reporting/rep401.php:71
 -msgid "Wrk Ctr"
++#: reporting/rep308.php:150
++msgid "QTY"
  msgstr ""
  
- #: ../reporting/reports_main.php:56
- msgid "Activity Less Than"
 -#: reporting/rep401.php:78
 -msgid "Bill of Material Listing"
++#: reporting/rep308.php:150 reporting/rep709.php:112
++#: taxes/item_tax_types.php:185
++msgid "Rate"
  msgstr ""
  
- #: ../reporting/reports_main.php:59
- msgid "Sales &Summary Report"
 -#: reporting/rep409.php:60 reporting/rep409.php:73
 -#: reporting/includes/doctext.inc:192
 -msgid "WORK ORDER"
++#: reporting/rep308.php:159
++msgid "Costed Inventory Movements"
 +msgstr ""
 +
- #: ../reporting/reports_main.php:65
- msgid "&Price Listing"
++#: reporting/rep309.php:98
++msgid "Item/Category"
 +msgstr ""
 +
- #: ../reporting/reports_main.php:67
- #: ../reporting/reports_main.php:76
- #: ../reporting/reports_main.php:179
- #: ../reporting/reports_main.php:185
- #: ../reporting/reports_main.php:190
- #: ../reporting/reports_main.php:201
- msgid "Inventory Category"
++#: reporting/rep309.php:98
++msgid "Remark"
 +msgstr ""
 +
- #: ../reporting/reports_main.php:68
- #: ../sales/manage/sales_types.php:16
- msgid "Sales Types"
++#: reporting/rep309.php:106
++msgid "Item Sales Summary Report"
  msgstr ""
  
- #: ../reporting/reports_main.php:69
- #: ../reporting/reports_main.php:192
- msgid "Show Pictures"
 -#: reporting/rep409.php:129
 -msgid "Insufficient stock"
++#: reporting/rep309.php:147
++msgid "Gift"
 +msgstr ""
 +
- #: ../reporting/reports_main.php:73
- msgid "&Order Status Listing"
++#: reporting/rep401.php:71
++msgid "Wrk Ctr"
 +msgstr ""
 +
- #: ../reporting/reports_main.php:77
- msgid "Stock Location"
++#: reporting/rep401.php:78
++msgid "Bill of Material Listing"
  msgstr ""
  
- #: ../reporting/reports_main.php:81
- msgid "&Salesman Listing"
+ #: reporting/rep501.php:87
+ msgid "YTD"
  msgstr ""
  
- #: ../reporting/reports_main.php:87
- msgid "Print &Invoices"
+ #: reporting/rep501.php:94
+ msgid "Dimension Summary"
  msgstr ""
  
- #: ../reporting/reports_main.php:91
- #: ../reporting/reports_main.php:98
- #: ../reporting/reports_main.php:104
- msgid "email Customers"
 -#: reporting/rep601.php:86 reporting/includes/doctext.inc:247
++#: reporting/rep601.php:86 reporting/rep602.php:87
++#: reporting/includes/doctext.inc:260
+ msgid "Bank Account"
  msgstr ""
  
- #: ../reporting/reports_main.php:92
- #: ../reporting/reports_main.php:99
- msgid "Payment Link"
 -#: reporting/rep601.php:151
++#: reporting/rep601.php:151 reporting/rep602.php:151
+ msgid "Total Debit / Credit"
  msgstr ""
  
- #: ../reporting/reports_main.php:94
- msgid "Print &Credit Notes"
 -#: reporting/rep601.php:168
++#: reporting/rep601.php:168 reporting/rep602.php:167
+ msgid "Net Change"
  msgstr ""
  
- #: ../reporting/reports_main.php:101
- msgid "Print &Deliveries"
++#: reporting/rep602.php:73
++msgid "Bank Statement w/Reconcile"
 +msgstr ""
 +
- #: ../reporting/reports_main.php:105
- msgid "Print as Packing Slip"
++#: reporting/rep602.php:81
++msgid "Reco Date"
 +msgstr ""
 +
- #: ../reporting/reports_main.php:107
- msgid "Print &Statements"
++#: reporting/rep602.php:81
++msgid "Narration"
 +msgstr ""
 +
- #: ../reporting/reports_main.php:111
- #: ../reporting/reports_main.php:117
- #: ../reporting/reports_main.php:124
- #: ../reporting/reports_main.php:166
- #: ../reporting/reports_main.php:172
- msgid "Email Customers"
++#: reporting/rep602.php:195
++msgid "Bank Balance"
 +msgstr ""
 +
- #: ../reporting/reports_main.php:113
- msgid "&Print Sales Orders"
+ #: reporting/rep702.php:53
+ msgid "Type/Account"
  msgstr ""
  
- #: ../reporting/reports_main.php:118
- msgid "Print as Quote"
+ #: reporting/rep702.php:53
+ msgid "Date/Dim."
  msgstr ""
  
- #: ../reporting/reports_main.php:120
- msgid "&Print Sales Quotations"
+ #: reporting/rep702.php:54
+ msgid "Person/Item/Memo"
  msgstr ""
  
- #: ../reporting/reports_main.php:126
- msgid "Print Receipts"
+ #: reporting/rep702.php:64
+ msgid "List of Journal Entries"
  msgstr ""
  
- #: ../reporting/reports_main.php:133
- msgid "Supplier &Balances"
+ #: reporting/rep704.php:71
+ msgid "GL Account Transactions"
  msgstr ""
  
- #: ../reporting/reports_main.php:141
- msgid "&Aged Supplier Analyses"
+ #: reporting/rep705.php:247 reporting/rep705.php:260 reporting/rep705.php:271
 -#: reporting/reports_main.php:328 reporting/reports_main.php:381
 -#: reporting/reports_main.php:429
+ msgid "Year"
  msgstr ""
  
- #: ../reporting/reports_main.php:151
- msgid "&Payment Report"
+ #: reporting/rep705.php:253 reporting/rep705.php:264 reporting/rep705.php:273
+ #: reporting/rep706.php:198 reporting/rep706.php:206 reporting/rep706.php:212
+ #: reporting/rep707.php:222 reporting/rep707.php:230 reporting/rep707.php:236
+ msgid "Tags"
  msgstr ""
  
- #: ../reporting/reports_main.php:158
- msgid "Outstanding &GRNs Report"
+ #: reporting/rep705.php:254 reporting/rep705.php:265 reporting/rep705.php:274
+ msgid "Amounts in thousands"
  msgstr ""
  
- #: ../reporting/reports_main.php:162
- msgid "Print Purchase &Orders"
+ #: reporting/rep705.php:278
+ msgid "Annual Expense Breakdown"
  msgstr ""
  
- #: ../reporting/reports_main.php:168
- msgid "Print Remi&ttances"
+ #: reporting/rep706.php:186
+ msgid "Close Balance"
  msgstr ""
  
- #: ../reporting/reports_main.php:177
- msgid "Inventory &Valuation Report"
+ #: reporting/rep707.php:258
+ msgid "Profit and Loss Statement"
  msgstr ""
  
- #: ../reporting/reports_main.php:184
- msgid "Inventory &Planning Report"
+ #: reporting/rep709.php:93
+ msgid "Tax Report"
  msgstr ""
  
- #: ../reporting/reports_main.php:189
- msgid "Stock &Check Sheets"
+ #: reporting/rep709.php:111
+ msgid "Branch Name"
  msgstr ""
  
- #: ../reporting/reports_main.php:193
- msgid "Inventory Column"
+ #: reporting/rep709.php:112
+ msgid "Net"
  msgstr ""
  
- #: ../reporting/reports_main.php:194
- msgid "Show Shortage"
 -#: reporting/rep709.php:112 taxes/item_tax_types.php:185
 -msgid "Rate"
 -msgstr ""
 -
 -#: reporting/rep709.php:183
 -msgid "Tax Rate"
 -msgstr ""
 -
 -#: reporting/rep709.php:183
 -msgid "Net Tax"
 -msgstr ""
 -
+ #: reporting/rep710.php:77
+ msgid "Time"
  msgstr ""
  
- #: ../reporting/reports_main.php:198
- msgid "Inventory &Sales Report"
+ #: reporting/rep710.php:77
+ msgid "Trans Date"
  msgstr ""
  
- #: ../reporting/reports_main.php:206
 -#: reporting/rep710.php:78
 -msgid "Action"
 -msgstr ""
 -
 -#: reporting/rep710.php:89 reporting/reports_main.php:469
 -msgid "Audit Trail"
 -msgstr ""
 -
 -#: reporting/rep710.php:111
 -msgid "Changed"
 -msgstr ""
 -
 -#: reporting/reports_main.php:26
 -msgid "Reports and Analysis"
 -msgstr ""
 -
 -#: reporting/reports_main.php:33
 -msgid "Customer &Balances"
 -msgstr ""
 -
 -#: reporting/reports_main.php:37 reporting/reports_main.php:45
 -#: reporting/reports_main.php:70 reporting/reports_main.php:97
 -#: reporting/reports_main.php:105 reporting/reports_main.php:119
 -#: reporting/reports_main.php:127 reporting/reports_main.php:135
 -#: reporting/reports_main.php:142 reporting/reports_main.php:151
 -#: reporting/reports_main.php:159 reporting/reports_main.php:170
 -#: reporting/reports_main.php:190 reporting/reports_main.php:197
 -msgid "Currency Filter"
 -msgstr ""
 -
 -#: reporting/reports_main.php:40 reporting/reports_main.php:51
 -#: reporting/reports_main.php:60 reporting/reports_main.php:67
 -#: reporting/reports_main.php:76 reporting/reports_main.php:85
 -#: reporting/reports_main.php:92 reporting/reports_main.php:101
 -#: reporting/reports_main.php:109 reporting/reports_main.php:116
 -#: reporting/reports_main.php:123 reporting/reports_main.php:131
 -#: reporting/reports_main.php:138 reporting/reports_main.php:144
 -#: reporting/reports_main.php:154 reporting/reports_main.php:165
 -#: reporting/reports_main.php:173 reporting/reports_main.php:178
 -#: reporting/reports_main.php:185 reporting/reports_main.php:193
 -#: reporting/reports_main.php:200 reporting/reports_main.php:210
 -#: reporting/reports_main.php:216 reporting/reports_main.php:226
 -#: reporting/reports_main.php:234 reporting/reports_main.php:243
 -#: reporting/reports_main.php:249 reporting/reports_main.php:259
 -#: reporting/reports_main.php:267 reporting/reports_main.php:274
 -#: reporting/reports_main.php:283 reporting/reports_main.php:296
 -#: reporting/reports_main.php:303 reporting/reports_main.php:310
 -#: reporting/reports_main.php:325 reporting/reports_main.php:333
 -#: reporting/reports_main.php:344 reporting/reports_main.php:356
 -#: reporting/reports_main.php:366 reporting/reports_main.php:378
 -#: reporting/reports_main.php:385 reporting/reports_main.php:395
 -#: reporting/reports_main.php:406 reporting/reports_main.php:415
 -#: reporting/reports_main.php:426 reporting/reports_main.php:432
 -#: reporting/reports_main.php:441 reporting/reports_main.php:451
 -#: reporting/reports_main.php:459 reporting/reports_main.php:467
 -#: reporting/reports_main.php:475
 -msgid "Orientation"
 -msgstr ""
 -
 -#: reporting/reports_main.php:41 reporting/reports_main.php:52
 -#: reporting/reports_main.php:61 reporting/reports_main.php:68
 -#: reporting/reports_main.php:77 reporting/reports_main.php:86
 -#: reporting/reports_main.php:93 reporting/reports_main.php:155
 -#: reporting/reports_main.php:166 reporting/reports_main.php:174
 -#: reporting/reports_main.php:179 reporting/reports_main.php:186
 -#: reporting/reports_main.php:211 reporting/reports_main.php:217
 -#: reporting/reports_main.php:227 reporting/reports_main.php:235
 -#: reporting/reports_main.php:244 reporting/reports_main.php:250
 -#: reporting/reports_main.php:260 reporting/reports_main.php:268
 -#: reporting/reports_main.php:284 reporting/reports_main.php:297
 -#: reporting/reports_main.php:304 reporting/reports_main.php:311
 -#: reporting/reports_main.php:326 reporting/reports_main.php:334
 -#: reporting/reports_main.php:345 reporting/reports_main.php:357
 -#: reporting/reports_main.php:367 reporting/reports_main.php:379
 -#: reporting/reports_main.php:386 reporting/reports_main.php:396
 -#: reporting/reports_main.php:407 reporting/reports_main.php:416
 -#: reporting/reports_main.php:427 reporting/reports_main.php:433
 -#: reporting/reports_main.php:442 reporting/reports_main.php:452
 -#: reporting/reports_main.php:460 reporting/reports_main.php:468
 -#: reporting/reports_main.php:476
 -msgid "Destination"
 -msgstr ""
 -
 -#: reporting/reports_main.php:42
 -msgid "&Aged Customer Analysis"
 -msgstr ""
 -
 -#: reporting/reports_main.php:49 reporting/reports_main.php:163
 -#: reporting/reports_main.php:342 reporting/reports_main.php:354
 -#: reporting/reports_main.php:393 reporting/reports_main.php:404
 -#: reporting/reports_main.php:439 reporting/reports_main.php:449
 -msgid "Graphics"
 -msgstr ""
 -
 -#: reporting/reports_main.php:53
 -msgid "Customer &Detail Listing"
 -msgstr ""
 -
 -#: reporting/reports_main.php:57 reporting/reports_main.php:182
 -msgid "Activity Greater Than"
 -msgstr ""
 -
 -#: reporting/reports_main.php:58 reporting/reports_main.php:183
 -msgid "Activity Less Than"
 -msgstr ""
 -
 -#: reporting/reports_main.php:62
 -msgid "Sales &Summary Report"
 -msgstr ""
 -
 -#: reporting/reports_main.php:69
 -msgid "&Price Listing"
 -msgstr ""
 -
 -#: reporting/reports_main.php:71 reporting/reports_main.php:81
 -#: reporting/reports_main.php:206 reporting/reports_main.php:213
 -#: reporting/reports_main.php:219 reporting/reports_main.php:231
 -#: reporting/reports_main.php:239 reporting/reports_main.php:254
 -msgid "Inventory Category"
 -msgstr ""
 -
 -#: reporting/reports_main.php:72 sales/manage/sales_types.php:16
 -msgid "Sales Types"
 -msgstr ""
 -
 -#: reporting/reports_main.php:73 reporting/reports_main.php:221
 -msgid "Show Pictures"
 -msgstr ""
 -
 -#: reporting/reports_main.php:78
 -msgid "&Order Status Listing"
 -msgstr ""
 -
 -#: reporting/reports_main.php:82
 -msgid "Stock Location"
 -msgstr ""
 -
 -#: reporting/reports_main.php:87
 -msgid "&Salesman Listing"
 -msgstr ""
 -
 -#: reporting/reports_main.php:94
 -msgid "Print &Invoices"
 -msgstr ""
 -
 -#: reporting/reports_main.php:98 reporting/reports_main.php:106
 -#: reporting/reports_main.php:113
 -msgid "email Customers"
 -msgstr ""
 -
 -#: reporting/reports_main.php:99 reporting/reports_main.php:107
 -msgid "Payment Link"
 -msgstr ""
 -
 -#: reporting/reports_main.php:102
 -msgid "Print &Credit Notes"
 -msgstr ""
 -
 -#: reporting/reports_main.php:110
 -msgid "Print &Deliveries"
 -msgstr ""
 -
 -#: reporting/reports_main.php:114
 -msgid "Print as Packing Slip"
 -msgstr ""
 -
 -#: reporting/reports_main.php:117
 -msgid "Print &Statements"
 -msgstr ""
 -
 -#: reporting/reports_main.php:121 reporting/reports_main.php:128
 -#: reporting/reports_main.php:136 reporting/reports_main.php:191
 -#: reporting/reports_main.php:198
 -msgid "Email Customers"
 -msgstr ""
 -
 -#: reporting/reports_main.php:124
 -msgid "&Print Sales Orders"
 -msgstr ""
 -
 -#: reporting/reports_main.php:129
 -msgid "Print as Quote"
 -msgstr ""
 -
 -#: reporting/reports_main.php:132
 -msgid "&Print Sales Quotations"
 -msgstr ""
 -
 -#: reporting/reports_main.php:139
 -msgid "Print Receipts"
 -msgstr ""
 -
 -#: reporting/reports_main.php:147
 -msgid "Supplier &Balances"
 -msgstr ""
 -
 -#: reporting/reports_main.php:156
 -msgid "&Aged Supplier Analyses"
 -msgstr ""
 -
 -#: reporting/reports_main.php:167
 -msgid "&Payment Report"
 -msgstr ""
 -
 -#: reporting/reports_main.php:175
 -msgid "Outstanding &GRNs Report"
 -msgstr ""
 -
 -#: reporting/reports_main.php:180
 -msgid "Supplier &Detail Listing"
 -msgstr ""
 -
 -#: reporting/reports_main.php:187
 -msgid "Print Purchase &Orders"
 -msgstr ""
 -
 -#: reporting/reports_main.php:194
 -msgid "Print Remittances"
 -msgstr ""
 -
 -#: reporting/reports_main.php:204
 -msgid "Inventory &Valuation Report"
 -msgstr ""
 -
 -#: reporting/reports_main.php:212
 -msgid "Inventory &Planning Report"
 -msgstr ""
 -
 -#: reporting/reports_main.php:218
 -msgid "Stock &Check Sheets"
 -msgstr ""
 -
 -#: reporting/reports_main.php:222
 -msgid "Inventory Column"
 -msgstr ""
 -
 -#: reporting/reports_main.php:223
 -msgid "Show Shortage"
 -msgstr ""
 -
 -#: reporting/reports_main.php:228
 -msgid "Inventory &Movement Report"
 -msgstr ""
 -
 -#: reporting/reports_main.php:236
 -msgid "Inventory &Sales Report"
 -msgstr ""
 -
 -#: reporting/reports_main.php:245
--msgid "&GRN Valuation Report"
 -msgstr ""
 -
 -#: reporting/reports_main.php:251
 -msgid "Inventory P&urchasing Report"
++#: reporting/rep710.php:78
++msgid "Action"
  msgstr ""
  
- #: ../reporting/reports_main.php:212
 -#: reporting/reports_main.php:262
--msgid "Manufacturing"
++#: reporting/rep710.php:89
++msgid "Audit Trail"
  msgstr ""
  
- #: ../reporting/reports_main.php:213
 -#: reporting/reports_main.php:263
--msgid "&Bill of Material Listing"
++#: reporting/reports_main.php:26
++msgid "Reports and Analysis"
  msgstr ""
  
- #: ../reporting/reports_main.php:214
 -#: reporting/reports_main.php:264
--msgid "From product"
++#: reporting/reports_main.php:33
++msgid "Customer &Balances"
  msgstr ""
  
- #: ../reporting/reports_main.php:215
 -#: reporting/reports_main.php:265
--msgid "To product"
++#: reporting/reports_main.php:37
++msgid "Show Balance"
  msgstr ""
  
- #: ../reporting/reports_main.php:218
 -#: reporting/reports_main.php:269
--msgid "Print &Work Orders"
++#: reporting/reports_main.php:38 reporting/reports_main.php:46
++#: reporting/reports_main.php:71 reporting/reports_main.php:98
++msgid "Currency Filter"
  msgstr ""
  
- #: ../reporting/reports_main.php:221
 -#: reporting/reports_main.php:272
--msgid "Email Locations"
++#: reporting/reports_main.php:41 reporting/reports_main.php:52
++#: reporting/reports_main.php:61 reporting/reports_main.php:68
++#: reporting/reports_main.php:77 reporting/reports_main.php:86
++#: reporting/reports_main.php:93
++msgid "Orientation"
  msgstr ""
  
- #: ../reporting/reports_main.php:226
 -#: reporting/reports_main.php:278
--msgid "Dimension &Summary"
++#: reporting/reports_main.php:42 reporting/reports_main.php:53
++#: reporting/reports_main.php:62 reporting/reports_main.php:69
++#: reporting/reports_main.php:78 reporting/reports_main.php:87
++#: reporting/reports_main.php:94
++msgid "Destination"
  msgstr ""
  
- #: ../reporting/reports_main.php:227
 -#: reporting/reports_main.php:279
--msgid "From Dimension"
++#: reporting/reports_main.php:43
++msgid "&Aged Customer Analysis"
  msgstr ""
  
- #: ../reporting/reports_main.php:228
 -#: reporting/reports_main.php:280
--msgid "To Dimension"
++#: reporting/reports_main.php:50
++msgid "Graphics"
  msgstr ""
  
- #: ../reporting/reports_main.php:229
 -#: reporting/reports_main.php:281
--msgid "Show Balance"
++#: reporting/reports_main.php:54
++msgid "Customer &Detail Listing"
  msgstr ""
  
- #: ../reporting/reports_main.php:236
 -#: reporting/reports_main.php:289
--msgid "Banking"
++#: reporting/reports_main.php:56 sales/manage/sales_areas.php:16
++msgid "Sales Areas"
  msgstr ""
  
- #: ../reporting/reports_main.php:237
 -#: reporting/reports_main.php:290
--msgid "Bank &Statement"
++#: reporting/reports_main.php:57
++msgid "Sales Folk"
  msgstr ""
  
- #: ../reporting/reports_main.php:244
- msgid "General Ledger"
 -#: reporting/reports_main.php:294 reporting/reports_main.php:361
 -#: reporting/reports_main.php:411 reporting/reports_main.php:456
 -msgid "Zero values"
++#: reporting/reports_main.php:58
++msgid "Activity Greater Than"
  msgstr ""
  
- #: ../reporting/reports_main.php:245
- msgid "Chart of &Accounts"
 -#: reporting/reports_main.php:299
 -msgid "General Ledger"
++#: reporting/reports_main.php:59
++msgid "Activity Less Than"
  msgstr ""
  
- #: ../reporting/reports_main.php:246
- msgid "Show Balances"
 -#: reporting/reports_main.php:300
 -msgid "Chart of &Accounts"
++#: reporting/reports_main.php:63
++msgid "Sales &Summary Report"
  msgstr ""
  
- #: ../reporting/reports_main.php:249
- msgid "List of &Journal Entries"
 -#: reporting/reports_main.php:301
 -msgid "Show Balances"
++#: reporting/reports_main.php:70
++msgid "&Price Listing"
  msgstr ""
  
- #: ../reporting/reports_main.php:260
- #: ../reporting/reports_main.php:309
- #: ../reporting/reports_main.php:353
- msgid "GL Account &Transactions"
 -#: reporting/reports_main.php:305
 -msgid "List of &Journal Entries"
++#: reporting/reports_main.php:72 reporting/reports_main.php:82
++msgid "Inventory Category"
  msgstr ""
  
- #: ../reporting/reports_main.php:263
- #: ../reporting/reports_main.php:312
- #: ../reporting/reports_main.php:356
- msgid "From Account"
 -#: reporting/reports_main.php:317 reporting/reports_main.php:371
 -#: reporting/reports_main.php:420
 -msgid "GL Account &Transactions"
++#: reporting/reports_main.php:73 sales/manage/sales_types.php:16
++msgid "Sales Types"
  msgstr ""
  
- #: ../reporting/reports_main.php:264
- #: ../reporting/reports_main.php:313
- #: ../reporting/reports_main.php:357
- msgid "To Account"
 -#: reporting/reports_main.php:320 reporting/reports_main.php:374
 -#: reporting/reports_main.php:423
 -msgid "From Account"
++#: reporting/reports_main.php:74
++msgid "Show Pictures"
  msgstr ""
  
- #: ../reporting/reports_main.php:269
- #: ../reporting/reports_main.php:317
- #: ../reporting/reports_main.php:360
- msgid "Annual &Expense Breakdown"
 -#: reporting/reports_main.php:321 reporting/reports_main.php:375
 -#: reporting/reports_main.php:424
 -msgid "To Account"
++#: reporting/reports_main.php:79
++msgid "&Order Status Listing"
  msgstr ""
  
- #: ../reporting/reports_main.php:276
- #: ../reporting/reports_main.php:323
- #: ../reporting/reports_main.php:365
- msgid "&Balance Sheet"
 -#: reporting/reports_main.php:327 reporting/reports_main.php:380
 -#: reporting/reports_main.php:428
 -msgid "Annual &Expense Breakdown"
++#: reporting/reports_main.php:83
++msgid "Stock Location"
  msgstr ""
  
- #: ../reporting/reports_main.php:282
- #: ../reporting/reports_main.php:293
- #: ../reporting/reports_main.php:328
- #: ../reporting/reports_main.php:338
- #: ../reporting/reports_main.php:369
- #: ../reporting/reports_main.php:378
- msgid "Decimal values"
 -#: reporting/reports_main.php:335 reporting/reports_main.php:387
 -#: reporting/reports_main.php:434
 -msgid "&Balance Sheet"
++#: reporting/reports_main.php:88
++msgid "&Salesman Listing"
  msgstr ""
  
- #: ../reporting/reports_main.php:286
- #: ../reporting/reports_main.php:332
- #: ../reporting/reports_main.php:373
- msgid "&Profit and Loss Statement"
 -#: reporting/reports_main.php:341 reporting/reports_main.php:353
 -#: reporting/reports_main.php:392 reporting/reports_main.php:403
 -#: reporting/reports_main.php:438 reporting/reports_main.php:448
 -msgid "Decimal values"
++#: reporting/reports_main.php:95
++msgid "Print &Invoices"
  msgstr ""
  
- #: ../reporting/reports_main.php:300
- #: ../reporting/reports_main.php:345
- #: ../reporting/reports_main.php:385
- msgid "Zero values"
 -#: reporting/reports_main.php:346 reporting/reports_main.php:397
 -#: reporting/reports_main.php:443
 -msgid "&Profit and Loss Statement"
++#: reporting/reports_main.php:99
++msgid "email Customers"
  msgstr ""
  
- #: ../reporting/reports_main.php:390
 -#: reporting/reports_main.php:462
--msgid "Ta&x Report"
++#: reporting/reports_main.php:100
++msgid "Payment Link"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:18
- #: ../reporting/includes/doctext.inc:156
- #: ../sales/view/view_dispatch.php:51
- #: ../sales/view/view_invoice.php:53
 -#: reporting/includes/doctext.inc:18 reporting/includes/doctext.inc:134
 -#: sales/view/view_dispatch.php:51 sales/view/view_invoice.php:51
++#: reporting/includes/doctext.inc:18 reporting/includes/doctext.inc:156
++#: sales/view/view_dispatch.php:51 sales/view/view_invoice.php:53
  msgid "Charge To"
  msgstr ""
  
@@@ -13004,13 -11231,10 +10419,10 @@@
  msgid "Delivered To"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:30
- #: ../sales/customer_credit_invoice.php:281
- #: ../sales/view/view_credit.php:91
- #: ../sales/view/view_dispatch.php:113
- #: ../sales/view/view_invoice.php:116
- #: ../sales/includes/ui/sales_credit_ui.inc:168
- #: ../sales/includes/ui/sales_order_ui.inc.orig:142
+ #: reporting/includes/doctext.inc:30 sales/customer_credit_invoice.php:281
+ #: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
 -#: sales/view/view_invoice.php:114 sales/includes/ui/sales_credit_ui.inc:168
 -#: sales/includes/ui/sales_order_ui.inc:146
++#: sales/view/view_invoice.php:116 sales/includes/ui/sales_credit_ui.inc:168
++#: sales/includes/ui/sales_order_ui.inc:147
  msgid "Discount %"
  msgstr ""
  
@@@ -13018,157 -11242,115 +10430,150 @@@
  msgid "All amounts stated in"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:51
 -#: reporting/includes/doctext.inc:39
++#: reporting/includes/doctext.inc:51
  msgid "Quotation No."
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:56
- #: ../reporting/includes/doctext.inc:73
- #: ../reporting/includes/doctext.inc:94
- #: ../reporting/includes/doctext.inc:108
- #: ../reporting/includes/doctext.inc:131
- #: ../reporting/includes/doctext.inc:161
- #: ../reporting/includes/doctext.inc:184
- #: ../reporting/includes/doctext.inc:202
- #: ../reporting/includes/doctext.inc:240
- msgid "Customers Reference"
- msgstr ""
- 
- #: ../reporting/includes/doctext.inc:57
- #: ../reporting/includes/doctext.inc:74
- #: ../reporting/includes/doctext.inc:95
- #: ../reporting/includes/doctext.inc:109
- #: ../reporting/includes/doctext.inc:132
- #: ../reporting/includes/doctext.inc:185
- #: ../reporting/includes/doctext.inc:241
- #: ../sales/manage/customer_branches.php:298
 -#: reporting/includes/doctext.inc:44 reporting/includes/doctext.inc:61
 -#: reporting/includes/doctext.inc:82 reporting/includes/doctext.inc:96
 -#: reporting/includes/doctext.inc:118 reporting/includes/doctext.inc:139
 -#: reporting/includes/doctext.inc:162 reporting/includes/doctext.inc:180
 -#: reporting/includes/doctext.inc:218
++#: reporting/includes/doctext.inc:56 reporting/includes/doctext.inc:73
++#: reporting/includes/doctext.inc:94 reporting/includes/doctext.inc:108
++#: reporting/includes/doctext.inc:131 reporting/includes/doctext.inc:161
++#: reporting/includes/doctext.inc:184 reporting/includes/doctext.inc:202
++#: reporting/includes/doctext.inc:240
+ msgid "Customer's Reference"
+ msgstr ""
+ 
 -#: reporting/includes/doctext.inc:45 reporting/includes/doctext.inc:62
 -#: reporting/includes/doctext.inc:83 reporting/includes/doctext.inc:97
 -#: reporting/includes/doctext.inc:119 reporting/includes/doctext.inc:163
 -#: reporting/includes/doctext.inc:219 sales/manage/customer_branches.php:296
++#: reporting/includes/doctext.inc:57 reporting/includes/doctext.inc:74
++#: reporting/includes/doctext.inc:95 reporting/includes/doctext.inc:109
++#: reporting/includes/doctext.inc:132 reporting/includes/doctext.inc:185
++#: reporting/includes/doctext.inc:241 sales/manage/customer_branches.php:298
  msgid "Sales Person"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:58
- #: ../reporting/includes/doctext.inc:75
- #: ../reporting/includes/doctext.inc:96
- #: ../reporting/includes/doctext.inc:110
- #: ../reporting/includes/doctext.inc:133
- #: ../reporting/includes/doctext.inc:163
- #: ../reporting/includes/doctext.inc:186
- #: ../reporting/includes/doctext.inc:204
- #: ../reporting/includes/doctext.inc:242
 -#: reporting/includes/doctext.inc:46 reporting/includes/doctext.inc:63
 -#: reporting/includes/doctext.inc:84 reporting/includes/doctext.inc:98
 -#: reporting/includes/doctext.inc:120 reporting/includes/doctext.inc:141
 -#: reporting/includes/doctext.inc:164 reporting/includes/doctext.inc:182
 -#: reporting/includes/doctext.inc:220
++#: reporting/includes/doctext.inc:58 reporting/includes/doctext.inc:75
++#: reporting/includes/doctext.inc:96 reporting/includes/doctext.inc:110
++#: reporting/includes/doctext.inc:133 reporting/includes/doctext.inc:163
++#: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:204
++#: reporting/includes/doctext.inc:242
  msgid "Your VAT no."
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:59
 -#: reporting/includes/doctext.inc:47
++#: reporting/includes/doctext.inc:59
  msgid "Our Quotation No"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:60
- #: ../sales/view/view_sales_order.php:69
- #: ../sales/view/view_sales_order.php.orig:69
- #: ../sales/inquiry/sales_orders_view.php:304
- #: ../sales/includes/ui/sales_order_ui.inc.orig:606
 -#: reporting/includes/doctext.inc:48 sales/view/view_sales_order.php:69
 -#: sales/inquiry/sales_orders_view.php:282
 -#: sales/includes/ui/sales_order_ui.inc:611
++#: reporting/includes/doctext.inc:60 sales/view/view_sales_order.php:69
++#: sales/includes/ui/sales_order_ui.inc:613
  msgid "Valid until"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:65
 -#: reporting/includes/doctext.inc:54
++#: reporting/includes/doctext.inc:65
 +msgid "PREPAYMENT ORDER"
 +msgstr ""
 +
- #: ../reporting/includes/doctext.inc:66
++#: reporting/includes/doctext.inc:66
  msgid "Order No."
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:76
- #: ../reporting/includes/doctext.inc:97
- #: ../reporting/includes/doctext.inc:111
- #: ../reporting/includes/doctext.inc:138
- #: ../reporting/includes/doctext.inc:164
- #: ../reporting/includes/doctext.inc:187
- #: ../reporting/includes/doctext.inc:205
- #: ../reporting/includes/doctext.inc:243
- #: ../sales/view/view_dispatch.php:87
- #: ../sales/view/view_invoice.php:87
 -#: reporting/includes/doctext.inc:64 reporting/includes/doctext.inc:85
 -#: reporting/includes/doctext.inc:99 reporting/includes/doctext.inc:183
 -#: reporting/includes/doctext.inc:221 sales/view/view_dispatch.php:87
 -#: sales/view/view_invoice.php:86
++#: reporting/includes/doctext.inc:76 reporting/includes/doctext.inc:97
++#: reporting/includes/doctext.inc:111 reporting/includes/doctext.inc:138
++#: reporting/includes/doctext.inc:205 reporting/includes/doctext.inc:243
++#: sales/view/view_dispatch.php:87 sales/view/view_invoice.php:87
  msgid "Our Order No"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:83
 -#: reporting/includes/doctext.inc:71 reporting/includes/doctext.inc:121
++#: reporting/includes/doctext.inc:83
  msgid "Delivery Note No."
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:98
 -#: reporting/includes/doctext.inc:86
++#: reporting/includes/doctext.inc:98
  msgid "To Be Invoiced Before"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:104
 -#: reporting/includes/doctext.inc:92
++#: reporting/includes/doctext.inc:104
  msgid "Credit No."
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:105
 -#: reporting/includes/doctext.inc:93
++#: reporting/includes/doctext.inc:105
  msgid "Please quote Credit no. when paying. All amounts stated in"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:117
 -#: reporting/includes/doctext.inc:106
++#: reporting/includes/doctext.inc:117
 +msgid "PREPAYMENT INVOICE"
 +msgstr ""
 +
- #: ../reporting/includes/doctext.inc:118
++#: reporting/includes/doctext.inc:118
 +msgid "FINAL INVOICE"
 +msgstr ""
 +
- #: ../reporting/includes/doctext.inc:119
++#: reporting/includes/doctext.inc:118
++msgid "INVOICE"
++msgstr ""
++
++#: reporting/includes/doctext.inc:119
  msgid "Invoice No."
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:121
 -#: reporting/includes/doctext.inc:108
++#: reporting/includes/doctext.inc:121
  msgid "Please quote Invoice no. when paying. All amounts stated in"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:137
 -#: reporting/includes/doctext.inc:130
++#: reporting/includes/doctext.inc:137
 +msgid "Date of Payment"
 +msgstr ""
 +
- #: ../reporting/includes/doctext.inc:143
++#: reporting/includes/doctext.inc:143
 +msgid "Date of Sale"
 +msgstr ""
 +
- #: ../reporting/includes/doctext.inc:152
++#: reporting/includes/doctext.inc:152
  msgid "Remittance No."
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:153
- #: ../reporting/includes/doctext.inc:173
 -#: reporting/includes/doctext.inc:131 reporting/includes/doctext.inc:151
++#: reporting/includes/doctext.inc:153 reporting/includes/doctext.inc:173
  msgid "Order To"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:172
 -#: reporting/includes/doctext.inc:150
++#: reporting/includes/doctext.inc:172
  msgid "Purchase Order No."
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:176
 -#: reporting/includes/doctext.inc:154
++#: reporting/includes/doctext.inc:176
  msgid "Deliver To"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:199
 -#: reporting/includes/doctext.inc:177
++#: reporting/includes/doctext.inc:199
  msgid "Receipt No."
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:200
 -#: reporting/includes/doctext.inc:178
++#: reporting/includes/doctext.inc:200
  msgid "With thanks from"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:215
 -#: reporting/includes/doctext.inc:193
++#: reporting/includes/doctext.inc:214
++msgid "WORK ORDER"
++msgstr ""
++
++#: reporting/includes/doctext.inc:215
  msgid "Work Order No."
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:246
 -#: reporting/includes/doctext.inc:224
++#: reporting/includes/doctext.inc:246
  msgid "DueDate"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:272
- #: ../reporting/includes/pdf_report.inc:1014
 -#: reporting/includes/doctext.inc:259 reporting/includes/pdf_report.inc:1020
++#: reporting/includes/doctext.inc:246
++msgid "Charges"
++msgstr ""
++
++#: reporting/includes/doctext.inc:247
++msgid "Credits"
++msgstr ""
++
++#: reporting/includes/doctext.inc:272 reporting/includes/pdf_report.inc:1020
  msgid "You can pay through"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:276
 -#: reporting/includes/doctext.inc:263
++#: reporting/includes/doctext.inc:276
  msgid "* Subject to Realisation of the Cheque."
  msgstr ""
  
@@@ -13443,8 -11628,7 +10851,7 @@@ msgstr "
  msgid "Modifying Customer Credit Note #%d"
  msgstr ""
  
- #: ../sales/credit_note_entry.php:51
- #: ../sales/sales_order_entry.php:692
 -#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:683
++#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:699
  msgid ""
  "There are no customers, or there are no customers with branches. Please "
  "define customers and customer branches."
@@@ -13612,398 -11788,315 +11011,350 @@@ msgstr "
  msgid "Deliver Items for a Sales Order"
  msgstr ""
  
- #: ../sales/customer_delivery.php:50
- #: ../sales/customer_delivery.php.orig:50
- #: ../sales/sales_order_entry.php:189
 -#: sales/customer_delivery.php:50 sales/sales_order_entry.php:183
++#: sales/customer_delivery.php:50 sales/sales_order_entry.php:189
  #, php-format
  msgid "Delivery # %d has been entered."
  msgstr ""
  
- #: ../sales/customer_delivery.php:52
- #: ../sales/customer_delivery.php.orig:52
- #: ../sales/sales_order_entry.php:191
 -#: sales/customer_delivery.php:52 sales/sales_order_entry.php:185
++#: sales/customer_delivery.php:52 sales/sales_order_entry.php:191
  msgid "&View This Delivery"
  msgstr ""
  
- #: ../sales/customer_delivery.php:54
- #: ../sales/customer_delivery.php:76
- #: ../sales/customer_delivery.php.orig:54
- #: ../sales/customer_delivery.php.orig:76
- #: ../sales/sales_order_entry.php:193
 -#: sales/customer_delivery.php:54 sales/customer_delivery.php:75
 -#: sales/sales_order_entry.php:187
++#: sales/customer_delivery.php:54 sales/customer_delivery.php:76
++#: sales/sales_order_entry.php:193
  msgid "&Print Delivery Note"
  msgstr ""
  
- #: ../sales/customer_delivery.php:55
- #: ../sales/customer_delivery.php:77
- #: ../sales/customer_delivery.php.orig:55
- #: ../sales/customer_delivery.php.orig:77
- #: ../sales/sales_order_entry.php:194
 -#: sales/customer_delivery.php:55 sales/customer_delivery.php:76
 -#: sales/sales_order_entry.php:188
++#: sales/customer_delivery.php:55 sales/customer_delivery.php:77
++#: sales/sales_order_entry.php:194
  msgid "&Email Delivery Note"
  msgstr ""
  
- #: ../sales/customer_delivery.php:56
- #: ../sales/customer_delivery.php:78
- #: ../sales/customer_delivery.php.orig:56
- #: ../sales/customer_delivery.php.orig:78
- #: ../sales/sales_order_entry.php:195
 -#: sales/customer_delivery.php:56 sales/customer_delivery.php:77
 -#: sales/sales_order_entry.php:189
++#: sales/customer_delivery.php:56 sales/customer_delivery.php:78
++#: sales/sales_order_entry.php:195
  msgid "P&rint as Packing Slip"
  msgstr ""
  
- #: ../sales/customer_delivery.php:57
- #: ../sales/customer_delivery.php:79
- #: ../sales/customer_delivery.php.orig:57
- #: ../sales/customer_delivery.php.orig:79
- #: ../sales/sales_order_entry.php:196
 -#: sales/customer_delivery.php:57 sales/customer_delivery.php:78
 -#: sales/sales_order_entry.php:190
++#: sales/customer_delivery.php:57 sales/customer_delivery.php:79
++#: sales/sales_order_entry.php:196
  msgid "E&mail as Packing Slip"
  msgstr ""
  
- #: ../sales/customer_delivery.php:59
- #: ../sales/customer_delivery.php.orig:59
- #: ../sales/sales_order_entry.php:199
 -#: sales/customer_delivery.php:59 sales/sales_order_entry.php:193
++#: sales/customer_delivery.php:59 sales/sales_order_entry.php:199
  msgid "View the GL Journal Entries for this Dispatch"
  msgstr ""
  
- #: ../sales/customer_delivery.php:62
- #: ../sales/customer_delivery.php.orig:62
 -#: sales/customer_delivery.php:61
++#: sales/customer_delivery.php:62
  msgid "Invoice This Delivery"
  msgstr ""
  
- #: ../sales/customer_delivery.php:64
- #: ../sales/customer_delivery.php.orig:64
 -#: sales/customer_delivery.php:63
++#: sales/customer_delivery.php:64
  msgid "Select Another Order For Dispatch"
  msgstr ""
  
- #: ../sales/customer_delivery.php:72
- #: ../sales/customer_delivery.php.orig:72
 -#: sales/customer_delivery.php:71
++#: sales/customer_delivery.php:72
  #, php-format
  msgid "Delivery Note # %d has been updated."
  msgstr ""
  
- #: ../sales/customer_delivery.php:74
- #: ../sales/customer_delivery.php.orig:74
 -#: sales/customer_delivery.php:73
++#: sales/customer_delivery.php:74
  msgid "View this delivery"
  msgstr ""
  
- #: ../sales/customer_delivery.php:82
- #: ../sales/customer_delivery.php.orig:82
 -#: sales/customer_delivery.php:80
++#: sales/customer_delivery.php:82
  msgid "Confirm Delivery and Invoice"
  msgstr ""
  
- #: ../sales/customer_delivery.php:84
- #: ../sales/customer_delivery.php.orig:84
 -#: sales/customer_delivery.php:82
++#: sales/customer_delivery.php:84
  msgid "Select A Different Delivery"
  msgstr ""
  
- #: ../sales/customer_delivery.php:94
- #: ../sales/customer_delivery.php.orig:94
- #: ../sales/customer_invoice.php:152
 -#: sales/customer_delivery.php:94
 -msgid "Select a different sales order to delivery"
++#: sales/customer_delivery.php:94 sales/customer_invoice.php:152
 +msgid ""
 +"You have to set Deferred Income Account in GL Setup to entry prepayment "
 +"invoices."
  msgstr ""
  
- #: ../sales/customer_delivery.php:97
- #: ../sales/customer_delivery.php.orig:97
 -#: sales/customer_delivery.php:95
++#: sales/customer_delivery.php:97
  msgid "This order has no items. There is nothing to delivery."
  msgstr ""
  
- #: ../sales/customer_delivery.php:100
- #: ../sales/customer_delivery.php:105
- #: ../sales/customer_delivery.php.orig:100
- #: ../sales/customer_delivery.php.orig:105
 -#: sales/customer_delivery.php:110
++#: sales/customer_delivery.php:100 sales/customer_delivery.php:105
 +msgid "Select a different sales order to delivery"
 +msgstr ""
 +
- #: ../sales/customer_delivery.php:103
- #: ../sales/customer_delivery.php.orig:103
++#: sales/customer_delivery.php:103
 +msgid ""
 +"This prepayment order is not yet ready for delivery due to insufficient "
 +"amount received."
 +msgstr ""
 +
- #: ../sales/customer_delivery.php:122
- #: ../sales/customer_delivery.php.orig:122
++#: sales/customer_delivery.php:122
  msgid "Select a different delivery"
  msgstr ""
  
- #: ../sales/customer_delivery.php:123
- #: ../sales/customer_delivery.php.orig:123
 -#: sales/customer_delivery.php:111
++#: sales/customer_delivery.php:123
  msgid "This delivery has all items invoiced. There is nothing to modify."
  msgstr ""
  
- #: ../sales/customer_delivery.php:133
- #: ../sales/customer_delivery.php.orig:133
 -#: sales/customer_delivery.php:121
++#: sales/customer_delivery.php:133
  msgid ""
  "This page can only be opened if an order or delivery note has been selected. "
  "Please select it first."
  msgstr ""
  
- #: ../sales/customer_delivery.php:135
- #: ../sales/customer_delivery.php.orig:135
 -#: sales/customer_delivery.php:123
++#: sales/customer_delivery.php:135
  msgid "Select a Sales Order to Delivery"
  msgstr ""
  
- #: ../sales/customer_delivery.php:144
- #: ../sales/customer_delivery.php.orig:144
 -#: sales/customer_delivery.php:132
++#: sales/customer_delivery.php:144
  msgid ""
  "Selected quantity cannot be less than quantity invoiced nor more than "
  "quantity\tnot dispatched on sales order."
  msgstr ""
  
- #: ../sales/customer_delivery.php:147
- #: ../sales/customer_delivery.php.orig:147
 -#: sales/customer_delivery.php:135
++#: sales/customer_delivery.php:147
  msgid "Freight cost cannot be less than zero"
  msgstr ""
  
- #: ../sales/customer_delivery.php:159
- #: ../sales/customer_delivery.php.orig:159
 -#: sales/customer_delivery.php:147
++#: sales/customer_delivery.php:159
  msgid "The entered date of delivery is invalid."
  msgstr ""
  
- #: ../sales/customer_delivery.php:171
- #: ../sales/customer_delivery.php.orig:171
 -#: sales/customer_delivery.php:153
 -msgid "The entered date of delivery is not in fiscal year."
 -msgstr ""
 -
 -#: sales/customer_delivery.php:159
++#: sales/customer_delivery.php:171
  msgid "The entered dead-line for invoice is invalid."
  msgstr ""
  
- #: ../sales/customer_delivery.php:188
- #: ../sales/customer_delivery.php.orig:194
- #: ../sales/customer_invoice.php:345
 -#: sales/customer_delivery.php:176 sales/customer_invoice.php:291
++#: sales/customer_delivery.php:188 sales/customer_invoice.php:345
  msgid "The entered shipping value is not numeric."
  msgstr ""
  
- #: ../sales/customer_delivery.php:194
- #: ../sales/customer_delivery.php.orig:200
 -#: sales/customer_delivery.php:182
++#: sales/customer_delivery.php:194
  msgid "There are no item quantities on this delivery note."
  msgstr ""
  
- #: ../sales/customer_delivery.php:297
- #: ../sales/customer_delivery.php.orig:303
- #: ../sales/sales_order_entry.php:521
- #: ../sales/includes/ui/sales_order_ui.inc.orig:244
 -#: sales/customer_delivery.php:285 sales/sales_order_entry.php:512
 -#: sales/includes/ui/sales_order_ui.inc:249
++#: sales/customer_delivery.php:297 sales/sales_order_entry.php:528
++#: sales/includes/ui/sales_order_ui.inc:251
  msgid ""
  "The delivery cannot be processed because there is an insufficient quantity "
  "for item:"
  msgstr ""
  
- #: ../sales/customer_delivery.php.orig:366
 -#: sales/customer_delivery.php:353
++#: sales/customer_delivery.php:367
  msgid "For Sales Order"
  msgstr ""
  
- #: ../sales/customer_delivery.php.orig:375
 -#: sales/customer_delivery.php:362
++#: sales/customer_delivery.php:376
  msgid "Delivery From"
  msgstr ""
  
- #: ../sales/customer_delivery.php.orig:424
 -#: sales/customer_delivery.php:411
++#: sales/customer_delivery.php:425
  msgid "Invoice Dead-line"
  msgstr ""
  
- #: ../sales/customer_delivery.php.orig:434
- #: ../sales/customer_invoice.php:530
- #: ../sales/includes/ui/sales_order_ui.inc:84
- #: ../sales/includes/ui/sales_order_ui.inc.orig:82
- #: ../sales/includes/ui/sales_order_ui.inc.orig:368
 -#: sales/customer_delivery.php:421 sales/customer_invoice.php:459
++#: sales/customer_delivery.php:435 sales/customer_invoice.php:530
+ #: sales/includes/ui/sales_order_ui.inc:84
 -#: sales/includes/ui/sales_order_ui.inc:373
++#: sales/includes/ui/sales_order_ui.inc:375
  msgid ""
  "The selected customer account is currently on hold. Please contact the "
  "credit control personnel to discuss."
  msgstr ""
  
- #: ../sales/customer_delivery.php.orig:439
 -#: sales/customer_delivery.php:426
++#: sales/customer_delivery.php:440
  msgid "Delivery Items"
  msgstr ""
  
- #: ../sales/customer_delivery.php.orig:445
 -#: sales/customer_delivery.php:432
++#: sales/customer_delivery.php:446
  msgid "Max. delivery"
  msgstr ""
  
- #: ../sales/customer_delivery.php.orig:445
- #: ../sales/customer_invoice.php:544
- #: ../sales/includes/ui/sales_order_ui.inc.orig:141
 -#: sales/customer_delivery.php:432 sales/customer_invoice.php:469
 -#: sales/includes/ui/sales_order_ui.inc:145
++#: sales/customer_delivery.php:446 sales/customer_invoice.php:544
++#: sales/includes/ui/sales_order_ui.inc:146
  msgid "Delivered"
  msgstr ""
  
- #: ../sales/customer_delivery.php.orig:506
- #: ../sales/customer_invoice.php:633
 -#: sales/customer_delivery.php:493 sales/customer_invoice.php:554
++#: sales/customer_delivery.php:515 sales/customer_invoice.php:633
  msgid "Shipping Cost"
  msgstr ""
  
- #: ../sales/customer_delivery.php.orig:526
- #: ../sales/includes/ui/sales_order_ui.inc.orig:242
 -#: sales/customer_delivery.php:513 sales/includes/ui/sales_order_ui.inc:247
++#: sales/customer_delivery.php:535 sales/includes/ui/sales_order_ui.inc:249
  msgid ""
  "Marked items have insufficient quantities in stock as on day of delivery."
  msgstr ""
  
- #: ../sales/customer_delivery.php.orig:530
 -#: sales/customer_delivery.php:517
++#: sales/customer_delivery.php:539
  msgid "Action For Balance"
  msgstr ""
  
- #: ../sales/customer_delivery.php.orig:537
- #: ../sales/customer_invoice.php:685
 -#: sales/customer_delivery.php:524 sales/customer_invoice.php:583
++#: sales/customer_delivery.php:546 sales/customer_delivery.php:548
++#: sales/customer_delivery.php:551 sales/customer_invoice.php:685
  msgid "Refresh document page"
  msgstr ""
  
- #: ../sales/customer_delivery.php.orig:538
 -#: sales/customer_delivery.php:525
++#: sales/customer_delivery.php:548
++msgid "Reset quantity"
++msgstr ""
++
++#: sales/customer_delivery.php:551
++msgid "Clear quantity"
++msgstr ""
++
++#: sales/customer_delivery.php:553
  msgid "Process Dispatch"
  msgstr ""
  
- #: ../sales/customer_delivery.php.orig:539
- #: ../sales/customer_invoice.php:687
- #: ../sales/sales_order_entry.php:739
 -#: sales/customer_delivery.php:526 sales/customer_invoice.php:585
 -#: sales/sales_order_entry.php:731
++#: sales/customer_delivery.php:554 sales/customer_invoice.php:687
++#: sales/sales_order_entry.php:746
  msgid "Check entered data and save document"
  msgstr ""
  
- #: ../sales/customer_invoice.php:38
 -#: sales/customer_invoice.php:37
++#: sales/customer_invoice.php:38
  #, php-format
  msgid "Modifying Sales Invoice # %d."
  msgstr ""
  
- #: ../sales/customer_invoice.php:41
 -#: sales/customer_invoice.php:40
++#: sales/customer_invoice.php:41
  msgid "Issue an Invoice for Delivery Note"
  msgstr ""
  
- #: ../sales/customer_invoice.php:43
 -#: sales/customer_invoice.php:42
++#: sales/customer_invoice.php:43
  msgid "Issue Batch Invoice for Delivery Notes"
  msgstr ""
  
- #: ../sales/customer_invoice.php:45
 -#: sales/customer_invoice.php:55
++#: sales/customer_invoice.php:45
 +msgid "Prepayment or Final Invoice Entry"
 +msgstr ""
 +
- #: ../sales/customer_invoice.php:58
++#: sales/customer_invoice.php:58
  msgid "Selected deliveries has been processed"
  msgstr ""
  
- #: ../sales/customer_invoice.php:60
- #: ../sales/customer_invoice.php:80
- #: ../sales/sales_order_entry.php:218
 -#: sales/customer_invoice.php:57 sales/customer_invoice.php:77
 -#: sales/sales_order_entry.php:212
++#: sales/customer_invoice.php:60 sales/customer_invoice.php:80
++#: sales/sales_order_entry.php:218
  msgid "&View This Invoice"
  msgstr ""
  
- #: ../sales/customer_invoice.php:62
- #: ../sales/customer_invoice.php:82
 -#: sales/customer_invoice.php:59 sales/customer_invoice.php:79
++#: sales/customer_invoice.php:62 sales/customer_invoice.php:82
  msgid "&Print This Invoice"
  msgstr ""
  
- #: ../sales/customer_invoice.php:63
- #: ../sales/customer_invoice.php:83
 -#: sales/customer_invoice.php:60 sales/customer_invoice.php:80
++#: sales/customer_invoice.php:63 sales/customer_invoice.php:83
  msgid "&Email This Invoice"
  msgstr ""
  
- #: ../sales/customer_invoice.php:65
- #: ../sales/sales_order_entry.php:231
 -#: sales/customer_invoice.php:62 sales/sales_order_entry.php:225
++#: sales/customer_invoice.php:65 sales/sales_order_entry.php:231
  msgid "View the GL &Journal Entries for this Invoice"
  msgstr ""
  
- #: ../sales/customer_invoice.php:67
 -#: sales/customer_invoice.php:64
++#: sales/customer_invoice.php:67
  msgid "Select Another &Delivery For Invoicing"
  msgstr ""
  
- #: ../sales/customer_invoice.php:78
 -#: sales/customer_invoice.php:75
++#: sales/customer_invoice.php:78
  #, php-format
  msgid "Sales Invoice # %d has been updated."
  msgstr ""
  
- #: ../sales/customer_invoice.php:85
 -#: sales/customer_invoice.php:82
++#: sales/customer_invoice.php:85
  msgid "Select Another &Invoice to Modify"
  msgstr ""
  
- #: ../sales/customer_invoice.php:124
 -#: sales/customer_invoice.php:121
++#: sales/customer_invoice.php:124
  msgid "Select a different delivery to invoice"
  msgstr ""
  
- #: ../sales/customer_invoice.php:125
 -#: sales/customer_invoice.php:122
++#: sales/customer_invoice.php:125
  msgid ""
  "There are no delivered items with a quantity left to invoice. There is "
  "nothing left to invoice."
  msgstr ""
  
- #: ../sales/customer_invoice.php:146
 -#: sales/customer_invoice.php:131
++#: sales/customer_invoice.php:146
  msgid ""
 -"There are no delivery notes for this invoice.<br>\n"
 -"\t\tMost likely this invoice was created in Front Accounting version prior "
 -"to 2.0\n"
 -"\t\tand therefore can not be modified."
 +"All quantities on this invoice has been credited. There is nothing to modify "
 +"on this invoice"
  msgstr ""
  
- #: ../sales/customer_invoice.php:160
 -#: sales/customer_invoice.php:140
++#: sales/customer_invoice.php:160
  msgid ""
 -"All quantities on this invoice has been credited. There is nothing to modify "
 -"on this invoice"
 +"Please select correct Sales Order Prepayment to be invoiced and try again."
  msgstr ""
  
- #: ../sales/customer_invoice.php:191
 -#: sales/customer_invoice.php:146
++#: sales/customer_invoice.php:191
  msgid ""
  "This page can only be opened after delivery selection. Please select "
  "delivery to invoicing first."
  msgstr ""
  
- #: ../sales/customer_invoice.php:193
 -#: sales/customer_invoice.php:148
++#: sales/customer_invoice.php:193
  msgid "Select Delivery to Invoice"
  msgstr ""
  
- #: ../sales/customer_invoice.php:198
- #: ../sales/customer_invoice.php:356
 -#: sales/customer_invoice.php:153 sales/customer_invoice.php:302
++#: sales/customer_invoice.php:198 sales/customer_invoice.php:356
  msgid ""
  "Selected quantity cannot be less than quantity credited nor more than "
  "quantity not invoiced yet."
  msgstr ""
  
- #: ../sales/customer_invoice.php:312
 -#: sales/customer_invoice.php:261
++#: sales/customer_invoice.php:312
  msgid "The entered invoice date is invalid."
  msgstr ""
  
- #: ../sales/customer_invoice.php:325
 -#: sales/customer_invoice.php:267
 -msgid "The entered invoice date is not in fiscal year."
 -msgstr ""
 -
 -#: sales/customer_invoice.php:273
++#: sales/customer_invoice.php:325
  msgid "The entered invoice due date is invalid."
  msgstr ""
  
- #: ../sales/customer_invoice.php:351
 -#: sales/customer_invoice.php:297
++#: sales/customer_invoice.php:351
  msgid "There are no item quantities on this invoice."
  msgstr ""
  
- #: ../sales/customer_invoice.php:361
 -#: sales/customer_invoice.php:385
++#: sales/customer_invoice.php:361
 +msgid ""
 +"There is no non-invoiced payments for this order. If you want to issue final "
 +"invoice, select delayed or cash payment terms."
 +msgstr ""
 +
- #: ../sales/customer_invoice.php:451
++#: sales/customer_invoice.php:451
  msgid "Payment terms:"
  msgstr ""
  
- #: ../sales/customer_invoice.php:536
- #: ../sales/sales_order_entry.php:715
 -#: sales/customer_invoice.php:388 sales/includes/ui/sales_order_ui.inc:410
 -#: sales/includes/ui/sales_order_ui.inc:414
 -msgid "Payment:"
++#: sales/customer_invoice.php:536 sales/sales_order_entry.php:722
 +msgid "Sales Order Items"
  msgstr ""
  
- #: ../sales/customer_invoice.php:536
 -#: sales/customer_invoice.php:465
++#: sales/customer_invoice.php:536
  msgid "Invoice Items"
  msgstr ""
  
- #: ../sales/customer_invoice.php:545
 -#: sales/customer_invoice.php:470
++#: sales/customer_invoice.php:545
  msgid "This Invoice"
  msgstr ""
  
- #: ../sales/customer_invoice.php:552
 -#: sales/customer_invoice.php:478
++#: sales/customer_invoice.php:552
  msgid "Credited"
  msgstr ""
  
- #: ../sales/customer_invoice.php:654
 -#: sales/customer_invoice.php:572
++#: sales/customer_invoice.php:654
  msgid "Invoice Total"
  msgstr ""
  
- #: ../sales/customer_invoice.php:663
++#: sales/customer_invoice.php:663
 +msgid "Sales order:"
 +msgstr ""
 +
- #: ../sales/customer_invoice.php:675
++#: sales/customer_invoice.php:675
 +msgid "Payments received:"
 +msgstr ""
 +
- #: ../sales/customer_invoice.php:676
++#: sales/customer_invoice.php:676
 +msgid "Invoiced here:"
 +msgstr ""
 +
- #: ../sales/customer_invoice.php:677
++#: sales/customer_invoice.php:677
 +msgid "Left to be invoiced:"
 +msgstr ""
 +
- #: ../sales/customer_payments.php:33
+ #: sales/customer_payments.php:33
  msgid "Customer Payment Entry"
  msgstr ""
  
@@@ -14038,13 -12132,15 +11390,15 @@@ msgstr "
  msgid "The customer payment has been successfully updated."
  msgstr ""
  
- #: ../sales/customer_payments.php:128
- #: ../sales/sales_order_entry.php:346
+ #: sales/customer_payments.php:119
+ msgid "Select Another Customer Payment for &Edition"
+ msgstr ""
+ 
 -#: sales/customer_payments.php:134 sales/sales_order_entry.php:336
++#: sales/customer_payments.php:134 sales/sales_order_entry.php:346
  msgid "There is no customer selected."
  msgstr ""
  
- #: ../sales/customer_payments.php:135
- #: ../sales/sales_order_entry.php:353
 -#: sales/customer_payments.php:141 sales/sales_order_entry.php:343
++#: sales/customer_payments.php:141 sales/sales_order_entry.php:353
  msgid "This customer has no branch defined."
  msgstr ""
  
@@@ -14067,36 -12162,35 +11420,7 @@@ msgid "
  "valid amounts."
  msgstr ""
  
- #: ../sales/customer_payments.php:338
- #: ../sales/customer_payments.php:340
 -#: sales/customer_payments.php:334 sales/customer_payments.php:336
--msgid "From Customer:"
--msgstr ""
--
- #: ../sales/customer_payments.php:381
 -#: sales/customer_payments.php:365
--msgid "Into Bank Account:"
--msgstr ""
--
- #: ../sales/customer_payments.php:386
 -#: sales/customer_payments.php:371
--msgid "Date of Deposit:"
--msgstr ""
--
- #: ../sales/customer_payments.php:408
 -#: sales/customer_payments.php:393
--msgid "Customer prompt payment discount :"
--msgstr ""
--
- #: ../sales/customer_payments.php:417
 -#: sales/customer_payments.php:402
--msgid "Amount and discount are in customer's currency."
--msgstr ""
--
- #: ../sales/customer_payments.php:422
 -#: sales/customer_payments.php:407
--msgid "Update Payment"
--msgstr ""
--
- #: ../sales/customer_payments.php:424
 -#: sales/customer_payments.php:409
--msgid "Add Payment"
--msgstr ""
--
- #: ../sales/sales_order_entry.php:64
+ #: sales/sales_order_entry.php:64
  msgid "Direct Sales Delivery"
  msgstr ""
  
@@@ -14126,284 -12220,293 +11450,305 @@@ msgstr "
  msgid "Sales Order Entry"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:115
 -#: sales/sales_order_entry.php:109
++#: sales/sales_order_entry.php:115
  #, php-format
  msgid "Order # %d has been entered."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:117
- #: ../sales/sales_order_entry.php:137
 -#: sales/sales_order_entry.php:111 sales/sales_order_entry.php:131
++#: sales/sales_order_entry.php:117 sales/sales_order_entry.php:137
  msgid "&View This Order"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:123
 -#: sales/sales_order_entry.php:117
++#: sales/sales_order_entry.php:123
  msgid "Make &Delivery Against This Order"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:128
 -#: sales/sales_order_entry.php:122
++#: sales/sales_order_entry.php:128
  msgid "Enter a &New Order"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:135
 -#: sales/sales_order_entry.php:129
++#: sales/sales_order_entry.php:135
  #, php-format
  msgid "Order # %d has been updated."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:143
 -#: sales/sales_order_entry.php:137
++#: sales/sales_order_entry.php:143
  msgid "Confirm Order Quantities and Make &Delivery"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:146
 -#: sales/sales_order_entry.php:140
++#: sales/sales_order_entry.php:146
  msgid "Select A Different &Order"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:153
 -#: sales/sales_order_entry.php:147
++#: sales/sales_order_entry.php:153
  #, php-format
  msgid "Quotation # %d has been entered."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:155
- #: ../sales/sales_order_entry.php:173
 -#: sales/sales_order_entry.php:149 sales/sales_order_entry.php:167
++#: sales/sales_order_entry.php:155 sales/sales_order_entry.php:173
  msgid "&View This Quotation"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:157
- #: ../sales/sales_order_entry.php:175
 -#: sales/sales_order_entry.php:151 sales/sales_order_entry.php:169
++#: sales/sales_order_entry.php:157 sales/sales_order_entry.php:175
  msgid "&Print This Quotation"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:158
- #: ../sales/sales_order_entry.php:176
 -#: sales/sales_order_entry.php:152 sales/sales_order_entry.php:170
++#: sales/sales_order_entry.php:158 sales/sales_order_entry.php:176
  msgid "&Email This Quotation"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:161
- #: ../sales/sales_order_entry.php:179
 -#: sales/sales_order_entry.php:155 sales/sales_order_entry.php:173
++#: sales/sales_order_entry.php:161 sales/sales_order_entry.php:179
  msgid "Make &Sales Order Against This Quotation"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:164
 -#: sales/sales_order_entry.php:158
++#: sales/sales_order_entry.php:164
  msgid "Enter a New &Quotation"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:171
 -#: sales/sales_order_entry.php:165
++#: sales/sales_order_entry.php:171
  #, php-format
  msgid "Quotation # %d has been updated."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:182
 -#: sales/sales_order_entry.php:176
++#: sales/sales_order_entry.php:182
  msgid "Select A Different &Quotation"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:201
 -#: sales/sales_order_entry.php:195
++#: sales/sales_order_entry.php:201
  msgid "Make &Invoice Against This Delivery"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:205
 -#: sales/sales_order_entry.php:199
++#: sales/sales_order_entry.php:205
  msgid "Enter a New Template &Delivery"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:208
 -#: sales/sales_order_entry.php:202
++#: sales/sales_order_entry.php:208
  msgid "Enter a &New Delivery"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:216
 -#: sales/sales_order_entry.php:210
++#: sales/sales_order_entry.php:216
  #, php-format
  msgid "Invoice # %d has been entered."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:220
 -#: sales/sales_order_entry.php:214
++#: sales/sales_order_entry.php:220
  msgid "&Print Sales Invoice"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:221
 -#: sales/sales_order_entry.php:215
++#: sales/sales_order_entry.php:221
  msgid "&Email Sales Invoice"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:229
 -#: sales/sales_order_entry.php:223
++#: sales/sales_order_entry.php:229
  msgid "Print &Receipt"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:234
 -#: sales/sales_order_entry.php:228
++#: sales/sales_order_entry.php:234
  msgid "Enter a &New Template Invoice"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:237
 -#: sales/sales_order_entry.php:231
++#: sales/sales_order_entry.php:237
  msgid "Enter a &New Direct Invoice"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:376
 -#: sales/sales_order_entry.php:365
++#: sales/sales_order_entry.php:376
 +msgid "Pre-payment required have to be positive and less than total amount."
 +msgstr ""
 +
- #: ../sales/sales_order_entry.php:381
++#: sales/sales_order_entry.php:381
  msgid ""
  "You must enter the person or company to whom delivery should be made to."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:388
 -#: sales/sales_order_entry.php:372
++#: sales/sales_order_entry.php:388
  msgid ""
  "You should enter the street address in the box provided. Orders cannot be "
  "accepted without a valid street address."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:397
 -#: sales/sales_order_entry.php:381
++#: sales/sales_order_entry.php:397
  msgid "The shipping cost entered is expected to be numeric."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:403
 -#: sales/sales_order_entry.php:387
++#: sales/sales_order_entry.php:403
  msgid "The Valid date is invalid."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:405
 -#: sales/sales_order_entry.php:389
++#: sales/sales_order_entry.php:405
  msgid "The delivery date is invalid."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:412
 -#: sales/sales_order_entry.php:396
++#: sales/sales_order_entry.php:412
  msgid "The requested valid date is before the date of the quotation."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:414
 -#: sales/sales_order_entry.php:398
++#: sales/sales_order_entry.php:414
  msgid "The requested delivery date is before the date of the order."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:423
 -#: sales/sales_order_entry.php:407
++#: sales/sales_order_entry.php:423
  msgid "You need to define a cash account for your Sales Point."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:500
 -#: sales/sales_order_entry.php:445
++#: sales/sales_order_entry.php:461
+ msgid ""
+ "The reference number field has been increased. Please save the document "
+ "again."
+ msgstr ""
+ 
 -#: sales/sales_order_entry.php:491
++#: sales/sales_order_entry.php:507
  msgid ""
  "The item could not be updated because you are attempting to set the quantity "
  "ordered to less than 0, or the discount percent to more than 100."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:504
 -#: sales/sales_order_entry.php:495
++#: sales/sales_order_entry.php:511
  msgid "Price for inventory item must be entered and can not be less than 0"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:511
 -#: sales/sales_order_entry.php:502
++#: sales/sales_order_entry.php:518
  msgid ""
  "You attempting to make the quantity ordered a quantity less than has already "
  "been delivered. The quantity delivered cannot be modified retrospectively."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:542
 -#: sales/sales_order_entry.php:533
++#: sales/sales_order_entry.php:549
  #, php-format
  msgid "Price %s is below Standard Cost %s"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:567
 -#: sales/sales_order_entry.php:558
++#: sales/sales_order_entry.php:574
  msgid ""
  "This item cannot be deleted because some of it has already been delivered."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:596
 -#: sales/sales_order_entry.php:587
++#: sales/sales_order_entry.php:603
  msgid "Direct delivery entry has been cancelled as requested."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:597
 -#: sales/sales_order_entry.php:588
++#: sales/sales_order_entry.php:604
  msgid "Enter a New Sales Delivery"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:600
 -#: sales/sales_order_entry.php:590
++#: sales/sales_order_entry.php:606
  msgid "Direct invoice entry has been cancelled as requested."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:601
 -#: sales/sales_order_entry.php:591
++#: sales/sales_order_entry.php:607
  msgid "Enter a New Sales Invoice"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:606
- msgid ""
- "This order cannot be cancelled because some of it has already been invoiced "
- "or dispatched. However, the line item quantities may be modified."
- msgstr ""
- 
- #: ../sales/sales_order_entry.php:611
 -#: sales/sales_order_entry.php:595
++#: sales/sales_order_entry.php:611
  msgid "This sales quotation has been cancelled as requested."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:612
 -#: sales/sales_order_entry.php:596
++#: sales/sales_order_entry.php:612
  msgid "Enter a New Sales Quotation"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:616
 -#: sales/sales_order_entry.php:603
++#: sales/sales_order_entry.php:619
+ msgid "Undelivered part of order has been cancelled as requested."
+ msgstr ""
+ 
 -#: sales/sales_order_entry.php:604
++#: sales/sales_order_entry.php:620
+ msgid "Select Another Sales Order for Edition"
+ msgstr ""
+ 
 -#: sales/sales_order_entry.php:608
++#: sales/sales_order_entry.php:624
  msgid "This sales order has been cancelled as requested."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:617
 -#: sales/sales_order_entry.php:609
++#: sales/sales_order_entry.php:625
  msgid "Enter a New Sales Order"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:696
 -#: sales/sales_order_entry.php:687
++#: sales/sales_order_entry.php:702
++msgid "Invoice Date:"
++msgstr ""
++
++#: sales/sales_order_entry.php:703
  msgid "Sales Invoice Items"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:697
 -#: sales/sales_order_entry.php:688
++#: sales/sales_order_entry.php:704
  msgid "Enter Delivery Details and Confirm Invoice"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:699
 -#: sales/sales_order_entry.php:690
++#: sales/sales_order_entry.php:706
  msgid "Place Invoice"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:702
 -#: sales/sales_order_entry.php:693
++#: sales/sales_order_entry.php:708
++msgid "Delivery Date:"
++msgstr ""
++
++#: sales/sales_order_entry.php:709
  msgid "Delivery Note Items"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:703
 -#: sales/sales_order_entry.php:694
++#: sales/sales_order_entry.php:710
  msgid "Enter Delivery Details and Confirm Dispatch"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:704
 -#: sales/sales_order_entry.php:695
++#: sales/sales_order_entry.php:711
  msgid "Cancel Delivery"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:705
 -#: sales/sales_order_entry.php:696
++#: sales/sales_order_entry.php:712
  msgid "Place Delivery"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:707
 -#: sales/sales_order_entry.php:698
++#: sales/sales_order_entry.php:714
  msgid "Quotation Date:"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:708
 -#: sales/sales_order_entry.php:699
++#: sales/sales_order_entry.php:715
  msgid "Sales Quotation Items"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:709
 -#: sales/sales_order_entry.php:700
++#: sales/sales_order_entry.php:716
  msgid "Enter Delivery Details and Confirm Quotation"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:710
 -#: sales/sales_order_entry.php:701
++#: sales/sales_order_entry.php:717
  msgid "Cancel Quotation"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:711
 -#: sales/sales_order_entry.php:702
++#: sales/sales_order_entry.php:718
  msgid "Place Quotation"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:712
 -#: sales/sales_order_entry.php:703
++#: sales/sales_order_entry.php:719
  msgid "Commit Quotations Changes"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:716
 -#: sales/sales_order_entry.php:706
 -msgid "Sales Order Items"
++#: sales/sales_order_entry.php:721
++msgid "Order Date:"
+ msgstr ""
+ 
 -#: sales/sales_order_entry.php:707
++#: sales/sales_order_entry.php:723
  msgid "Enter Delivery Details and Confirm Order"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:719
 -#: sales/sales_order_entry.php:710
++#: sales/sales_order_entry.php:726
  msgid "Commit Order Changes"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:740
 -#: sales/sales_order_entry.php:732
++#: sales/sales_order_entry.php:747
  msgid "You are about to void this Document.\\nDo you want to continue?"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:743
 -#: sales/sales_order_entry.php:735
++#: sales/sales_order_entry.php:750
+ msgid ""
+ "You are about to cancel undelivered part of this order.\\nDo you want to "
+ "continue?"
+ msgstr ""
+ 
 -#: sales/sales_order_entry.php:737
++#: sales/sales_order_entry.php:752
  msgid "Validate changes and update document"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:747
 -#: sales/sales_order_entry.php:741
++#: sales/sales_order_entry.php:756
  msgid ""
  "Cancels document entry or removes sales order when editing an old document"
  msgstr ""
@@@ -14421,13 -12524,11 +11766,10 @@@ msgstr "
  msgid "Customer Allocations"
  msgstr ""
  
- #: ../sales/allocations/customer_allocation_main.php:32
- #: ../sales/manage/customer_branches.php:282
- #: ../sales/manage/customers.php:324
- #: ../sales/manage/sav.customers.php:322
- #: ../sales/inquiry/customer_allocation_inquiry.php:42
- #: ../sales/inquiry/customer_inquiry.php:44
- #: ../sales/inquiry/sales_orders_view.php:265
+ #: sales/allocations/customer_allocation_main.php:32
 -#: sales/manage/customer_branches.php:280 sales/manage/customers.php:324
++#: sales/manage/customer_branches.php:282 sales/manage/customers.php:324
+ #: sales/inquiry/customer_allocation_inquiry.php:42
 -#: sales/inquiry/customer_inquiry.php:48
 -#: sales/inquiry/sales_orders_view.php:243
++#: sales/inquiry/customer_inquiry.php:44
  msgid "Select a customer: "
  msgstr ""
  
@@@ -14533,95 -12634,88 +11875,100 @@@ msgstr "
  msgid "Selected customer branch has been deleted"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:218
 -#: sales/manage/customer_branches.php:217
++#: sales/manage/customer_branches.php:218
  msgid "Main Branch"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:237
 -#: sales/manage/customer_branches.php:236
++#: sales/manage/customer_branches.php:237
  msgid "Name and Contact"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:238
 -#: sales/manage/customer_branches.php:237
++#: sales/manage/customer_branches.php:238
  msgid "Branch Name:"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:239
 -#: sales/manage/customer_branches.php:238
++#: sales/manage/customer_branches.php:239
  msgid "Branch Short Name:"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:242
- #: ../sales/manage/customers.php:256
- #: ../sales/manage/sav.customers.php:290
 -#: sales/manage/customer_branches.php:241 sales/manage/customers.php:256
++#: sales/manage/customer_branches.php:242 sales/manage/customers.php:256
  msgid "Sales Person:"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:243
- #: ../sales/manage/customers.php:293
- #: ../sales/manage/sav.customers.php:291
 -#: sales/manage/customer_branches.php:242 sales/manage/customers.php:293
++#: sales/manage/customer_branches.php:243 sales/manage/customers.php:293
  msgid "Sales Area:"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:244
- #: ../sales/manage/recurrent_invoices.php:174
 -#: sales/manage/customer_branches.php:243
++#: sales/manage/customer_branches.php:244
+ #: sales/manage/recurrent_invoices.php:174
  msgid "Sales Group:"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:245
- #: ../sales/manage/customers.php:291
 -#: sales/manage/customer_branches.php:244 sales/manage/customers.php:291
++#: sales/manage/customer_branches.php:245 sales/manage/customers.php:291
  msgid "Default Inventory Location:"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:246
- #: ../sales/manage/customers.php:292
 -#: sales/manage/customer_branches.php:245 sales/manage/customers.php:292
++#: sales/manage/customer_branches.php:246 sales/manage/customers.php:292
  msgid "Default Shipping Company:"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:253
 -#: sales/manage/customer_branches.php:252
++#: sales/manage/customer_branches.php:249
++msgid "GL Accounts"
++msgstr ""
++
++#: sales/manage/customer_branches.php:253
  msgid "Accounts Receivable Account:"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:260
 -#: sales/manage/customer_branches.php:258
++#: sales/manage/customer_branches.php:260
  msgid "General contact data"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:270
 -#: sales/manage/customer_branches.php:268
++#: sales/manage/customer_branches.php:270
  msgid "Billing Address:"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:274
 -#: sales/manage/customer_branches.php:272
++#: sales/manage/customer_branches.php:274
  msgid "Disable this Branch:"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:297
- #: ../sales/inquiry/sales_deliveries_view.php:183
 -#: sales/manage/customer_branches.php:295
++#: sales/manage/customer_branches.php:297
+ #: sales/inquiry/sales_deliveries_view.php:183
  msgid "Contact"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:299
 -#: sales/manage/customer_branches.php:297
++#: sales/manage/customer_branches.php:299
  msgid "Area"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:300
 -#: sales/manage/customer_branches.php:298
++#: sales/manage/customer_branches.php:300
  msgid "Phone No"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:301
 -#: sales/manage/customer_branches.php:299
++#: sales/manage/customer_branches.php:301
  msgid "Fax No"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:303
 -#: sales/manage/customer_branches.php:301
++#: sales/manage/customer_branches.php:303
  msgid "Tax Group"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:321
- #: ../sales/includes/ui/sales_order_ui.inc.orig:299
 -#: sales/manage/customer_branches.php:319
 -#: sales/includes/ui/sales_order_ui.inc:304
++#: sales/manage/customer_branches.php:321
++#: sales/includes/ui/sales_order_ui.inc:306
  msgid ""
  "The selected customer does not have any branches. Please create at least one "
  "branch."
  msgstr ""
  
- #: ../sales/manage/customers.php:42
- #: ../sales/manage/sav.customers.php:42
++#: sales/manage/customer_branches.php:324 sales/manage/customers.php:344
++msgid "&General settings"
++msgstr ""
++
++#: sales/manage/customer_branches.php:325 sales/manage/customers.php:345
++msgid "&Contacts"
++msgstr ""
++
+ #: sales/manage/customers.php:42
  msgid "The customer name cannot be empty."
  msgstr ""
  
@@@ -14796,8 -12857,7 +12110,11 @@@ msgstr "
  msgid "New customer"
  msgstr ""
  
- #: ../sales/manage/customers.php:347
- #: ../sales/manage/sav.customers.php:345
++#: sales/manage/customers.php:346
++msgid "&Transactions"
++msgstr ""
++
+ #: sales/manage/customers.php:347
  msgid "Sales &Orders"
  msgstr ""
  
@@@ -15092,7 -13157,7 +12414,17 @@@ msgstr "
  msgid "There are no line items on this credit note."
  msgstr ""
  
- #: ../sales/view/view_dispatch.php:23
++#: sales/view/view_credit.php:138 sales/view/view_dispatch.php:155
++#: sales/view/view_invoice.php:159 sales/view/view_sales_order.php:245
++#: sales/includes/ui/sales_credit_ui.inc:222
++msgid "Shipping"
++msgstr ""
++
++#: sales/view/view_credit.php:143
++msgid "TOTAL CREDIT"
++msgstr ""
++
+ #: sales/view/view_dispatch.php:23
  msgid "View Sales Dispatch"
  msgstr ""
  
@@@ -15101,15 -13166,12 +12433,12 @@@
  msgid "DISPATCH NOTE #%d"
  msgstr ""
  
- #: ../sales/view/view_dispatch.php:65
- #: ../sales/view/view_invoice.php:67
 -#: sales/view/view_dispatch.php:65 sales/view/view_invoice.php:65
++#: sales/view/view_dispatch.php:65 sales/view/view_invoice.php:67
  msgid "Charge Branch"
  msgstr ""
  
- #: ../sales/view/view_dispatch.php:91
- #: ../sales/view/view_invoice.php:91
- #: ../sales/view/view_sales_order.php:63
- #: ../sales/view/view_sales_order.php.orig:63
 -#: sales/view/view_dispatch.php:91 sales/view/view_invoice.php:90
++#: sales/view/view_dispatch.php:91 sales/view/view_invoice.php:91
+ #: sales/view/view_sales_order.php:63
  msgid "Customer Order Ref."
  msgstr ""
  
@@@ -15133,22 -13195,12 +12462,22 @@@ msgstr "
  msgid "View Sales Invoice"
  msgstr ""
  
- #: ../sales/view/view_invoice.php:45
 -#: sales/view/view_invoice.php:43
++#: sales/view/view_invoice.php:45
 +#, php-format
 +msgid "FINAL INVOICE #%d"
 +msgstr ""
 +
- #: ../sales/view/view_invoice.php:45
++#: sales/view/view_invoice.php:45
 +#, php-format
 +msgid "PREPAYMENT INVOICE #%d"
 +msgstr ""
 +
- #: ../sales/view/view_invoice.php:45
++#: sales/view/view_invoice.php:45
  #, php-format
  msgid "SALES INVOICE #%d"
  msgstr ""
  
- #: ../sales/view/view_invoice.php:154
 -#: sales/view/view_invoice.php:152
++#: sales/view/view_invoice.php:154
  msgid "There are no line items on this invoice."
  msgstr ""
  
@@@ -15224,26 -13267,15 +12544,27 @@@ msgstr "
  msgid "Deliver From Location"
  msgstr ""
  
- #: ../sales/view/view_sales_order.php:86
 -#: sales/view/view_sales_order.php:82
++#: sales/view/view_sales_order.php:83
++msgid "Required Pre-Payment"
++msgstr ""
++
++#: sales/view/view_sales_order.php:86
 +msgid "Non-Invoiced Prepayments"
 +msgstr ""
 +
- #: ../sales/view/view_sales_order.php:87
++#: sales/view/view_sales_order.php:87
 +msgid "All Payments Allocated"
 +msgstr ""
 +
- #: ../sales/view/view_sales_order.php:95
- #: ../sales/view/view_sales_order.php.orig:82
++#: sales/view/view_sales_order.php:95
  msgid "Telephone"
  msgstr ""
  
- #: ../sales/view/view_sales_order.php:215
- #: ../sales/view/view_sales_order.php.orig:197
 -#: sales/view/view_sales_order.php:197
++#: sales/view/view_sales_order.php:215
  msgid "This Sales Order is used as a Template."
  msgstr ""
  
- #: ../sales/view/view_sales_order.php:220
- #: ../sales/view/view_sales_order.php.orig:202
 -#: sales/view/view_sales_order.php:202
++#: sales/view/view_sales_order.php:220
  msgid "Quantity Delivered"
  msgstr ""
  
@@@ -15259,20 -13291,20 +12580,20 @@@ msgstr "
  msgid "Payment"
  msgstr ""
  
- #: ../sales/inquiry/customer_inquiry.php:26
 -#: sales/inquiry/customer_inquiry.php:28
++#: sales/inquiry/customer_inquiry.php:26
  msgid "Customer Transactions"
  msgstr ""
  
- #: ../sales/inquiry/customer_inquiry.php:68
 -#: sales/inquiry/customer_inquiry.php:72
++#: sales/inquiry/customer_inquiry.php:68
  msgid "CUSTOMER ACCOUNT IS ON HOLD"
  msgstr ""
  
- #: ../sales/inquiry/customer_inquiry.php:181
 -#: sales/inquiry/customer_inquiry.php:205
++#: sales/inquiry/customer_inquiry.php:181
  msgid "Print Receipt"
  msgstr ""
  
- #: ../sales/inquiry/customer_inquiry.php:211
- #: ../sales/inquiry/customer_inquiry.php:224
 -#: sales/inquiry/customer_inquiry.php:235
 -#: sales/inquiry/customer_inquiry.php:248
++#: sales/inquiry/customer_inquiry.php:211
++#: sales/inquiry/customer_inquiry.php:224
  msgid "RB"
  msgstr ""
  
@@@ -15315,87 -13347,79 +12636,41 @@@ msgstr "
  msgid "Batch Invoicing"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php:44
 -#: sales/inquiry/sales_orders_view.php:40
++#: sales/inquiry/sales_orders_view.php:44
  msgid "Search Outstanding Sales Orders"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php:49
 -#: sales/inquiry/sales_orders_view.php:45
++#: sales/inquiry/sales_orders_view.php:49
  msgid "Search Template for Invoicing"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php:54
 -#: sales/inquiry/sales_orders_view.php:50
++#: sales/inquiry/sales_orders_view.php:54
  msgid "Select Template for Delivery"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php:59
 -#: sales/inquiry/sales_orders_view.php:55
 -msgid "Search All Sales Orders"
 -msgstr ""
 -
 -#: sales/inquiry/sales_orders_view.php:61
 -msgid "Search All Sales Quotations"
 -msgstr ""
 -
 -#: sales/inquiry/sales_orders_view.php:136
 -msgid "Dispatch"
 -msgstr ""
 -
 -#: sales/inquiry/sales_orders_view.php:178
 -msgid "Set this order as a template for direct deliveries/invoices"
 -msgstr ""
 -
 -#: sales/inquiry/sales_orders_view.php:245
 -msgid "Show All:"
 -msgstr ""
 -
 -#: sales/inquiry/sales_orders_view.php:262
 -msgid "Order #"
 -msgstr ""
 -
 -#: sales/inquiry/sales_orders_view.php:266
 -#: sales/inquiry/sales_orders_view.php:280
 -msgid "Cust Order Ref"
 -msgstr ""
 -
 -#: sales/inquiry/sales_orders_view.php:269
 -#: sales/inquiry/sales_orders_view.php:283
 -msgid "Delivery To"
 -msgstr ""
 -
 -#: sales/inquiry/sales_orders_view.php:276
 -msgid "Quote #"
++#: sales/inquiry/sales_orders_view.php:59
 +msgid "Invoicing Prepayment Orders"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php:64
 -#: sales/inquiry/sales_orders_view.php:281
 -msgid "Quote Date"
 -msgstr ""
 -
 -#: sales/inquiry/sales_orders_view.php:284
 -msgid "Quote Total"
++#: sales/inquiry/sales_orders_view.php:64
 +msgid "Search All Sales Orders"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php:70
 -#: sales/inquiry/sales_orders_view.php:311
 -msgid "Tmpl"
++#: sales/inquiry/sales_orders_view.php:70
 +msgid "Search All Sales Quotations"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php:148
- msgid "Dispatch"
- msgstr ""
- 
- #: ../sales/inquiry/sales_orders_view.php:191
- msgid "Set this order as a template for direct deliveries/invoices"
 -#: sales/includes/cart_class.inc:356
++#: sales/includes/cart_class.inc:390
+ msgid "You have to enter valid stock code or nonempty description"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php:200
- msgid "Prepayment Invoice"
- msgstr ""
- 
- #: ../sales/inquiry/sales_orders_view.php:200
- msgid "Final Invoice"
- msgstr ""
- 
- #: ../sales/inquiry/sales_orders_view.php:267
- msgid "Show All:"
- msgstr ""
- 
- #: ../sales/inquiry/sales_orders_view.php:284
- msgid "Order #"
- msgstr ""
- 
- #: ../sales/inquiry/sales_orders_view.php:288
- #: ../sales/inquiry/sales_orders_view.php:302
- msgid "Cust Order Ref"
- msgstr ""
- 
- #: ../sales/inquiry/sales_orders_view.php:291
- #: ../sales/inquiry/sales_orders_view.php:305
- msgid "Delivery To"
- msgstr ""
- 
- #: ../sales/inquiry/sales_orders_view.php:298
- msgid "Quote #"
- msgstr ""
- 
- #: ../sales/inquiry/sales_orders_view.php:303
- msgid "Quote Date"
- msgstr ""
- 
- #: ../sales/inquiry/sales_orders_view.php:306
- msgid "Quote Total"
- msgstr ""
- 
- #: ../sales/inquiry/sales_orders_view.php:337
- msgid "Tmpl"
- msgstr ""
- 
- #: ../sales/includes/sales_ui.inc:50
+ #: sales/includes/sales_ui.inc:50
  msgid ""
  "This edit session has been abandoned by opening sales document in another "
  "browser tab. You cannot edit more than one sales document at once."
  msgstr ""
  
- #: ../sales/includes/db/custalloc_db.inc:351
 -#: sales/includes/db/custalloc_db.inc:292
++#: sales/includes/db/custalloc_db.inc:351
  msgid ""
  "Unsuspected overallocation happened due to sparse credit notes exists for "
  "this invoice.\n"
@@@ -15403,55 -13427,41 +12678,41 @@@
  "charges."
  msgstr ""
  
- #: ../sales/includes/db/old.sales_order_db.inc:107
- #: ../sales/includes/db/old.sales_order_db.inc:259
- #: ../sales/includes/db/sales_order_db.inc:109
- #: ../sales/includes/db/sales_order_db.inc:271
- #: ../sales/includes/db/sales_order_db.inc.orig:109
- #: ../sales/includes/db/sales_order_db.inc.orig:271
 -#: sales/includes/db/sales_invoice_db.inc:174
++#: sales/includes/db/sales_invoice_db.inc:196
+ msgid "Cash invoice"
+ msgstr ""
+ 
 -#: sales/includes/db/sales_order_db.inc:107
 -#: sales/includes/db/sales_order_db.inc:259
++#: sales/includes/db/sales_order_db.inc:109
++#: sales/includes/db/sales_order_db.inc:271
  msgid "Stocks below Re-Order Level at "
  msgstr ""
  
- #: ../sales/includes/db/old.sales_order_db.inc:110
- #: ../sales/includes/db/old.sales_order_db.inc:264
- #: ../sales/includes/db/sales_order_db.inc:112
- #: ../sales/includes/db/sales_order_db.inc:276
- #: ../sales/includes/db/sales_order_db.inc.orig:112
- #: ../sales/includes/db/sales_order_db.inc.orig:276
 -#: sales/includes/db/sales_order_db.inc:110
 -#: sales/includes/db/sales_order_db.inc:264
++#: sales/includes/db/sales_order_db.inc:112
++#: sales/includes/db/sales_order_db.inc:276
  msgid "Below"
  msgstr ""
  
- #: ../sales/includes/db/old.sales_order_db.inc:111
- #: ../sales/includes/db/old.sales_order_db.inc:265
- #: ../sales/includes/db/sales_order_db.inc:113
- #: ../sales/includes/db/sales_order_db.inc:277
- #: ../sales/includes/db/sales_order_db.inc.orig:113
- #: ../sales/includes/db/sales_order_db.inc.orig:277
 -#: sales/includes/db/sales_order_db.inc:111
 -#: sales/includes/db/sales_order_db.inc:265
++#: sales/includes/db/sales_order_db.inc:113
++#: sales/includes/db/sales_order_db.inc:277
  msgid "Please reorder"
  msgstr ""
  
- #: ../sales/includes/db/old.sales_order_db.inc:139
- #: ../sales/includes/db/sales_order_db.inc:141
- #: ../sales/includes/db/sales_order_db.inc.orig:141
 -#: sales/includes/db/sales_order_db.inc:139
++#: sales/includes/db/sales_order_db.inc:141
  msgid "Deleted."
  msgstr ""
  
- #: ../sales/includes/db/sales_invoice_db.inc.orig:196
- msgid "Cash invoice"
- msgstr ""
- 
- #: ../sales/includes/ui/sales_credit_ui.inc:94
- #: ../sales/includes/ui/sales_order_ui.inc.orig:379
+ #: sales/includes/ui/sales_credit_ui.inc:94
 -#: sales/includes/ui/sales_order_ui.inc:384
++#: sales/includes/ui/sales_order_ui.inc:386
  msgid "Customer Currency:"
  msgstr ""
  
- #: ../sales/includes/ui/sales_credit_ui.inc:112
- #: ../sales/includes/ui/sales_order_ui.inc.orig:647
+ #: sales/includes/ui/sales_credit_ui.inc:112
 -#: sales/includes/ui/sales_order_ui.inc:644
++#: sales/includes/ui/sales_order_ui.inc:654
  msgid "Shipping Company:"
  msgstr ""
  
- #: ../sales/includes/ui/sales_credit_ui.inc:114
- #: ../sales/includes/ui/sales_order_ui.inc.orig:386
+ #: sales/includes/ui/sales_credit_ui.inc:114
 -#: sales/includes/ui/sales_order_ui.inc:391
++#: sales/includes/ui/sales_order_ui.inc:393
  msgid "Customer Discount:"
  msgstr ""
  
@@@ -15467,98 -13475,98 +12726,107 @@@ msgid "
  "have any branches."
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:224
 -#: sales/includes/ui/sales_order_ui.inc:229
++#: sales/includes/ui/sales_order_ui.inc:231
  msgid "Shipping Charge"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:297
 -#: sales/includes/ui/sales_order_ui.inc:302
++#: sales/includes/ui/sales_order_ui.inc:304
  msgid "No customer found for entered text."
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:323
 -#: sales/includes/ui/sales_order_ui.inc:328
++#: sales/includes/ui/sales_order_ui.inc:330
  #, php-format
  msgid "Customer's payment terms '%s' cannot be selected on this POS"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:373
 -#: sales/includes/ui/sales_order_ui.inc:378
++#: sales/includes/ui/sales_order_ui.inc:380
  msgid "Reference number unique for this document type"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:413
- #: ../sales/includes/ui/sales_order_ui.inc.orig:415
 -#: sales/includes/ui/sales_order_ui.inc:418
+ #: sales/includes/ui/sales_order_ui.inc:420
++#: sales/includes/ui/sales_order_ui.inc:422
  msgid "Price List:"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:432
 -#: sales/includes/ui/sales_order_ui.inc:437
++#: sales/includes/ui/sales_order_ui.inc:439
  msgid "Date of order receive"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:582
 -#: sales/includes/ui/sales_order_ui.inc:587
++#: sales/includes/ui/sales_order_ui.inc:589
  msgid "Cash payment"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:585
- #: ../sales/includes/ui/sales_order_ui.inc.orig:617
 -#: sales/includes/ui/sales_order_ui.inc:590
 -#: sales/includes/ui/sales_order_ui.inc:622
++#: sales/includes/ui/sales_order_ui.inc:592
++#: sales/includes/ui/sales_order_ui.inc:624
  msgid "Deliver from Location:"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:588
 -#: sales/includes/ui/sales_order_ui.inc:593
++#: sales/includes/ui/sales_order_ui.inc:595
  msgid "Cash account:"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:595
 -#: sales/includes/ui/sales_order_ui.inc:600
++#: sales/includes/ui/sales_order_ui.inc:602
  msgid "Delivery Details"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:600
 -#: sales/includes/ui/sales_order_ui.inc:605
++#: sales/includes/ui/sales_order_ui.inc:607
  msgid "Invoice Delivery Details"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:601
 -#: sales/includes/ui/sales_order_ui.inc:606
++#: sales/includes/ui/sales_order_ui.inc:608
  msgid "Invoice before"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:605
 -#: sales/includes/ui/sales_order_ui.inc:610
++#: sales/includes/ui/sales_order_ui.inc:612
  msgid "Quotation Delivery Details"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:610
 -#: sales/includes/ui/sales_order_ui.inc:615
++#: sales/includes/ui/sales_order_ui.inc:617
  msgid "Order Delivery Details"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:631
 -#: sales/includes/ui/sales_order_ui.inc:628
 -msgid "Enter requested day of delivery"
++#: sales/includes/ui/sales_order_ui.inc:618
++msgid "Required Delivery Date"
+ msgstr ""
+ 
+ #: sales/includes/ui/sales_order_ui.inc:629
++#: sales/includes/ui/sales_order_ui.inc:631
++msgid "Pre-Payment Required:"
++msgstr ""
++
++#: sales/includes/ui/sales_order_ui.inc:638
 +msgid "Enter requested day of delivery"
 +msgstr ""
 +
- #: ../sales/includes/ui/sales_order_ui.inc.orig:632
++#: sales/includes/ui/sales_order_ui.inc:639
  msgid "Enter Valid until Date"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:633
 -#: sales/includes/ui/sales_order_ui.inc:630
++#: sales/includes/ui/sales_order_ui.inc:640
  msgid "Deliver To:"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:634
 -#: sales/includes/ui/sales_order_ui.inc:631
++#: sales/includes/ui/sales_order_ui.inc:641
  msgid "Additional identifier for delivery e.g. name of receiving person"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:637
 -#: sales/includes/ui/sales_order_ui.inc:634
++#: sales/includes/ui/sales_order_ui.inc:644
  msgid "Delivery address. Default is address of customer branch"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:641
 -#: sales/includes/ui/sales_order_ui.inc:638
++#: sales/includes/ui/sales_order_ui.inc:648
  msgid "Contact Phone Number:"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:642
 -#: sales/includes/ui/sales_order_ui.inc:639
++#: sales/includes/ui/sales_order_ui.inc:649
  msgid "Phone number of ordering person. Defaults to branch phone number"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:643
 -#: sales/includes/ui/sales_order_ui.inc:640
++#: sales/includes/ui/sales_order_ui.inc:650
  msgid "Customer Reference:"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc.orig:644
 -#: sales/includes/ui/sales_order_ui.inc:641
++#: sales/includes/ui/sales_order_ui.inc:651
  msgid "Customer reference number for this order (if any)"
  msgstr ""
  
@@@ -15633,52 -13635,42 +12895,38 @@@ msgstr "
  msgid "The tax group name cannot be empty."
  msgstr ""
  
- #: ../taxes/tax_groups.php:60
- #: ../taxes/tax_groups.php.orig:62
- #: ../taxes/tax_groups.php.sav:62
 -#: taxes/tax_groups.php:61
++#: taxes/tax_groups.php:60
  msgid "Selected tax group has been updated"
  msgstr ""
  
- #: ../taxes/tax_groups.php:65
- #: ../taxes/tax_groups.php.orig:67
- #: ../taxes/tax_groups.php.sav:67
 -#: taxes/tax_groups.php:66
++#: taxes/tax_groups.php:65
  msgid "New tax group has been added"
  msgstr ""
  
- #: ../taxes/tax_groups.php:80
- #: ../taxes/tax_groups.php.orig:82
- #: ../taxes/tax_groups.php.sav:82
 -#: taxes/tax_groups.php:81
++#: taxes/tax_groups.php:80
  msgid ""
  "Cannot delete this tax group because customer branches been created "
  "referring to it."
  msgstr ""
  
- #: ../taxes/tax_groups.php:86
- #: ../taxes/tax_groups.php.orig:88
- #: ../taxes/tax_groups.php.sav:88
 -#: taxes/tax_groups.php:87
++#: taxes/tax_groups.php:86
  msgid ""
  "Cannot delete this tax group because suppliers been created referring to it."
  msgstr ""
  
- #: ../taxes/tax_groups.php:103
- #: ../taxes/tax_groups.php.orig:105
- #: ../taxes/tax_groups.php.sav:105
 -#: taxes/tax_groups.php:104
++#: taxes/tax_groups.php:103
  msgid "Selected tax group has been deleted"
  msgstr ""
  
- #: ../taxes/tax_groups.php:166
- #: ../taxes/tax_groups.php.orig:168
- #: ../taxes/tax_groups.php.sav:168
 -#: taxes/tax_groups.php:124
 -msgid "Shipping Tax"
 -msgstr ""
 -
 -#: taxes/tax_groups.php:168
 -msgid "Tax applied to Shipping:"
++#: taxes/tax_groups.php:166
 +msgid "Select the taxes that are included in this group."
  msgstr ""
  
- #: ../taxes/tax_groups.php:171
- #: ../taxes/tax_groups.php.orig:173
- #: ../taxes/tax_groups.php.sav:173
 -#: taxes/tax_groups.php:172
 -msgid "Select the taxes that are included in this group."
++#: taxes/tax_groups.php:171
 +msgid "Shipping Tax"
  msgstr ""
  
- #: ../taxes/tax_types.php:16
+ #: taxes/tax_types.php:16
  msgid "Tax Types"
  msgstr ""
  
@@@ -15758,23 -13749,23 +13005,23 @@@ msgstr "
  msgid "Upgrade from version 2.0 to 2.1"
  msgstr ""
  
- #: ../sql/alter2.1.php:36
 -#: sql/alter2.1.php:35
++#: sql/alter2.1.php:36
  msgid "Cannot retrieve bank accounts codes"
  msgstr ""
  
- #: ../sql/alter2.1.php:44
 -#: sql/alter2.1.php:43
++#: sql/alter2.1.php:44
  msgid "Cannot update bank transactions"
  msgstr ""
  
- #: ../sql/alter2.1.php:53
 -#: sql/alter2.1.php:52
++#: sql/alter2.1.php:53
  msgid "Cannot select stock identificators"
  msgstr ""
  
- #: ../sql/alter2.1.php:64
 -#: sql/alter2.1.php:63
++#: sql/alter2.1.php:64
  msgid "Cannot insert stock id into item_codes"
  msgstr ""
  
- #: ../sql/alter2.1.php:140
 -#: sql/alter2.1.php:139
++#: sql/alter2.1.php:140
  msgid ""
  "Seems that system upgrade to version 2.1 has \n"
  "\t\t\tbeen performed for this company already.<br> If something has gone \n"
@@@ -15786,24 -13777,20 +13033,24 @@@ msgstr "
  msgid "Upgrade from version 2.1/2.2beta to 2.2"
  msgstr ""
  
- #: ../sql/alter2.2.php:85
 -#: sql/alter2.2.php:84
++#: sql/alter2.2.php:85
  msgid "Cannot query max sales order number."
  msgstr ""
  
- #: ../sql/alter2.2.php:96
 -#: sql/alter2.2.php:95
++#: sql/alter2.2.php:96
  msgid "Cannot store next sales order reference."
  msgstr ""
  
- #: ../sql/alter2.2.php:251
 -#: sql/alter2.2.php:250
++#: sql/alter2.2.php:251
  msgid ""
  "Cannot upgrade extensions system: file /modules/installed_modules.php is not "
  "writeable"
  msgstr ""
  
- #: ../sql/alter2.3.php:20
+ #: sql/alter2.3.php:20
  msgid "Upgrade from version 2.2 to 2.3"
  msgstr ""
- #: ../sql/alter2.4.php:19
 +
++#: sql/alter2.4.php:19
 +msgid "Upgrade from version 2.3 to 2.4"
 +msgstr ""

diff --cc manufacturing/includes/db/work_order_costing_db.inc
index bf4493c33d467731959dc457e113531203d41e9d,0000000000000000000000000000000000000000..e6d1e123c33a9229d62e441341d2a2b4dd9b0cfd
mode 100644,000000..100644
--- 1/manufacturing/includes/db/work_order_costing_db.inc
--- /dev/null
+++ b/manufacturing/includes/db/work_order_costing_db.inc
@@@ -1,188 -1,0 +1,291 @@@
- 
 +<?php
 +/**********************************************************************
 +    Copyright (C) FrontAccounting, LLC.
 +      Released under the terms of the GNU General Public License, GPL, 
 +      as published by the Free Software Foundation, either version 3 
 +      of the License, or (at your option) any later version.
 +    This program is distributed in the hope that it will be useful,
 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
 +    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 +***********************************************************************/
 +
 +function add_wo_costing($workorder_id, $cost_type, $trans_type, $trans_no, $factor=1)
 +{
 +      $sql = "INSERT INTO ".TB_PREF."wo_costing (workorder_id, cost_type, trans_type, trans_no, factor)
 +              VALUES (".db_escape($workorder_id).","
 +              .db_escape($cost_type).",".db_escape($trans_type).","
 +              .db_escape($trans_no).",".db_escape($factor).")";
 +
 +      db_query($sql, "could not add work order costing");
 +
 +}
 +
 +function get_wo_costing($workorder_id)
 +{
 +      $sql="SELECT * FROM ".TB_PREF."wo_costing WHERE workorder_id=".db_escape($workorder_id);
 +
 +      return db_query($sql, "could not get work order costing");
 +}
 +
 +function delete_wo_costing($trans_type, $trans_no)
 +{
 +      $sql="DELETE FROM ".TB_PREF."wo_costing WHERE trans_type=".db_escape($trans_type)
 +              ." AND trans_no=".db_escape($trans_no);
 +
 +      db_query($sql, "could not delete work order costing");
 +}
- function add_material_cost($stock_id, $qty, $date_)
 +//--------------------------------------------------------------------------------------
 +
-       //$dec = user_price_dec();
-       //price_decimal_format($m_cost, $dec);
-       $sql = "SELECT material_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
++function add_material_cost($stock_id, $qty, $date_, $advanced=false)
 +{
 +      $m_cost = 0;
 +    $result = get_bom($stock_id);
 +      while ($bom_item = db_fetch($result))
 +      {
 +              $standard_cost = get_standard_cost($bom_item['component']);
 +              $m_cost += ($bom_item['quantity'] * $standard_cost);
 +      }
-       //$qoh = get_qoh_on_date($stock_id, null, $date_);
++      $bom_cost = $m_cost;
++      
++      $sql = "SELECT material_cost, labour_cost, overhead_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
 +              .db_escape($stock_id);
 +      $result = db_query($sql);
 +      $myrow = db_fetch($result);
 +      $material_cost =  $myrow['material_cost'];
-       //$material_cost = round2($material_cost, $dec);        
-       $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=$material_cost
-               WHERE stock_id=".db_escape($stock_id);
++      
++      if ($advanced)
++      {
++              //reduce overhead_cost and labour_cost from price as those will remain as is
++              $m_cost = $m_cost - $myrow['labour_cost'] - $myrow['overhead_cost'];
++      }
++      
 +      $qoh = get_qoh_on_date($stock_id);
++      $cost_adjust = false;
 +      if ($qoh < 0)
++      {
++              if ($qoh + $qty >= 0)
++                      $cost_adjust = true;
 +              $qoh = 0;
++      }               
 +      if ($qoh + $qty != 0)   
 +              $material_cost = ($qoh * $material_cost + $qty * $m_cost) /     ($qoh + $qty);
- function add_overhead_cost($stock_id, $qty, $date_, $costs)
++      
++      if ($advanced && $cost_adjust) // new 2010-02-10
++              adjust_deliveries($stock_id, $bom_cost, $date_);        
++      
++      $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($material_cost)."
++                  WHERE stock_id=".db_escape($stock_id);
 +      db_query($sql,"The cost details for the inventory item could not be updated");
 +}
 +
-       //$dec = user_price_dec();
-       //price_decimal_format($costs, $dec); 
++function add_overhead_cost($stock_id, $qty, $date_, $costs, $adj_only=false)
 +{
-       //$qoh = get_qoh_on_date($stock_id, null, $date_);
 +      if ($qty != 0)
 +              $costs /= $qty;
 +      $sql = "SELECT overhead_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
 +              .db_escape($stock_id);
 +      $result = db_query($sql);
 +      $myrow = db_fetch($result);
 +      $overhead_cost =  $myrow['overhead_cost'];
-       if ($qoh + $qty != 0)   
-               $overhead_cost = ($qoh * $overhead_cost + $qty * $costs) /      ($qoh + $qty);
-       //$overhead_cost = round2($overhead_cost, $dec);        
 +      $qoh = get_qoh_on_date($stock_id);
 +      if ($qoh < 0)
 +              $qoh = 0;
- function add_labour_cost($stock_id, $qty, $date_, $costs)
++      if ($adj_only)
++      {
++              if ($qty != 0)
++                      $costs = $qty * $costs;
++              if ($qoh>0)
++                      $overhead_cost = ($qoh * $overhead_cost + $costs) / $qoh;
++              else // Journal Entry if QOH is 0/negative 
++              {
++                      global $Refs;
++
++                      $id = get_next_trans_no(ST_JOURNAL);
++                      $ref = $Refs->get_next(ST_JOURNAL);
++                      
++                      $stock_gl_code = get_stock_gl_code($stock_id);
++                      $memo = "WO Overhead cost settlement JV for zero/negative respository of ".$stock_id;
++                      //Reverse the inventory effect if $qoh <=0
++                      add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
++                              $stock_gl_code["inventory_account"],
++                              $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, 
++                              -$costs);
++                      //GL Posting to inventory adjustment account
++                      add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
++                              $stock_gl_code["adjustment_account"],
++                              $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,
++                              $costs);
++                              
++                      add_audit_trail(ST_JOURNAL, $id, $date_);
++                      add_comments(ST_JOURNAL, $id, $date_, $memo);
++                      $Refs->save(ST_JOURNAL, $id, $ref);     
++              }
++      }
++      else
++      {               
++              if ($qoh + $qty != 0)   
++                      $overhead_cost = ($qoh * $overhead_cost + $qty * $costs) /      ($qoh + $qty);
++      }
 +      $sql = "UPDATE ".TB_PREF."stock_master SET overhead_cost=".db_escape($overhead_cost)."
 +              WHERE stock_id=".db_escape($stock_id);
 +      db_query($sql,"The cost details for the inventory item could not be updated");
 +}
 +
-       //$dec = user_price_dec();
-       //price_decimal_format($costs, $dec); 
++function add_labour_cost($stock_id, $qty, $date_, $costs, $adj_only=false)
 +{
-       //$qoh = get_qoh_on_date($stock_id, null, $date_);
 +      if ($qty != 0)
 +              $costs /= $qty;
 +      $sql = "SELECT labour_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
 +              .db_escape($stock_id);
 +      $result = db_query($sql);
 +      $myrow = db_fetch($result);
 +      $labour_cost =  $myrow['labour_cost'];
-       if ($qoh + $qty != 0)   
-               $labour_cost = ($qoh * $labour_cost + $qty * $costs) /  ($qoh + $qty);
-       //$labour_cost = round2($labour_cost, $dec);    
 +      $qoh = get_qoh_on_date($stock_id);
 +      if ($qoh < 0)
 +              $qoh = 0;
- function add_issue_cost($stock_id, $qty, $date_, $costs)
++      if ($adj_only)
++      {
++              if ($qty != 0)
++                      $costs = $qty * $costs;
++              if ($qoh>0)
++                      $labour_cost = ($qoh * $labour_cost + $costs) / $qoh;   
++              else // Journal Entry if QOH is 0/negative 
++              {
++                      global $Refs;
++
++                      $id = get_next_trans_no(ST_JOURNAL);
++                      $ref = $Refs->get_next(ST_JOURNAL);
++                      
++                      $stock_gl_code = get_stock_gl_code($stock_id);
++                      $memo = "WO labour cost settlement JV for zero/negative respository of ".$stock_id;
++                      //Reverse the inventory effect if $qoh <=0
++                      add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
++                              $stock_gl_code["inventory_account"],
++                              $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, 
++                              -$costs);
++                      //GL Posting to inventory adjustment account
++                      add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
++                              $stock_gl_code["adjustment_account"],
++                              $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,
++                              $costs);
++                              
++                      add_audit_trail(ST_JOURNAL, $id, $date_);
++                      add_comments(ST_JOURNAL, $id, $date_, $memo);
++                      $Refs->save(ST_JOURNAL, $id, $ref);     
++              }
++      }
++      else
++      {               
++              if ($qoh + $qty != 0)   
++                      $labour_cost = ($qoh * $labour_cost + $qty * $costs) /  ($qoh + $qty);
++      }       
 +      $sql = "UPDATE ".TB_PREF."stock_master SET labour_cost=".db_escape($labour_cost)."
 +              WHERE stock_id=".db_escape($stock_id);
 +      db_query($sql,"The cost details for the inventory item could not be updated");
 +}
 +
-       //$dec = user_price_dec();
-       //price_decimal_format($material_cost, $dec); 
-       //$qoh = get_qoh_on_date($stock_id, null, $date_);
++function add_issue_cost($stock_id, $qty, $date_, $costs, $adj_only=false)
 +{
 +      if ($qty != 0)
 +              $costs /= $qty;
 +      $sql = "SELECT material_cost FROM ".TB_PREF."stock_master WHERE stock_id = "
 +              .db_escape($stock_id);
 +      $result = db_query($sql);
 +      $myrow = db_fetch($result);
 +      $material_cost =  $myrow['material_cost'];
-       if ($qoh + $qty != 0)   
-               $material_cost = ($qty * $costs) /      ($qoh + $qty);
-       //$material_cost = round2($material_cost, $dec);        
 +      $qoh = get_qoh_on_date($stock_id);
 +      if ($qoh < 0)
 +              $qoh = 0;
++      if ($adj_only)
++      {
++              if ($qty != 0)
++                      $costs = $qty * $costs;
++              if ($qoh>0)
++                      $material_cost = $costs / $qoh;
++              else // Journal Entry if QOH is 0/negative
++              {
++                      global $Refs;
++
++                      $id = get_next_trans_no(ST_JOURNAL);
++                      $ref = $Refs->get_next(ST_JOURNAL);
++                      
++                      $stock_gl_code = get_stock_gl_code($stock_id);
++                      $memo = "WO Issue settlement JV for zero/negative respository of ".$stock_id;
++                      //Reverse the inventory effect if $qoh <=0
++                      add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
++                              $stock_gl_code["inventory_account"],
++                              $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, 
++                              -$costs);
++                      //GL Posting to inventory adjustment account
++                      add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
++                              $stock_gl_code["adjustment_account"],
++                              $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,
++                              $costs);
++                              
++                      add_audit_trail(ST_JOURNAL, $id, $date_);
++                      add_comments(ST_JOURNAL, $id, $date_, $memo);
++                      $Refs->save(ST_JOURNAL, $id, $ref);     
++              }
++      }
++      else
++      {
++              if ($qoh + $qty != 0)   
++                      $material_cost = ($qty * $costs) /      ($qoh + $qty);
++      }       
 +      $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=material_cost+"
 +              .db_escape($material_cost)
 +              ." WHERE stock_id=".db_escape($stock_id);
 +      db_query($sql,"The cost details for the inventory item could not be updated");
 +}
 +
 +/*
 +      Create journal entry for WO related costs.
 +*/
 +function add_wo_costs_journal($wo_id, $amount, $cost_type, $cr_acc, $db_acc, $date, $dim1=0, $dim2=0, $memo = null, $ref= null)
 +{
 +//-------- this should be done by single call to write_journal_entries() using items_cart()
 +//
 +      global $Refs, $wo_cost_types;
 +
 +      begin_transaction();
 +
 +    $journal_id = get_next_trans_no(ST_JOURNAL);
 +    if (!$ref) $ref = $Refs->get_next(ST_JOURNAL);
 +
 +      add_gl_trans_std_cost(ST_JOURNAL, $journal_id, $date, $cr_acc,
 +              0, 0, $wo_cost_types[$cost_type], -$amount);
 +      $is_bank_to = is_bank_account($cr_acc);
 +      if ($is_bank_to)
 +      {
 +              add_bank_trans(ST_JOURNAL, $journal_id, $is_bank_to, "",
 +                      $date, -$amount, PT_WORKORDER, $wo_id, get_company_currency(),
 +                      "Cannot insert a destination bank transaction");
 +      }
 +
 +      add_gl_trans_std_cost(ST_JOURNAL, $journal_id, $date, $db_acc,
 +              $dim1, $dim2,  $wo_cost_types[$cost_type], $amount);
 +
 +      $Refs->save(ST_JOURNAL, $journal_id, $ref);
 +
 +      add_wo_costing($wo_id, $cost_type, ST_JOURNAL, $journal_id);
 +
 +      add_comments(ST_JOURNAL, $journal_id, $date, $memo);
 +      add_audit_trail(ST_JOURNAL, $journal_id, $date);
 +
 +      commit_transaction();
 +}
 +
 +function void_wo_costing($wo_id)
 +{
 +      $res = get_wo_costing($wo_id);
 +
 +      while($row = db_fetch($res))
 +      {
 +              // void any related gl trans
 +              void_gl_trans($row['trans_type'], $row['trans_no'], true);
 +      }
 +
 +      $sql = "DELETE FROM ".TB_PREF."wo_costing WHERE workorder_id=".db_escape($wo_id);
 +      db_query($sql, "could not delete work order costing");
 +}

diff --cc manufacturing/includes/db/work_orders_db.inc
index eb31056809b6c4f81d88bc4b8b9faacfbce5ed2c,a79c2574dab6e626556bc66d3ffb9a610fb71d3c..9bfebb758d920995ea1df620df42d58cbfb81e0e
--- 1/manufacturing/includes/db/work_orders_db.inc
--- 2/manufacturing/includes/db/work_orders_db.inc
+++ b/manufacturing/includes/db/work_orders_db.inc
@@@ -248,39 -436,42 +248,49 @@@ function void_work_order($woid
                $qty = 0;
                while ($row = db_fetch($result))
                {
 -                      void_work_order_produce($row['id']);
 +                      $qty += $row['quantity'];
 +                      // clear the production record
 +                      $sql = "UPDATE ".TB_PREF."wo_manufacture SET quantity=0 WHERE id=".$$row['id'];
 +                      db_query($sql, "Cannot void a wo production");
                        
-                       void_stock_move(ST_MANURECEIVE, $row['id']); // and void the stock moves; 
+                       //Post voided entry if not prevoided explicitly
+                       $void_entry = get_voided_entry(ST_MANURECEIVE, $row['id']);
+                       if ($void_entry)
+                               continue;
+                       $memo_ = _("Voiding Work Order Trans # ").$woid;
+                       add_audit_trail(ST_MANURECEIVE, $row['id'], today(), _("Voided.")."\n".$memo_);
+                       add_voided_entry(ST_MANURECEIVE, $row['id'], today(), $memo_);
                }
-               $result = get_additional_issues($woid); // check the issued quantities
+ 
+               $result = get_work_order_issues($woid);
                $cost = 0;
                $issue_no = 0;
                while ($row = db_fetch($result))
                {
 -                      void_work_order_issue($row['issue_no']);
 -                      
 -                      //Post voided entry if not prevoided explicitly
 -                      $void_entry = get_voided_entry(ST_MANUISSUE, $row['issue_no']);
 -                      if ($void_entry)
 -                              continue;
 -                      $memo_ = _("Voiding Work Order Trans # ").$woid;
 -                      add_audit_trail(ST_MANUISSUE, $row['issue_no'], today(), _("Voided.")."\n".$memo_);
 -                      add_voided_entry(ST_MANUISSUE, $row['issue_no'], today(), $memo_);                              
 -              }
 +                      $std_cost = get_standard_cost($row['stock_id']);
 +                      $icost = $std_cost * $row['qty_issued'];
 +                      $cost += $icost;
 +                      if ($issue_no == 0)
 +                              $issue_no = $row['issue_no'];
 +                      // void the actual issue items and their quantities
 +                      $sql = "UPDATE ".TB_PREF."wo_issue_items SET qty_issued = 0 WHERE issue_id="
 +                              .db_escape($row['id']);
 +                      db_query($sql,"A work order issue item could not be voided");
 +              }       
 +              if ($issue_no != 0)
 +                      void_stock_move(ST_MANUISSUE, $issue_no); // and void the stock moves 
 +              if ($cost != 0)
 +                      add_issue_cost($work_order['stock_id'], -$qty, $date, $cost);
  
-               $cost = get_gl_wo_cost($woid, WO_LABOUR); // get the labour cost and reduce avg cost
+               //Adust avg labour cost
+               $cost = get_gl_wo_cost($woid, WO_LABOUR); 
                if ($cost != 0)
-                       add_labour_cost($work_order['stock_id'], -$qty, $date, $cost);
-               $cost = get_gl_wo_cost($woid, WO_OVERHEAD); // get the overhead cost and reduce avg cost
+                       add_labour_cost($work_order['stock_id'], 1, $date, -$cost, true);
+                       
+               //Adust avg overhead cost
+               $cost = get_gl_wo_cost($woid, WO_OVERHEAD); 
                if ($cost != 0)
 -                      add_overhead_cost($work_order['stock_id'], 1, $date, -$cost, true);
 +                      add_overhead_cost($work_order['stock_id'], -$qty, $date, $cost);
                
                $sql = "UPDATE ".TB_PREF."workorders SET closed=1,units_reqd=0,units_issued=0 WHERE id = "
                        .db_escape($woid);

diff --cc manufacturing/includes/db/work_orders_quick_db.inc
index bcf9688f0ef015e1d5270a564042ed5b91c95664,43e0d5bb1f7098409f0458583673f0d93f86352f..33350aeb11c2197ff3ae5c2269e23854db729e56
--- 1/manufacturing/includes/db/work_orders_quick_db.inc
--- 2/manufacturing/includes/db/work_orders_quick_db.inc
+++ b/manufacturing/includes/db/work_orders_quick_db.inc
@@@ -66,12 -66,29 +66,22 @@@ function add_work_order_quick($wo_ref, 
          db_query($sql, "The work order requirements could not be added");
  
                // insert a -ve stock move for each item
 -              // Chaitanya: Updated to record price and cost as std_cost for work order issued item
 -              $UnitCost = get_standard_cost($bom_item["component"]);
                add_stock_move(ST_WORKORDER, $bom_item["component"], $woid,
-                       $bom_item["loc_code"], $date_, $wo_ref, -$item_quantity, 0);
+                       $bom_item["loc_code"], $date_, $wo_ref, -$item_quantity, $UnitCost, 0, 1, $UnitCost);
+       }
+       
+       // -------------------------------------------------------------------------
+       //Negative Stock Handling
+       $qoh = get_qoh_on_date($stock_id);
+       $cost_adjust = false;
+       if ($qoh < 0)
+       {
+               if ($qoh + $units_reqd >= 0)
+                       $cost_adjust = true;
        }
  
 +
        // -------------------------------------------------------------------------
 -      
 -      //Negative Stock Handling First; Prior to add_stock_move
 -      if ($cost_adjust)
 -              adjust_deliveries($stock_id, get_standard_cost($stock_id), $date_);
 -              
 -      // -------------------------------------------------------------------------    
  
        // insert a +ve stock move for the item being manufactured
        add_stock_move(ST_WORKORDER, $stock_id, $woid,  $loc_code, $date_,

diff --cc manufacturing/work_order_entry.php
Simple merge

diff --cc purchasing/includes/db/invoice_db.inc
index c86cac721dc116da2b756c8db4a3fcfd4f014313,72bc656e278621c1028e2a618a955808bfe997e0..322c12911edb8ccf88deb88823f11cd90f26fa43
--- 1/purchasing/includes/db/invoice_db.inc
--- 2/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@@ -124,20 -118,14 +124,22 @@@ function add_supp_invoice(&$supp_trans
        global $Refs;
  
        //$company_currency = get_company_currency();
 +      $trans_no = $supp_trans->trans_no;
 +      $trans_type = $supp_trans->trans_type;
        /*Start an sql transaction */
        begin_transaction();
 -      hook_db_prewrite($supp_trans, $supp_trans->trans_type);
 +      hook_db_prewrite($supp_trans, $trans_type);
        $tax_total = 0;
      $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id);
 +      if ($trans_no) {
 +              $allocs = get_payments_for($trans_no, $trans_type); // save allocations
 +              void_transaction($trans_type, $trans_no, Today(), _("Document reentered."));
 +              $Refs->restore_last($trans_type, $trans_no);
 +      } else
 +              $allocs = get_po_prepayments($supp_trans);
  
+       $supplier = get_supplier($supp_trans->supplier_id);
+ 
      foreach ($taxes as $n => $taxitem)
      {
                $taxes[$n]['Value'] =  round2($taxitem['Value'], user_price_dec());
@@@ -218,7 -204,9 +219,8 @@@
                $line_taxfree = $entered_grn->taxfree_charge_price($supp_trans->tax_group_id);
                $line_tax = $entered_grn->full_charge_price($supp_trans->tax_group_id) - $line_taxfree;
                $stock_gl_code = get_stock_gl_code($entered_grn->item_code);
- 
 -              
+               $dim = $supplier['dimension_id'] ? $supplier['dimension_id'] : $stock_gl_code['dimension_id'];
+               $dim2 = $supplier['dimension2_id'] ? $supplier['dimension2_id'] : $stock_gl_code['dimension2_id'];
        if ($trans_type == ST_SUPPCREDIT)
                {
                        $iv_act = (is_inventory_item($entered_grn->item_code) ? $stock_gl_code["inventory_account"] : 
@@@ -261,11 -247,10 +261,10 @@@
                                $currency = get_supplier_currency($supp_trans->supplier_id);
                                $ex_rate = get_exchange_rate_from_home_currency($currency, $old_date);
                                $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $iv_act,
-                                       $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
-                                       $entered_grn->this_quantity_inv * $old_price, $supp_trans->supplier_id, "", $ex_rate);
+                                       $dim, $dim2, $entered_grn->this_quantity_inv * $old_price, $supp_trans->supplier_id, "", $ex_rate);
                                $diff = get_diff_in_home_currency($supp_trans->supplier_id, $old_date, $date_, $old_price, 
                                        $line_taxfree); 
 -                      
 +
                                // always return due to change in currency.
                                /*$mat_cost = update_average_material_cost(null, $entered_grn->item_code,
                                        $diff, $entered_grn->this_quantity_inv, $old_date, true); */

diff --cc purchasing/includes/db/supp_trans_db.inc
Simple merge

diff --cc purchasing/includes/po_class.inc
Simple merge

diff --cc purchasing/includes/ui/po_ui.inc
Simple merge

diff --cc purchasing/inquiry/supplier_inquiry.php
index d1e2ee82f4ebc3fc4f070f7e3242d047952ee809,1e106d0edebbf31be72210045d1c2a62c1c5e486..94ab527597ffec00951249db3dc8488b7c4773bc
--- 1/purchasing/inquiry/supplier_inquiry.php
--- 2/purchasing/inquiry/supplier_inquiry.php
+++ b/purchasing/inquiry/supplier_inquiry.php
@@@ -160,14 -160,9 +160,14 @@@ function check_overdue($row
        return $row['OverDue'] == 1
                && (abs($row["TotalAmount"]) - $row["Allocated"] != 0);
  }
 +
 +function edit_link($row)
 +{
 +      return edit_trans_link($row['type'], $row['trans_no']);
 +}
  //------------------------------------------------------------------------------------------------
  
- $sql = get_sql_for_supplier_inquiry();
+ $sql = get_sql_for_supplier_inquiry($_POST['filterType'], $_POST['TransAfterDate'], $_POST['TransToDate'], $_POST['supplier_id']);
  
  $cols = array(
                        _("Type") => array('fun'=>'systype_name', 'ord'=>''), 

diff --cc purchasing/manage/suppliers.php
index 287849ff9d765c980a9fb1d73fa9da04aa6cff6c,35ba173d69aba02efd1b3e04fae0d4c0b7fa6f9d..bc8f3f28ccde84a6f9bd29a7ed815311fff9c54e
--- 1/purchasing/manage/suppliers.php
--- 2/purchasing/manage/suppliers.php
+++ b/purchasing/manage/suppliers.php
@@@ -216,7 -214,7 +216,7 @@@ if (isset($_POST['submit'])
                                $_POST['website'], $_POST['supp_account_no'], $_POST['bank_account'], 
                                input_num('credit_limit', 0), $_POST['dimension_id'], $_POST['dimension2_id'], $_POST['curr_code'],
                                $_POST['payment_terms'], $_POST['payable_account'], $_POST['purchase_account'], $_POST['payment_discount_account'],
-                               $_POST['notes'], $_POST['tax_group_id'], @$_POST['tax_included'], get_post('tax_algorithm'));
 -                              $_POST['notes'], $_POST['tax_group_id'], get_post('tax_included', 0));
++                              $_POST['notes'], $_POST['tax_group_id'], get_post('tax_included', 0), get_post('tax_algorithm'));
                        update_record_status($_POST['supplier_id'], $_POST['inactive'],
                                'suppliers', 'supplier_id');
  

diff --cc purchasing/po_entry_items.php
Simple merge

diff --cc purchasing/supplier_credit.php
Simple merge

diff --cc purchasing/supplier_payment.php
Simple merge

diff --cc reporting/includes/doctext.inc
index 21b3a8479508d2d59a31a2cad12d5e5fb3eaa4db,bf45b1ce355fbd67ce487cf61f366d5d72217bba..06bb7b1f7b24816dbc6adbd70475164d3790ada9
--- 1/reporting/includes/doctext.inc
--- 2/reporting/includes/doctext.inc
+++ b/reporting/includes/doctext.inc
@@@ -283,3 -270,6 +283,5 @@@
                foreach(explode("\n", $this->company['legal_text']) as $line)
                        $Footer[] = $line;
        }
 -?>
+ 
+       $this->formData['recipient_name'] = $Addr1['name'];

diff --cc reporting/includes/pdf_report.inc
Simple merge

diff --cc reporting/includes/reporting.inc
Simple merge

diff --cc reporting/rep107.php
Simple merge

diff --cc reporting/rep108.php
index de5d19408663409bc8c2a02761a71bb5722e43dc,894e7f61e5442fcc4afcbf9047ec3d1e7842adc9..59a558903e3292e717166aac0042b737e8f723c1
--- 1/reporting/rep108.php
--- 2/reporting/rep108.php
+++ b/reporting/rep108.php
@@@ -83,8 -83,9 +83,9 @@@ function print_statements(
  
        if ($email == 0)
                $rep = new FrontReport(_('STATEMENT'), "StatementBulk", user_pagesize(), 9, $orientation);
 -   if ($orientation == 'L')
 +    if ($orientation == 'L')
        recalculate_cols($cols);
 - 
++
        $sql = "SELECT debtor_no, name AS DebtorName, address, tax_id, curr_code, curdate() AS tran_date FROM ".TB_PREF."debtors_master";
        if ($customer != ALL_TEXT)
                $sql .= " WHERE debtor_no = ".db_escape($customer);

diff --cc reporting/rep109.php
index b5acbab7050552482d353ebcc2ee41f06b4e39f4,3251efcf5cc2bbc068b432eae3dc2e97e9680b0a..1f7270c4840e1c1885d3b013430ee38fea7dede7
--- 1/reporting/rep109.php
--- 2/reporting/rep109.php
+++ b/reporting/rep109.php
@@@ -77,23 -76,27 +77,32 @@@ function print_sales_orders(
                $params['bankaccount'] = $baccount['id'];
                $branch = get_branch($myrow["branch_code"]);
                if ($email == 1)
 +                      $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
 +              $rep->SetHeaderType('Header2');
 +              $rep->currency = $cur;
 +              $rep->Font();
 +              if ($print_as_quote == 1)
                {
-                       $rep->title = _('QUOTE');
-                       $rep->filename = "Quote" . $i . ".pdf";
+                       $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
+                       if ($print_as_quote == 1)
+                       {
+                               $rep->title = _('QUOTE');
+                               $rep->filename = "Quote" . $i . ".pdf";
+                       }
+                       else
+                       {
+                               $rep->title = _("SALES ORDER");
+                               $rep->filename = "SalesOrder" . $i . ".pdf";
+                       }
                }
                else
-               {
-                       $rep->title = _("SALES ORDER");
-                       $rep->filename = "SalesOrder" . $i . ".pdf";
-               }
+                       $rep->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER"));
+               $rep->SetHeaderType('Header2');
+               $rep->currency = $cur;
+               $rep->Font();
                $rep->Info($params, $cols, null, $aligns);
  
-               $contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no'], false);
+               $contacts = get_branch_contacts($branch['branch_code'], 'order', $branch['debtor_no'], true);
                $rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESORDER, $contacts);
                $rep->NewPage();
  

diff --cc reporting/rep110.php
Simple merge

diff --cc reporting/rep111.php
Simple merge

diff --cc reporting/rep112.php
Simple merge

diff --cc reporting/rep113.php
Simple merge

diff --cc reporting/rep210.php
Simple merge

diff --cc reporting/rep304.php
index f966702990b6f33287f712e4de4f47df858a4f99,9febce1c819bb600fc0aa7956a26bdd14708fea3..63c6fc2eb5aa2872ef3021adeb16e2456d27c6c4
--- 1/reporting/rep304.php
--- 2/reporting/rep304.php
+++ b/reporting/rep304.php
@@@ -201,5 -201,5 +201,3 @@@ function print_inventory_sales(
        $rep->NewLine();
      $rep->End();
  }
--
--?>

diff --cc reporting/rep305.php
Simple merge

diff --cc reporting/rep306.php
index 92eb08fc5819000e4ff154de5cb2fbc231e027d0,8f635653b361a7da7969c1d649e5ef06f98fbd26..77f367471c8ab0271610dd98f48dea033ab0a46f
--- 1/reporting/rep306.php
--- 2/reporting/rep306.php
+++ b/reporting/rep306.php
@@@ -170,6 -170,7 +170,7 @@@ function print_inventory_purchase(
                {
                        if ($stock_description != '')
                        {
 -                              $stock_dec = get_qty_dec($stock_id);    
++                              $stock_dec = get_qty_dec($stock_id);
                                if ($supplier_name != '')
                                {
                                        $rep->NewLine(2, 3);

diff --cc reporting/rep409.php
Simple merge

diff --cc reporting/rep708.php
Simple merge

diff --cc reporting/rep709.php
Simple merge

diff --cc reporting/reports_main.php
index dd35488aaf27580aaae80e8abe1cf235307e83a4,0c8a9cbf91d189f4d50770ce081a6be88afee056..6efe4c6be836364c51b9788bf2db29d938c62c6e
--- 1/reporting/reports_main.php
--- 2/reporting/reports_main.php
+++ b/reporting/reports_main.php
@@@ -193,9 -204,8 +204,8 @@@ $reports->addReport(RC_SUPPLIER, 210, _
                        _('Orientation') => 'ORIENTATION'));
  
  $reports->addReportClass(_('Inventory'), RC_INVENTORY);
- 
  $reports->addReport(RC_INVENTORY,  301, _('Inventory &Valuation Report'),
 -      array(  _('End Date') => 'DATE',        
 +      array(  _('End Date') => 'DATE',
                        _('Inventory Category') => 'CATEGORIES',
                        _('Location') => 'LOCATIONS',
                        _('Summary Only') => 'YES_NO',

diff --cc sales/create_recurrent_invoices.php
Simple merge

diff --cc sales/customer_delivery.php
index fba45c7baf06f739fcb79eabd039c3b9dad611c0,90905a2cbbc32267a69e5771a2cf138ce4cd08d1..5abc5942d4fa61699dca5194d3764681dbabbf5d
--- 1/sales/customer_delivery.php
--- 2/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@@ -326,18 -314,16 +326,18 @@@ if (isset($_POST['process_delivery']) &
        }
        else
        {
 +              $is_prepaid = $dn->is_prepaid() ? "&prepaid=Yes" : '';
 +
                processing_end();
                if ($newdelivery) {
 -                      meta_forward($_SERVER['PHP_SELF'], "AddedID=$delivery_no");
 +                      meta_forward($_SERVER['PHP_SELF'], "AddedID=$delivery_no$is_prepaid");
                } else {
 -                      meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$delivery_no");
 +                      meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$delivery_no$is_prepaid");
                }
 -      }       
 +      }
  }
  
- if (isset($_POST['Update']) || isset($_POST['_Location_update'])) {
+ if (isset($_POST['Update']) || isset($_POST['_Location_update']) || isset($_POST['qty'])) {
        $Ajax->activate('Items');
  }
  //------------------------------------------------------------------------------

diff --cc sales/customer_payments.php
index e1b672c9ae37cd69c5b2e563307faf5296daeff0,d0a0ea8b04e0038429615fdd88c108e1af5f68b2..42a84fb2fd4b83e59abcdafb3aac86a812290665
--- 1/sales/customer_payments.php
--- 2/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@@ -239,21 -238,9 +238,21 @@@ if (isset($_POST['_DateBanked_changed']
    $Ajax->activate('_ex_rate');
  }
  
 +//Chaitanya : 13-OCT-2011 - To support Edit feature
 +if (isset($_POST['ref']) && $_SESSION['alloc']->trans_no == 0) // added by Joe to fix the browser back button
 +{
 +      $tno = get_customer_trans_from_ref(ST_CUSTPAYMENT, $_POST['ref']);
 +      if ($tno != false)
 +      {
 +              display_error( _("The entered reference is already in use."));
 +              display_footer_exit();
 +      }
 +}
 +$new = $_SESSION['alloc']->trans_no == 0;
 +
  //----------------------------------------------------------------------------------------------
  
- if (isset($_POST['AddPaymentItem'])) {
+ if (get_post('AddPaymentItem') && can_process()) {
        
        $cust_currency = get_customer_currency($_POST['customer_id']);
        $bank_currency = get_bank_account_currency($_POST['bank_account']);

diff --cc sales/includes/cart_class.inc
index 3adf6c930a3b32675248834b78494b0f20edd360,5a3d561db42bc5e74568f01f91375844ce3c8b49..37c16528cc1808f993770e9f5c035b4292bcfaa9
--- 1/sales/includes/cart_class.inc
--- 2/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@@ -98,10 -89,31 +98,31 @@@ class car
                $this->dimension_id = 0;
                $this->dimension2_id = 0;
                $this->pos = get_sales_point(user_pos());
 -              $this->read($type, $trans_no, $prep_child);
 +              $this->read($type, $trans_no, $prepare_child);
                $this->cart_id = uniqid('');
        }
-       
+ 
+       /*
+               Optional sorting items by stock_id.
+       */
+       function _cmp_lines($a, $b)
+       {
+               return strcmp($a->stock_id, $b->stock_id);
+       }
+ 
+       /*
+               Returns items array optionally sorted by item code.
+       */
+       function get_items()
+       {
+               global $sort_sales_items;
+ 
+               $items = $this->line_items;
+               if (@$sort_sales_items)
+                       uasort($items, array($this, '_cmp_lines'));
+ 
+               return $items;
+       }
        //
        //      Prepare cart to new child document entry, just after initial parent doc read.
        //

diff --cc sales/includes/db/cust_trans_db.inc
index 1458b82279ee5d4894dc0646619c9067ed571ea1,4f92807a468ea3a831f2e8cad3f7921ff8c17be2..88e1bd0598e5bcbe98b8282f2eac22034f886e4c
--- 1/sales/includes/db/cust_trans_db.inc
--- 2/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@@ -104,9 -103,7 +104,9 @@@ function write_customer_trans($trans_ty
                ov_freight=".db_escape($Freight).", ov_freight_tax=$FreightTax, rate=$rate,
                ship_via=".db_escape($ship_via).", alloc=$AllocAmt,
                dimension_id=".db_escape($dimension_id).", dimension2_id=".db_escape($dimension2_id).",
-               payment_terms=".db_escape($payment_terms).",
 -              payment_terms=".db_escape($payment_terms, true)."
++              payment_terms=".db_escape($payment_terms, true).",
 +              tax_included=".db_escape($tax_included)."
 +              prep_amount =".db_escape($prep_amount)."
                WHERE trans_no=".db_escape($trans_no)." AND type=".db_escape($trans_type);
        }
        db_query($sql, "The debtor transaction record could not be inserted");

diff --cc sales/includes/db/custalloc_db.inc
Simple merge

diff --cc sales/includes/db/customers_db.inc
Simple merge

diff --cc sales/includes/db/sales_invoice_db.inc
Simple merge

diff --cc sales/includes/db/sales_order_db.inc
Simple merge

diff --cc sales/includes/ui/sales_order_ui.inc
Simple merge

diff --cc sales/inquiry/customer_allocation_inquiry.php
Simple merge

diff --cc sales/inquiry/sales_orders_view.php
index 78b4a40f6f28d0a62d11f192be9e412e9d7e8abd,93f21ef102db0af7536ef0e1bb385e89ab4661db..91b4d670b3b601bb9bdbcd480217ed1c23d10440
--- 1/sales/inquiry/sales_orders_view.php
--- 2/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@@ -248,10 -226,10 +248,10 @@@ ref_cells(_("#:"), 'OrderNumber', '',nu
  ref_cells(_("Ref"), 'OrderReference', '',null, '', true);
  if ($show_dates)
  {
 -      date_cells(_("from:"), 'OrdersAfterDate', '', null, -30);
 +      date_cells(_("from:"), 'OrdersAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
        date_cells(_("to:"), 'OrdersToDate', '', null, 1);
  }
- locations_list_cells(_("Location:"), 'StockLocation', null, true);
+ locations_list_cells(_("Location:"), 'StockLocation', null, true, true);
  
  if($show_dates) {
        end_row();
@@@ -348,6 -322,9 +348,5 @@@ $table->width = "80%"
  display_db_pager($table);
  submit_center('Update', _("Update"), true, '', null);
  
 -if (!@$_GET['popup'])
 -{
 -      end_form();
 -      end_page();
 -}
 -?>
 +end_form();
 +end_page();
- ?>

diff --cc sales/manage/customers.php
Simple merge

diff --cc sales/sales_order_entry.php
Simple merge

diff --cc sql/alter2.2.php
Simple merge

diff --cc sql/en_US-demo.sql
index 556796fd1713ae64e63d00b94ac10d177271708f,9f0d63397383dd419454e942bd8bc3751b62e0d1..8689abb5aa5d0b3ecdb39918eeb483307e1f623d
--- 1/sql/en_US-demo.sql
--- 2/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@@ -2081,8 -2069,7 +2083,9 @@@ INSERT INTO `0_sys_prefs` VALUES('defau
  INSERT INTO `0_sys_prefs` VALUES('version_id', 'system', 'varchar', 11, '2.3rc');
  INSERT INTO `0_sys_prefs` VALUES('auto_curr_reval', 'setup.company', 'smallint', 6, '1');
  INSERT INTO `0_sys_prefs` VALUES('grn_clearing_act', 'glsetup.purchase', 'varchar', 15, '1550');
 +INSERT INTO `0_sys_prefs` VALUES('deferred_income_act', 'glsetup.sales', 'varchar', '15', '');
 +INSERT INTO `0_sys_prefs` VALUES('gl_closing_date','setup.closing_date', 'date', 8, '');
+ INSERT INTO `0_sys_prefs` VALUES('bcc_email', 'setup.company', 'varchar', 100, '');
  
  -- --------------------------------------------------------
  

diff --cc sql/en_US-new.sql
index 0a04e735b1b91b1077404faf01715dc40ec66efc,c5115a40fbc0b2d49d9109059dd49c9319af5beb..dc701b2c222afdc08ca38d8e7ead5d1d3dd879b1
--- 1/sql/en_US-new.sql
--- 2/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@@ -1840,8 -1828,7 +1842,9 @@@ INSERT INTO `0_sys_prefs` VALUES('defau
  INSERT INTO `0_sys_prefs` VALUES('version_id', 'system', 'varchar', 11, '2.3rc');
  INSERT INTO `0_sys_prefs` VALUES('auto_curr_reval', 'setup.company', 'smallint', 6, '1');
  INSERT INTO `0_sys_prefs` VALUES('grn_clearing_act', 'glsetup.purchase', 'varchar', 15, '1550');
 +INSERT INTO `0_sys_prefs` VALUES('deferred_income_act', 'glsetup.sales', 'varchar', '15', '');
 +INSERT INTO `0_sys_prefs` VALUES('gl_closing_date','setup.closing_date', 'date', 8, '');
+ INSERT INTO `0_sys_prefs` VALUES('bcc_email', 'setup.company', 'varchar', 100, '');
  
  -- --------------------------------------------------------