Merged changes from stable branch up to 2.3.23.

diff --cc access/login.php
index dbf90ab9b7af2bfb37236ec1f2b7c8c88070aac5,0233354f0e4be510a99e3414ae6cca44935dc2e7..b7f802f17caca91c711c8de5e988cebaa1209e2b
--- 1/access/login.php
--- 2/access/login.php
+++ b/access/login.php
@@@ -79,17 -78,17 +79,17 @@@ function defaultCompany(
        start_row();
        echo "<td align='center' colspan=2>";
        if (!$login_timeout) { // FA logo
-       echo "<a target='_blank' href='".$SysPrefs->power_url."'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' /></a>";
 -      echo "<a target='_blank' href='$power_url'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' ></a>";
++      echo "<a target='_blank' href='".$SysPrefs->power_url."'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' ></a>";
        } else { 
                echo "<font size=5>"._('Authorization timeout')."</font>";
        } 
        echo "</td>\n";
        end_row();
  
-       echo "<input type='hidden' id=ui_mode name='ui_mode' value='".fallback_mode()."' />\n";
 -      echo "<input type='hidden' id=ui_mode name='ui_mode' value='".$_SESSION["wa_current_user"]->ui_mode."' >\n";
++      echo "<input type='hidden' id=ui_mode name='ui_mode' value='".fallback_mode()."' >\n";
        if (!$login_timeout)
 -              table_section_title(_("Version")." $version   Build $build_version - "._("Login"));
 -      $value = $login_timeout ? $_SESSION['wa_current_user']->loginname : ($allow_demo_mode ? "demouser":"");
 +              table_section_title(_("Version")." $version   Build ".$SysPrefs->build_version." - "._("Login"));
 +      $value = $login_timeout ? $_SESSION['wa_current_user']->loginname : ($SysPrefs->allow_demo_mode ? "demouser":"");
  
        text_row(_("User name"), "user_name_entry_field", $value, 20, 30);
  

diff --cc access/logout.php
Simple merge

diff --cc access/password_reset.php
index a20a2180c30b9bc59c5f87a6d584b13ea615171b,8ad67026e4c58237e3597e608d2a33f397a0ec07..bdea9136b89b6911fca2ae11d5823a6850a74fde
--- 1/access/password_reset.php
--- 2/access/password_reset.php
+++ b/access/password_reset.php
@@@ -53,12 -53,12 +53,12 @@@ function defaultCompany(
        start_table(false, "class='login'");
        start_row();
        echo "<td align='center' colspan=2>";
-   echo "<a target='_blank' href='".$SysPrefs->power_url."'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' /></a>";
 -  echo "<a target='_blank' href='$power_url'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' ></a>";
++      echo "<a target='_blank' href='".$SysPrefs->power_url."'><img src='$path_to_root/themes/$def_theme/images/logo_frontaccounting.png' alt='FrontAccounting' height='50' onload='fixPNG(this)' border='0' ></a>";
        echo "</td>\n";
        end_row();
  
-       echo "<input type='hidden' id=ui_mode name='ui_mode' value='".fallback_mode()."' />\n";
 -      echo "<input type='hidden' id=ui_mode name='ui_mode' value='".$_SESSION["wa_current_user"]->ui_mode."' >\n";
 -      table_section_title(_("Version")." $version   Build $build_version - "._("Password reset"));
++      echo "<input type='hidden' id=ui_mode name='ui_mode' value='".fallback_mode()."' >\n";
 +      table_section_title(_("Version")." $version   Build ".$SysPrefs->build_version." - "._("Password reset"));
  
        text_row(_("Email"), "email_entry_field", "", 20, 30);
  

diff --cc admin/create_coy.php
index 0366e76c2a382de99b970a4e52f1957d7eb6ddb9,999f376c8fb93e80d5c6e77629ed2a59d36abda0..eb44a1bc060ea59d7e041c55387ac7038cff2228
--- 1/admin/create_coy.php
--- 2/admin/create_coy.php
+++ b/admin/create_coy.php
@@@ -242,10 -238,10 +242,10 @@@ function display_companies(
  {
        global $def_coy, $db_connections;
  
 -      $coyno = $_SESSION["wa_current_user"]->company;
 +      $coyno = user_company();
  
        echo "
-               <script language='javascript'>
+               <script type='text/javascript'>
                function deleteCompany(id, name) {
                        if (!confirm('" . _("Are you sure you want to delete company no. ") . "'+id+' '+name+'?'))
                                return

diff --cc admin/crm_categories.php
Simple merge

diff --cc admin/db/attachments_db.inc
Simple merge

diff --cc admin/security_roles.php
Simple merge

diff --cc admin/view/view_package.php
index 6d957720e98dfec2a3bfd7056302330c63566fa1,0000000000000000000000000000000000000000..49c5fee95d5c0ab341bc2b064d42a036a18f5d57
mode 100644,000000..100644
--- 1/admin/view/view_package.php
--- /dev/null
+++ b/admin/view/view_package.php
@@@ -1,60 -1,0 +1,60 @@@
- start_table(TABLESTYLE2, "width=80%");
 +<?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>.
 +***********************************************************************/
 +$page_security = 'SA_OPEN';
 +$path_to_root = "../..";
 +include_once($path_to_root . "/includes/session.inc");
 +include_once($path_to_root . "/includes/packages.inc");
 +
 +page(_($help_context = "Package Details"), true);
 +
 +include_once($path_to_root . "/includes/ui.inc");
 +
 +if (!isset($_GET['id'])) 
 +{
 +      /*Script was not passed the correct parameters */
 +      display_note(_("The script must be called with a valid package id to review the info for."));
 +      end_page();
 +}
 +
 +$filter = array(
 +      'Version' => _('Available version'), 
 +      'Type' => _('Package type'), 
 +      'Name' => _('Package content'),
 +      'Description' => _('Description'), 
 +      'Author' => _('Author'), 
 +      'Homepage' => _('Home page'),
 +      'Maintenance' => _('Package maintainer'),
 +      'InstallPath' => _('Installation path'),
 +      'Depends' => _('Minimal software versions'),
 +      'RTLDir' => _('Right to left'),
 +      'Encoding' => _('Charset encoding')
 +);
 +
 +$pkg = get_package_info($_GET['id'], null, $filter);
 +
 +display_heading(sprintf(_("Content information for package '%s'"), $_GET['id']));
 +br();
++start_table(TABLESTYLE2, "width='80%'");
 +$th = array(_("Property"), _("Value"));
 +table_header($th);
 +
 +foreach ($pkg as $field => $value) {
 +      if ($value == '')
 +              continue;
 +      start_row();
 +      label_cells($field, nl2br(html_specials_encode(is_array($value) ? implode("\n", $value) :$value)),
 +               "class='tableheader2'");
 +      end_row();
 +}
 +end_table(1);
 +
 +end_page(true);

diff --cc gl/gl_bank.php
Simple merge

diff --cc gl/gl_journal.php
Simple merge

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

diff --cc gl/includes/ui/gl_journal_ui.inc
index d68f09140bbb951795a7687dc129fc8f905fe647,1bb56c2a2f93271525a2cb3444f66c50dbfe3995..6384e1fd7f518f1d71d62ceb6af126bbf7b0e831
--- 1/gl/includes/ui/gl_journal_ui.inc
--- 2/gl/includes/ui/gl_journal_ui.inc
+++ b/gl/includes/ui/gl_journal_ui.inc
@@@ -77,11 -75,8 +75,11 @@@ function display_gl_items($title, &$ord
  
        $dim = get_company_pref('use_dimension');
  
 +      $sub_type = is_subledger_account(get_post('code_id'));
 +      $has_subaccounts = $order->has_sub_accounts();
 +
      div_start('items_table');
-       start_table(TABLESTYLE, "colspan=7 width=95%");
+       start_table(TABLESTYLE, "width='95%'");
        if ($dim == 2)
                $th = array(_("Account Code"), _("Account Description"), _("Dimension")." 1",
                        _("Dimension")." 2", _("Debit"), _("Credit"), _("Memo"), "");

diff --cc gl/inquiry/balance_sheet.php
Simple merge

diff --cc gl/inquiry/profit_loss.php
Simple merge

diff --cc gl/view/bank_transfer_view.php
Simple merge

diff --cc gl/view/gl_deposit_view.php
Simple merge

diff --cc gl/view/gl_payment_view.php
Simple merge

diff --cc gl/view/gl_trans_view.php
index 89c29a28db766a6e61fc862ad3786feb9b2a832e,e80914eb694875dd3234fa18803f02f9513ae99b..b202b6bc1824e674a0aa56c782396aacbfbefeae
--- 1/gl/view/gl_trans_view.php
--- 2/gl/view/gl_trans_view.php
+++ b/gl/view/gl_trans_view.php
@@@ -31,15 -31,11 +31,15 @@@ function display_gl_heading($myrow
  {
        global $systypes_array;
        $trans_name = $systypes_array[$_GET['type_id']];
-     start_table(TABLESTYLE, "width=95%");
+     start_table(TABLESTYLE, "width='95%'");
      $th = array(_("General Ledger Transaction Details"), _("Reference"),
 -      _("Date"), _("Person/Item"));
 -    table_header($th);        
 -    start_row();      
 +      _("Date"));
 +
 +      if ($_GET['type_id'] != ST_JOURNAL)
 +              $th[] = _("Counterparty");
 +
 +    table_header($th);
 +    start_row();
      label_cell("$trans_name #" . $_GET['trans_no']);
      label_cell($myrow["reference"]);
        label_cell(sql2date($myrow["tran_date"]));
@@@ -84,18 -78,15 +84,18 @@@ while ($myrow = db_fetch($result)
        if (!$heading_shown)
        {
                display_gl_heading($myrow);
-               start_table(TABLESTYLE, "width=95%");
+               start_table(TABLESTYLE, "width='95%'");
                table_header($th);
                $heading_shown = true;
 -      }       
 +      }
  
        alt_table_row_color($k);
 -      
 -    label_cell($myrow['account']);
 -      label_cell($myrow['account_name']);
 +
 +      $counterpartyname = get_subaccount_name($myrow["account"], $myrow["person_id"]);
 +      $counterparty_id = $counterpartyname ? sprintf(' %05d', $myrow["person_id"]) : '';
 +
 +    label_cell($myrow['account'].$counterparty_id);
 +      label_cell($myrow['account_name'] . ($counterpartyname ? ': '.$counterpartyname : ''));
        if ($dim >= 1)
                label_cell(get_dimension_string($myrow['dimension_id'], true));
        if ($dim > 1)

diff --cc includes/page/footer.inc
Simple merge

diff --cc includes/page/header.inc
index 880c03f449489eb4ac4729bfbb63327ce3741dd2,7dd84b6525b66089b3fdbe1a91bbc99a86e0644d..721ba242d258ad3a6cc495054b40a2b170ef3f41
--- 1/includes/page/header.inc
--- 2/includes/page/header.inc
+++ b/includes/page/header.inc
@@@ -40,9 -40,9 +40,9 @@@ function help_url($context=null
        if ($clean)
                $help_page_url = access_string($help_page_url, true);
  
-       return $SysPrefs->help_base_url
 -      return htmlspecialchars($help_base_url
++      return htmlspecialchars($SysPrefs->help_base_url
                .urlencode(strtr(ucwords($help_page_url), array(' '=>'', '/'=>'', '&'=>'And')))
-               .'&ctxhelp=1&lang='.$country;
 -              .'&ctxhelp=1&lang='.$country);
++              .'&ctxhelp=1&lang='.$country, ENT_QUOTES);
  }
  
  function send_scripts()

diff --cc includes/system_tests.inc
Simple merge

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

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

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

diff --cc includes/ui/ui_controls.inc
index ddef1bddf3491d083918f0ed8f03ef8433b0add8,65e0071cf925dda04087868e2bfeca505aed7cb5..616d99b65502f2c130d3dba692b114b5107ab82f
--- 1/includes/ui/ui_controls.inc
--- 2/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@@ -58,9 -53,7 +58,9 @@@ function start_form($multi=false, $dumm
  
  function end_form($breaks=0)
  {
-       global $Ajax, $form_nested;
 -      global $Ajax, $hidden_fields;
++      global $Ajax, $form_nested, $hidden_fields;
 +
 +      if ($form_nested-- > 0) return;
  
        $_SESSION['csrf_token'] = hash('sha256', uniqid(mt_rand(), true));
        if ($breaks)
@@@ -68,7 -61,8 +68,8 @@@
        hidden('_focus');
        hidden('_modified', get_post('_modified', 0));
        hidden('_token', $_SESSION['csrf_token']);
-       echo "</form>\n";
 -      
++
+       echo implode('', $hidden_fields)."</form>\n";
        $Ajax->activate('_token');
  }
  

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

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

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

diff --cc includes/ui/ui_view.inc
index daa161be6ae3180436c9afe5791a210aed572179,cc003088d2595ec51e8815823189b0f6a0534f8e..16da77e4ff5851fd06d7828abde4a33a0505ded2
--- 1/includes/ui/ui_view.inc
--- 2/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@@ -541,9 -540,9 +541,9 @@@ function display_allocations($alloc_res
        if (!$alloc_result || db_num_rows($alloc_result) == 0)
                return;
  
 -    display_heading2(($payments ? _("Payments") : _("Allocations")));
 +    display_heading2($title);
  
-     start_table(TABLESTYLE, "width=80%");
+     start_table(TABLESTYLE, "width='80%'");
  
      $th = array( _("Type"), _("Number"), _("Date"), _("Total Amount"),
        _("Left to Allocate"), _("This Allocation"));

diff --cc install/index.php
Simple merge

diff --cc inventory/adjustments.php
Simple merge

diff --cc inventory/includes/item_adjustments_ui.inc
Simple merge

diff --cc inventory/includes/stock_transfers_ui.inc
Simple merge

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

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

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

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

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

diff --cc inventory/prices.php
Simple merge

diff --cc inventory/purchasing_data.php
Simple merge

diff --cc inventory/reorder_level.php
Simple merge

diff --cc inventory/transfers.php
Simple merge

diff --cc inventory/view/view_adjustment.php
Simple merge

diff --cc inventory/view/view_transfer.php
Simple merge

diff --cc lang/new_language_template/LC_MESSAGES/empty.po
index 40932dd23787ca73ab45be74de586022c8ee7e84,e5955db77f53cabbf5086957d0ea0c46d92b5cef..79b341939561e4c63b8e00ac45434efa0bcd663b
--- 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,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2014-12-25 16:46+0100\n"
 -"POT-Creation-Date: 2015-03-23 14:55+0100\n"
++"POT-Creation-Date: 2015-03-25 10:46+0100\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"
@@@ -22,10 -21,8 +22,9 @@@
  msgid "Main  Menu"
  msgstr ""
  
 -#: frontaccounting.php:75 access/logout.php:21 themes/default/renderer.php:68
 -#: themes/default/renderer.php:82
 +#: ../frontaccounting.php:75
 +#: ../access/logout.php:21
- #: ../themes/default/renderer.php:70
- #: ../themes/default/renderer.php:83
++#: ../themes/default/renderer.php:68
  msgid "Logout"
  msgstr ""
  
@@@ -54,38 -50,29 +53,38 @@@ msgstr "
  msgid "Too many failed login attempts.<br>Please wait a while or try later."
  msgstr ""
  
- #: ../access/login.php:52
- #: ../access/login.php:83
 -#: access/login.php:52 access/login.php:83
++#: ../access/login.php:53
++#: ../access/login.php:84
  msgid "Authorization timeout"
  msgstr ""
  
- #: ../access/login.php:52
- #: ../access/login.php:90
 -#: access/login.php:52 access/login.php:90
++#: ../access/login.php:53
++#: ../access/login.php:91
  msgid "Login"
  msgstr ""
  
- #: ../access/login.php:90
 -#: access/login.php:90 access/password_reset.php:61 admin/inst_upgrade.php:137
++#: ../access/login.php:91
 +#: ../access/password_reset.php:61
- #: ../admin/inst_upgrade.php:141
  msgid "Version"
  msgstr ""
  
- #: ../access/login.php:93
 -#: access/login.php:93
++#: ../access/login.php:94
  msgid "User name"
  msgstr ""
  
- #: ../access/login.php:97
 -#: access/login.php:97 admin/users.php:200
++#: ../access/login.php:98
 +#: ../admin/users.php:200
  msgid "Password:"
  msgstr ""
  
 -#: access/login.php:107 access/login.php:114 access/password_reset.php:70
 -#: access/password_reset.php:77 admin/create_coy.php:253
 -#: admin/create_coy.php:336
 +#: ../access/login.php:107
 +#: ../access/login.php:114
- #: ../access/password_reset.php:70
- #: ../access/password_reset.php:77
- #: ../admin/create_coy.php:253
- #: ../admin/create_coy.php:336
++#: ../access/password_reset.php:69
++#: ../access/password_reset.php:76
++#: ../admin/create_coy.php:257
++#: ../admin/create_coy.php:340
++#: ../admin/inst_upgrade.php:63
 +#: ../includes/sysnames.inc:194
  msgid "Company"
  msgstr ""
  
@@@ -93,10 -80,8 +92,9 @@@
  msgid "Login -->"
  msgstr ""
  
 -#: access/login.php:156 access/password_reset.php:108
 -#: admin/display_prefs.php:112 themes/default/renderer.php:126
 +#: ../access/login.php:156
- #: ../access/password_reset.php:108
- #: ../admin/display_prefs.php:112
- #: ../themes/default/renderer.php:129
++#: ../access/password_reset.php:107
++#: ../admin/display_prefs.php:123
  msgid "Theme:"
  msgstr ""
  
@@@ -113,16 -97,13 +111,16 @@@ msgstr "
  msgid "Password reset"
  msgstr ""
  
 -#: access/password_reset.php:63 reporting/rep103.php:277
 -#: reporting/rep106.php:88 reporting/rep205.php:195
 -#: reporting/includes/header2.inc:113 sales/manage/sales_people.php:99
 +#: ../access/password_reset.php:63
- #: ../reporting/rep103.php:277
- #: ../reporting/rep106.php:88
++#: ../reporting/rep103.php:276
++#: ../reporting/rep106.php:95
 +#: ../reporting/rep205.php:195
 +#: ../reporting/includes/header2.inc:113
 +#: ../sales/manage/sales_people.php:99
  msgid "Email"
  msgstr ""
  
- #: ../access/password_reset.php:83
 -#: access/password_reset.php:83
++#: ../access/password_reset.php:82
  msgid "Send password -->"
  msgstr ""
  
@@@ -150,83 -131,57 +148,74 @@@ msgstr "
  msgid "Attachment has been deleted."
  msgstr ""
  
 -#: admin/attachments.php:167 admin/view_print_transaction.php:72
 -#: admin/void_transaction.php:157 gl/inquiry/journal_inquiry.php:47
 -#: inventory/includes/item_adjustments_ui.inc:47
 -#: manufacturing/work_order_add_finished.php:200
 -#: manufacturing/work_order_costs.php:150
 -#: manufacturing/work_order_entry.php:377
 -#: manufacturing/work_order_entry.php:385
 -#: manufacturing/includes/work_order_issue_ui.inc:168
 -#: sales/inquiry/customer_allocation_inquiry.php:47
 +#: ../admin/attachments.php:167
 +#: ../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:200
 +#: ../manufacturing/work_order_costs.php:136
- #: ../manufacturing/work_order_entry.php:377
- #: ../manufacturing/work_order_entry.php:385
++#: ../manufacturing/work_order_entry.php:378
++#: ../manufacturing/work_order_entry.php:386
 +#: ../manufacturing/includes/work_order_issue_ui.inc:168
 +#: ../sales/inquiry/customer_allocation_inquiry.php:47
  msgid "Type:"
  msgstr ""
  
 -#: admin/attachments.php:183 admin/create_coy.php:277
 -#: admin/crm_categories.php:115 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:153
 -#: dimensions/inquiry/search_dimensions.php:120
 -#: gl/inquiry/journal_inquiry.php:118 gl/manage/bank_accounts.php: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:186 gl/includes/ui/gl_journal_ui.inc:120
 -#: includes/ui/contacts_view.inc:64 includes/ui/simple_crud_class.inc:52
 -#: inventory/prices.php:158 inventory/purchasing_data.php:164
 -#: inventory/includes/item_adjustments_ui.inc:91
 -#: inventory/includes/stock_transfers_ui.inc:83
 -#: 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:115
 -#: manufacturing/manage/bom_edit.php:86
 -#: manufacturing/manage/work_centres.php:114
 -#: manufacturing/includes/work_order_issue_ui.inc:63
 -#: purchasing/includes/ui/invoice_ui.inc:533
 -#: purchasing/includes/ui/po_ui.inc:263
 -#: purchasing/inquiry/po_search_completed.php:109
 -#: purchasing/inquiry/po_search.php:89 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:192
 -#: sales/inquiry/sales_deliveries_view.php:156
 -#: sales/inquiry/sales_orders_view.php:128
 -#: sales/includes/ui/sales_credit_ui.inc:197
 -#: sales/includes/ui/sales_order_ui.inc:197 taxes/item_tax_types.php:139
 -#: taxes/tax_groups.php:142 taxes/tax_types.php:132
 +#: ../admin/attachments.php:183
- #: ../admin/create_coy.php:277
- #: ../admin/crm_categories.php:115
++#: ../admin/create_coy.php:281
++#: ../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:153
 +#: ../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:186
- #: ../gl/includes/ui/gl_journal_ui.inc:134
++#: ../gl/includes/ui/gl_journal_ui.inc:132
 +#: ../includes/ui/contacts_view.inc:64
 +#: ../includes/ui/simple_crud_class.inc:52
- #: ../includes/ui/ui_input.inc:961
++#: ../includes/ui/ui_view.inc:1468
 +#: ../inventory/prices.php:159
 +#: ../inventory/purchasing_data.php:165
 +#: ../inventory/includes/item_adjustments_ui.inc:91
 +#: ../inventory/includes/stock_transfers_ui.inc:83
 +#: ../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:63
- #: ../purchasing/includes/ui/invoice_ui.inc:557
- #: ../purchasing/includes/ui/po_ui.inc:275
- #: ../purchasing/inquiry/po_search_completed.php:108
- #: ../purchasing/inquiry/po_search.php:89
++#: ../purchasing/includes/ui/po_ui.inc:248
 +#: ../sales/manage/credit_status.php:119
- #: ../sales/manage/customer_branches.php:159
- #: ../sales/manage/recurrent_invoices.php:130
++#: ../sales/manage/customer_branches.php:154
++#: ../sales/manage/recurrent_invoices.php:136
 +#: ../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:156
- #: ../sales/inquiry/sales_orders_view.php:136
 +#: ../sales/includes/ui/sales_credit_ui.inc:197
- #: ../sales/includes/ui/sales_order_ui.inc:197
++#: ../sales/includes/ui/sales_order_ui.inc:198
 +#: ../taxes/item_tax_types.php:139
- #: ../taxes/sav.tax_types.php:211
- #: ../taxes/sav.tax_types.php:262
 +#: ../taxes/tax_groups.php:137
 +#: ../taxes/tax_types.php:132
  msgid "Edit"
  msgstr ""
  
 -#: admin/attachments.php:188 gl/inquiry/journal_inquiry.php:135
 +#: ../admin/attachments.php:188
- #: ../gl/inquiry/journal_inquiry.php:135
++#: ../gl/inquiry/journal_inquiry.php:107
  msgid "View"
  msgstr ""
  
@@@ -234,160 -189,98 +223,152 @@@
  msgid "Download"
  msgstr ""
  
 -#: admin/attachments.php:198 admin/create_coy.php:278
 -#: admin/crm_categories.php:119 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:155
 -#: gl/gl_budget.php:137 gl/manage/bank_accounts.php: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:188 gl/includes/ui/gl_journal_ui.inc:122
 -#: includes/ui/contacts_view.inc:67 includes/ui/simple_crud_class.inc:54
 -#: includes/ui/ui_input.inc:286 inventory/prices.php:159
 -#: inventory/purchasing_data.php:165
 -#: inventory/includes/item_adjustments_ui.inc:93
 -#: inventory/includes/stock_transfers_ui.inc:85
 -#: 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:65
 -#: purchasing/includes/ui/invoice_ui.inc:297
 -#: purchasing/includes/ui/po_ui.inc:265 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:199 taxes/item_tax_types.php:140
 -#: taxes/tax_groups.php:143 taxes/tax_types.php:133
 +#: ../admin/attachments.php:198
- #: ../admin/create_coy.php:278
- #: ../admin/crm_categories.php:119
++#: ../admin/create_coy.php:282
++#: ../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/inst_theme.php:83
 +#: ../admin/payment_terms.php:143
 +#: ../admin/printers.php:97
 +#: ../admin/shipping_companies.php:107
 +#: ../admin/tags.php:141
 +#: ../admin/users.php:155
 +#: ../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:188
- #: ../gl/includes/ui/gl_journal_ui.inc:136
++#: ../gl/includes/ui/gl_journal_ui.inc:134
 +#: ../includes/ui/contacts_view.inc:67
 +#: ../includes/ui/simple_crud_class.inc:54
- #: ../includes/ui/ui_input.inc:286
++#: ../includes/ui/ui_input.inc:287
 +#: ../inventory/prices.php:160
 +#: ../inventory/purchasing_data.php:166
 +#: ../inventory/includes/item_adjustments_ui.inc:93
 +#: ../inventory/includes/stock_transfers_ui.inc:85
 +#: ../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:65
- #: ../purchasing/includes/ui/invoice_ui.inc:319
- #: ../purchasing/includes/ui/po_ui.inc:277
++#: ../purchasing/includes/ui/po_ui.inc:250
 +#: ../sales/manage/credit_status.php:120
- #: ../sales/manage/customer_branches.php:163
- #: ../sales/manage/recurrent_invoices.php:131
++#: ../sales/manage/customer_branches.php:158
++#: ../sales/manage/recurrent_invoices.php:137
 +#: ../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:199
++#: ../sales/includes/ui/sales_order_ui.inc:200
 +#: ../taxes/item_tax_types.php:140
- #: ../taxes/sav.tax_types.php:212
 +#: ../taxes/tax_groups.php:138
 +#: ../taxes/tax_types.php:133
  msgid "Delete"
  msgstr ""
  
 -#: admin/attachments.php:205 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
 -#: 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:288
 -#: inventory/inquiry/stock_movements.php:82
 -#: manufacturing/search_work_orders.php:165
 -#: 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:124
 -#: purchasing/inquiry/po_search.php:132
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:127
 -#: purchasing/inquiry/supplier_inquiry.php:169
 -#: purchasing/allocations/supplier_allocation_main.php:95
 -#: reporting/rep101.php:118 reporting/rep201.php:110 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
 -#: 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/inquiry/customer_allocation_inquiry.php:145
 -#: sales/inquiry/customer_inquiry.php:218
 +#: ../admin/attachments.php:205
 +#: ../admin/view_print_transaction.php:126
 +#: ../admin/void_transaction.php:181
- #: ../dimensions/inquiry/search_dimensions.php:127
++#: ../dimensions/inquiry/search_dimensions.php:128
 +#: ../dimensions/view/view_dimension.php:55
 +#: ../gl/bank_account_reconcile.php:232
- #: ../gl/inquiry/bank_inquiry.php:70
++#: ../gl/inquiry/bank_inquiry.php:71
 +#: ../gl/inquiry/gl_account_inquiry.php:126
- #: ../gl/inquiry/journal_inquiry.php:127
- #: ../gl/inquiry/journal_inquiry.php:140
++#: ../gl/inquiry/journal_inquiry.php:99
++#: ../gl/inquiry/journal_inquiry.php:112
 +#: ../includes/ui/allocation_cart.inc:290
 +#: ../inventory/inquiry/stock_movements.php:78
- #: ../manufacturing/search_work_orders.php:159
++#: ../manufacturing/search_work_orders.php:165
 +#: ../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:123
- #: ../purchasing/inquiry/po_search.php:132
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:127
++#: ../purchasing/inquiry/po_search_completed.php:122
++#: ../purchasing/inquiry/po_search.php:117
++#: ../purchasing/inquiry/supplier_allocation_inquiry.php:128
 +#: ../purchasing/inquiry/supplier_inquiry.php:174
 +#: ../purchasing/allocations/supplier_allocation_main.php:95
 +#: ../reporting/rep101.php:118
 +#: ../reporting/rep201.php:110
 +#: ../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
++#: ../reporting/includes/doctext.inc:166
++#: ../reporting/includes/doctext.inc:207
++#: ../reporting/includes/doctext.inc:245
 +#: ../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/inquiry/customer_allocation_inquiry.php:145
- #: ../sales/inquiry/customer_inquiry.php:201
  msgid "#"
  msgstr ""
  
 -#: admin/attachments.php:206 admin/attachments.php:250
 -#: admin/crm_categories.php:97 admin/inst_upgrade.php:137
 -#: 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:484
 -#: purchasing/includes/ui/invoice_ui.inc:496
 -#: purchasing/po_receive_items.php:62 reporting/rep104.php:111
 -#: reporting/rep105.php:114 reporting/rep204.php:84 reporting/rep303.php:121
 -#: reporting/rep303.php:127 reporting/rep304.php:114 reporting/rep305.php:101
 -#: reporting/rep306.php:141 reporting/rep307.php:117 reporting/rep308.php:230
 -#: 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
 -#: sales/inquiry/sales_orders_view.php:295
 -#: sales/inquiry/sales_orders_view.php:299 taxes/tax_groups.php:124
 -#: taxes/tax_types.php:115
 +#: ../admin/attachments.php:206
 +#: ../admin/attachments.php:250
- #: ../admin/crm_categories.php:97
- #: ../admin/inst_upgrade.php:141
++#: ../admin/crm_categories.php:88
 +#: ../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:507
- #: ../purchasing/includes/ui/invoice_ui.inc:519
 +#: ../purchasing/po_receive_items.php:62
 +#: ../reporting/rep104.php:111
 +#: ../reporting/rep105.php:114
 +#: ../reporting/rep204.php:84
 +#: ../reporting/rep303.php:121
 +#: ../reporting/rep303.php:127
 +#: ../reporting/rep304.php:114
 +#: ../reporting/rep305.php:101
 +#: ../reporting/rep306.php:141
 +#: ../reporting/rep307.php:117
 +#: ../reporting/rep308.php:230
 +#: ../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
- #: ../sales/inquiry/sales_orders_view.php:318
- #: ../sales/inquiry/sales_orders_view.php:322
- #: ../taxes/sav.tax_types.php:190
++#: ../sales/manage/recurrent_invoices.php:108
++#: ../sales/inquiry/sales_orders_view.php:281
++#: ../sales/inquiry/sales_orders_view.php:285
 +#: ../taxes/tax_groups.php:123
 +#: ../taxes/tax_types.php:115
  msgid "Description"
  msgstr ""
  
 -#: admin/attachments.php:207 admin/backups.php:63 admin/backups.php:149
 +#: ../admin/attachments.php:207
- #: ../admin/backups.php:63
- #: ../admin/backups.php:149
++#: ../admin/backups.php:67
++#: ../admin/backups.php:152
  msgid "Filename"
  msgstr ""
  
@@@ -412,12 -304,8 +393,12 @@@ msgstr "
  msgid "Attached File"
  msgstr ""
  
 -#: admin/backups.php:21 admin/backups.php:40 admin/backups.php:114
 -#: admin/backups.php:142 admin/backups.php:155 admin/backups.php:173
 +#: ../admin/backups.php:21
 +#: ../admin/backups.php:40
- #: ../admin/backups.php:114
- #: ../admin/backups.php:142
- #: ../admin/backups.php:155
- #: ../admin/backups.php:173
++#: ../admin/backups.php:118
++#: ../admin/backups.php:145
++#: ../admin/backups.php:158
++#: ../admin/backups.php:176
  msgid "Select backup file first."
  msgstr ""
  
@@@ -425,145 -313,125 +406,142 @@@
  msgid "Backup and Restore Database"
  msgstr ""
  
- #: ../admin/backups.php:50
 -#: admin/backups.php:50
++#: ../admin/backups.php:52
  msgid "Backup paths have not been set correctly."
  msgstr ""
  
- #: ../admin/backups.php:51
 -#: admin/backups.php:51
++#: ../admin/backups.php:53
  msgid "Please contact System Administrator."
  msgstr ""
  
- #: ../admin/backups.php:52
 -#: admin/backups.php:52
++#: ../admin/backups.php:54
  msgid "cannot find backup directory"
  msgstr ""
  
- #: ../admin/backups.php:62
 -#: admin/backups.php:62
++#: ../admin/backups.php:66
  msgid "Backup successfully generated."
  msgstr ""
  
- #: ../admin/backups.php:65
 -#: admin/backups.php:65
++#: ../admin/backups.php:69
  msgid "Database backup failed."
  msgstr ""
  
- #: ../admin/backups.php:98
- #: ../admin/create_coy.php:265
 -#: 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/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:1680
 -#: purchasing/manage/suppliers.php:121 reporting/rep101.php:114
 -#: reporting/rep102.php:114 reporting/rep102.php:116 reporting/rep104.php:105
 -#: reporting/rep106.php:75 reporting/rep114.php:74 reporting/rep201.php:106
 -#: reporting/rep202.php:118 reporting/rep202.php:120 reporting/rep203.php:89
 -#: reporting/rep303.php:113 reporting/rep303.php:117 reporting/rep402.php:99
 -#: reporting/rep402.php:134 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
++#: ../admin/backups.php:102
++#: ../admin/create_coy.php:269
 +#: ../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:1681
++#: ../includes/ui/ui_lists.inc:1670
 +#: ../purchasing/manage/suppliers.php:123
 +#: ../reporting/rep101.php:114
 +#: ../reporting/rep102.php:114
 +#: ../reporting/rep102.php:116
 +#: ../reporting/rep104.php:105
- #: ../reporting/rep106.php:75
++#: ../reporting/rep106.php:82
 +#: ../reporting/rep114.php:74
 +#: ../reporting/rep201.php:106
 +#: ../reporting/rep202.php:118
 +#: ../reporting/rep202.php:120
 +#: ../reporting/rep203.php:89
 +#: ../reporting/rep303.php:113
 +#: ../reporting/rep303.php:117
 +#: ../reporting/rep402.php:99
 +#: ../reporting/rep402.php:134
 +#: ../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
  msgid "No"
  msgstr ""
  
- #: ../admin/backups.php:139
 -#: admin/backups.php:139
++#: ../admin/backups.php:142
  msgid "Restore backup completed."
  msgstr ""
  
- #: ../admin/backups.php:148
 -#: admin/backups.php:148
++#: ../admin/backups.php:151
  msgid "File successfully deleted."
  msgstr ""
  
- #: ../admin/backups.php:153
 -#: admin/backups.php:153
++#: ../admin/backups.php:156
  msgid "Can't delete backup file."
  msgstr ""
  
- #: ../admin/backups.php:165
 -#: admin/backups.php:165
++#: ../admin/backups.php:168
  msgid "You can only upload *.sql backup files"
  msgstr ""
  
- #: ../admin/backups.php:168
 -#: admin/backups.php:168
++#: ../admin/backups.php:171
  msgid "File uploaded to backup directory"
  msgstr ""
  
- #: ../admin/backups.php:171
 -#: admin/backups.php:171
++#: ../admin/backups.php:174
  msgid "File was not uploaded into the system."
  msgstr ""
  
- #: ../admin/backups.php:180
 -#: admin/backups.php:180
++#: ../admin/backups.php:183
  msgid "Create backup"
  msgstr ""
  
- #: ../admin/backups.php:181
- #: ../sales/includes/ui/sales_order_ui.inc:580
- #: ../sales/includes/ui/sales_order_ui.inc:636
 -#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:582
 -#: sales/includes/ui/sales_order_ui.inc:630
++#: ../admin/backups.php:184
  msgid "Comments:"
  msgstr ""
  
- #: ../admin/backups.php:182
 -#: admin/backups.php:182
++#: ../admin/backups.php:185
  msgid "Compression:"
  msgstr ""
  
- #: ../admin/backups.php:184
 -#: admin/backups.php:184
++#: ../admin/backups.php:187
  msgid "Create Backup"
  msgstr ""
  
- #: ../admin/backups.php:186
 -#: admin/backups.php:186
++#: ../admin/backups.php:189
  msgid "Backup scripts maintenance"
  msgstr ""
  
- #: ../admin/backups.php:192
 -#: admin/backups.php:192
++#: ../admin/backups.php:195
  msgid "View Backup"
  msgstr ""
  
- #: ../admin/backups.php:193
 -#: admin/backups.php:193
++#: ../admin/backups.php:196
  msgid "Download Backup"
  msgstr ""
  
- #: ../admin/backups.php:194
 -#: admin/backups.php:194
++#: ../admin/backups.php:197
  msgid "Restore Backup"
  msgstr ""
  
- #: ../admin/backups.php:195
 -#: admin/backups.php:195
++#: ../admin/backups.php:198
  msgid ""
  "You are about to restore database from backup file.\n"
  "Do you want to continue?"
  msgstr ""
  
- #: ../admin/backups.php:197
 -#: admin/backups.php:197
++#: ../admin/backups.php:200
  msgid "Delete Backup"
  msgstr ""
  
- #: ../admin/backups.php:199
 -#: admin/backups.php:199
++#: ../admin/backups.php:202
  #, php-format
  msgid ""
  "You are about to remove selected backup file.\n"
  "Do you want to continue ?"
  msgstr ""
  
- #: ../admin/backups.php:205
 -#: admin/backups.php:205
++#: ../admin/backups.php:208
  msgid "Upload file"
  msgstr ""
  
 -#: admin/change_current_user_password.php:16
 -#: admin/change_current_user_password.php:99 themes/default/renderer.php:76
 +#: ../admin/change_current_user_password.php:16
 +#: ../admin/change_current_user_password.php:99
- #: ../themes/default/renderer.php:77
  msgid "Change password"
  msgstr ""
  
@@@ -619,228 -483,194 +597,232 @@@ msgstr "
  msgid "Company Setup"
  msgstr ""
  
- #: ../admin/company_preferences.php:31
 -#: admin/company_preferences.php:31
++#: ../admin/company_preferences.php:29
  msgid "Login timeout must be positive number not less than 10."
  msgstr ""
  
- #: ../admin/company_preferences.php:38
 -#: admin/company_preferences.php:38
++#: ../admin/company_preferences.php:36
  msgid "The company name must be entered."
  msgstr ""
  
- #: ../admin/company_preferences.php:54
 -#: admin/company_preferences.php:54
++#: ../admin/company_preferences.php:52
  msgid ""
  "Only jpg and png files are supported - a file extension of .jpg or .png is "
  "expected"
  msgstr ""
  
- #: ../admin/company_preferences.php:59
 -#: admin/company_preferences.php:59 inventory/manage/items.php:85
++#: ../admin/company_preferences.php:57
 +#: ../inventory/manage/items.php:86
  msgid ""
  "The file size is over the maximum allowed. The maximum size allowed in KB is"
  msgstr ""
  
- #: ../admin/company_preferences.php:64
 -#: admin/company_preferences.php:64 inventory/manage/items.php:75
++#: ../admin/company_preferences.php:62
 +#: ../inventory/manage/items.php:76
 +#: ../inventory/manage/items.php:91
  msgid "Only graphics files can be uploaded"
  msgstr ""
  
- #: ../admin/company_preferences.php:72
- #: ../admin/company_preferences.php:93
 -#: admin/company_preferences.php:72 admin/company_preferences.php:93
 -#: inventory/manage/items.php:93
++#: ../admin/company_preferences.php:70
++#: ../admin/company_preferences.php:91
 +#: ../inventory/manage/items.php:99
  msgid "The existing image could not be removed"
  msgstr ""
  
- #: ../admin/company_preferences.php:82
 -#: admin/company_preferences.php:82
++#: ../admin/company_preferences.php:80
  msgid "Error uploading logo file"
  msgstr ""
  
- #: ../admin/company_preferences.php:116
 -#: admin/company_preferences.php:116
++#: ../admin/company_preferences.php:114
  msgid "Company setup has been updated."
  msgstr ""
  
- #: ../admin/company_preferences.php:164
 -#: admin/company_preferences.php:164
++#: ../admin/company_preferences.php:173
  msgid "Name (to appear on reports):"
  msgstr ""
  
- #: ../admin/company_preferences.php:165
 -#: 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:234 sales/includes/ui/sales_order_ui.inc:621
++#: ../admin/company_preferences.php:174
 +#: ../admin/shipping_companies.php:142
 +#: ../includes/ui/contacts_view.inc:109
 +#: ../inventory/manage/locations.php:202
 +#: ../sales/manage/customers.php:234
- #: ../sales/includes/ui/sales_order_ui.inc:627
  msgid "Address:"
  msgstr ""
  
- #: ../admin/company_preferences.php:166
 -#: admin/company_preferences.php:166
++#: ../admin/company_preferences.php:175
  msgid "Domicile:"
  msgstr ""
  
- #: ../admin/company_preferences.php:168
 -#: admin/company_preferences.php:168 admin/shipping_companies.php:138
 -#: purchasing/manage/suppliers.php:130 sales/manage/customer_branches.php:260
++#: ../admin/company_preferences.php:177
 +#: ../admin/shipping_companies.php:138
 +#: ../purchasing/manage/suppliers.php:137
- #: ../sales/manage/customer_branches.php:262
++#: ../sales/manage/customer_branches.php:249
  msgid "Phone Number:"
  msgstr ""
  
- #: ../admin/company_preferences.php:169
 -#: admin/company_preferences.php:169 includes/ui/contacts_view.inc:104
 -#: purchasing/manage/suppliers.php:160 sales/manage/customer_branches.php:262
 -#: sales/manage/customers.php:258
++#: ../admin/company_preferences.php:178
 +#: ../includes/ui/contacts_view.inc:104
 +#: ../purchasing/manage/suppliers.php:140
- #: ../sales/manage/customer_branches.php:264
++#: ../sales/manage/customer_branches.php:251
 +#: ../sales/manage/customers.php:258
  msgid "Fax Number:"
  msgstr ""
  
- #: ../admin/company_preferences.php:170
 -#: admin/company_preferences.php:170 admin/users.php:211
++#: ../admin/company_preferences.php:179
 +#: ../admin/users.php:211
  msgid "Email Address:"
  msgstr ""
  
- #: ../admin/company_preferences.php:172
 -#: admin/company_preferences.php:172
++#: ../admin/company_preferences.php:181
  msgid "BCC Address for all outgoing mails:"
  msgstr ""
  
- #: ../admin/company_preferences.php:174
 -#: admin/company_preferences.php:174
++#: ../admin/company_preferences.php:183
  msgid "Official Company Number:"
  msgstr ""
  
- #: ../admin/company_preferences.php:175
 -#: admin/company_preferences.php:175 purchasing/manage/suppliers.php:94
 -#: sales/manage/customers.php:236
++#: ../admin/company_preferences.php:184
 +#: ../purchasing/manage/suppliers.php:96
 +#: ../sales/manage/customers.php:236
  msgid "GSTNo:"
  msgstr ""
  
- #: ../admin/company_preferences.php:177
 -#: admin/company_preferences.php:177
--msgid "Home Currency:"
--msgstr ""
--
- #: ../admin/company_preferences.php:178
 -#: admin/company_preferences.php:178 gl/gl_budget.php:63
++#: ../admin/company_preferences.php:186
 +#: ../gl/gl_budget.php:63
  msgid "Fiscal Year:"
  msgstr ""
  
- #: ../admin/company_preferences.php:179
 -#: admin/company_preferences.php:179
++#: ../admin/company_preferences.php:187
  msgid "Tax Periods:"
  msgstr ""
  
- #: ../admin/company_preferences.php:179
 -#: admin/company_preferences.php:179
++#: ../admin/company_preferences.php:187
  msgid "Months."
  msgstr ""
  
- #: ../admin/company_preferences.php:180
 -#: admin/company_preferences.php:180
++#: ../admin/company_preferences.php:188
  msgid "Tax Last Period:"
  msgstr ""
  
- #: ../admin/company_preferences.php:180
 -#: admin/company_preferences.php:180
++#: ../admin/company_preferences.php:188
  msgid "Months back."
  msgstr ""
  
- #: ../admin/company_preferences.php:184
 -#: admin/company_preferences.php:184
++#: ../admin/company_preferences.php:189
++msgid "Put alternative Tax Include on Docs"
++msgstr ""
++
++#: ../admin/company_preferences.php:190
++msgid "Suppress Tax Rates on Docs"
++msgstr ""
++
++#: ../admin/company_preferences.php:194
  msgid "Company Logo:"
  msgstr ""
  
- #: ../admin/company_preferences.php:185
 -#: admin/company_preferences.php:185
++#: ../admin/company_preferences.php:195
  msgid "New Company Logo (.jpg)"
  msgstr ""
  
- #: ../admin/company_preferences.php:186
 -#: admin/company_preferences.php:186
++#: ../admin/company_preferences.php:196
  msgid "Delete Company Logo:"
  msgstr ""
  
- #: ../admin/company_preferences.php:188
 -#: admin/company_preferences.php:188
++#: ../admin/company_preferences.php:198
  msgid "Use Dimensions:"
  msgstr ""
  
- #: ../admin/company_preferences.php:189
 -#: admin/company_preferences.php:189
++#: ../admin/company_preferences.php:199
  msgid "Base for auto price calculations:"
  msgstr ""
  
- #: ../admin/company_preferences.php:190
 -#: admin/company_preferences.php:190
++#: ../admin/company_preferences.php:200
  msgid "No base price list"
  msgstr ""
  
- #: ../admin/company_preferences.php:191
 -#: admin/company_preferences.php:191
++#: ../admin/company_preferences.php:201
  msgid "Add Price from Std Cost:"
  msgstr ""
  
- #: ../admin/company_preferences.php:193
 -#: admin/company_preferences.php:193
++#: ../admin/company_preferences.php:203
  msgid "Round to nearest:"
  msgstr ""
  
- #: ../admin/company_preferences.php:196
 -#: admin/company_preferences.php:196
++#: ../admin/company_preferences.php:206
  msgid "Search Item List"
  msgstr ""
  
- #: ../admin/company_preferences.php:197
 -#: admin/company_preferences.php:197
++#: ../admin/company_preferences.php:207
  msgid "Search Customer List"
  msgstr ""
  
- #: ../admin/company_preferences.php:198
 -#: admin/company_preferences.php:198
++#: ../admin/company_preferences.php:208
  msgid "Search Supplier List"
  msgstr ""
  
- #: ../admin/company_preferences.php:200
 -#: admin/company_preferences.php:200
++#: ../admin/company_preferences.php:210
++msgid "Home Currency:"
++msgstr ""
++
++#: ../admin/company_preferences.php:211
  msgid "Automatic Revaluation Currency Accounts"
  msgstr ""
  
- #: ../admin/company_preferences.php:201
 -#: admin/company_preferences.php:201
++#: ../admin/company_preferences.php:212
  msgid "Time Zone on Reports"
  msgstr ""
  
- #: ../admin/company_preferences.php:202
 -#: admin/company_preferences.php:202
++#: ../admin/company_preferences.php:213
  msgid "Login Timeout:"
  msgstr ""
  
- #: ../admin/company_preferences.php:202
 -#: admin/company_preferences.php:202
++#: ../admin/company_preferences.php:213
  msgid "seconds"
  msgstr ""
  
- #: ../admin/company_preferences.php:203
 -#: admin/company_preferences.php:203
++#: ../admin/company_preferences.php:214
  msgid "Version Id"
  msgstr ""
  
- #: ../admin/company_preferences.php:208
- #: ../admin/display_prefs.php:145
 -#: admin/company_preferences.php:208 admin/display_prefs.php:143
 -#: admin/forms_setup.php:61 admin/gl_setup.php:234 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:414 gl/gl_budget.php:135
 -#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:277
 -#: gl/includes/ui/gl_journal_ui.inc:220 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:234 inventory/cost_update.php:136
 -#: inventory/reorder_level.php:111 inventory/transfers.php:230
 -#: inventory/includes/item_adjustments_ui.inc:163
 -#: inventory/includes/stock_transfers_ui.inc:143
 -#: inventory/manage/sales_kits.php:208 manufacturing/work_order_entry.php:457
 -#: manufacturing/includes/work_order_issue_ui.inc:138
 -#: purchasing/includes/ui/po_ui.inc:296 purchasing/includes/ui/po_ui.inc:439
 -#: purchasing/po_receive_items.php:334 sales/credit_note_entry.php:284
 -#: sales/customer_credit_invoice.php:381 sales/customer_delivery.php:517
 -#: sales/customer_invoice.php:591 sales/inquiry/sales_orders_view.php:323
 -#: sales/includes/ui/sales_credit_ui.inc:293
 -#: sales/includes/ui/sales_order_ui.inc:232
 -#: sales/includes/ui/sales_order_ui.inc:548
++#: ../admin/company_preferences.php:219
++#: ../admin/display_prefs.php:160
 +#: ../admin/forms_setup.php:61
- #: ../admin/gl_setup.php:249
++#: ../admin/gl_setup.php:309
 +#: ../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
++#: ../admin/inst_theme.php:77
 +#: ../dimensions/dimension_entry.php:293
 +#: ../gl/gl_bank.php:417
 +#: ../gl/gl_budget.php:135
 +#: ../gl/manage/gl_quick_entries.php:60
 +#: ../gl/includes/ui/gl_bank_ui.inc:277
- #: ../gl/includes/ui/gl_journal_ui.inc:257
++#: ../gl/includes/ui/gl_journal_ui.inc:256
 +#: ../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
++#: ../includes/ui/ui_input.inc:209
++#: ../includes/ui/ui_input.inc:907
 +#: ../inventory/adjustments.php:234
 +#: ../inventory/cost_update.php:134
 +#: ../inventory/reorder_level.php:112
 +#: ../inventory/transfers.php:230
 +#: ../inventory/includes/item_adjustments_ui.inc:163
 +#: ../inventory/includes/stock_transfers_ui.inc:143
 +#: ../inventory/manage/sales_kits.php:208
 +#: ../manufacturing/work_order_entry.php:457
 +#: ../manufacturing/includes/work_order_issue_ui.inc:138
- #: ../purchasing/includes/ui/po_ui.inc:308
- #: ../purchasing/includes/ui/po_ui.inc:459
++#: ../purchasing/includes/ui/po_ui.inc:281
++#: ../purchasing/includes/ui/po_ui.inc:432
 +#: ../purchasing/po_receive_items.php:332
 +#: ../sales/credit_note_entry.php:284
- #: ../sales/customer_credit_invoice.php:380
- #: ../sales/customer_delivery.php:563
- #: ../sales/customer_invoice.php:693
- #: ../sales/inquiry/sales_orders_view.php:350
++#: ../sales/customer_credit_invoice.php:381
++#: ../sales/customer_delivery.php:528
++#: ../sales/inquiry/sales_orders_view.php:313
 +#: ../sales/includes/ui/sales_credit_ui.inc:293
- #: ../sales/includes/ui/sales_order_ui.inc:232
- #: ../sales/includes/ui/sales_order_ui.inc:546
- #: ../taxes/sav.tax_types.php:255
++#: ../sales/includes/ui/sales_order_ui.inc:233
  msgid "Update"
  msgstr ""
  
@@@ -871,189 -700,146 +853,191 @@@ msgstr "
  msgid ", Please create it manually"
  msgstr ""
  
- #: ../admin/create_coy.php:131
 -#: admin/create_coy.php:131
++#: ../admin/create_coy.php:133
  msgid "Cannot create new company due to bugs in sql file."
  msgstr ""
  
- #: ../admin/create_coy.php:149
- #: ../admin/create_coy.php:216
 -#: admin/create_coy.php:149 admin/create_coy.php:216
++#: ../admin/create_coy.php:152
++#: ../admin/create_coy.php:219
  msgid "Cannot open the configuration file - "
  msgstr ""
  
- #: ../admin/create_coy.php:151
- #: ../admin/create_coy.php:218
 -#: admin/create_coy.php:151 admin/create_coy.php:218
++#: ../admin/create_coy.php:154
++#: ../admin/create_coy.php:221
  msgid "Cannot write to the configuration file - "
  msgstr ""
  
- #: ../admin/create_coy.php:153
- #: ../admin/create_coy.php:189
- #: ../admin/create_coy.php:220
 -#: admin/create_coy.php:153 admin/create_coy.php:189 admin/create_coy.php:220
++#: ../admin/create_coy.php:156
++#: ../admin/create_coy.php:191
++#: ../admin/create_coy.php:223
  msgid "The configuration file "
  msgstr ""
  
- #: ../admin/create_coy.php:153
- #: ../admin/create_coy.php:189
- #: ../admin/create_coy.php:220
 -#: admin/create_coy.php:153 admin/create_coy.php:189 admin/create_coy.php:220
 -#: admin/db/maintenance_db.inc:250
++#: ../admin/create_coy.php:156
++#: ../admin/create_coy.php:191
++#: ../admin/create_coy.php:223
 +#: ../admin/db/maintenance_db.inc:250
  msgid ""
  " is not writable. Change its permissions so it is, then re-run the operation."
  msgstr ""
  
- #: ../admin/create_coy.php:165
 -#: admin/create_coy.php:165
++#: ../admin/create_coy.php:168
  msgid "New company has been created."
  msgstr ""
  
- #: ../admin/create_coy.php:165
 -#: admin/create_coy.php:165
++#: ../admin/create_coy.php:168
  msgid "Company has been updated."
  msgstr ""
  
- #: ../admin/create_coy.php:182
 -#: admin/create_coy.php:182
++#: ../admin/create_coy.php:184
  msgid ""
  "Broken company subdirectories system. You have to remove this company "
  "manually."
  msgstr ""
  
- #: ../admin/create_coy.php:198
 -#: admin/create_coy.php:198
++#: ../admin/create_coy.php:200
  msgid "Cannot rename subdirectory to temporary name."
  msgstr ""
  
- #: ../admin/create_coy.php:204
 -#: admin/create_coy.php:204
++#: ../admin/create_coy.php:206
  msgid "Cannot rename company subdirectory"
  msgstr ""
  
- #: ../admin/create_coy.php:210
 -#: admin/create_coy.php:210
++#: ../admin/create_coy.php:212
  msgid "Error removing Database: "
  msgstr ""
  
- #: ../admin/create_coy.php:210
 -#: admin/create_coy.php:210
++#: ../admin/create_coy.php:212
  msgid ", please remove it manually"
  msgstr ""
  
- #: ../admin/create_coy.php:229
 -#: admin/create_coy.php:229
++#: ../admin/create_coy.php:232
  msgid "Cannot remove temporary renamed company data directory "
  msgstr ""
  
- #: ../admin/create_coy.php:232
 -#: admin/create_coy.php:232
++#: ../admin/create_coy.php:235
  msgid "Selected company has been deleted"
  msgstr ""
  
- #: ../admin/create_coy.php:246
 -#: admin/create_coy.php:246
++#: ../admin/create_coy.php:250
  msgid "Are you sure you want to delete company no. "
  msgstr ""
  
- #: ../admin/create_coy.php:253
 -#: admin/create_coy.php:253
++#: ../admin/create_coy.php:257
  msgid "Database Host"
  msgstr ""
  
- #: ../admin/create_coy.php:253
- #: ../admin/create_coy.php:341
- #: ../admin/create_coy.php:347
 -#: admin/create_coy.php:253 admin/create_coy.php:341 admin/create_coy.php:347
++#: ../admin/create_coy.php:257
++#: ../admin/create_coy.php:345
++#: ../admin/create_coy.php:351
  msgid "Database User"
  msgstr ""
  
- #: ../admin/create_coy.php:254
- #: ../admin/create_coy.php:343
- #: ../admin/create_coy.php:348
 -#: admin/create_coy.php:254 admin/create_coy.php:343 admin/create_coy.php:348
++#: ../admin/create_coy.php:258
++#: ../admin/create_coy.php:347
++#: ../admin/create_coy.php:352
  msgid "Database Name"
  msgstr ""
  
- #: ../admin/create_coy.php:254
- #: ../admin/create_coy.php:344
- #: ../admin/create_coy.php:349
 -#: admin/create_coy.php:254 admin/create_coy.php:344 admin/create_coy.php:349
++#: ../admin/create_coy.php:258
++#: ../admin/create_coy.php:348
++#: ../admin/create_coy.php:353
  msgid "Table Pref"
  msgstr ""
  
- #: ../admin/create_coy.php:254
- #: ../admin/create_coy.php:351
 -#: admin/create_coy.php:254 admin/create_coy.php:351 admin/inst_lang.php:36
 -#: admin/print_profiles.php:162
++#: ../admin/create_coy.php:258
++#: ../admin/create_coy.php:355
 +#: ../admin/inst_lang.php:36
 +#: ../admin/print_profiles.php:162
++#: ../purchasing/includes/ui/invoice_ui.inc:132
++#: ../purchasing/includes/ui/invoice_ui.inc:135
++#: ../purchasing/includes/ui/po_ui.inc:176
++#: ../purchasing/includes/ui/po_ui.inc:178
  msgid "Default"
  msgstr ""
  
- #: ../admin/create_coy.php:263
 -#: 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/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:1681
 -#: purchasing/manage/suppliers.php:121 reporting/rep101.php:113
 -#: reporting/rep102.php:113 reporting/rep102.php:115 reporting/rep104.php:107
 -#: reporting/rep106.php:77 reporting/rep114.php:76 reporting/rep201.php:105
 -#: reporting/rep202.php:117 reporting/rep202.php:119 reporting/rep203.php:88
 -#: reporting/rep303.php:108 reporting/rep303.php:116 reporting/rep402.php:99
 -#: 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
++#: ../admin/create_coy.php:267
 +#: ../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:1682
++#: ../includes/ui/ui_lists.inc:1671
 +#: ../purchasing/manage/suppliers.php:123
 +#: ../reporting/rep101.php:113
 +#: ../reporting/rep102.php:113
 +#: ../reporting/rep102.php:115
 +#: ../reporting/rep104.php:107
- #: ../reporting/rep106.php:77
++#: ../reporting/rep106.php:84
 +#: ../reporting/rep114.php:76
 +#: ../reporting/rep201.php:105
 +#: ../reporting/rep202.php:117
 +#: ../reporting/rep202.php:119
 +#: ../reporting/rep203.php:88
 +#: ../reporting/rep303.php:108
 +#: ../reporting/rep303.php:116
 +#: ../reporting/rep402.php:99
 +#: ../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
  msgid "Yes"
  msgstr ""
  
- #: ../admin/create_coy.php:292
 -#: admin/create_coy.php:292
++#: ../admin/create_coy.php:296
  msgid "The marked company is the current company which cannot be deleted."
  msgstr ""
  
- #: ../admin/create_coy.php:293
 -#: admin/create_coy.php:293
++#: ../admin/create_coy.php:297
  msgid ""
  "If no Admin Password is entered, the new Admin Password will be "
  "'<b>password</b>' by default "
  msgstr ""
  
- #: ../admin/create_coy.php:340
- #: ../admin/create_coy.php:346
 -#: admin/create_coy.php:340 admin/create_coy.php:346 admin/printers.php:84
++#: ../admin/create_coy.php:344
++#: ../admin/create_coy.php:350
 +#: ../admin/printers.php:84
  msgid "Host"
  msgstr ""
  
- #: ../admin/create_coy.php:342
 -#: admin/create_coy.php:342
++#: ../admin/create_coy.php:346
  msgid "Database Password"
  msgstr ""
  
- #: ../admin/create_coy.php:344
 -#: 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:314
++#: ../admin/create_coy.php:348
 +#: ../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:153
++#: ../admin/inst_theme.php:72
++#: ../admin/inst_theme.php:74
 +#: ../gl/manage/gl_account_types.php:190
 +#: ../includes/ui/allocation_cart.inc:316
- #: ../taxes/sav.tax_types.php:168
  msgid "None"
  msgstr ""
  
- #: ../admin/create_coy.php:355
 -#: admin/create_coy.php:355
++#: ../admin/create_coy.php:359
  msgid "Database Script"
  msgstr ""
  
- #: ../admin/create_coy.php:356
 -#: admin/create_coy.php:356
++#: ../admin/create_coy.php:360
  msgid "New script Admin Password"
  msgstr ""
  
- #: ../admin/create_coy.php:360
 -#: admin/create_coy.php:360 gl/gl_budget.php:136
++#: ../admin/create_coy.php:364
 +#: ../gl/gl_budget.php:136
  msgid "Save"
  msgstr ""
  
- #: ../admin/create_coy.php:382
 -#: admin/create_coy.php:382
++#: ../admin/create_coy.php:386
  msgid "Create a new company"
  msgstr ""
  
@@@ -1073,42 -859,39 +1057,42 @@@ msgstr "
  msgid "New contact category has been added"
  msgstr ""
  
- #: ../admin/crm_categories.php:71
 -#: admin/crm_categories.php:71
++#: ../admin/crm_categories.php:62
  msgid "Cannot delete this category because there are contacts related to it."
  msgstr ""
  
- #: ../admin/crm_categories.php:77
 -#: admin/crm_categories.php:77
++#: ../admin/crm_categories.php:68
  msgid "Category has been deleted"
  msgstr ""
  
- #: ../admin/crm_categories.php:97
 -#: admin/crm_categories.php:97
++#: ../admin/crm_categories.php:88
  msgid "Category Type"
  msgstr ""
  
- #: ../admin/crm_categories.php:97
 -#: admin/crm_categories.php:97
++#: ../admin/crm_categories.php:88
  msgid "Category Subtype"
  msgstr ""
  
- #: ../admin/crm_categories.php:97
- #: ../sales/manage/customer_branches.php:295
 -#: admin/crm_categories.php:97 sales/manage/customer_branches.php:293
++#: ../admin/crm_categories.php:88
++#: ../sales/manage/customer_branches.php:279
  msgid "Short Name"
  msgstr ""
  
- #: ../admin/crm_categories.php:144
- #: ../admin/crm_categories.php:148
 -#: admin/crm_categories.php:144 admin/crm_categories.php:148
++#: ../admin/crm_categories.php:135
++#: ../admin/crm_categories.php:139
  msgid "Contact Category Type:"
  msgstr ""
  
- #: ../admin/crm_categories.php:145
- #: ../admin/crm_categories.php:149
 -#: admin/crm_categories.php:145 admin/crm_categories.php:149
++#: ../admin/crm_categories.php:136
++#: ../admin/crm_categories.php:140
  msgid "Contact Category Subtype:"
  msgstr ""
  
- #: ../admin/crm_categories.php:152
 -#: admin/crm_categories.php:152
++#: ../admin/crm_categories.php:143
  msgid "Category Short Name:"
  msgstr ""
  
- #: ../admin/crm_categories.php:153
 -#: admin/crm_categories.php:153
++#: ../admin/crm_categories.php:144
  msgid "Category Description:"
  msgstr ""
  
@@@ -1120,138 -903,128 +1104,177 @@@ msgstr "
  msgid "Query size must be integer and greater than zero."
  msgstr ""
  
- #: ../admin/display_prefs.php:60
 -#: admin/display_prefs.php:60
++#: ../admin/display_prefs.php:61
  msgid ""
  "Display settings have been updated. Keep in mind that changed settings are "
  "restored on every login in demo mode."
  msgstr ""
  
- #: ../admin/display_prefs.php:62
 -#: admin/display_prefs.php:62
++#: ../admin/display_prefs.php:63
  msgid "Display settings have been updated."
  msgstr ""
  
- #: ../admin/display_prefs.php:71
 -#: admin/display_prefs.php:71
++#: ../admin/display_prefs.php:72
  msgid "Decimal Places"
  msgstr ""
  
- #: ../admin/display_prefs.php:73
 -#: admin/display_prefs.php:73
++#: ../admin/display_prefs.php:74
  msgid "Prices/Amounts:"
  msgstr ""
  
- #: ../admin/display_prefs.php:74
 -#: admin/display_prefs.php:74
++#: ../admin/display_prefs.php:75
  msgid "Quantities:"
  msgstr ""
  
- #: ../admin/display_prefs.php:75
 -#: admin/display_prefs.php:75
++#: ../admin/display_prefs.php:76
  msgid "Exchange Rates:"
  msgstr ""
  
- #: ../admin/display_prefs.php:76
 -#: admin/display_prefs.php:76
++#: ../admin/display_prefs.php:77
  msgid "Percentages:"
  msgstr ""
  
- #: ../admin/display_prefs.php:78
 -#: admin/display_prefs.php:78
--msgid "Dateformat and Separators"
++#: ../admin/display_prefs.php:79
++msgid "Date Format and Separators"
  msgstr ""
  
- #: ../admin/display_prefs.php:80
 -#: admin/display_prefs.php:80
--msgid "Dateformat:"
++#: ../admin/display_prefs.php:81
++msgid "Date Format:"
  msgstr ""
  
- #: ../admin/display_prefs.php:82
 -#: admin/display_prefs.php:82
++#: ../admin/display_prefs.php:83
  msgid "Date Separator:"
  msgstr ""
  
- #: ../admin/display_prefs.php:87
 -#: admin/display_prefs.php:87
++#: ../admin/display_prefs.php:88
  msgid "Thousand Separator:"
  msgstr ""
  
- #: ../admin/display_prefs.php:92
 -#: admin/display_prefs.php:92
++#: ../admin/display_prefs.php:93
  msgid "Decimal Separator:"
  msgstr ""
  
- #: ../admin/display_prefs.php:99
- #: ../admin/inst_lang.php:35
 -#: admin/display_prefs.php:99 admin/inst_lang.php:35
--msgid "Language"
++#: ../admin/display_prefs.php:98
++msgid "Use Date Picker"
  msgstr ""
  
- #: ../admin/display_prefs.php:101
- #: ../admin/users.php:215
 -#: admin/display_prefs.php:101 admin/users.php:215
--msgid "Language:"
++#: ../admin/display_prefs.php:103
++msgid "Reports"
++msgstr ""
++
++#: ../admin/display_prefs.php:105
++msgid "Save Report Selection Days:"
++msgstr ""
++
++#: ../admin/display_prefs.php:107
++msgid "Default Report Destination:"
+ msgstr ""
+ 
 -#: admin/display_prefs.php:104 applications/setup.php:42
 -#: includes/sysnames.inc:94
++#: ../admin/display_prefs.php:108
++msgid "Excel"
++msgstr ""
++
++#: ../admin/display_prefs.php:108
++#: ../reporting/includes/reports_classes.inc:234
++msgid "PDF/Printer"
++msgstr ""
++
++#: ../admin/display_prefs.php:110
++msgid "Default Report Orientation:"
++msgstr ""
++
++#: ../admin/display_prefs.php:111
++#: ../reporting/includes/reports_classes.inc:241
++msgid "Landscape"
++msgstr ""
++
++#: ../admin/display_prefs.php:111
++#: ../reporting/includes/reports_classes.inc:241
++msgid "Portrait"
 +msgstr ""
 +
- #: ../admin/display_prefs.php:104
++#: ../admin/display_prefs.php:115
 +#: ../applications/setup.php:42
 +#: ../includes/sysnames.inc:94
  msgid "Miscellaneous"
  msgstr ""
  
- #: ../admin/display_prefs.php:106
 -#: admin/display_prefs.php:106
++#: ../admin/display_prefs.php:117
  msgid "Show hints for new users:"
  msgstr ""
  
- #: ../admin/display_prefs.php:108
 -#: admin/display_prefs.php:108
++#: ../admin/display_prefs.php:119
  msgid "Show GL Information:"
  msgstr ""
  
- #: ../admin/display_prefs.php:110
 -#: admin/display_prefs.php:110
++#: ../admin/display_prefs.php:121
  msgid "Show Item Codes:"
  msgstr ""
  
- #: ../admin/display_prefs.php:117
 -#: admin/display_prefs.php:117
++#: ../admin/display_prefs.php:128
  msgid "Page Size:"
  msgstr ""
  
- #: ../admin/display_prefs.php:119
 -#: admin/display_prefs.php:119
++#: ../admin/display_prefs.php:130
  msgid "Start-up Tab"
  msgstr ""
  
- #: ../admin/display_prefs.php:127
 -#: admin/display_prefs.php:127 admin/users.php:219
++#: ../admin/display_prefs.php:138
 +#: ../admin/users.php:219
  msgid "Printing profile"
  msgstr ""
  
- #: ../admin/display_prefs.php:128
 -#: admin/display_prefs.php:128 admin/users.php:220
++#: ../admin/display_prefs.php:139
 +#: ../admin/users.php:220
  msgid "Browser printing support"
  msgstr ""
  
- #: ../admin/display_prefs.php:130
 -#: admin/display_prefs.php:130
++#: ../admin/display_prefs.php:141
  msgid "Use popup window to display reports:"
  msgstr ""
  
- #: ../admin/display_prefs.php:131
 -#: admin/display_prefs.php:131 admin/users.php:223
++#: ../admin/display_prefs.php:142
 +#: ../admin/users.php:223
  msgid "Set this option to on if your browser directly supports pdf files"
  msgstr ""
  
- #: ../admin/display_prefs.php:133
 -#: admin/display_prefs.php:133
++#: ../admin/display_prefs.php:144
  msgid "Use icons instead of text links:"
  msgstr ""
  
- #: ../admin/display_prefs.php:134
 -#: admin/display_prefs.php:134
++#: ../admin/display_prefs.php:145
  msgid "Set this option to on for using icons instead of text links"
  msgstr ""
  
- #: ../admin/display_prefs.php:136
 -#: admin/display_prefs.php:136
--msgid "Query page size:"
--msgstr ""
--
- #: ../admin/display_prefs.php:138
 -#: admin/display_prefs.php:138
++#: ../admin/display_prefs.php:147
  msgid "Remember last document date:"
  msgstr ""
  
- #: ../admin/display_prefs.php:139
 -#: admin/display_prefs.php:139
++#: ../admin/display_prefs.php:148
  msgid ""
  "If set document date is remembered on subsequent documents, otherwise "
  "default is current date"
  msgstr ""
  
- #: ../admin/display_prefs.php:141
 -#: admin/fiscalyears.php:25
++#: ../admin/display_prefs.php:150
++msgid "Query page size:"
++msgstr ""
++
++#: ../admin/display_prefs.php:152
 +msgid "Transaction days:"
 +msgstr ""
 +
++#: ../admin/display_prefs.php:154
++#: ../admin/inst_lang.php:35
++msgid "Language"
++msgstr ""
++
++#: ../admin/display_prefs.php:156
++#: ../admin/users.php:215
++msgid "Language:"
++msgstr ""
++
 +#: ../admin/fiscalyears.php:25
  msgid "Fiscal Years"
  msgstr ""
  
@@@ -1310,17 -1083,12 +1333,17 @@@ 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_lists.inc:681
 -#: manufacturing/search_work_orders.php:114 reporting/rep402.php:103
 -#: reporting/rep501.php:87 reporting/rep710.php:113
 -#: 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/ui_input.inc:959
- #: ../includes/ui/ui_lists.inc:677
- #: ../manufacturing/search_work_orders.php:108
++#: ../dimensions/inquiry/search_dimensions.php:134
++#: ../dimensions/inquiry/search_dimensions.php:140
++#: ../includes/ui/ui_lists.inc:671
++#: ../includes/ui/ui_view.inc:1467
++#: ../manufacturing/search_work_orders.php:114
 +#: ../reporting/rep402.php:103
 +#: ../reporting/rep501.php:87
 +#: ../reporting/rep710.php:113
 +#: ../reporting/includes/excel_report.inc:234
- #: ../reporting/includes/pdf_report.inc:266
++#: ../reporting/includes/pdf_report.inc:267
  msgid "Closed"
  msgstr ""
  
@@@ -1382,216 -1148,182 +1405,310 @@@ msgstr "
  msgid "The past due days interval allowance must be between 0 and 100."
  msgstr ""
  
- #: ../admin/gl_setup.php:52
 -#: admin/gl_setup.php:52
++#: ../admin/gl_setup.php:55
  msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced"
  msgstr ""
  
- #: ../admin/gl_setup.php:59
- #: ../admin/db/fiscalyears_db.inc:141
 -#: admin/gl_setup.php:59 admin/db/fiscalyears_db.inc:141
++#: ../admin/gl_setup.php:62
++#: ../admin/db/fiscalyears_db.inc:139
  msgid ""
  "The Retained Earnings Account should be a Balance Account or the Profit and "
  "Loss Year Account should be an Expense Account (preferred the last one in "
  "the Expense Class)"
  msgstr ""
  
- #: ../admin/gl_setup.php:80
 -#: admin/gl_setup.php:80
++#: ../admin/gl_setup.php:85
  msgid "The general GL setup has been updated."
  msgstr ""
  
- #: ../admin/gl_setup.php:150
 -#: admin/gl_setup.php:143
++#: ../admin/gl_setup.php:197
  msgid "General GL"
  msgstr ""
  
- #: ../admin/gl_setup.php:152
 -#: admin/gl_setup.php:145
++#: ../admin/gl_setup.php:199
  msgid "Past Due Days Interval:"
  msgstr ""
  
- #: ../admin/gl_setup.php:152
- #: ../admin/gl_setup.php:192
- #: ../admin/gl_setup.php:194
- #: ../admin/gl_setup.php:202
- #: ../admin/gl_setup.php:220
- #: ../admin/gl_setup.php:242
 -#: admin/gl_setup.php:145 admin/gl_setup.php:180 admin/gl_setup.php:182
 -#: admin/gl_setup.php:190 admin/gl_setup.php:227 admin/payment_terms.php:140
++#: ../admin/gl_setup.php:199
++#: ../admin/gl_setup.php:245
++#: ../admin/gl_setup.php:247
++#: ../admin/gl_setup.php:255
++#: ../admin/gl_setup.php:273
++#: ../admin/gl_setup.php:303
 +#: ../admin/payment_terms.php:140
  msgid "days"
  msgstr ""
  
- #: ../admin/gl_setup.php:154
 -#: admin/gl_setup.php:147
++#: ../admin/gl_setup.php:201
++msgid "Accounts Type:"
++msgstr ""
++
++#: ../admin/gl_setup.php:203
  msgid "Retained Earnings:"
  msgstr ""
  
- #: ../admin/gl_setup.php:156
 -#: admin/gl_setup.php:149
++#: ../admin/gl_setup.php:205
  msgid "Profit/Loss Year:"
  msgstr ""
  
- #: ../admin/gl_setup.php:158
 -#: admin/gl_setup.php:151
++#: ../admin/gl_setup.php:207
  msgid "Exchange Variances Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php:160
 -#: admin/gl_setup.php:153
++#: ../admin/gl_setup.php:209
 +#: ../gl/manage/bank_accounts.php:193
  msgid "Bank Charges Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php:162
 -#: admin/gl_setup.php:157
++#: ../admin/gl_setup.php:211
 +msgid "Tax Algorithm:"
 +msgstr ""
 +
- #: ../admin/gl_setup.php:166
++#: ../admin/gl_setup.php:215
  msgid "Customers and Sales"
  msgstr ""
  
- #: ../admin/gl_setup.php:168
 -#: admin/gl_setup.php:159
++#: ../admin/gl_setup.php:217
  msgid "Default Credit Limit:"
  msgstr ""
  
- #: ../admin/gl_setup.php:170
 -#: admin/gl_setup.php:161
++#: ../admin/gl_setup.php:219
++msgid "Invoice Identification:"
++msgstr ""
++
++#: ../admin/gl_setup.php:219
++#: ../gl/manage/bank_accounts.php:110
++#: ../includes/ui/ui_view.inc:548
++msgid "Number"
++msgstr ""
++
++#: ../admin/gl_setup.php:219
++#: ../admin/view_print_transaction.php:127
++#: ../admin/void_transaction.php:182
++#: ../dimensions/inquiry/search_dimensions.php:129
++#: ../dimensions/view/view_dimension.php:55
++#: ../gl/bank_account_reconcile.php:233
++#: ../gl/inquiry/bank_inquiry.php:71
++#: ../gl/inquiry/journal_inquiry.php:103
++#: ../gl/view/bank_transfer_view.php:86
++#: ../gl/view/gl_deposit_view.php:80
++#: ../gl/view/gl_payment_view.php:78
++#: ../gl/view/gl_trans_view.php:35
++#: ../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:166
++#: ../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:32
++#: ../purchasing/includes/ui/grn_ui.inc:64
++#: ../purchasing/includes/ui/po_ui.inc:296
++#: ../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:123
++#: ../purchasing/inquiry/po_search.php:118
++#: ../purchasing/inquiry/supplier_allocation_inquiry.php:129
++#: ../purchasing/inquiry/supplier_inquiry.php:175
++#: ../purchasing/allocations/supplier_allocation_main.php:96
++#: ../reporting/rep501.php:87
++#: ../reporting/rep601.php:79
++#: ../reporting/rep602.php:80
++#: ../reporting/rep702.php:53
++#: ../reporting/includes/doctext.inc:220
++#: ../sales/customer_credit_invoice.php:245
++#: ../sales/customer_credit_invoice.php:247
++#: ../sales/customer_delivery.php:337
++#: ../sales/customer_delivery.php:339
++#: ../sales/customer_invoice.php:464
++#: ../sales/customer_invoice.php:466
++#: ../sales/allocations/customer_allocation_main.php:95
++#: ../sales/view/view_dispatch.php:85
++#: ../sales/view/view_invoice.php:85
++#: ../sales/view/view_receipt.php:39
++#: ../sales/view/view_sales_order.php:94
++#: ../sales/inquiry/customer_allocation_inquiry.php:146
++#: ../sales/inquiry/sales_deliveries_view.php:173
++#: ../sales/includes/ui/sales_credit_ui.inc:85
++#: ../sales/includes/ui/sales_credit_ui.inc:87
++#: ../sales/includes/ui/sales_order_ui.inc:365
++msgid "Reference"
++msgstr ""
++
++#: ../admin/gl_setup.php:221
  msgid "Accumulate batch shipping:"
  msgstr ""
  
- #: ../admin/gl_setup.php:172
 -#: admin/gl_setup.php:163
++#: ../admin/gl_setup.php:223
++msgid "Print Item Image on Quote:"
++msgstr ""
++
++#: ../admin/gl_setup.php:225
  msgid "Legal Text on Invoice:"
  msgstr ""
  
- #: ../admin/gl_setup.php:174
 -#: admin/gl_setup.php:165
++#: ../admin/gl_setup.php:227
  msgid "Shipping Charged Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php:176
 -#: admin/gl_setup.php:169
++#: ../admin/gl_setup.php:229
 +msgid "Deferred Income Account:"
 +msgstr ""
 +
- #: ../admin/gl_setup.php:177
++#: ../admin/gl_setup.php:230
 +msgid "Not used"
 +msgstr ""
 +
- #: ../admin/gl_setup.php:181
++#: ../admin/gl_setup.php:234
  msgid "Customers and Sales Defaults"
  msgstr ""
  
- #: ../admin/gl_setup.php:183
 -#: admin/gl_setup.php:171
++#: ../admin/gl_setup.php:236
  msgid "Receivable Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php:185
- #: ../admin/gl_setup.php:228
 -#: admin/gl_setup.php:173 admin/gl_setup.php:213
 -#: inventory/manage/item_categories.php:192 inventory/manage/items.php:354
 -#: sales/manage/customer_branches.php:250
++#: ../admin/gl_setup.php:238
++#: ../admin/gl_setup.php:289
 +#: ../inventory/manage/item_categories.php:196
 +#: ../inventory/manage/items.php:365
- #: ../sales/manage/customer_branches.php:251
++#: ../sales/manage/customer_branches.php:238
  msgid "Sales Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php:188
- #: ../sales/manage/customer_branches.php:252
 -#: admin/gl_setup.php:176 sales/manage/customer_branches.php:251
++#: ../admin/gl_setup.php:241
++#: ../sales/manage/customer_branches.php:239
  msgid "Sales Discount Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php:190
- #: ../sales/manage/customer_branches.php:254
 -#: admin/gl_setup.php:178 sales/manage/customer_branches.php:253
++#: ../admin/gl_setup.php:243
++#: ../sales/manage/customer_branches.php:241
  msgid "Prompt Payment Discount Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php:192
 -#: admin/gl_setup.php:180
++#: ../admin/gl_setup.php:245
  msgid "Quote Valid Days:"
  msgstr ""
  
- #: ../admin/gl_setup.php:194
 -#: admin/gl_setup.php:182
++#: ../admin/gl_setup.php:247
  msgid "Delivery Required By:"
  msgstr ""
  
- #: ../admin/gl_setup.php:200
 -#: admin/gl_setup.php:188
++#: ../admin/gl_setup.php:253
  msgid "Dimension Defaults"
  msgstr ""
  
- #: ../admin/gl_setup.php:202
 -#: admin/gl_setup.php:190
++#: ../admin/gl_setup.php:255
  msgid "Dimension Required By After:"
  msgstr ""
  
- #: ../admin/gl_setup.php:206
 -#: admin/gl_setup.php:193
++#: ../admin/gl_setup.php:259
  msgid "Suppliers and Purchasing"
  msgstr ""
  
- #: ../admin/gl_setup.php:208
 -#: admin/gl_setup.php:195
++#: ../admin/gl_setup.php:261
  msgid "Delivery Over-Receive Allowance:"
  msgstr ""
  
- #: ../admin/gl_setup.php:210
 -#: admin/gl_setup.php:197
++#: ../admin/gl_setup.php:263
  msgid "Invoice Over-Charge Allowance:"
  msgstr ""
  
- #: ../admin/gl_setup.php:212
 -#: admin/gl_setup.php:199
++#: ../admin/gl_setup.php:265
  msgid "Suppliers and Purchasing Defaults"
  msgstr ""
  
- #: ../admin/gl_setup.php:214
 -#: admin/gl_setup.php:201
++#: ../admin/gl_setup.php:267
  msgid "Payable Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php:216
 -#: admin/gl_setup.php:203 purchasing/manage/suppliers.php:127
++#: ../admin/gl_setup.php:269
 +#: ../purchasing/manage/suppliers.php:133
  msgid "Purchase Discount Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php:218
 -#: admin/gl_setup.php:205
++#: ../admin/gl_setup.php:271
  msgid "GRN Clearing Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php:218
 -#: admin/gl_setup.php:205
++#: ../admin/gl_setup.php:271
  msgid "No postings on GRN"
  msgstr ""
  
- #: ../admin/gl_setup.php:220
 -#: admin/gl_setup.php:207 reporting/reports_main.php:206
++#: ../admin/gl_setup.php:273
 +msgid "Receival Required By:"
 +msgstr ""
 +
- #: ../admin/gl_setup.php:222
++#: ../admin/gl_setup.php:275
++msgid "Show PO item codes:"
++msgstr ""
++
++#: ../admin/gl_setup.php:277
 +#: ../reporting/reports_main.php:206
  msgid "Inventory"
  msgstr ""
  
- #: ../admin/gl_setup.php:224
 -#: admin/gl_setup.php:209
++#: ../admin/gl_setup.php:279
  msgid "Allow Negative Inventory:"
  msgstr ""
  
- #: ../admin/gl_setup.php:225
 -#: admin/gl_setup.php:210
++#: ../admin/gl_setup.php:280
  msgid "Warning:  This may cause a delay in GL postings"
  msgstr ""
  
- #: ../admin/gl_setup.php:227
 -#: admin/gl_setup.php:212
++#: ../admin/gl_setup.php:282
++msgid "No zero-amounts (Service):"
++msgstr ""
++
++#: ../admin/gl_setup.php:284
++msgid "Location Notifications:"
++msgstr ""
++
++#: ../admin/gl_setup.php:286
++msgid "Allow Negative Prices:"
++msgstr ""
++
++#: ../admin/gl_setup.php:288
  msgid "Items Defaults"
  msgstr ""
  
- #: ../admin/gl_setup.php:230
 -#: admin/gl_setup.php:215 inventory/manage/item_categories.php:202
 -#: inventory/manage/items.php:358
++#: ../admin/gl_setup.php:291
 +#: ../inventory/manage/item_categories.php:206
 +#: ../inventory/manage/items.php:369
  msgid "Inventory Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php:232
 -#: admin/gl_setup.php:217 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:293
 +#: ../inventory/manage/item_categories.php:200
 +#: ../inventory/manage/item_categories.php:208
 +#: ../inventory/manage/items.php:370
 +#: ../inventory/manage/items.php:375
  msgid "C.O.G.S. Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php:234
 -#: admin/gl_setup.php:219 inventory/manage/item_categories.php:205
 -#: inventory/manage/items.php:360
++#: ../admin/gl_setup.php:295
 +#: ../inventory/manage/item_categories.php:209
 +#: ../inventory/manage/items.php:371
  msgid "Inventory Adjustments Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php:236
 -#: admin/gl_setup.php:221 inventory/manage/item_categories.php:209
 -#: inventory/manage/items.php:371
++#: ../admin/gl_setup.php:297
 +#: ../inventory/manage/item_categories.php:213
 +#: ../inventory/manage/items.php:382
  msgid "Item Assembly Costs Account:"
  msgstr ""
  
- #: ../admin/gl_setup.php:240
 -#: admin/gl_setup.php:225
++#: ../admin/gl_setup.php:301
  msgid "Manufacturing Defaults"
  msgstr ""
  
- #: ../admin/gl_setup.php:242
 -#: admin/gl_setup.php:227
++#: ../admin/gl_setup.php:303
  msgid "Work Order Required By After:"
  msgstr ""
  
@@@ -1607,20 -1339,14 +1724,19 @@@ 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:155
 +#: ../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_theme.php:55
  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:77
 -#: reporting/rep303.php:114
 +#: ../admin/inst_chart.php:50
 +#: ../admin/inst_lang.php:36
 +#: ../admin/inst_module.php:105
- #: ../admin/inst_theme.php:74
++#: ../admin/inst_theme.php:55
 +#: ../inventory/inquiry/stock_status.php:71
 +#: ../reporting/rep303.php:114
  msgid "Available"
  msgstr ""
  
@@@ -1630,34 -1354,22 +1746,33 @@@
  msgid "Encoding"
  msgstr ""
  
 -#: 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
 +#: ../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
++#: ../admin/inst_theme.php:73
 +#: ../includes/sysnames.inc:193
  msgid "Unknown"
  msgstr ""
  
 -#: 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_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:141
++#: ../admin/inst_theme.php:77
  msgid "Install"
  msgstr ""
  
 -#: admin/inst_chart.php:75 admin/inst_module.php:138 admin/inst_theme.php:97
 +#: ../admin/inst_chart.php:75
 +#: ../admin/inst_module.php:138
- #: ../admin/inst_theme.php:97
++#: ../admin/inst_theme.php:78
  msgid "Upload and install latest extension package"
  msgstr ""
  
 -#: admin/inst_chart.php:82 admin/inst_module.php:145 admin/inst_theme.php:104
 +#: ../admin/inst_chart.php:82
 +#: ../admin/inst_module.php:145
- #: ../admin/inst_theme.php:104
++#: ../admin/inst_theme.php:85
  #, php-format
  msgid ""
  "You are about to remove package \\'%s\\'.\n"
@@@ -1668,23 -1380,18 +1783,20 @@@ 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:55
 -#: inventory/manage/item_categories.php:98
 -#: manufacturing/manage/work_centres.php:101
 -#: purchasing/includes/ui/invoice_ui.inc:258
 -#: purchasing/includes/ui/invoice_ui.inc:260
 -#: purchasing/includes/ui/invoice_ui.inc:262 reporting/rep501.php:87
 -#: reporting/rep709.php:116 reporting/rep709.php:117
 -#: sales/manage/customer_branches.php:294 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/inquiry/search_dimensions.php:130
 +#: ../dimensions/view/view_dimension.php:55
 +#: ../inventory/manage/item_categories.php:98
 +#: ../manufacturing/manage/work_centres.php:101
- #: ../purchasing/includes/ui/invoice_ui.inc:280
- #: ../purchasing/includes/ui/invoice_ui.inc:282
- #: ../purchasing/includes/ui/invoice_ui.inc:284
 +#: ../reporting/rep501.php:87
 +#: ../reporting/rep709.php:116
 +#: ../reporting/rep709.php:117
- #: ../sales/manage/customer_branches.php:296
++#: ../sales/manage/customer_branches.php:280
 +#: ../sales/manage/sales_people.php:99
 +#: ../taxes/item_tax_types.php:117
  msgid "Name"
  msgstr ""
  
@@@ -1786,11 -1488,9 +1898,11 @@@ msgstr "
  msgid "Install third-party extension."
  msgstr ""
  
 -#: admin/inst_module.php:168 includes/ui/ui_lists.inc:681
 -#: includes/ui/ui_lists.inc:2161 reporting/includes/excel_report.inc:232
 -#: reporting/includes/pdf_report.inc:264
 +#: ../admin/inst_module.php:168
- #: ../includes/ui/ui_lists.inc:677
- #: ../includes/ui/ui_lists.inc:2162
++#: ../includes/ui/ui_lists.inc:671
++#: ../includes/ui/ui_lists.inc:2148
 +#: ../reporting/includes/excel_report.inc:232
- #: ../reporting/includes/pdf_report.inc:264
++#: ../reporting/includes/pdf_report.inc:265
  msgid "Active"
  msgstr ""
  
@@@ -1810,84 -1510,81 +1922,80 @@@ msgstr "
  msgid "Install Themes"
  msgstr ""
  
- #: ../admin/inst_theme.php:59
 -#: admin/inst_theme.php:59
++#: ../admin/inst_theme.php:40
  msgid "Selected theme has been successfully deleted"
  msgstr ""
  
- #: ../admin/inst_theme.php:74
 -#: admin/inst_theme.php:74
++#: ../admin/inst_theme.php:55
  msgid "Theme"
  msgstr ""
  
- #: ../admin/inst_upgrade.php:16
 -#: admin/inst_upgrade.php:16
++#: ../admin/inst_upgrade.php:19
  msgid "Software Upgrade"
  msgstr ""
  
- #: ../admin/inst_upgrade.php:72
 -#: admin/inst_upgrade.php:72
--#, php-format
--msgid "Database upgrade for company '%s' (%s:%s*) started..."
++#: ../admin/inst_upgrade.php:35
++msgid "Select company to be upgraded."
  msgstr ""
  
- #: ../admin/inst_upgrade.php:83
 -#: admin/inst_upgrade.php:80
--msgid "Database upgrade finished."
++#: ../admin/inst_upgrade.php:43
++msgid "Company upgraded successfully."
  msgstr ""
  
- #: ../admin/inst_upgrade.php:86
 -#: admin/inst_upgrade.php:84
--msgid ""
--"Upgrade cannot be done because database has been already partially upgraded. "
--"Please downgrade database to clean previous version or try forced upgrade."
++#: ../admin/inst_upgrade.php:63
++msgid "Table set"
  msgstr ""
  
- #: ../admin/inst_upgrade.php:104
 -#: admin/inst_upgrade.php:102
--msgid "Cannot connect to database for company"
++#: ../admin/inst_upgrade.php:63
++msgid "Current version"
  msgstr ""
  
- #: ../admin/inst_upgrade.php:117
 -#: admin/inst_upgrade.php:114
--#, php-format
--msgid "Database upgrade to version %s failed for company '%s'."
++#: ../admin/inst_upgrade.php:63
++msgid "Last log"
  msgstr ""
  
- #: ../admin/inst_upgrade.php:120
 -#: admin/inst_upgrade.php:117
--msgid "You should restore company database from latest backup file"
++#: ../admin/inst_upgrade.php:63
++#: ../admin/inst_upgrade.php:115
++msgid "Upgrade"
  msgstr ""
  
- #: ../admin/inst_upgrade.php:133
 -#: admin/inst_upgrade.php:129
--msgid "All companies data has been successfully updated"
++#: ../admin/inst_upgrade.php:82
++msgid "View log"
  msgstr ""
  
- #: ../admin/inst_upgrade.php:141
 -#: admin/inst_upgrade.php:137
--msgid "Sql file"
++#: ../admin/inst_upgrade.php:83
++msgid "Clear"
  msgstr ""
  
- #: ../admin/inst_upgrade.php:142
 -#: admin/inst_upgrade.php:138
--msgid "Force upgrade"
++#: ../admin/inst_upgrade.php:83
++msgid "Clear log"
  msgstr ""
  
- #: ../admin/inst_upgrade.php:165
 -#: admin/inst_upgrade.php:161
--#, php-format
--msgid "Partially installed (%s)"
++#: ../admin/inst_upgrade.php:84
++msgid "Do you really want to clear this upgrade log?"
  msgstr ""
  
- #: ../admin/inst_upgrade.php:174
 -#: admin/inst_upgrade.php:170
--msgid ""
--"Database upgrades marked as partially installed cannot be installed "
--"automatically.\n"
--"You have to clean database manually to enable them, or try to perform forced "
--"upgrade."
++#: ../admin/inst_upgrade.php:94
++msgid "Up to date"
  msgstr ""
  
- #: ../admin/inst_upgrade.php:178
 -#: admin/inst_upgrade.php:174
--msgid "Upgrade system"
++#: ../admin/inst_upgrade.php:111
++msgid "All company database schemes are up to date."
  msgstr ""
  
- #: ../admin/inst_upgrade.php:178
 -#: admin/inst_upgrade.php:174
++#: ../admin/inst_upgrade.php:114
++msgid "Select company for incremental upgrade."
++msgstr ""
++
++#: ../admin/inst_upgrade.php:115
  msgid "Save database and perform upgrade"
  msgstr ""
  
 -#: 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
++#: ../reporting/includes/doctext.inc:40
 +#: ../sales/view/view_invoice.php:76
 +#: ../sales/view/view_sales_order.php:82
 +#: ../sales/view/view_sales_order.php:90
  msgid "Payment Terms"
  msgstr ""
  
@@@ -1923,51 -1620,32 +2031,50 @@@ 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:55 gl/bank_account_reconcile.php:233
 -#: 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/gl_quick_entries.php:186
 -#: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:93
 -#: includes/ui/ui_view.inc:547 inventory/inquiry/stock_movements.php:82
 -#: inventory/manage/item_categories.php:98
 -#: manufacturing/search_work_orders.php:167
 -#: 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
 -#: reporting/rep202.php:139 reporting/rep402.php:103 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:112
 -#: reporting/rep710.php:78 reporting/rep710.php:86
 -#: reporting/reports_main.php:334 reporting/reports_main.php:498
 -#: reporting/includes/doctext.inc:140 reporting/includes/doctext.inc:181
 -#: reporting/includes/doctext.inc:200
 -#: sales/inquiry/customer_allocation_inquiry.php:144
 -#: sales/inquiry/customer_inquiry.php:217
 +#: ../admin/payment_terms.php:127
 +#: ../dimensions/dimension_entry.php:275
 +#: ../dimensions/inquiry/search_dimensions.php:75
- #: ../dimensions/inquiry/search_dimensions.php:130
++#: ../dimensions/inquiry/search_dimensions.php:131
 +#: ../dimensions/view/view_dimension.php:55
 +#: ../gl/bank_account_reconcile.php:231
- #: ../gl/inquiry/bank_inquiry.php:70
++#: ../gl/inquiry/bank_inquiry.php:71
 +#: ../gl/inquiry/gl_account_inquiry.php:126
- #: ../gl/inquiry/journal_inquiry.php:129
++#: ../gl/inquiry/journal_inquiry.php:101
 +#: ../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:93
- #: ../includes/ui/ui_view.inc:547
++#: ../includes/ui/ui_view.inc:548
 +#: ../inventory/inquiry/stock_movements.php:78
 +#: ../inventory/manage/item_categories.php:98
- #: ../manufacturing/search_work_orders.php:161
++#: ../manufacturing/search_work_orders.php:167
 +#: ../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_allocation_inquiry.php:127
 +#: ../purchasing/inquiry/supplier_inquiry.php:173
 +#: ../reporting/rep102.php:134
 +#: ../reporting/rep202.php:139
 +#: ../reporting/rep402.php:103
 +#: ../reporting/rep501.php:87
 +#: ../reporting/rep601.php:79
 +#: ../reporting/rep602.php:80
 +#: ../reporting/rep702.php:60
 +#: ../reporting/rep704.php:83
 +#: ../reporting/rep704.php:86
 +#: ../reporting/rep704.php:89
 +#: ../reporting/rep709.php:112
 +#: ../reporting/rep710.php:78
 +#: ../reporting/rep710.php:86
 +#: ../reporting/reports_main.php:340
 +#: ../reporting/reports_main.php:504
- #: ../reporting/includes/doctext.inc:162
- #: ../reporting/includes/doctext.inc:203
- #: ../reporting/includes/doctext.inc:222
++#: ../reporting/includes/doctext.inc:161
++#: ../reporting/includes/doctext.inc:202
++#: ../reporting/includes/doctext.inc:221
 +#: ../sales/inquiry/customer_allocation_inquiry.php:144
- #: ../sales/inquiry/customer_inquiry.php:200
  msgid "Type"
  msgstr ""
  
@@@ -2162,11 -1837,9 +2269,11 @@@ msgstr "
  msgid "Role:"
  msgstr ""
  
 -#: admin/security_roles.php:180 gl/manage/gl_accounts.php:199
 -#: inventory/manage/items.php:433 purchasing/manage/suppliers.php:290
 -#: sales/manage/customers.php:330
 +#: ../admin/security_roles.php:180
 +#: ../gl/manage/gl_accounts.php:198
 +#: ../inventory/manage/items.php:444
- #: ../purchasing/manage/suppliers.php:293
- #: ../sales/manage/customers.php:330
++#: ../purchasing/manage/suppliers.php:295
++#: ../sales/manage/customers.php:331
  msgid "Show inactive:"
  msgstr ""
  
@@@ -2207,25 -1879,17 +2314,21 @@@ 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:279
 -#: gl/includes/ui/gl_journal_ui.inc:222 includes/ui/simple_crud_class.inc:58
 -#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_controls.inc:590
 -#: includes/ui/ui_input.inc:211 inventory/includes/item_adjustments_ui.inc:165
 -#: inventory/includes/stock_transfers_ui.inc:145
 -#: inventory/manage/items.php:416
 -#: manufacturing/includes/work_order_issue_ui.inc:140
 -#: purchasing/includes/ui/po_ui.inc:441
 -#: sales/includes/ui/sales_credit_ui.inc:295
 -#: sales/includes/ui/sales_order_ui.inc:550
 +#: ../admin/security_roles.php:249
 +#: ../admin/void_transaction.php:229
 +#: ../gl/manage/gl_quick_entries.php:61
 +#: ../gl/includes/ui/gl_bank_ui.inc:279
- #: ../gl/includes/ui/gl_journal_ui.inc:259
++#: ../gl/includes/ui/gl_journal_ui.inc:258
 +#: ../includes/ui/simple_crud_class.inc:58
 +#: ../includes/ui/simple_crud_class.inc:231
- #: ../includes/ui/ui_controls.inc:596
- #: ../includes/ui/ui_input.inc:211
++#: ../includes/ui/ui_controls.inc:597
++#: ../includes/ui/ui_input.inc:212
 +#: ../inventory/includes/item_adjustments_ui.inc:165
 +#: ../inventory/includes/stock_transfers_ui.inc:145
 +#: ../inventory/manage/items.php:427
 +#: ../manufacturing/includes/work_order_issue_ui.inc:140
- #: ../purchasing/includes/ui/po_ui.inc:461
++#: ../purchasing/includes/ui/po_ui.inc:434
 +#: ../sales/includes/ui/sales_credit_ui.inc:295
- #: ../sales/includes/ui/sales_order_ui.inc:548
- #: ../taxes/sav.tax_types.php:173
- #: ../taxes/sav.tax_types.php:253
- #: ../taxes/sav.tax_types.php:256
  msgid "Cancel"
  msgstr ""
  
@@@ -2234,13 -1897,10 +2337,13 @@@
  msgid "Cancel Edition"
  msgstr ""
  
 -#: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:254
 -#: sales/customer_delivery.php:346 sales/customer_invoice.php:431
 -#: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92
 -#: sales/view/view_invoice.php:91
 +#: ../admin/shipping_companies.php:15
 +#: ../sales/customer_credit_invoice.php:254
- #: ../sales/customer_delivery.php:392
- #: ../sales/customer_invoice.php:497
++#: ../sales/customer_delivery.php:357
++#: ../sales/customer_invoice.php:492
 +#: ../sales/view/view_credit.php:74
 +#: ../sales/view/view_dispatch.php:92
 +#: ../sales/view/view_invoice.php:92
  msgid "Shipping Company"
  msgstr ""
  
@@@ -2298,18 -1954,14 +2401,18 @@@ msgstr "
  msgid "Name:"
  msgstr ""
  
 -#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:159
 -#: sales/manage/customer_branches.php:259
 +#: ../admin/shipping_companies.php:136
 +#: ../purchasing/manage/suppliers.php:136
- #: ../sales/manage/customer_branches.php:261
++#: ../sales/manage/customer_branches.php:248
  msgid "Contact Person:"
  msgstr ""
  
 -#: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:103
 -#: inventory/manage/locations.php:205 purchasing/manage/suppliers.php:131
 -#: sales/manage/customer_branches.php:261 sales/manage/customers.php:257
 +#: ../admin/shipping_companies.php:140
 +#: ../includes/ui/contacts_view.inc:103
 +#: ../inventory/manage/locations.php:205
 +#: ../purchasing/manage/suppliers.php:138
- #: ../sales/manage/customer_branches.php:263
++#: ../sales/manage/customer_branches.php:250
 +#: ../sales/manage/customers.php:257
  msgid "Secondary Phone Number:"
  msgstr ""
  
@@@ -2409,18 -2054,14 +2512,18 @@@ msgstr "
  msgid "Full Name"
  msgstr ""
  
 -#: admin/users.php:123 includes/ui/contacts_view.inc:41
 -#: inventory/manage/locations.php:146 reporting/rep106.php:88
 -#: reporting/includes/header2.inc:101 sales/manage/sales_people.php:99
 +#: ../admin/users.php:123
 +#: ../includes/ui/contacts_view.inc:41
 +#: ../inventory/manage/locations.php:146
- #: ../reporting/rep106.php:88
++#: ../reporting/rep106.php:95
 +#: ../reporting/includes/header2.inc:101
 +#: ../sales/manage/sales_people.php:99
  msgid "Phone"
  msgstr ""
  
 -#: admin/users.php:124 sales/manage/customer_branches.php:300
 -#: sales/view/view_sales_order.php:83
 +#: ../admin/users.php:124
- #: ../sales/manage/customer_branches.php:302
++#: ../sales/manage/customer_branches.php:286
 +#: ../sales/view/view_sales_order.php:96
  msgid "E-mail"
  msgstr ""
  
@@@ -2460,15 -2101,12 +2563,14 @@@ 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:189
 -#: purchasing/inquiry/po_search_completed.php:116
 -#: purchasing/inquiry/po_search.php:95 sales/inquiry/customer_inquiry.php:202
 -#: sales/inquiry/sales_deliveries_view.php:162
 -#: sales/inquiry/sales_orders_view.php:119
 +#: ../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:115
- #: ../purchasing/inquiry/po_search.php:95
- #: ../sales/inquiry/customer_inquiry.php:185
- #: ../sales/inquiry/sales_deliveries_view.php:162
- #: ../sales/inquiry/sales_orders_view.php:125
++#: ../includes/ui/ui_controls.inc:196
++#: ../purchasing/inquiry/po_search_completed.php:113
++#: ../purchasing/inquiry/po_search.php:94
++#: ../sales/inquiry/sales_deliveries_view.php:148
++#: ../sales/inquiry/sales_orders_view.php:102
  msgid "Print"
  msgstr ""
  
@@@ -2486,20 -2122,18 +2588,18 @@@ 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:84
 -#: purchasing/includes/ui/invoice_ui.inc:466
 -#: purchasing/inquiry/po_search_completed.php:80
 -#: purchasing/inquiry/po_search.php:78
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:57
 -#: purchasing/inquiry/supplier_inquiry.php:58
 -#: sales/inquiry/customer_allocation_inquiry.php:51
 -#: sales/inquiry/customer_inquiry.php:58
 -#: sales/inquiry/sales_deliveries_view.php:118
 -#: sales/inquiry/sales_orders_view.php:247
 +#: ../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:489
- #: ../purchasing/inquiry/po_search_completed.php:77
++#: ../manufacturing/search_work_orders.php:84
++#: ../purchasing/inquiry/po_search_completed.php:78
 +#: ../purchasing/inquiry/po_search.php:78
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
 +#: ../purchasing/inquiry/supplier_inquiry.php:55
 +#: ../sales/inquiry/customer_allocation_inquiry.php:51
- #: ../sales/inquiry/customer_inquiry.php:54
- #: ../sales/inquiry/sales_deliveries_view.php:118
- #: ../sales/inquiry/sales_orders_view.php:270
++#: ../sales/inquiry/sales_deliveries_view.php:116
++#: ../sales/inquiry/sales_orders_view.php:232
  msgid "Search"
  msgstr ""
  
@@@ -2515,129 -2149,87 +2615,68 @@@ 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: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:80
- #: ../gl/view/gl_payment_view.php:78
- #: ../gl/view/gl_trans_view.php:35
- #: ../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:32
- #: ../purchasing/includes/ui/grn_ui.inc:64
- #: ../purchasing/includes/ui/po_ui.inc:323
- #: ../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:124
- #: ../purchasing/inquiry/po_search.php:133
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:128
- #: ../purchasing/inquiry/supplier_inquiry.php:175
- #: ../purchasing/allocations/supplier_allocation_main.php:96
- #: ../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:372
- #: ../sales/customer_delivery.php:374
- #: ../sales/customer_invoice.php:469
- #: ../sales/customer_invoice.php:471
- #: ../sales/allocations/customer_allocation_main.php:95
- #: ../sales/view/view_dispatch.php:85
- #: ../sales/view/view_invoice.php:85
- #: ../sales/view/view_receipt.php:39
- #: ../sales/view/view_sales_order.php:94
- #: ../sales/inquiry/customer_allocation_inquiry.php:146
- #: ../sales/inquiry/customer_inquiry.php:203
- #: ../sales/inquiry/sales_deliveries_view.php:186
- #: ../sales/includes/ui/sales_credit_ui.inc:85
- #: ../sales/includes/ui/sales_credit_ui.inc:87
- #: ../sales/includes/ui/sales_order_ui.inc:364
 -#: 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
 -#: 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:80
 -#: gl/view/gl_payment_view.php:78 gl/view/gl_trans_view.php:35
 -#: includes/ui/contacts_view.inc:41 inventory/inquiry/stock_movements.php:82
 -#: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:44
 -#: manufacturing/search_work_orders.php:166
 -#: 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:32 purchasing/includes/ui/grn_ui.inc:64
 -#: purchasing/includes/ui/po_ui.inc:311 purchasing/view/view_po.php:115
 -#: purchasing/view/view_supp_credit.php:43
 -#: purchasing/view/view_supp_invoice.php:46
 -#: purchasing/view/view_supp_payment.php:73
 -#: purchasing/inquiry/po_search_completed.php:125
 -#: purchasing/inquiry/po_search.php:133
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:128
 -#: purchasing/inquiry/supplier_inquiry.php:170
 -#: 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:326
 -#: sales/customer_delivery.php:328 sales/customer_invoice.php:403
 -#: sales/customer_invoice.php:405
 -#: sales/allocations/customer_allocation_main.php:95
 -#: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:84
 -#: sales/view/view_receipt.php:39 sales/view/view_sales_order.php:81
 -#: sales/inquiry/customer_allocation_inquiry.php:146
 -#: sales/inquiry/customer_inquiry.php:220
 -#: sales/inquiry/sales_deliveries_view.php:186
 -#: sales/includes/ui/sales_credit_ui.inc:85
 -#: sales/includes/ui/sales_credit_ui.inc:87
 -#: sales/includes/ui/sales_order_ui.inc:364
--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:55 gl/accruals.php:90
 -#: gl/accruals.php:195 gl/bank_account_reconcile.php:236
 -#: 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:288 includes/ui/ui_view.inc:547
 -#: inventory/inquiry/stock_movements.php:84
 -#: inventory/view/view_adjustment.php:45 inventory/view/view_transfer.php:47
 -#: manufacturing/search_work_orders.php:172
 -#: manufacturing/work_order_entry.php:417
 -#: manufacturing/work_order_entry.php:423
 -#: 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:116
 -#: purchasing/includes/ui/po_ui.inc:325 purchasing/view/view_po.php:140
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:131
 -#: purchasing/inquiry/supplier_inquiry.php:173
 -#: purchasing/allocations/supplier_allocation_main.php:97
 -#: reporting/rep101.php:118 reporting/rep201.php:110 reporting/rep306.php:141
 -#: reporting/rep402.php:103 reporting/rep501.php:87 reporting/rep601.php:79
 -#: reporting/rep704.php:83 reporting/rep704.php:86 reporting/rep704.php:89
 -#: reporting/rep709.php:116 reporting/rep710.php:77
 -#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
 -#: reporting/includes/doctext.inc:224 reporting/includes/header2.inc:138
 -#: sales/customer_delivery.php:356 sales/customer_invoice.php:441
 -#: 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/inquiry/customer_allocation_inquiry.php:148
 -#: sales/inquiry/customer_inquiry.php:221
 +#: ../admin/view_print_transaction.php:128
 +#: ../admin/void_transaction.php:183
- #: ../dimensions/inquiry/search_dimensions.php:131
++#: ../dimensions/inquiry/search_dimensions.php:132
 +#: ../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/bank_inquiry.php:71
 +#: ../gl/inquiry/gl_account_inquiry.php:126
- #: ../gl/inquiry/journal_inquiry.php:128
++#: ../gl/inquiry/journal_inquiry.php:100
 +#: ../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:290
- #: ../includes/ui/ui_view.inc:547
++#: ../includes/ui/ui_view.inc:548
 +#: ../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:417
- #: ../manufacturing/work_order_entry.php:423
++#: ../manufacturing/search_work_orders.php:172
++#: ../manufacturing/work_order_entry.php:418
++#: ../manufacturing/work_order_entry.php:424
 +#: ../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:129
- #: ../purchasing/includes/ui/po_ui.inc:337
++#: ../purchasing/includes/ui/invoice_ui.inc:139
++#: ../purchasing/includes/ui/po_ui.inc:310
 +#: ../purchasing/view/view_po.php:140
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:131
++#: ../purchasing/inquiry/supplier_allocation_inquiry.php:132
 +#: ../purchasing/inquiry/supplier_inquiry.php:178
 +#: ../purchasing/allocations/supplier_allocation_main.php:97
 +#: ../reporting/rep101.php:118
- #: ../reporting/rep107.php:202
++#: ../reporting/rep107.php:205
 +#: ../reporting/rep201.php:110
 +#: ../reporting/rep306.php:141
 +#: ../reporting/rep402.php:103
 +#: ../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:116
 +#: ../reporting/rep710.php:77
- #: ../reporting/includes/doctext.inc:167
- #: ../reporting/includes/doctext.inc:208
- #: ../reporting/includes/doctext.inc:246
++#: ../reporting/includes/doctext.inc:166
++#: ../reporting/includes/doctext.inc:207
++#: ../reporting/includes/doctext.inc:245
 +#: ../reporting/includes/header2.inc:138
- #: ../sales/customer_delivery.php:402
- #: ../sales/customer_invoice.php:512
++#: ../sales/customer_delivery.php:367
++#: ../sales/customer_invoice.php:507
 +#: ../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/inquiry/customer_allocation_inquiry.php:148
- #: ../sales/inquiry/customer_inquiry.php:204
  msgid "Date"
  msgstr ""
  
@@@ -2651,11 -2242,9 +2690,11 @@@ 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/ui_input.inc:138
- #: ../includes/ui/ui_input.inc:282
++#: ../includes/ui/ui_input.inc:139
++#: ../includes/ui/ui_input.inc:283
 +#: ../includes/ui/ui_lists.inc:20
  msgid "Select"
  msgstr ""
  
@@@ -2671,22 -2256,14 +2710,20 @@@ msgstr "
  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:344
 -#: manufacturing/work_order_add_finished.php:207
 -#: manufacturing/work_order_entry.php:449
 -#: manufacturing/work_order_release.php:103
 -#: purchasing/includes/ui/invoice_ui.inc:174 purchasing/po_entry_items.php:529
 -#: purchasing/supplier_payment.php:325 sales/customer_payments.php:399
 +#: ../admin/void_transaction.php:208
 +#: ../dimensions/dimension_entry.php:283
- #: ../gl/bank_transfer.php:98
++#: ../gl/bank_transfer.php:137
 +#: ../gl/inquiry/journal_inquiry.php:56
 +#: ../gl/manage/revaluate_currencies.php:106
 +#: ../includes/ui/ui_view.inc:344
 +#: ../manufacturing/work_order_add_finished.php:207
 +#: ../manufacturing/work_order_costs.php:146
 +#: ../manufacturing/work_order_entry.php:449
 +#: ../manufacturing/work_order_release.php:103
- #: ../purchasing/includes/ui/invoice_ui.inc:195
- #: ../purchasing/includes/ui/po_ui.inc:494
++#: ../purchasing/includes/ui/po_ui.inc:467
 +#: ../purchasing/po_entry_items.php:485
 +#: ../purchasing/supplier_payment.php:325
- #: ../sales/customer_invoice.php:689
- #: ../sales/customer_payments.php:402
++#: ../sales/customer_payments.php:403
  msgid "Memo:"
  msgstr ""
  
@@@ -2706,8 -2281,7 +2743,8 @@@ msgid "
  "undone."
  msgstr ""
  
 -#: admin/void_transaction.php:228 includes/ui/ui_controls.inc:589
 +#: ../admin/void_transaction.php:228
- #: ../includes/ui/ui_controls.inc:595
++#: ../includes/ui/ui_controls.inc:596
  msgid "Proceed"
  msgstr ""
  
@@@ -2715,22 -2289,15 +2752,22 @@@
  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:156 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
 -#: purchasing/supplier_payment.php:185 sales/customer_credit_invoice.php:91
 -#: sales/sales_order_entry.php:356 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/bank_transfer.php:159
 +#: ../gl/gl_journal.php:162
 +#: ../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:80
 +#: ../purchasing/po_receive_items.php:174
 +#: ../purchasing/supplier_payment.php:185
 +#: ../sales/customer_credit_invoice.php:91
- #: ../sales/sales_order_entry.php:366
- #: ../sales/manage/recurrent_invoices.php:41
- #: ../sales/manage/recurrent_invoices.php:46
- #: ../sales/manage/recurrent_invoices.php:51
++#: ../sales/sales_order_entry.php:363
++#: ../sales/manage/recurrent_invoices.php:47
++#: ../sales/manage/recurrent_invoices.php:52
++#: ../sales/manage/recurrent_invoices.php:57
  msgid "The entered date is invalid."
  msgstr ""
  
@@@ -2754,21 -2330,18 +2791,21 @@@ msgstr "
  msgid "Attached File:"
  msgstr ""
  
- #: ../admin/db/fiscalyears_db.inc:136
 -#: admin/db/fiscalyears_db.inc:136
++#: ../admin/db/fiscalyears_db.inc:134
  msgid ""
  "The Retained Earnings Account or the Profit and Loss Year Account has not "
  "been set in System and General GL Setup"
  msgstr ""
  
 -#: admin/db/fiscalyears_db.inc:166 admin/db/fiscalyears_db.inc:168
++#: ../admin/db/fiscalyears_db.inc:164
 +#: ../admin/db/fiscalyears_db.inc:166
- #: ../admin/db/fiscalyears_db.inc:168
  msgid "Closing Year"
  msgstr ""
  
- #: ../admin/db/fiscalyears_db.inc:219
 -#: admin/db/fiscalyears_db.inc:219 reporting/rep101.php:173
 -#: reporting/rep201.php:165 reporting/rep706.php:185
++#: ../admin/db/fiscalyears_db.inc:217
 +#: ../reporting/rep101.php:173
 +#: ../reporting/rep201.php:165
 +#: ../reporting/rep706.php:185
  msgid "Open Balance"
  msgstr ""
  
@@@ -2803,13 -2376,7 +2840,13 @@@ msgstr "
  msgid "The language files folder "
  msgstr ""
  
- #: ../admin/db/maintenance_db.inc:391
 -#: admin/db/maintenance_db.inc:391
++#: ../admin/db/maintenance_db.inc:392
 +msgid ""
 +"This is new format backup file which cannot be restored on database not "
 +"migrated to utf8."
 +msgstr ""
 +
- #: ../admin/db/maintenance_db.inc:473
++#: ../admin/db/maintenance_db.inc:476
  #, php-format
  msgid "SQL script execution failed in line %d: %s"
  msgstr ""
@@@ -2822,8 -2389,10 +2859,8 @@@ msgstr "
  msgid "users online"
  msgstr ""
  
 -#: admin/db/voiding_db.inc:114
 -#: manufacturing/includes/db/work_orders_db.inc:456
 -#: manufacturing/includes/db/work_orders_db.inc:472
 -#: sales/includes/db/sales_invoice_db.inc:208
 +#: ../admin/db/voiding_db.inc:114
- #: ../sales/includes/db/sales_invoice_db.inc:251
++#: ../sales/includes/db/sales_invoice_db.inc:252
  msgid "Voided."
  msgstr ""
  
@@@ -3411,30 -2957,18 +3448,29 @@@ msgstr "
  msgid "The dimension reference must be entered."
  msgstr ""
  
 -#: dimensions/dimension_entry.php:123 gl/bank_transfer.php:176
 -#: gl/gl_bank.php:254 gl/gl_journal.php:176
 -#: gl/manage/revaluate_currencies.php:72 inventory/adjustments.php:101
 -#: inventory/transfers.php:96 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:166
 -#: purchasing/supplier_invoice.php:165 purchasing/supplier_payment.php:214
 -#: sales/create_recurrent_invoices.php:57 sales/credit_note_entry.php:181
 -#: sales/customer_credit_invoice.php:205 sales/customer_delivery.php:290
 -#: sales/customer_invoice.php:328 sales/customer_payments.php:169
 -#: sales/customer_payments.php:176 sales/sales_order_entry.php:453
 +#: ../dimensions/dimension_entry.php:123
- #: ../gl/bank_transfer.php:176
++#: ../gl/bank_transfer.php:243
 +#: ../gl/gl_bank.php:257
 +#: ../gl/gl_journal.php:182
 +#: ../gl/manage/revaluate_currencies.php:72
 +#: ../inventory/adjustments.php:101
 +#: ../inventory/transfers.php:96
 +#: ../manufacturing/work_order_add_finished.php:84
 +#: ../manufacturing/work_order_entry.php:139
 +#: ../manufacturing/work_order_issue.php:97
- #: ../manufacturing/work_order_issue.php.orig:97
 +#: ../purchasing/po_entry_items.php:365
 +#: ../purchasing/po_receive_items.php:193
 +#: ../purchasing/supplier_credit.php:182
 +#: ../purchasing/supplier_invoice.php:190
 +#: ../purchasing/supplier_payment.php:214
 +#: ../sales/create_recurrent_invoices.php:57
 +#: ../sales/credit_note_entry.php:181
 +#: ../sales/customer_credit_invoice.php:205
- #: ../sales/customer_delivery.php:334
- #: ../sales/customer_invoice.php:388
- #: ../sales/customer_payments.php:169
- #: ../sales/customer_payments.php:176
- #: ../sales/sales_order_entry.php:475
++#: ../sales/customer_delivery.php:299
++#: ../sales/customer_invoice.php:383
++#: ../sales/customer_payments.php:170
++#: ../sales/customer_payments.php:177
++#: ../sales/sales_order_entry.php:464
  msgid "The entered reference is already in use."
  msgstr ""
  
@@@ -3498,8 -3014,7 +3534,8 @@@ msgstr "
  msgid "Start Date"
  msgstr ""
  
 -#: dimensions/dimension_entry.php:279 manufacturing/work_order_entry.php:418
 +#: ../dimensions/dimension_entry.php:279
- #: ../manufacturing/work_order_entry.php:418
++#: ../manufacturing/work_order_entry.php:419
  msgid "Date Required By"
  msgstr ""
  
@@@ -3539,12 -3054,10 +3575,8 @@@ msgstr "
  msgid "Delete unused dimension"
  msgstr ""
  
 -#: dimensions/dimension_entry.php:302 includes/ui/simple_crud_class.inc:225
 -#: purchasing/includes/ui/invoice_ui.inc:199
 -#: purchasing/includes/ui/invoice_ui.inc:405
 -#: purchasing/includes/ui/invoice_ui.inc:407
 +#: ../dimensions/dimension_entry.php:302
 +#: ../includes/ui/simple_crud_class.inc:225
- #: ../purchasing/includes/ui/invoice_ui.inc:221
- #: ../purchasing/includes/ui/invoice_ui.inc:427
- #: ../purchasing/includes/ui/invoice_ui.inc:429
- #: ../taxes/sav.tax_types.php:172
  msgid "Add"
  msgstr ""
  
@@@ -3556,106 -3069,61 +3588,101 @@@ msgstr "
  msgid "Balance for this Dimension"
  msgstr ""
  
 -#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:90
 -#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:185
 -#: gl/manage/gl_quick_entries.php:241 gl/manage/gl_quick_entries.php:333
 -#: includes/sysnames.inc:164 purchasing/includes/ui/invoice_ui.inc:258
 -#: purchasing/includes/ui/invoice_ui.inc:260
 -#: purchasing/includes/ui/invoice_ui.inc:262 reporting/rep701.php:111
 -#: reporting/rep705.php:238 reporting/rep706.php:185 reporting/rep707.php:210
 -#: reporting/rep708.php:192
 +#: ../dimensions/includes/dimensions_ui.inc:31
 +#: ../gl/accruals.php:94
 +#: ../gl/inquiry/gl_account_inquiry.php:129
 +#: ../gl/inquiry/gl_trial_balance.php:184
 +#: ../gl/manage/gl_quick_entries.php:241
 +#: ../gl/manage/gl_quick_entries.php:333
 +#: ../includes/sysnames.inc:165
- #: ../purchasing/includes/ui/invoice_ui.inc:280
- #: ../purchasing/includes/ui/invoice_ui.inc:282
- #: ../purchasing/includes/ui/invoice_ui.inc:284
 +#: ../reporting/rep701.php:111
 +#: ../reporting/rep705.php:238
 +#: ../reporting/rep706.php:185
 +#: ../reporting/rep707.php:210
 +#: ../reporting/rep708.php:192
  msgid "Account"
  msgstr ""
  
 -#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
 -#: 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/inquiry/gl_trial_balance.php:191 gl/inquiry/gl_trial_balance.php:193
 -#: gl/inquiry/gl_trial_balance.php:195 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:82
 -#: gl/includes/ui/gl_journal_ui.inc:85 gl/includes/ui/gl_journal_ui.inc:88
 -#: 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:192 reporting/rep708.php:193
 -#: sales/inquiry/customer_allocation_inquiry.php:152
 -#: sales/inquiry/customer_inquiry.php:226
 +#: ../dimensions/includes/dimensions_ui.inc:31
 +#: ../gl/accruals.php:102
 +#: ../gl/bank_account_reconcile.php:235
- #: ../gl/inquiry/bank_inquiry.php:71
++#: ../gl/inquiry/bank_inquiry.php:72
 +#: ../gl/inquiry/gl_account_inquiry.php:141
 +#: ../gl/inquiry/gl_account_inquiry.php:143
 +#: ../gl/inquiry/gl_trial_balance.php:190
 +#: ../gl/inquiry/gl_trial_balance.php:192
 +#: ../gl/inquiry/gl_trial_balance.php:194
 +#: ../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:134
++#: ../gl/includes/ui/gl_journal_ui.inc:85
++#: ../gl/includes/ui/gl_journal_ui.inc:88
++#: ../gl/includes/ui/gl_journal_ui.inc:91
++#: ../purchasing/inquiry/supplier_allocation_inquiry.php:135
 +#: ../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:152
- #: ../sales/inquiry/customer_inquiry.php:209
  msgid "Debit"
  msgstr ""
  
 -#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
 -#: gl/bank_account_reconcile.php:238 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:192 gl/inquiry/gl_trial_balance.php:194
 -#: gl/inquiry/gl_trial_balance.php:196 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:82
 -#: gl/includes/ui/gl_journal_ui.inc:85 gl/includes/ui/gl_journal_ui.inc:88
 -#: 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:192 reporting/rep708.php:193
 -#: sales/inquiry/customer_allocation_inquiry.php:153
 -#: sales/inquiry/customer_inquiry.php:227
 +#: ../dimensions/includes/dimensions_ui.inc:31
 +#: ../gl/accruals.php:102
 +#: ../gl/bank_account_reconcile.php:236
- #: ../gl/inquiry/bank_inquiry.php:71
++#: ../gl/inquiry/bank_inquiry.php:72
 +#: ../gl/inquiry/gl_account_inquiry.php:141
 +#: ../gl/inquiry/gl_account_inquiry.php:143
 +#: ../gl/inquiry/gl_trial_balance.php:191
 +#: ../gl/inquiry/gl_trial_balance.php:193
 +#: ../gl/inquiry/gl_trial_balance.php:195
 +#: ../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
++#: ../gl/includes/ui/gl_journal_ui.inc:85
++#: ../gl/includes/ui/gl_journal_ui.inc:88
++#: ../gl/includes/ui/gl_journal_ui.inc:91
 +#: ../includes/sysnames.inc:85
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:135
++#: ../purchasing/inquiry/supplier_allocation_inquiry.php:136
 +#: ../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:153
- #: ../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:189
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:137
 -#: reporting/rep101.php:122 reporting/rep201.php:114 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:185
 -#: 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
++#: ../dimensions/inquiry/search_dimensions.php:135
++#: ../gl/inquiry/bank_inquiry.php:72
 +#: ../gl/inquiry/gl_account_inquiry.php:141
 +#: ../gl/inquiry/gl_trial_balance.php:188
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:137
++#: ../purchasing/inquiry/supplier_allocation_inquiry.php:138
 +#: ../reporting/rep101.php:122
 +#: ../reporting/rep201.php:114
 +#: ../reporting/rep203.php:94
 +#: ../reporting/rep204.php:84
 +#: ../reporting/rep307.php:117
 +#: ../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:155
  msgid "Balance"
  msgstr ""
  
@@@ -3667,132 -3135,88 +3694,128 @@@ 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_journal_ui.inc:31
 -#: 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:68
 -#: manufacturing/work_order_add_finished.php:195
 -#: manufacturing/work_order_entry.php:376
 -#: manufacturing/work_order_entry.php:383
 -#: manufacturing/includes/work_order_issue_ui.inc:163
 -#: purchasing/includes/ui/invoice_ui.inc:105
 -#: purchasing/includes/ui/po_ui.inc:176 purchasing/includes/ui/po_ui.inc:181
 -#: purchasing/supplier_payment.php:298 sales/customer_payments.php:368
 +#: ../dimensions/inquiry/search_dimensions.php:73
- #: ../gl/bank_transfer.php:79
++#: ../gl/bank_transfer.php:118
 +#: ../gl/inquiry/journal_inquiry.php:45
 +#: ../gl/manage/revaluate_currencies.php:105
 +#: ../gl/includes/ui/gl_bank_ui.inc:26
- #: ../gl/includes/ui/gl_journal_ui.inc:30
++#: ../gl/includes/ui/gl_journal_ui.inc:31
 +#: ../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/search_work_orders.php:68
 +#: ../manufacturing/work_order_add_finished.php:195
 +#: ../manufacturing/work_order_costs.php:134
- #: ../manufacturing/work_order_entry.php:376
- #: ../manufacturing/work_order_entry.php:383
++#: ../manufacturing/work_order_entry.php:377
++#: ../manufacturing/work_order_entry.php:384
 +#: ../manufacturing/includes/work_order_issue_ui.inc:163
- #: ../purchasing/includes/ui/invoice_ui.inc:119
- #: ../purchasing/includes/ui/po_ui.inc:188
- #: ../purchasing/includes/ui/po_ui.inc:193
++#: ../purchasing/includes/ui/invoice_ui.inc:123
++#: ../purchasing/includes/ui/po_ui.inc:160
++#: ../purchasing/includes/ui/po_ui.inc:165
 +#: ../purchasing/supplier_payment.php:298
- #: ../sales/customer_payments.php:371
++#: ../sales/customer_payments.php:372
  msgid "Reference:"
  msgstr ""
  
 -#: dimensions/inquiry/search_dimensions.php:75
 -#: includes/ui/allocation_cart.inc:312 includes/ui/ui_lists.inc:1928
 -#: reporting/rep101.php:100 reporting/rep102.php:96 reporting/rep104.php:97
 -#: reporting/rep104.php:101 reporting/rep105.php:95 reporting/rep105.php:99
 -#: reporting/rep201.php:92 reporting/rep202.php:100 reporting/rep203.php:74
 -#: reporting/rep204.php:77 reporting/rep301.php:156 reporting/rep301.php:163
 -#: reporting/rep302.php:105 reporting/rep302.php:112 reporting/rep303.php:96
 -#: reporting/rep303.php:103 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:219 reporting/rep308.php:224
 -#: reporting/rep309.php:92 reporting/rep402.php:87 reporting/rep402.php:95
 -#: reporting/rep702.php:61 reporting/rep710.php:86 reporting/rep710.php:87
 +#: ../dimensions/inquiry/search_dimensions.php:75
 +#: ../includes/ui/allocation_cart.inc:314
- #: ../includes/ui/ui_lists.inc:1929
++#: ../includes/ui/ui_lists.inc:1918
 +#: ../reporting/rep101.php:100
 +#: ../reporting/rep102.php:96
 +#: ../reporting/rep104.php:97
 +#: ../reporting/rep104.php:101
 +#: ../reporting/rep105.php:95
 +#: ../reporting/rep105.php:99
 +#: ../reporting/rep201.php:92
 +#: ../reporting/rep202.php:100
 +#: ../reporting/rep203.php:74
 +#: ../reporting/rep204.php:77
 +#: ../reporting/rep301.php:156
 +#: ../reporting/rep301.php:163
 +#: ../reporting/rep302.php:105
 +#: ../reporting/rep302.php:112
 +#: ../reporting/rep303.php:96
 +#: ../reporting/rep303.php:103
 +#: ../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:219
 +#: ../reporting/rep308.php:224
 +#: ../reporting/rep309.php:92
 +#: ../reporting/rep402.php:87
 +#: ../reporting/rep402.php:95
 +#: ../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:54 gl/inquiry/journal_inquiry.php:48
 -#: gl/inquiry/profit_loss.php:168 gl/includes/ui/gl_bank_ui.inc:52
 -#: gl/includes/ui/gl_bank_ui.inc:120 inventory/inquiry/stock_movements.php:62
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:50
 -#: purchasing/inquiry/supplier_inquiry.php:53
 -#: sales/inquiry/customer_inquiry.php:50
 +#: ../dimensions/inquiry/search_dimensions.php:76
- #: ../gl/inquiry/bank_inquiry.php:49
++#: ../gl/inquiry/bank_inquiry.php:50
 +#: ../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:52
 +#: ../gl/includes/ui/gl_bank_ui.inc:120
 +#: ../inventory/inquiry/stock_movements.php:58
 +#: ../purchasing/inquiry/supplier_allocation_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:55 gl/inquiry/journal_inquiry.php:49
 -#: gl/inquiry/profit_loss.php:169 inventory/inquiry/stock_movements.php:63
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:51
 -#: purchasing/inquiry/supplier_inquiry.php:54
 -#: sales/inquiry/customer_inquiry.php:51
 +#: ../dimensions/inquiry/search_dimensions.php:77
- #: ../gl/inquiry/bank_inquiry.php:50
++#: ../gl/inquiry/bank_inquiry.php:51
 +#: ../gl/inquiry/gl_trial_balance.php:55
 +#: ../gl/inquiry/journal_inquiry.php:49
 +#: ../gl/inquiry/profit_loss.php:169
 +#: ../inventory/inquiry/stock_movements.php:59
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:51
 +#: ../purchasing/inquiry/supplier_inquiry.php:51
- #: ../sales/inquiry/customer_inquiry.php:47
  msgid "To:"
  msgstr ""
  
 -#: dimensions/inquiry/search_dimensions.php:79
 -#: manufacturing/search_work_orders.php:77
 +#: ../dimensions/inquiry/search_dimensions.php:79
- #: ../manufacturing/search_work_orders.php:71
++#: ../manufacturing/search_work_orders.php:77
  msgid "Only Overdue:"
  msgstr ""
  
 -#: dimensions/inquiry/search_dimensions.php:83
 -#: manufacturing/search_work_orders.php:80
 +#: ../dimensions/inquiry/search_dimensions.php:83
- #: ../manufacturing/search_work_orders.php:74
++#: ../manufacturing/search_work_orders.php:80
  msgid "Only Open:"
  msgstr ""
  
- #: ../dimensions/inquiry/search_dimensions.php:132
 -#: dimensions/inquiry/search_dimensions.php:132
 -#: dimensions/view/view_dimension.php:55 includes/ui/allocation_cart.inc:288
 -#: purchasing/includes/ui/invoice_ui.inc:125
 -#: 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:118
 -#: reporting/rep201.php:110 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:448 sales/view/view_dispatch.php:97
 -#: sales/view/view_invoice.php:96
 -#: sales/inquiry/customer_allocation_inquiry.php:149
 -#: sales/inquiry/customer_inquiry.php:222
 -#: sales/includes/ui/sales_order_ui.inc:589
++#: ../dimensions/inquiry/search_dimensions.php:133
 +#: ../dimensions/view/view_dimension.php:55
 +#: ../includes/ui/allocation_cart.inc:290
- #: ../purchasing/includes/ui/invoice_ui.inc:138
++#: ../purchasing/includes/ui/invoice_ui.inc:148
 +#: ../purchasing/view/view_supp_credit.php:48
 +#: ../purchasing/view/view_supp_invoice.php:52
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:132
++#: ../purchasing/inquiry/supplier_allocation_inquiry.php:133
 +#: ../purchasing/inquiry/supplier_inquiry.php:179
 +#: ../reporting/rep101.php:118
 +#: ../reporting/rep201.php:110
 +#: ../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:519
++#: ../reporting/includes/doctext.inc:111
++#: ../reporting/includes/doctext.inc:143
++#: ../reporting/includes/doctext.inc:164
++#: ../reporting/includes/doctext.inc:166
++#: ../reporting/includes/doctext.inc:205
++#: ../reporting/includes/doctext.inc:207
++#: ../sales/customer_invoice.php:514
 +#: ../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:587
  msgid "Due Date"
  msgstr ""
  
- #: ../dimensions/inquiry/search_dimensions.php:143
 -#: dimensions/inquiry/search_dimensions.php:143
++#: ../dimensions/inquiry/search_dimensions.php:144
  msgid "Marked dimensions are overdue."
  msgstr ""
  
@@@ -3808,35 -3232,28 +3831,35 @@@ msgstr "
  msgid "This dimension is closed."
  msgstr ""
  
 -#: 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
 -#: 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
 +#: ../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:62
++#: ../purchasing/inquiry/po_search_completed.php: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
++#: ../sales/inquiry/sales_deliveries_view.php:102
++#: ../sales/inquiry/sales_orders_view.php:213
  msgid "from:"
  msgstr ""
  
 -#: 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
 -#: 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
 +#: ../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:63
++#: ../purchasing/inquiry/po_search_completed.php: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
++#: ../sales/inquiry/sales_deliveries_view.php:103
++#: ../sales/inquiry/sales_orders_view.php:214
  msgid "to:"
  msgstr ""
  
 -#: 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/tax_inquiry.php:63
 +#: ../dimensions/view/view_dimension.php:87
 +#: ../gl/inquiry/balance_sheet.php:131
- #: ../gl/inquiry/bank_inquiry.php:52
++#: ../gl/inquiry/bank_inquiry.php:53
 +#: ../gl/inquiry/gl_account_inquiry.php:85
 +#: ../gl/inquiry/gl_trial_balance.php:63
- #: ../gl/inquiry/profit_loss.php:183
++#: ../gl/inquiry/profit_loss.php:181
 +#: ../gl/inquiry/tax_inquiry.php:63
  msgid "Show"
  msgstr ""
  
@@@ -3845,35 -3261,7 +3868,34 @@@
  msgid "Revenue / Cost Accruals"
  msgstr ""
  
 -#: gl/accruals.php:44
 +#: ../gl/accruals.php:38
- #: ../gl/bank_transfer.php:121
++#: ../gl/bank_transfer.php:165
 +#: ../gl/gl_bank.php:269
 +#: ../gl/gl_journal.php:168
 +#: ../gl/manage/revaluate_currencies.php:59
 +#: ../inventory/adjustments.php:114
 +#: ../inventory/transfers.php:108
 +#: ../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
- #: ../manufacturing/work_order_issue.php.orig:84
 +#: ../purchasing/po_entry_items.php:342
 +#: ../purchasing/po_receive_items.php:179
 +#: ../purchasing/supplier_credit.php:202
 +#: ../purchasing/supplier_invoice.php:210
 +#: ../purchasing/supplier_payment.php:191
 +#: ../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:327
- #: ../sales/customer_payments.php:156
- #: ../sales/sales_order_entry.php:371
++#: ../sales/customer_invoice.php:322
++#: ../sales/customer_payments.php:157
++#: ../sales/sales_order_entry.php:368
 +msgid ""
 +"The entered date is out of fiscal year or is closed for further data entry."
 +msgstr ""
 +
 +#: ../gl/accruals.php:44
  msgid "The amount can not be 0."
  msgstr ""
  
@@@ -3892,136 -3280,73 +3914,131 @@@ msgstr "
  msgid "Accruals for %s"
  msgstr ""
  
 -#: 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/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/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:104
 -#: gl/view/gl_deposit_view.php:107 gl/view/gl_payment_view.php:103
 -#: gl/view/gl_payment_view.php:106 gl/view/gl_trans_view.php:63
 -#: gl/view/gl_trans_view.php:66 gl/includes/ui/gl_bank_ui.inc:152
 -#: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:155
 -#: gl/includes/ui/gl_journal_ui.inc:81 gl/includes/ui/gl_journal_ui.inc:82
 -#: gl/includes/ui/gl_journal_ui.inc:84 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:258
 -#: purchasing/includes/ui/invoice_ui.inc:260
 -#: purchasing/manage/suppliers.php:138 purchasing/manage/suppliers.php:139
 -#: purchasing/manage/suppliers.php:141 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:201 reporting/rep708.php:203 reporting/rep708.php:210
 -#: reporting/reports_main.php:348 reporting/reports_main.php:349
 -#: reporting/reports_main.php:355 reporting/reports_main.php:356
 -#: reporting/reports_main.php:364 reporting/reports_main.php:365
 -#: reporting/reports_main.php:376 reporting/reports_main.php:377
 -#: reporting/reports_main.php:389 reporting/reports_main.php:390
 -#: reporting/reports_main.php:402 reporting/reports_main.php:408
 -#: reporting/reports_main.php:416 reporting/reports_main.php:427
 -#: reporting/reports_main.php:439 sales/customer_delivery.php:373
 -#: sales/customer_delivery.php:381 sales/customer_invoice.php:418
 -#: sales/customer_invoice.php:456 sales/manage/customers.php:274
 -#: sales/manage/customers.php:276 sales/includes/ui/sales_credit_ui.inc:132
 -#: sales/includes/ui/sales_credit_ui.inc:137
 -#: sales/includes/ui/sales_order_ui.inc:444
 -#: sales/includes/ui/sales_order_ui.inc:449
 +#: ../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:177
 +#: ../gl/inquiry/profit_loss.php:179
- #: ../gl/inquiry/profit_loss.php:181
 +#: ../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:104
 +#: ../gl/view/gl_deposit_view.php:107
 +#: ../gl/view/gl_payment_view.php:103
 +#: ../gl/view/gl_payment_view.php:106
 +#: ../gl/view/gl_trans_view.php:68
 +#: ../gl/view/gl_trans_view.php:71
 +#: ../gl/includes/ui/gl_bank_ui.inc:152
 +#: ../gl/includes/ui/gl_bank_ui.inc:153
 +#: ../gl/includes/ui/gl_bank_ui.inc:155
- #: ../gl/includes/ui/gl_journal_ui.inc:86
++#: ../gl/includes/ui/gl_journal_ui.inc:84
++#: ../gl/includes/ui/gl_journal_ui.inc:85
 +#: ../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
 +#: ../inventory/manage/items.php:354
 +#: ../inventory/manage/items.php:356
- #: ../purchasing/includes/ui/invoice_ui.inc:280
- #: ../purchasing/includes/ui/invoice_ui.inc:282
- #: ../purchasing/manage/suppliers.php:147
- #: ../purchasing/manage/suppliers.php:148
++#: ../purchasing/includes/ui/invoice_ui.inc:132
++#: ../purchasing/includes/ui/po_ui.inc:176
++#: ../purchasing/manage/suppliers.php:149
 +#: ../purchasing/manage/suppliers.php:150
- #: ../reporting/rep103.php:243
- #: ../reporting/rep103.php:255
++#: ../purchasing/manage/suppliers.php:152
++#: ../reporting/rep103.php:242
++#: ../reporting/rep103.php:254
 +#: ../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
 +#: ../reporting/reports_main.php:354
 +#: ../reporting/reports_main.php:355
 +#: ../reporting/reports_main.php:361
 +#: ../reporting/reports_main.php:362
 +#: ../reporting/reports_main.php:370
 +#: ../reporting/reports_main.php:371
 +#: ../reporting/reports_main.php:382
 +#: ../reporting/reports_main.php:383
 +#: ../reporting/reports_main.php:395
 +#: ../reporting/reports_main.php:396
 +#: ../reporting/reports_main.php:408
 +#: ../reporting/reports_main.php:414
 +#: ../reporting/reports_main.php:422
 +#: ../reporting/reports_main.php:433
 +#: ../reporting/reports_main.php:445
- #: ../sales/customer_delivery.php:419
- #: ../sales/customer_delivery.php:427
- #: ../sales/customer_invoice.php:484
- #: ../sales/customer_invoice.php:527
- #: ../sales/manage/customers.php:274
- #: ../sales/manage/customers.php:276
++#: ../sales/customer_delivery.php:384
++#: ../sales/customer_delivery.php:392
++#: ../sales/customer_invoice.php:479
++#: ../sales/customer_invoice.php:522
++#: ../sales/manage/customers.php:275
++#: ../sales/manage/customers.php:277
 +#: ../sales/includes/ui/sales_credit_ui.inc:132
 +#: ../sales/includes/ui/sales_credit_ui.inc:137
- #: ../sales/includes/ui/sales_order_ui.inc:442
- #: ../sales/includes/ui/sales_order_ui.inc:447
  msgid "Dimension"
  msgstr ""
  
 -#: gl/accruals.php:98 gl/accruals.php:213 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:105 gl/view/gl_deposit_view.php:108
 -#: gl/view/gl_deposit_view.php:111 gl/view/gl_payment_view.php:104
 -#: gl/view/gl_payment_view.php:107 gl/view/gl_payment_view.php:110
 -#: 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:153
 -#: gl/includes/ui/gl_bank_ui.inc:156 gl/includes/ui/gl_bank_ui.inc:159
 -#: gl/includes/ui/gl_bank_ui.inc:312 gl/includes/ui/gl_journal_ui.inc:82
 -#: gl/includes/ui/gl_journal_ui.inc:85 gl/includes/ui/gl_journal_ui.inc:88
 -#: gl/includes/ui/gl_journal_ui.inc:239
 -#: inventory/includes/item_adjustments_ui.inc:187
 -#: inventory/includes/stock_transfers_ui.inc:167
 -#: manufacturing/includes/work_order_issue_ui.inc:176
 -#: purchasing/includes/ui/invoice_ui.inc:258
 -#: purchasing/includes/ui/invoice_ui.inc:260
 -#: purchasing/includes/ui/invoice_ui.inc:262
 -#: sales/customer_credit_invoice.php:364 sales/customer_delivery.php:513
 -#: sales/customer_invoice.php:587 sales/includes/ui/sales_credit_ui.inc:339
 +#: ../gl/accruals.php:102
 +#: ../gl/accruals.php:217
- #: ../gl/inquiry/bank_inquiry.php:71
++#: ../gl/inquiry/bank_inquiry.php:72
 +#: ../gl/inquiry/gl_account_inquiry.php:141
 +#: ../gl/inquiry/gl_account_inquiry.php:143
- #: ../gl/inquiry/journal_inquiry.php:133
++#: ../gl/inquiry/journal_inquiry.php:105
 +#: ../gl/view/accrual_trans.php:60
 +#: ../gl/view/gl_deposit_view.php:105
 +#: ../gl/view/gl_deposit_view.php:108
 +#: ../gl/view/gl_deposit_view.php:111
 +#: ../gl/view/gl_payment_view.php:104
 +#: ../gl/view/gl_payment_view.php:107
 +#: ../gl/view/gl_payment_view.php:110
 +#: ../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:153
 +#: ../gl/includes/ui/gl_bank_ui.inc:156
 +#: ../gl/includes/ui/gl_bank_ui.inc:159
 +#: ../gl/includes/ui/gl_bank_ui.inc:312
- #: ../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
++#: ../gl/includes/ui/gl_journal_ui.inc:85
++#: ../gl/includes/ui/gl_journal_ui.inc:88
++#: ../gl/includes/ui/gl_journal_ui.inc:91
++#: ../gl/includes/ui/gl_journal_ui.inc:275
 +#: ../inventory/includes/item_adjustments_ui.inc:187
 +#: ../inventory/includes/stock_transfers_ui.inc:167
 +#: ../manufacturing/view/wo_costs_view.php:46
 +#: ../manufacturing/includes/work_order_issue_ui.inc:176
- #: ../purchasing/includes/ui/invoice_ui.inc:280
- #: ../purchasing/includes/ui/invoice_ui.inc:282
- #: ../purchasing/includes/ui/invoice_ui.inc:284
 +#: ../sales/customer_credit_invoice.php:364
- #: ../sales/customer_delivery.php:559
++#: ../sales/customer_delivery.php:524
 +#: ../sales/includes/ui/sales_credit_ui.inc:339
  msgid "Memo"
  msgstr ""
  
@@@ -4041,11 -3366,9 +4058,11 @@@ msgstr "
  msgid "Bi-weekly"
  msgstr ""
  
 -#: gl/accruals.php:182 gl/manage/gl_quick_entries.php:240
 -#: gl/includes/ui/gl_journal_ui.inc:55 sales/create_recurrent_invoices.php:134
 -#: sales/manage/recurrent_invoices.php:102
 +#: ../gl/accruals.php:186
 +#: ../gl/manage/gl_quick_entries.php:240
- #: ../gl/includes/ui/gl_journal_ui.inc:57
++#: ../gl/includes/ui/gl_journal_ui.inc:55
 +#: ../sales/create_recurrent_invoices.php:134
- #: ../sales/manage/recurrent_invoices.php:102
++#: ../sales/manage/recurrent_invoices.php:108
  msgid "Monthly"
  msgstr ""
  
@@@ -4065,51 -3388,28 +4082,48 @@@ msgstr "
  msgid "Revenue / Cost Account"
  msgstr ""
  
 -#: gl/accruals.php:208 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:105
 -#: gl/view/gl_deposit_view.php:108 gl/view/gl_deposit_view.php:111
 -#: gl/view/gl_payment_view.php:65 gl/view/gl_payment_view.php:104
 -#: gl/view/gl_payment_view.php:107 gl/view/gl_payment_view.php:110
 -#: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:156
 -#: gl/includes/ui/gl_bank_ui.inc:159 includes/sysnames.inc:132
 -#: includes/ui/allocation_cart.inc:288 includes/ui/ui_lists.inc:1192
 -#: manufacturing/includes/manufacturing_ui.inc:236
 -#: purchasing/includes/ui/invoice_ui.inc:258
 -#: purchasing/includes/ui/invoice_ui.inc:260
 -#: purchasing/includes/ui/invoice_ui.inc:262
 -#: purchasing/view/view_supp_payment.php:60
 -#: purchasing/view/view_supp_payment.php:72 reporting/rep102.php:245
 -#: reporting/rep107.php:187 reporting/rep109.php:192 reporting/rep110.php:193
 -#: reporting/rep111.php:195 reporting/rep113.php:181 reporting/rep202.php:253
 -#: reporting/rep209.php:195 reporting/rep706.php:309 reporting/rep707.php:327
 -#: reporting/rep710.php:78 sales/view/view_receipt.php:44
 +#: ../gl/accruals.php:212
 +#: ../gl/gl_budget.php:91
 +#: ../gl/gl_budget.php:93
- #: ../gl/inquiry/journal_inquiry.php:132
++#: ../gl/inquiry/journal_inquiry.php:104
 +#: ../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:105
 +#: ../gl/view/gl_deposit_view.php:108
 +#: ../gl/view/gl_deposit_view.php:111
 +#: ../gl/view/gl_payment_view.php:65
 +#: ../gl/view/gl_payment_view.php:104
 +#: ../gl/view/gl_payment_view.php:107
 +#: ../gl/view/gl_payment_view.php:110
 +#: ../gl/includes/ui/gl_bank_ui.inc:153
 +#: ../gl/includes/ui/gl_bank_ui.inc:156
 +#: ../gl/includes/ui/gl_bank_ui.inc:159
 +#: ../includes/sysnames.inc:133
 +#: ../includes/ui/allocation_cart.inc:290
- #: ../includes/ui/ui_lists.inc:1187
++#: ../includes/ui/ui_lists.inc:1179
 +#: ../manufacturing/view/wo_costs_view.php:46
 +#: ../manufacturing/includes/manufacturing_ui.inc:236
- #: ../purchasing/includes/ui/invoice_ui.inc:280
- #: ../purchasing/includes/ui/invoice_ui.inc:282
- #: ../purchasing/includes/ui/invoice_ui.inc:284
 +#: ../purchasing/view/view_supp_payment.php:60
 +#: ../purchasing/view/view_supp_payment.php:72
- #: ../reporting/rep102.php:245
- #: ../reporting/rep107.php:204
- #: ../reporting/rep107.php:265
- #: ../reporting/rep109.php:195
- #: ../reporting/rep110.php:193
- #: ../reporting/rep111.php:192
- #: ../reporting/rep113.php:178
- #: ../reporting/rep202.php:253
- #: ../reporting/rep209.php:195
- #: ../reporting/rep706.php:309
- #: ../reporting/rep707.php:327
++#: ../reporting/rep102.php:244
++#: ../reporting/rep107.php:207
++#: ../reporting/rep107.php:268
++#: ../reporting/rep109.php:196
++#: ../reporting/rep110.php:192
++#: ../reporting/rep111.php:194
++#: ../reporting/rep113.php:181
++#: ../reporting/rep202.php:252
++#: ../reporting/rep209.php:198
++#: ../reporting/rep706.php:308
++#: ../reporting/rep707.php:326
 +#: ../reporting/rep710.php:78
 +#: ../sales/view/view_receipt.php:44
  msgid "Amount"
  msgstr ""
  
@@@ -4141,12 -3441,9 +4155,12 @@@ msgstr "
  msgid "Reconcile Bank Account"
  msgstr ""
  
 -#: gl/bank_account_reconcile.php:35 gl/bank_transfer.php:30 gl/gl_bank.php:49
 -#: gl/inquiry/bank_inquiry.php:30 purchasing/supplier_payment.php:42
 -#: sales/customer_payments.php:38
 +#: ../gl/bank_account_reconcile.php:35
- #: ../gl/bank_transfer.php:30
++#: ../gl/bank_transfer.php:37
 +#: ../gl/gl_bank.php:49
- #: ../gl/inquiry/bank_inquiry.php:30
++#: ../gl/inquiry/bank_inquiry.php:31
 +#: ../purchasing/supplier_payment.php:42
 +#: ../sales/customer_payments.php:38
  msgid "There are no bank accounts defined in the system."
  msgstr ""
  
@@@ -4158,9 -3455,8 +4172,9 @@@ msgstr "
  msgid "Reconcile this transaction"
  msgstr ""
  
 -#: gl/bank_account_reconcile.php:166 gl/inquiry/bank_inquiry.php:47
 -#: gl/inquiry/gl_account_inquiry.php:70
 +#: ../gl/bank_account_reconcile.php:164
- #: ../gl/inquiry/bank_inquiry.php:47
++#: ../gl/inquiry/bank_inquiry.php:48
 +#: ../gl/inquiry/gl_account_inquiry.php:70
  msgid "Account:"
  msgstr ""
  
@@@ -4168,8 -3464,7 +4182,7 @@@
  msgid "Bank Statement:"
  msgstr ""
  
 -#: gl/bank_account_reconcile.php:169
 +#: ../gl/bank_account_reconcile.php:167
- #: ../taxes/sav.tax_types.php:183
  msgid "New"
  msgstr ""
  
@@@ -4202,16 -3496,11 +4215,16 @@@ msgstr "
  msgid "Date of bank statement to reconcile"
  msgstr ""
  
 -#: gl/bank_account_reconcile.php:239 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
 -#: reporting/rep704.php:89
 +#: ../gl/bank_account_reconcile.php:237
- #: ../gl/inquiry/bank_inquiry.php:71
++#: ../gl/inquiry/bank_inquiry.php:72
 +#: ../gl/inquiry/gl_account_inquiry.php:141
 +#: ../gl/inquiry/gl_account_inquiry.php:143
 +#: ../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 ""
  
@@@ -4219,116 -3508,96 +4232,138 @@@
  msgid "Reconcile"
  msgstr ""
  
- #: ../gl/bank_transfer.php:28
 -#: gl/bank_transfer.php:28
--msgid "Transfer between Bank Accounts"
++#: ../gl/bank_transfer.php:30
++msgid "Modify Bank Account Transfer"
++msgstr ""
++
++#: ../gl/bank_transfer.php:32
++msgid "Bank Account Transfer Entry"
  msgstr ""
  
- #: ../gl/bank_transfer.php:39
 -#: gl/bank_transfer.php:39 gl/manage/revaluate_currencies.php:35
++#: ../gl/bank_transfer.php:46
 +#: ../gl/manage/revaluate_currencies.php:35
  msgid "Transfer has been entered"
  msgstr ""
  
- #: ../gl/bank_transfer.php:41
 -#: gl/bank_transfer.php:41 gl/manage/revaluate_currencies.php:37
++#: ../gl/bank_transfer.php:48
 +#: ../gl/manage/revaluate_currencies.php:37
  msgid "&View the GL Journal Entries for this Transfer"
  msgstr ""
  
- #: ../gl/bank_transfer.php:43
 -#: gl/bank_transfer.php:43
++#: ../gl/bank_transfer.php:50
  msgid "Enter &Another Transfer"
  msgstr ""
  
- #: ../gl/bank_transfer.php:66
 -#: gl/bank_transfer.php:66
++#: ../gl/bank_transfer.php:105
  msgid "From Account:"
  msgstr ""
  
- #: ../gl/bank_transfer.php:70
 -#: gl/bank_transfer.php:70
++#: ../gl/bank_transfer.php:109
  msgid "To Account:"
  msgstr ""
  
- #: ../gl/bank_transfer.php:77
 -#: gl/bank_transfer.php:77
++#: ../gl/bank_transfer.php:116
  msgid "Transfer Date:"
  msgstr ""
  
- #: ../gl/bank_transfer.php:87
- #: ../gl/bank_transfer.php:94
- #: ../sales/customer_payments.php:400
 -#: gl/bank_transfer.php:87 gl/bank_transfer.php:94
 -#: sales/customer_payments.php:397
++#: ../gl/bank_transfer.php:126
++#: ../gl/bank_transfer.php:133
++#: ../sales/customer_payments.php:401
  msgid "Amount:"
  msgstr ""
  
- #: ../gl/bank_transfer.php:88
- #: ../gl/bank_transfer.php:95
 -#: gl/bank_transfer.php:88 gl/bank_transfer.php:95
 -#: purchasing/supplier_payment.php:313 sales/customer_payments.php:383
++#: ../gl/bank_transfer.php:127
++#: ../gl/bank_transfer.php:134
 +#: ../purchasing/supplier_payment.php:313
- #: ../sales/customer_payments.php:386
++#: ../sales/customer_payments.php:387
  msgid "Bank Charge:"
  msgstr ""
  
- #: ../gl/bank_transfer.php:90
 -#: gl/bank_transfer.php:90
++#: ../gl/bank_transfer.php:129
  msgid "Incoming Amount:"
  msgstr ""
  
- #: ../gl/bank_transfer.php:102
 -#: gl/bank_transfer.php:102
++#: ../gl/bank_transfer.php:143
++msgid "Modify Transfer"
++msgstr ""
++
++#: ../gl/bank_transfer.php:145
  msgid "Enter Transfer"
  msgstr ""
  
- #: ../gl/bank_transfer.php:128
- #: ../gl/bank_transfer.php:158
- #: ../gl/bank_transfer.php:190
 -#: gl/bank_transfer.php:128 gl/bank_transfer.php:158 gl/bank_transfer.php:190
 -#: purchasing/supplier_payment.php:135 purchasing/supplier_payment.php:141
++#: ../gl/bank_transfer.php:172
++#: ../gl/bank_transfer.php:226
++#: ../gl/bank_transfer.php:257
 +#: ../purchasing/supplier_payment.php:135
 +#: ../purchasing/supplier_payment.php:141
  msgid "The entered amount is invalid or less than zero."
  msgstr ""
  
- #: ../gl/bank_transfer.php:133
 -#: gl/bank_transfer.php:133 gl/gl_bank.php:224
++#: ../gl/bank_transfer.php:177
 +#: ../gl/gl_bank.php:227
  msgid "The total bank amount cannot be 0."
  msgstr ""
  
- #: ../gl/bank_transfer.php:144
 -#: gl/bank_transfer.php:144
++#: ../gl/bank_transfer.php:193
  #, php-format
--msgid "The total bank amount exceeds allowed limit (%s) for source account."
++msgid ""
++"This bank transfer change would result in exceeding authorized overdraft "
++"limit (%s) of the account '%s'"
  msgstr ""
  
- #: ../gl/bank_transfer.php:150
- #: ../gl/gl_bank.php:244
 -#: gl/bank_transfer.php:150 gl/gl_bank.php:241
++#: ../gl/bank_transfer.php:198
  #, php-format
  msgid ""
--"The bank transaction would result in exceed of authorized overdraft limit "
--"for transaction: %s #%s on %s."
++"This bank transfer change would result in exceeding authorized overdraft "
++"limit on '%s' for transaction: %s #%s on %s."
++msgstr ""
++
++#: ../gl/bank_transfer.php:210
++#, php-format
++msgid ""
++"This bank transfer would result in exceeding authorized overdraft limit of "
++"the account (%s)"
++msgstr ""
++
++#: ../gl/bank_transfer.php:215
++#, php-format
++msgid ""
++"This bank transfer would result in exceeding authorized overdraft limit for "
++"transaction: %s #%s on %s."
  msgstr ""
  
- #: ../gl/bank_transfer.php:163
 -#: gl/bank_transfer.php:163 purchasing/supplier_payment.php:149
 -#: sales/customer_payments.php:195
++#: ../gl/bank_transfer.php:231
 +#: ../purchasing/supplier_payment.php:149
- #: ../sales/customer_payments.php:195
++#: ../sales/customer_payments.php:196
  msgid ""
  "The Bank Charge Account has not been set in System and General GL Setup."
  msgstr ""
  
- #: ../gl/bank_transfer.php:169
 -#: gl/bank_transfer.php:169 gl/gl_bank.php:248 gl/gl_journal.php:168
 -#: gl/manage/revaluate_currencies.php:65 inventory/adjustments.php:94
 -#: inventory/transfers.php:90 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
 -#: purchasing/supplier_payment.php:207 sales/credit_note_entry.php:147
 -#: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:166
 -#: sales/customer_invoice.php:289 sales/customer_payments.php:162
 -#: sales/sales_order_entry.php:424
++#: ../gl/bank_transfer.php:237
 +#: ../gl/gl_bank.php:251
 +#: ../gl/gl_journal.php:174
 +#: ../gl/manage/revaluate_currencies.php:65
 +#: ../inventory/adjustments.php:94
 +#: ../inventory/transfers.php:90
 +#: ../manufacturing/work_order_add_finished.php:77
 +#: ../manufacturing/work_order_entry.php:132
 +#: ../manufacturing/work_order_issue.php:90
- #: ../manufacturing/work_order_issue.php.orig:90
 +#: ../purchasing/po_receive_items.php:186
 +#: ../purchasing/supplier_payment.php:207
 +#: ../sales/credit_note_entry.php:147
 +#: ../sales/customer_credit_invoice.php:102
 +#: ../sales/customer_delivery.php:178
- #: ../sales/customer_invoice.php:341
- #: ../sales/customer_payments.php:162
- #: ../sales/sales_order_entry.php:446
++#: ../sales/customer_invoice.php:336
++#: ../sales/customer_payments.php:163
++#: ../sales/sales_order_entry.php:435
  msgid "You must enter a reference."
  msgstr ""
  
- #: ../gl/bank_transfer.php:183
 -#: gl/bank_transfer.php:183
++#: ../gl/bank_transfer.php:250
  msgid "The source and destination bank accouts cannot be the same."
  msgstr ""
  
- #: ../gl/bank_transfer.php:195
 -#: gl/bank_transfer.php:195
++#: ../gl/bank_transfer.php:262
  msgid "The incomming bank amount cannot be 0."
  msgstr ""
  
@@@ -4368,18 -3634,12 +4403,18 @@@ msgstr "
  msgid "Enter A &Deposit"
  msgstr ""
  
 -#: gl/gl_bank.php:82 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:53 sales/credit_note_entry.php:77
 -#: sales/customer_credit_invoice.php:62 sales/customer_invoice.php:75
 -#: sales/sales_order_entry.php:237
 +#: ../gl/gl_bank.php:85
 +#: ../gl/gl_journal.php:64
 +#: ../inventory/adjustments.php:50
 +#: ../manufacturing/work_order_entry.php:68
 +#: ../purchasing/po_entry_items.php:115
 +#: ../purchasing/po_entry_items.php:136
 +#: ../purchasing/supplier_credit.php:83
 +#: ../purchasing/supplier_invoice.php:76
 +#: ../sales/credit_note_entry.php:77
 +#: ../sales/customer_credit_invoice.php:62
- #: ../sales/customer_invoice.php:78
- #: ../sales/sales_order_entry.php:243
++#: ../sales/customer_invoice.php:73
++#: ../sales/sales_order_entry.php:240
  msgid "Add an Attachment"
  msgstr ""
  
@@@ -4432,7 -3691,7 +4467,14 @@@ msgstr "
  msgid "The total bank amount exceeds allowed limit (%s)."
  msgstr ""
  
 -#: gl/gl_bank.php:260
++#: ../gl/gl_bank.php:244
++#, php-format
++msgid ""
++"The bank transaction would result in exceed of authorized overdraft limit "
++"for transaction: %s #%s on %s."
++msgstr ""
++
 +#: ../gl/gl_bank.php:263
  msgid "The entered date for the payment is invalid."
  msgstr ""
  
@@@ -4498,45 -3754,22 +4540,45 @@@ msgstr "
  msgid "Account Code:"
  msgstr ""
  
 -#: gl/gl_budget.php:84 gl/manage/exchange_rates.php:142
 +#: ../gl/gl_budget.php:84
- #: ../gl/manage/exchange_rates.php:142
++#: ../gl/manage/exchange_rates.php:143
  msgid "Get"
  msgstr ""
  
 -#: 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:126
 -#: reporting/rep105.php:118 reporting/rep106.php:92 reporting/rep114.php:90
 -#: reporting/rep201.php:118 reporting/rep304.php:121 reporting/rep305.php:106
 -#: reporting/rep306.php:148 reporting/rep307.php:122 reporting/rep308.php:236
 -#: reporting/rep309.php:103 reporting/rep601.php:85 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:200
 -#: reporting/rep708.php:209 reporting/rep708.php:216 reporting/rep709.php:111
 -#: reporting/rep710.php:85
 +#: ../gl/gl_budget.php:91
 +#: ../gl/gl_budget.php:93
- #: ../gl/inquiry/profit_loss.php:236
++#: ../gl/inquiry/profit_loss.php:235
 +#: ../gl/manage/gl_quick_entries.php:240
 +#: ../reporting/rep101.php:126
 +#: ../reporting/rep105.php:118
- #: ../reporting/rep106.php:92
++#: ../reporting/rep106.php:99
 +#: ../reporting/rep114.php:90
 +#: ../reporting/rep201.php:118
 +#: ../reporting/rep304.php:121
 +#: ../reporting/rep305.php:106
 +#: ../reporting/rep306.php:148
 +#: ../reporting/rep307.php:122
 +#: ../reporting/rep308.php:236
 +#: ../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:200
 +#: ../reporting/rep708.php:209
 +#: ../reporting/rep708.php:216
 +#: ../reporting/rep709.php:111
 +#: ../reporting/rep710.php:85
  msgid "Period"
  msgstr ""
  
@@@ -4549,79 -3781,42 +4591,74 @@@ 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:224 gl/inquiry/profit_loss.php:115
 -#: gl/inquiry/profit_loss.php:288 gl/view/gl_deposit_view.php:137
 -#: gl/view/gl_payment_view.php:136 gl/view/gl_trans_view.php:106
 -#: gl/includes/ui/gl_bank_ui.inc:202 gl/includes/ui/gl_journal_ui.inc:139
 -#: inventory/includes/item_adjustments_ui.inc:63
 -#: inventory/includes/item_adjustments_ui.inc:106
 -#: manufacturing/includes/manufacturing_ui.inc:178
 -#: purchasing/includes/ui/invoice_ui.inc:322
 -#: purchasing/includes/ui/invoice_ui.inc:487
 -#: purchasing/includes/ui/invoice_ui.inc:557
 -#: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140
 -#: purchasing/allocations/supplier_allocation_main.php:100
 -#: reporting/rep101.php:234 reporting/rep106.php:84 reporting/rep106.php:119
 -#: reporting/rep106.php:162 reporting/rep114.php:161 reporting/rep201.php:224
 -#: reporting/rep203.php:94 reporting/rep203.php:171 reporting/rep204.php:113
 -#: reporting/rep204.php:141 reporting/rep301.php:197 reporting/rep301.php:245
 -#: reporting/rep304.php:146 reporting/rep304.php:188 reporting/rep305.php:101
 -#: reporting/rep305.php:127 reporting/rep305.php:183 reporting/rep306.php:141
 -#: reporting/rep306.php:176 reporting/rep306.php:196 reporting/rep306.php:212
 -#: reporting/rep306.php:261 reporting/rep306.php:276 reporting/rep306.php:287
 -#: reporting/rep308.php:311 reporting/rep309.php:126 reporting/rep309.php:153
 -#: 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:253
 -#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170
 -#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:411
 -#: sales/customer_invoice.php:479
 -#: 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/includes/ui/sales_credit_ui.inc:168
 -#: sales/includes/ui/sales_order_ui.inc:148
 +#: ../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:223
 +#: ../gl/inquiry/profit_loss.php:115
- #: ../gl/inquiry/profit_loss.php:288
++#: ../gl/inquiry/profit_loss.php:287
 +#: ../gl/view/gl_deposit_view.php:137
 +#: ../gl/view/gl_payment_view.php:136
 +#: ../gl/view/gl_trans_view.php:115
 +#: ../gl/includes/ui/gl_bank_ui.inc:202
- #: ../gl/includes/ui/gl_journal_ui.inc:153
++#: ../gl/includes/ui/gl_journal_ui.inc:151
 +#: ../inventory/includes/item_adjustments_ui.inc:63
 +#: ../inventory/includes/item_adjustments_ui.inc:106
 +#: ../manufacturing/includes/manufacturing_ui.inc:178
- #: ../purchasing/includes/ui/invoice_ui.inc:344
- #: ../purchasing/includes/ui/invoice_ui.inc:510
- #: ../purchasing/includes/ui/invoice_ui.inc:581
 +#: ../purchasing/po_receive_items.php:63
 +#: ../purchasing/view/view_po.php:140
 +#: ../purchasing/allocations/supplier_allocation_main.php:100
 +#: ../reporting/rep101.php:234
- #: ../reporting/rep106.php:84
- #: ../reporting/rep106.php:119
- #: ../reporting/rep106.php:162
++#: ../reporting/rep106.php:91
++#: ../reporting/rep106.php:126
++#: ../reporting/rep106.php:169
 +#: ../reporting/rep114.php:161
 +#: ../reporting/rep201.php:224
 +#: ../reporting/rep203.php:94
 +#: ../reporting/rep203.php:171
 +#: ../reporting/rep204.php:113
 +#: ../reporting/rep204.php:141
 +#: ../reporting/rep301.php:197
 +#: ../reporting/rep301.php:245
 +#: ../reporting/rep304.php:146
 +#: ../reporting/rep304.php:188
 +#: ../reporting/rep305.php:101
 +#: ../reporting/rep305.php:127
 +#: ../reporting/rep305.php:183
 +#: ../reporting/rep306.php:141
 +#: ../reporting/rep306.php:176
 +#: ../reporting/rep306.php:196
 +#: ../reporting/rep306.php:212
 +#: ../reporting/rep306.php:261
 +#: ../reporting/rep306.php:276
 +#: ../reporting/rep306.php:287
 +#: ../reporting/rep308.php:311
 +#: ../reporting/rep309.php:126
 +#: ../reporting/rep309.php:153
 +#: ../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:253
- #: ../reporting/includes/doctext.inc:30
- #: ../reporting/includes/doctext.inc:192
++#: ../reporting/includes/doctext.inc:32
++#: ../reporting/includes/doctext.inc:191
 +#: ../sales/customer_credit_invoice.php:281
- #: ../sales/customer_delivery.php:457
- #: ../sales/customer_invoice.php:551
- #: ../sales/customer_invoice.php:554
++#: ../sales/customer_delivery.php:422
 +#: ../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/includes/ui/sales_credit_ui.inc:168
- #: ../sales/includes/ui/sales_order_ui.inc:148
++#: ../sales/includes/ui/sales_order_ui.inc:149
  msgid "Total"
  msgstr ""
  
@@@ -4670,8 -3862,7 +4707,7 @@@ msgstr "
  msgid "You must enter at least one journal line."
  msgstr ""
  
 -#: gl/gl_journal.php:149
 +#: ../gl/gl_journal.php:155
- #: ../includes/ui/gl_cart.inc:128
  msgid ""
  "The journal must balance (debits equal to credits) before it can be "
  "processed."
@@@ -4694,10 -3884,8 +4730,10 @@@ msgstr "
  msgid "The credit amount entered is not a valid number or is less than zero."
  msgstr ""
  
 -#: gl/gl_journal.php:243 includes/ui/ui_view.inc:732
 -#: purchasing/supplier_credit.php:128 purchasing/supplier_invoice.php:129
 +#: ../gl/gl_journal.php:249
- #: ../includes/ui/ui_view.inc:733
++#: ../includes/ui/ui_view.inc:734
 +#: ../purchasing/supplier_credit.php:144
 +#: ../purchasing/supplier_invoice.php:154
  msgid "Cannot post to GL account used by more than one tax type."
  msgstr ""
  
@@@ -4727,13 -3915,9 +4763,13 @@@ msgstr "
  msgid "As at:"
  msgstr ""
  
 -#: 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:299
++#: ../gl/inquiry/profit_loss.php:298
 +#: ../reporting/rep705.php:325
 +#: ../reporting/rep706.php:278
 +#: ../reporting/rep706.php:303
 +#: ../reporting/rep707.php:309
 +#: ../reporting/rep707.php:315
  msgid "Calculated Return"
  msgstr ""
  
@@@ -4753,26 -3934,18 +4789,26 @@@ msgstr "
  msgid "Equities"
  msgstr ""
  
- #: ../gl/inquiry/bank_inquiry.php:28
 -#: gl/inquiry/bank_inquiry.php:28 reporting/rep601.php:72
++#: ../gl/inquiry/bank_inquiry.php:29
 +#: ../reporting/rep601.php:72
  msgid "Bank Statement"
  msgstr ""
  
- #: ../gl/inquiry/bank_inquiry.php:78
 -#: gl/inquiry/bank_inquiry.php:78 gl/inquiry/gl_account_inquiry.php:162
 -#: reporting/rep601.php:104 reporting/rep704.php:144
++#: ../gl/inquiry/bank_inquiry.php:79
 +#: ../gl/inquiry/gl_account_inquiry.php:162
 +#: ../reporting/rep601.php:104
 +#: ../reporting/rep602.php:103
 +#: ../reporting/rep704.php:144
  msgid "Opening Balance"
  msgstr ""
  
- #: ../gl/inquiry/bank_inquiry.php:124
 -#: gl/inquiry/bank_inquiry.php:124 gl/inquiry/gl_account_inquiry.php:213
 -#: gl/inquiry/gl_trial_balance.php:234 reporting/rep601.php:157
 -#: reporting/rep704.php:192 reporting/rep708.php:262
++#: ../gl/inquiry/bank_inquiry.php:128
 +#: ../gl/inquiry/gl_account_inquiry.php:213
 +#: ../gl/inquiry/gl_trial_balance.php:233
 +#: ../reporting/rep601.php:157
 +#: ../reporting/rep602.php:157
 +#: ../reporting/rep704.php:192
 +#: ../reporting/rep708.php:262
  msgid "Ending Balance"
  msgstr ""
  
@@@ -4813,14 -3983,10 +4849,14 @@@ msgstr "
  msgid "Only balances"
  msgstr ""
  
 -#: gl/inquiry/gl_trial_balance.php:95 gl/inquiry/gl_trial_balance.php:156
 -#: reporting/rep706.php:308 reporting/rep707.php:326 reporting/rep708.php:51
 -#: reporting/rep708.php:126 sales/create_recurrent_invoices.php:134
 -#: sales/manage/recurrent_invoices.php:102
 +#: ../gl/inquiry/gl_trial_balance.php:93
 +#: ../gl/inquiry/gl_trial_balance.php:154
- #: ../reporting/rep706.php:308
- #: ../reporting/rep707.php:326
++#: ../reporting/rep706.php:307
++#: ../reporting/rep707.php:325
 +#: ../reporting/rep708.php:51
 +#: ../reporting/rep708.php:126
 +#: ../sales/create_recurrent_invoices.php:134
- #: ../sales/manage/recurrent_invoices.php:102
++#: ../sales/manage/recurrent_invoices.php:108
  msgid "Group"
  msgstr ""
  
@@@ -4880,14 -4036,12 +4916,14 @@@ msgstr "
  msgid "Enter memo fragment or leave empty"
  msgstr ""
  
- #: ../gl/inquiry/journal_inquiry.php:130
 -#: gl/inquiry/journal_inquiry.php:130
++#: ../gl/inquiry/journal_inquiry.php:102
  msgid "Trans #"
  msgstr ""
  
- #: ../gl/inquiry/journal_inquiry.php:134
 -#: gl/inquiry/journal_inquiry.php:134 reporting/rep710.php:77
 -#: reporting/rep710.php:87 reporting/reports_main.php:499
++#: ../gl/inquiry/journal_inquiry.php:106
 +#: ../reporting/rep710.php:77
 +#: ../reporting/rep710.php:87
 +#: ../reporting/reports_main.php:505
  msgid "User"
  msgstr ""
  
@@@ -4895,37 -4049,31 +4931,37 @@@
  msgid "Profit & Loss Drilldown"
  msgstr ""
  
- #: ../gl/inquiry/profit_loss.php:173
 -#: gl/inquiry/profit_loss.php:173 reporting/rep707.php:210
 -#: reporting/includes/reports_classes.inc:248
++#: ../gl/inquiry/profit_loss.php:171
 +#: ../reporting/rep707.php:210
 +#: ../reporting/includes/reports_classes.inc:248
  msgid "Accumulated"
  msgstr ""
  
- #: ../gl/inquiry/profit_loss.php:173
 -#: gl/inquiry/profit_loss.php:173 reporting/rep707.php:255
 -#: reporting/includes/reports_classes.inc:248
++#: ../gl/inquiry/profit_loss.php:171
 +#: ../reporting/rep707.php:255
 +#: ../reporting/includes/reports_classes.inc:248
  msgid "Period Y-1"
  msgstr ""
  
- #: ../gl/inquiry/profit_loss.php:173
 -#: gl/inquiry/profit_loss.php:173 reporting/rep707.php:246
 -#: reporting/includes/reports_classes.inc:248
++#: ../gl/inquiry/profit_loss.php:171
 +#: ../reporting/rep707.php:246
 +#: ../reporting/includes/reports_classes.inc:248
  msgid "Budget"
  msgstr ""
  
- #: ../gl/inquiry/profit_loss.php:174
 -#: gl/inquiry/profit_loss.php:174 reporting/reports_main.php:375
 -#: reporting/reports_main.php:426 reporting/reports_main.php:472
++#: ../gl/inquiry/profit_loss.php:172
 +#: ../reporting/reports_main.php:381
 +#: ../reporting/reports_main.php:432
 +#: ../reporting/reports_main.php:478
  msgid "Compare to"
  msgstr ""
  
- #: ../gl/inquiry/profit_loss.php:235
 -#: gl/inquiry/profit_loss.php:235
++#: ../gl/inquiry/profit_loss.php:234
  msgid "Group/Account Name"
  msgstr ""
  
- #: ../gl/inquiry/profit_loss.php:238
 -#: gl/inquiry/profit_loss.php:238 reporting/rep707.php:210
++#: ../gl/inquiry/profit_loss.php:237
 +#: ../reporting/rep707.php:210
  msgid "Achieved %"
  msgstr ""
  
@@@ -4980,11 -4121,11 +5016,13 @@@ msgstr "
  msgid "The bank account name cannot be empty."
  msgstr ""
  
 -#: gl/manage/bank_accounts.php:39
 -msgid "The GL account selected is already in use. Select another GL account."
 +#: ../gl/manage/bank_accounts.php:39
- msgid "The GL account selected is already in use. Select another GL account."
++msgid ""
++"The GL account selected is already in use or has transactions. Select "
++"another empty GL account."
  msgstr ""
  
 -#: gl/manage/bank_accounts.php:52
 +#: ../gl/manage/bank_accounts.php:52
  msgid "Bank account has been updated"
  msgstr ""
  
@@@ -5008,49 -4149,37 +5046,46 @@@ msgstr "
  msgid "Selected bank account has been deleted"
  msgstr ""
  
 -#: gl/manage/bank_accounts.php: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:146
 -#: inventory/purchasing_data.php:147 purchasing/view/view_supp_credit.php:49
 -#: purchasing/view/view_supp_invoice.php:53
 -#: purchasing/inquiry/po_search_completed.php:130
 -#: purchasing/inquiry/po_search.php:138
 -#: 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/allocations/supplier_allocation_main.php:99
 -#: purchasing/allocations/supplier_allocation_main.php:107
 -#: reporting/rep101.php:128 reporting/rep102.php:133 reporting/rep102.php:139
 -#: reporting/rep103.php:232 reporting/rep104.php:116 reporting/rep201.php:120
 -#: reporting/rep202.php:138 reporting/rep203.php:101 reporting/rep205.php:150
 -#: sales/customer_credit_invoice.php:237 sales/customer_delivery.php:318
 -#: sales/customer_invoice.php:413
 -#: 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/inquiry/customer_allocation_inquiry.php:151
 -#: sales/inquiry/customer_allocation_inquiry.php:161
 -#: sales/inquiry/customer_inquiry.php:80
 -#: sales/inquiry/customer_inquiry.php:225
 -#: sales/inquiry/customer_inquiry.php:238
 -#: sales/inquiry/sales_deliveries_view.php:191
 -#: sales/inquiry/sales_orders_view.php:272
 -#: sales/inquiry/sales_orders_view.php:286
 +#: ../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:147
 +#: ../inventory/purchasing_data.php:148
 +#: ../purchasing/view/view_supp_credit.php:49
 +#: ../purchasing/view/view_supp_invoice.php:54
- #: ../purchasing/inquiry/po_search_completed.php:129
- #: ../purchasing/inquiry/po_search.php:138
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:133
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:143
++#: ../purchasing/inquiry/po_search_completed.php:128
++#: ../purchasing/inquiry/po_search.php:123
++#: ../purchasing/inquiry/supplier_allocation_inquiry.php:134
++#: ../purchasing/inquiry/supplier_allocation_inquiry.php:144
 +#: ../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:128
 +#: ../reporting/rep102.php:133
 +#: ../reporting/rep102.php:139
- #: ../reporting/rep103.php:232
++#: ../reporting/rep103.php:231
 +#: ../reporting/rep104.php:116
 +#: ../reporting/rep201.php:120
 +#: ../reporting/rep202.php:138
 +#: ../reporting/rep203.php:101
 +#: ../reporting/rep205.php:150
 +#: ../sales/customer_credit_invoice.php:237
- #: ../sales/customer_delivery.php:364
- #: ../sales/customer_invoice.php:479
++#: ../sales/customer_delivery.php:329
++#: ../sales/customer_invoice.php:474
 +#: ../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:191
- #: ../sales/inquiry/sales_orders_view.php:295
- #: ../sales/inquiry/sales_orders_view.php:309
++#: ../sales/inquiry/sales_deliveries_view.php:178
++#: ../sales/inquiry/sales_orders_view.php:258
++#: ../sales/inquiry/sales_orders_view.php:272
  msgid "Currency"
  msgstr ""
  
@@@ -5058,17 -4187,15 +5093,12 @@@
  msgid "GL Account"
  msgstr ""
  
 -#: gl/manage/bank_accounts.php:107 reporting/includes/doctext.inc:247
 +#: ../gl/manage/bank_accounts.php:110
- #: ../reporting/includes/doctext.inc:260
++#: ../reporting/includes/doctext.inc:259
  msgid "Bank"
  msgstr ""
  
- #: ../gl/manage/bank_accounts.php:110
- #: ../includes/ui/ui_view.inc:547
 -#: gl/manage/bank_accounts.php:107 includes/ui/ui_view.inc:547
--msgid "Number"
--msgstr ""
--
 -#: gl/manage/bank_accounts.php:107
 +#: ../gl/manage/bank_accounts.php:110
  msgid "Bank Address"
  msgstr ""
  
@@@ -5103,8 -4227,7 +5133,9 @@@ msgstr "
  msgid "Bank Name:"
  msgstr ""
  
 -#: gl/manage/bank_accounts.php:190
 +#: ../gl/manage/bank_accounts.php:195
- #: ../sales/manage/customer_branches.php:255
++#: ../sales/manage/customer_branches.php:242
++#: ../sales/manage/customers.php:260
  msgid "Bank Account Number:"
  msgstr ""
  
@@@ -5270,41 -4351,39 +5301,41 @@@ msgstr "
  msgid "The exchange rate for the date is already there."
  msgstr ""
  
- #: ../gl/manage/exchange_rates.php:127
- #: ../gl/manage/exchange_rates.php:133
 -#: gl/manage/exchange_rates.php:127 gl/manage/exchange_rates.php:133
++#: ../gl/manage/exchange_rates.php:128
++#: ../gl/manage/exchange_rates.php:134
  msgid "Date to Use From:"
  msgstr ""
  
- #: ../gl/manage/exchange_rates.php:141
 -#: gl/manage/exchange_rates.php:141 includes/ui/ui_view.inc:325
++#: ../gl/manage/exchange_rates.php:142
 +#: ../includes/ui/ui_view.inc:325
  msgid "Exchange Rate:"
  msgstr ""
  
- #: ../gl/manage/exchange_rates.php:142
 -#: gl/manage/exchange_rates.php:142
++#: ../gl/manage/exchange_rates.php:143
  msgid "Get current rate from"
  msgstr ""
  
- #: ../gl/manage/exchange_rates.php:148
 -#: gl/manage/exchange_rates.php:148
++#: ../gl/manage/exchange_rates.php:149
  msgid "Exchange rates are entered against the company currency."
  msgstr ""
  
- #: ../gl/manage/exchange_rates.php:179
 -#: gl/manage/exchange_rates.php:179
++#: ../gl/manage/exchange_rates.php:180
  msgid "Select a currency :"
  msgstr ""
  
- #: ../gl/manage/exchange_rates.php:195
 -#: gl/manage/exchange_rates.php:195
++#: ../gl/manage/exchange_rates.php:196
  msgid "Date to Use From"
  msgstr ""
  
- #: ../gl/manage/exchange_rates.php:196
 -#: gl/manage/exchange_rates.php:196
++#: ../gl/manage/exchange_rates.php:197
  msgid "Exchange Rate"
  msgstr ""
  
- #: ../gl/manage/exchange_rates.php:205
 -#: gl/manage/exchange_rates.php:205
++#: ../gl/manage/exchange_rates.php:206
  msgid "The selected currency is the company currency."
  msgstr ""
  
- #: ../gl/manage/exchange_rates.php:206
 -#: gl/manage/exchange_rates.php:206
++#: ../gl/manage/exchange_rates.php:207
  msgid ""
  "The company currency is the base currency so exchange rates cannot be set "
  "for it."
@@@ -5562,10 -4637,8 +5593,9 @@@ 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/simple_crud_class.inc:221
- #: ../includes/ui/ui_input.inc:206
- #: ../taxes/sav.tax_types.php:252
++#: ../includes/ui/ui_input.inc:207
  msgid "Add new"
  msgstr ""
  
@@@ -5621,8 -4694,7 +5651,8 @@@ msgstr "
  msgid "Balance Based"
  msgstr ""
  
 -#: gl/manage/gl_quick_entries.php:240 gl/includes/ui/gl_journal_ui.inc:55
 +#: ../gl/manage/gl_quick_entries.php:240
- #: ../gl/includes/ui/gl_journal_ui.inc:57
++#: ../gl/includes/ui/gl_journal_ui.inc:55
  msgid "Yearly"
  msgstr ""
  
@@@ -5654,10 -4724,8 +5684,8 @@@ msgstr "
  msgid "Posted"
  msgstr ""
  
 -#: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:411
 -#: sales/customer_invoice.php:479
 +#: ../gl/manage/gl_quick_entries.php:329
- #: ../sales/customer_delivery.php:457
- #: ../sales/customer_invoice.php:551
- #: ../sales/customer_invoice.php:554
++#: ../sales/customer_delivery.php:422
  msgid "Tax Type"
  msgstr ""
  
@@@ -5774,37 -4830,23 +5802,37 @@@ msgstr "
  msgid "Item Amounts are Shown in:"
  msgstr ""
  
 -#: gl/view/gl_deposit_view.php:104 gl/view/gl_deposit_view.php:107
 -#: gl/view/gl_deposit_view.php:110 gl/view/gl_payment_view.php:103
 -#: gl/view/gl_payment_view.php:106 gl/view/gl_payment_view.php:109
 -#: 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:152
 -#: gl/includes/ui/gl_bank_ui.inc:155 gl/includes/ui/gl_bank_ui.inc:158
 -#: gl/includes/ui/gl_journal_ui.inc:81 gl/includes/ui/gl_journal_ui.inc:84
 -#: gl/includes/ui/gl_journal_ui.inc:87 reporting/rep701.php:111
 +#: ../gl/view/gl_deposit_view.php:104
 +#: ../gl/view/gl_deposit_view.php:107
 +#: ../gl/view/gl_deposit_view.php:110
 +#: ../gl/view/gl_payment_view.php:103
 +#: ../gl/view/gl_payment_view.php:106
 +#: ../gl/view/gl_payment_view.php:109
 +#: ../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:152
 +#: ../gl/includes/ui/gl_bank_ui.inc:155
 +#: ../gl/includes/ui/gl_bank_ui.inc:158
- #: ../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/includes/ui/gl_journal_ui.inc:84
++#: ../gl/includes/ui/gl_journal_ui.inc:87
++#: ../gl/includes/ui/gl_journal_ui.inc:90
 +#: ../reporting/rep701.php:111
  msgid "Account Code"
  msgstr ""
  
 -#: gl/view/gl_deposit_view.php:104 gl/view/gl_deposit_view.php:107
 -#: gl/view/gl_deposit_view.php:110 gl/view/gl_payment_view.php:103
 -#: gl/view/gl_payment_view.php:106 gl/view/gl_payment_view.php:109
 -#: 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_journal_ui.inc:81
 -#: gl/includes/ui/gl_journal_ui.inc:84 gl/includes/ui/gl_journal_ui.inc:87
 +#: ../gl/view/gl_deposit_view.php:104
 +#: ../gl/view/gl_deposit_view.php:107
 +#: ../gl/view/gl_deposit_view.php:110
 +#: ../gl/view/gl_payment_view.php:103
 +#: ../gl/view/gl_payment_view.php:106
 +#: ../gl/view/gl_payment_view.php:109
 +#: ../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_journal_ui.inc:86
- #: ../gl/includes/ui/gl_journal_ui.inc:89
- #: ../gl/includes/ui/gl_journal_ui.inc:92
++#: ../gl/includes/ui/gl_journal_ui.inc:84
++#: ../gl/includes/ui/gl_journal_ui.inc:87
++#: ../gl/includes/ui/gl_journal_ui.inc:90
  msgid "Account Description"
  msgstr ""
  
@@@ -5845,12 -4883,7 +5873,12 @@@ msgstr "
  msgid "General Ledger Transaction Details"
  msgstr ""
  
 -#: gl/view/gl_trans_view.php:54
 +#: ../gl/view/gl_trans_view.php:39
- #: ../gl/includes/ui/gl_journal_ui.inc:97
++#: ../gl/includes/ui/gl_journal_ui.inc:95
 +msgid "Counterparty"
 +msgstr ""
 +
 +#: ../gl/view/gl_trans_view.php:59
  msgid "No general ledger transactions have been created for"
  msgstr ""
  
@@@ -5883,8 -4909,7 +5911,8 @@@ msgstr "
  msgid "To"
  msgstr ""
  
- #: ../gl/includes/db/gl_db_banking.inc:444
- #: ../purchasing/includes/db/invoice_db.inc:136
 -#: gl/includes/db/gl_db_banking.inc:445
++#: ../gl/includes/db/gl_db_banking.inc:518
++#: ../purchasing/includes/db/invoice_db.inc:138
  msgid "Document reentered."
  msgstr ""
  
@@@ -5893,15 -4918,14 +5921,15 @@@
  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_journal_ui.inc:28
 -#: inventory/includes/item_adjustments_ui.inc:39
 -#: inventory/includes/stock_transfers_ui.inc:42
 -#: manufacturing/work_order_add_finished.php:205
 -#: manufacturing/work_order_costs.php:152
 -#: purchasing/allocations/supplier_allocate.php:56
 -#: sales/allocations/customer_allocate.php:54
 -#: sales/includes/ui/sales_credit_ui.inc:121
 +#: ../gl/includes/ui/gl_bank_ui.inc:24
- #: ../gl/includes/ui/gl_journal_ui.inc:27
++#: ../gl/includes/ui/gl_journal_ui.inc:28
 +#: ../inventory/includes/item_adjustments_ui.inc:39
 +#: ../inventory/includes/stock_transfers_ui.inc:42
 +#: ../manufacturing/work_order_add_finished.php:205
 +#: ../manufacturing/work_order_costs.php:133
 +#: ../purchasing/allocations/supplier_allocate.php:56
 +#: ../sales/allocations/customer_allocate.php:54
 +#: ../sales/includes/ui/sales_credit_ui.inc:121
  msgid "Date:"
  msgstr ""
  
@@@ -5913,42 -4937,34 +5941,41 @@@ msgstr "
  msgid "To the Order of:"
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:64 inventory/purchasing_data.php:208
 -#: inventory/purchasing_data.php:212 purchasing/includes/ui/invoice_ui.inc:86
 -#: purchasing/includes/ui/invoice_ui.inc:93
 -#: purchasing/includes/ui/po_ui.inc:127 purchasing/includes/ui/po_ui.inc:132
 +#: ../gl/includes/ui/gl_bank_ui.inc:64
 +#: ../inventory/purchasing_data.php:208
 +#: ../inventory/purchasing_data.php:212
- #: ../purchasing/includes/ui/invoice_ui.inc:95
- #: ../purchasing/includes/ui/invoice_ui.inc:103
- #: ../purchasing/includes/ui/invoice_ui.inc:105
- #: ../purchasing/includes/ui/po_ui.inc:137
- #: ../purchasing/includes/ui/po_ui.inc:142
++#: ../purchasing/includes/ui/invoice_ui.inc:99
++#: ../purchasing/includes/ui/invoice_ui.inc:107
++#: ../purchasing/includes/ui/invoice_ui.inc:109
++#: ../purchasing/includes/ui/po_ui.inc:110
++#: ../purchasing/includes/ui/po_ui.inc:115
  msgid "Supplier:"
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:67 sales/manage/recurrent_invoices.php:169
 -#: sales/includes/ui/sales_credit_ui.inc:29
 -#: sales/includes/ui/sales_order_ui.inc:270
 +#: ../gl/includes/ui/gl_bank_ui.inc:67
- #: ../sales/manage/recurrent_invoices.php:169
++#: ../sales/manage/recurrent_invoices.php:175
 +#: ../sales/includes/ui/sales_credit_ui.inc:29
- #: ../sales/includes/ui/sales_order_ui.inc:270
++#: ../sales/includes/ui/sales_order_ui.inc:271
  msgid "Customer:"
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:71 sales/customer_payments.php:345
 -#: sales/manage/recurrent_invoices.php:172
 -#: sales/includes/ui/sales_credit_ui.inc:37
 -#: sales/includes/ui/sales_order_ui.inc:277
 +#: ../gl/includes/ui/gl_bank_ui.inc:71
- #: ../sales/customer_payments.php:348
- #: ../sales/manage/recurrent_invoices.php:172
++#: ../sales/customer_payments.php:349
++#: ../sales/manage/recurrent_invoices.php:178
 +#: ../sales/includes/ui/sales_credit_ui.inc:37
- #: ../sales/includes/ui/sales_order_ui.inc:277
++#: ../sales/includes/ui/sales_order_ui.inc:278
  msgid "Branch:"
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:85 gl/includes/ui/gl_bank_ui.inc:88
 -#: sales/customer_payments.php:361
 +#: ../gl/includes/ui/gl_bank_ui.inc:85
 +#: ../gl/includes/ui/gl_bank_ui.inc:88
- #: ../sales/customer_payments.php:364
++#: ../sales/customer_payments.php:365
  msgid "This customer account is on hold."
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:101 gl/includes/ui/gl_journal_ui.inc:56
 -#: gl/includes/ui/gl_journal_ui.inc:60
 -#: purchasing/includes/ui/invoice_ui.inc:244
 +#: ../gl/includes/ui/gl_bank_ui.inc:101
- #: ../gl/includes/ui/gl_journal_ui.inc:58
- #: ../gl/includes/ui/gl_journal_ui.inc:62
- #: ../purchasing/includes/ui/invoice_ui.inc:266
++#: ../gl/includes/ui/gl_journal_ui.inc:56
++#: ../gl/includes/ui/gl_journal_ui.inc:60
  msgid "Go"
  msgstr ""
  
@@@ -5956,72 -4972,67 +5983,66 @@@
  msgid "Into:"
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:187 includes/ui/simple_crud_class.inc:52
 -#: inventory/includes/item_adjustments_ui.inc:92
 -#: inventory/includes/stock_transfers_ui.inc:84
 -#: manufacturing/includes/work_order_issue_ui.inc:64
 -#: purchasing/includes/ui/invoice_ui.inc:533
 -#: purchasing/includes/ui/po_ui.inc:264
 -#: sales/includes/ui/sales_credit_ui.inc:198
 -#: sales/includes/ui/sales_order_ui.inc:198
 +#: ../gl/includes/ui/gl_bank_ui.inc:187
 +#: ../includes/ui/simple_crud_class.inc:52
 +#: ../inventory/includes/item_adjustments_ui.inc:92
 +#: ../inventory/includes/stock_transfers_ui.inc:84
 +#: ../manufacturing/includes/work_order_issue_ui.inc:64
- #: ../purchasing/includes/ui/invoice_ui.inc:557
- #: ../purchasing/includes/ui/po_ui.inc:276
++#: ../purchasing/includes/ui/po_ui.inc:249
 +#: ../sales/includes/ui/sales_credit_ui.inc:198
- #: ../sales/includes/ui/sales_order_ui.inc:198
++#: ../sales/includes/ui/sales_order_ui.inc:199
  msgid "Edit document line"
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:189 includes/ui/simple_crud_class.inc:54
 -#: inventory/includes/item_adjustments_ui.inc:94
 -#: inventory/includes/stock_transfers_ui.inc:86
 -#: manufacturing/includes/work_order_issue_ui.inc:66
 -#: purchasing/includes/ui/invoice_ui.inc:298
 -#: purchasing/includes/ui/po_ui.inc:266
 -#: sales/includes/ui/sales_credit_ui.inc:200
 -#: sales/includes/ui/sales_order_ui.inc:200
 +#: ../gl/includes/ui/gl_bank_ui.inc:189
 +#: ../includes/ui/simple_crud_class.inc:54
 +#: ../inventory/includes/item_adjustments_ui.inc:94
 +#: ../inventory/includes/stock_transfers_ui.inc:86
 +#: ../manufacturing/includes/work_order_issue_ui.inc:66
- #: ../purchasing/includes/ui/invoice_ui.inc:320
- #: ../purchasing/includes/ui/po_ui.inc:278
++#: ../purchasing/includes/ui/po_ui.inc:251
 +#: ../sales/includes/ui/sales_credit_ui.inc:200
- #: ../sales/includes/ui/sales_order_ui.inc:200
++#: ../sales/includes/ui/sales_order_ui.inc:201
  msgid "Remove line from document"
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:278 gl/includes/ui/gl_journal_ui.inc:221
 -#: includes/ui/simple_crud_class.inc:56
 -#: inventory/includes/item_adjustments_ui.inc:164
 -#: inventory/includes/stock_transfers_ui.inc:144
 -#: manufacturing/includes/work_order_issue_ui.inc:139
 -#: purchasing/includes/ui/po_ui.inc:440
 -#: sales/includes/ui/sales_credit_ui.inc:294
 -#: sales/includes/ui/sales_order_ui.inc:549
 +#: ../gl/includes/ui/gl_bank_ui.inc:278
- #: ../gl/includes/ui/gl_journal_ui.inc:258
++#: ../gl/includes/ui/gl_journal_ui.inc:257
 +#: ../includes/ui/simple_crud_class.inc:56
 +#: ../inventory/includes/item_adjustments_ui.inc:164
 +#: ../inventory/includes/stock_transfers_ui.inc:144
 +#: ../manufacturing/includes/work_order_issue_ui.inc:139
- #: ../purchasing/includes/ui/po_ui.inc:460
++#: ../purchasing/includes/ui/po_ui.inc:433
 +#: ../sales/includes/ui/sales_credit_ui.inc:294
- #: ../sales/includes/ui/sales_order_ui.inc:547
  msgid "Confirm changes"
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:280 gl/includes/ui/gl_journal_ui.inc:223
 -#: includes/ui/simple_crud_class.inc:58
 -#: inventory/includes/item_adjustments_ui.inc:166
 -#: inventory/includes/stock_transfers_ui.inc:146
 -#: manufacturing/includes/work_order_issue_ui.inc:141
 -#: purchasing/includes/ui/po_ui.inc:442
 -#: sales/includes/ui/sales_credit_ui.inc:296
 -#: sales/includes/ui/sales_order_ui.inc:551
 +#: ../gl/includes/ui/gl_bank_ui.inc:280
- #: ../gl/includes/ui/gl_journal_ui.inc:260
++#: ../gl/includes/ui/gl_journal_ui.inc:259
 +#: ../includes/ui/simple_crud_class.inc:58
 +#: ../inventory/includes/item_adjustments_ui.inc:166
 +#: ../inventory/includes/stock_transfers_ui.inc:146
 +#: ../manufacturing/includes/work_order_issue_ui.inc:141
- #: ../purchasing/includes/ui/po_ui.inc:462
++#: ../purchasing/includes/ui/po_ui.inc:435
 +#: ../sales/includes/ui/sales_credit_ui.inc:296
- #: ../sales/includes/ui/sales_order_ui.inc:549
  msgid "Cancel changes"
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:285 gl/includes/ui/gl_journal_ui.inc:227
 -#: inventory/includes/item_adjustments_ui.inc:172
 -#: inventory/includes/stock_transfers_ui.inc:152
 -#: manufacturing/includes/work_order_issue_ui.inc:147
 -#: purchasing/includes/ui/po_ui.inc:448
 -#: sales/includes/ui/sales_credit_ui.inc:302
 -#: sales/includes/ui/sales_order_ui.inc:557
 +#: ../gl/includes/ui/gl_bank_ui.inc:285
- #: ../gl/includes/ui/gl_journal_ui.inc:264
++#: ../gl/includes/ui/gl_journal_ui.inc:263
 +#: ../inventory/includes/item_adjustments_ui.inc:172
 +#: ../inventory/includes/stock_transfers_ui.inc:152
 +#: ../manufacturing/includes/work_order_issue_ui.inc:147
- #: ../purchasing/includes/ui/po_ui.inc:468
++#: ../purchasing/includes/ui/po_ui.inc:441
 +#: ../sales/includes/ui/sales_credit_ui.inc:302
- #: ../sales/includes/ui/sales_order_ui.inc:555
  msgid "Add Item"
  msgstr ""
  
 -#: gl/includes/ui/gl_bank_ui.inc:286
 -#: inventory/includes/item_adjustments_ui.inc:173
 -#: inventory/includes/stock_transfers_ui.inc:153
 -#: manufacturing/includes/work_order_issue_ui.inc:148
 -#: purchasing/includes/ui/po_ui.inc:449
 -#: sales/includes/ui/sales_credit_ui.inc:303
 -#: sales/includes/ui/sales_order_ui.inc:558
 +#: ../gl/includes/ui/gl_bank_ui.inc:286
 +#: ../inventory/includes/item_adjustments_ui.inc:173
 +#: ../inventory/includes/stock_transfers_ui.inc:153
 +#: ../manufacturing/includes/work_order_issue_ui.inc:148
- #: ../purchasing/includes/ui/po_ui.inc:469
++#: ../purchasing/includes/ui/po_ui.inc:442
 +#: ../sales/includes/ui/sales_credit_ui.inc:303
- #: ../sales/includes/ui/sales_order_ui.inc:556
  msgid "Add new item to document"
  msgstr ""
  
@@@ -6033,33 -5044,27 +6054,33 @@@ msgstr "
  msgid "Settled AP Amount:"
  msgstr ""
  
- #: ../gl/includes/ui/gl_journal_ui.inc:38
 -#: gl/includes/ui/gl_journal_ui.inc:36
++#: ../gl/includes/ui/gl_journal_ui.inc:36
  msgid "Reverse Transaction:"
  msgstr ""
  
- #: ../gl/includes/ui/gl_journal_ui.inc:46
 -#: gl/includes/ui/gl_journal_ui.inc:44 includes/sysnames.inc:98
++#: ../gl/includes/ui/gl_journal_ui.inc:44
 +#: ../includes/sysnames.inc:98
  msgid "Quick Entry"
  msgstr ""
  
- #: ../gl/includes/ui/gl_journal_ui.inc:57
 -#: gl/includes/ui/gl_journal_ui.inc:55
++#: ../gl/includes/ui/gl_journal_ui.inc:55
  msgid "balance from account"
  msgstr ""
  
- #: ../gl/includes/ui/gl_journal_ui.inc:135
 -#: gl/includes/ui/gl_journal_ui.inc:121
++#: ../gl/includes/ui/gl_journal_ui.inc:133
  msgid "Edit journal line"
  msgstr ""
  
- #: ../gl/includes/ui/gl_journal_ui.inc:137
 -#: gl/includes/ui/gl_journal_ui.inc:123
++#: ../gl/includes/ui/gl_journal_ui.inc:135
  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:228
++#: ../gl/includes/ui/gl_journal_ui.inc:198
++#: ../gl/includes/ui/gl_journal_ui.inc:230
 +msgid "[Select account]"
 +msgstr ""
 +
- #: ../gl/includes/ui/gl_journal_ui.inc:265
++#: ../gl/includes/ui/gl_journal_ui.inc:264
  msgid "Add new line to journal"
  msgstr ""
  
@@@ -6613,8 -5605,7 +6634,8 @@@ msgstr "
  msgid "GL reports and inquiries"
  msgstr ""
  
- #: ../includes/banking.inc:100
 -#: includes/banking.inc:100 includes/data_checks.inc:52
++#: ../includes/banking.inc:42
 +#: ../includes/data_checks.inc:52
  #, php-format
  msgid ""
  "Cannot retrieve exchange rate for currency %s as of %s. Please add exchange "
@@@ -6627,9 -5618,8 +6648,9 @@@ msgid "
  "$security_headings arrays from old config.php file to the new one."
  msgstr ""
  
 -#: includes/current_user.inc:92 includes/ui/ui_controls.inc:191
 -#: includes/ui/ui_view.inc:903
 +#: ../includes/current_user.inc:102
- #: ../includes/ui/ui_controls.inc:197
- #: ../includes/ui/ui_view.inc:904
++#: ../includes/ui/ui_controls.inc:198
++#: ../includes/ui/ui_view.inc:906
  msgid "Back"
  msgstr ""
  
@@@ -6637,46 -5627,37 +6658,46 @@@
  msgid "System is available for site admin only until full database upgrade"
  msgstr ""
  
- #: ../includes/current_user.inc:163
 -#: includes/current_user.inc:153
++#: ../includes/current_user.inc:164
  msgid "New password for"
  msgstr ""
  
- #: ../includes/current_user.inc:570
 -#: includes/current_user.inc:549
++#: ../includes/current_user.inc:618
  msgid "Requesting data..."
  msgstr ""
  
 -#: includes/errors.inc:126
 +#: ../includes/data_checks.inc:508
 +#, php-format
 +msgid "%s #%s is closed for further edition."
 +msgstr ""
 +
 +#: ../includes/data_checks.inc:534
 +msgid "You have no edit access to transactions created by other users."
 +msgstr ""
 +
- #: ../includes/errors.inc:126
++#: ../includes/errors.inc:124
  msgid "in file"
  msgstr ""
  
- #: ../includes/errors.inc:126
 -#: includes/errors.inc:126
++#: ../includes/errors.inc:124
  msgid "at line "
  msgstr ""
  
- #: ../includes/errors.inc:180
 -#: includes/errors.inc:180
++#: ../includes/errors.inc:178
  msgid "Debug mode database warning:"
  msgstr ""
  
- #: ../includes/errors.inc:182
 -#: includes/errors.inc:182
++#: ../includes/errors.inc:180
  msgid "DATABASE ERROR :"
  msgstr ""
  
- #: ../includes/errors.inc:217
 -#: includes/errors.inc:217
++#: ../includes/errors.inc:213
  msgid ""
  "The entered information is a duplicate. Please go back and enter different "
  "values."
  msgstr ""
  
- #: ../includes/main.inc:44
 -#: includes/main.inc:41
++#: ../includes/main.inc:49
  msgid "This page is usable only with javascript enabled browsers."
  msgstr ""
  
@@@ -6790,19 -5766,19 +6811,19 @@@ msgid "
  "file!"
  msgstr ""
  
- #: ../includes/session.inc:244
 -#: includes/session.inc:244
++#: ../includes/session.inc:245
  msgid ""
  "Access to application has been blocked until database upgrade is completed "
  "by system administrator."
  msgstr ""
  
- #: ../includes/session.inc:258
 -#: includes/session.inc:258
++#: ../includes/session.inc:259
  msgid ""
  "The security settings on your account do not permit you to access this "
  "function"
  msgstr ""
  
- #: ../includes/session.inc:267
 -#: includes/session.inc:267
++#: ../includes/session.inc:268
  msgid ""
  "System is blocked after source upgrade until database is updated on System/"
  "Software Upgrade page"
@@@ -6847,9 -5820,8 +6868,9 @@@ msgstr "
  msgid "Inventory Adjustment"
  msgstr ""
  
 -#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:320
 -#: purchasing/view/view_po.php:30
 +#: ../includes/sysnames.inc:32
- #: ../purchasing/includes/ui/po_ui.inc:332
++#: ../purchasing/includes/ui/po_ui.inc:305
 +#: ../purchasing/view/view_po.php:30
  msgid "Purchase Order"
  msgstr ""
  
@@@ -6885,14 -5853,12 +6906,14 @@@ msgstr "
  msgid "Work Order Production"
  msgstr ""
  
 -#: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:139
 -#: sales/inquiry/sales_orders_view.php:161
 +#: ../includes/sysnames.inc:40
- #: ../sales/inquiry/sales_orders_view.php:151
- #: ../sales/inquiry/sales_orders_view.php:173
++#: ../sales/inquiry/sales_orders_view.php:123
++#: ../sales/inquiry/sales_orders_view.php:145
  msgid "Sales Order"
  msgstr ""
  
 -#: includes/sysnames.inc:41 sales/sales_order_entry.php:636
 +#: ../includes/sysnames.inc:41
- #: ../sales/sales_order_entry.php:658
++#: ../sales/sales_order_entry.php:647
  msgid "Sales Quotation"
  msgstr ""
  
@@@ -6928,8 -5894,7 +6949,7 @@@ msgstr "
  msgid "CP"
  msgstr ""
  
 -#: includes/sysnames.inc:54 sales/customer_invoice.php:482
 +#: ../includes/sysnames.inc:54
- #: ../sales/customer_invoice.php:556
  msgid "DN"
  msgstr ""
  
@@@ -7021,70 -5982,47 +7041,68 @@@ msgstr "
  msgid "Cash"
  msgstr ""
  
 -#: includes/sysnames.inc:96 reporting/rep101.php:127 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:45 reporting/reports_main.php:102
 -#: reporting/reports_main.php:121 reporting/reports_main.php:237
 -#: sales/create_recurrent_invoices.php:134
 -#: sales/customer_credit_invoice.php:235 sales/customer_delivery.php:316
 -#: sales/customer_invoice.php:389
 -#: 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:223
 -#: sales/inquiry/customer_inquiry.php:237
 -#: sales/inquiry/sales_deliveries_view.php:182
 -#: sales/inquiry/sales_orders_view.php:264
 -#: sales/inquiry/sales_orders_view.php:278
 +#: ../includes/sysnames.inc:96
 +#: ../includes/sysnames.inc:195
 +#: ../reporting/rep101.php:127
 +#: ../reporting/rep102.php:125
 +#: ../reporting/rep102.php:132
 +#: ../reporting/rep105.php:109
- #: ../reporting/rep106.php:83
++#: ../reporting/rep106.php:90
 +#: ../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:45
 +#: ../reporting/reports_main.php:102
 +#: ../reporting/reports_main.php:121
 +#: ../reporting/reports_main.php:237
 +#: ../sales/create_recurrent_invoices.php:134
 +#: ../sales/customer_credit_invoice.php:235
- #: ../sales/customer_delivery.php:362
- #: ../sales/customer_invoice.php:455
++#: ../sales/customer_delivery.php:327
++#: ../sales/customer_invoice.php:450
 +#: ../sales/allocations/customer_allocation_main.php:97
 +#: ../sales/allocations/customer_allocation_main.php:105
- #: ../sales/manage/recurrent_invoices.php:102
++#: ../sales/manage/recurrent_invoices.php:108
 +#: ../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:182
- #: ../sales/inquiry/sales_orders_view.php:287
- #: ../sales/inquiry/sales_orders_view.php:301
++#: ../sales/inquiry/sales_deliveries_view.php:169
++#: ../sales/inquiry/sales_orders_view.php:250
++#: ../sales/inquiry/sales_orders_view.php:264
  msgid "Customer"
  msgstr ""
  
 -#: includes/sysnames.inc:97 includes/sysnames.inc:172
 -#: inventory/purchasing_data.php:147 purchasing/includes/ui/grn_ui.inc:20
 -#: purchasing/includes/ui/grn_ui.inc:52 purchasing/includes/ui/po_ui.inc:313
 -#: purchasing/view/view_supp_credit.php:42
 -#: purchasing/view/view_supp_invoice.php:45
 -#: purchasing/inquiry/po_search_completed.php:126
 -#: purchasing/inquiry/po_search.php:134
 -#: 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/allocations/supplier_allocation_main.php:98
 -#: purchasing/allocations/supplier_allocation_main.php:106
 -#: reporting/rep201.php:119 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:149
 -#: reporting/reports_main.php:153 reporting/reports_main.php:162
 -#: reporting/reports_main.php:173 reporting/reports_main.php:180
 -#: reporting/reports_main.php:252
 +#: ../includes/sysnames.inc:97
 +#: ../includes/sysnames.inc:173
 +#: ../includes/sysnames.inc:196
 +#: ../inventory/purchasing_data.php:148
 +#: ../purchasing/includes/ui/grn_ui.inc:20
 +#: ../purchasing/includes/ui/grn_ui.inc:52
- #: ../purchasing/includes/ui/po_ui.inc:325
++#: ../purchasing/includes/ui/po_ui.inc:298
 +#: ../purchasing/view/view_supp_credit.php:42
 +#: ../purchasing/view/view_supp_invoice.php:46
- #: ../purchasing/inquiry/po_search_completed.php:125
- #: ../purchasing/inquiry/po_search.php:134
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:129
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:142
++#: ../purchasing/inquiry/po_search_completed.php:124
++#: ../purchasing/inquiry/po_search.php:119
++#: ../purchasing/inquiry/supplier_allocation_inquiry.php:130
++#: ../purchasing/inquiry/supplier_allocation_inquiry.php:143
 +#: ../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:119
 +#: ../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:149
 +#: ../reporting/reports_main.php:153
 +#: ../reporting/reports_main.php:162
 +#: ../reporting/reports_main.php:173
 +#: ../reporting/reports_main.php:180
 +#: ../reporting/reports_main.php:252
  msgid "Supplier"
  msgstr ""
  
@@@ -7184,10 -6118,8 +7202,10 @@@ msgstr "
  msgid "Supplier Invoice/Credit"
  msgstr ""
  
 -#: includes/sysnames.inc:156 manufacturing/search_work_orders.php:171
 -#: manufacturing/includes/manufacturing_ui.inc:278 reporting/rep402.php:103
 +#: ../includes/sysnames.inc:157
- #: ../manufacturing/search_work_orders.php:165
++#: ../manufacturing/search_work_orders.php:171
 +#: ../manufacturing/includes/manufacturing_ui.inc:278
 +#: ../reporting/rep402.php:103
  msgid "Manufactured"
  msgstr ""
  
@@@ -7247,8 -6171,7 +7265,8 @@@ msgstr "
  msgid "Apr"
  msgstr ""
  
 -#: includes/sysnames.inc:187 includes/ui/ui_view.inc:900
 +#: ../includes/sysnames.inc:200
- #: ../includes/ui/ui_view.inc:901
++#: ../includes/ui/ui_view.inc:903
  msgid "May"
  msgstr ""
  
@@@ -7376,219 -6296,180 +7394,218 @@@ msgstr "
  msgid "To switch debugging on set $go_debug>0 in config.php file"
  msgstr ""
  
- #: ../includes/system_tests.inc:137
 -#: includes/system_tests.inc:137
++#: ../includes/system_tests.inc:138
  msgid "Error logging"
  msgstr ""
  
- #: ../includes/system_tests.inc:145
 -#: includes/system_tests.inc:145
++#: ../includes/system_tests.inc:146
  msgid "Disabled"
  msgstr ""
  
- #: ../includes/system_tests.inc:148
 -#: includes/system_tests.inc:148
++#: ../includes/system_tests.inc:149
  msgid "To switch error logging set $error_logging in config.php file"
  msgstr ""
  
- #: ../includes/system_tests.inc:151
 -#: includes/system_tests.inc:151
++#: ../includes/system_tests.inc:152
  msgid "Log file is not writeable"
  msgstr ""
  
- #: ../includes/system_tests.inc:161
 -#: includes/system_tests.inc:161
++#: ../includes/system_tests.inc:162
  msgid "Current database version"
  msgstr ""
  
- #: ../includes/system_tests.inc:165
 -#: includes/system_tests.inc:165
++#: ../includes/system_tests.inc:166
  msgid "Database structure seems to be not upgraded to current version"
  msgstr ""
  
- #: ../includes/system_tests.inc:180
 -#: includes/system_tests.inc:180
++#: ../includes/system_tests.inc:181
  msgid "Company subdirectories consistency"
  msgstr ""
  
- #: ../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
 -#: 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
++#: ../includes/system_tests.inc:194
++#: ../includes/system_tests.inc:201
++#: ../includes/system_tests.inc:209
++#: ../includes/system_tests.inc:226
++#: ../includes/system_tests.inc:341
++#: ../includes/system_tests.inc:350
++#: ../includes/system_tests.inc:359
++#: ../includes/system_tests.inc:367
  #, php-format
  msgid "'%s' is not writeable"
  msgstr ""
  
- #: ../includes/system_tests.inc:221
 -#: includes/system_tests.inc:221
++#: ../includes/system_tests.inc:222
  msgid "Temporary directory"
  msgstr ""
  
- #: ../includes/system_tests.inc:233
 -#: includes/system_tests.inc:233
++#: ../includes/system_tests.inc:234
  msgid "Language configuration consistency"
  msgstr ""
  
- #: ../includes/system_tests.inc:242
 -#: includes/system_tests.inc:242
++#: ../includes/system_tests.inc:243
  msgid "Languages folder should be writeable."
  msgstr ""
  
- #: ../includes/system_tests.inc:251
 -#: includes/system_tests.inc:251
++#: ../includes/system_tests.inc:252
  msgid "Languages configuration file should be writeable."
  msgstr ""
  
- #: ../includes/system_tests.inc:270
 -#: includes/system_tests.inc:270
++#: ../includes/system_tests.inc:271
  #, php-format
  msgid "Missing %s translation file."
  msgstr ""
  
- #: ../includes/system_tests.inc:275
 -#: includes/system_tests.inc:275
++#: ../includes/system_tests.inc:276
  #, php-format
  msgid "Missing system locale: %s"
  msgstr ""
  
- #: ../includes/system_tests.inc:288
 -#: includes/system_tests.inc:288
++#: ../includes/system_tests.inc:289
  msgid "Main config file"
  msgstr ""
  
- #: ../includes/system_tests.inc:295
- #: ../includes/system_tests.inc:317
 -#: includes/system_tests.inc:295 includes/system_tests.inc:317
++#: ../includes/system_tests.inc:296
++#: ../includes/system_tests.inc:318
  #, php-format
  msgid "Can't write '%s' file. Check FA directory write permissions."
  msgstr ""
  
- #: ../includes/system_tests.inc:296
- #: ../includes/system_tests.inc:318
 -#: includes/system_tests.inc:296 includes/system_tests.inc:318
++#: ../includes/system_tests.inc:297
++#: ../includes/system_tests.inc:319
  #, php-format
  msgid "'%s' file exists."
  msgstr ""
  
- #: ../includes/system_tests.inc:300
 -#: includes/system_tests.inc:300
++#: ../includes/system_tests.inc:301
  #, php-format
  msgid "'%s' file should be read-only"
  msgstr ""
  
- #: ../includes/system_tests.inc:309
 -#: includes/system_tests.inc:309
++#: ../includes/system_tests.inc:310
  msgid "Database auth file"
  msgstr ""
  
- #: ../includes/system_tests.inc:322
 -#: includes/system_tests.inc:322
++#: ../includes/system_tests.inc:323
  #, php-format
  msgid ""
  "'%s' file should be read-only if you do not plan to add or change companies"
  msgstr ""
  
- #: ../includes/system_tests.inc:333
 -#: includes/system_tests.inc:333
++#: ../includes/system_tests.inc:334
  msgid "Extensions system"
  msgstr ""
  
- #: ../includes/system_tests.inc:371
 -#: includes/system_tests.inc:371
++#: ../includes/system_tests.inc:372
  msgid "Extensions configuration files and directories should be writeable"
  msgstr ""
  
- #: ../includes/system_tests.inc:384
 -#: includes/system_tests.inc:384
++#: ../includes/system_tests.inc:385
  #, php-format
  msgid "Non-standard theme directory '%s' is not writable"
  msgstr ""
  
- #: ../includes/system_tests.inc:394
 -#: includes/system_tests.inc:394
++#: ../includes/system_tests.inc:395
  msgid ""
  "OpenSSL PHP extension have to be enabled to use extension repository system."
  msgstr ""
  
- #: ../includes/system_tests.inc:397
 -#: includes/system_tests.inc:397
++#: ../includes/system_tests.inc:398
  msgid ""
  "OpenSSL have to be available on your server to use extension repository "
  "system."
  msgstr ""
  
- #: ../includes/system_tests.inc:420
 -#: includes/system_tests.inc:420
++#: ../includes/system_tests.inc:421
  msgid "Test"
  msgstr ""
  
- #: ../includes/system_tests.inc:420
 -#: includes/system_tests.inc:420
++#: ../includes/system_tests.inc:421
  msgid "Test type"
  msgstr ""
  
- #: ../includes/system_tests.inc:420
- #: ../includes/ui/view_package.php:47
 -#: includes/system_tests.inc:420 includes/ui/view_package.php:47
 -#: reporting/rep204.php:85 reporting/rep301.php:169 reporting/rep308.php:231
++#: ../includes/system_tests.inc:421
 +#: ../reporting/rep204.php:85
 +#: ../reporting/rep301.php:169
 +#: ../reporting/rep308.php:231
  msgid "Value"
  msgstr ""
  
- #: ../includes/system_tests.inc:420
 -#: 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/reports_main.php:111
 -#: reporting/reports_main.php:118 reporting/reports_main.php:125
 -#: reporting/reports_main.php:133 reporting/reports_main.php:140
 -#: reporting/reports_main.php:146 reporting/reports_main.php:157
 -#: reporting/reports_main.php:168 reporting/reports_main.php:176
 -#: reporting/reports_main.php:181 reporting/reports_main.php:188
 -#: reporting/reports_main.php:196 reporting/reports_main.php:203
 -#: reporting/reports_main.php:212 reporting/reports_main.php:218
 -#: reporting/reports_main.php:229 reporting/reports_main.php:238
 -#: reporting/reports_main.php:244 reporting/reports_main.php:254
 -#: reporting/reports_main.php:262 reporting/reports_main.php:270
 -#: reporting/reports_main.php:277 reporting/reports_main.php:285
 -#: reporting/reports_main.php:292 reporting/reports_main.php:299
 -#: reporting/reports_main.php:308 reporting/reports_main.php:321
 -#: reporting/reports_main.php:328 reporting/reports_main.php:335
 -#: reporting/reports_main.php:350 reporting/reports_main.php:358
 -#: reporting/reports_main.php:369 reporting/reports_main.php:381
 -#: reporting/reports_main.php:391 reporting/reports_main.php:403
 -#: reporting/reports_main.php:410 reporting/reports_main.php:420
 -#: reporting/reports_main.php:431 reporting/reports_main.php:440
 -#: reporting/reports_main.php:451 reporting/reports_main.php:457
 -#: reporting/reports_main.php:466 reporting/reports_main.php:476
 -#: reporting/reports_main.php:484 reporting/reports_main.php:492
 -#: reporting/reports_main.php:500 reporting/includes/excel_report.inc:295
 -#: reporting/includes/excel_report.inc:428
 -#: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:618
 -#: sales/view/view_sales_order.php:85
++#: ../includes/system_tests.inc:421
 +#: ../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:111
 +#: ../reporting/reports_main.php:118
 +#: ../reporting/reports_main.php:125
 +#: ../reporting/reports_main.php:133
 +#: ../reporting/reports_main.php:140
 +#: ../reporting/reports_main.php:146
 +#: ../reporting/reports_main.php:157
 +#: ../reporting/reports_main.php:168
 +#: ../reporting/reports_main.php:176
 +#: ../reporting/reports_main.php:181
 +#: ../reporting/reports_main.php:188
 +#: ../reporting/reports_main.php:196
 +#: ../reporting/reports_main.php:203
 +#: ../reporting/reports_main.php:212
 +#: ../reporting/reports_main.php:218
 +#: ../reporting/reports_main.php:229
 +#: ../reporting/reports_main.php:238
 +#: ../reporting/reports_main.php:244
 +#: ../reporting/reports_main.php:254
 +#: ../reporting/reports_main.php:262
 +#: ../reporting/reports_main.php:270
 +#: ../reporting/reports_main.php:277
 +#: ../reporting/reports_main.php:285
 +#: ../reporting/reports_main.php:292
 +#: ../reporting/reports_main.php:299
 +#: ../reporting/reports_main.php:308
 +#: ../reporting/reports_main.php:321
 +#: ../reporting/reports_main.php:328
 +#: ../reporting/reports_main.php:334
 +#: ../reporting/reports_main.php:341
 +#: ../reporting/reports_main.php:356
 +#: ../reporting/reports_main.php:364
 +#: ../reporting/reports_main.php:375
 +#: ../reporting/reports_main.php:387
 +#: ../reporting/reports_main.php:397
 +#: ../reporting/reports_main.php:409
 +#: ../reporting/reports_main.php:416
 +#: ../reporting/reports_main.php:426
 +#: ../reporting/reports_main.php:437
 +#: ../reporting/reports_main.php:446
 +#: ../reporting/reports_main.php:457
 +#: ../reporting/reports_main.php:463
 +#: ../reporting/reports_main.php:472
 +#: ../reporting/reports_main.php:482
 +#: ../reporting/reports_main.php:490
 +#: ../reporting/reports_main.php:498
 +#: ../reporting/reports_main.php:506
 +#: ../reporting/includes/excel_report.inc:295
 +#: ../reporting/includes/excel_report.inc:428
- #: ../reporting/includes/pdf_report.inc:346
- #: ../reporting/includes/pdf_report.inc:618
++#: ../reporting/includes/pdf_report.inc:347
++#: ../reporting/includes/pdf_report.inc:620
 +#: ../sales/view/view_sales_order.php:98
  msgid "Comments"
  msgstr ""
  
- #: ../includes/system_tests.inc:444
 -#: includes/system_tests.inc:444
++#: ../includes/system_tests.inc:445
  msgid "Ok"
  msgstr ""
  
- #: ../includes/db/audit_trail_db.inc:99
 -#: includes/db/audit_trail_db.inc:93
++#: ../includes/db/audit_trail_db.inc:102
  msgid ""
  "Some transactions journal GL postings were not indexed due to lack of audit "
  "trail record."
  msgstr ""
  
 -#: includes/db/inventory_db.inc:284
 -#: inventory/includes/db/items_trans_db.inc:60
 +#: ../includes/db/inventory_db.inc:284
- #: ../inventory/includes/db/items_trans_db.inc:66
++#: ../inventory/includes/db/items_trans_db.inc:60
  #, php-format
  msgid "Cost was %s changed to %s x quantity on hand for item '%s'"
  msgstr ""
@@@ -7612,18 -6493,13 +7629,18 @@@ msgstr "
  msgid "Supplier Ref"
  msgstr ""
  
 -#: includes/ui/allocation_cart.inc:288 reporting/rep704.php:83
 -#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep709.php:116
 -#: 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
 +#: ../includes/ui/allocation_cart.inc:290
 +#: ../reporting/rep704.php:83
 +#: ../reporting/rep704.php:86
 +#: ../reporting/rep704.php:89
 +#: ../reporting/rep709.php:116
 +#: ../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/inquiry/sales_orders_view.php:248
- #: ../sales/inquiry/sales_orders_view.php:286
- #: ../sales/inquiry/sales_orders_view.php:300
++#: ../sales/inquiry/sales_orders_view.php:210
++#: ../sales/inquiry/sales_orders_view.php:249
++#: ../sales/inquiry/sales_orders_view.php:263
  msgid "Ref"
  msgstr ""
  
@@@ -7631,28 -6507,22 +7648,24 @@@
  msgid "Other Allocations"
  msgstr ""
  
 -#: includes/ui/allocation_cart.inc:289 includes/ui/allocation_cart.inc:342
 -#: includes/ui/ui_view.inc:548
 -#: purchasing/allocations/supplier_allocation_main.php:101
 -#: reporting/rep112.php:160 reporting/rep210.php:167
 -#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
 -#: sales/allocations/customer_allocation_main.php:100
 +#: ../includes/ui/allocation_cart.inc:291
 +#: ../includes/ui/allocation_cart.inc:344
- #: ../includes/ui/ui_view.inc:548
++#: ../includes/ui/ui_view.inc:549
 +#: ../purchasing/allocations/supplier_allocation_main.php:101
- #: ../reporting/rep112.php:145
- #: ../reporting/rep210.php:152
- #: ../reporting/includes/doctext.inc:167
- #: ../reporting/includes/doctext.inc:208
++#: ../reporting/includes/doctext.inc:166
++#: ../reporting/includes/doctext.inc:207
 +#: ../sales/allocations/customer_allocation_main.php:100
  msgid "Left to Allocate"
  msgstr ""
  
 -#: includes/ui/allocation_cart.inc:289 includes/ui/ui_view.inc:548
 -#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
 +#: ../includes/ui/allocation_cart.inc:291
- #: ../includes/ui/ui_view.inc:548
- #: ../reporting/includes/doctext.inc:167
- #: ../reporting/includes/doctext.inc:208
++#: ../includes/ui/ui_view.inc:549
++#: ../reporting/includes/doctext.inc:166
++#: ../reporting/includes/doctext.inc:207
  msgid "This Allocation"
  msgstr ""
  
 -#: includes/ui/allocation_cart.inc:322 reporting/rep112.php:157
 -#: reporting/rep210.php:164
 +#: ../includes/ui/allocation_cart.inc:324
- #: ../reporting/rep112.php:142
- #: ../reporting/rep210.php:149
  msgid "Total Allocated"
  msgstr ""
  
@@@ -7678,11 -6548,9 +7691,11 @@@ msgstr "
  msgid "Sec Phone"
  msgstr ""
  
 -#: includes/ui/contacts_view.inc:41 reporting/rep103.php:266
 -#: reporting/rep205.php:184 reporting/includes/header2.inc:107
 -#: sales/manage/sales_people.php:99
 +#: ../includes/ui/contacts_view.inc:41
- #: ../reporting/rep103.php:266
++#: ../reporting/rep103.php:265
 +#: ../reporting/rep205.php:184
 +#: ../reporting/includes/header2.inc:107
 +#: ../sales/manage/sales_people.php:99
  msgid "Fax"
  msgstr ""
  
@@@ -7711,23 -6578,18 +7724,23 @@@ msgstr "
  msgid "Phone:"
  msgstr ""
  
 -#: includes/ui/contacts_view.inc:105 inventory/manage/locations.php:207
 -#: purchasing/manage/suppliers.php:161 sales/manage/customer_branches.php:263
 -#: sales/manage/customers.php:259 sales/manage/sales_people.php:158
 +#: ../includes/ui/contacts_view.inc:105
 +#: ../inventory/manage/locations.php:207
 +#: ../purchasing/manage/suppliers.php:141
- #: ../sales/manage/customer_branches.php:265
++#: ../sales/manage/customer_branches.php:252
 +#: ../sales/manage/customers.php:259
 +#: ../sales/manage/sales_people.php:158
  msgid "E-mail:"
  msgstr ""
  
 -#: includes/ui/contacts_view.inc:110 purchasing/manage/suppliers.php:162
 -#: sales/manage/customer_branches.php:264
 +#: ../includes/ui/contacts_view.inc:110
 +#: ../purchasing/manage/suppliers.php:142
- #: ../sales/manage/customer_branches.php:266
++#: ../sales/manage/customer_branches.php:253
  msgid "Document Language:"
  msgstr ""
  
 -#: includes/ui/contacts_view.inc:110 sales/manage/customer_branches.php:264
 +#: ../includes/ui/contacts_view.inc:110
- #: ../sales/manage/customer_branches.php:266
++#: ../sales/manage/customer_branches.php:253
  msgid "Customer default"
  msgstr ""
  
@@@ -7747,8 -6609,7 +7760,8 @@@ msgstr "
  msgid "You have to select at least one category."
  msgstr ""
  
 -#: includes/ui/db_pager_view.inc:166 includes/ui/ui_input.inc:904
 +#: ../includes/ui/db_pager_view.inc:166
- #: ../includes/ui/ui_input.inc:904
++#: ../includes/ui/ui_input.inc:905
  msgid "Show also Inactive"
  msgstr ""
  
@@@ -7777,106 -6638,88 +7790,105 @@@ msgstr "
  msgid "No records"
  msgstr ""
  
 -#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:208
 +#: ../includes/ui/simple_crud_class.inc:227
- #: ../includes/ui/ui_input.inc:208
- #: ../taxes/sav.tax_types.php:255
++#: ../includes/ui/ui_input.inc:209
  msgid "Submit changes"
  msgstr ""
  
 -#: 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:209
++#: ../includes/ui/ui_input.inc:210
  msgid "Clone"
  msgstr ""
  
 -#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:210
 +#: ../includes/ui/simple_crud_class.inc:229
- #: ../includes/ui/ui_input.inc:210
++#: ../includes/ui/ui_input.inc:211
  msgid "Edit new record with current data"
  msgstr ""
  
 -#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_input.inc:211
 +#: ../includes/ui/simple_crud_class.inc:231
- #: ../includes/ui/ui_input.inc:211
++#: ../includes/ui/ui_input.inc:212
  msgid "Cancel edition"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:79
 -#: includes/ui/ui_controls.inc:73
++#: ../includes/ui/ui_controls.inc:80
  msgid "Request from outside of this page is forbidden."
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:80
 -#: includes/ui/ui_controls.inc:74
++#: ../includes/ui/ui_controls.inc:81
  msgid "CSRF attack detected from: "
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:146
 -#: includes/ui/ui_controls.inc:140
++#: ../includes/ui/ui_controls.inc:147
  msgid "You should automatically be forwarded."
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:147
 -#: includes/ui/ui_controls.inc:141
++#: ../includes/ui/ui_controls.inc:148
  msgid "If this does not happen"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:147
 -#: includes/ui/ui_controls.inc:141
++#: ../includes/ui/ui_controls.inc:148
  msgid "click here"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:147
 -#: includes/ui/ui_controls.inc:141
++#: ../includes/ui/ui_controls.inc:148
  msgid "to continue"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:197
 -#: includes/ui/ui_controls.inc:191
++#: ../includes/ui/ui_controls.inc:198
  msgid "Close"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:459
 -#: includes/ui/ui_controls.inc:453 sales/manage/customers.php:23
++#: ../includes/ui/ui_controls.inc:460
 +#: ../sales/manage/customers.php:23
  msgid "Customers"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:461
 -#: includes/ui/ui_controls.inc:455
++#: ../includes/ui/ui_controls.inc:462
  msgid "Branches"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:463
 -#: includes/ui/ui_controls.inc:457 purchasing/manage/suppliers.php:22
++#: ../includes/ui/ui_controls.inc:464
 +#: ../purchasing/manage/suppliers.php:22
  msgid "Suppliers"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:465
 -#: includes/ui/ui_controls.inc:459 inventory/transfers.php:224
 -#: inventory/manage/items.php:21 reporting/rep402.php:108
 -#: reporting/reports_main.php:253 reporting/reports_main.php:289
++#: ../includes/ui/ui_controls.inc:466
 +#: ../inventory/transfers.php:224
 +#: ../inventory/manage/items.php:22
 +#: ../reporting/rep402.php:108
 +#: ../reporting/reports_main.php:253
 +#: ../reporting/reports_main.php:289
  msgid "Items"
  msgstr ""
  
- #: ../includes/ui/ui_controls.inc:610
 -#: includes/ui/ui_controls.inc:604
++#: ../includes/ui/ui_controls.inc:611
  msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
  msgstr ""
  
- #: ../includes/ui/ui_input.inc:632
 -#: includes/ui/ui_input.inc:632 reporting/includes/reports_classes.inc:222
++#: ../includes/ui/ui_input.inc:633
 +#: ../reporting/includes/reports_classes.inc:222
  msgid "Click Here to Pick up the date"
  msgstr ""
  
- #: ../includes/ui/ui_input.inc:916
- #: ../includes/ui/ui_lists.inc:2162
 -#: includes/ui/ui_input.inc:916 includes/ui/ui_lists.inc:2161
 -#: reporting/rep301.php:229 reporting/rep302.php:170 reporting/rep303.php:184
 -#: reporting/rep304.php:170 reporting/rep304.php:174 reporting/rep306.php:235
 -#: reporting/rep306.php:242 sales/manage/customer_branches.php:302
++#: ../includes/ui/ui_input.inc:917
++#: ../includes/ui/ui_lists.inc:2148
 +#: ../reporting/rep301.php:229
 +#: ../reporting/rep302.php:170
 +#: ../reporting/rep303.php:184
 +#: ../reporting/rep304.php:170
 +#: ../reporting/rep304.php:174
 +#: ../reporting/rep306.php:235
 +#: ../reporting/rep306.php:242
- #: ../sales/manage/customer_branches.php:304
++#: ../sales/manage/customer_branches.php:288
  msgid "Inactive"
  msgstr ""
  
- #: ../includes/ui/ui_input.inc:926
- #: ../includes/ui/ui_input.inc:938
 -#: includes/ui/ui_input.inc:926 includes/ui/ui_input.inc:938
++#: ../includes/ui/ui_input.inc:927
++#: ../includes/ui/ui_input.inc:939
  msgid "Current Credit:"
  msgstr ""
  
- #: ../includes/ui/ui_input.inc:972
 -#: includes/ui/ui_input.inc:952
++#: ../includes/ui/ui_input.inc:953
  msgid "Bank Balance:"
  msgstr ""
  
@@@ -7884,169 -6727,156 +7896,181 @@@
  msgid "Set filter"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:100
 -#: includes/ui/ui_lists.inc:100
++#: ../includes/ui/ui_lists.inc:98
  msgid "Press Space tab for search pattern entry"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:104
 -#: includes/ui/ui_lists.inc:104
++#: ../includes/ui/ui_lists.inc:102
  msgid "Enter code fragment to search or * for all"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:105
 -#: includes/ui/ui_lists.inc:105
++#: ../includes/ui/ui_lists.inc:103
  msgid "Enter description fragment to search or * for all"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:454
- #: ../includes/ui/ui_lists.inc:1391
 -#: includes/ui/ui_lists.inc:457 includes/ui/ui_lists.inc:1396
++#: ../includes/ui/ui_lists.inc:451
++#: ../includes/ui/ui_lists.inc:1382
  msgid "All Suppliers"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:458
 -#: includes/ui/ui_lists.inc:461
++#: ../includes/ui/ui_lists.inc:455
  msgid "Press Space tab to filter by name fragment"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:459
 -#: includes/ui/ui_lists.inc:462
++#: ../includes/ui/ui_lists.inc:456
  msgid "Select supplier"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:507
 -#: includes/ui/ui_lists.inc:510
++#: ../includes/ui/ui_lists.inc:503
  msgid "All Customers"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:511
 -#: includes/ui/ui_lists.inc:514
++#: ../includes/ui/ui_lists.inc:507
  msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:512
 -#: includes/ui/ui_lists.inc:515
++#: ../includes/ui/ui_lists.inc:508
  msgid "Select customer"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:559
 -#: includes/ui/ui_lists.inc:563
++#: ../includes/ui/ui_lists.inc:554
  msgid "All branches"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:562
 -#: includes/ui/ui_lists.inc:566
++#: ../includes/ui/ui_lists.inc:557
  msgid "Select customer branch"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:602
 -#: includes/ui/ui_lists.inc:606
++#: ../includes/ui/ui_lists.inc:596
  msgid "All Locations"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:754
- #: ../includes/ui/ui_lists.inc:822
 -#: includes/ui/ui_lists.inc:758 includes/ui/ui_lists.inc:827
++#: ../includes/ui/ui_lists.inc:747
++#: ../includes/ui/ui_lists.inc:814
  msgid "All Items"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1298
 -#: includes/ui/ui_lists.inc:1303
++#: ../includes/ui/ui_lists.inc:1290
  msgid "All Sales Types"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1635
 -#: includes/ui/ui_lists.inc:1634
++#: ../includes/ui/ui_lists.inc:1624
  msgid "Use Item Sales Accounts"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1946
- #: ../includes/ui/ui_lists.inc:1963
- #: ../includes/ui/ui_lists.inc:1980
 -#: includes/ui/ui_lists.inc:1945 includes/ui/ui_lists.inc:1962
 -#: includes/ui/ui_lists.inc:1979
++#: ../includes/ui/ui_lists.inc:1934
++#: ../includes/ui/ui_lists.inc:1950
++#: ../includes/ui/ui_lists.inc:1966
  msgid "All Types"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1947
 -#: includes/ui/ui_lists.inc:1946 sales/view/view_sales_order.php:127
++#: ../includes/ui/ui_lists.inc:1935
 +#: ../sales/view/view_sales_order.php:140
  msgid "Sales Invoices"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1948
- #: ../includes/ui/ui_lists.inc:1965
- #: ../includes/ui/ui_lists.inc:1983
 -#: includes/ui/ui_lists.inc:1947 includes/ui/ui_lists.inc:1964
 -#: includes/ui/ui_lists.inc:1982
++#: ../includes/ui/ui_lists.inc:1936
++#: ../includes/ui/ui_lists.inc:1952
++#: ../includes/ui/ui_lists.inc:1969
  msgid "Overdue Invoices"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1949
- #: ../includes/ui/ui_lists.inc:1966
- #: ../includes/ui/ui_lists.inc:1984
- #: ../includes/ui/ui_view.inc:610
- #: ../includes/ui/ui_view.inc:614
 -#: includes/ui/ui_lists.inc:1948 includes/ui/ui_lists.inc:1965
 -#: includes/ui/ui_lists.inc:1983 includes/ui/ui_view.inc:543
++#: ../includes/ui/ui_lists.inc:1937
++#: ../includes/ui/ui_lists.inc:1953
++#: ../includes/ui/ui_lists.inc:1970
++#: ../includes/ui/ui_view.inc:611
++#: ../includes/ui/ui_view.inc:615
  msgid "Payments"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1950
- #: ../includes/ui/ui_lists.inc:1967
- #: ../includes/ui/ui_lists.inc:1985
 -#: includes/ui/ui_lists.inc:1949 includes/ui/ui_lists.inc:1966
 -#: includes/ui/ui_lists.inc:1984 sales/view/view_sales_order.php:158
++#: ../includes/ui/ui_lists.inc:1938
++#: ../includes/ui/ui_lists.inc:1954
++#: ../includes/ui/ui_lists.inc:1971
 +#: ../sales/view/view_sales_order.php:176
  msgid "Credit Notes"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1951
 -#: includes/ui/ui_lists.inc:1950 sales/view/view_sales_order.php:93
++#: ../includes/ui/ui_lists.inc:1939
 +#: ../sales/view/view_sales_order.php:106
  msgid "Delivery Notes"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1964
- #: ../includes/ui/ui_lists.inc:1982
 -#: includes/ui/ui_lists.inc:1963 includes/ui/ui_lists.inc:1981
++#: ../includes/ui/ui_lists.inc:1951
++#: ../includes/ui/ui_lists.inc:1968
  msgid "Invoices"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1968
- #: ../includes/ui/ui_lists.inc:1986
 -#: includes/ui/ui_lists.inc:1967 includes/ui/ui_lists.inc:1985
++#: ../includes/ui/ui_lists.inc:1955
++#: ../includes/ui/ui_lists.inc:1972
  msgid "Overdue Credit Notes"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1981
 -#: includes/ui/ui_lists.inc:1980
++#: ../includes/ui/ui_lists.inc:1967
  msgid "GRNs"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:1999
 -#: includes/ui/ui_lists.inc:1998
++#: ../includes/ui/ui_lists.inc:1985
  msgid "Automatically put balance on back order"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2000
 -#: includes/ui/ui_lists.inc:1999
++#: ../includes/ui/ui_lists.inc:1986
  msgid "Cancel any quantites not delivered"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2017
 -#: includes/ui/ui_lists.inc:2016
++#: ../includes/ui/ui_lists.inc:2003
  msgid "Items Returned to Inventory Location"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2018
 -#: includes/ui/ui_lists.inc:2017
++#: ../includes/ui/ui_lists.inc:2004
  msgid "Items Written Off"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2188
 -#: includes/ui/ui_lists.inc:2187
++#: ../includes/ui/ui_lists.inc:2173
  msgid "New role"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2240
 -#: includes/ui/ui_lists.inc:2239
++#: ../includes/ui/ui_lists.inc:2225
  msgid "No tags defined."
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2240
 -#: includes/ui/ui_lists.inc:2239
++#: ../includes/ui/ui_lists.inc:2225
  msgid "No active tags defined."
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2278
 -#: includes/ui/ui_lists.inc:2277
++#: ../includes/ui/ui_lists.inc:2263
  #, php-format
  msgid "Activated for '%s'"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2281
 -#: includes/ui/ui_lists.inc:2280
++#: ../includes/ui/ui_lists.inc:2266
  msgid "Available and/or installed"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2351
 -#: includes/ui/ui_lists.inc:2350
++#: ../includes/ui/ui_lists.inc:2336
  msgid "Standard new company American COA (4 digit)"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2353
 -#: includes/ui/ui_lists.inc:2352
++#: ../includes/ui/ui_lists.inc:2338
  msgid "Standard American COA (4 digit) with demo data"
  msgstr ""
  
- #: ../includes/ui/ui_lists.inc:2374
 -#: includes/ui/ui_lists.inc:2373
++#: ../includes/ui/ui_lists.inc:2359
  msgid "No payment Link"
  msgstr ""
  
- #: ../includes/ui/ui_msgs.inc:63
 -#: includes/ui/ui_msgs.inc:68
++#: ../includes/ui/ui_lists.inc:2445
++msgid "Numeric"
++msgstr ""
++
++#: ../includes/ui/ui_lists.inc:2445
++msgid "Alpha Numeric"
++msgstr ""
++
++#: ../includes/ui/ui_lists.inc:2445
++msgid "ALPHA NUMERIC"
++msgstr ""
++
++#: ../includes/ui/ui_msgs.inc:68
  msgid "in units of : "
  msgstr ""
  
@@@ -8061,202 -6891,184 +8085,143 @@@ msgstr "
  msgid "Date Voided:"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:443
- #: ../reporting/rep107.php:256
- #: ../reporting/rep109.php:186
- #: ../reporting/rep110.php:184
- #: ../reporting/rep111.php:183
- #: ../reporting/rep113.php:169
- #: ../reporting/rep209.php:186
 -#: includes/ui/ui_view.inc:443 reporting/rep107.php:178
 -#: reporting/rep109.php:183 reporting/rep110.php:184 reporting/rep111.php:186
 -#: reporting/rep113.php:172 reporting/rep209.php:186
++#: ../includes/ui/ui_view.inc:444
++#: ../reporting/rep107.php:259
++#: ../reporting/rep109.php:187
++#: ../reporting/rep110.php:183
++#: ../reporting/rep111.php:185
++#: ../reporting/rep113.php:172
++#: ../reporting/rep209.php:189
  msgid "Total Tax Excluded"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:449
- #: ../includes/ui/ui_view.inc:468
- #: ../includes/ui/ui_view.inc:492
- #: ../includes/ui/ui_view.inc:509
- #: ../reporting/rep107.php:265
- #: ../reporting/rep109.php:195
- #: ../reporting/rep110.php:193
- #: ../reporting/rep111.php:192
- #: ../reporting/rep113.php:178
- #: ../reporting/rep209.php:195
 -#: includes/ui/ui_view.inc:449 includes/ui/ui_view.inc:468
 -#: includes/ui/ui_view.inc:492 includes/ui/ui_view.inc:509
 -#: reporting/rep107.php:187 reporting/rep109.php:192 reporting/rep110.php:193
 -#: reporting/rep111.php:195 reporting/rep113.php:181 reporting/rep209.php:195
++#: ../includes/ui/ui_view.inc:450
++#: ../includes/ui/ui_view.inc:469
++#: ../includes/ui/ui_view.inc:493
++#: ../includes/ui/ui_view.inc:510
++#: ../reporting/rep107.php:268
++#: ../reporting/rep109.php:196
++#: ../reporting/rep110.php:192
++#: ../reporting/rep111.php:194
++#: ../reporting/rep113.php:181
++#: ../reporting/rep209.php:198
  msgid "Included"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:547
- #: ../reporting/includes/doctext.inc:167
- #: ../reporting/includes/doctext.inc:208
 -#: includes/ui/ui_view.inc:543
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:100
 -msgid "Allocations"
 -msgstr ""
 -
 -#: includes/ui/ui_view.inc:547 reporting/includes/doctext.inc:145
 -#: reporting/includes/doctext.inc:186
++#: ../includes/ui/ui_view.inc:548
++#: ../reporting/includes/doctext.inc:166
++#: ../reporting/includes/doctext.inc:207
  msgid "Total Amount"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:571
 -#: includes/ui/ui_view.inc:572
++#: ../includes/ui/ui_view.inc:572
  msgid "Total Allocated:"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:577
 -#: includes/ui/ui_view.inc:576
++#: ../includes/ui/ui_view.inc:578
  msgid "Left to Allocate:"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:593
- #: ../includes/ui/ui_view.inc:597
 -#: includes/ui/ui_view.inc:629
++#: ../includes/ui/ui_view.inc:594
++#: ../includes/ui/ui_view.inc:598
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:100
 +msgid "Allocations"
 +msgstr ""
 +
- #: ../includes/ui/ui_view.inc:610
- #: ../includes/ui/ui_view.inc:614
++#: ../includes/ui/ui_view.inc:611
++#: ../includes/ui/ui_view.inc:615
 +msgid "Pre-Payments"
 +msgstr ""
 +
- #: ../includes/ui/ui_view.inc:630
++#: ../includes/ui/ui_view.inc:631
  msgid "No Quick Entries are defined."
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:658
 -#: includes/ui/ui_view.inc:657
++#: ../includes/ui/ui_view.inc:659
  msgid "No Quick Entry lines are defined."
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:840
- #: ../purchasing/includes/ui/invoice_ui.inc:488
 -#: includes/ui/ui_view.inc:839 purchasing/includes/ui/invoice_ui.inc:465
++#: ../includes/ui/ui_view.inc:841
  msgid "and"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:901
 -#: includes/ui/ui_view.inc:900
++#: ../includes/ui/ui_view.inc:903
  msgid "January"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:901
 -#: includes/ui/ui_view.inc:900
++#: ../includes/ui/ui_view.inc:903
  msgid "February"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:901
 -#: includes/ui/ui_view.inc:900
++#: ../includes/ui/ui_view.inc:903
  msgid "March"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:901
 -#: includes/ui/ui_view.inc:900
++#: ../includes/ui/ui_view.inc:903
  msgid "April"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:901
 -#: includes/ui/ui_view.inc:900
++#: ../includes/ui/ui_view.inc:903
  msgid "June"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:901
 -#: includes/ui/ui_view.inc:900
++#: ../includes/ui/ui_view.inc:903
  msgid "July"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:901
 -#: includes/ui/ui_view.inc:900
++#: ../includes/ui/ui_view.inc:903
  msgid "August"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:901
 -#: includes/ui/ui_view.inc:900
++#: ../includes/ui/ui_view.inc:903
  msgid "September"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:901
 -#: includes/ui/ui_view.inc:900
++#: ../includes/ui/ui_view.inc:903
  msgid "October"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:901
 -#: includes/ui/ui_view.inc:900
++#: ../includes/ui/ui_view.inc:903
  msgid "November"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:901
 -#: includes/ui/ui_view.inc:900
++#: ../includes/ui/ui_view.inc:903
  msgid "December"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:902
 -#: includes/ui/ui_view.inc:901
++#: ../includes/ui/ui_view.inc:904
  msgid "Su"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:902
 -#: includes/ui/ui_view.inc:901
++#: ../includes/ui/ui_view.inc:904
  msgid "Mo"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:902
 -#: includes/ui/ui_view.inc:901
++#: ../includes/ui/ui_view.inc:904
  msgid "Tu"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:902
 -#: includes/ui/ui_view.inc:901
++#: ../includes/ui/ui_view.inc:904
  msgid "We"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:902
 -#: includes/ui/ui_view.inc:901
++#: ../includes/ui/ui_view.inc:904
  msgid "Th"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:902
 -#: includes/ui/ui_view.inc:901
++#: ../includes/ui/ui_view.inc:904
  msgid "Fr"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:902
 -#: includes/ui/ui_view.inc:901
++#: ../includes/ui/ui_view.inc:904
  msgid "Sa"
  msgstr ""
  
- #: ../includes/ui/ui_view.inc:903
 -#: includes/ui/ui_view.inc:902
++#: ../includes/ui/ui_view.inc:905
  msgid "W"
  msgstr ""
  
- #: ../includes/ui/view_package.php:17
 -#: includes/ui/view_package.php:17
--msgid "Package Details"
--msgstr ""
--
- #: ../includes/ui/view_package.php:24
 -#: includes/ui/view_package.php:24
--msgid ""
--"The script must be called with a valid package id to review the info for."
--msgstr ""
--
- #: ../includes/ui/view_package.php:29
 -#: includes/ui/view_package.php:29
--msgid "Available version"
--msgstr ""
--
- #: ../includes/ui/view_package.php:30
 -#: includes/ui/view_package.php:30
--msgid "Package type"
--msgstr ""
--
- #: ../includes/ui/view_package.php:31
 -#: includes/ui/view_package.php:31
--msgid "Package content"
--msgstr ""
--
- #: ../includes/ui/view_package.php:33
 -#: includes/ui/view_package.php:33
--msgid "Author"
--msgstr ""
--
- #: ../includes/ui/view_package.php:34
 -#: includes/ui/view_package.php:34
--msgid "Home page"
--msgstr ""
--
- #: ../includes/ui/view_package.php:35
 -#: includes/ui/view_package.php:35
--msgid "Package maintainer"
--msgstr ""
--
- #: ../includes/ui/view_package.php:36
 -#: includes/ui/view_package.php:36
--msgid "Installation path"
--msgstr ""
--
- #: ../includes/ui/view_package.php:37
 -#: includes/ui/view_package.php:37
--msgid "Minimal software versions"
--msgstr ""
--
- #: ../includes/ui/view_package.php:38
 -#: includes/ui/view_package.php:38
--msgid "Right to left"
--msgstr ""
--
- #: ../includes/ui/view_package.php:39
 -#: includes/ui/view_package.php:39
--msgid "Charset encoding"
--msgstr ""
--
- #: ../includes/ui/view_package.php:44
 -#: includes/ui/view_package.php:44
--#, php-format
--msgid "Content information for package '%s'"
--msgstr ""
--
- #: ../includes/ui/view_package.php:47
 -#: includes/ui/view_package.php:47
--msgid "Property"
--msgstr ""
--
 -#: inventory/adjustments.php:28
 +#: ../inventory/adjustments.php:28
  msgid "Item Adjustments Note"
  msgstr ""
  
@@@ -8289,9 -7100,8 +8254,9 @@@ msgstr "
  msgid "Enter &Another Adjustment"
  msgstr ""
  
 -#: inventory/adjustments.php:88 inventory/transfers.php:84
 -#: sales/sales_order_entry.php:366
 +#: ../inventory/adjustments.php:88
 +#: ../inventory/transfers.php:84
- #: ../sales/sales_order_entry.php:376
++#: ../sales/sales_order_entry.php:373
  msgid "You must enter at least one non empty item line."
  msgstr ""
  
@@@ -8305,13 -7115,11 +8270,13 @@@ msgid "
  "balance for marked items as of document date or later."
  msgstr ""
  
 -#: inventory/adjustments.php:153 manufacturing/work_order_issue.php:138
 +#: ../inventory/adjustments.php:153
- #: ../manufacturing/work_order_issue.php.orig:141
++#: ../manufacturing/work_order_issue.php:139
  msgid "The quantity entered is negative or invalid."
  msgstr ""
  
 -#: inventory/adjustments.php:160 manufacturing/work_order_issue.php:145
 +#: ../inventory/adjustments.php:160
- #: ../manufacturing/work_order_issue.php.orig:148
++#: ../manufacturing/work_order_issue.php:146
  msgid "The entered standard cost is negative or invalid."
  msgstr ""
  
@@@ -8349,18 -7157,14 +8314,18 @@@ msgstr "
  msgid "View the GL Journal Entries for this Cost Update"
  msgstr ""
  
 -#: inventory/cost_update.php:95 inventory/prices.php:61
 -#: inventory/purchasing_data.php:117 inventory/reorder_level.php:48
 -#: inventory/inquiry/stock_movements.php:53
 -#: inventory/inquiry/stock_status.php:47 inventory/manage/item_codes.php:105
 -#: manufacturing/work_order_entry.php:394
 -#: manufacturing/work_order_entry.php:399 purchasing/inquiry/po_search.php:74
 -#: sales/inquiry/sales_deliveries_view.php:114
 -#: sales/inquiry/sales_orders_view.php:241
 +#: ../inventory/cost_update.php:94
 +#: ../inventory/prices.php:62
 +#: ../inventory/purchasing_data.php:118
 +#: ../inventory/reorder_level.php:50
 +#: ../inventory/inquiry/stock_movements.php:49
 +#: ../inventory/inquiry/stock_status.php:41
 +#: ../inventory/manage/item_codes.php:105
- #: ../manufacturing/work_order_entry.php:394
- #: ../manufacturing/work_order_entry.php:399
++#: ../manufacturing/work_order_entry.php:395
++#: ../manufacturing/work_order_entry.php:400
 +#: ../purchasing/inquiry/po_search.php:74
- #: ../sales/inquiry/sales_deliveries_view.php:114
- #: ../sales/inquiry/sales_orders_view.php:263
++#: ../sales/inquiry/sales_deliveries_view.php:112
++#: ../sales/inquiry/sales_orders_view.php:225
  msgid "Item:"
  msgstr ""
  
@@@ -8417,35 -7219,23 +8382,32 @@@ msgstr "
  msgid "The selected price has been deleted."
  msgstr ""
  
 -#: inventory/prices.php:146 reporting/rep104.php:118
 -#: sales/customer_delivery.php:333 sales/customer_invoice.php:411
 -#: 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
 +#: ../inventory/prices.php:147
 +#: ../reporting/rep104.php:118
- #: ../sales/customer_delivery.php:379
- #: ../sales/customer_invoice.php:477
++#: ../sales/customer_delivery.php:344
++#: ../sales/customer_invoice.php:472
 +#: ../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
  msgid "Sales Type"
  msgstr ""
  
 -#: inventory/prices.php:146 inventory/purchasing_data.php:147
 -#: purchasing/includes/ui/invoice_ui.inc:497
 -#: 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:411
 -#: sales/customer_invoice.php:479 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
 -#: sales/includes/ui/sales_credit_ui.inc:168
 +#: ../inventory/prices.php:147
 +#: ../inventory/purchasing_data.php:148
- #: ../purchasing/includes/ui/invoice_ui.inc:520
 +#: ../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:192
++#: ../reporting/includes/doctext.inc:32
++#: ../reporting/includes/doctext.inc:191
 +#: ../sales/customer_credit_invoice.php:281
- #: ../sales/customer_delivery.php:457
- #: ../sales/customer_invoice.php:551
- #: ../sales/customer_invoice.php:554
++#: ../sales/customer_delivery.php:422
 +#: ../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 ""
  
@@@ -8566,51 -7350,32 +8528,49 @@@ msgid "
  "manufactured items)."
  msgstr ""
  
 -#: inventory/reorder_level.php:65 inventory/inquiry/stock_movements.php:83
 -#: inventory/inquiry/stock_status.php:72 inventory/inquiry/stock_status.php:76
 -#: manufacturing/search_work_orders.php:168
 -#: manufacturing/inquiry/where_used_inquiry.php:45
 -#: manufacturing/manage/bom_edit.php:70
 -#: purchasing/inquiry/po_search_completed.php:127
 -#: purchasing/inquiry/po_search_completed.php:137
 -#: purchasing/inquiry/po_search.php:135 purchasing/inquiry/po_search.php:146
 -#: reporting/rep105.php:120 reporting/rep301.php:176 reporting/rep302.php:132
 -#: reporting/rep303.php:134 reporting/rep304.php:123 reporting/rep306.php:150
 -#: reporting/rep307.php:124 reporting/rep308.php:238 reporting/rep402.php:103
 -#: reporting/rep402.php:109 reporting/reports_main.php:210
 -#: reporting/reports_main.php:217 reporting/reports_main.php:223
 -#: reporting/reports_main.php:236 reporting/reports_main.php:251
 -#: reporting/reports_main.php:261 reporting/reports_main.php:269
 -#: reporting/reports_main.php:290 sales/manage/sales_points.php:84
 +#: ../inventory/reorder_level.php:67
 +#: ../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/search_work_orders.php:168
 +#: ../manufacturing/inquiry/where_used_inquiry.php:45
 +#: ../manufacturing/manage/bom_edit.php:70
- #: ../purchasing/inquiry/po_search_completed.php:126
- #: ../purchasing/inquiry/po_search_completed.php:136
- #: ../purchasing/inquiry/po_search.php:135
- #: ../purchasing/inquiry/po_search.php:146
++#: ../purchasing/inquiry/po_search_completed.php:125
++#: ../purchasing/inquiry/po_search_completed.php:135
++#: ../purchasing/inquiry/po_search.php:120
++#: ../purchasing/inquiry/po_search.php:131
 +#: ../reporting/rep105.php:120
 +#: ../reporting/rep301.php:176
 +#: ../reporting/rep302.php:132
 +#: ../reporting/rep303.php:134
 +#: ../reporting/rep304.php:123
 +#: ../reporting/rep306.php:150
 +#: ../reporting/rep307.php:124
 +#: ../reporting/rep308.php:238
 +#: ../reporting/rep402.php:103
 +#: ../reporting/rep402.php:109
 +#: ../reporting/reports_main.php:210
 +#: ../reporting/reports_main.php:217
 +#: ../reporting/reports_main.php:223
 +#: ../reporting/reports_main.php:236
 +#: ../reporting/reports_main.php:251
 +#: ../reporting/reports_main.php:261
 +#: ../reporting/reports_main.php:269
 +#: ../reporting/reports_main.php:290
 +#: ../sales/manage/sales_points.php:84
  msgid "Location"
  msgstr ""
  
 -#: inventory/reorder_level.php:65 inventory/inquiry/stock_movements.php:84
 -#: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:212
 +#: ../inventory/reorder_level.php:67
 +#: ../inventory/inquiry/stock_movements.php:80
 +#: ../inventory/inquiry/stock_status.php:70
- #: ../purchasing/supplier_credit.php:228
++#: ../purchasing/supplier_credit.php:222
  msgid "Quantity On Hand"
  msgstr ""
  
 -#: inventory/reorder_level.php:65 inventory/includes/inventory_db.inc:72
 -#: inventory/inquiry/stock_status.php:76
 +#: ../inventory/reorder_level.php:67
 +#: ../inventory/includes/inventory_db.inc:72
 +#: ../inventory/inquiry/stock_status.php:70
- #: ../sales/includes/db/old.sales_order_db.inc:110
- #: ../sales/includes/db/old.sales_order_db.inc:263
  msgid "Re-Order Level"
  msgstr ""
  
@@@ -8656,21 -7421,15 +8616,15 @@@ msgstr "
  msgid "Process Transfer"
  msgstr ""
  
 -#: inventory/includes/inventory_db.inc:69
 +#: ../inventory/includes/inventory_db.inc:69
- #: ../sales/includes/db/old.sales_order_db.inc:107
- #: ../sales/includes/db/old.sales_order_db.inc:259
  msgid "Stocks below Re-Order Level at "
  msgstr ""
  
 -#: inventory/includes/inventory_db.inc:72
 +#: ../inventory/includes/inventory_db.inc:72
- #: ../sales/includes/db/old.sales_order_db.inc:110
- #: ../sales/includes/db/old.sales_order_db.inc:264
  msgid "Below"
  msgstr ""
  
 -#: inventory/includes/inventory_db.inc:73
 +#: ../inventory/includes/inventory_db.inc:73
- #: ../sales/includes/db/old.sales_order_db.inc:111
- #: ../sales/includes/db/old.sales_order_db.inc:265
  msgid "Please reorder"
  msgstr ""
  
@@@ -8681,11 -7440,10 +8635,11 @@@
  msgid "For Part :"
  msgstr ""
  
 -#: inventory/includes/item_adjustments_ui.inc:34
 -#: manufacturing/work_order_entry.php:209 purchasing/inquiry/po_search.php:67
 -#: sales/inquiry/sales_deliveries_view.php:107
 -#: sales/inquiry/sales_orders_view.php:232
 +#: ../inventory/includes/item_adjustments_ui.inc:34
 +#: ../manufacturing/work_order_entry.php:209
 +#: ../purchasing/inquiry/po_search.php:67
- #: ../sales/inquiry/sales_deliveries_view.php:107
- #: ../sales/inquiry/sales_orders_view.php:254
++#: ../sales/inquiry/sales_deliveries_view.php:105
++#: ../sales/inquiry/sales_orders_view.php:216
  msgid "Location:"
  msgstr ""
  
@@@ -8701,99 -7459,70 +8655,93 @@@ msgstr "
  msgid "Negative Adjustment"
  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:233 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:409 sales/customer_invoice.php:478
 -#: 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/includes/ui/sales_credit_ui.inc:167
 -#: sales/includes/ui/sales_order_ui.inc:146
 +#: ../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:245
++#: ../purchasing/includes/ui/po_ui.inc:218
 +#: ../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
++#: ../reporting/includes/doctext.inc:31
++#: ../reporting/includes/doctext.inc:190
++#: ../reporting/includes/doctext.inc:227
 +#: ../sales/customer_credit_invoice.php:280
- #: ../sales/customer_delivery.php:455
- #: ../sales/customer_invoice.php:550
- #: ../sales/customer_invoice.php:553
++#: ../sales/customer_delivery.php:420
 +#: ../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:146
++#: ../sales/includes/ui/sales_order_ui.inc:147
  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:233 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:409
 -#: sales/customer_invoice.php:478 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/includes/ui/sales_credit_ui.inc:167
 -#: sales/includes/ui/sales_order_ui.inc:146
 +#: ../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:245
++#: ../purchasing/includes/ui/po_ui.inc:218
 +#: ../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
++#: ../reporting/includes/doctext.inc:31
++#: ../reporting/includes/doctext.inc:190
++#: ../reporting/includes/doctext.inc:227
 +#: ../sales/customer_credit_invoice.php:280
- #: ../sales/customer_delivery.php:455
- #: ../sales/customer_invoice.php:550
- #: ../sales/customer_invoice.php:553
++#: ../sales/customer_delivery.php:420
 +#: ../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:146
++#: ../sales/includes/ui/sales_order_ui.inc:147
  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:497
 -#: purchasing/includes/ui/po_ui.inc:233 purchasing/view/view_grn.php:40
 -#: purchasing/view/view_po.php:45 reporting/rep301.php:169
 -#: reporting/rep303.php:121 reporting/rep303.php:127 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
 -#: sales/includes/ui/sales_credit_ui.inc:167
 -#: sales/includes/ui/sales_order_ui.inc:146
 +#: ../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:520
- #: ../purchasing/includes/ui/po_ui.inc:245
++#: ../purchasing/includes/ui/po_ui.inc:218
 +#: ../purchasing/view/view_grn.php:40
 +#: ../purchasing/view/view_po.php:45
 +#: ../reporting/rep301.php:169
 +#: ../reporting/rep303.php:121
 +#: ../reporting/rep303.php:127
 +#: ../reporting/rep401.php:71
- #: ../reporting/includes/doctext.inc:29
- #: ../reporting/includes/doctext.inc:192
- #: ../reporting/includes/doctext.inc:225
- #: ../sales/customer_invoice.php:550
++#: ../reporting/includes/doctext.inc:31
++#: ../reporting/includes/doctext.inc:191
++#: ../reporting/includes/doctext.inc:224
 +#: ../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:146
++#: ../sales/includes/ui/sales_order_ui.inc:147
  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:234 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
 -#: sales/includes/ui/sales_credit_ui.inc:167
 -#: sales/includes/ui/sales_order_ui.inc:148
 +#: ../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:246
++#: ../purchasing/includes/ui/po_ui.inc:219
 +#: ../purchasing/view/view_grn.php:41
 +#: ../purchasing/view/view_po.php:45
- #: ../reporting/includes/doctext.inc:30
- #: ../reporting/includes/doctext.inc:192
++#: ../reporting/includes/doctext.inc:32
++#: ../reporting/includes/doctext.inc:191
 +#: ../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:148
++#: ../sales/includes/ui/sales_order_ui.inc:149
  msgid "Unit"
  msgstr ""
  
@@@ -8863,12 -7591,12 +8811,10 @@@ msgstr "
  msgid "Show Movements"
  msgstr ""
  
 -#: inventory/inquiry/stock_movements.php:65
 -#: purchasing/includes/ui/invoice_ui.inc:466
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:57
 -#: purchasing/inquiry/supplier_inquiry.php:58
 -#: sales/inquiry/customer_allocation_inquiry.php:51
 -#: sales/inquiry/customer_inquiry.php:58
 +#: ../inventory/inquiry/stock_movements.php:61
- #: ../purchasing/includes/ui/invoice_ui.inc:489
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
 +#: ../purchasing/inquiry/supplier_inquiry.php:55
 +#: ../sales/inquiry/customer_allocation_inquiry.php:51
- #: ../sales/inquiry/customer_inquiry.php:54
  msgid "Refresh Inquiry"
  msgstr ""
  
@@@ -8947,18 -7670,12 +8893,16 @@@ 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:410
 -#: sales/customer_invoice.php:478
 +#: ../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:456
- #: ../sales/customer_invoice.php:550
- #: ../sales/customer_invoice.php:553
++#: ../sales/customer_delivery.php:421
  msgid "Units"
  msgstr ""
  
@@@ -9019,8 -7727,7 +8963,8 @@@ msgstr "
  msgid "Foreign Item Codes"
  msgstr ""
  
 -#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:681
 +#: ../inventory/manage/item_codes.php:23
- #: ../sales/sales_order_entry.php:703
++#: ../sales/sales_order_entry.php:692
  msgid "There are no inventory items defined in the system."
  msgstr ""
  
@@@ -9079,26 -7773,20 +9023,25 @@@ msgstr "
  msgid "UPC/EAN code:"
  msgstr ""
  
 -#: inventory/manage/item_codes.php:179 inventory/manage/sales_kits.php:245
 -#: manufacturing/work_order_add_finished.php:203
 -#: manufacturing/work_order_entry.php:422
 -#: manufacturing/manage/bom_edit.php:228
 +#: ../inventory/manage/item_codes.php:179
 +#: ../inventory/manage/sales_kits.php:245
 +#: ../manufacturing/work_order_add_finished.php:203
- #: ../manufacturing/work_order_entry.php:422
++#: ../manufacturing/work_order_entry.php:423
 +#: ../manufacturing/manage/bom_edit.php:228
  msgid "Quantity:"
  msgstr ""
  
 -#: 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
 -#: 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/tax_types.php:158
 +#: ../inventory/manage/item_codes.php:180
 +#: ../inventory/manage/items.php:309
 +#: ../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
++#: ../sales/manage/recurrent_invoices.php:171
 +#: ../taxes/item_tax_types.php:173
- #: ../taxes/sav.tax_types.php:241
 +#: ../taxes/tax_groups.php:162
 +#: ../taxes/tax_types.php:158
  msgid "Description:"
  msgstr ""
  
@@@ -9153,18 -7839,14 +9096,16 @@@ msgstr "
  msgid "Selected item has been deleted."
  msgstr ""
  
 -#: 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:169
 -#: manufacturing/view/wo_issue_view.php:44
 -#: manufacturing/view/wo_production_view.php:45
 -#: purchasing/includes/ui/invoice_ui.inc:484
 -#: purchasing/includes/ui/invoice_ui.inc:496 reporting/rep204.php:84
 -#: reporting/rep306.php:152 reporting/rep402.php:103
 +#: ../inventory/manage/items.php:265
 +#: ../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/search_work_orders.php:169
 +#: ../manufacturing/view/wo_issue_view.php:44
 +#: ../manufacturing/view/wo_production_view.php:45
- #: ../purchasing/includes/ui/invoice_ui.inc:507
- #: ../purchasing/includes/ui/invoice_ui.inc:519
 +#: ../reporting/rep204.php:84
 +#: ../reporting/rep306.php:152
 +#: ../reporting/rep402.php:103
  msgid "Item"
  msgstr ""
  
@@@ -9177,8 -7858,7 +9118,8 @@@ msgstr "
  msgid "Editable description:"
  msgstr ""
  
 -#: inventory/manage/items.php:352 sales/manage/customer_branches.php:248
 +#: ../inventory/manage/items.php:363
- #: ../sales/manage/customer_branches.php:249
++#: ../sales/manage/customer_branches.php:236
  msgid "GL Accounts"
  msgstr ""
  
@@@ -9230,10 -7910,8 +9171,10 @@@ msgstr "
  msgid "New item"
  msgstr ""
  
 -#: inventory/manage/items.php:454 purchasing/manage/suppliers.php:307
 -#: sales/manage/customer_branches.php:322 sales/manage/customers.php:348
 +#: ../inventory/manage/items.php:465
- #: ../purchasing/manage/suppliers.php:310
- #: ../sales/manage/customer_branches.php:324
- #: ../sales/manage/customers.php:348
++#: ../purchasing/manage/suppliers.php:312
++#: ../sales/manage/customer_branches.php:306
++#: ../sales/manage/customers.php:350
  msgid "&General settings"
  msgstr ""
  
@@@ -9245,9 -7923,8 +9186,9 @@@ msgstr "
  msgid "&Purchasing Pricing"
  msgstr ""
  
 -#: inventory/manage/items.php:459 purchasing/manage/suppliers.php:309
 -#: sales/manage/customers.php:350
 +#: ../inventory/manage/items.php:470
- #: ../purchasing/manage/suppliers.php:312
- #: ../sales/manage/customers.php:350
++#: ../purchasing/manage/suppliers.php:314
++#: ../sales/manage/customers.php:352
  msgid "&Transactions"
  msgstr ""
  
@@@ -9526,11 -8194,10 +9467,11 @@@ msgstr "
  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:207
 +#: ../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
++#: ../reporting/includes/doctext.inc:228
  msgid "From Location"
  msgstr ""
  
@@@ -9546,54 -8213,59 +9487,62 @@@ msgstr "
  msgid "Search Work Orders"
  msgstr ""
  
- #: ../manufacturing/search_work_orders.php:69
 -#: manufacturing/search_work_orders.php:67
 -#: purchasing/inquiry/po_search_completed.php:63
 -#: purchasing/inquiry/po_search.php:62
 -#: sales/inquiry/sales_deliveries_view.php:103
 -#: sales/inquiry/sales_orders_view.php:225
++#: ../manufacturing/search_work_orders.php:67
++#: ../purchasing/inquiry/po_search_completed.php:61
++#: ../purchasing/inquiry/po_search.php:62
++#: ../sales/inquiry/sales_deliveries_view.php:101
++#: ../sales/inquiry/sales_orders_view.php:209
+ msgid "#:"
+ msgstr ""
+ 
 -#: manufacturing/search_work_orders.php:70
++#: ../manufacturing/search_work_orders.php:70
  msgid "at Location:"
  msgstr ""
  
- #: ../manufacturing/search_work_orders.php:76
- #: ../purchasing/inquiry/po_search_completed.php:72
 -#: manufacturing/search_work_orders.php:82
 -#: purchasing/inquiry/po_search_completed.php:75
++#: ../manufacturing/search_work_orders.php:82
++#: ../purchasing/inquiry/po_search_completed.php:73
  msgid "for item:"
  msgstr ""
  
- #: ../manufacturing/search_work_orders.php:78
- #: ../purchasing/inquiry/po_search_completed.php:77
 -#: manufacturing/search_work_orders.php:84
 -#: purchasing/inquiry/po_search_completed.php:80
 -#: purchasing/inquiry/po_search.php:78
 -#: sales/inquiry/sales_deliveries_view.php:118
 -#: sales/inquiry/sales_orders_view.php:247
++#: ../manufacturing/search_work_orders.php:84
++#: ../purchasing/inquiry/po_search_completed.php:78
 +#: ../purchasing/inquiry/po_search.php:78
- #: ../sales/inquiry/sales_deliveries_view.php:118
- #: ../sales/inquiry/sales_orders_view.php:270
++#: ../sales/inquiry/sales_deliveries_view.php:116
++#: ../sales/inquiry/sales_orders_view.php:232
  msgid "Select documents"
  msgstr ""
  
- #: ../manufacturing/search_work_orders.php:117
 -#: manufacturing/search_work_orders.php:123
++#: ../manufacturing/search_work_orders.php:122
  msgid "Release"
  msgstr ""
  
- #: ../manufacturing/search_work_orders.php:120
 -#: manufacturing/search_work_orders.php:126
++#: ../manufacturing/search_work_orders.php:125
  msgid "Issue"
  msgstr ""
  
- #: ../manufacturing/search_work_orders.php:127
 -#: manufacturing/search_work_orders.php:133
++#: ../manufacturing/search_work_orders.php:132
  msgid "Produce"
  msgstr ""
  
- #: ../manufacturing/search_work_orders.php:140
 -#: manufacturing/search_work_orders.php:146
++#: ../manufacturing/search_work_orders.php:145
  msgid "Costs"
  msgstr ""
  
- #: ../manufacturing/search_work_orders.php:164
 -#: manufacturing/search_work_orders.php:170 reporting/rep402.php:103
++#: ../manufacturing/search_work_orders.php:170
 +#: ../reporting/rep402.php:103
  msgid "Required"
  msgstr ""
  
- #: ../manufacturing/search_work_orders.php:167
 -#: manufacturing/search_work_orders.php:173
 -#: manufacturing/includes/manufacturing_ui.inc:277
 -#: manufacturing/includes/manufacturing_ui.inc:281 reporting/rep402.php:103
 -#: reporting/includes/doctext.inc:205 sales/inquiry/sales_orders_view.php:268
++#: ../manufacturing/search_work_orders.php:173
 +#: ../manufacturing/includes/manufacturing_ui.inc:277
 +#: ../manufacturing/includes/manufacturing_ui.inc:281
 +#: ../reporting/rep402.php:103
- #: ../reporting/includes/doctext.inc:227
- #: ../sales/inquiry/sales_orders_view.php:291
++#: ../reporting/includes/doctext.inc:226
++#: ../sales/inquiry/sales_orders_view.php:254
  msgid "Required By"
  msgstr ""
  
- #: ../manufacturing/search_work_orders.php:176
 -#: manufacturing/search_work_orders.php:182
++#: ../manufacturing/search_work_orders.php:182
  msgid "Marked orders are overdue."
  msgstr ""
  
@@@ -9605,19 -8277,16 +9554,17 @@@ 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:38
 -#: manufacturing/work_order_release.php:75
 +#: ../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_issue.php.orig:40
 +#: ../manufacturing/work_order_release.php:75
  msgid "View this Work Order"
  msgstr ""
  
 -#: 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_add_finished.php:48
 +#: ../manufacturing/work_order_entry.php:64
 +#: ../manufacturing/work_order_issue.php:42
- #: ../manufacturing/work_order_issue.php.orig:42
  msgid "View the GL Journal Entries for this Work Order"
  msgstr ""
  
@@@ -9626,18 -8295,16 +9573,17 @@@
  msgid "Print the GL Journal Entries for this Work Order"
  msgstr ""
  
 -#: manufacturing/work_order_add_finished.php:52
 -#: manufacturing/work_order_costs.php:51 manufacturing/work_order_issue.php:42
 +#: ../manufacturing/work_order_add_finished.php:52
 +#: ../manufacturing/work_order_costs.php:49
 +#: ../manufacturing/work_order_issue.php:44
- #: ../manufacturing/work_order_issue.php.orig:44
  msgid "Select another &Work Order to Process"
  msgstr ""
  
 -#: manufacturing/work_order_add_finished.php:65
 -#: manufacturing/work_order_costs.php:64
 -#: manufacturing/work_order_entry.php:339
 -#: 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:62
- #: ../manufacturing/work_order_entry.php:339
++#: ../manufacturing/work_order_entry.php:340
 +#: ../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 ""
  
@@@ -9791,25 -8458,25 +9737,25 @@@ msgid "
  "manufactured for this order."
  msgstr ""
  
- #: ../manufacturing/work_order_entry.php:296
 -#: manufacturing/work_order_entry.php:296
++#: ../manufacturing/work_order_entry.php:297
  msgid ""
  "This work order cannot be deleted because it has already been processed."
  msgstr ""
  
- #: ../manufacturing/work_order_entry.php:347
 -#: manufacturing/work_order_entry.php:347
++#: ../manufacturing/work_order_entry.php:348
  msgid "This work order is closed and cannot be edited."
  msgstr ""
  
- #: ../manufacturing/work_order_entry.php:395
- #: ../manufacturing/work_order_entry.php:403
 -#: manufacturing/work_order_entry.php:395
 -#: manufacturing/work_order_entry.php:403
++#: ../manufacturing/work_order_entry.php:396
++#: ../manufacturing/work_order_entry.php:404
  msgid "Destination Location:"
  msgstr ""
  
- #: ../manufacturing/work_order_entry.php:414
 -#: manufacturing/work_order_entry.php:414
++#: ../manufacturing/work_order_entry.php:415
  msgid "Quantity Required:"
  msgstr ""
  
- #: ../manufacturing/work_order_entry.php:416
 -#: manufacturing/work_order_entry.php:416
++#: ../manufacturing/work_order_entry.php:417
  msgid "Quantity Manufactured:"
  msgstr ""
  
@@@ -9841,46 -8508,43 +9787,43 @@@ msgstr "
  msgid "Add Workorder"
  msgstr ""
  
 -#: manufacturing/work_order_issue.php:29
 +#: ../manufacturing/work_order_issue.php:31
- #: ../manufacturing/work_order_issue.php.orig:31
  msgid "Issue Items to Work Order"
  msgstr ""
  
 -#: manufacturing/work_order_issue.php:36
 +#: ../manufacturing/work_order_issue.php:38
- #: ../manufacturing/work_order_issue.php.orig:38
  msgid "The work order issue has been entered."
  msgstr ""
  
 -#: manufacturing/work_order_issue.php:77
 +#: ../manufacturing/work_order_issue.php:78
- #: ../manufacturing/work_order_issue.php.orig:78
  msgid "The entered date for the issue is invalid."
  msgstr ""
  
- #: ../manufacturing/work_order_issue.php.orig:106
 -#: manufacturing/work_order_issue.php:104
++#: ../manufacturing/work_order_issue.php:105
  msgid ""
- "The issue cannot be processed because an entered item would cause a negative "
- "inventory balance :"
+ "The issue cannot be processed because it would cause negative inventory "
+ "balance for marked items as of document date or later."
  msgstr ""
  
- #: ../manufacturing/work_order_issue.php.orig:124
 -#: manufacturing/work_order_issue.php:121
++#: ../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.orig:125
 -#: manufacturing/work_order_issue.php:122
++#: ../manufacturing/work_order_issue.php:123
  msgid "Component is :"
  msgstr ""
  
- #: ../manufacturing/work_order_issue.php.orig:126
 -#: manufacturing/work_order_issue.php:123
++#: ../manufacturing/work_order_issue.php:124
  msgid "From location :"
  msgstr ""
  
- #: ../manufacturing/work_order_issue.php.orig:219
 -#: manufacturing/work_order_issue.php:216
++#: ../manufacturing/work_order_issue.php:217
  msgid "Items to Issue"
  msgstr ""
  
- #: ../manufacturing/work_order_issue.php.orig:225
 -#: manufacturing/work_order_issue.php:222
++#: ../manufacturing/work_order_issue.php:223
  msgid "Process Issue"
  msgstr ""
  
@@@ -10045,11 -8698,11 +9988,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:207
 +#: ../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
++#: ../reporting/includes/doctext.inc:228
  msgid "Work Centre"
  msgstr ""
  
@@@ -10152,18 -8804,18 +10095,18 @@@ msgstr "
  msgid "There are no Requirements for this Order."
  msgstr ""
  
 -#: manufacturing/includes/manufacturing_ui.inc:84
 -#: reporting/includes/doctext.inc:207
 +#: ../manufacturing/includes/manufacturing_ui.inc:84
- #: ../reporting/includes/doctext.inc:229
++#: ../reporting/includes/doctext.inc:228
  msgid "Unit Quantity"
  msgstr ""
  
 -#: manufacturing/includes/manufacturing_ui.inc:84
 -#: reporting/includes/doctext.inc:207
 +#: ../manufacturing/includes/manufacturing_ui.inc:84
- #: ../reporting/includes/doctext.inc:229
++#: ../reporting/includes/doctext.inc:228
  msgid "Total Quantity"
  msgstr ""
  
 -#: manufacturing/includes/manufacturing_ui.inc:84
 -#: reporting/includes/doctext.inc:207
 +#: ../manufacturing/includes/manufacturing_ui.inc:84
- #: ../reporting/includes/doctext.inc:229
++#: ../reporting/includes/doctext.inc:228
  msgid "Units Issued"
  msgstr ""
  
@@@ -10192,17 -8844,17 +10135,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:201
 +#: ../manufacturing/includes/manufacturing_ui.inc:276
 +#: ../manufacturing/includes/manufacturing_ui.inc:280
 +#: ../manufacturing/includes/manufacturing_ui.inc:331
- #: ../reporting/includes/doctext.inc:223
++#: ../reporting/includes/doctext.inc:222
  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:202
 +#: ../manufacturing/includes/manufacturing_ui.inc:277
 +#: ../manufacturing/includes/manufacturing_ui.inc:281
 +#: ../manufacturing/includes/manufacturing_ui.inc:332
- #: ../reporting/includes/doctext.inc:224
++#: ../reporting/includes/doctext.inc:223
  msgid "Into Location"
  msgstr ""
  
@@@ -10255,19 -8907,18 +10198,18 @@@ msgstr "
  msgid "Reversed the production "
  msgstr ""
  
- #: ../manufacturing/includes/db/work_orders_db.inc.orig:79
- #: ../purchasing/includes/db/po_db.inc:123
 -#: manufacturing/includes/db/work_orders_db.inc:288
 -#: purchasing/includes/db/po_db.inc:122
 -#: sales/includes/db/cust_trans_db.inc:111
 -#: sales/includes/db/sales_order_db.inc:204
++#: ../manufacturing/includes/db/work_orders_db.inc:79
++#: ../purchasing/includes/db/po_db.inc:161
 +#: ../sales/includes/db/cust_trans_db.inc:114
- #: ../sales/includes/db/old.sales_order_db.inc:249
 +#: ../sales/includes/db/sales_order_db.inc:213
  msgid "Updated."
  msgstr ""
  
- #: ../manufacturing/includes/db/work_orders_db.inc.orig:100
 -#: manufacturing/includes/db/work_orders_db.inc:307
++#: ../manufacturing/includes/db/work_orders_db.inc:100
  msgid "Canceled."
  msgstr ""
  
- #: ../manufacturing/includes/db/work_orders_db.inc.orig:176
 -#: manufacturing/includes/db/work_orders_db.inc:383
++#: ../manufacturing/includes/db/work_orders_db.inc:176
  msgid "Released."
  msgstr ""
  
@@@ -10279,30 -8935,23 +10221,30 @@@ msgstr "
  msgid "Produced"
  msgstr ""
  
- #: ../purchasing/includes/purchasing_db.inc:219
 -#: purchasing/includes/db/invoice_db.inc:311
++#: ../purchasing/includes/purchasing_db.inc:221
 +msgid "Payment for:"
 +msgstr ""
 +
- #: ../purchasing/includes/db/invoice_db.inc:334
++#: ../purchasing/includes/db/invoice_db.inc:338
  msgid "Supplier invoice adjustment for zero inventory of "
  msgstr ""
  
- #: ../purchasing/includes/db/invoice_db.inc:334
- #: ../reporting/rep106.php:83
- #: ../sales/inquiry/sales_deliveries_view.php:168
- #: ../sales/inquiry/sales_orders_view.php:159
 -#: purchasing/includes/db/invoice_db.inc:311 reporting/rep106.php:83
 -#: sales/inquiry/sales_deliveries_view.php:168
 -#: sales/inquiry/sales_orders_view.php:147
++#: ../purchasing/includes/db/invoice_db.inc:338
++#: ../reporting/rep106.php:90
++#: ../sales/inquiry/sales_deliveries_view.php:154
++#: ../sales/inquiry/sales_orders_view.php:131
  msgid "Invoice"
  msgstr ""
  
- #: ../purchasing/includes/db/invoice_db.inc:693
- #: ../purchasing/includes/db/invoice_db.inc:695
 -#: purchasing/includes/db/invoice_db.inc:659
 -#: purchasing/includes/db/invoice_db.inc:661
++#: ../purchasing/includes/db/invoice_db.inc:690
++#: ../purchasing/includes/db/invoice_db.inc:692
  msgid "GRN Removal"
  msgstr ""
  
 -#: purchasing/includes/ui/grn_ui.inc:23 purchasing/includes/ui/grn_ui.inc:55
 -#: purchasing/includes/ui/po_ui.inc:316 sales/view/view_sales_order.php:74
 +#: ../purchasing/includes/ui/grn_ui.inc:23
 +#: ../purchasing/includes/ui/grn_ui.inc:55
- #: ../purchasing/includes/ui/po_ui.inc:328
++#: ../purchasing/includes/ui/po_ui.inc:301
 +#: ../sales/view/view_sales_order.php:74
  msgid "Order Currency"
  msgstr ""
  
@@@ -10317,36 -8964,29 +10259,36 @@@ msgstr "
  msgid "Ordered On"
  msgstr ""
  
 -#: purchasing/includes/ui/grn_ui.inc:33 purchasing/includes/ui/grn_ui.inc:69
 -#: purchasing/includes/ui/po_ui.inc:331 purchasing/includes/ui/po_ui.inc:336
 +#: ../purchasing/includes/ui/grn_ui.inc:33
 +#: ../purchasing/includes/ui/grn_ui.inc:69
- #: ../purchasing/includes/ui/po_ui.inc:343
- #: ../purchasing/includes/ui/po_ui.inc:348
++#: ../purchasing/includes/ui/po_ui.inc:316
++#: ../purchasing/includes/ui/po_ui.inc:321
  msgid "Deliver Into Location"
  msgstr ""
  
 -#: purchasing/includes/ui/grn_ui.inc:34 purchasing/includes/ui/grn_ui.inc:79
 -#: purchasing/includes/ui/po_ui.inc:341
 -#: purchasing/view/view_supp_credit.php:44
 -#: purchasing/view/view_supp_invoice.php:47
 -#: purchasing/inquiry/po_search_completed.php:128
 -#: purchasing/inquiry/po_search.php:136
 -#: purchasing/inquiry/supplier_inquiry.php:172
 -#: reporting/includes/doctext.inc:142 reporting/includes/doctext.inc:165
 +#: ../purchasing/includes/ui/grn_ui.inc:34
 +#: ../purchasing/includes/ui/grn_ui.inc:79
- #: ../purchasing/includes/ui/po_ui.inc:353
++#: ../purchasing/includes/ui/po_ui.inc:326
 +#: ../purchasing/view/view_supp_credit.php:44
 +#: ../purchasing/view/view_supp_invoice.php:48
- #: ../purchasing/inquiry/po_search_completed.php:127
- #: ../purchasing/inquiry/po_search.php:136
++#: ../purchasing/inquiry/po_search_completed.php:126
++#: ../purchasing/inquiry/po_search.php:121
 +#: ../purchasing/inquiry/supplier_inquiry.php:177
- #: ../reporting/includes/doctext.inc:164
- #: ../reporting/includes/doctext.inc:187
++#: ../reporting/includes/doctext.inc:163
++#: ../reporting/includes/doctext.inc:186
  msgid "Supplier's Reference"
  msgstr ""
  
 -#: purchasing/includes/ui/grn_ui.inc:38 purchasing/includes/ui/grn_ui.inc:81
 -#: purchasing/includes/ui/po_ui.inc:345 sales/view/view_sales_order.php:79
 +#: ../purchasing/includes/ui/grn_ui.inc:38
 +#: ../purchasing/includes/ui/grn_ui.inc:81
- #: ../purchasing/includes/ui/po_ui.inc:357
++#: ../purchasing/includes/ui/po_ui.inc:330
 +#: ../sales/view/view_sales_order.php:92
  msgid "Delivery Address"
  msgstr ""
  
 -#: purchasing/includes/ui/grn_ui.inc:41 purchasing/includes/ui/grn_ui.inc:84
 -#: purchasing/includes/ui/po_ui.inc:349
 +#: ../purchasing/includes/ui/grn_ui.inc:41
 +#: ../purchasing/includes/ui/grn_ui.inc:84
- #: ../purchasing/includes/ui/po_ui.inc:369
++#: ../purchasing/includes/ui/po_ui.inc:342
  msgid "Order Comments"
  msgstr ""
  
@@@ -10354,353 -8994,288 +10296,200 @@@
  msgid "Date Items Received"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:123
 -#: purchasing/includes/ui/invoice_ui.inc:109
 -#: purchasing/includes/ui/invoice_ui.inc:112
++#: ../purchasing/includes/ui/invoice_ui.inc:127
 +msgid "Source Invoices:"
 +msgstr ""
 +
- #: ../purchasing/includes/ui/invoice_ui.inc:125
++#: ../purchasing/includes/ui/invoice_ui.inc:129
  msgid "Supplier's Ref.:"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:140
 -#: purchasing/includes/ui/invoice_ui.inc:127
++#: ../purchasing/includes/ui/invoice_ui.inc:135
++#: ../purchasing/includes/ui/po_ui.inc:178
++msgid "Dimension 2"
++msgstr ""
++
++#: ../purchasing/includes/ui/invoice_ui.inc:150
  msgid "Terms:"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:152
 -#: purchasing/includes/ui/invoice_ui.inc:139
 -#: purchasing/manage/suppliers.php:99 purchasing/manage/suppliers.php:104
++#: ../purchasing/includes/ui/invoice_ui.inc:162
 +#: ../purchasing/manage/suppliers.php:101
 +#: ../purchasing/manage/suppliers.php:106
  msgid "Supplier's Currency:"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:156
 -#: purchasing/includes/ui/invoice_ui.inc:143
 -#: purchasing/manage/suppliers.php:106 sales/manage/customer_branches.php:246
 -#: sales/manage/customers.php:298
++#: ../purchasing/includes/ui/invoice_ui.inc:166
 +#: ../purchasing/manage/suppliers.php:108
- #: ../sales/manage/customer_branches.php:247
- #: ../sales/manage/customers.php:298
++#: ../sales/manage/customer_branches.php:234
++#: ../sales/manage/customers.php:299
  msgid "Tax Group:"
  msgstr ""
  
- #: ../purchasing/includes/ui/invoice_ui.inc:174
 -#: purchasing/includes/ui/invoice_ui.inc:158
--msgid "Sub-total:"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:182
- msgid "Invoice Total:"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:185
- #: ../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:190
- #: ../purchasing/includes/ui/po_ui.inc:489
- #: ../purchasing/po_entry_items.php:481
- msgid "Tax algorithm:"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:222
- msgid "Add GL Line"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:223
- msgid "Reset"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:224
- #: ../purchasing/po_receive_items.php:333
- msgid "Clear all GL entry fields"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:242
- msgid "GL Items for this Invoice"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:244
- msgid "GL Items for this Credit Note"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:254
- msgid "Quick Entry:"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:427
- msgid "Add to Invoice"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:429
- msgid "Add to Credit Note"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:431
- #: ../sales/customer_invoice.php:612
- msgid "Remove"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:431
- #: ../purchasing/includes/ui/invoice_ui.inc:466
- msgid ""
- "WARNING! Be careful with removal. The operation is executed immediately and "
- "cannot be undone !!!"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:433
- #, php-format
- msgid ""
- "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:464
- msgid "Items Received Yet to be Invoiced"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:469
- msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:474
- msgid "Received Items Charged on this Invoice"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:476
- msgid "Received Items Credited on this Note"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:486
- msgid "Received between"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:498
- msgid "Add All Items"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:507
- #: ../purchasing/includes/ui/invoice_ui.inc:519
- #: ../reporting/rep308.php:230
- #: ../sales/inquiry/sales_orders_view.php:167
- msgid "Delivery"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:507
- msgid "Sequence #"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:507
- msgid "P.O."
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:508
- msgid "Received On"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:508
- #: ../purchasing/view/view_po.php:46
- msgid "Quantity Received"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:508
- #: ../purchasing/view/view_grn.php:41
- #: ../purchasing/view/view_po.php:46
- msgid "Quantity Invoiced"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:509
- msgid "Qty Yet To Invoice"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:509
- #: ../purchasing/includes/ui/po_ui.inc:247
- #: ../sales/includes/ui/sales_order_ui.inc:148
- msgid "Price after Tax"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:509
- #: ../purchasing/includes/ui/po_ui.inc:247
- #: ../sales/includes/ui/sales_order_ui.inc:148
- msgid "Price before Tax"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:515
- msgid "Qty Yet To Credit"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:520
- msgid "Line Value"
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:588
- msgid ""
- "There are no outstanding items received from this supplier that have not "
- "been invoiced by them."
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:591
- msgid ""
- "There are no received items for the selected supplier that have been "
- "invoiced."
- msgstr ""
- 
- #: ../purchasing/includes/ui/invoice_ui.inc:592
- msgid "Credits can only be applied to invoiced items."
- msgstr ""
- 
- #: ../purchasing/includes/ui/po_ui.inc:166
- #: ../sales/sales_order_entry.php:727
++#: ../purchasing/includes/ui/po_ui.inc:139
++#: ../sales/sales_order_entry.php:716
 +msgid "Order Date:"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:167
- #: ../sales/sales_order_entry.php:714
 -#: purchasing/includes/ui/invoice_ui.inc:166
 -msgid "Invoice Total:"
++#: ../purchasing/includes/ui/po_ui.inc:140
++#: ../sales/sales_order_entry.php:703
 +msgid "Delivery Date:"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:167
- #: ../sales/sales_order_entry.php:708
 -#: purchasing/includes/ui/invoice_ui.inc:169
 -#: sales/customer_credit_invoice.php:330
 -#: sales/includes/ui/sales_credit_ui.inc:233
 -msgid "Credit Note Total"
++#: ../purchasing/includes/ui/po_ui.inc:140
++#: ../sales/sales_order_entry.php:697
 +msgid "Invoice Date:"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:180
 -#: purchasing/includes/ui/invoice_ui.inc:200
 -msgid "Add GL Line"
++#: ../purchasing/includes/ui/po_ui.inc:153
 +msgid "Supplier Currency:"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:199
 -#: purchasing/includes/ui/invoice_ui.inc:201
 -msgid "Reset"
++#: ../purchasing/includes/ui/po_ui.inc:171
 +msgid "Due Date:"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:201
 -#: purchasing/includes/ui/invoice_ui.inc:202
 -#: purchasing/po_receive_items.php:335
 -msgid "Clear all GL entry fields"
++#: ../purchasing/includes/ui/po_ui.inc:173
 +msgid "Supplier's Reference:"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:202
 -#: purchasing/includes/ui/invoice_ui.inc:220
 -msgid "GL Items for this Invoice"
++#: ../purchasing/includes/ui/po_ui.inc:179
 +msgid "Receive Into:"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:227
 -#: purchasing/includes/ui/invoice_ui.inc:222
 -msgid "GL Items for this Credit Note"
++#: ../purchasing/includes/ui/po_ui.inc:200
 +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:231
 -#: purchasing/includes/ui/invoice_ui.inc:232
 -msgid "Quick Entry:"
++#: ../purchasing/includes/ui/po_ui.inc:204
 +msgid "Deliver to:"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:240
 -#: purchasing/includes/ui/invoice_ui.inc:405
 -msgid "Add to Invoice"
++#: ../purchasing/includes/ui/po_ui.inc:213
 +msgid "Order Items"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:246
 -#: purchasing/includes/ui/invoice_ui.inc:407
 -msgid "Add to Credit Note"
++#: ../purchasing/includes/ui/po_ui.inc:219
 +#: ../purchasing/po_receive_items.php:62
 +msgid "Received"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:247
- #: ../sales/includes/ui/sales_order_ui.inc:602
 -#: purchasing/includes/ui/invoice_ui.inc:409 sales/customer_invoice.php:533
 -msgid "Remove"
++#: ../purchasing/includes/ui/po_ui.inc:220
 +msgid "Required Delivery Date"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:247
 -#: purchasing/includes/ui/invoice_ui.inc:409
 -#: purchasing/includes/ui/invoice_ui.inc:444
 -msgid ""
 -"WARNING! Be careful with removal. The operation is executed immediately and "
 -"cannot be undone !!!"
++#: ../purchasing/includes/ui/po_ui.inc:220
++#: ../sales/includes/ui/sales_order_ui.inc:149
++msgid "Price after Tax"
+ msgstr ""
+ 
 -#: purchasing/includes/ui/invoice_ui.inc:411
 -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 ?"
++#: ../purchasing/includes/ui/po_ui.inc:220
++#: ../sales/includes/ui/sales_order_ui.inc:149
++msgid "Price before Tax"
+ msgstr ""
+ 
 -#: purchasing/includes/ui/invoice_ui.inc:442
 -msgid "Items Received Yet to be Invoiced"
++#: ../purchasing/includes/ui/po_ui.inc:220
 +#: ../purchasing/view/view_grn.php:41
 +#: ../purchasing/view/view_po.php:46
 +msgid "Line Total"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:298
 -#: purchasing/includes/ui/invoice_ui.inc:447
 -msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
++#: ../purchasing/includes/ui/po_ui.inc:271
 +#: ../purchasing/po_receive_items.php:114
- #: ../reporting/rep107.php:231
- #: ../reporting/rep109.php:155
- #: ../reporting/rep110.php:159
- #: ../reporting/rep111.php:152
- #: ../reporting/rep113.php:144
- #: ../reporting/rep209.php:162
++#: ../reporting/rep107.php:234
++#: ../reporting/rep109.php:156
++#: ../reporting/rep110.php:158
++#: ../reporting/rep111.php:154
++#: ../reporting/rep113.php:147
++#: ../reporting/rep209.php:165
 +#: ../sales/customer_credit_invoice.php:322
- #: ../sales/customer_delivery.php:541
- #: ../sales/customer_invoice.php:656
++#: ../sales/customer_delivery.php:506
 +#: ../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:224
++#: ../sales/includes/ui/sales_order_ui.inc:225
 +msgid "Sub-total"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:307
 -#: purchasing/includes/ui/invoice_ui.inc:452
 -msgid "Received Items Charged on this Invoice"
++#: ../purchasing/includes/ui/po_ui.inc:280
 +#: ../purchasing/po_receive_items.php:122
 +#: ../purchasing/view/view_grn.php:79
 +#: ../purchasing/view/view_po.php:93
- #: ../sales/customer_delivery.php:548
++#: ../sales/customer_delivery.php:513
 +#: ../sales/view/view_sales_order.php:262
- #: ../sales/includes/ui/sales_order_ui.inc:231
++#: ../sales/includes/ui/sales_order_ui.inc:232
 +msgid "Amount Total"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:308
 -#: purchasing/includes/ui/invoice_ui.inc:454
 -msgid "Received Items Credited on this Note"
++#: ../purchasing/includes/ui/po_ui.inc:281
 +#: ../purchasing/allocations/supplier_allocate.php:74
 +#: ../sales/allocations/customer_allocate.php:72
- #: ../sales/includes/ui/sales_order_ui.inc:232
++#: ../sales/includes/ui/sales_order_ui.inc:233
 +msgid "Refresh"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:363
 -#: purchasing/includes/ui/invoice_ui.inc:464
 -msgid "Received between"
++#: ../purchasing/includes/ui/po_ui.inc:336
 +#: ../sales/view/view_sales_order.php:83
 +msgid "Required Pre-Payment"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:364
 -#: purchasing/includes/ui/invoice_ui.inc:475
 -msgid "Add All Items"
++#: ../purchasing/includes/ui/po_ui.inc:337
 +msgid "Pre-Payments Allocated"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:490
 -#: purchasing/includes/ui/invoice_ui.inc:484
 -#: purchasing/includes/ui/invoice_ui.inc:496 reporting/rep308.php:230
 -#: sales/inquiry/sales_orders_view.php:155
 -msgid "Delivery"
++#: ../purchasing/includes/ui/po_ui.inc:462
++#: ../purchasing/po_entry_items.php:481
++msgid "Tax algorithm:"
+ msgstr ""
+ 
 -#: purchasing/includes/ui/invoice_ui.inc:484
 -msgid "P.O."
++#: ../purchasing/includes/ui/po_ui.inc:463
 +#: ../purchasing/po_entry_items.php:482
- #: ../sales/customer_invoice.php:463
- #: ../sales/includes/ui/sales_order_ui.inc:398
- #: ../sales/includes/ui/sales_order_ui.inc:400
++#: ../sales/customer_invoice.php:458
 +msgid "Payment:"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:490
 -#: purchasing/includes/ui/invoice_ui.inc:485
 -msgid "Received On"
++#: ../purchasing/includes/ui/po_ui.inc:463
 +#: ../purchasing/po_entry_items.php:482
 +msgid "Delayed"
  msgstr ""
  
- #: ../purchasing/includes/ui/po_ui.inc:492
- #: ../sales/includes/ui/sales_order_ui.inc:613
- #: ../sales/includes/ui/sales_order_ui.inc:615
 -#: purchasing/includes/ui/invoice_ui.inc:485 purchasing/view/view_po.php:46
 -msgid "Quantity Received"
++#: ../purchasing/includes/ui/po_ui.inc:465
 +msgid "Pre-Payment Required:"
  msgstr ""
  
 -#: purchasing/includes/ui/invoice_ui.inc:485 purchasing/view/view_grn.php:41
 -#: purchasing/view/view_po.php:46
 -msgid "Quantity Invoiced"
 +#: ../purchasing/po_entry_items.php:41
 +msgid "Modify Purchase Order #"
  msgstr ""
  
 -#: purchasing/includes/ui/invoice_ui.inc:486
 -msgid "Qty Yet To Invoice"
 +#: ../purchasing/po_entry_items.php:46
 +msgid "Purchase Order Entry"
  msgstr ""
  
 -#: purchasing/includes/ui/invoice_ui.inc:486
 -#: purchasing/includes/ui/po_ui.inc:235
 -#: sales/includes/ui/sales_order_ui.inc:148
 -msgid "Price after Tax"
 +#: ../purchasing/po_entry_items.php:51
 +msgid "Direct GRN Entry"
  msgstr ""
  
 -#: purchasing/includes/ui/invoice_ui.inc:486
 -#: purchasing/includes/ui/po_ui.inc:235
 -#: sales/includes/ui/sales_order_ui.inc:148
 -msgid "Price before Tax"
 +#: ../purchasing/po_entry_items.php:56
 +msgid "Direct Purchase Invoice Entry"
  msgstr ""
  
 -#: purchasing/includes/ui/invoice_ui.inc:492
 -msgid "Qty Yet To Credit"
 +#: ../purchasing/po_entry_items.php:80
 +msgid "Purchase Order has been entered"
  msgstr ""
  
 -#: purchasing/includes/ui/invoice_ui.inc:497
 -msgid "Line Value"
 +#: ../purchasing/po_entry_items.php:82
 +msgid "Purchase Order has been updated"
  msgstr ""
  
 -#: purchasing/includes/ui/invoice_ui.inc:564
 -msgid ""
 -"There are no outstanding items received from this supplier that have not "
 -"been invoiced by them."
 +#: ../purchasing/po_entry_items.php:83
 +msgid "&View this order"
  msgstr ""
  
 -#: purchasing/includes/ui/invoice_ui.inc:567
 -msgid ""
 -"There are no received items for the selected supplier that have been "
 -"invoiced."
 -msgstr ""
 -
 -#: purchasing/includes/ui/invoice_ui.inc:568
 -msgid "Credits can only be applied to invoiced items."
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:154 sales/sales_order_entry.php:705
 -msgid "Order Date:"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:692
 -msgid "Delivery Date:"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:686
 -msgid "Invoice Date:"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:168
 -msgid "Supplier Currency:"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:187
 -msgid "Due Date:"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:189
 -msgid "Supplier's Reference:"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:190
 -msgid "Receive Into:"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:215
 -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:219
 -msgid "Deliver to:"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:228
 -msgid "Order Items"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:234 purchasing/po_receive_items.php:62
 -msgid "Received"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:235
 -#: sales/includes/ui/sales_order_ui.inc:604
 -msgid "Required Delivery Date"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:235 purchasing/view/view_grn.php:41
 -#: purchasing/view/view_po.php:46
 -msgid "Line Total"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:286 purchasing/po_receive_items.php:114
 -#: reporting/rep107.php:153 reporting/rep109.php:152 reporting/rep110.php:159
 -#: reporting/rep111.php:155 reporting/rep113.php:147 reporting/rep209.php:165
 -#: sales/customer_credit_invoice.php:322 sales/customer_delivery.php:495
 -#: sales/customer_invoice.php:574 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:224
 -msgid "Sub-total"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:295 purchasing/po_receive_items.php:122
 -#: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93
 -#: sales/customer_delivery.php:502 sales/view/view_sales_order.php:244
 -#: sales/includes/ui/sales_order_ui.inc:231
 -msgid "Amount Total"
 -msgstr ""
 -
 -#: purchasing/includes/ui/po_ui.inc:296
 -#: purchasing/allocations/supplier_allocate.php:73
 -#: sales/allocations/customer_allocate.php:71
 -#: sales/includes/ui/sales_order_ui.inc:232
 -msgid "Refresh"
 -msgstr ""
 -
 -#: purchasing/po_entry_items.php:41
 -msgid "Modify Purchase Order #"
 -msgstr ""
 -
 -#: purchasing/po_entry_items.php:46
 -msgid "Purchase Order Entry"
 -msgstr ""
 -
 -#: purchasing/po_entry_items.php:51
 -msgid "Direct GRN Entry"
 -msgstr ""
 -
 -#: purchasing/po_entry_items.php:56
 -msgid "Direct Purchase Invoice Entry"
 -msgstr ""
 -
 -#: purchasing/po_entry_items.php:77
 -msgid "Purchase Order has been entered"
 -msgstr ""
 -
 -#: purchasing/po_entry_items.php:79
 -msgid "Purchase Order has been updated"
 -msgstr ""
 -
 -#: purchasing/po_entry_items.php:80
 -msgid "&View this order"
 -msgstr ""
 -
 -#: 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 ""
  
@@@ -10786,8 -9361,7 +10575,8 @@@ msgstr "
  msgid "Enter a new purchase order"
  msgstr ""
  
 -#: purchasing/po_entry_items.php:216 sales/sales_order_entry.php:498
 +#: ../purchasing/po_entry_items.php:216
- #: ../sales/sales_order_entry.php:520
++#: ../sales/sales_order_entry.php:509
  msgid "Item description cannot be empty."
  msgstr ""
  
@@@ -10822,9 -9396,8 +10611,9 @@@ msgid "
  "purchased."
  msgstr ""
  
 -#: purchasing/po_entry_items.php:329 purchasing/supplier_invoice.php:355
 -#: purchasing/supplier_payment.php:123
 +#: ../purchasing/po_entry_items.php:329
- #: ../purchasing/supplier_invoice.php:394
++#: ../purchasing/supplier_invoice.php:393
 +#: ../purchasing/supplier_payment.php:123
  msgid "There is no supplier selected."
  msgstr ""
  
@@@ -10864,12 -9440,7 +10653,12 @@@ msgid "
  "The order cannot be placed because there are no lines entered on this order."
  msgstr ""
  
 -#: purchasing/po_entry_items.php:534 sales/sales_order_entry.php:709
 +#: ../purchasing/po_entry_items.php:405
 +msgid "Required prepayment is greater than total invoice value."
 +msgstr ""
 +
 +#: ../purchasing/po_entry_items.php:490
- #: ../sales/sales_order_entry.php:731
++#: ../sales/sales_order_entry.php:720
  msgid "Place Order"
  msgstr ""
  
@@@ -10877,8 -9448,7 +10666,8 @@@
  msgid "Update Order"
  msgstr ""
  
 -#: purchasing/po_entry_items.php:536 sales/sales_order_entry.php:708
 +#: ../purchasing/po_entry_items.php:492
- #: ../sales/sales_order_entry.php:730
++#: ../sales/sales_order_entry.php:719
  msgid "Cancel Order"
  msgstr ""
  
@@@ -10894,8 -9464,7 +10683,7 @@@ msgstr "
  msgid "Cancel GRN"
  msgstr ""
  
 -#: purchasing/po_entry_items.php:543 sales/customer_invoice.php:593
 +#: ../purchasing/po_entry_items.php:499
- #: ../sales/customer_invoice.php:695
  msgid "Process Invoice"
  msgstr ""
  
@@@ -10903,8 -9472,7 +10691,8 @@@
  msgid "Update Invoice"
  msgstr ""
  
 -#: purchasing/po_entry_items.php:545 sales/sales_order_entry.php:689
 +#: ../purchasing/po_entry_items.php:501
- #: ../sales/sales_order_entry.php:711
++#: ../sales/sales_order_entry.php:700
  msgid "Cancel Invoice"
  msgstr ""
  
@@@ -10930,23 -9498,18 +10718,23 @@@ msgid "
  "select a purchase order first."
  msgstr ""
  
 -#: purchasing/po_receive_items.php:62 reporting/rep105.php:114
 -#: sales/customer_delivery.php:410
 +#: ../purchasing/po_receive_items.php:62
 +#: ../reporting/rep105.php:114
- #: ../sales/customer_delivery.php:456
++#: ../sales/customer_delivery.php:421
  msgid "Ordered"
  msgstr ""
  
 -#: purchasing/po_receive_items.php:63 reporting/rep101.php:119
 -#: reporting/rep105.php:115 reporting/rep105.php:166 reporting/rep201.php:111
 -#: reporting/includes/doctext.inc:225
 +#: ../purchasing/po_receive_items.php:63
 +#: ../reporting/rep101.php:119
 +#: ../reporting/rep105.php:115
 +#: ../reporting/rep105.php:166
 +#: ../reporting/rep201.php:111
- #: ../reporting/includes/doctext.inc:247
++#: ../reporting/includes/doctext.inc:246
  msgid "Outstanding"
  msgstr ""
  
 -#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:411
 +#: ../purchasing/po_receive_items.php:63
- #: ../sales/customer_delivery.php:457
++#: ../sales/customer_delivery.php:422
  msgid "This Delivery"
  msgstr ""
  
@@@ -10992,7 -9554,7 +10780,11 @@@ msgstr "
  msgid "Process Receive Items"
  msgstr ""
  
 -#: purchasing/supplier_credit.php:43
++#: ../purchasing/po_receive_items.php:333
++msgid "Clear all GL entry fields"
++msgstr ""
++
 +#: ../purchasing/supplier_credit.php:77
  msgid "Supplier credit note has been processed."
  msgstr ""
  
@@@ -11049,28 -9608,28 +10841,21 @@@ msgid "
  "incorrect format."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:215
 -#: purchasing/supplier_credit.php:199
--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:226
 -#: purchasing/supplier_credit.php:210
++#: ../purchasing/supplier_credit.php:220
  msgid ""
  "The return cannot be processed because there is an insufficient quantity for "
  "item:"
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:269
 -#: purchasing/supplier_credit.php:253
++#: ../purchasing/supplier_credit.php:263
  msgid "The quantity to credit must be numeric and greater than zero."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:276
 -#: purchasing/supplier_credit.php:260
++#: ../purchasing/supplier_credit.php:270
  msgid "The price is either not numeric or negative."
  msgstr ""
  
- #: ../purchasing/supplier_credit.php:378
 -#: purchasing/supplier_credit.php:362
++#: ../purchasing/supplier_credit.php:372
  msgid "Enter Credit Note"
  msgstr ""
  
@@@ -11115,27 -9665,26 +10900,27 @@@ msgid "
  "incorrect format."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:265
 -#: purchasing/supplier_invoice.php:235
++#: ../purchasing/supplier_invoice.php:264
  msgid "The quantity to invoice must be numeric and greater than zero."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:272
 -#: purchasing/supplier_invoice.php:242
++#: ../purchasing/supplier_invoice.php:271
  msgid "The price is not numeric."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:285
 -#: purchasing/supplier_invoice.php:255
++#: ../purchasing/supplier_invoice.php:284
  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:286
- #: ../purchasing/supplier_invoice.php:299
 -#: purchasing/supplier_invoice.php:256 purchasing/supplier_invoice.php:269
++#: ../purchasing/supplier_invoice.php:285
++#: ../purchasing/supplier_invoice.php:298
  msgid "The over-charge percentage allowance is :"
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:298
 -#: purchasing/supplier_invoice.php:268
++#: ../purchasing/supplier_invoice.php:297
  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 "
@@@ -11143,12 -9692,12 +10928,12 @@@
  "necessary."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:376
 -#: purchasing/supplier_invoice.php:337
++#: ../purchasing/supplier_invoice.php:375
  #, php-format
  msgid "All yet non-invoiced items on delivery line # %d has been removed."
  msgstr ""
  
- #: ../purchasing/supplier_invoice.php:418
 -#: purchasing/supplier_invoice.php:379
++#: ../purchasing/supplier_invoice.php:417
  msgid "Enter Invoice"
  msgstr ""
  
@@@ -11184,8 -9733,7 +10969,8 @@@ msgstr "
  msgid "Enter another supplier &payment"
  msgstr ""
  
 -#: purchasing/supplier_payment.php:107 sales/customer_payments.php:106
 +#: ../purchasing/supplier_payment.php:107
- #: ../sales/customer_payments.php:106
++#: ../sales/customer_payments.php:107
  msgid "Enter Other &Payment"
  msgstr ""
  
@@@ -11193,13 -9741,11 +10978,13 @@@
  msgid "Enter &Customer Payment"
  msgstr ""
  
 -#: purchasing/supplier_payment.php:109 sales/customer_payments.php:104
 +#: ../purchasing/supplier_payment.php:109
- #: ../sales/customer_payments.php:104
++#: ../sales/customer_payments.php:105
  msgid "Enter Other &Deposit"
  msgstr ""
  
 -#: purchasing/supplier_payment.php:110 sales/customer_payments.php:107
 +#: ../purchasing/supplier_payment.php:110
- #: ../sales/customer_payments.php:107
++#: ../sales/customer_payments.php:108
  msgid "Bank Account &Transfer"
  msgstr ""
  
@@@ -11234,8 -9785,7 +11019,8 @@@ msgstr "
  msgid "Bank Amount:"
  msgstr ""
  
 -#: purchasing/supplier_payment.php:323 sales/customer_payments.php:395
 +#: ../purchasing/supplier_payment.php:323
- #: ../sales/customer_payments.php:398
++#: ../sales/customer_payments.php:399
  msgid "Amount of Discount:"
  msgstr ""
  
@@@ -11262,20 -9811,16 +11047,25 @@@ msgstr "
  msgid "Line Details"
  msgstr ""
  
 -#: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:65
 -#: reporting/includes/doctext.inc:170 reporting/includes/doctext.inc:222
 -#: sales/inquiry/sales_deliveries_view.php:188
 +#: ../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:188
++#: ../reporting/includes/doctext.inc:76
++#: ../reporting/includes/doctext.inc:191
++#: ../reporting/includes/doctext.inc:243
++#: ../sales/inquiry/sales_deliveries_view.php:175
  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:65 sales/view/view_credit.php:136
 -#: sales/view/view_sales_order.php:234
++#: ../purchasing/view/view_grn.php:41
++#: ../purchasing/view/view_po.php:46
++msgid "Quantity Invoiced"
++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
  msgid "Sub Total"
  msgstr ""
  
@@@ -11295,13 -9840,13 +11085,16 @@@ msgstr "
  msgid "Requested By"
  msgstr ""
  
 -#: purchasing/view/view_po.php:100
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:148
 -#: purchasing/inquiry/supplier_inquiry.php:193
 -#: sales/inquiry/customer_allocation_inquiry.php:165
 -#: sales/inquiry/customer_inquiry.php:244
 -#: sales/inquiry/sales_deliveries_view.php:208
 -#: sales/inquiry/sales_orders_view.php:318
++#: ../purchasing/view/view_po.php:46
++msgid "Quantity Received"
++msgstr ""
++
 +#: ../purchasing/view/view_po.php:100
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:148
++#: ../purchasing/inquiry/supplier_allocation_inquiry.php:149
 +#: ../purchasing/inquiry/supplier_inquiry.php:197
 +#: ../sales/inquiry/customer_allocation_inquiry.php:165
- #: ../sales/inquiry/customer_inquiry.php:227
- #: ../sales/inquiry/sales_deliveries_view.php:208
- #: ../sales/inquiry/sales_orders_view.php:345
++#: ../sales/inquiry/sales_deliveries_view.php:195
++#: ../sales/inquiry/sales_orders_view.php:308
  msgid "Marked items are overdue."
  msgstr ""
  
@@@ -11328,11 -9871,9 +11121,11 @@@ msgstr "
  msgid "SUPPLIER CREDIT NOTE"
  msgstr ""
  
 -#: 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_credit.php:47
 +#: ../purchasing/view/view_supp_invoice.php:51
- #: ../reporting/includes/doctext.inc:141
++#: ../reporting/includes/doctext.inc:140
 +#: ../sales/customer_credit_invoice.php:268
 +#: ../sales/view/view_invoice.php:100
  msgid "Invoice Date"
  msgstr ""
  
@@@ -11353,10 -9893,8 +11146,10 @@@ msgstr "
  msgid "SUPPLIER INVOICE"
  msgstr ""
  
 -#: purchasing/view/view_supp_invoice.php:72 reporting/rep107.php:201
 -#: sales/view/view_invoice.php:164
 +#: ../purchasing/view/view_supp_invoice.php:73
- #: ../reporting/rep107.php:280
- #: ../reporting/rep107.php:286
++#: ../reporting/rep107.php:283
++#: ../reporting/rep107.php:289
 +#: ../sales/view/view_invoice.php:166
  msgid "TOTAL INVOICE"
  msgstr ""
  
@@@ -11381,14 -9918,10 +11174,10 @@@ msgstr "
  msgid "Payment Currency"
  msgstr ""
  
 -#: purchasing/view/view_supp_payment.php:62 reporting/rep112.php:165
 -#: reporting/rep210.php:174 sales/customer_delivery.php:411
 -#: sales/customer_invoice.php:479 sales/view/view_receipt.php:45
 -#: sales/view/view_sales_order.php:202
 +#: ../purchasing/view/view_supp_payment.php:62
- #: ../reporting/rep112.php:150
- #: ../reporting/rep210.php:159
- #: ../sales/customer_delivery.php:457
- #: ../sales/customer_invoice.php:551
- #: ../sales/customer_invoice.php:554
++#: ../sales/customer_delivery.php:422
 +#: ../sales/view/view_receipt.php:45
 +#: ../sales/view/view_sales_order.php:220
  msgid "Discount"
  msgstr ""
  
@@@ -11431,13 -9963,11 +11220,13 @@@ msgstr "
  msgid "Bank Name/Account:"
  msgstr ""
  
 -#: purchasing/manage/suppliers.php:111 sales/manage/customers.php:268
 +#: ../purchasing/manage/suppliers.php:113
- #: ../sales/manage/customers.php:268
++#: ../sales/manage/customers.php:269
  msgid "Credit Limit:"
  msgstr ""
  
 -#: purchasing/manage/suppliers.php:112 sales/manage/customers.php:270
 +#: ../purchasing/manage/suppliers.php:114
- #: ../sales/manage/customers.php:270
++#: ../sales/manage/customers.php:271
  msgid "Payment Terms:"
  msgstr ""
  
@@@ -11474,137 -9996,125 +11263,130 @@@ msgstr "
  msgid "Contact Data"
  msgstr ""
  
 -#: purchasing/manage/suppliers.php:149 sales/manage/customer_branches.php:266
 +#: ../purchasing/manage/suppliers.php:142
 +msgid "System default"
 +msgstr ""
 +
- #: ../purchasing/manage/suppliers.php:159
- #: ../sales/manage/customer_branches.php:268
++#: ../purchasing/manage/suppliers.php:161
++#: ../sales/manage/customer_branches.php:255
  msgid "Addresses"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:160
 -#: purchasing/manage/suppliers.php:150 reporting/rep205.php:102
 -#: sales/manage/customer_branches.php:267
++#: ../purchasing/manage/suppliers.php:162
 +#: ../reporting/rep205.php:102
- #: ../sales/manage/customer_branches.php:269
++#: ../sales/manage/customer_branches.php:256
  msgid "Mailing Address:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:161
 -#: purchasing/manage/suppliers.php:151
++#: ../purchasing/manage/suppliers.php:163
  msgid "Physical Address:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:163
 -#: purchasing/manage/suppliers.php:153
++#: ../purchasing/manage/suppliers.php:165
  msgid "General"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:164
- #: ../sales/manage/customer_branches.php:271
- #: ../sales/manage/customers.php:291
 -#: purchasing/manage/suppliers.php:154 sales/manage/customer_branches.php:269
 -#: sales/manage/customers.php:291
++#: ../purchasing/manage/suppliers.php:166
++#: ../sales/manage/customer_branches.php:258
++#: ../sales/manage/customers.php:292
  msgid "General Notes:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:166
 -#: purchasing/manage/suppliers.php:156
++#: ../purchasing/manage/suppliers.php:168
  msgid "Supplier status:"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:172
 -#: purchasing/manage/suppliers.php:162
 -msgid "System default"
 -msgstr ""
 -
 -#: purchasing/manage/suppliers.php:169
++#: ../purchasing/manage/suppliers.php:174
  msgid "Update Supplier"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:173
 -#: purchasing/manage/suppliers.php:170
++#: ../purchasing/manage/suppliers.php:175
  msgid "Update supplier data"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:174
 -#: purchasing/manage/suppliers.php:171
++#: ../purchasing/manage/suppliers.php:176
  msgid "Select this supplier and return to document entry."
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:175
 -#: purchasing/manage/suppliers.php:172
++#: ../purchasing/manage/suppliers.php:177
  msgid "Delete Supplier"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:176
 -#: purchasing/manage/suppliers.php:173
++#: ../purchasing/manage/suppliers.php:178
  msgid "Delete supplier data if have been never used"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:180
 -#: purchasing/manage/suppliers.php:177
++#: ../purchasing/manage/suppliers.php:182
  msgid "Add New Supplier Details"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:199
 -#: purchasing/manage/suppliers.php:196
++#: ../purchasing/manage/suppliers.php:201
  msgid "The supplier name must be entered."
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:206
 -#: purchasing/manage/suppliers.php:203
++#: ../purchasing/manage/suppliers.php:208
  msgid "The supplier short name must be entered."
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:226
 -#: purchasing/manage/suppliers.php:223
++#: ../purchasing/manage/suppliers.php:228
  msgid "Supplier has been updated."
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:244
 -#: purchasing/manage/suppliers.php:241
++#: ../purchasing/manage/suppliers.php:246
  msgid "A new supplier has been added."
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:262
 -#: purchasing/manage/suppliers.php:259
++#: ../purchasing/manage/suppliers.php:264
  msgid ""
  "Cannot delete this supplier because there are transactions that refer to "
  "this supplier."
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:270
 -#: purchasing/manage/suppliers.php:267
++#: ../purchasing/manage/suppliers.php:272
  msgid ""
  "Cannot delete the supplier record because purchase orders have been created "
  "against this supplier."
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:291
- #: ../purchasing/inquiry/po_search_completed.php:75
 -#: purchasing/manage/suppliers.php:288
 -#: purchasing/inquiry/po_search_completed.php:78
 -#: purchasing/inquiry/po_search.php:76
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:48
++#: ../purchasing/manage/suppliers.php:293
++#: ../purchasing/inquiry/po_search_completed.php:76
 +#: ../purchasing/inquiry/po_search.php:76
 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:48
  msgid "Select a supplier: "
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:292
 -#: purchasing/manage/suppliers.php:289
++#: ../purchasing/manage/suppliers.php:294
  msgid "New supplier"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:311
- #: ../sales/manage/customer_branches.php:325
- #: ../sales/manage/customers.php:349
 -#: purchasing/manage/suppliers.php:308 sales/manage/customer_branches.php:323
 -#: sales/manage/customers.php:349
++#: ../purchasing/manage/suppliers.php:313
++#: ../sales/manage/customer_branches.php:307
++#: ../sales/manage/customers.php:351
  msgid "&Contacts"
  msgstr ""
  
- #: ../purchasing/manage/suppliers.php:313
 -#: purchasing/manage/suppliers.php:310
++#: ../purchasing/manage/suppliers.php:315
  msgid "Purchase &Orders"
  msgstr ""
  
- #: ../purchasing/inquiry/po_search_completed.php:24
 -#: purchasing/inquiry/po_search_completed.php:26
++#: ../purchasing/inquiry/po_search_completed.php:25
  msgid "Search Purchase Orders"
  msgstr ""
  
- #: ../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:247
- msgid "#:"
- msgstr ""
- 
- #: ../purchasing/inquiry/po_search_completed.php:65
 -#: purchasing/inquiry/po_search_completed.php:68
++#: ../purchasing/inquiry/po_search_completed.php:66
  msgid "into location:"
  msgstr ""
  
- #: ../purchasing/inquiry/po_search_completed.php:128
- #: ../purchasing/inquiry/po_search.php:137
- #: ../reporting/includes/doctext.inc:188
- #: ../sales/inquiry/sales_orders_view.php:290
 -#: purchasing/inquiry/po_search_completed.php:129
 -#: purchasing/inquiry/po_search.php:137 reporting/includes/doctext.inc:166
 -#: sales/inquiry/sales_orders_view.php:267
++#: ../purchasing/inquiry/po_search_completed.php:127
++#: ../purchasing/inquiry/po_search.php:122
++#: ../reporting/includes/doctext.inc:187
++#: ../sales/inquiry/sales_orders_view.php:253
  msgid "Order Date"
  msgstr ""
  
- #: ../purchasing/inquiry/po_search_completed.php:130
- #: ../purchasing/inquiry/po_search.php:139
- #: ../sales/inquiry/sales_orders_view.php:293
 -#: purchasing/inquiry/po_search_completed.php:131
 -#: purchasing/inquiry/po_search.php:139
 -#: sales/inquiry/sales_orders_view.php:270
++#: ../purchasing/inquiry/po_search_completed.php:129
++#: ../purchasing/inquiry/po_search.php:124
++#: ../sales/inquiry/sales_orders_view.php:256
  msgid "Order Total"
  msgstr ""
  
@@@ -11612,11 -10122,11 +11394,11 @@@
  msgid "Search Outstanding Purchase Orders"
  msgstr ""
  
- #: ../purchasing/inquiry/po_search.php:100
 -#: purchasing/inquiry/po_search.php:100
++#: ../purchasing/inquiry/po_search.php:99
  msgid "Receive"
  msgstr ""
  
- #: ../purchasing/inquiry/po_search.php:150
 -#: purchasing/inquiry/po_search.php:150
++#: ../purchasing/inquiry/po_search.php:135
  msgid "Marked orders have overdue items."
  msgstr ""
  
@@@ -11633,15 -10143,14 +11415,15 @@@ msgstr "
  msgid "Pay"
  msgstr ""
  
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:130
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:130
++#: ../purchasing/inquiry/supplier_allocation_inquiry.php:131
  msgid "Supp Reference"
  msgstr ""
  
- #: ../purchasing/inquiry/supplier_allocation_inquiry.php:136
 -#: purchasing/inquiry/supplier_allocation_inquiry.php:136
 -#: reporting/rep101.php:119 reporting/rep201.php:111
 -#: reporting/includes/doctext.inc:225
 -#: sales/inquiry/customer_allocation_inquiry.php:154
++#: ../purchasing/inquiry/supplier_allocation_inquiry.php:137
 +#: ../reporting/rep101.php:119
 +#: ../reporting/rep201.php:111
- #: ../reporting/includes/doctext.inc:247
++#: ../reporting/includes/doctext.inc:246
 +#: ../sales/inquiry/customer_allocation_inquiry.php:154
  msgid "Allocated"
  msgstr ""
  
@@@ -11653,65 -10162,45 +11435,57 @@@ msgstr "
  msgid "Select a supplier:"
  msgstr ""
  
 -#: 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:154 reporting/rep108.php:155 reporting/rep108.php:156
 -#: 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
 +#: ../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/rep102.php:244
- #: ../reporting/rep108.php:151
- #: ../reporting/rep108.php:152
- #: ../reporting/rep108.php:153
++#: ../reporting/rep102.php:243
++#: ../reporting/rep108.php:154
++#: ../reporting/rep108.php:155
++#: ../reporting/rep108.php:156
 +#: ../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
++#: ../reporting/rep202.php:251
 +#: ../sales/create_recurrent_invoices.php:134
- #: ../sales/manage/recurrent_invoices.php:102
- #: ../sales/inquiry/customer_inquiry.php:71
- #: ../sales/inquiry/customer_inquiry.php:72
- #: ../sales/inquiry/customer_inquiry.php:73
++#: ../sales/manage/recurrent_invoices.php:108
  msgid "Days"
  msgstr ""
  
 -#: purchasing/inquiry/supplier_inquiry.php:72 reporting/rep102.php:122
 -#: reporting/rep108.php:156 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/rep108.php:153
++#: ../reporting/rep108.php:156
 +#: ../reporting/rep202.php:126
 +#: ../reporting/rep202.php:160
- #: ../sales/inquiry/customer_inquiry.php:73
  msgid "Over"
  msgstr ""
  
 -#: 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:76 reporting/rep102.php:125
 -#: reporting/rep102.php:242 reporting/rep108.php:158 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/rep102.php:242
- #: ../reporting/rep108.php:155
++#: ../reporting/rep102.php:241
++#: ../reporting/rep108.php:158
 +#: ../reporting/rep202.php:130
- #: ../reporting/rep202.php:250
- #: ../sales/inquiry/customer_inquiry.php:76
++#: ../reporting/rep202.php:249
  msgid "Current"
  msgstr ""
  
 -#: purchasing/inquiry/supplier_inquiry.php:77 reporting/rep102.php:126
 -#: reporting/rep108.php:158 reporting/rep202.php:131
 -#: sales/inquiry/customer_inquiry.php:81
 +#: ../purchasing/inquiry/supplier_inquiry.php:74
 +#: ../reporting/rep102.php:126
- #: ../reporting/rep108.php:155
++#: ../reporting/rep108.php:158
 +#: ../reporting/rep202.php:131
- #: ../sales/inquiry/customer_inquiry.php:77
  msgid "Total Balance"
  msgstr ""
  
 -#: purchasing/inquiry/supplier_inquiry.php:133
 -#: sales/inquiry/customer_inquiry.php:164
 +#: ../purchasing/inquiry/supplier_inquiry.php:133
- #: ../sales/inquiry/customer_inquiry.php:162
  msgid "Credit This"
  msgstr ""
  
@@@ -11797,25 -10283,19 +11571,25 @@@ msgstr "
  msgid "Balances in Home Currency"
  msgstr ""
  
 -#: reporting/rep101.php:118 reporting/rep201.php:110 reporting/rep203.php:93
 -#: reporting/rep709.php:116 reporting/includes/doctext.inc:145
 -#: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:224
 +#: ../reporting/rep101.php:118
 +#: ../reporting/rep201.php:110
 +#: ../reporting/rep203.php:93
 +#: ../reporting/rep709.php:116
- #: ../reporting/includes/doctext.inc:167
- #: ../reporting/includes/doctext.inc:208
- #: ../reporting/includes/doctext.inc:246
++#: ../reporting/includes/doctext.inc:166
++#: ../reporting/includes/doctext.inc:207
++#: ../reporting/includes/doctext.inc:245
  msgid "Trans Type"
  msgstr ""
  
 -#: reporting/rep101.php:118 reporting/rep201.php:110
 -#: reporting/includes/doctext.inc:224
 +#: ../reporting/rep101.php:118
 +#: ../reporting/rep201.php:110
- #: ../reporting/includes/doctext.inc:246
++#: ../reporting/includes/doctext.inc:245
  msgid "Charges"
  msgstr ""
  
 -#: reporting/rep101.php:118 reporting/rep201.php:111
 -#: reporting/includes/doctext.inc:225
 +#: ../reporting/rep101.php:118
 +#: ../reporting/rep201.php:111
- #: ../reporting/includes/doctext.inc:247
++#: ../reporting/includes/doctext.inc:246
  msgid "Credits"
  msgstr ""
  
@@@ -11838,30 -10311,17 +11612,30 @@@ msgstr "
  msgid "Customer Balances"
  msgstr ""
  
 -#: reporting/rep101.php:241 reporting/rep102.php:228 reporting/rep106.php:171
 -#: reporting/rep201.php:234 reporting/rep202.php:235 reporting/rep203.php:181
 -#: reporting/rep204.php:148 reporting/rep301.php:254 reporting/rep304.php:195
 -#: reporting/rep305.php:188 reporting/rep306.php:293 reporting/rep309.php:158
 +#: ../reporting/rep101.php:241
 +#: ../reporting/rep102.php:228
- #: ../reporting/rep106.php:171
++#: ../reporting/rep106.php:178
 +#: ../reporting/rep201.php:234
 +#: ../reporting/rep202.php:235
 +#: ../reporting/rep203.php:181
 +#: ../reporting/rep204.php:148
 +#: ../reporting/rep301.php:254
 +#: ../reporting/rep304.php:195
 +#: ../reporting/rep305.php:188
 +#: ../reporting/rep306.php:293
 +#: ../reporting/rep309.php:158
  msgid "Grand Total"
  msgstr ""
  
 -#: reporting/rep102.php:102 reporting/rep106.php:93 reporting/rep202.php:106
 -#: reporting/rep709.php:100 reporting/reports_main.php:48
 -#: reporting/reports_main.php:91 reporting/reports_main.php:165
 -#: reporting/reports_main.php:211 reporting/reports_main.php:491
 +#: ../reporting/rep102.php:102
- #: ../reporting/rep106.php:93
++#: ../reporting/rep106.php:100
 +#: ../reporting/rep202.php:106
 +#: ../reporting/rep709.php:100
 +#: ../reporting/reports_main.php:48
 +#: ../reporting/reports_main.php:91
 +#: ../reporting/reports_main.php:165
 +#: ../reporting/reports_main.php:211
 +#: ../reporting/reports_main.php:497
  msgid "Summary Only"
  msgstr ""
  
@@@ -11922,88 -10359,77 +11696,88 @@@ msgstr "
  msgid "Aged Customer Analysis"
  msgstr ""
  
- #: ../reporting/rep103.php:134
 -#: reporting/rep103.php:134
++#: ../reporting/rep103.php:133
  msgid "All Areas"
  msgstr ""
  
- #: ../reporting/rep103.php:138
 -#: reporting/rep103.php:138
++#: ../reporting/rep103.php:137
  msgid "All Sales Folk"
  msgstr ""
  
- #: ../reporting/rep103.php:142
 -#: reporting/rep103.php:142 reporting/rep205.php:89
++#: ../reporting/rep103.php:141
 +#: ../reporting/rep205.php:89
  msgid "Greater than "
  msgstr ""
  
- #: ../reporting/rep103.php:146
 -#: reporting/rep103.php:146 reporting/rep205.php:93
++#: ../reporting/rep103.php:145
 +#: ../reporting/rep205.php:93
  msgid "Less than "
  msgstr ""
  
- #: ../reporting/rep103.php:155
 -#: reporting/rep103.php:155
++#: ../reporting/rep103.php:154
  msgid "Customer Postal Address"
  msgstr ""
  
- #: ../reporting/rep103.php:155
 -#: reporting/rep103.php:155
++#: ../reporting/rep103.php:154
  msgid "Price/Turnover"
  msgstr ""
  
- #: ../reporting/rep103.php:155
 -#: reporting/rep103.php:155
++#: ../reporting/rep103.php:154
  msgid "Branch Contact Information"
  msgstr ""
  
- #: ../reporting/rep103.php:156
 -#: reporting/rep103.php:156
++#: ../reporting/rep103.php:155
  msgid "Branch Delivery Address"
  msgstr ""
  
- #: ../reporting/rep103.php:161
 -#: reporting/rep103.php:161 reporting/rep205.php:108
 -#: reporting/reports_main.php:55 reporting/reports_main.php:185
++#: ../reporting/rep103.php:160
 +#: ../reporting/rep205.php:108
 +#: ../reporting/reports_main.php:55
 +#: ../reporting/reports_main.php:185
  msgid "Activity Since"
  msgstr ""
  
- #: ../reporting/rep103.php:162
 -#: reporting/rep103.php:162 reporting/reports_main.php:56
 -#: sales/manage/sales_areas.php:16
++#: ../reporting/rep103.php:161
 +#: ../reporting/reports_main.php:56
 +#: ../sales/manage/sales_areas.php:16
  msgid "Sales Areas"
  msgstr ""
  
- #: ../reporting/rep103.php:163
 -#: reporting/rep103.php:163 reporting/reports_main.php:57
++#: ../reporting/rep103.php:162
 +#: ../reporting/reports_main.php:57
  msgid "Sales Folk"
  msgstr ""
  
- #: ../reporting/rep103.php:164
 -#: reporting/rep103.php:164 reporting/rep205.php:109
++#: ../reporting/rep103.php:163
 +#: ../reporting/rep205.php:109
  msgid "Activity"
  msgstr ""
  
- #: ../reporting/rep103.php:166
 -#: reporting/rep103.php:166
++#: ../reporting/rep103.php:165
  msgid "Customer Details Listing"
  msgstr ""
  
- #: ../reporting/rep103.php:197
 -#: reporting/rep103.php:197
++#: ../reporting/rep103.php:196
  msgid "Customers in"
  msgstr ""
  
- #: ../reporting/rep103.php:218
 -#: reporting/rep103.php:218
++#: ../reporting/rep103.php:217
  msgid "Price List"
  msgstr ""
  
- #: ../reporting/rep103.php:246
 -#: reporting/rep103.php:246 reporting/rep205.php:164
++#: ../reporting/rep103.php:245
 +#: ../reporting/rep205.php:164
  msgid "Ph"
  msgstr ""
  
- #: ../reporting/rep103.php:261
 -#: reporting/rep103.php:261 reporting/rep205.php:179
++#: ../reporting/rep103.php:260
 +#: ../reporting/rep205.php:179
  msgid "Gereral Notes:"
  msgstr ""
  
- #: ../reporting/rep103.php:270
 -#: reporting/rep103.php:270 reporting/rep205.php:102 reporting/rep205.php:188
++#: ../reporting/rep103.php:269
 +#: ../reporting/rep205.php:102
 +#: ../reporting/rep205.php:188
  msgid "Turnover"
  msgstr ""
  
@@@ -12046,33 -10466,25 +11820,30 @@@ msgstr "
  msgid "Back Orders Only"
  msgstr ""
  
 -#: reporting/rep105.php:109 reporting/rep204.php:84
 -#: sales/inquiry/customer_allocation_inquiry.php:147
 -#: sales/inquiry/customer_inquiry.php:219
 +#: ../reporting/rep105.php:109
 +#: ../reporting/rep204.php:84
 +#: ../sales/inquiry/customer_allocation_inquiry.php:147
- #: ../sales/inquiry/customer_inquiry.php:202
  msgid "Order"
  msgstr ""
  
 -#: reporting/rep105.php:109 reporting/rep106.php:83 reporting/rep112.php:190
 -#: sales/create_recurrent_invoices.php:134
 -#: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:317
 -#: sales/customer_invoice.php:390 sales/manage/customers.php:255
 -#: sales/manage/customers.php:294 sales/manage/recurrent_invoices.php:102
 -#: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:224
 -#: sales/inquiry/sales_deliveries_view.php:184
 -#: sales/inquiry/sales_orders_view.php:265
 -#: sales/inquiry/sales_orders_view.php:279
 +#: ../reporting/rep105.php:109
- #: ../reporting/rep106.php:83
- #: ../reporting/rep112.php:175
++#: ../reporting/rep106.php:90
 +#: ../sales/create_recurrent_invoices.php:134
 +#: ../sales/customer_credit_invoice.php:236
- #: ../sales/customer_delivery.php:363
- #: ../sales/customer_invoice.php:456
++#: ../sales/customer_delivery.php:328
++#: ../sales/customer_invoice.php:451
 +#: ../sales/manage/customers.php:255
- #: ../sales/manage/customers.php:294
- #: ../sales/manage/recurrent_invoices.php:102
++#: ../sales/manage/customers.php:295
++#: ../sales/manage/recurrent_invoices.php:108
 +#: ../sales/view/view_credit.php:58
- #: ../sales/inquiry/customer_inquiry.php:207
- #: ../sales/inquiry/sales_deliveries_view.php:184
- #: ../sales/inquiry/sales_orders_view.php:288
- #: ../sales/inquiry/sales_orders_view.php:302
++#: ../sales/inquiry/sales_deliveries_view.php:171
++#: ../sales/inquiry/sales_orders_view.php:251
++#: ../sales/inquiry/sales_orders_view.php:265
  msgid "Branch"
  msgstr ""
  
 -#: reporting/rep105.php:109 reporting/rep106.php:83
 +#: ../reporting/rep105.php:109
- #: ../reporting/rep106.php:83
++#: ../reporting/rep106.php:90
  msgid "Customer Ref"
  msgstr ""
  
@@@ -12089,10 -10500,8 +11860,9 @@@ msgstr "
  msgid "Loc"
  msgstr ""
  
 -#: reporting/rep105.php:114 sales/customer_delivery.php:410
 -#: sales/customer_invoice.php:478 sales/includes/ui/sales_order_ui.inc:147
 +#: ../reporting/rep105.php:114
- #: ../sales/customer_delivery.php:456
- #: ../sales/customer_invoice.php:553
- #: ../sales/includes/ui/sales_order_ui.inc:147
++#: ../sales/customer_delivery.php:421
++#: ../sales/includes/ui/sales_order_ui.inc:148
  msgid "Delivered"
  msgstr ""
  
@@@ -12104,172 -10513,131 +11874,147 @@@ msgstr "
  msgid "Order Status Listing"
  msgstr ""
  
- #: ../reporting/rep106.php:84
 -#: reporting/rep106.php:84
++#: ../reporting/rep106.php:91
  msgid "Inv Date"
  msgstr ""
  
- #: ../reporting/rep106.php:84
- #: ../reporting/rep106.php:88
- #: ../reporting/rep106.php:89
 -#: reporting/rep106.php:84 reporting/rep106.php:88 reporting/rep106.php:89
 -#: sales/manage/sales_people.php:99 sales/manage/sales_people.php:159
 -#: sales/manage/sales_people.php:161
++#: ../reporting/rep106.php:91
++#: ../reporting/rep106.php:95
++#: ../reporting/rep106.php:96
 +#: ../sales/manage/sales_people.php:99
 +#: ../sales/manage/sales_people.php:159
 +#: ../sales/manage/sales_people.php:161
  msgid "Provision"
  msgstr ""
  
- #: ../reporting/rep106.php:88
 -#: reporting/rep106.php:88
++#: ../reporting/rep106.php:95
  msgid "Salesman"
  msgstr ""
  
- #: ../reporting/rep106.php:89
 -#: reporting/rep106.php:89 sales/manage/sales_people.php:99
++#: ../reporting/rep106.php:96
 +#: ../sales/manage/sales_people.php:99
  msgid "Break Pt."
  msgstr ""
  
- #: ../reporting/rep106.php:97
 -#: reporting/rep106.php:97
++#: ../reporting/rep106.php:104
  msgid "Salesman Listing"
  msgstr ""
  
 -#: reporting/rep107.php:68 reporting/rep107.php:92
 -#: reporting/includes/doctext.inc:105
 +#: ../reporting/rep107.php:88
- #: ../reporting/rep107.php:111
- #: ../reporting/includes/doctext.inc:118
++#: ../reporting/rep107.php:114
++#: ../reporting/includes/doctext.inc:117
  msgid "INVOICE"
  msgstr ""
  
- #: ../reporting/rep107.php:196
 -#: reporting/rep107.php:156 reporting/rep109.php:155 reporting/rep110.php:162
 -#: reporting/rep111.php:158 reporting/rep113.php:150
 -#: 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
++#: ../reporting/rep107.php:199
 +msgid "Prepayments invoiced to this order up to day:"
 +msgstr ""
 +
- #: ../reporting/rep107.php:203
++#: ../reporting/rep107.php:206
 +msgid "Invoice reference"
 +msgstr ""
 +
- #: ../reporting/rep107.php:220
++#: ../reporting/rep107.php:223
 +msgid "Total payments:"
 +msgstr ""
 +
- #: ../reporting/rep107.php:234
- #: ../reporting/rep109.php:158
- #: ../reporting/rep110.php:162
- #: ../reporting/rep111.php:155
- #: ../reporting/rep113.php:147
++#: ../reporting/rep107.php:237
++#: ../reporting/rep109.php:159
++#: ../reporting/rep110.php:161
++#: ../reporting/rep111.php:157
++#: ../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/includes/ui/sales_credit_ui.inc:222
  msgid "Shipping"
  msgstr ""
  
- #: ../reporting/rep107.php:280
- #: ../reporting/rep109.php:210
- #: ../reporting/rep111.php:207
 -#: reporting/rep108.php:85 reporting/rep108.php:113
 -#: reporting/includes/doctext.inc:216
++#: ../reporting/rep107.php:283
++#: ../reporting/rep109.php:211
++#: ../reporting/rep111.php:209
 +msgid "TOTAL ORDER VAT INCL."
 +msgstr ""
 +
- #: ../reporting/rep107.php:286
++#: ../reporting/rep107.php:289
 +msgid "THIS INVOICE"
 +msgstr ""
 +
 +#: ../reporting/rep108.php:85
- #: ../reporting/rep108.php:110
- #: ../reporting/includes/doctext.inc:238
++#: ../reporting/rep108.php:113
++#: ../reporting/includes/doctext.inc:237
  msgid "STATEMENT"
  msgstr ""
  
- #: ../reporting/rep108.php:127
 -#: reporting/rep108.php:130
++#: ../reporting/rep108.php:130
  msgid "Outstanding Transactions"
  msgstr ""
  
- #: ../reporting/rep108.php:170
 -#: reporting/rep108.php:173
++#: ../reporting/rep108.php:173
  msgid "Statement"
  msgstr ""
  
- #: ../reporting/rep108.php:170
 -#: reporting/rep108.php:173
++#: ../reporting/rep108.php:173
  msgid "as of"
  msgstr ""
  
- #: ../reporting/rep109.php:66
- #: ../reporting/rep109.php:94
- #: ../reporting/rep109.php:99
- #: ../reporting/includes/doctext.inc:65
 -#: reporting/rep109.php:65 reporting/rep109.php:91 reporting/rep109.php:96
 -#: reporting/includes/doctext.inc:53
++#: ../reporting/rep109.php:64
++#: ../reporting/rep109.php:95
++#: ../reporting/rep109.php:100
++#: ../reporting/includes/doctext.inc:64
  msgid "SALES ORDER"
  msgstr ""
  
- #: ../reporting/rep109.php:68
- #: ../reporting/rep109.php:89
- #: ../reporting/rep109.php:99
- #: ../reporting/includes/doctext.inc:65
 -#: reporting/rep109.php:67 reporting/rep109.php:86 reporting/rep109.php:96
 -#: reporting/includes/doctext.inc:53
++#: ../reporting/rep109.php:66
++#: ../reporting/rep109.php:90
++#: ../reporting/rep109.php:100
++#: ../reporting/includes/doctext.inc:64
  msgid "QUOTE"
  msgstr ""
  
- #: ../reporting/rep109.php:164
- #: ../reporting/rep111.php:161
 -#: reporting/rep109.php:161 reporting/rep111.php:164
++#: ../reporting/rep109.php:165
++#: ../reporting/rep111.php:163
  msgid "TOTAL ORDER EX VAT"
  msgstr ""
  
- #: ../reporting/rep110.php:70
 -#: reporting/rep109.php:207 reporting/rep111.php:210
 -msgid "TOTAL ORDER VAT INCL."
 -msgstr ""
 -
 -#: reporting/rep110.php:70
++#: ../reporting/rep110.php:69
  msgid "DELIVERY"
  msgstr ""
  
- #: ../reporting/rep110.php:72
- #: ../reporting/rep110.php:93
- #: ../reporting/includes/doctext.inc:82
 -#: reporting/rep110.php:72 reporting/rep110.php:93
 -#: reporting/includes/doctext.inc:70
++#: ../reporting/rep110.php:71
++#: ../reporting/rep110.php:92
++#: ../reporting/includes/doctext.inc:81
  msgid "PACKING SLIP"
  msgstr ""
  
- #: ../reporting/rep110.php:88
- #: ../reporting/includes/doctext.inc:82
 -#: reporting/rep110.php:88 reporting/includes/doctext.inc:70
++#: ../reporting/rep110.php:87
++#: ../reporting/includes/doctext.inc:81
  msgid "DELIVERY NOTE"
  msgstr ""
  
- #: ../reporting/rep110.php:206
 -#: reporting/rep110.php:206
++#: ../reporting/rep110.php:205
  msgid "TOTAL DELIVERY INCL. VAT"
  msgstr ""
  
 -#: reporting/rep111.php:64 reporting/includes/doctext.inc:38
 +#: ../reporting/rep111.php:64
- #: ../reporting/includes/doctext.inc:50
++#: ../reporting/includes/doctext.inc:49
  msgid "SALES QUOTATION"
  msgstr ""
  
 -#: reporting/rep112.php:95 reporting/includes/doctext.inc:176
 +#: ../reporting/rep112.php:83
- #: ../reporting/includes/doctext.inc:198
++#: ../reporting/includes/doctext.inc:197
  msgid "RECEIPT"
  msgstr ""
  
- #: ../reporting/rep112.php:114
- #: ../reporting/rep210.php:122
 -#: reporting/rep112.php:129 reporting/rep210.php:137
--msgid "As advance / full / part / payment towards:"
--msgstr ""
--
- #: ../reporting/rep112.php:155
 -#: reporting/rep112.php:170
--msgid "TOTAL RECEIPT"
--msgstr ""
--
- #: ../reporting/rep112.php:166
 -#: reporting/rep112.php:181
--msgid "Received / Sign"
--msgstr ""
--
- #: ../reporting/rep112.php:168
 -#: reporting/rep112.php:183
--msgid "By Cash / Cheque* / Draft No."
--msgstr ""
--
- #: ../reporting/rep112.php:170
 -#: reporting/rep112.php:185
--msgid "Dated"
--msgstr ""
--
- #: ../reporting/rep112.php:173
 -#: reporting/rep112.php:188
--msgid "Drawn on Bank"
--msgstr ""
--
 -#: reporting/rep113.php:67 reporting/rep113.php:89
 -#: reporting/includes/doctext.inc:91
 +#: ../reporting/rep113.php:67
- #: ../reporting/rep113.php:86
- #: ../reporting/includes/doctext.inc:103
++#: ../reporting/rep113.php:89
++#: ../reporting/includes/doctext.inc:102
  msgid "CREDIT NOTE"
  msgstr ""
  
- #: ../reporting/rep113.php:191
 -#: reporting/rep113.php:194 sales/view/view_credit.php:143
++#: ../reporting/rep113.php:194
 +#: ../sales/view/view_credit.php:143
  msgid "TOTAL CREDIT"
  msgstr ""
  
@@@ -12348,27 -10713,25 +12093,22 @@@ msgstr "
  msgid "Tax_Id"
  msgstr ""
  
 -#: reporting/rep209.php:87 reporting/rep209.php:103
 -#: reporting/includes/doctext.inc:149
 +#: ../reporting/rep209.php:87
- #: ../reporting/rep209.php:100
- #: ../reporting/includes/doctext.inc:171
++#: ../reporting/rep209.php:103
++#: ../reporting/includes/doctext.inc:170
  msgid "PURCHASE ORDER"
  msgstr ""
  
- #: ../reporting/rep209.php:209
 -#: reporting/rep209.php:209
++#: ../reporting/rep209.php:212
  msgid "TOTAL PO"
  msgstr ""
  
 -#: reporting/rep210.php:96 reporting/rep210.php:121
 -#: reporting/includes/doctext.inc:129
 +#: ../reporting/rep210.php:84
- #: ../reporting/rep210.php:106
- #: ../reporting/includes/doctext.inc:151
++#: ../reporting/includes/doctext.inc:150
  msgid "REMITTANCE"
  msgstr ""
  
- #: ../reporting/rep210.php:165
 -#: reporting/rep210.php:180
--msgid "TOTAL REMITTANCE"
--msgstr ""
--
 -#: reporting/rep301.php:178
 +#: ../reporting/rep301.php:178
  msgid "Inventory Valuation Report"
  msgstr ""
  
@@@ -12421,10 -10780,8 +12161,10 @@@ msgstr "
  msgid "Qty"
  msgstr ""
  
 -#: reporting/rep304.php:114 reporting/rep309.php:98
 -#: sales/manage/customer_branches.php:240 sales/manage/customers.php:264
 +#: ../reporting/rep304.php:114
 +#: ../reporting/rep309.php:98
- #: ../sales/manage/customer_branches.php:241
- #: ../sales/manage/customers.php:264
++#: ../sales/manage/customer_branches.php:228
++#: ../sales/manage/customers.php:265
  msgid "Sales"
  msgstr ""
  
@@@ -12485,7 -10841,7 +12225,12 @@@ msgstr "
  msgid "StockIn"
  msgstr ""
  
 -#: reporting/rep308.php:230
++#: ../reporting/rep308.php:230
++#: ../sales/inquiry/sales_orders_view.php:139
++msgid "Delivery"
++msgstr ""
++
 +#: ../reporting/rep308.php:230
  msgid "ClosingStock"
  msgstr ""
  
@@@ -12535,9 -10890,8 +12280,9 @@@ msgstr "
  msgid "Work Order Listing"
  msgstr ""
  
 -#: reporting/rep409.php:60 reporting/rep409.php:73
 -#: reporting/includes/doctext.inc:192
 +#: ../reporting/rep409.php:59
 +#: ../reporting/rep409.php:72
- #: ../reporting/includes/doctext.inc:214
++#: ../reporting/includes/doctext.inc:213
  msgid "WORK ORDER"
  msgstr ""
  
@@@ -12553,9 -10907,7 +12298,9 @@@ msgstr "
  msgid "Dimension Summary"
  msgstr ""
  
 -#: reporting/rep601.php:86 reporting/includes/doctext.inc:247
 +#: ../reporting/rep601.php:86
 +#: ../reporting/rep602.php:87
- #: ../reporting/includes/doctext.inc:260
++#: ../reporting/includes/doctext.inc:259
  msgid "Bank Account"
  msgstr ""
  
@@@ -13155,196 -11387,150 +12900,195 @@@ msgstr "
  msgid "Ta&x Report"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:18
- #: ../reporting/includes/doctext.inc:156
 -#: 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:20
++#: ../reporting/includes/doctext.inc:155
 +#: ../sales/view/view_dispatch.php:51
 +#: ../sales/view/view_invoice.php:53
  msgid "Charge To"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:23
 -#: reporting/includes/doctext.inc:23 sales/view/view_dispatch.php:74
++#: ../reporting/includes/doctext.inc:25
 +#: ../sales/view/view_dispatch.php:74
  msgid "Delivered To"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:30
 -#: 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:148
++#: ../reporting/includes/doctext.inc:32
 +#: ../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:148
++#: ../sales/includes/ui/sales_order_ui.inc:149
  msgid "Discount %"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:33
 -#: reporting/includes/doctext.inc:33
++#: ../reporting/includes/doctext.inc:35
  msgid "All amounts stated in"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:51
 -#: reporting/includes/doctext.inc:39
++#: ../reporting/includes/doctext.inc:50
  msgid "Quotation No."
  msgstr ""
  
 -#: 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:55
++#: ../reporting/includes/doctext.inc:72
++#: ../reporting/includes/doctext.inc:93
++#: ../reporting/includes/doctext.inc:107
++#: ../reporting/includes/doctext.inc:130
++#: ../reporting/includes/doctext.inc:160
++#: ../reporting/includes/doctext.inc:183
++#: ../reporting/includes/doctext.inc:201
++#: ../reporting/includes/doctext.inc:239
+ 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: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"
++#: ../sales/manage/customer_branches.php:282
+ msgid "Sales Person"
  msgstr ""
  
 -#: 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: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:162
 +#: ../reporting/includes/doctext.inc:185
++#: ../reporting/includes/doctext.inc:203
 +#: ../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
  msgid "Your VAT no."
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:59
 -#: reporting/includes/doctext.inc:47
++#: ../reporting/includes/doctext.inc:58
  msgid "Our Quotation No"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:60
 -#: 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:599
++#: ../reporting/includes/doctext.inc:59
 +#: ../sales/view/view_sales_order.php:69
- #: ../sales/inquiry/sales_orders_view.php:305
- #: ../sales/includes/ui/sales_order_ui.inc:597
++#: ../sales/inquiry/sales_orders_view.php:268
  msgid "Valid until"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:65
 -#: reporting/includes/doctext.inc:54
++#: ../reporting/includes/doctext.inc:64
 +msgid "PREPAYMENT ORDER"
 +msgstr ""
 +
- #: ../reporting/includes/doctext.inc:66
++#: ../reporting/includes/doctext.inc:65
  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:205
- #: ../reporting/includes/doctext.inc:243
 -#: 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:75
++#: ../reporting/includes/doctext.inc:96
++#: ../reporting/includes/doctext.inc:110
++#: ../reporting/includes/doctext.inc:137
++#: ../reporting/includes/doctext.inc:204
++#: ../reporting/includes/doctext.inc:242
 +#: ../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:82
  msgid "Delivery Note No."
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:98
 -#: reporting/includes/doctext.inc:86
++#: ../reporting/includes/doctext.inc:97
  msgid "To Be Invoiced Before"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:104
 -#: reporting/includes/doctext.inc:92
++#: ../reporting/includes/doctext.inc:103
  msgid "Credit No."
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:105
 -#: reporting/includes/doctext.inc:93
++#: ../reporting/includes/doctext.inc:104
  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:116
 +msgid "PREPAYMENT INVOICE"
 +msgstr ""
 +
- #: ../reporting/includes/doctext.inc:118
++#: ../reporting/includes/doctext.inc:117
 +msgid "FINAL INVOICE"
 +msgstr ""
 +
- #: ../reporting/includes/doctext.inc:119
++#: ../reporting/includes/doctext.inc:118
  msgid "Invoice No."
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:121
 -#: reporting/includes/doctext.inc:108
++#: ../reporting/includes/doctext.inc:120
  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:136
 +msgid "Date of Payment"
 +msgstr ""
 +
- #: ../reporting/includes/doctext.inc:143
++#: ../reporting/includes/doctext.inc:142
 +msgid "Date of Sale"
 +msgstr ""
 +
- #: ../reporting/includes/doctext.inc:152
++#: ../reporting/includes/doctext.inc:151
  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:152
++#: ../reporting/includes/doctext.inc:172
  msgid "Order To"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:172
 -#: reporting/includes/doctext.inc:150
++#: ../reporting/includes/doctext.inc:171
  msgid "Purchase Order No."
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:176
 -#: reporting/includes/doctext.inc:154
++#: ../reporting/includes/doctext.inc:175
  msgid "Deliver To"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:199
 -#: reporting/includes/doctext.inc:177
++#: ../reporting/includes/doctext.inc:198
  msgid "Receipt No."
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:200
 -#: reporting/includes/doctext.inc:178
++#: ../reporting/includes/doctext.inc:199
  msgid "With thanks from"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:215
 -#: reporting/includes/doctext.inc:193
++#: ../reporting/includes/doctext.inc:214
  msgid "Work Order No."
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:246
 -#: reporting/includes/doctext.inc:224
++#: ../reporting/includes/doctext.inc:245
  msgid "DueDate"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:272
- #: ../reporting/includes/pdf_report.inc:1019
 -#: reporting/includes/doctext.inc:259 reporting/includes/pdf_report.inc:1019
++#: ../reporting/includes/doctext.inc:271
++#: ../reporting/includes/pdf_report.inc:1021
  msgid "You can pay through"
  msgstr ""
  
- #: ../reporting/includes/doctext.inc:276
 -#: reporting/includes/doctext.inc:263
++#: ../reporting/includes/doctext.inc:275
  msgid "* Subject to Realisation of the Cheque."
  msgstr ""
  
- #: ../reporting/includes/excel_report.inc:67
- #: ../reporting/includes/pdf_report.inc:80
 -#: reporting/includes/excel_report.inc:67 reporting/includes/pdf_report.inc:80
++#: ../reporting/includes/excel_report.inc:68
++#: ../reporting/includes/pdf_report.inc:81
  msgid ""
  "The security settings on your account do not permit you to print this report"
  msgstr ""
  
 -#: reporting/includes/excel_report.inc:262
 -#: reporting/includes/pdf_report.inc:316
 +#: ../reporting/includes/excel_report.inc:262
- #: ../reporting/includes/pdf_report.inc:316
++#: ../reporting/includes/pdf_report.inc:317
  msgid "Print Out Date"
  msgstr ""
  
 -#: reporting/includes/excel_report.inc:268
 -#: reporting/includes/pdf_report.inc:325
 +#: ../reporting/includes/excel_report.inc:268
- #: ../reporting/includes/pdf_report.inc:325
++#: ../reporting/includes/pdf_report.inc:326
  msgid "Fiscal Year"
  msgstr ""
  
@@@ -13352,13 -11538,13 +13096,13 @@@
  msgid "Report Date"
  msgstr ""
  
 -#: reporting/includes/excel_report.inc:413
 -#: reporting/includes/pdf_report.inc:600
 +#: ../reporting/includes/excel_report.inc:413
- #: ../reporting/includes/pdf_report.inc:600
++#: ../reporting/includes/pdf_report.inc:602
  msgid "Generated At"
  msgstr ""
  
 -#: reporting/includes/excel_report.inc:419
 -#: reporting/includes/pdf_report.inc:609
 +#: ../reporting/includes/excel_report.inc:419
- #: ../reporting/includes/pdf_report.inc:609
++#: ../reporting/includes/pdf_report.inc:611
  msgid "Generated By"
  msgstr ""
  
@@@ -13370,49 -11556,47 +13114,49 @@@ msgstr "
  msgid "Domicile"
  msgstr ""
  
- #: ../reporting/includes/header2.inc:146
- #: ../reporting/includes/pdf_report.inc:352
- #: ../reporting/includes/pdf_report.inc:501
- #: ../reporting/includes/pdf_report.inc:628
 -#: reporting/includes/header2.inc:147 reporting/includes/pdf_report.inc:352
 -#: reporting/includes/pdf_report.inc:501 reporting/includes/pdf_report.inc:628
++#: ../reporting/includes/header2.inc:147
++#: ../reporting/includes/pdf_report.inc:353
++#: ../reporting/includes/pdf_report.inc:503
++#: ../reporting/includes/pdf_report.inc:630
  msgid "Page"
  msgstr ""
  
- #: ../reporting/includes/pdf_report.inc:583
 -#: reporting/includes/pdf_report.inc:583
++#: ../reporting/includes/pdf_report.inc:585
  msgid "Report Period"
  msgstr ""
  
- #: ../reporting/includes/pdf_report.inc:986
- #: ../reporting/includes/pdf_report.inc:1034
 -#: reporting/includes/pdf_report.inc:986
 -#: reporting/includes/pdf_report.inc:1034
++#: ../reporting/includes/pdf_report.inc:988
++#: ../reporting/includes/pdf_report.inc:1036
  #, php-format
  msgid "You have no email contact defined for this type of document for '%s'."
  msgstr ""
  
- #: ../reporting/includes/pdf_report.inc:1005
 -#: reporting/includes/pdf_report.inc:1005
++#: ../reporting/includes/pdf_report.inc:1007
  msgid "Dear"
  msgstr ""
  
- #: ../reporting/includes/pdf_report.inc:1006
 -#: reporting/includes/pdf_report.inc:1006
++#: ../reporting/includes/pdf_report.inc:1008
  msgid "Attached you will find "
  msgstr ""
  
- #: ../reporting/includes/pdf_report.inc:1022
 -#: reporting/includes/pdf_report.inc:1022
++#: ../reporting/includes/pdf_report.inc:1024
  msgid "Kindest regards"
  msgstr ""
  
- #: ../reporting/includes/pdf_report.inc:1037
 -#: reporting/includes/pdf_report.inc:1037
++#: ../reporting/includes/pdf_report.inc:1039
  msgid "Sending document by email failed"
  msgstr ""
  
- #: ../reporting/includes/pdf_report.inc:1037
- #: ../reporting/includes/pdf_report.inc:1040
 -#: reporting/includes/pdf_report.inc:1037
 -#: reporting/includes/pdf_report.inc:1040
++#: ../reporting/includes/pdf_report.inc:1039
++#: ../reporting/includes/pdf_report.inc:1042
  msgid "Email:"
  msgstr ""
  
- #: ../reporting/includes/pdf_report.inc:1040
 -#: reporting/includes/pdf_report.inc:1040
++#: ../reporting/includes/pdf_report.inc:1042
  msgid "has been sent by email to destination."
  msgstr ""
  
- #: ../reporting/includes/pdf_report.inc:1070
 -#: reporting/includes/pdf_report.inc:1070
++#: ../reporting/includes/pdf_report.inc:1072
  msgid "Report has been sent to network printer "
  msgstr ""
  
@@@ -13464,19 -11648,19 +13208,7 @@@ msgstr "
  msgid "No Currency Filter"
  msgstr ""
  
- #: ../reporting/includes/reports_classes.inc:234
 -#: reporting/includes/reports_classes.inc:234
--msgid "PDF/Printer"
--msgstr ""
--
- #: ../reporting/includes/reports_classes.inc:241
 -#: reporting/includes/reports_classes.inc:241
--msgid "Portrait"
--msgstr ""
--
- #: ../reporting/includes/reports_classes.inc:241
 -#: reporting/includes/reports_classes.inc:241
--msgid "Landscape"
--msgstr ""
--
 -#: reporting/includes/reports_classes.inc:252
 +#: ../reporting/includes/reports_classes.inc:252
  msgid "No Graphics"
  msgstr ""
  
@@@ -13571,24 -11755,24 +13303,24 @@@ msgstr "
  msgid "Invoice date:"
  msgstr ""
  
 -#: sales/create_recurrent_invoices.php:134
 -#: sales/manage/recurrent_invoices.php:102
 +#: ../sales/create_recurrent_invoices.php:134
- #: ../sales/manage/recurrent_invoices.php:102
++#: ../sales/manage/recurrent_invoices.php:108
  msgid "Template No"
  msgstr ""
  
 -#: sales/create_recurrent_invoices.php:134
 -#: sales/manage/recurrent_invoices.php:102
 +#: ../sales/create_recurrent_invoices.php:134
- #: ../sales/manage/recurrent_invoices.php:102
++#: ../sales/manage/recurrent_invoices.php:108
  msgid "Begin"
  msgstr ""
  
 -#: sales/create_recurrent_invoices.php:134
 -#: sales/manage/recurrent_invoices.php:102
 +#: ../sales/create_recurrent_invoices.php:134
- #: ../sales/manage/recurrent_invoices.php:102
++#: ../sales/manage/recurrent_invoices.php:108
  msgid "End"
  msgstr ""
  
 -#: sales/create_recurrent_invoices.php:134
 -#: sales/manage/recurrent_invoices.php:102
 -#: sales/manage/recurrent_invoices.php:185
 +#: ../sales/create_recurrent_invoices.php:134
- #: ../sales/manage/recurrent_invoices.php:102
- #: ../sales/manage/recurrent_invoices.php:185
++#: ../sales/manage/recurrent_invoices.php:108
++#: ../sales/manage/recurrent_invoices.php:191
  msgid "Last Created"
  msgstr ""
  
@@@ -13609,8 -11793,7 +13341,8 @@@ msgstr "
  msgid "Modifying Customer Credit Note #%d"
  msgstr ""
  
 -#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:683
 +#: ../sales/credit_note_entry.php:51
- #: ../sales/sales_order_entry.php:705
++#: ../sales/sales_order_entry.php:694
  msgid ""
  "There are no customers, or there are no customers with branches. Please "
  "define customers and customer branches."
@@@ -13675,8 -11857,7 +13407,8 @@@ msgstr "
  msgid "Credit Note Items"
  msgstr ""
  
 -#: sales/credit_note_entry.php:285 sales/customer_credit_invoice.php:383
 +#: ../sales/credit_note_entry.php:285
- #: ../sales/customer_credit_invoice.php:382
++#: ../sales/customer_credit_invoice.php:383
  msgid "Process Credit Note"
  msgstr ""
  
@@@ -13748,8 -11925,8 +13480,13 @@@ msgstr "
  msgid "Credit Shipping Cost"
  msgstr ""
  
 -#: sales/customer_credit_invoice.php:348
 -#: sales/includes/ui/sales_credit_ui.inc:323
++#: ../sales/customer_credit_invoice.php:330
++#: ../sales/includes/ui/sales_credit_ui.inc:233
++msgid "Credit Note Total"
++msgstr ""
++
 +#: ../sales/customer_credit_invoice.php:348
 +#: ../sales/includes/ui/sales_credit_ui.inc:323
  msgid "Credit Note Type"
  msgstr ""
  
@@@ -13763,7 -11940,7 +13500,7 @@@ msgstr "
  msgid "Write off the cost of the items to"
  msgstr ""
  
- #: ../sales/customer_credit_invoice.php:380
 -#: sales/customer_credit_invoice.php:381
++#: ../sales/customer_credit_invoice.php:381
  msgid "Update credit value for quantities entered"
  msgstr ""
  
@@@ -13841,15 -12011,7 +13578,15 @@@ msgstr "
  msgid "Select A Different Delivery"
  msgstr ""
  
 -#: sales/customer_delivery.php:94
 +#: ../sales/customer_delivery.php:94
- #: ../sales/customer_invoice.php:161
++#: ../sales/customer_invoice.php:156
 +msgid ""
 +"You have to set Deferred Income Account in GL Setup to entry prepayment "
 +"invoices."
 +msgstr ""
 +
 +#: ../sales/customer_delivery.php:98
 +#: ../sales/customer_delivery.php:103
  msgid "Select a different sales order to delivery"
  msgstr ""
  
@@@ -13899,8 -12059,7 +13636,8 @@@ msgstr "
  msgid "The entered dead-line for invoice is invalid."
  msgstr ""
  
 -#: sales/customer_delivery.php:176 sales/customer_invoice.php:300
 +#: ../sales/customer_delivery.php:188
- #: ../sales/customer_invoice.php:354
++#: ../sales/customer_invoice.php:349
  msgid "The entered shipping value is not numeric."
  msgstr ""
  
@@@ -13914,83 -12073,70 +13651,73 @@@ msgid "
  "for: "
  msgstr ""
  
- #: ../sales/customer_delivery.php:305
- msgid ""
- "The delivery cannot be processed because there is an insufficient quantity "
- "for item:"
- msgstr ""
- 
- #: ../sales/customer_delivery.php:377
 -#: sales/customer_delivery.php:331
++#: ../sales/customer_delivery.php:342
  msgid "For Sales Order"
  msgstr ""
  
- #: ../sales/customer_delivery.php:386
 -#: sales/customer_delivery.php:340
++#: ../sales/customer_delivery.php:351
  msgid "Delivery From"
  msgstr ""
  
- #: ../sales/customer_delivery.php:435
 -#: sales/customer_delivery.php:389
++#: ../sales/customer_delivery.php:400
  msgid "Invoice Dead-line"
  msgstr ""
  
- #: ../sales/customer_delivery.php:445
- #: ../sales/customer_invoice.php:539
 -#: sales/customer_delivery.php:399 sales/customer_invoice.php:468
 -#: sales/includes/ui/sales_order_ui.inc:84
 -#: sales/includes/ui/sales_order_ui.inc:360
++#: ../sales/customer_delivery.php:410
++#: ../sales/customer_invoice.php:534
 +#: ../sales/includes/ui/sales_order_ui.inc:84
- #: ../sales/includes/ui/sales_order_ui.inc:360
++#: ../sales/includes/ui/sales_order_ui.inc:361
  msgid ""
  "The selected customer account is currently on hold. Please contact the "
  "credit control personnel to discuss."
  msgstr ""
  
- #: ../sales/customer_delivery.php:450
 -#: sales/customer_delivery.php:404
++#: ../sales/customer_delivery.php:415
  msgid "Delivery Items"
  msgstr ""
  
- #: ../sales/customer_delivery.php:456
 -#: sales/customer_delivery.php:410
++#: ../sales/customer_delivery.php:421
  msgid "Max. delivery"
  msgstr ""
  
- #: ../sales/customer_delivery.php:456
- #: ../sales/customer_invoice.php:553
 -#: sales/customer_delivery.php:410 sales/customer_invoice.php:478
++#: ../sales/customer_delivery.php:421
  msgid "Invoiced"
  msgstr ""
  
- #: ../sales/customer_delivery.php:533
- #: ../sales/customer_invoice.php:642
 -#: sales/customer_delivery.php:487 sales/customer_invoice.php:563
++#: ../sales/customer_delivery.php:498
  msgid "Shipping Cost"
  msgstr ""
  
- #: ../sales/customer_delivery.php:553
- #: ../sales/includes/ui/sales_order_ui.inc:237
 -#: sales/customer_delivery.php:507 sales/includes/ui/sales_order_ui.inc:237
++#: ../sales/customer_delivery.php:518
++#: ../sales/includes/ui/sales_order_ui.inc:238
  msgid ""
  "Marked items have insufficient quantities in stock as on day of delivery."
  msgstr ""
  
- #: ../sales/customer_delivery.php:557
 -#: sales/customer_delivery.php:511
++#: ../sales/customer_delivery.php:522
  msgid "Action For Balance"
  msgstr ""
  
- #: ../sales/customer_delivery.php:564
- #: ../sales/customer_delivery.php:566
- #: ../sales/customer_delivery.php:569
- #: ../sales/customer_invoice.php:694
 -#: sales/customer_delivery.php:518 sales/customer_delivery.php:520
 -#: sales/customer_delivery.php:523 sales/customer_invoice.php:592
++#: ../sales/customer_delivery.php:529
++#: ../sales/customer_delivery.php:531
++#: ../sales/customer_delivery.php:534
  msgid "Refresh document page"
  msgstr ""
  
- #: ../sales/customer_delivery.php:566
 -#: sales/customer_delivery.php:520
++#: ../sales/customer_delivery.php:531
  msgid "Reset quantity"
  msgstr ""
  
- #: ../sales/customer_delivery.php:569
 -#: sales/customer_delivery.php:523
++#: ../sales/customer_delivery.php:534
  msgid "Clear quantity"
  msgstr ""
  
- #: ../sales/customer_delivery.php:571
 -#: sales/customer_delivery.php:525
++#: ../sales/customer_delivery.php:536
  msgid "Process Dispatch"
  msgstr ""
  
- #: ../sales/customer_delivery.php:572
- #: ../sales/customer_invoice.php:696
- #: ../sales/sales_order_entry.php:752
 -#: sales/customer_delivery.php:526 sales/customer_invoice.php:594
 -#: sales/sales_order_entry.php:731
++#: ../sales/customer_delivery.php:537
++#: ../sales/sales_order_entry.php:741
  msgid "Check entered data and save document"
  msgstr ""
  
@@@ -14015,24 -12157,20 +13742,24 @@@ msgstr "
  msgid "Selected deliveries has been processed"
  msgstr ""
  
 -#: sales/customer_invoice.php:57 sales/customer_invoice.php:86
 -#: sales/sales_order_entry.php:212
 +#: ../sales/customer_invoice.php:60
- #: ../sales/customer_invoice.php:89
++#: ../sales/customer_invoice.php:84
 +#: ../sales/sales_order_entry.php:218
  msgid "&View This Invoice"
  msgstr ""
  
 -#: sales/customer_invoice.php:59 sales/customer_invoice.php:88
 +#: ../sales/customer_invoice.php:62
- #: ../sales/customer_invoice.php:91
++#: ../sales/customer_invoice.php:86
  msgid "&Print This Invoice"
  msgstr ""
  
 -#: sales/customer_invoice.php:60 sales/customer_invoice.php:89
 +#: ../sales/customer_invoice.php:63
- #: ../sales/customer_invoice.php:92
++#: ../sales/customer_invoice.php:87
  msgid "&Email This Invoice"
  msgstr ""
  
 -#: sales/customer_invoice.php:62 sales/sales_order_entry.php:225
 +#: ../sales/customer_invoice.php:65
- #: ../sales/sales_order_entry.php:231
++#: ../sales/sales_order_entry.php:228
  msgid "View the GL &Journal Entries for this Invoice"
  msgstr ""
  
@@@ -14040,118 -12178,101 +13767,90 @@@
  msgid "Select Another &Delivery For Invoicing"
  msgstr ""
  
- #: ../sales/customer_invoice.php:75
- #: ../sales/sales_order_entry.php:241
 -#: sales/customer_invoice.php:72 sales/sales_order_entry.php:235
++#: ../sales/customer_invoice.php:70
++#: ../sales/sales_order_entry.php:238
  msgid "Entry &customer payment for this invoice"
  msgstr ""
  
- #: ../sales/customer_invoice.php:87
 -#: sales/customer_invoice.php:84
++#: ../sales/customer_invoice.php:82
  #, php-format
  msgid "Sales Invoice # %d has been updated."
  msgstr ""
  
- #: ../sales/customer_invoice.php:94
 -#: sales/customer_invoice.php:91
++#: ../sales/customer_invoice.php:89
  msgid "Select Another &Invoice to Modify"
  msgstr ""
  
- #: ../sales/customer_invoice.php:133
 -#: sales/customer_invoice.php:130
++#: ../sales/customer_invoice.php:128
  msgid "Select a different delivery to invoice"
  msgstr ""
  
- #: ../sales/customer_invoice.php:134
 -#: sales/customer_invoice.php:131
++#: ../sales/customer_invoice.php:129
  msgid ""
  "There are no delivered items with a quantity left to invoice. There is "
  "nothing left to invoice."
  msgstr ""
  
- #: ../sales/customer_invoice.php:155
 -#: sales/customer_invoice.php:140
++#: ../sales/customer_invoice.php:150
  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:169
 -#: sales/customer_invoice.php:149
++#: ../sales/customer_invoice.php:164
  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:200
 -#: sales/customer_invoice.php:155
++#: ../sales/customer_invoice.php:195
  msgid ""
  "This page can only be opened after delivery selection. Please select "
  "delivery to invoicing first."
  msgstr ""
  
- #: ../sales/customer_invoice.php:202
 -#: sales/customer_invoice.php:157
++#: ../sales/customer_invoice.php:197
  msgid "Select Delivery to Invoice"
  msgstr ""
  
- #: ../sales/customer_invoice.php:207
- #: ../sales/customer_invoice.php:365
 -#: sales/customer_invoice.php:162 sales/customer_invoice.php:311
++#: ../sales/customer_invoice.php:202
++#: ../sales/customer_invoice.php:360
  msgid ""
  "Selected quantity cannot be less than quantity credited nor more than "
  "quantity not invoiced yet."
  msgstr ""
  
- #: ../sales/customer_invoice.php:321
 -#: sales/customer_invoice.php:270
++#: ../sales/customer_invoice.php:316
  msgid "The entered invoice date is invalid."
  msgstr ""
  
- #: ../sales/customer_invoice.php:334
 -#: sales/customer_invoice.php:276
 -msgid "The entered invoice date is not in fiscal year."
 -msgstr ""
 -
 -#: sales/customer_invoice.php:282
++#: ../sales/customer_invoice.php:329
  msgid "The entered invoice due date is invalid."
  msgstr ""
  
- #: ../sales/customer_invoice.php:360
 -#: sales/customer_invoice.php:306
++#: ../sales/customer_invoice.php:355
  msgid "There are no item quantities on this invoice."
  msgstr ""
  
- #: ../sales/customer_invoice.php:370
 -#: sales/customer_invoice.php:394
 -msgid "Payment terms:"
 -msgstr ""
 -
 -#: sales/customer_invoice.php:397 sales/includes/ui/sales_order_ui.inc:397
 -#: sales/includes/ui/sales_order_ui.inc:401
 -msgid "Payment:"
 -msgstr ""
 -
 -#: sales/customer_invoice.php:474
 -msgid "Invoice Items"
++#: ../sales/customer_invoice.php:365
 +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:460
 -#: sales/customer_invoice.php:479
 -msgid "This Invoice"
++#: ../sales/customer_invoice.php:455
 +msgid "Payment terms:"
  msgstr ""
  
- #: ../sales/customer_invoice.php:545
- #: ../sales/sales_order_entry.php:728
 -#: sales/customer_invoice.php:487
 -msgid "Credited"
++#: ../sales/customer_invoice.php:540
++#: ../sales/sales_order_entry.php:717
 +msgid "Sales Order Items"
  msgstr ""
  
- #: ../sales/customer_invoice.php:545
 -#: sales/customer_invoice.php:581
 -msgid "Invoice Total"
++#: ../sales/customer_invoice.php:540
 +msgid "Invoice Items"
  msgstr ""
  
- #: ../sales/customer_invoice.php:554
- msgid "This Invoice"
- msgstr ""
- 
- #: ../sales/customer_invoice.php:561
- msgid "Credited"
- msgstr ""
- 
- #: ../sales/customer_invoice.php:663
- msgid "Invoice Total"
- msgstr ""
- 
- #: ../sales/customer_invoice.php:672
- msgid "Sales order:"
- msgstr ""
- 
- #: ../sales/customer_invoice.php:684
- msgid "Payments received:"
- msgstr ""
- 
- #: ../sales/customer_invoice.php:685
- msgid "Invoiced here:"
- msgstr ""
- 
- #: ../sales/customer_invoice.php:686
- msgid "Left to be invoiced:"
- msgstr ""
- 
 -#: sales/customer_payments.php:32
 +#: ../sales/customer_payments.php:32
  msgid "Customer Payment Entry"
  msgstr ""
  
@@@ -14159,104 -12280,97 +13858,104 @@@
  msgid "There are no customers defined in the system."
  msgstr ""
  
- #: ../sales/customer_payments.php:70
 -#: sales/customer_payments.php:70
++#: ../sales/customer_payments.php:71
  msgid "Invalid sales invoice number."
  msgstr ""
  
- #: ../sales/customer_payments.php:97
 -#: sales/customer_payments.php:97
++#: ../sales/customer_payments.php:98
  msgid "The customer payment has been successfully entered."
  msgstr ""
  
- #: ../sales/customer_payments.php:99
- #: ../sales/customer_payments.php:118
 -#: sales/customer_payments.php:99 sales/customer_payments.php:118
++#: ../sales/customer_payments.php:100
++#: ../sales/customer_payments.php:119
  msgid "&Print This Receipt"
  msgstr ""
  
- #: ../sales/customer_payments.php:101
 -#: sales/customer_payments.php:101
++#: ../sales/customer_payments.php:102
  msgid "&View this Customer Payment"
  msgstr ""
  
- #: ../sales/customer_payments.php:103
- #: ../sales/customer_payments.php:126
 -#: sales/customer_payments.php:103 sales/customer_payments.php:126
++#: ../sales/customer_payments.php:104
++#: ../sales/customer_payments.php:127
  msgid "Enter Another &Customer Payment"
  msgstr ""
  
- #: ../sales/customer_payments.php:105
 -#: sales/customer_payments.php:105
++#: ../sales/customer_payments.php:106
  msgid "Enter Payment to &Supplier"
  msgstr ""
  
- #: ../sales/customer_payments.php:109
- #: ../sales/customer_payments.php:120
 -#: sales/customer_payments.php:109 sales/customer_payments.php:120
++#: ../sales/customer_payments.php:110
++#: ../sales/customer_payments.php:121
  msgid "&View the GL Journal Entries for this Customer Payment"
  msgstr ""
  
- #: ../sales/customer_payments.php:116
 -#: sales/customer_payments.php:116
++#: ../sales/customer_payments.php:117
  msgid "The customer payment has been successfully updated."
  msgstr ""
  
- #: ../sales/customer_payments.php:124
 -#: sales/customer_payments.php:124
++#: ../sales/customer_payments.php:125
  msgid "Select Another Customer Payment for &Edition"
  msgstr ""
  
- #: ../sales/customer_payments.php:139
- #: ../sales/sales_order_entry.php:353
 -#: sales/customer_payments.php:139 sales/sales_order_entry.php:343
++#: ../sales/customer_payments.php:140
++#: ../sales/sales_order_entry.php:350
  msgid "There is no customer selected."
  msgstr ""
  
- #: ../sales/customer_payments.php:146
- #: ../sales/sales_order_entry.php:360
 -#: sales/customer_payments.php:146 sales/sales_order_entry.php:350
++#: ../sales/customer_payments.php:147
++#: ../sales/sales_order_entry.php:357
  msgid "This customer has no branch defined."
  msgstr ""
  
- #: ../sales/customer_payments.php:152
 -#: sales/customer_payments.php:152
++#: ../sales/customer_payments.php:153
  msgid "The entered date is invalid. Please enter a valid date for the payment."
  msgstr ""
  
- #: ../sales/customer_payments.php:182
- #: ../sales/customer_payments.php:188
 -#: sales/customer_payments.php:182 sales/customer_payments.php:188
++#: ../sales/customer_payments.php:183
++#: ../sales/customer_payments.php:189
  msgid "The entered amount is invalid or negative and cannot be processed."
  msgstr ""
  
- #: ../sales/customer_payments.php:214
 -#: sales/customer_payments.php:214
++#: ../sales/customer_payments.php:215
  msgid "The entered discount is not a valid number."
  msgstr ""
  
- #: ../sales/customer_payments.php:221
 -#: sales/customer_payments.php:221
++#: ../sales/customer_payments.php:222
  msgid ""
  "The balance of the amount and discount is zero or negative. Please enter "
  "valid amounts."
  msgstr ""
  
- #: ../sales/customer_payments.php:228
 -#: sales/customer_payments.php:228
++#: ../sales/customer_payments.php:229
  msgid "The entered payment amount is zero or negative."
  msgstr ""
  
- #: ../sales/customer_payments.php:332
 -#: sales/customer_payments.php:335
++#: ../sales/customer_payments.php:333
  msgid "Into Bank Account:"
  msgstr ""
  
- #: ../sales/customer_payments.php:335
- #: ../sales/customer_payments.php:337
 -#: sales/customer_payments.php:338 sales/customer_payments.php:340
++#: ../sales/customer_payments.php:336
++#: ../sales/customer_payments.php:338
  msgid "From Customer:"
  msgstr ""
  
- #: ../sales/customer_payments.php:369
 -#: sales/customer_payments.php:366
++#: ../sales/customer_payments.php:370
  msgid "Date of Deposit:"
  msgstr ""
  
- #: ../sales/customer_payments.php:383
 -#: sales/customer_payments.php:380
++#: ../sales/customer_payments.php:384
  msgid "Payment Amount:"
  msgstr ""
  
- #: ../sales/customer_payments.php:396
 -#: sales/customer_payments.php:393
++#: ../sales/customer_payments.php:397
  msgid "Customer prompt payment discount :"
  msgstr ""
  
- #: ../sales/customer_payments.php:406
 -#: sales/customer_payments.php:403
++#: ../sales/customer_payments.php:407
  msgid "Add Payment"
  msgstr ""
  
- #: ../sales/customer_payments.php:408
 -#: sales/customer_payments.php:405
++#: ../sales/customer_payments.php:409
  msgid "Update Payment"
  msgstr ""
  
@@@ -14384,212 -12493,209 +14083,211 @@@ msgstr "
  msgid "&Email Sales Invoice"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:229
 -#: sales/sales_order_entry.php:223
++#: ../sales/sales_order_entry.php:226
  msgid "Print &Receipt"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:234
 -#: sales/sales_order_entry.php:228
++#: ../sales/sales_order_entry.php:231
  msgid "Enter a &New Template Invoice"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:237
 -#: sales/sales_order_entry.php:231
++#: ../sales/sales_order_entry.php:234
  msgid "Enter a &New Direct Invoice"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:383
- msgid "Pre-payment required have to be positive and less than total amount."
 -#: sales/sales_order_entry.php:373
++#: ../sales/sales_order_entry.php:379
+ msgid ""
+ "This document cannot be processed because there is insufficient quantity for "
+ "items marked."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:388
- #: ../sales/sales_order_entry.php:402
- msgid ""
- "You must enter the person or company to whom delivery should be made to."
 -#: sales/sales_order_entry.php:380
++#: ../sales/sales_order_entry.php:385
++msgid "Pre-payment required have to be positive and less than total amount."
 +msgstr ""
 +
- #: ../sales/sales_order_entry.php:395
++#: ../sales/sales_order_entry.php:390
  msgid ""
- "This document cannot be processed because there is insufficient quantity for "
- "items marked."
+ "You must enter the person or company to whom delivery should be made to."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:407
 -#: sales/sales_order_entry.php:385
++#: ../sales/sales_order_entry.php:396
  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:416
 -#: sales/sales_order_entry.php:394
++#: ../sales/sales_order_entry.php:405
  msgid "The shipping cost entered is expected to be numeric."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:422
 -#: sales/sales_order_entry.php:400
++#: ../sales/sales_order_entry.php:411
  msgid "The Valid date is invalid."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:424
 -#: sales/sales_order_entry.php:402
++#: ../sales/sales_order_entry.php:413
  msgid "The delivery date is invalid."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:430
 -#: sales/sales_order_entry.php:408
++#: ../sales/sales_order_entry.php:419
  msgid "The requested valid date is before the date of the quotation."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:432
 -#: sales/sales_order_entry.php:410
++#: ../sales/sales_order_entry.php:421
  msgid "The requested delivery date is before the date of the order."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:441
 -#: sales/sales_order_entry.php:419
++#: ../sales/sales_order_entry.php:430
  msgid "You need to define a cash account for your Sales Point."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:479
 -#: sales/sales_order_entry.php:457
++#: ../sales/sales_order_entry.php:468
  msgid ""
  "The reference number field has been increased. Please save the document "
  "again."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:525
 -#: sales/sales_order_entry.php:503
++#: ../sales/sales_order_entry.php:514
  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:529
 -#: sales/sales_order_entry.php:507
++#: ../sales/sales_order_entry.php:518
  msgid "Price for inventory item must be entered and can not be less than 0"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:536
 -#: sales/sales_order_entry.php:514
++#: ../sales/sales_order_entry.php:525
  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:554
 -#: sales/sales_order_entry.php:532
++#: ../sales/sales_order_entry.php:543
  #, php-format
  msgid "Price %s is below Standard Cost %s"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:579
 -#: sales/sales_order_entry.php:557
++#: ../sales/sales_order_entry.php:568
  msgid ""
  "This item cannot be deleted because some of it has already been delivered."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:608
 -#: sales/sales_order_entry.php:586
++#: ../sales/sales_order_entry.php:597
  msgid "Direct delivery entry has been cancelled as requested."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:609
 -#: sales/sales_order_entry.php:587
++#: ../sales/sales_order_entry.php:598
  msgid "Enter a New Sales Delivery"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:611
 -#: sales/sales_order_entry.php:589
++#: ../sales/sales_order_entry.php:600
  msgid "Direct invoice entry has been cancelled as requested."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:612
 -#: sales/sales_order_entry.php:590
++#: ../sales/sales_order_entry.php:601
  msgid "Enter a New Sales Invoice"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:617
 -#: sales/sales_order_entry.php:595
++#: ../sales/sales_order_entry.php:606
  msgid "This sales quotation has been cancelled as requested."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:618
 -#: sales/sales_order_entry.php:596
++#: ../sales/sales_order_entry.php:607
  msgid "Enter a New Sales Quotation"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:625
 -#: sales/sales_order_entry.php:603
++#: ../sales/sales_order_entry.php:614
  msgid "Undelivered part of order has been cancelled as requested."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:626
 -#: sales/sales_order_entry.php:604
++#: ../sales/sales_order_entry.php:615
  msgid "Select Another Sales Order for Edition"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:630
 -#: sales/sales_order_entry.php:608
++#: ../sales/sales_order_entry.php:619
  msgid "This sales order has been cancelled as requested."
  msgstr ""
  
- #: ../sales/sales_order_entry.php:631
 -#: sales/sales_order_entry.php:609
++#: ../sales/sales_order_entry.php:620
  msgid "Enter a New Sales Order"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:709
 -#: sales/sales_order_entry.php:687
++#: ../sales/sales_order_entry.php:698
  msgid "Sales Invoice Items"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:710
 -#: sales/sales_order_entry.php:688
++#: ../sales/sales_order_entry.php:699
  msgid "Enter Delivery Details and Confirm Invoice"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:712
 -#: sales/sales_order_entry.php:690
++#: ../sales/sales_order_entry.php:701
  msgid "Place Invoice"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:715
 -#: sales/sales_order_entry.php:693
++#: ../sales/sales_order_entry.php:704
  msgid "Delivery Note Items"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:716
 -#: sales/sales_order_entry.php:694
++#: ../sales/sales_order_entry.php:705
  msgid "Enter Delivery Details and Confirm Dispatch"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:717
 -#: sales/sales_order_entry.php:695
++#: ../sales/sales_order_entry.php:706
  msgid "Cancel Delivery"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:718
 -#: sales/sales_order_entry.php:696
++#: ../sales/sales_order_entry.php:707
  msgid "Place Delivery"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:720
 -#: sales/sales_order_entry.php:698
++#: ../sales/sales_order_entry.php:709
  msgid "Quotation Date:"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:721
 -#: sales/sales_order_entry.php:699
++#: ../sales/sales_order_entry.php:710
  msgid "Sales Quotation Items"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:722
 -#: sales/sales_order_entry.php:700
++#: ../sales/sales_order_entry.php:711
  msgid "Enter Delivery Details and Confirm Quotation"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:723
 -#: sales/sales_order_entry.php:701
++#: ../sales/sales_order_entry.php:712
  msgid "Cancel Quotation"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:724
 -#: sales/sales_order_entry.php:702
++#: ../sales/sales_order_entry.php:713
  msgid "Place Quotation"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:725
 -#: sales/sales_order_entry.php:703
++#: ../sales/sales_order_entry.php:714
  msgid "Commit Quotations Changes"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:729
 -#: sales/sales_order_entry.php:706
 -msgid "Sales Order Items"
 -msgstr ""
 -
 -#: sales/sales_order_entry.php:707
++#: ../sales/sales_order_entry.php:718
  msgid "Enter Delivery Details and Confirm Order"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:732
 -#: sales/sales_order_entry.php:710
++#: ../sales/sales_order_entry.php:721
  msgid "Commit Order Changes"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:754
- #: ../sales/sales_order_entry.php:760
 -#: sales/sales_order_entry.php:733 sales/sales_order_entry.php:739
++#: ../sales/sales_order_entry.php:743
++#: ../sales/sales_order_entry.php:749
  msgid ""
  "Cancels document entry or removes sales order when editing an old document"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:755
- #: ../sales/sales_order_entry.php:764
 -#: sales/sales_order_entry.php:734 sales/sales_order_entry.php:743
++#: ../sales/sales_order_entry.php:744
++#: ../sales/sales_order_entry.php:753
  msgid "You are about to void this Document.\\nDo you want to continue?"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:758
 -#: sales/sales_order_entry.php:737
++#: ../sales/sales_order_entry.php:747
  msgid "Validate changes and update document"
  msgstr ""
  
- #: ../sales/sales_order_entry.php:762
 -#: sales/sales_order_entry.php:741
++#: ../sales/sales_order_entry.php:751
  msgid ""
  "You are about to cancel undelivered part of this order.\\nDo you want to "
  "continue?"
@@@ -14608,13 -12714,12 +14306,13 @@@ msgstr "
  msgid "Customer Allocations"
  msgstr ""
  
 -#: sales/allocations/customer_allocation_main.php:32
 -#: sales/manage/customer_branches.php:280 sales/manage/customers.php:328
 -#: sales/inquiry/customer_allocation_inquiry.php:42
 -#: sales/inquiry/customer_inquiry.php:48
 -#: sales/inquiry/sales_deliveries_view.php:116
 -#: sales/inquiry/sales_orders_view.php:243
 +#: ../sales/allocations/customer_allocation_main.php:32
- #: ../sales/manage/customer_branches.php:282
- #: ../sales/manage/customers.php:328
++#: ../sales/manage/customer_branches.php:266
++#: ../sales/manage/customers.php:329
 +#: ../sales/inquiry/customer_allocation_inquiry.php:42
 +#: ../sales/inquiry/customer_inquiry.php:44
- #: ../sales/inquiry/sales_deliveries_view.php:116
- #: ../sales/inquiry/sales_orders_view.php:266
++#: ../sales/inquiry/sales_deliveries_view.php:114
++#: ../sales/inquiry/sales_orders_view.php:228
  msgid "Select a customer: "
  msgstr ""
  
@@@ -14696,110 -12801,106 +14394,106 @@@ msgstr "
  msgid "The Branch short name cannot be empty."
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:88
 -#: sales/manage/customer_branches.php:88
++#: ../sales/manage/customer_branches.php:86
  msgid "Selected customer branch has been updated"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:106
 -#: sales/manage/customer_branches.php:106
++#: ../sales/manage/customer_branches.php:104
  msgid "New customer branch has been added"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:125
 -#: sales/manage/customer_branches.php:125
++#: ../sales/manage/customer_branches.php:120
  msgid ""
  "Cannot delete this branch because customer transactions have been created to "
  "this branch."
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:132
 -#: sales/manage/customer_branches.php:132
++#: ../sales/manage/customer_branches.php:127
  msgid ""
  "Cannot delete this branch because sales orders exist for it. Purge old sales "
  "orders first."
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:137
 -#: sales/manage/customer_branches.php:137
++#: ../sales/manage/customer_branches.php:132
  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:205
  msgid "Main Branch"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:237
 -#: sales/manage/customer_branches.php:236
++#: ../sales/manage/customer_branches.php:224
  msgid "Name and Contact"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:238
 -#: sales/manage/customer_branches.php:237
++#: ../sales/manage/customer_branches.php:225
  msgid "Branch Name:"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:239
 -#: sales/manage/customer_branches.php:238
++#: ../sales/manage/customer_branches.php:226
  msgid "Branch Short Name:"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:242
- #: ../sales/manage/customers.php:260
 -#: sales/manage/customer_branches.php:241 sales/manage/customers.php:260
++#: ../sales/manage/customer_branches.php:229
++#: ../sales/manage/customers.php:261
  msgid "Sales Person:"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:243
- #: ../sales/manage/customers.php:297
 -#: sales/manage/customer_branches.php:242 sales/manage/customers.php:297
++#: ../sales/manage/customer_branches.php:230
++#: ../sales/manage/customers.php:298
  msgid "Sales Area:"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:244
- #: ../sales/manage/recurrent_invoices.php:174
 -#: sales/manage/customer_branches.php:243
 -#: sales/manage/recurrent_invoices.php:174
++#: ../sales/manage/customer_branches.php:231
++#: ../sales/manage/recurrent_invoices.php:180
  msgid "Sales Group:"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:245
- #: ../sales/manage/customers.php:295
 -#: sales/manage/customer_branches.php:244 sales/manage/customers.php:295
++#: ../sales/manage/customer_branches.php:232
++#: ../sales/manage/customers.php:296
  msgid "Default Inventory Location:"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:246
- #: ../sales/manage/customers.php:296
 -#: sales/manage/customer_branches.php:245 sales/manage/customers.php:296
++#: ../sales/manage/customer_branches.php:233
++#: ../sales/manage/customers.php:297
  msgid "Default Shipping Company:"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:253
 -#: sales/manage/customer_branches.php:252
++#: ../sales/manage/customer_branches.php:240
  msgid "Accounts Receivable Account:"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:260
 -#: sales/manage/customer_branches.php:258
++#: ../sales/manage/customer_branches.php:247
  msgid "General contact data"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:270
 -#: sales/manage/customer_branches.php:268
++#: ../sales/manage/customer_branches.php:257
  msgid "Billing Address:"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:274
 -#: sales/manage/customer_branches.php:272
--msgid "Disable this Branch:"
--msgstr ""
--
- #: ../sales/manage/customer_branches.php:297
- #: ../sales/inquiry/sales_deliveries_view.php:185
 -#: sales/manage/customer_branches.php:295
 -#: sales/inquiry/sales_deliveries_view.php:185
++#: ../sales/manage/customer_branches.php:281
++#: ../sales/inquiry/sales_deliveries_view.php:172
  msgid "Contact"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:299
 -#: sales/manage/customer_branches.php:297
++#: ../sales/manage/customer_branches.php:283
  msgid "Area"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:300
 -#: sales/manage/customer_branches.php:298
++#: ../sales/manage/customer_branches.php:284
  msgid "Phone No"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:301
 -#: sales/manage/customer_branches.php:299
++#: ../sales/manage/customer_branches.php:285
  msgid "Fax No"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:303
 -#: sales/manage/customer_branches.php:301
++#: ../sales/manage/customer_branches.php:287
  msgid "Tax Group"
  msgstr ""
  
- #: ../sales/manage/customer_branches.php:321
- #: ../sales/includes/ui/sales_order_ui.inc:291
 -#: sales/manage/customer_branches.php:319
 -#: sales/includes/ui/sales_order_ui.inc:291
++#: ../sales/manage/customer_branches.php:303
++#: ../sales/includes/ui/sales_order_ui.inc:292
  msgid ""
  "The selected customer does not have any branches. Please create at least one "
  "branch."
@@@ -14890,65 -12990,65 +14584,65 @@@ msgstr "
  msgid "Customer status:"
  msgstr ""
  
- #: ../sales/manage/customers.php:266
 -#: sales/manage/customers.php:266
++#: ../sales/manage/customers.php:267
  msgid "Discount Percent:"
  msgstr ""
  
- #: ../sales/manage/customers.php:267
 -#: sales/manage/customers.php:267
++#: ../sales/manage/customers.php:268
  msgid "Prompt Payment Discount Percent:"
  msgstr ""
  
- #: ../sales/manage/customers.php:271
 -#: sales/manage/customers.php:271
++#: ../sales/manage/customers.php:272
  msgid "Credit Status:"
  msgstr ""
  
- #: ../sales/manage/customers.php:284
 -#: sales/manage/customers.php:284
++#: ../sales/manage/customers.php:285
  msgid "Customer branches"
  msgstr ""
  
- #: ../sales/manage/customers.php:286
 -#: sales/manage/customers.php:286
++#: ../sales/manage/customers.php:287
  msgid "Select or &Add"
  msgstr ""
  
- #: ../sales/manage/customers.php:286
 -#: sales/manage/customers.php:286
++#: ../sales/manage/customers.php:287
  msgid "&Add or Edit "
  msgstr ""
  
- #: ../sales/manage/customers.php:305
 -#: sales/manage/customers.php:305
++#: ../sales/manage/customers.php:306
  msgid "Add New Customer"
  msgstr ""
  
- #: ../sales/manage/customers.php:309
 -#: sales/manage/customers.php:309
++#: ../sales/manage/customers.php:310
  msgid "Update Customer"
  msgstr ""
  
- #: ../sales/manage/customers.php:310
 -#: sales/manage/customers.php:310
++#: ../sales/manage/customers.php:311
  msgid "Update customer data"
  msgstr ""
  
- #: ../sales/manage/customers.php:311
 -#: sales/manage/customers.php:311
++#: ../sales/manage/customers.php:312
  msgid "Select this customer and return to document entry."
  msgstr ""
  
- #: ../sales/manage/customers.php:312
 -#: sales/manage/customers.php:312
++#: ../sales/manage/customers.php:313
  msgid "Delete Customer"
  msgstr ""
  
- #: ../sales/manage/customers.php:313
 -#: sales/manage/customers.php:313
++#: ../sales/manage/customers.php:314
  msgid "Delete customer data if have been never used"
  msgstr ""
  
- #: ../sales/manage/customers.php:320
 -#: sales/manage/customers.php:320
++#: ../sales/manage/customers.php:321
  msgid ""
  "There are no sales types defined. Please define at least one sales type "
  "before adding a customer."
  msgstr ""
  
- #: ../sales/manage/customers.php:329
 -#: sales/manage/customers.php:329
++#: ../sales/manage/customers.php:330
  msgid "New customer"
  msgstr ""
  
- #: ../sales/manage/customers.php:351
 -#: sales/manage/customers.php:351
++#: ../sales/manage/customers.php:353
  msgid "Sales &Orders"
  msgstr ""
  
@@@ -14956,39 -13056,39 +14650,43 @@@
  msgid "Recurrent Invoices"
  msgstr ""
  
 -#: sales/manage/recurrent_invoices.php:36
 +#: ../sales/manage/recurrent_invoices.php:36
++msgid "No order has been selected as a template for recurrent invoicing."
++msgstr ""
++
++#: ../sales/manage/recurrent_invoices.php:42
  msgid "The invoice description cannot be empty."
  msgstr ""
  
- #: ../sales/manage/recurrent_invoices.php:63
 -#: sales/manage/recurrent_invoices.php:63
++#: ../sales/manage/recurrent_invoices.php:69
  msgid "Selected recurrent invoice has been updated"
  msgstr ""
  
- #: ../sales/manage/recurrent_invoices.php:69
 -#: sales/manage/recurrent_invoices.php:69
++#: ../sales/manage/recurrent_invoices.php:75
  msgid "New recurrent invoice has been added"
  msgstr ""
  
- #: ../sales/manage/recurrent_invoices.php:86
 -#: sales/manage/recurrent_invoices.php:86
++#: ../sales/manage/recurrent_invoices.php:92
  msgid "Selected recurrent invoice has been deleted"
  msgstr ""
  
- #: ../sales/manage/recurrent_invoices.php:167
 -#: sales/manage/recurrent_invoices.php:167
++#: ../sales/manage/recurrent_invoices.php:173
  msgid "Template:"
  msgstr ""
  
- #: ../sales/manage/recurrent_invoices.php:176
 -#: sales/manage/recurrent_invoices.php:176
++#: ../sales/manage/recurrent_invoices.php:182
  msgid "Days:"
  msgstr ""
  
- #: ../sales/manage/recurrent_invoices.php:178
 -#: sales/manage/recurrent_invoices.php:178
++#: ../sales/manage/recurrent_invoices.php:184
  msgid "Monthly:"
  msgstr ""
  
- #: ../sales/manage/recurrent_invoices.php:180
 -#: sales/manage/recurrent_invoices.php:180
++#: ../sales/manage/recurrent_invoices.php:186
  msgid "Begin:"
  msgstr ""
  
- #: ../sales/manage/recurrent_invoices.php:182
 -#: sales/manage/recurrent_invoices.php:182
++#: ../sales/manage/recurrent_invoices.php:188
  msgid "End:"
  msgstr ""
  
@@@ -15415,20 -13494,20 +15113,7 @@@ msgstr "
  msgid "Customer Transactions"
  msgstr ""
  
- #: ../sales/inquiry/customer_inquiry.php:68
 -#: sales/inquiry/customer_inquiry.php:72
--msgid "CUSTOMER ACCOUNT IS ON HOLD"
--msgstr ""
--
- #: ../sales/inquiry/customer_inquiry.php:181
 -#: sales/inquiry/customer_inquiry.php:198
--msgid "Print Receipt"
--msgstr ""
--
- #: ../sales/inquiry/customer_inquiry.php:211
- #: ../sales/inquiry/customer_inquiry.php:224
 -#: sales/inquiry/customer_inquiry.php:228
 -#: sales/inquiry/customer_inquiry.php:241
--msgid "RB"
--msgstr ""
--
 -#: sales/inquiry/sales_deliveries_view.php:29
 +#: ../sales/inquiry/sales_deliveries_view.php:29
  msgid "Search Not Invoiced Deliveries"
  msgstr ""
  
@@@ -15436,34 -13515,34 +15121,34 @@@
  msgid "Search All Deliveries"
  msgstr ""
  
- #: ../sales/inquiry/sales_deliveries_view.php:70
 -#: sales/inquiry/sales_deliveries_view.php:70
++#: ../sales/inquiry/sales_deliveries_view.php:68
  msgid ""
  "For batch invoicing you should\n"
  "\t\t    select at least one delivery. All items must be dispatched to\n"
  "\t\t    the same customer branch."
  msgstr ""
  
- #: ../sales/inquiry/sales_deliveries_view.php:181
 -#: sales/inquiry/sales_deliveries_view.php:181
++#: ../sales/inquiry/sales_deliveries_view.php:168
  msgid "Delivery #"
  msgstr ""
  
- #: ../sales/inquiry/sales_deliveries_view.php:187
 -#: sales/inquiry/sales_deliveries_view.php:187
++#: ../sales/inquiry/sales_deliveries_view.php:174
  msgid "Cust Ref"
  msgstr ""
  
- #: ../sales/inquiry/sales_deliveries_view.php:189
 -#: sales/inquiry/sales_deliveries_view.php:189
++#: ../sales/inquiry/sales_deliveries_view.php:176
  msgid "Due By"
  msgstr ""
  
- #: ../sales/inquiry/sales_deliveries_view.php:190
 -#: sales/inquiry/sales_deliveries_view.php:190
++#: ../sales/inquiry/sales_deliveries_view.php:177
  msgid "Delivery Total"
  msgstr ""
  
- #: ../sales/inquiry/sales_deliveries_view.php:192
 -#: sales/inquiry/sales_deliveries_view.php:192
++#: ../sales/inquiry/sales_deliveries_view.php:179
  msgid "Batch"
  msgstr ""
  
- #: ../sales/inquiry/sales_deliveries_view.php:192
 -#: sales/inquiry/sales_deliveries_view.php:192
++#: ../sales/inquiry/sales_deliveries_view.php:179
  msgid "Batch Invoicing"
  msgstr ""
  
@@@ -15491,57 -13566,49 +15176,57 @@@ msgstr "
  msgid "Search All Sales Quotations"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php:148
 -#: sales/inquiry/sales_orders_view.php:136
++#: ../sales/inquiry/sales_orders_view.php:120
  msgid "Dispatch"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php:191
 -#: sales/inquiry/sales_orders_view.php:178
++#: ../sales/inquiry/sales_orders_view.php:163
  msgid "Set this order as a template for direct deliveries/invoices"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php:200
 -#: sales/inquiry/sales_orders_view.php:245
++#: ../sales/inquiry/sales_orders_view.php:172
 +msgid "Prepayment Invoice"
 +msgstr ""
 +
- #: ../sales/inquiry/sales_orders_view.php:200
++#: ../sales/inquiry/sales_orders_view.php:172
 +msgid "Final Invoice"
 +msgstr ""
 +
- #: ../sales/inquiry/sales_orders_view.php:268
++#: ../sales/inquiry/sales_orders_view.php:230
  msgid "Show All:"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php:285
 -#: sales/inquiry/sales_orders_view.php:262
++#: ../sales/inquiry/sales_orders_view.php:248
  msgid "Order #"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php:289
- #: ../sales/inquiry/sales_orders_view.php:303
 -#: sales/inquiry/sales_orders_view.php:266
 -#: sales/inquiry/sales_orders_view.php:280
++#: ../sales/inquiry/sales_orders_view.php:252
++#: ../sales/inquiry/sales_orders_view.php:266
  msgid "Cust Order Ref"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php:292
- #: ../sales/inquiry/sales_orders_view.php:306
 -#: sales/inquiry/sales_orders_view.php:269
 -#: sales/inquiry/sales_orders_view.php:283
++#: ../sales/inquiry/sales_orders_view.php:255
++#: ../sales/inquiry/sales_orders_view.php:269
  msgid "Delivery To"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php:299
 -#: sales/inquiry/sales_orders_view.php:276
++#: ../sales/inquiry/sales_orders_view.php:262
  msgid "Quote #"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php:304
 -#: sales/inquiry/sales_orders_view.php:281
++#: ../sales/inquiry/sales_orders_view.php:267
  msgid "Quote Date"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php:307
 -#: sales/inquiry/sales_orders_view.php:284
++#: ../sales/inquiry/sales_orders_view.php:270
  msgid "Quote Total"
  msgstr ""
  
- #: ../sales/inquiry/sales_orders_view.php:338
 -#: sales/inquiry/sales_orders_view.php:311
++#: ../sales/inquiry/sales_orders_view.php:301
  msgid "Tmpl"
  msgstr ""
  
- #: ../sales/includes/cart_class.inc:391
 -#: sales/includes/cart_class.inc:383
++#: ../sales/includes/cart_class.inc:396
  msgid "You have to enter valid stock code or nonempty description"
  msgstr ""
  
@@@ -15559,27 -13626,26 +15244,25 @@@ msgid "
  "charges."
  msgstr ""
  
- #: ../sales/includes/db/old.sales_order_db.inc:139
- #: ../sales/includes/db/sales_order_db.inc:103
- msgid "Deleted."
 -#: sales/includes/db/sales_invoice_db.inc:176
++#: ../sales/includes/db/sales_invoice_db.inc:199
+ msgid "Cash invoice"
  msgstr ""
  
- #: ../sales/includes/db/sales_invoice_db.inc:198
- msgid "Cash invoice"
 -#: sales/includes/db/sales_order_db.inc:101
++#: ../sales/includes/db/sales_order_db.inc:103
+ msgid "Deleted."
  msgstr ""
  
 -#: sales/includes/ui/sales_credit_ui.inc:94
 -#: sales/includes/ui/sales_order_ui.inc:370
 +#: ../sales/includes/ui/sales_credit_ui.inc:94
- #: ../sales/includes/ui/sales_order_ui.inc:370
++#: ../sales/includes/ui/sales_order_ui.inc:371
  msgid "Customer Currency:"
  msgstr ""
  
 -#: sales/includes/ui/sales_credit_ui.inc:112
 -#: sales/includes/ui/sales_order_ui.inc:632
 +#: ../sales/includes/ui/sales_credit_ui.inc:112
- #: ../sales/includes/ui/sales_order_ui.inc:638
  msgid "Shipping Company:"
  msgstr ""
  
 -#: sales/includes/ui/sales_credit_ui.inc:114
 -#: sales/includes/ui/sales_order_ui.inc:377
 +#: ../sales/includes/ui/sales_credit_ui.inc:114
- #: ../sales/includes/ui/sales_order_ui.inc:377
++#: ../sales/includes/ui/sales_order_ui.inc:378
  msgid "Customer Discount:"
  msgstr ""
  
@@@ -15593,102 -13659,102 +15276,24 @@@ msgid "
  "have any branches."
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc:219
 -#: sales/includes/ui/sales_order_ui.inc:219
++#: ../sales/includes/ui/sales_order_ui.inc:220
  msgid "Shipping Charge"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc:289
 -#: sales/includes/ui/sales_order_ui.inc:289
++#: ../sales/includes/ui/sales_order_ui.inc:290
  msgid "No customer found for entered text."
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc:315
 -#: sales/includes/ui/sales_order_ui.inc:315
++#: ../sales/includes/ui/sales_order_ui.inc:316
  #, php-format
  msgid "Customer's payment terms '%s' cannot be selected on this POS"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc:364
 -#: sales/includes/ui/sales_order_ui.inc:364
++#: ../sales/includes/ui/sales_order_ui.inc:365
  msgid "Reference number unique for this document type"
  msgstr ""
  
- #: ../sales/includes/ui/sales_order_ui.inc:404
- #: ../sales/includes/ui/sales_order_ui.inc:406
 -#: sales/includes/ui/sales_order_ui.inc:406
 -#: sales/includes/ui/sales_order_ui.inc:408
--msgid "Price List:"
--msgstr ""
--
- #: ../sales/includes/ui/sales_order_ui.inc:423
 -#: sales/includes/ui/sales_order_ui.inc:425
--msgid "Date of order receive"
--msgstr ""
--
- #: ../sales/includes/ui/sales_order_ui.inc:573
 -#: sales/includes/ui/sales_order_ui.inc:575
--msgid "Cash payment"
--msgstr ""
--
- #: ../sales/includes/ui/sales_order_ui.inc:576
- #: ../sales/includes/ui/sales_order_ui.inc:608
 -#: sales/includes/ui/sales_order_ui.inc:578
 -#: sales/includes/ui/sales_order_ui.inc:610
--msgid "Deliver from Location:"
--msgstr ""
--
- #: ../sales/includes/ui/sales_order_ui.inc:579
 -#: sales/includes/ui/sales_order_ui.inc:581
--msgid "Cash account:"
--msgstr ""
--
- #: ../sales/includes/ui/sales_order_ui.inc:586
 -#: sales/includes/ui/sales_order_ui.inc:588
--msgid "Delivery Details"
--msgstr ""
--
- #: ../sales/includes/ui/sales_order_ui.inc:591
 -#: sales/includes/ui/sales_order_ui.inc:593
--msgid "Invoice Delivery Details"
--msgstr ""
--
- #: ../sales/includes/ui/sales_order_ui.inc:592
 -#: sales/includes/ui/sales_order_ui.inc:594
--msgid "Invoice before"
--msgstr ""
--
- #: ../sales/includes/ui/sales_order_ui.inc:596
 -#: sales/includes/ui/sales_order_ui.inc:598
--msgid "Quotation Delivery Details"
--msgstr ""
--
- #: ../sales/includes/ui/sales_order_ui.inc:601
 -#: sales/includes/ui/sales_order_ui.inc:603
--msgid "Order Delivery Details"
--msgstr ""
--
- #: ../sales/includes/ui/sales_order_ui.inc:622
 -#: sales/includes/ui/sales_order_ui.inc:616
--msgid "Enter requested day of delivery"
--msgstr ""
--
- #: ../sales/includes/ui/sales_order_ui.inc:623
 -#: sales/includes/ui/sales_order_ui.inc:617
--msgid "Enter Valid until Date"
--msgstr ""
--
- #: ../sales/includes/ui/sales_order_ui.inc:624
 -#: sales/includes/ui/sales_order_ui.inc:618
--msgid "Deliver To:"
--msgstr ""
--
- #: ../sales/includes/ui/sales_order_ui.inc:625
 -#: sales/includes/ui/sales_order_ui.inc:619
--msgid "Additional identifier for delivery e.g. name of receiving person"
--msgstr ""
--
- #: ../sales/includes/ui/sales_order_ui.inc:628
 -#: sales/includes/ui/sales_order_ui.inc:622
--msgid "Delivery address. Default is address of customer branch"
--msgstr ""
--
- #: ../sales/includes/ui/sales_order_ui.inc:632
 -#: sales/includes/ui/sales_order_ui.inc:626
--msgid "Contact Phone Number:"
--msgstr ""
--
- #: ../sales/includes/ui/sales_order_ui.inc:633
 -#: sales/includes/ui/sales_order_ui.inc:627
--msgid "Phone number of ordering person. Defaults to branch phone number"
--msgstr ""
--
- #: ../sales/includes/ui/sales_order_ui.inc:634
 -#: sales/includes/ui/sales_order_ui.inc:628
--msgid "Customer Reference:"
--msgstr ""
--
- #: ../sales/includes/ui/sales_order_ui.inc:635
 -#: sales/includes/ui/sales_order_ui.inc:629
--msgid "Customer reference number for this order (if any)"
--msgstr ""
--
 -#: taxes/item_tax_types.php:17
 +#: ../taxes/item_tax_types.php:17
  msgid "Item Tax Types"
  msgstr ""
  
@@@ -15740,199 -13806,150 +15345,142 @@@ msgstr "
  msgid "Is exempt"
  msgstr ""
  
- #: ../taxes/sav.tax_types.php:21
 -#: taxes/tax_groups.php:17
++#: ../taxes/tax_groups.php:17
+ msgid "Tax Groups"
+ msgstr ""
+ 
 -#: taxes/tax_groups.php:27
++#: ../taxes/tax_groups.php:27
+ msgid ""
+ "There are no tax types defined. Define tax types before defining tax groups."
+ msgstr ""
+ 
 -#: taxes/tax_groups.php:40
++#: ../taxes/tax_groups.php:40
+ msgid "The tax group name cannot be empty."
+ msgstr ""
+ 
 -#: taxes/tax_groups.php:61
++#: ../taxes/tax_groups.php:60
+ msgid "Selected tax group has been updated"
+ msgstr ""
+ 
 -#: taxes/tax_groups.php:66
++#: ../taxes/tax_groups.php:65
+ msgid "New tax group has been added"
+ msgstr ""
+ 
 -#: 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:87
++#: ../taxes/tax_groups.php:86
+ msgid ""
+ "Cannot delete this tax group because suppliers been created referring to it."
+ msgstr ""
+ 
 -#: taxes/tax_groups.php:104
++#: ../taxes/tax_groups.php:103
+ msgid "Selected tax group has been deleted"
+ msgstr ""
+ 
 -#: 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: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 ""
  
- #: ../taxes/sav.tax_types.php:60
 -#: taxes/tax_types.php:30
 +#: ../taxes/tax_types.php:30
  msgid "The tax type name cannot be empty."
  msgstr ""
  
- #: ../taxes/sav.tax_types.php:66
 -#: taxes/tax_types.php:36
 +#: ../taxes/tax_types.php:36
  msgid "The default tax rate must be numeric and not less than zero."
  msgstr ""
  
- #: ../taxes/sav.tax_types.php:72
 -#: taxes/tax_types.php:42
 +#: ../taxes/tax_types.php:42
  msgid "Selected GL Accounts cannot be used by another tax type."
  msgstr ""
  
- #: ../taxes/sav.tax_types.php:86
 -#: taxes/tax_types.php:56
 +#: ../taxes/tax_types.php:56
  msgid "New tax type has been added"
  msgstr ""
  
- #: ../taxes/sav.tax_types.php:97
 -#: taxes/tax_types.php:67
 +#: ../taxes/tax_types.php:67
  msgid "Selected tax type has been updated"
  msgstr ""
  
- #: ../taxes/sav.tax_types.php:107
 -#: taxes/tax_types.php:77
 +#: ../taxes/tax_types.php:77
  msgid ""
  "Cannot delete this tax type because tax groups been created referring to it."
  msgstr ""
  
- #: ../taxes/sav.tax_types.php:141
 -#: taxes/tax_types.php:94
 +#: ../taxes/tax_types.php:94
  msgid "Selected tax type has been deleted"
  msgstr ""
  
- #: ../taxes/sav.tax_types.php:164
- msgid ""
- "Start new tax regulations span below, then select new span and edit tax "
- "rates as needed."
- msgstr ""
- 
- #: ../taxes/sav.tax_types.php:167
- msgid "Tax span begin:"
- msgstr ""
- 
- #: ../taxes/sav.tax_types.php:168
- msgid "Tax span end:"
- msgstr ""
- 
- #: ../taxes/sav.tax_types.php:172
- msgid "Add new span"
- msgstr ""
- 
- #: ../taxes/sav.tax_types.php:182
- msgid "Tax regulations span:"
- msgstr ""
- 
- #: ../taxes/sav.tax_types.php:183
- msgid "Add new tax sub-period"
- msgstr ""
- 
- #: ../taxes/sav.tax_types.php:187
 -#: taxes/tax_types.php:112
 +#: ../taxes/tax_types.php:112
  msgid ""
  "To avoid problems with manual journal entry all tax types should have unique "
  "Sales/Purchasing GL accounts."
  msgstr ""
  
- #: ../taxes/sav.tax_types.php:190
- msgid "Rate (%)"
 -#: taxes/tax_types.php:115
++#: ../taxes/tax_types.php:115
+ msgid "Default Rate (%)"
  msgstr ""
  
- #: ../taxes/sav.tax_types.php:190
 -#: taxes/tax_types.php:116
 +#: ../taxes/tax_types.php:116
  msgid "Sales GL Account"
  msgstr ""
  
- #: ../taxes/sav.tax_types.php:190
 -#: taxes/tax_types.php:116
 +#: ../taxes/tax_types.php:116
  msgid "Purchasing GL Account"
  msgstr ""
  
- #: ../taxes/sav.tax_types.php:205
- msgid "Exempt"
- msgstr ""
- 
- #: ../taxes/sav.tax_types.php:242
 -#: taxes/tax_types.php:159
 +#: ../taxes/tax_types.php:159
  msgid "Default Rate:"
  msgstr ""
  
- #: ../taxes/sav.tax_types.php:244
 -#: taxes/tax_types.php:161
 +#: ../taxes/tax_types.php:161
  msgid "Sales GL Account:"
  msgstr ""
  
- #: ../taxes/sav.tax_types.php:245
 -#: taxes/tax_types.php:162
 +#: ../taxes/tax_types.php:162
  msgid "Purchasing GL Account:"
  msgstr ""
  
- #: ../taxes/sav.tax_types.php:262
- msgid "Edit selected span"
- msgstr ""
- 
- #: ../taxes/tax_groups.php:17
- msgid "Tax Groups"
- msgstr ""
- 
- #: ../taxes/tax_groups.php:27
- msgid ""
- "There are no tax types defined. Define tax types before defining tax groups."
- msgstr ""
- 
- #: ../taxes/tax_groups.php:40
- msgid "The tax group name cannot be empty."
- msgstr ""
- 
- #: ../taxes/tax_groups.php:60
- msgid "Selected tax group has been updated"
- msgstr ""
- 
- #: ../taxes/tax_groups.php:65
- msgid "New tax group has been added"
- msgstr ""
- 
- #: ../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
- msgid ""
- "Cannot delete this tax group because suppliers been created referring to it."
- msgstr ""
- 
- #: ../taxes/tax_groups.php:103
- msgid "Selected tax group has been deleted"
- msgstr ""
- 
- #: ../taxes/tax_groups.php:166
- msgid "Select the taxes that are included in this group."
- msgstr ""
- 
- #: ../taxes/tax_groups.php:171
- msgid "Shipping Tax"
- msgstr ""
- 
- #: ../taxes/tax_types.php:115
- msgid "Default Rate (%)"
- msgstr ""
- 
- #: ../themes/default/renderer.php:28
 -#: themes/default/renderer.php:27
++#: ../themes/default/renderer.php:27
  msgid "Main Menu"
  msgstr ""
  
- #: ../themes/default/renderer.php:71
- #: ../themes/default/renderer.php:81
 -#: themes/default/renderer.php:69 themes/default/renderer.php:80
++#: ../themes/default/renderer.php:69
  msgid "Help"
  msgstr ""
  
- #: ../themes/default/renderer.php:76
 -#: themes/default/renderer.php:75
--msgid "Preferences"
--msgstr ""
--
- #: ../sql/alter2.1.php:18
 -#: sql/alter2.1.php:18
++#: ../sql/alter2.1.php:19
  msgid "Upgrade from version 2.0 to 2.1"
  msgstr ""
  
- #: ../sql/alter2.1.php:36
 -#: sql/alter2.1.php:35
++#: ../sql/alter2.1.php:37
  msgid "Cannot retrieve bank accounts codes"
  msgstr ""
  
- #: ../sql/alter2.1.php:44
 -#: sql/alter2.1.php:43
++#: ../sql/alter2.1.php:45
  msgid "Cannot update bank transactions"
  msgstr ""
  
- #: ../sql/alter2.1.php:53
 -#: sql/alter2.1.php:52
++#: ../sql/alter2.1.php:54
  msgid "Cannot select stock identificators"
  msgstr ""
  
- #: ../sql/alter2.1.php:64
 -#: sql/alter2.1.php:63
++#: ../sql/alter2.1.php:65
  msgid "Cannot insert stock id into item_codes"
  msgstr ""
  
- #: ../sql/alter2.1.php:140
 -#: sql/alter2.1.php:139
++#: ../sql/alter2.1.php:144
  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"
@@@ -15940,28 -13957,24 +15488,52 @@@
  "\t\t\tdatabase restore from last backup file first."
  msgstr ""
  
- #: ../sql/alter2.2.php:23
 -#: sql/alter2.2.php:23
++#: ../sql/alter2.2.php:24
  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:86
  msgid "Cannot query max sales order number."
  msgstr ""
  
- #: ../sql/alter2.2.php:96
 -#: sql/alter2.2.php:95
++#: ../sql/alter2.2.php:97
  msgid "Cannot store next sales order reference."
  msgstr ""
  
- #: ../sql/alter2.2.php:251
 -#: sql/alter2.2.php:250
++#: ../sql/alter2.2.php:221
  msgid ""
  "Cannot upgrade extensions system: file /modules/installed_modules.php is not "
  "writeable"
  msgstr ""
  
- #: ../sql/alter2.3.php:20
 -#: sql/alter2.3.php:20
++#: ../sql/alter2.3.php:21
  msgid "Upgrade from version 2.2 to 2.3"
  msgstr ""
- #: ../sql/alter2.4.php:19
 +
++#: ../sql/alter2.4.php:56
 +msgid "Upgrade from version 2.3 to 2.4"
 +msgstr ""
++
++#: ../sql/alter2.4.php:64
++msgid "Set optimal parameters and start upgrade:"
++msgstr ""
++
++#: ../sql/alter2.4.php:67
++msgid "Text collation optimization:"
++msgstr ""
++
++#: ../sql/alter2.4.php:133
++#, php-format
++msgid ""
++"Cannot update work orders costs:\n"
++"%s"
++msgstr ""
++
++#: ../sql/alter2.4.php:223
++msgid "Convertion to utf8 done."
++msgstr ""
++
++#: ../sql/alter2.4.php:260
++#, php-format
++msgid "Cannot drop column in %s table: %s"
++msgstr ""

diff --cc manufacturing/includes/db/work_orders_db.inc
index 35c00d392d882cc627fa6c9e27b112d74c473288,d8894401ce1de2a93e98be17324bafc695c46324..3ed8126da9e2e80b703aa6546655de289dad7e48
--- 1/manufacturing/includes/db/work_orders_db.inc
--- 2/manufacturing/includes/db/work_orders_db.inc
+++ b/manufacturing/includes/db/work_orders_db.inc
@@@ -297,7 -499,7 +297,7 @@@ function void_work_order($woid
        commit_transaction();
  }
  
- function get_sql_for_work_orders($outstanding_only, $stock_id, $location = ALL_TEXT, $order = '', $overdue = false)
 -function get_sql_for_work_orders($outstanding_only, $all_items)
++function get_sql_for_work_orders($outstanding_only, $stock_id, $location = ALL_TEXT, $oredr_no='', $order_ref = '', $overdue = false)
  {
        $sql = "SELECT
                workorder.id,
@@@ -327,22 -529,27 +327,27 @@@
                $sql .= " AND workorder.closed=0";
        }
  
 -      if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != $all_items)
 +      if ($location != ALL_TEXT)
        {
 -              $sql .= " AND workorder.loc_code=".db_escape($_POST['StockLocation']);
 +              $sql .= " AND workorder.loc_code=".db_escape($location);
        }
  
-       if ($order != '')
 -      if (isset($_POST['OrderId']) && $_POST['OrderId'] != "")
++      if ($order_no != '')
        {
-               $sql .= " AND workorder.wo_ref LIKE ".db_escape('%'.$order.'%');
 -              $sql .= " AND workorder.id LIKE ".db_escape('%'.$_POST['OrderId'].'%');
++              $sql .= " AND workorder.id LIKE ".db_escape('%'.$order_no.'%');
+       }
+ 
 -      if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "")
++      if ($order_ref != '')
+       {
 -              $sql .= " AND workorder.wo_ref LIKE ".db_escape('%'.$_POST['OrderNumber'].'%');
++              $sql .= " AND workorder.wo_ref LIKE ".db_escape('%'.$order_ref.'%');
        }
  
 -      if (isset($_POST['SelectedStockItem']) && $_POST['SelectedStockItem'] != $all_items)
 +      if ($stock_id != ALL_TEXT)
        {
 -              $sql .= " AND workorder.stock_id=".db_escape($_POST['SelectedStockItem']);
 +              $sql .= " AND workorder.stock_id=".db_escape($stock_id);
        }
  
 -      if (check_value('OverdueOnly'))
 +      if ($overdue)
        {
                $Today = date2sql(Today());
  

diff --cc manufacturing/includes/manufacturing_ui.inc
Simple merge

diff --cc manufacturing/includes/work_order_issue_ui.inc
Simple merge

diff --cc manufacturing/manage/bom_edit.php
Simple merge

diff --cc manufacturing/manage/work_centres.php
Simple merge

diff --cc manufacturing/search_work_orders.php
index d79fc1dc2aeead789c37acf56bc49bb99becd835,024c3b8540f9ba2c1d06e62fd2c2d1c4afe74765..98b645b340e351d9b9810aa75d50732e08b7459e
--- 1/manufacturing/search_work_orders.php
--- 2/manufacturing/search_work_orders.php
+++ b/manufacturing/search_work_orders.php
@@@ -152,8 -159,7 +158,8 @@@ function dec_amount($row, $amount
        return number_format2($amount, $row['decimals']);
  }
  
- $sql = get_sql_for_work_orders($outstanding_only, get_post('SelectedStockItem'), get_post('StockLocation'), get_post('OrderNumber'), 
-       check_value('OverdueOnly'));
 -$sql = get_sql_for_work_orders($outstanding_only, $all_items);
++$sql = get_sql_for_work_orders($outstanding_only, get_post('SelectedStockItem'), get_post('StockLocation'),
++      get_post('OrderId'), get_post('OrderNumber'), check_value('OverdueOnly'));
  
  $cols = array(
        _("#") => array('fun'=>'view_link', 'ord'=>''), 

diff --cc manufacturing/work_order_issue.php
Simple merge

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

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

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

diff --cc purchasing/includes/ui/invoice_ui.inc
index 5846af6e6b5c37c3cd3eb4231c76cda8bc908a2a,fafe4c5d79159ab9152b65d058b2d000b4eb6ae3..b172ed90627fcf5d7d5ff529ef35010b2e20ed82
--- 1/purchasing/includes/ui/invoice_ui.inc
--- 2/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@@ -179,8 -154,7 +179,8 @@@ function invoice_totals(&$supp_trans
  
        $dim = get_company_pref('use_dimension');
        $colspan = ($dim == 2 ? 7 : ($dim == 1 ? 6 : 5));
-       start_table(TABLESTYLE, "width=95%");
 +      div_start('tax_table');
+       start_table(TABLESTYLE, "width='95%'");
        label_row(_("Sub-total:"), price_format( $supp_trans->ov_amount), "colspan=$colspan align=right", "align=right");
  
      $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id);
@@@ -503,18 -470,18 +503,18 @@@ function display_grn_items(&$supp_trans
                if ($heading2 != "")
                {
                        display_note($heading2, 0, 0, "class='overduefg'");
 -              }       
 +              }
-               echo "</td><td width=10% align='right'>";
+               echo "</td><td width='10%' align='right'>";
                submit('InvGRNAll', _("Add All Items"), true, false,true);
 -      }       
 +      }
  
        end_outer_table(0, false);
  
        div_start('grn_items');
-       start_table(TABLESTYLE, "width=95%");
+       start_table(TABLESTYLE, "width='95%'");
        if ($mode == 1)
        {
 -      $th = array(_("Delivery"), _("P.O."), _("Item"), _("Description"),
 +      $th = array(_("Delivery"), _("Sequence #"), _("P.O."), _("Item"), _("Description"),
                _("Received On"), _("Quantity Received"), _("Quantity Invoiced"),
                _("Qty Yet To Invoice"), $supp_trans->tax_included ? _("Price after Tax") : _("Price before Tax"), 
                _("Total"), "");

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

diff --cc purchasing/inquiry/supplier_inquiry.php
Simple merge

diff --cc purchasing/po_receive_items.php
Simple merge

diff --cc purchasing/supplier_payment.php
Simple merge

diff --cc purchasing/view/view_grn.php
Simple merge

diff --cc purchasing/view/view_po.php
Simple merge

diff --cc purchasing/view/view_supp_credit.php
Simple merge

diff --cc purchasing/view/view_supp_invoice.php
Simple merge

diff --cc purchasing/view/view_supp_payment.php
Simple merge

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

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

diff --cc reporting/rep102.php
Simple merge

diff --cc reporting/rep107.php
index aaade9058bb9517fb1cf4cddb11499451354621a,d3f74dd7999b3e826cc0443fa59196c95edd2b8c..a125995dce7b5a04d4818f0eadbc441cdca21de0
--- 1/reporting/rep107.php
--- 2/reporting/rep107.php
+++ b/reporting/rep107.php
@@@ -88,16 -68,17 +88,19 @@@ function print_invoices(
                $rep = new FrontReport(_('INVOICE'), "InvoiceBulk", user_pagesize(), 9, $orientation);
        if ($orientation == 'L')
                recalculate_cols($cols);
 -      for ($i = $from; $i <= $to; $i++)
 +
 +      $range = get_invoice_range($from, $to);
 +      while($row = db_fetch($range))
        {
 -                      if (!exists_customer_trans(ST_SALESINVOICE, $i))
 +                      if (!exists_customer_trans(ST_SALESINVOICE, $row['trans_no']))
                                continue;
                        $sign = 1;
 -                      $myrow = get_customer_trans($i, ST_SALESINVOICE);
 +                      $myrow = get_customer_trans($row['trans_no'], ST_SALESINVOICE);
  
-                       if($customer && $myrow['debtor_no'] != $customer) {
+                       if ($customer && $myrow['debtor_no'] != $customer) {
+                               continue;
+                       }
+                       if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
                                continue;
                        }
                        $baccount = get_default_bank_account($myrow['curr_code']);

diff --cc reporting/rep108.php
Simple merge

diff --cc reporting/rep109.php
Simple merge

diff --cc reporting/rep111.php
Simple merge

diff --cc reporting/rep112.php
index ee1a0e1f2dddad639450952d4b18f6df664b77b3,4662a785ea92f04c33ae471eb0910fd0ef62cc97..6cb3148fa292df4ba18e43afb0dcf8b7ca5c639a
--- 1/reporting/rep112.php
--- 2/reporting/rep112.php
+++ b/reporting/rep112.php
@@@ -97,7 -110,10 +97,10 @@@ function print_receipts(
                {
                        $myrow = get_receipt($j, $i);
                        if (!$myrow)
 -                              continue;                       
 +                              continue;
+                       if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
+                               continue;
+                       }
                        $res = get_bank_trans($j, $i);
                        $baccount = db_fetch($res);
                        $params['bankaccount'] = $baccount['bank_act'];

diff --cc reporting/rep113.php
Simple merge

diff --cc reporting/rep202.php
Simple merge

diff --cc reporting/rep209.php
Simple merge

diff --cc reporting/rep210.php
index 3af1bafbc2eb4ab27bd552d9a08f678ecb25961e,5b7634d2a1ece014c3aedbb04f8ee5081bb54353..9f14a1ae2975ad8fd72ae6dcbb96aab7c0b17749
--- 1/reporting/rep210.php
--- 2/reporting/rep210.php
+++ b/reporting/rep210.php
@@@ -95,7 -107,10 +95,10 @@@ function print_remittances(
                {
                        $myrow = get_remittance($j, $i);
                        if (!$myrow)
 -                              continue;                       
 +                              continue;
+                       if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
+                               continue;
+                       }
                        $res = get_bank_trans($j, $i);
                        $baccount = db_fetch($res);
                        $params['bankaccount'] = $baccount['bank_act'];

diff --cc sales/create_recurrent_invoices.php
Simple merge

diff --cc sales/credit_note_entry.php
Simple merge

diff --cc sales/customer_credit_invoice.php
Simple merge

diff --cc sales/customer_delivery.php
Simple merge

diff --cc sales/customer_invoice.php
index 7f46f16968f61aea38bf28f7c13bd701422fcae5,f306c08cdfda41888fa0576fe868f5de8518a706..2f4d05988458008d57d36accec0c64e03508aaa3
--- 1/sales/customer_invoice.php
--- 2/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@@ -537,16 -471,13 +537,18 @@@ if ($row['dissallow_invoices'] == 1
        exit();
  }     
  
 -display_heading(_("Invoice Items"));
 +display_heading($prepaid ? _("Sales Order Items") : _("Invoice Items"));
  
  div_start('Items');
- start_table(TABLESTYLE, "width=80%");
++
+ start_table(TABLESTYLE, "width='80%'");
 -$th = array(_("Item Code"), _("Item Description"), _("Delivered"), _("Units"), _("Invoiced"),
 -      _("This Invoice"), _("Price"), _("Tax Type"), _("Discount"), _("Total"));
 +if ($prepaid)
 +      $th = array(_("Item Code"), _("Item Description"), _("Units"), _("Quantity"),
 +              _("Price"), _("Tax Type"), _("Discount"), _("Total"));
 +else
 +      $th = array(_("Item Code"), _("Item Description"), _("Delivered"), _("Units"), _("Invoiced"),
 +              _("This Invoice"), _("Price"), _("Tax Type"), _("Discount"), _("Total"));
+ 
  if ($is_batch_invoice) {
      $th[] = _("DN");
      $th[] = "";

diff --cc sales/customer_payments.php
Simple merge

diff --cc sales/includes/cart_class.inc
Simple merge

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

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

diff --cc sales/includes/ui/sales_order_ui.inc
index d60431bf74bf680a292f4b47ed9920666326a924,20509efcf373ba48fedd64c0148a925aac6acc5f..ce0b8604c9f6d4e3fbc1472a766c23896cd6ac04
--- 1/sales/includes/ui/sales_order_ui.inc
--- 2/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@@ -377,8 -377,8 +378,9 @@@ function display_order_header(&$order, 
        label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
  
        table_section(3);
 -      if ($order->pos['cash_sale'] || $order->pos['credit_sale']) {
+       start_row();
 +      if (($order->pos['cash_sale'] || $order->pos['credit_sale']) 
 +              && !$order->is_started()) {
                 // editable payment type 
                if (get_post('payment') !== $order->payment) {
                        $order->payment = get_post('payment');
@@@ -394,11 -394,13 +396,12 @@@
                $paymcat = !$order->pos['cash_sale'] ? PM_CREDIT : 
                        (!$order->pos['credit_sale'] ? PM_CASH : PM_ANY);
                // all terms are available for SO
 -              sale_payment_list_cells(_('Payment:'), 'payment', 
 -                      (in_array($order->trans_type, array(ST_SALESQUOTE, ST_SALESORDER)) 
 -                      ? PM_ANY : $paymcat), null);
 +              $is_order = in_array($order->trans_type, array(ST_SALESQUOTE, ST_SALESORDER));
 +              sale_payment_list_cells(_('Payment:'), 'payment', $is_order ? PM_ANY : $paymcat, null, true, $is_order);
        } else {
 -              label_cells(_('Payment:'), $order->payment_terms['terms']);
 +              label_cells(_('Payment:'), $order->payment_terms['terms'], "class='label'");
        }
+       end_row();
  
        if($editable) {
                $str = sales_types_list_row(_("Price List:"), 'sales_type', null, true);

diff --cc sales/inquiry/customer_inquiry.php
index f9744d0168c15e184c3d0428e63b90e45d35d9b0,1aa02aeed09308b1988ec19863fd3fad406e3f22..14457aa9a119a60cdfae5d9f3240bd6abb850cab
--- 1/sales/inquiry/customer_inquiry.php
--- 2/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@@ -40,11 -44,11 +40,11 @@@ if (!isset($_POST['customer_id'])
  start_table(TABLESTYLE_NOBORDER);
  start_row();
  
 -if (!@$_GET['popup'])
 +if (!$page_nested)
        customer_list_cells(_("Select a customer: "), 'customer_id', null, true, false, false, !@$_GET['popup']);
  
 -date_cells(_("From:"), 'TransAfterDate', '', null, -30);
 +date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days());
- date_cells(_("To:"), 'TransToDate', '', null, 1);
+ date_cells(_("To:"), 'TransToDate', '', null);
  
  if (!isset($_POST['filterType']))
        $_POST['filterType'] = 0;

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

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

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

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

diff --cc sales/sales_order_entry.php
index 586ca10510ab12cf3dbb84dc8a2b407a836d031f,f9933b318d7919f7ce3750cd605c2a2c2aa94210..b608c2001bd06935541ae628bc035ee34888e38a
--- 1/sales/sales_order_entry.php
--- 2/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@@ -723,10 -712,11 +723,10 @@@ if ($_SESSION['Items']->trans_type == S
  start_form();
  
  hidden('cart_id');
 -$customer_error = display_order_header($_SESSION['Items'],
 -      ($_SESSION['Items']->any_already_delivered() == 0), $idate);
 +$customer_error = display_order_header($_SESSION['Items'], !$_SESSION['Items']->is_started(), $idate);
  
  if ($customer_error == "") {
-       start_table(TABLESTYLE, "width=80%", 10);
+       start_table(TABLESTYLE, "width='80%'", 10);
        echo "<tr><td>";
        display_order_summary($orderitems, $_SESSION['Items'], true);
        echo "</td></tr>";

diff --cc sales/view/view_credit.php
Simple merge

diff --cc sales/view/view_dispatch.php
Simple merge

diff --cc sales/view/view_invoice.php
index 9532bb778e5d005e498219be1899f964f977d7e8,2d128a518d7a3af7996b39cef6b73fb1d5f3891d..db9ab1031c86ca9a91826d99bb76ed20ca020687
--- 1/sales/view/view_invoice.php
--- 2/sales/view/view_invoice.php
+++ b/sales/view/view_invoice.php
@@@ -41,11 -40,10 +41,11 @@@ $branch = get_branch($myrow["branch_cod
  
  $sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER);
  
 -display_heading(sprintf(_("SALES INVOICE #%d"),$trans_id));
 +display_heading(sprintf($myrow['prep_amount'] > 0 ? (
 +      $paym['days_before_due']>=0 ? _("FINAL INVOICE #%d") : _("PREPAYMENT INVOICE #%d")) : _("SALES INVOICE #%d"),$trans_id));
  
  echo "<br>";
- start_table(TABLESTYLE2, "width=95%");
+ start_table(TABLESTYLE2, "width='95%'");
  echo "<tr valign=top><td>"; // outer table
  
  /*Now the customer charged to details in a sub table*/
@@@ -72,9 -70,10 +72,9 @@@ end_table()
  
  echo "</td><td>"; // outer table
  
- start_table(TABLESTYLE, "width=100%");
+ start_table(TABLESTYLE, "width='100%'");
  $th = array(_("Payment Terms"));
  table_header($th); 
 -$paym = get_payment_terms($myrow['payment_terms']);
  label_row(null, $paym["terms"], "nowrap");
  end_table();
  

diff --cc sales/view/view_receipt.php
Simple merge

diff --cc sales/view/view_sales_order.php
index 605350afd0cc9e3ea36733f0043eb8b436234582,3276b9582b89fb0a45e391dc207b98dbdac431a5..6014aeaf50b9a27eef7918a97731256b4b97f14f
--- 1/sales/view/view_sales_order.php
--- 2/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@@ -39,9 -39,9 +39,9 @@@ if (isset($_SESSION['View'])
        unset ($_SESSION['View']);
  }
  
 -$_SESSION['View'] = new Cart($_GET['trans_type'], $_GET['trans_no']);
 +$_SESSION['View'] = new Cart($_GET['trans_type'], $_GET['trans_no'], true);
  
- start_table(TABLESTYLE2, "width=95%", 5);
+ start_table(TABLESTYLE2, "width='95%'", 5);
  
  if ($_GET['trans_type'] != ST_SALESQUOTE)
  {

diff --cc taxes/item_tax_types.php
Simple merge

diff --cc themes/aqua/renderer.php
index cd7075c5021ab3d3ac09022b5e209dcf6061da3b,5f3843b253f665ccd068eacabc1997983e7039a9..7406d2443e3a8dde0f2ed6ce413a9f716b7df8f7
--- 1/themes/aqua/renderer.php
--- 2/themes/aqua/renderer.php
+++ b/themes/aqua/renderer.php
@@@ -34,9 -34,9 +34,9 @@@
  
                function menu_header($title, $no_menu, $is_index)
                {
 -                      global $path_to_root, $help_base_url, $db_connections;
 +                      global $path_to_root, $SysPrefs, $db_connections;
                        echo "<table class='callout_main' border='0' cellpadding='0' cellspacing='0'>\n";
-                       echo "<tr>";
+                       echo "<tr>\n";
                        echo "<td colspan='2' rowspan='2'>\n";
  
                        echo "<table class='main_page' border='0' cellpadding='0' cellspacing='0'>\n";
@@@ -70,10 -68,10 +68,10 @@@
                                $img = "<img src='$local_path_to_root/themes/aqua/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'>&nbsp;&nbsp;";
                                $himg = "<img src='$local_path_to_root/themes/aqua/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'>&nbsp;&nbsp;";
  
-                               echo "<table class=logoutBar>";
-                               echo "<tr><td class=headingtext3>" . $db_connections[user_company()]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
+                               echo "<table class='logoutBar'>";
 -                              echo "<tr><td class='headingtext3'>" . $db_connections[$_SESSION["wa_current_user"]->company]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
++                              echo "<tr><td class='headingtext3'>" . $db_connections[user_company()]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
                                $indicator = "$path_to_root/themes/".user_theme(). "/images/ajax-loader.gif";
-                               echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;'></td>";
+                               echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;' alt='ajaxmark'></td>";
                                echo "  <td class='logoutBarRight'><a class='shortcut' href='$path_to_root/admin/display_prefs.php?'>" . _("Preferences") . "</a>&nbsp;&nbsp;&nbsp;\n";
                                echo "  <a class='shortcut' href='$path_to_root/admin/change_current_user_password.php?selected_id=" . $_SESSION["wa_current_user"]->username . "'>" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
  
@@@ -95,15 -93,12 +93,12 @@@
                                ."</td>"
                                ."</tr></table></center>";
                        }
- 
- 
                }
  
- 
                function menu_footer($no_menu, $is_index)
                {
 -                      global $version, $allow_demo_mode, $app_title, $power_url,
 -                              $power_by, $path_to_root, $Pagehelp, $Ajax;
 +                      global $version, $path_to_root, $Pagehelp, $Ajax, $SysPrefs;
 +
                        include_once($path_to_root . "/includes/date_functions.inc");
  
                        echo "</td></tr></table>\n"; // 'main_page'
@@@ -127,16 -122,15 +122,17 @@@
                        {
                                echo "<table align='center' id='footer'>\n";
                                echo "<tr>\n";
 -                              echo "<td align='center' class='footer'><a target='_blank' href='$power_url' tabindex='-1'><font color='#ffffff'>$app_title $version - " . _("Theme:") . " " . user_theme() ." - ".show_users_online()."</font></a></td>\n";
 +                              echo "<td align='center' class='footer'><a target='_blank' href='".$SysPrefs->power_url."'><font color='#ffffff'>"
 +                                      .$SysPrefs->app_title." $version - " . _("Theme:") . " " . user_theme() . " - ".show_users_online()."</font></a></td>\n";
                                echo "</tr>\n";
                                echo "<tr>\n";
 -                              echo "<td align='center' class='footer'><a target='_blank' href='$power_url' tabindex='-1'><font color='#ffff00'>$power_by</font></a></td>\n";
 +                              echo "<td align='center' class='footer'><a target='_blank' href='".$SysPrefs->power_url."'><font color='#ffff00'>"
 +                                      .$SysPrefs->power_by."</font></a></td>\n";
                                echo "</tr>\n";
 -                              if ($allow_demo_mode==true)
 +                              if ($SysPrefs->allow_demo_mode==true)
                                {
                                        echo "<tr>\n";
+                                       //echo "<td><br><div align='center'><a href='http://sourceforge.net'><img src='http://sourceforge.net/sflogo.php?group_id=89967&amp;type=5' alt='SourceForge.net Logo' width='210' height='62' border='0' align='center' /></a></div></td>\n";
                                        echo "</tr>\n";
                                }
                                echo "</table><br><br>\n";
@@@ -215,5 -208,6 +210,5 @@@
                                echo "</tr></table></td></tr>";
                        }
                        echo "</table>";
-       }
+               }
        }
 -?>

diff --cc themes/cool/renderer.php
index 0881a204796ad0902f08855865da99deadda6f10,ddb7dcdd1b0cc9330e046a05980c8eaeaa832535..b325611e07e1212b0e776c166fe4846e47328a1a
--- 1/themes/cool/renderer.php
--- 2/themes/cool/renderer.php
+++ b/themes/cool/renderer.php
@@@ -34,9 -34,9 +34,9 @@@
  
                function menu_header($title, $no_menu, $is_index)
                {
 -                      global $path_to_root, $help_base_url, $db_connections;
 +                      global $path_to_root, $SysPrefs, $db_connections;
                        echo "<table class='callout_main' border='0' cellpadding='0' cellspacing='0'>\n";
-                       echo "<tr>";
+                       echo "<tr>\n";
                        echo "<td colspan='2' rowspan='2'>\n";
  
                        echo "<table class='main_page' border='0' cellpadding='0' cellspacing='0'>\n";
@@@ -57,23 -56,22 +56,22 @@@
                                {
                      if ($_SESSION["wa_current_user"]->check_application_access($app))
                      {
-                                               $acc = access_string($app->name);
-                                               echo "<a class='".($sel_app == $app->id ? 'selected' : 'menu_tab')
-                                                       ."' href='$local_path_to_root/index.php?application=".$app->id
-                                                       ."'$acc[1]>" .$acc[0] . "</a>";
-                                       }
+                         $acc = access_string($app->name);
+                         echo "<a class='".($sel_app == $app->id ? 'selected' : 'menu_tab')
+                             ."' href='$local_path_to_root/index.php?application=".$app->id
+                             ."'$acc[1]>" .$acc[0] . "</a>";
+                     }
                                }
                                echo "</div>";
- 
                                echo "</td></tr></table>";
                                // top status bar
-                               $img = "<img src='$local_path_to_root/themes/aqua/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'>&nbsp;&nbsp;";
-                               $himg = "<img src='$local_path_to_root/themes/aqua/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'>&nbsp;&nbsp;";
+                               $img = "<img src='$local_path_to_root/themes/cool/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'>&nbsp;&nbsp;";
+                               $himg = "<img src='$local_path_to_root/themes/cool/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'>&nbsp;&nbsp;";
  
-                               echo "<table class=logoutBar>";
-                               echo "<tr><td class=headingtext3>" . $db_connections[user_company()]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
+                               echo "<table class='logoutBar'>";
 -                              echo "<tr><td class='headingtext3'>" . $db_connections[$_SESSION["wa_current_user"]->company]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
++                              echo "<tr><td class='headingtext3'>" . $db_connections[user_company()]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
                                $indicator = "$path_to_root/themes/".user_theme(). "/images/ajax-loader.gif";
-                               echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;'></td>";
+                               echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;' alt='ajaxmark'></td>";
                                echo "  <td class='logoutBarRight'><a class='shortcut' href='$path_to_root/admin/display_prefs.php?'>" . _("Preferences") . "</a>&nbsp;&nbsp;&nbsp;\n";
                                echo "  <a class='shortcut' href='$path_to_root/admin/change_current_user_password.php?selected_id=" . $_SESSION["wa_current_user"]->username . "'>" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
  
@@@ -101,7 -97,8 +97,8 @@@
  
                function menu_footer($no_menu, $is_index)
                {
 -                      global $version, $allow_demo_mode, $app_title, $power_url,
 -                              $power_by, $path_to_root, $Pagehelp, $Ajax;
 +                      global $version, $SysPrefs, $path_to_root, $Pagehelp, $Ajax;
++
                        include_once($path_to_root . "/includes/date_functions.inc");
  
                        echo "</td></tr></table>\n"; // 'main_page'
@@@ -125,13 -122,17 +122,19 @@@
                        {
                                echo "<table align='center' id='footer'>\n";
                                echo "<tr>\n";
 -                              echo "<td align='center' class='footer'><a target='_blank' href='$power_url' tabindex='-1'><font color='#ffffff'>$app_title $version - " . _("Theme:") . " " . user_theme() ." - ".show_users_online()."</font></a></td>\n";
 +                              echo "<td align='center' class='footer'><a target='_blank' href='".$SysPrefs->power_url."'><font color='#ffffff'>".$SysPrefs->app_title
 +                                      ." $version - " . _("Theme:") . " " . user_theme() ." - ".show_users_online(). "</font></a></td>\n";
                                echo "</tr>\n";
                                echo "<tr>\n";
 -                              echo "<td align='center' class='footer'><a target='_blank' href='$power_url' tabindex='-1'><font color='#ffff00'>$power_by</font></a></td>\n";
 +                              echo "<td align='center' class='footer'><a target='_blank' href='".$SysPrefs->power_url."'><font color='#ffff00'".$SysPrefs->power_by
 +                                      ."</font></a></td>\n";
                                echo "</tr>\n";
+                               if ($allow_demo_mode==true)
+                               {
+                                       echo "<tr>\n";
+                                       //echo "<td><br><div align='center'><a href='http://sourceforge.net'><img src='http://sourceforge.net/sflogo.php?group_id=89967&amp;type=5' alt='SourceForge.net Logo' width='210' height='62' border='0' align='center' /></a></div></td>\n";
+                                       echo "</tr>\n";
+                               }
                                echo "</table><br><br>\n";
                        }
                }
@@@ -207,6 -208,6 +210,5 @@@
                                echo "</tr></table></td></tr>";
                        }
                        echo "</table>";
-       }
+               }
        }
- 
 -?>

diff --cc themes/default/renderer.php
index 53c2ea4410fdf07301891eb245eca56a7674268b,438d87debd814313d47325cc6726937db237c720..16c6dd655b91c0bfb57e1fcd36bdba1529884967
--- 1/themes/default/renderer.php
--- 2/themes/default/renderer.php
+++ b/themes/default/renderer.php
@@@ -68,11 -67,11 +67,10 @@@
                                // top status bar
                                $img = "<img src='$local_path_to_root/themes/default/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'>&nbsp;&nbsp;";
                                $himg = "<img src='$local_path_to_root/themes/default/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'>&nbsp;&nbsp;";
-                               echo "<table class=logoutBar>";
-                               echo "<tr><td class=headingtext3>" . $db_connections[user_company()]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
 -
+                               echo "<table class='logoutBar'>";
 -                              echo "<tr><td class='headingtext3'>" . $db_connections[$_SESSION["wa_current_user"]->company]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
++                              echo "<tr><td class='headingtext3'>" . $db_connections[user_company()]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
                                $indicator = "$path_to_root/themes/".user_theme(). "/images/ajax-loader.gif";
-                               echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;'></td>";
+                               echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;' alt='ajaxmark'></td>";
                                echo "  <td class='logoutBarRight'><a class='shortcut' href='$path_to_root/admin/display_prefs.php?'>" . _("Preferences") . "</a>&nbsp;&nbsp;&nbsp;\n";
                                echo "  <a class='shortcut' href='$path_to_root/admin/change_current_user_password.php?selected_id=" . $_SESSION["wa_current_user"]->username . "'>" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
  
@@@ -100,7 -98,8 +97,8 @@@
  
                function menu_footer($no_menu, $is_index)
                {
 -                      global $version, $allow_demo_mode, $app_title, $power_url,
 -                              $power_by, $path_to_root, $Pagehelp, $Ajax;
 +                      global $version, $path_to_root, $Pagehelp, $Ajax, $SysPrefs;
++
                        include_once($path_to_root . "/includes/date_functions.inc");
  
                        echo "</td></tr></table>\n"; // 'main_page'
@@@ -125,13 -123,17 +122,19 @@@
                        {
                                echo "<table align='center' id='footer'>\n";
                                echo "<tr>\n";
 -                              echo "<td align='center' class='footer'><a target='_blank' href='$power_url' tabindex='-1'><font color='#ffffff'>$app_title $version - " . _("Theme:") . " " . user_theme() ." - ".show_users_online()."</font></a></td>\n";
 +                              echo "<td align='center' class='footer'><a target='_blank' href='".$SysPrefs->power_url."' tabindex='-1'><font color='#ffffff'>".$SysPrefs->app_title
 +                                      ." $version - " . _("Theme:") . " " . user_theme() . " - ".show_users_online()."</font></a></td>\n";
                                echo "</tr>\n";
                                echo "<tr>\n";
 -                              echo "<td align='center' class='footer'><a target='_blank' href='$power_url' tabindex='-1'><font color='#ffff00'>$power_by</font></a></td>\n";
 +                              echo "<td align='center' class='footer'><a target='_blank' href='".$SysPrefs->power_url
 +                                      ."' tabindex='-1'><font color='#ffff00'>".$SysPrefs->power_by."</font></a></td>\n";
                                echo "</tr>\n";
+                               if ($allow_demo_mode==true)
+                               {
+                                       echo "<tr>\n";
+                                       //echo "<td><br><div align='center'><a href='http://sourceforge.net'><img src='http://sourceforge.net/sflogo.php?group_id=89967&amp;type=5' alt='SourceForge.net Logo' width='210' height='62' border='0' align='center' /></a></div></td>\n";
+                                       echo "</tr>\n";
+                               }
                                echo "</table><br><br>\n";
                        }
                }