Merged latest changes from stable branch.

diff --git a/.htaccess b/.htaccess
index cad8d65d5f9619ca575cf62979288af8a28540ce..27e55548b09db271335cff27c39af8d8f09c4f4a 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -25,7 +25,6 @@ DirectoryIndex index.php
        php_flag register_globals Off
        php_flag session.use_trans_sid Off
 </IfModule>
-
 #Sometimes neccessary to add those
 #
 #AddType application/x-javascript .js

diff --git a/admin/change_current_user_password.php b/admin/change_current_user_password.php
index 4ed37fb012d1f55c2a13e4e1225179a2263a014b..628fcf897a95d51a4d693802de147fe00c1aa39d 100644 (file)
--- a/admin/change_current_user_password.php
+++ b/admin/change_current_user_password.php
@@ -23,6 +23,18 @@ include_once($path_to_root . "/admin/db/users_db.inc");
 function can_process()
 {
 
+       $Auth_Result = hook_authenticate($_SESSION["wa_current_user"]->username, $_POST['cur_password']);
+
+       if (!isset($Auth_Result))       // if not used external login: standard method
+               $Auth_Result = get_user_auth($_SESSION["wa_current_user"]->username, md5($_POST['cur_password']));
+
+       if (!$Auth_Result)
+       {
+               display_error( _("Invalid password entered."));
+               set_focus('cur_password');
+               return false;
+       }
+       
        if (strlen($_POST['password']) < 4)
        {
                display_error( _("The password entered must be at least 4 characters long."));
@@ -72,11 +84,13 @@ $myrow = get_user($_SESSION["wa_current_user"]->user);
 
 label_row(_("User login:"), $myrow['user_id']);
 
+$_POST['cur_password'] = "";
 $_POST['password'] = "";
 $_POST['passwordConfirm'] = "";
 
-password_row(_("Password:"), 'password', $_POST['password']);
-password_row(_("Repeat password:"), 'passwordConfirm', $_POST['passwordConfirm']);
+password_row(_("Current Password:"), 'cur_password', $_POST['cur_password']);
+password_row(_("New Password:"), 'password', $_POST['password']);
+password_row(_("Repeat New Password:"), 'passwordConfirm', $_POST['passwordConfirm']);
 
 table_section_title(_("Enter your new password in the fields."));
 

diff --git a/admin/crm_categories.php b/admin/crm_categories.php
index b06c618a02752a638d5d9a7b6031041d34e7f858..372faa71637995cff71b84c3f94d9658f5060d93 100644 (file)
--- a/admin/crm_categories.php
+++ b/admin/crm_categories.php
@@ -52,11 +52,20 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
        }
 } 
 
+function key_in_crm_contacts($id) // extra function for testing foreign concatenated key. Joe 02.09.2013.
+{
+       $row = get_crm_category($id);
+       $sql = "SELECT COUNT(*) FROM ".TB_PREF."crm_contacts WHERE type='".$row['type']."' AND action='".$row['action']."'";
+       $result = db_query($sql, "check relations for crm_contacts failed");
+       $contacts = db_fetch($result);
+       return $contacts[0];
+}
+
 if ($Mode == 'Delete')
 {
        $cancel_delete = 0;
 
-       if (key_in_foreign_table($selected_id, 'crm_relations', 'category_id'))
+       if (key_in_crm_contacts($selected_id))
        {
                $cancel_delete = 1;
                display_error(_("Cannot delete this category because there are contacts related to it."));
@@ -83,9 +92,9 @@ if ($Mode == 'RESET')
 $result = get_crm_categories(check_value('show_inactive'));
 
 start_form();
-start_table(TABLESTYLE, "width=50%");
+start_table(TABLESTYLE, "width=70%");
 
-$th = array(_("Type id"), _("Action id"), _("Short Name"), _("Description"),  "", " ");
+$th = array(_("Category Type"), _("Category Subtype"), _("Short Name"), _("Description"),  "", " ");
 inactive_control_column($th);
 
 table_header($th);

diff --git a/admin/db/printers_db.inc b/admin/db/printers_db.inc
index 43e13b4c9bbd1c016e241e35d9dc46f346538634..d6c44c2901b19163a8d35cf76399631da2b8e364 100644 (file)
--- a/admin/db/printers_db.inc
+++ b/admin/db/printers_db.inc
@@ -57,7 +57,7 @@ function update_printer_profile($name, $dest)
                        ."(profile, report, printer) VALUES ("
                        .db_escape($name).","
                        .db_escape($rep).","
-                       .db_escape($printer).")";
+                       .db_escape($printer ? $printer: null, true).")";
                } else {
                        $sql = "DELETE FROM ".TB_PREF."print_profiles WHERE ("
                                ."report=" . db_escape($rep)

diff --git a/config.default.php b/config.default.php
index 5b6a0bc69e2edf57f9930ed10fea4c93cb0437b6..398c0863dfe87ee10b7aad953947e575ce1852ac 100644 (file)
--- a/config.default.php
+++ b/config.default.php
@@ -233,30 +233,6 @@ if(isset($_SESSION["wa_current_user"])) {
        // additional js source included in header
        $js_lib = $js_userlib = array();
 
-if (!defined('ICON_EDIT'))
-{
-       define("ICON_EDIT", "edit.gif");
-       define("ICON_DELETE", "delete.gif");
-       define("ICON_ADD", "ok.gif");
-       define("ICON_UPDATE", "ok.gif");
-       define("ICON_OK", "ok.gif");
-       define("ICON_CANCEL", "cancel.png");
-       define("ICON_GL", "gl.png");
-       define("ICON_PRINT", "print.png");
-       define("ICON_PDF", "pdf.gif");
-       define("ICON_DOC", "invoice.gif");
-       define("ICON_CREDIT", "credit.gif");
-       define("ICON_RECEIVE", "receive.gif");
-       define("ICON_DOWN", "download.gif");
-       define("ICON_MONEY", "money.png");
-       define("ICON_REMOVE", "remove.png");
-       define("ICON_REPORT", "report.png");
-       define("ICON_VIEW", "view.gif");
-       define("ICON_SUBMIT", "ok.gif");
-       define("ICON_ESCAPE", "escape.png");
-       define("ICON_CLOSED", "closed.png");
-}
-
 /* 
        Display a dropdown select box for choosing Company to login if false.
        Show a blank editbox only if true where the Company NickName
@@ -285,6 +261,12 @@ $login_max_attempts = 10;
 $xr_providers = array("ECB", "YAHOO", "GOOGLE", "BLOOMBERG");
 $dflt_xr_provider = 0;
 
+/*
+       Set to true when remote service is authoritative source of exchange rates, and can be stored automatically without
+       manual edition. Otherwise exrate is stored on first new currency transaction of the day.
+*/
+$xr_provider_authoritative = false;
+
 /*
        Optional sorting sales documents lines during edition according to item code
 */

diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php
index 1dbc3939c0ed714558ad897b7dc2649f33d6a6cb..e56726f5eb005da7337e7ceec68b5ac59e31ad2c 100644 (file)
--- a/gl/bank_transfer.php
+++ b/gl/bank_transfer.php
@@ -87,7 +87,7 @@ function gl_payment_controls()
                amount_row(_("Amount:"), 'amount', null, null, $from_currency);
                amount_row(_("Bank Charge:"), 'charge', null, null, $from_currency);
 
-               exchange_rate_display($from_currency, $to_currency, $_POST['DatePaid']);
+               amount_row(_("Incoming Amount:"), 'target_amount', null, '', $to_currency, 2);
        } 
        else 
        {
@@ -139,7 +139,7 @@ function check_valid_entries()
 
        $amnt_tr = input_num('charge') + input_num('amount');
 
-       if ($limit != null && ($limit < $amnt_tr))
+       if ($limit !== null && floatcmp($limit, $amnt_tr) < 0)
        {
                display_error(sprintf(_("The total bank amount exceeds allowed limit (%s) for source account."), price_format($limit)));
                set_focus('amount');
@@ -184,7 +184,19 @@ function check_valid_entries()
                set_focus('ToBankAccount');
                return false;
        }
-       
+
+       if (isset($_POST['target_amount']) && !check_num('target_amount', 0)) 
+       {
+               display_error(_("The entered amount is invalid or less than zero."));
+               set_focus('target_amount');
+               return false;
+       }
+       if (isset($_POST['target_amount']) && input_num('target_amount') == 0) {
+               display_error(_("The incomming bank amount cannot be 0."));
+               set_focus('target_amount');
+               return false;
+       }
+
        if (!db_has_currency_rates(get_bank_account_currency($_POST['FromBankAccount']), $_POST['DatePaid']))
                return false;
 
@@ -200,7 +212,7 @@ function handle_add_deposit()
 {
        new_doc_date($_POST['DatePaid']);
        $trans_no = add_bank_transfer($_POST['FromBankAccount'], $_POST['ToBankAccount'],
-               $_POST['DatePaid'], input_num('amount'), $_POST['ref'], $_POST['memo_'], input_num('charge'));
+               $_POST['DatePaid'], input_num('amount'), $_POST['ref'], $_POST['memo_'], input_num('charge'), input_num('target_amount'));
 
        meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
 }

diff --git a/gl/gl_bank.php b/gl/gl_bank.php
index 3cf2c8d2d275c21f93a90dca4fc842420b9befe5..9a4257cec3f4c1fa731bef4dd8ed3d295ff72592 100644 (file)
--- a/gl/gl_bank.php
+++ b/gl/gl_bank.php
@@ -63,6 +63,7 @@ function line_start_focus() {
   global       $Ajax;
 
   $Ajax->activate('items_table');
+  $Ajax->activate('footer');
   set_focus('_code_id_edit');
 }
 
@@ -133,9 +134,6 @@ if (isset($_GET['UpdatedDep']))
        display_footer_exit();
 }
 
-if (isset($_POST['_date__changed'])) {
-       $Ajax->activate('_ex_rate');
-}
 //--------------------------------------------------------------------------------------------------
 
 function create_cart($type, $trans_no)
@@ -213,8 +211,9 @@ function create_cart($type, $trans_no)
 }
 //-----------------------------------------------------------------------------------------------
 
-if (isset($_POST['Process']))
+function check_trans()
 {
+       global $Refs;
 
        $input_error = 0;
 
@@ -234,7 +233,7 @@ if (isset($_POST['Process']))
 
        $amnt_chg = -$_SESSION['pay_items']->gl_items_total()-$_SESSION['pay_items']->original_amount;
 
-       if ($limit != null && ($limit + $amnt_chg < 0))
+       if ($limit !== null && floatcmp($limit, -$amnt_chg) < 0)
        {
                display_error(sprintf(_("The total bank amount exceeds allowed limit (%s)."), price_format($limit-$_SESSION['pay_items']->original_amount)));
                set_focus('code_id');
@@ -284,14 +283,18 @@ if (isset($_POST['Process']))
        if (!db_has_currency_rates(get_bank_account_currency($_POST['bank_account']), $_POST['date_'], true))
                $input_error = 1;
 
-       if ($input_error == 1)
-               unset($_POST['Process']);
+       if (in_array(get_post('PayType'), array(PT_SUPPLIER, PT_CUSTOMER)) && (input_num('settled_amount') <= 0)) {
+               display_error(_("Settled amount have to be positive number."));
+               set_focus('person_id');
+               $input_error = 1;
+       }
+       return $input_error;
 }
 
-if (isset($_POST['Process']))
+if (isset($_POST['Process']) && !check_trans())
 {
        begin_transaction();
-       
+
        $_SESSION['pay_items'] = &$_SESSION['pay_items'];
        $new = $_SESSION['pay_items']->order_id == 0;
 
@@ -299,17 +302,18 @@ if (isset($_POST['Process']))
                $_SESSION['pay_items']->trans_type, $_SESSION['pay_items']->order_id, $_POST['bank_account'],
                $_SESSION['pay_items'], $_POST['date_'],
                $_POST['PayType'], $_POST['person_id'], get_post('PersonDetailID'),
-               $_POST['ref'], $_POST['memo_'], false);
+               $_POST['ref'], $_POST['memo_'], true, input_num('settled_amount', null));
 
+       add_new_exchange_rate(get_bank_account_currency(get_post('bank_account')), get_post('date_'), input_num('_ex_rate'));
        $trans_type = $trans[0];
        $trans_no = $trans[1];
        new_doc_date($_POST['date_']);
 
        $_SESSION['pay_items']->clear_items();
        unset($_SESSION['pay_items']);
-       
+
        commit_transaction();
-       
+
        if ($new)
                meta_forward($_SERVER['PHP_SELF'], $trans_type==ST_BANKPAYMENT ?
                        "AddedID=$trans_no" : "AddedDep=$trans_no");
@@ -329,6 +333,12 @@ function check_item_data()
                set_focus('amount');
                return false;
        }
+       if (isset($_POST['_ex_rate']) && input_num('_ex_rate') <= 0)
+       {
+               display_error( _("The exchange rate cannot be zero or a negative number."));
+               set_focus('_ex_rate');
+               return false;
+       }
 
        return true;
 }
@@ -398,7 +408,7 @@ start_row();
 echo "<td>";
 display_gl_items($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ?
        _("Payment Items"):_("Deposit Items"), $_SESSION['pay_items']);
-gl_options_controls();
+gl_options_controls($_SESSION['pay_items']);
 echo "</td>";
 end_row();
 end_table(1);

diff --git a/gl/includes/db/gl_db_bank_trans.inc b/gl/includes/db/gl_db_bank_trans.inc
index 3bd65e23b974270983b1dcb6e2c6e0c474951434..49c1c9ff599604362845a4e92fa4e0535dc8ebe1 100644 (file)
--- a/gl/includes/db/gl_db_bank_trans.inc
+++ b/gl/includes/db/gl_db_bank_trans.inc
@@ -65,18 +65,27 @@ function exists_bank_trans($type, $type_no)
 
 function get_bank_trans($type, $trans_no=null, $person_type_id=null, $person_id=null)
 {
-       $sql = "SELECT *, bank_account_name, account_code, bank_curr_code
-               FROM ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts
-               WHERE ".TB_PREF."bank_accounts.id=".TB_PREF."bank_trans.bank_act ";
+       $sql = "SELECT bt.*, act.*,
+               IFNULL(abs(dt.ov_amount), IFNULL (abs(st.ov_amount), bt.amount)) settled_amount,
+               IFNULL(abs(dt.ov_amount/bt.amount), IFNULL (abs(st.ov_amount/bt.amount), 1)) settle_rate,
+               IFNULL(debtor.curr_code, IFNULL (supplier.curr_code, act.bank_curr_code)) settle_curr
+
+               FROM ".TB_PREF."bank_trans bt
+                                LEFT JOIN ".TB_PREF."debtor_trans dt ON dt.type=bt.type AND dt.trans_no=bt.trans_no
+                                LEFT JOIN ".TB_PREF."debtors_master debtor ON debtor.debtor_no = dt.debtor_no
+                                LEFT JOIN ".TB_PREF."supp_trans st ON st.type=bt.type AND st.trans_no=bt.trans_no
+                                LEFT JOIN ".TB_PREF."suppliers supplier ON supplier.supplier_id = st.supplier_id,
+                        ".TB_PREF."bank_accounts act
+               WHERE act.id=bt.bank_act ";
        if ($type != null)
-               $sql .= " AND type=".db_escape($type);
+               $sql .= " AND bt.type=".db_escape($type);
        if ($trans_no != null)
-               $sql .= " AND ".TB_PREF."bank_trans.trans_no = ".db_escape($trans_no);
+               $sql .= " AND bt.trans_no = ".db_escape($trans_no);
        if ($person_type_id != null)
-               $sql .= " AND ".TB_PREF."bank_trans.person_type_id = ".db_escape($person_type_id);
+               $sql .= " AND bt.person_type_id = ".db_escape($person_type_id);
        if ($person_id != null)
-               $sql .= " AND ".TB_PREF."bank_trans.person_id = ".db_escape($person_id);
-       $sql .= " ORDER BY trans_date, ".TB_PREF."bank_trans.id";
+               $sql .= " AND bt.person_id = ".db_escape($person_id);
+       $sql .= " ORDER BY trans_date, bt.id";
 
        return db_query($sql, "query for bank transaction");
 }
@@ -168,7 +177,7 @@ function check_bank_account_history($delta_amount, $bank_account, $date=null, $u
        if (!isset($balance) && isset($date))
                return null;    // unlimited account
 
-       if ($balance < $delta_amount)
+       if ($balance < -$delta_amount)
                return array('amount' => $balance, 'trans_date'=> $date);
 
        $balance += $delta_amount;

diff --git a/gl/includes/db/gl_db_banking.inc b/gl/includes/db/gl_db_banking.inc
index f3f9a99593b312c679186dd6f69d0fc032ece9e2..964eac0ce384556adff2f08714e0ceea5eb6a1dd 100644 (file)
--- a/gl/includes/db/gl_db_banking.inc
+++ b/gl/includes/db/gl_db_banking.inc
@@ -35,7 +35,7 @@ function add_exchange_variation($trans_no, $date_, $acc_id, $account,
        }       
        $amount = get_gl_trans_from_to("", $date_, $account);
        $diff = $amount - $for_amount;
-       if ($diff != 0)
+       if (floatcmp($diff,0))
        {
                if ($trans_no == null)
                        $trans_no = get_next_trans_no(ST_JOURNAL);
@@ -45,8 +45,9 @@ function add_exchange_variation($trans_no, $date_, $acc_id, $account,
                -$diff, null, $person_type_id, $person_id);
        add_gl_trans(ST_JOURNAL, $trans_no, $date_, get_company_pref('exchange_diff_act'), 0, 0, 
                _("Exchange Variance"), $diff, null, $person_type_id, $person_id);
+               return true;
        }
-       return ($diff != 0);
+       return false;
 }
 
 //------------- New helper functions for revaluation of customer/supplier currencies 2011-05-08 Joe Hunt.
@@ -189,14 +190,14 @@ function add_exchange_variation_all($date=null, $ref="", $memo)
 //     
 
 function add_bank_transfer($from_account, $to_account, $date_,
-       $amount, $ref, $memo_, $charge=0)
+       $amount, $ref, $memo_, $charge=0, $target_amount=0)
 {
        global $Refs, $SysPrefs;
        
        begin_transaction();
-       $args = func_get_args(); if (count($args) < 7) $args[] = 0;
+       $args = func_get_args(); if (count($args) < 8) $args[] = 0;
        $args = (object)array_combine(array('from_account', 'to_account', 'date_', 'amount',
-               'ref', 'memo_', 'charge'), $args);
+               'ref', 'memo_', 'charge', 'target_amount'), $args);
        $args->trans_no = 0;
        hook_db_prewrite($args, ST_BANKTRANSFER);
 
@@ -237,16 +238,25 @@ function add_bank_transfer($from_account, $to_account, $date_,
                $total += add_gl_trans($trans_type, $trans_no, $date_,
                        $charge_act, 0, 0, $person_id, $charge, $currency);
        }
+
+       // provide backward compatibility for extension modules (target amount can be not passed)
+       $to_currency = $target_amount ? $toact['bank_curr_code'] : $currency;
+       $to_amount = $target_amount ? $target_amount : $amount;
+
        // do the destination account postings
        $total += add_gl_trans($trans_type, $trans_no, $date_, $to_gl_account, 0, 0, $person_id,
-               $amount, $currency);
+               $to_amount, $to_currency);
                
        /*Post a balance post if $total != 0 */
-       add_gl_balance($trans_type, $trans_no, $date_, -$total);        
+       if ($currency == $to_currency)
+               add_gl_balance($trans_type, $trans_no, $date_, -$total);
+       else    // in this case those are exchange variances between bank and home rates
+               add_gl_trans($trans_type, $trans_no, $date_, get_company_pref('exchange_diff_act'),
+                       0, 0, _("Exchange Variance"), -$total);
        
        add_bank_trans($trans_type, $trans_no, $to_account, $ref,
-               $date_, $amount, PT_MISC, $person_id,
-               $currency, "Cannot insert a destination bank transaction");
+               $date_, $to_amount, PT_MISC, $person_id,
+               $to_currency, "Cannot insert a destination bank transaction");
 
        if ($SysPrefs->auto_currency_revaluation())
        {
@@ -276,17 +286,18 @@ function add_bank_transfer($from_account, $to_account, $date_,
 //     Add bank payment or deposit to database.
 //
 //     $from_account - bank account id
-//  $item - transaction cart (line item's amounts in bank account's currency)
+//  $items - transaction cart (line amounts in bank account's currency); negative for deposit
 //  $person_type_id - defines type of $person_id identifiers
 //  $person_id - supplier/customer/other id
-// $person_detail_id - customer branch id or not used
+//  $person_detail_id - customer branch id or not used
+//  $settled_amount - settled amount in AR/AP (if applicable) in customer/supplier currency (always non-negative number)
 //
 // returns an array of (inserted trans type, trans no)
 //
 // FIXME -revise code for update case
 //
 function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $date_,
-       $person_type_id, $person_id, $person_detail_id, $ref, $memo_, $use_transaction=true)
+       $person_type_id, $person_id, $person_detail_id, $ref, $memo_, $use_transaction=true, $settled_amount=null)
 {
        global $Refs, $SysPrefs;
 
@@ -301,7 +312,7 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $
 
        $args = func_get_args(); if (count($args) < 11) $args[] = true;
        $args = (object)array_combine(array('trans_type', 'trans_no', 'from_account', 'items', 'date_',
-               'person_type_id', 'person_id', 'person_detail_id', 'ref', 'memo_', 'use_transaction'),
+               'person_type_id', 'person_id', 'person_detail_id', 'ref', 'memo_', 'use_transaction', 'settled_amount'),
                $args);
        hook_db_prewrite($args, $trans_type);
 
@@ -321,11 +332,14 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $
     if ($person_type_id == PT_CUSTOMER)
     {
        // we need to add a customer transaction record
-
                // convert to customer currency
-               $cust_amount = exchange_from_to($total_amount, $currency, get_customer_currency($person_id), $date_);
-               // we need to negate it too
-               $cust_amount = -$cust_amount;
+               if (!isset($settled_amount)) // leaved for backward/ext compatibility 
+                       $cust_amount = exchange_from_to(abs($total_amount), $currency, get_customer_currency($person_id), $date_);
+               else
+                       $cust_amount = $settled_amount;
+
+               if ($trans_type == ST_BANKPAYMENT)
+                       $cust_amount = -$cust_amount;
 
                $trans_no = write_customer_trans($trans_type, 0, $person_id, $person_detail_id, $date_,
                $ref, $cust_amount);
@@ -335,10 +349,13 @@ function write_bank_transaction($trans_type, $trans_no, $from_account, $items, $
     {
        // we need to add a supplier transaction record
                // convert to supp currency
-               $supp_amount = exchange_from_to($total_amount, $currency, get_supplier_currency($person_id), $date_);
+               if (!isset($settled_amount)) // leaved for for backward/ext compatibility 
+                       $supp_amount = exchange_from_to(abs($total_amount), $currency, get_supplier_currency($person_id), $date_);
+               else
+                       $supp_amount = $settled_amount;
 
-               // we need to negate it too
-               $supp_amount = -$supp_amount;
+               if ($trans_type == ST_BANKPAYMENT)
+                       $supp_amount = -$supp_amount;
 
                $trans_no = write_supp_trans($trans_type, 0, $person_id, $date_, '',
                        $ref, "", $supp_amount, 0, 0);

diff --git a/gl/includes/db/gl_db_rates.inc b/gl/includes/db/gl_db_rates.inc
index 9f0f101d12d742704a46f983591c4fb53a6705a0..4988ff4c6632cb02ec52fd50463926f2d84156a6 100644 (file)
--- a/gl/includes/db/gl_db_rates.inc
+++ b/gl/includes/db/gl_db_rates.inc
@@ -45,7 +45,7 @@ function update_exchange_rate($curr_code, $date_, $buy_rate, $sell_rate)
        $sql = "UPDATE ".TB_PREF."exchange_rates SET rate_buy=$buy_rate, rate_sell=".db_escape($sell_rate)
        ." WHERE curr_code=".db_escape($curr_code)." AND date_='$date'";
                                
-       db_query($sql, "could not add exchange rate for $curr_code");                           
+       db_query($sql, "could not add exchange rate for $curr_code");
 }
 
 //---------------------------------------------------------------------------------------------
@@ -60,7 +60,18 @@ function add_exchange_rate($curr_code, $date_, $buy_rate, $sell_rate)
        $sql = "INSERT INTO ".TB_PREF."exchange_rates (curr_code, date_, rate_buy, rate_sell)
                VALUES (".db_escape($curr_code).", '$date', ".db_escape($buy_rate)
                .", ".db_escape($sell_rate).")";
-       db_query($sql, "could not add exchange rate for $curr_code");                           
+       db_query($sql, "could not add exchange rate for $curr_code");
+}
+
+//---------------------------------------------------------------------------------------------
+
+function add_new_exchange_rate($curr_code, $date_, $ex_rate)
+{
+       if (is_company_currency($curr_code) || !$ex_rate)
+               return;
+
+       if (!get_date_exchange_rate($curr_code, $date_))
+               add_exchange_rate($curr_code, $date_, $ex_rate, $ex_rate);
 }
 
 //---------------------------------------------------------------------------------------------
@@ -68,12 +79,16 @@ function add_exchange_rate($curr_code, $date_, $buy_rate, $sell_rate)
 function delete_exchange_rate($rate_id)
 {
        $sql = "DELETE FROM ".TB_PREF."exchange_rates WHERE id=".db_escape($rate_id);
-       db_query($sql, "could not delete exchange rate $rate_id");              
+       db_query($sql, "could not delete exchange rate $rate_id");
 }
 
 //-----------------------------------------------------------------------------
 //     Retrieve exchange rate as of date $date from external source (usually inet)
 //
+//     Exchange rate for currency revaluation purposes is defined in FA as home_currency/curr_b ratio i.e.
+//
+//     amount [home] = amount [curr] * ex_rate
+//
 function retrieve_exrate($curr_b, $date)
 {
        global $xr_providers, $dflt_xr_provider;
@@ -88,6 +103,11 @@ function retrieve_exrate($curr_b, $date)
 
 function get_extern_rate($curr_b, $provider = 'ECB', $date) 
 {
+       global  $path_to_root;
+
+       if ($date != Today())   // no historical rates available
+               return 0;
+
        $curr_a = get_company_pref('curr_default');
        if ($provider == 'ECB')
        {
@@ -118,7 +138,7 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
                do {
               $ch = curl_init();
           curl_setopt ($ch, CURLOPT_URL, 'http://'.$site.$filename);
-              curl_setopt ($ch, CURLOPT_COOKIEJAR, "cookie.txt");
+              curl_setopt ($ch, CURLOPT_COOKIEJAR, "$path_to_root/tmp/cookie.txt");
           curl_setopt ($ch, CURLOPT_HEADER, 0);
               curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
               // prevent warning while save_mode/open_basedir on (redireciton doesn't occur at least on ECB page)
@@ -135,9 +155,6 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
        } else {
                $contents = url_get_contents("http://".$site.$filename);
        }
-       if (!$contents) {
-               display_warning(sprintf(_("Cannot retrieve currency rate from %s page. Please set the rate manually."), $provider));
-       }
        if ($provider == 'ECB')
        {
                $contents = str_replace ("<Cube currency='USD'", " <Cube currency='EUR' rate='1'/> <Cube currency='USD'", $contents);

diff --git a/gl/includes/ui/gl_bank_ui.inc b/gl/includes/ui/gl_bank_ui.inc
index 88801754511447f7d5118ce94de7f43f1996346d..7c411de00dc769101d5b47cffbe6ede094c0c643 100644 (file)
--- a/gl/includes/ui/gl_bank_ui.inc
+++ b/gl/includes/ui/gl_bank_ui.inc
@@ -47,6 +47,7 @@ function display_bank_header(&$order)
                $Ajax->activate('code_id');
                $Ajax->activate('pagehelp');
                $Ajax->activate('editors');
+               $Ajax->activate('footer');
        }
     payment_person_types_list_row( $payment ? _("Pay To:"):_("From:"),
                 'PayType', $_POST['PayType'], true);
@@ -93,6 +94,7 @@ function display_bank_header(&$order)
                        $qid = get_quick_entry(get_post('person_id'));
                        if (list_updated('person_id')) {
                                unset($_POST['totamount']); // enable default
+                               $Ajax->activate('footer');
                                $Ajax->activate('totamount');
                        }
                        amount_row($qid['base_desc'].":", 'totamount', price_format($qid['base_amount']),
@@ -105,7 +107,7 @@ function display_bank_header(&$order)
 
        table_section(3, "33%");
 
-       if (!$order->order_id && !list_updated('bank_account'))
+       if (!$order->order_id && !get_post('bank_account'))
        {
                if ($_POST['PayType'] == PT_CUSTOMER)
                        $_POST['bank_account'] = get_default_customer_bank_account($_POST['person_id']);
@@ -118,11 +120,10 @@ function display_bank_header(&$order)
     bank_accounts_list_row( $payment ? _("From:") : _("Into:"), 'bank_account', null, true);
     if ($payment)
                bank_balance_row($_POST['bank_account']);
-       
-       $person_currency = payment_person_currency($_POST['PayType'], $_POST['person_id']);
+
        $bank_currency = get_bank_account_currency($_POST['bank_account']);
 
-       exchange_rate_display($bank_currency, $person_currency, $_POST['date_']);
+       exchange_rate_display(get_company_currency(), $bank_currency, $_POST['date_']);
 
        end_outer_table(1); // outer table
 
@@ -291,13 +292,27 @@ function gl_edit_item_controls(&$order, $dim, $Index=null)
 
 //---------------------------------------------------------------------------------
 
-function gl_options_controls()
+function gl_options_controls($order)
 {
+       div_start('footer');
        echo "<br><table align='center'>";
 
+       $type = get_post('PayType');
+       $bank_curr = get_bank_account_currency(get_post('bank_account'));
+       $person_curr = $type == PT_CUSTOMER ? get_customer_currency(get_post('person_id')) 
+               : ($type == PT_SUPPLIER ? get_supplier_currency(get_post('person_id')) : $bank_curr);
+
+       if ($person_curr != $bank_curr)
+       {
+               $_POST['settled_amount'] =
+                       price_format(abs($order->gl_items_total() / get_exchange_rate_from_to($bank_curr, $person_curr, get_post('date_'))));
+               amount_row($type == PT_CUSTOMER ? _("Settled AR Amount:") :  _("Settled AP Amount:"),
+                        'settled_amount', null, null, $person_curr, user_price_dec());
+       }
        textarea_row(_("Memo"), 'memo_', null, 50, 3);
 
        echo "</table>";
+       div_end();
 }
 
 

diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index dfdda2f1282be7634cee1aa41aa703228716b24e..bfb6a5477b2ba862a0c1361934c472a6304d1cc2 100644 (file)
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -46,7 +46,12 @@ function gl_inquiry_controls()
 
     start_table(TABLESTYLE_NOBORDER);
 
-    date_cells(_("From:"), 'TransFromDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
+       $date = today();
+       if (!isset($_POST['TransToDate']))
+               $_POST['TransToDate'] = end_month($date);
+       if (!isset($_POST['TransFromDate']))
+               $_POST['TransFromDate'] = add_days(end_month($date), -$_SESSION["wa_current_user"]->prefs->transaction_days());
+    date_cells(_("From:"), 'TransFromDate');
        date_cells(_("To:"), 'TransToDate');
        if ($dim >= 1)
                dimensions_list_cells(_("Dimension")." 1:", 'Dimension', null, true, " ", false, 1);
@@ -64,10 +69,10 @@ function gl_inquiry_controls()
 
 function display_trial_balance($type, $typename)
 {
-       global $path_to_root, $clear_trial_balance_opening;
-       
-       global $k, $pdeb, $pcre, $cdeb, $ccre, $tdeb, $tcre, $pbal, $cbal, $tbal;
-       $printtitle = 0; //Flag for printing type name          
+       global $path_to_root, $clear_trial_balance_opening,
+                $k, $pdeb, $pcre, $cdeb, $ccre, $tdeb, $tcre, $pbal, $cbal, $tbal;
+
+       $printtitle = 0; //Flag for printing type name
 
        $k = 0;
 

diff --git a/gl/inquiry/profit_loss.php b/gl/inquiry/profit_loss.php
index f7ba91767c1055bc9b1282c5f8830d58d90f76e1..8d9144d61c12f624fd19079ae3eedd6e8d9f63d7 100644 (file)
--- a/gl/inquiry/profit_loss.php
+++ b/gl/inquiry/profit_loss.php
@@ -160,7 +160,12 @@ function inquiry_controls()
        $dim = get_company_pref('use_dimension');
     start_table(TABLESTYLE_NOBORDER);
     
-    date_cells(_("From:"), 'TransFromDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
+       $date = today();
+       if (!isset($_POST['TransToDate']))
+               $_POST['TransToDate'] = end_month($date);
+       if (!isset($_POST['TransFromDate']))
+               $_POST['TransFromDate'] = add_days(end_month($date), -$_SESSION["wa_current_user"]->prefs->transaction_days());
+    date_cells(_("From:"), 'TransFromDate');
        date_cells(_("To:"), 'TransToDate');
        
        //Compare Combo

diff --git a/gl/view/gl_deposit_view.php b/gl/view/gl_deposit_view.php
index 88b9a2f23e415e0ebb0d7e068be7ce46eb47ac4b..21dfcc3234c4cd674889bb688925b0e70e0dcd4f 100644 (file)
--- a/gl/view/gl_deposit_view.php
+++ b/gl/view/gl_deposit_view.php
@@ -38,7 +38,7 @@ $company_currency = get_company_currency();
 
 $show_currencies = false;
 
-if ($to_trans['bank_curr_code'] != $company_currency)
+if ($to_trans['bank_curr_code'] != $to_trans['settle_curr'])
 {
        $show_currencies = true;
 }
@@ -52,13 +52,13 @@ start_table(TABLESTYLE, "width=80%");
 
 if ($show_currencies)
 {
-       $colspan1 = 5;
-       $colspan2 = 8;
+       $colspan1 = 1;
+       $colspan2 = 7;
 }
 else
 {
        $colspan1 = 3;
-       $colspan2 = 6;
+       $colspan2 = 5;
 }
 start_row();
 label_cells(_("To Bank Account"), $to_trans['bank_account_name'], "class='tableheader2'");
@@ -68,7 +68,12 @@ label_cells(_("Amount"), number_format2($to_trans['amount'], user_price_dec()),
 label_cells(_("Date"), sql2date($to_trans['trans_date']), "class='tableheader2'");
 end_row();
 start_row();
-label_cells(_("From"), get_counterparty_name(ST_BANKDEPOSIT, $trans_no), "class='tableheader2'", "colspan=$colspan1");
+label_cells(_("From"), get_counterparty_name(BT_BANKDEPOSIT, $to_trans['trans_no']), "class='tableheader2'", "colspan=$colspan1");
+if ($show_currencies)
+{
+       label_cells(_("Settle currency"), $to_trans['settle_curr'], "class='tableheader2'");
+       label_cells(_("Settled amount"),  number_format2($to_trans['settled_amount'], user_price_dec()), "class='tableheader2'");
+}
 label_cells(_("Deposit Type"), $bank_transfer_types[$to_trans['account_type']], "class='tableheader2'");
 end_row();
 start_row();
@@ -91,7 +96,7 @@ else
 
        display_heading2(_("Items for this Deposit"));
        if ($show_currencies)
-               display_heading2(_("Item Amounts are Shown in :") . " " . $company_currency);
+               display_heading2(_("Item Amounts are Shown in:") . " " . $company_currency);
 
     start_table(TABLESTYLE, "width=80%");
     $dim = get_company_pref('use_dimension');
@@ -133,7 +138,7 @@ else
 
        end_table(1);
 
-       display_allocations_from($to_trans['person_type_id'], $to_trans['person_id'], 2, $trans_no, $to_trans['amount']);
+       display_allocations_from($to_trans['person_type_id'], $to_trans['person_id'], 2, $trans_no, $to_trans['settled_amount']);
 }
 
 end_page(true, false, false, ST_BANKDEPOSIT, $trans_no);

diff --git a/gl/view/gl_payment_view.php b/gl/view/gl_payment_view.php
index 681373c2c9577d3924bc6319b0f598a12c877854..b349064161f92699a68dc6b344cd6ceb98efae29 100644 (file)
--- a/gl/view/gl_payment_view.php
+++ b/gl/view/gl_payment_view.php
@@ -38,7 +38,7 @@ $company_currency = get_company_currency();
 
 $show_currencies = false;
 
-if ($from_trans['bank_curr_code'] != $company_currency)
+if ($from_trans['bank_curr_code'] != $from_trans['settle_curr'])
 {
        $show_currencies = true;
 }
@@ -50,13 +50,13 @@ start_table(TABLESTYLE, "width=80%");
 
 if ($show_currencies)
 {
-       $colspan1 = 5;
-       $colspan2 = 8;
+       $colspan1 = 1;
+       $colspan2 = 7;
 }
 else
 {
        $colspan1 = 3;
-       $colspan2 = 6;
+       $colspan2 = 5;
 }
 start_row();
 label_cells(_("From Bank Account"), $from_trans['bank_account_name'], "class='tableheader2'");
@@ -66,7 +66,12 @@ label_cells(_("Amount"), number_format2(-$from_trans['amount'], user_price_dec()
 label_cells(_("Date"), sql2date($from_trans['trans_date']), "class='tableheader2'");
 end_row();
 start_row();
-label_cells(_("Pay To"), get_counterparty_name(ST_BANKPAYMENT, $trans_no), "class='tableheader2'", "colspan=$colspan1");
+label_cells(_("Pay To"), get_counterparty_name(ST_BANKPAYMENT, $from_trans['trans_no']), "class='tableheader2'", "colspan=$colspan1");
+if ($show_currencies)
+{
+       label_cells(_("Settle currency"), $from_trans['settle_curr'], "class='tableheader2'");
+       label_cells(_("Settled amount"), number_format2($from_trans['settled_amount'], user_price_dec()), "class='tableheader2'");
+}
 label_cells(_("Payment Type"), $bank_transfer_types[$from_trans['account_type']], "class='tableheader2'");
 end_row();
 start_row();
@@ -89,7 +94,7 @@ else
 
        display_heading2(_("Items for this Payment"));
        if ($show_currencies)
-               display_heading2(_("Item Amounts are Shown in :") . " " . $company_currency);
+               display_heading2(_("Item Amounts are Shown in:") . " " . $company_currency);
 
     echo "<br>";
     start_table(TABLESTYLE, "width=80%");
@@ -133,7 +138,7 @@ else
        end_table(1);
 
        if (!$voided)
-               display_allocations_from($from_trans['person_type_id'], $from_trans['person_id'], 1, $trans_no, -$from_trans['amount']);
+               display_allocations_from($from_trans['person_type_id'], $from_trans['person_id'], 1, $trans_no, $from_trans['settled_amount']);
 }
 
 end_page(true, false, false, ST_BANKPAYMENT, $trans_no);

diff --git a/includes/app_entries.inc b/includes/app_entries.inc
index eabfdd8096222428662678e045ae1706754dd5de..1fa7bb73571db0cdf3fee54256fdd240e2658707 100644 (file)
--- a/includes/app_entries.inc
+++ b/includes/app_entries.inc
@@ -30,7 +30,7 @@ $trans_editors = array(
 // credit invoice
 //     "/sales/customer_credit_invoice.php?ModifyCredit=%d"
        ST_CUSTCREDIT =>  "/sales/customer_credit_invoice.php?ModifyCredit=%s",
-       //ST_CUSTPAYMENT =>  ,
+       ST_CUSTPAYMENT =>  "/sales/customer_payments.php?trans_no=%d",
        ST_CUSTDELIVERY => "/sales/customer_delivery.php?ModifyDelivery=%d",
 
        //ST_LOCTRANSFER =>  ,

diff --git a/includes/banking.inc b/includes/banking.inc
index 21dbb8f6fc85516bc819ce47427cf5d00993e835..53af3598b8580b7c3263d6fb46937a201e24a08b 100644 (file)
--- a/includes/banking.inc
+++ b/includes/banking.inc
@@ -163,7 +163,8 @@ function exchange_variation($pyt_type, $pyt_no, $type, $trans_no, $pyt_date, $am
        {
                $trans = get_customer_trans($trans_no, $type);
                $pyt_trans = get_customer_trans($pyt_no, $pyt_type);
-               $ar_ap_act = $trans['receivables_account'];
+               $cust_accs = get_branch_accounts($trans['branch_code']);
+               $ar_ap_act = $cust_accs['receivables_account'];
                $person_id = $trans['debtor_no'];
                $curr = $trans['curr_code'];
                $date = sql2date($trans['tran_date']);
@@ -175,7 +176,7 @@ function exchange_variation($pyt_type, $pyt_no, $type, $trans_no, $pyt_date, $am
                $supp_accs = get_supplier_accounts($trans['supplier_id']);
                $ar_ap_act = $supp_accs['payable_account'];
                $person_id = $trans['supplier_id'];
-               $curr = $trans['SupplierCurrCode'];
+               $curr = $trans['curr_code'];
                $date = sql2date($trans['tran_date']);
        }
        if (is_company_currency($curr))

diff --git a/includes/db/crm_contacts_db.inc b/includes/db/crm_contacts_db.inc
index 94a5a991594034f10bba5c8a1d81732171628f29..8623c8e0043525755a07ff8a2248ef76dbc7556e 100644 (file)
--- a/includes/db/crm_contacts_db.inc
+++ b/includes/db/crm_contacts_db.inc
@@ -41,7 +41,7 @@ function add_crm_person($ref, $name, $name2, $address, $phone, $phone2, $fax, $e
 }
 
 function update_crm_person($id, $ref, $name, $name2, $address, $phone, $phone2, $fax, $email, 
-       $lang, $notes, $cat_ids, $entity=null)
+       $lang, $notes, $cat_ids, $entity=null, $type=null)
 {
        $sql = "UPDATE ".TB_PREF."crm_persons SET "
                  ."ref=".db_escape($ref) . ", "
@@ -60,7 +60,7 @@ function update_crm_person($id, $ref, $name, $name2, $address, $phone, $phone2,
 
        $ret = db_query($sql, "Can't update crm person");
        if ($ret) {
-               if(!update_person_contacts($id, $cat_ids, $entity))
+               if(!update_person_contacts($id, $cat_ids, $entity, $type))
                        return null;
        }
        commit_transaction();
@@ -147,9 +147,11 @@ function get_person_contacts($id)
        return $contacts;
 }
 
-function update_person_contacts($id, $cat_ids, $entity_id=null) 
+function update_person_contacts($id, $cat_ids, $entity_id=null, $type=null)
 {
        $sql = "DELETE FROM ".TB_PREF."crm_contacts WHERE person_id=".db_escape($id);
+       if ($type)
+               $sql .= " AND type=".db_escape($type);
 
        begin_transaction();
 
@@ -163,6 +165,8 @@ function update_person_contacts($id, $cat_ids, $entity_id=null)
                $sql = "INSERT INTO ".TB_PREF."crm_contacts (person_id,type,action,entity_id)
                        SELECT ".db_escape($id).",t.type, t.action,".db_escape($entity_id, true)."
                        FROM ".TB_PREF."crm_categories t WHERE t.id=".implode(' OR t.id=', $cat_ids);
+               if ($type)
+                       $sql .= " AND t.type=".db_escape($type);
                $ret = db_query($sql, "Can't update person contacts");
        }
        commit_transaction();
@@ -171,10 +175,14 @@ function update_person_contacts($id, $cat_ids, $entity_id=null)
 
 function delete_entity_contacts($class, $entity)
 {
+       delete_crm_contacts(null, $class, $entity);
+       // cleanup
        $res = get_crm_persons($class, null, $entity, null, true);
-
        while($person = db_fetch($res)) {
-               delete_crm_person($person['id'], true);
+               $rels = get_person_contacts($person['id']);
+               if (count($rels) == 0) {
+                       delete_crm_person($person['id']);
+               }
        }
 }
 
@@ -261,17 +269,20 @@ function delete_crm_contact($id)
 /*
        Delete selected contacts for given person
 */
-function delete_crm_contacts($person_id, $type = null, $entity_id=null, $action = null)
+function delete_crm_contacts($person_id = null, $type = null, $entity_id=null, $action = null)
 {
-       $sql = "DELETE FROM ".TB_PREF."crm_contacts WHERE person_id=".db_escape($person_id);
+       $sql = "DELETE FROM ".TB_PREF."crm_contacts WHERE ";
+
+       if ($person_id)
+               $where[] = 'person_id='.db_escape($person_id);
        if ($type)
-               $sql .= ' AND type='.db_escape($type);
+               $where[] = 'type='.db_escape($type);
        if ($entity_id)
-               $sql .= ' AND entity_id='.db_escape($entity_id);
+               $where[] = 'entity_id='.db_escape($entity_id);
        if ($action)
-               $sql .= ' AND action='.db_escape($action);
+               $where[] = 'action='.db_escape($action);
 
-       return db_query($sql, "Can't delete crm contact");
+       return db_query($sql.implode(' AND ', $where), "Can't delete crm contact");
 }
 
 /*

diff --git a/includes/db/inventory_db.inc b/includes/db/inventory_db.inc
index 77ba496f47876fb9649abbe000b74bc0b4db3276..c65cacb2c665a93a2072ecf23e98b921f71449c4 100644 (file)
--- a/includes/db/inventory_db.inc
+++ b/includes/db/inventory_db.inc
@@ -45,7 +45,8 @@ function get_qoh_on_date($stock_id, $location=null, $date_=null, $exclude=0)
             $myrow[0] -= $myrow2[0];
     }
 
-    return $myrow[0];
+    $qoh =  $myrow[0];
+               return $qoh ? $qoh : 0;
 }
 
 //--------------------------------------------------------------------------------------
@@ -393,13 +394,13 @@ function void_stock_move($type, $type_no)
                        // The cost has to be adjusted.
                        // Transaction rates are stored either as price or standard_cost depending on types
                        $types = array(ST_SUPPCREDIT, ST_SUPPRECEIVE);
-                       if (in_array($type,$types))
-                               $trans_rate = $row["price"];
+                       if (in_array($type, $types))
+                               $unit_cost = $row["price"];
                        else
-                               $trans_rate = $row["standard_cost"];
+                               $unit_cost = $row["standard_cost"];
 
-                       update_average_material_cost(0, $row["stock_id"],
-                               $trans_rate, -$row["qty"], sql2date($row["tran_date"]));
+                       update_average_material_cost($row["person_id"], $row["stock_id"],
+                               $unit_cost, -$row["qty"], sql2date($row["tran_date"]));
                }
 
     }

diff --git a/includes/db_pager.inc b/includes/db_pager.inc
index 473e6f6a536e41964266b462176939dd7305afb6..48359f3cf510cb66b65ceffa5078c80e57a6414f 100644 (file)
--- a/includes/db_pager.inc
+++ b/includes/db_pager.inc
@@ -39,12 +39,15 @@ class db_pager {
            $prev_page, 
            $next_page,
            $first_page;
-
+           
        var $page_len,
            $rec_count;
-
-       var $order = array();
-
+       
+       var $select,
+               $where,
+           $from,
+               $group,
+               $order;
        var     $extra_where;
        
        var $ready = false; // this var is false after change in sql before first
@@ -66,12 +69,47 @@ class db_pager {
        }
        //
        //      Parse base sql select query.
-       //
+       //      or use an associative array.
+       //  Usefull is the query can't be split correctly (using subquery for example).
+       //  The associative array shouldn't contain the keyword itself.
+       //  ex :
+       //  array('select' => 'SUM(quantity)', 'from' => TB_PREF."stock_moves", 'group' => 'location')
        function set_sql($sql)
        {
                if ($sql != $this->sql) {
                    $this->sql = $sql;
                    $this->ready = false;
+
+                               if(is_array($sql)) {
+                                       foreach(explode(' ', 'select from where group order') as $section) {
+                                               $this->$section = @$sql[$section];
+                                       }
+                                       $this->select = "SELECT ".$this->select;
+                               }
+                               else {
+                                       // parse the query
+                                               $parts = preg_split('/\sORDER\s*BY\s/si', $sql, 2);
+                                       if(count($parts) == 2) {
+                                               $sql = $parts[0];
+                                               $this->order = $parts[1];
+                                       }
+                                               $parts = preg_split('/\sGROUP\s*BY\s/si', $sql, 2);
+                                       if(count($parts) == 2) {
+                                               $sql = $parts[0];
+                                               $this->group = $parts[1];
+                                       }
+                                               $parts = preg_split('/\sWHERE\s/si', $sql, 2);
+                                       if(count($parts) == 2) {
+                                               $sql = $parts[0];
+                                               $this->where = $parts[1];
+                                       }
+                                               $parts = preg_split('/\sFROM\s/si', $sql, 2);
+                                       if(count($parts) == 2) {
+                                               $sql = $parts[0];
+                                               $this->from = $parts[1];
+                                       }
+                                       $this->select = $sql;
+                       }
                }
        }
        //
@@ -105,17 +143,20 @@ class db_pager {
        //
        function sort_table($col) 
        {
+
+                       $max_priority = 0;
+                       foreach($this->columns as $id => $_col) {
+                       if(!isset($_col['ord_priority'])) continue;
+                               $max_priority = max($max_priority, $_col['ord_priority']);
+                       };
+
+
            $ord = $this->columns[$col]['ord'];
+               $this->columns[$col]['ord_priority']  = $max_priority+1; // set priority , higher than anything else
            $ord = ($ord == '') ? 'asc' : (($ord == 'asc') ? 'desc' : '');
            $this->columns[$col]['ord'] = $ord;
-           $n = array_search($col, $this->order);
-           if ($n !== false)
-                       unset($this->order[$n]);
-               if ($ord != '')
-                       array_unshift($this->order, $col); // store column number as first
            $this->set_page(1);
            $this->query();
-
            return true;
        }
        //
@@ -156,7 +197,7 @@ class db_pager {
                } else 
                  return false;
                return true;
-       }
+       }           
        //
        //      Calculates page numbers for html controls.
        //
@@ -192,7 +233,7 @@ class db_pager {
        //  $flds: array( fldname1, fldname2=>type,...)
        function set_columns($flds)
        {
-               $this->columns = $this->order = array();
+               $this->columns = array();
                if (!is_array($flds)) {
                        $flds = array($flds);
                }
@@ -224,9 +265,7 @@ class db_pager {
                                case 'skip':            // skip the column (no header)
                                        unset($c['head']); break;
                        }
-                       if (@$c['ord'])
-                               array_push($this->order, count($this->columns));
-                       $this->columns[] = $c;
+                       $this->columns[] = $c;  
                }
        }
        //
@@ -236,28 +275,45 @@ class db_pager {
        //
        function _sql_gen($count=false) 
        {
+               $select = $this->select;
+               $from = $this->from;
+               $where = $this->where;
+               $group = $this->group;
+               $order = $this->order;
+
+               if(count($this->extra_where)) {
+                   $where .= ($where=='' ? '' : ' AND ')
+                               .implode(' AND ', $this->extra_where);
+               }
+               if ($where) $where = " WHERE ($where)";
 
-               if (count($this->extra_where)) {
-                   $where = ' WHERE ('.implode(' AND ', $this->extra_where).')';
-               } else
-                       $where = '';
-
-               if ($count)
-                       return "SELECT COUNT(*) FROM ($this->sql) $where AS _dummyname";
+               if ($count) {
+                       $group = $group == '' ? "*" : "DISTINCT $group";
 
+                       return "SELECT COUNT($group) FROM $from $where";
+               }
 
+               $sql = "$select FROM $from $where";
+               if ($group) $sql.= " GROUP BY $group";
            $ord = array();
 
-               $sql = "SELECT * FROM ($this->sql) $where AS _dummyname";
+                       // sort order column by priority instead of table order.
+                       $columns = array();
+           foreach ($this->columns as $col) {
+                                       if(isset($col['ord_priority'])) {
+                                               $columns[$col['ord_priority']] = $col;
+                                       }
+                       }
+                       krsort($columns);
 
-           foreach ($this->order as $n) {
-               $col = $this->columns[$n];
+           foreach ($columns as $col) {
                if (isset($col['ord'])) {
                        if ( $col['ord'] != '' && isset($col['name'])) {
                            $ord[] = $col['name'] .' '. $col['ord'];
                            }
                        }
            }
+                               
            if (count($ord)) {
                        $ord = array_map(function_exists('mysql_real_escape_string') ? 
                                'mysql_real_escape_string': 'mysql_escape_string', $ord);
@@ -270,11 +326,10 @@ class db_pager {
            $page_len = $this->page_len;
            $offset = ($this->curr_page - 1) * $page_len;
 
-
            $sql .= " LIMIT $offset, $page_len";
 
                return $sql;
-
+               
        }
        //
        //      Initialization after changing record set
@@ -282,7 +337,7 @@ class db_pager {
        function _init() 
        {
                global $go_debug;
-
+               
            if ($this->ready == false ) {
                        $sql = $this->_sql_gen(true);
                        $result = db_query($sql, 'Error reading record set');
@@ -292,7 +347,7 @@ class db_pager {
                        $this->rec_count = $row[0];
                        $this->max_page = $this->page_len ?
                                ceil($this->rec_count/$this->page_len) : 0;
-
+               
                        if ($go_debug) { // FIX - need column name parsing, but for now:
                                // check if field names are set explicite in col def
                                // for all initially ordered columns
@@ -374,7 +429,7 @@ class db_pager {
 //                     return inactive_control_cell($row[$this->inactive_ctrl['key']],
 //                              $row['inactive'], $this->inactive_ctrl['table'], 
 //                              $this->inactive_ctrl['key']);
-
+                                
                        global  $Ajax;
 
                        $key = $this->key ?
@@ -449,4 +504,4 @@ function refresh_pager($name)
        if (isset($_SESSION[$name]))
                $_SESSION[$name]->ready = false;
 }
-?>
\ No newline at end of file
+?>

diff --git a/includes/hooks.inc b/includes/hooks.inc
index 361a56eca52d95d7852ca9e6370ad0be1a7bc3fc..1621d8f48cbc6a9c371101d74b7ff9be9636ede4 100644 (file)
--- a/includes/hooks.inc
+++ b/includes/hooks.inc
@@ -191,6 +191,29 @@ class hooks {
        {
                return true;
        }
+
+       /*
+        * Returns the quantity allowed to be dispatched for a particular item 
+        * and a status (which can be used to style the row).
+        * This quantity would be the default value on the delivery note.
+        * The usual use case for this is when a item is in stock,
+        * but has been reserved by someone else.
+        * This allows extensions to implements its own priority algorithm.
+        * This function is by detail_id and not item in case the item is present
+        * more than one in  the cart.
+        */
+       /* Default behavior check if there is enough quantity on hand and change the css
+ * class if needed */
+       static function  default_get_dispatchable_quantity($line_item, $location, $date, $qoh) {
+    global $SysPrefs;
+
+               if ($SysPrefs->allow_negative_stock() || ($line_item->qty_dispatched <= $qoh)) {
+                       return true;
+               }
+               return array($qoh, 'stockmankobg');
+               return array($line_item->qty_dispatched, 'stockmankobg');
+       }
+
 }
 
 /*
@@ -416,3 +439,19 @@ function hook_authenticate($login, $password)
 {
        return hook_invoke_last('authenticate', $login, $password);
 }
+
+       /*
+        * Returns the quantity allowed to be dispatched for a particular item 
+        * and a "reason" (css classes).
+        * This quantity would be the default value on the delivery note.
+        * The usual use case for this is when a item is in stock,
+        * but has been reserved by someone else.
+        * This allows extensions to implements its own priority algorithm.
+        * This function is by detail_id and not item in case the item is present
+        * more than one in  the cart.
+        * If 'skip' is returned, the line will be skipped and not displayed
+        */
+function hook_get_dispatchable_quantity($line_item, $location, $date, $qoh) {
+               $result =  hook_invoke_first('get_dispatchable_quantity', $line_item, array($location, $date, $qoh));
+               return $result !== null ? $result : hooks::default_get_dispatchable_quantity($line_item, $location, $date, $qoh);
+}

diff --git a/includes/prefs/userprefs.inc b/includes/prefs/userprefs.inc
index 422c741bfa9f96470e34d640d83c582030eda120..bd72d6670627c4a2725eb7dd9071fda3bc03a2b0 100644 (file)
--- a/includes/prefs/userprefs.inc
+++ b/includes/prefs/userprefs.inc
@@ -86,6 +86,7 @@ class user_prefs
                                $this->startup_tab = "orders";
                        }
                        $this->transaction_days = $user['transaction_days'];
+
                        if (!file_exists("$path_to_root/themes/$this->theme"))
                                $this->theme = "default";
                }

diff --git a/includes/session.inc b/includes/session.inc
index da23735e62df03ebaafded64fef8d3b5e72412c5..22644aec2fe2955352ab212c4e7c6f2a4b4aebb3 100644 (file)
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -21,7 +21,11 @@ class SessionManager
                $https = isset($secure) ? $secure : (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off');
 
                // Set session cookie options
-               session_set_cookie_params($limit, $path, $domain, $https, true);
+               if (version_compare(PHP_VERSION, '5.2', '<')) // avoid failure on older php versions
+                       session_set_cookie_params($limit, $path, $domain, $https);
+               else
+                       session_set_cookie_params($limit, $path, $domain, $https, true);
+
                session_start();
 
                // Make sure the session hasn't expired, and destroy it if it has
@@ -184,7 +188,7 @@ function write_login_filelog($login, $result)
        $msg .= "*/\n";
        $msg .= "\$login_faillog = " .var_export($login_faillog, true). ";\n";
 
-       $filename = $path_to_root."/faillog.php";
+       $filename = $path_to_root."/tmp/faillog.php";
 
        if ((!file_exists($filename) && is_writable($path_to_root)) || is_writable($filename))
        {
@@ -367,7 +371,7 @@ include_once($path_to_root . "/config.php");
 get_text_init();
 
 if ($login_delay > 0)
-       @include_once($path_to_root . "/faillog.php");
+       @include_once($path_to_root . "/tmp/faillog.php");
 
 // Page Initialisation
 if (!isset($_SESSION['wa_current_user']) || !$_SESSION['wa_current_user']->logged_in()

diff --git a/includes/systypes.inc b/includes/systypes.inc
index 974adfdbb0ed51f27272ab4f6e5d6ec168c0a075..c1c17a4a6f3e95b15b5e7f2fa3270bdafbb7d21e 100644 (file)
--- a/includes/systypes.inc
+++ b/includes/systypes.inc
@@ -14,6 +14,7 @@
 //     Returns next transaction number.
 //     Used only for transactions stored in tables without autoincremented key.
 //
+
 function get_next_trans_no ($trans_type){
 
        $st = get_systype_db_info($trans_type);
@@ -23,11 +24,14 @@ function get_next_trans_no ($trans_type){
                display_error('Internal error: invalid type passed to get_next_trans_no()');
                return 0;
        }
-       $sql = "SELECT MAX(`$st[2]`) FROM $st[0]";
-
+       $sql1 = "SELECT MAX(`$st[2]`) as last_no FROM $st[0]";
        if ($st[1] != null)
-                $sql .= " WHERE `$st[1]`=".db_escape($trans_type);
+                $sql1 .= " WHERE `$st[1]`=".db_escape($trans_type);
+
+       // check also in voided transactions (some transactions like location transfer are removed completely)
+       $sql2 = "SELECT MAX(`id`) as last_no FROM ".TB_PREF."voided WHERE `type`=".db_escape($trans_type);
 
+       $sql = "SELECT max(last_no) last_no FROM ($sql1 UNION $sql2) a";
     $result = db_query($sql,"The next transaction number for $trans_type could not be retrieved");
     $myrow = db_fetch_row($result);
 

diff --git a/includes/types.inc b/includes/types.inc
index 94d5c4e026391ecf95fb7180025e63560fa7167b..cd4e3dc3d18fd055c040c9177c033dbf2634c244 100644 (file)
--- a/includes/types.inc
+++ b/includes/types.inc
@@ -315,4 +315,28 @@ define('BO_SUPPLIER', 3);
 
 include_once($path_to_root . '/includes/sysnames.inc');
 
+//---------------------------------------------------------------------------------
+// Constants optionally redefined locally
+//
+defined('ICON_EDIT') || define('ICON_EDIT', 'edit.gif');
+defined('ICON_DELETE') || define('ICON_DELETE', 'delete.gif');
+defined('ICON_ADD')    || define('ICON_ADD', 'ok.gif');
+defined('ICON_UPDATE') || define('ICON_UPDATE', 'ok.gif');
+defined('ICON_OK') || define('ICON_OK', 'ok.gif');
+defined('ICON_CANCEL') || define('ICON_CANCEL', 'cancel.png');
+defined('ICON_GL') || define('ICON_GL', 'gl.png');
+defined('ICON_PRINT') || define('ICON_PRINT', 'print.png');
+defined('ICON_PDF') || define('ICON_PDF', 'pdf.gif');
+defined('ICON_DOC') || define('ICON_DOC', 'invoice.gif');
+defined('ICON_CREDIT') || define('ICON_CREDIT', 'credit.gif');
+defined('ICON_RECEIVE') || define('ICON_RECEIVE', 'receive.gif');
+defined('ICON_DOWN') || define('ICON_DOWN', 'download.gif');
+defined('ICON_MONEY') || define('ICON_MONEY', 'money.png');
+defined('ICON_REMOVE') || define('ICON_REMOVE', 'remove.png');
+defined('ICON_REPORT') || define('ICON_REPORT', 'report.png');
+defined('ICON_VIEW') || define('ICON_VIEW', 'view.gif');
+defined('ICON_SUBMIT') || define('ICON_SUBMIT', 'ok.gif');
+defined('ICON_ESCAPE') || define('ICON_ESCAPE', 'escape.png');
+defined('ICON_ALLOC') || define('ICON_ALLOC', 'alloc.png');
+
 ?>
\ No newline at end of file

diff --git a/includes/ui/allocation_cart.inc b/includes/ui/allocation_cart.inc
index f67c5f15ba66c7aaca7025c9dfb69a53ea310edf..37c436a0ac3a96b2daa447f0f64985c4d7b014d9 100644 (file)
--- a/includes/ui/allocation_cart.inc
+++ b/includes/ui/allocation_cart.inc
@@ -22,25 +22,39 @@ class allocation
        var $type;
        var $person_id = '';
        var $person_name = '';
-       var $person_type;       // true - supplier, otherwise customer
+       var $person_type;       // PT_SUPPLIER/PT_CUSTOMER
+       var $person_curr;
        var $date_;
        var $amount = 0; /*Total amount of the transaction in FX */
-       
-       var $allocs; /*array of transactions allocated to */    
+       var $currency;
+
+       var $allocs; /*array of transactions allocated to */
 
-       function allocation($type, $trans_no)
+       function allocation($type, $trans_no, $person_id = null, $person_type_id=null)
        {
                $this->allocs = array();
                
                $this->trans_no = $trans_no;
                $this->type = $type;
-               $this->read(); // read payment or credit
+               if ($person_id)
+                       $this->set_person($person_id, $person_type_id);
+
+               $this->read($type, $trans_no, $person_id, $person_type_id); // read payment or credit
+       }
+
+       function set_person($person_id, $person_type)
+       {
+               $this->person_id = $person_id;
+               $this->person_type = $person_type;
+               $this->person_curr = $person_type == PT_SUPPLIER ?
+                       get_supplier_currency($person_id) : get_customer_currency($person_id);
+               return $this->person_curr;
        }
 
        function add_item($type, $type_no, $date_, $due_date, $amount, $amount_allocated, 
                $current_allocated, $ref)
        {
-               if ($amount > 0)
+               if (floatcmp($amount, 0))
                {
                        $this->allocs[count($this->allocs)] = new allocation_item($type, $type_no, 
                                $date_, $due_date, $amount, $amount_allocated, $current_allocated, $ref);
@@ -55,7 +69,7 @@ class allocation
        function update_item($index, $type, $type_no, $date_, $due_date, 
                $amount, $amount_allocated, $current_allocated, $ref)
        {
-               if ($amount > 0)
+               if (floatcmp($amount, 0))
                {
                        $this->allocs[$index] = new allocation_item($type, $type_no, 
                                $date_, $due_date, $amount, $amount_allocated, $current_allocated, $ref);
@@ -65,7 +79,7 @@ class allocation
                {
                        return false;
                }
-       }       
+       }
        
        function add_or_update_item($type, $type_no, $date_, $due_date, 
                $amount, $amount_allocated, $current_allocated, $ref)
@@ -77,7 +91,7 @@ class allocation
                        {
                                return $this->update_item($i, $type, $type_no, $date_, $due_date, 
                                        $amount, $amount_allocated, $current_allocated, $ref);
-                       }  
+                       }
                }
         return $this->add_item($type, $type_no, $date_, $due_date, 
                $amount, $amount_allocated, $current_allocated, $ref);
@@ -88,65 +102,73 @@ class allocation
        //
        // FIXME - read all transactions below twice seems to be suboptimal
        //
-       function read($type = null, $trans_no = 0) 
+       function read($type = null, $trans_no = 0, $person_id=null, $person_type_id=null)
        {
-               if ($type == null) {    // re-read
+               if ($type !== null) {   // otherwise re-read
                        $type = $this->type;
                        $trans_no = $this->trans_no;
-               }
-               if ($type == ST_BANKPAYMENT || $type == ST_BANKDEPOSIT) {
-                       $bank_trans = db_fetch(get_bank_trans($type, $trans_no));
-                       $this->person_type = $bank_trans['person_type_id'] == PT_SUPPLIER;
-               } else
-                       $this->person_type = $type == ST_SUPPCREDIT || $type == ST_SUPPAYMENT;
-               $this->allocs = array();
 
-               if ($trans_no) {
-                       $trans = $this->person_type ? get_supp_trans($trans_no, $type) 
-                               : get_customer_trans($trans_no, $type);
+                       if (isset($person_type_id))
+                       {
+                               $this->person_type = $person_type_id;
+                               $this->person_id = $person_id;
+                       } else { // guess person_type_id
+                               if (in_array($type, array(ST_BANKPAYMENT, ST_BANKDEPOSIT)))
+                               {
+                                       $bank_trans = db_fetch(get_bank_trans($type, $trans_no));
+                                       $this->person_type = $bank_trans['person_type_id'];
+                               } else
+                                       $this->person_type = in_array($type, array(ST_SUPPCREDIT, ST_SUPPAYMENT)) ? PT_SUPPLIER : PT_CUSTOMER;
+                       }
 
-                       $this->person_id = $trans[$this->person_type ? 'supplier_id':'debtor_no'];
-                       $this->person_name = $trans[$this->person_type ? "supplier_name":"DebtorName"];
-                       $this->amount = $trans["Total"];
-                       $this->date_ = sql2date($trans["tran_date"]);
-               } 
-               else {
-                       $this->person_id = get_post($this->person_type ? 'supplier_id':'customer_id');
-                       $this->date_ = get_post($this->person_type ? 'DatePaid':'DateBanked', Today());
+                       if ($trans_no) {
+                               $trans = $this->person_type == PT_SUPPLIER ? get_supp_trans($trans_no, $type, $person_id)
+                                       : get_customer_trans($trans_no, $type, $person_id);
+
+                               $this->person_id = $trans[$this->person_type == PT_SUPPLIER ? 'supplier_id':'debtor_no'];
+                               $this->person_name = $trans[$this->person_type == PT_SUPPLIER ? "supplier_name":"DebtorName"];
+                               $this->date_ = sql2date($trans["tran_date"]);
+                               $this->person_curr = $trans['curr_code'];
+                               $this->currency = isset($trans['bank_curr_code']) ? $trans['bank_curr_code'] : $trans['curr_code'];
+                               $this->bank_amount = @$trans["bank_amount"];
+                               $this->amount = $trans["Total"];
+                       }
                }
-               
        /* Now populate the array of possible (and previous actual) allocations 
                for this customer/supplier. First get the transactions that have 
                outstanding balances ie Total-alloc >0 */
 
-               if ($this->person_type)
-                       $trans_items = get_allocatable_to_supp_transactions($this->person_id);
-               else
-                       $trans_items = get_allocatable_to_cust_transactions($this->person_id);
-
-               while ($myrow = db_fetch($trans_items))
+               $this->allocs = array();
+               if ($this->person_id)
                {
-//_vd($myrow);
-                       $this->add_item($myrow["type"], $myrow["trans_no"],
-                               sql2date($myrow["tran_date"]),
-                               sql2date($myrow["due_date"]),
-                               $myrow["Total"], // trans total
-                               $myrow["alloc"], // trans total allocated
-                               0,
-                               $myrow["reference"]); // this allocation
+                       if ($this->person_type==PT_SUPPLIER)
+                               $trans_items = get_allocatable_to_supp_transactions($this->person_id);
+                       else
+                               $trans_items = get_allocatable_to_cust_transactions($this->person_id);
+                       while ($myrow = db_fetch($trans_items))
+                       {
+                               $this->add_item($myrow["type"], $myrow["trans_no"],
+                                       sql2date($myrow["tran_date"]),
+                                       sql2date($myrow["due_date"]),
+                                       $myrow["Total"], // trans total
+                                       $myrow["alloc"], // trans total allocated
+                                       0,
+                                       $myrow["reference"]); // this allocation
+                       }
                }
-               if ($trans_no == 0) return; // this is new payment
+               if ($this->trans_no == 0) return; // this is new payment
 
        /* Now get trans that might have previously been allocated to by this trans
        NB existing entries where still some of the trans outstanding entered from
        above logic will be overwritten with the prev alloc detail below */
 
-               if ($this->person_type)
+               if ($this->person_type==PT_SUPPLIER)
                        $trans_items = get_allocatable_to_supp_transactions($this->person_id, 
-                               $trans_no, $type);
+                               $this->trans_no, $this->type);
                else
                        $trans_items = get_allocatable_to_cust_transactions($this->person_id, 
-                               $trans_no, $type);
+                               $this->trans_no, $this->type);
+
                while ($myrow = db_fetch($trans_items))
                {
 //_vd($myrow);
@@ -164,50 +186,48 @@ class allocation
        {
                begin_transaction();
 
-               if ($this->person_type)
-                       clear_supp_alloctions($this->type, $this->trans_no);
+               if ($this->person_type == PT_SUPPLIER)
+                       clear_supp_alloctions($this->type, $this->trans_no, $this->date_);
                else
                        clear_cust_alloctions($this->type, $this->trans_no);
 
                // now add the new allocations
                $total_allocated = 0;
+               $dec = user_price_dec();
                foreach ($this->allocs as $alloc_item)
                {
                        if ($alloc_item->current_allocated > 0)
                        {
-                               if ($this->person_type) {
-                                       add_supp_allocation($alloc_item->current_allocated,
+                               $amount = round($alloc_item->current_allocated, $dec);
+
+                               if ($this->person_type == PT_SUPPLIER) {
+                                       add_supp_allocation($amount,
                                                $this->type, $this->trans_no,
                                        $alloc_item->type, $alloc_item->type_no, $this->date_);
 
-                                       update_supp_trans_allocation($alloc_item->type, 
-                                               $alloc_item->type_no, $alloc_item->current_allocated);
+                                       update_supp_trans_allocation($alloc_item->type, $alloc_item->type_no);
                                } else {
-                                       add_cust_allocation($alloc_item->current_allocated,
+                                       add_cust_allocation($amount,
                                                $this->type, $this->trans_no,
                                        $alloc_item->type, $alloc_item->type_no, $this->date_);
 
-                                       update_debtor_trans_allocation($alloc_item->type, 
-                                               $alloc_item->type_no, $alloc_item->current_allocated);
+                                       update_debtor_trans_allocation($alloc_item->type, $alloc_item->type_no);
                                }
                                // Exchange Variations Joe Hunt 2008-09-20 ////////////////////
                                if (!in_array($alloc_item->type, array(ST_SALESQUOTE, ST_SALESORDER, ST_PURCHORDER)))
                                 exchange_variation($this->type, $this->trans_no,
                                        $alloc_item->type, $alloc_item->type_no, $this->date_,
-                                       $alloc_item->current_allocated,
-                                       $this->person_type ? PT_SUPPLIER : PT_CUSTOMER);
+                                       $amount, $this->person_type);
 
                                //////////////////////////////////////////////////////////////
                                $total_allocated += $alloc_item->current_allocated;
                        }
 
-               }  //end of the loop through the array of allocations made
-               if ($this->person_type)
-                       update_supp_trans_allocation($this->type, $this->trans_no, 
-                               $total_allocated);
+               }  /*end of the loop through the array of allocations made */
+               if ($this->person_type == PT_SUPPLIER)
+                       update_supp_trans_allocation($this->type, $this->trans_no);
                else
-                       update_debtor_trans_allocation($this->type,     $this->trans_no, 
-                               $total_allocated);
+                       update_debtor_trans_allocation($this->type,     $this->trans_no);
 
                commit_transaction();
 
@@ -258,52 +278,61 @@ function show_allocatable($show_totals) {
        
     $k = $counter = $total_allocated = 0;
 
-       if (count($_SESSION['alloc']->allocs)) 
+       $cart = $_SESSION['alloc'];
+       $supp_ref = in_array($cart->type, array(ST_SUPPCREDIT, ST_SUPPAYMENT, ST_BANKPAYMENT));
+
+       if (count($cart->allocs)) 
        {
+               if ($cart->currency != $cart->person_curr)
+                       display_heading(sprintf(_("Allocated amounts in %s:"), $cart->person_curr));
                start_table(TABLESTYLE, "width=60%");
-               $th = array(_("Transaction Type"), _("#"), _("Ref"), _("Date"), _("Due Date"), _("Amount"),
-                       _("Other Allocations"), _("This Allocation"), _("Left to Allocate"),'','');
+               $th = array(_("Transaction Type"), _("#"), $supp_ref ? _("Supplier Ref"): _("Ref"), _("Date"), _("Due Date"), _("Amount"),
+                       _("Other Allocations"), _("Left to Allocate"), _("This Allocation"),'','');
+
                table_header($th);
 
-               foreach ($_SESSION['alloc']->allocs as $alloc_item)
+               foreach ($cart->allocs as $id => $alloc_item)
                {
-                   if ($alloc_item->amount > $alloc_item->amount_allocated) {
+                   if (floatcmp(abs($alloc_item->amount), $alloc_item->amount_allocated))
+                   {
                                alt_table_row_color($k);
                        label_cell($systypes_array[$alloc_item->type]);
                                label_cell(get_trans_view_str($alloc_item->type, $alloc_item->type_no));
-                               label_cell($alloc_item->ref);
-                       label_cell($alloc_item->date_, "align=right");
+                               label_cell($alloc_item->ref);
+                       label_cell($alloc_item->date_, "align=right");
                        label_cell($alloc_item->due_date, "align=right");
-                       amount_cell($alloc_item->amount);
+                       amount_cell(abs($alloc_item->amount));
                                amount_cell($alloc_item->amount_allocated);
 
-                       $_POST['amount' . $counter] = price_format($alloc_item->current_allocated);
-                       amount_cells(null, "amount" . $counter, price_format('amount' . $counter));
+                       $_POST['amount' . $id] = price_format($alloc_item->current_allocated);
 
-                       $un_allocated = round($alloc_item->amount - $alloc_item->amount_allocated, 6);
-                       amount_cell($un_allocated, false,'', 'maxval'.$counter);
-                               label_cell("<a href='#' name=Alloc$counter onclick='allocate_all(this.name.substr(5));return true;'>"
+                       $un_allocated = round((abs($alloc_item->amount) - $alloc_item->amount_allocated), 6);
+                       amount_cell($un_allocated, false,'', 'maxval'.$id);
+                       amount_cells(null, "amount" . $id);//, input_num('amount' . $id));
+                               label_cell("<a href='#' name=Alloc$id onclick='allocate_all(this.name.substr(5));return true;'>"
                                         . _("All") . "</a>");
-                               label_cell("<a href='#' name=DeAll$counter onclick='allocate_none(this.name.substr(5));return true;'>"
-                                        . _("None") . "</a>".hidden("un_allocated" . $counter, 
+                               label_cell("<a href='#' name=DeAll$id onclick='allocate_none(this.name.substr(5));return true;'>"
+                                        . _("None") . "</a>".hidden("un_allocated" . $id, 
                                         price_format($un_allocated), false));
                                end_row();
 
-                       $total_allocated += input_num('amount' . $counter);
-                       }
-                   $counter++;
-               }
+                       $total_allocated += input_num('amount' . $id);
+                       }
+               }
                if ($show_totals) {
                label_row(_("Total Allocated"), price_format($total_allocated),
-                       "colspan=6 align=right", "align=right id='total_allocated'", 3);
+                       "colspan=8 align=right", "align=right id='total_allocated'", 3);
+/*
                        $amount = $_SESSION['alloc']->amount;
 
                        if ($_SESSION['alloc']->type == ST_SUPPCREDIT
                                || $_SESSION['alloc']->type == ST_SUPPAYMENT
                                ||  $_SESSION['alloc']->type == ST_BANKPAYMENT)
                                $amount = -$amount;
-                       
-                       if ($amount - $total_allocated < 0)
+*/
+                       $amount = abs($cart->amount);
+
+                       if (floatcmp($amount, $total_allocated) < 0)
                {
                        $font1 = "<font color=red>";
                        $font2 = "</font>";
@@ -312,12 +341,12 @@ function show_allocatable($show_totals) {
                        $font1 = $font2 = "";
                        $left_to_allocate = price_format($amount - $total_allocated);
                label_row(_("Left to Allocate"), $font1 . $left_to_allocate . $font2, 
-                               "colspan=6 align=right", "nowrap align=right id='left_to_allocate'",
+                               "colspan=8 align=right", "nowrap align=right id='left_to_allocate'",
                                 3);
                }
                end_table(1);
        }
-       hidden('TotalNumberOfAllocs', $counter);
+       hidden('TotalNumberOfAllocs', count($cart->allocs));
 }
 //--------------------------------------------------------------------------------
 
@@ -327,8 +356,10 @@ function check_allocations()
 
        $total_allocated = 0;
 
-       for ($counter = 0; $counter < $_POST["TotalNumberOfAllocs"]; $counter++)
-       if (isset($_POST['amount' . $counter])) {
+       for ($counter = 0; $counter < get_post("TotalNumberOfAllocs"); $counter++)
+       {
+               if (!isset($_POST['amount'.$counter])) continue;
+
                if (!check_num('amount' . $counter, 0))
                {
                        display_error(_("The entry for one or more amounts is invalid or negative."));
@@ -336,9 +367,11 @@ function check_allocations()
                        return false;
                 }
 
-                 /*Now check to see that the AllocAmt is no greater than the
-                amount left to be allocated against the transaction under review */
-                if (input_num('amount' . $counter) > input_num('un_allocated' . $counter))
+                 /* Now check to see that the AllocAmt is no greater than the
+                amount left to be allocated against the transaction under review;
+                skip check if no allocation is set to avoid deadlock on mistakenly overallocated transactions*/
+                $allocated = input_num('amount' . $counter);
+                if ($allocated && ($allocated > input_num('un_allocated' . $counter)))
                 {
                        display_error(_("At least one transaction is overallocated."));
                        set_focus('amount'.$counter);
@@ -349,12 +382,13 @@ function check_allocations()
 
                 $total_allocated += input_num('amount' . $counter);
        }
-
+/*
        $amount = $_SESSION['alloc']->amount;
-       
 
        if (in_array($_SESSION['alloc']->type, array(ST_BANKPAYMENT, ST_SUPPCREDIT, ST_SUPPAYMENT)))
                $amount = -$amount;
+*/
+       $amount = abs($_SESSION['alloc']->amount);
 
        if ($total_allocated - ($amount + input_num('discount'))  > $SysPrefs->allocation_settled_allowance())
        {
@@ -364,5 +398,3 @@ function check_allocations()
 
        return true;
 }
-
-?>

diff --git a/includes/ui/contacts_view.inc b/includes/ui/contacts_view.inc
index 07e3066deff1224036ee083cf95d2501ebcb09bb..3cdc3c1ad50cbcf814628b1ed7a86619e8d1b05f 100644 (file)
--- a/includes/ui/contacts_view.inc
+++ b/includes/ui/contacts_view.inc
@@ -123,8 +123,7 @@ class contacts extends simple_crud {
        function db_update() {
                        return update_crm_person($this->selected_id, $_POST['ref'], $_POST['name'], $_POST['name2'], 
                                $_POST['address'], $_POST['phone'], $_POST['phone2'], $_POST['fax'], $_POST['email'], 
-                               $_POST['lang'], $_POST['notes'], $_POST['assgn'], $this->entity);
-               
+                               $_POST['lang'], $_POST['notes'], $_POST['assgn'], $this->entity, $this->class);
        }
 
        function insert_check() {

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 0639124a5a236a4f6170ca70b57c0c7a5b637dd8..311180c6e30b710936f4964c1dd4e269ee0e8ad8 100644 (file)
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -69,7 +69,7 @@ function end_form($breaks=0)
        hidden('_modified', get_post('_modified', 0));
        hidden('_token', $_SESSION['csrf_token']);
        echo "</form>\n";
-       $Ajax->activate('token');
+       $Ajax->activate('_token');
 }
 
 function check_csrf_token()
@@ -313,18 +313,20 @@ function hyperlink_params_separate_td($target, $label, $params)
 
 //--------------------------------------------------------------------------------------------------
 
-function alt_table_row_color(&$k)
+function alt_table_row_color(&$k, $extra_class=null)
 {
+       $classes = $extra_class ? array($extra_class) : array();
        if ($k == 1)
        {
-               echo "<tr class='oddrow'>\n";
+               array_push($classes, 'oddrow');
                $k = 0;
        }
        else
        {
-               echo "<tr class='evenrow'>\n";
+               array_push($classes, 'evenrow');
                $k++;
        }
+       echo "<tr class='".implode(' ', $classes)."'>\n";
 }
 
 function table_section_title($msg, $colspan=2)

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index f406d007aede01599ba0c0fcae489f064ff4d735..42644a98339e698150e4af0c7338ac4c0bc76d88 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -831,8 +831,11 @@ function sales_items_list($name, $selected_id=null, $all_option=false,
          ), $opts) );
 }
 
-function sales_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function sales_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false, $editkey=false)
 {
+       if ($editkey)
+               set_editor('item', $name, $editkey);
+
        if ($label != null)
                echo "<td>$label</td>\n";
        echo sales_items_list($name, $selected_id, $all_option, $submit_on_change,

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 49315c02c894958b7cdf4841e9c17b81dd4dccfd..5ed17abd8c96eae5790b2e872f4aac86366dde05 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -250,45 +250,81 @@ function get_trans_view_str($type, $trans_no, $label="", $icon=false,
        return null;
 }
 
+/*
+       Helper for ui drawing functions.
+       Checks whether any of input function parameters has changed or page is called with GET method (first page display).
+       $name - context
+*/
+function check_ui_refresh($name=null)
+{
+       $bt = debug_backtrace();
+       if (!$name)
+               $name = $bt[1]['function'];
+       $old = @$_SESSION['ui_context'][$name];
+       $new = $_SESSION['ui_context'][$name] = $bt[1]['args'];
+       return ($new != $old) || ($_SERVER['REQUEST_METHOD'] == 'GET');
+}
+
 //--------------------------------------------------------------------------------------
 // Displays currency exchange rate for given date.
 // When there is no exrate for today, 
 // gets it form ECB and stores in local database.
 //
-function exchange_rate_display($from_currency, $to_currency, $date_, $edit_rate=false)
+function exchange_rate_display($from_currency, $to_currency, $date_, $force_edit=false)
 {
-    global $Ajax;
+    global $Ajax, $xr_provider_authoritative;
+
+       $readonly = false;
 
        if ($from_currency != $to_currency)
        {
-               $comp_currency = get_company_currency();
-               if ($from_currency == $comp_currency)
-                       $currency = $to_currency;
-               else
-                       $currency = $from_currency;
-               $rate = 0;
-               if ($date_ == Today()) {
-                       $rate = get_date_exchange_rate($currency, $date_);
-                       if (!$rate) {
+               $rate = get_post('_ex_rate');
+               if (check_ui_refresh() || !$rate) { // readonly or ui context changed
+                       $comp_currency = get_company_currency();
+                       if ($from_currency == $comp_currency)
+                               $currency = $to_currency;
+                       else
+                               $currency = $from_currency;
+
+                       $rate = get_date_exchange_rate($currency, $date_); // try local
+
+                       if ($rate)
+                               $readonly = true; // if we have already local exrate keep it unchanged 
+
+                       if (!$rate) {   // retry from remote service
                                $row = get_currency($currency);
-                               if ($row['auto_update']) {
-                                       $rate = retrieve_exrate($currency, $date_);
-                                       if ($rate) 
-                                               add_exchange_rate($currency, $date_, $rate, $rate);
+
+                               if ($row['auto_update']) // autoupdate means use remote service & store exrate on first transaction.
+                               {
+                                       $rate = retrieve_exrate($currency, $date_);
+                                       if (!$rate)
+                                               display_warning(sprintf(_("Cannot retrieve exchange rate for currency %s. Please adjust approximate rate if needed."), $currency));
+                                       elseif ($xr_provider_authoritative) {
+                                               // if the remote exrate is considered authoritative we can store the rate here,
+                                               // otherwise exrate will be stored during transaction write
+                                               $readonly = true;
+                                               add_new_exchange_rate($currency, $date_, $rate);
+                                       }
                                }
                        }
+                       if (!$rate)     {       // get and edit latest available
+                               $rate = get_exchange_rate_from_home_currency($currency, $date_);
+                       }
+                       if ($from_currency != $comp_currency)
+                               $rate = 1 / ($rate / get_exchange_rate_from_home_currency($to_currency, $date_));
+                       $Ajax->activate('_ex_rate_span');
                }
-               if (!$rate)
-                       $rate = get_exchange_rate_from_home_currency($currency, $date_);
-               if ($from_currency != $comp_currency)
-                       $rate = 1 / ($rate / get_exchange_rate_from_home_currency($to_currency, $date_));
 
                $rate = number_format2($rate, user_exrate_dec());
-               if ($edit_rate)
-                       text_row(_("Exchange Rate:"), '_ex_rate', $rate, 8, 8, null, "", " $from_currency = 1 $to_currency"); 
-               else
-               label_row(_("Exchange Rate:"),"<span style='vertical-align:top;' id='_ex_rate'>$rate</span> $from_currency = 1 $to_currency" );
-               $Ajax->addUpdate('_ex_rate','_ex_rate', $rate);
+
+               if ($force_edit || !$readonly)
+                       $ctrl = "<input type=\"text\" name=\"_ex_rate\" size=\"8\" maxlength=\"8\" value=\"$rate\">";
+           else
+               $ctrl = "<span id=\"_ex_rate\">$rate</span>";
+
+               label_row(_("Exchange Rate:"), $span = "<span style='vertical-align:top;' id='_ex_rate_span'>$ctrl $from_currency = 1 $to_currency</span>" );
+
+               $Ajax->addUpdate('_ex_rate_span', '_ex_rate_span', $span);
        }
 }
 
@@ -322,7 +358,7 @@ function comments_display_row($type, $id)
                echo "<tr><td colspan=15>";
        while ($comment = db_fetch($comments))
        {
-               echo $comment["memo_"] . "<br>";
+               echo nl2br($comment["memo_"]) . "<br>";
        }
                echo "</td></tr>";
        }
@@ -439,28 +475,50 @@ function display_supp_trans_tax_details($tax_items, $columns)
 
 //--------------------------------------------------------------------------------------
 
-function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0)
+function display_edit_tax_items($taxes, $columns, $tax_included, $rightspan=0, $editable=false)
 {
        $total = 0;
 
     foreach ($taxes as $taxitem)
-    {
-       if ($taxitem['Value'] != 0) {
-               if ($tax_included)
-               {
-                       label_row(_("Included") . " " . $taxitem['tax_type_name']
-                               . " " . number_format2($taxitem['Value'],user_price_dec()), "", "colspan=$columns align=right", "align=right",$leftspan);
-               }
-               else
-               {
-                       label_row($taxitem['tax_type_name'],
-                               number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right",$leftspan);
-                       $total +=  round2($taxitem['Value'], user_price_dec());
-               }
-       }
-    }
-
-    return $total;
+       {
+               $amount = isset($taxitem['Override']) ? $taxitem['Override'] : $taxitem['Value'];
+               if ($taxitem['Value'] != 0){
+                       if ($editable) {
+                               if (!isset($_POST['mantax['.$taxitem['tax_type_id'].']']))
+                                       $_POST['mantax['.$taxitem['tax_type_id'].']'] = price_format($amount);
+                               start_row();
+                               if ($tax_included) {
+                                       $colspan = $columns-1;
+                                       label_cell(_("Included") . " " . $taxitem['tax_type_name'].":",
+                                               "colspan={$colspan} align='right'");
+                                       amount_cells(null, 'mantax['.$taxitem['tax_type_id'].']',
+                                               null, "colspan=$columns align=right", '<td></td>', user_price_dec());
+                               } else {
+                                       label_cell($taxitem['tax_type_name'], "colspan=$columns align='right'");
+                                       amount_cells(null, 'mantax['.$taxitem['tax_type_id'].']',
+                                               null, "colspan=$columns align=right", null, user_price_dec());
+                                       $total +=  round2($amount, user_price_dec());
+                               }
+                               if ($rightspan)
+                                       label_cell('', "colspan ='$rightspan'");
+                               end_row();
+                       } else {
+                               $value = number_format2($taxitem['Value'],user_price_dec());
+                               if ($tax_included)
+                               {
+                                       label_row(_("Included") . " " . $taxitem['tax_type_name']
+                                               . " " . $value , "", "colspan=$columns align=right", "align=right", $rightspan);
+                               }
+                               else
+                               {
+                                       label_row($taxitem['tax_type_name'],
+                                               $value, "colspan=$columns align=right", "align=right", $rightspan);
+                                       $total +=  round2($taxitem['Value'], user_price_dec());
+                               }
+                       }
+               }
+       }
+       return $total;
 }
 
 //--------------------------------------------------------------------------------------
@@ -500,7 +558,7 @@ function display_allocations($alloc_result, $total, $title, $show_summary=true)
        label_cell(sql2date($alloc_row['tran_date']));
        $alloc_row['Total'] = round2($alloc_row['Total'], user_price_dec());
        $alloc_row['amt'] = round2($alloc_row['amt'], user_price_dec());
-       if ($payments && ($alloc_row['type'] == ST_SUPPAYMENT || $alloc_row['type'] == ST_BANKPAYMENT || $alloc_row['type'] == ST_SUPPCREDIT))
+       if ($alloc_row['type'] == ST_SUPPAYMENT || $alloc_row['type'] == ST_BANKPAYMENT || $alloc_row['type'] == ST_SUPPCREDIT)
                $alloc_row['Total'] = -$alloc_row['Total'];
        amount_cell($alloc_row['Total']);
                amount_cell($alloc_row['Total'] - $alloc_row['amt']);

diff --git a/install/isession.inc b/install/isession.inc
index 25a5519c1f5eef284c3bd80d9625a2730c73ded5..5a9f912e7bfb5b213ff17de2c593de20d2c236e8 100644 (file)
--- a/install/isession.inc
+++ b/install/isession.inc
@@ -39,6 +39,19 @@ function strip_quotes($data)
        return $data;
 }
 
+function html_cleanup(&$parms)
+{
+       foreach($parms as $name => $value) {
+//             $value = @html_entity_decode($value, ENT_QUOTES, $_SESSION['language']->encoding);
+               if (is_array($value))
+                       html_cleanup($parms[$name]);
+               else
+                       $parms[$name] = @htmlspecialchars($value, ENT_QUOTES, $_SESSION['language']->encoding);
+       }
+       reset($parms); // needed for direct key() usage later throughout the sources
+}
+
+
 function check_page_security($page_security)
 {
 }
@@ -83,7 +96,8 @@ $inst_langs = array(
   'ka_GE' => array ( 'name' => 'Georgian','code' => 'ka_GE',   'encoding' => 'utf-8'),
   'nl_BE' => array ( 'name' => 'Nederlands','code' => 'nl_BE', 'encoding' => 'iso-8859-1'),
   'pl_PL' => array ( 'name' => 'Polski',       'code' => 'pl_PL',      'encoding' => 'iso-8859-2'),
-  'pt_BR' => array ( 'name' => 'Português','code' => 'pt_BR',  'encoding' => 'iso-8859-1'),
+  'pt_BR' => array ( 'name' => 'Português (Brasilia)','code' => 'pt_BR',       'encoding' => 'iso-8859-1'),
+  'pt_PT' => array ( 'name' => 'Português','code' => 'pt_PT',  'encoding' => 'iso-8859-1'),
   'sv_SE' => array ( 'name' => 'Svenska',      'code' => 'sv_SE',      'encoding' => 'iso-8859-1'),
   'zh_CN' => array ( 'name' => 'Chinese Simplifed',    'code' => 'zh_CN',      'encoding' => 'utf-8'),
 );
@@ -128,6 +142,11 @@ ob_start('output_html',0);
 if (!isset($_SESSION["wa_current_user"]))
        $_SESSION["wa_current_user"] = new current_user();
 
+html_cleanup($_GET);
+html_cleanup($_POST);
+html_cleanup($_REQUEST);
+html_cleanup($_SERVER);
+
 $SysPrefs = &$_SESSION['SysPrefs'];
 
 // POST vars cleanup needed for direct reuse.

diff --git a/install/lang/new_language_template/LC_MESSAGES/empty.po b/install/lang/new_language_template/LC_MESSAGES/empty.po
index c7807254b1c0e2ff571c6db8d0509b2c3a36f56e..d35d3c27aab6e7a955d5c183c401c9636c811ed5 100644 (file)
--- a/install/lang/new_language_template/LC_MESSAGES/empty.po
+++ b/install/lang/new_language_template/LC_MESSAGES/empty.po
@@ -8,504 +8,527 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 21:43+0200\n"
+"POT-Creation-Date: 2013-10-27 18:01+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"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: install/index.php:20 install/index.php:41
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:20
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:41
 msgid "FrontAccouting ERP Installation Wizard"
 msgstr ""
 
-#: install/index.php:42
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:42
 #, php-format
 msgid "Step %d: %s"
 msgstr ""
 
-#: install/index.php:49
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49
 msgid "Chart of accounts"
 msgstr ""
 
-#: install/index.php:49 install/index.php:76
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76
 msgid "Encoding"
 msgstr ""
 
-#: install/index.php:49 install/index.php:76
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76
 msgid "Description"
 msgstr ""
 
-#: install/index.php:49 install/index.php:76
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76
 msgid "Install"
 msgstr ""
 
-#: install/index.php:66 install/index.php:94
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:66
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:94
 msgid "Installed"
 msgstr ""
 
-#: install/index.php:76
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76
 msgid "Language"
 msgstr ""
 
-#: install/index.php:124
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:124
 msgid ""
 "Cannot connect to database. User or password is invalid or you have no "
 "permittions to create database."
 msgstr ""
 
-#: install/index.php:160
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:160
 msgid "Cannot save system configuration file 'config.php'."
 msgstr ""
 
-#: install/index.php:167
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:167
 msgid "Cannot open 'config_db.php' configuration file."
 msgstr ""
 
-#: install/index.php:170
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:170
 msgid "Cannot write to the 'config_db.php' configuration file."
 msgstr ""
 
-#: install/index.php:173
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:173
 msgid ""
 "Configuration file 'config_db.php' is not writable. Change its permissions "
 "so it is, then re-run installation step."
 msgstr ""
 
-#: install/index.php:211
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:211
 msgid "Host name cannot be empty."
 msgstr ""
 
-#: install/index.php:215
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:215
 msgid "Database user name cannot be empty."
 msgstr ""
 
-#: install/index.php:219
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:219
 msgid "Database name cannot be empty."
 msgstr ""
 
-#: install/index.php:272
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:272
 msgid "Company name cannot be empty."
 msgstr ""
 
-#: install/index.php:276
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:276
 msgid "Company admin name cannot be empty."
 msgstr ""
 
-#: install/index.php:280
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:280
 msgid "Company admin password cannot be empty."
 msgstr ""
 
-#: install/index.php:284
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:284
 msgid "Company admin passwords differ."
 msgstr ""
 
-#: install/index.php:316
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:316
 msgid "System Diagnostics"
 msgstr ""
 
-#: install/index.php:318
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:318
 msgid "Select install wizard language:"
 msgstr ""
 
-#: install/index.php:324
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:324
 msgid ""
 "All application preliminary requirements seems to be correct. Please press "
 "Continue button below."
 msgstr ""
 
-#: install/index.php:325 install/index.php:351 install/index.php:358
-#: install/index.php:365 install/index.php:389
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:325
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:351
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:358
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:365
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:389
 msgid "Continue >>"
 msgstr ""
 
-#: install/index.php:327
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:327
 msgid ""
 "Application cannot be installed. Please fix problems listed below in red, "
 "and press Refresh button."
 msgstr ""
 
-#: install/index.php:328
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:328
 msgid "Refresh"
 msgstr ""
 
-#: install/index.php:338
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:338
 msgid "Database Server Settings"
 msgstr ""
 
-#: install/index.php:340
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:340
 msgid "Server Host:"
 msgstr ""
 
-#: install/index.php:341
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:341
 msgid "Database User:"
 msgstr ""
 
-#: install/index.php:342
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:342
 msgid "Database Password:"
 msgstr ""
 
-#: install/index.php:343
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:343
 msgid "Database Name:"
 msgstr ""
 
-#: install/index.php:344
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:344
 msgid "Use '0_' Table Prefix:"
 msgstr ""
 
-#: install/index.php:344 includes/system_tests.inc:38
-#: includes/system_tests.inc:113 includes/system_tests.inc:126
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:344
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:38
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:113
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:126
 msgid "Yes"
 msgstr ""
 
-#: install/index.php:344 includes/system_tests.inc:38
-#: includes/system_tests.inc:113 includes/system_tests.inc:126
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:344
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:38
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:113
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:126
 msgid "No"
 msgstr ""
 
-#: install/index.php:345
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:345
 msgid "Install Additional Language Packs from FA Repository:"
 msgstr ""
 
-#: install/index.php:346
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:346
 msgid "Install Additional COAs from FA Repository:"
 msgstr ""
 
-#: install/index.php:348
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:348
 msgid ""
 "Use table prefix if you share selected database for more than one FA company."
 msgstr ""
 
-#: install/index.php:349
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:349
 msgid ""
 "Do not select additional langs nor COAs if you have no working internet "
 "connection right now. You can install them later."
 msgstr ""
 
-#: install/index.php:350 install/index.php:357 install/index.php:364
-#: install/index.php:388
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:350
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:357
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:364
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:388
 msgid "<< Back"
 msgstr ""
 
-#: install/index.php:355
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:355
 msgid "User Interface Languages Selection"
 msgstr ""
 
-#: install/index.php:362
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:362
 msgid "Charts of Accounts Selection"
 msgstr ""
 
-#: install/index.php:379
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:379
 msgid "Company Settings"
 msgstr ""
 
-#: install/index.php:381
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:381
 msgid "Company Name:"
 msgstr ""
 
-#: install/index.php:382
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:382
 msgid "Admin Login:"
 msgstr ""
 
-#: install/index.php:383
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:383
 msgid "Admin Password:"
 msgstr ""
 
-#: install/index.php:384
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:384
 msgid "Reenter Password:"
 msgstr ""
 
-#: install/index.php:385
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:385
 msgid "Select Chart of Accounts:"
 msgstr ""
 
-#: install/index.php:386
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:386
 msgid "Select Default Language:"
 msgstr ""
 
-#: install/index.php:393
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:393
 msgid "FrontAccounting ERP has been installed successsfully."
 msgstr ""
 
-#: install/index.php:394
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:394
 msgid "Please do not forget to remove install wizard folder."
 msgstr ""
 
-#: install/index.php:397
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:397
 msgid "Click here to start."
 msgstr ""
 
-#: includes/system_tests.inc:15
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:15
 msgid "Info"
 msgstr ""
 
-#: includes/system_tests.inc:16
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:16
 msgid "Optional"
 msgstr ""
 
-#: includes/system_tests.inc:17
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:17
 msgid "Recommended"
 msgstr ""
 
-#: includes/system_tests.inc:18
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:18
 msgid "Required "
 msgstr ""
 
-#: includes/system_tests.inc:24
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:24
 msgid "MySQL version"
 msgstr ""
 
-#: includes/system_tests.inc:28
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:28
 msgid "Upgrade MySQL server to version at least 4.1"
 msgstr ""
 
-#: includes/system_tests.inc:35
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:35
 msgid "PHP MySQL extension"
 msgstr ""
 
-#: includes/system_tests.inc:40
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:40
 msgid "Your PHP has to have MySQL extension enabled."
 msgstr ""
 
-#: includes/system_tests.inc:46
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:46
 msgid "PHP version"
 msgstr ""
 
-#: includes/system_tests.inc:50
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:50
 msgid "Upgrade PHP to version at least 4.3.3"
 msgstr ""
 
-#: includes/system_tests.inc:57
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:57
 msgid "Server system"
 msgstr ""
 
-#: includes/system_tests.inc:67
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:67
 msgid "Session save path"
 msgstr ""
 
-#: includes/system_tests.inc:79
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:79
 msgid "Removed install wizard folder"
 msgstr ""
 
-#: includes/system_tests.inc:82
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:82
 msgid "Not removed"
 msgstr ""
 
-#: includes/system_tests.inc:83
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:83
 msgid "Remove or rename install wizard folder for security reasons."
 msgstr ""
 
-#: includes/system_tests.inc:90
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:90
 msgid "Browser type"
 msgstr ""
 
-#: includes/system_tests.inc:94
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:94
 msgid "Any browser is supported"
 msgstr ""
 
-#: includes/system_tests.inc:101
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:101
 msgid "Http server type"
 msgstr ""
 
-#: includes/system_tests.inc:105
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:105
 msgid "Any server is supported"
 msgstr ""
 
-#: includes/system_tests.inc:112
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:112
 msgid "Native gettext"
 msgstr ""
 
-#: includes/system_tests.inc:116
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:116
 msgid "In case of no gettext support, php emulation is used"
 msgstr ""
 
-#: includes/system_tests.inc:124
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:124
 msgid "Debugging mode"
 msgstr ""
 
-#: includes/system_tests.inc:128
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:128
 msgid "To switch debugging on set $go_debug>0 in config.php file"
 msgstr ""
 
-#: includes/system_tests.inc:137
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:137
 msgid "Error logging"
 msgstr ""
 
-#: includes/system_tests.inc:145
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:145
 msgid "Disabled"
 msgstr ""
 
-#: includes/system_tests.inc:148
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:148
 msgid "To switch error logging set $error_logging in config.php file"
 msgstr ""
 
-#: includes/system_tests.inc:151
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:151
 msgid "Log file is not writeable"
 msgstr ""
 
-#: includes/system_tests.inc:161
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:161
 msgid "Current database version"
 msgstr ""
 
-#: includes/system_tests.inc:165
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:165
 msgid "Database structure seems to be not upgraded to current version"
 msgstr ""
 
-#: includes/system_tests.inc:180
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:180
 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
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:193
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:200
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:208
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:225
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:340
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:349
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:358
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:366
 #, php-format
 msgid "'%s' is not writeable"
 msgstr ""
 
-#: includes/system_tests.inc:221
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:221
 msgid "Temporary directory"
 msgstr ""
 
-#: includes/system_tests.inc:233
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:233
 msgid "Language configuration consistency"
 msgstr ""
 
-#: includes/system_tests.inc:242
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:242
 msgid "Languages folder should be writeable."
 msgstr ""
 
-#: includes/system_tests.inc:251
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:251
 msgid "Languages configuration file should be writeable."
 msgstr ""
 
-#: includes/system_tests.inc:270
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:270
 #, php-format
 msgid "Missing %s translation file."
 msgstr ""
 
-#: includes/system_tests.inc:275
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:275
 #, php-format
 msgid "Missing system locale: %s"
 msgstr ""
 
-#: includes/system_tests.inc:288
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:288
 msgid "Main config file"
 msgstr ""
 
-#: includes/system_tests.inc:295 includes/system_tests.inc:317
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:295
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:317
 #, php-format
 msgid "Can't write '%s' file. Check FA directory write permissions."
 msgstr ""
 
-#: includes/system_tests.inc:296 includes/system_tests.inc:318
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:296
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:318
 #, php-format
 msgid "'%s' file exists."
 msgstr ""
 
-#: includes/system_tests.inc:300
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:300
 #, php-format
 msgid "'%s' file should be read-only"
 msgstr ""
 
-#: includes/system_tests.inc:309
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:309
 msgid "Database auth file"
 msgstr ""
 
-#: includes/system_tests.inc:322
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:322
 #, 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
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:333
 msgid "Extensions system"
 msgstr ""
 
-#: includes/system_tests.inc:371
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:371
 msgid "Extensions configuration files and directories should be writeable"
 msgstr ""
 
-#: includes/system_tests.inc:384
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:384
 #, php-format
 msgid "Non-standard theme directory '%s' is not writable"
 msgstr ""
 
-#: includes/system_tests.inc:394
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:394
 msgid ""
 "OpenSSL PHP extension have to be enabled to use extension repository system."
 msgstr ""
 
-#: includes/system_tests.inc:397
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:397
 msgid ""
 "OpenSSL have to be available on your server to use extension repository "
 "system."
 msgstr ""
 
-#: includes/system_tests.inc:420
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420
 msgid "Test"
 msgstr ""
 
-#: includes/system_tests.inc:420
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420
 msgid "Test type"
 msgstr ""
 
-#: includes/system_tests.inc:420
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420
 msgid "Value"
 msgstr ""
 
-#: includes/system_tests.inc:420
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420
 msgid "Comments"
 msgstr ""
 
-#: includes/system_tests.inc:444
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:444
 msgid "Ok"
 msgstr ""
 
-#: includes/packages.inc:189
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:189
 #, php-format
 msgid "No key field '%s' in file '%s'"
 msgstr ""
 
-#: includes/packages.inc:294
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:294
 msgid "Cannot download repo index file."
 msgstr ""
 
-#: includes/packages.inc:306 includes/packages.inc:343
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:306
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:343
 #, php-format
 msgid "Cannot delete outdated '%s' file."
 msgstr ""
 
-#: includes/packages.inc:310
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:310
 msgid "Release file in repository is invalid, or public key is outdated."
 msgstr ""
 
-#: includes/packages.inc:327
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:327
 msgid "Repository version does not match application version."
 msgstr ""
 
-#: includes/packages.inc:335 includes/packages.inc:377
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:335
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:377
 #, php-format
 msgid "Cannot download '%s' file."
 msgstr ""
 
-#: includes/packages.inc:347
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:347
 #, php-format
 msgid ""
 "Security alert: broken index file in repository '%s'. Please inform "
 "repository administrator about this issue."
 msgstr ""
 
-#: includes/packages.inc:383
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:383
 #, php-format
 msgid ""
 "Security alert: broken package '%s' in repository. Please inform repository "
 "administrator about this issue."
 msgstr ""
 
-#: includes/packages.inc:638 includes/packages.inc:699
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:638
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:699
 #, php-format
 msgid "Package '%s' not found."
 msgstr ""

diff --git a/install/lang/pl_PL/LC_MESSAGES/pl_PL.mo b/install/lang/pl_PL/LC_MESSAGES/pl_PL.mo
index 2bc5ea9bdff0cdc7633168453ddf0b7eb6388d0c..37a630a0c0886a3de0b1959fb07b1272db1cecc2 100644 (file)
Binary files a/install/lang/pl_PL/LC_MESSAGES/pl_PL.mo and b/install/lang/pl_PL/LC_MESSAGES/pl_PL.mo differ

diff --git a/install/lang/pl_PL/LC_MESSAGES/pl_PL.po b/install/lang/pl_PL/LC_MESSAGES/pl_PL.po
index 5fc3546d3879d04eb030dd1301e68be0191a9708..b7f573c6e9ee52cd6411795e251f68f0afb4efb0 100644 (file)
--- a/install/lang/pl_PL/LC_MESSAGES/pl_PL.po
+++ b/install/lang/pl_PL/LC_MESSAGES/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-18 14:11+0200\n"
+"POT-Creation-Date: 2013-10-27 18:01+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Janusz Dobrowolski <janusz@iron.from.pl>\n"
 "Language-Team: \n"
@@ -16,63 +16,63 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:20
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:41
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:20
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:41
 msgid "FrontAccouting ERP Installation Wizard"
 msgstr "Instalator FrontAccounting ERP"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:42
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:42
 #, php-format
 msgid "Step %d: %s"
 msgstr "Krok %d: %s"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:49
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49
 msgid "Chart of accounts"
 msgstr "Plan kont"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:49
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:76
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:49
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:76
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76
 msgid "Description"
 msgstr "Opis"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:49
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:76
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76
 msgid "Install"
 msgstr "Zainstaluj"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:66
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:94
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:66
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:94
 msgid "Installed"
 msgstr "Zainstalowany"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:76
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76
 msgid "Language"
 msgstr "Jêzyk"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:124
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:124
 msgid ""
 "Cannot connect to database. User or password is invalid or you have no "
 "permittions to create database."
 msgstr ""
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:160
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:160
 msgid "Cannot save system configuration file 'config.php'."
 msgstr "Nie mo¿na zapisaæ pliku konfiguracyjnego 'config.php'."
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:167
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:167
 msgid "Cannot open 'config_db.php' configuration file."
 msgstr "Nie mo¿na utworzyæ pliku konfiguracji 'config_db.php'."
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:170
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:170
 msgid "Cannot write to the 'config_db.php' configuration file."
 msgstr "Nie mo¿na zapisaæ pliku konfiguracji  'config_db.php'."
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:173
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:173
 msgid ""
 "Configuration file 'config_db.php' is not writable. Change its permissions "
 "so it is, then re-run installation step."
@@ -80,43 +80,43 @@ msgstr ""
 "Plik konfiguracji 'config_db.php' jest zabezpieczony przed zapisem. Zmieñ "
 "prawa dostêpu i powtórz krok instalacji."
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:211
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:211
 msgid "Host name cannot be empty."
 msgstr "Adres serwera nie mo¿e byæ pusty."
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:215
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:215
 msgid "Database user name cannot be empty."
 msgstr "Nazwa u¿ytkownika nie mo¿e by pusta."
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:219
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:219
 msgid "Database name cannot be empty."
 msgstr "Nazwa bazy danych nie mo¿e byæ pusta."
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:272
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:272
 msgid "Company name cannot be empty."
 msgstr "Nazwa firmy nie mo¿e by pusta."
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:276
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:276
 msgid "Company admin name cannot be empty."
 msgstr "Nazwa administratora nie mo¿e byæ pusta."
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:280
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:280
 msgid "Company admin password cannot be empty."
 msgstr "Has³o administratora nie mo¿e by puste."
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:284
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:284
 msgid "Company admin passwords differ."
 msgstr "Wprowadzone has³a ró¿ni± siê."
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:316
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:316
 msgid "System Diagnostics"
 msgstr "Diagnostyka Systemu"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:318
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:318
 msgid "Select install wizard language:"
 msgstr "Wybierz jêzyk u¿ywany przy instalacji:"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:324
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:324
 msgid ""
 "All application preliminary requirements seems to be correct. Please press "
 "Continue button below."
@@ -124,15 +124,15 @@ msgstr ""
 "Wszystkie wymagania systemu wydaj± siê byæ spe³nione. Kliknij klawisz "
 "poni¿ej aby rozpocz±æ instalacjê."
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:325
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:351
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:358
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:365
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:389
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:325
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:351
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:358
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:365
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:389
 msgid "Continue >>"
 msgstr "Kontynuuj >>"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:327
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:327
 msgid ""
 "Application cannot be installed. Please fix problems listed below in red, "
 "and press Refresh button."
@@ -140,62 +140,62 @@ msgstr ""
 "Aplikacja nie mo¿e byæ zainstalowana. Usuñ wskazane problemy i kliknij "
 "klawisz 'Od¶wie¿'."
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:328
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:328
 msgid "Refresh"
 msgstr "Od¶wierz"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:338
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:338
 msgid "Database Server Settings"
 msgstr "Ustawienia Serwera Bazy Danych"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:340
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:340
 msgid "Server Host:"
 msgstr "Adres Serwera:"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:341
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:341
 msgid "Database User:"
 msgstr "Nazwa U¿ytkownika:"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:342
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:342
 msgid "Database Password:"
 msgstr "Has³o:"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:343
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:343
 msgid "Database Name:"
 msgstr "Nazwa Bazy Danych:"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:344
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:344
 msgid "Use '0_' Table Prefix:"
 msgstr "Prefiks '0_' dla Nazw Tablic:"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:344
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:38
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:113
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:126
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:344
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:38
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:113
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:126
 msgid "Yes"
 msgstr "Tak"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:344
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:38
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:113
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:126
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:344
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:38
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:113
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:126
 msgid "No"
 msgstr "Nie"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:345
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:345
 msgid "Install Additional Language Packs from FA Repository:"
 msgstr "Instalacja Dodatkowych Jêzyków z Repozytorium FA:"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:346
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:346
 msgid "Install Additional COAs from FA Repository:"
 msgstr "Instalacja Dodatkowych Planów Kont z Repozytorium FA:"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:348
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:348
 msgid ""
 "Use table prefix if you share selected database for more than one FA company."
 msgstr "U¿yj prefiksu je¶li ta sama baza danych bêdzie u¿ywana dla kilku firm."
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:349
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:349
 msgid ""
 "Do not select additional langs nor COAs if you have no working internet "
 "connection right now. You can install them later."
@@ -203,246 +203,246 @@ msgstr ""
 "Nie zaznaczaj wyboru dodatkowych jêzyków ani planów kont je¶li w tej chwili "
 "nie masz dostêpu do internetu. Bêdziesz je móg³ zainstalowaæ równie¿ pó¼niej."
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:350
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:357
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:364
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:388
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:350
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:357
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:364
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:388
 msgid "<< Back"
 msgstr "<< Wróæ"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:355
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:355
 msgid "User Interface Languages Selection"
 msgstr "Wybór Jêzyków Interfejsu U¿ytkownika"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:362
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:362
 msgid "Charts of Accounts Selection"
 msgstr "Wybór Planów Kont"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:379
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:379
 msgid "Company Settings"
 msgstr "Ustawienia Firmy"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:381
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:381
 msgid "Company Name:"
 msgstr "Nazwa Firmy:"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:382
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:382
 msgid "Admin Login:"
 msgstr "Login Administratora:"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:383
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:383
 msgid "Admin Password:"
 msgstr "Has³o Administratora:"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:384
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:384
 msgid "Reenter Password:"
 msgstr "Powtórz Has³o:"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:385
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:385
 msgid "Select Chart of Accounts:"
 msgstr "Wybierz Planów Kont:"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:386
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:386
 msgid "Select Default Language:"
 msgstr "Wybierz Jêzyk Domy¶lny:"
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:393
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:393
 msgid "FrontAccounting ERP has been installed successsfully."
 msgstr "Aplikacja FrontAccounting ERP zosta³a zainstalowana pomy¶lnie."
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:394
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:394
 msgid "Please do not forget to remove install wizard folder."
 msgstr "Nie zapomnij usun±æ folderu instalatora."
 
-#: /tmp/fa_unstable.sav3/devel/../install/index.php:397
+#: /home/janusz/FA/fa_unstable/devel/../install/index.php:397
 msgid "Click here to start."
 msgstr "Kliknij tutaj, aby rozpocz±æ pracê."
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:15
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:15
 msgid "Info"
 msgstr "Informacja"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:16
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:16
 msgid "Optional"
 msgstr "Opcjonalne"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:17
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:17
 msgid "Recommended"
 msgstr "Zalecane"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:18
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:18
 msgid "Required "
 msgstr "Wymagane"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:24
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:24
 msgid "MySQL version"
 msgstr "Wersja MySQL"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:28
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:28
 msgid "Upgrade MySQL server to version at least 4.1"
 msgstr "U¿yj wersji serwera MySQL minimum 4.1"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:35
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:35
 msgid "PHP MySQL extension"
 msgstr "Rozszerzenie PHP MySQL"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:40
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:40
 msgid "Your PHP has to have MySQL extension enabled."
 msgstr "PHP musi mieæ w³±czone rozszerzenie MySQL."
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:46
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:46
 msgid "PHP version"
 msgstr "Wersja PHP"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:50
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:50
 msgid "Upgrade PHP to version at least 4.3.3"
 msgstr "Zainstaluj PHP w wersji co najmniej 4.3.3"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:57
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:57
 msgid "Server system"
 msgstr "System serwera"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:67
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:67
 msgid "Session save path"
 msgstr "Katalog zapisu pliku sesji"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:79
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:79
 msgid "Removed install wizard folder"
 msgstr "Folder instalatora usuniêty"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:82
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:82
 msgid "Not removed"
 msgstr "Nie usuniêty"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:83
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:83
 msgid "Remove or rename install wizard folder for security reasons."
 msgstr "Ze wzglêdów bezpieczeñstwa usuñ lub zmieñ nazwê folderu instalatora."
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:90
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:90
 msgid "Browser type"
 msgstr "Typ przegl±darki"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:94
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:94
 msgid "Any browser is supported"
 msgstr "Mo¿e byæ u¿yty dowolny typ przegl±darki"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:101
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:101
 msgid "Http server type"
 msgstr "Serwer http"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:105
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:105
 msgid "Any server is supported"
 msgstr "Dowolny"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:112
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:112
 msgid "Native gettext"
 msgstr "Biblioteka Gettext "
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:116
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:116
 msgid "In case of no gettext support, php emulation is used"
 msgstr "W przypadku braku wsparcia systemu,  gettext jest emulowany."
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:124
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:124
 msgid "Debugging mode"
 msgstr "Tryb debug"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:128
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:128
 msgid "To switch debugging on set $go_debug>0 in config.php file"
 msgstr "Aby w³±czyæ tryb debug ustaw $go_debug>0 in config.php file"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:137
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:137
 msgid "Error logging"
 msgstr "Logowanie b³êdów"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:145
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:145
 msgid "Disabled"
 msgstr "Wy³±czony"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:148
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:148
 msgid "To switch error logging set $error_logging in config.php file"
 msgstr ""
 "Aby w³±czyæ logowanie b³êdów ustaw zmienn± $error_logging w pliku config.php"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:151
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:151
 msgid "Log file is not writeable"
 msgstr "Logfile jest niezapisywalny"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:161
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:161
 msgid "Current database version"
 msgstr "Aktualna wersja bazy danych"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:165
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:165
 msgid "Database structure seems to be not upgraded to current version"
 msgstr "Struktura bazy danych nie jest zaktualizowana do bie¿±cej wersji"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:180
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:180
 msgid "Company subdirectories consistency"
 msgstr "Prawid³owa struktura folderów firmowych"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:193
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:200
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:208
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:225
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:340
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:349
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:358
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:366
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:193
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:200
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:208
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:225
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:340
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:349
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:358
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:366
 #, php-format
 msgid "'%s' is not writeable"
 msgstr "'%s' jest niezapisywalny"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:221
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:221
 msgid "Temporary directory"
 msgstr "Katalog plików tymczasowych"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:233
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:233
 msgid "Language configuration consistency"
 msgstr "Konfiguracja jêzykowa"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:242
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:242
 msgid "Languages folder should be writeable."
 msgstr "Folder jêzyków musi byæ zapisywalny"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:251
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:251
 msgid "Languages configuration file should be writeable."
 msgstr "Pliki konfiguracyjny jêzyków musi byæ zapisywalny."
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:270
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:270
 #, php-format
 msgid "Missing %s translation file."
 msgstr "Brak pliku t³umaczeñ %s"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:275
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:275
 #, php-format
 msgid "Missing system locale: %s"
 msgstr "Lokalizacja '%s' nie jest zainstalowana w systemie"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:288
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:288
 msgid "Main config file"
 msgstr "G³ówny plik konfiguracyjny "
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:295
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:317
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:295
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:317
 #, php-format
 msgid "Can't write '%s' file. Check FA directory write permissions."
 msgstr "Nie mo¿na zapisaæ pliku '%s'. Sprawd¼ prawa zapisu do foderu FA."
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:296
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:318
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:296
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:318
 #, php-format
 msgid "'%s' file exists."
 msgstr "Plik '%s' istnieje."
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:300
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:300
 #, php-format
 msgid "'%s' file should be read-only"
 msgstr "Plik '%s powinien byæ zabezpieczony przed zapisem"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:309
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:309
 msgid "Database auth file"
 msgstr "Pik configuracyjny bazy danych"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:322
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:322
 #, php-format
 msgid ""
 "'%s' file should be read-only if you do not plan to add or change companies"
@@ -450,25 +450,25 @@ msgstr ""
 "Plik '%s' powinien byæ zabezpieczony przed zapisem je¶li nie planujesz "
 "dodawania ani zmiany firm"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:333
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:333
 msgid "Extensions system"
 msgstr "System rozszerzeñ"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:371
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:371
 msgid "Extensions configuration files and directories should be writeable"
 msgstr "Pliki konfiguracyjne i foldery rozszerzeñ powinny byæ zapisywalne"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:384
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:384
 #, php-format
 msgid "Non-standard theme directory '%s' is not writable"
 msgstr "Niestandardowy folder tematu '%s' jest zazpieczony przed zapisem"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:394
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:394
 msgid ""
 "OpenSSL PHP extension have to be enabled to use extension repository system."
 msgstr "System pakietów wymaga zaisnatlowanego rozszerzenia PHP OpenSSL."
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:397
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:397
 msgid ""
 "OpenSSL have to be available on your server to use extension repository "
 "system."
@@ -476,47 +476,57 @@ msgstr ""
 "Serwer musi mieæ zainstalowane OpenSSL ¿eby mo¿na by³o korzystaæ z "
 "repozytorium pakietów rozszerzeñ FA."
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420
 msgid "Test"
 msgstr "Test"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420
 msgid "Test type"
 msgstr "Typ testu"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420
 msgid "Value"
 msgstr "Warto¶æ"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420
 msgid "Comments"
 msgstr "Komentarz"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:444
+#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:444
 msgid "Ok"
 msgstr "Ok"
 
-#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:190
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:189
 #, php-format
 msgid "No key field '%s' in file '%s'"
 msgstr ""
 
-#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:295
-#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:329
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:294
+msgid "Cannot download repo index file."
+msgstr ""
+
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:306
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:343
 #, fuzzy, php-format
 msgid "Cannot delete outdated '%s' file."
 msgstr "Nie mo¿na usun±æ pliku."
 
-#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:299
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:310
 msgid "Release file in repository is invalid, or public key is outdated."
 msgstr ""
 "Plik kontrolny wydania jest uszkodzony, lub klucz publiczny jest nieaktualny."
 
-#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:316
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:327
 msgid "Repository version does not match application version."
 msgstr "Wersja repozytorium nie zgadza siê z wersj± aplikacji."
 
-#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:333
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:335
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:377
+#, fuzzy, php-format
+msgid "Cannot download '%s' file."
+msgstr "Nie mo¿na usun±æ pliku."
+
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:347
 #, php-format
 msgid ""
 "Security alert: broken index file in repository '%s'. Please inform "
@@ -525,7 +535,7 @@ msgstr ""
 "Alarm bezpieczeñstwa: uszkodzony plik indeksu repozytorium '%s'. Poinformuj "
 "administratora repozytorium o tym problemie."
 
-#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:366
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:383
 #, php-format
 msgid ""
 "Security alert: broken package '%s' in repository. Please inform repository "
@@ -534,8 +544,8 @@ msgstr ""
 "Alarm bezpieczeñstwa: uszkodzony plik '%s' w repozytorium. Poinformuj "
 "administratora repozytorium o tym problemie."
 
-#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:621
-#: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:672
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:638
+#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:699
 #, php-format
 msgid "Package '%s' not found."
 msgstr "Pakiet '%s' nie zosta³ znaleziony."

diff --git a/install/lang/pt_PT/LC_MESSAGES/pt_PT.mo b/install/lang/pt_PT/LC_MESSAGES/pt_PT.mo
new file mode 100644 (file)
index 0000000..db70336
Binary files /dev/null and b/install/lang/pt_PT/LC_MESSAGES/pt_PT.mo differ

diff --git a/install/lang/pt_PT/LC_MESSAGES/pt_PT.po b/install/lang/pt_PT/LC_MESSAGES/pt_PT.po
new file mode 100644 (file)
index 0000000..ad1004e
--- /dev/null
+++ b/install/lang/pt_PT/LC_MESSAGES/pt_PT.po
@@ -0,0 +1,500 @@
+# Idioma PT-BR FrontAccouting ERP
+# Copyright (C) 2010
+# This file is distributed under the same license as the PACKAGE package.
+# InterConnect Brasil Ltda. <info@inter.bz>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: FA setup PT V1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2013-09-08 10:56+0100\n"
+"Last-Translator: Mário Batista <mariorbatista@gmail.com>\n"
+"Language-Team: Mario Batista <mariorbatista@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Portuguese\n"
+"X-Poedit-Country: PORTUGAL\n"
+"X-Poedit-SourceCharset: iso-8859-1\n"
+
+#: install/index.php:20
+#: install/index.php:40
+msgid "FrontAccouting ERP Installation Wizard"
+msgstr "Assistente de Instalação do FrontAccouting ERP"
+
+#: install/index.php:41
+#, php-format
+msgid "Step %d: %s"
+msgstr "%d do passo:  %s"
+
+#: install/index.php:48
+msgid "Chart of accounts"
+msgstr "Plano de contas"
+
+#: install/index.php:48
+#: install/index.php:75
+msgid "Encoding"
+msgstr "Codificação"
+
+#: install/index.php:48
+#: install/index.php:75
+msgid "Description"
+msgstr "Descrição"
+
+#: install/index.php:48
+#: install/index.php:75
+msgid "Install"
+msgstr "Instalar"
+
+#: install/index.php:65
+#: install/index.php:93
+msgid "Installed"
+msgstr "Instalado"
+
+#: install/index.php:75
+msgid "Language"
+msgstr "Idioma"
+
+#: install/index.php:123
+msgid "Cannot connect to database. User or password is invalid or you have no permittions to create database."
+msgstr "Não é possível conectar à base de dados. Utilizador ou chave inválidos ou não possui permissões para criar a base de dados."
+
+#: install/index.php:159
+msgid "Cannot save system configuration file 'config.php'."
+msgstr "Não é possível gravar o ficheiro de configuração do sistema 'config.php'."
+
+#: install/index.php:166
+msgid "Cannot open 'config_db.php' configuration file."
+msgstr "Não é possível abrir o ficheiro de configuração 'config_db.php'."
+
+#: install/index.php:169
+msgid "Cannot write to the 'config_db.php' configuration file."
+msgstr "Não é possível escrever no ficheiro de configuração 'config_db.php'."
+
+#: install/index.php:172
+msgid "Configuration file 'config_db.php' is not writable. Change its permissions so it is, then re-run installation step."
+msgstr "Ficheiro de configuração 'config_db.php' não é gravável. Deve alterar as permissões da pasta do FA para gravável, então reinstale passo a passo."
+
+#: install/index.php:211
+msgid "Host name cannot be empty."
+msgstr "O nome da máquina deve ser preenchido."
+
+#: install/index.php:215
+msgid "Database user name cannot be empty."
+msgstr "O nome do utilizador da base de dados deve ser preenchido."
+
+#: install/index.php:219
+msgid "Database name cannot be empty."
+msgstr "O nome da base de dados deve ser preenchido."
+
+#: install/index.php:272
+msgid "Company name cannot be empty."
+msgstr "O nome da empresa deve ser preenchido."
+
+#: install/index.php:276
+msgid "Company admin name cannot be empty."
+msgstr "O nome do admin da empresa deve ser preenchido."
+
+#: install/index.php:280
+msgid "Company admin password cannot be empty."
+msgstr "A password do admin da empresa deve ser preenchida."
+
+#: install/index.php:284
+msgid "Company admin passwords differ."
+msgstr "As passwords do administrador da empresa diferem."
+
+#: install/index.php:316
+msgid "System Diagnostics"
+msgstr "Diagnóstico do Sistema"
+
+#: install/index.php:318
+msgid "Select install wizard language:"
+msgstr "Selecione o idioma do assistente de instalação:"
+
+#: install/index.php:324
+msgid "All application preliminary requirements seems to be correct. Please press Continue button below."
+msgstr "Todos os pré-requisitos da aplicação parecem estar corretos. Por favor clique em Continuar."
+
+#: install/index.php:325
+#: install/index.php:351
+#: install/index.php:358
+#: install/index.php:365
+#: install/index.php:384
+msgid "Continue >>"
+msgstr "Continuar >>"
+
+#: install/index.php:327
+msgid "Application cannot be installed. Please fix problems listed below in red, and press Refresh button."
+msgstr "O aplicativo não pode ser instalado. Por favor corrija os problemas listados abaixo a vermelho, e clique em Atualizar."
+
+#: install/index.php:328
+msgid "Refresh"
+msgstr "Atualizar"
+
+#: install/index.php:338
+msgid "Database Server Settings"
+msgstr "Configuração da Base de Dados"
+
+#: install/index.php:340
+msgid "Server Host:"
+msgstr "Servidor da Base de Dados:"
+
+#: install/index.php:341
+msgid "Database User:"
+msgstr "Utilizador da Base de Dados:"
+
+#: install/index.php:342
+msgid "Database Password:"
+msgstr "Senha da Base de Dados:"
+
+#: install/index.php:343
+msgid "Database Name:"
+msgstr "Nome da Base de Dados:"
+
+#: install/index.php:344
+msgid "Use '0_' Table Prefix:"
+msgstr "Usar Prefixo de Tabela '0_':"
+
+#: install/index.php:344
+#: includes/system_tests.inc:38
+#: includes/system_tests.inc:113
+#: includes/system_tests.inc:126
+msgid "Yes"
+msgstr "Sim"
+
+#: install/index.php:344
+#: includes/system_tests.inc:38
+#: includes/system_tests.inc:113
+#: includes/system_tests.inc:126
+msgid "No"
+msgstr "Não"
+
+#: install/index.php:345
+msgid "Install Additional Language Packs from FA Repository:"
+msgstr "Instalar Suporte de Idiomas Adicionais do Repositório do FA:"
+
+#: install/index.php:346
+msgid "Install Additional COAs from FA Repository:"
+msgstr "Instalar Plano de Contas do Repositório do FA:"
+
+#: install/index.php:348
+msgid "Use table prefix if you share selected database for more than one FA company."
+msgstr "Utilize o prefixo da tabela se  for utilizar a base de dados para mais do que uma empresa."
+
+#: install/index.php:349
+msgid "Do not select additional langs nor COAs if you have no working internet connection right now. You can install them later."
+msgstr "Não selecione Idiomas Adicionais nem Plano de Contas se não possui uma conexão à internet. Poderá instalar mais tarde."
+
+#: install/index.php:350
+#: install/index.php:357
+#: install/index.php:364
+#: install/index.php:383
+msgid "<< Back"
+msgstr "<< Voltar"
+
+#: install/index.php:355
+msgid "User Interface Languages Selection"
+msgstr "Seleção da Idioma da Interface"
+
+#: install/index.php:362
+msgid "Charts of Accounts Selection"
+msgstr "Seleção do Plano de Contas"
+
+#: install/index.php:374
+msgid "Company Settings"
+msgstr "Configuração da Empresa"
+
+#: install/index.php:376
+msgid "Company Name:"
+msgstr "Nome da Empresa:"
+
+#: install/index.php:377
+msgid "Admin Login:"
+msgstr "Login do Administrador:"
+
+#: install/index.php:378
+msgid "Admin Password:"
+msgstr "Senha do Administrador:"
+
+#: install/index.php:379
+msgid "Reenter Password:"
+msgstr "Digitar a Senha Novamente:"
+
+#: install/index.php:380
+msgid "Select Chart of Accounts:"
+msgstr "Selecionar Plano de Contas:"
+
+#: install/index.php:381
+msgid "Select Default Language:"
+msgstr "Selecionar Idioma Padrão:"
+
+#: install/index.php:388
+msgid "FrontAccounting ERP has been installed successsfully."
+msgstr "O FrontAccounting ERP foi instalado com sucesso."
+
+#: install/index.php:389
+msgid "Please do not forget to remove install wizard folder."
+msgstr "Por favor não se esqueça de remover a pasta de instalação do assistente."
+
+#: install/index.php:392
+msgid "Click here to start."
+msgstr "Clique aqui para iniciar."
+
+#: includes/system_tests.inc:15
+msgid "Info"
+msgstr "Info"
+
+#: includes/system_tests.inc:16
+msgid "Optional"
+msgstr "Opcional"
+
+#: includes/system_tests.inc:17
+msgid "Recommended"
+msgstr "Recomendado"
+
+#: includes/system_tests.inc:18
+msgid "Required "
+msgstr "Requerido "
+
+#: includes/system_tests.inc:24
+msgid "MySQL version"
+msgstr "Versão do MySQL"
+
+#: includes/system_tests.inc:28
+msgid "Upgrade MySQL server to version at least 4.1"
+msgstr "Atualize o servidor MySQL para versão 4.1 ou superior"
+
+#: includes/system_tests.inc:35
+msgid "PHP MySQL extension"
+msgstr "Extensão PHP MySQL"
+
+#: includes/system_tests.inc:40
+msgid "Your PHP has to have MySQL extension enabled."
+msgstr "Seu PHP deve ter extensão de MySQL habilitada."
+
+#: includes/system_tests.inc:46
+msgid "PHP version"
+msgstr "Versão do PHP"
+
+#: includes/system_tests.inc:50
+msgid "Upgrade PHP to version at least 4.3.3"
+msgstr "Atualize o PHP para versão 4.3.3 ou superior"
+
+#: includes/system_tests.inc:57
+msgid "Server system"
+msgstr "Sistema do Servidor"
+
+#: includes/system_tests.inc:67
+msgid "Session save path"
+msgstr "Endereço de gravação da seção"
+
+#: includes/system_tests.inc:79
+msgid "Removed install wizard folder"
+msgstr "Removida a pasta do assistente de instalação"
+
+#: includes/system_tests.inc:82
+msgid "Not removed"
+msgstr "Não removido"
+
+#: includes/system_tests.inc:83
+msgid "Remove or rename install wizard folder for security reasons."
+msgstr "Remova ou renomeie a pasta do assistente de instalação por motivos de segurança."
+
+#: includes/system_tests.inc:90
+msgid "Browser type"
+msgstr "Tipo de browser"
+
+#: includes/system_tests.inc:94
+msgid "Any browser is supported"
+msgstr "Qualquer browser é compatível"
+
+#: includes/system_tests.inc:101
+msgid "Http server type"
+msgstr "Tipo de servidor Http"
+
+#: includes/system_tests.inc:105
+msgid "Any server is supported"
+msgstr "Qualquer servidor é compatível"
+
+#: includes/system_tests.inc:112
+msgid "Native gettext"
+msgstr "gettext nativo"
+
+#: includes/system_tests.inc:116
+msgid "In case of no gettext support, php emulation is used"
+msgstr "Na falta de suporte getext, a emulação do php será utilizada"
+
+#: includes/system_tests.inc:124
+msgid "Debugging mode"
+msgstr "Modo de depuração (debug)"
+
+#: includes/system_tests.inc:128
+msgid "To switch debugging on set $go_debug>0 in config.php file"
+msgstr "Para ativar depuração (debug) inclua $go_debug>0 no ficheiro config.php"
+
+#: includes/system_tests.inc:137
+msgid "Error logging"
+msgstr "Log de erros"
+
+#: includes/system_tests.inc:145
+msgid "Disabled"
+msgstr "Desabilitado"
+
+#: includes/system_tests.inc:148
+msgid "To switch error logging set $error_logging in config.php file"
+msgstr "Para alternar erros de login inclua $error_logging no ficheiro config.php"
+
+#: includes/system_tests.inc:151
+msgid "Log file is not writeable"
+msgstr "Ficheiro de log não é gravável"
+
+#: includes/system_tests.inc:161
+msgid "Current database version"
+msgstr "Versão da base de dados atual"
+
+#: includes/system_tests.inc:165
+msgid "Database structure seems to be not upgraded to current version"
+msgstr "A estrutura da base de dados não foi atualizada para a versão atual"
+
+#: includes/system_tests.inc:180
+msgid "Company subdirectories consistency"
+msgstr "Consistência de sub-pastas da empresa"
+
+#: 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
+#, php-format
+msgid "'%s' is not writeable"
+msgstr "'%s' não é gravável"
+
+#: includes/system_tests.inc:221
+msgid "Temporary directory"
+msgstr "Pasta temporária"
+
+#: includes/system_tests.inc:233
+msgid "Language configuration consistency"
+msgstr "Consistência de configuração de idioma"
+
+#: includes/system_tests.inc:242
+msgid "Languages folder should be writeable."
+msgstr "Pasta de idiomas deve ser gravável."
+
+#: includes/system_tests.inc:251
+msgid "Languages configuration file should be writeable."
+msgstr "O ficheiro de configuração de idiomas deve ser gravável."
+
+#: includes/system_tests.inc:270
+#, php-format
+msgid "Missing %s translation file."
+msgstr "Falta o ficheiro de tradução %s."
+
+#: includes/system_tests.inc:275
+#, php-format
+msgid "Missing system locale: %s"
+msgstr "Falta localidade (locale) do sistema: %s"
+
+#: includes/system_tests.inc:288
+msgid "Main config file"
+msgstr "Ficheiro de configuração principal"
+
+#: includes/system_tests.inc:295
+#: includes/system_tests.inc:317
+#, php-format
+msgid "Can't write '%s' file. Check FA directory write permissions."
+msgstr "Não é possível escrever no ficheiro '%s'. Verifique a permissõe de escrita do diretório FA"
+
+#: includes/system_tests.inc:296
+#: includes/system_tests.inc:318
+#, php-format
+msgid "'%s' file exists."
+msgstr "O ficheiro '%s' já existe."
+
+#: includes/system_tests.inc:300
+#, php-format
+msgid "'%s' file should be read-only"
+msgstr "O ficheiro '%s' deve ser somente de leitura"
+
+#: includes/system_tests.inc:309
+msgid "Database auth file"
+msgstr "Ficheiro de autorização da base de dados"
+
+#: includes/system_tests.inc:322
+#, php-format
+msgid "'%s' file should be read-only if you do not plan to add or change companies"
+msgstr "O ficheiro '%s' deve ser somente leitura se não pretende adicionar ou alterar empresas"
+
+#: includes/system_tests.inc:333
+msgid "Extensions system"
+msgstr "Sistema de extensões"
+
+#: includes/system_tests.inc:363
+msgid "Extensions configuration files and directories should be writeable"
+msgstr "Extensões de ficheiros de configuração e pastas devem ser graváveis"
+
+#: includes/system_tests.inc:375
+#, php-format
+msgid "Non-standard theme directory '%s' is not writable"
+msgstr "Descrição da pasta não-padrão '%s' não é editável"
+
+#: includes/system_tests.inc:385
+msgid "OpenSSL PHP extension have to be enabled to use extension repository system."
+msgstr "A extensão OpenSSL PHP tem que estar habilitada para usar o repositório de extensão."
+
+#: includes/system_tests.inc:388
+msgid "OpenSSL have to be available on your server to use extension repository system."
+msgstr "OpenSSL deve estar disponível no seu servidor para utilizar o repositório de extensão."
+
+#: includes/system_tests.inc:411
+msgid "Test"
+msgstr "Teste"
+
+#: includes/system_tests.inc:411
+msgid "Test type"
+msgstr "Tipo de teste"
+
+#: includes/system_tests.inc:411
+msgid "Value"
+msgstr "Valor"
+
+#: includes/system_tests.inc:411
+msgid "Comments"
+msgstr "Comentários"
+
+#: includes/system_tests.inc:435
+msgid "Ok"
+msgstr "Ok"
+
+#: includes/packages.inc:190
+#, php-format
+msgid "No key field '%s' in file '%s'"
+msgstr "Campo chave '%s' no ficheiro '%s' não existe"
+
+#: includes/packages.inc:295
+msgid "Release file in repository is invalid, or public key is outdated."
+msgstr "Ficheiro de lançamento no repositório é inválido, ou a chave pública está desatualizada."
+
+#: includes/packages.inc:311
+msgid "Repository version does not match application version."
+msgstr "Versão do repositório não corresponde à versão da aplicação."
+
+#: includes/packages.inc:325
+#, php-format
+msgid "Security alert: broken index file in repository '%s'. Please inform repository administrator about this issue."
+msgstr "ALERTA DE SEGURANÇA: ficheiro de índice danificado no repositório '% s'. Por favor, informe o administrador do repositório sobre este assunto."
+
+#: includes/packages.inc:358
+#, php-format
+msgid "Security alert: broken package '%s' in repository. Please inform repository administrator about this issue."
+msgstr "ALERTA DE SEGURANÇA: pacote '% s' danificado no repositório. Por favor, informe o administrador do repositório sobre este assunto."
+
+#: includes/packages.inc:613
+#: includes/packages.inc:664
+#, php-format
+msgid "Package '%s' not found."
+msgstr "Pacote '%s' não encontrado."
+

diff --git a/inventory/cost_update.php b/inventory/cost_update.php
index 157524dada10f9114924905bfb043d08853e6dda..30e73c0c7066477744e630e5d08b742880c04f79 100644 (file)
--- a/inventory/cost_update.php
+++ b/inventory/cost_update.php
@@ -138,7 +138,5 @@ div_end();
 submit_center('UpdateData', _("Update"), true, false, 'default');
 
 end_form();
-if (!@$_GET['popup'])
-       end_page(@$_GET['popup'], false, false);
-
+end_page();
 ?>

diff --git a/inventory/includes/db/items_category_db.inc b/inventory/includes/db/items_category_db.inc
index 25368ee75e12c1357e0e002e74ab686b952af1c6..b32d472e6b15acc7ccf247e8f223e3e3f74b59a6 100644 (file)
--- a/inventory/includes/db/items_category_db.inc
+++ b/inventory/includes/db/items_category_db.inc
@@ -70,7 +70,9 @@ function get_item_categories($show_inactive)
 {
        $sql = "SELECT c.*, t.name as tax_name FROM ".TB_PREF."stock_category c, "
                .TB_PREF."item_tax_types t WHERE c.dflt_tax_type=t.id";
-       if (!$show_inactive) $sql .= " AND !c.inactive";
+       if (!$show_inactive)
+               $sql .= " AND !c.inactive";
+       $sql .= " ORDER by description";
 
        return db_query($sql, "could not get stock categories");
 }

diff --git a/inventory/manage/item_units.php b/inventory/manage/item_units.php
index fa63bbe532a2176603cf3881a5258fc331f8ba0c..249c09d252b2a42a75790fbb76fac0f0a4bf4f56 100644 (file)
--- a/inventory/manage/item_units.php
+++ b/inventory/manage/item_units.php
@@ -48,7 +48,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
        }
 
        if ($input_error !=1) {
-       write_item_unit(htmlentities($selected_id), $_POST['abbr'], $_POST['description'], $_POST['decimals'] );
+       write_item_unit($selected_id, $_POST['abbr'], $_POST['description'], $_POST['decimals'] );
                if($selected_id != '')
                        display_notification(_('Selected unit has been updated'));
                else
@@ -105,10 +105,10 @@ while ($myrow = db_fetch($result))
        label_cell($myrow["abbr"]);
        label_cell($myrow["name"]);
        label_cell(($myrow["decimals"]==-1?_("User Quantity Decimals"):$myrow["decimals"]));
-
-       inactive_control_cell($myrow["abbr"], $myrow["inactive"], 'item_units', 'abbr');
-       edit_button_cell("Edit".$myrow["abbr"], _("Edit"));
-       delete_button_cell("Delete".$myrow["abbr"], _("Delete"));
+       $id = htmlentities($myrow["abbr"]);
+       inactive_control_cell($id, $myrow["inactive"], 'item_units', 'abbr');
+       edit_button_cell("Edit".$id, _("Edit"));
+       delete_button_cell("Delete".$id, _("Delete"));
        end_row();
 }
 
@@ -130,7 +130,7 @@ if ($selected_id != '')
                $_POST['description']  = $myrow["name"];
                $_POST['decimals']  = $myrow["decimals"];
        }
-       hidden('selected_id', $selected_id);
+       hidden('selected_id', $myrow["abbr"]);
 }
 if ($selected_id != '' && item_unit_used($selected_id)) {
     label_row(_("Unit Abbreviation:"), $_POST['abbr']);

diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index 20e331c125b6b4f700682de93af4e9447912a070..eb7c0ec500902530cbe98a20601ae657f8b4fc66 100644 (file)
--- a/inventory/manage/items.php
+++ b/inventory/manage/items.php
@@ -18,7 +18,7 @@ if ($use_popup_windows)
        $js .= get_js_open_window(900, 500);
 if ($use_date_picker)
        $js .= get_js_date_picker();
-       
+
 page(_($help_context = "Items"), @$_REQUEST['popup'], false, "", $js);
 
 include_once($path_to_root . "/includes/date_functions.inc");

diff --git a/inventory/prices.php b/inventory/prices.php
index f1c63c40b2b9a52f273a4f84e5495586754678d1..84db8288d1b8cbc8e9471df73d80547655cb9dc6 100644 (file)
--- a/inventory/prices.php
+++ b/inventory/prices.php
@@ -50,7 +50,6 @@ if (!isset($_POST['curr_abrev']))
 }
 
 //---------------------------------------------------------------------------------------------------
-
 $action = $_SERVER['PHP_SELF'];
 if (@$_GET['popup'])
        $action .= "?stock_id=".get_post('stock_id');
@@ -212,6 +211,5 @@ submit_add_or_update_center($selected_id == -1, '', 'both');
 div_end();
 
 end_form();
-if (!@$_GET['popup'])
-       end_page(@$_GET['popup'], false, false);
+end_page();
 ?>

diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php
index 1b4602ee785887b11ae5885e84183d502127a41d..286ad1350718de574ae1ee8f67eb750bf45e7915 100644 (file)
--- a/inventory/purchasing_data.php
+++ b/inventory/purchasing_data.php
@@ -230,7 +230,5 @@ end_table(1);
 submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();
-if (!@$_GET['popup'])
-       end_page(@$_GET['popup'], false, false);
-
+end_page();
 ?>

diff --git a/inventory/reorder_level.php b/inventory/reorder_level.php
index c863796a6ece9fbff25b16f9a78f59de59e6b56f..7a37b8f5e751012ecc1ab2fa02c553b1af10aec0 100644 (file)
--- a/inventory/reorder_level.php
+++ b/inventory/reorder_level.php
@@ -114,7 +114,4 @@ div_end();
 submit_center('UpdateData', _("Update"), true, false, 'default');
 
 end_form();
-if (!@$_GET['popup'])
-       end_page(@$_GET['popup'], false, false);
-
-?>
+end_page();

diff --git a/js/payalloc.js b/js/payalloc.js
index 1bd818c1864fc27859e0ae86c1f9f0dd7fb821c9..a711e603cb40daf97dcc8924cefb339c5714eabd 100644 (file)
--- a/js/payalloc.js
+++ b/js/payalloc.js
@@ -56,7 +56,7 @@ function allocate_none(doc) {
 
 var allocations = {
        '.amount': function(e) {
-               if(e.name == 'allocated_amount')
+               if(e.name == 'allocated_amount' || e.name == 'bank_amount')
                {
                  e.onblur = function() {
                        var dec = this.getAttribute("dec");

diff --git a/js/utils.js b/js/utils.js
index 6996ebec2ee12a8dd099d67f9628bb9a97d5d01f..c5aec13332dea4100dd439ad3cd98f7f5225249b 100644 (file)
--- a/js/utils.js
+++ b/js/utils.js
@@ -55,7 +55,7 @@ JsHttpRequest._request = function(trigger, form, tout, retry) {
 
                var upload = form && form.enctype=='multipart/form-data';
                
-               var url = form ? form.action : 
+               var url = form ? form.getAttribute('action') : 
                  window.location.toString();
 
                var content = this.formInputs(trigger, form, upload);

diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po
index bb6bfc206c6c59fb68991c66939ea79e22a8825c..4d41cd3bb43a8b8cff269e1b2f870a3d8650226e 100644 (file)
--- a/lang/new_language_template/LC_MESSAGES/empty.po
+++ b/lang/new_language_template/LC_MESSAGES/empty.po
@@ -8,1527 +8,1827 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 21:40+0200\n"
+"POT-Creation-Date: 2013-10-27 17:26+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"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: frontaccounting.php:73 frontaccounting.php:74
+#: ../frontaccounting.php:73
+#: ../frontaccounting.php:74
 msgid "Main  Menu"
 msgstr ""
 
-#: frontaccounting.php:75 access/logout.php:18 themes/default/renderer.php:70
-#: themes/default/renderer.php:83
+#: ../frontaccounting.php:75
+#: ../access/logout.php:18
+#: ../themes/default/renderer.php:70
+#: ../themes/default/renderer.php:83
 msgid "Logout"
 msgstr ""
 
-#: access/login.php:13
+#: ../access/login.php:13
 msgid "Restricted access"
 msgstr ""
 
-#: access/login.php:27
+#: ../access/login.php:27
 msgid "Login as user: demouser and password: password"
 msgstr ""
 
-#: access/login.php:31
+#: ../access/login.php:31
 msgid "Please login here"
 msgstr ""
 
-#: access/login.php:36
+#: ../access/login.php:36
 msgid "Too many failed login attempts.<br>Please wait a while or try later."
 msgstr ""
 
-#: access/login.php:49 access/login.php:80
+#: ../access/login.php:49
+#: ../access/login.php:80
 msgid "Authorization timeout"
 msgstr ""
 
-#: access/login.php:49 access/login.php:87
+#: ../access/login.php:49
+#: ../access/login.php:87
 msgid "Login"
 msgstr ""
 
-#: access/login.php:87 admin/inst_upgrade.php:141
+#: ../access/login.php:87
+#: ../admin/inst_upgrade.php:141
 msgid "Version"
 msgstr ""
 
-#: access/login.php:90
+#: ../access/login.php:90
 msgid "User name"
 msgstr ""
 
-#: access/login.php:94 admin/change_current_user_password.php:78
-#: admin/users.php:191
+#: ../access/login.php:94
+#: ../admin/users.php:191
 msgid "Password:"
 msgstr ""
 
-#: access/login.php:104 access/login.php:111 admin/create_coy.php:253
-#: admin/create_coy.php:336 includes/sysnames.inc:194
+#: ../access/login.php:104
+#: ../access/login.php:111
+#: ../admin/create_coy.php:253
+#: ../admin/create_coy.php:336
+#: ../includes/sysnames.inc:194
 msgid "Company"
 msgstr ""
 
-#: access/login.php:118
+#: ../access/login.php:118
 msgid "Login -->"
 msgstr ""
 
-#: access/login.php:149 admin/display_prefs.php:112
-#: themes/default/renderer.php:129
+#: ../access/login.php:149
+#: ../admin/display_prefs.php:112
+#: ../themes/default/renderer.php:129
 msgid "Theme:"
 msgstr ""
 
-#: access/logout.php:29
+#: ../access/logout.php:29
 msgid "Thank you for using"
 msgstr ""
 
-#: access/logout.php:40
+#: ../access/logout.php:40
 msgid "Click here to Login Again."
 msgstr ""
 
-#: admin/attachments.php:74
+#: ../admin/attachments.php:74
 msgid "Attach Documents"
 msgstr ""
 
-#: admin/attachments.php:86
+#: ../admin/attachments.php:86
 msgid "Selected transaction does not exists."
 msgstr ""
 
-#: admin/attachments.php:88
+#: ../admin/attachments.php:88
 msgid "Select attachment file."
 msgstr ""
 
-#: admin/attachments.php:125
+#: ../admin/attachments.php:125
 msgid "Attachment has been inserted."
 msgstr ""
 
-#: admin/attachments.php:131
+#: ../admin/attachments.php:131
 msgid "Attachment has been updated."
 msgstr ""
 
-#: admin/attachments.php:146
+#: ../admin/attachments.php:146
 msgid "Attachment has been deleted."
 msgstr ""
 
-#: admin/attachments.php:164 admin/view_print_transaction.php:72
-#: gl/inquiry/journal_inquiry.php:47
-#: inventory/includes/item_adjustments_ui.inc:47
-#: manufacturing/work_order_add_finished.php:203
-#: manufacturing/work_order_costs.php:136
-#: manufacturing/includes/work_order_issue_ui.inc:161
-#: sales/inquiry/customer_allocation_inquiry.php:47
+#: ../admin/attachments.php:164
+#: ../admin/view_print_transaction.php:72
+#: ../gl/inquiry/journal_inquiry.php:47
+#: ../inventory/includes/item_adjustments_ui.inc:47
+#: ../manufacturing/work_order_add_finished.php:203
+#: ../manufacturing/work_order_costs.php:136
+#: ../manufacturing/work_order_entry.php:379
+#: ../manufacturing/work_order_entry.php:387
+#: ../manufacturing/includes/work_order_issue_ui.inc:161
+#: ../sales/inquiry/customer_allocation_inquiry.php:47
 msgid "Type:"
 msgstr ""
 
-#: admin/attachments.php:180 admin/create_coy.php:277
-#: admin/crm_categories.php:106 admin/fiscalyears.php:164
-#: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96
-#: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:144
-#: dimensions/inquiry/search_dimensions.php:120
-#: gl/inquiry/journal_inquiry.php:118 gl/manage/bank_accounts.php:133
-#: gl/manage/currencies.php:164 gl/manage/exchange_rates.php:94
-#: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:154
-#: gl/manage/gl_quick_entries.php:196 gl/manage/gl_quick_entries.php:295
-#: gl/includes/ui/gl_bank_ui.inc:185 gl/includes/ui/gl_journal_ui.inc:134
-#: includes/ui/contacts_view.inc:64 includes/ui/simple_crud_class.inc:52
-#: includes/ui/ui_input.inc:961 inventory/prices.php:161
-#: inventory/purchasing_data.php:166
-#: inventory/includes/item_adjustments_ui.inc:87
-#: inventory/includes/stock_transfers_ui.inc:79
-#: inventory/manage/item_categories.php:121
-#: inventory/manage/item_codes.php:140 inventory/manage/item_units.php:110
-#: inventory/manage/locations.php:161 inventory/manage/movement_types.php:106
-#: inventory/manage/sales_kits.php:55 manufacturing/search_work_orders.php:109
-#: manufacturing/manage/bom_edit.php:86
-#: manufacturing/manage/work_centres.php:114
-#: manufacturing/includes/work_order_issue_ui.inc:58
-#: purchasing/includes/ui/invoice_ui.inc:542
-#: purchasing/inquiry/po_search_completed.php:105
-#: purchasing/inquiry/po_search.php:87 sales/manage/credit_status.php:119
-#: sales/manage/customer_branches.php:159
-#: sales/manage/recurrent_invoices.php:130 sales/manage/sales_areas.php:103
-#: sales/manage/sales_groups.php:99 sales/manage/sales_people.php:119
-#: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121
-#: sales/inquiry/sales_deliveries_view.php:154
-#: sales/includes/ui/sales_credit_ui.inc:197
-#: sales/includes/ui/sales_order_ui.inc:209 taxes/item_tax_types.php:139
-#: taxes/tax_groups.php:137 taxes/tax_types.php:132
+#: ../admin/attachments.php:180
+#: ../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:144
+#: ../dimensions/inquiry/search_dimensions.php:120
+#: ../gl/inquiry/journal_inquiry.php:118
+#: ../gl/manage/bank_accounts.php:133
+#: ../gl/manage/currencies.php:164
+#: ../gl/manage/exchange_rates.php:94
+#: ../gl/manage/gl_account_classes.php:132
+#: ../gl/manage/gl_account_types.php:154
+#: ../gl/manage/gl_quick_entries.php:196
+#: ../gl/manage/gl_quick_entries.php:295
+#: ../gl/includes/ui/gl_bank_ui.inc:186
+#: ../gl/includes/ui/gl_journal_ui.inc:134
+#: ../includes/ui/contacts_view.inc:64
+#: ../includes/ui/simple_crud_class.inc:52
+#: ../includes/ui/ui_input.inc:961
+#: ../inventory/prices.php.orig:161
+#: ../inventory/purchasing_data.php.orig:166
+#: ../inventory/includes/item_adjustments_ui.inc:87
+#: ../inventory/includes/stock_transfers_ui.inc:79
+#: ../inventory/manage/item_categories.php:121
+#: ../inventory/manage/item_codes.php:140
+#: ../inventory/manage/item_units.php:110
+#: ../inventory/manage/locations.php:161
+#: ../inventory/manage/movement_types.php:106
+#: ../inventory/manage/sales_kits.php:55
+#: ../manufacturing/search_work_orders.php:109
+#: ../manufacturing/manage/bom_edit.php:86
+#: ../manufacturing/manage/work_centres.php:114
+#: ../manufacturing/includes/work_order_issue_ui.inc:58
+#: ../purchasing/includes/ui/invoice_ui.inc:557
+#: ../purchasing/includes/ui/po_ui.inc:271
+#: ../purchasing/inquiry/po_search_completed.php:105
+#: ../purchasing/inquiry/po_search.php:87
+#: ../sales/manage/credit_status.php:119
+#: ../sales/manage/customer_branches.php:159
+#: ../sales/manage/recurrent_invoices.php:130
+#: ../sales/manage/sales_areas.php:103
+#: ../sales/manage/sales_groups.php:99
+#: ../sales/manage/sales_people.php:119
+#: ../sales/manage/sales_points.php:99
+#: ../sales/manage/sales_types.php:121
+#: ../sales/inquiry/sales_deliveries_view.php:154
+#: ../sales/inquiry/sales_orders_view.php:136
+#: ../sales/inquiry/sales_orders_view.php.orig:136
+#: ../sales/includes/ui/sales_credit_ui.inc:197
+#: ../sales/includes/ui/sales_order_ui.inc:209
+#: ../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:185 gl/inquiry/journal_inquiry.php:135
+#: ../admin/attachments.php:185
+#: ../gl/inquiry/journal_inquiry.php:135
 msgid "View"
 msgstr ""
 
-#: admin/attachments.php:190
+#: ../admin/attachments.php:190
 msgid "Download"
 msgstr ""
 
-#: admin/attachments.php:195 admin/create_coy.php:278
-#: admin/crm_categories.php:110 admin/fiscalyears.php:166
-#: admin/inst_chart.php:80 admin/inst_lang.php:109 admin/inst_module.php:143
-#: admin/inst_theme.php:102 admin/payment_terms.php:143 admin/printers.php:97
-#: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:146
-#: gl/gl_budget.php:137 gl/manage/bank_accounts.php:134
-#: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:99
-#: gl/manage/gl_account_classes.php:133 gl/manage/gl_account_types.php:155
-#: gl/manage/gl_quick_entries.php:197 gl/manage/gl_quick_entries.php:296
-#: gl/includes/ui/gl_bank_ui.inc:187 gl/includes/ui/gl_journal_ui.inc:136
-#: includes/ui/contacts_view.inc:67 includes/ui/simple_crud_class.inc:54
-#: includes/ui/ui_input.inc:286 inventory/prices.php:162
-#: inventory/purchasing_data.php:167
-#: inventory/includes/item_adjustments_ui.inc:89
-#: inventory/includes/stock_transfers_ui.inc:81
-#: inventory/manage/item_categories.php:122
-#: inventory/manage/item_codes.php:141 inventory/manage/item_units.php:111
-#: inventory/manage/locations.php:162 inventory/manage/movement_types.php:107
-#: inventory/manage/sales_kits.php:56 manufacturing/manage/bom_edit.php:87
-#: manufacturing/manage/work_centres.php:115
-#: manufacturing/includes/work_order_issue_ui.inc:60
-#: purchasing/includes/ui/invoice_ui.inc:304
-#: sales/manage/credit_status.php:120 sales/manage/customer_branches.php:163
-#: sales/manage/recurrent_invoices.php:131 sales/manage/sales_areas.php:104
-#: sales/manage/sales_groups.php:100 sales/manage/sales_people.php:120
-#: sales/manage/sales_points.php:100 sales/manage/sales_types.php:122
-#: sales/includes/ui/sales_credit_ui.inc:199
-#: sales/includes/ui/sales_order_ui.inc:211 taxes/item_tax_types.php:140
-#: taxes/tax_groups.php:138 taxes/tax_types.php:133
+#: ../admin/attachments.php:195
+#: ../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:146
+#: ../gl/gl_budget.php:137
+#: ../gl/manage/bank_accounts.php:134
+#: ../gl/manage/currencies.php:166
+#: ../gl/manage/exchange_rates.php:99
+#: ../gl/manage/gl_account_classes.php:133
+#: ../gl/manage/gl_account_types.php:155
+#: ../gl/manage/gl_quick_entries.php:197
+#: ../gl/manage/gl_quick_entries.php:296
+#: ../gl/includes/ui/gl_bank_ui.inc:188
+#: ../gl/includes/ui/gl_journal_ui.inc:136
+#: ../includes/ui/contacts_view.inc:67
+#: ../includes/ui/simple_crud_class.inc:54
+#: ../includes/ui/ui_input.inc:286
+#: ../inventory/prices.php.orig:162
+#: ../inventory/purchasing_data.php.orig:167
+#: ../inventory/includes/item_adjustments_ui.inc:89
+#: ../inventory/includes/stock_transfers_ui.inc:81
+#: ../inventory/manage/item_categories.php:122
+#: ../inventory/manage/item_codes.php:141
+#: ../inventory/manage/item_units.php:111
+#: ../inventory/manage/locations.php:162
+#: ../inventory/manage/movement_types.php:107
+#: ../inventory/manage/sales_kits.php:56
+#: ../manufacturing/manage/bom_edit.php:87
+#: ../manufacturing/manage/work_centres.php:115
+#: ../manufacturing/includes/work_order_issue_ui.inc:60
+#: ../purchasing/includes/ui/invoice_ui.inc:319
+#: ../purchasing/includes/ui/po_ui.inc:273
+#: ../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:211
+#: ../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:202 admin/view_print_transaction.php:126
-#: admin/void_transaction.php:181 dimensions/inquiry/search_dimensions.php:127
-#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:232
-#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
-#: gl/inquiry/journal_inquiry.php:127 gl/inquiry/journal_inquiry.php:140
-#: includes/ui/allocation_cart.inc:264
-#: inventory/inquiry/stock_movements.php:78
-#: manufacturing/search_work_orders.php:159
-#: manufacturing/includes/manufacturing_ui.inc:157
-#: manufacturing/includes/manufacturing_ui.inc:200
-#: manufacturing/includes/manufacturing_ui.inc:236
-#: manufacturing/includes/manufacturing_ui.inc:276
-#: manufacturing/includes/manufacturing_ui.inc:280
-#: manufacturing/includes/manufacturing_ui.inc:331
-#: purchasing/view/view_po.php:115 purchasing/view/view_po.php:140
-#: purchasing/inquiry/po_search_completed.php:120
-#: purchasing/inquiry/po_search.php:130
-#: purchasing/inquiry/supplier_allocation_inquiry.php:126
-#: purchasing/inquiry/supplier_inquiry.php:174
-#: purchasing/allocations/supplier_allocation_main.php:95
-#: reporting/rep203.php:93 reporting/rep306.php:141 reporting/rep601.php:79
-#: reporting/rep602.php:80 reporting/rep704.php:83 reporting/rep704.php:86
-#: reporting/rep704.php:89 reporting/rep710.php:78
-#: reporting/includes/doctext.inc:167 reporting/includes/doctext.inc:208
-#: reporting/includes/doctext.inc:246
-#: sales/allocations/customer_allocation_main.php:94
-#: sales/view/view_sales_order.php:109 sales/view/view_sales_order.php:142
-#: sales/view/view_sales_order.php:179
-#: sales/inquiry/customer_allocation_inquiry.php:144
-#: sales/inquiry/customer_inquiry.php:201
+#: ../admin/attachments.php:202
+#: ../admin/view_print_transaction.php:126
+#: ../admin/void_transaction.php:181
+#: ../dimensions/inquiry/search_dimensions.php:127
+#: ../dimensions/view/view_dimension.php:55
+#: ../gl/bank_account_reconcile.php:232
+#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/gl_account_inquiry.php:126
+#: ../gl/inquiry/journal_inquiry.php:127
+#: ../gl/inquiry/journal_inquiry.php:140
+#: ../includes/ui/allocation_cart.inc:289
+#: ../inventory/inquiry/stock_movements.php:78
+#: ../manufacturing/search_work_orders.php:159
+#: ../manufacturing/includes/manufacturing_ui.inc:157
+#: ../manufacturing/includes/manufacturing_ui.inc:200
+#: ../manufacturing/includes/manufacturing_ui.inc:236
+#: ../manufacturing/includes/manufacturing_ui.inc:276
+#: ../manufacturing/includes/manufacturing_ui.inc:280
+#: ../manufacturing/includes/manufacturing_ui.inc:331
+#: ../purchasing/view/view_po.php:115
+#: ../purchasing/view/view_po.php:140
+#: ../purchasing/inquiry/po_search_completed.php:120
+#: ../purchasing/inquiry/po_search.php:130
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:127
+#: ../purchasing/inquiry/supplier_inquiry.php:174
+#: ../purchasing/allocations/supplier_allocation_main.php:95
+#: ../reporting/rep101.php:147
+#: ../reporting/rep201.php:135
+#: ../reporting/rep203.php:93
+#: ../reporting/rep306.php:141
+#: ../reporting/rep601.php:79
+#: ../reporting/rep602.php:80
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep704.php:89
+#: ../reporting/rep710.php:78
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+#: ../reporting/includes/doctext.inc:246
+#: ../sales/allocations/customer_allocation_main.php:94
+#: ../sales/view/view_sales_order.php: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:203 admin/attachments.php:247
-#: admin/crm_categories.php:88 admin/inst_upgrade.php:141
-#: admin/payment_terms.php:127 admin/printers.php:84
-#: admin/print_profiles.php:148 gl/inquiry/tax_inquiry.php:82
-#: gl/manage/gl_quick_entries.php:186 gl/manage/gl_quick_entries.php:224
-#: includes/ui/view_package.php:32 inventory/manage/item_codes.php:125
-#: inventory/manage/item_units.php:94 inventory/manage/movement_types.php:95
-#: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:56
-#: inventory/view/view_transfer.php:56 manufacturing/manage/bom_edit.php:70
-#: manufacturing/includes/manufacturing_ui.inc:28
-#: purchasing/includes/ui/invoice_ui.inc:492
-#: purchasing/includes/ui/invoice_ui.inc:504
-#: purchasing/po_receive_items.php:62 reporting/rep104.php:111
-#: reporting/rep105.php:114 reporting/rep204.php:84 reporting/rep304.php:114
-#: reporting/rep305.php:100 reporting/rep306.php:141 reporting/rep307.php:117
-#: reporting/rep308.php:149 reporting/rep309.php:98 reporting/rep401.php:71
-#: sales/create_recurrent_invoices.php:134 sales/manage/credit_status.php:97
-#: sales/manage/recurrent_invoices.php:102 taxes/tax_groups.php:123
-#: taxes/tax_types.php:115
+#: ../admin/attachments.php:203
+#: ../admin/attachments.php:247
+#: ../admin/crm_categories.php:97
+#: ../admin/inst_upgrade.php:141
+#: ../admin/payment_terms.php:127
+#: ../admin/printers.php:84
+#: ../admin/print_profiles.php:148
+#: ../gl/inquiry/tax_inquiry.php:82
+#: ../gl/manage/gl_quick_entries.php:186
+#: ../gl/manage/gl_quick_entries.php:224
+#: ../includes/ui/view_package.php:32
+#: ../inventory/manage/item_codes.php:125
+#: ../inventory/manage/item_units.php:94
+#: ../inventory/manage/movement_types.php:95
+#: ../inventory/manage/sales_kits.php:40
+#: ../inventory/view/view_adjustment.php:56
+#: ../inventory/view/view_transfer.php:56
+#: ../manufacturing/manage/bom_edit.php:70
+#: ../manufacturing/includes/manufacturing_ui.inc:28
+#: ../purchasing/includes/ui/invoice_ui.inc: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:149
+#: ../reporting/rep309.php:98
+#: ../reporting/rep401.php:71
+#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/manage/credit_status.php:97
+#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/inquiry/sales_orders_view.php.orig:317
+#: ../sales/inquiry/sales_orders_view.php.orig:321
+#: ../taxes/sav.tax_types.php:190
+#: ../taxes/tax_groups.php:123
+#: ../taxes/tax_types.php:115
 msgid "Description"
 msgstr ""
 
-#: admin/attachments.php:204 admin/backups.php:63 admin/backups.php:149
+#: ../admin/attachments.php:204
+#: ../admin/backups.php:63
+#: ../admin/backups.php:149
 msgid "Filename"
 msgstr ""
 
-#: admin/attachments.php:205
+#: ../admin/attachments.php:205
 msgid "Size"
 msgstr ""
 
-#: admin/attachments.php:206
+#: ../admin/attachments.php:206
 msgid "Filetype"
 msgstr ""
 
-#: admin/attachments.php:207
+#: ../admin/attachments.php:207
 msgid "Date Uploaded"
 msgstr ""
 
-#: admin/attachments.php:241 admin/attachments.php:246
+#: ../admin/attachments.php:241
+#: ../admin/attachments.php:246
 msgid "Transaction #"
 msgstr ""
 
-#: admin/attachments.php:248
+#: ../admin/attachments.php:248
 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
 msgid "Select backup file first."
 msgstr ""
 
-#: admin/backups.php:43
+#: ../admin/backups.php:43
 msgid "Backup and Restore Database"
 msgstr ""
 
-#: admin/backups.php:50
+#: ../admin/backups.php:50
 msgid "Backup paths have not been set correctly."
 msgstr ""
 
-#: admin/backups.php:51
+#: ../admin/backups.php:51
 msgid "Please contact System Administrator."
 msgstr ""
 
-#: admin/backups.php:52
+#: ../admin/backups.php:52
 msgid "cannot find backup directory"
 msgstr ""
 
-#: admin/backups.php:62
+#: ../admin/backups.php:62
 msgid "Backup successfully generated."
 msgstr ""
 
-#: admin/backups.php:65
+#: ../admin/backups.php:65
 msgid "Database backup failed."
 msgstr ""
 
-#: admin/backups.php:98 admin/create_coy.php:265 admin/fiscalyears.php:155
-#: admin/inst_lang.php:85 admin/inst_lang.php:97
-#: dimensions/inquiry/search_dimensions.php:107
-#: gl/manage/bank_accounts.php:130 gl/manage/currencies.php:162
-#: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230
-#: includes/system_tests.inc:38 includes/system_tests.inc:113
-#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1676
-#: purchasing/manage/suppliers.php:122 reporting/rep102.php:114
-#: reporting/rep102.php:116 reporting/rep104.php:105 reporting/rep106.php:75
-#: reporting/rep114.php:74 reporting/rep202.php:118 reporting/rep202.php:120
-#: reporting/rep203.php:89 reporting/rep501.php:113
-#: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
-#: sales/manage/sales_types.php:119 taxes/item_tax_types.php:129
+#: ../admin/backups.php:98
+#: ../admin/create_coy.php:265
+#: ../admin/fiscalyears.php:155
+#: ../admin/inst_lang.php:85
+#: ../admin/inst_lang.php:97
+#: ../dimensions/inquiry/search_dimensions.php:107
+#: ../gl/manage/bank_accounts.php:130
+#: ../gl/manage/currencies.php:162
+#: ../gl/manage/gl_account_classes.php:127
+#: ../gl/manage/gl_quick_entries.php:230
+#: ../includes/system_tests.inc:38
+#: ../includes/system_tests.inc:113
+#: ../includes/system_tests.inc:126
+#: ../includes/ui/ui_lists.inc:1679
+#: ../purchasing/manage/suppliers.php:122
+#: ../reporting/rep101.php:143
+#: ../reporting/rep102.php:114
+#: ../reporting/rep102.php:116
+#: ../reporting/rep104.php:105
+#: ../reporting/rep106.php:75
+#: ../reporting/rep114.php:74
+#: ../reporting/rep201.php:131
+#: ../reporting/rep202.php:118
+#: ../reporting/rep202.php:120
+#: ../reporting/rep203.php:89
+#: ../reporting/rep303.php:113
+#: ../reporting/rep303.php:117
+#: ../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
 msgid "Restore backup completed."
 msgstr ""
 
-#: admin/backups.php:148
+#: ../admin/backups.php:148
 msgid "File successfully deleted."
 msgstr ""
 
-#: admin/backups.php:153
+#: ../admin/backups.php:153
 msgid "Can't delete backup file."
 msgstr ""
 
-#: admin/backups.php:165
+#: ../admin/backups.php:165
 msgid "You can only upload *.sql backup files"
 msgstr ""
 
-#: admin/backups.php:168
+#: ../admin/backups.php:168
 msgid "File uploaded to backup directory"
 msgstr ""
 
-#: admin/backups.php:171
+#: ../admin/backups.php:171
 msgid "File was not uploaded into the system."
 msgstr ""
 
-#: admin/backups.php:180
+#: ../admin/backups.php:180
 msgid "Create backup"
 msgstr ""
 
-#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:596
-#: sales/includes/ui/sales_order_ui.inc:652
+#: ../admin/backups.php:181
+#: ../sales/includes/ui/sales_order_ui.inc:595
+#: ../sales/includes/ui/sales_order_ui.inc:651
 msgid "Comments:"
 msgstr ""
 
-#: admin/backups.php:182
+#: ../admin/backups.php:182
 msgid "Compression:"
 msgstr ""
 
-#: admin/backups.php:184
+#: ../admin/backups.php:184
 msgid "Create Backup"
 msgstr ""
 
-#: admin/backups.php:186
+#: ../admin/backups.php:186
 msgid "Backup scripts maintenance"
 msgstr ""
 
-#: admin/backups.php:192
+#: ../admin/backups.php:192
 msgid "View Backup"
 msgstr ""
 
-#: admin/backups.php:193
+#: ../admin/backups.php:193
 msgid "Download Backup"
 msgstr ""
 
-#: admin/backups.php:194
+#: ../admin/backups.php:194
 msgid "Restore Backup"
 msgstr ""
 
-#: admin/backups.php:195
+#: ../admin/backups.php:195
 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
 msgid "Delete Backup"
 msgstr ""
 
-#: admin/backups.php:199
+#: ../admin/backups.php:199
 #, 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
 msgid "Upload file"
 msgstr ""
 
-#: admin/change_current_user_password.php:16
-#: admin/change_current_user_password.php:85 themes/default/renderer.php:77
+#: ../admin/change_current_user_password.php:16
+#: ../admin/change_current_user_password.php:99
+#: ../themes/default/renderer.php:77
 msgid "Change password"
 msgstr ""
 
-#: admin/change_current_user_password.php:28 admin/users.php:40
+#: ../admin/change_current_user_password.php:33
+msgid "Invalid password entered."
+msgstr ""
+
+#: ../admin/change_current_user_password.php:40
+#: ../admin/users.php:40
 msgid "The password entered must be at least 4 characters long."
 msgstr ""
 
-#: admin/change_current_user_password.php:35 admin/users.php:47
+#: ../admin/change_current_user_password.php:47
+#: ../admin/users.php:47
 msgid "The password cannot contain the user login."
 msgstr ""
 
-#: admin/change_current_user_password.php:42
+#: ../admin/change_current_user_password.php:54
 msgid "The passwords entered are not the same."
 msgstr ""
 
-#: admin/change_current_user_password.php:56
+#: ../admin/change_current_user_password.php:68
 msgid "Password cannot be changed in demo mode."
 msgstr ""
 
-#: admin/change_current_user_password.php:61
+#: ../admin/change_current_user_password.php:73
 msgid "Your password has been updated."
 msgstr ""
 
-#: admin/change_current_user_password.php:73 admin/users.php:180
+#: ../admin/change_current_user_password.php:85
+#: ../admin/users.php:180
 msgid "User login:"
 msgstr ""
 
-#: admin/change_current_user_password.php:79
-msgid "Repeat password:"
+#: ../admin/change_current_user_password.php:91
+msgid "Current Password:"
+msgstr ""
+
+#: ../admin/change_current_user_password.php:92
+msgid "New Password:"
 msgstr ""
 
-#: admin/change_current_user_password.php:81
+#: ../admin/change_current_user_password.php:93
+msgid "Repeat New Password:"
+msgstr ""
+
+#: ../admin/change_current_user_password.php:95
 msgid "Enter your new password in the fields."
 msgstr ""
 
-#: admin/company_preferences.php:16 applications/setup.php:18
+#: ../admin/company_preferences.php:16
+#: ../applications/setup.php:18
 msgid "Company Setup"
 msgstr ""
 
-#: admin/company_preferences.php:31
+#: ../admin/company_preferences.php:31
 msgid "Login timeout must be positive number not less than 10."
 msgstr ""
 
-#: admin/company_preferences.php:38
+#: ../admin/company_preferences.php:38
 msgid "The company name must be entered."
 msgstr ""
 
-#: admin/company_preferences.php:54
+#: ../admin/company_preferences.php:54
 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: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: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:99
 msgid "The existing image could not be removed"
 msgstr ""
 
-#: admin/company_preferences.php:82
+#: ../admin/company_preferences.php:82
 msgid "Error uploading logo file"
 msgstr ""
 
-#: admin/company_preferences.php:116
+#: ../admin/company_preferences.php:116
 msgid "Company setup has been updated."
 msgstr ""
 
-#: admin/company_preferences.php:164
+#: ../admin/company_preferences.php:164
 msgid "Name (to appear on reports):"
 msgstr ""
 
-#: admin/company_preferences.php:165 admin/shipping_companies.php:142
-#: includes/ui/contacts_view.inc:109 inventory/manage/locations.php:202
-#: sales/manage/customers.php:231 sales/includes/ui/sales_order_ui.inc:643
+#: ../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:642
 msgid "Address:"
 msgstr ""
 
-#: admin/company_preferences.php:166
+#: ../admin/company_preferences.php:166
 msgid "Domicile:"
 msgstr ""
 
-#: admin/company_preferences.php:168 admin/shipping_companies.php:138
-#: purchasing/manage/suppliers.php:135 sales/manage/customer_branches.php:262
+#: ../admin/company_preferences.php:168
+#: ../admin/shipping_companies.php:138
+#: ../purchasing/manage/suppliers.php:135
+#: ../sales/manage/customer_branches.php:262
 msgid "Phone Number:"
 msgstr ""
 
-#: admin/company_preferences.php:169 includes/ui/contacts_view.inc:104
-#: purchasing/manage/suppliers.php:138 sales/manage/customer_branches.php:264
-#: sales/manage/customers.php:254
+#: ../admin/company_preferences.php:169
+#: ../includes/ui/contacts_view.inc:104
+#: ../purchasing/manage/suppliers.php:138
+#: ../sales/manage/customer_branches.php:264
+#: ../sales/manage/customers.php:257
 msgid "Fax Number:"
 msgstr ""
 
-#: admin/company_preferences.php:170 admin/users.php:202
+#: ../admin/company_preferences.php:170
+#: ../admin/users.php:202
 msgid "Email Address:"
 msgstr ""
 
-#: admin/company_preferences.php:172
+#: ../admin/company_preferences.php:172
 msgid "BCC Address for all outgoing mails:"
 msgstr ""
 
-#: admin/company_preferences.php:174
+#: ../admin/company_preferences.php:174
 msgid "Official Company Number:"
 msgstr ""
 
-#: admin/company_preferences.php:175 purchasing/manage/suppliers.php:96
-#: sales/manage/customers.php:233
+#: ../admin/company_preferences.php:175
+#: ../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 gl/gl_budget.php:63
+#: ../admin/company_preferences.php:178
+#: ../gl/gl_budget.php:63
 msgid "Fiscal Year:"
 msgstr ""
 
-#: admin/company_preferences.php:179
+#: ../admin/company_preferences.php:179
 msgid "Tax Periods:"
 msgstr ""
 
-#: admin/company_preferences.php:179
+#: ../admin/company_preferences.php:179
 msgid "Months."
 msgstr ""
 
-#: admin/company_preferences.php:180
+#: ../admin/company_preferences.php:180
 msgid "Tax Last Period:"
 msgstr ""
 
-#: admin/company_preferences.php:180
+#: ../admin/company_preferences.php:180
 msgid "Months back."
 msgstr ""
 
-#: admin/company_preferences.php:184
+#: ../admin/company_preferences.php:184
 msgid "Company Logo:"
 msgstr ""
 
-#: admin/company_preferences.php:185
+#: ../admin/company_preferences.php:185
 msgid "New Company Logo (.jpg)"
 msgstr ""
 
-#: admin/company_preferences.php:186
+#: ../admin/company_preferences.php:186
 msgid "Delete Company Logo:"
 msgstr ""
 
-#: admin/company_preferences.php:188
+#: ../admin/company_preferences.php:188
 msgid "Use Dimensions:"
 msgstr ""
 
-#: admin/company_preferences.php:189
+#: ../admin/company_preferences.php:189
 msgid "Base for auto price calculations:"
 msgstr ""
 
-#: admin/company_preferences.php:190
+#: ../admin/company_preferences.php:190
 msgid "No base price list"
 msgstr ""
 
-#: admin/company_preferences.php:191
+#: ../admin/company_preferences.php:191
 msgid "Add Price from Std Cost:"
 msgstr ""
 
-#: admin/company_preferences.php:193
+#: ../admin/company_preferences.php:193
 msgid "Round to nearest:"
 msgstr ""
 
-#: admin/company_preferences.php:196
+#: ../admin/company_preferences.php:196
 msgid "Search Item List"
 msgstr ""
 
-#: admin/company_preferences.php:197
+#: ../admin/company_preferences.php:197
 msgid "Search Customer List"
 msgstr ""
 
-#: admin/company_preferences.php:198
+#: ../admin/company_preferences.php:198
 msgid "Search Supplier List"
 msgstr ""
 
-#: admin/company_preferences.php:200
+#: ../admin/company_preferences.php:200
 msgid "Automatic Revaluation Currency Accounts"
 msgstr ""
 
-#: admin/company_preferences.php:201
+#: ../admin/company_preferences.php:201
 msgid "Time Zone on Reports"
 msgstr ""
 
-#: admin/company_preferences.php:202
+#: ../admin/company_preferences.php:202
 msgid "Login Timeout:"
 msgstr ""
 
-#: admin/company_preferences.php:202
+#: ../admin/company_preferences.php:202
 msgid "seconds"
 msgstr ""
 
-#: admin/company_preferences.php:203
+#: ../admin/company_preferences.php:203
 msgid "Version Id"
 msgstr ""
 
-#: admin/company_preferences.php:208 admin/display_prefs.php:145
-#: admin/forms_setup.php:61 admin/gl_setup.php:241 admin/inst_chart.php:74
-#: admin/inst_lang.php:103 admin/inst_module.php:137 admin/inst_module.php:155
-#: admin/inst_module.php:198 admin/inst_theme.php:96
-#: dimensions/dimension_entry.php:293 gl/gl_bank.php:406 gl/gl_budget.php:135
-#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:276
-#: gl/includes/ui/gl_journal_ui.inc:257 includes/ui/db_pager_view.inc:174
-#: includes/ui/simple_crud_class.inc:56 includes/ui/simple_crud_class.inc:227
-#: includes/ui/ui_input.inc:208 includes/ui/ui_input.inc:906
-#: inventory/adjustments.php:233 inventory/cost_update.php:138
-#: inventory/reorder_level.php:114 inventory/transfers.php:234
-#: inventory/includes/item_adjustments_ui.inc:157
-#: inventory/includes/stock_transfers_ui.inc:137
-#: inventory/manage/sales_kits.php:208
-#: manufacturing/includes/work_order_issue_ui.inc:131
-#: purchasing/po_receive_items.php:331 sales/credit_note_entry.php:284
-#: sales/customer_credit_invoice.php:380 sales/customer_delivery.php:545
-#: sales/customer_invoice.php:684 sales/includes/ui/sales_credit_ui.inc:293
-#: sales/includes/ui/sales_order_ui.inc:244
-#: sales/includes/ui/sales_order_ui.inc:562
+#: ../admin/company_preferences.php:208
+#: ../admin/display_prefs.php:145
+#: ../admin/forms_setup.php:61
+#: ../admin/gl_setup.php:241
+#: ../admin/inst_chart.php:74
+#: ../admin/inst_lang.php:103
+#: ../admin/inst_module.php:137
+#: ../admin/inst_module.php:155
+#: ../admin/inst_module.php:198
+#: ../admin/inst_theme.php:96
+#: ../dimensions/dimension_entry.php:293
+#: ../gl/gl_bank.php:416
+#: ../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
+#: ../includes/ui/db_pager_view.inc:174
+#: ../includes/ui/simple_crud_class.inc:56
+#: ../includes/ui/simple_crud_class.inc:227
+#: ../includes/ui/ui_input.inc:208
+#: ../includes/ui/ui_input.inc:906
+#: ../inventory/adjustments.php:233
+#: ../inventory/cost_update.php.orig:138
+#: ../inventory/reorder_level.php.orig:114
+#: ../inventory/transfers.php:234
+#: ../inventory/includes/item_adjustments_ui.inc:157
+#: ../inventory/includes/stock_transfers_ui.inc:137
+#: ../inventory/manage/sales_kits.php:208
+#: ../manufacturing/work_order_entry.php:459
+#: ../manufacturing/includes/work_order_issue_ui.inc:131
+#: ../purchasing/includes/ui/po_ui.inc:304
+#: ../purchasing/includes/ui/po_ui.inc:455
+#: ../purchasing/po_receive_items.php:332
+#: ../sales/credit_note_entry.php:284
+#: ../sales/customer_credit_invoice.php:380
+#: ../sales/customer_delivery.php:547
+#: ../sales/customer_invoice.php:684
+#: ../sales/inquiry/sales_orders_view.php.orig:349
+#: ../sales/includes/ui/sales_credit_ui.inc:293
+#: ../sales/includes/ui/sales_order_ui.inc:244
+#: ../sales/includes/ui/sales_order_ui.inc:561
+#: ../taxes/sav.tax_types.php:255
 msgid "Update"
 msgstr ""
 
-#: admin/create_coy.php:21
+#: ../admin/create_coy.php:21
 msgid "Create/Update Company"
 msgstr ""
 
-#: admin/create_coy.php:46 admin/create_coy.php:52
+#: ../admin/create_coy.php:46
+#: ../admin/create_coy.php:52
 msgid "Database settings are not specified."
 msgstr ""
 
-#: admin/create_coy.php:62
+#: ../admin/create_coy.php:62
 msgid "This database settings are already used by another company."
 msgstr ""
 
-#: admin/create_coy.php:67
+#: ../admin/create_coy.php:67
 msgid ""
 "You cannot have table set without prefix together with prefixed sets in the "
 "same database."
 msgstr ""
 
-#: admin/create_coy.php:127
+#: ../admin/create_coy.php:127
 msgid "Error creating Database: "
 msgstr ""
 
-#: admin/create_coy.php:127
+#: ../admin/create_coy.php:127
 msgid ", Please create it manually"
 msgstr ""
 
-#: admin/create_coy.php:131
+#: ../admin/create_coy.php:131
 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
 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
 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
 msgid "The configuration file "
 msgstr ""
 
-#: 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:153
+#: ../admin/create_coy.php:189
+#: ../admin/create_coy.php:220
+#: ../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
 msgid "New company has been created."
 msgstr ""
 
-#: admin/create_coy.php:165
+#: ../admin/create_coy.php:165
 msgid "Company has been updated."
 msgstr ""
 
-#: admin/create_coy.php:182
+#: ../admin/create_coy.php:182
 msgid ""
 "Broken company subdirectories system. You have to remove this company "
 "manually."
 msgstr ""
 
-#: admin/create_coy.php:198
+#: ../admin/create_coy.php:198
 msgid "Cannot rename subdirectory to temporary name."
 msgstr ""
 
-#: admin/create_coy.php:204
+#: ../admin/create_coy.php:204
 msgid "Cannot rename company subdirectory"
 msgstr ""
 
-#: admin/create_coy.php:210
+#: ../admin/create_coy.php:210
 msgid "Error removing Database: "
 msgstr ""
 
-#: admin/create_coy.php:210
+#: ../admin/create_coy.php:210
 msgid ", please remove it manually"
 msgstr ""
 
-#: admin/create_coy.php:229
+#: ../admin/create_coy.php:229
 msgid "Cannot remove temporary renamed company data directory "
 msgstr ""
 
-#: admin/create_coy.php:232
+#: ../admin/create_coy.php:232
 msgid "Selected company has been deleted"
 msgstr ""
 
-#: admin/create_coy.php:246
+#: ../admin/create_coy.php:246
 msgid "Are you sure you want to delete company no. "
 msgstr ""
 
-#: admin/create_coy.php:253
+#: ../admin/create_coy.php:253
 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
 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
 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
 msgid "Table Pref"
 msgstr ""
 
-#: admin/create_coy.php:254 admin/create_coy.php:351 admin/inst_lang.php:36
-#: admin/print_profiles.php:162
+#: ../admin/create_coy.php:254
+#: ../admin/create_coy.php:351
+#: ../admin/inst_lang.php:36
+#: ../admin/print_profiles.php:162
 msgid "Default"
 msgstr ""
 
-#: admin/create_coy.php:263 admin/fiscalyears.php:159 admin/inst_lang.php:85
-#: admin/inst_lang.php:97 dimensions/inquiry/search_dimensions.php:107
-#: gl/manage/bank_accounts.php:128 gl/manage/currencies.php:162
-#: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230
-#: includes/system_tests.inc:38 includes/system_tests.inc:113
-#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1677
-#: purchasing/manage/suppliers.php:122 reporting/rep102.php:113
-#: reporting/rep102.php:115 reporting/rep104.php:107 reporting/rep106.php:77
-#: reporting/rep114.php:76 reporting/rep202.php:117 reporting/rep202.php:119
-#: reporting/rep203.php:88 reporting/rep501.php:111
-#: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95
-#: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133
+#: ../admin/create_coy.php:263
+#: ../admin/fiscalyears.php:159
+#: ../admin/inst_lang.php:85
+#: ../admin/inst_lang.php:97
+#: ../dimensions/inquiry/search_dimensions.php:107
+#: ../gl/manage/bank_accounts.php:128
+#: ../gl/manage/currencies.php:162
+#: ../gl/manage/gl_account_classes.php:127
+#: ../gl/manage/gl_quick_entries.php:230
+#: ../includes/system_tests.inc:38
+#: ../includes/system_tests.inc:113
+#: ../includes/system_tests.inc:126
+#: ../includes/ui/ui_lists.inc:1680
+#: ../purchasing/manage/suppliers.php:122
+#: ../reporting/rep101.php:142
+#: ../reporting/rep102.php:113
+#: ../reporting/rep102.php:115
+#: ../reporting/rep104.php:107
+#: ../reporting/rep106.php:77
+#: ../reporting/rep114.php:76
+#: ../reporting/rep201.php:130
+#: ../reporting/rep202.php:117
+#: ../reporting/rep202.php:119
+#: ../reporting/rep203.php:88
+#: ../reporting/rep303.php:108
+#: ../reporting/rep303.php:116
+#: ../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
 msgid "The marked company is the current company which cannot be deleted."
 msgstr ""
 
-#: admin/create_coy.php:293
+#: ../admin/create_coy.php:293
 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/printers.php:84
+#: ../admin/create_coy.php:340
+#: ../admin/create_coy.php:346
+#: ../admin/printers.php:84
 msgid "Host"
 msgstr ""
 
-#: admin/create_coy.php:342
+#: ../admin/create_coy.php:342
 msgid "Database Password"
 msgstr ""
 
-#: admin/create_coy.php:344 admin/inst_chart.php:68 admin/inst_chart.php:70
-#: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:126
-#: admin/inst_theme.php:91 admin/inst_theme.php:93 admin/inst_upgrade.php:153
-#: gl/manage/gl_account_types.php:190 includes/ui/allocation_cart.inc:288
+#: ../admin/create_coy.php:344
+#: ../admin/inst_chart.php:68
+#: ../admin/inst_chart.php:70
+#: ../admin/inst_lang.php:87
+#: ../admin/inst_lang.php:90
+#: ../admin/inst_module.php:126
+#: ../admin/inst_theme.php:91
+#: ../admin/inst_theme.php:93
+#: ../admin/inst_upgrade.php:153
+#: ../gl/manage/gl_account_types.php:190
+#: ../includes/ui/allocation_cart.inc:315
+#: ../taxes/sav.tax_types.php:168
 msgid "None"
 msgstr ""
 
-#: admin/create_coy.php:355
+#: ../admin/create_coy.php:355
 msgid "Database Script"
 msgstr ""
 
-#: admin/create_coy.php:356
+#: ../admin/create_coy.php:356
 msgid "New script Admin Password"
 msgstr ""
 
-#: admin/create_coy.php:360 gl/gl_budget.php:136
+#: ../admin/create_coy.php:360
+#: ../gl/gl_budget.php:136
 msgid "Save"
 msgstr ""
 
-#: admin/create_coy.php:382
+#: ../admin/create_coy.php:382
 msgid "Create a new company"
 msgstr ""
 
-#: admin/crm_categories.php:17
+#: ../admin/crm_categories.php:17
 msgid "Contact Categories"
 msgstr ""
 
-#: admin/crm_categories.php:31
+#: ../admin/crm_categories.php:31
 msgid "Category description cannot be empty."
 msgstr ""
 
-#: admin/crm_categories.php:41
+#: ../admin/crm_categories.php:41
 msgid "Selected contact category has been updated"
 msgstr ""
 
-#: admin/crm_categories.php:47
+#: ../admin/crm_categories.php:47
 msgid "New contact category has been added"
 msgstr ""
 
-#: admin/crm_categories.php:62
+#: ../admin/crm_categories.php:71
 msgid "Cannot delete this category because there are contacts related to it."
 msgstr ""
 
-#: admin/crm_categories.php:68
+#: ../admin/crm_categories.php:77
 msgid "Category has been deleted"
 msgstr ""
 
-#: admin/crm_categories.php:88
-msgid "Type id"
+#: ../admin/crm_categories.php:97
+msgid "Category Type"
 msgstr ""
 
-#: admin/crm_categories.php:88
-msgid "Action id"
+#: ../admin/crm_categories.php:97
+msgid "Category Subtype"
 msgstr ""
 
-#: admin/crm_categories.php:88 sales/manage/customer_branches.php:295
+#: ../admin/crm_categories.php:97
+#: ../sales/manage/customer_branches.php:295
 msgid "Short Name"
 msgstr ""
 
-#: admin/crm_categories.php:135 admin/crm_categories.php:139
+#: ../admin/crm_categories.php:144
+#: ../admin/crm_categories.php:148
 msgid "Contact Category Type:"
 msgstr ""
 
-#: admin/crm_categories.php:136 admin/crm_categories.php:140
+#: ../admin/crm_categories.php:145
+#: ../admin/crm_categories.php:149
 msgid "Contact Category Subtype:"
 msgstr ""
 
-#: admin/crm_categories.php:143
+#: ../admin/crm_categories.php:152
 msgid "Category Short Name:"
 msgstr ""
 
-#: admin/crm_categories.php:144
+#: ../admin/crm_categories.php:153
 msgid "Category Description:"
 msgstr ""
 
-#: admin/display_prefs.php:16
+#: ../admin/display_prefs.php:16
 msgid "Display Setup"
 msgstr ""
 
-#: admin/display_prefs.php:30
+#: ../admin/display_prefs.php:30
 msgid "Query size must be integer and greater than zero."
 msgstr ""
 
-#: admin/display_prefs.php:60
+#: ../admin/display_prefs.php:60
 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
 msgid "Display settings have been updated."
 msgstr ""
 
-#: admin/display_prefs.php:71
+#: ../admin/display_prefs.php:71
 msgid "Decimal Places"
 msgstr ""
 
-#: admin/display_prefs.php:73
+#: ../admin/display_prefs.php:73
 msgid "Prices/Amounts:"
 msgstr ""
 
-#: admin/display_prefs.php:74
+#: ../admin/display_prefs.php:74
 msgid "Quantities:"
 msgstr ""
 
-#: admin/display_prefs.php:75
+#: ../admin/display_prefs.php:75
 msgid "Exchange Rates:"
 msgstr ""
 
-#: admin/display_prefs.php:76
+#: ../admin/display_prefs.php:76
 msgid "Percentages:"
 msgstr ""
 
-#: admin/display_prefs.php:78
+#: ../admin/display_prefs.php:78
 msgid "Dateformat and Separators"
 msgstr ""
 
-#: admin/display_prefs.php:80
+#: ../admin/display_prefs.php:80
 msgid "Dateformat:"
 msgstr ""
 
-#: admin/display_prefs.php:82
+#: ../admin/display_prefs.php:82
 msgid "Date Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:87
+#: ../admin/display_prefs.php:87
 msgid "Thousand Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:92
+#: ../admin/display_prefs.php:92
 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"
 msgstr ""
 
-#: admin/display_prefs.php:101 admin/users.php:206
+#: ../admin/display_prefs.php:101
+#: ../admin/users.php:206
 msgid "Language:"
 msgstr ""
 
-#: admin/display_prefs.php:104 applications/setup.php:42
-#: includes/sysnames.inc:94
+#: ../admin/display_prefs.php:104
+#: ../applications/setup.php:42
+#: ../includes/sysnames.inc:94
 msgid "Miscellaneous"
 msgstr ""
 
-#: admin/display_prefs.php:106
+#: ../admin/display_prefs.php:106
 msgid "Show hints for new users:"
 msgstr ""
 
-#: admin/display_prefs.php:108
+#: ../admin/display_prefs.php:108
 msgid "Show GL Information:"
 msgstr ""
 
-#: admin/display_prefs.php:110
+#: ../admin/display_prefs.php:110
 msgid "Show Item Codes:"
 msgstr ""
 
-#: admin/display_prefs.php:117
+#: ../admin/display_prefs.php:117
 msgid "Page Size:"
 msgstr ""
 
-#: admin/display_prefs.php:119
+#: ../admin/display_prefs.php:119
 msgid "Start-up Tab"
 msgstr ""
 
-#: admin/display_prefs.php:127 admin/users.php:210
+#: ../admin/display_prefs.php:127
+#: ../admin/users.php:210
 msgid "Printing profile"
 msgstr ""
 
-#: admin/display_prefs.php:128 admin/users.php:211
+#: ../admin/display_prefs.php:128
+#: ../admin/users.php:211
 msgid "Browser printing support"
 msgstr ""
 
-#: admin/display_prefs.php:130
+#: ../admin/display_prefs.php:130
 msgid "Use popup window to display reports:"
 msgstr ""
 
-#: admin/display_prefs.php:131 admin/users.php:214
+#: ../admin/display_prefs.php:131
+#: ../admin/users.php:214
 msgid "Set this option to on if your browser directly supports pdf files"
 msgstr ""
 
-#: admin/display_prefs.php:133
+#: ../admin/display_prefs.php:133
 msgid "Use icons instead of text links:"
 msgstr ""
 
-#: admin/display_prefs.php:134
+#: ../admin/display_prefs.php:134
 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
 msgid "Remember last document date:"
 msgstr ""
 
-#: admin/display_prefs.php:139
+#: ../admin/display_prefs.php:139
 msgid ""
 "If set document date is remembered on subsequent documents, otherwise "
 "default is current date"
 msgstr ""
 
-#: admin/display_prefs.php:141
+#: ../admin/display_prefs.php:141
 msgid "Transaction days:"
 msgstr ""
 
-#: admin/fiscalyears.php:25
+#: ../admin/fiscalyears.php:25
 msgid "Fiscal Years"
 msgstr ""
 
-#: admin/fiscalyears.php:34
+#: ../admin/fiscalyears.php:34
 msgid "Invalid BEGIN date in fiscal year."
 msgstr ""
 
-#: admin/fiscalyears.php:40
+#: ../admin/fiscalyears.php:40
 msgid "Invalid END date in fiscal year."
 msgstr ""
 
-#: admin/fiscalyears.php:46
+#: ../admin/fiscalyears.php:46
 msgid "Invalid BEGIN or END date in fiscal year."
 msgstr ""
 
-#: admin/fiscalyears.php:52
+#: ../admin/fiscalyears.php:52
 msgid "BEGIN date bigger than END date."
 msgstr ""
 
-#: admin/fiscalyears.php:70
+#: ../admin/fiscalyears.php:70
 msgid "Cannot CLOSE this year because there are open fiscal years before"
 msgstr ""
 
-#: admin/fiscalyears.php:81
+#: ../admin/fiscalyears.php:81
 msgid "Selected fiscal year has been updated"
 msgstr ""
 
-#: admin/fiscalyears.php:89
+#: ../admin/fiscalyears.php:89
 msgid "New fiscal year has been added"
 msgstr ""
 
-#: admin/fiscalyears.php:102
+#: ../admin/fiscalyears.php:102
 msgid "Cannot delete this fiscal year because there are fiscal years before."
 msgstr ""
 
-#: admin/fiscalyears.php:107
+#: ../admin/fiscalyears.php:107
 msgid "Cannot delete this fiscal year because the fiscal year is not closed."
 msgstr ""
 
-#: admin/fiscalyears.php:120
+#: ../admin/fiscalyears.php:120
 msgid "Selected fiscal year has been deleted"
 msgstr ""
 
-#: admin/fiscalyears.php:133
+#: ../admin/fiscalyears.php:133
 msgid ""
 "Warning: Deleting a fiscal year all transactions \n"
 "\t\tare removed and converted into relevant balances. This process is "
 "irreversible!"
 msgstr ""
 
-#: admin/fiscalyears.php:138
+#: ../admin/fiscalyears.php:138
 msgid "Fiscal Year Begin"
 msgstr ""
 
-#: admin/fiscalyears.php:138
+#: ../admin/fiscalyears.php:138
 msgid "Fiscal Year End"
 msgstr ""
 
-#: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:133
-#: dimensions/inquiry/search_dimensions.php:139 includes/ui/ui_input.inc:959
-#: includes/ui/ui_lists.inc:675 manufacturing/search_work_orders.php:108
-#: reporting/rep501.php:87 reporting/includes/excel_report.inc:234
-#: reporting/includes/pdf_report.inc:266
+#: ../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:675
+#: ../manufacturing/search_work_orders.php:108
+#: ../reporting/rep501.php:87
+#: ../reporting/rep710.php:113
+#: ../reporting/includes/excel_report.inc:234
+#: ../reporting/includes/pdf_report.inc:266
 msgid "Closed"
 msgstr ""
 
-#: admin/fiscalyears.php:168
+#: ../admin/fiscalyears.php:168
 #, php-format
 msgid ""
 "Are you sure you want to delete fiscal year %s - %s? All transactions are "
 "deleted and converted into relevant balances. Do you want to continue ?"
 msgstr ""
 
-#: admin/fiscalyears.php:176
+#: ../admin/fiscalyears.php:176
 msgid ""
 "The marked fiscal year is the current fiscal year which cannot be deleted."
 msgstr ""
 
-#: admin/fiscalyears.php:200 admin/fiscalyears.php:211
+#: ../admin/fiscalyears.php:200
+#: ../admin/fiscalyears.php:211
 msgid "Fiscal Year Begin:"
 msgstr ""
 
-#: admin/fiscalyears.php:201 admin/fiscalyears.php:212
+#: ../admin/fiscalyears.php:201
+#: ../admin/fiscalyears.php:212
 msgid "Fiscal Year End:"
 msgstr ""
 
-#: admin/fiscalyears.php:216
+#: ../admin/fiscalyears.php:216
 msgid "Is Closed:"
 msgstr ""
 
-#: admin/forms_setup.php:16
+#: ../admin/forms_setup.php:16
 msgid "Forms Setup"
 msgstr ""
 
-#: admin/forms_setup.php:36
+#: ../admin/forms_setup.php:36
 msgid "Forms settings have been updated."
 msgstr ""
 
-#: admin/forms_setup.php:46
+#: ../admin/forms_setup.php:46
 msgid "Form"
 msgstr ""
 
-#: admin/forms_setup.php:46
+#: ../admin/forms_setup.php:46
 msgid "Next Reference"
 msgstr ""
 
-#: admin/gl_setup.php:16
+#: ../admin/gl_setup.php:16
 msgid "System and General GL Setup"
 msgstr ""
 
-#: admin/gl_setup.php:30
+#: ../admin/gl_setup.php:30
 msgid "The delivery over-receive allowance must be between 0 and 100."
 msgstr ""
 
-#: admin/gl_setup.php:37
+#: ../admin/gl_setup.php:37
 msgid "The invoice over-charge allowance must be between 0 and 100."
 msgstr ""
 
-#: admin/gl_setup.php:44
+#: ../admin/gl_setup.php:44
 msgid "The past due days interval allowance must be between 0 and 100."
 msgstr ""
 
-#: admin/gl_setup.php:52
+#: ../admin/gl_setup.php:52
 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
 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
 msgid "The general GL setup has been updated."
 msgstr ""
 
-#: admin/gl_setup.php:144
+#: ../admin/gl_setup.php:144
 msgid "General GL"
 msgstr ""
 
-#: admin/gl_setup.php:146
+#: ../admin/gl_setup.php:146
 msgid "Past Due Days Interval:"
 msgstr ""
 
-#: admin/gl_setup.php:146 admin/gl_setup.php:186 admin/gl_setup.php:194
-#: admin/gl_setup.php:212 admin/gl_setup.php:234 admin/payment_terms.php:140
+#: ../admin/gl_setup.php:146
+#: ../admin/gl_setup.php:186
+#: ../admin/gl_setup.php:194
+#: ../admin/gl_setup.php:212
+#: ../admin/gl_setup.php:234
+#: ../admin/payment_terms.php:140
 msgid "days"
 msgstr ""
 
-#: admin/gl_setup.php:148
+#: ../admin/gl_setup.php:148
 msgid "Retained Earnings:"
 msgstr ""
 
-#: admin/gl_setup.php:150
+#: ../admin/gl_setup.php:150
 msgid "Profit/Loss Year:"
 msgstr ""
 
-#: admin/gl_setup.php:152
+#: ../admin/gl_setup.php:152
 msgid "Exchange Variances Account:"
 msgstr ""
 
-#: admin/gl_setup.php:154 gl/manage/bank_accounts.php:193
+#: ../admin/gl_setup.php:154
+#: ../gl/manage/bank_accounts.php:193
 msgid "Bank Charges Account:"
 msgstr ""
 
-#: admin/gl_setup.php:156
+#: ../admin/gl_setup.php:156
 msgid "Tax Algorithm:"
 msgstr ""
 
-#: admin/gl_setup.php:160
+#: ../admin/gl_setup.php:160
 msgid "Customers and Sales"
 msgstr ""
 
-#: admin/gl_setup.php:162
+#: ../admin/gl_setup.php:162
 msgid "Default Credit Limit:"
 msgstr ""
 
-#: admin/gl_setup.php:164
+#: ../admin/gl_setup.php:164
 msgid "Accumulate batch shipping:"
 msgstr ""
 
-#: admin/gl_setup.php:166
+#: ../admin/gl_setup.php:166
 msgid "Legal Text on Invoice:"
 msgstr ""
 
-#: admin/gl_setup.php:168
+#: ../admin/gl_setup.php:168
 msgid "Shipping Charged Account:"
 msgstr ""
 
-#: admin/gl_setup.php:170
+#: ../admin/gl_setup.php:170
 msgid "Deferred Income Account:"
 msgstr ""
 
-#: admin/gl_setup.php:171
+#: ../admin/gl_setup.php:171
 msgid "Not used"
 msgstr ""
 
-#: admin/gl_setup.php:175
+#: ../admin/gl_setup.php:175
 msgid "Customers and Sales Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:177
+#: ../admin/gl_setup.php:177
 msgid "Receivable Account:"
 msgstr ""
 
-#: admin/gl_setup.php:179 admin/gl_setup.php:220
-#: inventory/manage/item_categories.php:196
-#: sales/manage/customer_branches.php:251
+#: ../admin/gl_setup.php:179
+#: ../admin/gl_setup.php:220
+#: ../inventory/manage/item_categories.php:196
+#: ../inventory/manage/items.php:365
+#: ../sales/manage/customer_branches.php:251
 msgid "Sales Account:"
 msgstr ""
 
-#: admin/gl_setup.php:182 sales/manage/customer_branches.php:252
+#: ../admin/gl_setup.php:182
+#: ../sales/manage/customer_branches.php:252
 msgid "Sales Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:184 sales/manage/customer_branches.php:254
+#: ../admin/gl_setup.php:184
+#: ../sales/manage/customer_branches.php:254
 msgid "Prompt Payment Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:186
+#: ../admin/gl_setup.php:186
 msgid "Delivery Required By:"
 msgstr ""
 
-#: admin/gl_setup.php:192
+#: ../admin/gl_setup.php:192
 msgid "Dimension Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:194
+#: ../admin/gl_setup.php:194
 msgid "Dimension Required By After:"
 msgstr ""
 
-#: admin/gl_setup.php:198
+#: ../admin/gl_setup.php:198
 msgid "Suppliers and Purchasing"
 msgstr ""
 
-#: admin/gl_setup.php:200
+#: ../admin/gl_setup.php:200
 msgid "Delivery Over-Receive Allowance:"
 msgstr ""
 
-#: admin/gl_setup.php:202
+#: ../admin/gl_setup.php:202
 msgid "Invoice Over-Charge Allowance:"
 msgstr ""
 
-#: admin/gl_setup.php:204
+#: ../admin/gl_setup.php:204
 msgid "Suppliers and Purchasing Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:206
+#: ../admin/gl_setup.php:206
 msgid "Payable Account:"
 msgstr ""
 
-#: admin/gl_setup.php:208 purchasing/manage/suppliers.php:132
+#: ../admin/gl_setup.php:208
+#: ../purchasing/manage/suppliers.php:132
 msgid "Purchase Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:210
+#: ../admin/gl_setup.php:210
 msgid "GRN Clearing Account:"
 msgstr ""
 
-#: admin/gl_setup.php:210
+#: ../admin/gl_setup.php:210
 msgid "No postings on GRN"
 msgstr ""
 
-#: admin/gl_setup.php:212
+#: ../admin/gl_setup.php:212
 msgid "Receival Required By:"
 msgstr ""
 
-#: admin/gl_setup.php:214
+#: ../admin/gl_setup.php:214
+#: ../reporting/reports_main.php:206
 msgid "Inventory"
 msgstr ""
 
-#: admin/gl_setup.php:216
+#: ../admin/gl_setup.php:216
 msgid "Allow Negative Inventory:"
 msgstr ""
 
-#: admin/gl_setup.php:217
+#: ../admin/gl_setup.php:217
 msgid "Warning:  This may cause a delay in GL postings"
 msgstr ""
 
-#: admin/gl_setup.php:219
+#: ../admin/gl_setup.php:219
 msgid "Items Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:222 inventory/manage/item_categories.php:206
+#: ../admin/gl_setup.php:222
+#: ../inventory/manage/item_categories.php:206
+#: ../inventory/manage/items.php:369
 msgid "Inventory Account:"
 msgstr ""
 
-#: admin/gl_setup.php:224 inventory/manage/item_categories.php:200
-#: inventory/manage/item_categories.php:208
+#: ../admin/gl_setup.php:224
+#: ../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:226 inventory/manage/item_categories.php:209
+#: ../admin/gl_setup.php:226
+#: ../inventory/manage/item_categories.php:209
+#: ../inventory/manage/items.php:371
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
-#: admin/gl_setup.php:228 inventory/manage/item_categories.php:213
+#: ../admin/gl_setup.php:228
+#: ../inventory/manage/item_categories.php:213
+#: ../inventory/manage/items.php:382
 msgid "Item Assembly Costs Account:"
 msgstr ""
 
-#: admin/gl_setup.php:232
+#: ../admin/gl_setup.php:232
 msgid "Manufacturing Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:234
+#: ../admin/gl_setup.php:234
 msgid "Work Order Required By After:"
 msgstr ""
 
-#: admin/inst_chart.php:20
+#: ../admin/inst_chart.php:20
 msgid "Install Charts of Accounts"
 msgstr ""
 
-#: admin/inst_chart.php:35
+#: ../admin/inst_chart.php:35
 msgid "Selected chart has been successfully deleted"
 msgstr ""
 
-#: admin/inst_chart.php:50
+#: ../admin/inst_chart.php:50
 msgid "Chart"
 msgstr ""
 
-#: admin/inst_chart.php:50 admin/inst_lang.php:36 admin/inst_module.php:105
-#: admin/inst_theme.php:74 admin/inst_upgrade.php:159
+#: ../admin/inst_chart.php:50
+#: ../admin/inst_lang.php:36
+#: ../admin/inst_module.php:105
+#: ../admin/inst_theme.php:74
+#: ../admin/inst_upgrade.php:159
 msgid "Installed"
 msgstr ""
 
-#: admin/inst_chart.php:50 admin/inst_lang.php:36 admin/inst_module.php:105
-#: admin/inst_theme.php:74 inventory/inquiry/stock_status.php:71
+#: ../admin/inst_chart.php:50
+#: ../admin/inst_lang.php:36
+#: ../admin/inst_module.php:105
+#: ../admin/inst_theme.php:74
+#: ../inventory/inquiry/stock_status.php:71
+#: ../reporting/rep303.php:114
 msgid "Available"
 msgstr ""
 
-#: admin/inst_chart.php:50 admin/inst_lang.php:35 admin/inst_lang.php:218
+#: ../admin/inst_chart.php:50
+#: ../admin/inst_lang.php:35
+#: ../admin/inst_lang.php:218
 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
-#: includes/sysnames.inc:193
+#: ../admin/inst_chart.php:69
+#: ../admin/inst_chart.php:71
+#: ../admin/inst_lang.php:88
+#: ../admin/inst_module.php:127
+#: ../admin/inst_module.php:128
+#: ../admin/inst_theme.php:92
+#: ../includes/sysnames.inc:193
 msgid "Unknown"
 msgstr ""
 
-#: admin/inst_chart.php:74 admin/inst_lang.php:103 admin/inst_module.php:132
-#: admin/inst_module.php:137 admin/inst_theme.php:96
-#: admin/inst_upgrade.php:141
+#: ../admin/inst_chart.php:74
+#: ../admin/inst_lang.php:103
+#: ../admin/inst_module.php:132
+#: ../admin/inst_module.php:137
+#: ../admin/inst_theme.php:96
+#: ../admin/inst_upgrade.php:141
 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
 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
 #, php-format
 msgid ""
 "You are about to remove package \\'%s\\'.\n"
 "Do you want to continue ?"
 msgstr ""
 
-#: admin/inst_lang.php:23
+#: ../admin/inst_lang.php:23
 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:265
-#: purchasing/includes/ui/invoice_ui.inc:267
-#: purchasing/includes/ui/invoice_ui.inc:269 reporting/rep501.php:87
-#: reporting/rep709.php:111 reporting/rep709.php:112
-#: sales/manage/customer_branches.php:296 sales/manage/sales_people.php:99
-#: taxes/item_tax_types.php:117
+#: ../admin/inst_lang.php:35
+#: ../admin/printers.php:84
+#: ../admin/shipping_companies.php:91
+#: ../dimensions/dimension_entry.php:271
+#: ../dimensions/inquiry/search_dimensions.php:129
+#: ../dimensions/view/view_dimension.php:55
+#: ../inventory/manage/item_categories.php:98
+#: ../manufacturing/manage/work_centres.php:101
+#: ../purchasing/includes/ui/invoice_ui.inc:280
+#: ../purchasing/includes/ui/invoice_ui.inc:282
+#: ../purchasing/includes/ui/invoice_ui.inc:284
+#: ../reporting/rep501.php:87
+#: ../reporting/rep709.php:111
+#: ../reporting/rep709.php:112
+#: ../sales/manage/customer_branches.php:296
+#: ../sales/manage/sales_people.php:99
+#: ../taxes/item_tax_types.php:117
 msgid "Name"
 msgstr ""
 
-#: admin/inst_lang.php:35 admin/inst_lang.php:220
+#: ../admin/inst_lang.php:35
+#: ../admin/inst_lang.php:220
 msgid "Right To Left"
 msgstr ""
 
-#: admin/inst_lang.php:47
+#: ../admin/inst_lang.php:47
 msgid "Supported"
 msgstr ""
 
-#: admin/inst_lang.php:49
+#: ../admin/inst_lang.php:49
 msgid "Display also languages not supported by server locales"
 msgstr ""
 
-#: admin/inst_lang.php:100
+#: ../admin/inst_lang.php:100
 msgid "Edit non standard language configuration"
 msgstr ""
 
-#: admin/inst_lang.php:104
+#: ../admin/inst_lang.php:104
 msgid "Upload and install latest language package"
 msgstr ""
 
-#: admin/inst_lang.php:111
+#: ../admin/inst_lang.php:111
 #, php-format
 msgid ""
 "You are about to remove language \\'%s\\'.\n"
 "Do you want to continue ?"
 msgstr ""
 
-#: admin/inst_lang.php:118
+#: ../admin/inst_lang.php:118
 msgid "The marked language is the current language which cannot be deleted."
 msgstr ""
 
-#: admin/inst_lang.php:120
+#: ../admin/inst_lang.php:120
 msgid "Update default"
 msgstr ""
 
-#: admin/inst_lang.php:122
+#: ../admin/inst_lang.php:122
 msgid "Add new language manually"
 msgstr ""
 
-#: admin/inst_lang.php:135
+#: ../admin/inst_lang.php:135
 msgid "Language name, code nor encoding cannot be empty"
 msgstr ""
 
-#: admin/inst_lang.php:140
+#: ../admin/inst_lang.php:140
 msgid ""
 "Standard package for this language is already installed. If you want to "
 "install this language manually, uninstall standard language package first."
 msgstr ""
 
-#: admin/inst_lang.php:216
+#: ../admin/inst_lang.php:216
 msgid "Language Code"
 msgstr ""
 
-#: admin/inst_lang.php:217
+#: ../admin/inst_lang.php:217
 msgid "Language Name"
 msgstr ""
 
-#: admin/inst_lang.php:221
+#: ../admin/inst_lang.php:221
 msgid "Default Language"
 msgstr ""
 
-#: admin/inst_lang.php:223 admin/inst_lang.php:224
+#: ../admin/inst_lang.php:223
+#: ../admin/inst_lang.php:224
 msgid "Language File"
 msgstr ""
 
-#: admin/inst_lang.php:227
+#: ../admin/inst_lang.php:227
 msgid "Select your language files from your local harddisk."
 msgstr ""
 
-#: admin/inst_module.php:20
+#: ../admin/inst_module.php:20
 msgid "Install/Activate extensions"
 msgstr ""
 
-#: admin/inst_module.php:78
+#: ../admin/inst_module.php:78
 msgid "Selected extension has been successfully deleted"
 msgstr ""
 
-#: admin/inst_module.php:104 admin/inst_module.php:168
+#: ../admin/inst_module.php:104
+#: ../admin/inst_module.php:168
 msgid "Extension"
 msgstr ""
 
-#: admin/inst_module.php:104 admin/inst_module.php:168
+#: ../admin/inst_module.php:104
+#: ../admin/inst_module.php:168
 msgid "Modules provided"
 msgstr ""
 
-#: admin/inst_module.php:104 admin/inst_module.php:168
+#: ../admin/inst_module.php:104
+#: ../admin/inst_module.php:168
 msgid "Options provided"
 msgstr ""
 
-#: admin/inst_module.php:132
+#: ../admin/inst_module.php:132
 msgid "Install third-party extension."
 msgstr ""
 
-#: admin/inst_module.php:168 includes/ui/ui_lists.inc:675
-#: includes/ui/ui_lists.inc:2157 reporting/includes/excel_report.inc:232
-#: reporting/includes/pdf_report.inc:264
+#: ../admin/inst_module.php:168
+#: ../includes/ui/ui_lists.inc:675
+#: ../includes/ui/ui_lists.inc:2160
+#: ../reporting/includes/excel_report.inc:232
+#: ../reporting/includes/pdf_report.inc:264
 msgid "Active"
 msgstr ""
 
-#: admin/inst_module.php:231
+#: ../admin/inst_module.php:231
 msgid "Status change for some extensions failed."
 msgstr ""
 
-#: admin/inst_module.php:234
+#: ../admin/inst_module.php:234
 msgid "Current active extensions set has been saved."
 msgstr ""
 
-#: admin/inst_module.php:256
+#: ../admin/inst_module.php:256
 msgid "Extensions:"
 msgstr ""
 
-#: admin/inst_theme.php:20
+#: ../admin/inst_theme.php:20
 msgid "Install Themes"
 msgstr ""
 
-#: admin/inst_theme.php:59
+#: ../admin/inst_theme.php:59
 msgid "Selected theme has been successfully deleted"
 msgstr ""
 
-#: admin/inst_theme.php:74
+#: ../admin/inst_theme.php:74
 msgid "Theme"
 msgstr ""
 
-#: admin/inst_upgrade.php:16
+#: ../admin/inst_upgrade.php:16
 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..."
 msgstr ""
 
-#: admin/inst_upgrade.php:83
+#: ../admin/inst_upgrade.php:83
 msgid "Database upgrade finished."
 msgstr ""
 
-#: admin/inst_upgrade.php:86
+#: ../admin/inst_upgrade.php:86
 msgid ""
 "Upgrade cannot be done because database has been already partially upgraded. "
 "Please downgrade database to clean previous version or try forced upgrade."
 msgstr ""
 
-#: admin/inst_upgrade.php:104
+#: ../admin/inst_upgrade.php:104
 msgid "Cannot connect to database for company"
 msgstr ""
 
-#: admin/inst_upgrade.php:117
+#: ../admin/inst_upgrade.php:117
 #, php-format
 msgid "Database upgrade to version %s failed for company '%s'."
 msgstr ""
 
-#: admin/inst_upgrade.php:120
+#: ../admin/inst_upgrade.php:120
 msgid "You should restore company database from latest backup file"
 msgstr ""
 
-#: admin/inst_upgrade.php:133
+#: ../admin/inst_upgrade.php:133
 msgid "All companies data has been successfully updated"
 msgstr ""
 
-#: admin/inst_upgrade.php:141
+#: ../admin/inst_upgrade.php:141
 msgid "Sql file"
 msgstr ""
 
-#: admin/inst_upgrade.php:142
+#: ../admin/inst_upgrade.php:142
 msgid "Force upgrade"
 msgstr ""
 
-#: admin/inst_upgrade.php:165
+#: ../admin/inst_upgrade.php:165
 #, php-format
 msgid "Partially installed (%s)"
 msgstr ""
 
-#: admin/inst_upgrade.php:174
+#: ../admin/inst_upgrade.php:174
 msgid ""
 "Database upgrades marked as partially installed cannot be installed "
 "automatically.\n"
@@ -1536,2631 +1836,3198 @@ msgid ""
 "upgrade."
 msgstr ""
 
-#: admin/inst_upgrade.php:178
+#: ../admin/inst_upgrade.php:178
 msgid "Upgrade system"
 msgstr ""
 
-#: admin/inst_upgrade.php:178
+#: ../admin/inst_upgrade.php:178
 msgid "Save database and perform upgrade"
 msgstr ""
 
-#: admin/payment_terms.php:16 reporting/includes/doctext.inc:41
-#: sales/view/view_invoice.php:76 sales/view/view_sales_order.php:82
-#: sales/view/view_sales_order.php:90
+#: ../admin/payment_terms.php:16
+#: ../reporting/includes/doctext.inc:41
+#: ../sales/view/view_invoice.php:76
+#: ../sales/view/view_sales_order.php:82
+#: ../sales/view/view_sales_order.php:90
 msgid "Payment Terms"
 msgstr ""
 
-#: admin/payment_terms.php:51
+#: ../admin/payment_terms.php:51
 msgid "The number of days or the day in the following month must be numeric."
 msgstr ""
 
-#: admin/payment_terms.php:57
+#: ../admin/payment_terms.php:57
 msgid "The Terms description must be entered."
 msgstr ""
 
-#: admin/payment_terms.php:77
+#: ../admin/payment_terms.php:77
 msgid "Selected payment terms have been updated"
 msgstr ""
 
-#: admin/payment_terms.php:82
+#: ../admin/payment_terms.php:82
 msgid "New payment terms have been added"
 msgstr ""
 
-#: admin/payment_terms.php:95
+#: ../admin/payment_terms.php:95
 msgid ""
 "Cannot delete this payment term, because customer accounts have been created "
 "referring to this term."
 msgstr ""
 
-#: admin/payment_terms.php:101
+#: ../admin/payment_terms.php:101
 msgid ""
 "Cannot delete this payment term, because supplier accounts have been created "
 "referring to this term"
 msgstr ""
 
-#: admin/payment_terms.php:107
+#: ../admin/payment_terms.php:107
 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:231
-#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
-#: gl/inquiry/journal_inquiry.php:129 gl/inquiry/tax_inquiry.php:82
-#: gl/manage/bank_accounts.php:109 gl/manage/gl_quick_entries.php:186
-#: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:92
-#: includes/ui/ui_view.inc:489 inventory/inquiry/stock_movements.php:78
-#: inventory/manage/item_categories.php:98
-#: manufacturing/search_work_orders.php:161
-#: manufacturing/view/wo_costs_view.php:46
-#: manufacturing/includes/manufacturing_ui.inc:236
-#: manufacturing/includes/manufacturing_ui.inc:276
-#: manufacturing/includes/manufacturing_ui.inc:280
-#: manufacturing/includes/manufacturing_ui.inc:331
-#: purchasing/inquiry/supplier_allocation_inquiry.php:125
-#: purchasing/inquiry/supplier_inquiry.php:173 reporting/rep102.php:134
-#: reporting/rep202.php:139 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:107
-#: reporting/rep710.php:78 reporting/rep710.php:86
-#: reporting/includes/doctext.inc:162 reporting/includes/doctext.inc:203
-#: reporting/includes/doctext.inc:222
-#: sales/inquiry/customer_allocation_inquiry.php:143
-#: sales/inquiry/customer_inquiry.php:200
+#: ../admin/payment_terms.php:127
+#: ../dimensions/dimension_entry.php:275
+#: ../dimensions/inquiry/search_dimensions.php:75
+#: ../dimensions/inquiry/search_dimensions.php:130
+#: ../dimensions/view/view_dimension.php:55
+#: ../gl/bank_account_reconcile.php:231
+#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/gl_account_inquiry.php:126
+#: ../gl/inquiry/journal_inquiry.php:129
+#: ../gl/inquiry/tax_inquiry.php:82
+#: ../gl/manage/bank_accounts.php:109
+#: ../gl/manage/gl_quick_entries.php:186
+#: ../gl/view/accrual_trans.php:52
+#: ../gl/includes/ui/gl_bank_ui.inc:93
+#: ../includes/ui/ui_view.inc:547
+#: ../inventory/inquiry/stock_movements.php:78
+#: ../inventory/manage/item_categories.php:98
+#: ../manufacturing/search_work_orders.php:161
+#: ../manufacturing/view/wo_costs_view.php:46
+#: ../manufacturing/includes/manufacturing_ui.inc:236
+#: ../manufacturing/includes/manufacturing_ui.inc:276
+#: ../manufacturing/includes/manufacturing_ui.inc:280
+#: ../manufacturing/includes/manufacturing_ui.inc:331
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:126
+#: ../purchasing/inquiry/supplier_inquiry.php:173
+#: ../reporting/rep102.php:134
+#: ../reporting/rep202.php:139
+#: ../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:107
+#: ../reporting/rep710.php:78
+#: ../reporting/rep710.php:86
+#: ../reporting/includes/doctext.inc:162
+#: ../reporting/includes/doctext.inc:203
+#: ../reporting/includes/doctext.inc:222
+#: ../sales/inquiry/customer_allocation_inquiry.php:144
+#: ../sales/inquiry/customer_inquiry.php:200
 msgid "Type"
 msgstr ""
 
-#: admin/payment_terms.php:127
+#: ../admin/payment_terms.php:127
 msgid "Due After/Days"
 msgstr ""
 
-#: admin/payment_terms.php:140 admin/void_transaction.php:125
+#: ../admin/payment_terms.php:140
+#: ../admin/void_transaction.php:125
 msgid "N/A"
 msgstr ""
 
-#: admin/payment_terms.php:174
+#: ../admin/payment_terms.php:174
 msgid "Terms Description:"
 msgstr ""
 
-#: admin/payment_terms.php:176
+#: ../admin/payment_terms.php:176
 msgid "Payment type:"
 msgstr ""
 
-#: admin/payment_terms.php:179
+#: ../admin/payment_terms.php:179
 msgid "Days (Or Day In Following Month):"
 msgstr ""
 
-#: admin/printers.php:16
+#: ../admin/printers.php:16
 msgid "Printer Locations"
 msgstr ""
 
-#: admin/printers.php:31
+#: ../admin/printers.php:31
 msgid "Printer name cannot be empty."
 msgstr ""
 
-#: admin/printers.php:36
+#: ../admin/printers.php:36
 msgid "You have selected printing to server at user IP."
 msgstr ""
 
-#: admin/printers.php:41
+#: ../admin/printers.php:41
 msgid "Timeout cannot be less than zero nor longer than 60 (sec)."
 msgstr ""
 
-#: admin/printers.php:52
+#: ../admin/printers.php:52
 msgid "New printer definition has been created"
 msgstr ""
 
-#: admin/printers.php:53
+#: ../admin/printers.php:53
 msgid "Selected printer definition has been updated"
 msgstr ""
 
-#: admin/printers.php:64
+#: ../admin/printers.php:64
 msgid ""
 "Cannot delete this printer definition, because print profile have been "
 "created using it."
 msgstr ""
 
-#: admin/printers.php:69
+#: ../admin/printers.php:69
 msgid "Selected printer definition has been deleted"
 msgstr ""
 
-#: admin/printers.php:84 admin/printers.php:136
+#: ../admin/printers.php:84
+#: ../admin/printers.php:136
 msgid "Printer Queue"
 msgstr ""
 
-#: admin/printers.php:132
+#: ../admin/printers.php:132
 msgid "Printer Name"
 msgstr ""
 
-#: admin/printers.php:133
+#: ../admin/printers.php:133
 msgid "Printer Description"
 msgstr ""
 
-#: admin/printers.php:134
+#: ../admin/printers.php:134
 msgid "Host name or IP"
 msgstr ""
 
-#: admin/printers.php:135
+#: ../admin/printers.php:135
 msgid "Port"
 msgstr ""
 
-#: admin/printers.php:137
+#: ../admin/printers.php:137
 msgid "Timeout"
 msgstr ""
 
-#: admin/print_profiles.php:18
+#: ../admin/print_profiles.php:18
 msgid "Printing Profiles"
 msgstr ""
 
-#: admin/print_profiles.php:33
+#: ../admin/print_profiles.php:33
 msgid "Default printing destination"
 msgstr ""
 
-#: admin/print_profiles.php:91
+#: ../admin/print_profiles.php:91
 msgid "Printing profile name cannot be empty."
 msgstr ""
 
-#: admin/print_profiles.php:107
+#: ../admin/print_profiles.php:107
 msgid "New printing profile has been created"
 msgstr ""
 
-#: admin/print_profiles.php:110
+#: ../admin/print_profiles.php:110
 msgid "Printing profile has been updated"
 msgstr ""
 
-#: admin/print_profiles.php:119
+#: ../admin/print_profiles.php:119
 msgid "Selected printing profile has been deleted"
 msgstr ""
 
-#: admin/print_profiles.php:130
+#: ../admin/print_profiles.php:130
 msgid "Select printing profile"
 msgstr ""
 
-#: admin/print_profiles.php:131
+#: ../admin/print_profiles.php:131
 msgid "New printing profile"
 msgstr ""
 
-#: admin/print_profiles.php:136 admin/print_profiles.php:138
+#: ../admin/print_profiles.php:136
+#: ../admin/print_profiles.php:138
 msgid "Printing Profile Name"
 msgstr ""
 
-#: admin/print_profiles.php:148
+#: ../admin/print_profiles.php:148
 msgid "Report Id"
 msgstr ""
 
-#: admin/print_profiles.php:148
+#: ../admin/print_profiles.php:148
 msgid "Printer"
 msgstr ""
 
-#: admin/print_profiles.php:162
+#: ../admin/print_profiles.php:162
 msgid "Browser support"
 msgstr ""
 
-#: admin/print_profiles.php:169
+#: ../admin/print_profiles.php:169
 msgid "no title was found in this report definition file."
 msgstr ""
 
-#: admin/print_profiles.php:175
+#: ../admin/print_profiles.php:175
 msgid "Add New Profile"
 msgstr ""
 
-#: admin/print_profiles.php:177
+#: ../admin/print_profiles.php:177
 msgid "Update Profile"
 msgstr ""
 
-#: admin/print_profiles.php:178
+#: ../admin/print_profiles.php:178
 msgid "Update printer profile"
 msgstr ""
 
-#: admin/print_profiles.php:179
+#: ../admin/print_profiles.php:179
 msgid "Delete Profile"
 msgstr ""
 
-#: admin/print_profiles.php:180
+#: ../admin/print_profiles.php:180
 msgid "Delete printer profile (only if not used by any user)"
 msgstr ""
 
-#: admin/security_roles.php:18
+#: ../admin/security_roles.php:18
 msgid "Access setup"
 msgstr ""
 
-#: admin/security_roles.php:63
+#: ../admin/security_roles.php:63
 msgid "Role description cannot be empty."
 msgstr ""
 
-#: admin/security_roles.php:69
+#: ../admin/security_roles.php:69
 msgid "Role name cannot be empty."
 msgstr ""
 
-#: admin/security_roles.php:76
+#: ../admin/security_roles.php:76
 msgid ""
 "Access level edition in Company setup section have to be enabled for your "
 "account."
 msgstr ""
 
-#: admin/security_roles.php:105
+#: ../admin/security_roles.php:105
 msgid "New security role has been added."
 msgstr ""
 
-#: admin/security_roles.php:113
+#: ../admin/security_roles.php:113
 msgid "Security role has been updated."
 msgstr ""
 
-#: admin/security_roles.php:126
+#: ../admin/security_roles.php:126
 msgid "This role is currently assigned to some users and cannot be deleted"
 msgstr ""
 
-#: admin/security_roles.php:129
+#: ../admin/security_roles.php:129
 msgid "Security role has been sucessfully deleted."
 msgstr ""
 
-#: admin/security_roles.php:178
+#: ../admin/security_roles.php:178
 msgid "Role:"
 msgstr ""
 
-#: admin/security_roles.php:180 gl/manage/gl_accounts.php:198
-#: sales/manage/customers.php:326
+#: ../admin/security_roles.php:180
+#: ../gl/manage/gl_accounts.php:198
+#: ../inventory/manage/items.php:444
+#: ../purchasing/manage/suppliers.php:291
+#: ../sales/manage/customers.php:329
 msgid "Show inactive:"
 msgstr ""
 
-#: admin/security_roles.php:195
+#: ../admin/security_roles.php:195
 msgid "Role name:"
 msgstr ""
 
-#: admin/security_roles.php:196
+#: ../admin/security_roles.php:196
 msgid "Role description:"
 msgstr ""
 
-#: admin/security_roles.php:197
+#: ../admin/security_roles.php:197
 msgid "Current status:"
 msgstr ""
 
-#: admin/security_roles.php:221
+#: ../admin/security_roles.php:221
 msgid "On/off set of features"
 msgstr ""
 
-#: admin/security_roles.php:240 admin/security_roles.php:246
+#: ../admin/security_roles.php:240
+#: ../admin/security_roles.php:246
 msgid "Update view"
 msgstr ""
 
-#: admin/security_roles.php:241
+#: ../admin/security_roles.php:241
 msgid "Insert New Role"
 msgstr ""
 
-#: admin/security_roles.php:245
+#: ../admin/security_roles.php:245
 msgid "Save Role"
 msgstr ""
 
-#: admin/security_roles.php:247
+#: ../admin/security_roles.php:247
 msgid "Clone This Role"
 msgstr ""
 
-#: admin/security_roles.php:248
+#: ../admin/security_roles.php:248
 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:278
-#: gl/includes/ui/gl_journal_ui.inc:259 includes/ui/simple_crud_class.inc:58
-#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_controls.inc:594
-#: includes/ui/ui_input.inc:211 inventory/includes/item_adjustments_ui.inc:159
-#: inventory/includes/stock_transfers_ui.inc:139
-#: manufacturing/includes/work_order_issue_ui.inc:133
-#: sales/includes/ui/sales_credit_ui.inc:295
-#: sales/includes/ui/sales_order_ui.inc:564
+#: ../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
+#: ../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
+#: ../inventory/includes/item_adjustments_ui.inc:159
+#: ../inventory/includes/stock_transfers_ui.inc:139
+#: ../inventory/manage/items.php:427
+#: ../manufacturing/includes/work_order_issue_ui.inc:133
+#: ../purchasing/includes/ui/po_ui.inc:457
+#: ../sales/includes/ui/sales_credit_ui.inc:295
+#: ../sales/includes/ui/sales_order_ui.inc:563
+#: ../taxes/sav.tax_types.php:173
+#: ../taxes/sav.tax_types.php:253
+#: ../taxes/sav.tax_types.php:256
 msgid "Cancel"
 msgstr ""
 
-#: admin/security_roles.php:249
+#: ../admin/security_roles.php:249
+#: ../inventory/manage/items.php:427
 msgid "Cancel Edition"
 msgstr ""
 
-#: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:254
-#: sales/customer_delivery.php:382 sales/customer_invoice.php:488
-#: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92
-#: sales/view/view_invoice.php:92
+#: ../admin/shipping_companies.php:15
+#: ../sales/customer_credit_invoice.php:254
+#: ../sales/customer_delivery.php:382
+#: ../sales/customer_invoice.php:488
+#: ../sales/view/view_credit.php:74
+#: ../sales/view/view_dispatch.php:92
+#: ../sales/view/view_invoice.php:92
 msgid "Shipping Company"
 msgstr ""
 
-#: admin/shipping_companies.php:26
+#: ../admin/shipping_companies.php:26
 msgid "The shipping company name cannot be empty."
 msgstr ""
 
-#: admin/shipping_companies.php:37
+#: ../admin/shipping_companies.php:37
 msgid "New shipping company has been added"
 msgstr ""
 
-#: admin/shipping_companies.php:46
+#: ../admin/shipping_companies.php:46
 msgid "Selected shipping company has been updated"
 msgstr ""
 
-#: admin/shipping_companies.php:59
+#: ../admin/shipping_companies.php:59
 msgid ""
 "Cannot delete this shipping company because sales orders have been created "
 "using this shipper."
 msgstr ""
 
-#: admin/shipping_companies.php:67
+#: ../admin/shipping_companies.php:67
 msgid ""
 "Cannot delete this shipping company because invoices have been created using "
 "this shipping company."
 msgstr ""
 
-#: admin/shipping_companies.php:72
+#: ../admin/shipping_companies.php:72
 msgid "Selected shipping company has been deleted"
 msgstr ""
 
-#: admin/shipping_companies.php:91
+#: ../admin/shipping_companies.php:91
 msgid "Contact Person"
 msgstr ""
 
-#: admin/shipping_companies.php:91
+#: ../admin/shipping_companies.php:91
 msgid "Phone Number"
 msgstr ""
 
-#: admin/shipping_companies.php:91 inventory/manage/locations.php:146
+#: ../admin/shipping_companies.php:91
+#: ../inventory/manage/locations.php:146
 msgid "Secondary Phone"
 msgstr ""
 
-#: admin/shipping_companies.php:91 inventory/manage/locations.php:146
+#: ../admin/shipping_companies.php:91
+#: ../inventory/manage/locations.php:146
 msgid "Address"
 msgstr ""
 
-#: admin/shipping_companies.php:134 gl/manage/gl_account_types.php:188
-#: gl/includes/ui/gl_bank_ui.inc:56 manufacturing/manage/work_centres.php:137
+#: ../admin/shipping_companies.php:134
+#: ../gl/manage/gl_account_types.php:188
+#: ../gl/includes/ui/gl_bank_ui.inc:57
+#: ../inventory/manage/items.php:307
+#: ../manufacturing/manage/work_centres.php:137
 msgid "Name:"
 msgstr ""
 
-#: admin/shipping_companies.php:136 sales/manage/customer_branches.php:261
+#: ../admin/shipping_companies.php:136
+#: ../sales/manage/customer_branches.php:261
 msgid "Contact Person:"
 msgstr ""
 
-#: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:103
-#: inventory/manage/locations.php:205 purchasing/manage/suppliers.php:136
-#: sales/manage/customer_branches.php:263 sales/manage/customers.php:253
+#: ../admin/shipping_companies.php:140
+#: ../includes/ui/contacts_view.inc:103
+#: ../inventory/manage/locations.php:205
+#: ../purchasing/manage/suppliers.php:136
+#: ../sales/manage/customer_branches.php:263
+#: ../sales/manage/customers.php:256
 msgid "Secondary Phone Number:"
 msgstr ""
 
-#: admin/system_diagnostics.php:17
+#: ../admin/system_diagnostics.php:17
 msgid "System Diagnostics"
 msgstr ""
 
-#: admin/tags.php:33
+#: ../admin/tags.php:33
 msgid "Unspecified tag type"
 msgstr ""
 
-#: admin/tags.php:40
+#: ../admin/tags.php:40
 msgid "Account Tags"
 msgstr ""
 
-#: admin/tags.php:44
+#: ../admin/tags.php:44
 msgid "Dimension Tags"
 msgstr ""
 
-#: admin/tags.php:57
+#: ../admin/tags.php:57
 msgid "The tag name cannot be empty."
 msgstr ""
 
-#: admin/tags.php:73
+#: ../admin/tags.php:73
 msgid "Selected tag settings have been updated"
 msgstr ""
 
-#: admin/tags.php:78
+#: ../admin/tags.php:78
 msgid "New tag has been added"
 msgstr ""
 
-#: admin/tags.php:94
+#: ../admin/tags.php:94
 msgid ""
 "Cannot delete this tag because records have been created referring to it."
 msgstr ""
 
-#: admin/tags.php:109
+#: ../admin/tags.php:109
 msgid "Selected tag has been deleted"
 msgstr ""
 
-#: admin/tags.php:128
+#: ../admin/tags.php:128
 msgid "Tag Name"
 msgstr ""
 
-#: admin/tags.php:128
+#: ../admin/tags.php:128
 msgid "Tag Description"
 msgstr ""
 
-#: admin/tags.php:165
+#: ../admin/tags.php:165
 msgid "Tag Name:"
 msgstr ""
 
-#: admin/tags.php:166
+#: ../admin/tags.php:166
 msgid "Tag Description:"
 msgstr ""
 
-#: admin/users.php:16
+#: ../admin/users.php:16
 msgid "Users"
 msgstr ""
 
-#: admin/users.php:31
+#: ../admin/users.php:31
 msgid "The user login entered must be at least 4 characters long."
 msgstr ""
 
-#: admin/users.php:72
+#: ../admin/users.php:72
 msgid "The selected user has been updated."
 msgstr ""
 
-#: admin/users.php:86
+#: ../admin/users.php:86
 msgid "A new user has been added."
 msgstr ""
 
-#: admin/users.php:97
+#: ../admin/users.php:97
 msgid "User has been deleted."
 msgstr ""
 
-#: admin/users.php:114
+#: ../admin/users.php:114
 msgid "User login"
 msgstr ""
 
-#: admin/users.php:114 admin/users.php:198 includes/ui/contacts_view.inc:41
+#: ../admin/users.php:114
+#: ../admin/users.php:198
+#: ../includes/ui/contacts_view.inc:41
 msgid "Full Name"
 msgstr ""
 
-#: admin/users.php:114 includes/ui/contacts_view.inc:41
-#: inventory/manage/locations.php:146 reporting/rep106.php:88
-#: reporting/includes/header2.inc:98 sales/manage/sales_people.php:99
+#: ../admin/users.php:114
+#: ../includes/ui/contacts_view.inc:41
+#: ../inventory/manage/locations.php:146
+#: ../reporting/rep106.php:88
+#: ../reporting/includes/header2.inc:98
+#: ../sales/manage/sales_people.php:99
 msgid "Phone"
 msgstr ""
 
-#: admin/users.php:115 sales/manage/customer_branches.php:302
-#: sales/view/view_sales_order.php:96
+#: ../admin/users.php:115
+#: ../sales/manage/customer_branches.php:302
+#: ../sales/view/view_sales_order.php:96
 msgid "E-mail"
 msgstr ""
 
-#: admin/users.php:115
+#: ../admin/users.php:115
 msgid "Last Visit"
 msgstr ""
 
-#: admin/users.php:115
+#: ../admin/users.php:115
 msgid "Access Level"
 msgstr ""
 
-#: admin/users.php:184
+#: ../admin/users.php:184
 msgid "User Login:"
 msgstr ""
 
-#: admin/users.php:195
+#: ../admin/users.php:195
 msgid "Enter a new password to change, leave empty to keep current."
 msgstr ""
 
-#: admin/users.php:200
+#: ../admin/users.php:200
 msgid "Telephone No.:"
 msgstr ""
 
-#: admin/users.php:204
+#: ../admin/users.php:204
 msgid "Access Level:"
 msgstr ""
 
-#: admin/users.php:208
+#: ../admin/users.php:208
 msgid "User's POS"
 msgstr ""
 
-#: admin/users.php:213
+#: ../admin/users.php:213
 msgid "Use popup window for reports:"
 msgstr ""
 
-#: admin/view_print_transaction.php:27
+#: ../admin/view_print_transaction.php:27
 msgid "View or Print Transactions"
 msgstr ""
 
-#: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45
-#: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:195
-#: purchasing/inquiry/po_search_completed.php:112
-#: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:185
-#: sales/inquiry/sales_deliveries_view.php:160
-#: sales/inquiry/sales_orders_view.php:125
+#: ../admin/view_print_transaction.php:43
+#: ../admin/view_print_transaction.php:45
+#: ../admin/view_print_transaction.php:129
+#: ../includes/ui/ui_controls.inc:195
+#: ../purchasing/inquiry/po_search_completed.php:112
+#: ../purchasing/inquiry/po_search.php:93
+#: ../sales/inquiry/customer_inquiry.php:185
+#: ../sales/inquiry/sales_deliveries_view.php:160
+#: ../sales/inquiry/sales_orders_view.php:125
+#: ../sales/inquiry/sales_orders_view.php.orig:125
 msgid "Print"
 msgstr ""
 
-#: admin/view_print_transaction.php:67
+#: ../admin/view_print_transaction.php:67
 msgid "Only documents can be printed."
 msgstr ""
 
-#: admin/view_print_transaction.php:79 admin/void_transaction.php:166
+#: ../admin/view_print_transaction.php:79
+#: ../admin/void_transaction.php:166
 msgid "from #:"
 msgstr ""
 
-#: admin/view_print_transaction.php:81 admin/void_transaction.php:168
+#: ../admin/view_print_transaction.php:81
+#: ../admin/void_transaction.php:168
 msgid "to #:"
 msgstr ""
 
-#: admin/view_print_transaction.php:83 admin/void_transaction.php:170
-#: dimensions/inquiry/search_dimensions.php:88
-#: gl/inquiry/journal_inquiry.php:53 manufacturing/search_work_orders.php:78
-#: purchasing/includes/ui/invoice_ui.inc:474
-#: purchasing/inquiry/po_search_completed.php:74
-#: purchasing/inquiry/po_search.php:76
-#: 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:116
+#: ../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:74
+#: ../purchasing/inquiry/po_search.php:76
+#: ../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:116
+#: ../sales/inquiry/sales_orders_view.php.orig:269
 msgid "Search"
 msgstr ""
 
-#: admin/view_print_transaction.php:96
+#: ../admin/view_print_transaction.php:96
 msgid ""
 "The starting transaction number is expected to be numeric and greater than "
 "zero."
 msgstr ""
 
-#: admin/view_print_transaction.php:102
+#: ../admin/view_print_transaction.php:102
 msgid ""
 "The ending transaction number is expected to be numeric and greater than "
 "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:75
-#: gl/view/gl_payment_view.php:73 gl/view/gl_trans_view.php:35
-#: includes/ui/contacts_view.inc:41 inventory/inquiry/stock_movements.php:78
-#: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:44
-#: manufacturing/search_work_orders.php:160
-#: manufacturing/view/wo_issue_view.php:43
-#: manufacturing/view/wo_production_view.php:44
-#: manufacturing/includes/manufacturing_ui.inc:157
-#: manufacturing/includes/manufacturing_ui.inc:200
-#: manufacturing/includes/manufacturing_ui.inc:276
-#: manufacturing/includes/manufacturing_ui.inc:280
-#: manufacturing/includes/manufacturing_ui.inc:331
-#: purchasing/includes/ui/grn_ui.inc:36 purchasing/includes/ui/grn_ui.inc:53
-#: purchasing/view/view_po.php:115 purchasing/view/view_supp_credit.php:43
-#: purchasing/view/view_supp_invoice.php:47
-#: purchasing/view/view_supp_payment.php:73
-#: purchasing/inquiry/po_search_completed.php:121
-#: purchasing/inquiry/po_search.php:131
-#: purchasing/inquiry/supplier_allocation_inquiry.php:127
-#: purchasing/inquiry/supplier_inquiry.php:175
-#: purchasing/allocations/supplier_allocation_main.php:96
-#: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep602.php:80
-#: reporting/rep702.php:53 reporting/includes/doctext.inc:221
-#: sales/customer_credit_invoice.php:245 sales/customer_credit_invoice.php:247
-#: sales/customer_delivery.php:362 sales/customer_delivery.php:364
-#: sales/customer_invoice.php:460 sales/customer_invoice.php:462
-#: sales/allocations/customer_allocation_main.php:95
-#: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:85
-#: sales/view/view_receipt.php:50 sales/view/view_sales_order.php:94
-#: sales/inquiry/customer_allocation_inquiry.php:145
-#: sales/inquiry/customer_inquiry.php:203
-#: sales/inquiry/sales_deliveries_view.php:184
-#: sales/includes/ui/sales_credit_ui.inc:85
-#: sales/includes/ui/sales_credit_ui.inc:87
-#: sales/includes/ui/sales_order_ui.inc:380
+#: ../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:319
+#: ../purchasing/view/view_po.php:115
+#: ../purchasing/view/view_supp_credit.php:43
+#: ../purchasing/view/view_supp_invoice.php:47
+#: ../purchasing/view/view_supp_payment.php:73
+#: ../purchasing/inquiry/po_search_completed.php:121
+#: ../purchasing/inquiry/po_search.php:131
+#: ../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:362
+#: ../sales/customer_delivery.php:364
+#: ../sales/customer_invoice.php:460
+#: ../sales/customer_invoice.php:462
+#: ../sales/allocations/customer_allocation_main.php:95
+#: ../sales/view/view_dispatch.php:85
+#: ../sales/view/view_invoice.php: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:184
+#: ../sales/includes/ui/sales_credit_ui.inc:85
+#: ../sales/includes/ui/sales_credit_ui.inc:87
+#: ../sales/includes/ui/sales_order_ui.inc:379
 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:94
-#: gl/accruals.php:199 gl/bank_account_reconcile.php:234
-#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
-#: gl/inquiry/journal_inquiry.php:128 gl/view/accrual_trans.php:52
-#: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68
-#: gl/view/gl_payment_view.php:66 gl/view/gl_trans_view.php:36
-#: includes/ui/allocation_cart.inc:264 includes/ui/ui_view.inc:489
-#: inventory/inquiry/stock_movements.php:80
-#: inventory/view/view_adjustment.php:45 inventory/view/view_transfer.php:47
-#: manufacturing/search_work_orders.php:166
-#: manufacturing/view/wo_costs_view.php:46
-#: manufacturing/view/wo_production_view.php:45
-#: manufacturing/includes/manufacturing_ui.inc:157
-#: manufacturing/includes/manufacturing_ui.inc:200
-#: manufacturing/includes/manufacturing_ui.inc:236
-#: manufacturing/includes/manufacturing_ui.inc:277
-#: manufacturing/includes/manufacturing_ui.inc:281
-#: manufacturing/includes/manufacturing_ui.inc:332
-#: purchasing/includes/ui/invoice_ui.inc:114 purchasing/view/view_po.php:140
-#: purchasing/inquiry/supplier_allocation_inquiry.php:130
-#: purchasing/inquiry/supplier_inquiry.php:178
-#: purchasing/allocations/supplier_allocation_main.php:97
-#: reporting/rep306.php:141 reporting/rep501.php:87 reporting/rep601.php:79
-#: reporting/rep602.php:80 reporting/rep704.php:83 reporting/rep704.php:86
-#: reporting/rep704.php:89 reporting/rep709.php:111 reporting/rep710.php:77
-#: reporting/includes/doctext.inc:167 reporting/includes/doctext.inc:208
-#: reporting/includes/doctext.inc:246 reporting/includes/header2.inc:135
-#: sales/customer_delivery.php:392 sales/customer_invoice.php:503
-#: sales/allocations/customer_allocation_main.php:96
-#: sales/view/view_credit.php:69 sales/view/view_sales_order.php:109
-#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
-#: sales/inquiry/customer_allocation_inquiry.php:147
-#: sales/inquiry/customer_inquiry.php:204
+#: ../admin/view_print_transaction.php:128
+#: ../admin/void_transaction.php:183
+#: ../dimensions/inquiry/search_dimensions.php:131
+#: ../dimensions/view/view_dimension.php:55
+#: ../gl/accruals.php:94
+#: ../gl/accruals.php:199
+#: ../gl/bank_account_reconcile.php:234
+#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/gl_account_inquiry.php:126
+#: ../gl/inquiry/journal_inquiry.php:128
+#: ../gl/view/accrual_trans.php:52
+#: ../gl/view/bank_transfer_view.php:83
+#: ../gl/view/gl_deposit_view.php:68
+#: ../gl/view/gl_payment_view.php:66
+#: ../gl/view/gl_trans_view.php:36
+#: ../includes/ui/allocation_cart.inc:289
+#: ../includes/ui/ui_view.inc:547
+#: ../inventory/inquiry/stock_movements.php:80
+#: ../inventory/view/view_adjustment.php:45
+#: ../inventory/view/view_transfer.php:47
+#: ../manufacturing/search_work_orders.php:166
+#: ../manufacturing/work_order_entry.php:419
+#: ../manufacturing/work_order_entry.php:425
+#: ../manufacturing/view/wo_costs_view.php:46
+#: ../manufacturing/view/wo_production_view.php:45
+#: ../manufacturing/includes/manufacturing_ui.inc:157
+#: ../manufacturing/includes/manufacturing_ui.inc:200
+#: ../manufacturing/includes/manufacturing_ui.inc:236
+#: ../manufacturing/includes/manufacturing_ui.inc:277
+#: ../manufacturing/includes/manufacturing_ui.inc:281
+#: ../manufacturing/includes/manufacturing_ui.inc:332
+#: ../purchasing/includes/ui/invoice_ui.inc:129
+#: ../purchasing/includes/ui/po_ui.inc:333
+#: ../purchasing/view/view_po.php:140
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:131
+#: ../purchasing/inquiry/supplier_inquiry.php:178
+#: ../purchasing/allocations/supplier_allocation_main.php:97
+#: ../reporting/rep101.php:147
+#: ../reporting/rep201.php:135
+#: ../reporting/rep306.php:141
+#: ../reporting/rep501.php:87
+#: ../reporting/rep601.php:79
+#: ../reporting/rep602.php:80
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep704.php:89
+#: ../reporting/rep709.php:111
+#: ../reporting/rep710.php:77
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+#: ../reporting/includes/doctext.inc:246
+#: ../reporting/includes/header2.inc:135
+#: ../sales/customer_delivery.php:392
+#: ../sales/customer_invoice.php:503
+#: ../sales/allocations/customer_allocation_main.php:96
+#: ../sales/view/view_credit.php:69
+#: ../sales/view/view_sales_order.php: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 ""
 
-#: admin/view_print_transaction.php:130 admin/void_transaction.php:184
-#: includes/ui/ui_view.inc:51
+#: ../admin/view_print_transaction.php:130
+#: ../admin/void_transaction.php:184
+#: ../includes/ui/ui_view.inc:51
 msgid "GL"
 msgstr ""
 
-#: admin/void_transaction.php:29
+#: ../admin/void_transaction.php:29
 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_lists.inc:20
 msgid "Select"
 msgstr ""
 
-#: admin/void_transaction.php:157
+#: ../admin/void_transaction.php:157
 msgid "Transaction Type:"
 msgstr ""
 
-#: admin/void_transaction.php:204
+#: ../admin/void_transaction.php:204
 msgid "Transaction #:"
 msgstr ""
 
-#: admin/void_transaction.php:206
+#: ../admin/void_transaction.php:206
 msgid "Voiding Date:"
 msgstr ""
 
-#: admin/void_transaction.php:208 dimensions/dimension_entry.php:283
-#: gl/bank_transfer.php:98 gl/inquiry/journal_inquiry.php:56
-#: gl/manage/revaluate_currencies.php:106 includes/ui/ui_view.inc:308
-#: manufacturing/work_order_add_finished.php:210
-#: manufacturing/work_order_costs.php:146
-#: manufacturing/work_order_release.php:103
-#: purchasing/includes/ui/invoice_ui.inc:180 purchasing/po_entry_items.php:563
-#: purchasing/supplier_payment.php:321 sales/customer_invoice.php:680
+#: ../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:210
+#: ../manufacturing/work_order_costs.php:146
+#: ../manufacturing/work_order_entry.php:451
+#: ../manufacturing/work_order_release.php:103
+#: ../purchasing/includes/ui/invoice_ui.inc:195
+#: ../purchasing/includes/ui/po_ui.inc:490
+#: ../purchasing/po_entry_items.php:566
+#: ../purchasing/supplier_payment.php.orig:321
+#: ../sales/customer_invoice.php:680
+#: ../sales/customer_payments.php.orig:409
 msgid "Memo:"
 msgstr ""
 
-#: admin/void_transaction.php:213 admin/void_transaction.php:222
+#: ../admin/void_transaction.php:213
+#: ../admin/void_transaction.php:222
 msgid "Void Transaction"
 msgstr ""
 
-#: admin/void_transaction.php:218 admin/void_transaction.php:297
+#: ../admin/void_transaction.php:218
+#: ../admin/void_transaction.php:297
 msgid "The entered transaction does not exist or cannot be voided."
 msgstr ""
 
-#: admin/void_transaction.php:226
+#: ../admin/void_transaction.php:226
 msgid ""
 "Are you sure you want to void this transaction ? This action cannot be "
 "undone."
 msgstr ""
 
-#: admin/void_transaction.php:228 includes/ui/ui_controls.inc:593
+#: ../admin/void_transaction.php:228
+#: ../includes/ui/ui_controls.inc:595
 msgid "Proceed"
 msgstr ""
 
-#: admin/void_transaction.php:242
+#: ../admin/void_transaction.php:242
 msgid "The selected transaction was closed for edition and cannot be voided."
 msgstr ""
 
-#: admin/void_transaction.php:248 gl/accruals.php:32 gl/bank_transfer.php:115
-#: gl/gl_journal.php:161 gl/manage/close_period.php:34
-#: gl/manage/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:175 sales/customer_credit_invoice.php:91
-#: sales/sales_order_entry.php:359 sales/manage/recurrent_invoices.php:41
-#: sales/manage/recurrent_invoices.php:46
-#: sales/manage/recurrent_invoices.php:51
+#: ../admin/void_transaction.php:248
+#: ../gl/accruals.php:32
+#: ../gl/bank_transfer.php:115
+#: ../gl/gl_journal.php:161
+#: ../gl/manage/close_period.php:34
+#: ../gl/manage/exchange_rates.php:33
+#: ../gl/manage/revaluate_currencies.php:53
+#: ../manufacturing/work_order_add_finished.php:98
+#: ../manufacturing/work_order_costs.php:80
+#: ../purchasing/po_receive_items.php:174
+#: ../purchasing/supplier_payment.php.orig:175
+#: ../sales/customer_credit_invoice.php:91
+#: ../sales/sales_order_entry.php:360
+#: ../sales/manage/recurrent_invoices.php:41
+#: ../sales/manage/recurrent_invoices.php:46
+#: ../sales/manage/recurrent_invoices.php:51
 msgid "The entered date is invalid."
 msgstr ""
 
-#: admin/void_transaction.php:254
+#: ../admin/void_transaction.php:254
 msgid "The entered date is not in fiscal year."
 msgstr ""
 
-#: admin/void_transaction.php:261
+#: ../admin/void_transaction.php:261
 msgid "The transaction number is expected to be numeric and greater than zero."
 msgstr ""
 
-#: admin/void_transaction.php:278
+#: ../admin/void_transaction.php:278
 msgid "The selected transaction has already been voided."
 msgstr ""
 
-#: admin/void_transaction.php:291
+#: ../admin/void_transaction.php:291
 msgid "Selected transaction has been voided."
 msgstr ""
 
-#: admin/db/fiscalyears_db.inc:136
+#: ../admin/db/fiscalyears_db.inc:136
 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:166
+#: ../admin/db/fiscalyears_db.inc:168
 msgid "Closing Year"
 msgstr ""
 
-#: admin/db/fiscalyears_db.inc:214 reporting/rep706.php:185
+#: ../admin/db/fiscalyears_db.inc:214
+#: ../reporting/rep706.php:185
 msgid "Open Balance"
 msgstr ""
 
-#: admin/db/maintenance_db.inc:152
+#: ../admin/db/maintenance_db.inc:152
 #, php-format
 msgid "Cannot open the extension setup file '%s' for writing."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:160
+#: ../admin/db/maintenance_db.inc:160
 #, php-format
 msgid "Cannot write to the extensions setup file '%s'."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:178
+#: ../admin/db/maintenance_db.inc:178
 msgid "Cannot update system extensions list."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:196
+#: ../admin/db/maintenance_db.inc:196
 #, php-format
 msgid "Cannot update extensions list for company '%s'."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:233
+#: ../admin/db/maintenance_db.inc:233
 msgid "Cannot open the languages file - "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:240
+#: ../admin/db/maintenance_db.inc:240
 msgid "Cannot write to the language file - "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:250
+#: ../admin/db/maintenance_db.inc:250
 msgid "The language files folder "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:389
+#: ../admin/db/maintenance_db.inc:389
 msgid ""
 "This is new format backup file which cannot be restored on database not "
 "migrated to utf8."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:471
+#: ../admin/db/maintenance_db.inc:471
 #, php-format
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
 
-#: admin/db/users_db.inc:210
+#: ../admin/db/users_db.inc:210
 msgid "user online"
 msgstr ""
 
-#: admin/db/users_db.inc:210
+#: ../admin/db/users_db.inc:210
 msgid "users online"
 msgstr ""
 
-#: admin/db/voiding_db.inc:114
+#: ../admin/db/voiding_db.inc:114
+#: ../manufacturing/includes/db/work_orders_db.inc.orig:261
+#: ../sales/includes/db/sales_invoice_db.inc:251
 msgid "Voided."
 msgstr ""
 
-#: applications/customers.php:16
+#: ../applications/customers.php:16
 msgid "&Sales"
 msgstr ""
 
-#: applications/customers.php:18 applications/dimensions.php:21
-#: applications/generalledger.php:18 applications/inventory.php:18
-#: applications/manufacturing.php:18 applications/suppliers.php:18
+#: ../applications/customers.php:18
+#: ../applications/dimensions.php:21
+#: ../applications/generalledger.php:18
+#: ../applications/inventory.php:18
+#: ../applications/manufacturing.php:18
+#: ../applications/suppliers.php:18
 msgid "Transactions"
 msgstr ""
 
-#: applications/customers.php:19
+#: ../applications/customers.php:19
 msgid "Sales &Quotation Entry"
 msgstr ""
 
-#: applications/customers.php:21
+#: ../applications/customers.php:21
 msgid "Sales &Order Entry"
 msgstr ""
 
-#: applications/customers.php:23
+#: ../applications/customers.php:23
 msgid "Direct &Delivery"
 msgstr ""
 
-#: applications/customers.php:25 applications/suppliers.php:25
+#: ../applications/customers.php:25
+#: ../applications/suppliers.php:25
 msgid "Direct &Invoice"
 msgstr ""
 
-#: applications/customers.php:28
+#: ../applications/customers.php:28
 msgid "&Delivery Against Sales Orders"
 msgstr ""
 
-#: applications/customers.php:30
+#: ../applications/customers.php:30
 msgid "&Invoice Against Sales Delivery"
 msgstr ""
 
-#: applications/customers.php:33
+#: ../applications/customers.php:33
 msgid "&Template Delivery"
 msgstr ""
 
-#: applications/customers.php:35
+#: ../applications/customers.php:35
 msgid "&Template Invoice"
 msgstr ""
 
-#: applications/customers.php:37
+#: ../applications/customers.php:37
 msgid "&Create and Print Recurrent Invoices"
 msgstr ""
 
-#: applications/customers.php:40
+#: ../applications/customers.php:40
 msgid "Customer &Payments"
 msgstr ""
 
-#: applications/customers.php:42
+#: ../applications/customers.php:42
 msgid "Invoice &Prepaid Orders"
 msgstr ""
 
-#: applications/customers.php:44
+#: ../applications/customers.php:44
 msgid "Customer &Credit Notes"
 msgstr ""
 
-#: applications/customers.php:46
+#: ../applications/customers.php:46
 msgid "&Allocate Customer Payments or Credit Notes"
 msgstr ""
 
-#: applications/customers.php:49 applications/dimensions.php:27
-#: applications/generalledger.php:34 applications/inventory.php:24
-#: applications/manufacturing.php:24 applications/suppliers.php:38
+#: ../applications/customers.php:49
+#: ../applications/dimensions.php:27
+#: ../applications/generalledger.php:34
+#: ../applications/inventory.php:24
+#: ../applications/manufacturing.php:24
+#: ../applications/suppliers.php:38
 msgid "Inquiries and Reports"
 msgstr ""
 
-#: applications/customers.php:50
+#: ../applications/customers.php:50
 msgid "Sales Quotation I&nquiry"
 msgstr ""
 
-#: applications/customers.php:52
+#: ../applications/customers.php:52
 msgid "Sales Order &Inquiry"
 msgstr ""
 
-#: applications/customers.php:54
+#: ../applications/customers.php:54
 msgid "Customer Transaction &Inquiry"
 msgstr ""
 
-#: applications/customers.php:56
+#: ../applications/customers.php:56
 msgid "Customer Allocation &Inquiry"
 msgstr ""
 
-#: applications/customers.php:59
+#: ../applications/customers.php:59
 msgid "Customer and Sales &Reports"
 msgstr ""
 
-#: applications/customers.php:62 applications/dimensions.php:34
-#: applications/generalledger.php:55 applications/inventory.php:32
-#: applications/manufacturing.php:34 applications/setup.php:54
-#: applications/suppliers.php:49
+#: ../applications/customers.php:62
+#: ../applications/dimensions.php:34
+#: ../applications/generalledger.php:55
+#: ../applications/inventory.php:32
+#: ../applications/manufacturing.php:34
+#: ../applications/setup.php:54
+#: ../applications/suppliers.php:49
 msgid "Maintenance"
 msgstr ""
 
-#: applications/customers.php:63
+#: ../applications/customers.php:63
 msgid "Add and Manage &Customers"
 msgstr ""
 
-#: applications/customers.php:65
+#: ../applications/customers.php:65
 msgid "Customer &Branches"
 msgstr ""
 
-#: applications/customers.php:67
+#: ../applications/customers.php:67
 msgid "Sales &Groups"
 msgstr ""
 
-#: applications/customers.php:69
+#: ../applications/customers.php:69
 msgid "Recurrent &Invoices"
 msgstr ""
 
-#: applications/customers.php:71
+#: ../applications/customers.php:71
 msgid "Sales T&ypes"
 msgstr ""
 
-#: applications/customers.php:73
+#: ../applications/customers.php:73
 msgid "Sales &Persons"
 msgstr ""
 
-#: applications/customers.php:75
+#: ../applications/customers.php:75
 msgid "Sales &Areas"
 msgstr ""
 
-#: applications/customers.php:77
+#: ../applications/customers.php:77
 msgid "Credit &Status Setup"
 msgstr ""
 
-#: applications/dimensions.php:17
+#: ../applications/dimensions.php:17
 msgid "&Dimensions"
 msgstr ""
 
-#: applications/dimensions.php:22
+#: ../applications/dimensions.php:22
 msgid "Dimension &Entry"
 msgstr ""
 
-#: applications/dimensions.php:24
+#: ../applications/dimensions.php:24
 msgid "&Outstanding Dimensions"
 msgstr ""
 
-#: applications/dimensions.php:28
+#: ../applications/dimensions.php:28
 msgid "Dimension &Inquiry"
 msgstr ""
 
-#: applications/dimensions.php:31
+#: ../applications/dimensions.php:31
 msgid "Dimension &Reports"
 msgstr ""
 
-#: applications/dimensions.php:35
+#: ../applications/dimensions.php:35
 msgid "Dimension &Tags"
 msgstr ""
 
-#: applications/generalledger.php:16
+#: ../applications/generalledger.php:16
 msgid "&Banking and General Ledger"
 msgstr ""
 
-#: applications/generalledger.php:19
+#: ../applications/generalledger.php:19
 msgid "&Payments"
 msgstr ""
 
-#: applications/generalledger.php:21
+#: ../applications/generalledger.php:21
 msgid "&Deposits"
 msgstr ""
 
-#: applications/generalledger.php:23
+#: ../applications/generalledger.php:23
 msgid "Bank Account &Transfers"
 msgstr ""
 
-#: applications/generalledger.php:25
+#: ../applications/generalledger.php:25
 msgid "&Journal Entry"
 msgstr ""
 
-#: applications/generalledger.php:27
+#: ../applications/generalledger.php:27
 msgid "&Budget Entry"
 msgstr ""
 
-#: applications/generalledger.php:29
+#: ../applications/generalledger.php:29
 msgid "&Reconcile Bank Account"
 msgstr ""
 
-#: applications/generalledger.php:31
+#: ../applications/generalledger.php:31
 msgid "Revenue / &Costs Accruals"
 msgstr ""
 
-#: applications/generalledger.php:35
+#: ../applications/generalledger.php:35
 msgid "&Journal Inquiry"
 msgstr ""
 
-#: applications/generalledger.php:37
+#: ../applications/generalledger.php:37
 msgid "GL &Inquiry"
 msgstr ""
 
-#: applications/generalledger.php:39
+#: ../applications/generalledger.php:39
 msgid "Bank Account &Inquiry"
 msgstr ""
 
-#: applications/generalledger.php:41
+#: ../applications/generalledger.php:41
 msgid "Ta&x Inquiry"
 msgstr ""
 
-#: applications/generalledger.php:44
+#: ../applications/generalledger.php:44
 msgid "Trial &Balance"
 msgstr ""
 
-#: applications/generalledger.php:46
+#: ../applications/generalledger.php:46
 msgid "Balance &Sheet Drilldown"
 msgstr ""
 
-#: applications/generalledger.php:48
+#: ../applications/generalledger.php:48
 msgid "&Profit and Loss Drilldown"
 msgstr ""
 
-#: applications/generalledger.php:50
+#: ../applications/generalledger.php:50
 msgid "Banking &Reports"
 msgstr ""
 
-#: applications/generalledger.php:52
+#: ../applications/generalledger.php:52
 msgid "General Ledger &Reports"
 msgstr ""
 
-#: applications/generalledger.php:56
+#: ../applications/generalledger.php:56
 msgid "Bank &Accounts"
 msgstr ""
 
-#: applications/generalledger.php:58
+#: ../applications/generalledger.php:58
 msgid "&Quick Entries"
 msgstr ""
 
-#: applications/generalledger.php:60
+#: ../applications/generalledger.php:60
 msgid "Account &Tags"
 msgstr ""
 
-#: applications/generalledger.php:63
+#: ../applications/generalledger.php:63
 msgid "&Currencies"
 msgstr ""
 
-#: applications/generalledger.php:65
+#: ../applications/generalledger.php:65
 msgid "&Exchange Rates"
 msgstr ""
 
-#: applications/generalledger.php:68
+#: ../applications/generalledger.php:68
 msgid "&GL Accounts"
 msgstr ""
 
-#: applications/generalledger.php:70
+#: ../applications/generalledger.php:70
 msgid "GL Account &Groups"
 msgstr ""
 
-#: applications/generalledger.php:72
+#: ../applications/generalledger.php:72
 msgid "GL Account &Classes"
 msgstr ""
 
-#: applications/generalledger.php:74
+#: ../applications/generalledger.php:74
 msgid "&Closing GL Transactions"
 msgstr ""
 
-#: applications/generalledger.php:76
+#: ../applications/generalledger.php:76
 msgid "&Revaluation of Currency Accounts"
 msgstr ""
 
-#: applications/inventory.php:16
+#: ../applications/inventory.php:16
 msgid "&Items and Inventory"
 msgstr ""
 
-#: applications/inventory.php:19
+#: ../applications/inventory.php:19
 msgid "Inventory Location &Transfers"
 msgstr ""
 
-#: applications/inventory.php:21
+#: ../applications/inventory.php:21
 msgid "Inventory &Adjustments"
 msgstr ""
 
-#: applications/inventory.php:25
+#: ../applications/inventory.php:25
 msgid "Inventory Item &Movements"
 msgstr ""
 
-#: applications/inventory.php:27
+#: ../applications/inventory.php:27
 msgid "Inventory Item &Status"
 msgstr ""
 
-#: applications/inventory.php:29
+#: ../applications/inventory.php:29
 msgid "Inventory &Reports"
 msgstr ""
 
-#: applications/inventory.php:33
+#: ../applications/inventory.php:33
 msgid "&Items"
 msgstr ""
 
-#: applications/inventory.php:35
+#: ../applications/inventory.php:35
 msgid "&Foreign Item Codes"
 msgstr ""
 
-#: applications/inventory.php:37
+#: ../applications/inventory.php:37
 msgid "Sales &Kits"
 msgstr ""
 
-#: applications/inventory.php:39
+#: ../applications/inventory.php:39
 msgid "Item &Categories"
 msgstr ""
 
-#: applications/inventory.php:41
+#: ../applications/inventory.php:41
 msgid "Inventory &Locations"
 msgstr ""
 
-#: applications/inventory.php:43
+#: ../applications/inventory.php:43
 msgid "Inventory &Movement Types"
 msgstr ""
 
-#: applications/inventory.php:45
+#: ../applications/inventory.php:45
 msgid "&Units of Measure"
 msgstr ""
 
-#: applications/inventory.php:47
+#: ../applications/inventory.php:47
+#: ../inventory/manage/items.php:469
 msgid "&Reorder Levels"
 msgstr ""
 
-#: applications/inventory.php:50
+#: ../applications/inventory.php:50
 msgid "Pricing and Costs"
 msgstr ""
 
-#: applications/inventory.php:51
+#: ../applications/inventory.php:51
 msgid "Sales &Pricing"
 msgstr ""
 
-#: applications/inventory.php:53
+#: ../applications/inventory.php:53
 msgid "Purchasing &Pricing"
 msgstr ""
 
-#: applications/inventory.php:55
+#: ../applications/inventory.php:55
+#: ../inventory/manage/items.php:468
 msgid "Standard &Costs"
 msgstr ""
 
-#: applications/manufacturing.php:16
+#: ../applications/manufacturing.php:16
 msgid "&Manufacturing"
 msgstr ""
 
-#: applications/manufacturing.php:19 sales/sales_order_entry.php:126
+#: ../applications/manufacturing.php:19
+#: ../sales/sales_order_entry.php:126
 msgid "Work &Order Entry"
 msgstr ""
 
-#: applications/manufacturing.php:21
+#: ../applications/manufacturing.php:21
 msgid "&Outstanding Work Orders"
 msgstr ""
 
-#: applications/manufacturing.php:25
-#: manufacturing/inquiry/bom_cost_inquiry.php:16
+#: ../applications/manufacturing.php:25
+#: ../manufacturing/inquiry/bom_cost_inquiry.php:16
 msgid "Costed Bill Of Material Inquiry"
 msgstr ""
 
-#: applications/manufacturing.php:27
+#: ../applications/manufacturing.php:27
 msgid "Inventory Item Where Used &Inquiry"
 msgstr ""
 
-#: applications/manufacturing.php:29
+#: ../applications/manufacturing.php:29
 msgid "Work Order &Inquiry"
 msgstr ""
 
-#: applications/manufacturing.php:31
+#: ../applications/manufacturing.php:31
 msgid "Manufacturing &Reports"
 msgstr ""
 
-#: applications/manufacturing.php:35
+#: ../applications/manufacturing.php:35
 msgid "&Bills Of Material"
 msgstr ""
 
-#: applications/manufacturing.php:37
+#: ../applications/manufacturing.php:37
 msgid "&Work Centres"
 msgstr ""
 
-#: applications/setup.php:16
+#: ../applications/setup.php:16
 msgid "S&etup"
 msgstr ""
 
-#: applications/setup.php:19
+#: ../applications/setup.php:19
 msgid "&Company Setup"
 msgstr ""
 
-#: applications/setup.php:21
+#: ../applications/setup.php:21
 msgid "&User Accounts Setup"
 msgstr ""
 
-#: applications/setup.php:23
+#: ../applications/setup.php:23
 msgid "&Access Setup"
 msgstr ""
 
-#: applications/setup.php:25
+#: ../applications/setup.php:25
 msgid "&Display Setup"
 msgstr ""
 
-#: applications/setup.php:27
+#: ../applications/setup.php:27
 msgid "&Forms Setup"
 msgstr ""
 
-#: applications/setup.php:29
+#: ../applications/setup.php:29
 msgid "&Taxes"
 msgstr ""
 
-#: applications/setup.php:31
+#: ../applications/setup.php:31
 msgid "Tax &Groups"
 msgstr ""
 
-#: applications/setup.php:33
+#: ../applications/setup.php:33
 msgid "Item Ta&x Types"
 msgstr ""
 
-#: applications/setup.php:35
+#: ../applications/setup.php:35
 msgid "System and &General GL Setup"
 msgstr ""
 
-#: applications/setup.php:37
+#: ../applications/setup.php:37
 msgid "&Fiscal Years"
 msgstr ""
 
-#: applications/setup.php:39
+#: ../applications/setup.php:39
 msgid "&Print Profiles"
 msgstr ""
 
-#: applications/setup.php:43
+#: ../applications/setup.php:43
 msgid "Pa&yment Terms"
 msgstr ""
 
-#: applications/setup.php:45
+#: ../applications/setup.php:45
 msgid "Shi&pping Company"
 msgstr ""
 
-#: applications/setup.php:47
+#: ../applications/setup.php:47
 msgid "&Points of Sale"
 msgstr ""
 
-#: applications/setup.php:49
+#: ../applications/setup.php:49
 msgid "&Printers"
 msgstr ""
 
-#: applications/setup.php:51
+#: ../applications/setup.php:51
 msgid "Contact &Categories"
 msgstr ""
 
-#: applications/setup.php:55
+#: ../applications/setup.php:55
 msgid "&Void a Transaction"
 msgstr ""
 
-#: applications/setup.php:57
+#: ../applications/setup.php:57
 msgid "View or &Print Transactions"
 msgstr ""
 
-#: applications/setup.php:59
+#: ../applications/setup.php:59
 msgid "&Attach Documents"
 msgstr ""
 
-#: applications/setup.php:61
+#: ../applications/setup.php:61
 msgid "System &Diagnostics"
 msgstr ""
 
-#: applications/setup.php:64
+#: ../applications/setup.php:64
 msgid "&Backup and Restore"
 msgstr ""
 
-#: applications/setup.php:66
+#: ../applications/setup.php:66
 msgid "Create/Update &Companies"
 msgstr ""
 
-#: applications/setup.php:68
+#: ../applications/setup.php:68
 msgid "Install/Update &Languages"
 msgstr ""
 
-#: applications/setup.php:70
+#: ../applications/setup.php:70
 msgid "Install/Activate &Extensions"
 msgstr ""
 
-#: applications/setup.php:72
+#: ../applications/setup.php:72
 msgid "Install/Activate &Themes"
 msgstr ""
 
-#: applications/setup.php:74
+#: ../applications/setup.php:74
 msgid "Install/Activate &Chart of Accounts"
 msgstr ""
 
-#: applications/setup.php:76
+#: ../applications/setup.php:76
 msgid "Software &Upgrade"
 msgstr ""
 
-#: applications/suppliers.php:16
+#: ../applications/suppliers.php:16
 msgid "&Purchases"
 msgstr ""
 
-#: applications/suppliers.php:19
+#: ../applications/suppliers.php:19
 msgid "Purchase &Order Entry"
 msgstr ""
 
-#: applications/suppliers.php:21
+#: ../applications/suppliers.php:21
 msgid "&Outstanding Purchase Orders Maintenance"
 msgstr ""
 
-#: applications/suppliers.php:23
+#: ../applications/suppliers.php:23
 msgid "Direct &GRN"
 msgstr ""
 
-#: applications/suppliers.php:28
+#: ../applications/suppliers.php:28
 msgid "&Payments to Suppliers"
 msgstr ""
 
-#: applications/suppliers.php:31
+#: ../applications/suppliers.php:31
 msgid "Supplier &Invoices"
 msgstr ""
 
-#: applications/suppliers.php:33
+#: ../applications/suppliers.php:33
 msgid "Supplier &Credit Notes"
 msgstr ""
 
-#: applications/suppliers.php:35
+#: ../applications/suppliers.php:35
 msgid "&Allocate Supplier Payments or Credit Notes"
 msgstr ""
 
-#: applications/suppliers.php:39
+#: ../applications/suppliers.php:39
 msgid "Purchase Orders &Inquiry"
 msgstr ""
 
-#: applications/suppliers.php:41
+#: ../applications/suppliers.php:41
 msgid "Supplier Transaction &Inquiry"
 msgstr ""
 
-#: applications/suppliers.php:43
+#: ../applications/suppliers.php:43
 msgid "Supplier Allocation &Inquiry"
 msgstr ""
 
-#: applications/suppliers.php:46
+#: ../applications/suppliers.php:46
 msgid "Supplier and Purchasing &Reports"
 msgstr ""
 
-#: applications/suppliers.php:50
+#: ../applications/suppliers.php:50
 msgid "&Suppliers"
 msgstr ""
 
-#: dimensions/dimension_entry.php:27
+#: ../dimensions/dimension_entry.php:27
 msgid "Dimension Entry"
 msgstr ""
 
-#: dimensions/dimension_entry.php:47
+#: ../dimensions/dimension_entry.php:47
 msgid "The dimension has been entered."
 msgstr ""
 
-#: dimensions/dimension_entry.php:58
+#: ../dimensions/dimension_entry.php:58
 msgid "The dimension has been updated."
 msgstr ""
 
-#: dimensions/dimension_entry.php:68
+#: ../dimensions/dimension_entry.php:68
 msgid "The dimension has been deleted."
 msgstr ""
 
-#: dimensions/dimension_entry.php:78
+#: ../dimensions/dimension_entry.php:78
 msgid "The dimension has been closed. There can be no more changes to it."
 msgstr ""
 
-#: dimensions/dimension_entry.php:88
+#: ../dimensions/dimension_entry.php:88
 msgid "The dimension has been re-opened. "
 msgstr ""
 
-#: dimensions/dimension_entry.php:98
+#: ../dimensions/dimension_entry.php:98
 msgid "Enter a &new dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:100
+#: ../dimensions/dimension_entry.php:100
 msgid "&Select an existing dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:116
+#: ../dimensions/dimension_entry.php:116
 msgid "The dimension reference must be entered."
 msgstr ""
 
-#: dimensions/dimension_entry.php:123 gl/bank_transfer.php:176
-#: gl/gl_bank.php:258 gl/gl_journal.php:181
-#: gl/manage/revaluate_currencies.php:72 inventory/adjustments.php:101
-#: inventory/transfers.php:97 manufacturing/work_order_add_finished.php:84
-#: manufacturing/work_order_issue.php:97 purchasing/po_entry_items.php:368
-#: purchasing/po_receive_items.php:193 purchasing/supplier_credit.php:173
-#: purchasing/supplier_invoice.php:179 purchasing/supplier_payment.php:204
-#: sales/create_recurrent_invoices.php:57 sales/credit_note_entry.php:181
-#: sales/customer_credit_invoice.php:205 sales/customer_delivery.php:324
-#: sales/customer_invoice.php:379 sales/customer_payments.php:164
-#: sales/customer_payments.php:171 sales/sales_order_entry.php:457
+#: ../dimensions/dimension_entry.php:123
+#: ../gl/bank_transfer.php:176
+#: ../gl/gl_bank.php:257
+#: ../gl/gl_journal.php:181
+#: ../gl/manage/revaluate_currencies.php:72
+#: ../inventory/adjustments.php:101
+#: ../inventory/transfers.php:97
+#: ../manufacturing/work_order_add_finished.php:84
+#: ../manufacturing/work_order_entry.php:139
+#: ../manufacturing/work_order_issue.php:97
+#: ../purchasing/po_entry_items.php:368
+#: ../purchasing/po_receive_items.php:193
+#: ../purchasing/supplier_credit.php:172
+#: ../purchasing/supplier_invoice.php:179
+#: ../purchasing/supplier_payment.php.orig:204
+#: ../sales/create_recurrent_invoices.php:57
+#: ../sales/credit_note_entry.php:181
+#: ../sales/customer_credit_invoice.php:205
+#: ../sales/customer_delivery.php:324
+#: ../sales/customer_invoice.php:379
+#: ../sales/customer_payments.php.orig:164
+#: ../sales/customer_payments.php.orig:171
+#: ../sales/customer_payments.php.orig:247
+#: ../sales/sales_order_entry.php:458
 msgid "The entered reference is already in use."
 msgstr ""
 
-#: dimensions/dimension_entry.php:131
+#: ../dimensions/dimension_entry.php:131
 msgid "The dimension name must be entered."
 msgstr ""
 
-#: dimensions/dimension_entry.php:138 purchasing/po_entry_items.php:241
+#: ../dimensions/dimension_entry.php:138
+#: ../manufacturing/work_order_entry.php:154
+#: ../manufacturing/work_order_entry.php:234
+#: ../purchasing/po_entry_items.php:241
 msgid "The date entered is in an invalid format."
 msgstr ""
 
-#: dimensions/dimension_entry.php:145
+#: ../dimensions/dimension_entry.php:145
 msgid "The required by date entered is in an invalid format."
 msgstr ""
 
-#: dimensions/dimension_entry.php:190
+#: ../dimensions/dimension_entry.php:190
 msgid "This dimension cannot be deleted because it has already been processed."
 msgstr ""
 
-#: dimensions/dimension_entry.php:234
+#: ../dimensions/dimension_entry.php:234
 msgid "The dimension sent is not valid."
 msgstr ""
 
-#: dimensions/dimension_entry.php:261 dimensions/dimension_entry.php:268
+#: ../dimensions/dimension_entry.php:261
+#: ../dimensions/dimension_entry.php:268
 msgid "Dimension Reference:"
 msgstr ""
 
-#: dimensions/dimension_entry.php:277 reporting/reports_main.php:34
-#: reporting/reports_main.php:64 reporting/reports_main.php:80
-#: reporting/reports_main.php:89
+#: ../dimensions/dimension_entry.php:277
+#: ../reporting/reports_main.php:34
+#: ../reporting/reports_main.php:64
+#: ../reporting/reports_main.php:80
+#: ../reporting/reports_main.php:89
+#: ../reporting/reports_main.php:151
+#: ../reporting/reports_main.php:233
+#: ../reporting/reports_main.php:242
+#: ../reporting/reports_main.php:248
+#: ../reporting/reports_main.php:258
+#: ../reporting/reports_main.php:266
+#: ../reporting/reports_main.php:274
+#: ../reporting/reports_main.php:311
 msgid "Start Date"
 msgstr ""
 
-#: dimensions/dimension_entry.php:279
+#: ../dimensions/dimension_entry.php:279
+#: ../manufacturing/work_order_entry.php:420
 msgid "Date Required By"
 msgstr ""
 
-#: dimensions/dimension_entry.php:281
+#: ../dimensions/dimension_entry.php:281
 msgid "Tags:"
 msgstr ""
 
-#: dimensions/dimension_entry.php:288
+#: ../dimensions/dimension_entry.php:288
 msgid "This Dimension is closed."
 msgstr ""
 
-#: dimensions/dimension_entry.php:293
+#: ../dimensions/dimension_entry.php:293
 msgid "Save changes to dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:295
+#: ../dimensions/dimension_entry.php:295
 msgid "Re-open This Dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:295
+#: ../dimensions/dimension_entry.php:295
 msgid "Mark this dimension as re-opened"
 msgstr ""
 
-#: dimensions/dimension_entry.php:297
+#: ../dimensions/dimension_entry.php:297
 msgid "Close This Dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:297
+#: ../dimensions/dimension_entry.php:297
 msgid "Mark this dimension as closed"
 msgstr ""
 
-#: dimensions/dimension_entry.php:298
+#: ../dimensions/dimension_entry.php:298
 msgid "Delete This Dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:298
+#: ../dimensions/dimension_entry.php:298
 msgid "Delete unused dimension"
 msgstr ""
 
-#: dimensions/dimension_entry.php:302 includes/ui/simple_crud_class.inc:225
-#: purchasing/includes/ui/invoice_ui.inc:206
-#: purchasing/includes/ui/invoice_ui.inc:412
-#: purchasing/includes/ui/invoice_ui.inc:414
+#: ../dimensions/dimension_entry.php:302
+#: ../includes/ui/simple_crud_class.inc:225
+#: ../purchasing/includes/ui/invoice_ui.inc:221
+#: ../purchasing/includes/ui/invoice_ui.inc:427
+#: ../purchasing/includes/ui/invoice_ui.inc:429
+#: ../taxes/sav.tax_types.php:172
 msgid "Add"
 msgstr ""
 
-#: dimensions/includes/dimensions_ui.inc:24
+#: ../dimensions/includes/dimensions_ui.inc:24
 msgid "There are no transactions for this dimension for the selected period."
 msgstr ""
 
-#: dimensions/includes/dimensions_ui.inc:28
+#: ../dimensions/includes/dimensions_ui.inc:28
 msgid "Balance for this Dimension"
 msgstr ""
 
-#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:94
-#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:179
-#: gl/manage/gl_quick_entries.php:241 gl/manage/gl_quick_entries.php:333
-#: includes/sysnames.inc:165 purchasing/includes/ui/invoice_ui.inc:265
-#: purchasing/includes/ui/invoice_ui.inc:267
-#: purchasing/includes/ui/invoice_ui.inc:269 reporting/rep701.php: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.orig:179
+#: ../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:102
-#: gl/bank_account_reconcile.php:235 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/gl_trial_balance.php:185 gl/inquiry/gl_trial_balance.php:187
-#: gl/inquiry/gl_trial_balance.php:189 gl/view/accrual_trans.php:60
-#: gl/view/gl_trans_view.php:69 gl/view/gl_trans_view.php:72
-#: gl/view/gl_trans_view.php:75 gl/includes/ui/gl_journal_ui.inc:87
-#: gl/includes/ui/gl_journal_ui.inc:90 gl/includes/ui/gl_journal_ui.inc:93
-#: purchasing/inquiry/supplier_allocation_inquiry.php:133
-#: purchasing/inquiry/supplier_inquiry.php:181 reporting/rep601.php:80
-#: reporting/rep602.php:81 reporting/rep702.php:54 reporting/rep704.php:84
-#: reporting/rep704.php:87 reporting/rep704.php:90 reporting/rep708.php:192
-#: reporting/rep708.php:193 sales/inquiry/customer_allocation_inquiry.php:151
-#: sales/inquiry/customer_inquiry.php:209
+#: ../dimensions/includes/dimensions_ui.inc:31
+#: ../gl/accruals.php:102
+#: ../gl/bank_account_reconcile.php:235
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_account_inquiry.php:143
+#: ../gl/inquiry/gl_trial_balance.php.orig:185
+#: ../gl/inquiry/gl_trial_balance.php.orig:187
+#: ../gl/inquiry/gl_trial_balance.php.orig:189
+#: ../gl/view/accrual_trans.php:60
+#: ../gl/view/gl_trans_view.php:69
+#: ../gl/view/gl_trans_view.php:72
+#: ../gl/view/gl_trans_view.php:75
+#: ../gl/includes/ui/gl_journal_ui.inc:87
+#: ../gl/includes/ui/gl_journal_ui.inc:90
+#: ../gl/includes/ui/gl_journal_ui.inc:93
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:134
+#: ../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:102
-#: gl/bank_account_reconcile.php:236 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/gl_trial_balance.php:186 gl/inquiry/gl_trial_balance.php:188
-#: gl/inquiry/gl_trial_balance.php:190 gl/view/accrual_trans.php:60
-#: gl/view/gl_trans_view.php:69 gl/view/gl_trans_view.php:72
-#: gl/view/gl_trans_view.php:75 gl/includes/ui/gl_journal_ui.inc:87
-#: gl/includes/ui/gl_journal_ui.inc:90 gl/includes/ui/gl_journal_ui.inc:93
-#: includes/sysnames.inc:85
-#: purchasing/inquiry/supplier_allocation_inquiry.php:134
-#: purchasing/inquiry/supplier_inquiry.php:182 reporting/rep601.php:80
-#: reporting/rep602.php:81 reporting/rep702.php:54 reporting/rep704.php:84
-#: reporting/rep704.php:87 reporting/rep704.php:90 reporting/rep708.php:192
-#: reporting/rep708.php:193 sales/inquiry/customer_allocation_inquiry.php:152
-#: sales/inquiry/customer_inquiry.php:210
+#: ../dimensions/includes/dimensions_ui.inc:31
+#: ../gl/accruals.php:102
+#: ../gl/bank_account_reconcile.php:236
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_account_inquiry.php:143
+#: ../gl/inquiry/gl_trial_balance.php.orig:186
+#: ../gl/inquiry/gl_trial_balance.php.orig:188
+#: ../gl/inquiry/gl_trial_balance.php.orig:190
+#: ../gl/view/accrual_trans.php:60
+#: ../gl/view/gl_trans_view.php:69
+#: ../gl/view/gl_trans_view.php:72
+#: ../gl/view/gl_trans_view.php:75
+#: ../gl/includes/ui/gl_journal_ui.inc:87
+#: ../gl/includes/ui/gl_journal_ui.inc:90
+#: ../gl/includes/ui/gl_journal_ui.inc:93
+#: ../includes/sysnames.inc:85
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:135
+#: ../purchasing/inquiry/supplier_inquiry.php: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:183
-#: purchasing/inquiry/supplier_allocation_inquiry.php:136
-#: reporting/rep203.php:94 reporting/rep204.php:84 reporting/rep307.php:117
-#: reporting/rep601.php:80 reporting/rep602.php:81 reporting/rep701.php:111
-#: reporting/rep704.php:84 reporting/rep704.php:87 reporting/rep704.php:90
-#: reporting/rep708.php:185 sales/inquiry/customer_allocation_inquiry.php:154
+#: ../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.orig:183
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:137
+#: ../reporting/rep101.php:151
+#: ../reporting/rep201.php:139
+#: ../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 ""
 
-#: dimensions/inquiry/search_dimensions.php:29
+#: ../dimensions/inquiry/search_dimensions.php:29
 msgid "Search Outstanding Dimensions"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:34
+#: ../dimensions/inquiry/search_dimensions.php:34
 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:30
-#: includes/ui/contacts_view.inc:94
-#: inventory/includes/item_adjustments_ui.inc:35
-#: inventory/includes/stock_transfers_ui.inc:40
-#: manufacturing/search_work_orders.php:67
-#: manufacturing/work_order_add_finished.php:198
-#: manufacturing/work_order_costs.php:134
-#: manufacturing/includes/work_order_issue_ui.inc:156
-#: purchasing/includes/ui/invoice_ui.inc:104
-#: purchasing/supplier_payment.php:294
+#: ../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:30
+#: ../includes/ui/contacts_view.inc:94
+#: ../inventory/includes/item_adjustments_ui.inc:35
+#: ../inventory/includes/stock_transfers_ui.inc:40
+#: ../manufacturing/search_work_orders.php:67
+#: ../manufacturing/work_order_add_finished.php:198
+#: ../manufacturing/work_order_costs.php:134
+#: ../manufacturing/work_order_entry.php:378
+#: ../manufacturing/work_order_entry.php:385
+#: ../manufacturing/includes/work_order_issue_ui.inc:156
+#: ../purchasing/includes/ui/invoice_ui.inc:119
+#: ../purchasing/includes/ui/po_ui.inc:184
+#: ../purchasing/includes/ui/po_ui.inc:189
+#: ../purchasing/supplier_payment.php.orig:294
+#: ../sales/customer_payments.php.orig:378
 msgid "Reference:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:75
-#: includes/ui/allocation_cart.inc:286 includes/ui/ui_lists.inc:1924
-#: reporting/rep102.php:96 reporting/rep104.php:97 reporting/rep104.php:101
-#: reporting/rep105.php:95 reporting/rep105.php:99 reporting/rep202.php:100
-#: reporting/rep203.php:74 reporting/rep204.php:77 reporting/rep301.php:92
-#: reporting/rep301.php:99 reporting/rep302.php:105 reporting/rep302.php:112
-#: reporting/rep304.php:98 reporting/rep304.php:103 reporting/rep304.php:108
-#: reporting/rep306.php:120 reporting/rep306.php:125 reporting/rep306.php:130
-#: reporting/rep306.php:135 reporting/rep307.php:103 reporting/rep307.php:110
-#: reporting/rep308.php:138 reporting/rep308.php:143 reporting/rep309.php:92
-#: reporting/rep702.php:61 reporting/rep710.php:86 reporting/rep710.php:87
+#: ../dimensions/inquiry/search_dimensions.php:75
+#: ../includes/ui/allocation_cart.inc:313
+#: ../includes/ui/ui_lists.inc:1927
+#: ../reporting/rep101.php:129
+#: ../reporting/rep102.php:96
+#: ../reporting/rep104.php:97
+#: ../reporting/rep104.php:101
+#: ../reporting/rep105.php:95
+#: ../reporting/rep105.php:99
+#: ../reporting/rep201.php:117
+#: ../reporting/rep202.php:100
+#: ../reporting/rep203.php:74
+#: ../reporting/rep204.php:77
+#: ../reporting/rep301.php:92
+#: ../reporting/rep301.php:99
+#: ../reporting/rep302.php:105
+#: ../reporting/rep302.php:112
+#: ../reporting/rep303.php: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:138
+#: ../reporting/rep308.php:143
+#: ../reporting/rep309.php:92
+#: ../reporting/rep702.php:61
+#: ../reporting/rep710.php:86
+#: ../reporting/rep710.php:87
 msgid "All"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:76 gl/inquiry/bank_inquiry.php:49
-#: gl/inquiry/gl_trial_balance.php:49 gl/inquiry/journal_inquiry.php:48
-#: gl/inquiry/profit_loss.php:163 gl/includes/ui/gl_bank_ui.inc:51
-#: gl/includes/ui/gl_bank_ui.inc:118 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
+#: ../dimensions/inquiry/search_dimensions.php:76
+#: ../gl/inquiry/bank_inquiry.php:49
+#: ../gl/inquiry/gl_trial_balance.php:54
+#: ../gl/inquiry/gl_trial_balance.php.orig:49
+#: ../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:50 gl/inquiry/journal_inquiry.php:49
-#: gl/inquiry/profit_loss.php:164 inventory/inquiry/stock_movements.php:59
-#: purchasing/inquiry/supplier_allocation_inquiry.php:51
-#: purchasing/inquiry/supplier_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:47
+#: ../dimensions/inquiry/search_dimensions.php:77
+#: ../gl/inquiry/bank_inquiry.php:50
+#: ../gl/inquiry/gl_trial_balance.php:55
+#: ../gl/inquiry/gl_trial_balance.php.orig:50
+#: ../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:71
+#: ../dimensions/inquiry/search_dimensions.php:79
+#: ../manufacturing/search_work_orders.php:71
 msgid "Only Overdue:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:83
-#: manufacturing/search_work_orders.php:74
+#: ../dimensions/inquiry/search_dimensions.php:83
+#: ../manufacturing/search_work_orders.php:74
 msgid "Only Open:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:132
-#: dimensions/view/view_dimension.php:55 includes/ui/allocation_cart.inc:264
-#: purchasing/includes/ui/invoice_ui.inc:123
-#: purchasing/view/view_supp_credit.php:48
-#: purchasing/view/view_supp_invoice.php:52
-#: purchasing/inquiry/supplier_allocation_inquiry.php:131
-#: purchasing/inquiry/supplier_inquiry.php:179 reporting/rep203.php:93
-#: reporting/rep501.php:87 reporting/includes/doctext.inc:112
-#: reporting/includes/doctext.inc:144 reporting/includes/doctext.inc:165
-#: reporting/includes/doctext.inc:167 reporting/includes/doctext.inc:206
-#: reporting/includes/doctext.inc:208 sales/customer_invoice.php:510
-#: sales/view/view_dispatch.php:97 sales/view/view_invoice.php:96
-#: sales/inquiry/customer_allocation_inquiry.php:148
-#: sales/inquiry/customer_inquiry.php:205
-#: sales/includes/ui/sales_order_ui.inc:603
+#: ../dimensions/inquiry/search_dimensions.php:132
+#: ../dimensions/view/view_dimension.php:55
+#: ../includes/ui/allocation_cart.inc:289
+#: ../purchasing/includes/ui/invoice_ui.inc:138
+#: ../purchasing/view/view_supp_credit.php:48
+#: ../purchasing/view/view_supp_invoice.php:52
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:132
+#: ../purchasing/inquiry/supplier_inquiry.php:179
+#: ../reporting/rep101.php:147
+#: ../reporting/rep201.php:135
+#: ../reporting/rep203.php:93
+#: ../reporting/rep501.php:87
+#: ../reporting/includes/doctext.inc:112
+#: ../reporting/includes/doctext.inc:144
+#: ../reporting/includes/doctext.inc:165
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:206
+#: ../reporting/includes/doctext.inc:208
+#: ../sales/customer_invoice.php:510
+#: ../sales/view/view_dispatch.php:97
+#: ../sales/view/view_invoice.php:96
+#: ../sales/inquiry/customer_allocation_inquiry.php:149
+#: ../sales/inquiry/customer_inquiry.php:205
+#: ../sales/includes/ui/sales_order_ui.inc:602
 msgid "Due Date"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:143
+#: ../dimensions/inquiry/search_dimensions.php:143
 msgid "Marked dimensions are overdue."
 msgstr ""
 
-#: dimensions/view/view_dimension.php:20
+#: ../dimensions/view/view_dimension.php:20
 msgid "View Dimension"
 msgstr ""
 
-#: dimensions/view/view_dimension.php:49
+#: ../dimensions/view/view_dimension.php:49
 msgid "The dimension number sent is not valid."
 msgstr ""
 
-#: dimensions/view/view_dimension.php:73
+#: ../dimensions/view/view_dimension.php:73
 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:62
-#: purchasing/inquiry/po_search.php:64
-#: sales/inquiry/customer_allocation_inquiry.php:44
-#: sales/inquiry/sales_deliveries_view.php:104
+#: ../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.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_orders_view.php.orig:251
 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:63
-#: purchasing/inquiry/po_search.php:65
-#: sales/inquiry/customer_allocation_inquiry.php:45
-#: sales/inquiry/sales_deliveries_view.php:105
+#: ../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.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_orders_view.php.orig:252
 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:58 gl/inquiry/profit_loss.php:178
-#: gl/inquiry/tax_inquiry.php:63
+#: ../dimensions/view/view_dimension.php:87
+#: ../gl/inquiry/balance_sheet.php:131
+#: ../gl/inquiry/bank_inquiry.php:52
+#: ../gl/inquiry/gl_account_inquiry.php:85
+#: ../gl/inquiry/gl_trial_balance.php:63
+#: ../gl/inquiry/gl_trial_balance.php.orig:58
+#: ../gl/inquiry/profit_loss.php:183
+#: ../gl/inquiry/tax_inquiry.php:63
 msgid "Show"
 msgstr ""
 
-#: gl/accruals.php:20 includes/access_levels.inc:245
+#: ../gl/accruals.php:20
+#: ../includes/access_levels.inc:245
 msgid "Revenue / Cost Accruals"
 msgstr ""
 
-#: gl/accruals.php:38 gl/bank_transfer.php:121 gl/gl_bank.php:270
-#: gl/gl_journal.php:167 gl/manage/revaluate_currencies.php:59
-#: inventory/adjustments.php:114 inventory/transfers.php:109
-#: manufacturing/work_order_add_finished.php:104
-#: manufacturing/work_order_costs.php:86 manufacturing/work_order_issue.php:84
-#: purchasing/po_entry_items.php:345 purchasing/po_receive_items.php:179
-#: purchasing/supplier_credit.php:193 purchasing/supplier_invoice.php:199
-#: purchasing/supplier_payment.php:181 sales/create_recurrent_invoices.php:121
-#: sales/credit_note_entry.php:157 sales/customer_credit_invoice.php:95
-#: sales/customer_delivery.php:165 sales/customer_invoice.php:318
-#: sales/customer_payments.php:151 sales/sales_order_entry.php:364
+#: ../gl/accruals.php:38
+#: ../gl/bank_transfer.php:121
+#: ../gl/gl_bank.php:269
+#: ../gl/gl_journal.php:167
+#: ../gl/manage/revaluate_currencies.php:59
+#: ../inventory/adjustments.php:114
+#: ../inventory/transfers.php:109
+#: ../manufacturing/work_order_add_finished.php:104
+#: ../manufacturing/work_order_costs.php:86
+#: ../manufacturing/work_order_entry.php:160
+#: ../manufacturing/work_order_issue.php:84
+#: ../purchasing/po_entry_items.php:345
+#: ../purchasing/po_receive_items.php:179
+#: ../purchasing/supplier_credit.php:192
+#: ../purchasing/supplier_invoice.php:199
+#: ../purchasing/supplier_payment.php.orig:181
+#: ../sales/create_recurrent_invoices.php:121
+#: ../sales/credit_note_entry.php:157
+#: ../sales/customer_credit_invoice.php:95
+#: ../sales/customer_delivery.php:165
+#: ../sales/customer_invoice.php:318
+#: ../sales/customer_payments.php.orig:151
+#: ../sales/sales_order_entry.php:365
 msgid ""
 "The entered date is out of fiscal year or is closed for further data entry."
 msgstr ""
 
-#: gl/accruals.php:44
+#: ../gl/accruals.php:44
 msgid "The amount can not be 0."
 msgstr ""
 
-#: gl/accruals.php:50
+#: ../gl/accruals.php:50
 msgid "The periods must be greater than 0."
 msgstr ""
 
-#: gl/accruals.php:71
+#: ../gl/accruals.php:71
 msgid ""
 "Some of the period dates are outside the fiscal year or are closed for "
 "further data entry. Create a new fiscal year first!"
 msgstr ""
 
-#: gl/accruals.php:86
+#: ../gl/accruals.php:86
 #, php-format
 msgid "Accruals for %s"
 msgstr ""
 
-#: gl/accruals.php:96 gl/accruals.php:98 gl/accruals.php:207
-#: gl/accruals.php:209 gl/gl_budget.php:71 gl/gl_budget.php:72
-#: gl/gl_budget.php:76 gl/inquiry/balance_sheet.php:128
-#: gl/inquiry/balance_sheet.php:130 gl/inquiry/gl_account_inquiry.php:79
-#: gl/inquiry/gl_account_inquiry.php:81 gl/inquiry/gl_account_inquiry.php:134
-#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_trial_balance.php:52
-#: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/profit_loss.php:174
-#: gl/inquiry/profit_loss.php:176 gl/manage/gl_quick_entries.php:261
-#: gl/manage/gl_quick_entries.php:263 gl/manage/gl_quick_entries.php:343
-#: gl/manage/gl_quick_entries.php:345 gl/view/accrual_trans.php:54
-#: gl/view/accrual_trans.php:56 gl/view/gl_deposit_view.php:99
-#: gl/view/gl_deposit_view.php:102 gl/view/gl_payment_view.php:98
-#: gl/view/gl_payment_view.php:101 gl/view/gl_trans_view.php:68
-#: gl/view/gl_trans_view.php:71 gl/includes/ui/gl_bank_ui.inc:151
-#: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_bank_ui.inc:154
-#: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:87
-#: gl/includes/ui/gl_journal_ui.inc:89 includes/sysnames.inc:43
-#: includes/sysnames.inc:166 inventory/manage/item_categories.php:220
-#: inventory/manage/item_categories.php:222
-#: purchasing/includes/ui/invoice_ui.inc:265
-#: purchasing/includes/ui/invoice_ui.inc:267
-#: purchasing/manage/suppliers.php:145 purchasing/manage/suppliers.php:146
-#: purchasing/manage/suppliers.php:148 reporting/rep205.php:161
-#: reporting/rep205.php:173 reporting/rep501.php:92 reporting/rep704.php:83
-#: reporting/rep704.php:86 reporting/rep704.php:97 reporting/rep704.php:99
-#: reporting/rep704.php:107 reporting/rep705.php:249 reporting/rep705.php:251
-#: reporting/rep705.php:262 reporting/rep706.php:194 reporting/rep706.php:196
-#: reporting/rep706.php:204 reporting/rep707.php:218 reporting/rep707.php:220
-#: reporting/rep707.php:228 reporting/rep708.php:201 reporting/rep708.php:203
-#: reporting/rep708.php:210 sales/customer_delivery.php:409
-#: sales/customer_delivery.php:417 sales/customer_invoice.php:475
-#: sales/customer_invoice.php:518 sales/manage/customers.php:270
-#: sales/manage/customers.php:272 sales/includes/ui/sales_credit_ui.inc:132
-#: sales/includes/ui/sales_credit_ui.inc:137
-#: sales/includes/ui/sales_order_ui.inc:458
-#: sales/includes/ui/sales_order_ui.inc:463
+#: ../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/gl_trial_balance.php.orig:52
+#: ../gl/inquiry/gl_trial_balance.php.orig:54
+#: ../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: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:145
+#: ../purchasing/manage/suppliers.php:146
+#: ../purchasing/manage/suppliers.php:148
+#: ../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
+#: ../sales/customer_delivery.php:409
+#: ../sales/customer_delivery.php:417
+#: ../sales/customer_invoice.php:475
+#: ../sales/customer_invoice.php:518
+#: ../sales/manage/customers.php:273
+#: ../sales/manage/customers.php:275
+#: ../sales/includes/ui/sales_credit_ui.inc:132
+#: ../sales/includes/ui/sales_credit_ui.inc:137
+#: ../sales/includes/ui/sales_order_ui.inc:457
+#: ../sales/includes/ui/sales_order_ui.inc:462
 msgid "Dimension"
 msgstr ""
 
-#: gl/accruals.php:102 gl/accruals.php:217 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/journal_inquiry.php:133 gl/view/accrual_trans.php:60
-#: gl/view/gl_deposit_view.php:100 gl/view/gl_deposit_view.php:103
-#: gl/view/gl_deposit_view.php:106 gl/view/gl_payment_view.php:99
-#: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105
-#: gl/view/gl_trans_view.php:69 gl/view/gl_trans_view.php:72
-#: gl/view/gl_trans_view.php:75 gl/includes/ui/gl_bank_ui.inc:152
-#: gl/includes/ui/gl_bank_ui.inc:155 gl/includes/ui/gl_bank_ui.inc:158
-#: gl/includes/ui/gl_bank_ui.inc:298 gl/includes/ui/gl_journal_ui.inc:87
-#: gl/includes/ui/gl_journal_ui.inc:90 gl/includes/ui/gl_journal_ui.inc:93
-#: gl/includes/ui/gl_journal_ui.inc:276
-#: inventory/includes/item_adjustments_ui.inc:181
-#: inventory/includes/stock_transfers_ui.inc:161
-#: manufacturing/view/wo_costs_view.php:46
-#: manufacturing/includes/work_order_issue_ui.inc:169
-#: purchasing/includes/ui/invoice_ui.inc:265
-#: purchasing/includes/ui/invoice_ui.inc:267
-#: purchasing/includes/ui/invoice_ui.inc:269
-#: sales/customer_credit_invoice.php:364 sales/customer_delivery.php:541
-#: sales/includes/ui/sales_credit_ui.inc:339
+#: ../gl/accruals.php:102
+#: ../gl/accruals.php:217
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_account_inquiry.php:143
+#: ../gl/inquiry/journal_inquiry.php:133
+#: ../gl/view/accrual_trans.php:60
+#: ../gl/view/gl_deposit_view.php: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
+#: ../inventory/includes/item_adjustments_ui.inc:181
+#: ../inventory/includes/stock_transfers_ui.inc:161
+#: ../manufacturing/view/wo_costs_view.php:46
+#: ../manufacturing/includes/work_order_issue_ui.inc:169
+#: ../purchasing/includes/ui/invoice_ui.inc: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:543
+#: ../sales/includes/ui/sales_credit_ui.inc:339
 msgid "Memo"
 msgstr ""
 
-#: gl/accruals.php:166
+#: ../gl/accruals.php:166
 msgid "Revenue / Cost Accruals have been processed."
 msgstr ""
 
-#: gl/accruals.php:172
+#: ../gl/accruals.php:172
 msgid "Showing GL Transactions."
 msgstr ""
 
-#: gl/accruals.php:184
+#: ../gl/accruals.php:184
 msgid "Weekly"
 msgstr ""
 
-#: gl/accruals.php:185
+#: ../gl/accruals.php:185
 msgid "Bi-weekly"
 msgstr ""
 
-#: gl/accruals.php:186 gl/manage/gl_quick_entries.php:240
-#: gl/includes/ui/gl_journal_ui.inc:57 sales/create_recurrent_invoices.php: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
+#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/manage/recurrent_invoices.php:102
 msgid "Monthly"
 msgstr ""
 
-#: gl/accruals.php:187
+#: ../gl/accruals.php:187
 msgid "Quarterly"
 msgstr ""
 
-#: gl/accruals.php:199
+#: ../gl/accruals.php:199
 msgid "First date of Accruals"
 msgstr ""
 
-#: gl/accruals.php:201
+#: ../gl/accruals.php:201
 msgid "Accrued Balance Account"
 msgstr ""
 
-#: gl/accruals.php:204
+#: ../gl/accruals.php:204
 msgid "Revenue / Cost Account"
 msgstr ""
 
-#: gl/accruals.php:212 gl/gl_budget.php:91 gl/gl_budget.php:93
-#: gl/inquiry/journal_inquiry.php:132 gl/inquiry/tax_inquiry.php:82
-#: gl/manage/gl_quick_entries.php:261 gl/manage/gl_quick_entries.php:263
-#: gl/manage/gl_quick_entries.php:265 gl/manage/gl_quick_entries.php:339
-#: gl/view/bank_transfer_view.php:70 gl/view/bank_transfer_view.php:80
-#: gl/view/gl_deposit_view.php:67 gl/view/gl_deposit_view.php:100
-#: gl/view/gl_deposit_view.php:103 gl/view/gl_deposit_view.php:106
-#: gl/view/gl_payment_view.php:65 gl/view/gl_payment_view.php:99
-#: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105
-#: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_bank_ui.inc:155
-#: gl/includes/ui/gl_bank_ui.inc:158 includes/sysnames.inc:133
-#: includes/ui/allocation_cart.inc:264 includes/ui/ui_lists.inc:1182
-#: manufacturing/view/wo_costs_view.php:46
-#: manufacturing/includes/manufacturing_ui.inc:236
-#: purchasing/includes/ui/invoice_ui.inc:265
-#: purchasing/includes/ui/invoice_ui.inc:267
-#: purchasing/includes/ui/invoice_ui.inc:269
-#: purchasing/view/view_supp_payment.php:60
-#: purchasing/view/view_supp_payment.php:72 reporting/rep202.php:253
-#: reporting/rep209.php:195 reporting/rep706.php:309 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/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:289
+#: ../includes/ui/ui_lists.inc:1185
+#: ../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/rep109.php:195
+#: ../reporting/rep110.php:193
+#: ../reporting/rep111.php:174
+#: ../reporting/rep113.php:178
+#: ../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
 msgid "Amount"
 msgstr ""
 
-#: gl/accruals.php:212
+#: ../gl/accruals.php:212
 msgid "Search Amount"
 msgstr ""
 
-#: gl/accruals.php:214
+#: ../gl/accruals.php:214
 msgid "Frequency"
 msgstr ""
 
-#: gl/accruals.php:216
+#: ../gl/accruals.php:216
 msgid "Periods"
 msgstr ""
 
-#: gl/accruals.php:220
+#: ../gl/accruals.php:220
 msgid "Show GL Rows"
 msgstr ""
 
-#: gl/accruals.php:221
+#: ../gl/accruals.php:221
 msgid "Process Accruals"
 msgstr ""
 
-#: gl/accruals.php:222
+#: ../gl/accruals.php:222
 msgid "Are you sure you want to post accruals?"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:33
+#: ../gl/bank_account_reconcile.php:33
 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:39
+#: ../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
+#: ../purchasing/supplier_payment.php.orig:42
+#: ../sales/customer_payments.php:38
+#: ../sales/customer_payments.php.orig:39
 msgid "There are no bank accounts defined in the system."
 msgstr ""
 
-#: gl/bank_account_reconcile.php:39
+#: ../gl/bank_account_reconcile.php:39
 msgid "Invalid reconcile date format"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:56
+#: ../gl/bank_account_reconcile.php:56
 msgid "Reconcile this transaction"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:164 gl/inquiry/bank_inquiry.php:47
-#: gl/inquiry/gl_account_inquiry.php:70
+#: ../gl/bank_account_reconcile.php:164
+#: ../gl/inquiry/bank_inquiry.php:47
+#: ../gl/inquiry/gl_account_inquiry.php:70
 msgid "Account:"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:166
+#: ../gl/bank_account_reconcile.php:166
 msgid "Bank Statement:"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:167
+#: ../gl/bank_account_reconcile.php:167
+#: ../taxes/sav.tax_types.php:183
 msgid "New"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:196
+#: ../gl/bank_account_reconcile.php:196
 msgid "Reconcile Date"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:196
+#: ../gl/bank_account_reconcile.php:196
 msgid "Beginning<br>Balance"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:197
+#: ../gl/bank_account_reconcile.php:197
 msgid "Ending<br>Balance"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:197
+#: ../gl/bank_account_reconcile.php:197
 msgid "Account<br>Total"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:197
+#: ../gl/bank_account_reconcile.php:197
 msgid "Reconciled<br>Amount"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:197 reporting/rep602.php:205
+#: ../gl/bank_account_reconcile.php:197
+#: ../reporting/rep602.php:205
 msgid "Difference"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:201
+#: ../gl/bank_account_reconcile.php:201
 msgid "Date of bank statement to reconcile"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:237 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/view/accrual_trans.php:60 reporting/rep601.php:79
-#: reporting/rep602.php:80 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/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 ""
 
-#: gl/bank_account_reconcile.php:247
+#: ../gl/bank_account_reconcile.php:247
 msgid "Reconcile"
 msgstr ""
 
-#: gl/bank_transfer.php:28
+#: ../gl/bank_transfer.php:28
 msgid "Transfer between Bank Accounts"
 msgstr ""
 
-#: gl/bank_transfer.php:39 gl/manage/revaluate_currencies.php:35
+#: ../gl/bank_transfer.php:39
+#: ../gl/manage/revaluate_currencies.php:35
 msgid "Transfer has been entered"
 msgstr ""
 
-#: gl/bank_transfer.php:41 gl/manage/revaluate_currencies.php:37
+#: ../gl/bank_transfer.php:41
+#: ../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
 msgid "Enter &Another Transfer"
 msgstr ""
 
-#: gl/bank_transfer.php:66
+#: ../gl/bank_transfer.php:66
 msgid "From Account:"
 msgstr ""
 
-#: gl/bank_transfer.php:70
+#: ../gl/bank_transfer.php:70
 msgid "To Account:"
 msgstr ""
 
-#: gl/bank_transfer.php:77
+#: ../gl/bank_transfer.php:77
 msgid "Transfer Date:"
 msgstr ""
 
-#: gl/bank_transfer.php:87 gl/bank_transfer.php:94
+#: ../gl/bank_transfer.php:87
+#: ../gl/bank_transfer.php:94
+#: ../sales/customer_payments.php.orig:407
 msgid "Amount:"
 msgstr ""
 
-#: gl/bank_transfer.php:88 gl/bank_transfer.php:95
-#: purchasing/supplier_payment.php:307
+#: ../gl/bank_transfer.php:88
+#: ../gl/bank_transfer.php:95
+#: ../purchasing/supplier_payment.php.orig:307
+#: ../sales/customer_payments.php.orig:392
 msgid "Bank Charge:"
 msgstr ""
 
-#: gl/bank_transfer.php:102
+#: ../gl/bank_transfer.php:90
+msgid "Incoming Amount:"
+msgstr ""
+
+#: ../gl/bank_transfer.php:102
 msgid "Enter Transfer"
 msgstr ""
 
-#: gl/bank_transfer.php:128 gl/bank_transfer.php:158
-#: purchasing/supplier_payment.php:126 purchasing/supplier_payment.php:132
+#: ../gl/bank_transfer.php:128
+#: ../gl/bank_transfer.php:158
+#: ../gl/bank_transfer.php:190
+#: ../purchasing/supplier_payment.php.orig:126
+#: ../purchasing/supplier_payment.php.orig:132
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
-#: gl/bank_transfer.php:133 gl/gl_bank.php:228
+#: ../gl/bank_transfer.php:133
+#: ../gl/gl_bank.php:227
 msgid "The total bank amount cannot be 0."
 msgstr ""
 
-#: gl/bank_transfer.php:144
+#: ../gl/bank_transfer.php:144
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s) for source account."
 msgstr ""
 
-#: gl/bank_transfer.php:150 gl/gl_bank.php:245
+#: ../gl/bank_transfer.php:150
+#: ../gl/gl_bank.php:244
 #, php-format
 msgid ""
 "The bank transaction would result in exceed of authorized overdraft limit "
 "for transaction: %s #%s on %s."
 msgstr ""
 
-#: gl/bank_transfer.php:163 purchasing/supplier_payment.php:140
-#: sales/customer_payments.php:190
+#: ../gl/bank_transfer.php:163
+#: ../purchasing/supplier_payment.php.orig:140
+#: ../sales/customer_payments.php.orig:190
 msgid ""
 "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
 
-#: gl/bank_transfer.php:169 gl/gl_bank.php:252 gl/gl_journal.php:173
-#: gl/manage/revaluate_currencies.php:65 inventory/adjustments.php:94
-#: inventory/transfers.php:91 manufacturing/work_order_add_finished.php:77
-#: manufacturing/work_order_issue.php:90 purchasing/po_receive_items.php:186
-#: purchasing/supplier_payment.php:197 sales/credit_note_entry.php:147
-#: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:178
-#: sales/customer_invoice.php:332 sales/customer_payments.php:157
-#: sales/sales_order_entry.php:428
+#: ../gl/bank_transfer.php:169
+#: ../gl/gl_bank.php:251
+#: ../gl/gl_journal.php:173
+#: ../gl/manage/revaluate_currencies.php:65
+#: ../inventory/adjustments.php:94
+#: ../inventory/transfers.php:91
+#: ../manufacturing/work_order_add_finished.php:77
+#: ../manufacturing/work_order_entry.php:132
+#: ../manufacturing/work_order_issue.php:90
+#: ../purchasing/po_receive_items.php:186
+#: ../purchasing/supplier_payment.php.orig:197
+#: ../sales/credit_note_entry.php:147
+#: ../sales/customer_credit_invoice.php:102
+#: ../sales/customer_delivery.php:178
+#: ../sales/customer_invoice.php:332
+#: ../sales/customer_payments.php.orig:157
+#: ../sales/sales_order_entry.php:429
 msgid "You must enter a reference."
 msgstr ""
 
-#: gl/bank_transfer.php:183
+#: ../gl/bank_transfer.php:183
 msgid "The source and destination bank accouts cannot be the same."
 msgstr ""
 
-#: gl/gl_bank.php:34
+#: ../gl/bank_transfer.php:195
+msgid "The incomming bank amount cannot be 0."
+msgstr ""
+
+#: ../gl/gl_bank.php:34
 msgid "Bank Account Payment Entry"
 msgstr ""
 
-#: gl/gl_bank.php:37
+#: ../gl/gl_bank.php:37
 msgid "Bank Account Deposit Entry"
 msgstr ""
 
-#: gl/gl_bank.php:40
+#: ../gl/gl_bank.php:40
 msgid "Modify Bank Account Entry"
 msgstr ""
 
-#: gl/gl_bank.php:43
+#: ../gl/gl_bank.php:43
 msgid "Modify Bank Deposit Entry"
 msgstr ""
 
-#: gl/gl_bank.php:76
+#: ../gl/gl_bank.php:77
 #, php-format
 msgid "Payment %d has been entered"
 msgstr ""
 
-#: gl/gl_bank.php:78 gl/gl_bank.php:96
+#: ../gl/gl_bank.php:79
+#: ../gl/gl_bank.php:97
 msgid "&View the GL Postings for this Payment"
 msgstr ""
 
-#: gl/gl_bank.php:80 gl/gl_bank.php:98
+#: ../gl/gl_bank.php:81
+#: ../gl/gl_bank.php:99
 msgid "Enter Another &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:82 gl/gl_bank.php:100
+#: ../gl/gl_bank.php:83
+#: ../gl/gl_bank.php:101
 msgid "Enter A &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:84 gl/gl_journal.php:63 inventory/adjustments.php:50
-#: purchasing/po_entry_items.php:115 purchasing/po_entry_items.php:139
-#: purchasing/supplier_credit.php:84 purchasing/supplier_invoice.php:75
-#: sales/credit_note_entry.php:77 sales/customer_credit_invoice.php:62
-#: sales/customer_invoice.php:69 sales/sales_order_entry.php:240
+#: ../gl/gl_bank.php:85
+#: ../gl/gl_journal.php:63
+#: ../inventory/adjustments.php:50
+#: ../manufacturing/work_order_entry.php:68
+#: ../purchasing/po_entry_items.php:115
+#: ../purchasing/po_entry_items.php:139
+#: ../purchasing/supplier_credit.php:83
+#: ../purchasing/supplier_invoice.php:75
+#: ../sales/credit_note_entry.php:77
+#: ../sales/customer_credit_invoice.php:62
+#: ../sales/customer_invoice.php:69
+#: ../sales/sales_order_entry.php:240
 msgid "Add an Attachment"
 msgstr ""
 
-#: gl/gl_bank.php:94
+#: ../gl/gl_bank.php:95
 #, php-format
 msgid "Payment %d has been modified"
 msgstr ""
 
-#: gl/gl_bank.php:110
+#: ../gl/gl_bank.php:111
 #, php-format
 msgid "Deposit %d has been entered"
 msgstr ""
 
-#: gl/gl_bank.php:112
+#: ../gl/gl_bank.php:113
 msgid "View the GL Postings for this Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:114
+#: ../gl/gl_bank.php:115
 msgid "Enter Another Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:116
+#: ../gl/gl_bank.php:117
 msgid "Enter A Payment"
 msgstr ""
 
-#: gl/gl_bank.php:125
+#: ../gl/gl_bank.php:126
 #, php-format
 msgid "Deposit %d has been modified"
 msgstr ""
 
-#: gl/gl_bank.php:127
+#: ../gl/gl_bank.php:128
 msgid "&View the GL Postings for this Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:129
+#: ../gl/gl_bank.php:130
 msgid "Enter Another &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:131
+#: ../gl/gl_bank.php:132
 msgid "Enter A &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:222
+#: ../gl/gl_bank.php:221
 msgid "You must enter at least one payment line."
 msgstr ""
 
-#: gl/gl_bank.php:239 purchasing/supplier_payment.php:190
+#: ../gl/gl_bank.php:238
+#: ../purchasing/supplier_payment.php.orig:190
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
 
-#: gl/gl_bank.php:264
+#: ../gl/gl_bank.php:263
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
-#: gl/gl_bank.php:276
+#: ../gl/gl_bank.php:275
 msgid "You have to select customer and customer branch."
 msgstr ""
 
-#: gl/gl_bank.php:280
+#: ../gl/gl_bank.php:279
 msgid "You have to select supplier."
 msgstr ""
 
-#: gl/gl_bank.php:328
+#: ../gl/gl_bank.php:287
+msgid "Settled amount have to be positive number."
+msgstr ""
+
+#: ../gl/gl_bank.php:332
 msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_bank.php:400
+#: ../gl/gl_bank.php:338
+#: ../gl/manage/exchange_rates.php:39
+msgid "The exchange rate cannot be zero or a negative number."
+msgstr ""
+
+#: ../gl/gl_bank.php:410
 msgid "Payment Items"
 msgstr ""
 
-#: gl/gl_bank.php:400
+#: ../gl/gl_bank.php:410
 msgid "Deposit Items"
 msgstr ""
 
-#: gl/gl_bank.php:408
+#: ../gl/gl_bank.php:418
 msgid "Process Payment"
 msgstr ""
 
-#: gl/gl_bank.php:408
+#: ../gl/gl_bank.php:418
 msgid "Process Deposit"
 msgstr ""
 
-#: gl/gl_budget.php:18
+#: ../gl/gl_budget.php:18
 msgid "Budget Entry"
 msgstr ""
 
-#: gl/gl_budget.php:26 gl/manage/gl_accounts.php:23
+#: ../gl/gl_budget.php:26
+#: ../gl/manage/gl_accounts.php:23
 msgid ""
 "There are no account groups defined. Please define at least one account "
 "group before entering accounts."
 msgstr ""
 
-#: gl/gl_budget.php:45
+#: ../gl/gl_budget.php:45
 msgid "The Budget has been saved."
 msgstr ""
 
-#: gl/gl_budget.php:47
+#: ../gl/gl_budget.php:47
 msgid "The Budget has been deleted."
 msgstr ""
 
-#: gl/gl_budget.php:64 gl/manage/gl_accounts.php:230
-#: gl/manage/gl_accounts.php:240
+#: ../gl/gl_budget.php:64
+#: ../gl/manage/gl_accounts.php:230
+#: ../gl/manage/gl_accounts.php:240
 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
 msgid "Get"
 msgstr ""
 
-#: gl/gl_budget.php:91 gl/gl_budget.php:93 gl/inquiry/profit_loss.php:231
-#: gl/manage/gl_quick_entries.php:240 reporting/rep105.php:118
-#: reporting/rep106.php:92 reporting/rep114.php:90 reporting/rep304.php:121
-#: reporting/rep305.php:105 reporting/rep306.php:148 reporting/rep307.php:122
-#: reporting/rep308.php:155 reporting/rep309.php:103 reporting/rep601.php:85
-#: reporting/rep602.php:86 reporting/rep702.php:59 reporting/rep704.php:95
-#: reporting/rep704.php:105 reporting/rep704.php:113 reporting/rep706.php:185
-#: reporting/rep706.php:193 reporting/rep706.php:203 reporting/rep706.php:211
-#: reporting/rep707.php:210 reporting/rep707.php:217 reporting/rep707.php:227
-#: reporting/rep707.php:235 reporting/rep708.php:200 reporting/rep708.php:209
-#: reporting/rep708.php:216 reporting/rep709.php:106 reporting/rep710.php:85
+#: ../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:155
+#: ../reporting/rep105.php:118
+#: ../reporting/rep106.php:92
+#: ../reporting/rep114.php:90
+#: ../reporting/rep201.php:143
+#: ../reporting/rep304.php:121
+#: ../reporting/rep305.php:106
+#: ../reporting/rep306.php:148
+#: ../reporting/rep307.php:122
+#: ../reporting/rep308.php:155
+#: ../reporting/rep309.php:103
+#: ../reporting/rep601.php:85
+#: ../reporting/rep602.php:86
+#: ../reporting/rep702.php:59
+#: ../reporting/rep704.php:95
+#: ../reporting/rep704.php:105
+#: ../reporting/rep704.php:113
+#: ../reporting/rep706.php:185
+#: ../reporting/rep706.php:193
+#: ../reporting/rep706.php:203
+#: ../reporting/rep706.php:211
+#: ../reporting/rep707.php:210
+#: ../reporting/rep707.php:217
+#: ../reporting/rep707.php:227
+#: ../reporting/rep707.php:235
+#: ../reporting/rep708.php:200
+#: ../reporting/rep708.php:209
+#: ../reporting/rep708.php:216
+#: ../reporting/rep709.php:106
+#: ../reporting/rep710.php:85
 msgid "Period"
 msgstr ""
 
-#: gl/gl_budget.php:91
+#: ../gl/gl_budget.php:91
 msgid "Dim. incl."
 msgstr ""
 
-#: gl/gl_budget.php:91 gl/gl_budget.php:93
+#: ../gl/gl_budget.php:91
+#: ../gl/gl_budget.php:93
 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:218 gl/inquiry/profit_loss.php:115
-#: gl/inquiry/profit_loss.php:283 gl/view/gl_deposit_view.php:132
-#: gl/view/gl_payment_view.php:131 gl/view/gl_trans_view.php:115
-#: gl/includes/ui/gl_bank_ui.inc:201 gl/includes/ui/gl_journal_ui.inc:153
-#: inventory/includes/item_adjustments_ui.inc:63
-#: inventory/includes/item_adjustments_ui.inc:102
-#: manufacturing/includes/manufacturing_ui.inc:178
-#: purchasing/includes/ui/invoice_ui.inc:329
-#: purchasing/includes/ui/invoice_ui.inc:495
-#: purchasing/includes/ui/invoice_ui.inc:566
-#: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140
-#: purchasing/allocations/supplier_allocation_main.php:100
-#: reporting/rep106.php:84 reporting/rep106.php:119 reporting/rep106.php:162
-#: reporting/rep203.php:94 reporting/rep203.php:171 reporting/rep204.php:113
-#: reporting/rep204.php:141 reporting/rep301.php:133 reporting/rep301.php:170
-#: reporting/rep304.php:146 reporting/rep304.php:188 reporting/rep305.php:100
-#: reporting/rep305.php:126 reporting/rep305.php:182 reporting/rep306.php:141
-#: reporting/rep306.php:177 reporting/rep306.php:197 reporting/rep306.php:213
-#: reporting/rep306.php:262 reporting/rep306.php:277 reporting/rep306.php:288
-#: reporting/rep309.php:126 reporting/rep309.php:153 reporting/rep702.php:142
-#: reporting/rep705.php:152 reporting/rep706.php:106 reporting/rep706.php:255
-#: reporting/rep706.php:290 reporting/rep707.php:115
-#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:192
-#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:447
-#: sales/customer_invoice.php:542 sales/customer_invoice.php:545
-#: sales/allocations/customer_allocation_main.php:99
-#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
-#: sales/view/view_invoice.php: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:147
+#: ../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.orig:218
+#: ../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:115
+#: ../gl/includes/ui/gl_bank_ui.inc:202
+#: ../gl/includes/ui/gl_journal_ui.inc:153
+#: ../inventory/includes/item_adjustments_ui.inc:63
+#: ../inventory/includes/item_adjustments_ui.inc:102
+#: ../manufacturing/includes/manufacturing_ui.inc:178
+#: ../purchasing/includes/ui/invoice_ui.inc: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/rep106.php:84
+#: ../reporting/rep106.php:119
+#: ../reporting/rep106.php:162
+#: ../reporting/rep114.php:161
+#: ../reporting/rep203.php:94
+#: ../reporting/rep203.php:171
+#: ../reporting/rep204.php:113
+#: ../reporting/rep204.php:141
+#: ../reporting/rep301.php:133
+#: ../reporting/rep301.php:170
+#: ../reporting/rep304.php:146
+#: ../reporting/rep304.php:188
+#: ../reporting/rep305.php:101
+#: ../reporting/rep305.php:127
+#: ../reporting/rep305.php:183
+#: ../reporting/rep306.php:141
+#: ../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
+#: ../sales/customer_credit_invoice.php:281
+#: ../sales/customer_delivery.php:447
+#: ../sales/customer_invoice.php:542
+#: ../sales/customer_invoice.php:545
+#: ../sales/allocations/customer_allocation_main.php:99
+#: ../sales/view/view_credit.php:91
+#: ../sales/view/view_dispatch.php:113
+#: ../sales/view/view_invoice.php: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:147
 msgid "Total"
 msgstr ""
 
-#: gl/gl_journal.php:32
+#: ../gl/gl_journal.php:32
 #, php-format
 msgid "Modifying Journal Transaction # %d."
 msgstr ""
 
-#: gl/gl_journal.php:36 includes/sysnames.inc:22 includes/sysnames.inc:150
+#: ../gl/gl_journal.php:36
+#: ../includes/sysnames.inc:22
+#: ../includes/sysnames.inc:150
 msgid "Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:56
+#: ../gl/gl_journal.php:56
 msgid "Journal entry has been entered"
 msgstr ""
 
-#: gl/gl_journal.php:58 gl/gl_journal.php:73
+#: ../gl/gl_journal.php:58
+#: ../gl/gl_journal.php:73
 msgid "&View this Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:61
+#: ../gl/gl_journal.php:61
 msgid "Enter &New Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:71
+#: ../gl/gl_journal.php:71
 msgid "Journal entry has been updated"
 msgstr ""
 
-#: gl/gl_journal.php:75
+#: ../gl/gl_journal.php:75
 msgid "Return to Journal &Inquiry"
 msgstr ""
 
-#: gl/gl_journal.php:90
+#: ../gl/gl_journal.php:90
 msgid ""
 "You can edit directly only journal entries created via Journal Entry page."
 msgstr ""
 
-#: gl/gl_journal.php:91
+#: ../gl/gl_journal.php:91
 msgid "Entry &New Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:148
+#: ../gl/gl_journal.php:148
 msgid "You must enter at least one journal line."
 msgstr ""
 
-#: gl/gl_journal.php:154
+#: ../gl/gl_journal.php:154
+#: ../includes/ui/gl_cart.inc:128
 msgid ""
 "The journal must balance (debits equal to credits) before it can be "
 "processed."
 msgstr ""
 
-#: gl/gl_journal.php:216 gl/gl_journal.php:223
+#: ../gl/gl_journal.php:216
+#: ../gl/gl_journal.php:223
 msgid "Dimension is closed."
 msgstr ""
 
-#: gl/gl_journal.php:230
+#: ../gl/gl_journal.php:230
 msgid "You must enter either a debit amount or a credit amount."
 msgstr ""
 
-#: gl/gl_journal.php:237
+#: ../gl/gl_journal.php:237
 msgid "The debit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_journal.php:242
+#: ../gl/gl_journal.php:242
 msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_journal.php:248 includes/ui/ui_view.inc:675
-#: purchasing/supplier_credit.php:136 purchasing/supplier_invoice.php:144
+#: ../gl/gl_journal.php:248
+#: ../includes/ui/ui_view.inc:733
+#: ../purchasing/supplier_credit.php:135
+#: ../purchasing/supplier_invoice.php:144
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
 
-#: gl/gl_journal.php:255
+#: ../gl/gl_journal.php:255
 msgid ""
 "You cannot make a journal entry for a bank account. Please use one of the "
 "banking functions for bank transactions."
 msgstr ""
 
-#: gl/gl_journal.php:334
+#: ../gl/gl_journal.php:334
 msgid "Rows"
 msgstr ""
 
-#: gl/gl_journal.php:340
+#: ../gl/gl_journal.php:340
 msgid "Process Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:341
+#: ../gl/gl_journal.php:341
 msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:27
+#: ../gl/inquiry/balance_sheet.php:27
 msgid "Balance Sheet Drilldown"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:126
+#: ../gl/inquiry/balance_sheet.php:126
 msgid "As at:"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:228 gl/inquiry/profit_loss.php:294
-#: reporting/rep706.php:278 reporting/rep706.php:303
+#: ../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
 msgid "Calculated Return"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:236 includes/sysnames.inc:121
-#: reporting/rep706.php:290
+#: ../gl/inquiry/balance_sheet.php:236
+#: ../includes/sysnames.inc:121
+#: ../reporting/rep706.php:290
 msgid "Liabilities"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:236 reporting/rep706.php:290
+#: ../gl/inquiry/balance_sheet.php:236
+#: ../reporting/rep706.php:290
 msgid " and "
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:236 reporting/rep706.php:290
+#: ../gl/inquiry/balance_sheet.php:236
+#: ../reporting/rep706.php:290
 msgid "Equities"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:28 reporting/rep601.php:72
+#: ../gl/inquiry/bank_inquiry.php:28
+#: ../reporting/rep601.php:72
 msgid "Bank Statement"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:78 gl/inquiry/gl_account_inquiry.php:162
-#: reporting/rep601.php:104 reporting/rep602.php:103 reporting/rep704.php:144
+#: ../gl/inquiry/bank_inquiry.php:78
+#: ../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/gl_account_inquiry.php:211
-#: gl/inquiry/gl_trial_balance.php:228 reporting/rep601.php:157
-#: reporting/rep602.php:157 reporting/rep704.php:192
+#: ../gl/inquiry/bank_inquiry.php:124
+#: ../gl/inquiry/gl_account_inquiry.php:211
+#: ../gl/inquiry/gl_trial_balance.php.orig:228
+#: ../reporting/rep601.php:157
+#: ../reporting/rep602.php:157
+#: ../reporting/rep704.php:192
+#: ../reporting/rep708.php:262
 msgid "Ending Balance"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:31
+#: ../gl/inquiry/gl_account_inquiry.php:31
 msgid "General Ledger Inquiry"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:70
+#: ../gl/inquiry/gl_account_inquiry.php:70
 msgid "All Accounts"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:83
+#: ../gl/inquiry/gl_account_inquiry.php:83
 msgid "Amount min:"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:84
+#: ../gl/inquiry/gl_account_inquiry.php:84
 msgid "Amount max:"
 msgstr ""
 
-#: gl/inquiry/gl_account_inquiry.php:220
+#: ../gl/inquiry/gl_account_inquiry.php:220
 msgid ""
 "No general ledger transactions have been created for the specified criteria."
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:28 reporting/rep708.php:219
+#: ../gl/inquiry/gl_trial_balance.php:28
+#: ../gl/inquiry/gl_trial_balance.php.orig:28
+#: ../reporting/rep708.php:219
 msgid "Trial Balance"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:55
+#: ../gl/inquiry/gl_trial_balance.php:60
+#: ../gl/inquiry/gl_trial_balance.php.orig:55
 msgid "No zero values"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:56
+#: ../gl/inquiry/gl_trial_balance.php:61
+#: ../gl/inquiry/gl_trial_balance.php.orig:56
 msgid "Only balances"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:88 gl/inquiry/gl_trial_balance.php:149
-#: reporting/rep706.php:308 reporting/rep708.php:51 reporting/rep708.php:126
-#: sales/create_recurrent_invoices.php:134
-#: sales/manage/recurrent_invoices.php:102
+#: ../gl/inquiry/gl_trial_balance.php.orig:88
+#: ../gl/inquiry/gl_trial_balance.php.orig:149
+#: ../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
 msgid "Group"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:167
+#: ../gl/inquiry/gl_trial_balance.php.orig:167
 msgid "The from date cannot be bigger than the fiscal year end."
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:180 gl/manage/bank_accounts.php:109
-#: gl/view/gl_trans_view.php:68 gl/view/gl_trans_view.php:71
-#: gl/view/gl_trans_view.php:74 reporting/rep701.php:111
-#: reporting/rep702.php:53 reporting/rep705.php:238 reporting/rep706.php:185
-#: reporting/rep707.php:210 reporting/rep708.php:192
+#: ../gl/inquiry/gl_trial_balance.php.orig:180
+#: ../gl/manage/bank_accounts.php:109
+#: ../gl/view/gl_trans_view.php:68
+#: ../gl/view/gl_trans_view.php:71
+#: ../gl/view/gl_trans_view.php:74
+#: ../reporting/rep701.php:111
+#: ../reporting/rep702.php:53
+#: ../reporting/rep705.php:238
+#: ../reporting/rep706.php:185
+#: ../reporting/rep707.php:210
+#: ../reporting/rep708.php:192
 msgid "Account Name"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:181 reporting/rep708.php:185
+#: ../gl/inquiry/gl_trial_balance.php.orig:181
+#: ../reporting/rep708.php:185
 msgid "Brought Forward"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:182 reporting/rep708.php:185
+#: ../gl/inquiry/gl_trial_balance.php.orig:182
+#: ../reporting/rep708.php:185
 msgid "This Period"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:201 gl/manage/gl_account_types.php:128
+#: ../gl/inquiry/gl_trial_balance.php.orig:201
+#: ../gl/manage/gl_account_types.php:128
 msgid "Class"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:236
+#: ../gl/inquiry/gl_trial_balance.php.orig:236
+#: ../reporting/rep708.php:283
 msgid ""
 "The Opening Balance is not in balance, probably due to a non closed Previous "
 "Fiscalyear."
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:27
+#: ../gl/inquiry/journal_inquiry.php:27
 msgid "Journal Inquiry"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:45
+#: ../gl/inquiry/journal_inquiry.php:45
 msgid "Enter reference fragment or leave empty"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:51
+#: ../gl/inquiry/journal_inquiry.php:51
 msgid "Show closed:"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:56
+#: ../gl/inquiry/journal_inquiry.php:56
 msgid "Enter memo fragment or leave empty"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:130
+#: ../gl/inquiry/journal_inquiry.php:130
 msgid "Trans #"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:134 reporting/rep710.php:77
-#: reporting/rep710.php:87
+#: ../gl/inquiry/journal_inquiry.php:134
+#: ../reporting/rep710.php:77
+#: ../reporting/rep710.php:87
 msgid "User"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:27
+#: ../gl/inquiry/profit_loss.php:27
 msgid "Profit & Loss Drilldown"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:210
-#: reporting/includes/reports_classes.inc:245
+#: ../gl/inquiry/profit_loss.php:173
+#: ../reporting/rep707.php:210
+#: ../reporting/includes/reports_classes.inc:245
 msgid "Accumulated"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:255
-#: reporting/includes/reports_classes.inc:245
+#: ../gl/inquiry/profit_loss.php:173
+#: ../reporting/rep707.php:255
+#: ../reporting/includes/reports_classes.inc:245
 msgid "Period Y-1"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:246
-#: reporting/includes/reports_classes.inc:245
+#: ../gl/inquiry/profit_loss.php:173
+#: ../reporting/rep707.php:246
+#: ../reporting/includes/reports_classes.inc:245
 msgid "Budget"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:169
+#: ../gl/inquiry/profit_loss.php:174
 msgid "Compare to"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:230
+#: ../gl/inquiry/profit_loss.php:235
 msgid "Group/Account Name"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:233 reporting/rep707.php:210
+#: ../gl/inquiry/profit_loss.php:238
+#: ../reporting/rep707.php:210
 msgid "Achieved %"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:30
+#: ../gl/inquiry/tax_inquiry.php:30
 msgid "Tax Inquiry"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:82
+#: ../gl/inquiry/tax_inquiry.php:82
+#: ../reporting/rep709.php:183
 msgid "Outputs"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:82
+#: ../gl/inquiry/tax_inquiry.php:82
+#: ../reporting/rep709.php:183
 msgid "Inputs"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:100
+#: ../gl/inquiry/tax_inquiry.php:100
 msgid "Charged on sales"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:100
+#: ../gl/inquiry/tax_inquiry.php:100
+#: ../reporting/rep709.php:183
 msgid "Output Tax"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:106
+#: ../gl/inquiry/tax_inquiry.php:106
 msgid "Paid on purchases"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:106
+#: ../gl/inquiry/tax_inquiry.php:106
+#: ../reporting/rep709.php:183
 msgid "Input Tax"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:112
+#: ../gl/inquiry/tax_inquiry.php:112
 msgid "Net payable or collectible"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:119
+#: ../gl/inquiry/tax_inquiry.php:119
+#: ../reporting/rep709.php:214
 msgid "Total payable or refund"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:16
+#: ../gl/manage/bank_accounts.php:16
+#: ../reporting/reports_main.php:310
 msgid "Bank Accounts"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:33
+#: ../gl/manage/bank_accounts.php:33
 msgid "The bank account name cannot be empty."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:39
+#: ../gl/manage/bank_accounts.php:39
 msgid "The GL account selected is already in use. Select another GL account."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:52
+#: ../gl/manage/bank_accounts.php:52
 msgid "Bank account has been updated"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:61
+#: ../gl/manage/bank_accounts.php:61
 msgid "New bank account has been added"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:76
+#: ../gl/manage/bank_accounts.php:76
 msgid ""
 "Cannot delete this bank account because transactions have been created using "
 "this account."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:82
+#: ../gl/manage/bank_accounts.php:82
 msgid ""
 "Cannot delete this bank account because POS definitions have been created "
 "using this account."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:87
+#: ../gl/manage/bank_accounts.php:87
 msgid "Selected bank account has been deleted"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:109 gl/view/bank_transfer_view.php:69
-#: gl/view/bank_transfer_view.php:78 gl/view/gl_deposit_view.php:66
-#: gl/view/gl_payment_view.php:64 inventory/prices.php:149
-#: inventory/purchasing_data.php:149 purchasing/view/view_supp_credit.php:49
-#: purchasing/view/view_supp_invoice.php:54
-#: purchasing/inquiry/po_search_completed.php:126
-#: purchasing/inquiry/po_search.php:136
-#: purchasing/inquiry/supplier_allocation_inquiry.php:132
-#: purchasing/inquiry/supplier_allocation_inquiry.php:142
-#: purchasing/inquiry/supplier_inquiry.php:73
-#: purchasing/inquiry/supplier_inquiry.php:180
-#: purchasing/inquiry/supplier_inquiry.php:192
-#: purchasing/allocations/supplier_allocation_main.php:99
-#: purchasing/allocations/supplier_allocation_main.php:107
-#: reporting/rep102.php:133 reporting/rep102.php:139 reporting/rep104.php:116
-#: reporting/rep202.php:138 reporting/rep203.php:101 reporting/rep205.php:150
-#: sales/customer_credit_invoice.php:237 sales/customer_delivery.php:354
-#: sales/customer_invoice.php:470
-#: sales/allocations/customer_allocation_main.php:98
-#: sales/allocations/customer_allocation_main.php:106
-#: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86
-#: sales/view/view_invoice.php:86
-#: sales/inquiry/customer_allocation_inquiry.php:150
-#: sales/inquiry/customer_allocation_inquiry.php:160
-#: sales/inquiry/customer_inquiry.php:76
-#: sales/inquiry/customer_inquiry.php:208
-#: sales/inquiry/customer_inquiry.php:221
-#: sales/inquiry/sales_deliveries_view.php:189
+#: ../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.orig:149
+#: ../inventory/purchasing_data.php.orig:149
+#: ../purchasing/view/view_supp_credit.php:49
+#: ../purchasing/view/view_supp_invoice.php:54
+#: ../purchasing/inquiry/po_search_completed.php:126
+#: ../purchasing/inquiry/po_search.php:136
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:133
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:143
+#: ../purchasing/inquiry/supplier_inquiry.php: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:157
+#: ../reporting/rep102.php:133
+#: ../reporting/rep102.php:139
+#: ../reporting/rep103.php:232
+#: ../reporting/rep104.php:116
+#: ../reporting/rep201.php:145
+#: ../reporting/rep202.php:138
+#: ../reporting/rep203.php:101
+#: ../reporting/rep205.php:150
+#: ../sales/customer_credit_invoice.php:237
+#: ../sales/customer_delivery.php:354
+#: ../sales/customer_invoice.php:470
+#: ../sales/allocations/customer_allocation_main.php:98
+#: ../sales/allocations/customer_allocation_main.php:106
+#: ../sales/view/view_credit.php:70
+#: ../sales/view/view_dispatch.php:86
+#: ../sales/view/view_invoice.php:86
+#: ../sales/inquiry/customer_allocation_inquiry.php:151
+#: ../sales/inquiry/customer_allocation_inquiry.php:161
+#: ../sales/inquiry/customer_inquiry.php:76
+#: ../sales/inquiry/customer_inquiry.php:208
+#: ../sales/inquiry/customer_inquiry.php:221
+#: ../sales/inquiry/sales_deliveries_view.php:189
+#: ../sales/inquiry/sales_orders_view.php.orig:294
+#: ../sales/inquiry/sales_orders_view.php.orig:308
 msgid "Currency"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:109
+#: ../gl/manage/bank_accounts.php:109
 msgid "GL Account"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:110 reporting/includes/doctext.inc:260
+#: ../gl/manage/bank_accounts.php:110
+#: ../reporting/includes/doctext.inc:260
 msgid "Bank"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:110 includes/ui/ui_view.inc:489
+#: ../gl/manage/bank_accounts.php:110
+#: ../includes/ui/ui_view.inc:547
 msgid "Number"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:110
+#: ../gl/manage/bank_accounts.php:110
 msgid "Bank Address"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:110
+#: ../gl/manage/bank_accounts.php:110
 msgid "Dflt"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:167
+#: ../gl/manage/bank_accounts.php:167
 msgid "Bank Account Name:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:171 gl/manage/bank_accounts.php:175
+#: ../gl/manage/bank_accounts.php:171
+#: ../gl/manage/bank_accounts.php:175
 msgid "Account Type:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:179 gl/manage/bank_accounts.php:183
+#: ../gl/manage/bank_accounts.php:179
+#: ../gl/manage/bank_accounts.php:183
 msgid "Bank Account Currency:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:186
+#: ../gl/manage/bank_accounts.php:186
 msgid "Default currency account:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:189 gl/manage/bank_accounts.php:191
+#: ../gl/manage/bank_accounts.php:189
+#: ../gl/manage/bank_accounts.php:191
 msgid "Bank Account GL Code:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:194
+#: ../gl/manage/bank_accounts.php:194
 msgid "Bank Name:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:195 sales/manage/customer_branches.php:255
+#: ../gl/manage/bank_accounts.php:195
+#: ../sales/manage/customer_branches.php:255
 msgid "Bank Account Number:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:196
+#: ../gl/manage/bank_accounts.php:196
 msgid "Bank Address:"
 msgstr ""
 
-#: gl/manage/close_period.php:25
+#: ../gl/manage/close_period.php:25
 msgid "Closing GL Transactions"
 msgstr ""
 
-#: gl/manage/close_period.php:40
+#: ../gl/manage/close_period.php:40
 msgid "Selected date is not in fiscal year or the year is closed."
 msgstr ""
 
-#: gl/manage/close_period.php:47
+#: ../gl/manage/close_period.php:47
 msgid "The entered date is earlier than date already selected as closing date."
 msgstr ""
 
-#: gl/manage/close_period.php:51
+#: ../gl/manage/close_period.php:51
 msgid "You are not allowed to reopen already closed transactions."
 msgstr ""
 
-#: gl/manage/close_period.php:69
+#: ../gl/manage/close_period.php:69
 #, php-format
 msgid ""
 "All transactions resulting in GL accounts changes up to %s has been closed "
 "for further edition."
 msgstr ""
 
-#: gl/manage/close_period.php:88
+#: ../gl/manage/close_period.php:88
 msgid ""
 "Using this feature you can prevent entering new transactions <br>\n"
 "\tand disable edition of already entered transactions up to specified date."
@@ -4169,4484 +5036,5247 @@ msgid ""
 "constraint."
 msgstr ""
 
-#: gl/manage/close_period.php:101
+#: ../gl/manage/close_period.php:101
 msgid "End date of closing period:"
 msgstr ""
 
-#: gl/manage/close_period.php:104
+#: ../gl/manage/close_period.php:104
 msgid "Close Transactions"
 msgstr ""
 
-#: gl/manage/currencies.php:16 includes/access_levels.inc:223
+#: ../gl/manage/currencies.php:16
+#: ../includes/access_levels.inc:223
 msgid "Currencies"
 msgstr ""
 
-#: gl/manage/currencies.php:29
+#: ../gl/manage/currencies.php:29
 msgid "The currency abbreviation must be entered."
 msgstr ""
 
-#: gl/manage/currencies.php:35
+#: ../gl/manage/currencies.php:35
 msgid "The currency name must be entered."
 msgstr ""
 
-#: gl/manage/currencies.php:41
+#: ../gl/manage/currencies.php:41
 msgid "The currency symbol must be entered."
 msgstr ""
 
-#: gl/manage/currencies.php:47
+#: ../gl/manage/currencies.php:47
 msgid "The hundredths name must be entered."
 msgstr ""
 
-#: gl/manage/currencies.php:69
+#: ../gl/manage/currencies.php:69
 msgid "Selected currency settings has been updated"
 msgstr ""
 
-#: gl/manage/currencies.php:76
+#: ../gl/manage/currencies.php:76
 msgid "New currency has been added"
 msgstr ""
 
-#: gl/manage/currencies.php:92
+#: ../gl/manage/currencies.php:92
 msgid ""
 "Cannot delete this currency, because customer accounts have been created "
 "referring to this currency."
 msgstr ""
 
-#: gl/manage/currencies.php:98
+#: ../gl/manage/currencies.php:98
 msgid ""
 "Cannot delete this currency, because supplier accounts have been created "
 "referring to this currency."
 msgstr ""
 
-#: gl/manage/currencies.php:104
+#: ../gl/manage/currencies.php:104
 msgid ""
 "Cannot delete this currency, because the company preferences uses this "
 "currency."
 msgstr ""
 
-#: gl/manage/currencies.php:111
+#: ../gl/manage/currencies.php:111
 msgid ""
 "Cannot delete this currency, because thre are bank accounts that use this "
 "currency."
 msgstr ""
 
-#: gl/manage/currencies.php:126
+#: ../gl/manage/currencies.php:126
 msgid "Selected currency has been deleted"
 msgstr ""
 
-#: gl/manage/currencies.php:139
+#: ../gl/manage/currencies.php:139
 msgid "Abbreviation"
 msgstr ""
 
-#: gl/manage/currencies.php:139
+#: ../gl/manage/currencies.php:139
 msgid "Symbol"
 msgstr ""
 
-#: gl/manage/currencies.php:139
+#: ../gl/manage/currencies.php:139
 msgid "Currency Name"
 msgstr ""
 
-#: gl/manage/currencies.php:140
+#: ../gl/manage/currencies.php:140
 msgid "Hundredths name"
 msgstr ""
 
-#: gl/manage/currencies.php:140
+#: ../gl/manage/currencies.php:140
 msgid "Country"
 msgstr ""
 
-#: gl/manage/currencies.php:140
+#: ../gl/manage/currencies.php:140
 msgid "Auto update"
 msgstr ""
 
-#: gl/manage/currencies.php:175
+#: ../gl/manage/currencies.php:175
 msgid "The marked currency is the home currency which cannot be deleted."
 msgstr ""
 
-#: gl/manage/currencies.php:201 gl/manage/currencies.php:206
+#: ../gl/manage/currencies.php:201
+#: ../gl/manage/currencies.php:206
 msgid "Currency Abbreviation:"
 msgstr ""
 
-#: gl/manage/currencies.php:209
+#: ../gl/manage/currencies.php:209
 msgid "Currency Symbol:"
 msgstr ""
 
-#: gl/manage/currencies.php:210
+#: ../gl/manage/currencies.php:210
 msgid "Currency Name:"
 msgstr ""
 
-#: gl/manage/currencies.php:211
+#: ../gl/manage/currencies.php:211
 msgid "Hundredths Name:"
 msgstr ""
 
-#: gl/manage/currencies.php:212
+#: ../gl/manage/currencies.php:212
 msgid "Country:"
 msgstr ""
 
-#: gl/manage/currencies.php:213
+#: ../gl/manage/currencies.php:213
 msgid "Automatic exchange rate update:"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:24
+#: ../gl/manage/exchange_rates.php:24
 msgid "Exchange Rates"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:39
-msgid "The exchange rate cannot be zero or a negative number."
-msgstr ""
-
-#: gl/manage/exchange_rates.php:45
+#: ../gl/manage/exchange_rates.php:45
 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
 msgid "Date to Use From:"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:141 includes/ui/ui_view.inc:288
-#: includes/ui/ui_view.inc:290
+#: ../gl/manage/exchange_rates.php:141
+#: ../includes/ui/ui_view.inc:325
 msgid "Exchange Rate:"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:142
+#: ../gl/manage/exchange_rates.php:142
 msgid "Get current rate from"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:148
+#: ../gl/manage/exchange_rates.php:148
 msgid "Exchange rates are entered against the company currency."
 msgstr ""
 
-#: gl/manage/exchange_rates.php:179
+#: ../gl/manage/exchange_rates.php:179
 msgid "Select a currency :"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:195
+#: ../gl/manage/exchange_rates.php:195
 msgid "Date to Use From"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:196
+#: ../gl/manage/exchange_rates.php:196
 msgid "Exchange Rate"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:205
+#: ../gl/manage/exchange_rates.php:205
 msgid "The selected currency is the company currency."
 msgstr ""
 
-#: gl/manage/exchange_rates.php:206
+#: ../gl/manage/exchange_rates.php:206
 msgid ""
 "The company currency is the base currency so exchange rates cannot be set "
 "for it."
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:16
+#: ../gl/manage/gl_account_classes.php:16
 msgid "GL Account Classes"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:31
+#: ../gl/manage/gl_account_classes.php:31
 msgid "The account class ID cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:37
+#: ../gl/manage/gl_account_classes.php:37
 msgid "The account class name cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:57
+#: ../gl/manage/gl_account_classes.php:57
 msgid "Selected account class settings has been updated"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:62
+#: ../gl/manage/gl_account_classes.php:62
 msgid "New account class has been added"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:77
+#: ../gl/manage/gl_account_classes.php:77
 msgid ""
 "Cannot delete this account class because GL account types have been created "
 "referring to it."
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:93
+#: ../gl/manage/gl_account_classes.php:93
 msgid "Selected account class has been deleted"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:110
+#: ../gl/manage/gl_account_classes.php:110
 msgid "Class ID"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:110
+#: ../gl/manage/gl_account_classes.php:110
 msgid "Class Name"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:110
+#: ../gl/manage/gl_account_classes.php:110
 msgid "Class Type"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:112 gl/manage/gl_account_classes.php:169
-#: reporting/rep706.php:215
+#: ../gl/manage/gl_account_classes.php:112
+#: ../gl/manage/gl_account_classes.php:169
+#: ../reporting/rep706.php:215
 msgid "Balance Sheet"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:157 gl/manage/gl_account_classes.php:163
+#: ../gl/manage/gl_account_classes.php:157
+#: ../gl/manage/gl_account_classes.php:163
 msgid "Class ID:"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:166
+#: ../gl/manage/gl_account_classes.php:166
 msgid "Class Name:"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:171
+#: ../gl/manage/gl_account_classes.php:171
 msgid "Class Type:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:16 reporting/rep701.php:117
+#: ../gl/manage/gl_accounts.php:16
+#: ../reporting/rep701.php:117
 msgid "Chart of Accounts"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:53
+#: ../gl/manage/gl_accounts.php:53
 msgid "The account code must be entered."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:59
+#: ../gl/manage/gl_accounts.php:59
 msgid "The account name cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:65
+#: ../gl/manage/gl_accounts.php:65
 msgid "The account code must be numeric."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:80
+#: ../gl/manage/gl_accounts.php:80
 msgid "The account belongs to a bank account and cannot be inactivated."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:89
+#: ../gl/manage/gl_accounts.php:89
 msgid "Account data has been updated."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:98
+#: ../gl/manage/gl_accounts.php:98
 msgid "New account has been added."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:102
+#: ../gl/manage/gl_accounts.php:102
 msgid "Account not added, possible duplicate Account Code."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:117
+#: ../gl/manage/gl_accounts.php:117
 msgid ""
 "Cannot delete this account because transactions have been created using this "
 "account."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:123
+#: ../gl/manage/gl_accounts.php:123
 msgid ""
 "Cannot delete this account because it is used as one of the company default "
 "GL accounts."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:129
+#: ../gl/manage/gl_accounts.php:129
 msgid "Cannot delete this account because it is used by a bank account."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:135
+#: ../gl/manage/gl_accounts.php:135
 msgid ""
 "Cannot delete this account because it is used by one or more Item Categories."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:141
+#: ../gl/manage/gl_accounts.php:141
 msgid "Cannot delete this account because it is used by one or more Items."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:147
+#: ../gl/manage/gl_accounts.php:147
 msgid "Cannot delete this account because it is used by one or more Taxes."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:153
+#: ../gl/manage/gl_accounts.php:153
 msgid ""
 "Cannot delete this account because it is used by one or more Customer "
 "Branches."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:158
+#: ../gl/manage/gl_accounts.php:158
 msgid "Cannot delete this account because it is used by one or more suppliers."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:164
+#: ../gl/manage/gl_accounts.php:164
 msgid ""
 "Cannot delete this account because it is used by one or more Quick Entry "
 "Lines."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:182
+#: ../gl/manage/gl_accounts.php:182
 msgid "Selected account has been deleted"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:197
+#: ../gl/manage/gl_accounts.php:197
 msgid "New account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:243
+#: ../gl/manage/gl_accounts.php:243
 msgid "Account Code 2:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:245
+#: ../gl/manage/gl_accounts.php:245
 msgid "Account Name:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:247
+#: ../gl/manage/gl_accounts.php:247
 msgid "Account Group:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:249
+#: ../gl/manage/gl_accounts.php:249
 msgid "Account Tags:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:251
+#: ../gl/manage/gl_accounts.php:251
 msgid "Account status:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:256
+#: ../gl/manage/gl_accounts.php:256
 msgid "Add Account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:260
+#: ../gl/manage/gl_accounts.php:260
 msgid "Update Account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:261
+#: ../gl/manage/gl_accounts.php:261
 msgid "Delete account"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:16
+#: ../gl/manage/gl_account_types.php:16
 msgid "GL Account Groups"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:29
+#: ../gl/manage/gl_account_types.php:29
 msgid "The account group id cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:35
+#: ../gl/manage/gl_account_types.php:35
 msgid "The account group name cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:42
+#: ../gl/manage/gl_account_types.php:42
 msgid "This account group id is already in use."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:50
+#: ../gl/manage/gl_account_types.php:50
 msgid "You cannot set an account group to be a subgroup of itself."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:68
+#: ../gl/manage/gl_account_types.php:68
 msgid "Selected account type has been updated"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:73
+#: ../gl/manage/gl_account_types.php:73
 msgid "New account type has been added"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:89
+#: ../gl/manage/gl_account_types.php:89
 msgid ""
 "Cannot delete this account group because GL accounts have been created "
 "referring to it."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:95
+#: ../gl/manage/gl_account_types.php:95
 msgid ""
 "Cannot delete this account group because GL account groups have been created "
 "referring to it."
 msgstr ""
 
-#: gl/manage/gl_account_types.php:111
+#: ../gl/manage/gl_account_types.php:111
 msgid "Selected account group has been deleted"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:128
+#: ../gl/manage/gl_account_types.php:128
 msgid "Group ID"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:128 sales/manage/sales_groups.php:85
+#: ../gl/manage/gl_account_types.php:128
+#: ../sales/manage/sales_groups.php:85
 msgid "Group Name"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:128
+#: ../gl/manage/gl_account_types.php:128
 msgid "Subgroup Of"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:187
+#: ../gl/manage/gl_account_types.php:187
 msgid "ID:"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:190
+#: ../gl/manage/gl_account_types.php:190
 msgid "Subgroup Of:"
 msgstr ""
 
-#: gl/manage/gl_account_types.php:192
+#: ../gl/manage/gl_account_types.php:192
 msgid "Class:"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:16
+#: ../gl/manage/gl_quick_entries.php:16
 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
 msgid "Add new"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:73
+#: ../gl/manage/gl_quick_entries.php:73
 msgid "The Quick Entry description cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:80
+#: ../gl/manage/gl_quick_entries.php:80
 msgid "You can only use Balance Based together with Journal Entries."
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:86
+#: ../gl/manage/gl_quick_entries.php:86
 msgid "The base amount description cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:106
+#: ../gl/manage/gl_quick_entries.php:106
 msgid "Selected quick entry has been updated"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:112
+#: ../gl/manage/gl_quick_entries.php:112
 msgid "New quick entry has been added"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:124
+#: ../gl/manage/gl_quick_entries.php:124
 msgid "Selected quick entry line has been updated"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:130
+#: ../gl/manage/gl_quick_entries.php:130
 msgid "New quick entry line has been added"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:142
+#: ../gl/manage/gl_quick_entries.php:142
 msgid "Selected quick entry has been deleted"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:147
+#: ../gl/manage/gl_quick_entries.php:147
 msgid "The Quick Entry has Quick Entry Lines. Cannot be deleted."
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:163
+#: ../gl/manage/gl_quick_entries.php:163
 msgid "Selected quick entry line has been deleted"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:171
+#: ../gl/manage/gl_quick_entries.php:171
 msgid "Base Amount"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:226
+#: ../gl/manage/gl_quick_entries.php:226
 msgid "Entry Type"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:230
+#: ../gl/manage/gl_quick_entries.php:230
 msgid "Balance Based"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:240 gl/includes/ui/gl_journal_ui.inc:57
+#: ../gl/manage/gl_quick_entries.php:240
+#: ../gl/includes/ui/gl_journal_ui.inc:57
 msgid "Yearly"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:245
+#: ../gl/manage/gl_quick_entries.php:245
 msgid "Base Amount Description"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:246
+#: ../gl/manage/gl_quick_entries.php:246
 msgid "Default Base Amount"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:255
+#: ../gl/manage/gl_quick_entries.php:255
 msgid "Quick Entry Lines"
 msgstr ""
 
-#: 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:261
+#: ../gl/manage/gl_quick_entries.php:263
+#: ../gl/manage/gl_quick_entries.php:265
 msgid "Post"
 msgstr ""
 
-#: 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:261
+#: ../gl/manage/gl_quick_entries.php:263
+#: ../gl/manage/gl_quick_entries.php:265
 msgid "Account/Tax Type"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:320
+#: ../gl/manage/gl_quick_entries.php:320
 msgid "Posted"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:447
-#: sales/customer_invoice.php:542 sales/customer_invoice.php:545
+#: ../gl/manage/gl_quick_entries.php:329
+#: ../sales/customer_delivery.php:447
+#: ../sales/customer_invoice.php:542
+#: ../sales/customer_invoice.php:545
 msgid "Tax Type"
 msgstr ""
 
-#: gl/manage/gl_quick_entries.php:337
+#: ../gl/manage/gl_quick_entries.php:337
 msgid "Part"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:23
+#: ../gl/manage/revaluate_currencies.php:23
 msgid "Revaluation of Currency Accounts"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:32
+#: ../gl/manage/revaluate_currencies.php:32
 msgid "No Revaluation was needed"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:40
+#: ../gl/manage/revaluate_currencies.php:40
 #, php-format
 msgid "%d Journal Entries for AR/AP accounts have been added"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:104
+#: ../gl/manage/revaluate_currencies.php:104
 msgid "Date for Revaluation:"
 msgstr ""
 
-#: gl/manage/revaluate_currencies.php:109
+#: ../gl/manage/revaluate_currencies.php:109
 msgid "Revaluate Currencies"
 msgstr ""
 
-#: gl/view/accrual_trans.php:16
+#: ../gl/view/accrual_trans.php:16
 msgid "Search General Ledger Transactions for account: "
 msgstr ""
 
-#: gl/view/accrual_trans.php:41 gl/view/gl_trans_view.php:26
+#: ../gl/view/accrual_trans.php:41
+#: ../gl/view/gl_trans_view.php:26
 msgid ""
 "The script must be called with a valid transaction type and transaction "
 "number to review the general ledger postings for."
 msgstr ""
 
-#: gl/view/bank_transfer_view.php:17
+#: ../gl/view/bank_transfer_view.php:17
 msgid "View Bank Transfer"
 msgstr ""
 
-#: gl/view/bank_transfer_view.php:67 gl/view/gl_payment_view.php:62
-#: purchasing/view/view_supp_payment.php:54
+#: ../gl/view/bank_transfer_view.php:67
+#: ../gl/view/gl_payment_view.php:62
+#: ../purchasing/view/view_supp_payment.php:54
 msgid "From Bank Account"
 msgstr ""
 
-#: gl/view/bank_transfer_view.php:76 gl/view/gl_deposit_view.php:64
+#: ../gl/view/bank_transfer_view.php:76
+#: ../gl/view/gl_deposit_view.php:64
 msgid "To Bank Account"
 msgstr ""
 
-#: gl/view/bank_transfer_view.php:84
+#: ../gl/view/bank_transfer_view.php:84
 msgid "Transfer Type"
 msgstr ""
 
-#: gl/view/bank_transfer_view.php:92 inventory/view/view_transfer.php:76
+#: ../gl/view/bank_transfer_view.php:92
+#: ../inventory/view/view_transfer.php:76
 msgid "This transfer has been voided."
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:17
+#: ../gl/view/gl_deposit_view.php:17
 msgid "View Bank Deposit"
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:48
+#: ../gl/view/gl_deposit_view.php:48
 msgid "GL Deposit"
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:211
-#: reporting/reports_main.php:96
+#: ../gl/view/gl_deposit_view.php:71
+#: ../gl/includes/db/gl_db_banking.inc:212
+#: ../reporting/reports_main.php:96
+#: ../reporting/reports_main.php:106
+#: ../reporting/reports_main.php:114
+#: ../reporting/reports_main.php:128
+#: ../reporting/reports_main.php:136
+#: ../reporting/reports_main.php:143
+#: ../reporting/reports_main.php:192
+#: ../reporting/reports_main.php:199
+#: ../reporting/reports_main.php:289
 msgid "From"
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:72
+#: ../gl/view/gl_deposit_view.php:74
+#: ../gl/view/gl_payment_view.php:72
+msgid "Settle currency"
+msgstr ""
+
+#: ../gl/view/gl_deposit_view.php:75
+#: ../gl/view/gl_payment_view.php:73
+msgid "Settled amount"
+msgstr ""
+
+#: ../gl/view/gl_deposit_view.php:77
 msgid "Deposit Type"
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:81
+#: ../gl/view/gl_deposit_view.php:86
 msgid "This deposit has been voided."
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:87
+#: ../gl/view/gl_deposit_view.php:92
 msgid "There are no items for this deposit."
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:92
+#: ../gl/view/gl_deposit_view.php:97
 msgid "Items for this Deposit"
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:94 gl/view/gl_payment_view.php:92
-msgid "Item Amounts are Shown in :"
-msgstr ""
-
-#: gl/view/gl_deposit_view.php:99 gl/view/gl_deposit_view.php:102
-#: gl/view/gl_deposit_view.php:105 gl/view/gl_payment_view.php:98
-#: gl/view/gl_payment_view.php:101 gl/view/gl_payment_view.php:104
-#: gl/view/gl_trans_view.php:68 gl/view/gl_trans_view.php:71
-#: gl/view/gl_trans_view.php:74 gl/includes/ui/gl_bank_ui.inc:151
-#: gl/includes/ui/gl_bank_ui.inc:154 gl/includes/ui/gl_bank_ui.inc:157
-#: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
-#: gl/includes/ui/gl_journal_ui.inc:92 reporting/rep701.php:111
+#: ../gl/view/gl_deposit_view.php:99
+#: ../gl/view/gl_payment_view.php:97
+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: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
+#: ../reporting/rep701.php:111
 msgid "Account Code"
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:99 gl/view/gl_deposit_view.php:102
-#: gl/view/gl_deposit_view.php:105 gl/view/gl_payment_view.php:98
-#: gl/view/gl_payment_view.php:101 gl/view/gl_payment_view.php:104
-#: gl/includes/ui/gl_bank_ui.inc:151 gl/includes/ui/gl_bank_ui.inc:154
-#: gl/includes/ui/gl_bank_ui.inc:157 gl/includes/ui/gl_journal_ui.inc:86
-#: gl/includes/ui/gl_journal_ui.inc:89 gl/includes/ui/gl_journal_ui.inc:92
+#: ../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
 msgid "Account Description"
 msgstr ""
 
-#: gl/view/gl_payment_view.php:17
+#: ../gl/view/gl_payment_view.php:17
 msgid "View Bank Payment"
 msgstr ""
 
-#: gl/view/gl_payment_view.php:46
+#: ../gl/view/gl_payment_view.php:46
 msgid "GL Payment"
 msgstr ""
 
-#: gl/view/gl_payment_view.php:69
+#: ../gl/view/gl_payment_view.php:69
 msgid "Pay To"
 msgstr ""
 
-#: gl/view/gl_payment_view.php:70 purchasing/view/view_supp_payment.php:64
-#: purchasing/view/view_supp_payment.php:78 sales/view/view_receipt.php:48
+#: ../gl/view/gl_payment_view.php:75
+#: ../purchasing/view/view_supp_payment.php:64
+#: ../purchasing/view/view_supp_payment.php:78
+#: ../sales/view/view_receipt.php:50
 msgid "Payment Type"
 msgstr ""
 
-#: gl/view/gl_payment_view.php:79 purchasing/view/view_supp_payment.php:85
+#: ../gl/view/gl_payment_view.php:84
+#: ../purchasing/view/view_supp_payment.php:85
 msgid "This payment has been voided."
 msgstr ""
 
-#: gl/view/gl_payment_view.php:85
+#: ../gl/view/gl_payment_view.php:90
 msgid "There are no items for this payment."
 msgstr ""
 
-#: gl/view/gl_payment_view.php:90
+#: ../gl/view/gl_payment_view.php:95
 msgid "Items for this Payment"
 msgstr ""
 
-#: gl/view/gl_trans_view.php:16 gl/view/gl_trans_view.php:35
+#: ../gl/view/gl_trans_view.php:16
+#: ../gl/view/gl_trans_view.php:35
 msgid "General Ledger Transaction Details"
 msgstr ""
 
-#: gl/view/gl_trans_view.php:39 gl/includes/ui/gl_journal_ui.inc:97
+#: ../gl/view/gl_trans_view.php:39
+#: ../gl/includes/ui/gl_journal_ui.inc:97
 msgid "Counterparty"
 msgstr ""
 
-#: gl/view/gl_trans_view.php:59
+#: ../gl/view/gl_trans_view.php:59
 msgid "No general ledger transactions have been created for"
 msgstr ""
 
-#: gl/view/gl_trans_view.php:59
+#: ../gl/view/gl_trans_view.php:59
 msgid "number"
 msgstr ""
 
-#: gl/view/gl_trans_view.php:129
+#: ../gl/view/gl_trans_view.php:129
 msgid "This transaction has been voided."
 msgstr ""
 
-#: gl/includes/db/gl_db_banking.inc:44 gl/includes/db/gl_db_banking.inc:47
-#: gl/includes/db/gl_db_banking.inc:59 gl/includes/db/gl_db_banking.inc:62
+#: ../gl/includes/db/gl_db_banking.inc:44
+#: ../gl/includes/db/gl_db_banking.inc:47
+#: ../gl/includes/db/gl_db_banking.inc:60
+#: ../gl/includes/db/gl_db_banking.inc:63
+#: ../gl/includes/db/gl_db_banking.inc:255
 msgid "Exchange Variance"
 msgstr ""
 
-#: gl/includes/db/gl_db_banking.inc:211 reporting/reports_main.php:97
+#: ../gl/includes/db/gl_db_banking.inc:212
+#: ../reporting/reports_main.php:97
+#: ../reporting/reports_main.php:107
+#: ../reporting/reports_main.php:115
+#: ../reporting/reports_main.php:129
+#: ../reporting/reports_main.php:137
+#: ../reporting/reports_main.php:144
+#: ../reporting/reports_main.php:193
+#: ../reporting/reports_main.php:200
+#: ../reporting/reports_main.php:290
 msgid "To"
 msgstr ""
 
-#: gl/includes/db/gl_db_banking.inc:427
-#: purchasing/includes/db/invoice_db.inc:143
+#: ../gl/includes/db/gl_db_banking.inc:444
+#: ../purchasing/includes/db/invoice_db.inc:136
+#: ../purchasing/includes/db/invoice_db.inc.orig:136
 msgid "Document reentered."
 msgstr ""
 
-#: gl/includes/db/gl_db_rates.inc:139
-#, php-format
-msgid ""
-"Cannot retrieve currency rate from %s page. Please set the rate manually."
-msgstr ""
-
-#: gl/includes/db/gl_db_trans.inc:96
+#: ../gl/includes/db/gl_db_trans.inc:96
 #, php-format
 msgid "Rounding error %s encountered for trans_type:%s,trans_no:%s"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:24 gl/includes/ui/gl_journal_ui.inc:27
-#: inventory/includes/item_adjustments_ui.inc:39
-#: inventory/includes/stock_transfers_ui.inc:42
-#: manufacturing/work_order_add_finished.php:208
-#: manufacturing/work_order_costs.php:133
-#: purchasing/allocations/supplier_allocate.php:53
-#: sales/allocations/customer_allocate.php:52
-#: sales/includes/ui/sales_credit_ui.inc:121
+#: ../gl/includes/ui/gl_bank_ui.inc:24
+#: ../gl/includes/ui/gl_journal_ui.inc:27
+#: ../inventory/includes/item_adjustments_ui.inc:39
+#: ../inventory/includes/stock_transfers_ui.inc:42
+#: ../manufacturing/work_order_add_finished.php:208
+#: ../manufacturing/work_order_costs.php:133
+#: ../purchasing/allocations/supplier_allocate.php:56
+#: ../sales/allocations/customer_allocate.php:54
+#: ../sales/includes/ui/sales_credit_ui.inc:121
 msgid "Date:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:51
+#: ../gl/includes/ui/gl_bank_ui.inc:52
 msgid "Pay To:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:56
+#: ../gl/includes/ui/gl_bank_ui.inc:57
 msgid "To the Order of:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:63 inventory/purchasing_data.php:210
-#: inventory/purchasing_data.php:214 purchasing/includes/ui/invoice_ui.inc:80
-#: purchasing/includes/ui/invoice_ui.inc:88
-#: purchasing/includes/ui/invoice_ui.inc:90
+#: ../gl/includes/ui/gl_bank_ui.inc:64
+#: ../inventory/purchasing_data.php.orig:210
+#: ../inventory/purchasing_data.php.orig:214
+#: ../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:133
+#: ../purchasing/includes/ui/po_ui.inc:138
 msgid "Supplier:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:66 sales/manage/recurrent_invoices.php:169
-#: sales/includes/ui/sales_credit_ui.inc:29
-#: sales/includes/ui/sales_order_ui.inc:285
+#: ../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:285
 msgid "Customer:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:70 sales/manage/recurrent_invoices.php:172
-#: sales/includes/ui/sales_credit_ui.inc:37
-#: sales/includes/ui/sales_order_ui.inc:292
+#: ../gl/includes/ui/gl_bank_ui.inc:71
+#: ../sales/customer_payments.php.orig:359
+#: ../sales/manage/recurrent_invoices.php:172
+#: ../sales/includes/ui/sales_credit_ui.inc:37
+#: ../sales/includes/ui/sales_order_ui.inc:292
 msgid "Branch:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:84 gl/includes/ui/gl_bank_ui.inc:87
+#: ../gl/includes/ui/gl_bank_ui.inc:85
+#: ../gl/includes/ui/gl_bank_ui.inc:88
+#: ../sales/customer_payments.php.orig:368
 msgid "This customer account is on hold."
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:99 gl/includes/ui/gl_journal_ui.inc:58
-#: gl/includes/ui/gl_journal_ui.inc:62
-#: purchasing/includes/ui/invoice_ui.inc:251
+#: ../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
 msgid "Go"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:118
+#: ../gl/includes/ui/gl_bank_ui.inc:120
 msgid "Into:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:186 includes/ui/simple_crud_class.inc:52
-#: inventory/includes/item_adjustments_ui.inc:88
-#: inventory/includes/stock_transfers_ui.inc:80
-#: manufacturing/includes/work_order_issue_ui.inc:59
-#: purchasing/includes/ui/invoice_ui.inc:542
-#: sales/includes/ui/sales_credit_ui.inc:198
-#: sales/includes/ui/sales_order_ui.inc:210
+#: ../gl/includes/ui/gl_bank_ui.inc:187
+#: ../includes/ui/simple_crud_class.inc:52
+#: ../inventory/includes/item_adjustments_ui.inc:88
+#: ../inventory/includes/stock_transfers_ui.inc:80
+#: ../manufacturing/includes/work_order_issue_ui.inc:59
+#: ../purchasing/includes/ui/invoice_ui.inc:557
+#: ../purchasing/includes/ui/po_ui.inc:272
+#: ../sales/includes/ui/sales_credit_ui.inc:198
+#: ../sales/includes/ui/sales_order_ui.inc:210
 msgid "Edit document line"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:188 includes/ui/simple_crud_class.inc:54
-#: inventory/includes/item_adjustments_ui.inc:90
-#: inventory/includes/stock_transfers_ui.inc:82
-#: manufacturing/includes/work_order_issue_ui.inc:61
-#: purchasing/includes/ui/invoice_ui.inc:305
-#: sales/includes/ui/sales_credit_ui.inc:200
-#: sales/includes/ui/sales_order_ui.inc:212
+#: ../gl/includes/ui/gl_bank_ui.inc:189
+#: ../includes/ui/simple_crud_class.inc:54
+#: ../inventory/includes/item_adjustments_ui.inc:90
+#: ../inventory/includes/stock_transfers_ui.inc:82
+#: ../manufacturing/includes/work_order_issue_ui.inc:61
+#: ../purchasing/includes/ui/invoice_ui.inc:320
+#: ../purchasing/includes/ui/po_ui.inc:274
+#: ../sales/includes/ui/sales_credit_ui.inc:200
+#: ../sales/includes/ui/sales_order_ui.inc:212
 msgid "Remove line from document"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:277 gl/includes/ui/gl_journal_ui.inc:258
-#: includes/ui/simple_crud_class.inc:56
-#: inventory/includes/item_adjustments_ui.inc:158
-#: inventory/includes/stock_transfers_ui.inc:138
-#: manufacturing/includes/work_order_issue_ui.inc:132
-#: sales/includes/ui/sales_credit_ui.inc:294
-#: sales/includes/ui/sales_order_ui.inc:563
+#: ../gl/includes/ui/gl_bank_ui.inc:278
+#: ../gl/includes/ui/gl_journal_ui.inc:258
+#: ../includes/ui/simple_crud_class.inc:56
+#: ../inventory/includes/item_adjustments_ui.inc:158
+#: ../inventory/includes/stock_transfers_ui.inc:138
+#: ../manufacturing/includes/work_order_issue_ui.inc:132
+#: ../purchasing/includes/ui/po_ui.inc:456
+#: ../sales/includes/ui/sales_credit_ui.inc:294
+#: ../sales/includes/ui/sales_order_ui.inc:562
 msgid "Confirm changes"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:279 gl/includes/ui/gl_journal_ui.inc:260
-#: includes/ui/simple_crud_class.inc:58
-#: inventory/includes/item_adjustments_ui.inc:160
-#: inventory/includes/stock_transfers_ui.inc:140
-#: manufacturing/includes/work_order_issue_ui.inc:134
-#: sales/includes/ui/sales_credit_ui.inc:296
-#: sales/includes/ui/sales_order_ui.inc:565
+#: ../gl/includes/ui/gl_bank_ui.inc:280
+#: ../gl/includes/ui/gl_journal_ui.inc:260
+#: ../includes/ui/simple_crud_class.inc:58
+#: ../inventory/includes/item_adjustments_ui.inc:160
+#: ../inventory/includes/stock_transfers_ui.inc:140
+#: ../manufacturing/includes/work_order_issue_ui.inc:134
+#: ../purchasing/includes/ui/po_ui.inc:458
+#: ../sales/includes/ui/sales_credit_ui.inc:296
+#: ../sales/includes/ui/sales_order_ui.inc:564
 msgid "Cancel changes"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:284 gl/includes/ui/gl_journal_ui.inc:264
-#: inventory/includes/item_adjustments_ui.inc:166
-#: inventory/includes/stock_transfers_ui.inc:146
-#: manufacturing/includes/work_order_issue_ui.inc:140
-#: sales/includes/ui/sales_credit_ui.inc:302
-#: sales/includes/ui/sales_order_ui.inc:571
+#: ../gl/includes/ui/gl_bank_ui.inc:285
+#: ../gl/includes/ui/gl_journal_ui.inc:264
+#: ../inventory/includes/item_adjustments_ui.inc:166
+#: ../inventory/includes/stock_transfers_ui.inc:146
+#: ../manufacturing/includes/work_order_issue_ui.inc:140
+#: ../purchasing/includes/ui/po_ui.inc:464
+#: ../sales/includes/ui/sales_credit_ui.inc:302
+#: ../sales/includes/ui/sales_order_ui.inc:570
 msgid "Add Item"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:285
-#: inventory/includes/item_adjustments_ui.inc:167
-#: inventory/includes/stock_transfers_ui.inc:147
-#: manufacturing/includes/work_order_issue_ui.inc:141
-#: sales/includes/ui/sales_credit_ui.inc:303
-#: sales/includes/ui/sales_order_ui.inc:572
+#: ../gl/includes/ui/gl_bank_ui.inc:286
+#: ../inventory/includes/item_adjustments_ui.inc:167
+#: ../inventory/includes/stock_transfers_ui.inc:147
+#: ../manufacturing/includes/work_order_issue_ui.inc:141
+#: ../purchasing/includes/ui/po_ui.inc:465
+#: ../sales/includes/ui/sales_credit_ui.inc:303
+#: ../sales/includes/ui/sales_order_ui.inc:571
 msgid "Add new item to document"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:38
+#: ../gl/includes/ui/gl_bank_ui.inc:309
+msgid "Settled AR Amount:"
+msgstr ""
+
+#: ../gl/includes/ui/gl_bank_ui.inc:309
+msgid "Settled AP Amount:"
+msgstr ""
+
+#: ../gl/includes/ui/gl_journal_ui.inc:38
 msgid "Reverse Transaction:"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:46 includes/sysnames.inc:98
+#: ../gl/includes/ui/gl_journal_ui.inc:46
+#: ../includes/sysnames.inc:98
 msgid "Quick Entry"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:57
+#: ../gl/includes/ui/gl_journal_ui.inc:57
 msgid "balance from account"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:135
+#: ../gl/includes/ui/gl_journal_ui.inc:135
 msgid "Edit journal line"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:137
+#: ../gl/includes/ui/gl_journal_ui.inc:137
 msgid "Remove line from journal"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:200 gl/includes/ui/gl_journal_ui.inc:232
+#: ../gl/includes/ui/gl_journal_ui.inc:200
+#: ../gl/includes/ui/gl_journal_ui.inc:232
 msgid "[Select account]"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:265
+#: ../gl/includes/ui/gl_journal_ui.inc:265
 msgid "Add new line to journal"
 msgstr ""
 
-#: includes/access_levels.inc:56
+#: ../includes/access_levels.inc:56
 msgid "System administration"
 msgstr ""
 
-#: includes/access_levels.inc:57
+#: ../includes/access_levels.inc:57
 msgid "Company setup"
 msgstr ""
 
-#: includes/access_levels.inc:58
+#: ../includes/access_levels.inc:58
 msgid "Special maintenance"
 msgstr ""
 
-#: includes/access_levels.inc:59
+#: ../includes/access_levels.inc:59
 msgid "Sales configuration"
 msgstr ""
 
-#: includes/access_levels.inc:60
+#: ../includes/access_levels.inc:60
 msgid "Sales transactions"
 msgstr ""
 
-#: includes/access_levels.inc:61
+#: ../includes/access_levels.inc:61
 msgid "Sales related reports"
 msgstr ""
 
-#: includes/access_levels.inc:62
+#: ../includes/access_levels.inc:62
 msgid "Purchase configuration"
 msgstr ""
 
-#: includes/access_levels.inc:63
+#: ../includes/access_levels.inc:63
 msgid "Purchase transactions"
 msgstr ""
 
-#: includes/access_levels.inc:64
+#: ../includes/access_levels.inc:64
 msgid "Purchase analytics"
 msgstr ""
 
-#: includes/access_levels.inc:65
+#: ../includes/access_levels.inc:65
 msgid "Inventory configuration"
 msgstr ""
 
-#: includes/access_levels.inc:66
+#: ../includes/access_levels.inc:66
 msgid "Inventory operations"
 msgstr ""
 
-#: includes/access_levels.inc:67
+#: ../includes/access_levels.inc:67
 msgid "Inventory analytics"
 msgstr ""
 
-#: includes/access_levels.inc:68
+#: ../includes/access_levels.inc:68
 msgid "Manufacturing configuration"
 msgstr ""
 
-#: includes/access_levels.inc:69
+#: ../includes/access_levels.inc:69
 msgid "Manufacturing transactions"
 msgstr ""
 
-#: includes/access_levels.inc:70
+#: ../includes/access_levels.inc:70
 msgid "Manufacturing analytics"
 msgstr ""
 
-#: includes/access_levels.inc:71
+#: ../includes/access_levels.inc:71
 msgid "Dimensions configuration"
 msgstr ""
 
-#: includes/access_levels.inc:72
+#: ../includes/access_levels.inc:72
+#: ../inventory/manage/items.php:352
+#: ../reporting/reports_main.php:294
 msgid "Dimensions"
 msgstr ""
 
-#: includes/access_levels.inc:73
+#: ../includes/access_levels.inc:73
 msgid "Banking & GL configuration"
 msgstr ""
 
-#: includes/access_levels.inc:74
+#: ../includes/access_levels.inc:74
 msgid "Banking & GL transactions"
 msgstr ""
 
-#: includes/access_levels.inc:75
+#: ../includes/access_levels.inc:75
 msgid "Banking & GL analytics"
 msgstr ""
 
-#: includes/access_levels.inc:93
+#: ../includes/access_levels.inc:93
 msgid "Install/update companies"
 msgstr ""
 
-#: includes/access_levels.inc:94
+#: ../includes/access_levels.inc:94
 msgid "Install/update languages"
 msgstr ""
 
-#: includes/access_levels.inc:95
+#: ../includes/access_levels.inc:95
 msgid "Install/upgrade modules"
 msgstr ""
 
-#: includes/access_levels.inc:96
+#: ../includes/access_levels.inc:96
 msgid "Software upgrades"
 msgstr ""
 
-#: includes/access_levels.inc:100
+#: ../includes/access_levels.inc:100
 msgid "Company parameters"
 msgstr ""
 
-#: includes/access_levels.inc:101
+#: ../includes/access_levels.inc:101
 msgid "Access levels edition"
 msgstr ""
 
-#: includes/access_levels.inc:102
+#: ../includes/access_levels.inc:102
 msgid "Users setup"
 msgstr ""
 
-#: includes/access_levels.inc:103
+#: ../includes/access_levels.inc:103
 msgid "Point of sales definitions"
 msgstr ""
 
-#: includes/access_levels.inc:104
+#: ../includes/access_levels.inc:104
 msgid "Printers configuration"
 msgstr ""
 
-#: includes/access_levels.inc:105
+#: ../includes/access_levels.inc:105
 msgid "Print profiles"
 msgstr ""
 
-#: includes/access_levels.inc:106
+#: ../includes/access_levels.inc:106
 msgid "Payment terms"
 msgstr ""
 
-#: includes/access_levels.inc:107
+#: ../includes/access_levels.inc:107
 msgid "Shipping ways"
 msgstr ""
 
-#: includes/access_levels.inc:108
+#: ../includes/access_levels.inc:108
 msgid "Credit status definitions changes"
 msgstr ""
 
-#: includes/access_levels.inc:109
+#: ../includes/access_levels.inc:109
 msgid "Inventory locations changes"
 msgstr ""
 
-#: includes/access_levels.inc:110
+#: ../includes/access_levels.inc:110
 msgid "Inventory movement types"
 msgstr ""
 
-#: includes/access_levels.inc:111
+#: ../includes/access_levels.inc:111
 msgid "Manufacture work centres"
 msgstr ""
 
-#: includes/access_levels.inc:112
+#: ../includes/access_levels.inc:112
 msgid "Forms setup"
 msgstr ""
 
-#: includes/access_levels.inc:113
+#: ../includes/access_levels.inc:113
 msgid "Contact categories"
 msgstr ""
 
-#: includes/access_levels.inc:117
+#: ../includes/access_levels.inc:117
 msgid "Voiding transactions"
 msgstr ""
 
-#: includes/access_levels.inc:118
+#: ../includes/access_levels.inc:118
 msgid "Database backup/restore"
 msgstr ""
 
-#: includes/access_levels.inc:119
+#: ../includes/access_levels.inc:119
 msgid "Common view/print transactions interface"
 msgstr ""
 
-#: includes/access_levels.inc:120
+#: ../includes/access_levels.inc:120
 msgid "Attaching documents"
 msgstr ""
 
-#: includes/access_levels.inc:121
+#: ../includes/access_levels.inc:121
 msgid "Display preferences"
 msgstr ""
 
-#: includes/access_levels.inc:122
+#: ../includes/access_levels.inc:122
 msgid "Password changes"
 msgstr ""
 
-#: includes/access_levels.inc:123
+#: ../includes/access_levels.inc:123
 msgid "Edit other users transactions"
 msgstr ""
 
-#: includes/access_levels.inc:127
+#: ../includes/access_levels.inc:127
 msgid "Sales types"
 msgstr ""
 
-#: includes/access_levels.inc:128
+#: ../includes/access_levels.inc:128
 msgid "Sales prices edition"
 msgstr ""
 
-#: includes/access_levels.inc:129
+#: ../includes/access_levels.inc:129
 msgid "Sales staff maintenance"
 msgstr ""
 
-#: includes/access_levels.inc:130
+#: ../includes/access_levels.inc:130
 msgid "Sales areas maintenance"
 msgstr ""
 
-#: includes/access_levels.inc:131
+#: ../includes/access_levels.inc:131
 msgid "Sales groups changes"
 msgstr ""
 
-#: includes/access_levels.inc:132
+#: ../includes/access_levels.inc:132
 msgid "Sales templates"
 msgstr ""
 
-#: includes/access_levels.inc:133
+#: ../includes/access_levels.inc:133
 msgid "Recurrent invoices definitions"
 msgstr ""
 
-#: includes/access_levels.inc:135
+#: ../includes/access_levels.inc:135
 msgid "Sales transactions view"
 msgstr ""
 
-#: includes/access_levels.inc:136
+#: ../includes/access_levels.inc:136
 msgid "Sales customer and branches changes"
 msgstr ""
 
-#: includes/access_levels.inc:137
+#: ../includes/access_levels.inc:137
 msgid "Sales quotations"
 msgstr ""
 
-#: includes/access_levels.inc:138
+#: ../includes/access_levels.inc:138
 msgid "Sales orders edition"
 msgstr ""
 
-#: includes/access_levels.inc:139
+#: ../includes/access_levels.inc:139
 msgid "Sales deliveries edition"
 msgstr ""
 
-#: includes/access_levels.inc:140
+#: ../includes/access_levels.inc:140
 msgid "Sales invoices edition"
 msgstr ""
 
-#: includes/access_levels.inc:141
+#: ../includes/access_levels.inc:141
 msgid "Sales credit notes against invoice"
 msgstr ""
 
-#: includes/access_levels.inc:142
+#: ../includes/access_levels.inc:142
 msgid "Sales freehand credit notes"
 msgstr ""
 
-#: includes/access_levels.inc:143
+#: ../includes/access_levels.inc:143
 msgid "Customer payments entry"
 msgstr ""
 
-#: includes/access_levels.inc:144
+#: ../includes/access_levels.inc:144
 msgid "Customer payments allocation"
 msgstr ""
 
-#: includes/access_levels.inc:146
+#: ../includes/access_levels.inc:146
 msgid "Sales analytical reports"
 msgstr ""
 
-#: includes/access_levels.inc:147
+#: ../includes/access_levels.inc:147
 msgid "Sales document bulk reports"
 msgstr ""
 
-#: includes/access_levels.inc:148
+#: ../includes/access_levels.inc:148
 msgid "Sales prices listing"
 msgstr ""
 
-#: includes/access_levels.inc:149
+#: ../includes/access_levels.inc:149
 msgid "Sales staff listing"
 msgstr ""
 
-#: includes/access_levels.inc:150
+#: ../includes/access_levels.inc:150
 msgid "Customer bulk listing"
 msgstr ""
 
-#: includes/access_levels.inc:151
+#: ../includes/access_levels.inc:151
 msgid "Customer status report"
 msgstr ""
 
-#: includes/access_levels.inc:152
+#: ../includes/access_levels.inc:152
 msgid "Customer payments report"
 msgstr ""
 
-#: includes/access_levels.inc:157
+#: ../includes/access_levels.inc:157
 msgid "Purchase price changes"
 msgstr ""
 
-#: includes/access_levels.inc:159
+#: ../includes/access_levels.inc:159
 msgid "Supplier transactions view"
 msgstr ""
 
-#: includes/access_levels.inc:160
+#: ../includes/access_levels.inc:160
 msgid "Suppliers changes"
 msgstr ""
 
-#: includes/access_levels.inc:161
+#: ../includes/access_levels.inc:161
 msgid "Purchase order entry"
 msgstr ""
 
-#: includes/access_levels.inc:162
+#: ../includes/access_levels.inc:162
 msgid "Purchase receive"
 msgstr ""
 
-#: includes/access_levels.inc:163
+#: ../includes/access_levels.inc:163
 msgid "Supplier invoices"
 msgstr ""
 
-#: includes/access_levels.inc:164
+#: ../includes/access_levels.inc:164
 msgid "Deleting GRN items during invoice entry"
 msgstr ""
 
-#: includes/access_levels.inc:165
+#: ../includes/access_levels.inc:165
 msgid "Supplier credit notes"
 msgstr ""
 
-#: includes/access_levels.inc:166
+#: ../includes/access_levels.inc:166
 msgid "Supplier payments"
 msgstr ""
 
-#: includes/access_levels.inc:167
+#: ../includes/access_levels.inc:167
 msgid "Supplier payments allocations"
 msgstr ""
 
-#: includes/access_levels.inc:169
+#: ../includes/access_levels.inc:169
 msgid "Supplier analytical reports"
 msgstr ""
 
-#: includes/access_levels.inc:170
+#: ../includes/access_levels.inc:170
 msgid "Supplier document bulk reports"
 msgstr ""
 
-#: includes/access_levels.inc:171
+#: ../includes/access_levels.inc:171
 msgid "Supplier payments report"
 msgstr ""
 
-#: includes/access_levels.inc:175
+#: ../includes/access_levels.inc:175
 msgid "Stock items add/edit"
 msgstr ""
 
-#: includes/access_levels.inc:176
+#: ../includes/access_levels.inc:176
 msgid "Sales kits"
 msgstr ""
 
-#: includes/access_levels.inc:177
+#: ../includes/access_levels.inc:177
 msgid "Item categories"
 msgstr ""
 
-#: includes/access_levels.inc:178
+#: ../includes/access_levels.inc:178
 msgid "Units of measure"
 msgstr ""
 
-#: includes/access_levels.inc:180
+#: ../includes/access_levels.inc:180
 msgid "Stock status view"
 msgstr ""
 
-#: includes/access_levels.inc:181
+#: ../includes/access_levels.inc:181
 msgid "Stock transactions view"
 msgstr ""
 
-#: includes/access_levels.inc:182
+#: ../includes/access_levels.inc:182
 msgid "Foreign item codes entry"
 msgstr ""
 
-#: includes/access_levels.inc:183
+#: ../includes/access_levels.inc:183
 msgid "Inventory location transfers"
 msgstr ""
 
-#: includes/access_levels.inc:184
+#: ../includes/access_levels.inc:184
 msgid "Inventory adjustments"
 msgstr ""
 
-#: includes/access_levels.inc:186
+#: ../includes/access_levels.inc:186
 msgid "Reorder levels"
 msgstr ""
 
-#: includes/access_levels.inc:187
+#: ../includes/access_levels.inc:187
 msgid "Items analytical reports and inquiries"
 msgstr ""
 
-#: includes/access_levels.inc:188
+#: ../includes/access_levels.inc:188
 msgid "Inventory valuation report"
 msgstr ""
 
-#: includes/access_levels.inc:193
+#: ../includes/access_levels.inc:193
 msgid "Bill of Materials"
 msgstr ""
 
-#: includes/access_levels.inc:195
+#: ../includes/access_levels.inc:195
 msgid "Manufacturing operations view"
 msgstr ""
 
-#: includes/access_levels.inc:196
+#: ../includes/access_levels.inc:196
 msgid "Work order entry"
 msgstr ""
 
-#: includes/access_levels.inc:197
+#: ../includes/access_levels.inc:197
 msgid "Material issues entry"
 msgstr ""
 
-#: includes/access_levels.inc:198
+#: ../includes/access_levels.inc:198
 msgid "Final product receive"
 msgstr ""
 
-#: includes/access_levels.inc:199
+#: ../includes/access_levels.inc:199
 msgid "Work order releases"
 msgstr ""
 
-#: includes/access_levels.inc:201
+#: ../includes/access_levels.inc:201
 msgid "Work order analytical reports and inquiries"
 msgstr ""
 
-#: includes/access_levels.inc:202
+#: ../includes/access_levels.inc:202
 msgid "Manufacturing cost inquiry"
 msgstr ""
 
-#: includes/access_levels.inc:203
+#: ../includes/access_levels.inc:203
 msgid "Work order bulk reports"
 msgstr ""
 
-#: includes/access_levels.inc:204
+#: ../includes/access_levels.inc:204
 msgid "Bill of materials reports"
 msgstr ""
 
-#: includes/access_levels.inc:208
+#: ../includes/access_levels.inc:208
 msgid "Dimension tags"
 msgstr ""
 
-#: includes/access_levels.inc:210
+#: ../includes/access_levels.inc:210
 msgid "Dimension view"
 msgstr ""
 
-#: includes/access_levels.inc:212
+#: ../includes/access_levels.inc:212
 msgid "Dimension entry"
 msgstr ""
 
-#: includes/access_levels.inc:214
+#: ../includes/access_levels.inc:214
 msgid "Dimension reports"
 msgstr ""
 
-#: includes/access_levels.inc:218
+#: ../includes/access_levels.inc:218
 msgid "Item tax type definitions"
 msgstr ""
 
-#: includes/access_levels.inc:219
+#: ../includes/access_levels.inc:219
 msgid "GL accounts edition"
 msgstr ""
 
-#: includes/access_levels.inc:220
+#: ../includes/access_levels.inc:220
 msgid "GL account groups"
 msgstr ""
 
-#: includes/access_levels.inc:221
+#: ../includes/access_levels.inc:221
 msgid "GL account classes"
 msgstr ""
 
-#: includes/access_levels.inc:222
+#: ../includes/access_levels.inc:222
 msgid "Quick GL entry definitions"
 msgstr ""
 
-#: includes/access_levels.inc:224
+#: ../includes/access_levels.inc:224
 msgid "Bank accounts"
 msgstr ""
 
-#: includes/access_levels.inc:225
+#: ../includes/access_levels.inc:225
 msgid "Tax rates"
 msgstr ""
 
-#: includes/access_levels.inc:226
+#: ../includes/access_levels.inc:226
 msgid "Tax groups"
 msgstr ""
 
-#: includes/access_levels.inc:227
+#: ../includes/access_levels.inc:227
 msgid "Fiscal years maintenance"
 msgstr ""
 
-#: includes/access_levels.inc:228
+#: ../includes/access_levels.inc:228
 msgid "Company GL setup"
 msgstr ""
 
-#: includes/access_levels.inc:229
+#: ../includes/access_levels.inc:229
 msgid "GL Account tags"
 msgstr ""
 
-#: includes/access_levels.inc:230
+#: ../includes/access_levels.inc:230
 msgid "Closing GL transactions"
 msgstr ""
 
-#: includes/access_levels.inc:231
+#: ../includes/access_levels.inc:231
 msgid "Reopening GL transactions"
 msgstr ""
 
-#: includes/access_levels.inc:232
+#: ../includes/access_levels.inc:232
 msgid "Allow entry on non closed Fiscal years"
 msgstr ""
 
-#: includes/access_levels.inc:234
+#: ../includes/access_levels.inc:234
 msgid "Bank transactions view"
 msgstr ""
 
-#: includes/access_levels.inc:235
+#: ../includes/access_levels.inc:235
 msgid "GL postings view"
 msgstr ""
 
-#: includes/access_levels.inc:236
+#: ../includes/access_levels.inc:236
 msgid "Exchange rate table changes"
 msgstr ""
 
-#: includes/access_levels.inc:237
+#: ../includes/access_levels.inc:237
 msgid "Bank payments"
 msgstr ""
 
-#: includes/access_levels.inc:238
+#: ../includes/access_levels.inc:238
 msgid "Bank deposits"
 msgstr ""
 
-#: includes/access_levels.inc:239
+#: ../includes/access_levels.inc:239
 msgid "Bank account transfers"
 msgstr ""
 
-#: includes/access_levels.inc:240
+#: ../includes/access_levels.inc:240
 msgid "Bank reconciliation"
 msgstr ""
 
-#: includes/access_levels.inc:241
+#: ../includes/access_levels.inc:241
 msgid "Manual journal entries"
 msgstr ""
 
-#: includes/access_levels.inc:242
+#: ../includes/access_levels.inc:242
 msgid "Journal entries to bank related accounts"
 msgstr ""
 
-#: includes/access_levels.inc:243
+#: ../includes/access_levels.inc:243
 msgid "Budget edition"
 msgstr ""
 
-#: includes/access_levels.inc:244
+#: ../includes/access_levels.inc:244
 msgid "Item standard costs"
 msgstr ""
 
-#: includes/access_levels.inc:247
+#: ../includes/access_levels.inc:247
 msgid "GL analytical reports and inquiries"
 msgstr ""
 
-#: includes/access_levels.inc:248
+#: ../includes/access_levels.inc:248
 msgid "Tax reports and inquiries"
 msgstr ""
 
-#: includes/access_levels.inc:249
+#: ../includes/access_levels.inc:249
 msgid "Bank reports and inquiries"
 msgstr ""
 
-#: includes/access_levels.inc:250
+#: ../includes/access_levels.inc:250
 msgid "GL reports and inquiries"
 msgstr ""
 
-#: includes/banking.inc:100 includes/data_checks.inc:52
+#: ../includes/banking.inc:100
+#: ../includes/data_checks.inc:52
 #, php-format
 msgid ""
 "Cannot retrieve exchange rate for currency %s as of %s. Please add exchange "
 "rate manually on Exchange Rates page."
 msgstr ""
 
-#: includes/current_user.inc:101
+#: ../includes/current_user.inc:101
 msgid ""
 "Before software upgrade you have to include old $security_groups and "
 "$security_headings arrays from old config.php file to the new one."
 msgstr ""
 
-#: includes/current_user.inc:102 includes/ui/ui_controls.inc:197
-#: includes/ui/ui_view.inc:846
+#: ../includes/current_user.inc:102
+#: ../includes/ui/ui_controls.inc:197
+#: ../includes/ui/ui_view.inc:904
 msgid "Back"
 msgstr ""
 
-#: includes/current_user.inc:112
+#: ../includes/current_user.inc:112
 msgid "System is available for site admin only until full database upgrade"
 msgstr ""
 
-#: includes/current_user.inc:544
+#: ../includes/current_user.inc:544
 msgid "Requesting data..."
 msgstr ""
 
-#: includes/data_checks.inc:508
+#: ../includes/data_checks.inc:508
 #, php-format
 msgid "%s #%s is closed for further edition."
 msgstr ""
 
-#: includes/data_checks.inc:534
+#: ../includes/data_checks.inc:534
 msgid "You have no edit access to transactions created by other users."
 msgstr ""
 
-#: includes/errors.inc:125
+#: ../includes/errors.inc:125
 msgid "in file"
 msgstr ""
 
-#: includes/errors.inc:125
+#: ../includes/errors.inc:125
 msgid "at line "
 msgstr ""
 
-#: includes/errors.inc:179
+#: ../includes/errors.inc:179
 msgid "Debug mode database warning:"
 msgstr ""
 
-#: includes/errors.inc:181
+#: ../includes/errors.inc:181
 msgid "DATABASE ERROR :"
 msgstr ""
 
-#: includes/errors.inc:212
+#: ../includes/errors.inc:212
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
 msgstr ""
 
-#: includes/main.inc:44
+#: ../includes/main.inc:44
 msgid "This page is usable only with javascript enabled browsers."
 msgstr ""
 
-#: includes/packages.inc:189
+#: ../includes/packages.inc:189
 #, php-format
 msgid "No key field '%s' in file '%s'"
 msgstr ""
 
-#: includes/packages.inc:294
+#: ../includes/packages.inc:294
 msgid "Cannot download repo index file."
 msgstr ""
 
-#: includes/packages.inc:306 includes/packages.inc:343
+#: ../includes/packages.inc:306
+#: ../includes/packages.inc:343
 #, php-format
 msgid "Cannot delete outdated '%s' file."
 msgstr ""
 
-#: includes/packages.inc:310
+#: ../includes/packages.inc:310
 msgid "Release file in repository is invalid, or public key is outdated."
 msgstr ""
 
-#: includes/packages.inc:327
+#: ../includes/packages.inc:327
 msgid "Repository version does not match application version."
 msgstr ""
 
-#: includes/packages.inc:335 includes/packages.inc:377
+#: ../includes/packages.inc:335
+#: ../includes/packages.inc:377
 #, php-format
 msgid "Cannot download '%s' file."
 msgstr ""
 
-#: includes/packages.inc:347
+#: ../includes/packages.inc:347
 #, php-format
 msgid ""
 "Security alert: broken index file in repository '%s'. Please inform "
 "repository administrator about this issue."
 msgstr ""
 
-#: includes/packages.inc:383
+#: ../includes/packages.inc:383
 #, php-format
 msgid ""
 "Security alert: broken package '%s' in repository. Please inform repository "
 "administrator about this issue."
 msgstr ""
 
-#: includes/packages.inc:638 includes/packages.inc:699
+#: ../includes/packages.inc:638
+#: ../includes/packages.inc:699
 #, php-format
 msgid "Package '%s' not found."
 msgstr ""
 
-#: includes/session.inc:132
+#: ../includes/session.inc:136
 msgid "Incorrect Password"
 msgstr ""
 
-#: includes/session.inc:133
+#: ../includes/session.inc:137
 msgid "The user and password combination is not valid for the system."
 msgstr ""
 
-#: includes/session.inc:135
+#: ../includes/session.inc:139
 msgid ""
 "If you are not an authorized user, please contact your system administrator "
 "to obtain an account to enable you to use the system."
 msgstr ""
 
-#: includes/session.inc:136
+#: ../includes/session.inc:140
 msgid "Try again"
 msgstr ""
 
-#: includes/session.inc:176
+#: ../includes/session.inc:180
 #, php-format
 msgid ""
 "Brute force attack on account '%s' detected. Access for non-logged users "
 "temporarily blocked."
 msgstr ""
 
-#: includes/session.inc:207
+#: ../includes/session.inc:211
 msgid "Security settings have not been defined for your user account."
 msgstr ""
 
-#: includes/session.inc:208
+#: ../includes/session.inc:212
 msgid "Please contact your system administrator."
 msgstr ""
 
-#: includes/session.inc:209
+#: ../includes/session.inc:213
 msgid ""
 "Please remove $security_groups and $security_headings arrays from config.php "
 "file!"
 msgstr ""
 
-#: includes/session.inc:211
+#: ../includes/session.inc:215
 msgid ""
 "Access to application has been blocked until database upgrade is completed "
 "by system administrator."
 msgstr ""
 
-#: includes/session.inc:225
+#: ../includes/session.inc:229
 msgid ""
 "The security settings on your account do not permit you to access this "
 "function"
 msgstr ""
 
-#: includes/session.inc:234
+#: ../includes/session.inc:238
 msgid ""
 "System is blocked after source upgrade until database is updated on System/"
 "Software Upgrade page"
 msgstr ""
 
-#: includes/sysnames.inc:23 includes/sysnames.inc:149
+#: ../includes/sysnames.inc:23
+#: ../includes/sysnames.inc:149
 msgid "Bank Payment"
 msgstr ""
 
-#: includes/sysnames.inc:24 includes/sysnames.inc:148
+#: ../includes/sysnames.inc:24
+#: ../includes/sysnames.inc:148
 msgid "Bank Deposit"
 msgstr ""
 
-#: includes/sysnames.inc:25
+#: ../includes/sysnames.inc:25
 msgid "Funds Transfer"
 msgstr ""
 
-#: includes/sysnames.inc:26
+#: ../includes/sysnames.inc:26
 msgid "Sales Invoice"
 msgstr ""
 
-#: includes/sysnames.inc:27 sales/credit_note_entry.php:37
+#: ../includes/sysnames.inc:27
+#: ../sales/credit_note_entry.php:37
 msgid "Customer Credit Note"
 msgstr ""
 
-#: includes/sysnames.inc:28
+#: ../includes/sysnames.inc:28
 msgid "Customer Payment"
 msgstr ""
 
-#: includes/sysnames.inc:29
+#: ../includes/sysnames.inc:29
 msgid "Delivery Note"
 msgstr ""
 
-#: includes/sysnames.inc:30
+#: ../includes/sysnames.inc:30
 msgid "Location Transfer"
 msgstr ""
 
-#: includes/sysnames.inc:31
+#: ../includes/sysnames.inc:31
 msgid "Inventory Adjustment"
 msgstr ""
 
-#: includes/sysnames.inc:32 purchasing/view/view_po.php:30
+#: ../includes/sysnames.inc:32
+#: ../purchasing/includes/ui/po_ui.inc:328
+#: ../purchasing/view/view_po.php:30
 msgid "Purchase Order"
 msgstr ""
 
-#: includes/sysnames.inc:33
+#: ../includes/sysnames.inc:33
 msgid "Supplier Invoice"
 msgstr ""
 
-#: includes/sysnames.inc:34 purchasing/supplier_credit.php:58
+#: ../includes/sysnames.inc:34
+#: ../purchasing/supplier_credit.php:58
+#: ../purchasing/supplier_credit.php:62
 msgid "Supplier Credit Note"
 msgstr ""
 
-#: includes/sysnames.inc:35
+#: ../includes/sysnames.inc:35
 msgid "Supplier Payment"
 msgstr ""
 
-#: includes/sysnames.inc:36 purchasing/view/view_grn.php:33
+#: ../includes/sysnames.inc:36
+#: ../purchasing/view/view_grn.php:33
 msgid "Purchase Order Delivery"
 msgstr ""
 
-#: includes/sysnames.inc:37 includes/sysnames.inc:95
+#: ../includes/sysnames.inc:37
+#: ../includes/sysnames.inc:95
 msgid "Work Order"
 msgstr ""
 
-#: includes/sysnames.inc:38
+#: ../includes/sysnames.inc:38
 msgid "Work Order Issue"
 msgstr ""
 
-#: includes/sysnames.inc:39
+#: ../includes/sysnames.inc:39
 msgid "Work Order Production"
 msgstr ""
 
-#: includes/sysnames.inc:40
+#: ../includes/sysnames.inc:40
+#: ../sales/inquiry/sales_orders_view.php:151
+#: ../sales/inquiry/sales_orders_view.php:173
+#: ../sales/inquiry/sales_orders_view.php.orig:151
+#: ../sales/inquiry/sales_orders_view.php.orig:173
 msgid "Sales Order"
 msgstr ""
 
-#: includes/sysnames.inc:41 sales/sales_order_entry.php:652
+#: ../includes/sysnames.inc:41
+#: ../sales/sales_order_entry.php:653
 msgid "Sales Quotation"
 msgstr ""
 
-#: includes/sysnames.inc:42
+#: ../includes/sysnames.inc:42
 msgid "Cost Update"
 msgstr ""
 
-#: includes/sysnames.inc:47
+#: ../includes/sysnames.inc:47
 msgid "GJ"
 msgstr ""
 
-#: includes/sysnames.inc:48
+#: ../includes/sysnames.inc:48
 msgid "BP"
 msgstr ""
 
-#: includes/sysnames.inc:49
+#: ../includes/sysnames.inc:49
 msgid "BD"
 msgstr ""
 
-#: includes/sysnames.inc:50
+#: ../includes/sysnames.inc:50
 msgid "BT"
 msgstr ""
 
-#: includes/sysnames.inc:51
+#: ../includes/sysnames.inc:51
 msgid "SI"
 msgstr ""
 
-#: includes/sysnames.inc:52
+#: ../includes/sysnames.inc:52
 msgid "CN"
 msgstr ""
 
-#: includes/sysnames.inc:53
+#: ../includes/sysnames.inc:53
 msgid "CP"
 msgstr ""
 
-#: includes/sysnames.inc:54 sales/customer_invoice.php:547
+#: ../includes/sysnames.inc:54
+#: ../sales/customer_invoice.php:547
 msgid "DN"
 msgstr ""
 
-#: includes/sysnames.inc:55
+#: ../includes/sysnames.inc:55
 msgid "IT"
 msgstr ""
 
-#: includes/sysnames.inc:56
+#: ../includes/sysnames.inc:56
 msgid "IA"
 msgstr ""
 
-#: includes/sysnames.inc:57
+#: ../includes/sysnames.inc:57
 msgid "PO"
 msgstr ""
 
-#: includes/sysnames.inc:58
+#: ../includes/sysnames.inc:58
 msgid "PI"
 msgstr ""
 
-#: includes/sysnames.inc:59
+#: ../includes/sysnames.inc:59
 msgid "PC"
 msgstr ""
 
-#: includes/sysnames.inc:60
+#: ../includes/sysnames.inc:60
 msgid "SP"
 msgstr ""
 
-#: includes/sysnames.inc:61 reporting/rep204.php:84 reporting/rep305.php:100
+#: ../includes/sysnames.inc:61
+#: ../reporting/rep204.php:84
+#: ../reporting/rep305.php:101
 msgid "GRN"
 msgstr ""
 
-#: includes/sysnames.inc:62
+#: ../includes/sysnames.inc:62
 msgid "WO"
 msgstr ""
 
-#: includes/sysnames.inc:63
+#: ../includes/sysnames.inc:63
 msgid "WI"
 msgstr ""
 
-#: includes/sysnames.inc:64
+#: ../includes/sysnames.inc:64
 msgid "WP"
 msgstr ""
 
-#: includes/sysnames.inc:65
+#: ../includes/sysnames.inc:65
 msgid "SO"
 msgstr ""
 
-#: includes/sysnames.inc:66
+#: ../includes/sysnames.inc:66
 msgid "SQ"
 msgstr ""
 
-#: includes/sysnames.inc:67
+#: ../includes/sysnames.inc:67
 msgid "CU"
 msgstr ""
 
-#: includes/sysnames.inc:68
+#: ../includes/sysnames.inc:68
 msgid "Dim"
 msgstr ""
 
-#: includes/sysnames.inc:76
+#: ../includes/sysnames.inc:76
 msgid "Savings Account"
 msgstr ""
 
-#: includes/sysnames.inc:77
+#: ../includes/sysnames.inc:77
 msgid "Chequing Account"
 msgstr ""
 
-#: includes/sysnames.inc:78 manufacturing/work_order_costs.php:145
+#: ../includes/sysnames.inc:78
+#: ../manufacturing/work_order_costs.php:145
 msgid "Credit Account"
 msgstr ""
 
-#: includes/sysnames.inc:79
+#: ../includes/sysnames.inc:79
 msgid "Cash Account"
 msgstr ""
 
-#: includes/sysnames.inc:83
+#: ../includes/sysnames.inc:83
 msgid "Transfer"
 msgstr ""
 
-#: includes/sysnames.inc:84
+#: ../includes/sysnames.inc:84
 msgid "Cheque"
 msgstr ""
 
-#: includes/sysnames.inc:86 includes/sysnames.inc:181
+#: ../includes/sysnames.inc:86
+#: ../includes/sysnames.inc:181
 msgid "Cash"
 msgstr ""
 
-#: includes/sysnames.inc:96 includes/sysnames.inc:195 reporting/rep102.php:125
-#: reporting/rep102.php:132 reporting/rep105.php:109 reporting/rep106.php:83
-#: reporting/rep114.php:95 reporting/rep304.php:114 reporting/rep304.php:124
-#: reporting/reports_main.php:32 reporting/reports_main.php:36
-#: reporting/reports_main.php:45 sales/create_recurrent_invoices.php:134
-#: sales/customer_credit_invoice.php:235 sales/customer_delivery.php:352
-#: sales/customer_invoice.php:446
-#: sales/allocations/customer_allocation_main.php:97
-#: sales/allocations/customer_allocation_main.php:105
-#: sales/manage/recurrent_invoices.php:102 sales/view/view_credit.php:47
-#: sales/inquiry/customer_allocation_inquiry.php:149
-#: sales/inquiry/customer_allocation_inquiry.php:159
-#: sales/inquiry/customer_inquiry.php:206
-#: sales/inquiry/customer_inquiry.php:220
-#: sales/inquiry/sales_deliveries_view.php:180
+#: ../includes/sysnames.inc:96
+#: ../includes/sysnames.inc:195
+#: ../reporting/rep101.php:156
+#: ../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:352
+#: ../sales/customer_invoice.php:446
+#: ../sales/allocations/customer_allocation_main.php:97
+#: ../sales/allocations/customer_allocation_main.php:105
+#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/view/view_credit.php:47
+#: ../sales/inquiry/customer_allocation_inquiry.php:150
+#: ../sales/inquiry/customer_allocation_inquiry.php:160
+#: ../sales/inquiry/customer_inquiry.php:206
+#: ../sales/inquiry/customer_inquiry.php:220
+#: ../sales/inquiry/sales_deliveries_view.php:180
+#: ../sales/inquiry/sales_orders_view.php.orig:286
+#: ../sales/inquiry/sales_orders_view.php.orig:300
 msgid "Customer"
 msgstr ""
 
-#: includes/sysnames.inc:97 includes/sysnames.inc:173
-#: includes/sysnames.inc:196 inventory/purchasing_data.php:149
-#: purchasing/includes/ui/grn_ui.inc:20
-#: purchasing/view/view_supp_credit.php:42
-#: purchasing/view/view_supp_invoice.php:46
-#: purchasing/inquiry/po_search_completed.php:122
-#: purchasing/inquiry/po_search.php:132
-#: purchasing/inquiry/supplier_allocation_inquiry.php:128
-#: purchasing/inquiry/supplier_allocation_inquiry.php:141
-#: purchasing/inquiry/supplier_inquiry.php:176
-#: purchasing/inquiry/supplier_inquiry.php:191
-#: purchasing/allocations/supplier_allocation_main.php:98
-#: purchasing/allocations/supplier_allocation_main.php:106
-#: reporting/rep202.php:130 reporting/rep202.php:137 reporting/rep203.php:100
-#: reporting/rep204.php:90 reporting/rep306.php:141 reporting/rep306.php:151
+#: ../includes/sysnames.inc:97
+#: ../includes/sysnames.inc:173
+#: ../includes/sysnames.inc:196
+#: ../inventory/purchasing_data.php.orig:149
+#: ../purchasing/includes/ui/grn_ui.inc:20
+#: ../purchasing/includes/ui/grn_ui.inc:52
+#: ../purchasing/includes/ui/po_ui.inc:321
+#: ../purchasing/view/view_supp_credit.php:42
+#: ../purchasing/view/view_supp_invoice.php:46
+#: ../purchasing/inquiry/po_search_completed.php:122
+#: ../purchasing/inquiry/po_search.php:132
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:129
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:142
+#: ../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:144
+#: ../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 ""
 
-#: includes/sysnames.inc:105
+#: ../includes/sysnames.inc:105
 msgid "Assemble"
 msgstr ""
 
-#: includes/sysnames.inc:106
+#: ../includes/sysnames.inc:106
 msgid "Unassemble"
 msgstr ""
 
-#: includes/sysnames.inc:107
+#: ../includes/sysnames.inc:107
 msgid "Advanced Manufacture"
 msgstr ""
 
-#: includes/sysnames.inc:111
+#: ../includes/sysnames.inc:111
 msgid "Labour Cost"
 msgstr ""
 
-#: includes/sysnames.inc:112
+#: ../includes/sysnames.inc:112
 msgid "Overhead Cost"
 msgstr ""
 
-#: includes/sysnames.inc:113
+#: ../includes/sysnames.inc:113
 msgid "Materials"
 msgstr ""
 
-#: includes/sysnames.inc:120
+#: ../includes/sysnames.inc:120
 msgid "Assets"
 msgstr ""
 
-#: includes/sysnames.inc:122
+#: ../includes/sysnames.inc:122
 msgid "Equity"
 msgstr ""
 
-#: includes/sysnames.inc:123
+#: ../includes/sysnames.inc:123
 msgid "Income"
 msgstr ""
 
-#: includes/sysnames.inc:124
+#: ../includes/sysnames.inc:124
 msgid "Cost of Goods Sold"
 msgstr ""
 
-#: includes/sysnames.inc:125
+#: ../includes/sysnames.inc:125
 msgid "Expense"
 msgstr ""
 
-#: includes/sysnames.inc:132
+#: ../includes/sysnames.inc:132
 msgid "Remainder"
 msgstr ""
 
-#: includes/sysnames.inc:134
+#: ../includes/sysnames.inc:134
 msgid "Amount, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:135
+#: ../includes/sysnames.inc:135
 msgid "Amount, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:136
+#: ../includes/sysnames.inc:136
 msgid "% amount of base"
 msgstr ""
 
-#: includes/sysnames.inc:137
+#: ../includes/sysnames.inc:137
 msgid "% amount of base, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:138
+#: ../includes/sysnames.inc:138
 msgid "% amount of base, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:139
+#: ../includes/sysnames.inc:139
 msgid "Taxes added"
 msgstr ""
 
-#: includes/sysnames.inc:140
+#: ../includes/sysnames.inc:140
 msgid "Taxes added, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:141
+#: ../includes/sysnames.inc:141
 msgid "Taxes added, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:142
+#: ../includes/sysnames.inc:142
 msgid "Taxes included"
 msgstr ""
 
-#: includes/sysnames.inc:143
+#: ../includes/sysnames.inc:143
 msgid "Taxes included, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:144
+#: ../includes/sysnames.inc:144
 msgid "Taxes included, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:151
+#: ../includes/sysnames.inc:151
 msgid "Supplier Invoice/Credit"
 msgstr ""
 
-#: includes/sysnames.inc:157 manufacturing/search_work_orders.php:165
-#: manufacturing/includes/manufacturing_ui.inc:278
+#: ../includes/sysnames.inc:157
+#: ../manufacturing/search_work_orders.php:165
+#: ../manufacturing/includes/manufacturing_ui.inc:278
 msgid "Manufactured"
 msgstr ""
 
-#: includes/sysnames.inc:158
+#: ../includes/sysnames.inc:158
 msgid "Purchased"
 msgstr ""
 
-#: includes/sysnames.inc:159
+#: ../includes/sysnames.inc:159
 msgid "Service"
 msgstr ""
 
-#: includes/sysnames.inc:172
+#: ../includes/sysnames.inc:172
 msgid "Customer branch"
 msgstr ""
 
-#: includes/sysnames.inc:174
+#: ../includes/sysnames.inc:174
 msgid "Shipper"
 msgstr ""
 
-#: includes/sysnames.inc:175
+#: ../includes/sysnames.inc:175
 msgid "Company internal"
 msgstr ""
 
-#: includes/sysnames.inc:180
+#: ../includes/sysnames.inc:180
 msgid "Prepayment"
 msgstr ""
 
-#: includes/sysnames.inc:182
+#: ../includes/sysnames.inc:182
 msgid "After No. of Days"
 msgstr ""
 
-#: includes/sysnames.inc:183
+#: ../includes/sysnames.inc:183
 msgid "Day In Following Month"
 msgstr ""
 
-#: includes/sysnames.inc:187
+#: ../includes/sysnames.inc:187
 msgid "Sum per line taxes"
 msgstr ""
 
-#: includes/sysnames.inc:188
+#: ../includes/sysnames.inc:188
 msgid "Taxes from totals"
 msgstr ""
 
-#: includes/sysnames.inc:200
+#: ../includes/sysnames.inc:200
 msgid "Jan"
 msgstr ""
 
-#: includes/sysnames.inc:200
+#: ../includes/sysnames.inc:200
 msgid "Feb"
 msgstr ""
 
-#: includes/sysnames.inc:200
+#: ../includes/sysnames.inc:200
 msgid "Mar"
 msgstr ""
 
-#: includes/sysnames.inc:200
+#: ../includes/sysnames.inc:200
 msgid "Apr"
 msgstr ""
 
-#: includes/sysnames.inc:200 includes/ui/ui_view.inc:843
+#: ../includes/sysnames.inc:200
+#: ../includes/ui/ui_view.inc:901
 msgid "May"
 msgstr ""
 
-#: includes/sysnames.inc:200
+#: ../includes/sysnames.inc:200
 msgid "Jun"
 msgstr ""
 
-#: includes/sysnames.inc:200
+#: ../includes/sysnames.inc:200
 msgid "Jul"
 msgstr ""
 
-#: includes/sysnames.inc:200
+#: ../includes/sysnames.inc:200
 msgid "Aug"
 msgstr ""
 
-#: includes/sysnames.inc:200
+#: ../includes/sysnames.inc:200
 msgid "Sep"
 msgstr ""
 
-#: includes/sysnames.inc:200
+#: ../includes/sysnames.inc:200
 msgid "Oct"
 msgstr ""
 
-#: includes/sysnames.inc:200
+#: ../includes/sysnames.inc:200
 msgid "Nov"
 msgstr ""
 
-#: includes/sysnames.inc:200
+#: ../includes/sysnames.inc:200
 msgid "Dec"
 msgstr ""
 
-#: includes/system_tests.inc:15 includes/ui/ui_view.inc:210
-#: reporting/rep705.php:254 reporting/rep705.php:265 reporting/rep705.php:274
+#: ../includes/system_tests.inc:15
+#: ../includes/ui/ui_view.inc:210
+#: ../reporting/rep705.php:254
+#: ../reporting/rep705.php:265
+#: ../reporting/rep705.php:274
 msgid "Info"
 msgstr ""
 
-#: includes/system_tests.inc:16
+#: ../includes/system_tests.inc:16
 msgid "Optional"
 msgstr ""
 
-#: includes/system_tests.inc:17
+#: ../includes/system_tests.inc:17
 msgid "Recommended"
 msgstr ""
 
-#: includes/system_tests.inc:18
+#: ../includes/system_tests.inc:18
 msgid "Required "
 msgstr ""
 
-#: includes/system_tests.inc:24
+#: ../includes/system_tests.inc:24
 msgid "MySQL version"
 msgstr ""
 
-#: includes/system_tests.inc:28
+#: ../includes/system_tests.inc:28
 msgid "Upgrade MySQL server to version at least 4.1"
 msgstr ""
 
-#: includes/system_tests.inc:35
+#: ../includes/system_tests.inc:35
 msgid "PHP MySQL extension"
 msgstr ""
 
-#: includes/system_tests.inc:40
+#: ../includes/system_tests.inc:40
 msgid "Your PHP has to have MySQL extension enabled."
 msgstr ""
 
-#: includes/system_tests.inc:46
+#: ../includes/system_tests.inc:46
 msgid "PHP version"
 msgstr ""
 
-#: includes/system_tests.inc:50
+#: ../includes/system_tests.inc:50
 msgid "Upgrade PHP to version at least 4.3.3"
 msgstr ""
 
-#: includes/system_tests.inc:57
+#: ../includes/system_tests.inc:57
 msgid "Server system"
 msgstr ""
 
-#: includes/system_tests.inc:67
+#: ../includes/system_tests.inc:67
 msgid "Session save path"
 msgstr ""
 
-#: includes/system_tests.inc:79
+#: ../includes/system_tests.inc:79
 msgid "Removed install wizard folder"
 msgstr ""
 
-#: includes/system_tests.inc:82
+#: ../includes/system_tests.inc:82
 msgid "Not removed"
 msgstr ""
 
-#: includes/system_tests.inc:83
+#: ../includes/system_tests.inc:83
 msgid "Remove or rename install wizard folder for security reasons."
 msgstr ""
 
-#: includes/system_tests.inc:90
+#: ../includes/system_tests.inc:90
 msgid "Browser type"
 msgstr ""
 
-#: includes/system_tests.inc:94
+#: ../includes/system_tests.inc:94
 msgid "Any browser is supported"
 msgstr ""
 
-#: includes/system_tests.inc:101
+#: ../includes/system_tests.inc:101
 msgid "Http server type"
 msgstr ""
 
-#: includes/system_tests.inc:105
+#: ../includes/system_tests.inc:105
 msgid "Any server is supported"
 msgstr ""
 
-#: includes/system_tests.inc:112
+#: ../includes/system_tests.inc:112
 msgid "Native gettext"
 msgstr ""
 
-#: includes/system_tests.inc:116
+#: ../includes/system_tests.inc:116
 msgid "In case of no gettext support, php emulation is used"
 msgstr ""
 
-#: includes/system_tests.inc:124
+#: ../includes/system_tests.inc:124
 msgid "Debugging mode"
 msgstr ""
 
-#: includes/system_tests.inc:128
+#: ../includes/system_tests.inc:128
 msgid "To switch debugging on set $go_debug>0 in config.php file"
 msgstr ""
 
-#: includes/system_tests.inc:137
+#: ../includes/system_tests.inc:137
 msgid "Error logging"
 msgstr ""
 
-#: includes/system_tests.inc:145
+#: ../includes/system_tests.inc:145
 msgid "Disabled"
 msgstr ""
 
-#: includes/system_tests.inc:148
+#: ../includes/system_tests.inc:148
 msgid "To switch error logging set $error_logging in config.php file"
 msgstr ""
 
-#: includes/system_tests.inc:151
+#: ../includes/system_tests.inc:151
 msgid "Log file is not writeable"
 msgstr ""
 
-#: includes/system_tests.inc:161
+#: ../includes/system_tests.inc:161
 msgid "Current database version"
 msgstr ""
 
-#: includes/system_tests.inc:165
+#: ../includes/system_tests.inc:165
 msgid "Database structure seems to be not upgraded to current version"
 msgstr ""
 
-#: includes/system_tests.inc:180
+#: ../includes/system_tests.inc:180
 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
 #, php-format
 msgid "'%s' is not writeable"
 msgstr ""
 
-#: includes/system_tests.inc:221
+#: ../includes/system_tests.inc:221
 msgid "Temporary directory"
 msgstr ""
 
-#: includes/system_tests.inc:233
+#: ../includes/system_tests.inc:233
 msgid "Language configuration consistency"
 msgstr ""
 
-#: includes/system_tests.inc:242
+#: ../includes/system_tests.inc:242
 msgid "Languages folder should be writeable."
 msgstr ""
 
-#: includes/system_tests.inc:251
+#: ../includes/system_tests.inc:251
 msgid "Languages configuration file should be writeable."
 msgstr ""
 
-#: includes/system_tests.inc:270
+#: ../includes/system_tests.inc:270
 #, php-format
 msgid "Missing %s translation file."
 msgstr ""
 
-#: includes/system_tests.inc:275
+#: ../includes/system_tests.inc:275
 #, php-format
 msgid "Missing system locale: %s"
 msgstr ""
 
-#: includes/system_tests.inc:288
+#: ../includes/system_tests.inc:288
 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
 #, 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
 #, php-format
 msgid "'%s' file exists."
 msgstr ""
 
-#: includes/system_tests.inc:300
+#: ../includes/system_tests.inc:300
 #, php-format
 msgid "'%s' file should be read-only"
 msgstr ""
 
-#: includes/system_tests.inc:309
+#: ../includes/system_tests.inc:309
 msgid "Database auth file"
 msgstr ""
 
-#: includes/system_tests.inc:322
+#: ../includes/system_tests.inc:322
 #, php-format
 msgid ""
 "'%s' file should be read-only if you do not plan to add or change companies"
 msgstr ""
 
-#: includes/system_tests.inc:333
+#: ../includes/system_tests.inc:333
 msgid "Extensions system"
 msgstr ""
 
-#: includes/system_tests.inc:371
+#: ../includes/system_tests.inc:371
 msgid "Extensions configuration files and directories should be writeable"
 msgstr ""
 
-#: includes/system_tests.inc:384
+#: ../includes/system_tests.inc:384
 #, php-format
 msgid "Non-standard theme directory '%s' is not writable"
 msgstr ""
 
-#: includes/system_tests.inc:394
+#: ../includes/system_tests.inc:394
 msgid ""
 "OpenSSL PHP extension have to be enabled to use extension repository system."
 msgstr ""
 
-#: includes/system_tests.inc:397
+#: ../includes/system_tests.inc:397
 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
 msgid "Test"
 msgstr ""
 
-#: includes/system_tests.inc:420
+#: ../includes/system_tests.inc:420
 msgid "Test type"
 msgstr ""
 
-#: includes/system_tests.inc:420 includes/ui/view_package.php:47
-#: reporting/rep204.php:85 reporting/rep301.php:105 reporting/rep308.php:150
+#: ../includes/system_tests.inc:420
+#: ../includes/ui/view_package.php:47
+#: ../reporting/rep204.php:85
+#: ../reporting/rep301.php:105
+#: ../reporting/rep308.php:150
 msgid "Value"
 msgstr ""
 
-#: includes/system_tests.inc:420 reporting/reports_main.php:40
-#: reporting/reports_main.php:51 reporting/reports_main.php:60
-#: reporting/reports_main.php:67 reporting/reports_main.php:76
-#: reporting/reports_main.php:85 reporting/reports_main.php:92
-#: reporting/reports_main.php:101 reporting/includes/excel_report.inc:295
-#: reporting/includes/excel_report.inc:428
-#: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:619
-#: sales/view/view_sales_order.php:98
+#: ../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:301
+#: ../reporting/reports_main.php:314
+#: ../reporting/includes/excel_report.inc:295
+#: ../reporting/includes/excel_report.inc:428
+#: ../reporting/includes/pdf_report.inc:346
+#: ../reporting/includes/pdf_report.inc:619
+#: ../sales/view/view_sales_order.php:98
 msgid "Comments"
 msgstr ""
 
-#: includes/system_tests.inc:444
+#: ../includes/system_tests.inc:444
 msgid "Ok"
 msgstr ""
 
-#: includes/db/audit_trail_db.inc:99
+#: ../includes/db/audit_trail_db.inc:99
 msgid ""
 "Some transactions journal GL postings were not indexed due to lack of audit "
 "trail record."
 msgstr ""
 
-#: includes/db/inventory_db.inc:252
-#: inventory/includes/db/items_trans_db.inc:66
+#: ../includes/db/inventory_db.inc:253
+#: ../inventory/includes/db/items_trans_db.inc:66
 #, php-format
 msgid "Cost was %s changed to %s x quantity on hand for item '%s'"
 msgstr ""
 
-#: includes/db/inventory_db.inc:293
+#: ../includes/db/inventory_db.inc:294
 msgid "Zero/negative inventory handling"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:264
-#: purchasing/allocations/supplier_allocation_main.php:94
-#: sales/allocations/customer_allocation_main.php:93
+#: ../includes/ui/allocation_cart.inc:287
+#, php-format
+msgid "Allocated amounts in %s:"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:289
+#: ../purchasing/allocations/supplier_allocation_main.php:94
+#: ../sales/allocations/customer_allocation_main.php:93
 msgid "Transaction Type"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:264 reporting/rep704.php:83
-#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep709.php:111
-#: sales/view/view_credit.php:68 sales/view/view_sales_order.php:109
-#: sales/view/view_sales_order.php:142 sales/view/view_sales_order.php:179
+#: ../includes/ui/allocation_cart.inc:289
+msgid "Supplier Ref"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:289
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep704.php:89
+#: ../reporting/rep709.php:111
+#: ../sales/view/view_credit.php:68
+#: ../sales/view/view_sales_order.php: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.orig:248
+#: ../sales/inquiry/sales_orders_view.php.orig:285
+#: ../sales/inquiry/sales_orders_view.php.orig:299
 msgid "Ref"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:265
+#: ../includes/ui/allocation_cart.inc:290
 msgid "Other Allocations"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:265 includes/ui/ui_view.inc:490
-#: reporting/includes/doctext.inc:167 reporting/includes/doctext.inc:208
-msgid "This Allocation"
+#: ../includes/ui/allocation_cart.inc:290
+#: ../includes/ui/allocation_cart.inc:343
+#: ../includes/ui/ui_view.inc:548
+#: ../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
+#: ../sales/allocations/customer_allocation_main.php:100
+msgid "Left to Allocate"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:265 includes/ui/allocation_cart.inc:314
-#: includes/ui/ui_view.inc:490
-#: purchasing/allocations/supplier_allocation_main.php:101
-#: reporting/includes/doctext.inc:167 reporting/includes/doctext.inc:208
-#: sales/allocations/customer_allocation_main.php:100
-msgid "Left to Allocate"
+#: ../includes/ui/allocation_cart.inc:290
+#: ../includes/ui/ui_view.inc:548
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+msgid "This Allocation"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:297
+#: ../includes/ui/allocation_cart.inc:323
+#: ../reporting/rep112.php:142
+#: ../reporting/rep210.php:149
 msgid "Total Allocated"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:334
+#: ../includes/ui/allocation_cart.inc:365
 msgid "The entry for one or more amounts is invalid or negative."
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:343
+#: ../includes/ui/allocation_cart.inc:376
 msgid "At least one transaction is overallocated."
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:361
+#: ../includes/ui/allocation_cart.inc:395
 msgid ""
 "These allocations cannot be processed because the amount allocated is more "
 "than the total amount left to allocate."
 msgstr ""
 
-#: includes/ui/contacts_view.inc:41
+#: ../includes/ui/contacts_view.inc:41
 msgid "Assignment"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:41
+#: ../includes/ui/contacts_view.inc:41
 msgid "Sec Phone"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:41 reporting/rep205.php:184
-#: reporting/includes/header2.inc:104 sales/manage/sales_people.php:99
+#: ../includes/ui/contacts_view.inc:41
+#: ../reporting/rep103.php:266
+#: ../reporting/rep205.php:184
+#: ../reporting/includes/header2.inc:104
+#: ../sales/manage/sales_people.php:99
 msgid "Fax"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:42
+#: ../includes/ui/contacts_view.inc:42
 msgid "email"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:90
+#: ../includes/ui/contacts_view.inc:90
 msgid "Contact data"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:92
+#: ../includes/ui/contacts_view.inc:92
 msgid "First Name:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:93
+#: ../includes/ui/contacts_view.inc:93
 msgid "Last Name:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:96
+#: ../includes/ui/contacts_view.inc:96
 msgid "Contact active for:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:102 sales/manage/customers.php:252
+#: ../includes/ui/contacts_view.inc:102
+#: ../sales/manage/customers.php:255
 msgid "Phone:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:105 inventory/manage/locations.php:207
-#: purchasing/manage/suppliers.php:139 sales/manage/customer_branches.php:265
-#: sales/manage/customers.php:255 sales/manage/sales_people.php:158
+#: ../includes/ui/contacts_view.inc:105
+#: ../inventory/manage/locations.php:207
+#: ../purchasing/manage/suppliers.php:139
+#: ../sales/manage/customer_branches.php:265
+#: ../sales/manage/customers.php:258
+#: ../sales/manage/sales_people.php:158
 msgid "E-mail:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:110 purchasing/manage/suppliers.php:140
-#: sales/manage/customer_branches.php:266
+#: ../includes/ui/contacts_view.inc:110
+#: ../purchasing/manage/suppliers.php:140
+#: ../sales/manage/customer_branches.php:266
 msgid "Document Language:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:110 sales/manage/customer_branches.php:266
+#: ../includes/ui/contacts_view.inc:110
+#: ../sales/manage/customer_branches.php:266
 msgid "Customer default"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:112
+#: ../includes/ui/contacts_view.inc:112
 msgid "Notes:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:132
+#: ../includes/ui/contacts_view.inc:131
 msgid "The contact name cannot be empty."
 msgstr ""
 
-#: includes/ui/contacts_view.inc:137
+#: ../includes/ui/contacts_view.inc:136
 msgid "Contact reference cannot be empty."
 msgstr ""
 
-#: includes/ui/contacts_view.inc:142
+#: ../includes/ui/contacts_view.inc:141
 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
 msgid "Show also Inactive"
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:175
+#: ../includes/ui/db_pager_view.inc:175
 msgid "First"
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:176
+#: ../includes/ui/db_pager_view.inc:176
 msgid "Prev"
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:177
+#: ../includes/ui/db_pager_view.inc:177
 msgid "Next"
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:178
+#: ../includes/ui/db_pager_view.inc:178
 msgid "Last"
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:187
+#: ../includes/ui/db_pager_view.inc:187
 #, php-format
 msgid "Records %d-%d of %d"
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:191
+#: ../includes/ui/db_pager_view.inc:191
 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
 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
 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
 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
 msgid "Cancel edition"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:79
+#: ../includes/ui/ui_controls.inc:79
 msgid "Request from outside of this page is forbidden."
 msgstr ""
 
-#: includes/ui/ui_controls.inc:80
+#: ../includes/ui/ui_controls.inc:80
 msgid "CSRF attack detected from: "
 msgstr ""
 
-#: includes/ui/ui_controls.inc:146
+#: ../includes/ui/ui_controls.inc:146
 msgid "You should automatically be forwarded."
 msgstr ""
 
-#: includes/ui/ui_controls.inc:147
+#: ../includes/ui/ui_controls.inc:147
 msgid "If this does not happen"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:147
+#: ../includes/ui/ui_controls.inc:147
 msgid "click here"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:147
+#: ../includes/ui/ui_controls.inc:147
 msgid "to continue"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:194
+#: ../includes/ui/ui_controls.inc:194
 msgid "View Attachment"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:197
+#: ../includes/ui/ui_controls.inc:197
 msgid "Close"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:457 sales/manage/customers.php:23
+#: ../includes/ui/ui_controls.inc:459
+#: ../sales/manage/customers.php:23
 msgid "Customers"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:459
+#: ../includes/ui/ui_controls.inc:461
 msgid "Branches"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:461 purchasing/manage/suppliers.php:22
+#: ../includes/ui/ui_controls.inc:463
+#: ../purchasing/manage/suppliers.php:22
 msgid "Suppliers"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:463 inventory/transfers.php:228
-#: inventory/manage/items.php:22
+#: ../includes/ui/ui_controls.inc:465
+#: ../inventory/transfers.php:228
+#: ../inventory/manage/items.php:22
+#: ../reporting/reports_main.php:253
 msgid "Items"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:608
+#: ../includes/ui/ui_controls.inc:610
 msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
 msgstr ""
 
-#: includes/ui/ui_input.inc:632 reporting/includes/reports_classes.inc:219
+#: ../includes/ui/ui_input.inc:632
+#: ../reporting/includes/reports_classes.inc:219
 msgid "Click Here to Pick up the date"
 msgstr ""
 
-#: includes/ui/ui_input.inc:916 includes/ui/ui_lists.inc:2157
-#: reporting/rep301.php:155 reporting/rep302.php:170 reporting/rep304.php:170
-#: reporting/rep304.php:174 reporting/rep306.php:236 reporting/rep306.php:243
-#: sales/manage/customer_branches.php:304
+#: ../includes/ui/ui_input.inc:916
+#: ../includes/ui/ui_lists.inc:2160
+#: ../reporting/rep301.php:155
+#: ../reporting/rep302.php:170
+#: ../reporting/rep303.php:184
+#: ../reporting/rep304.php:170
+#: ../reporting/rep304.php:174
+#: ../sales/manage/customer_branches.php:304
 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
 msgid "Current Credit:"
 msgstr ""
 
-#: includes/ui/ui_input.inc:972
+#: ../includes/ui/ui_input.inc:972
 msgid "Bank Balance:"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:17
+#: ../includes/ui/ui_lists.inc:17
 msgid "Set filter"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:100
+#: ../includes/ui/ui_lists.inc:100
 msgid "Press Space tab for search pattern entry"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:104
+#: ../includes/ui/ui_lists.inc:104
 msgid "Enter code fragment to search or * for all"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:105
+#: ../includes/ui/ui_lists.inc:105
 msgid "Enter description fragment to search or * for all"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:453 includes/ui/ui_lists.inc:1386
+#: ../includes/ui/ui_lists.inc:453
+#: ../includes/ui/ui_lists.inc:1389
 msgid "All Suppliers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:457
+#: ../includes/ui/ui_lists.inc:457
 msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:458
+#: ../includes/ui/ui_lists.inc:458
 msgid "Select supplier"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:505
+#: ../includes/ui/ui_lists.inc:505
 msgid "All Customers"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:509
+#: ../includes/ui/ui_lists.inc:509
 msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:510
+#: ../includes/ui/ui_lists.inc:510
 msgid "Select customer"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:557
+#: ../includes/ui/ui_lists.inc:557
 msgid "All branches"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:560
+#: ../includes/ui/ui_lists.inc:560
 msgid "Select customer branch"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:600
+#: ../includes/ui/ui_lists.inc:600
 msgid "All Locations"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:752 includes/ui/ui_lists.inc:820
+#: ../includes/ui/ui_lists.inc:752
+#: ../includes/ui/ui_lists.inc:820
 msgid "All Items"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1293
+#: ../includes/ui/ui_lists.inc:1296
 msgid "All Sales Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1630
+#: ../includes/ui/ui_lists.inc:1633
 msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1941 includes/ui/ui_lists.inc:1958
-#: includes/ui/ui_lists.inc:1975
+#: ../includes/ui/ui_lists.inc:1944
+#: ../includes/ui/ui_lists.inc:1961
+#: ../includes/ui/ui_lists.inc:1978
 msgid "All Types"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1942 sales/view/view_sales_order.php:140
+#: ../includes/ui/ui_lists.inc:1945
+#: ../sales/view/view_sales_order.php:140
 msgid "Sales Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1943 includes/ui/ui_lists.inc:1960
-#: includes/ui/ui_lists.inc:1978
+#: ../includes/ui/ui_lists.inc:1946
+#: ../includes/ui/ui_lists.inc:1963
+#: ../includes/ui/ui_lists.inc:1981
 msgid "Overdue Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1944 includes/ui/ui_lists.inc:1961
-#: includes/ui/ui_lists.inc:1979 includes/ui/ui_view.inc:552
-#: includes/ui/ui_view.inc:556
+#: ../includes/ui/ui_lists.inc:1947
+#: ../includes/ui/ui_lists.inc:1964
+#: ../includes/ui/ui_lists.inc:1982
+#: ../includes/ui/ui_view.inc:610
+#: ../includes/ui/ui_view.inc:614
 msgid "Payments"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1945 includes/ui/ui_lists.inc:1962
-#: includes/ui/ui_lists.inc:1980 sales/view/view_sales_order.php:176
+#: ../includes/ui/ui_lists.inc:1948
+#: ../includes/ui/ui_lists.inc:1965
+#: ../includes/ui/ui_lists.inc:1983
+#: ../sales/view/view_sales_order.php:176
 msgid "Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1946 sales/view/view_sales_order.php:106
+#: ../includes/ui/ui_lists.inc:1949
+#: ../sales/view/view_sales_order.php:106
 msgid "Delivery Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1959 includes/ui/ui_lists.inc:1977
+#: ../includes/ui/ui_lists.inc:1962
+#: ../includes/ui/ui_lists.inc:1980
 msgid "Invoices"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1963 includes/ui/ui_lists.inc:1981
+#: ../includes/ui/ui_lists.inc:1966
+#: ../includes/ui/ui_lists.inc:1984
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1976
+#: ../includes/ui/ui_lists.inc:1979
 msgid "GRNs"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1994
+#: ../includes/ui/ui_lists.inc:1997
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:1995
+#: ../includes/ui/ui_lists.inc:1998
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2012
+#: ../includes/ui/ui_lists.inc:2015
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2013
+#: ../includes/ui/ui_lists.inc:2016
 msgid "Items Written Off"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2183
+#: ../includes/ui/ui_lists.inc:2186
 msgid "New role"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2235
+#: ../includes/ui/ui_lists.inc:2238
 msgid "No tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2235
+#: ../includes/ui/ui_lists.inc:2238
 msgid "No active tags defined."
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2273
+#: ../includes/ui/ui_lists.inc:2276
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2276
+#: ../includes/ui/ui_lists.inc:2279
 msgid "Available and/or installed"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2346
+#: ../includes/ui/ui_lists.inc:2349
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2348
+#: ../includes/ui/ui_lists.inc:2351
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: includes/ui/ui_lists.inc:2369
+#: ../includes/ui/ui_lists.inc:2372
 msgid "No payment Link"
 msgstr ""
 
-#: includes/ui/ui_msgs.inc:63
+#: ../includes/ui/ui_msgs.inc:63
 msgid "in units of : "
 msgstr ""
 
-#: includes/ui/ui_view.inc:306
+#: ../includes/ui/ui_view.inc:301
+#, php-format
+msgid ""
+"Cannot retrieve exchange rate for currency %s. Please adjust approximate "
+"rate if needed."
+msgstr ""
+
+#: ../includes/ui/ui_view.inc:342
 msgid "Date Voided:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:407 reporting/rep209.php:186
+#: ../includes/ui/ui_view.inc:443
+#: ../reporting/rep109.php:186
+#: ../reporting/rep110.php:184
+#: ../reporting/rep111.php:165
+#: ../reporting/rep113.php:169
+#: ../reporting/rep209.php:186
 msgid "Total Tax Excluded"
 msgstr ""
 
-#: includes/ui/ui_view.inc:413 includes/ui/ui_view.inc:432
-#: includes/ui/ui_view.inc:451 reporting/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/rep109.php:195
+#: ../reporting/rep110.php:193
+#: ../reporting/rep111.php:174
+#: ../reporting/rep113.php:178
+#: ../reporting/rep209.php:195
 msgid "Included"
 msgstr ""
 
-#: includes/ui/ui_view.inc:489 reporting/includes/doctext.inc:167
-#: reporting/includes/doctext.inc:208
+#: ../includes/ui/ui_view.inc:547
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
 msgid "Total Amount"
 msgstr ""
 
-#: includes/ui/ui_view.inc:513
+#: ../includes/ui/ui_view.inc:571
 msgid "Total Allocated:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:519
+#: ../includes/ui/ui_view.inc:577
 msgid "Left to Allocate:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:535 includes/ui/ui_view.inc:539
-#: purchasing/inquiry/supplier_allocation_inquiry.php:99
+#: ../includes/ui/ui_view.inc:593
+#: ../includes/ui/ui_view.inc:597
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:100
 msgid "Allocations"
 msgstr ""
 
-#: includes/ui/ui_view.inc:552 includes/ui/ui_view.inc:556
+#: ../includes/ui/ui_view.inc:610
+#: ../includes/ui/ui_view.inc:614
 msgid "Pre-Payments"
 msgstr ""
 
-#: includes/ui/ui_view.inc:572
+#: ../includes/ui/ui_view.inc:630
 msgid "No Quick Entries are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:600
+#: ../includes/ui/ui_view.inc:658
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:782 purchasing/includes/ui/invoice_ui.inc:473
+#: ../includes/ui/ui_view.inc:840
+#: ../purchasing/includes/ui/invoice_ui.inc:488
 msgid "and"
 msgstr ""
 
-#: includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc:901
 msgid "January"
 msgstr ""
 
-#: includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc:901
 msgid "February"
 msgstr ""
 
-#: includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc:901
 msgid "March"
 msgstr ""
 
-#: includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc:901
 msgid "April"
 msgstr ""
 
-#: includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc:901
 msgid "June"
 msgstr ""
 
-#: includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc:901
 msgid "July"
 msgstr ""
 
-#: includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc:901
 msgid "August"
 msgstr ""
 
-#: includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc:901
 msgid "September"
 msgstr ""
 
-#: includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc:901
 msgid "October"
 msgstr ""
 
-#: includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc:901
 msgid "November"
 msgstr ""
 
-#: includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc:901
 msgid "December"
 msgstr ""
 
-#: includes/ui/ui_view.inc:844
+#: ../includes/ui/ui_view.inc:902
 msgid "Su"
 msgstr ""
 
-#: includes/ui/ui_view.inc:844
+#: ../includes/ui/ui_view.inc:902
 msgid "Mo"
 msgstr ""
 
-#: includes/ui/ui_view.inc:844
+#: ../includes/ui/ui_view.inc:902
 msgid "Tu"
 msgstr ""
 
-#: includes/ui/ui_view.inc:844
+#: ../includes/ui/ui_view.inc:902
 msgid "We"
 msgstr ""
 
-#: includes/ui/ui_view.inc:844
+#: ../includes/ui/ui_view.inc:902
 msgid "Th"
 msgstr ""
 
-#: includes/ui/ui_view.inc:844
+#: ../includes/ui/ui_view.inc:902
 msgid "Fr"
 msgstr ""
 
-#: includes/ui/ui_view.inc:844
+#: ../includes/ui/ui_view.inc:902
 msgid "Sa"
 msgstr ""
 
-#: includes/ui/ui_view.inc:845
+#: ../includes/ui/ui_view.inc:903
 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 ""
 
-#: inventory/adjustments.php:32
+#: ../inventory/adjustments.php:32
 msgid ""
 "There are no inventory items defined in the system which can be adjusted "
 "(Purchased or Manufactured)."
 msgstr ""
 
-#: inventory/adjustments.php:34 inventory/transfers.php:34
+#: ../inventory/adjustments.php:34
+#: ../inventory/transfers.php:34
 msgid ""
 "There are no inventory movement types defined in the system. Please define "
 "at least one inventory adjustment type."
 msgstr ""
 
-#: inventory/adjustments.php:43
+#: ../inventory/adjustments.php:43
 msgid "Items adjustment has been processed"
 msgstr ""
 
-#: inventory/adjustments.php:44
+#: ../inventory/adjustments.php:44
 msgid "&View this adjustment"
 msgstr ""
 
-#: inventory/adjustments.php:46
+#: ../inventory/adjustments.php:46
 msgid "View the GL &Postings for this Adjustment"
 msgstr ""
 
-#: inventory/adjustments.php:48
+#: ../inventory/adjustments.php:48
 msgid "Enter &Another Adjustment"
 msgstr ""
 
-#: inventory/adjustments.php:88 inventory/transfers.php:85
-#: sales/sales_order_entry.php:369
+#: ../inventory/adjustments.php:88
+#: ../inventory/transfers.php:85
+#: ../sales/sales_order_entry.php:370
 msgid "You must enter at least one non empty item line."
 msgstr ""
 
-#: inventory/adjustments.php:108
+#: ../inventory/adjustments.php:108
 msgid "The entered date for the adjustment is invalid."
 msgstr ""
 
-#: inventory/adjustments.php:122
+#: ../inventory/adjustments.php:122
 msgid ""
 "The adjustment cannot be processed because an adjustment item would cause a "
 "negative inventory balance :"
 msgstr ""
 
-#: inventory/adjustments.php:152 manufacturing/work_order_issue.php:141
+#: ../inventory/adjustments.php:152
+#: ../manufacturing/work_order_issue.php:141
 msgid "The quantity entered is negative or invalid."
 msgstr ""
 
-#: inventory/adjustments.php:159 manufacturing/work_order_issue.php:148
+#: ../inventory/adjustments.php:159
+#: ../manufacturing/work_order_issue.php:148
 msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
-#: inventory/adjustments.php:228
+#: ../inventory/adjustments.php:228
 msgid "Adjustment Items"
 msgstr ""
 
-#: inventory/adjustments.php:234
+#: ../inventory/adjustments.php:234
 msgid "Process Adjustment"
 msgstr ""
 
-#: inventory/cost_update.php:31
+#: ../inventory/cost_update.php:31
+#: ../inventory/cost_update.php.orig:31
 msgid "Inventory Item Cost Update"
 msgstr ""
 
-#: inventory/cost_update.php:36
+#: ../inventory/cost_update.php:36
+#: ../inventory/cost_update.php.orig:36
 msgid ""
 "There are no costable inventory items defined in the system (Purchased or "
 "manufactured items)."
 msgstr ""
 
-#: inventory/cost_update.php:57
+#: ../inventory/cost_update.php:57
+#: ../inventory/cost_update.php.orig:57
 msgid "The entered cost is not numeric."
 msgstr ""
 
-#: inventory/cost_update.php:63
+#: ../inventory/cost_update.php:63
+#: ../inventory/cost_update.php.orig:63
 msgid "The new cost is the same as the old cost. Cost was not updated."
 msgstr ""
 
-#: inventory/cost_update.php:73
+#: ../inventory/cost_update.php:73
+#: ../inventory/cost_update.php.orig:73
 msgid "Cost has been updated."
 msgstr ""
 
-#: inventory/cost_update.php:77
+#: ../inventory/cost_update.php:77
+#: ../inventory/cost_update.php.orig:77
 msgid "View the GL Journal Entries for this Cost Update"
 msgstr ""
 
-#: inventory/cost_update.php:97 inventory/prices.php:64
-#: inventory/purchasing_data.php:119 inventory/reorder_level.php:51
-#: inventory/inquiry/stock_movements.php:49
-#: inventory/inquiry/stock_status.php:41 inventory/manage/item_codes.php:105
-#: purchasing/inquiry/po_search.php:74
-#: sales/inquiry/sales_deliveries_view.php:114
+#: ../inventory/cost_update.php.orig:97
+#: ../inventory/prices.php.orig:64
+#: ../inventory/purchasing_data.php.orig:119
+#: ../inventory/reorder_level.php.orig:51
+#: ../inventory/inquiry/stock_movements.php:49
+#: ../inventory/inquiry/stock_status.php:41
+#: ../inventory/manage/item_codes.php:105
+#: ../manufacturing/work_order_entry.php:396
+#: ../manufacturing/work_order_entry.php:401
+#: ../purchasing/inquiry/po_search.php:74
+#: ../sales/inquiry/sales_deliveries_view.php:114
+#: ../sales/inquiry/sales_orders_view.php:263
+#: ../sales/inquiry/sales_orders_view.php.orig:263
 msgid "Item:"
 msgstr ""
 
-#: inventory/cost_update.php:118
+#: ../inventory/cost_update.php.orig:118
 msgid "Standard Material Cost Per Unit"
 msgstr ""
 
-#: inventory/cost_update.php:127
+#: ../inventory/cost_update.php.orig:127
 msgid "Standard Labour Cost Per Unit"
 msgstr ""
 
-#: inventory/cost_update.php:128
+#: ../inventory/cost_update.php.orig:128
 msgid "Standard Overhead Cost Per Unit"
 msgstr ""
 
-#: inventory/prices.php:26
+#: ../inventory/prices.php:26
+#: ../inventory/prices.php.orig:26
 msgid "Inventory Item Sales prices"
 msgstr ""
 
-#: inventory/prices.php:30 inventory/inquiry/stock_movements.php:29
-#: inventory/inquiry/stock_status.php:32 inventory/manage/sales_kits.php:24
-#: manufacturing/inquiry/where_used_inquiry.php:21
-#: sales/credit_note_entry.php:49
+#: ../inventory/prices.php:30
+#: ../inventory/prices.php.orig:30
+#: ../inventory/inquiry/stock_movements.php:29
+#: ../inventory/inquiry/stock_status.php:32
+#: ../inventory/manage/sales_kits.php:24
+#: ../manufacturing/inquiry/where_used_inquiry.php:21
+#: ../sales/credit_note_entry.php:49
 msgid "There are no items defined in the system."
 msgstr ""
 
-#: inventory/prices.php:32
+#: ../inventory/prices.php:32
+#: ../inventory/prices.php.orig:32
 msgid ""
 "There are no sales types in the system. Please set up sales types befor "
 "entering pricing."
 msgstr ""
 
-#: inventory/prices.php:80
+#: ../inventory/prices.php.orig:80
 msgid "The price entered must be numeric."
 msgstr ""
 
-#: inventory/prices.php:86
+#: ../inventory/prices.php.orig:86
 msgid ""
 "The sales pricing for this item, sales type and currency has already been "
 "added."
 msgstr ""
 
-#: inventory/prices.php:99
+#: ../inventory/prices.php.orig:99
 msgid "This price has been updated."
 msgstr ""
 
-#: inventory/prices.php:107
+#: ../inventory/prices.php.orig:107
 msgid "The new price has been added."
 msgstr ""
 
-#: inventory/prices.php:121
+#: ../inventory/prices.php.orig:121
 msgid "The selected price has been deleted."
 msgstr ""
 
-#: inventory/prices.php:149 reporting/rep104.php:118
-#: sales/customer_delivery.php:369 sales/customer_invoice.php:468
-#: sales/view/view_credit.php:73 sales/view/view_dispatch.php:93
-#: sales/view/view_invoice.php:93 sales/includes/ui/sales_credit_ui.inc:102
+#: ../inventory/prices.php.orig:149
+#: ../reporting/rep104.php:118
+#: ../sales/customer_delivery.php:369
+#: ../sales/customer_invoice.php:468
+#: ../sales/view/view_credit.php:73
+#: ../sales/view/view_dispatch.php:93
+#: ../sales/view/view_invoice.php:93
+#: ../sales/includes/ui/sales_credit_ui.inc:102
 msgid "Sales Type"
 msgstr ""
 
-#: inventory/prices.php:149 inventory/purchasing_data.php:149
-#: purchasing/includes/ui/invoice_ui.inc:505
-#: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41
-#: purchasing/view/view_po.php:45 reporting/rep104.php:111
-#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:192
-#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:447
-#: sales/customer_invoice.php:542 sales/customer_invoice.php:545
-#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
-#: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:220
-#: sales/includes/ui/sales_credit_ui.inc:168
+#: ../inventory/prices.php.orig:149
+#: ../inventory/purchasing_data.php.orig:149
+#: ../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
+#: ../sales/customer_credit_invoice.php:281
+#: ../sales/customer_delivery.php:447
+#: ../sales/customer_invoice.php:542
+#: ../sales/customer_invoice.php:545
+#: ../sales/view/view_credit.php:91
+#: ../sales/view/view_dispatch.php:113
+#: ../sales/view/view_invoice.php:116
+#: ../sales/view/view_sales_order.php:220
+#: ../sales/includes/ui/sales_credit_ui.inc:168
 msgid "Price"
 msgstr ""
 
-#: inventory/prices.php:171
+#: ../inventory/prices.php.orig:171
 msgid "There are no prices set up for this part."
 msgstr ""
 
-#: inventory/prices.php:195
+#: ../inventory/prices.php.orig:195
 msgid "Currency:"
 msgstr ""
 
-#: inventory/prices.php:197
+#: ../inventory/prices.php.orig:197
 msgid "Sales Type:"
 msgstr ""
 
-#: inventory/prices.php:205 inventory/purchasing_data.php:217
+#: ../inventory/prices.php.orig:205
+#: ../inventory/purchasing_data.php.orig:217
 msgid "Price:"
 msgstr ""
 
-#: inventory/prices.php:205
+#: ../inventory/prices.php.orig:205
 msgid "per"
 msgstr ""
 
-#: inventory/prices.php:209
+#: ../inventory/prices.php.orig:209
 msgid "The price is calculated."
 msgstr ""
 
-#: inventory/purchasing_data.php:25
+#: ../inventory/purchasing_data.php:25
+#: ../inventory/purchasing_data.php.orig:25
 msgid "Supplier Purchasing Data"
 msgstr ""
 
-#: inventory/purchasing_data.php:27 purchasing/po_entry_items.php:70
+#: ../inventory/purchasing_data.php:27
+#: ../inventory/purchasing_data.php.orig:27
+#: ../purchasing/po_entry_items.php:70
 msgid "There are no purchasable inventory items defined in the system."
 msgstr ""
 
-#: inventory/purchasing_data.php:28 purchasing/po_entry_items.php:68
-#: purchasing/supplier_credit.php:31 purchasing/supplier_invoice.php:30
-#: purchasing/supplier_payment.php:40
+#: ../inventory/purchasing_data.php:28
+#: ../inventory/purchasing_data.php.orig:28
+#: ../purchasing/po_entry_items.php:68
+#: ../purchasing/supplier_credit.php:31
+#: ../purchasing/supplier_invoice.php:30
+#: ../purchasing/supplier_payment.php:40
+#: ../purchasing/supplier_payment.php.orig:40
 msgid "There are no suppliers defined in the system."
 msgstr ""
 
-#: inventory/purchasing_data.php:46 inventory/manage/item_codes.php:35
+#: ../inventory/purchasing_data.php:46
+#: ../inventory/purchasing_data.php.orig:46
+#: ../inventory/manage/item_codes.php:35
 msgid "There is no item selected."
 msgstr ""
 
-#: inventory/purchasing_data.php:52
+#: ../inventory/purchasing_data.php:52
+#: ../inventory/purchasing_data.php.orig:52
 msgid "The price entered was not numeric."
 msgstr ""
 
-#: inventory/purchasing_data.php:58
+#: ../inventory/purchasing_data.php:58
+#: ../inventory/purchasing_data.php.orig:58
 msgid ""
 "The conversion factor entered was not numeric. The conversion factor is the "
 "number by which the price must be divided by to get the unit price in our "
 "unit of measure."
 msgstr ""
 
-#: inventory/purchasing_data.php:64
+#: ../inventory/purchasing_data.php:64
+#: ../inventory/purchasing_data.php.orig:64
 msgid "The purchasing data for this supplier has already been added."
 msgstr ""
 
-#: inventory/purchasing_data.php:73
+#: ../inventory/purchasing_data.php:73
+#: ../inventory/purchasing_data.php.orig:73
 msgid "This supplier purchasing data has been added."
 msgstr ""
 
-#: inventory/purchasing_data.php:79
+#: ../inventory/purchasing_data.php:79
+#: ../inventory/purchasing_data.php.orig:79
 msgid "Supplier purchasing data has been updated."
 msgstr ""
 
-#: inventory/purchasing_data.php:90
+#: ../inventory/purchasing_data.php:90
+#: ../inventory/purchasing_data.php.orig:90
 msgid "The purchasing data item has been sucessfully deleted."
 msgstr ""
 
-#: inventory/purchasing_data.php:134
+#: ../inventory/purchasing_data.php.orig:134
 msgid "Entered item is not defined. Please re-enter."
 msgstr ""
 
-#: inventory/purchasing_data.php:143
+#: ../inventory/purchasing_data.php.orig:143
 msgid "There is no purchasing data set up for the part selected"
 msgstr ""
 
-#: inventory/purchasing_data.php:150
+#: ../inventory/purchasing_data.php.orig:150
 msgid "Supplier's Unit"
 msgstr ""
 
-#: inventory/purchasing_data.php:150
+#: ../inventory/purchasing_data.php.orig:150
 msgid "Conversion Factor"
 msgstr ""
 
-#: inventory/purchasing_data.php:150
+#: ../inventory/purchasing_data.php.orig:150
 msgid "Supplier's Description"
 msgstr ""
 
-#: inventory/purchasing_data.php:218
+#: ../inventory/purchasing_data.php.orig:218
 msgid "Suppliers Unit of Measure:"
 msgstr ""
 
-#: inventory/purchasing_data.php:224
+#: ../inventory/purchasing_data.php.orig:224
 msgid "Conversion Factor (to our UOM):"
 msgstr ""
 
-#: inventory/purchasing_data.php:226
+#: ../inventory/purchasing_data.php.orig:226
 msgid "Supplier's Code or Description:"
 msgstr ""
 
-#: inventory/reorder_level.php:25
+#: ../inventory/reorder_level.php:25
+#: ../inventory/reorder_level.php.orig:25
 msgid "Reorder Levels"
 msgstr ""
 
-#: inventory/reorder_level.php:27 inventory/transfers.php:32
+#: ../inventory/reorder_level.php:27
+#: ../inventory/reorder_level.php.orig:27
+#: ../inventory/transfers.php:32
 msgid ""
 "There are no inventory items defined in the system (Purchased or "
 "manufactured items)."
 msgstr ""
 
-#: inventory/reorder_level.php:68 inventory/inquiry/stock_movements.php:79
-#: inventory/inquiry/stock_status.php:66 inventory/inquiry/stock_status.php:70
-#: manufacturing/search_work_orders.php:162
-#: manufacturing/inquiry/where_used_inquiry.php:45
-#: manufacturing/manage/bom_edit.php:70
-#: purchasing/inquiry/po_search_completed.php:123
-#: purchasing/inquiry/po_search_completed.php:133
-#: purchasing/inquiry/po_search.php:133 purchasing/inquiry/po_search.php:144
-#: reporting/rep105.php:120 reporting/rep301.php:112 reporting/rep302.php:132
-#: reporting/rep304.php:123 reporting/rep306.php:150 reporting/rep307.php:124
-#: reporting/rep308.php:157 sales/manage/sales_points.php:84
+#: ../inventory/reorder_level.php.orig:68
+#: ../inventory/inquiry/stock_movements.php:79
+#: ../inventory/inquiry/stock_status.php:66
+#: ../inventory/inquiry/stock_status.php:70
+#: ../manufacturing/search_work_orders.php:162
+#: ../manufacturing/inquiry/where_used_inquiry.php:45
+#: ../manufacturing/manage/bom_edit.php:70
+#: ../purchasing/inquiry/po_search_completed.php:123
+#: ../purchasing/inquiry/po_search_completed.php:133
+#: ../purchasing/inquiry/po_search.php:133
+#: ../purchasing/inquiry/po_search.php:144
+#: ../reporting/rep105.php:120
+#: ../reporting/rep301.php:112
+#: ../reporting/rep302.php:132
+#: ../reporting/rep303.php:134
+#: ../reporting/rep304.php:123
+#: ../reporting/rep306.php:150
+#: ../reporting/rep307.php:124
+#: ../reporting/rep308.php:157
+#: ../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
+#: ../sales/manage/sales_points.php:84
 msgid "Location"
 msgstr ""
 
-#: inventory/reorder_level.php:68 inventory/inquiry/stock_movements.php:80
-#: inventory/inquiry/stock_status.php:70 purchasing/supplier_credit.php:220
-#: sales/sales_order_entry.php:530 sales/includes/ui/sales_order_ui.inc:182
+#: ../inventory/reorder_level.php.orig:68
+#: ../inventory/inquiry/stock_movements.php:80
+#: ../inventory/inquiry/stock_status.php:70
+#: ../purchasing/supplier_credit.php:219
+#: ../sales/sales_order_entry.php:531
+#: ../sales/includes/ui/sales_order_ui.inc:182
 msgid "Quantity On Hand"
 msgstr ""
 
-#: inventory/reorder_level.php:68 inventory/inquiry/stock_status.php:70
-#: sales/includes/db/sales_order_db.inc:112
-#: sales/includes/db/sales_order_db.inc:275
+#: ../inventory/reorder_level.php.orig:68
+#: ../inventory/inquiry/stock_status.php:70
+#: ../sales/includes/db/old.sales_order_db.inc:110
+#: ../sales/includes/db/old.sales_order_db.inc:263
+#: ../sales/includes/db/sales_order_db.inc:112
+#: ../sales/includes/db/sales_order_db.inc:291
 msgid "Re-Order Level"
 msgstr ""
 
-#: inventory/reorder_level.php:92
+#: ../inventory/reorder_level.php.orig:92
 msgid "Reorder levels has been updated."
 msgstr ""
 
-#: inventory/transfers.php:28
+#: ../inventory/transfers.php:28
 msgid "Inventory Location Transfers"
 msgstr ""
 
-#: inventory/transfers.php:43
+#: ../inventory/transfers.php:43
 msgid "Inventory transfer has been processed"
 msgstr ""
 
-#: inventory/transfers.php:44
+#: ../inventory/transfers.php:44
 msgid "&View this transfer"
 msgstr ""
 
-#: inventory/transfers.php:46
+#: ../inventory/transfers.php:46
 msgid "Enter &Another Inventory Transfer"
 msgstr ""
 
-#: inventory/transfers.php:103
+#: ../inventory/transfers.php:103
 msgid "The entered transfer date is invalid."
 msgstr ""
 
-#: inventory/transfers.php:115
+#: ../inventory/transfers.php:115
 msgid "The locations to transfer from and to must be different."
 msgstr ""
 
-#: inventory/transfers.php:125
+#: ../inventory/transfers.php:125
 msgid ""
 "The quantity entered is greater than the available quantity for this item at "
 "the source location :"
 msgstr ""
 
-#: inventory/transfers.php:158
+#: ../inventory/transfers.php:158
 msgid "The quantity entered must be a positive number."
 msgstr ""
 
-#: inventory/transfers.php:235
+#: ../inventory/transfers.php:235
 msgid "Process Transfer"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:20
-#: inventory/includes/stock_transfers_ui.inc:20
-#: manufacturing/includes/work_order_issue_ui.inc:20
-#: sales/includes/ui/sales_order_ui.inc:60
+#: ../inventory/includes/item_adjustments_ui.inc:20
+#: ../inventory/includes/stock_transfers_ui.inc:20
+#: ../manufacturing/includes/work_order_issue_ui.inc:20
+#: ../sales/includes/ui/sales_order_ui.inc:60
 msgid "For Part :"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:34
-#: purchasing/inquiry/po_search.php:67
-#: sales/inquiry/sales_deliveries_view.php:107
+#: ../inventory/includes/item_adjustments_ui.inc:34
+#: ../manufacturing/work_order_entry.php:210
+#: ../purchasing/inquiry/po_search.php:67
+#: ../sales/inquiry/sales_deliveries_view.php:107
+#: ../sales/inquiry/sales_orders_view.php:254
+#: ../sales/inquiry/sales_orders_view.php.orig:254
 msgid "Location:"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:43
+#: ../inventory/includes/item_adjustments_ui.inc:43
 msgid "Detail:"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:48
+#: ../inventory/includes/item_adjustments_ui.inc:48
 msgid "Positive Adjustment"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:48
+#: ../inventory/includes/item_adjustments_ui.inc:48
 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/po_receive_items.php:62 purchasing/view/view_grn.php:40
-#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:29
-#: reporting/includes/doctext.inc:191 reporting/includes/doctext.inc:228
-#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:445
-#: sales/customer_invoice.php:541 sales/customer_invoice.php:544
-#: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
-#: sales/view/view_invoice.php:115 sales/view/view_sales_order.php:219
-#: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:145
+#: ../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:241
+#: ../purchasing/po_receive_items.php:62
+#: ../purchasing/view/view_grn.php:40
+#: ../purchasing/view/view_po.php:45
+#: ../reporting/includes/doctext.inc:29
+#: ../reporting/includes/doctext.inc:191
+#: ../reporting/includes/doctext.inc:228
+#: ../sales/customer_credit_invoice.php:280
+#: ../sales/customer_delivery.php:445
+#: ../sales/customer_invoice.php:541
+#: ../sales/customer_invoice.php:544
+#: ../sales/view/view_credit.php:90
+#: ../sales/view/view_dispatch.php:112
+#: ../sales/view/view_invoice.php:115
+#: ../sales/view/view_sales_order.php:219
+#: ../sales/includes/ui/sales_credit_ui.inc:167
+#: ../sales/includes/ui/sales_order_ui.inc:145
 msgid "Item Code"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:62
-#: inventory/includes/stock_transfers_ui.inc:60
-#: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45
-#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:191
-#: reporting/includes/doctext.inc:228 sales/customer_credit_invoice.php:280
-#: sales/customer_delivery.php:445 sales/customer_invoice.php:541
-#: sales/customer_invoice.php:544 sales/view/view_credit.php:90
-#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:115
-#: sales/view/view_sales_order.php:219
-#: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:145
+#: ../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:241
+#: ../purchasing/view/view_grn.php:40
+#: ../purchasing/view/view_po.php:45
+#: ../reporting/includes/doctext.inc:29
+#: ../reporting/includes/doctext.inc:191
+#: ../reporting/includes/doctext.inc:228
+#: ../sales/customer_credit_invoice.php:280
+#: ../sales/customer_delivery.php:445
+#: ../sales/customer_invoice.php:541
+#: ../sales/customer_invoice.php:544
+#: ../sales/view/view_credit.php:90
+#: ../sales/view/view_dispatch.php:112
+#: ../sales/view/view_invoice.php:115
+#: ../sales/view/view_sales_order.php:219
+#: ../sales/includes/ui/sales_credit_ui.inc:167
+#: ../sales/includes/ui/sales_order_ui.inc:145
 msgid "Item Description"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:62
-#: inventory/includes/stock_transfers_ui.inc:60
-#: inventory/manage/item_codes.php:124 inventory/manage/sales_kits.php:40
-#: inventory/view/view_adjustment.php:56 inventory/view/view_transfer.php:56
-#: manufacturing/view/wo_issue_view.php:77
-#: manufacturing/manage/bom_edit.php:71
-#: manufacturing/includes/manufacturing_ui.inc:29
-#: manufacturing/includes/manufacturing_ui.inc:157
-#: manufacturing/includes/manufacturing_ui.inc:332
-#: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/invoice_ui.inc:505 purchasing/view/view_grn.php:40
-#: purchasing/view/view_po.php:45 reporting/rep301.php:105
-#: reporting/rep401.php:71 reporting/includes/doctext.inc:29
-#: reporting/includes/doctext.inc:192 reporting/includes/doctext.inc:225
-#: sales/customer_invoice.php:541 sales/view/view_credit.php:90
-#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:115
-#: sales/view/view_sales_order.php:219
-#: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:145
+#: ../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:241
+#: ../purchasing/view/view_grn.php:40
+#: ../purchasing/view/view_po.php:45
+#: ../reporting/rep301.php:105
+#: ../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:541
+#: ../sales/view/view_credit.php:90
+#: ../sales/view/view_dispatch.php:112
+#: ../sales/view/view_invoice.php:115
+#: ../sales/view/view_sales_order.php:219
+#: ../sales/includes/ui/sales_credit_ui.inc:167
+#: ../sales/includes/ui/sales_order_ui.inc:145
 msgid "Quantity"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:63
-#: inventory/includes/stock_transfers_ui.inc:60
-#: inventory/manage/item_units.php:94
-#: manufacturing/includes/work_order_issue_ui.inc:34
-#: purchasing/view/view_grn.php:41 purchasing/view/view_po.php:45
-#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:192
-#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
-#: sales/view/view_invoice.php:116 sales/view/view_sales_order.php:219
-#: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:147
+#: ../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:242
+#: ../purchasing/view/view_grn.php:41
+#: ../purchasing/view/view_po.php:45
+#: ../reporting/includes/doctext.inc:30
+#: ../reporting/includes/doctext.inc:192
+#: ../sales/view/view_credit.php:91
+#: ../sales/view/view_dispatch.php:113
+#: ../sales/view/view_invoice.php:116
+#: ../sales/view/view_sales_order.php:219
+#: ../sales/includes/ui/sales_credit_ui.inc:167
+#: ../sales/includes/ui/sales_order_ui.inc:147
 msgid "Unit"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:63
-#: inventory/view/view_adjustment.php:57
-#: manufacturing/includes/manufacturing_ui.inc:29
-#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:105
+#: ../inventory/includes/item_adjustments_ui.inc:63
+#: ../inventory/view/view_adjustment.php:57
+#: ../manufacturing/includes/manufacturing_ui.inc:29
+#: ../manufacturing/includes/work_order_issue_ui.inc:34
+#: ../reporting/rep301.php:105
 msgid "Unit Cost"
 msgstr ""
 
-#: inventory/includes/stock_transfers_ui.inc:35
-#: inventory/inquiry/stock_movements.php:56
-#: manufacturing/includes/work_order_issue_ui.inc:164
+#: ../inventory/includes/stock_transfers_ui.inc:35
+#: ../inventory/inquiry/stock_movements.php:56
+#: ../manufacturing/includes/work_order_issue_ui.inc:164
 msgid "From Location:"
 msgstr ""
 
-#: inventory/includes/stock_transfers_ui.inc:36
+#: ../inventory/includes/stock_transfers_ui.inc:36
 msgid "To Location:"
 msgstr ""
 
-#: inventory/includes/stock_transfers_ui.inc:46
+#: ../inventory/includes/stock_transfers_ui.inc:46
 msgid "Transfer Type:"
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:121
+#: ../inventory/includes/db/items_db.inc:121
 msgid ""
 "Cannot delete this item because there are stock movements that refer to this "
 "item."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:124
+#: ../inventory/includes/db/items_db.inc:124
 msgid ""
 "Cannot delete this item record because there are bills of material that "
 "require this part as a component."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:127
-#: inventory/includes/db/items_db.inc:130
+#: ../inventory/includes/db/items_db.inc:127
+#: ../inventory/includes/db/items_db.inc:130
 msgid ""
 "Cannot delete this item because there are existing purchase order items for "
 "it."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:148
+#: ../inventory/includes/db/items_db.inc:148
 msgid ""
 "This item cannot be deleted because some code aliases \n"
 "\t\t\t\tor foreign codes was entered for it, or there are kits defined \n"
 "\t\t\t\tusing this item as component"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:26
+#: ../inventory/inquiry/stock_movements.php:26
 msgid "Inventory Item Movement"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:61
+#: ../inventory/inquiry/stock_movements.php:61
 msgid "Show Movements"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:61
-#: purchasing/includes/ui/invoice_ui.inc:474
-#: purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: purchasing/inquiry/supplier_inquiry.php:55
-#: sales/inquiry/customer_allocation_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:54
+#: ../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 ""
 
-#: inventory/inquiry/stock_movements.php:80
+#: ../inventory/inquiry/stock_movements.php:80
 msgid "Detail"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:80 reporting/rep307.php:117
+#: ../inventory/inquiry/stock_movements.php:80
+#: ../reporting/rep307.php:117
 msgid "Quantity In"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:80 reporting/rep307.php:117
+#: ../inventory/inquiry/stock_movements.php:80
+#: ../reporting/rep307.php:117
 msgid "Quantity Out"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:97
+#: ../inventory/inquiry/stock_movements.php:97
 msgid "Quantity on hand before"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:188
+#: ../inventory/inquiry/stock_movements.php:188
 msgid "Quantity on hand after"
 msgstr ""
 
-#: inventory/inquiry/stock_status.php:16
+#: ../inventory/inquiry/stock_status.php:16
 msgid "Inventory Item Status"
 msgstr ""
 
-#: inventory/inquiry/stock_status.php:56
+#: ../inventory/inquiry/stock_status.php:56
 msgid ""
 "This is a service and cannot have a stock holding, only the total quantity "
 "on outstanding sales orders is shown."
 msgstr ""
 
-#: inventory/inquiry/stock_status.php:66 inventory/inquiry/stock_status.php:71
+#: ../inventory/inquiry/stock_status.php:66
+#: ../inventory/inquiry/stock_status.php:71
+#: ../reporting/rep303.php:121
+#: ../reporting/rep303.php:127
 msgid "Demand"
 msgstr ""
 
-#: inventory/inquiry/stock_status.php:71
+#: ../inventory/inquiry/stock_status.php:71
+#: ../reporting/rep303.php:121
+#: ../reporting/rep303.php:127
 msgid "On Order"
 msgstr ""
 
-#: inventory/manage/item_categories.php:16
+#: ../inventory/manage/item_categories.php:16
 msgid "Item Categories"
 msgstr ""
 
-#: inventory/manage/item_categories.php:34
+#: ../inventory/manage/item_categories.php:34
 msgid "The item category description cannot be empty."
 msgstr ""
 
-#: inventory/manage/item_categories.php:48
+#: ../inventory/manage/item_categories.php:48
 msgid "Selected item category has been updated"
 msgstr ""
 
-#: inventory/manage/item_categories.php:58
+#: ../inventory/manage/item_categories.php:58
 msgid "New item category has been added"
 msgstr ""
 
-#: inventory/manage/item_categories.php:72
+#: ../inventory/manage/item_categories.php:72
 msgid ""
 "Cannot delete this item category because items have been created using this "
 "item category."
 msgstr ""
 
-#: inventory/manage/item_categories.php:77
+#: ../inventory/manage/item_categories.php:77
 msgid "Selected item category has been deleted"
 msgstr ""
 
-#: inventory/manage/item_categories.php:98
+#: ../inventory/manage/item_categories.php:98
 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:446
-#: sales/customer_invoice.php:541 sales/customer_invoice.php:544
+#: ../inventory/manage/item_categories.php:98
+#: ../inventory/manage/item_codes.php:124
+#: ../inventory/manage/sales_kits.php:40
+#: ../inventory/view/view_adjustment.php:57
+#: ../inventory/view/view_transfer.php:56
+#: ../manufacturing/view/wo_issue_view.php:77
+#: ../manufacturing/manage/bom_edit.php:71
+#: ../purchasing/po_receive_items.php:62
+#: ../sales/customer_credit_invoice.php:280
+#: ../sales/customer_delivery.php:446
+#: ../sales/customer_invoice.php:541
+#: ../sales/customer_invoice.php:544
 msgid "Units"
 msgstr ""
 
-#: inventory/manage/item_categories.php:98
+#: ../inventory/manage/item_categories.php:98
 msgid "Sales Act"
 msgstr ""
 
-#: inventory/manage/item_categories.php:99
+#: ../inventory/manage/item_categories.php:99
 msgid "Inventory Account"
 msgstr ""
 
-#: inventory/manage/item_categories.php:99
+#: ../inventory/manage/item_categories.php:99
 msgid "COGS Account"
 msgstr ""
 
-#: inventory/manage/item_categories.php:99
+#: ../inventory/manage/item_categories.php:99
 msgid "Adjustment Account"
 msgstr ""
 
-#: inventory/manage/item_categories.php:100
+#: ../inventory/manage/item_categories.php:100
 msgid "Assembly Account"
 msgstr ""
 
-#: inventory/manage/item_categories.php:182
+#: ../inventory/manage/item_categories.php:182
 msgid "Category Name:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:184
+#: ../inventory/manage/item_categories.php:184
 msgid "Default values for new items"
 msgstr ""
 
-#: inventory/manage/item_categories.php:186
+#: ../inventory/manage/item_categories.php:186
+#: ../inventory/manage/items.php:335
 msgid "Item Tax Type:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:188
+#: ../inventory/manage/item_categories.php:188
+#: ../inventory/manage/items.php:337
 msgid "Item Type:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:190
+#: ../inventory/manage/item_categories.php:190
+#: ../inventory/manage/items.php:339
 msgid "Units of Measure:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:192
+#: ../inventory/manage/item_categories.php:192
+#: ../inventory/manage/items.php:343
 msgid "Exclude from sales:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:194
+#: ../inventory/manage/item_categories.php:194
+#: ../inventory/manage/items.php:345
 msgid "Exclude from purchases:"
 msgstr ""
 
-#: inventory/manage/item_codes.php:16
+#: ../inventory/manage/item_codes.php:16
 msgid "Foreign Item Codes"
 msgstr ""
 
-#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:697
+#: ../inventory/manage/item_codes.php:23
+#: ../sales/sales_order_entry.php:698
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
-#: inventory/manage/item_codes.php:41
+#: ../inventory/manage/item_codes.php:41
 msgid "The price entered was not positive number."
 msgstr ""
 
-#: inventory/manage/item_codes.php:47 inventory/manage/sales_kits.php:78
+#: ../inventory/manage/item_codes.php:47
+#: ../inventory/manage/sales_kits.php:78
 msgid "Item code description cannot be empty."
 msgstr ""
 
-#: inventory/manage/item_codes.php:55 inventory/manage/sales_kits.php:88
+#: ../inventory/manage/item_codes.php:55
+#: ../inventory/manage/items.php:163
+#: ../inventory/manage/sales_kits.php:88
 msgid "This item code is already assigned to stock item or sale kit."
 msgstr ""
 
-#: inventory/manage/item_codes.php:67
+#: ../inventory/manage/item_codes.php:67
 msgid "New item code has been added."
 msgstr ""
 
-#: inventory/manage/item_codes.php:73
+#: ../inventory/manage/item_codes.php:73
 msgid "Item code has been updated."
 msgstr ""
 
-#: inventory/manage/item_codes.php:85
+#: ../inventory/manage/item_codes.php:85
 msgid "Item code has been sucessfully deleted."
 msgstr ""
 
-#: inventory/manage/item_codes.php:124
+#: ../inventory/manage/item_codes.php:124
 msgid "EAN/UPC Code"
 msgstr ""
 
-#: inventory/manage/item_codes.php:125 reporting/rep104.php:117
-#: reporting/rep105.php:119 reporting/rep301.php:105 reporting/rep301.php:111
-#: reporting/rep302.php:124 reporting/rep302.php:131 reporting/rep304.php:114
-#: reporting/rep304.php:122 reporting/rep306.php:141 reporting/rep306.php:149
-#: reporting/rep307.php:117 reporting/rep307.php:123 reporting/rep308.php:149
-#: reporting/rep308.php:156 reporting/rep309.php:104
+#: ../inventory/manage/item_codes.php:125
+#: ../reporting/rep104.php:117
+#: ../reporting/rep105.php:119
+#: ../reporting/rep301.php:105
+#: ../reporting/rep301.php:111
+#: ../reporting/rep302.php:124
+#: ../reporting/rep302.php:131
+#: ../reporting/rep303.php:133
+#: ../reporting/rep304.php:114
+#: ../reporting/rep304.php:122
+#: ../reporting/rep306.php:141
+#: ../reporting/rep306.php:149
+#: ../reporting/rep307.php:117
+#: ../reporting/rep307.php:123
+#: ../reporting/rep308.php:149
+#: ../reporting/rep308.php:156
+#: ../reporting/rep309.php:104
 msgid "Category"
 msgstr ""
 
-#: inventory/manage/item_codes.php:178
+#: ../inventory/manage/item_codes.php:178
 msgid "UPC/EAN code:"
 msgstr ""
 
-#: inventory/manage/item_codes.php:179 inventory/manage/sales_kits.php:245
-#: manufacturing/work_order_add_finished.php:206
-#: manufacturing/manage/bom_edit.php:228
+#: ../inventory/manage/item_codes.php:179
+#: ../inventory/manage/sales_kits.php:245
+#: ../manufacturing/work_order_add_finished.php:206
+#: ../manufacturing/work_order_entry.php:424
+#: ../manufacturing/manage/bom_edit.php:228
 msgid "Quantity:"
 msgstr ""
 
-#: inventory/manage/item_codes.php:180 inventory/manage/movement_types.php:129
-#: inventory/manage/sales_kits.php:206 inventory/manage/sales_kits.php:232
-#: manufacturing/manage/work_centres.php:138
-#: sales/manage/credit_status.php:145 sales/manage/recurrent_invoices.php:165
-#: taxes/item_tax_types.php:173 taxes/tax_groups.php:162
-#: taxes/tax_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
+#: ../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 ""
 
-#: inventory/manage/item_codes.php:181 inventory/manage/sales_kits.php:207
-#: inventory/manage/sales_kits.php:233
+#: ../inventory/manage/item_codes.php:181
+#: ../inventory/manage/items.php:311
+#: ../inventory/manage/sales_kits.php:207
+#: ../inventory/manage/sales_kits.php:233
 msgid "Category:"
 msgstr ""
 
-#: inventory/manage/item_units.php:16
+#: ../inventory/manage/items.php:81
+msgid ""
+"Only graphics files are supported - a file extension of .jpg, .png or .gif "
+"is expected"
+msgstr ""
+
+#: ../inventory/manage/items.php:112
+msgid ""
+"There are no item categories defined in the system. At least one item "
+"category is required to add a item."
+msgstr ""
+
+#: ../inventory/manage/items.php:114
+msgid ""
+"There are no item tax types defined in the system. At least one item tax "
+"type is required to add a item."
+msgstr ""
+
+#: ../inventory/manage/items.php:142
+msgid "The item name must be entered."
+msgstr ""
+
+#: ../inventory/manage/items.php:148
+msgid "The item code cannot be empty"
+msgstr ""
+
+#: ../inventory/manage/items.php:156
+msgid ""
+"The item code cannot contain any of the following characters -  & + OR a "
+"space OR quotes"
+msgstr ""
+
+#: ../inventory/manage/items.php:192
+msgid "Item has been updated."
+msgstr ""
+
+#: ../inventory/manage/items.php:205
+msgid "A new item has been added."
+msgstr ""
+
+#: ../inventory/manage/items.php:248
+msgid "Selected item has been deleted."
+msgstr ""
+
+#: ../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/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
+msgid "Item"
+msgstr ""
+
+#: ../inventory/manage/items.php:270
+#: ../inventory/manage/items.php:302
+msgid "Item Code:"
+msgstr ""
+
+#: ../inventory/manage/items.php:341
+msgid "Editable description:"
+msgstr ""
+
+#: ../inventory/manage/items.php:363
+#: ../sales/manage/customer_branches.php:249
+msgid "GL Accounts"
+msgstr ""
+
+#: ../inventory/manage/items.php:386
+msgid "Other"
+msgstr ""
+
+#: ../inventory/manage/items.php:389
+msgid "Image File (.jpg)"
+msgstr ""
+
+#: ../inventory/manage/items.php:404
+msgid "No image"
+msgstr ""
+
+#: ../inventory/manage/items.php:409
+msgid "Delete Image:"
+msgstr ""
+
+#: ../inventory/manage/items.php:411
+msgid "Item status:"
+msgstr ""
+
+#: ../inventory/manage/items.php:417
+msgid "Insert New Item"
+msgstr ""
+
+#: ../inventory/manage/items.php:421
+msgid "Update Item"
+msgstr ""
+
+#: ../inventory/manage/items.php:424
+msgid "Select this items and return to document entry."
+msgstr ""
+
+#: ../inventory/manage/items.php:425
+msgid "Clone This Item"
+msgstr ""
+
+#: ../inventory/manage/items.php:426
+msgid "Delete This Item"
+msgstr ""
+
+#: ../inventory/manage/items.php:441
+msgid "Select an item:"
+msgstr ""
+
+#: ../inventory/manage/items.php:442
+msgid "New item"
+msgstr ""
+
+#: ../inventory/manage/items.php:465
+#: ../purchasing/manage/suppliers.php:308
+#: ../sales/manage/customer_branches.php:324
+#: ../sales/manage/customers.php:347
+msgid "&General settings"
+msgstr ""
+
+#: ../inventory/manage/items.php:466
+msgid "S&ales Pricing"
+msgstr ""
+
+#: ../inventory/manage/items.php:467
+msgid "&Purchasing Pricing"
+msgstr ""
+
+#: ../inventory/manage/items.php:470
+#: ../purchasing/manage/suppliers.php:310
+#: ../sales/manage/customers.php:349
+msgid "&Transactions"
+msgstr ""
+
+#: ../inventory/manage/items.php:471
+msgid "&Status"
+msgstr ""
+
+#: ../inventory/manage/item_units.php:16
 msgid "Units of Measure"
 msgstr ""
 
-#: inventory/manage/item_units.php:34
+#: ../inventory/manage/item_units.php:34
 msgid "The unit of measure code cannot be empty."
 msgstr ""
 
-#: inventory/manage/item_units.php:40
+#: ../inventory/manage/item_units.php:40
 msgid "The unit of measure code is too long."
 msgstr ""
 
-#: inventory/manage/item_units.php:46
+#: ../inventory/manage/item_units.php:46
 msgid "The unit of measure description cannot be empty."
 msgstr ""
 
-#: inventory/manage/item_units.php:53
+#: ../inventory/manage/item_units.php:53
 msgid "Selected unit has been updated"
 msgstr ""
 
-#: inventory/manage/item_units.php:55
+#: ../inventory/manage/item_units.php:55
 msgid "New unit has been added"
 msgstr ""
 
-#: inventory/manage/item_units.php:69
+#: ../inventory/manage/item_units.php:69
 msgid ""
 "Cannot delete this unit of measure because items have been created using "
 "this unit."
 msgstr ""
 
-#: inventory/manage/item_units.php:75
+#: ../inventory/manage/item_units.php:75
 msgid "Selected unit has been deleted"
 msgstr ""
 
-#: inventory/manage/item_units.php:94
+#: ../inventory/manage/item_units.php:94
 msgid "Decimals"
 msgstr ""
 
-#: inventory/manage/item_units.php:107 inventory/manage/item_units.php:142
+#: ../inventory/manage/item_units.php:107
+#: ../inventory/manage/item_units.php:142
 msgid "User Quantity Decimals"
 msgstr ""
 
-#: inventory/manage/item_units.php:136 inventory/manage/item_units.php:139
+#: ../inventory/manage/item_units.php:136
+#: ../inventory/manage/item_units.php:139
 msgid "Unit Abbreviation:"
 msgstr ""
 
-#: inventory/manage/item_units.php:140
+#: ../inventory/manage/item_units.php:140
 msgid "Descriptive Name:"
 msgstr ""
 
-#: inventory/manage/item_units.php:142
+#: ../inventory/manage/item_units.php:142
 msgid "Decimal Places:"
 msgstr ""
 
-#: inventory/manage/locations.php:16
+#: ../inventory/manage/locations.php:16
 msgid "Inventory Locations"
 msgstr ""
 
-#: inventory/manage/locations.php:39
+#: ../inventory/manage/locations.php:39
 msgid ""
 "The location code must be five characters or less long (including converted "
 "special chars)."
 msgstr ""
 
-#: inventory/manage/locations.php:45
+#: ../inventory/manage/locations.php:45
 msgid "The location name must be entered."
 msgstr ""
 
-#: inventory/manage/locations.php:56
+#: ../inventory/manage/locations.php:56
 msgid "Selected location has been updated"
 msgstr ""
 
-#: inventory/manage/locations.php:65
+#: ../inventory/manage/locations.php:65
 msgid "New location has been added"
 msgstr ""
 
-#: inventory/manage/locations.php:76
+#: ../inventory/manage/locations.php:76
 msgid ""
 "Cannot delete this location because item movements have been created using "
 "this location."
 msgstr ""
 
-#: inventory/manage/locations.php:82
+#: ../inventory/manage/locations.php:82
 msgid ""
 "Cannot delete this location because it is used by some work orders records."
 msgstr ""
 
-#: inventory/manage/locations.php:88
+#: ../inventory/manage/locations.php:88
 msgid ""
 "Cannot delete this location because it is used by some branch records as the "
 "default location to deliver from."
 msgstr ""
 
-#: inventory/manage/locations.php:94 inventory/manage/locations.php:100
-#: inventory/manage/locations.php:105 inventory/manage/locations.php:110
-#: inventory/manage/locations.php:115
+#: ../inventory/manage/locations.php:94
+#: ../inventory/manage/locations.php:100
+#: ../inventory/manage/locations.php:105
+#: ../inventory/manage/locations.php:110
+#: ../inventory/manage/locations.php:115
 msgid ""
 "Cannot delete this location because it is used by some related records in "
 "other tables."
 msgstr ""
 
-#: inventory/manage/locations.php:129
+#: ../inventory/manage/locations.php:129
 msgid "Selected location has been deleted"
 msgstr ""
 
-#: inventory/manage/locations.php:146
+#: ../inventory/manage/locations.php:146
 msgid "Location Code"
 msgstr ""
 
-#: inventory/manage/locations.php:146
+#: ../inventory/manage/locations.php:146
 msgid "Location Name"
 msgstr ""
 
-#: inventory/manage/locations.php:192 inventory/manage/locations.php:196
+#: ../inventory/manage/locations.php:192
+#: ../inventory/manage/locations.php:196
 msgid "Location Code:"
 msgstr ""
 
-#: inventory/manage/locations.php:199
+#: ../inventory/manage/locations.php:199
 msgid "Location Name:"
 msgstr ""
 
-#: inventory/manage/locations.php:200
+#: ../inventory/manage/locations.php:200
 msgid "Contact for deliveries:"
 msgstr ""
 
-#: inventory/manage/locations.php:204
+#: ../inventory/manage/locations.php:204
 msgid "Telephone No:"
 msgstr ""
 
-#: inventory/manage/locations.php:206
+#: ../inventory/manage/locations.php:206
 msgid "Facsimile No:"
 msgstr ""
 
-#: inventory/manage/movement_types.php:16
+#: ../inventory/manage/movement_types.php:16
 msgid "Inventory Movement Types"
 msgstr ""
 
-#: inventory/manage/movement_types.php:34
+#: ../inventory/manage/movement_types.php:34
 msgid "The inventory movement type name cannot be empty."
 msgstr ""
 
-#: inventory/manage/movement_types.php:43
+#: ../inventory/manage/movement_types.php:43
 msgid "Selected movement type has been updated"
 msgstr ""
 
-#: inventory/manage/movement_types.php:48
+#: ../inventory/manage/movement_types.php:48
 msgid "New movement type has been added"
 msgstr ""
 
-#: inventory/manage/movement_types.php:61
+#: ../inventory/manage/movement_types.php:61
 msgid ""
 "Cannot delete this inventory movement type because item transactions have "
 "been created referring to it."
 msgstr ""
 
-#: inventory/manage/movement_types.php:76
+#: ../inventory/manage/movement_types.php:76
 msgid "Selected movement type has been deleted"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:16
+#: ../inventory/manage/sales_kits.php:16
 msgid "Sales Kits & Alias Codes"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:40
+#: ../inventory/manage/sales_kits.php:40
 msgid "Stock Item"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:54
+#: ../inventory/manage/sales_kits.php:54
 msgid "kit"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:72 manufacturing/manage/bom_edit.php:101
+#: ../inventory/manage/sales_kits.php:72
+#: ../manufacturing/manage/bom_edit.php:101
 msgid "The quantity entered must be numeric and greater than zero."
 msgstr ""
 
-#: inventory/manage/sales_kits.php:93
+#: ../inventory/manage/sales_kits.php:93
 msgid "Kit/alias code cannot be empty."
 msgstr ""
 
-#: inventory/manage/sales_kits.php:101
+#: ../inventory/manage/sales_kits.php:101
 msgid ""
 "The selected component contains directly or on any lower level the kit under "
 "edition. Recursive kits are not allowed."
 msgstr ""
 
-#: inventory/manage/sales_kits.php:108
+#: ../inventory/manage/sales_kits.php:108
 msgid ""
 "The selected component is already in this kit. You can modify it's quantity "
 "but it cannot appear more than once in the same kit."
 msgstr ""
 
-#: inventory/manage/sales_kits.php:116
+#: ../inventory/manage/sales_kits.php:116
 msgid "New alias code has been created."
 msgstr ""
 
-#: inventory/manage/sales_kits.php:119
+#: ../inventory/manage/sales_kits.php:119
 msgid "New component has been added to selected kit."
 msgstr ""
 
-#: inventory/manage/sales_kits.php:129
+#: ../inventory/manage/sales_kits.php:129
 msgid "Component of selected kit has been updated."
 msgstr ""
 
-#: inventory/manage/sales_kits.php:139
+#: ../inventory/manage/sales_kits.php:139
 msgid "Kit common properties has been updated"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:157
+#: ../inventory/manage/sales_kits.php:157
 msgid ""
 "This item cannot be deleted because it is the last item in the kit used by "
 "following kits"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:168 manufacturing/manage/bom_edit.php:153
+#: ../inventory/manage/sales_kits.php:168
+#: ../manufacturing/manage/bom_edit.php:153
 msgid "The component item has been deleted from this bom"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:183
+#: ../inventory/manage/sales_kits.php:183
 msgid "Select a sale kit:"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:184
+#: ../inventory/manage/sales_kits.php:184
 msgid "New kit"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:199
+#: ../inventory/manage/sales_kits.php:199
 msgid "Alias/kit code:"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:208
+#: ../inventory/manage/sales_kits.php:208
 msgid "Update kit/alias name"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:223 manufacturing/manage/bom_edit.php:204
-#: manufacturing/manage/bom_edit.php:211
+#: ../inventory/manage/sales_kits.php:223
+#: ../manufacturing/manage/bom_edit.php:204
+#: ../manufacturing/manage/bom_edit.php:211
 msgid "Component:"
 msgstr ""
 
-#: inventory/manage/sales_kits.php:237
+#: ../inventory/manage/sales_kits.php:237
 msgid "kits"
 msgstr ""
 
-#: inventory/view/view_adjustment.php:17
+#: ../inventory/view/view_adjustment.php:17
 msgid "View Inventory Adjustment"
 msgstr ""
 
-#: inventory/view/view_adjustment.php:43
+#: ../inventory/view/view_adjustment.php:43
 msgid "At Location"
 msgstr ""
 
-#: inventory/view/view_adjustment.php:46 inventory/view/view_transfer.php:46
+#: ../inventory/view/view_adjustment.php:46
+#: ../inventory/view/view_transfer.php:46
 msgid "Adjustment Type"
 msgstr ""
 
-#: inventory/view/view_adjustment.php:56 inventory/view/view_transfer.php:39
-#: inventory/view/view_transfer.php:56
-#: manufacturing/search_work_orders.php:163
-#: manufacturing/view/wo_issue_view.php:44
-#: manufacturing/view/wo_production_view.php:45
-#: purchasing/includes/ui/invoice_ui.inc:492
-#: purchasing/includes/ui/invoice_ui.inc:504 reporting/rep204.php:84
-#: reporting/rep306.php:152
-msgid "Item"
-msgstr ""
-
-#: inventory/view/view_adjustment.php:73
+#: ../inventory/view/view_adjustment.php:73
 msgid "This adjustment has been voided."
 msgstr ""
 
-#: inventory/view/view_transfer.php:17
+#: ../inventory/view/view_transfer.php:17
 msgid "View Inventory Transfer"
 msgstr ""
 
-#: inventory/view/view_transfer.php:40 manufacturing/view/wo_issue_view.php:44
-#: manufacturing/includes/manufacturing_ui.inc:29
-#: manufacturing/includes/manufacturing_ui.inc:83
-#: reporting/includes/doctext.inc:229
+#: ../inventory/view/view_transfer.php:40
+#: ../manufacturing/view/wo_issue_view.php:44
+#: ../manufacturing/includes/manufacturing_ui.inc:29
+#: ../manufacturing/includes/manufacturing_ui.inc:83
+#: ../reporting/includes/doctext.inc:229
 msgid "From Location"
 msgstr ""
 
-#: inventory/view/view_transfer.php:41
+#: ../inventory/view/view_transfer.php:41
 msgid "To Location"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:26
+#: ../manufacturing/search_work_orders.php:26
 msgid "Search Outstanding Work Orders"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:31
+#: ../manufacturing/search_work_orders.php:31
 msgid "Search Work Orders"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:69
+#: ../manufacturing/search_work_orders.php:69
 msgid "at Location:"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:76
-#: purchasing/inquiry/po_search_completed.php:72
+#: ../manufacturing/search_work_orders.php:76
+#: ../purchasing/inquiry/po_search_completed.php:72
 msgid "for item:"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:78
-#: purchasing/inquiry/po_search_completed.php:74
-#: purchasing/inquiry/po_search.php:76
-#: sales/inquiry/sales_deliveries_view.php:116
+#: ../manufacturing/search_work_orders.php:78
+#: ../purchasing/inquiry/po_search_completed.php:74
+#: ../purchasing/inquiry/po_search.php:76
+#: ../sales/inquiry/sales_deliveries_view.php:116
+#: ../sales/inquiry/sales_orders_view.php.orig:269
 msgid "Select documents"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:117
+#: ../manufacturing/search_work_orders.php:117
 msgid "Release"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:120
+#: ../manufacturing/search_work_orders.php:120
 msgid "Issue"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:127
+#: ../manufacturing/search_work_orders.php:127
 msgid "Produce"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:140
+#: ../manufacturing/search_work_orders.php:140
 msgid "Costs"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:164
+#: ../manufacturing/search_work_orders.php:164
 msgid "Required"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:167
-#: manufacturing/includes/manufacturing_ui.inc:277
-#: manufacturing/includes/manufacturing_ui.inc:281
-#: reporting/includes/doctext.inc:227
+#: ../manufacturing/search_work_orders.php:167
+#: ../manufacturing/includes/manufacturing_ui.inc:277
+#: ../manufacturing/includes/manufacturing_ui.inc:281
+#: ../reporting/includes/doctext.inc:227
+#: ../sales/inquiry/sales_orders_view.php.orig:290
 msgid "Required By"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:176
+#: ../manufacturing/search_work_orders.php:176
 msgid "Marked orders are overdue."
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:29
+#: ../manufacturing/work_order_add_finished.php:29
 msgid "Produce or Unassemble Finished Items From Work Order"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:44
+#: ../manufacturing/work_order_add_finished.php:44
 msgid "The manufacturing process has been entered."
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:46
-#: manufacturing/work_order_costs.php:45 manufacturing/work_order_entry.php:56
-#: manufacturing/work_order_issue.php:40
-#: manufacturing/work_order_release.php: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_release.php:75
 msgid "View this Work Order"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:48
-#: manufacturing/work_order_issue.php:42
+#: ../manufacturing/work_order_add_finished.php:48
+#: ../manufacturing/work_order_entry.php:64
+#: ../manufacturing/work_order_issue.php:42
 msgid "View the GL Journal Entries for this Work Order"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:50
+#: ../manufacturing/work_order_add_finished.php:50
+#: ../manufacturing/work_order_entry.php:67
 msgid "Print the GL Journal Entries for this Work Order"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:52
-#: manufacturing/work_order_costs.php:49 manufacturing/work_order_issue.php:44
+#: ../manufacturing/work_order_add_finished.php:52
+#: ../manufacturing/work_order_costs.php:49
+#: ../manufacturing/work_order_issue.php:44
 msgid "Select another &Work Order to Process"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:65
-#: manufacturing/work_order_costs.php:62
-#: manufacturing/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:341
+#: ../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 ""
 
-#: manufacturing/work_order_add_finished.php:91
+#: ../manufacturing/work_order_add_finished.php:91
 msgid "The quantity entered is not a valid number or less then zero."
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:110
+#: ../manufacturing/work_order_add_finished.php:110
 msgid ""
 "The production date cannot be before the release date of the work order."
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:117
+#: ../manufacturing/work_order_add_finished.php:117
 msgid ""
 "The production exceeds the quantity needed. Please change the Work Order."
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:129
+#: ../manufacturing/work_order_add_finished.php:129
 msgid ""
 "The unassembling cannot be processed because there is insufficient stock."
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:147
+#: ../manufacturing/work_order_add_finished.php:147
 msgid ""
 "The production cannot be processed because a required item would cause a "
 "negative inventory balance :"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:204
+#: ../manufacturing/work_order_add_finished.php:204
 msgid "Produce Finished Items"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:204
+#: ../manufacturing/work_order_add_finished.php:204
 msgid "Return Items to Work Order"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:214
-#: purchasing/allocations/supplier_allocate.php:64
-#: sales/allocations/customer_allocate.php:63
+#: ../manufacturing/work_order_add_finished.php:214
+#: ../purchasing/allocations/supplier_allocate.php:74
+#: ../sales/allocations/customer_allocate.php:72
 msgid "Process"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:215
+#: ../manufacturing/work_order_add_finished.php:215
 msgid "Process And Close Order"
 msgstr ""
 
-#: manufacturing/work_order_costs.php:29
+#: ../manufacturing/work_order_costs.php:29
 msgid "Work Order Additional Costs"
 msgstr ""
 
-#: manufacturing/work_order_costs.php:43
+#: ../manufacturing/work_order_costs.php:43
 msgid "The additional cost has been entered."
 msgstr ""
 
-#: manufacturing/work_order_costs.php:47
+#: ../manufacturing/work_order_costs.php:47
 msgid "Enter another additional cost."
 msgstr ""
 
-#: manufacturing/work_order_costs.php:73
+#: ../manufacturing/work_order_costs.php:73
 msgid "The amount entered is not a valid number or less then zero."
 msgstr ""
 
-#: manufacturing/work_order_costs.php:92
+#: ../manufacturing/work_order_costs.php:92
 msgid ""
 "The additional cost date cannot be before the release date of the work order."
 msgstr ""
 
-#: manufacturing/work_order_costs.php:143
+#: ../manufacturing/work_order_costs.php:143
 msgid "Additional Costs:"
 msgstr ""
 
-#: manufacturing/work_order_costs.php:144
+#: ../manufacturing/work_order_costs.php:144
 msgid "Debit Account"
 msgstr ""
 
-#: manufacturing/work_order_costs.php:151
+#: ../manufacturing/work_order_costs.php:151
 msgid "Process Additional Cost"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:29
+#: ../manufacturing/work_order_entry.php:29
 msgid "Work Order Entry"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:32
+#: ../manufacturing/work_order_entry.php:32
 msgid "There are no manufacturable items defined in the system."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:54
+#: ../manufacturing/work_order_entry.php:54
 msgid "The work order been added."
 msgstr ""
 
-#: manufacturing/work_order_issue.php:31
+#: ../manufacturing/work_order_entry.php:62
+msgid "&Print This Work Order"
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:63
+msgid "&Email This Work Order"
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:80
+msgid "The work order been updated."
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:90
+msgid "Work order has been deleted."
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:100
+msgid ""
+"This work order has been closed. There can be no more issues against it."
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:110
+msgid "Enter a new work order"
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:111
+msgid "Select an existing work order"
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:147
+msgid "The quantity entered is invalid or less than zero."
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:169
+msgid "The selected item to manufacture does not have a bom."
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:178
+msgid "The labour cost entered is invalid or less than zero."
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:186
+msgid "The cost entered is invalid or less than zero."
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:209
+msgid ""
+"The work order cannot be processed because there is an insufficient quantity "
+"for component:"
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:223
+msgid ""
+"The selected item cannot be unassembled because there is insufficient stock."
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:249
+msgid ""
+"The quantity cannot be changed to be less than the quantity already "
+"manufactured for this order."
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:298
+msgid ""
+"This work order cannot be deleted because it has already been processed."
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:349
+msgid "This work order is closed and cannot be edited."
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:397
+#: ../manufacturing/work_order_entry.php:405
+msgid "Destination Location:"
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:416
+msgid "Quantity Required:"
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:418
+msgid "Quantity Manufactured:"
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:437
+msgid "Credit Labour Account"
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:444
+msgid "Credit Overhead Account"
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:449
+msgid "Released On:"
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:459
+msgid "Save changes to work order"
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:462
+msgid "Close This Work Order"
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:464
+msgid "Delete This Work Order"
+msgstr ""
+
+#: ../manufacturing/work_order_entry.php:470
+msgid "Add Workorder"
+msgstr ""
+
+#: ../manufacturing/work_order_issue.php:31
 msgid "Issue Items to Work Order"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:38
+#: ../manufacturing/work_order_issue.php:38
 msgid "The work order issue has been entered."
 msgstr ""
 
-#: manufacturing/work_order_issue.php:78
+#: ../manufacturing/work_order_issue.php:78
 msgid "The entered date for the issue is invalid."
 msgstr ""
 
-#: manufacturing/work_order_issue.php:106
+#: ../manufacturing/work_order_issue.php:106
 msgid ""
 "The issue cannot be processed because an entered item would cause a negative "
 "inventory balance :"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:124
+#: ../manufacturing/work_order_issue.php:124
 msgid ""
 "The process cannot be completed because there is an insufficient total "
 "quantity for a component."
 msgstr ""
 
-#: manufacturing/work_order_issue.php:125
+#: ../manufacturing/work_order_issue.php:125
 msgid "Component is :"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:126
+#: ../manufacturing/work_order_issue.php:126
 msgid "From location :"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:219
+#: ../manufacturing/work_order_issue.php:219
 msgid "Items to Issue"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:225
+#: ../manufacturing/work_order_issue.php:225
 msgid "Process Issue"
 msgstr ""
 
-#: manufacturing/work_order_release.php:27
+#: ../manufacturing/work_order_release.php:27
 msgid "Work Order Release to Manufacturing"
 msgstr ""
 
-#: manufacturing/work_order_release.php:49
+#: ../manufacturing/work_order_release.php:49
 msgid "This work order has already been released."
 msgstr ""
 
-#: manufacturing/work_order_release.php:60
+#: ../manufacturing/work_order_release.php:60
 msgid ""
 "This Work Order cannot be released. The selected item to manufacture does "
 "not have a bom."
 msgstr ""
 
-#: manufacturing/work_order_release.php:73
+#: ../manufacturing/work_order_release.php:73
 msgid "The work order has been released to manufacturing."
 msgstr ""
 
-#: manufacturing/work_order_release.php:77
+#: ../manufacturing/work_order_release.php:77
 msgid "Select another &work order"
 msgstr ""
 
-#: manufacturing/work_order_release.php:98
+#: ../manufacturing/work_order_release.php:98
 msgid "Work Order #:"
 msgstr ""
 
-#: manufacturing/work_order_release.php:99
+#: ../manufacturing/work_order_release.php:99
 msgid "Work Order Reference:"
 msgstr ""
 
-#: manufacturing/work_order_release.php:101
-#: manufacturing/includes/manufacturing_ui.inc:278
+#: ../manufacturing/work_order_release.php:101
+#: ../manufacturing/includes/manufacturing_ui.inc:278
 msgid "Released Date"
 msgstr ""
 
-#: manufacturing/work_order_release.php:107
+#: ../manufacturing/work_order_release.php:107
 msgid "Release Work Order"
 msgstr ""
 
-#: manufacturing/view/wo_costs_view.php:20
+#: ../manufacturing/view/wo_costs_view.php:20
 msgid "View Work Order Costs"
 msgstr ""
 
-#: manufacturing/view/wo_costs_view.php:62
+#: ../manufacturing/view/wo_costs_view.php:62
 #, php-format
 msgid "Production Costs for Work Order # %d"
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:19
+#: ../manufacturing/view/wo_issue_view.php:19
 msgid "View Work Order Issue"
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:43
+#: ../manufacturing/view/wo_issue_view.php:43
 msgid "Issue #"
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:43
-#: manufacturing/view/wo_production_view.php:44
+#: ../manufacturing/view/wo_issue_view.php:43
+#: ../manufacturing/view/wo_production_view.php:44
 msgid "For Work Order #"
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:44
+#: ../manufacturing/view/wo_issue_view.php:44
 msgid "To Work Centre"
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:44
+#: ../manufacturing/view/wo_issue_view.php:44
 msgid "Date of Issue"
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:61
+#: ../manufacturing/view/wo_issue_view.php:61
 msgid "This issue has been voided."
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:72
+#: ../manufacturing/view/wo_issue_view.php:72
 msgid "There are no items for this issue."
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:77
-#: manufacturing/includes/manufacturing_ui.inc:28
-#: manufacturing/includes/manufacturing_ui.inc:83 reporting/rep401.php:71
-#: reporting/rep401.php:76
+#: ../manufacturing/view/wo_issue_view.php:77
+#: ../manufacturing/includes/manufacturing_ui.inc:28
+#: ../manufacturing/includes/manufacturing_ui.inc:83
+#: ../reporting/rep401.php:71
+#: ../reporting/rep401.php:76
 msgid "Component"
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:114
+#: ../manufacturing/view/wo_issue_view.php:114
 msgid "Items for this Issue"
 msgstr ""
 
-#: manufacturing/view/wo_production_view.php:20
+#: ../manufacturing/view/wo_production_view.php:20
 msgid "View Work Order Production"
 msgstr ""
 
-#: manufacturing/view/wo_production_view.php:44
+#: ../manufacturing/view/wo_production_view.php:44
 msgid "Production #"
 msgstr ""
 
-#: manufacturing/view/wo_production_view.php:45
+#: ../manufacturing/view/wo_production_view.php:45
 msgid "Quantity Manufactured"
 msgstr ""
 
-#: manufacturing/view/wo_production_view.php:61
+#: ../manufacturing/view/wo_production_view.php:61
 msgid "This production has been voided."
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:26
+#: ../manufacturing/view/work_order_view.php:26
 msgid "View Work Order"
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:51
+#: ../manufacturing/view/work_order_view.php:51
 msgid "BOM for item:"
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:56
+#: ../manufacturing/view/work_order_view.php:56
 msgid "Work Order Requirements"
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:61
+#: ../manufacturing/view/work_order_view.php:61
 msgid "Issues"
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:64
+#: ../manufacturing/view/work_order_view.php:64
 msgid "Productions"
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:67
-#: manufacturing/view/work_order_view.php:74
+#: ../manufacturing/view/work_order_view.php:67
+#: ../manufacturing/view/work_order_view.php:74
 msgid "Additional Costs"
 msgstr ""
 
-#: manufacturing/view/work_order_view.php:82
+#: ../manufacturing/view/work_order_view.php:82
 msgid "This work order has been voided."
 msgstr ""
 
-#: manufacturing/inquiry/bom_cost_inquiry.php:24
-#: manufacturing/manage/bom_edit.php:24
+#: ../manufacturing/inquiry/bom_cost_inquiry.php:24
+#: ../manufacturing/manage/bom_edit.php:24
 msgid "There are no manufactured or kit items defined in the system."
 msgstr ""
 
-#: manufacturing/inquiry/bom_cost_inquiry.php:35
-#: manufacturing/manage/bom_edit.php:170
+#: ../manufacturing/inquiry/bom_cost_inquiry.php:35
+#: ../manufacturing/manage/bom_edit.php:170
 msgid "Select a manufacturable item:"
 msgstr ""
 
-#: manufacturing/inquiry/bom_cost_inquiry.php:38
+#: ../manufacturing/inquiry/bom_cost_inquiry.php:38
 msgid "All Costs Are In:"
 msgstr ""
 
-#: manufacturing/inquiry/where_used_inquiry.php:17
+#: ../manufacturing/inquiry/where_used_inquiry.php:17
 msgid "Inventory Item Where Used Inquiry"
 msgstr ""
 
-#: manufacturing/inquiry/where_used_inquiry.php:28
+#: ../manufacturing/inquiry/where_used_inquiry.php:28
 msgid "Select an item to display its parent item(s)."
 msgstr ""
 
-#: manufacturing/inquiry/where_used_inquiry.php:43
+#: ../manufacturing/inquiry/where_used_inquiry.php:43
 msgid "Parent Item"
 msgstr ""
 
-#: manufacturing/inquiry/where_used_inquiry.php:44
-#: manufacturing/manage/bom_edit.php:71
-#: manufacturing/includes/manufacturing_ui.inc:28
-#: manufacturing/includes/manufacturing_ui.inc:83
-#: reporting/includes/doctext.inc:229
+#: ../manufacturing/inquiry/where_used_inquiry.php:44
+#: ../manufacturing/manage/bom_edit.php:71
+#: ../manufacturing/includes/manufacturing_ui.inc:28
+#: ../manufacturing/includes/manufacturing_ui.inc:83
+#: ../reporting/includes/doctext.inc:229
 msgid "Work Centre"
 msgstr ""
 
-#: manufacturing/inquiry/where_used_inquiry.php:46
-#: manufacturing/includes/manufacturing_ui.inc:277
-#: manufacturing/includes/manufacturing_ui.inc:281
+#: ../manufacturing/inquiry/where_used_inquiry.php:46
+#: ../manufacturing/includes/manufacturing_ui.inc:277
+#: ../manufacturing/includes/manufacturing_ui.inc:281
 msgid "Quantity Required"
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:16
+#: ../manufacturing/manage/bom_edit.php:16
 msgid "Bill Of Materials"
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:26
+#: ../manufacturing/manage/bom_edit.php:26
 msgid ""
 "There are no work centres defined in the system. BOMs require at least one "
 "work centre be defined."
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:70 reporting/rep105.php:114
+#: ../manufacturing/manage/bom_edit.php:70
+#: ../reporting/rep105.php:114
 msgid "Code"
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:110
+#: ../manufacturing/manage/bom_edit.php:110
 msgid "Selected component has been updated"
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:130
+#: ../manufacturing/manage/bom_edit.php:130
 msgid ""
 "A new component part has been added to the bill of material for this item."
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:136
+#: ../manufacturing/manage/bom_edit.php:136
 msgid ""
 "The selected component is already on this bom. You can modify it's quantity "
 "but it cannot appear more than once on the same bom."
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:142
+#: ../manufacturing/manage/bom_edit.php:142
 msgid ""
 "The selected component is a parent of the current item. Recursive BOMs are "
 "not allowed."
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:224
+#: ../manufacturing/manage/bom_edit.php:224
 msgid "Location to Draw From:"
 msgstr ""
 
-#: manufacturing/manage/bom_edit.php:225
+#: ../manufacturing/manage/bom_edit.php:225
 msgid "Work Centre Added:"
 msgstr ""
 
-#: manufacturing/manage/work_centres.php:16
+#: ../manufacturing/manage/work_centres.php:16
 msgid "Work Centres"
 msgstr ""
 
-#: manufacturing/manage/work_centres.php:34
+#: ../manufacturing/manage/work_centres.php:34
 msgid "The work centre name cannot be empty."
 msgstr ""
 
-#: manufacturing/manage/work_centres.php:44
+#: ../manufacturing/manage/work_centres.php:44
 msgid "Selected work center has been updated"
 msgstr ""
 
-#: manufacturing/manage/work_centres.php:49
+#: ../manufacturing/manage/work_centres.php:49
 msgid "New work center has been added"
 msgstr ""
 
-#: manufacturing/manage/work_centres.php:61
+#: ../manufacturing/manage/work_centres.php:61
 msgid ""
 "Cannot delete this work centre because BOMs have been created referring to "
 "it."
 msgstr ""
 
-#: manufacturing/manage/work_centres.php:67
+#: ../manufacturing/manage/work_centres.php:67
 msgid ""
 "Cannot delete this work centre because work order requirements have been "
 "created referring to it."
 msgstr ""
 
-#: manufacturing/manage/work_centres.php:83
+#: ../manufacturing/manage/work_centres.php:83
 msgid "Selected work center has been deleted"
 msgstr ""
 
-#: manufacturing/manage/work_centres.php:101
+#: ../manufacturing/manage/work_centres.php:101
 msgid "description"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:22
+#: ../manufacturing/includes/manufacturing_ui.inc:22
 msgid "The bill of material for this item is empty."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:29
-#: manufacturing/includes/manufacturing_ui.inc:61
+#: ../manufacturing/includes/manufacturing_ui.inc:29
+#: ../manufacturing/includes/manufacturing_ui.inc:61
 msgid "Total Cost"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:77
+#: ../manufacturing/includes/manufacturing_ui.inc:77
 msgid "There are no Requirements for this Order."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:84
-#: reporting/includes/doctext.inc:229
+#: ../manufacturing/includes/manufacturing_ui.inc:84
+#: ../reporting/includes/doctext.inc:229
 msgid "Unit Quantity"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:84
-#: reporting/includes/doctext.inc:229
+#: ../manufacturing/includes/manufacturing_ui.inc:84
+#: ../reporting/includes/doctext.inc:229
 msgid "Total Quantity"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:84
-#: reporting/includes/doctext.inc:229
+#: ../manufacturing/includes/manufacturing_ui.inc:84
+#: ../reporting/includes/doctext.inc:229
 msgid "Units Issued"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:84
+#: ../manufacturing/includes/manufacturing_ui.inc:84
 msgid "On Hand"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:138
+#: ../manufacturing/includes/manufacturing_ui.inc:138
 msgid "Marked items have insufficient quantities in stock."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:152
+#: ../manufacturing/includes/manufacturing_ui.inc:152
 msgid "There are no Productions for this Order."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:195
+#: ../manufacturing/includes/manufacturing_ui.inc:195
 msgid "There are no Issues for this Order."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:231
+#: ../manufacturing/includes/manufacturing_ui.inc:231
 msgid "There are no additional costs for this Order."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:269
-#: manufacturing/includes/manufacturing_ui.inc:325
+#: ../manufacturing/includes/manufacturing_ui.inc:269
+#: ../manufacturing/includes/manufacturing_ui.inc:325
 msgid "The work order number sent is not valid."
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:276
-#: manufacturing/includes/manufacturing_ui.inc:280
-#: manufacturing/includes/manufacturing_ui.inc:331
-#: reporting/includes/doctext.inc:223
+#: ../manufacturing/includes/manufacturing_ui.inc:276
+#: ../manufacturing/includes/manufacturing_ui.inc:280
+#: ../manufacturing/includes/manufacturing_ui.inc:331
+#: ../reporting/includes/doctext.inc:223
 msgid "Manufactured Item"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:277
-#: manufacturing/includes/manufacturing_ui.inc:281
-#: manufacturing/includes/manufacturing_ui.inc:332
-#: reporting/includes/doctext.inc:224
+#: ../manufacturing/includes/manufacturing_ui.inc:277
+#: ../manufacturing/includes/manufacturing_ui.inc:281
+#: ../manufacturing/includes/manufacturing_ui.inc:332
+#: ../reporting/includes/doctext.inc:224
 msgid "Into Location"
 msgstr ""
 
-#: manufacturing/includes/manufacturing_ui.inc:311
-#: manufacturing/includes/manufacturing_ui.inc:356
+#: ../manufacturing/includes/manufacturing_ui.inc:311
+#: ../manufacturing/includes/manufacturing_ui.inc:356
 msgid "This work order is closed."
 msgstr ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:162
+#: ../manufacturing/includes/work_order_issue_ui.inc:162
 msgid "Return Items to Location"
 msgstr ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:162
+#: ../manufacturing/includes/work_order_issue_ui.inc:162
 msgid "Issue Items to Work order"
 msgstr ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:165
+#: ../manufacturing/includes/work_order_issue_ui.inc:165
 msgid "To Work Centre:"
 msgstr ""
 
-#: manufacturing/includes/work_order_issue_ui.inc:167
+#: ../manufacturing/includes/work_order_issue_ui.inc:167
 msgid "Issue Date:"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_issues_db.inc:81
+#: ../manufacturing/includes/db/work_order_issues_db.inc:81
 msgid "Issue of"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_issues_db.inc:90
+#: ../manufacturing/includes/db/work_order_issues_db.inc:90
 msgid "Issue to"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_issues_db.inc:208
+#: ../manufacturing/includes/db/work_order_issues_db.inc:208
 msgid "Reversed the issue of"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_issues_db.inc:220
+#: ../manufacturing/includes/db/work_order_issues_db.inc:220
 msgid "Reversed the issue to"
 msgstr ""
 
-#: manufacturing/includes/db/work_order_produce_items_db.inc:73
+#: ../manufacturing/includes/db/work_order_produce_items_db.inc:73
 msgid "Production."
 msgstr ""
 
-#: manufacturing/includes/db/work_order_produce_items_db.inc:157
+#: ../manufacturing/includes/db/work_order_produce_items_db.inc:157
 msgid "Reversed the production "
 msgstr ""
 
-#: purchasing/includes/db/po_db.inc:123
-#: sales/includes/db/cust_trans_db.inc:118
-#: sales/includes/db/sales_order_db.inc:261
+#: ../manufacturing/includes/db/work_orders_db.inc:79
+#: ../manufacturing/includes/db/work_orders_db.inc.orig:79
+#: ../purchasing/includes/db/po_db.inc:123
+#: ../sales/includes/db/cust_trans_db.inc:114
+#: ../sales/includes/db/old.sales_order_db.inc:249
+#: ../sales/includes/db/sales_order_db.inc:275
 msgid "Updated."
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:23 sales/view/view_sales_order.php:74
+#: ../manufacturing/includes/db/work_orders_db.inc:100
+#: ../manufacturing/includes/db/work_orders_db.inc.orig:100
+msgid "Canceled."
+msgstr ""
+
+#: ../manufacturing/includes/db/work_orders_db.inc:176
+#: ../manufacturing/includes/db/work_orders_db.inc.orig:176
+msgid "Released."
+msgstr ""
+
+#: ../manufacturing/includes/db/work_orders_db.inc.orig:260
+msgid "Voiding Work Order Trans # "
+msgstr ""
+
+#: ../manufacturing/includes/db/work_orders_quick_db.inc:104
+msgid "Quick production."
+msgstr ""
+
+#: ../manufacturing/includes/db/work_orders_quick_db.inc:184
+msgid "Produced"
+msgstr ""
+
+#: ../purchasing/includes/db/invoice_db.inc.orig:296
+msgid "Supplier invoice adjustment for zero inventory of "
+msgstr ""
+
+#: ../purchasing/includes/db/invoice_db.inc.orig:296
+#: ../reporting/rep106.php:83
+#: ../sales/inquiry/sales_deliveries_view.php:166
+#: ../sales/inquiry/sales_orders_view.php:159
+#: ../sales/inquiry/sales_orders_view.php.orig:159
+msgid "Invoice"
+msgstr ""
+
+#: ../purchasing/includes/db/invoice_db.inc.orig:707
+#: ../purchasing/includes/db/invoice_db.inc.orig:709
+msgid "GRN Removal"
+msgstr ""
+
+#: ../purchasing/includes/ui/grn_ui.inc:23
+#: ../purchasing/includes/ui/grn_ui.inc:55
+#: ../purchasing/includes/ui/po_ui.inc:324
+#: ../sales/view/view_sales_order.php:74
 msgid "Order Currency"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:25
+#: ../purchasing/includes/ui/grn_ui.inc:25
+#: ../purchasing/includes/ui/grn_ui.inc:57
 msgid "For Purchase Order"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:28 sales/view/view_sales_order.php:67
+#: ../purchasing/includes/ui/grn_ui.inc:28
+#: ../purchasing/includes/ui/grn_ui.inc:59
+#: ../sales/view/view_sales_order.php:67
 msgid "Ordered On"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:40 purchasing/includes/ui/grn_ui.inc:54
+#: ../purchasing/includes/ui/grn_ui.inc:33
+#: ../purchasing/includes/ui/grn_ui.inc:69
+#: ../purchasing/includes/ui/po_ui.inc:339
+#: ../purchasing/includes/ui/po_ui.inc:344
 msgid "Deliver Into Location"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:46
-msgid "Date Items Received"
-msgstr ""
-
-#: purchasing/includes/ui/grn_ui.inc:49 purchasing/includes/ui/grn_ui.inc:55
-#: purchasing/view/view_supp_credit.php:44
-#: purchasing/view/view_supp_invoice.php:48
-#: purchasing/inquiry/po_search_completed.php:124
-#: purchasing/inquiry/po_search.php:134
-#: purchasing/inquiry/supplier_inquiry.php:177
-#: reporting/includes/doctext.inc:164 reporting/includes/doctext.inc:187
+#: ../purchasing/includes/ui/grn_ui.inc:34
+#: ../purchasing/includes/ui/grn_ui.inc:79
+#: ../purchasing/includes/ui/po_ui.inc:349
+#: ../purchasing/view/view_supp_credit.php:44
+#: ../purchasing/view/view_supp_invoice.php:48
+#: ../purchasing/inquiry/po_search_completed.php:124
+#: ../purchasing/inquiry/po_search.php:134
+#: ../purchasing/inquiry/supplier_inquiry.php:177
+#: ../reporting/includes/doctext.inc:164
+#: ../reporting/includes/doctext.inc:187
 msgid "Supplier's Reference"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:62 sales/view/view_sales_order.php:92
+#: ../purchasing/includes/ui/grn_ui.inc:38
+#: ../purchasing/includes/ui/grn_ui.inc:81
+#: ../purchasing/includes/ui/po_ui.inc:353
+#: ../sales/view/view_sales_order.php:92
 msgid "Delivery Address"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:65
+#: ../purchasing/includes/ui/grn_ui.inc:41
+#: ../purchasing/includes/ui/grn_ui.inc:84
+#: ../purchasing/includes/ui/po_ui.inc:365
 msgid "Order Comments"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:108
+#: ../purchasing/includes/ui/grn_ui.inc:74
+msgid "Date Items Received"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:123
 msgid "Source Invoices:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:110
+#: ../purchasing/includes/ui/invoice_ui.inc:125
 msgid "Supplier's Ref.:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:125
+#: ../purchasing/includes/ui/invoice_ui.inc:140
 msgid "Terms:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:137
-#: purchasing/manage/suppliers.php:100 purchasing/manage/suppliers.php:105
+#: ../purchasing/includes/ui/invoice_ui.inc:152
+#: ../purchasing/manage/suppliers.php:100
+#: ../purchasing/manage/suppliers.php:105
 msgid "Supplier's Currency:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:141
-#: purchasing/manage/suppliers.php:107 sales/manage/customer_branches.php:247
-#: sales/manage/customers.php:294
+#: ../purchasing/includes/ui/invoice_ui.inc:156
+#: ../purchasing/manage/suppliers.php:107
+#: ../sales/manage/customer_branches.php:247
+#: ../sales/manage/customers.php:297
 msgid "Tax Group:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:159
+#: ../purchasing/includes/ui/invoice_ui.inc:174
 msgid "Sub-total:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:167
+#: ../purchasing/includes/ui/invoice_ui.inc:182
 msgid "Invoice Total:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:170
-#: sales/customer_credit_invoice.php:330
-#: sales/includes/ui/sales_credit_ui.inc:233
+#: ../purchasing/includes/ui/invoice_ui.inc: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:175 purchasing/po_entry_items.php:559
+#: ../purchasing/includes/ui/invoice_ui.inc:190
+#: ../purchasing/includes/ui/po_ui.inc:485
+#: ../purchasing/po_entry_items.php:562
 msgid "Tax algorithm:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:207
+#: ../purchasing/includes/ui/invoice_ui.inc:222
 msgid "Add GL Line"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:208
+#: ../purchasing/includes/ui/invoice_ui.inc:223
 msgid "Reset"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:209
-#: purchasing/po_receive_items.php:332
+#: ../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:227
+#: ../purchasing/includes/ui/invoice_ui.inc:242
 msgid "GL Items for this Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:229
+#: ../purchasing/includes/ui/invoice_ui.inc:244
 msgid "GL Items for this Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:239
+#: ../purchasing/includes/ui/invoice_ui.inc:254
 msgid "Quick Entry:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:412
+#: ../purchasing/includes/ui/invoice_ui.inc:427
 msgid "Add to Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:414
+#: ../purchasing/includes/ui/invoice_ui.inc:429
 msgid "Add to Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:416 sales/customer_invoice.php:603
+#: ../purchasing/includes/ui/invoice_ui.inc:431
+#: ../sales/customer_invoice.php:603
 msgid "Remove"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:416
-#: purchasing/includes/ui/invoice_ui.inc:451
+#: ../purchasing/includes/ui/invoice_ui.inc: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:418
+#: ../purchasing/includes/ui/invoice_ui.inc:433
 #, php-format
 msgid ""
 "You are about to remove all yet non-invoiced items from delivery line #%d. "
@@ -8654,410 +10284,532 @@ msgid ""
 "continue ?"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:449
+#: ../purchasing/includes/ui/invoice_ui.inc:464
 msgid "Items Received Yet to be Invoiced"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:454
+#: ../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:459
+#: ../purchasing/includes/ui/invoice_ui.inc:474
 msgid "Received Items Charged on this Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:461
+#: ../purchasing/includes/ui/invoice_ui.inc:476
 msgid "Received Items Credited on this Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:471
+#: ../purchasing/includes/ui/invoice_ui.inc:486
 msgid "Received between"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:483
+#: ../purchasing/includes/ui/invoice_ui.inc:498
 msgid "Add All Items"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:492
-#: purchasing/includes/ui/invoice_ui.inc:504 reporting/rep308.php:149
+#: ../purchasing/includes/ui/invoice_ui.inc:507
+#: ../purchasing/includes/ui/invoice_ui.inc:519
+#: ../reporting/rep308.php:149
+#: ../sales/inquiry/sales_orders_view.php:167
+#: ../sales/inquiry/sales_orders_view.php.orig:167
 msgid "Delivery"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:492
+#: ../purchasing/includes/ui/invoice_ui.inc:507
 msgid "Sequence #"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:492
+#: ../purchasing/includes/ui/invoice_ui.inc:507
 msgid "P.O."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:493
+#: ../purchasing/includes/ui/invoice_ui.inc:508
 msgid "Received On"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:493 purchasing/view/view_po.php:46
+#: ../purchasing/includes/ui/invoice_ui.inc:508
+#: ../purchasing/view/view_po.php:46
 msgid "Quantity Received"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:493 purchasing/view/view_grn.php:41
-#: purchasing/view/view_po.php:46
+#: ../purchasing/includes/ui/invoice_ui.inc:508
+#: ../purchasing/view/view_grn.php:41
+#: ../purchasing/view/view_po.php:46
 msgid "Quantity Invoiced"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:494
+#: ../purchasing/includes/ui/invoice_ui.inc:509
 msgid "Qty Yet To Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:494
-#: sales/includes/ui/sales_order_ui.inc:147
+#: ../purchasing/includes/ui/invoice_ui.inc:509
+#: ../purchasing/includes/ui/po_ui.inc:243
+#: ../sales/includes/ui/sales_order_ui.inc:147
 msgid "Price after Tax"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:494
-#: sales/includes/ui/sales_order_ui.inc:147
+#: ../purchasing/includes/ui/invoice_ui.inc:509
+#: ../purchasing/includes/ui/po_ui.inc:243
+#: ../sales/includes/ui/sales_order_ui.inc:147
 msgid "Price before Tax"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:500
+#: ../purchasing/includes/ui/invoice_ui.inc:515
 msgid "Qty Yet To Credit"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:505
+#: ../purchasing/includes/ui/invoice_ui.inc:520
 msgid "Line Value"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:573
+#: ../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:576
+#: ../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:577
+#: ../purchasing/includes/ui/invoice_ui.inc:592
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
-#: purchasing/po_entry_items.php:41
+#: ../purchasing/includes/ui/po_ui.inc:162
+#: ../sales/sales_order_entry.php:722
+msgid "Order Date:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:163
+#: ../sales/sales_order_entry.php:709
+msgid "Delivery Date:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:163
+#: ../sales/sales_order_entry.php:703
+msgid "Invoice Date:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:176
+msgid "Supplier Currency:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:195
+msgid "Due Date:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:197
+msgid "Supplier's Reference:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:198
+msgid "Receive Into:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:223
+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:227
+msgid "Deliver to:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:236
+msgid "Order Items"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:242
+#: ../purchasing/po_receive_items.php:62
+msgid "Received"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:243
+#: ../sales/includes/ui/sales_order_ui.inc:617
+msgid "Required Delivery Date"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:243
+#: ../purchasing/view/view_grn.php:41
+#: ../purchasing/view/view_po.php:46
+msgid "Line Total"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:294
+#: ../purchasing/po_receive_items.php:114
+#: ../reporting/rep109.php:155
+#: ../reporting/rep110.php:159
+#: ../reporting/rep111.php:134
+#: ../reporting/rep113.php:144
+#: ../reporting/rep209.php:162
+#: ../sales/customer_credit_invoice.php:322
+#: ../sales/customer_delivery.php:525
+#: ../sales/customer_invoice.php:647
+#: ../sales/view/view_dispatch.php:146
+#: ../sales/view/view_invoice.php:150
+#: ../sales/includes/ui/sales_credit_ui.inc:217
+#: ../sales/includes/ui/sales_order_ui.inc:236
+msgid "Sub-total"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:303
+#: ../purchasing/po_receive_items.php:122
+#: ../purchasing/view/view_grn.php:79
+#: ../purchasing/view/view_po.php:93
+#: ../sales/customer_delivery.php:532
+#: ../sales/view/view_sales_order.php:262
+#: ../sales/includes/ui/sales_order_ui.inc:243
+msgid "Amount Total"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:304
+#: ../purchasing/allocations/supplier_allocate.php:73
+#: ../sales/allocations/customer_allocate.php:71
+#: ../sales/includes/ui/sales_order_ui.inc:244
+msgid "Refresh"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:359
+#: ../sales/view/view_sales_order.php:83
+msgid "Required Pre-Payment"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:360
+msgid "Pre-Payments Allocated"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:486
+#: ../purchasing/po_entry_items.php:563
+#: ../sales/customer_invoice.php:454
+#: ../sales/includes/ui/sales_order_ui.inc:413
+#: ../sales/includes/ui/sales_order_ui.inc:415
+msgid "Payment:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:486
+#: ../purchasing/po_entry_items.php:563
+msgid "Delayed"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:488
+#: ../sales/includes/ui/sales_order_ui.inc:628
+#: ../sales/includes/ui/sales_order_ui.inc:630
+msgid "Pre-Payment Required:"
+msgstr ""
+
+#: ../purchasing/po_entry_items.php:41
 msgid "Modify Purchase Order #"
 msgstr ""
 
-#: purchasing/po_entry_items.php:46
+#: ../purchasing/po_entry_items.php:46
 msgid "Purchase Order Entry"
 msgstr ""
 
-#: purchasing/po_entry_items.php:51
+#: ../purchasing/po_entry_items.php:51
 msgid "Direct GRN Entry"
 msgstr ""
 
-#: purchasing/po_entry_items.php:56
+#: ../purchasing/po_entry_items.php:56
 msgid "Direct Purchase Invoice Entry"
 msgstr ""
 
-#: purchasing/po_entry_items.php:80
+#: ../purchasing/po_entry_items.php:80
 msgid "Purchase Order has been entered"
 msgstr ""
 
-#: purchasing/po_entry_items.php:82
+#: ../purchasing/po_entry_items.php:82
 msgid "Purchase Order has been updated"
 msgstr ""
 
-#: purchasing/po_entry_items.php:83
+#: ../purchasing/po_entry_items.php:83
 msgid "&View this order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:85 sales/sales_order_entry.php:119
-#: sales/sales_order_entry.php:139
+#: ../purchasing/po_entry_items.php:85
+#: ../sales/sales_order_entry.php:119
+#: ../sales/sales_order_entry.php:139
 msgid "&Print This Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:87 sales/sales_order_entry.php:120
-#: sales/sales_order_entry.php:140
+#: ../purchasing/po_entry_items.php:87
+#: ../sales/sales_order_entry.php:120
+#: ../sales/sales_order_entry.php:140
 msgid "&Email This Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:89
+#: ../purchasing/po_entry_items.php:89
 msgid "&Receive Items on this Purchase Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:91
+#: ../purchasing/po_entry_items.php:91
 msgid "Enter &Another Purchase Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:93
+#: ../purchasing/po_entry_items.php:93
 msgid "Select An &Outstanding Purchase Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:102
+#: ../purchasing/po_entry_items.php:102
 msgid "Direct GRN has been entered"
 msgstr ""
 
-#: purchasing/po_entry_items.php:104
+#: ../purchasing/po_entry_items.php:104
 msgid "&View this GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:108 purchasing/po_receive_items.php:40
+#: ../purchasing/po_entry_items.php:108
+#: ../purchasing/po_receive_items.php:40
 msgid "View the GL Journal Entries for this Delivery"
 msgstr ""
 
-#: purchasing/po_entry_items.php:113 purchasing/po_receive_items.php:42
+#: ../purchasing/po_entry_items.php:113
+#: ../purchasing/po_receive_items.php:42
 msgid "Entry purchase &invoice for this receival"
 msgstr ""
 
-#: purchasing/po_entry_items.php:118
+#: ../purchasing/po_entry_items.php:118
 msgid "Enter &Another GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:127
+#: ../purchasing/po_entry_items.php:127
 msgid "Direct Purchase Invoice has been entered"
 msgstr ""
 
-#: purchasing/po_entry_items.php:129
+#: ../purchasing/po_entry_items.php:129
 msgid "&View this Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:134 purchasing/supplier_invoice.php:69
+#: ../purchasing/po_entry_items.php:134
+#: ../purchasing/supplier_invoice.php:69
 msgid "View the GL Journal Entries for this Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:136 purchasing/supplier_invoice.php:71
+#: ../purchasing/po_entry_items.php:136
+#: ../purchasing/supplier_invoice.php:71
 msgid "Entry supplier &payment for this invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:142
+#: ../purchasing/po_entry_items.php:142
 msgid "Enter &Another Direct Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:174
+#: ../purchasing/po_entry_items.php:174
 msgid ""
 "This item cannot be deleted because some of it has already been received."
 msgstr ""
 
-#: purchasing/po_entry_items.php:189
+#: ../purchasing/po_entry_items.php:189
 msgid ""
 "This order cannot be cancelled because some of it has already been received."
 msgstr ""
 
-#: purchasing/po_entry_items.php:190
+#: ../purchasing/po_entry_items.php:190
 msgid ""
 "The line item quantities may be modified to quantities more than already "
 "received. prices cannot be altered for lines that have already been received "
 "and quantities cannot be reduced below the quantity already received."
 msgstr ""
 
-#: purchasing/po_entry_items.php:205
+#: ../purchasing/po_entry_items.php:205
 msgid "This purchase order has been cancelled."
 msgstr ""
 
-#: purchasing/po_entry_items.php:207
+#: ../purchasing/po_entry_items.php:207
 msgid "Enter a new purchase order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:219 sales/sales_order_entry.php:502
+#: ../purchasing/po_entry_items.php:219
+#: ../sales/sales_order_entry.php:503
 msgid "Item description cannot be empty."
 msgstr ""
 
-#: purchasing/po_entry_items.php:229
+#: ../purchasing/po_entry_items.php:229
 msgid "The quantity of the order item must be numeric and not less than "
 msgstr ""
 
-#: purchasing/po_entry_items.php:236
+#: ../purchasing/po_entry_items.php:236
 msgid "The price entered must be numeric and not less than zero."
 msgstr ""
 
-#: purchasing/po_entry_items.php:260
+#: ../purchasing/po_entry_items.php:260
 msgid ""
 "You are attempting to make the quantity ordered a quantity less than has "
 "already been invoiced or received.  This is prohibited."
 msgstr ""
 
-#: purchasing/po_entry_items.php:261
+#: ../purchasing/po_entry_items.php:261
 msgid ""
 "The quantity received can only be modified by entering a negative receipt "
 "and the quantity invoiced can only be reduced by entering a credit note "
 "against this item."
 msgstr ""
 
-#: purchasing/po_entry_items.php:289
+#: ../purchasing/po_entry_items.php:289
 msgid "The selected item is already on this order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:316
+#: ../purchasing/po_entry_items.php:316
 msgid ""
 "The selected item does not exist or it is a kit part and therefore cannot be "
 "purchased."
 msgstr ""
 
-#: purchasing/po_entry_items.php:332 purchasing/supplier_invoice.php:382
-#: purchasing/supplier_payment.php:114
+#: ../purchasing/po_entry_items.php:332
+#: ../purchasing/supplier_invoice.php:384
+#: ../purchasing/supplier_payment.php.orig:114
 msgid "There is no supplier selected."
 msgstr ""
 
-#: purchasing/po_entry_items.php:339
+#: ../purchasing/po_entry_items.php:339
 msgid "The entered order date is invalid."
 msgstr ""
 
-#: purchasing/po_entry_items.php:352
+#: ../purchasing/po_entry_items.php:352
 msgid "The entered due date is invalid."
 msgstr ""
 
-#: purchasing/po_entry_items.php:361
+#: ../purchasing/po_entry_items.php:361
 msgid "There is no reference entered for this purchase order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:376 purchasing/supplier_invoice.php:186
+#: ../purchasing/po_entry_items.php:376
+#: ../purchasing/supplier_invoice.php:186
 msgid "You must enter a supplier's invoice reference."
 msgstr ""
 
-#: purchasing/po_entry_items.php:383 purchasing/supplier_invoice.php:212
+#: ../purchasing/po_entry_items.php:383
+#: ../purchasing/supplier_invoice.php:212
 msgid ""
 "This invoice number has already been entered. It cannot be entered again."
 msgstr ""
 
-#: purchasing/po_entry_items.php:389
+#: ../purchasing/po_entry_items.php:389
 msgid "There is no delivery address specified."
 msgstr ""
 
-#: purchasing/po_entry_items.php:395
+#: ../purchasing/po_entry_items.php:395
 msgid "There is no location specified to move any items into."
 msgstr ""
 
-#: purchasing/po_entry_items.php:403
+#: ../purchasing/po_entry_items.php:403
 msgid ""
 "The order cannot be placed because there are no lines entered on this order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:408
+#: ../purchasing/po_entry_items.php:408
 msgid "Required prepayment is greater than total invoice value."
 msgstr ""
 
-#: purchasing/po_entry_items.php:497
+#: ../purchasing/po_entry_items.php:500
 msgid "Payment for:"
 msgstr ""
 
-#: purchasing/po_entry_items.php:560 sales/customer_invoice.php:454
-#: sales/includes/ui/sales_order_ui.inc:414
-#: sales/includes/ui/sales_order_ui.inc:416
-msgid "Payment:"
+#: ../purchasing/po_entry_items.php:571
+#: ../sales/sales_order_entry.php:726
+msgid "Place Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:560
-msgid "Delayed"
+#: ../purchasing/po_entry_items.php:572
+msgid "Update Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:568 sales/sales_order_entry.php:725
-msgid "Place Order"
-msgstr ""
-
-#: purchasing/po_entry_items.php:569
-msgid "Update Order"
-msgstr ""
-
-#: purchasing/po_entry_items.php:570 sales/sales_order_entry.php:724
+#: ../purchasing/po_entry_items.php:573
+#: ../sales/sales_order_entry.php:725
 msgid "Cancel Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:572
+#: ../purchasing/po_entry_items.php:575
 msgid "Process GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:573
+#: ../purchasing/po_entry_items.php:576
 msgid "Update GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:574
+#: ../purchasing/po_entry_items.php:577
 msgid "Cancel GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:577 sales/customer_invoice.php:686
+#: ../purchasing/po_entry_items.php:580
+#: ../sales/customer_invoice.php:686
 msgid "Process Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:578
+#: ../purchasing/po_entry_items.php:581
 msgid "Update Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:579 sales/sales_order_entry.php:705
+#: ../purchasing/po_entry_items.php:582
+#: ../sales/sales_order_entry.php:706
 msgid "Cancel Invoice"
 msgstr ""
 
-#: purchasing/po_receive_items.php:25
+#: ../purchasing/po_receive_items.php:25
 msgid "Receive Purchase Order Items"
 msgstr ""
 
-#: purchasing/po_receive_items.php:34
+#: ../purchasing/po_receive_items.php:34
 msgid "Purchase Order Delivery has been processed"
 msgstr ""
 
-#: purchasing/po_receive_items.php:36
+#: ../purchasing/po_receive_items.php:36
 msgid "&View this Delivery"
 msgstr ""
 
-#: purchasing/po_receive_items.php:44
+#: ../purchasing/po_receive_items.php:44
 msgid "Select a different &purchase order for receiving items against"
 msgstr ""
 
-#: purchasing/po_receive_items.php:53
+#: ../purchasing/po_receive_items.php:53
 msgid ""
 "This page can only be opened if a purchase order has been selected. Please "
 "select a purchase order first."
 msgstr ""
 
-#: purchasing/po_receive_items.php:62 reporting/rep105.php:114
-#: sales/customer_delivery.php:446
+#: ../purchasing/po_receive_items.php:62
+#: ../reporting/rep105.php:114
+#: ../sales/customer_delivery.php:446
 msgid "Ordered"
 msgstr ""
 
-#: purchasing/po_receive_items.php:62
-msgid "Received"
-msgstr ""
-
-#: purchasing/po_receive_items.php:63 reporting/rep105.php:115
-#: reporting/rep105.php:166 reporting/includes/doctext.inc:247
+#: ../purchasing/po_receive_items.php:63
+#: ../reporting/rep101.php:148
+#: ../reporting/rep105.php:115
+#: ../reporting/rep105.php:166
+#: ../reporting/rep201.php:136
+#: ../reporting/includes/doctext.inc:247
 msgid "Outstanding"
 msgstr ""
 
-#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:447
+#: ../purchasing/po_receive_items.php:63
+#: ../sales/customer_delivery.php:447
 msgid "This Delivery"
 msgstr ""
 
-#: purchasing/po_receive_items.php:114 reporting/rep209.php:162
-#: sales/customer_credit_invoice.php:322 sales/customer_delivery.php:523
-#: sales/customer_invoice.php:647 sales/view/view_dispatch.php:146
-#: sales/view/view_invoice.php:150 sales/includes/ui/sales_credit_ui.inc:217
-#: sales/includes/ui/sales_order_ui.inc:236
-msgid "Sub-total"
-msgstr ""
-
-#: purchasing/po_receive_items.php:122 purchasing/view/view_grn.php:79
-#: purchasing/view/view_po.php:93 sales/customer_delivery.php:530
-#: sales/view/view_sales_order.php:262
-#: sales/includes/ui/sales_order_ui.inc:243
-msgid "Amount Total"
-msgstr ""
-
-#: purchasing/po_receive_items.php:168 purchasing/po_receive_items.php:222
+#: ../purchasing/po_receive_items.php:168
+#: ../purchasing/po_receive_items.php:222
 msgid ""
 "There is nothing to process. Please enter valid quantities greater than zero."
 msgstr ""
 
-#: purchasing/po_receive_items.php:227
+#: ../purchasing/po_receive_items.php:227
 msgid ""
 "Entered quantities cannot be greater than the quantity entered on the "
 "purchase order including the allowed over-receive percentage"
 msgstr ""
 
-#: purchasing/po_receive_items.php:229
+#: ../purchasing/po_receive_items.php:229
 msgid ""
 "Modify the ordered items on the purchase order if you wish to increase the "
 "quantities."
 msgstr ""
 
-#: purchasing/po_receive_items.php:247
+#: ../purchasing/po_receive_items.php:247
 msgid ""
 "This order has been changed or invoiced since this delivery was started to "
 "be actioned. Processing halted. To enter a delivery against this purchase "
@@ -9065,163 +10817,162 @@ msgid ""
 "by the other user."
 msgstr ""
 
-#: purchasing/po_receive_items.php:250
+#: ../purchasing/po_receive_items.php:250
 msgid "Select a different purchase order for receiving goods against"
 msgstr ""
 
-#: purchasing/po_receive_items.php:253
+#: ../purchasing/po_receive_items.php:253
 msgid "Re-Read the updated purchase order for receiving goods against"
 msgstr ""
 
-#: purchasing/po_receive_items.php:327
+#: ../purchasing/po_receive_items.php:328
 msgid "Items to Receive"
 msgstr ""
 
-#: purchasing/po_receive_items.php:332
+#: ../purchasing/po_receive_items.php:333
 msgid "Process Receive Items"
 msgstr ""
 
-#: purchasing/supplier_credit.php:63
-#, php-format
-msgid "Modifying Supplier Credit # %d"
-msgstr ""
-
-#: purchasing/supplier_credit.php:78
+#: ../purchasing/supplier_credit.php:77
 msgid "Supplier credit note has been processed."
 msgstr ""
 
-#: purchasing/supplier_credit.php:79
+#: ../purchasing/supplier_credit.php:78
 msgid "View this Credit Note"
 msgstr ""
 
-#: purchasing/supplier_credit.php:81
+#: ../purchasing/supplier_credit.php:80
 msgid "View the GL Journal Entries for this Credit Note"
 msgstr ""
 
-#: purchasing/supplier_credit.php:83
+#: ../purchasing/supplier_credit.php:82
 msgid "Enter Another Credit Note"
 msgstr ""
 
-#: purchasing/supplier_credit.php:119 purchasing/supplier_invoice.php:127
+#: ../purchasing/supplier_credit.php:118
+#: ../purchasing/supplier_invoice.php:127
 msgid ""
 "The account code entered is not a valid code, this line cannot be added to "
 "the transaction."
 msgstr ""
 
-#: purchasing/supplier_credit.php:129 purchasing/supplier_invoice.php:137
+#: ../purchasing/supplier_credit.php:128
+#: ../purchasing/supplier_invoice.php:137
 msgid ""
 "The amount entered is not numeric. This line cannot be added to the "
 "transaction."
 msgstr ""
 
-#: purchasing/supplier_credit.php:159
+#: ../purchasing/supplier_credit.php:158
 msgid ""
 "The credit note cannot be processed because the there are no items or values "
 "on the invoice.  Credit notes are expected to have a charge."
 msgstr ""
 
-#: purchasing/supplier_credit.php:166
+#: ../purchasing/supplier_credit.php:165
 msgid "You must enter an credit note reference."
 msgstr ""
 
-#: purchasing/supplier_credit.php:180
+#: ../purchasing/supplier_credit.php:179
 msgid "You must enter a supplier's credit note reference."
 msgstr ""
 
-#: purchasing/supplier_credit.php:187
+#: ../purchasing/supplier_credit.php:186
 msgid ""
 "The credit note as entered cannot be processed because the date entered is "
 "not valid."
 msgstr ""
 
-#: purchasing/supplier_credit.php:199 purchasing/supplier_invoice.php:205
+#: ../purchasing/supplier_credit.php:198
+#: ../purchasing/supplier_invoice.php:205
 msgid ""
 "The invoice as entered cannot be processed because the due date is in an "
 "incorrect format."
 msgstr ""
 
-#: purchasing/supplier_credit.php:206
+#: ../purchasing/supplier_credit.php:205
 msgid ""
 "The credit note total as entered is less than the sum of the the general "
 "ledger entires (if any) and the charges for goods received. There must be a "
 "mistake somewhere, the credit note as entered will not be processed."
 msgstr ""
 
-#: purchasing/supplier_credit.php:218
+#: ../purchasing/supplier_credit.php:217
 msgid ""
 "The return cannot be processed because there is an insufficient quantity for "
 "item:"
 msgstr ""
 
-#: purchasing/supplier_credit.php:261
+#: ../purchasing/supplier_credit.php:260
 msgid "The quantity to credit must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_credit.php:268
+#: ../purchasing/supplier_credit.php:267
 msgid "The price is either not numeric or negative."
 msgstr ""
 
-#: purchasing/supplier_credit.php:370
+#: ../purchasing/supplier_credit.php:369
 msgid "Enter Credit Note"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:43
+#: ../purchasing/supplier_invoice.php:43
 msgid "Enter Supplier Invoice"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:48
+#: ../purchasing/supplier_invoice.php:48
 #, php-format
 msgid "Modifying Purchase Invoice # %d"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:66
+#: ../purchasing/supplier_invoice.php:66
 msgid "Supplier invoice has been processed."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:67
+#: ../purchasing/supplier_invoice.php:67
 msgid "View this Invoice"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:73
+#: ../purchasing/supplier_invoice.php:73
 msgid "Enter Another Invoice"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:166
+#: ../purchasing/supplier_invoice.php:166
 msgid ""
 "The invoice cannot be processed because the there are no items or values on "
 "the invoice.  Invoices are expected to have a charge."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:172
+#: ../purchasing/supplier_invoice.php:172
 msgid "You must enter an invoice reference."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:193
+#: ../purchasing/supplier_invoice.php:193
 msgid ""
 "The invoice as entered cannot be processed because the invoice date is in an "
 "incorrect format."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:254
+#: ../purchasing/supplier_invoice.php:254
 msgid "The quantity to invoice must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:261
+#: ../purchasing/supplier_invoice.php:261
 msgid "The price is not numeric."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:274
+#: ../purchasing/supplier_invoice.php:274
 msgid ""
 "The price being invoiced is more than the purchase order price by more than "
 "the allowed over-charge percentage. The system is set up to prohibit this. "
 "See the system administrator to modify the set up parameters if necessary."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:275 purchasing/supplier_invoice.php:288
+#: ../purchasing/supplier_invoice.php:275
+#: ../purchasing/supplier_invoice.php:288
 msgid "The over-charge percentage allowance is :"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:287
+#: ../purchasing/supplier_invoice.php:287
 msgid ""
 "The quantity being invoiced is more than the outstanding quantity by more "
 "than the allowed over-charge percentage. The system is set up to prohibit "
@@ -9229,3448 +10980,4211 @@ msgid ""
 "necessary."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:364
+#: ../purchasing/supplier_invoice.php:366
 #, php-format
 msgid "All yet non-invoiced items on delivery line # %d has been removed."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:406
+#: ../purchasing/supplier_invoice.php:408
 msgid "Enter Invoice"
 msgstr ""
 
-#: purchasing/supplier_payment.php:31
+#: ../purchasing/supplier_payment.php:31
+#: ../purchasing/supplier_payment.php.orig:31
 msgid "Supplier Payment Entry"
 msgstr ""
 
-#: purchasing/supplier_payment.php:85
+#: ../purchasing/supplier_payment.php:92
+#: ../purchasing/supplier_payment.php.orig:85
 msgid "Invalid purchase invoice number."
 msgstr ""
 
-#: purchasing/supplier_payment.php:91
+#: ../purchasing/supplier_payment.php:98
+#: ../purchasing/supplier_payment.php.orig:91
 msgid "Payment has been sucessfully entered"
 msgstr ""
 
-#: purchasing/supplier_payment.php:93
+#: ../purchasing/supplier_payment.php:100
+#: ../purchasing/supplier_payment.php.orig:93
 msgid "&Print This Remittance"
 msgstr ""
 
-#: purchasing/supplier_payment.php:94
+#: ../purchasing/supplier_payment.php:101
+#: ../purchasing/supplier_payment.php.orig:94
 msgid "&Email This Remittance"
 msgstr ""
 
-#: purchasing/supplier_payment.php:96
+#: ../purchasing/supplier_payment.php:103
+msgid "View this Payment"
+msgstr ""
+
+#: ../purchasing/supplier_payment.php:104
+#: ../purchasing/supplier_payment.php.orig:96
 msgid "View the GL &Journal Entries for this Payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:98
+#: ../purchasing/supplier_payment.php.orig:98
 msgid "Select Another &Supplier Transaction for Payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:101
+#: ../purchasing/supplier_payment.php.orig:101
 msgid "Enter Another Supplier &Payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:148 sales/customer_payments.php:198
+#: ../purchasing/supplier_payment.php.orig:148
+#: ../sales/customer_payments.php.orig:198
 msgid "The exchange rate must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_payment.php:160
+#: ../purchasing/supplier_payment.php.orig:160
 msgid "The entered discount is invalid or less than zero."
 msgstr ""
 
-#: purchasing/supplier_payment.php:168
+#: ../purchasing/supplier_payment.php.orig:168
 msgid ""
 "The total of the amount and the discount is zero or negative. Please enter "
 "positive values."
 msgstr ""
 
-#: purchasing/supplier_payment.php:275
+#: ../purchasing/supplier_payment.php.orig:275
 msgid "Payment To:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:288
+#: ../purchasing/supplier_payment.php.orig:288
 msgid "From Bank Account:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:296
-#: purchasing/view/view_supp_payment.php:55
+#: ../purchasing/supplier_payment.php.orig:296
+#: ../purchasing/view/view_supp_payment.php:55
 msgid "Date Paid"
 msgstr ""
 
-#: purchasing/supplier_payment.php:319
+#: ../purchasing/supplier_payment.php.orig:319
+#: ../sales/customer_payments.php.orig:405
 msgid "Amount of Discount:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:320
+#: ../purchasing/supplier_payment.php.orig:320
 msgid "Amount of Payment:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:326
+#: ../purchasing/supplier_payment.php.orig:326
 msgid "The amount and discount are in the bank account's currency."
 msgstr ""
 
-#: purchasing/supplier_payment.php:329
+#: ../purchasing/supplier_payment.php.orig:329
 msgid "Enter Payment"
 msgstr ""
 
-#: purchasing/view/view_grn.php:21
+#: ../purchasing/view/view_grn.php:21
 msgid "View Purchase Order Delivery"
 msgstr ""
 
-#: purchasing/view/view_grn.php:27
+#: ../purchasing/view/view_grn.php:27
 msgid ""
 "This page must be called with a Purchase Order Delivery number to review."
 msgstr ""
 
-#: purchasing/view/view_grn.php:37 purchasing/view/view_po.php:41
-#: sales/view/view_sales_order.php:216
+#: ../purchasing/view/view_grn.php:37
+#: ../purchasing/view/view_po.php:41
+#: ../sales/view/view_sales_order.php:216
 msgid "Line Details"
 msgstr ""
 
-#: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:77
-#: reporting/includes/doctext.inc:192 reporting/includes/doctext.inc:244
-#: sales/inquiry/sales_deliveries_view.php:186
+#: ../purchasing/view/view_grn.php:40
+#: ../reporting/includes/doctext.inc:77
+#: ../reporting/includes/doctext.inc:192
+#: ../reporting/includes/doctext.inc:244
+#: ../sales/inquiry/sales_deliveries_view.php:186
 msgid "Delivery Date"
 msgstr ""
 
-#: purchasing/view/view_grn.php:41 purchasing/view/view_po.php:46
-msgid "Line Total"
-msgstr ""
-
-#: purchasing/view/view_grn.php:70 purchasing/view/view_po.php:84
-#: purchasing/view/view_supp_credit.php:60
-#: purchasing/view/view_supp_invoice.php:66 sales/view/view_credit.php:136
-#: sales/view/view_sales_order.php:252
+#: ../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 ""
 
-#: purchasing/view/view_grn.php:86
+#: ../purchasing/view/view_grn.php:86
 msgid "This delivery has been voided."
 msgstr ""
 
-#: purchasing/view/view_po.php:22
+#: ../purchasing/view/view_po.php:22
 msgid "View Purchase Order"
 msgstr ""
 
-#: purchasing/view/view_po.php:27
+#: ../purchasing/view/view_po.php:27
 msgid "This page must be called with a purchase order number to review."
 msgstr ""
 
-#: purchasing/view/view_po.php:46
+#: ../purchasing/view/view_po.php:46
 msgid "Requested By"
 msgstr ""
 
-#: purchasing/view/view_po.php:100
-#: purchasing/inquiry/supplier_allocation_inquiry.php:147
-#: purchasing/inquiry/supplier_inquiry.php:197
-#: sales/inquiry/customer_allocation_inquiry.php:164
-#: sales/inquiry/customer_inquiry.php:227
-#: sales/inquiry/sales_deliveries_view.php:206
+#: ../purchasing/view/view_po.php:100
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:148
+#: ../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:206
+#: ../sales/inquiry/sales_orders_view.php.orig:344
 msgid "Marked items are overdue."
 msgstr ""
 
-#: purchasing/view/view_po.php:113 sales/view/view_invoice.php:98
-#: sales/view/view_sales_order.php:51
+#: ../purchasing/view/view_po.php:113
+#: ../sales/view/view_invoice.php:98
+#: ../sales/view/view_sales_order.php:51
 msgid "Deliveries"
 msgstr ""
 
-#: purchasing/view/view_po.php:115
+#: ../purchasing/view/view_po.php:115
 msgid "Delivered On"
 msgstr ""
 
-#: purchasing/view/view_po.php:138 sales/view/view_sales_order.php:53
+#: ../purchasing/view/view_po.php:138
+#: ../sales/view/view_sales_order.php:53
 msgid "Invoices/Credits"
 msgstr ""
 
-#: purchasing/view/view_supp_credit.php:23
+#: ../purchasing/view/view_supp_credit.php:23
 msgid "View Supplier Credit Note"
 msgstr ""
 
-#: purchasing/view/view_supp_credit.php:38
+#: ../purchasing/view/view_supp_credit.php:38
 msgid "SUPPLIER CREDIT NOTE"
 msgstr ""
 
-#: purchasing/view/view_supp_credit.php:47
-#: purchasing/view/view_supp_invoice.php:51 reporting/includes/doctext.inc:141
-#: sales/customer_credit_invoice.php:268 sales/view/view_invoice.php:100
+#: ../purchasing/view/view_supp_credit.php:47
+#: ../purchasing/view/view_supp_invoice.php:51
+#: ../reporting/includes/doctext.inc:141
+#: ../sales/customer_credit_invoice.php:268
+#: ../sales/view/view_invoice.php:100
 msgid "Invoice Date"
 msgstr ""
 
-#: purchasing/view/view_supp_credit.php:66
+#: ../purchasing/view/view_supp_credit.php:66
 msgid "TOTAL CREDIT NOTE"
 msgstr ""
 
-#: purchasing/view/view_supp_credit.php:71 sales/view/view_credit.php:147
+#: ../purchasing/view/view_supp_credit.php:71
+#: ../sales/view/view_credit.php:147
 msgid "This credit note has been voided."
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:24
+#: ../purchasing/view/view_supp_invoice.php:24
 msgid "View Supplier Invoice"
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:41
+#: ../purchasing/view/view_supp_invoice.php:41
 msgid "SUPPLIER INVOICE"
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:73 sales/view/view_invoice.php:166
+#: ../purchasing/view/view_supp_invoice.php:73
+#: ../sales/view/view_invoice.php:166
 msgid "TOTAL INVOICE"
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:77 sales/view/view_invoice.php:170
+#: ../purchasing/view/view_supp_invoice.php:77
+#: ../sales/view/view_invoice.php:170
 msgid "This invoice has been voided."
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:22
+#: ../purchasing/view/view_supp_payment.php:22
 msgid "View Payment to Supplier"
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:47
+#: ../purchasing/view/view_supp_payment.php:47
 msgid "Payment to Supplier"
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:53
+#: ../purchasing/view/view_supp_payment.php:53
 msgid "To Supplier"
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:59 sales/view/view_receipt.php:43
+#: ../purchasing/view/view_supp_payment.php:59
 msgid "Payment Currency"
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:62 sales/customer_delivery.php:447
-#: sales/customer_invoice.php:542 sales/customer_invoice.php:545
-#: sales/view/view_receipt.php:45 sales/view/view_sales_order.php:220
+#: ../purchasing/view/view_supp_payment.php:62
+#: ../reporting/rep112.php:150
+#: ../reporting/rep210.php:159
+#: ../sales/customer_delivery.php:447
+#: ../sales/customer_invoice.php:542
+#: ../sales/customer_invoice.php:545
+#: ../sales/view/view_receipt.php:45
+#: ../sales/view/view_sales_order.php:220
 msgid "Discount"
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:69
+#: ../purchasing/view/view_supp_payment.php:69
 msgid "Supplier's Currency"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:27 sales/manage/customer_branches.php:33
+#: ../purchasing/manage/suppliers.php:27
+#: ../sales/manage/customer_branches.php:33
 msgid ""
 "There are no tax groups defined in the system. At least one tax group is "
 "required before proceeding."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:91
+#: ../purchasing/manage/suppliers.php:91
 msgid "Basic Data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:93
+#: ../purchasing/manage/suppliers.php:93
 msgid "Supplier Name:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:94
+#: ../purchasing/manage/suppliers.php:94
 msgid "Supplier Short Name:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:97
+#: ../purchasing/manage/suppliers.php:97
 msgid "Website:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:108
+#: ../purchasing/manage/suppliers.php:108
 msgid "Our Customer No:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:110
+#: ../purchasing/manage/suppliers.php:110
 msgid "Purchasing"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:111
+#: ../purchasing/manage/suppliers.php:111
 msgid "Bank Name/Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:112 sales/manage/customers.php:264
+#: ../purchasing/manage/suppliers.php:112
+#: ../sales/manage/customers.php:267
 msgid "Credit Limit:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:113 sales/manage/customers.php:266
+#: ../purchasing/manage/suppliers.php:113
+#: ../sales/manage/customers.php:269
 msgid "Payment Terms:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:119 purchasing/manage/suppliers.php:122
+#: ../purchasing/manage/suppliers.php:119
+#: ../purchasing/manage/suppliers.php:122
 msgid "Prices contain tax included:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:124
+#: ../purchasing/manage/suppliers.php:124
 msgid "Tax Calculation Algorithm:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:128 reporting/rep704.php:96
-#: reporting/rep704.php:106 reporting/rep704.php:114
+#: ../purchasing/manage/suppliers.php:128
+#: ../reporting/rep704.php:96
+#: ../reporting/rep704.php:106
+#: ../reporting/rep704.php:114
 msgid "Accounts"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:129
+#: ../purchasing/manage/suppliers.php:129
 msgid "Accounts Payable Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:130
+#: ../purchasing/manage/suppliers.php:130
 msgid "Purchase Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:131
+#: ../purchasing/manage/suppliers.php:131
 msgid "Use Item Inventory/COGS Account"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:134 purchasing/manage/suppliers.php:137
+#: ../purchasing/manage/suppliers.php:134
+#: ../purchasing/manage/suppliers.php:137
 msgid "Contact Data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:140
+#: ../purchasing/manage/suppliers.php:140
 msgid "System default"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:157 sales/manage/customer_branches.php:268
+#: ../purchasing/manage/suppliers.php:157
+#: ../sales/manage/customer_branches.php:268
 msgid "Addresses"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:158 reporting/rep205.php:102
-#: sales/manage/customer_branches.php:269
+#: ../purchasing/manage/suppliers.php:158
+#: ../reporting/rep205.php:102
+#: ../sales/manage/customer_branches.php:269
 msgid "Mailing Address:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:159
+#: ../purchasing/manage/suppliers.php:159
 msgid "Physical Address:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:161
+#: ../purchasing/manage/suppliers.php:161
 msgid "General"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:162 sales/manage/customer_branches.php:271
-#: sales/manage/customers.php:287
+#: ../purchasing/manage/suppliers.php:162
+#: ../sales/manage/customer_branches.php:271
+#: ../sales/manage/customers.php:290
 msgid "General Notes:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:164
+#: ../purchasing/manage/suppliers.php:164
 msgid "Supplier status:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:170
+#: ../purchasing/manage/suppliers.php:170
 msgid "Update Supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:171
+#: ../purchasing/manage/suppliers.php:171
 msgid "Update supplier data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:172
+#: ../purchasing/manage/suppliers.php:172
 msgid "Select this supplier and return to document entry."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:173
+#: ../purchasing/manage/suppliers.php:173
 msgid "Delete Supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:174
+#: ../purchasing/manage/suppliers.php:174
 msgid "Delete supplier data if have been never used"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:178
+#: ../purchasing/manage/suppliers.php:178
 msgid "Add New Supplier Details"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:197
+#: ../purchasing/manage/suppliers.php:197
 msgid "The supplier name must be entered."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:204
+#: ../purchasing/manage/suppliers.php:204
 msgid "The supplier short name must be entered."
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:24
+#: ../purchasing/manage/suppliers.php:224
+msgid "Supplier has been updated."
+msgstr ""
+
+#: ../purchasing/manage/suppliers.php:242
+msgid "A new supplier has been added."
+msgstr ""
+
+#: ../purchasing/manage/suppliers.php:260
+msgid ""
+"Cannot delete this supplier because there are transactions that refer to "
+"this supplier."
+msgstr ""
+
+#: ../purchasing/manage/suppliers.php:268
+msgid ""
+"Cannot delete the supplier record because purchase orders have been created "
+"against this supplier."
+msgstr ""
+
+#: ../purchasing/manage/suppliers.php:289
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:48
+msgid "Select a supplier: "
+msgstr ""
+
+#: ../purchasing/manage/suppliers.php:290
+msgid "New supplier"
+msgstr ""
+
+#: ../purchasing/manage/suppliers.php:309
+#: ../sales/manage/customer_branches.php:325
+#: ../sales/manage/customers.php:348
+msgid "&Contacts"
+msgstr ""
+
+#: ../purchasing/manage/suppliers.php:311
+msgid "Purchase &Orders"
+msgstr ""
+
+#: ../purchasing/inquiry/po_search_completed.php:24
 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
+#: ../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
+#: ../sales/inquiry/sales_orders_view.php.orig:247
 msgid "#:"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:65
+#: ../purchasing/inquiry/po_search_completed.php:65
 msgid "into location:"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:125
-#: purchasing/inquiry/po_search.php:135 reporting/includes/doctext.inc:188
+#: ../purchasing/inquiry/po_search_completed.php:125
+#: ../purchasing/inquiry/po_search.php:135
+#: ../reporting/includes/doctext.inc:188
+#: ../sales/inquiry/sales_orders_view.php.orig:289
 msgid "Order Date"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:127
-#: purchasing/inquiry/po_search.php:137
+#: ../purchasing/inquiry/po_search_completed.php:127
+#: ../purchasing/inquiry/po_search.php:137
+#: ../sales/inquiry/sales_orders_view.php.orig:292
 msgid "Order Total"
 msgstr ""
 
-#: purchasing/inquiry/po_search.php:25
+#: ../purchasing/inquiry/po_search.php:25
 msgid "Search Outstanding Purchase Orders"
 msgstr ""
 
-#: purchasing/inquiry/po_search.php:98
+#: ../purchasing/inquiry/po_search.php:98
 msgid "Receive"
 msgstr ""
 
-#: purchasing/inquiry/po_search.php:148
+#: ../purchasing/inquiry/po_search.php:148
 msgid "Marked orders have overdue items."
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:23
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:23
 msgid "Supplier Allocation Inquiry"
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:48
-msgid "Select a supplier: "
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:55
+#: ../sales/inquiry/customer_allocation_inquiry.php:49
+msgid "show settled:"
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:55
-#: sales/inquiry/customer_allocation_inquiry.php:49
-msgid "show settled:"
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:103
+msgid "Pay"
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:129
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:130
 msgid "Supp Reference"
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:135
-#: reporting/includes/doctext.inc:247
-#: sales/inquiry/customer_allocation_inquiry.php:153
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:136
+#: ../reporting/rep101.php:148
+#: ../reporting/rep201.php:136
+#: ../reporting/includes/doctext.inc:247
+#: ../sales/inquiry/customer_allocation_inquiry.php:154
 msgid "Allocated"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:25
+#: ../purchasing/inquiry/supplier_inquiry.php:25
 msgid "Supplier Inquiry"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:48
+#: ../purchasing/inquiry/supplier_inquiry.php:48
 msgid "Select a supplier:"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:67
-#: purchasing/inquiry/supplier_inquiry.php:68
-#: purchasing/inquiry/supplier_inquiry.php:69 reporting/rep102.php:120
-#: reporting/rep102.php:121 reporting/rep102.php:122 reporting/rep202.php:124
-#: reporting/rep202.php:125 reporting/rep202.php:126 reporting/rep202.php:158
-#: reporting/rep202.php:159 reporting/rep202.php:160 reporting/rep202.php:252
-#: sales/create_recurrent_invoices.php:134
-#: sales/manage/recurrent_invoices.php:102
-#: sales/inquiry/customer_inquiry.php:71 sales/inquiry/customer_inquiry.php:72
-#: sales/inquiry/customer_inquiry.php:73
+#: ../purchasing/inquiry/supplier_inquiry.php:67
+#: ../purchasing/inquiry/supplier_inquiry.php:68
+#: ../purchasing/inquiry/supplier_inquiry.php:69
+#: ../reporting/rep102.php:120
+#: ../reporting/rep102.php:121
+#: ../reporting/rep102.php:122
+#: ../reporting/rep202.php:124
+#: ../reporting/rep202.php:125
+#: ../reporting/rep202.php:126
+#: ../reporting/rep202.php:158
+#: ../reporting/rep202.php:159
+#: ../reporting/rep202.php:160
+#: ../reporting/rep202.php:252
+#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/inquiry/customer_inquiry.php:71
+#: ../sales/inquiry/customer_inquiry.php:72
+#: ../sales/inquiry/customer_inquiry.php:73
 msgid "Days"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:69 reporting/rep102.php:122
-#: reporting/rep202.php:126 reporting/rep202.php:160
-#: sales/inquiry/customer_inquiry.php:73
+#: ../purchasing/inquiry/supplier_inquiry.php:69
+#: ../reporting/rep102.php:122
+#: ../reporting/rep202.php:126
+#: ../reporting/rep202.php:160
+#: ../sales/inquiry/customer_inquiry.php:73
 msgid "Over"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:73
-#: sales/inquiry/customer_inquiry.php:76
+#: ../purchasing/inquiry/supplier_inquiry.php:73
+#: ../sales/inquiry/customer_inquiry.php:76
 msgid "Terms"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:73 reporting/rep102.php:125
-#: reporting/rep202.php:130 reporting/rep202.php:250
-#: sales/inquiry/customer_inquiry.php:76
+#: ../purchasing/inquiry/supplier_inquiry.php:73
+#: ../reporting/rep102.php:125
+#: ../reporting/rep202.php:130
+#: ../reporting/rep202.php:250
+#: ../sales/inquiry/customer_inquiry.php:76
 msgid "Current"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:74 reporting/rep102.php:126
-#: reporting/rep202.php:131 sales/inquiry/customer_inquiry.php:77
+#: ../purchasing/inquiry/supplier_inquiry.php:74
+#: ../reporting/rep102.php:126
+#: ../reporting/rep202.php:131
+#: ../sales/inquiry/customer_inquiry.php:77
 msgid "Total Balance"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:133
-#: sales/inquiry/customer_inquiry.php:162
+#: ../purchasing/inquiry/supplier_inquiry.php:133
+#: ../sales/inquiry/customer_inquiry.php:162
 msgid "Credit This"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:155
+#: ../purchasing/inquiry/supplier_inquiry.php:155
 msgid "Print Remittance"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:29
+#: ../purchasing/allocations/supplier_allocate.php:29
 msgid "Allocate Supplier Payment or Credit Note"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:49
+#: ../purchasing/allocations/supplier_allocate.php:52
 msgid "Allocation of"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:54
-#: sales/allocations/customer_allocate.php:53
+#: ../purchasing/allocations/supplier_allocate.php:58
+#: ../sales/allocations/customer_allocate.php:55
 msgid "Total:"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:63
-#: sales/allocations/customer_allocate.php:62
-#: sales/includes/ui/sales_order_ui.inc:244
-msgid "Refresh"
+#: ../purchasing/allocations/supplier_allocate.php:62
+#: ../sales/allocations/customer_allocate.php:59
+msgid "Total in clearing currency:"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:63
-#: sales/allocations/customer_allocate.php:62
+#: ../purchasing/allocations/supplier_allocate.php:73
+#: ../sales/allocations/customer_allocate.php:71
 msgid "Start again allocation of selected amount"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:64
-#: sales/allocations/customer_allocate.php:63
+#: ../purchasing/allocations/supplier_allocate.php:74
+#: ../sales/allocations/customer_allocate.php:72
 msgid "Process allocations"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:65
-#: purchasing/allocations/supplier_allocate.php:71
-#: sales/allocations/customer_allocate.php:64
-#: sales/allocations/customer_allocate.php:70
+#: ../purchasing/allocations/supplier_allocate.php:75
+#: ../purchasing/allocations/supplier_allocate.php:81
+#: ../sales/allocations/customer_allocate.php:73
+#: ../sales/allocations/customer_allocate.php:79
 msgid "Back to Allocations"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:66
-#: purchasing/allocations/supplier_allocate.php:72
-#: sales/allocations/customer_allocate.php:64
-#: sales/allocations/customer_allocate.php:71
+#: ../purchasing/allocations/supplier_allocate.php:76
+#: ../purchasing/allocations/supplier_allocate.php:82
+#: ../sales/allocations/customer_allocate.php:73
+#: ../sales/allocations/customer_allocate.php:80
 msgid "Abandon allocations and return to selection of allocatable amounts"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:70
-#: sales/allocations/customer_allocate.php:68
+#: ../purchasing/allocations/supplier_allocate.php:80
+#: ../sales/allocations/customer_allocate.php:77
 msgid "There are no unsettled transactions to allocate."
 msgstr ""
 
-#: purchasing/allocations/supplier_allocation_main.php:26
+#: ../purchasing/allocations/supplier_allocation_main.php:26
 msgid "Supplier Allocations"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocation_main.php:36
+#: ../purchasing/allocations/supplier_allocation_main.php:36
 msgid "Select a Supplier: "
 msgstr ""
 
-#: purchasing/allocations/supplier_allocation_main.php:39
-#: sales/allocations/customer_allocation_main.php:35
+#: ../purchasing/allocations/supplier_allocation_main.php:39
+#: ../sales/allocations/customer_allocation_main.php:35
 msgid "Show Settled Items:"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocation_main.php:70
-#: sales/allocations/customer_allocation_main.php:74
+#: ../purchasing/allocations/supplier_allocation_main.php:70
+#: ../sales/allocations/customer_allocation_main.php:74
 msgid "Allocate"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocation_main.php:111
-#: sales/allocations/customer_allocation_main.php:110
+#: ../purchasing/allocations/supplier_allocation_main.php:111
+#: ../sales/allocations/customer_allocation_main.php:110
 msgid "Marked items are settled."
 msgstr ""
 
-#: reporting/rep102.php:102 reporting/rep106.php:93 reporting/rep202.php:106
-#: reporting/rep709.php:95 reporting/reports_main.php:48
-#: reporting/reports_main.php:91
-msgid "Summary Only"
+#: ../reporting/rep101.php:137
+#: ../reporting/rep102.php:108
+#: ../reporting/rep114.php:108
+#: ../reporting/rep202.php:112
+#: ../reporting/rep203.php:83
+msgid "Balances in Home Currency"
 msgstr ""
 
-#: reporting/rep102.php:104 reporting/rep202.php:108 reporting/rep709.php:97
-msgid "Detailed Report"
+#: ../reporting/rep101.php:147
+#: ../reporting/rep201.php:135
+#: ../reporting/rep203.php:93
+#: ../reporting/rep709.php:111
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+#: ../reporting/includes/doctext.inc:246
+msgid "Trans Type"
 msgstr ""
 
-#: reporting/rep102.php:108 reporting/rep202.php:112 reporting/rep203.php:83
-msgid "Balances in Home Currency"
+#: ../reporting/rep101.php:147
+#: ../reporting/rep201.php:135
+#: ../reporting/includes/doctext.inc:246
+msgid "Charges"
+msgstr ""
+
+#: ../reporting/rep101.php:147
+#: ../reporting/rep201.php:136
+#: ../reporting/includes/doctext.inc:247
+msgid "Credits"
+msgstr ""
+
+#: ../reporting/rep101.php:158
+#: ../reporting/rep102.php:136
+#: ../reporting/rep201.php:146
+#: ../reporting/rep202.php:141
+#: ../reporting/rep203.php:102
+#: ../reporting/rep303.php:136
+#: ../reporting/reports_main.php:39
+#: ../reporting/reports_main.php:49
+#: ../reporting/reports_main.php:156
+#: ../reporting/reports_main.php:166
+#: ../reporting/reports_main.php:175
+#: ../reporting/reports_main.php:227
+msgid "Suppress Zeros"
+msgstr ""
+
+#: ../reporting/rep101.php:160
+msgid "Customer Balances"
+msgstr ""
+
+#: ../reporting/rep102.php:102
+#: ../reporting/rep106.php:93
+#: ../reporting/rep202.php:106
+#: ../reporting/rep709.php:95
+#: ../reporting/reports_main.php:48
+#: ../reporting/reports_main.php:91
+#: ../reporting/reports_main.php:165
+#: ../reporting/reports_main.php:211
+msgid "Summary Only"
 msgstr ""
 
-#: reporting/rep102.php:131 reporting/rep202.php:136 reporting/rep203.php:99
-#: reporting/rep301.php:110 reporting/reports_main.php:35
-#: reporting/reports_main.php:44 reporting/reports_main.php:65
-#: reporting/reports_main.php:81 reporting/reports_main.php:90
+#: ../reporting/rep102.php:104
+#: ../reporting/rep202.php:108
+#: ../reporting/rep709.php:97
+msgid "Detailed Report"
+msgstr ""
+
+#: ../reporting/rep102.php:131
+#: ../reporting/rep202.php:136
+#: ../reporting/rep203.php:99
+#: ../reporting/rep301.php:110
+#: ../reporting/reports_main.php:35
+#: ../reporting/reports_main.php:44
+#: ../reporting/reports_main.php:65
+#: ../reporting/reports_main.php:81
+#: ../reporting/reports_main.php:90
+#: ../reporting/reports_main.php:152
+#: ../reporting/reports_main.php:161
+#: ../reporting/reports_main.php:172
+#: ../reporting/reports_main.php:208
+#: ../reporting/reports_main.php:234
+#: ../reporting/reports_main.php:243
+#: ../reporting/reports_main.php:249
+#: ../reporting/reports_main.php:259
+#: ../reporting/reports_main.php:267
+#: ../reporting/reports_main.php:275
+#: ../reporting/reports_main.php:312
 msgid "End Date"
 msgstr ""
 
-#: reporting/rep102.php:135 reporting/rep202.php:140
-#: reporting/reports_main.php:47
+#: ../reporting/rep102.php:135
+#: ../reporting/rep202.php:140
+#: ../reporting/reports_main.php:47
+#: ../reporting/reports_main.php:123
+#: ../reporting/reports_main.php:164
 msgid "Show Also Allocated"
 msgstr ""
 
-#: reporting/rep102.php:136 reporting/rep202.php:141 reporting/rep203.php:102
-#: reporting/reports_main.php:39 reporting/reports_main.php:49
-msgid "Suppress Zeros"
+#: ../reporting/rep102.php:140
+msgid "Aged Customer Analysis"
 msgstr ""
 
-#: reporting/rep102.php:140
-msgid "Aged Customer Analysis"
+#: ../reporting/rep103.php:134
+msgid "All Areas"
+msgstr ""
+
+#: ../reporting/rep103.php:138
+msgid "All Sales Folk"
+msgstr ""
+
+#: ../reporting/rep103.php:142
+#: ../reporting/rep205.php:89
+msgid "Greater than "
+msgstr ""
+
+#: ../reporting/rep103.php:146
+#: ../reporting/rep205.php:93
+msgid "Less than "
+msgstr ""
+
+#: ../reporting/rep103.php:155
+msgid "Customer Postal Address"
+msgstr ""
+
+#: ../reporting/rep103.php:155
+msgid "Price/Turnover"
+msgstr ""
+
+#: ../reporting/rep103.php:155
+msgid "Branch Contact Information"
+msgstr ""
+
+#: ../reporting/rep103.php:156
+msgid "Branch Delivery Address"
+msgstr ""
+
+#: ../reporting/rep103.php:161
+#: ../reporting/rep205.php:108
+#: ../reporting/reports_main.php:55
+#: ../reporting/reports_main.php:185
+msgid "Activity Since"
+msgstr ""
+
+#: ../reporting/rep103.php:162
+#: ../reporting/reports_main.php:56
+#: ../sales/manage/sales_areas.php:16
+msgid "Sales Areas"
+msgstr ""
+
+#: ../reporting/rep103.php:163
+#: ../reporting/reports_main.php:57
+msgid "Sales Folk"
+msgstr ""
+
+#: ../reporting/rep103.php:164
+#: ../reporting/rep205.php:109
+msgid "Activity"
+msgstr ""
+
+#: ../reporting/rep103.php:166
+msgid "Customer Details Listing"
+msgstr ""
+
+#: ../reporting/rep103.php:197
+msgid "Customers in"
+msgstr ""
+
+#: ../reporting/rep103.php:218
+msgid "Price List"
+msgstr ""
+
+#: ../reporting/rep103.php:246
+#: ../reporting/rep205.php:164
+msgid "Ph"
+msgstr ""
+
+#: ../reporting/rep103.php:261
+#: ../reporting/rep205.php:179
+msgid "Gereral Notes:"
+msgstr ""
+
+#: ../reporting/rep103.php:270
+#: ../reporting/rep205.php:102
+#: ../reporting/rep205.php:188
+msgid "Turnover"
 msgstr ""
 
-#: reporting/rep104.php:111
+#: ../reporting/rep103.php:277
+#: ../reporting/rep106.php:88
+#: ../reporting/rep205.php:195
+#: ../reporting/includes/header2.inc:110
+#: ../sales/manage/sales_people.php:99
+msgid "Email"
+msgstr ""
+
+#: ../reporting/rep104.php:111
 msgid "Category/Items"
 msgstr ""
 
-#: reporting/rep104.php:111 reporting/rep301.php:105 reporting/rep307.php:117
-#: reporting/rep308.php:149
+#: ../reporting/rep104.php:111
+#: ../reporting/rep301.php:105
+#: ../reporting/rep303.php:121
+#: ../reporting/rep303.php:127
+#: ../reporting/rep307.php:117
+#: ../reporting/rep308.php:149
 msgid "UOM"
 msgstr ""
 
-#: reporting/rep104.php:111
+#: ../reporting/rep104.php:111
 msgid "GP %"
 msgstr ""
 
-#: reporting/rep104.php:119 reporting/reports_main.php:75
+#: ../reporting/rep104.php:119
+#: ../reporting/reports_main.php:75
 msgid "Show GP %"
 msgstr ""
 
-#: reporting/rep104.php:126
+#: ../reporting/rep104.php:126
 msgid "Price Listing"
 msgstr ""
 
-#: reporting/rep104.php:195
+#: ../reporting/rep104.php:195
 msgid "Sales Kits"
 msgstr ""
 
-#: reporting/rep105.php:103
+#: ../reporting/rep105.php:103
 msgid "All Orders"
 msgstr ""
 
-#: reporting/rep105.php:105 reporting/reports_main.php:84
+#: ../reporting/rep105.php:105
+#: ../reporting/reports_main.php:84
 msgid "Back Orders Only"
 msgstr ""
 
-#: reporting/rep105.php:109 reporting/rep204.php:84
-#: sales/inquiry/customer_allocation_inquiry.php:146
-#: sales/inquiry/customer_inquiry.php:202
+#: ../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
-#: sales/create_recurrent_invoices.php:134
-#: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:353
-#: sales/customer_invoice.php:447 sales/manage/customers.php:251
-#: sales/manage/customers.php:290 sales/manage/recurrent_invoices.php:102
-#: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:207
-#: sales/inquiry/sales_deliveries_view.php:182
+#: ../reporting/rep105.php:109
+#: ../reporting/rep106.php:83
+#: ../reporting/rep112.php:175
+#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/customer_credit_invoice.php:236
+#: ../sales/customer_delivery.php:353
+#: ../sales/customer_invoice.php:447
+#: ../sales/manage/customers.php:254
+#: ../sales/manage/customers.php:293
+#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/view/view_credit.php:58
+#: ../sales/inquiry/customer_inquiry.php:207
+#: ../sales/inquiry/sales_deliveries_view.php:182
+#: ../sales/inquiry/sales_orders_view.php.orig:287
+#: ../sales/inquiry/sales_orders_view.php.orig:301
 msgid "Branch"
 msgstr ""
 
-#: reporting/rep105.php:109 reporting/rep106.php:83
+#: ../reporting/rep105.php:109
+#: ../reporting/rep106.php:83
 msgid "Customer Ref"
 msgstr ""
 
-#: reporting/rep105.php:110
+#: ../reporting/rep105.php:110
 msgid "Ord Date"
 msgstr ""
 
-#: reporting/rep105.php:110
+#: ../reporting/rep105.php:110
 msgid "Del Date"
 msgstr ""
 
-#: reporting/rep105.php:110 reporting/rep401.php:71
+#: ../reporting/rep105.php:110
+#: ../reporting/rep401.php:71
 msgid "Loc"
 msgstr ""
 
-#: reporting/rep105.php:114 sales/customer_delivery.php:446
-#: sales/customer_invoice.php:544
-msgid "Invoiced"
+#: ../reporting/rep105.php:114
+#: ../sales/customer_delivery.php:446
+#: ../sales/customer_invoice.php:544
+#: ../sales/includes/ui/sales_order_ui.inc:146
+msgid "Delivered"
 msgstr ""
 
-#: reporting/rep105.php:121
+#: ../reporting/rep105.php:121
 msgid "Selection"
 msgstr ""
 
-#: reporting/rep105.php:125
+#: ../reporting/rep105.php:125
 msgid "Order Status Listing"
 msgstr ""
 
-#: reporting/rep106.php:83 sales/inquiry/sales_deliveries_view.php:166
-msgid "Invoice"
-msgstr ""
-
-#: reporting/rep106.php:84
+#: ../reporting/rep106.php:84
 msgid "Inv Date"
 msgstr ""
 
-#: 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: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
 msgid "Provision"
 msgstr ""
 
-#: reporting/rep106.php:88
+#: ../reporting/rep106.php:88
 msgid "Salesman"
 msgstr ""
 
-#: reporting/rep106.php:88 reporting/rep205.php:195
-#: reporting/includes/header2.inc:110 sales/manage/sales_people.php:99
-msgid "Email"
-msgstr ""
-
-#: reporting/rep106.php:89 sales/manage/sales_people.php:99
+#: ../reporting/rep106.php:89
+#: ../sales/manage/sales_people.php:99
 msgid "Break Pt."
 msgstr ""
 
-#: reporting/rep106.php:97
+#: ../reporting/rep106.php:97
 msgid "Salesman Listing"
 msgstr ""
 
-#: reporting/rep106.php:171 reporting/rep202.php:235 reporting/rep203.php:181
-#: reporting/rep204.php:148 reporting/rep301.php:179 reporting/rep304.php:195
-#: reporting/rep305.php:187 reporting/rep306.php:294 reporting/rep309.php:158
+#: ../reporting/rep106.php:171
+#: ../reporting/rep202.php:235
+#: ../reporting/rep203.php:181
+#: ../reporting/rep204.php:148
+#: ../reporting/rep301.php:179
+#: ../reporting/rep304.php:195
+#: ../reporting/rep305.php:188
+#: ../reporting/rep309.php:158
 msgid "Grand Total"
 msgstr ""
 
-#: reporting/rep108.php:85 reporting/includes/doctext.inc:238
-msgid "STATEMENT"
+#: ../reporting/rep107.php:88
+#: ../reporting/includes/doctext.inc:118
+msgid "INVOICE"
 msgstr ""
 
-#: reporting/rep109.php:66 reporting/includes/doctext.inc:65
+#: ../reporting/rep109.php:66
+#: ../reporting/rep109.php:94
+#: ../reporting/rep109.php:99
+#: ../reporting/includes/doctext.inc:65
 msgid "SALES ORDER"
 msgstr ""
 
-#: reporting/rep109.php:68 reporting/includes/doctext.inc:65
+#: ../reporting/rep109.php:68
+#: ../reporting/rep109.php:89
+#: ../reporting/rep109.php:99
+#: ../reporting/includes/doctext.inc:65
 msgid "QUOTE"
 msgstr ""
 
-#: reporting/rep110.php:70
+#: ../reporting/rep109.php:158
+#: ../reporting/rep110.php:162
+#: ../reporting/rep111.php:137
+#: ../reporting/rep113.php:147
+#: ../sales/view/view_credit.php:138
+#: ../sales/view/view_dispatch.php:155
+#: ../sales/view/view_invoice.php:159
+#: ../sales/view/view_sales_order.php:245
+#: ../sales/includes/ui/sales_credit_ui.inc:222
+msgid "Shipping"
+msgstr ""
+
+#: ../reporting/rep109.php:164
+#: ../reporting/rep111.php:143
+msgid "TOTAL ORDER EX VAT"
+msgstr ""
+
+#: ../reporting/rep109.php:210
+#: ../reporting/rep111.php:189
+msgid "TOTAL ORDER VAT INCL."
+msgstr ""
+
+#: ../reporting/rep110.php:70
 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:82
 msgid "PACKING SLIP"
 msgstr ""
 
-#: reporting/rep110.php:88 reporting/includes/doctext.inc:82
+#: ../reporting/rep110.php:88
+#: ../reporting/includes/doctext.inc:82
 msgid "DELIVERY NOTE"
 msgstr ""
 
-#: reporting/rep111.php:60 reporting/includes/doctext.inc:50
+#: ../reporting/rep110.php:206
+msgid "TOTAL DELIVERY INCL. VAT"
+msgstr ""
+
+#: ../reporting/rep111.php:60
+#: ../reporting/includes/doctext.inc:50
 msgid "SALES QUOTATION"
 msgstr ""
 
-#: reporting/rep112.php:82 reporting/includes/doctext.inc:198
+#: ../reporting/rep112.php:83
+#: ../reporting/includes/doctext.inc:198
 msgid "RECEIPT"
 msgstr ""
 
-#: reporting/rep113.php:67 reporting/rep113.php:86
-#: reporting/includes/doctext.inc:103
+#: ../reporting/rep112.php:114
+#: ../reporting/rep210.php:122
+msgid "As advance / full / part / payment towards:"
+msgstr ""
+
+#: ../reporting/rep112.php:155
+msgid "TOTAL RECEIPT"
+msgstr ""
+
+#: ../reporting/rep112.php:166
+msgid "Received / Sign"
+msgstr ""
+
+#: ../reporting/rep112.php:168
+msgid "By Cash / Cheque* / Draft No."
+msgstr ""
+
+#: ../reporting/rep112.php:170
+msgid "Dated"
+msgstr ""
+
+#: ../reporting/rep112.php:173
+msgid "Drawn on Bank"
+msgstr ""
+
+#: ../reporting/rep113.php:67
+#: ../reporting/rep113.php:86
+#: ../reporting/includes/doctext.inc:103
 msgid "CREDIT NOTE"
 msgstr ""
 
-#: reporting/rep114.php:87
+#: ../reporting/rep113.php:191
+#: ../sales/view/view_credit.php:143
+msgid "TOTAL CREDIT"
+msgstr ""
+
+#: ../reporting/rep114.php:87
 msgid "Sales Summary Report"
 msgstr ""
 
-#: reporting/rep114.php:91 reporting/reports_main.php:66
+#: ../reporting/rep114.php:91
+#: ../reporting/reports_main.php:66
 msgid "Tax Id Only"
 msgstr ""
 
-#: reporting/rep114.php:95
+#: ../reporting/rep114.php:95
 msgid "Tax Id"
 msgstr ""
 
-#: reporting/rep114.php:95
+#: ../reporting/rep114.php:95
 msgid "Total ex. Tax"
 msgstr ""
 
-#: reporting/rep114.php:95 reporting/rep709.php:112 taxes/tax_groups.php:171
+#: ../reporting/rep114.php:95
+#: ../reporting/rep709.php:112
+#: ../taxes/tax_groups.php:171
 msgid "Tax"
 msgstr ""
 
-#: reporting/rep202.php:144
-msgid "currency"
+#: ../reporting/rep201.php:125
+msgid "Balances in Home currency"
 msgstr ""
 
-#: reporting/rep202.php:145
-msgid "Aged Supplier Analysis"
+#: ../reporting/rep201.php:148
+msgid "Supplier Balances"
 msgstr ""
 
-#: reporting/rep203.php:93 reporting/rep709.php:111
-#: reporting/includes/doctext.inc:167 reporting/includes/doctext.inc:208
-#: reporting/includes/doctext.inc:246
-msgid "Trans Type"
+#: ../reporting/rep202.php:144
+msgid "currency"
 msgstr ""
 
-#: reporting/rep203.php:104
+#: ../reporting/rep202.php:145
+msgid "Aged Supplier Analysis"
+msgstr ""
+
+#: ../reporting/rep203.php:104
 msgid "Payment Report"
 msgstr ""
 
-#: reporting/rep204.php:84
+#: ../reporting/rep204.php:84
 msgid "Qty Recd"
 msgstr ""
 
-#: reporting/rep204.php:84
+#: ../reporting/rep204.php:84
 msgid "qty Inv"
 msgstr ""
 
-#: reporting/rep204.php:85
+#: ../reporting/rep204.php:85
 msgid "Act Price"
 msgstr ""
 
-#: reporting/rep204.php:92
+#: ../reporting/rep204.php:92
 msgid "Outstanding GRNs Report"
 msgstr ""
 
-#: reporting/rep205.php:89
-msgid "Greater than "
-msgstr ""
-
-#: reporting/rep205.php:93
-msgid "Less than "
-msgstr ""
-
-#: reporting/rep205.php:102 reporting/rep205.php:188
-msgid "Turnover"
-msgstr ""
-
-#: reporting/rep205.php:102
+#: ../reporting/rep205.php:102
 msgid "Contact Information"
 msgstr ""
 
-#: reporting/rep205.php:103
+#: ../reporting/rep205.php:103
 msgid "Physical Address"
 msgstr ""
 
-#: reporting/rep205.php:108 reporting/reports_main.php:55
-msgid "Activity Since"
-msgstr ""
-
-#: reporting/rep205.php:109
-msgid "Activity"
-msgstr ""
-
-#: reporting/rep205.php:111
+#: ../reporting/rep205.php:111
 msgid "Supplier Details Listing"
 msgstr ""
 
-#: reporting/rep205.php:139
+#: ../reporting/rep205.php:139
 msgid "Tax_Id"
 msgstr ""
 
-#: reporting/rep205.php:164
-msgid "Ph"
-msgstr ""
-
-#: reporting/rep205.php:179
-msgid "Gereral Notes:"
-msgstr ""
-
-#: reporting/rep209.php:87 reporting/rep209.php:100
-#: reporting/includes/doctext.inc:171
+#: ../reporting/rep209.php:87
+#: ../reporting/rep209.php:100
+#: ../reporting/includes/doctext.inc:171
 msgid "PURCHASE ORDER"
 msgstr ""
 
-#: reporting/rep209.php:209
+#: ../reporting/rep209.php:209
 msgid "TOTAL PO"
 msgstr ""
 
-#: reporting/rep210.php:83 reporting/rep210.php:105
-#: reporting/includes/doctext.inc:151
+#: ../reporting/rep210.php:84
+#: ../reporting/rep210.php:106
+#: ../reporting/includes/doctext.inc:151
 msgid "REMITTANCE"
 msgstr ""
 
-#: reporting/rep301.php:114
+#: ../reporting/rep210.php:165
+msgid "TOTAL REMITTANCE"
+msgstr ""
+
+#: ../reporting/rep301.php:114
 msgid "Inventory Valuation Report"
 msgstr ""
 
-#: reporting/rep302.php:125
+#: ../reporting/rep302.php:125
 msgid "QOH"
 msgstr ""
 
-#: reporting/rep302.php:125
+#: ../reporting/rep302.php:125
 msgid "Cust Ord"
 msgstr ""
 
-#: reporting/rep302.php:125
+#: ../reporting/rep302.php:125
 msgid "Supp Ord"
 msgstr ""
 
-#: reporting/rep302.php:125
+#: ../reporting/rep302.php:125
 msgid "Sugg Ord"
 msgstr ""
 
-#: reporting/rep302.php:134
+#: ../reporting/rep302.php:134
 msgid "Inventory Planning Report"
 msgstr ""
 
-#: reporting/rep304.php:114 reporting/rep305.php:100 reporting/rep306.php:141
-#: reporting/rep309.php:98
+#: ../reporting/rep303.php:109
+msgid "Shortage"
+msgstr ""
+
+#: ../reporting/rep303.php:121
+#: ../reporting/rep303.php:127
+#: ../reporting/rep305.php:101
+msgid "Stock ID"
+msgstr ""
+
+#: ../reporting/rep303.php:121
+msgid "Check"
+msgstr ""
+
+#: ../reporting/rep303.php:135
+msgid "Only Shortage"
+msgstr ""
+
+#: ../reporting/rep303.php:143
+msgid "Stock Check Sheets"
+msgstr ""
+
+#: ../reporting/rep304.php:114
+#: ../reporting/rep305.php:101
+#: ../reporting/rep306.php:141
+#: ../reporting/rep309.php:98
 msgid "Qty"
 msgstr ""
 
-#: reporting/rep304.php:114 reporting/rep309.php:98
-#: sales/manage/customer_branches.php:241 sales/manage/customers.php:260
+#: ../reporting/rep304.php:114
+#: ../reporting/rep309.php:98
+#: ../sales/manage/customer_branches.php:241
+#: ../sales/manage/customers.php:263
 msgid "Sales"
 msgstr ""
 
-#: reporting/rep304.php:114
+#: ../reporting/rep304.php:114
 msgid "Cost"
 msgstr ""
 
-#: reporting/rep304.php:114
+#: ../reporting/rep304.php:114
 msgid "Contribution"
 msgstr ""
 
-#: reporting/rep304.php:126
+#: ../reporting/rep304.php:126
 msgid "Inventory Sales Report"
 msgstr ""
 
-#: reporting/rep305.php:100
-msgid "Stock ID"
-msgstr ""
-
-#: reporting/rep305.php:100
+#: ../reporting/rep305.php:101
 msgid "PO No"
 msgstr ""
 
-#: reporting/rep305.php:100
+#: ../reporting/rep305.php:101
 msgid "Inv"
 msgstr ""
 
-#: reporting/rep305.php:100
+#: ../reporting/rep305.php:101
 msgid "Inv Price"
 msgstr ""
 
-#: reporting/rep305.php:100
+#: ../reporting/rep305.php:101
 msgid "PO Price"
 msgstr ""
 
-#: reporting/rep305.php:107
+#: ../reporting/rep305.php:108
 msgid "GRN Valuation Report"
 msgstr ""
 
-#: reporting/rep306.php:141 reporting/rep309.php:98
+#: ../reporting/rep306.php:141
+#: ../reporting/rep309.php:98
 msgid "Unit Price"
 msgstr ""
 
-#: reporting/rep306.php:154
+#: ../reporting/rep306.php:154
 msgid "Inventory Purchasing Report"
 msgstr ""
 
-#: reporting/rep307.php:117
+#: ../reporting/rep307.php:117
 msgid "Opening"
 msgstr ""
 
-#: reporting/rep307.php:126
+#: ../reporting/rep307.php:126
 msgid "Inventory Movements"
 msgstr ""
 
-#: reporting/rep308.php:149
+#: ../reporting/rep308.php:149
 msgid "OpeningStock"
 msgstr ""
 
-#: reporting/rep308.php:149
+#: ../reporting/rep308.php:149
 msgid "StockIn"
 msgstr ""
 
-#: reporting/rep308.php:149
+#: ../reporting/rep308.php:149
 msgid "ClosingStock"
 msgstr ""
 
-#: reporting/rep308.php:150
+#: ../reporting/rep308.php:150
 msgid "QTY"
 msgstr ""
 
-#: reporting/rep308.php:150 reporting/rep709.php:112
-#: taxes/item_tax_types.php:185
+#: ../reporting/rep308.php:150
+#: ../reporting/rep709.php:112
+#: ../taxes/item_tax_types.php:185
 msgid "Rate"
 msgstr ""
 
-#: reporting/rep308.php:159
+#: ../reporting/rep308.php:159
 msgid "Costed Inventory Movements"
 msgstr ""
 
-#: reporting/rep309.php:98
+#: ../reporting/rep309.php:98
 msgid "Item/Category"
 msgstr ""
 
-#: reporting/rep309.php:98
+#: ../reporting/rep309.php:98
 msgid "Remark"
 msgstr ""
 
-#: reporting/rep309.php:106
+#: ../reporting/rep309.php:106
 msgid "Item Sales Summary Report"
 msgstr ""
 
-#: reporting/rep309.php:147
+#: ../reporting/rep309.php:147
 msgid "Gift"
 msgstr ""
 
-#: reporting/rep401.php:71
+#: ../reporting/rep401.php:71
 msgid "Wrk Ctr"
 msgstr ""
 
-#: reporting/rep401.php:78
+#: ../reporting/rep401.php:78
 msgid "Bill of Material Listing"
 msgstr ""
 
-#: reporting/rep501.php:87
+#: ../reporting/rep501.php:87
 msgid "YTD"
 msgstr ""
 
-#: reporting/rep501.php:94
+#: ../reporting/rep501.php:94
 msgid "Dimension Summary"
 msgstr ""
 
-#: reporting/rep601.php:86 reporting/rep602.php:87
-#: reporting/includes/doctext.inc:260
+#: ../reporting/rep601.php:86
+#: ../reporting/rep602.php:87
+#: ../reporting/includes/doctext.inc:260
 msgid "Bank Account"
 msgstr ""
 
-#: reporting/rep601.php:151 reporting/rep602.php:151
+#: ../reporting/rep601.php:151
+#: ../reporting/rep602.php:151
 msgid "Total Debit / Credit"
 msgstr ""
 
-#: reporting/rep601.php:168 reporting/rep602.php:167
+#: ../reporting/rep601.php:168
+#: ../reporting/rep602.php:167
 msgid "Net Change"
 msgstr ""
 
-#: reporting/rep602.php:73
+#: ../reporting/rep602.php:73
 msgid "Bank Statement w/Reconcile"
 msgstr ""
 
-#: reporting/rep602.php:81
+#: ../reporting/rep602.php:81
 msgid "Reco Date"
 msgstr ""
 
-#: reporting/rep602.php:81
+#: ../reporting/rep602.php:81
 msgid "Narration"
 msgstr ""
 
-#: reporting/rep602.php:195
+#: ../reporting/rep602.php:195
 msgid "Bank Balance"
 msgstr ""
 
-#: reporting/rep702.php:53
+#: ../reporting/rep702.php:53
 msgid "Type/Account"
 msgstr ""
 
-#: reporting/rep702.php:53
+#: ../reporting/rep702.php:53
 msgid "Date/Dim."
 msgstr ""
 
-#: reporting/rep702.php:54
+#: ../reporting/rep702.php:54
 msgid "Person/Item/Memo"
 msgstr ""
 
-#: reporting/rep702.php:64
+#: ../reporting/rep702.php:64
 msgid "List of Journal Entries"
 msgstr ""
 
-#: reporting/rep704.php:71
+#: ../reporting/rep704.php:71
 msgid "GL Account Transactions"
 msgstr ""
 
-#: reporting/rep705.php:247 reporting/rep705.php:260 reporting/rep705.php:271
+#: ../reporting/rep705.php:247
+#: ../reporting/rep705.php:260
+#: ../reporting/rep705.php:271
 msgid "Year"
 msgstr ""
 
-#: reporting/rep705.php:253 reporting/rep705.php:264 reporting/rep705.php:273
-#: reporting/rep706.php:198 reporting/rep706.php:206 reporting/rep706.php:212
-#: reporting/rep707.php:222 reporting/rep707.php:230 reporting/rep707.php:236
+#: ../reporting/rep705.php:253
+#: ../reporting/rep705.php:264
+#: ../reporting/rep705.php:273
+#: ../reporting/rep706.php:198
+#: ../reporting/rep706.php:206
+#: ../reporting/rep706.php:212
+#: ../reporting/rep707.php:222
+#: ../reporting/rep707.php:230
+#: ../reporting/rep707.php:236
 msgid "Tags"
 msgstr ""
 
-#: reporting/rep705.php:254 reporting/rep705.php:265 reporting/rep705.php:274
+#: ../reporting/rep705.php:254
+#: ../reporting/rep705.php:265
+#: ../reporting/rep705.php:274
 msgid "Amounts in thousands"
 msgstr ""
 
-#: reporting/rep705.php:278
+#: ../reporting/rep705.php:278
 msgid "Annual Expense Breakdown"
 msgstr ""
 
-#: reporting/rep706.php:186
+#: ../reporting/rep706.php:186
 msgid "Close Balance"
 msgstr ""
 
-#: reporting/rep707.php:258
+#: ../reporting/rep707.php:258
 msgid "Profit and Loss Statement"
 msgstr ""
 
-#: reporting/rep709.php:93
+#: ../reporting/rep709.php:93
 msgid "Tax Report"
 msgstr ""
 
-#: reporting/rep709.php:111
+#: ../reporting/rep709.php:111
 msgid "Branch Name"
 msgstr ""
 
-#: reporting/rep709.php:112
+#: ../reporting/rep709.php:112
 msgid "Net"
 msgstr ""
 
-#: reporting/rep710.php:77
+#: ../reporting/rep709.php:183
+msgid "Tax Rate"
+msgstr ""
+
+#: ../reporting/rep709.php:183
+msgid "Net Tax"
+msgstr ""
+
+#: ../reporting/rep710.php:77
 msgid "Time"
 msgstr ""
 
-#: reporting/rep710.php:77
+#: ../reporting/rep710.php:77
 msgid "Trans Date"
 msgstr ""
 
-#: reporting/rep710.php:78
+#: ../reporting/rep710.php:78
 msgid "Action"
 msgstr ""
 
-#: reporting/rep710.php:89
+#: ../reporting/rep710.php:89
 msgid "Audit Trail"
 msgstr ""
 
-#: reporting/reports_main.php:26
+#: ../reporting/rep710.php:111
+msgid "Changed"
+msgstr ""
+
+#: ../reporting/reports_main.php:26
 msgid "Reports and Analysis"
 msgstr ""
 
-#: reporting/reports_main.php:33
+#: ../reporting/reports_main.php:33
 msgid "Customer &Balances"
 msgstr ""
 
-#: reporting/reports_main.php:37
+#: ../reporting/reports_main.php:37
+#: ../reporting/reports_main.php:154
+#: ../reporting/reports_main.php:300
 msgid "Show Balance"
 msgstr ""
 
-#: reporting/reports_main.php:38 reporting/reports_main.php:46
-#: reporting/reports_main.php:71 reporting/reports_main.php:98
+#: ../reporting/reports_main.php:38
+#: ../reporting/reports_main.php:46
+#: ../reporting/reports_main.php:71
+#: ../reporting/reports_main.php:98
+#: ../reporting/reports_main.php:108
+#: ../reporting/reports_main.php:122
+#: ../reporting/reports_main.php:130
+#: ../reporting/reports_main.php:138
+#: ../reporting/reports_main.php:145
+#: ../reporting/reports_main.php:155
+#: ../reporting/reports_main.php:163
+#: ../reporting/reports_main.php:174
+#: ../reporting/reports_main.php:194
+#: ../reporting/reports_main.php:201
 msgid "Currency Filter"
 msgstr ""
 
-#: reporting/reports_main.php:41 reporting/reports_main.php:52
-#: reporting/reports_main.php:61 reporting/reports_main.php:68
-#: reporting/reports_main.php:77 reporting/reports_main.php:86
-#: reporting/reports_main.php:93
+#: ../reporting/reports_main.php:41
+#: ../reporting/reports_main.php:52
+#: ../reporting/reports_main.php:61
+#: ../reporting/reports_main.php:68
+#: ../reporting/reports_main.php:77
+#: ../reporting/reports_main.php:86
+#: ../reporting/reports_main.php:93
+#: ../reporting/reports_main.php:103
+#: ../reporting/reports_main.php:112
+#: ../reporting/reports_main.php:119
+#: ../reporting/reports_main.php:126
+#: ../reporting/reports_main.php:134
+#: ../reporting/reports_main.php:141
+#: ../reporting/reports_main.php:147
+#: ../reporting/reports_main.php:158
+#: ../reporting/reports_main.php:169
+#: ../reporting/reports_main.php:177
+#: ../reporting/reports_main.php:182
+#: ../reporting/reports_main.php:189
+#: ../reporting/reports_main.php:197
+#: ../reporting/reports_main.php:204
+#: ../reporting/reports_main.php:213
+#: ../reporting/reports_main.php:219
+#: ../reporting/reports_main.php:230
+#: ../reporting/reports_main.php:239
+#: ../reporting/reports_main.php:245
+#: ../reporting/reports_main.php:255
+#: ../reporting/reports_main.php:263
+#: ../reporting/reports_main.php:271
+#: ../reporting/reports_main.php:278
+#: ../reporting/reports_main.php:286
+#: ../reporting/reports_main.php:293
+#: ../reporting/reports_main.php:302
+#: ../reporting/reports_main.php:315
 msgid "Orientation"
 msgstr ""
 
-#: reporting/reports_main.php:42 reporting/reports_main.php:53
-#: reporting/reports_main.php:62 reporting/reports_main.php:69
-#: reporting/reports_main.php:78 reporting/reports_main.php:87
-#: reporting/reports_main.php:94
+#: ../reporting/reports_main.php:42
+#: ../reporting/reports_main.php:53
+#: ../reporting/reports_main.php:62
+#: ../reporting/reports_main.php:69
+#: ../reporting/reports_main.php:78
+#: ../reporting/reports_main.php:87
+#: ../reporting/reports_main.php:94
+#: ../reporting/reports_main.php:159
+#: ../reporting/reports_main.php:170
+#: ../reporting/reports_main.php:178
+#: ../reporting/reports_main.php:183
+#: ../reporting/reports_main.php:190
+#: ../reporting/reports_main.php:214
+#: ../reporting/reports_main.php:220
+#: ../reporting/reports_main.php:231
+#: ../reporting/reports_main.php:240
+#: ../reporting/reports_main.php:246
+#: ../reporting/reports_main.php:256
+#: ../reporting/reports_main.php:264
+#: ../reporting/reports_main.php:272
+#: ../reporting/reports_main.php:279
+#: ../reporting/reports_main.php:287
+#: ../reporting/reports_main.php:303
 msgid "Destination"
 msgstr ""
 
-#: reporting/reports_main.php:43
+#: ../reporting/reports_main.php:43
 msgid "&Aged Customer Analysis"
 msgstr ""
 
-#: reporting/reports_main.php:50
+#: ../reporting/reports_main.php:50
+#: ../reporting/reports_main.php:167
 msgid "Graphics"
 msgstr ""
 
-#: reporting/reports_main.php:54
+#: ../reporting/reports_main.php:54
 msgid "Customer &Detail Listing"
 msgstr ""
 
-#: reporting/reports_main.php:56 sales/manage/sales_areas.php:16
-msgid "Sales Areas"
-msgstr ""
-
-#: reporting/reports_main.php:57
-msgid "Sales Folk"
-msgstr ""
-
-#: reporting/reports_main.php:58
+#: ../reporting/reports_main.php:58
+#: ../reporting/reports_main.php:186
 msgid "Activity Greater Than"
 msgstr ""
 
-#: reporting/reports_main.php:59
+#: ../reporting/reports_main.php:59
+#: ../reporting/reports_main.php:187
 msgid "Activity Less Than"
 msgstr ""
 
-#: reporting/reports_main.php:63
+#: ../reporting/reports_main.php:63
 msgid "Sales &Summary Report"
 msgstr ""
 
-#: reporting/reports_main.php:70
+#: ../reporting/reports_main.php:70
 msgid "&Price Listing"
 msgstr ""
 
-#: reporting/reports_main.php:72 reporting/reports_main.php:82
+#: ../reporting/reports_main.php:72
+#: ../reporting/reports_main.php:82
+#: ../reporting/reports_main.php:209
+#: ../reporting/reports_main.php:216
+#: ../reporting/reports_main.php:222
+#: ../reporting/reports_main.php:235
+#: ../reporting/reports_main.php:250
+#: ../reporting/reports_main.php:260
+#: ../reporting/reports_main.php:268
+#: ../reporting/reports_main.php:276
 msgid "Inventory Category"
 msgstr ""
 
-#: reporting/reports_main.php:73 sales/manage/sales_types.php:16
+#: ../reporting/reports_main.php:73
+#: ../sales/manage/sales_types.php:16
 msgid "Sales Types"
 msgstr ""
 
-#: reporting/reports_main.php:74
+#: ../reporting/reports_main.php:74
+#: ../reporting/reports_main.php:224
 msgid "Show Pictures"
 msgstr ""
 
-#: reporting/reports_main.php:79
+#: ../reporting/reports_main.php:79
 msgid "&Order Status Listing"
 msgstr ""
 
-#: reporting/reports_main.php:83
+#: ../reporting/reports_main.php:83
 msgid "Stock Location"
 msgstr ""
 
-#: reporting/reports_main.php:88
+#: ../reporting/reports_main.php:88
 msgid "&Salesman Listing"
 msgstr ""
 
-#: reporting/reports_main.php:95
+#: ../reporting/reports_main.php:95
 msgid "Print &Invoices"
 msgstr ""
 
-#: reporting/reports_main.php:99
+#: ../reporting/reports_main.php:99
+#: ../reporting/reports_main.php:109
+#: ../reporting/reports_main.php:116
 msgid "email Customers"
 msgstr ""
 
-#: reporting/reports_main.php:100
+#: ../reporting/reports_main.php:100
+#: ../reporting/reports_main.php:110
 msgid "Payment Link"
 msgstr ""
 
-#: reporting/includes/doctext.inc:18 reporting/includes/doctext.inc:156
-#: sales/view/view_dispatch.php:51 sales/view/view_invoice.php:53
+#: ../reporting/reports_main.php:105
+msgid "Print &Credit Notes"
+msgstr ""
+
+#: ../reporting/reports_main.php:113
+msgid "Print &Deliveries"
+msgstr ""
+
+#: ../reporting/reports_main.php:117
+msgid "Print as Packing Slip"
+msgstr ""
+
+#: ../reporting/reports_main.php:120
+msgid "Print &Statements"
+msgstr ""
+
+#: ../reporting/reports_main.php:124
+#: ../reporting/reports_main.php:131
+#: ../reporting/reports_main.php:139
+#: ../reporting/reports_main.php:195
+#: ../reporting/reports_main.php:202
+msgid "Email Customers"
+msgstr ""
+
+#: ../reporting/reports_main.php:127
+msgid "&Print Sales Orders"
+msgstr ""
+
+#: ../reporting/reports_main.php:132
+msgid "Print as Quote"
+msgstr ""
+
+#: ../reporting/reports_main.php:135
+msgid "&Print Sales Quotations"
+msgstr ""
+
+#: ../reporting/reports_main.php:142
+msgid "Print Receipts"
+msgstr ""
+
+#: ../reporting/reports_main.php:150
+msgid "Supplier &Balances"
+msgstr ""
+
+#: ../reporting/reports_main.php:160
+msgid "&Aged Supplier Analyses"
+msgstr ""
+
+#: ../reporting/reports_main.php:171
+msgid "&Payment Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:179
+msgid "Outstanding &GRNs Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:184
+msgid "Supplier &Detail Listing"
+msgstr ""
+
+#: ../reporting/reports_main.php:191
+msgid "Print Purchase &Orders"
+msgstr ""
+
+#: ../reporting/reports_main.php:198
+msgid "Print Remi&ttances"
+msgstr ""
+
+#: ../reporting/reports_main.php:207
+msgid "Inventory &Valuation Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:215
+msgid "Inventory &Planning Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:221
+msgid "Stock &Check Sheets"
+msgstr ""
+
+#: ../reporting/reports_main.php:225
+msgid "Inventory Column"
+msgstr ""
+
+#: ../reporting/reports_main.php:226
+msgid "Show Shortage"
+msgstr ""
+
+#: ../reporting/reports_main.php:228
+msgid "Item Like"
+msgstr ""
+
+#: ../reporting/reports_main.php:232
+msgid "Inventory &Sales Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:241
+msgid "&GRN Valuation Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:247
+msgid "Inventory P&urchasing Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:257
+msgid "Inventory &Movement Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:265
+msgid "C&osted Inventory Movement Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:273
+msgid "Item &Sales Summary Report"
+msgstr ""
+
+#: ../reporting/reports_main.php:281
+msgid "Manufacturing"
+msgstr ""
+
+#: ../reporting/reports_main.php:282
+msgid "&Bill of Material Listing"
+msgstr ""
+
+#: ../reporting/reports_main.php:283
+msgid "From product"
+msgstr ""
+
+#: ../reporting/reports_main.php:284
+msgid "To product"
+msgstr ""
+
+#: ../reporting/reports_main.php:288
+msgid "Print &Work Orders"
+msgstr ""
+
+#: ../reporting/reports_main.php:291
+msgid "Email Locations"
+msgstr ""
+
+#: ../reporting/reports_main.php:297
+msgid "Dimension &Summary"
+msgstr ""
+
+#: ../reporting/reports_main.php:298
+msgid "From Dimension"
+msgstr ""
+
+#: ../reporting/reports_main.php:299
+msgid "To Dimension"
+msgstr ""
+
+#: ../reporting/reports_main.php:308
+msgid "Banking"
+msgstr ""
+
+#: ../reporting/reports_main.php:309
+msgid "Bank &Statement"
+msgstr ""
+
+#: ../reporting/reports_main.php:313
+msgid "Zero values"
+msgstr ""
+
+#: ../reporting/includes/doctext.inc:18
+#: ../reporting/includes/doctext.inc:156
+#: ../sales/view/view_dispatch.php:51
+#: ../sales/view/view_invoice.php:53
 msgid "Charge To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:23 sales/view/view_dispatch.php:74
+#: ../reporting/includes/doctext.inc:23
+#: ../sales/view/view_dispatch.php:74
 msgid "Delivered To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:30 sales/customer_credit_invoice.php:281
-#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
-#: sales/view/view_invoice.php:116 sales/includes/ui/sales_credit_ui.inc:168
-#: sales/includes/ui/sales_order_ui.inc:147
+#: ../reporting/includes/doctext.inc:30
+#: ../sales/customer_credit_invoice.php:281
+#: ../sales/view/view_credit.php:91
+#: ../sales/view/view_dispatch.php:113
+#: ../sales/view/view_invoice.php:116
+#: ../sales/includes/ui/sales_credit_ui.inc:168
+#: ../sales/includes/ui/sales_order_ui.inc:147
 msgid "Discount %"
 msgstr ""
 
-#: reporting/includes/doctext.inc:33
+#: ../reporting/includes/doctext.inc:33
 msgid "All amounts stated in"
 msgstr ""
 
-#: reporting/includes/doctext.inc:51
+#: ../reporting/includes/doctext.inc:51
 msgid "Quotation No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:56 reporting/includes/doctext.inc:73
-#: reporting/includes/doctext.inc:94 reporting/includes/doctext.inc:108
-#: reporting/includes/doctext.inc:131 reporting/includes/doctext.inc:161
-#: reporting/includes/doctext.inc:184 reporting/includes/doctext.inc:202
-#: reporting/includes/doctext.inc:240
+#: ../reporting/includes/doctext.inc:56
+#: ../reporting/includes/doctext.inc:73
+#: ../reporting/includes/doctext.inc:94
+#: ../reporting/includes/doctext.inc:108
+#: ../reporting/includes/doctext.inc:131
+#: ../reporting/includes/doctext.inc:161
+#: ../reporting/includes/doctext.inc:184
+#: ../reporting/includes/doctext.inc:202
+#: ../reporting/includes/doctext.inc:240
 msgid "Customer's Reference"
 msgstr ""
 
-#: reporting/includes/doctext.inc:57 reporting/includes/doctext.inc:74
-#: reporting/includes/doctext.inc:95 reporting/includes/doctext.inc:109
-#: reporting/includes/doctext.inc:132 reporting/includes/doctext.inc:185
-#: reporting/includes/doctext.inc:241 sales/manage/customer_branches.php:298
+#: ../reporting/includes/doctext.inc:57
+#: ../reporting/includes/doctext.inc:74
+#: ../reporting/includes/doctext.inc:95
+#: ../reporting/includes/doctext.inc:109
+#: ../reporting/includes/doctext.inc:132
+#: ../reporting/includes/doctext.inc:185
+#: ../reporting/includes/doctext.inc:241
+#: ../sales/manage/customer_branches.php:298
 msgid "Sales Person"
 msgstr ""
 
-#: reporting/includes/doctext.inc:58 reporting/includes/doctext.inc:75
-#: reporting/includes/doctext.inc:96 reporting/includes/doctext.inc:110
-#: reporting/includes/doctext.inc:133 reporting/includes/doctext.inc:163
-#: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:204
-#: reporting/includes/doctext.inc:242
+#: ../reporting/includes/doctext.inc: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:59
 msgid "Our Quotation No"
 msgstr ""
 
-#: reporting/includes/doctext.inc:60 sales/view/view_sales_order.php:69
-#: sales/includes/ui/sales_order_ui.inc:613
+#: ../reporting/includes/doctext.inc:60
+#: ../sales/view/view_sales_order.php:69
+#: ../sales/inquiry/sales_orders_view.php.orig:304
+#: ../sales/includes/ui/sales_order_ui.inc:612
 msgid "Valid until"
 msgstr ""
 
-#: reporting/includes/doctext.inc:65
+#: ../reporting/includes/doctext.inc:65
 msgid "PREPAYMENT ORDER"
 msgstr ""
 
-#: reporting/includes/doctext.inc:66
+#: ../reporting/includes/doctext.inc:66
 msgid "Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:76 reporting/includes/doctext.inc:97
-#: reporting/includes/doctext.inc:111 reporting/includes/doctext.inc:138
-#: reporting/includes/doctext.inc:205 reporting/includes/doctext.inc:243
-#: sales/view/view_dispatch.php:87 sales/view/view_invoice.php:87
+#: ../reporting/includes/doctext.inc:76
+#: ../reporting/includes/doctext.inc:97
+#: ../reporting/includes/doctext.inc:111
+#: ../reporting/includes/doctext.inc:138
+#: ../reporting/includes/doctext.inc:205
+#: ../reporting/includes/doctext.inc:243
+#: ../sales/view/view_dispatch.php:87
+#: ../sales/view/view_invoice.php:87
 msgid "Our Order No"
 msgstr ""
 
-#: reporting/includes/doctext.inc:83
+#: ../reporting/includes/doctext.inc:83
 msgid "Delivery Note No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:98
+#: ../reporting/includes/doctext.inc:98
 msgid "To Be Invoiced Before"
 msgstr ""
 
-#: reporting/includes/doctext.inc:104
+#: ../reporting/includes/doctext.inc:104
 msgid "Credit No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:105
+#: ../reporting/includes/doctext.inc:105
 msgid "Please quote Credit no. when paying. All amounts stated in"
 msgstr ""
 
-#: reporting/includes/doctext.inc:117
+#: ../reporting/includes/doctext.inc:117
 msgid "PREPAYMENT INVOICE"
 msgstr ""
 
-#: reporting/includes/doctext.inc:118
+#: ../reporting/includes/doctext.inc:118
 msgid "FINAL INVOICE"
 msgstr ""
 
-#: reporting/includes/doctext.inc:118
-msgid "INVOICE"
-msgstr ""
-
-#: reporting/includes/doctext.inc:119
+#: ../reporting/includes/doctext.inc:119
 msgid "Invoice No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:121
+#: ../reporting/includes/doctext.inc:121
 msgid "Please quote Invoice no. when paying. All amounts stated in"
 msgstr ""
 
-#: reporting/includes/doctext.inc:137
+#: ../reporting/includes/doctext.inc:137
 msgid "Date of Payment"
 msgstr ""
 
-#: reporting/includes/doctext.inc:143
+#: ../reporting/includes/doctext.inc:143
 msgid "Date of Sale"
 msgstr ""
 
-#: reporting/includes/doctext.inc:152
+#: ../reporting/includes/doctext.inc:152
 msgid "Remittance No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:153 reporting/includes/doctext.inc:173
+#: ../reporting/includes/doctext.inc:153
+#: ../reporting/includes/doctext.inc:173
 msgid "Order To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:172
+#: ../reporting/includes/doctext.inc:172
 msgid "Purchase Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:176
+#: ../reporting/includes/doctext.inc:176
 msgid "Deliver To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:199
+#: ../reporting/includes/doctext.inc:199
 msgid "Receipt No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:200
+#: ../reporting/includes/doctext.inc:200
 msgid "With thanks from"
 msgstr ""
 
-#: reporting/includes/doctext.inc:214
+#: ../reporting/includes/doctext.inc:214
 msgid "WORK ORDER"
 msgstr ""
 
-#: reporting/includes/doctext.inc:215
+#: ../reporting/includes/doctext.inc:215
 msgid "Work Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:246
-msgid "DueDate"
-msgstr ""
-
-#: reporting/includes/doctext.inc:246
-msgid "Charges"
+#: ../reporting/includes/doctext.inc:238
+msgid "STATEMENT"
 msgstr ""
 
-#: reporting/includes/doctext.inc:247
-msgid "Credits"
+#: ../reporting/includes/doctext.inc:246
+msgid "DueDate"
 msgstr ""
 
-#: reporting/includes/doctext.inc:272 reporting/includes/pdf_report.inc:1020
+#: ../reporting/includes/doctext.inc:272
+#: ../reporting/includes/pdf_report.inc:1020
 msgid "You can pay through"
 msgstr ""
 
-#: reporting/includes/doctext.inc:276
+#: ../reporting/includes/doctext.inc:276
 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
 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
 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
 msgid "Fiscal Year"
 msgstr ""
 
-#: reporting/includes/excel_report.inc:396
+#: ../reporting/includes/excel_report.inc:396
 msgid "Report Date"
 msgstr ""
 
-#: reporting/includes/excel_report.inc:413
-#: reporting/includes/pdf_report.inc:601
+#: ../reporting/includes/excel_report.inc:413
+#: ../reporting/includes/pdf_report.inc:601
 msgid "Generated At"
 msgstr ""
 
-#: reporting/includes/excel_report.inc:419
-#: reporting/includes/pdf_report.inc:610
+#: ../reporting/includes/excel_report.inc:419
+#: ../reporting/includes/pdf_report.inc:610
 msgid "Generated By"
 msgstr ""
 
-#: reporting/includes/header2.inc:122
+#: ../reporting/includes/header2.inc:122
 msgid "Our VAT No."
 msgstr ""
 
-#: reporting/includes/header2.inc:128
+#: ../reporting/includes/header2.inc:128
 msgid "Domicile"
 msgstr ""
 
-#: reporting/includes/header2.inc:143 reporting/includes/pdf_report.inc:352
-#: reporting/includes/pdf_report.inc:501 reporting/includes/pdf_report.inc:629
+#: ../reporting/includes/header2.inc:143
+#: ../reporting/includes/pdf_report.inc:352
+#: ../reporting/includes/pdf_report.inc:501
+#: ../reporting/includes/pdf_report.inc:629
 msgid "Page"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:584
+#: ../reporting/includes/pdf_report.inc:584
 msgid "Report Period"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:987
-#: reporting/includes/pdf_report.inc:1035
+#: ../reporting/includes/pdf_report.inc:987
+#: ../reporting/includes/pdf_report.inc:1035
 #, php-format
 msgid "You have no email contact defined for this type of document for '%s'."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1006
+#: ../reporting/includes/pdf_report.inc:1006
 msgid "Dear"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1007
+#: ../reporting/includes/pdf_report.inc:1007
 msgid "Attached you will find "
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1023
+#: ../reporting/includes/pdf_report.inc:1023
 msgid "Kindest regards"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1038
+#: ../reporting/includes/pdf_report.inc:1038
 msgid "Sending document by email failed"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1038
-#: reporting/includes/pdf_report.inc:1041
+#: ../reporting/includes/pdf_report.inc:1038
+#: ../reporting/includes/pdf_report.inc:1041
 msgid "Email:"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1041
+#: ../reporting/includes/pdf_report.inc:1041
 msgid "has been sent by email to destination."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1071
+#: ../reporting/includes/pdf_report.inc:1071
 msgid "Report has been sent to network printer "
 msgstr ""
 
-#: reporting/includes/printer_class.inc:39
+#: ../reporting/includes/printer_class.inc:39
 msgid "Cannot open connection to printer"
 msgstr ""
 
-#: reporting/includes/printer_class.inc:50
+#: ../reporting/includes/printer_class.inc:50
 msgid "Printer does not acept the job"
 msgstr ""
 
-#: reporting/includes/printer_class.inc:61
+#: ../reporting/includes/printer_class.inc:61
 msgid "Error sending print job control file"
 msgstr ""
 
-#: reporting/includes/printer_class.inc:68
+#: ../reporting/includes/printer_class.inc:68
 msgid "Print control file not accepted"
 msgstr ""
 
-#: reporting/includes/printer_class.inc:76
+#: ../reporting/includes/printer_class.inc:76
 msgid "Cannot send report to printer"
 msgstr ""
 
-#: reporting/includes/printer_class.inc:86
+#: ../reporting/includes/printer_class.inc:86
 msgid "No ack after report printout"
 msgstr ""
 
-#: reporting/includes/printer_class.inc:100
+#: ../reporting/includes/printer_class.inc:100
 msgid "Cannot flush printing queue"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:61
+#: ../reporting/includes/reports_classes.inc:61
 msgid "Report Classes:"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:81
+#: ../reporting/includes/reports_classes.inc:81
 msgid "Reports For Class: "
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:101
+#: ../reporting/includes/reports_classes.inc:101
 msgid "Display: "
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:149
+#: ../reporting/includes/reports_classes.inc:149
 msgid "Unknown report parameter type:"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:175
+#: ../reporting/includes/reports_classes.inc:175
 msgid "No Currency Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:231
+#: ../reporting/includes/reports_classes.inc:231
 msgid "PDF/Printer"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:238
+#: ../reporting/includes/reports_classes.inc:238
 msgid "Portrait"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:238
+#: ../reporting/includes/reports_classes.inc:238
 msgid "Landscape"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:249
+#: ../reporting/includes/reports_classes.inc:249
 msgid "No Graphics"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:249
+#: ../reporting/includes/reports_classes.inc:249
 msgid "Vertical bars"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:249
+#: ../reporting/includes/reports_classes.inc:249
 msgid "Horizontal bars"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:250
+#: ../reporting/includes/reports_classes.inc:250
 msgid "Dots"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:250
+#: ../reporting/includes/reports_classes.inc:250
 msgid "Lines"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:250
+#: ../reporting/includes/reports_classes.inc:250
 msgid "Pie"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:250
+#: ../reporting/includes/reports_classes.inc:250
 msgid "Donut"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:254
-#: reporting/includes/reports_classes.inc:257
+#: ../reporting/includes/reports_classes.inc:254
+#: ../reporting/includes/reports_classes.inc:257
 msgid "No Type Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:267
+#: ../reporting/includes/reports_classes.inc:267
 msgid "No Account Group Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:282
-#: reporting/includes/reports_classes.inc:288
-#: reporting/includes/reports_classes.inc:294
+#: ../reporting/includes/reports_classes.inc:282
+#: ../reporting/includes/reports_classes.inc:288
+#: ../reporting/includes/reports_classes.inc:294
 msgid "No Dimension Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:300
+#: ../reporting/includes/reports_classes.inc:300
 msgid "No Customer Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:308
+#: ../reporting/includes/reports_classes.inc:308
 msgid "No Supplier Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:393
+#: ../reporting/includes/reports_classes.inc:393
 msgid "No Location Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:396
+#: ../reporting/includes/reports_classes.inc:396
 msgid "No Category Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:405
+#: ../reporting/includes/reports_classes.inc:405
 msgid "No Sales Folk Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:412
+#: ../reporting/includes/reports_classes.inc:412
 msgid "No Users Filter"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:26
+#: ../sales/create_recurrent_invoices.php:26
 msgid "Create and Print Recurrent Invoices"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:44
+#: ../sales/create_recurrent_invoices.php:44
 #, php-format
 msgid "Recurrent Invoice covers period %s - %s."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:110
+#: ../sales/create_recurrent_invoices.php:110
 #, php-format
 msgid "%s recurrent invoice(s) created, # %s - # %s."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:115
+#: ../sales/create_recurrent_invoices.php:115
 #, php-format
 msgid "&Print Recurrent Invoices # %s - # %s"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:117
+#: ../sales/create_recurrent_invoices.php:117
 #, php-format
 msgid "&Email Recurrent Invoices # %s - # %s"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:129
+#: ../sales/create_recurrent_invoices.php:129
 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
 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
 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
 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
 msgid "Last Created"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:175
+#: ../sales/create_recurrent_invoices.php:175
 msgid "Create Invoices"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:183
+#: ../sales/create_recurrent_invoices.php:183
 msgid "Marked items are due."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:185
+#: ../sales/create_recurrent_invoices.php:185
 msgid "No recurrent invoices are due."
 msgstr ""
 
-#: sales/credit_note_entry.php:40
+#: ../sales/credit_note_entry.php:40
 #, php-format
 msgid "Modifying Customer Credit Note #%d"
 msgstr ""
 
-#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:699
+#: ../sales/credit_note_entry.php:51
+#: ../sales/sales_order_entry.php:700
 msgid ""
 "There are no customers, or there are no customers with branches. Please "
 "define customers and customer branches."
 msgstr ""
 
-#: sales/credit_note_entry.php:66
+#: ../sales/credit_note_entry.php:66
 #, php-format
 msgid "Credit Note # %d has been processed"
 msgstr ""
 
-#: sales/credit_note_entry.php:68
+#: ../sales/credit_note_entry.php:68
 msgid "&View this credit note"
 msgstr ""
 
-#: sales/credit_note_entry.php:70
+#: ../sales/credit_note_entry.php:70
 msgid "&Print This Credit Invoice"
 msgstr ""
 
-#: sales/credit_note_entry.php:71
+#: ../sales/credit_note_entry.php:71
 msgid "&Email This Credit Invoice"
 msgstr ""
 
-#: sales/credit_note_entry.php:73 sales/customer_credit_invoice.php:60
-#: sales/customer_credit_invoice.php:77
+#: ../sales/credit_note_entry.php:73
+#: ../sales/customer_credit_invoice.php:60
+#: ../sales/customer_credit_invoice.php:77
 msgid "View the GL &Journal Entries for this Credit Note"
 msgstr ""
 
-#: sales/credit_note_entry.php:75
+#: ../sales/credit_note_entry.php:75
 msgid "Enter Another &Credit Note"
 msgstr ""
 
-#: sales/credit_note_entry.php:153
+#: ../sales/credit_note_entry.php:153
 msgid "The entered date for the credit note is invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:170
+#: ../sales/credit_note_entry.php:170
 msgid ""
 "For credit notes created to write off the stock, a general ledger account is "
 "required to be selected."
 msgstr ""
 
-#: sales/credit_note_entry.php:171
+#: ../sales/credit_note_entry.php:171
 msgid ""
 "Please select an account to write the cost of the stock off to, then click "
 "on Process again."
 msgstr ""
 
-#: sales/credit_note_entry.php:197
+#: ../sales/credit_note_entry.php:197
 msgid "The quantity must be greater than zero."
 msgstr ""
 
-#: sales/credit_note_entry.php:202
+#: ../sales/credit_note_entry.php:202
 msgid "The entered price is negative or invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:207
+#: ../sales/credit_note_entry.php:207
 msgid "The entered discount percent is negative, greater than 100 or invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:275
+#: ../sales/credit_note_entry.php:275
 msgid "Credit Note Items"
 msgstr ""
 
-#: sales/credit_note_entry.php:285 sales/customer_credit_invoice.php:382
+#: ../sales/credit_note_entry.php:285
+#: ../sales/customer_credit_invoice.php:382
 msgid "Process Credit Note"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:38
+#: ../sales/customer_credit_invoice.php:38
 #, php-format
 msgid "Modifying Credit Invoice # %d."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:42
+#: ../sales/customer_credit_invoice.php:42
 msgid "Credit all or part of an Invoice"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:53
+#: ../sales/customer_credit_invoice.php:53
 msgid "Credit Note has been processed"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:55 sales/customer_credit_invoice.php:72
+#: ../sales/customer_credit_invoice.php:55
+#: ../sales/customer_credit_invoice.php:72
 msgid "&View This Credit Note"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:57 sales/customer_credit_invoice.php:74
+#: ../sales/customer_credit_invoice.php:57
+#: ../sales/customer_credit_invoice.php:74
 msgid "&Print This Credit Note"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:58 sales/customer_credit_invoice.php:75
+#: ../sales/customer_credit_invoice.php:58
+#: ../sales/customer_credit_invoice.php:75
 msgid "&Email This Credit Note"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:70
+#: ../sales/customer_credit_invoice.php:70
 msgid "Credit Note has been updated"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:109
+#: ../sales/customer_credit_invoice.php:109
 msgid "The entered shipping cost is invalid or less than zero."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:114 sales/customer_credit_invoice.php:136
+#: ../sales/customer_credit_invoice.php:114
+#: ../sales/customer_credit_invoice.php:136
 msgid ""
 "Selected quantity cannot be less than zero nor more than quantity not "
 "credited yet."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:134
+#: ../sales/customer_credit_invoice.php:134
 msgid ""
 "This page can only be opened if an invoice has been selected for crediting."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:249
+#: ../sales/customer_credit_invoice.php:249
 msgid "Crediting Invoice"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:270
+#: ../sales/customer_credit_invoice.php:270
 msgid "Credit Note Date"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:280
+#: ../sales/customer_credit_invoice.php:280
 msgid "Invoiced Quantity"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:281
+#: ../sales/customer_credit_invoice.php:281
 msgid "Credit Quantity"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:315
+#: ../sales/customer_credit_invoice.php:315
 msgid "Credit Shipping Cost"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:348
-#: sales/includes/ui/sales_credit_ui.inc:323
+#: ../sales/customer_credit_invoice.php:348
+#: ../sales/includes/ui/sales_credit_ui.inc:323
 msgid "Credit Note Type"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:356
-#: sales/includes/ui/sales_credit_ui.inc:331
+#: ../sales/customer_credit_invoice.php:356
+#: ../sales/includes/ui/sales_credit_ui.inc:331
 msgid "Items Returned to Location"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:361
-#: sales/includes/ui/sales_credit_ui.inc:336
+#: ../sales/customer_credit_invoice.php:361
+#: ../sales/includes/ui/sales_credit_ui.inc:336
 msgid "Write off the cost of the items to"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:380
+#: ../sales/customer_credit_invoice.php:380
 msgid "Update credit value for quantities entered"
 msgstr ""
 
-#: sales/customer_delivery.php:37
+#: ../sales/customer_delivery.php:37
 #, php-format
 msgid "Modifying Delivery Note # %d."
 msgstr ""
 
-#: sales/customer_delivery.php:41
+#: ../sales/customer_delivery.php:41
 msgid "Deliver Items for a Sales Order"
 msgstr ""
 
-#: sales/customer_delivery.php:50 sales/sales_order_entry.php:189
+#: ../sales/customer_delivery.php:50
+#: ../sales/sales_order_entry.php:189
 #, php-format
 msgid "Delivery # %d has been entered."
 msgstr ""
 
-#: sales/customer_delivery.php:52 sales/sales_order_entry.php:191
+#: ../sales/customer_delivery.php:52
+#: ../sales/sales_order_entry.php:191
 msgid "&View This Delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:54 sales/customer_delivery.php:76
-#: sales/sales_order_entry.php:193
+#: ../sales/customer_delivery.php:54
+#: ../sales/customer_delivery.php:76
+#: ../sales/sales_order_entry.php:193
 msgid "&Print Delivery Note"
 msgstr ""
 
-#: sales/customer_delivery.php:55 sales/customer_delivery.php:77
-#: sales/sales_order_entry.php:194
+#: ../sales/customer_delivery.php:55
+#: ../sales/customer_delivery.php:77
+#: ../sales/sales_order_entry.php:194
 msgid "&Email Delivery Note"
 msgstr ""
 
-#: sales/customer_delivery.php:56 sales/customer_delivery.php:78
-#: sales/sales_order_entry.php:195
+#: ../sales/customer_delivery.php:56
+#: ../sales/customer_delivery.php:78
+#: ../sales/sales_order_entry.php:195
 msgid "P&rint as Packing Slip"
 msgstr ""
 
-#: sales/customer_delivery.php:57 sales/customer_delivery.php:79
-#: sales/sales_order_entry.php:196
+#: ../sales/customer_delivery.php:57
+#: ../sales/customer_delivery.php:79
+#: ../sales/sales_order_entry.php:196
 msgid "E&mail as Packing Slip"
 msgstr ""
 
-#: sales/customer_delivery.php:59 sales/sales_order_entry.php:199
+#: ../sales/customer_delivery.php:59
+#: ../sales/sales_order_entry.php:199
 msgid "View the GL Journal Entries for this Dispatch"
 msgstr ""
 
-#: sales/customer_delivery.php:62
+#: ../sales/customer_delivery.php:62
 msgid "Invoice This Delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:64
+#: ../sales/customer_delivery.php:64
 msgid "Select Another Order For Dispatch"
 msgstr ""
 
-#: sales/customer_delivery.php:72
+#: ../sales/customer_delivery.php:72
 #, php-format
 msgid "Delivery Note # %d has been updated."
 msgstr ""
 
-#: sales/customer_delivery.php:74
+#: ../sales/customer_delivery.php:74
 msgid "View this delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:82
+#: ../sales/customer_delivery.php:82
 msgid "Confirm Delivery and Invoice"
 msgstr ""
 
-#: sales/customer_delivery.php:84
+#: ../sales/customer_delivery.php:84
 msgid "Select A Different Delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:94 sales/customer_invoice.php:152
+#: ../sales/customer_delivery.php:94
+#: ../sales/customer_invoice.php:152
 msgid ""
 "You have to set Deferred Income Account in GL Setup to entry prepayment "
 "invoices."
 msgstr ""
 
-#: sales/customer_delivery.php:97
+#: ../sales/customer_delivery.php:97
 msgid "This order has no items. There is nothing to delivery."
 msgstr ""
 
-#: sales/customer_delivery.php:100 sales/customer_delivery.php:105
+#: ../sales/customer_delivery.php:100
+#: ../sales/customer_delivery.php:105
 msgid "Select a different sales order to delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:103
+#: ../sales/customer_delivery.php:103
 msgid ""
 "This prepayment order is not yet ready for delivery due to insufficient "
 "amount received."
 msgstr ""
 
-#: sales/customer_delivery.php:122
+#: ../sales/customer_delivery.php:122
 msgid "Select a different delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:123
+#: ../sales/customer_delivery.php:123
 msgid "This delivery has all items invoiced. There is nothing to modify."
 msgstr ""
 
-#: sales/customer_delivery.php:133
+#: ../sales/customer_delivery.php:133
 msgid ""
 "This page can only be opened if an order or delivery note has been selected. "
 "Please select it first."
 msgstr ""
 
-#: sales/customer_delivery.php:135
+#: ../sales/customer_delivery.php:135
 msgid "Select a Sales Order to Delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:144
+#: ../sales/customer_delivery.php:144
 msgid ""
 "Selected quantity cannot be less than quantity invoiced nor more than "
 "quantity\tnot dispatched on sales order."
 msgstr ""
 
-#: sales/customer_delivery.php:147
+#: ../sales/customer_delivery.php:147
 msgid "Freight cost cannot be less than zero"
 msgstr ""
 
-#: sales/customer_delivery.php:159
+#: ../sales/customer_delivery.php:159
 msgid "The entered date of delivery is invalid."
 msgstr ""
 
-#: sales/customer_delivery.php:171
+#: ../sales/customer_delivery.php:171
 msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
-#: sales/customer_delivery.php:188 sales/customer_invoice.php:345
+#: ../sales/customer_delivery.php:188
+#: ../sales/customer_invoice.php:345
 msgid "The entered shipping value is not numeric."
 msgstr ""
 
-#: sales/customer_delivery.php:194
+#: ../sales/customer_delivery.php:194
 msgid "There are no item quantities on this delivery note."
 msgstr ""
 
-#: sales/customer_delivery.php:297 sales/sales_order_entry.php:528
-#: sales/includes/ui/sales_order_ui.inc:251
+#: ../sales/customer_delivery.php:297
+#: ../sales/sales_order_entry.php:529
+#: ../sales/includes/ui/sales_order_ui.inc:251
 msgid ""
 "The delivery cannot be processed because there is an insufficient quantity "
 "for item:"
 msgstr ""
 
-#: sales/customer_delivery.php:367
+#: ../sales/customer_delivery.php:367
 msgid "For Sales Order"
 msgstr ""
 
-#: sales/customer_delivery.php:376
+#: ../sales/customer_delivery.php:376
 msgid "Delivery From"
 msgstr ""
 
-#: sales/customer_delivery.php:425
+#: ../sales/customer_delivery.php:425
 msgid "Invoice Dead-line"
 msgstr ""
 
-#: sales/customer_delivery.php:435 sales/customer_invoice.php:530
-#: sales/includes/ui/sales_order_ui.inc:84
-#: sales/includes/ui/sales_order_ui.inc:375
+#: ../sales/customer_delivery.php:435
+#: ../sales/customer_invoice.php:530
+#: ../sales/includes/ui/sales_order_ui.inc:84
+#: ../sales/includes/ui/sales_order_ui.inc:375
 msgid ""
 "The selected customer account is currently on hold. Please contact the "
 "credit control personnel to discuss."
 msgstr ""
 
-#: sales/customer_delivery.php:440
+#: ../sales/customer_delivery.php:440
 msgid "Delivery Items"
 msgstr ""
 
-#: sales/customer_delivery.php:446
+#: ../sales/customer_delivery.php:446
 msgid "Max. delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:446 sales/customer_invoice.php:544
-#: sales/includes/ui/sales_order_ui.inc:146
-msgid "Delivered"
+#: ../sales/customer_delivery.php:446
+#: ../sales/customer_invoice.php:544
+msgid "Invoiced"
 msgstr ""
 
-#: sales/customer_delivery.php:515 sales/customer_invoice.php:633
+#: ../sales/customer_delivery.php:517
+#: ../sales/customer_invoice.php:633
 msgid "Shipping Cost"
 msgstr ""
 
-#: sales/customer_delivery.php:535 sales/includes/ui/sales_order_ui.inc:249
+#: ../sales/customer_delivery.php:537
+#: ../sales/includes/ui/sales_order_ui.inc:249
 msgid ""
 "Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
 
-#: sales/customer_delivery.php:539
+#: ../sales/customer_delivery.php:541
 msgid "Action For Balance"
 msgstr ""
 
-#: sales/customer_delivery.php:546 sales/customer_delivery.php:548
-#: sales/customer_delivery.php:551 sales/customer_invoice.php:685
+#: ../sales/customer_delivery.php:548
+#: ../sales/customer_delivery.php:550
+#: ../sales/customer_delivery.php:553
+#: ../sales/customer_invoice.php:685
 msgid "Refresh document page"
 msgstr ""
 
-#: sales/customer_delivery.php:548
+#: ../sales/customer_delivery.php:550
 msgid "Reset quantity"
 msgstr ""
 
-#: sales/customer_delivery.php:551
+#: ../sales/customer_delivery.php:553
 msgid "Clear quantity"
 msgstr ""
 
-#: sales/customer_delivery.php:553
+#: ../sales/customer_delivery.php:555
 msgid "Process Dispatch"
 msgstr ""
 
-#: sales/customer_delivery.php:554 sales/customer_invoice.php:687
-#: sales/sales_order_entry.php:746
+#: ../sales/customer_delivery.php:556
+#: ../sales/customer_invoice.php:687
+#: ../sales/sales_order_entry.php:747
 msgid "Check entered data and save document"
 msgstr ""
 
-#: sales/customer_invoice.php:38
+#: ../sales/customer_invoice.php:38
 #, php-format
 msgid "Modifying Sales Invoice # %d."
 msgstr ""
 
-#: sales/customer_invoice.php:41
+#: ../sales/customer_invoice.php:41
 msgid "Issue an Invoice for Delivery Note"
 msgstr ""
 
-#: sales/customer_invoice.php:43
+#: ../sales/customer_invoice.php:43
 msgid "Issue Batch Invoice for Delivery Notes"
 msgstr ""
 
-#: sales/customer_invoice.php:45
+#: ../sales/customer_invoice.php:45
 msgid "Prepayment or Final Invoice Entry"
 msgstr ""
 
-#: sales/customer_invoice.php:58
+#: ../sales/customer_invoice.php:58
 msgid "Selected deliveries has been processed"
 msgstr ""
 
-#: sales/customer_invoice.php:60 sales/customer_invoice.php:80
-#: sales/sales_order_entry.php:218
+#: ../sales/customer_invoice.php:60
+#: ../sales/customer_invoice.php:80
+#: ../sales/sales_order_entry.php:218
 msgid "&View This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:62 sales/customer_invoice.php:82
+#: ../sales/customer_invoice.php:62
+#: ../sales/customer_invoice.php:82
 msgid "&Print This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:63 sales/customer_invoice.php:83
+#: ../sales/customer_invoice.php:63
+#: ../sales/customer_invoice.php:83
 msgid "&Email This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:65 sales/sales_order_entry.php:231
+#: ../sales/customer_invoice.php:65
+#: ../sales/sales_order_entry.php:231
 msgid "View the GL &Journal Entries for this Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:67
+#: ../sales/customer_invoice.php:67
 msgid "Select Another &Delivery For Invoicing"
 msgstr ""
 
-#: sales/customer_invoice.php:78
+#: ../sales/customer_invoice.php:78
 #, php-format
 msgid "Sales Invoice # %d has been updated."
 msgstr ""
 
-#: sales/customer_invoice.php:85
+#: ../sales/customer_invoice.php:85
 msgid "Select Another &Invoice to Modify"
 msgstr ""
 
-#: sales/customer_invoice.php:124
+#: ../sales/customer_invoice.php:124
 msgid "Select a different delivery to invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:125
+#: ../sales/customer_invoice.php:125
 msgid ""
 "There are no delivered items with a quantity left to invoice. There is "
 "nothing left to invoice."
 msgstr ""
 
-#: sales/customer_invoice.php:146
+#: ../sales/customer_invoice.php:146
 msgid ""
 "All quantities on this invoice has been credited. There is nothing to modify "
 "on this invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:160
+#: ../sales/customer_invoice.php:160
 msgid ""
 "Please select correct Sales Order Prepayment to be invoiced and try again."
 msgstr ""
 
-#: sales/customer_invoice.php:191
+#: ../sales/customer_invoice.php:191
 msgid ""
 "This page can only be opened after delivery selection. Please select "
 "delivery to invoicing first."
 msgstr ""
 
-#: sales/customer_invoice.php:193
+#: ../sales/customer_invoice.php:193
 msgid "Select Delivery to Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:198 sales/customer_invoice.php:356
+#: ../sales/customer_invoice.php:198
+#: ../sales/customer_invoice.php:356
 msgid ""
 "Selected quantity cannot be less than quantity credited nor more than "
 "quantity not invoiced yet."
 msgstr ""
 
-#: sales/customer_invoice.php:312
+#: ../sales/customer_invoice.php:312
 msgid "The entered invoice date is invalid."
 msgstr ""
 
-#: sales/customer_invoice.php:325
+#: ../sales/customer_invoice.php:325
 msgid "The entered invoice due date is invalid."
 msgstr ""
 
-#: sales/customer_invoice.php:351
+#: ../sales/customer_invoice.php:351
 msgid "There are no item quantities on this invoice."
 msgstr ""
 
-#: sales/customer_invoice.php:361
+#: ../sales/customer_invoice.php:361
 msgid ""
 "There is no non-invoiced payments for this order. If you want to issue final "
 "invoice, select delayed or cash payment terms."
 msgstr ""
 
-#: sales/customer_invoice.php:451
+#: ../sales/customer_invoice.php:451
 msgid "Payment terms:"
 msgstr ""
 
-#: sales/customer_invoice.php:536 sales/sales_order_entry.php:722
+#: ../sales/customer_invoice.php:536
+#: ../sales/sales_order_entry.php:723
 msgid "Sales Order Items"
 msgstr ""
 
-#: sales/customer_invoice.php:536
+#: ../sales/customer_invoice.php:536
 msgid "Invoice Items"
 msgstr ""
 
-#: sales/customer_invoice.php:545
+#: ../sales/customer_invoice.php:545
 msgid "This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:552
+#: ../sales/customer_invoice.php:552
 msgid "Credited"
 msgstr ""
 
-#: sales/customer_invoice.php:654
+#: ../sales/customer_invoice.php:654
 msgid "Invoice Total"
 msgstr ""
 
-#: sales/customer_invoice.php:663
+#: ../sales/customer_invoice.php:663
 msgid "Sales order:"
 msgstr ""
 
-#: sales/customer_invoice.php:675
+#: ../sales/customer_invoice.php:675
 msgid "Payments received:"
 msgstr ""
 
-#: sales/customer_invoice.php:676
+#: ../sales/customer_invoice.php:676
 msgid "Invoiced here:"
 msgstr ""
 
-#: sales/customer_invoice.php:677
+#: ../sales/customer_invoice.php:677
 msgid "Left to be invoiced:"
 msgstr ""
 
-#: sales/customer_payments.php:33
+#: ../sales/customer_payments.php:32
+#: ../sales/customer_payments.php.orig:33
 msgid "Customer Payment Entry"
 msgstr ""
 
-#: sales/customer_payments.php:37
+#: ../sales/customer_payments.php:36
+#: ../sales/customer_payments.php.orig:37
 msgid "There are no customers defined in the system."
 msgstr ""
 
-#: sales/customer_payments.php:68
+#: ../sales/customer_payments.php:70
+#: ../sales/customer_payments.php.orig:68
 msgid "Invalid sales invoice number."
 msgstr ""
 
-#: sales/customer_payments.php:94
+#: ../sales/customer_payments.php:97
+#: ../sales/customer_payments.php.orig:94
 msgid "The customer payment has been successfully entered."
 msgstr ""
 
-#: sales/customer_payments.php:96 sales/customer_payments.php:113
+#: ../sales/customer_payments.php:99
+#: ../sales/customer_payments.php.orig:96
+#: ../sales/customer_payments.php.orig:113
 msgid "&Print This Receipt"
 msgstr ""
 
-#: sales/customer_payments.php:98 sales/customer_payments.php:115
-msgid "&View the GL Journal Entries for this Customer Payment"
+#: ../sales/customer_payments.php:101
+msgid "&View this Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:102
-msgid "Select Another &Customer Transaction for Payment"
+#: ../sales/customer_payments.php:103
+#: ../sales/customer_payments.php.orig:104
+#: ../sales/customer_payments.php.orig:121
+msgid "Enter Another &Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:104 sales/customer_payments.php:121
-msgid "Enter Another &Customer Payment"
+#: ../sales/customer_payments.php:104
+msgid "Enter Other &Deposit"
+msgstr ""
+
+#: ../sales/customer_payments.php:105
+msgid "Enter Payment to &Supplier"
+msgstr ""
+
+#: ../sales/customer_payments.php:106
+msgid "Enter Other &Payment"
+msgstr ""
+
+#: ../sales/customer_payments.php:107
+msgid "Bank Account &Transfer"
+msgstr ""
+
+#: ../sales/customer_payments.php:109
+#: ../sales/customer_payments.php.orig:98
+#: ../sales/customer_payments.php.orig:115
+msgid "&View the GL Journal Entries for this Customer Payment"
+msgstr ""
+
+#: ../sales/customer_payments.php.orig:102
+msgid "Select Another &Customer Transaction for Payment"
 msgstr ""
 
-#: sales/customer_payments.php:111
+#: ../sales/customer_payments.php.orig:111
 msgid "The customer payment has been successfully updated."
 msgstr ""
 
-#: sales/customer_payments.php:119
+#: ../sales/customer_payments.php.orig:119
 msgid "Select Another Customer Payment for &Edition"
 msgstr ""
 
-#: sales/customer_payments.php:134 sales/sales_order_entry.php:346
+#: ../sales/customer_payments.php.orig:134
+#: ../sales/sales_order_entry.php:347
 msgid "There is no customer selected."
 msgstr ""
 
-#: sales/customer_payments.php:141 sales/sales_order_entry.php:353
+#: ../sales/customer_payments.php.orig:141
+#: ../sales/sales_order_entry.php:354
 msgid "This customer has no branch defined."
 msgstr ""
 
-#: sales/customer_payments.php:147
+#: ../sales/customer_payments.php.orig:147
 msgid "The entered date is invalid. Please enter a valid date for the payment."
 msgstr ""
 
-#: sales/customer_payments.php:177 sales/customer_payments.php:183
+#: ../sales/customer_payments.php.orig:177
+#: ../sales/customer_payments.php.orig:183
 msgid "The entered amount is invalid or negative and cannot be processed."
 msgstr ""
 
-#: sales/customer_payments.php:209
+#: ../sales/customer_payments.php.orig:209
 msgid "The entered discount is not a valid number."
 msgstr ""
 
-#: sales/customer_payments.php:216
+#: ../sales/customer_payments.php.orig:216
 msgid ""
 "The balance of the amount and discout is zero or negative. Please enter "
 "valid amounts."
 msgstr ""
 
-#: sales/sales_order_entry.php:64
+#: ../sales/customer_payments.php.orig:346
+#: ../sales/customer_payments.php.orig:348
+msgid "From Customer:"
+msgstr ""
+
+#: ../sales/customer_payments.php.orig:377
+msgid "Into Bank Account:"
+msgstr ""
+
+#: ../sales/customer_payments.php.orig:382
+msgid "Date of Deposit:"
+msgstr ""
+
+#: ../sales/customer_payments.php.orig:404
+msgid "Customer prompt payment discount :"
+msgstr ""
+
+#: ../sales/customer_payments.php.orig:413
+msgid "Amount and discount are in customer's currency."
+msgstr ""
+
+#: ../sales/customer_payments.php.orig:418
+msgid "Update Payment"
+msgstr ""
+
+#: ../sales/customer_payments.php.orig:420
+msgid "Add Payment"
+msgstr ""
+
+#: ../sales/sales_order_entry.php:64
 msgid "Direct Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:69
+#: ../sales/sales_order_entry.php:69
 msgid "Direct Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:75
+#: ../sales/sales_order_entry.php:75
 #, php-format
 msgid "Modifying Sales Order # %d"
 msgstr ""
 
-#: sales/sales_order_entry.php:81
+#: ../sales/sales_order_entry.php:81
 #, php-format
 msgid "Modifying Sales Quotation # %d"
 msgstr ""
 
-#: sales/sales_order_entry.php:86
+#: ../sales/sales_order_entry.php:86
 msgid "New Sales Order Entry"
 msgstr ""
 
-#: sales/sales_order_entry.php:90
+#: ../sales/sales_order_entry.php:90
 msgid "New Sales Quotation Entry"
 msgstr ""
 
-#: sales/sales_order_entry.php:93
+#: ../sales/sales_order_entry.php:93
 msgid "Sales Order Entry"
 msgstr ""
 
-#: sales/sales_order_entry.php:115
+#: ../sales/sales_order_entry.php:115
 #, php-format
 msgid "Order # %d has been entered."
 msgstr ""
 
-#: sales/sales_order_entry.php:117 sales/sales_order_entry.php:137
+#: ../sales/sales_order_entry.php:117
+#: ../sales/sales_order_entry.php:137
 msgid "&View This Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:123
+#: ../sales/sales_order_entry.php:123
 msgid "Make &Delivery Against This Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:128
+#: ../sales/sales_order_entry.php:128
 msgid "Enter a &New Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:135
+#: ../sales/sales_order_entry.php:135
 #, php-format
 msgid "Order # %d has been updated."
 msgstr ""
 
-#: sales/sales_order_entry.php:143
+#: ../sales/sales_order_entry.php:143
 msgid "Confirm Order Quantities and Make &Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:146
+#: ../sales/sales_order_entry.php:146
 msgid "Select A Different &Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:153
+#: ../sales/sales_order_entry.php:153
 #, php-format
 msgid "Quotation # %d has been entered."
 msgstr ""
 
-#: sales/sales_order_entry.php:155 sales/sales_order_entry.php:173
+#: ../sales/sales_order_entry.php:155
+#: ../sales/sales_order_entry.php:173
 msgid "&View This Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:157 sales/sales_order_entry.php:175
+#: ../sales/sales_order_entry.php:157
+#: ../sales/sales_order_entry.php:175
 msgid "&Print This Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:158 sales/sales_order_entry.php:176
+#: ../sales/sales_order_entry.php:158
+#: ../sales/sales_order_entry.php:176
 msgid "&Email This Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:161 sales/sales_order_entry.php:179
+#: ../sales/sales_order_entry.php:161
+#: ../sales/sales_order_entry.php:179
 msgid "Make &Sales Order Against This Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:164
+#: ../sales/sales_order_entry.php:164
 msgid "Enter a New &Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:171
+#: ../sales/sales_order_entry.php:171
 #, php-format
 msgid "Quotation # %d has been updated."
 msgstr ""
 
-#: sales/sales_order_entry.php:182
+#: ../sales/sales_order_entry.php:182
 msgid "Select A Different &Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:201
+#: ../sales/sales_order_entry.php:201
 msgid "Make &Invoice Against This Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:205
+#: ../sales/sales_order_entry.php:205
 msgid "Enter a New Template &Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:208
+#: ../sales/sales_order_entry.php:208
 msgid "Enter a &New Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:216
+#: ../sales/sales_order_entry.php:216
 #, php-format
 msgid "Invoice # %d has been entered."
 msgstr ""
 
-#: sales/sales_order_entry.php:220
+#: ../sales/sales_order_entry.php:220
 msgid "&Print Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:221
+#: ../sales/sales_order_entry.php:221
 msgid "&Email Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:229
+#: ../sales/sales_order_entry.php:229
 msgid "Print &Receipt"
 msgstr ""
 
-#: sales/sales_order_entry.php:234
+#: ../sales/sales_order_entry.php:234
 msgid "Enter a &New Template Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:237
+#: ../sales/sales_order_entry.php:237
 msgid "Enter a &New Direct Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:376
+#: ../sales/sales_order_entry.php:377
 msgid "Pre-payment required have to be positive and less than total amount."
 msgstr ""
 
-#: sales/sales_order_entry.php:381
+#: ../sales/sales_order_entry.php:382
 msgid ""
 "You must enter the person or company to whom delivery should be made to."
 msgstr ""
 
-#: sales/sales_order_entry.php:388
+#: ../sales/sales_order_entry.php:389
 msgid ""
 "You should enter the street address in the box provided. Orders cannot be "
 "accepted without a valid street address."
 msgstr ""
 
-#: sales/sales_order_entry.php:397
+#: ../sales/sales_order_entry.php:398
 msgid "The shipping cost entered is expected to be numeric."
 msgstr ""
 
-#: sales/sales_order_entry.php:403
+#: ../sales/sales_order_entry.php:404
 msgid "The Valid date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:405
+#: ../sales/sales_order_entry.php:406
 msgid "The delivery date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:412
+#: ../sales/sales_order_entry.php:413
 msgid "The requested valid date is before the date of the quotation."
 msgstr ""
 
-#: sales/sales_order_entry.php:414
+#: ../sales/sales_order_entry.php:415
 msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
-#: sales/sales_order_entry.php:423
+#: ../sales/sales_order_entry.php:424
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: sales/sales_order_entry.php:461
+#: ../sales/sales_order_entry.php:462
 msgid ""
 "The reference number field has been increased. Please save the document "
 "again."
 msgstr ""
 
-#: sales/sales_order_entry.php:507
+#: ../sales/sales_order_entry.php:508
 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:511
+#: ../sales/sales_order_entry.php:512
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: sales/sales_order_entry.php:518
+#: ../sales/sales_order_entry.php:519
 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:549
+#: ../sales/sales_order_entry.php:550
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
-#: sales/sales_order_entry.php:574
+#: ../sales/sales_order_entry.php:575
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: sales/sales_order_entry.php:603
+#: ../sales/sales_order_entry.php:604
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:604
+#: ../sales/sales_order_entry.php:605
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:606
+#: ../sales/sales_order_entry.php:607
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:607
+#: ../sales/sales_order_entry.php:608
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:611
+#: ../sales/sales_order_entry.php:612
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:612
+#: ../sales/sales_order_entry.php:613
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:619
+#: ../sales/sales_order_entry.php:620
 msgid "Undelivered part of order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:620
+#: ../sales/sales_order_entry.php:621
 msgid "Select Another Sales Order for Edition"
 msgstr ""
 
-#: sales/sales_order_entry.php:624
+#: ../sales/sales_order_entry.php:625
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:625
+#: ../sales/sales_order_entry.php:626
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:702
-msgid "Invoice Date:"
-msgstr ""
-
-#: sales/sales_order_entry.php:703
+#: ../sales/sales_order_entry.php:704
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:704
+#: ../sales/sales_order_entry.php:705
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:706
+#: ../sales/sales_order_entry.php:707
 msgid "Place Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:708
-msgid "Delivery Date:"
-msgstr ""
-
-#: sales/sales_order_entry.php:709
+#: ../sales/sales_order_entry.php:710
 msgid "Delivery Note Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:710
+#: ../sales/sales_order_entry.php:711
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: sales/sales_order_entry.php:711
+#: ../sales/sales_order_entry.php:712
 msgid "Cancel Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:712
+#: ../sales/sales_order_entry.php:713
 msgid "Place Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:714
+#: ../sales/sales_order_entry.php:715
 msgid "Quotation Date:"
 msgstr ""
 
-#: sales/sales_order_entry.php:715
+#: ../sales/sales_order_entry.php:716
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:716
+#: ../sales/sales_order_entry.php:717
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:717
+#: ../sales/sales_order_entry.php:718
 msgid "Cancel Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:718
+#: ../sales/sales_order_entry.php:719
 msgid "Place Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:719
+#: ../sales/sales_order_entry.php:720
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:721
-msgid "Order Date:"
-msgstr ""
-
-#: sales/sales_order_entry.php:723
+#: ../sales/sales_order_entry.php:724
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:726
+#: ../sales/sales_order_entry.php:727
 msgid "Commit Order Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:747
+#: ../sales/sales_order_entry.php:748
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
-#: sales/sales_order_entry.php:750
+#: ../sales/sales_order_entry.php:751
 msgid ""
 "You are about to cancel undelivered part of this order.\\nDo you want to "
 "continue?"
 msgstr ""
 
-#: sales/sales_order_entry.php:752
+#: ../sales/sales_order_entry.php:753
 msgid "Validate changes and update document"
 msgstr ""
 
-#: sales/sales_order_entry.php:756
+#: ../sales/sales_order_entry.php:757
 msgid ""
 "Cancels document entry or removes sales order when editing an old document"
 msgstr ""
 
-#: sales/allocations/customer_allocate.php:28
+#: ../sales/allocations/customer_allocate.php:28
 msgid "Allocate Customer Payment or Credit Note"
 msgstr ""
 
-#: sales/allocations/customer_allocate.php:47
+#: ../sales/allocations/customer_allocate.php:50
 #, php-format
 msgid "Allocation of %s # %d"
 msgstr ""
 
-#: sales/allocations/customer_allocation_main.php:22
+#: ../sales/allocations/customer_allocation_main.php:22
 msgid "Customer Allocations"
 msgstr ""
 
-#: sales/allocations/customer_allocation_main.php:32
-#: sales/manage/customer_branches.php:282 sales/manage/customers.php:324
-#: sales/inquiry/customer_allocation_inquiry.php:42
-#: sales/inquiry/customer_inquiry.php:44
+#: ../sales/allocations/customer_allocation_main.php:32
+#: ../sales/manage/customer_branches.php:282
+#: ../sales/manage/customers.php:327
+#: ../sales/inquiry/customer_allocation_inquiry.php:42
+#: ../sales/inquiry/customer_inquiry.php:44
+#: ../sales/inquiry/sales_orders_view.php.orig:265
 msgid "Select a customer: "
 msgstr ""
 
-#: sales/manage/credit_status.php:16
+#: ../sales/manage/credit_status.php:16
 msgid "Credit Status"
 msgstr ""
 
-#: sales/manage/credit_status.php:30
+#: ../sales/manage/credit_status.php:30
 msgid "The credit status description cannot be empty."
 msgstr ""
 
-#: sales/manage/credit_status.php:44
+#: ../sales/manage/credit_status.php:44
 msgid "New credit status has been added"
 msgstr ""
 
-#: sales/manage/credit_status.php:52
+#: ../sales/manage/credit_status.php:52
 msgid "Selected credit status has been updated"
 msgstr ""
 
-#: sales/manage/credit_status.php:63
+#: ../sales/manage/credit_status.php:63
 msgid ""
 "Cannot delete this credit status because customer accounts have been created "
 "referring to it."
 msgstr ""
 
-#: sales/manage/credit_status.php:79
+#: ../sales/manage/credit_status.php:79
 msgid "Selected credit status has been deleted"
 msgstr ""
 
-#: sales/manage/credit_status.php:97
+#: ../sales/manage/credit_status.php:97
 msgid "Dissallow Invoices"
 msgstr ""
 
-#: sales/manage/credit_status.php:109
+#: ../sales/manage/credit_status.php:109
 msgid "Invoice OK"
 msgstr ""
 
-#: sales/manage/credit_status.php:113
+#: ../sales/manage/credit_status.php:113
 msgid "NO INVOICING"
 msgstr ""
 
-#: sales/manage/credit_status.php:147
+#: ../sales/manage/credit_status.php:147
 msgid "Dissallow invoicing ?"
 msgstr ""
 
-#: sales/manage/customer_branches.php:18
+#: ../sales/manage/customer_branches.php:18
 msgid "Customer Branches"
 msgstr ""
 
-#: sales/manage/customer_branches.php:25
+#: ../sales/manage/customer_branches.php:25
 msgid ""
 "There are no customers defined in the system. Please define a customer to "
 "add customer branches."
 msgstr ""
 
-#: sales/manage/customer_branches.php:27
+#: ../sales/manage/customer_branches.php:27
 msgid ""
 "There are no sales people defined in the system. At least one sales person "
 "is required before proceeding."
 msgstr ""
 
-#: sales/manage/customer_branches.php:29
+#: ../sales/manage/customer_branches.php:29
 msgid ""
 "There are no sales areas defined in the system. At least one sales area is "
 "required before proceeding."
 msgstr ""
 
-#: sales/manage/customer_branches.php:31
+#: ../sales/manage/customer_branches.php:31
 msgid ""
 "There are no shipping companies defined in the system. At least one shipping "
 "company is required before proceeding."
 msgstr ""
 
-#: sales/manage/customer_branches.php:63
+#: ../sales/manage/customer_branches.php:63
 msgid "The Branch name cannot be empty."
 msgstr ""
 
-#: sales/manage/customer_branches.php:70
+#: ../sales/manage/customer_branches.php:70
 msgid "The Branch short name cannot be empty."
 msgstr ""
 
-#: sales/manage/customer_branches.php:88
+#: ../sales/manage/customer_branches.php:88
 msgid "Selected customer branch has been updated"
 msgstr ""
 
-#: sales/manage/customer_branches.php:106
+#: ../sales/manage/customer_branches.php:106
 msgid "New customer branch has been added"
 msgstr ""
 
-#: sales/manage/customer_branches.php:125
+#: ../sales/manage/customer_branches.php:125
 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
 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
 msgid "Selected customer branch has been deleted"
 msgstr ""
 
-#: sales/manage/customer_branches.php:218
+#: ../sales/manage/customer_branches.php:218
 msgid "Main Branch"
 msgstr ""
 
-#: sales/manage/customer_branches.php:237
+#: ../sales/manage/customer_branches.php:237
 msgid "Name and Contact"
 msgstr ""
 
-#: sales/manage/customer_branches.php:238
+#: ../sales/manage/customer_branches.php:238
 msgid "Branch Name:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:239
+#: ../sales/manage/customer_branches.php:239
 msgid "Branch Short Name:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:242 sales/manage/customers.php:256
+#: ../sales/manage/customer_branches.php:242
+#: ../sales/manage/customers.php:259
 msgid "Sales Person:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:243 sales/manage/customers.php:293
+#: ../sales/manage/customer_branches.php:243
+#: ../sales/manage/customers.php:296
 msgid "Sales Area:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:244
-#: sales/manage/recurrent_invoices.php:174
+#: ../sales/manage/customer_branches.php:244
+#: ../sales/manage/recurrent_invoices.php:174
 msgid "Sales Group:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:245 sales/manage/customers.php:291
+#: ../sales/manage/customer_branches.php:245
+#: ../sales/manage/customers.php:294
 msgid "Default Inventory Location:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:246 sales/manage/customers.php:292
+#: ../sales/manage/customer_branches.php:246
+#: ../sales/manage/customers.php:295
 msgid "Default Shipping Company:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:249
-msgid "GL Accounts"
-msgstr ""
-
-#: sales/manage/customer_branches.php:253
+#: ../sales/manage/customer_branches.php:253
 msgid "Accounts Receivable Account:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:260
+#: ../sales/manage/customer_branches.php:260
 msgid "General contact data"
 msgstr ""
 
-#: sales/manage/customer_branches.php:270
+#: ../sales/manage/customer_branches.php:270
 msgid "Billing Address:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:274
+#: ../sales/manage/customer_branches.php:274
 msgid "Disable this Branch:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:297
-#: sales/inquiry/sales_deliveries_view.php:183
+#: ../sales/manage/customer_branches.php:297
+#: ../sales/inquiry/sales_deliveries_view.php:183
 msgid "Contact"
 msgstr ""
 
-#: sales/manage/customer_branches.php:299
+#: ../sales/manage/customer_branches.php:299
 msgid "Area"
 msgstr ""
 
-#: sales/manage/customer_branches.php:300
+#: ../sales/manage/customer_branches.php:300
 msgid "Phone No"
 msgstr ""
 
-#: sales/manage/customer_branches.php:301
+#: ../sales/manage/customer_branches.php:301
 msgid "Fax No"
 msgstr ""
 
-#: sales/manage/customer_branches.php:303
+#: ../sales/manage/customer_branches.php:303
 msgid "Tax Group"
 msgstr ""
 
-#: sales/manage/customer_branches.php:321
-#: sales/includes/ui/sales_order_ui.inc:306
+#: ../sales/manage/customer_branches.php:321
+#: ../sales/includes/ui/sales_order_ui.inc:306
 msgid ""
 "The selected customer does not have any branches. Please create at least one "
 "branch."
 msgstr ""
 
-#: sales/manage/customer_branches.php:324 sales/manage/customers.php:344
-msgid "&General settings"
-msgstr ""
-
-#: sales/manage/customer_branches.php:325 sales/manage/customers.php:345
-msgid "&Contacts"
-msgstr ""
-
-#: sales/manage/customers.php:42
+#: ../sales/manage/customers.php:42
 msgid "The customer name cannot be empty."
 msgstr ""
 
-#: sales/manage/customers.php:49
+#: ../sales/manage/customers.php:49
 msgid "The customer short name cannot be empty."
 msgstr ""
 
-#: sales/manage/customers.php:56
+#: ../sales/manage/customers.php:56
 msgid "The credit limit must be numeric and not less than zero."
 msgstr ""
 
-#: sales/manage/customers.php:63
+#: ../sales/manage/customers.php:63
 msgid ""
 "The payment discount must be numeric and is expected to be less than 100% "
 "and greater than or equal to 0."
 msgstr ""
 
-#: sales/manage/customers.php:70
+#: ../sales/manage/customers.php:70
 msgid ""
 "The discount percentage must be numeric and is expected to be less than 100% "
 "and greater than or equal to 0."
 msgstr ""
 
-#: sales/manage/customers.php:98
+#: ../sales/manage/customers.php:98
 msgid "Customer has been updated."
 msgstr ""
 
-#: sales/manage/customers.php:127
+#: ../sales/manage/customers.php:130
 msgid "A new customer has been added."
 msgstr ""
 
-#: sales/manage/customers.php:130
+#: ../sales/manage/customers.php:133
 msgid ""
 "A default Branch has been automatically created, please check default Branch "
 "values by using link below."
 msgstr ""
 
-#: sales/manage/customers.php:153
+#: ../sales/manage/customers.php:156
 msgid ""
 "This customer cannot be deleted because there are transactions that refer to "
 "it."
 msgstr ""
 
-#: sales/manage/customers.php:160
+#: ../sales/manage/customers.php:163
 msgid ""
 "Cannot delete the customer record because orders have been created against "
 "it."
 msgstr ""
 
-#: sales/manage/customers.php:167
+#: ../sales/manage/customers.php:170
 msgid ""
 "Cannot delete this customer because there are branch records set up against "
 "it."
 msgstr ""
 
-#: sales/manage/customers.php:178
+#: ../sales/manage/customers.php:181
 msgid "Selected customer has been deleted."
 msgstr ""
 
-#: sales/manage/customers.php:227
+#: ../sales/manage/customers.php:230
 msgid "Name and Address"
 msgstr ""
 
-#: sales/manage/customers.php:229
+#: ../sales/manage/customers.php:232
 msgid "Customer Name:"
 msgstr ""
 
-#: sales/manage/customers.php:230
+#: ../sales/manage/customers.php:233
 msgid "Customer Short Name:"
 msgstr ""
 
-#: sales/manage/customers.php:238 sales/manage/customers.php:242
+#: ../sales/manage/customers.php:241
+#: ../sales/manage/customers.php:245
 msgid "Customer's Currency:"
 msgstr ""
 
-#: sales/manage/customers.php:245
+#: ../sales/manage/customers.php:248
 msgid "Sales Type/Price List:"
 msgstr ""
 
-#: sales/manage/customers.php:248
+#: ../sales/manage/customers.php:251
 msgid "Customer status:"
 msgstr ""
 
-#: sales/manage/customers.php:262
+#: ../sales/manage/customers.php:265
 msgid "Discount Percent:"
 msgstr ""
 
-#: sales/manage/customers.php:263
+#: ../sales/manage/customers.php:266
 msgid "Prompt Payment Discount Percent:"
 msgstr ""
 
-#: sales/manage/customers.php:267
+#: ../sales/manage/customers.php:270
 msgid "Credit Status:"
 msgstr ""
 
-#: sales/manage/customers.php:280
+#: ../sales/manage/customers.php:283
 msgid "Customer branches"
 msgstr ""
 
-#: sales/manage/customers.php:282
+#: ../sales/manage/customers.php:285
 msgid "Select or &Add"
 msgstr ""
 
-#: sales/manage/customers.php:282
+#: ../sales/manage/customers.php:285
 msgid "&Add or Edit "
 msgstr ""
 
-#: sales/manage/customers.php:301
+#: ../sales/manage/customers.php:304
 msgid "Add New Customer"
 msgstr ""
 
-#: sales/manage/customers.php:305
+#: ../sales/manage/customers.php:308
 msgid "Update Customer"
 msgstr ""
 
-#: sales/manage/customers.php:306
+#: ../sales/manage/customers.php:309
 msgid "Update customer data"
 msgstr ""
 
-#: sales/manage/customers.php:307
+#: ../sales/manage/customers.php:310
 msgid "Select this customer and return to document entry."
 msgstr ""
 
-#: sales/manage/customers.php:308
+#: ../sales/manage/customers.php:311
 msgid "Delete Customer"
 msgstr ""
 
-#: sales/manage/customers.php:309
+#: ../sales/manage/customers.php:312
 msgid "Delete customer data if have been never used"
 msgstr ""
 
-#: sales/manage/customers.php:316
+#: ../sales/manage/customers.php:319
 msgid ""
 "There are no sales types defined. Please define at least one sales type "
 "before adding a customer."
 msgstr ""
 
-#: sales/manage/customers.php:325
+#: ../sales/manage/customers.php:328
 msgid "New customer"
 msgstr ""
 
-#: sales/manage/customers.php:346
-msgid "&Transactions"
-msgstr ""
-
-#: sales/manage/customers.php:347
+#: ../sales/manage/customers.php:350
 msgid "Sales &Orders"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:24
+#: ../sales/manage/recurrent_invoices.php:24
 msgid "Recurrent Invoices"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:36
+#: ../sales/manage/recurrent_invoices.php:36
 msgid "The invoice description cannot be empty."
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:63
+#: ../sales/manage/recurrent_invoices.php:63
 msgid "Selected recurrent invoice has been updated"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:69
+#: ../sales/manage/recurrent_invoices.php:69
 msgid "New recurrent invoice has been added"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:86
+#: ../sales/manage/recurrent_invoices.php:86
 msgid "Selected recurrent invoice has been deleted"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:167
+#: ../sales/manage/recurrent_invoices.php:167
 msgid "Template:"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:176
+#: ../sales/manage/recurrent_invoices.php:176
 msgid "Days:"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:178
+#: ../sales/manage/recurrent_invoices.php:178
 msgid "Monthly:"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:180
+#: ../sales/manage/recurrent_invoices.php:180
 msgid "Begin:"
 msgstr ""
 
-#: sales/manage/recurrent_invoices.php:182
+#: ../sales/manage/recurrent_invoices.php:182
 msgid "End:"
 msgstr ""
 
-#: sales/manage/sales_areas.php:30
+#: ../sales/manage/sales_areas.php:30
 msgid "The area description cannot be empty."
 msgstr ""
 
-#: sales/manage/sales_areas.php:39
+#: ../sales/manage/sales_areas.php:39
 msgid "Selected sales area has been updated"
 msgstr ""
 
-#: sales/manage/sales_areas.php:44
+#: ../sales/manage/sales_areas.php:44
 msgid "New sales area has been added"
 msgstr ""
 
-#: sales/manage/sales_areas.php:62
+#: ../sales/manage/sales_areas.php:62
 msgid ""
 "Cannot delete this area because customer branches have been created using "
 "this area."
 msgstr ""
 
-#: sales/manage/sales_areas.php:68
+#: ../sales/manage/sales_areas.php:68
 msgid "Selected sales area has been deleted"
 msgstr ""
 
-#: sales/manage/sales_areas.php:88
+#: ../sales/manage/sales_areas.php:88
 msgid "Area Name"
 msgstr ""
 
-#: sales/manage/sales_areas.php:127
+#: ../sales/manage/sales_areas.php:127
 msgid "Area Name:"
 msgstr ""
 
-#: sales/manage/sales_groups.php:16
+#: ../sales/manage/sales_groups.php:16
 msgid "Sales Groups"
 msgstr ""
 
-#: sales/manage/sales_groups.php:30
+#: ../sales/manage/sales_groups.php:30
 msgid "The sales group description cannot be empty."
 msgstr ""
 
-#: sales/manage/sales_groups.php:39
+#: ../sales/manage/sales_groups.php:39
 msgid "Selected sales group has been updated"
 msgstr ""
 
-#: sales/manage/sales_groups.php:44
+#: ../sales/manage/sales_groups.php:44
 msgid "New sales group has been added"
 msgstr ""
 
-#: sales/manage/sales_groups.php:62
+#: ../sales/manage/sales_groups.php:62
 msgid ""
 "Cannot delete this group because customers have been created using this "
 "group."
 msgstr ""
 
-#: sales/manage/sales_groups.php:67
+#: ../sales/manage/sales_groups.php:67
 msgid "Selected sales group has been deleted"
 msgstr ""
 
-#: sales/manage/sales_groups.php:85 sales/manage/sales_groups.php:120
+#: ../sales/manage/sales_groups.php:85
+#: ../sales/manage/sales_groups.php:120
 msgid "ID"
 msgstr ""
 
-#: sales/manage/sales_groups.php:123
+#: ../sales/manage/sales_groups.php:123
 msgid "Group Name:"
 msgstr ""
 
-#: sales/manage/sales_people.php:16
+#: ../sales/manage/sales_people.php:16
 msgid "Sales Persons"
 msgstr ""
 
-#: sales/manage/sales_people.php:32
+#: ../sales/manage/sales_people.php:32
 msgid "The sales person name cannot be empty."
 msgstr ""
 
-#: sales/manage/sales_people.php:38
+#: ../sales/manage/sales_people.php:38
 msgid "Salesman provision cannot be less than 0 or more than 100%."
 msgstr ""
 
-#: sales/manage/sales_people.php:43
+#: ../sales/manage/sales_people.php:43
 msgid "Salesman provision breakpoint must be numeric and not less than 0."
 msgstr ""
 
-#: sales/manage/sales_people.php:62
+#: ../sales/manage/sales_people.php:62
 msgid "Selected sales person data have been updated"
 msgstr ""
 
-#: sales/manage/sales_people.php:64
+#: ../sales/manage/sales_people.php:64
 msgid "New sales person data have been added"
 msgstr ""
 
-#: sales/manage/sales_people.php:76
+#: ../sales/manage/sales_people.php:76
 msgid ""
 "Cannot delete this sales-person because branches are set up referring to "
 "this sales-person - first alter the branches concerned."
 msgstr ""
 
-#: sales/manage/sales_people.php:81
+#: ../sales/manage/sales_people.php:81
 msgid "Selected sales person data have been deleted"
 msgstr ""
 
-#: sales/manage/sales_people.php:155
+#: ../sales/manage/sales_people.php:155
 msgid "Sales person name:"
 msgstr ""
 
-#: sales/manage/sales_people.php:156
+#: ../sales/manage/sales_people.php:156
 msgid "Telephone number:"
 msgstr ""
 
-#: sales/manage/sales_people.php:157
+#: ../sales/manage/sales_people.php:157
 msgid "Fax number:"
 msgstr ""
 
-#: sales/manage/sales_people.php:160
+#: ../sales/manage/sales_people.php:160
 msgid "Break Pt.:"
 msgstr ""
 
-#: sales/manage/sales_points.php:16
+#: ../sales/manage/sales_points.php:16
 msgid "POS settings"
 msgstr ""
 
-#: sales/manage/sales_points.php:28
+#: ../sales/manage/sales_points.php:28
 msgid "The POS name cannot be empty."
 msgstr ""
 
-#: sales/manage/sales_points.php:41
+#: ../sales/manage/sales_points.php:41
 msgid "New point of sale has been added"
 msgstr ""
 
-#: sales/manage/sales_points.php:52
+#: ../sales/manage/sales_points.php:52
 msgid "Selected point of sale has been updated"
 msgstr ""
 
-#: sales/manage/sales_points.php:62
+#: ../sales/manage/sales_points.php:62
 msgid "Cannot delete this POS because it is used in users setup."
 msgstr ""
 
-#: sales/manage/sales_points.php:65
+#: ../sales/manage/sales_points.php:65
 msgid "Selected point of sale has been deleted"
 msgstr ""
 
-#: sales/manage/sales_points.php:84
+#: ../sales/manage/sales_points.php:84
 msgid "POS Name"
 msgstr ""
 
-#: sales/manage/sales_points.php:84
+#: ../sales/manage/sales_points.php:84
 msgid "Credit sale"
 msgstr ""
 
-#: sales/manage/sales_points.php:84
+#: ../sales/manage/sales_points.php:84
 msgid "Cash sale"
 msgstr ""
 
-#: sales/manage/sales_points.php:84
+#: ../sales/manage/sales_points.php:84
 msgid "Default account"
 msgstr ""
 
-#: sales/manage/sales_points.php:110
+#: ../sales/manage/sales_points.php:110
 msgid "To have cash POS first define at least one cash bank account."
 msgstr ""
 
-#: sales/manage/sales_points.php:129
+#: ../sales/manage/sales_points.php:129
 msgid "Point of Sale Name"
 msgstr ""
 
-#: sales/manage/sales_points.php:131
+#: ../sales/manage/sales_points.php:131
 msgid "Allowed credit sale terms selection:"
 msgstr ""
 
-#: sales/manage/sales_points.php:132
+#: ../sales/manage/sales_points.php:132
 msgid "Allowed cash sale terms selection:"
 msgstr ""
 
-#: sales/manage/sales_points.php:133
+#: ../sales/manage/sales_points.php:133
 msgid "Default cash account"
 msgstr ""
 
-#: sales/manage/sales_points.php:139
+#: ../sales/manage/sales_points.php:139
 msgid "POS location"
 msgstr ""
 
-#: sales/manage/sales_types.php:28
+#: ../sales/manage/sales_types.php:28
 msgid "The sales type description cannot be empty."
 msgstr ""
 
-#: sales/manage/sales_types.php:35
+#: ../sales/manage/sales_types.php:35
 msgid "Calculation factor must be valid positive number."
 msgstr ""
 
-#: sales/manage/sales_types.php:48
+#: ../sales/manage/sales_types.php:48
 msgid "New sales type has been added"
 msgstr ""
 
-#: sales/manage/sales_types.php:59
+#: ../sales/manage/sales_types.php:59
 msgid "Selected sales type has been updated"
 msgstr ""
 
-#: sales/manage/sales_types.php:71
+#: ../sales/manage/sales_types.php:71
 msgid ""
 "Cannot delete this sale type because customer transactions have been created "
 "using this sales type."
 msgstr ""
 
-#: sales/manage/sales_types.php:78
+#: ../sales/manage/sales_types.php:78
 msgid ""
 "Cannot delete this sale type because customers are currently set up to use "
 "this sales type."
 msgstr ""
 
-#: sales/manage/sales_types.php:83
+#: ../sales/manage/sales_types.php:83
 msgid "Selected sales type has been deleted"
 msgstr ""
 
-#: sales/manage/sales_types.php:103
+#: ../sales/manage/sales_types.php:103
 msgid "Type Name"
 msgstr ""
 
-#: sales/manage/sales_types.php:103
+#: ../sales/manage/sales_types.php:103
 msgid "Factor"
 msgstr ""
 
-#: sales/manage/sales_types.php:103
+#: ../sales/manage/sales_types.php:103
 msgid "Tax Incl"
 msgstr ""
 
-#: sales/manage/sales_types.php:117
+#: ../sales/manage/sales_types.php:117
 msgid "Base"
 msgstr ""
 
-#: sales/manage/sales_types.php:128
+#: ../sales/manage/sales_types.php:128
 msgid ""
 "Marked sales type is the company base pricelist for prices calculations."
 msgstr ""
 
-#: sales/manage/sales_types.php:154
+#: ../sales/manage/sales_types.php:154
 msgid "Sales Type Name"
 msgstr ""
 
-#: sales/manage/sales_types.php:155
+#: ../sales/manage/sales_types.php:155
 msgid "Calculation factor"
 msgstr ""
 
-#: sales/manage/sales_types.php:156
+#: ../sales/manage/sales_types.php:156
 msgid "Tax included"
 msgstr ""
 
-#: sales/view/view_credit.php:24
+#: ../sales/view/view_credit.php:24
 msgid "View Credit Note"
 msgstr ""
 
-#: sales/view/view_credit.php:39
+#: ../sales/view/view_credit.php:39
 #, php-format
 msgid "CREDIT NOTE #%d"
 msgstr ""
 
-#: sales/view/view_credit.php:126
+#: ../sales/view/view_credit.php:126
 msgid "There are no line items on this credit note."
 msgstr ""
 
-#: sales/view/view_credit.php:138 sales/view/view_dispatch.php:155
-#: sales/view/view_invoice.php:159 sales/view/view_sales_order.php:245
-#: sales/includes/ui/sales_credit_ui.inc:222
-msgid "Shipping"
-msgstr ""
-
-#: sales/view/view_credit.php:143
-msgid "TOTAL CREDIT"
-msgstr ""
-
-#: sales/view/view_dispatch.php:23
+#: ../sales/view/view_dispatch.php:23
 msgid "View Sales Dispatch"
 msgstr ""
 
-#: sales/view/view_dispatch.php:43
+#: ../sales/view/view_dispatch.php:43
 #, php-format
 msgid "DISPATCH NOTE #%d"
 msgstr ""
 
-#: sales/view/view_dispatch.php:65 sales/view/view_invoice.php:67
+#: ../sales/view/view_dispatch.php:65
+#: ../sales/view/view_invoice.php:67
 msgid "Charge Branch"
 msgstr ""
 
-#: sales/view/view_dispatch.php:91 sales/view/view_invoice.php:91
-#: sales/view/view_sales_order.php:63
+#: ../sales/view/view_dispatch.php:91
+#: ../sales/view/view_invoice.php:91
+#: ../sales/view/view_sales_order.php:63
 msgid "Customer Order Ref."
 msgstr ""
 
-#: sales/view/view_dispatch.php:96
+#: ../sales/view/view_dispatch.php:96
 msgid "Dispatch Date"
 msgstr ""
 
-#: sales/view/view_dispatch.php:151
+#: ../sales/view/view_dispatch.php:151
 msgid "There are no line items on this dispatch."
 msgstr ""
 
-#: sales/view/view_dispatch.php:162
+#: ../sales/view/view_dispatch.php:162
 msgid "TOTAL VALUE"
 msgstr ""
 
-#: sales/view/view_dispatch.php:166
+#: ../sales/view/view_dispatch.php:166
 msgid "This dispatch has been voided."
 msgstr ""
 
-#: sales/view/view_invoice.php:23
+#: ../sales/view/view_invoice.php:23
 msgid "View Sales Invoice"
 msgstr ""
 
-#: sales/view/view_invoice.php:45
+#: ../sales/view/view_invoice.php:45
 #, php-format
 msgid "FINAL INVOICE #%d"
 msgstr ""
 
-#: sales/view/view_invoice.php:45
+#: ../sales/view/view_invoice.php:45
 #, php-format
 msgid "PREPAYMENT INVOICE #%d"
 msgstr ""
 
-#: sales/view/view_invoice.php:45
+#: ../sales/view/view_invoice.php:45
 #, php-format
 msgid "SALES INVOICE #%d"
 msgstr ""
 
-#: sales/view/view_invoice.php:154
+#: ../sales/view/view_invoice.php:154
 msgid "There are no line items on this invoice."
 msgstr ""
 
-#: sales/view/view_receipt.php:24
+#: ../sales/view/view_receipt.php:24
 msgid "View Customer Payment"
 msgstr ""
 
-#: sales/view/view_receipt.php:33
+#: ../sales/view/view_receipt.php:33
 #, php-format
 msgid "Customer Payment #%d"
 msgstr ""
 
-#: sales/view/view_receipt.php:38
+#: ../sales/view/view_receipt.php:38
 msgid "From Customer"
 msgstr ""
 
-#: sales/view/view_receipt.php:39
+#: ../sales/view/view_receipt.php:40
+msgid "Date of Deposit"
+msgstr ""
+
+#: ../sales/view/view_receipt.php:43
+msgid "Customer Currency"
+msgstr ""
+
+#: ../sales/view/view_receipt.php:48
 msgid "Into Bank Account"
 msgstr ""
 
-#: sales/view/view_receipt.php:40
-msgid "Date of Deposit"
+#: ../sales/view/view_receipt.php:49
+msgid "Bank Amount"
 msgstr ""
 
-#: sales/view/view_receipt.php:56
+#: ../sales/view/view_receipt.php:56
 msgid "This customer payment has been voided."
 msgstr ""
 
-#: sales/view/view_sales_order.php:28
+#: ../sales/view/view_sales_order.php:28
 msgid "View Sales Quotation"
 msgstr ""
 
-#: sales/view/view_sales_order.php:29
+#: ../sales/view/view_sales_order.php:29
 #, php-format
 msgid "Sales Quotation #%d"
 msgstr ""
 
-#: sales/view/view_sales_order.php:33
+#: ../sales/view/view_sales_order.php:33
 msgid "View Sales Order"
 msgstr ""
 
-#: sales/view/view_sales_order.php:34
+#: ../sales/view/view_sales_order.php:34
 #, php-format
 msgid "Sales Order #%d"
 msgstr ""
 
-#: sales/view/view_sales_order.php:49
+#: ../sales/view/view_sales_order.php:49
 msgid "Order Information"
 msgstr ""
 
-#: sales/view/view_sales_order.php:60
+#: ../sales/view/view_sales_order.php:60
 msgid "Customer Name"
 msgstr ""
 
-#: sales/view/view_sales_order.php:64
+#: ../sales/view/view_sales_order.php:64
 msgid "Deliver To Branch"
 msgstr ""
 
-#: sales/view/view_sales_order.php:71
+#: ../sales/view/view_sales_order.php:71
 msgid "Requested Delivery"
 msgstr ""
 
-#: sales/view/view_sales_order.php:75
+#: ../sales/view/view_sales_order.php:75
 msgid "Deliver From Location"
 msgstr ""
 
-#: sales/view/view_sales_order.php:83
-msgid "Required Pre-Payment"
-msgstr ""
-
-#: sales/view/view_sales_order.php:86
+#: ../sales/view/view_sales_order.php:86
 msgid "Non-Invoiced Prepayments"
 msgstr ""
 
-#: sales/view/view_sales_order.php:87
+#: ../sales/view/view_sales_order.php:87
 msgid "All Payments Allocated"
 msgstr ""
 
-#: sales/view/view_sales_order.php:95
+#: ../sales/view/view_sales_order.php:95
 msgid "Telephone"
 msgstr ""
 
-#: sales/view/view_sales_order.php:215
+#: ../sales/view/view_sales_order.php:215
 msgid "This Sales Order is used as a Template."
 msgstr ""
 
-#: sales/view/view_sales_order.php:220
+#: ../sales/view/view_sales_order.php:220
 msgid "Quantity Delivered"
 msgstr ""
 
-#: sales/inquiry/customer_allocation_inquiry.php:25
+#: ../sales/inquiry/customer_allocation_inquiry.php:25
 msgid "Customer Allocation Inquiry"
 msgstr ""
 
-#: sales/inquiry/customer_allocation_inquiry.php:96
+#: ../sales/inquiry/customer_allocation_inquiry.php:96
 msgid "Allocation"
 msgstr ""
 
-#: sales/inquiry/customer_allocation_inquiry.php:116
+#: ../sales/inquiry/customer_allocation_inquiry.php:116
 msgid "Payment"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:26
+#: ../sales/inquiry/customer_inquiry.php:26
 msgid "Customer Transactions"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:68
+#: ../sales/inquiry/customer_inquiry.php:68
 msgid "CUSTOMER ACCOUNT IS ON HOLD"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:181
+#: ../sales/inquiry/customer_inquiry.php:181
 msgid "Print Receipt"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:211
-#: sales/inquiry/customer_inquiry.php:224
+#: ../sales/inquiry/customer_inquiry.php:211
+#: ../sales/inquiry/customer_inquiry.php:224
 msgid "RB"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:29
+#: ../sales/inquiry/sales_deliveries_view.php:29
 msgid "Search Not Invoiced Deliveries"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:34
+#: ../sales/inquiry/sales_deliveries_view.php:34
 msgid "Search All Deliveries"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:70
+#: ../sales/inquiry/sales_deliveries_view.php:70
 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:179
+#: ../sales/inquiry/sales_deliveries_view.php:179
 msgid "Delivery #"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:185
+#: ../sales/inquiry/sales_deliveries_view.php:185
 msgid "Cust Ref"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:187
+#: ../sales/inquiry/sales_deliveries_view.php:187
 msgid "Due By"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:188
+#: ../sales/inquiry/sales_deliveries_view.php:188
 msgid "Delivery Total"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:190
+#: ../sales/inquiry/sales_deliveries_view.php:190
 msgid "Batch"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:190
+#: ../sales/inquiry/sales_deliveries_view.php:190
 msgid "Batch Invoicing"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:44
+#: ../sales/inquiry/sales_orders_view.php:44
+#: ../sales/inquiry/sales_orders_view.php.orig:44
 msgid "Search Outstanding Sales Orders"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:49
+#: ../sales/inquiry/sales_orders_view.php:49
+#: ../sales/inquiry/sales_orders_view.php.orig:49
 msgid "Search Template for Invoicing"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:54
+#: ../sales/inquiry/sales_orders_view.php:54
+#: ../sales/inquiry/sales_orders_view.php.orig:54
 msgid "Select Template for Delivery"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:59
+#: ../sales/inquiry/sales_orders_view.php:59
+#: ../sales/inquiry/sales_orders_view.php.orig:59
 msgid "Invoicing Prepayment Orders"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:64
+#: ../sales/inquiry/sales_orders_view.php:64
+#: ../sales/inquiry/sales_orders_view.php.orig:64
 msgid "Search All Sales Orders"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:70
+#: ../sales/inquiry/sales_orders_view.php:70
+#: ../sales/inquiry/sales_orders_view.php.orig:70
 msgid "Search All Sales Quotations"
 msgstr ""
 
-#: sales/includes/cart_class.inc:390
+#: ../sales/inquiry/sales_orders_view.php:148
+#: ../sales/inquiry/sales_orders_view.php.orig:148
+msgid "Dispatch"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php:191
+#: ../sales/inquiry/sales_orders_view.php.orig:191
+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.orig:200
+msgid "Prepayment Invoice"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php:200
+#: ../sales/inquiry/sales_orders_view.php.orig:200
+msgid "Final Invoice"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php.orig:267
+msgid "Show All:"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php.orig:284
+msgid "Order #"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php.orig:288
+#: ../sales/inquiry/sales_orders_view.php.orig:302
+msgid "Cust Order Ref"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php.orig:291
+#: ../sales/inquiry/sales_orders_view.php.orig:305
+msgid "Delivery To"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php.orig:298
+msgid "Quote #"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php.orig:303
+msgid "Quote Date"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php.orig:306
+msgid "Quote Total"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php.orig:337
+msgid "Tmpl"
+msgstr ""
+
+#: ../sales/includes/cart_class.inc:391
 msgid "You have to enter valid stock code or nonempty description"
 msgstr ""
 
-#: sales/includes/sales_ui.inc:50
+#: ../sales/includes/sales_ui.inc:50
 msgid ""
 "This edit session has been abandoned by opening sales document in another "
 "browser tab. You cannot edit more than one sales document at once."
 msgstr ""
 
-#: sales/includes/db/custalloc_db.inc:351
+#: ../sales/includes/db/custalloc_db.inc:351
 msgid ""
 "Unsuspected overallocation happened due to sparse credit notes exists for "
 "this invoice.\n"
@@ -12678,350 +15192,401 @@ msgid ""
 "charges."
 msgstr ""
 
-#: sales/includes/db/sales_invoice_db.inc:196
-msgid "Cash invoice"
-msgstr ""
-
-#: sales/includes/db/sales_order_db.inc:109
-#: sales/includes/db/sales_order_db.inc:271
+#: ../sales/includes/db/old.sales_order_db.inc:107
+#: ../sales/includes/db/old.sales_order_db.inc:259
+#: ../sales/includes/db/sales_order_db.inc:109
+#: ../sales/includes/db/sales_order_db.inc:287
 msgid "Stocks below Re-Order Level at "
 msgstr ""
 
-#: sales/includes/db/sales_order_db.inc:112
-#: sales/includes/db/sales_order_db.inc:276
+#: ../sales/includes/db/old.sales_order_db.inc:110
+#: ../sales/includes/db/old.sales_order_db.inc:264
+#: ../sales/includes/db/sales_order_db.inc:112
+#: ../sales/includes/db/sales_order_db.inc:292
 msgid "Below"
 msgstr ""
 
-#: sales/includes/db/sales_order_db.inc:113
-#: sales/includes/db/sales_order_db.inc:277
+#: ../sales/includes/db/old.sales_order_db.inc:111
+#: ../sales/includes/db/old.sales_order_db.inc:265
+#: ../sales/includes/db/sales_order_db.inc:113
+#: ../sales/includes/db/sales_order_db.inc:293
 msgid "Please reorder"
 msgstr ""
 
-#: sales/includes/db/sales_order_db.inc:141
+#: ../sales/includes/db/old.sales_order_db.inc:139
+#: ../sales/includes/db/sales_order_db.inc:141
 msgid "Deleted."
 msgstr ""
 
-#: sales/includes/ui/sales_credit_ui.inc:94
-#: sales/includes/ui/sales_order_ui.inc:386
+#: ../sales/includes/db/sales_invoice_db.inc:198
+msgid "Cash invoice"
+msgstr ""
+
+#: ../sales/includes/ui/sales_credit_ui.inc:94
+#: ../sales/includes/ui/sales_order_ui.inc:385
 msgid "Customer Currency:"
 msgstr ""
 
-#: sales/includes/ui/sales_credit_ui.inc:112
-#: sales/includes/ui/sales_order_ui.inc:654
+#: ../sales/includes/ui/sales_credit_ui.inc:112
+#: ../sales/includes/ui/sales_order_ui.inc:653
 msgid "Shipping Company:"
 msgstr ""
 
-#: sales/includes/ui/sales_credit_ui.inc:114
-#: sales/includes/ui/sales_order_ui.inc:393
+#: ../sales/includes/ui/sales_credit_ui.inc:114
+#: ../sales/includes/ui/sales_order_ui.inc:392
 msgid "Customer Discount:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:61
+#: ../sales/includes/ui/sales_order_ui.inc:61
 msgid "This item is already on this document. You have been warned."
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:106
+#: ../sales/includes/ui/sales_order_ui.inc:106
 msgid ""
 "The selected customer and branch are not valid, or the customer does not "
 "have any branches."
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:231
+#: ../sales/includes/ui/sales_order_ui.inc:231
 msgid "Shipping Charge"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:304
+#: ../sales/includes/ui/sales_order_ui.inc:304
 msgid "No customer found for entered text."
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:330
+#: ../sales/includes/ui/sales_order_ui.inc:330
 #, php-format
 msgid "Customer's payment terms '%s' cannot be selected on this POS"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:380
+#: ../sales/includes/ui/sales_order_ui.inc:379
 msgid "Reference number unique for this document type"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:420
-#: sales/includes/ui/sales_order_ui.inc:422
+#: ../sales/includes/ui/sales_order_ui.inc:419
+#: ../sales/includes/ui/sales_order_ui.inc:421
 msgid "Price List:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:439
+#: ../sales/includes/ui/sales_order_ui.inc:438
 msgid "Date of order receive"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:589
+#: ../sales/includes/ui/sales_order_ui.inc:588
 msgid "Cash payment"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:592
-#: sales/includes/ui/sales_order_ui.inc:624
+#: ../sales/includes/ui/sales_order_ui.inc:591
+#: ../sales/includes/ui/sales_order_ui.inc:623
 msgid "Deliver from Location:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:595
+#: ../sales/includes/ui/sales_order_ui.inc:594
 msgid "Cash account:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:602
+#: ../sales/includes/ui/sales_order_ui.inc:601
 msgid "Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:607
+#: ../sales/includes/ui/sales_order_ui.inc:606
 msgid "Invoice Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:608
+#: ../sales/includes/ui/sales_order_ui.inc:607
 msgid "Invoice before"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:612
+#: ../sales/includes/ui/sales_order_ui.inc:611
 msgid "Quotation Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:617
+#: ../sales/includes/ui/sales_order_ui.inc:616
 msgid "Order Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:618
-msgid "Required Delivery Date"
-msgstr ""
-
-#: sales/includes/ui/sales_order_ui.inc:629
-#: sales/includes/ui/sales_order_ui.inc:631
-msgid "Pre-Payment Required:"
-msgstr ""
-
-#: sales/includes/ui/sales_order_ui.inc:638
+#: ../sales/includes/ui/sales_order_ui.inc:637
 msgid "Enter requested day of delivery"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:639
+#: ../sales/includes/ui/sales_order_ui.inc:638
 msgid "Enter Valid until Date"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:640
+#: ../sales/includes/ui/sales_order_ui.inc:639
 msgid "Deliver To:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:641
+#: ../sales/includes/ui/sales_order_ui.inc:640
 msgid "Additional identifier for delivery e.g. name of receiving person"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:644
+#: ../sales/includes/ui/sales_order_ui.inc:643
 msgid "Delivery address. Default is address of customer branch"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:648
+#: ../sales/includes/ui/sales_order_ui.inc:647
 msgid "Contact Phone Number:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:649
+#: ../sales/includes/ui/sales_order_ui.inc:648
 msgid "Phone number of ordering person. Defaults to branch phone number"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:650
+#: ../sales/includes/ui/sales_order_ui.inc:649
 msgid "Customer Reference:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:651
+#: ../sales/includes/ui/sales_order_ui.inc:650
 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 ""
 
-#: taxes/item_tax_types.php:35
+#: ../taxes/item_tax_types.php:35
 msgid "The item tax type description cannot be empty."
 msgstr ""
 
-#: taxes/item_tax_types.php:60
+#: ../taxes/item_tax_types.php:60
 msgid "Selected item tax type has been updated"
 msgstr ""
 
-#: taxes/item_tax_types.php:65
+#: ../taxes/item_tax_types.php:65
 msgid "New item tax type has been added"
 msgstr ""
 
-#: taxes/item_tax_types.php:77
+#: ../taxes/item_tax_types.php:77
 msgid ""
 "Cannot delete this item tax type because items have been created referring "
 "to it."
 msgstr ""
 
-#: taxes/item_tax_types.php:82
+#: ../taxes/item_tax_types.php:82
 msgid ""
 "Cannot delete this item tax type because item categories have been created "
 "referring to it."
 msgstr ""
 
-#: taxes/item_tax_types.php:98
+#: ../taxes/item_tax_types.php:98
 msgid "Selected item tax type has been deleted"
 msgstr ""
 
-#: taxes/item_tax_types.php:117
+#: ../taxes/item_tax_types.php:117
 msgid "Tax exempt"
 msgstr ""
 
-#: taxes/item_tax_types.php:175
+#: ../taxes/item_tax_types.php:175
 msgid "Is Fully Tax-exempt:"
 msgstr ""
 
-#: taxes/item_tax_types.php:182
+#: ../taxes/item_tax_types.php:182
 msgid "Select which taxes this item tax type is exempt from."
 msgstr ""
 
-#: taxes/item_tax_types.php:185
+#: ../taxes/item_tax_types.php:185
 msgid "Tax Name"
 msgstr ""
 
-#: taxes/item_tax_types.php:185
+#: ../taxes/item_tax_types.php:185
 msgid "Is exempt"
 msgstr ""
 
-#: taxes/tax_groups.php:17
-msgid "Tax Groups"
+#: ../taxes/sav.tax_types.php:21
+#: ../taxes/tax_types.php:16
+msgid "Tax Types"
 msgstr ""
 
-#: taxes/tax_groups.php:27
-msgid ""
-"There are no tax types defined. Define tax types before defining tax groups."
+#: ../taxes/sav.tax_types.php:60
+#: ../taxes/tax_types.php:30
+msgid "The tax type name cannot be empty."
 msgstr ""
 
-#: taxes/tax_groups.php:40
-msgid "The tax group name cannot be empty."
+#: ../taxes/sav.tax_types.php:66
+#: ../taxes/tax_types.php:36
+msgid "The default tax rate must be numeric and not less than zero."
 msgstr ""
 
-#: taxes/tax_groups.php:60
-msgid "Selected tax group has been updated"
+#: ../taxes/sav.tax_types.php:72
+#: ../taxes/tax_types.php:42
+msgid "Selected GL Accounts cannot be used by another tax type."
 msgstr ""
 
-#: taxes/tax_groups.php:65
-msgid "New tax group has been added"
+#: ../taxes/sav.tax_types.php:86
+#: ../taxes/tax_types.php:56
+msgid "New tax type has been added"
 msgstr ""
 
-#: taxes/tax_groups.php:80
+#: ../taxes/sav.tax_types.php:97
+#: ../taxes/tax_types.php:67
+msgid "Selected tax type has been updated"
+msgstr ""
+
+#: ../taxes/sav.tax_types.php:107
+#: ../taxes/tax_types.php:77
 msgid ""
-"Cannot delete this tax group because customer branches been created "
-"referring to it."
+"Cannot delete this tax type because tax groups been created referring to it."
 msgstr ""
 
-#: taxes/tax_groups.php:86
+#: ../taxes/sav.tax_types.php:141
+#: ../taxes/tax_types.php:94
+msgid "Selected tax type has been deleted"
+msgstr ""
+
+#: ../taxes/sav.tax_types.php:164
 msgid ""
-"Cannot delete this tax group because suppliers been created referring to it."
+"Start new tax regulations span below, then select new span and edit tax "
+"rates as needed."
 msgstr ""
 
-#: taxes/tax_groups.php:103
-msgid "Selected tax group has been deleted"
+#: ../taxes/sav.tax_types.php:167
+msgid "Tax span begin:"
 msgstr ""
 
-#: taxes/tax_groups.php:166
-msgid "Select the taxes that are included in this group."
+#: ../taxes/sav.tax_types.php:168
+msgid "Tax span end:"
 msgstr ""
 
-#: taxes/tax_groups.php:171
-msgid "Shipping Tax"
+#: ../taxes/sav.tax_types.php:172
+msgid "Add new span"
 msgstr ""
 
-#: taxes/tax_types.php:16
-msgid "Tax Types"
+#: ../taxes/sav.tax_types.php:182
+msgid "Tax regulations span:"
 msgstr ""
 
-#: taxes/tax_types.php:30
-msgid "The tax type name cannot be empty."
+#: ../taxes/sav.tax_types.php:183
+msgid "Add new tax sub-period"
 msgstr ""
 
-#: taxes/tax_types.php:36
-msgid "The default tax rate must be numeric and not less than zero."
+#: ../taxes/sav.tax_types.php:187
+#: ../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/tax_types.php:42
-msgid "Selected GL Accounts cannot be used by another tax type."
+#: ../taxes/sav.tax_types.php:190
+msgid "Rate (%)"
 msgstr ""
 
-#: taxes/tax_types.php:56
-msgid "New tax type has been added"
+#: ../taxes/sav.tax_types.php:190
+#: ../taxes/tax_types.php:116
+msgid "Sales GL Account"
 msgstr ""
 
-#: taxes/tax_types.php:67
-msgid "Selected tax type has been updated"
+#: ../taxes/sav.tax_types.php:190
+#: ../taxes/tax_types.php:116
+msgid "Purchasing GL Account"
 msgstr ""
 
-#: taxes/tax_types.php:77
-msgid ""
-"Cannot delete this tax type because tax groups been created referring to it."
+#: ../taxes/sav.tax_types.php:205
+msgid "Exempt"
 msgstr ""
 
-#: taxes/tax_types.php:94
-msgid "Selected tax type has been deleted"
+#: ../taxes/sav.tax_types.php:242
+#: ../taxes/tax_types.php:159
+msgid "Default Rate:"
 msgstr ""
 
-#: taxes/tax_types.php:112
+#: ../taxes/sav.tax_types.php:244
+#: ../taxes/tax_types.php:161
+msgid "Sales GL Account:"
+msgstr ""
+
+#: ../taxes/sav.tax_types.php:245
+#: ../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 ""
-"To avoid problems with manual journal entry all tax types should have unique "
-"Sales/Purchasing GL accounts."
+"There are no tax types defined. Define tax types before defining tax groups."
 msgstr ""
 
-#: taxes/tax_types.php:115
-msgid "Default Rate (%)"
+#: ../taxes/tax_groups.php:40
+msgid "The tax group name cannot be empty."
 msgstr ""
 
-#: taxes/tax_types.php:116
-msgid "Sales GL Account"
+#: ../taxes/tax_groups.php:60
+msgid "Selected tax group has been updated"
 msgstr ""
 
-#: taxes/tax_types.php:116
-msgid "Purchasing GL Account"
+#: ../taxes/tax_groups.php:65
+msgid "New tax group has been added"
 msgstr ""
 
-#: taxes/tax_types.php:159
-msgid "Default Rate:"
+#: ../taxes/tax_groups.php:80
+msgid ""
+"Cannot delete this tax group because customer branches been created "
+"referring to it."
 msgstr ""
 
-#: taxes/tax_types.php:161
-msgid "Sales GL Account:"
+#: ../taxes/tax_groups.php:86
+msgid ""
+"Cannot delete this tax group because suppliers been created referring to it."
 msgstr ""
 
-#: taxes/tax_types.php:162
-msgid "Purchasing GL Account:"
+#: ../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:28
 msgid "Main Menu"
 msgstr ""
 
-#: themes/default/renderer.php:71 themes/default/renderer.php:81
+#: ../themes/default/renderer.php:71
+#: ../themes/default/renderer.php:81
 msgid "Help"
 msgstr ""
 
-#: themes/default/renderer.php:76
+#: ../themes/default/renderer.php:76
 msgid "Preferences"
 msgstr ""
 
-#: sql/alter2.1.php:18
+#: ../sql/alter2.1.php:18
 msgid "Upgrade from version 2.0 to 2.1"
 msgstr ""
 
-#: sql/alter2.1.php:36
+#: ../sql/alter2.1.php:36
 msgid "Cannot retrieve bank accounts codes"
 msgstr ""
 
-#: sql/alter2.1.php:44
+#: ../sql/alter2.1.php:44
 msgid "Cannot update bank transactions"
 msgstr ""
 
-#: sql/alter2.1.php:53
+#: ../sql/alter2.1.php:53
 msgid "Cannot select stock identificators"
 msgstr ""
 
-#: sql/alter2.1.php:64
+#: ../sql/alter2.1.php:64
 msgid "Cannot insert stock id into item_codes"
 msgstr ""
 
-#: sql/alter2.1.php:140
+#: ../sql/alter2.1.php:140
 msgid ""
 "Seems that system upgrade to version 2.1 has \n"
 "\t\t\tbeen performed for this company already.<br> If something has gone \n"
@@ -13029,28 +15594,28 @@ msgid ""
 "\t\t\tdatabase restore from last backup file first."
 msgstr ""
 
-#: sql/alter2.2.php:23
+#: ../sql/alter2.2.php:23
 msgid "Upgrade from version 2.1/2.2beta to 2.2"
 msgstr ""
 
-#: sql/alter2.2.php:85
+#: ../sql/alter2.2.php:85
 msgid "Cannot query max sales order number."
 msgstr ""
 
-#: sql/alter2.2.php:96
+#: ../sql/alter2.2.php:96
 msgid "Cannot store next sales order reference."
 msgstr ""
 
-#: sql/alter2.2.php:251
+#: ../sql/alter2.2.php:251
 msgid ""
 "Cannot upgrade extensions system: file /modules/installed_modules.php is not "
 "writeable"
 msgstr ""
 
-#: sql/alter2.3.php:20
+#: ../sql/alter2.3.php:20
 msgid "Upgrade from version 2.2 to 2.3"
 msgstr ""
 
-#: sql/alter2.4.php:19
+#: ../sql/alter2.4.php:19
 msgid "Upgrade from version 2.3 to 2.4"
 msgstr ""

diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc
index 9bfebb758d920995ea1df620df42d58cbfb81e0e..c9a352e1f9b93408dd460a25527c4d66f1cc25e3 100644 (file)
--- a/manufacturing/includes/db/work_orders_db.inc
+++ b/manufacturing/includes/db/work_orders_db.inc
@@ -252,14 +252,8 @@ function void_work_order($woid)
                        // clear the production record
                        $sql = "UPDATE ".TB_PREF."wo_manufacture SET quantity=0 WHERE id=".$$row['id'];
                        db_query($sql, "Cannot void a wo production");
-                       
-                       //Post voided entry if not prevoided explicitly
-                       $void_entry = get_voided_entry(ST_MANURECEIVE, $row['id']);
-                       if ($void_entry)
-                               continue;
-                       $memo_ = _("Voiding Work Order Trans # ").$woid;
-                       add_audit_trail(ST_MANURECEIVE, $row['id'], today(), _("Voided.")."\n".$memo_);
-                       add_voided_entry(ST_MANURECEIVE, $row['id'], today(), $memo_);
+
+                       void_stock_move(ST_MANURECEIVE, $row['id']); // and void the stock moves; 
                }
 
                $result = get_work_order_issues($woid);

diff --git a/manufacturing/includes/db/work_orders_quick_db.inc b/manufacturing/includes/db/work_orders_quick_db.inc
index 33350aeb11c2197ff3ae5c2269e23854db729e56..2d1bd933d048d2f719006b7858d17f85a97f0b0a 100644 (file)
--- a/manufacturing/includes/db/work_orders_quick_db.inc
+++ b/manufacturing/includes/db/work_orders_quick_db.inc
@@ -66,6 +66,7 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type,
         db_query($sql, "The work order requirements could not be added");
 
                // insert a -ve stock move for each item
+               $UnitCost = get_standard_cost($bom_item["component"]);
                add_stock_move(ST_WORKORDER, $bom_item["component"], $woid,
                        $bom_item["loc_code"], $date_, $wo_ref, -$item_quantity, $UnitCost, 0, 1, $UnitCost);
        }
@@ -81,6 +82,10 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type,
        }
 
 
+       //Negative Stock Handling First; Prior to add_stock_move
+       if ($cost_adjust)
+               adjust_deliveries($stock_id, get_standard_cost($stock_id), $date_);
+
        // -------------------------------------------------------------------------
 
        // insert a +ve stock move for the item being manufactured

diff --git a/purchasing/allocations/supplier_allocate.php b/purchasing/allocations/supplier_allocate.php
index a501d0b34a23eb8b0ba248a867df4ac13786659c..a12494067783efe391fafe93f3ba8ec5fdfbf02f 100644 (file)
--- a/purchasing/allocations/supplier_allocate.php
+++ b/purchasing/allocations/supplier_allocate.php
@@ -37,6 +37,7 @@ function clear_allocations()
                unset($_SESSION['alloc']->allocs);
                unset($_SESSION['alloc']);
        }
+       //session_register("alloc");
 }
 //--------------------------------------------------------------------------------
 
@@ -46,17 +47,26 @@ function edit_allocations_for_transaction($type, $trans_no)
 
        start_form();
 
-    display_heading(_("Allocation of") . " " . $systypes_array[$_SESSION['alloc']->type] . " # " . $_SESSION['alloc']->trans_no);
+       $cart = $_SESSION['alloc'];
 
-       display_heading($_SESSION['alloc']->person_name);
+    display_heading(_("Allocation of") . " " . $systypes_array[$cart->type] . " # " . $cart->trans_no);
 
-    display_heading2(_("Date:") . " <b>" . $_SESSION['alloc']->date_ . "</b>");
-    display_heading2(_("Total:") . " <b>" . price_format(-$_SESSION['alloc']->amount) . "</b>");
+       display_heading($cart->person_name);
 
+    display_heading2(_("Date:") . " <b>" . $cart->date_ . "</b>");
+
+       display_heading2(_("Total:"). " <b>" . price_format(-$cart->bank_amount).' '.$cart->currency."</b>");
+
+       if ($cart->currency != $cart->person_curr)
+       {
+           $total = _("Total in clearing currency:") . " <b>" . price_format(-$cart->amount)."</b>"
+               . sprintf(" %s (%s %s/%s)", $cart->person_curr, exrate_format($cart->bank_amount/$cart->amount), $cart->currency, $cart->person_curr);
+       display_heading2($total);
+       }
     echo "<br>";
 
        div_start('alloc_tbl');
-    if (count($_SESSION['alloc']->allocs) > 0)
+    if (count($cart->allocs) > 0)
     {
                show_allocatable(true);
 
@@ -99,7 +109,7 @@ if (isset($_POST['Cancel']))
 
 if (isset($_GET['trans_no']) && isset($_GET['trans_type']))
 {
-       $_SESSION['alloc'] = new allocation($_GET['trans_type'], $_GET['trans_no']);
+       $_SESSION['alloc'] = new allocation($_GET['trans_type'], $_GET['trans_no'], @$_GET['supplier_id'], PT_SUPPLIER);
 }
 
 if (get_post('UpdateDisplay'))

diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php
index 3487767544f025f0dea620d3b5fdd2e1c012c49a..039db9a5094c41d775a3c2e6b47cbd1fac786a65 100644 (file)
--- a/purchasing/allocations/supplier_allocation_main.php
+++ b/purchasing/allocations/supplier_allocation_main.php
@@ -69,7 +69,7 @@ function alloc_link($row)
 {
        return pager_link(_("Allocate"),
                "/purchasing/allocations/supplier_allocate.php?trans_no="
-                       .$row["trans_no"] . "&trans_type=" . $row["type"], ICON_MONEY );
+                       .$row["trans_no"] . "&trans_type=" . $row["type"], ICON_ALLOC);
 }
 
 function amount_left($row)

diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc
index da4dedffb5977536a25a11fb996c59cdbae0fc15..94853b469f52bde3ddff3c66d3c5cdee5a279828 100644 (file)
--- a/purchasing/includes/db/grn_db.inc
+++ b/purchasing/includes/db/grn_db.inc
@@ -83,6 +83,7 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date,
                adjust_deliveries($stock_id, $price_in_home_currency_, $date);
        $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($material_cost)."
                WHERE stock_id=".db_escape($stock_id);
+
        db_query($sql,"The cost details for the inventory item could not be updated");
        return $material_cost;
 }
@@ -98,6 +99,8 @@ function add_grn(&$po)
        begin_transaction();
        hook_db_prewrite($po, ST_SUPPRECEIVE);
 
+       add_new_exchange_rate(get_supplier_currency($po->supplier_id), $date_, $po->ex_rate);
+
        $grn = add_grn_batch($po->order_no, $po->supplier_id, $po->reference, $po->Location, $date_);
 
     $clearing_act = get_company_pref('grn_clearing_act');

diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc
index 322c12911edb8ccf88deb88823f11cd90f26fa43..18939822d8676a704d579c3c1b4c9674573a25bd 100644 (file)
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -140,19 +140,22 @@ function add_supp_invoice(&$supp_trans) // do not receive as ref because we chan
 
        $supplier = get_supplier($supp_trans->supplier_id);
 
+       add_new_exchange_rate($supplier['curr_code'], $supp_trans->tran_date, $supp_trans->ex_rate);
+
     foreach ($taxes as $n => $taxitem)
     {
                $taxes[$n]['Value'] =  round2($taxitem['Value'], user_price_dec());
        $tax_total += $taxes[$n]['Value'];
     }
 
-       $invoice_items_total = $supp_trans->get_items_total(); // get total with/without tax dep. on tax_included
-//     $invoice_items_total = $supp_trans->get_total_taxfree($supp_trans->tax_group_id);
+       $invoice_items_total = $supp_trans->get_items_total();
 
-       if($supp_trans->tax_included==0) {
-               $item_added_tax = $tax_total;
-       } else {
-               $item_added_tax = 0;
+       $item_added_tax = 0;
+    if (!$supp_trans->tax_included)
+    {
+           $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id);
+           foreach ($taxes as $n => $taxitem)
+                       $item_added_tax += isset($taxitem['Override']) ? $taxitem['Override'] : round2($taxitem['Value'], user_price_dec());
        }
 
        if ($trans_type == ST_SUPPCREDIT)
@@ -177,7 +180,38 @@ function add_supp_invoice(&$supp_trans) // do not receive as ref because we chan
        $supp_trans->trans_no = $invoice_id;
 
        $total = 0;
-    /* Now the control account */
+
+    /* Now the TAX account */
+    $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id, 0, false);
+       $net_diff = 0;
+
+    foreach ($taxes as $taxitem)
+    {
+               if ($taxitem['Net'] != 0)
+               {
+                       if (isset($taxitem['Override'])) {
+                               if ($supp_trans->tax_included) { // if tax included, fix net amount to preserve overall line price
+                                       $net_diff += $taxitem['Override'] - $taxitem['Value'];
+                                       $taxitem['Net'] += $taxitem['Override'] - $taxitem['Value'];
+                               }
+                               $taxitem['Value'] = $taxitem['Override'];
+                       }
+                       add_trans_tax_details($trans_type, $invoice_id, 
+                               $taxitem['tax_type_id'], $taxitem['rate'], $supp_trans->tax_included, $taxitem['Value'],
+                               $taxitem['Net'], $ex_rate, $date_, $supp_trans->supp_reference);
+
+                       if ($trans_type == ST_SUPPCREDIT)
+                               $taxitem['Value'] = -$taxitem['Value'];
+                       $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_,
+                               $taxitem['purchasing_gl_code'], 0, 0, $taxitem['Value'],
+                               $supp_trans->supplier_id,
+                               "A general ledger transaction for the tax amount could not be added");
+               }
+    }
+    if ($trans_type == ST_SUPPCREDIT)
+               $net_diff = -$net_diff;
+
+    /* Now the AP account */
     $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $supplier["payable_account"], 0, 0,
                -($invoice_items_total +  $item_added_tax + $supp_trans->ov_discount),
                $supp_trans->supplier_id,
@@ -185,7 +219,6 @@ function add_supp_invoice(&$supp_trans) // do not receive as ref because we chan
 
     foreach ($supp_trans->gl_codes as $entered_gl_code)
     {
-
            /*GL Items are straight forward - just do the debit postings to the GL accounts specified -
            the credit is to creditors control act  done later for the total invoice value + tax*/
 
@@ -216,9 +249,22 @@ function add_supp_invoice(&$supp_trans) // do not receive as ref because we chan
                        $entered_grn->this_quantity_inv = -$entered_grn->this_quantity_inv;
                        set_grn_item_credited($entered_grn, $supp_trans->supplier_id, $invoice_id, $date_);
        }
-               $line_taxfree = $entered_grn->taxfree_charge_price($supp_trans->tax_group_id);
-               $line_tax = $entered_grn->full_charge_price($supp_trans->tax_group_id) - $line_taxfree;
+
+               // For tax included pricelist the net price is calculated down from tax_included price.
+               // To avoid rounding errors we have to operate on line value instead of price
+               // Additionally we have to take into account differences in net value
+               // due to variations in tax calculations on supplier side. More over there is no direct relation between
+               // taxes and sales accounts, so we add net_diff just to first posted net value. This is _ugly_hack_
+               // which save us from rewriting whole routine, and works right only for small tax differences.
+
+               $taxfree_line = get_tax_free_price_for_item($entered_grn->item_code, $entered_grn->this_quantity_inv * $entered_grn->chg_price, 
+                         $supp_trans->tax_group_id, $supp_trans->tax_included) - $net_diff; $net_diff = 0;
+
+               $line_tax = get_full_price_for_item($entered_grn->item_code,
+                       $entered_grn->this_quantity_inv * $entered_grn->chg_price, 0, $supp_trans->tax_included) - $taxfree_line;
+
                $stock_gl_code = get_stock_gl_code($entered_grn->item_code);
+
                $dim = $supplier['dimension_id'] ? $supplier['dimension_id'] : $stock_gl_code['dimension_id'];
                $dim2 = $supplier['dimension2_id'] ? $supplier['dimension2_id'] : $stock_gl_code['dimension2_id'];
        if ($trans_type == ST_SUPPCREDIT)
@@ -226,69 +272,56 @@ function add_supp_invoice(&$supp_trans) // do not receive as ref because we chan
                        $iv_act = (is_inventory_item($entered_grn->item_code) ? $stock_gl_code["inventory_account"] : 
                                ($supplier["purchase_account"] ? $supplier["purchase_account"] : $stock_gl_code["cogs_account"]));
                        $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $iv_act,
-                               $dim, $dim2, $entered_grn->this_quantity_inv * $line_taxfree, $supp_trans->supplier_id);
+                               $dim, $dim2, $taxfree_line, $supp_trans->supplier_id);
                }
        else
        {
-               // -------------- if price changed since po received. 16 Aug 2008 Joe Hunt
+               // -------------- if price changed since po received.
                        $iv_act = is_inventory_item($entered_grn->item_code) ? ($clearing_act ? $clearing_act : $stock_gl_code["inventory_account"]) : 
                                ($supplier["purchase_account"] ? $supplier["purchase_account"] : $stock_gl_code["cogs_account"]);
                $old = update_supp_received_items_for_invoice($entered_grn->id, $entered_grn->po_detail_item,
                        $entered_grn->this_quantity_inv, $entered_grn->chg_price);
+
                        // Since the standard cost is always calculated on basis of the po unit_price,
                        // this is also the price that should be the base of calculating the price diff.
                        // In cases where there is two different po invoices on the same delivery with different unit prices this will not work either
 
-                       //$old_price = $old[0];
-                        
                        $old_price = $old[2];
-                       // adjust for tax included.
-                       $old_price = get_tax_free_price_for_item($entered_grn->item_code, $old_price,
-                               $supp_trans->tax_group_id, $entered_grn->tax_included);                 
-
-                       /*
-                       If statement is removed. Should always check for deliveries nomatter if there has been a price change. 
-                       */
-                       //if ($old_price != $line_taxfree) // price-change, so update
-                       //{
-                       //$diff = $line_taxfree - $old_price;
+
                        $old_date = sql2date($old[1]);
                        if (!is_inventory_item($entered_grn->item_code))
                                $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $iv_act,
-                                       $dim, $dim2, $entered_grn->this_quantity_inv * $line_taxfree, $supp_trans->supplier_id);
+                                       $dim, $dim2, $taxfree_line, $supp_trans->supplier_id);
                        else
                        {
+                               $ex_rate = get_exchange_rate_from_home_currency($supplier['curr_code'], $old_date);
+                               $old_value = get_tax_free_price_for_item($entered_grn->item_code, $entered_grn->this_quantity_inv * $old_price, 
+                                         $supp_trans->tax_group_id, $supp_trans->tax_included);
+
                                $currency = get_supplier_currency($supp_trans->supplier_id);
-                               $ex_rate = get_exchange_rate_from_home_currency($currency, $old_date);
+
                                $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $iv_act,
                                        $dim, $dim2, $entered_grn->this_quantity_inv * $old_price, $supp_trans->supplier_id, "", $ex_rate);
-                               $diff = get_diff_in_home_currency($supp_trans->supplier_id, $old_date, $date_, $old_price, 
-                                       $line_taxfree); 
+                               $diff = get_diff_in_home_currency($supp_trans->supplier_id, $old_date, $date_, $old_value, 
+                                       $taxfree_line);
 
-                               // always return due to change in currency.
-                               /*$mat_cost = update_average_material_cost(null, $entered_grn->item_code,
-                                       $diff, $entered_grn->this_quantity_inv, $old_date, true); */
                                $mat_cost = update_average_material_cost(null, $entered_grn->item_code,
-                                       $diff, $entered_grn->this_quantity_inv, null, true);
-                               
+                                       $diff/$entered_grn->this_quantity_inv, $entered_grn->this_quantity_inv, null, true);
+
                                //Add GL transaction for GRN Provision in case of difference
-                               if (($diff * $entered_grn->this_quantity_inv) != 0 )
+                               if ($diff != 0)
                                {
-                                       $diff_amt = $diff * $entered_grn->this_quantity_inv;
-                                       $total += add_gl_trans($trans_type, $invoice_id, $date_,        $stock_gl_code["inventory_account"],
-                                               $dim, $dim2, 'GRN Provision', $diff_amt, null, null, null,
+                                       $total += add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["inventory_account"],
+                                               $dim, $dim2, 'GRN Provision', $diff, null, null, null,
                                                "The general ledger transaction could not be added for the GRN of the inventory item");
 
-                                       //Chaitanya
                                        //If QOH is 0 or negative then update_average_material_cost will be skipped
                                        //Thus difference in PO and Supp Invoice should be handled separately
-                                       
                                        $qoh = get_qoh_on_date($entered_grn->item_code);
                                        if ($qoh <= 0)
                                        {
                                                global $Refs;
 
-                                               //Chaitanya : Post a journal entry
                                                $id = get_next_trans_no(ST_JOURNAL);
                                                $ref = $Refs->get_next(ST_JOURNAL);
                                                $stock_id = $entered_grn->item_code;
@@ -297,100 +330,28 @@ function add_supp_invoice(&$supp_trans) // do not receive as ref because we chan
                                                //Reverse the inventory effect if $qoh <=0
                                                add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
                                                        $stock_gl_code["inventory_account"],
-                                                       $dim, $dim2, $memo, -$entered_grn->this_quantity_inv * $diff);
+                                                       $dim, $dim2, $memo, -$diff);
                                                //GL Posting to inventory adjustment account
                                                add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
                                                        $stock_gl_code["adjustment_account"],
-                                                       $dim, $dim2, $memo, $entered_grn->this_quantity_inv * $diff);
-                                               
+                                                       $dim, $dim2, $memo, $diff);
+
                                                add_audit_trail(ST_JOURNAL, $id, $date_);
                                                add_comments(ST_JOURNAL, $id, $date_, $memo);
-                                               $Refs->save(ST_JOURNAL, $id, $ref);                                             
-                                       }                                       
-                                       
-                                       /*$qoh = get_qoh_on_date($entered_grn->item_code);
-                                       if ($qoh <= 0)
-                                       {
-                                               $memo = "Diff. in cost: ".$diff;
-                                               //Reverse the inventory effect if $qoh <=0
-                                               add_gl_trans_supplier($trans_type, $invoice_id, $date_, 
-                                               $stock_gl_code["inventory_account"],
-                                               $dim, $dim2, -$entered_grn->this_quantity_inv * $diff, $supp_trans->supplier_id, "", null, $memo);
-                                               //GL Posting to inventory adjustment account
-                                               add_gl_trans_supplier($trans_type, $invoice_id, $date_, 
-                                               $stock_gl_code["adjustment_account"],
-                                               $dim, $dim2, $entered_grn->this_quantity_inv * $diff, $supp_trans->supplier_id, "", null, $memo);                                               
-                                       }*/                             
-                                       
-                                       //add_gl_trans($trans_type, $invoice_id, $date_,        $stock_gl_code["cogs_account"],
-                                       //      0, 0, 'GRN Provision', -$diff_amt, null, null, null,
-                                       //      "The general ledger transaction could not be added for the GRN of the inventory item");                         
+                                               $Refs->save(ST_JOURNAL, $id, $ref);
+                                       }
                                }
-                       }       
-                       // added 2008-12-08 Joe Hunt. Update the purchase data table
+                       }
                        add_or_update_purchase_data($supp_trans->supplier_id, $entered_grn->item_code, $entered_grn->chg_price); 
-                       /*$deliveries = get_deliveries_between($entered_grn->item_code, $old_date, Today()); // extend the period, if invoice is before any deliveries.
-                       if ($deliveries[0] != 0) // have deliveries been done during the period?
-                       {
-                               $deliveries[1] /= $deliveries[0];
-                               $amt = ($mat_cost - $deliveries[1]) * $deliveries[0]; // $amt in home currency
-                               if ($amt != 0.0)
-                               {
-                                       $_s = $entered_grn->item_code;
-                                       $_d = $deliveries[0];
-                                       $_od = $old_date;
-                                       $_cd = $mat_cost - $deliveries[1];
-                                       $memo = _("Cost difference adjustment for $_s. $_d items delivered since $_od. The cost difference is $_cd");
-                                       add_gl_trans($trans_type, $invoice_id, $date_,  $stock_gl_code["cogs_account"],
-                                               $dim, $dim2, $memo,     $amt, null, null, null,
-                                               "The general ledger transaction could not be added for the price variance of the inventory item");
-                                       add_gl_trans($trans_type, $invoice_id, $date_,  $iv_act,
-                                               0, 0, $memo, -$amt, null, null, null,
-                                               "The general ledger transaction could not be added for the price variance of the inventory item");
-                               }               
-                               update_stock_move_pid(ST_CUSTDELIVERY, $entered_grn->item_code, $old_date, $date_, 0, $mat_cost);
-                       } 
-                       if (is_inventory_item($entered_grn->item_code))
-                               update_stock_move_pid(ST_SUPPRECEIVE, $entered_grn->item_code, $old_date, $old_date, $supp_trans->supplier_id, $mat_cost);
-                       */      
-               //}
                }
-       // ----------------------------------------------------------------------
 
                add_supp_invoice_item($trans_type, $invoice_id, $entered_grn->item_code,
-                       $entered_grn->item_description, 0,      $entered_grn->chg_price, $line_tax,
+                       $entered_grn->item_description, 0,      $entered_grn->chg_price, $line_tax/$entered_grn->this_quantity_inv,
                        $entered_grn->this_quantity_inv, $entered_grn->id, $entered_grn->po_detail_item, "");
     } /* end of GRN postings */
-    /* Now the TAX account */
-    $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id, 0, false); // 2009.08-18 Joe Hunt. We have already got the gl lines
-    foreach ($taxes as $taxitem)
-    {
-       if ($taxitem['Net'] != 0)
-       {
 
-               if ($trans_type == ST_SUPPCREDIT)
-               {
-                       $taxitem['Net'] = -$taxitem['Net'];
-                       $taxitem['Value'] = -$taxitem['Value'];
-               }       
-                       add_trans_tax_details($trans_type, $invoice_id, 
-                               $taxitem['tax_type_id'], $taxitem['rate'], $supp_trans->tax_included, $taxitem['Value'],
-                               $taxitem['Net'], $ex_rate, $date_, $supp_trans->supp_reference);
-
-                       if (isset($taxitem['purchasing_gl_code']))
-                       {
-                       if ($trans_type == ST_SUPPCREDIT)
-                               $taxitem['Value'] = -$taxitem['Value'];
-                       $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_,
-                               $taxitem['purchasing_gl_code'], 0, 0, $taxitem['Value'],
-                               $supp_trans->supplier_id,
-                               "A general ledger transaction for the tax amount could not be added");
-                       }
-       }
-    }
-       
        /*Post a balance post if $total != 0 */
-       add_gl_balance($trans_type, $invoice_id, $date_, -$total, PT_SUPPLIER, $supp_trans->supplier_id);       
+       add_gl_balance($trans_type, $invoice_id, $date_, -$total, PT_SUPPLIER, $supp_trans->supplier_id); // ??
 
        add_comments($trans_type, $invoice_id, $date_, $supp_trans->Comments);
 
@@ -409,16 +370,13 @@ function add_supp_invoice(&$supp_trans) // do not receive as ref because we chan
                        /*Now insert the allocation record if > 0 */
                        if ($allocate_amount != 0) 
                        {
-                               update_supp_trans_allocation(ST_SUPPINVOICE, $supp_trans->src_docs, $allocate_amount);
-                               update_supp_trans_allocation(ST_SUPPCREDIT, $invoice_id, $allocate_amount); // ***
+                               update_supp_trans_allocation(ST_SUPPINVOICE, $supp_trans->src_docs);
+                               update_supp_trans_allocation(ST_SUPPCREDIT, $invoice_id);
                                add_supp_allocation($allocate_amount, ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $supp_trans->src_docs,
                                        $date_);
-                               // Exchange Variations Joe Hunt 2008-09-20 ////////////////////////////////////////
 
                                exchange_variation(ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $supp_trans->src_docs, $date_,
                                        $allocate_amount, PT_SUPPLIER);
-
-                               ///////////////////////////////////////////////////////////////////////////
                        }
                }
        }
@@ -455,6 +413,26 @@ function get_po_invoices_credits($po_number)
        return db_query($sql, "The invoices/credits for the po $po_number could not be retreived");
 }
 
+//----------------------------------------------------------------------------------------
+//
+// Retrieve tax ovverides from tax register.
+//
+function get_tax_overrides($trans_type, $trans_no)
+{
+       $tax_overrides = array();
+       $sql = "SELECT amount, tax_type_id as id, rate
+               FROM ".TB_PREF."trans_tax_details details
+               WHERE trans_type=".db_escape($trans_type)." AND trans_no=".db_escape($trans_no)
+               ." AND amount>0"; // skip reposting of nondeductible VAT
+
+       $result = db_query($sql, 'Cannot retrieve tax overrides');
+       while($row = db_fetch($result))
+       {
+               $tax_overrides[$row['id']] = $row['amount'];
+       }
+
+       return $tax_overrides;
+}
 //----------------------------------------------------------------------------------------
 
 function read_supp_invoice($trans_no, $trans_type, &$supp_trans)
@@ -508,6 +486,7 @@ function read_supp_invoice($trans_no, $trans_type, &$supp_trans)
                                        $details_row["FullUnitPrice"], $details_row["memo_"]);
                }
             }
+                       $supp_trans->tax_overrides = get_tax_overrides($trans_type, $trans_no);
         }
         else
         {

diff --git a/purchasing/includes/db/po_db.inc b/purchasing/includes/db/po_db.inc
index 4818dda3e386324262c5fc8049d43b4c4ed8cc8e..22a853d140ef49afaa13cfa9778540f4687be111 100644 (file)
--- a/purchasing/includes/db/po_db.inc
+++ b/purchasing/includes/db/po_db.inc
@@ -155,7 +155,7 @@ function read_po_header($order_no, &$order)
                $order->credit = get_current_supp_credit($order->supplier_id);
 
        $order->orig_order_date = sql2date($myrow["ord_date"]);
-       $order->Comments = $myrow["comments"];
+       $order->Comments = nl2br($myrow["comments"]);
        $order->Location = $myrow["into_stock_location"];
        $order->supp_ref = $myrow["requisition_no"];
        $order->reference = $myrow["reference"];

diff --git a/purchasing/includes/db/supp_payment_db.inc b/purchasing/includes/db/supp_payment_db.inc
index cec8f351b10b4c0fee198614a6c53719e62e2b1c..99fe530cad6001999c24d949c3cd87650ccee07b 100644 (file)
--- a/purchasing/includes/db/supp_payment_db.inc
+++ b/purchasing/includes/db/supp_payment_db.inc
@@ -9,6 +9,84 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
+function write_supp_payment($trans_no, $supplier_id, $bank_account,
+       $date_, $ref, $supp_amount, $supp_discount, $memo_, $bank_charge=0, $bank_amount=0)
+{
+       global $Refs;
+
+       begin_transaction();
+       $args = func_get_args(); while (count($args) < 10) $args[] = 0;
+       $args = (object)array_combine(array('trans_no', 'supplier_id', 'bank_account', 'date_',
+                'ref', 'bank_amount', 'supp_amount', 'supp_discount', 'memo_', 'bank_charge'), $args);
+       $args->trans_no = 0;
+       hook_db_prewrite( $args, ST_SUPPAYMENT);
+
+       if ($trans_no != 0) {
+         delete_comments(ST_SUPPAYMENT, $trans_no);
+         void_bank_trans(ST_SUPPAYMENT, $trans_no, true);
+         void_gl_trans(ST_SUPPAYMENT, $trans_no, true);
+         void_cust_allocations(ST_SUPPAYMENT, $trans_no, $date_);
+       }
+
+       /* Create a supp_trans entry for the supplier payment */
+       $payment_id = write_supp_trans(ST_SUPPAYMENT, 0, $supplier_id, $date_, $date_,
+               $ref, "", -$supp_amount, 0, -$supp_discount);
+
+       // Now debit creditors account with payment + discount
+
+       $total = 0;
+    $supplier_accounts = get_supplier_accounts($supplier_id);
+       $total += add_gl_trans_supplier(ST_SUPPAYMENT, $payment_id, $date_, $supplier_accounts["payable_account"], 0, 0,
+               $supp_amount + $supp_discount, $supplier_id);
+
+       // Now credit discount received account with discounts
+       if ($supp_discount != 0)
+       {
+               $total += add_gl_trans_supplier(ST_SUPPAYMENT, $payment_id, $date_, $supplier_accounts["payment_discount_account"], 0, 0,
+                       -$supp_discount, $supplier_id);
+       }
+
+       $bank = get_bank_account($bank_account);
+
+       if ($bank_charge != 0)
+       {
+               $charge_act = get_company_pref('bank_charge_act');
+               $total += add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $charge_act, 0, 0, '',
+                       $bank_charge, $bank['bank_curr_code']);
+       }
+
+       $total += add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $bank['account_code'], 0, 0, '',
+               -($bank_amount + $bank_charge), $bank['bank_curr_code']);
+
+       /*Post a balance post if $total != 0 due to variance in AP and bank posted values*/
+       if ($total != 0)
+       {
+               $variance_act = get_company_pref('exchange_diff_act');
+               add_gl_trans(ST_SUPPAYMENT, $payment_id, $date_, $variance_act, 0, 0, '',
+                       -$total, null, PT_SUPPLIER,  $supplier_id);
+       }
+
+   /*now enter the bank_trans entry */
+       add_bank_trans(ST_SUPPAYMENT, $payment_id, $bank_account, $ref,
+               $date_, -($bank_amount + $bank_charge), PT_SUPPLIER, $supplier_id);
+
+       add_comments(ST_SUPPAYMENT, $payment_id, $date_, $memo_);
+
+       $Refs->save(ST_SUPPAYMENT, $payment_id, $ref);
+
+       $args->trans_no = $payment_id;
+       hook_db_postwrite($args, ST_SUPPAYMENT);
+
+       commit_transaction();
+
+       return $payment_id;
+}
+
+//------------------------------------------------------------------------------------------------
+/*
+       This is legacy code, leaved here to provide compatibility for 2.3 extension modules.
+       Will be removed in 2.4 due to design issues.
+*/
 function add_supp_payment($supplier_id, $date_, $bank_account,
        $amount, $discount, $ref, $memo_, $rate=0, $charge=0)
 {

diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc
index eb6a3a1f16ebf3a85319a63034ec22afd6592e6d..6af755e659c6c466e0e72b8f4ff22e977f8c7c79 100644 (file)
--- a/purchasing/includes/db/supp_trans_db.inc
+++ b/purchasing/includes/db/supp_trans_db.inc
@@ -54,19 +54,19 @@ function write_supp_trans($type, $trans_no, $supplier_id, $date_, $due_date, $re
 function get_supp_trans($trans_no, $trans_type=-1)
 {
        $sql = "SELECT ".TB_PREF."supp_trans.*, (".TB_PREF."supp_trans.ov_amount+".TB_PREF."supp_trans.ov_gst+".TB_PREF."supp_trans.ov_discount) AS Total,
-               ".TB_PREF."suppliers.supp_name AS supplier_name, ".TB_PREF."suppliers.curr_code AS SupplierCurrCode ";
+               ".TB_PREF."suppliers.supp_name AS supplier_name, ".TB_PREF."suppliers.curr_code AS curr_code ";
 
-       if ($trans_type == ST_SUPPAYMENT)
+       if ($trans_type == ST_SUPPAYMENT || $trans_type == ST_BANKPAYMENT)
        {
                // it's a payment so also get the bank account
                $sql .= ", ".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name, ".TB_PREF."bank_accounts.bank_curr_code,
-                       ".TB_PREF."bank_accounts.account_type AS BankTransType, ".TB_PREF."bank_trans.amount AS BankAmount,
+                       ".TB_PREF."bank_accounts.account_type AS BankTransType, ".TB_PREF."bank_trans.amount AS bank_amount,
                        ".TB_PREF."bank_trans.ref ";
        }
 
        $sql .= " FROM ".TB_PREF."supp_trans, ".TB_PREF."suppliers ";
 
-       if ($trans_type == ST_SUPPAYMENT)
+       if ($trans_type == ST_SUPPAYMENT || $trans_type == ST_BANKPAYMENT)
        {
                // it's a payment so also get the bank account
                $sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts";
@@ -78,7 +78,7 @@ function get_supp_trans($trans_no, $trans_type=-1)
        if ($trans_type > 0)
                $sql .= " AND ".TB_PREF."supp_trans.type=".db_escape($trans_type);
 
-       if ($trans_type == ST_SUPPAYMENT)
+       if ($trans_type == ST_SUPPAYMENT || $trans_type == ST_BANKPAYMENT)
        {
                // it's a payment so also get the bank account
                $sql .= " AND ".TB_PREF."bank_trans.trans_no =".db_escape($trans_no)."
@@ -191,7 +191,7 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
                trans.id as trans_no,
                trans.reference, 
                supplier.supp_name, 
-               '' as supp_reference,
+               po.requisition_no AS supp_reference,
        delivery_date as tran_date, 
                '' as due_date,
                supplier.curr_code, 
@@ -199,8 +199,9 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_
                '' AS Allocated,
                0 as OverDue,
        1 as Settled
-       FROM ".TB_PREF."grn_batch as trans, ".TB_PREF."suppliers as supplier
+       FROM ".TB_PREF."grn_batch as trans, ".TB_PREF."suppliers as supplier, ".TB_PREF."purch_orders as po
        WHERE supplier.supplier_id = trans.supplier_id
+       AND trans.purch_order_no = po.order_no
        AND trans.delivery_date >= '$date_after'
        AND trans.delivery_date <= '$date_to'";
 

diff --git a/purchasing/includes/db/suppalloc_db.inc b/purchasing/includes/db/suppalloc_db.inc
index c16c97557f015b1a3d3cac1e809fe945279ef727..dc7119db05f739722c2efd5b76c46ad1abe79175 100644 (file)
--- a/purchasing/includes/db/suppalloc_db.inc
+++ b/purchasing/includes/db/suppalloc_db.inc
@@ -48,19 +48,24 @@ function get_supp_trans_allocation_balance($trans_type, $trans_no)
 }
 
 //----------------------------------------------------------------------------------------
-
-function update_supp_trans_allocation($trans_type, $trans_no, $alloc)
+//     Update supplier trans alloc field according to current status of supp_allocations
+//
+function update_supp_trans_allocation($trans_type, $trans_no)
 {
+       $sql = "UPDATE `".TB_PREF.($trans_type==ST_PURCHORDER ? 'purch_orders' : 'supp_trans')."` trans,
+                       (SELECT sum(amt) amt from ".TB_PREF."supp_allocations
+                               WHERE (trans_type_to=".db_escape($trans_type)." AND trans_no_to=".db_escape($trans_no).")
+                               OR (trans_type_from=".db_escape($trans_type)." AND trans_no_from=".db_escape($trans_no).")) allocated
+               SET 
+                       trans.alloc=IFNULL(allocated.amt, 0)
+               WHERE " . ($trans_type==ST_PURCHORDER ? 
+                         "trans.order_no=".db_escape($trans_no)
+                       : "trans.type=".db_escape($trans_type)." AND trans.trans_no=".db_escape($trans_no));
 
-       if ($trans_type == ST_PURCHORDER)
-               $sql = "UPDATE ".TB_PREF."purch_orders SET alloc = alloc + ".db_escape($alloc)."
-                       WHERE order_no = ".db_escape($trans_no);
-       else
-               $sql = "UPDATE ".TB_PREF."supp_trans SET alloc = alloc + ".db_escape($alloc)."
-                       WHERE type=".db_escape($trans_type)." AND trans_no = ".db_escape($trans_no);
        db_query($sql, "The supp transaction record could not be modified for the allocation against it");
 }
 
+
 //-------------------------------------------------------------------------------------------------------------
 
 function void_supp_allocations($type, $type_no, $date="")

diff --git a/purchasing/includes/po_class.inc b/purchasing/includes/po_class.inc
index 30a30dea4363eef1296d92c37f7bc5e04b96da11..be484631115353f32db1e28a419328a66d33573f 100644 (file)
--- a/purchasing/includes/po_class.inc
+++ b/purchasing/includes/po_class.inc
@@ -35,8 +35,10 @@ class purch_order
        var $tax_algorithm;
        var $stored_algorithm; // copy to find the change after invoice in processed
        var $terms;
-       
+       var $ex_rate;
+
        var $reference;
+       var $tax_overrides = array();           // array of taxes manually inserted during sales invoice entry (direct invoice)
        
        var $prep_amount = 0; // prepayment required
        var $alloc; // sum of payments allocated
@@ -153,8 +155,13 @@ class purch_order
        // Adjustment for swiss franken, we always have 5 rappen = 1/20 franken
            if ($this->curr_code == 'CHF') {
                        $val = $taxes['1']['Value'];
-                       $taxes['1']['Value'] = (floatval((intval(round(($val*20),0)))/20));
-               } 
+                       $val1 = (floatval((intval(round(($val*20),0)))/20));
+                       $taxes['1']['Value'] = $val1;
+               }
+               foreach($this->tax_overrides as $id => $value) // add values entered manually
+               {
+                       $taxes[$id]['Override'] = $value;
+               }
                return $taxes;
        }
 

diff --git a/purchasing/includes/purchasing_db.inc b/purchasing/includes/purchasing_db.inc
index ac9e5e5e6d4991144517ba4c5527b55eb2add739..2c480c7e52c8c3c7fb9dca4615d7ba3f9942af09 100644 (file)
--- a/purchasing/includes/purchasing_db.inc
+++ b/purchasing/includes/purchasing_db.inc
@@ -9,8 +9,6 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-include_once($path_to_root . "/purchasing/includes/supp_trans_class.inc");
-
 include_once($path_to_root . "/includes/banking.inc");
 
 include_once($path_to_root . "/includes/date_functions.inc");

diff --git a/purchasing/includes/purchasing_ui.inc b/purchasing/includes/purchasing_ui.inc
index 8014fe0a4a1a889f127c9df525d5e8797692de44..3fcfb7d2cbcb7d0b4bfc47b7a8fbbae058b1536c 100644 (file)
--- a/purchasing/includes/purchasing_ui.inc
+++ b/purchasing/includes/purchasing_ui.inc
@@ -9,6 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
+include_once($path_to_root . "/purchasing/includes/supp_trans_class.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 
 include_once($path_to_root . "/includes/ui.inc");

diff --git a/purchasing/includes/supp_trans_class.inc b/purchasing/includes/supp_trans_class.inc
index 8178d30d1094affee1bf159c88b1058ebdbe7f8f..547d833e3012f0031f8b394649019cdfe9e36667 100644 (file)
--- a/purchasing/includes/supp_trans_class.inc
+++ b/purchasing/includes/supp_trans_class.inc
@@ -22,6 +22,7 @@ class supp_trans
        var $supplier_id;
        var $supplier_name;
        var $terms;
+       var $ex_rate;
        
        var $tax_description;
        var $tax_group_id;
@@ -45,6 +46,7 @@ class supp_trans
        var $tax_algorithm;
        var $stored_algorithm;
        var $currency;
+       var $tax_overrides = array();           // array of taxes manually inserted during sales invoice entry
 
        function supp_trans($trans_type, $trans_no=0)
        {
@@ -76,7 +78,10 @@ class supp_trans
                $this->grn_items[$grn_item_id] = new grn_item($grn_item_id, $po_detail_item, 
                        $item_code, $item_description, $qty_recd, $prev_quantity_inv, $this_quantity_inv, 
                        $order_price, $chg_price, $std_cost_unit, $gl_code, $this->tax_included);
+
                $this->src_docs = find_src_invoices($this);
+
+               unset($this->tax_overrides); // cancel tax overrides after cart change
                return 1;
        }
 
@@ -85,51 +90,53 @@ class supp_trans
                $this->gl_codes[$this->gl_codes_counter] = new gl_codes($this->gl_codes_counter, 
                        $gl_code, $gl_act_name, $gl_dim, $gl_dim2, $amount, $memo_);
                $this->gl_codes_counter++;
+               unset($this->tax_overrides); // cancel tax overrides after cart change
                return 1;
        }
 
        function remove_grn_from_trans($grn_item_id)
        {
+               unset($this->tax_overrides); // cancel tax overrides after cart change
            unset($this->grn_items[$grn_item_id]);
        }
        function remove_gl_codes_from_trans($gl_code_counter)
        {
-            unset($this->gl_codes[$gl_code_counter]);
+               unset($this->tax_overrides); // cancel tax overrides after cart change
+               unset($this->gl_codes[$gl_code_counter]);
        }
-       
+
        function is_valid_trans_to_post()
        {
                return (count($this->grn_items) > 0 || count($this->gl_codes) > 0 || 
                        ($this->ov_amount != 0) || ($this->ov_discount > 0));
        }
-       
+
        function clear_items()
        {
                unset($this->grn_items);
                unset($this->gl_codes);
                $this->ov_amount = $this->ov_discount = $this->supplier_id = 0;
-               
+
                $this->grn_items = array();
                $this->gl_codes = array();
        }
-       
+
     function get_taxes($tax_group_id=null, $shipping_cost=0, $gl_codes=true)
     {
        $items = array();
        $prices = array();
-       
+
         if ($tax_group_id == null)
                $tax_group_id = $this->tax_group_id;
-               
-               // preload the taxgroup !
-               $tax_group = get_tax_group_items_as_array($tax_group_id);       
-        
+
+               // preload the taxgroup
+               $tax_group = get_tax_group_items_as_array($tax_group_id);
+
         foreach ($this->grn_items as $ln_itm) 
         {
                $items[] = $ln_itm->item_code;
-//             $prices[] =round( ($ln_itm->this_quantity_inv * $ln_itm->taxfree_charge_price($tax_group_id, $tax_group)),
                $prices[] =round( ($ln_itm->this_quantity_inv * $ln_itm->chg_price),
-                        user_price_dec());
+                               user_price_dec());
         }
 
         if ($tax_group_id == null)
@@ -137,8 +144,6 @@ class supp_trans
         $taxes = get_tax_for_items($items, $prices, $shipping_cost, $tax_group_id, 
                $this->tax_included, null, $this->tax_algorithm);
 
-///////////////// Joe Hunt 2009.08.18
-
                if ($gl_codes)
                {
                        foreach ($this->gl_codes as $gl_code)
@@ -147,34 +152,39 @@ class supp_trans
                                if ($index !== false)
                                {
                                        $taxes[$index]['Value'] += $gl_code->amount;
-                               }       
+                               }
+                       }
+               }
+
+               if(isset($this->tax_overrides))
+                       foreach($this->tax_overrides as $id => $value) // add values entered manually
+                       {
+                               $taxes[$id]['Override'] = $value;
                        }
-               }       
-////////////////               
         return $taxes;
-    }          
+    }
        //
        //      Returns total invoice amount without taxes.
        //
     function get_total_taxfree($tax_group_id=null)
     {
        $total = 0;
-       
+
                // preload the taxgroup !
                if ($tax_group_id != null)
                        $tax_group = get_tax_group_items_as_array($tax_group_id);
-               else            
-                       $tax_group = null;      
-       
+               else
+                       $tax_group = null;
+
                foreach ($this->grn_items as $ln_itm)
                $total += round(($ln_itm->this_quantity_inv * $ln_itm->taxfree_charge_price($tax_group_id, $tax_group)),
                         user_price_dec());
 
                foreach ($this->gl_codes as $gl_line)
-               {       //////// 2009-08-18 Joe Hunt
+               {
                        if (!is_tax_account($gl_line->gl_code))
                                $total += $gl_line->amount;
-               }       
+               }
                return $total;
     }
        //
@@ -188,7 +198,7 @@ class supp_trans
                        $total += round($ln_itm->this_quantity_inv * $ln_itm->chg_price, user_price_dec());
 
                foreach ($this->gl_codes as $gl_line)
-               {   //////// 2010-10-10 Joe Hunt
+               {
                        if (!is_tax_account($gl_line->gl_code) || $this->tax_included)
                                $total += $gl_line->amount;
                }
@@ -233,17 +243,15 @@ all the info to do the necessary entries without looking up ie additional querie
                $this->gl_code = $gl_code;
                $this->tax_included = $tax_included;
        }
-       
+
        function full_charge_price($tax_group_id, $tax_group=null)
        {
                return get_full_price_for_item($this->item_code, 
                  $this->chg_price, $tax_group_id, $this->tax_included, $tax_group);
        }
-       
+
        function taxfree_charge_price($tax_group_id, $tax_group=null)
        {
-//             if ($tax_group_id==null)
-//                     return $this->chg_price;
                return get_tax_free_price_for_item($this->item_code, $this->chg_price, 
                  $tax_group_id, $this->tax_included, $tax_group);
        }

diff --git a/purchasing/includes/ui/grn_ui.inc b/purchasing/includes/ui/grn_ui.inc
index cfb2f26c21fa7dc120c76a4eeab39247a0017150..059c7bd13e270e09bb04d81b92e6b7aeee13e94e 100644 (file)
--- a/purchasing/includes/ui/grn_ui.inc
+++ b/purchasing/includes/ui/grn_ui.inc
@@ -11,59 +11,81 @@
 ***********************************************************************/
 //---------------------------------------------------------------------------------------------------
 
-function display_grn_summary(&$po, $editable=false)
+function display_grn_summary(&$po)
 {
        global $Refs;
     start_table(TABLESTYLE2, "width=90%");
-    
+
     start_row();
        label_cells(_("Supplier"), $po->supplier_name, "class='tableheader2'");
-    
+
     if (!is_company_currency($po->curr_code))
        label_cells(_("Order Currency"), $po->curr_code, "class='tableheader2'");
-    
+
     label_cells(_("For Purchase Order"), get_trans_view_str(ST_PURCHORDER, $po->order_no),
        "class='tableheader2'");
-    
+
        label_cells(_("Ordered On"), $po->orig_order_date, "class='tableheader2'");
        end_row();
-               
+
        start_row();
-    if ($editable) 
-    {
+       label_cells(_("Reference"), $po->reference, "class='tableheader2'");
+       label_cells(_("Deliver Into Location"), get_location_name($po->Location), "class='tableheader2'");
+       label_cells(_("Supplier's Reference"), $po->supp_ref, "class='tableheader2'");
+
+    end_row();
+
+       label_row(_("Delivery Address"), $po->delivery_address, "class='tableheader2'", "colspan=9");
+
+    if ($po->Comments != "")
+       label_row(_("Order Comments"), $po->Comments, "class='tableheader2'", "colspan=9");
+    end_table(1);
+}
+
+function edit_grn_summary(&$po)
+{
+       global $Refs;
+
+       start_outer_table(TABLESTYLE2, "width=80%");
+
+       table_section(1);
+               label_row(_("Supplier"), $po->supplier_name);
+
+       if (!is_company_currency($po->curr_code))
+               label_row(_("Order Currency"), $po->curr_code);
+
+           label_row(_("For Purchase Order"), get_trans_view_str(ST_PURCHORDER, $po->order_no));
+
+               label_row(_("Ordered On"), $po->orig_order_date);
+
+       table_section(2);
        if (!isset($_POST['ref']))
            $_POST['ref'] = $Refs->get_next(ST_SUPPRECEIVE);
-       ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
-               
+       ref_row(_("Reference"), 'ref', '', null);
+
         if (!isset($_POST['Location']))
                $_POST['Location'] = $po->Location;
-        label_cell(_("Deliver Into Location"), "class='tableheader2'");
-        locations_list_cells(null, "Location", $_POST['Location']);
-        
+
+        locations_list_row(_("Deliver Into Location"), "Location", $_POST['Location']);
+
        if (!isset($_POST['DefaultReceivedDate']))
                $_POST['DefaultReceivedDate'] = new_doc_date();
-       
-       date_cells(_("Date Items Received"), 'DefaultReceivedDate', '', true, 0, 0, 0, "class='tableheader2'");    
+
+       date_row(_("Date Items Received"), 'DefaultReceivedDate', '', true, 0, 0, 0, '', true);
+
+       table_section(3);
                // currently this is related order supp reference
-//             ref_cells(_("Supplier's Reference"), 'supp_ref', _("Supplier's Reference"), null, "class='tableheader2'");
-               label_cells(_("Supplier's Reference"), $po->supp_ref, "class='tableheader2'");
-    } 
-    else 
-    {
-       label_cells(_("Reference"), $po->reference, "class='tableheader2'");
-       label_cells(_("Deliver Into Location"), get_location_name($po->Location), "class='tableheader2'");
-               label_cells(_("Supplier's Reference"), $po->supp_ref, "class='tableheader2'");
-    }
-    
-    end_row();
-    
-    if (!$editable)
-    
-       label_row(_("Delivery Address"), $po->delivery_address, "class='tableheader2'", "colspan=9");
-    
-    if ($po->Comments != "")
-       label_row(_("Order Comments"), $po->Comments, "class='tableheader2'", "colspan=9");
-    end_table(1);      
+//             ref_row(_("Supplier's Reference"), 'supp_ref', _("Supplier's Reference"));
+               label_row(_("Supplier's Reference"), $po->supp_ref);
+
+               label_row(_("Delivery Address"), $po->delivery_address);
+
+       if ($po->Comments != "")
+               label_row(_("Order Comments"), $po->Comments, "class='tableheader2'", "colspan=9");
+
+           if (!is_company_currency($po->curr_code))
+                       exchange_rate_display(get_company_currency(), $po->curr_code, get_post('DefaultReceivedDate'));
+       end_outer_table(1);
 }
 
 ?>
\ No newline at end of file

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index 062ff8f41024c4fc7e0f1d652926ae4b573ac923..983e507c9e8d5273ee9bdd2701ceb5c8ea5d8a4f 100644 (file)
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -20,6 +20,11 @@ function copy_from_trans(&$supp_trans)
        $_POST['reference'] = $supp_trans->reference;
        $_POST['supplier_id'] = $supp_trans->supplier_id;
        $_POST['tax_algorithm'] = $supp_trans->tax_algorithm;
+
+       $_POST['_ex_rate'] = $supp_trans->ex_rate;
+       if (isset($supp_trans->tax_overrides))
+           foreach($supp_trans->tax_overrides as $id => $value)
+                   $_POST['mantax'][$id] = price_format($value);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -34,7 +39,17 @@ function copy_to_trans(&$supp_trans)
        if (isset($_POST['tax_algorithm']))
            $supp_trans->tax_algorithm = $_POST['tax_algorithm'];
 
+       $supp_trans->ex_rate = input_num('_ex_rate', null);
+
        $supp_trans->ov_amount = $supp_trans->ov_discount = 0; /* for starters */
+    if (isset($_POST['mantax'])) {
+               foreach($_POST['mantax'] as $id => $tax) {
+               $supp_trans->tax_overrides[$id] = user_numeric($_POST['mantax'][$id]);
+               }
+       }
+       else
+               unset($supp_trans->tax_overrides);
+
        if (count($supp_trans->grn_items) > 0)
        {
                foreach ( $supp_trans->grn_items as $grn)
@@ -135,7 +150,7 @@ function invoice_header(&$supp_trans)
        if ($supplier_currency != $company_currency)
        {
         label_row(_("Supplier's Currency:"), "<b>" . $supplier_currency . "</b>");
-               exchange_rate_display($supplier_currency, $company_currency, $_POST['tran_date']);
+               exchange_rate_display($company_currency, $supplier_currency, $_POST['tran_date']);
        }
 
        label_row(_("Tax Group:"), $supp_trans->tax_description);
@@ -159,7 +174,7 @@ function invoice_totals(&$supp_trans)
        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);
-    $tax_total = display_edit_tax_items($taxes, $colspan, $supp_trans->tax_included);
+    $tax_total = display_edit_tax_items($taxes, $colspan, $supp_trans->tax_included, 0, true);
 
     $display_total = price_format($supp_trans->ov_amount + $tax_total);
 

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index 3c7f94b27fffacd6730279a94f11e4b7cc156735..f13a197b0ea0a8c26c203d5d418dcfa4d4aff7e2 100644 (file)
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -28,6 +28,9 @@ function copy_from_cart()
     $_POST['delivery_address'] = $cart->delivery_address;
     $_POST['tax_algorithm'] = $cart->tax_algorithm;
        $_POST['prep_amount'] = price_format($cart->prep_amount);
+       $_POST['_ex_rate'] = $cart->ex_rate;
+    foreach($cart->tax_overrides as $id => $value)
+           $_POST['mantax'][$id] = price_format($value);
 }
 
 function copy_to_cart()
@@ -46,6 +49,12 @@ function copy_to_cart()
        if (isset($_POST['tax_algorithm']))
            $cart->tax_algorithm = $_POST['tax_algorithm'];
        $cart->prep_amount = input_num('prep_amount', 0);
+       $cart->ex_rate = input_num('_ex_rate', null);
+
+    if (isset($_POST['mantax'])) {
+               foreach($_POST['mantax'] as $id => $tax) {
+                       $cart->tax_overrides[$id] = user_numeric($_POST['mantax'][$id]); }
+       }
 }
 // ------------------------------------------------------------------------------
 
@@ -94,7 +103,6 @@ function create_new_po($trans_type, $trans_no)
                $_POST['OrderDate'] = end_fiscalyear();
        $cart->due_date = $cart->orig_order_date = $_POST['OrderDate'];
 
-       
        $cart->trans_type = $trans_type;
        $cart->order_no = $trans_no;
        /*read in all the selected order into the Items cart  */
@@ -114,7 +122,7 @@ function display_po_header(&$order)
 
        $editable = ($order->order_no == 0);
 
-       start_outer_table(TABLESTYLE2, "width=80%");
+       start_outer_table(TABLESTYLE2, 'width=80%');
 
        table_section(1);
     if ($editable)
@@ -151,15 +159,25 @@ function display_po_header(&$order)
        }
        set_global_supplier($_POST['supplier_id']);
 
+       date_row($order->trans_type==ST_PURCHORDER ? _("Order Date:") :
+               ($order->trans_type==ST_SUPPRECEIVE ? _("Delivery Date:") : _("Invoice Date:")),
+               'OrderDate', '', true, 0, 0, 0, null, true);
+
+       if (isset($_POST['_OrderDate_changed'])) {
+               $order->orig_order_date = $_POST['OrderDate'];
+           get_duedate_from_terms($order);
+           $_POST['due_date'] = $order->due_date;
+               $Ajax->activate('due_date');
+       }
+       supplier_credit_row($order->supplier_id, $order->credit);
+
        if (!is_company_currency($order->curr_code))
        {
                label_row(_("Supplier Currency:"), $order->curr_code);
-               exchange_rate_display($order->curr_code, get_company_currency(),
+               exchange_rate_display(get_company_currency(), $order->curr_code,
                        $_POST['OrderDate']);
        }
 
-       supplier_credit_row($order->supplier_id, $order->credit);
-
 
     if ($editable)
     {
@@ -173,26 +191,6 @@ function display_po_header(&$order)
 
        table_section(2);
 
-       // check this out?????????
-       //if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
-       //      $_POST['OrderDate'] = $order->orig_order_date;
-       //if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
-       //{
-       //      $_POST['OrderDate'] = Today();
-       //      if (!is_date_in_fiscalyear($_POST['OrderDate']))
-       //              $_POST['OrderDate'] = end_fiscalyear();
-       //}
-       date_row($order->trans_type==ST_PURCHORDER ? _("Order Date:") :
-               ($order->trans_type==ST_SUPPRECEIVE ? _("Delivery Date:") : _("Invoice Date:")),
-               'OrderDate', '', true, 0, 0, 0, null, true);
-
-       if (isset($_POST['_OrderDate_changed'])) {
-               $order->orig_order_date = $_POST['OrderDate'];
-           get_duedate_from_terms($order);
-           $_POST['due_date'] = $order->due_date;
-               $Ajax->activate('_ex_rate');
-               $Ajax->activate('due_date');
-       }
        if ($order->trans_type==ST_SUPPINVOICE)
                date_row(_("Due Date:"), 'due_date', '', false, 0, 0, 0, null, true);
 
@@ -297,7 +295,7 @@ function display_po_items(&$order, $editable=true)
 
        $taxes = $order->get_taxes(input_num('freight_cost'));
        
-       $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2);
+       $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2, $order->trans_type==ST_SUPPINVOICE);
 
        $display_total = price_format(($total + input_num('freight_cost') + $tax_total));
 

diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php
index 6998b74fce50d535f82dbd650be28a2f0da41608..fc19aee869944fd81786071865674ae743cd0317 100644 (file)
--- a/purchasing/inquiry/supplier_allocation_inquiry.php
+++ b/purchasing/inquiry/supplier_allocation_inquiry.php
@@ -95,14 +95,15 @@ function fmt_balance($row)
 
 function alloc_link($row)
 {
-       $link = 
-       pager_link(_("Allocations"),
-               "/purchasing/allocations/supplier_allocate.php?trans_no=" .
-                       $row["trans_no"]. "&trans_type=" . $row["type"], ICON_MONEY );
-
-       return (($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT) 
-               && (-$row["TotalAmount"] - $row["Allocated"]) > 0)
-               ? $link : '';
+       if (($row["type"] == ST_BANKPAYMENT || $row["type"] == ST_SUPPCREDIT || $row["type"] == ST_SUPPAYMENT) 
+               && (-$row["TotalAmount"] - $row["Allocated"]) >= 0)
+                       return  pager_link(_("Allocations"), "/purchasing/allocations/supplier_allocate.php?trans_no=" .
+                               $row["trans_no"]. "&trans_type=" . $row["type"]. "&supplier_id=" . $row["supplier_id"], ICON_ALLOC);
+       elseif ($row["type"] == ST_SUPPINVOICE && ($row["TotalAmount"] - $row["Allocated"]) > 0)
+                       return  pager_link(_("Pay"), "/purchasing/supplier_payment.php?supplier_id=".$row["supplier_id"]
+                               ."&PInvoice=".$row["trans_no"], ICON_MONEY );
+       else
+               return '';
 }
 
 function fmt_debit($row)

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index f8f4a45c5e325f1dc0005a6aae3ebfe95bc35525..0dfa4ebba560b9ec5854727fcf5df5839a20893c 100644 (file)
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -470,20 +470,23 @@ function handle_commit_order()
                        $inv->stored_algorithm = $cart->stored_algorithm;
                        $supp = get_supplier($cart->supplier_id);
                        $inv->tax_group_id = $supp['tax_group_id'];
-                       $total = 0;
+                       $inv->ov_amount = $inv->ov_gst = $inv->ov_discount = 0;
 
+                       $total = 0;
                        foreach($cart->line_items as $key => $line) {
                                $inv->add_grn_to_trans($line->grn_item_id, $line->po_detail_rec, $line->stock_id,
                                        $line->item_description, $line->receive_qty, 0, $line->receive_qty,
                                        $line->price, $line->price, true, get_standard_cost($line->stock_id), '');
                                $total += round2(($line->receive_qty * $line->price), user_price_dec());
                        }
+                       $inv->tax_overrides = $cart->tax_overrides;
                        if (!$inv->tax_included) {
                                $taxes = $inv->get_taxes($inv->tax_group_id, 0, false, $inv->tax_algorithm);
                                foreach( $taxes as $taxitem) {
-                                       $total += $taxitem['Value'];
+                                       $total += isset($taxitem['Override']) ? $taxitem['Override'] : $taxitem['Value'];
                                }
                        }
+                       $inv->ex_rate = $cart->ex_rate;
 
                        $inv_no = add_supp_invoice($inv);
                        // presume supplier data need correction
@@ -496,8 +499,8 @@ function handle_commit_order()
                                        $total, 0,      $Refs->get_next(ST_SUPPAYMENT), 
                                        _('Payment for:').$inv->supp_reference .' ('.$type_shortcuts[ST_SUPPINVOICE].$inv_no.')');
                                add_supp_allocation($total, ST_SUPPAYMENT, $pmt_no, ST_SUPPINVOICE, $inv_no, $inv->tran_date);
-                               update_supp_trans_allocation(ST_SUPPINVOICE, $inv_no, $total);
-                               update_supp_trans_allocation(ST_SUPPAYMENT, $pmt_no, $total);
+                               update_supp_trans_allocation(ST_SUPPINVOICE, $inv_no);
+                               update_supp_trans_allocation(ST_SUPPAYMENT, $pmt_no);
 
                        }
 
@@ -507,7 +510,7 @@ function handle_commit_order()
                        meta_forward($_SERVER['PHP_SELF'], "AddedPI=$inv_no");
                }
                else { // order modification
-               
+
                        $order_no = update_po($cart);
                        unset($_SESSION['PO']);
                meta_forward($_SERVER['PHP_SELF'], "AddedID=$order_no&Updated=1");      

diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index 83900c865a0458592d0532360f48cb880875ff79..d2697de9c389ea45e3ece41a09f79c49139cc5a7 100644 (file)
--- a/purchasing/po_receive_items.php
+++ b/purchasing/po_receive_items.php
@@ -264,6 +264,7 @@ function process_receive_po()
        $grn->orig_order_date = $_POST['DefaultReceivedDate'];
        $grn->reference = $_POST['ref'];
        $grn->Location = $_POST['Location'];
+       $grn->ex_rate = input_num('_ex_rate', null);
 
        $grn_no = add_grn($grn);
 
@@ -323,7 +324,7 @@ if (isset($_POST['ProcessGoodsReceived']))
 
 start_form();
 
-display_grn_summary($_SESSION['PO'], true);
+edit_grn_summary($_SESSION['PO'], true);
 display_heading(_("Items to Receive"));
 display_po_receive_items();
 

diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php
index 12926f3665340a170cd613522c12b09cb235a2a0..3ee243055bf96715d0bfd822be0ef98152458cab 100644 (file)
--- a/purchasing/supplier_credit.php
+++ b/purchasing/supplier_credit.php
@@ -57,11 +57,10 @@ if (isset($_GET['New']))
                $help_context = "Supplier Credit Note";
                $_SESSION['page_title'] = _("Supplier Credit Note");
 
+       } else {
+               $help_context = "Supplier Credit Note";
+               $_SESSION['page_title'] = _("Supplier Credit Note");
                $_SESSION['supp_trans'] = new supp_trans(ST_SUPPCREDIT);
-       } elseif (isset($_GET['ModifyInvoice'])) {
-               $help_context = 'Modifying Purchase Invoice';
-               $_SESSION['page_title'] = sprintf( _("Modifying Supplier Credit # %d"), $_GET['ModifyCredit']);
-               $_SESSION['supp_trans'] = new supp_trans(ST_SUPPCREDIT, $_GET['ModifyCredit']);
        }
 }
 page($_SESSION['page_title'], false, false, "", $js);

diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php
index d62f5e530a2f2d97ff0670459f4669fa3024ede1..1a0ac95c5be03436a87c3c270a1597767a944439 100644 (file)
--- a/purchasing/supplier_invoice.php
+++ b/purchasing/supplier_invoice.php
@@ -312,6 +312,7 @@ function commit_item_data($n)
                        $_POST['prev_quantity_inv'.$n], input_num('this_quantity_inv'.$n),
                        $_POST['order_price'.$n], input_num('ChgPrice'.$n), $complete,
                        $_POST['std_cost_unit'.$n], "");
+               unset($_POST['mantax']);
        }
 }
 
@@ -341,6 +342,7 @@ $id3 = find_submit('Delete');
 if ($id3 != -1)
 {
        $_SESSION['supp_trans']->remove_grn_from_trans($id3);
+       unset($_POST['mantax']);
        $Ajax->activate('grn_items');
        $Ajax->activate('inv_tot');
 }

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index 800591df6baff9227e1cf8d9bde9235806e70094..cf05dfd9d9c29acc4e051ae7abc4b0c0b1acbc73 100644 (file)
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -57,26 +57,33 @@ if (isset($_POST['_DatePaid_changed'])) {
   $Ajax->activate('_ex_rate');
 }
 
+if (list_updated('supplier_id')) {
+       $_POST['amount'] = price_format(0);
+       $_SESSION['alloc']->person_id = get_post('supplier_id');
+       $Ajax->activate('amount');
+} elseif (list_updated('bank_account'))
+       $Ajax->activate('alloc_tbl');
+
 //----------------------------------------------------------------------------------------
 
 if (!isset($_POST['bank_account'])) { // first page call
-         $_SESSION['alloc'] = new allocation(ST_SUPPAYMENT, 0);
+       $_SESSION['alloc'] = new allocation(ST_SUPPAYMENT, 0, get_post('supplier_id'));
 
        if (isset($_GET['PInvoice'])) {
                //  get date and supplier
                $inv = get_supp_trans($_GET['PInvoice'], ST_SUPPINVOICE);
+               $dflt_act = get_default_bank_account($inv['curr_code']);
+               $_POST['bank_account'] = $dflt_act['id'];
                if($inv) {
-                       $_POST['supplier_id'] = $inv['supplier_id'];
+                       $_SESSION['alloc']->person_id = $_POST['supplier_id'] = $inv['supplier_id'];
+                       $_SESSION['alloc']->read();
                        $_POST['DatePaid'] = sql2date($inv['tran_date']);
-//                     $_POST['discount'] = price_format(0);
-//             $_POST['bank_account'], $_POST['ref']
                        $_POST['memo_'] = $inv['supp_reference'];
                        foreach($_SESSION['alloc']->allocs as $line => $trans) {
                                if ($trans->type == ST_SUPPINVOICE && $trans->type_no == $_GET['PInvoice']) {
-                                       $_POST['amount'] =
-                                               $_SESSION['alloc']->amount = price_format($_SESSION['alloc']->allocs[$line]->amount);
-                                       $_SESSION['alloc']->allocs[$line]->current_allocated =
-                                               $_SESSION['alloc']->allocs[$line]->amount;
+                                       $un_allocated = abs($trans->amount) - $trans->amount_allocated;
+                                       $_SESSION['alloc']->amount = $_SESSION['alloc']->allocs[$line]->current_allocated = $un_allocated;
+                                       $_POST['amount'] = $_POST['amount'.$line] = price_format($un_allocated);
                                        break;
                                }
                        }
@@ -93,12 +100,14 @@ if (isset($_GET['AddedID'])) {
        submenu_print(_("&Print This Remittance"), ST_SUPPAYMENT, $payment_id."-".ST_SUPPAYMENT, 'prtopt');
        submenu_print(_("&Email This Remittance"), ST_SUPPAYMENT, $payment_id."-".ST_SUPPAYMENT, null, 1);
 
-    display_note(get_gl_view_str(ST_SUPPAYMENT, $payment_id, _("View the GL &Journal Entries for this Payment")));
-
-       hyperlink_no_params($path_to_root . "/purchasing/inquiry/supplier_allocation_inquiry.php?supplier_id=", _("Select Another &Supplier Transaction for Payment"));
-//    hyperlink_params($path_to_root . "/purchasing/allocations/supplier_allocate.php", _("&Allocate this Payment"), "trans_no=$payment_id&trans_type=22");
+       submenu_view(_("View this Payment"), ST_SUPPAYMENT, $payment_id);
+    display_note(get_gl_view_str(ST_SUPPAYMENT, $payment_id, _("View the GL &Journal Entries for this Payment")), 0, 1);
 
-       hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Supplier &Payment"), "supplier_id=" . $_POST['supplier_id']);
+       submenu_option(_("Enter another supplier &payment"), "/purchasing/supplier_payment.php?supplier_id=".$_POST['supplier_id']);
+       submenu_option(_("Enter Other &Payment"), "/gl/gl_bank.php?NewPayment=Yes");
+       submenu_option(_("Enter &Customer Payment"), "/sales/customer_payments.php");
+       submenu_option(_("Enter Other &Deposit"), "/gl/gl_bank.php?NewDeposit=Yes");
+       submenu_option(_("Bank Account &Transfer"), "/gl/bank_transfer.php");
 
        display_footer_exit();
 }
@@ -116,7 +125,7 @@ function check_inputs()
                return false;
        } 
        
-       if ($_POST['amount'] == "") 
+       if (@$_POST['amount'] == "") 
        {
                $_POST['amount'] = price_format(0);
        }
@@ -143,14 +152,7 @@ function check_inputs()
                }       
        }
 
-       if (isset($_POST['_ex_rate']) && !check_num('_ex_rate', 0.000001))
-       {
-               display_error(_("The exchange rate must be numeric and greater than zero."));
-               set_focus('_ex_rate');
-               return false;
-       }
-
-       if ($_POST['discount'] == "") 
+       if (@$_POST['discount'] == "") 
        {
                $_POST['discount'] = 0;
        }
@@ -170,6 +172,14 @@ function check_inputs()
                return false;
        }
 
+       if (isset($_POST['bank_amount']) && input_num('bank_amount')<=0)
+       {
+               display_error(_("The entered bank amount is zero or negative."));
+               set_focus('bank_amount');
+               return false;
+       }
+
+
        if (!is_date($_POST['DatePaid']))
        {
                display_error(_("The entered date is invalid."));
@@ -185,7 +195,7 @@ function check_inputs()
 
        $limit = get_bank_account_limit($_POST['bank_account'], $_POST['DatePaid']);
 
-       if ($limit != null && ($limit < input_num('amount')))
+       if (($limit !== null) && (floatcmp($limit, input_num('amount')) < 0))
        {
                display_error(sprintf(_("The total bank amount exceeds allowed limit (%s)."), price_format($limit)));
                set_focus('amount');
@@ -208,6 +218,7 @@ function check_inputs()
 
        if (!db_has_currency_rates(get_supplier_currency($_POST['supplier_id']), $_POST['DatePaid'], true))
                return false;
+
        $_SESSION['alloc']->amount = -input_num('amount');
 
        if (isset($_POST["TotalNumberOfAllocs"]))
@@ -220,26 +231,14 @@ function check_inputs()
 
 function handle_add_payment()
 {
-       $supp_currency = get_supplier_currency($_POST['supplier_id']);
-       $bank_currency = get_bank_account_currency($_POST['bank_account']);
-       $comp_currency = get_company_currency();
-       if ($comp_currency != $bank_currency && $bank_currency != $supp_currency)
-               $rate = 0;
-       else
-       {
-               $rate = input_num('_ex_rate');
-               $supplier_amount = input_num('allocated_amount'); 
-                       if($supplier_amount) $rate = input_num('amount')/$supplier_amount;
-       }
-
-       $payment_id = add_supp_payment($_POST['supplier_id'], $_POST['DatePaid'],
-               $_POST['bank_account'], input_num('amount'), input_num('discount'), 
-               $_POST['ref'], $_POST['memo_'], $rate, input_num('charge'));
+       $payment_id = write_supp_payment(0, $_POST['supplier_id'], $_POST['bank_account'],
+               $_POST['DatePaid'], $_POST['ref'], input_num('amount'), input_num('discount'), $_POST['memo_'], 
+               input_num('charge'), input_num('bank_amount', input_num('amount')));
        new_doc_date($_POST['DatePaid']);
 
        $_SESSION['alloc']->trans_no = $payment_id;
        $_SESSION['alloc']->write();
-       //unset($_POST['supplier_id']);
+
        unset($_POST['bank_account']);
        unset($_POST['DatePaid']);
        unset($_POST['currency']);
@@ -282,8 +281,10 @@ start_form();
 
        set_global_supplier($_POST['supplier_id']);
 
-       if (!list_updated('bank_account'))
-               $_POST['bank_account'] = get_default_supplier_bank_account($_POST['supplier_id']);              
+       if (!list_updated('bank_account') && !get_post('__ex_rate_changed'))
+               $_POST['bank_account'] = get_default_supplier_bank_account($_POST['supplier_id']);
+       else
+               $_POST['amount'] = price_format(0);
 
     bank_accounts_list_row(_("From Bank Account:"), 'bank_account', null, true);
 
@@ -291,40 +292,37 @@ start_form();
 
        table_section(2);
 
-    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_SUPPAYMENT));
-
     date_row(_("Date Paid") . ":", 'DatePaid', '', true, 0, 0, 0, null, true);
 
+    ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_SUPPAYMENT));
+
        table_section(3);
 
-       $supplier_currency = get_supplier_currency($_POST['supplier_id']);
-       $bank_currency = get_bank_account_currency($_POST['bank_account']);
+       $comp_currency = get_company_currency();
+       $supplier_currency = $_SESSION['alloc']->set_person($_POST['supplier_id'], PT_SUPPLIER);
+       if (!$supplier_currency)
+                       $supplier_currency = $comp_currency;
+       $_SESSION['alloc']->currency = $bank_currency = get_bank_account_currency($_POST['bank_account']);
+
        if ($bank_currency != $supplier_currency) 
        {
-               amount_row("Supplier Amount:", 'allocated_amount', null, '', $supplier_currency, 2);
+               amount_row(_("Bank Amount:"), 'bank_amount', null, '', $bank_currency, 2);
        }
 
-       amount_row(_("Bank Charge:"), 'charge');
+       amount_row(_("Bank Charge:"), 'charge', null, '', $bank_currency);
 
 
-       end_outer_table(1); // outer table
+       end_outer_table(1);
 
-       if ($bank_currency == $supplier_currency) {
-               div_start('alloc_tbl');
-               show_allocatable(false);
-               div_end();
-       }
+       div_start('alloc_tbl');
+       show_allocatable(false);
+       div_end();
 
        start_table(TABLESTYLE, "width=60%");
-       amount_row(_("Amount of Discount:"), 'discount');
-       amount_row(_("Amount of Payment:"), 'amount');
+       amount_row(_("Amount of Discount:"), 'discount', null, '', $supplier_currency);
+       amount_row(_("Amount of Payment:"), 'amount', null, '', $supplier_currency);
        textarea_row(_("Memo:"), 'memo_', null, 22, 4);
        end_table(1);
-       
-       if ($bank_currency != $supplier_currency) 
-       {
-               display_note(_("The amount and discount are in the bank account's currency."), 0, 1);
-       }
 
        submit_center('ProcessSuppPayment',_("Enter Payment"), true, '', 'default');
 

diff --git a/purchasing/view/view_supp_payment.php b/purchasing/view/view_supp_payment.php
index d6786f5538e075faafdcf226edf2e79f99094085..a23e8d713574a4a90b726305bf3f0fb1a98ae5b0 100644 (file)
--- a/purchasing/view/view_supp_payment.php
+++ b/purchasing/view/view_supp_payment.php
@@ -33,10 +33,10 @@ $company_currency = get_company_currency();
 $show_currencies = false;
 $show_both_amounts = false;
 
-if (($receipt['bank_curr_code'] != $company_currency) || ($receipt['SupplierCurrCode'] != $company_currency))
+if (($receipt['bank_curr_code'] != $company_currency) || ($receipt['curr_code'] != $company_currency))
        $show_currencies = true;
 
-if ($receipt['bank_curr_code'] != $receipt['SupplierCurrCode']) 
+if ($receipt['bank_curr_code'] != $receipt['curr_code']) 
 {
        $show_currencies = true;
        $show_both_amounts = true;
@@ -57,7 +57,7 @@ end_row();
 start_row();
 if ($show_currencies)
        label_cells(_("Payment Currency"), $receipt['bank_curr_code'], "class='tableheader2'");
-label_cells(_("Amount"), number_format2(-$receipt['BankAmount'], user_price_dec()), "class='tableheader2'");
+label_cells(_("Amount"), number_format2(-$receipt['bank_amount'], user_price_dec()), "class='tableheader2'");
 if ($receipt['ov_discount'] != 0)
        label_cells(_("Discount"), number_format2(-$receipt['ov_discount']*$receipt['rate'], user_price_dec()), "class='tableheader2'");
 else
@@ -66,7 +66,7 @@ end_row();
 start_row();
 if ($show_currencies) 
 {
-       label_cells(_("Supplier's Currency"), $receipt['SupplierCurrCode'], "class='tableheader2'");
+       label_cells(_("Supplier's Currency"), $receipt['curr_code'], "class='tableheader2'");
 }
 if ($show_both_amounts)
        label_cells(_("Amount"), number_format2(-$receipt['Total'], user_price_dec()), "class='tableheader2'");

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index 3ecc468e34f964fe315fb2dee4ad6702cc6c4bb0..5bda35c6c171c471aaffec419675abf38eada389 100644 (file)
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -139,7 +139,7 @@
                $this->Text($mcol + 100, $this->formData['document_name']);
                $this->Text($mcol + 180, $this->formData['document_number']);
 
-               if ($this->pageNumber > 1 && !strstr($this->filename, "Bulk"))
+               if ($this->pageNumber > 1)
                        $this->Text($this->endLine - 35, _("Page") . ' ' . $this->pageNumber);
                $this->row = $iline1 - $this->lineHeight;
                $this->fontSize -= 4;

diff --git a/reporting/rep101.php b/reporting/rep101.php
index 6bff59510dad8e2f30edd1c665c4e9dc8c216d58..74b355d8dc81cfbe667126fb70ab4cf3fb614dc3 100644 (file)
--- a/reporting/rep101.php
+++ b/reporting/rep101.php
@@ -30,34 +30,19 @@ include_once($path_to_root . "/sales/includes/db/customers_db.inc");
 // trial_inquiry_controls();
 print_customer_balances();
 
-function get_open_balance($debtorno, $to, $convert)
+function get_open_balance($debtorno, $to)
 {
        if($to)
                $to = date2sql($to);
 
     $sql = "SELECT SUM(IF(t.type = ".ST_SALESINVOICE." OR t.type = ".ST_BANKPAYMENT.",
-       (t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount)";
-    if ($convert)
-       $sql .= " * rate";
-    $sql .= ", 0)) AS charges,
+       (t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount), 0)) AS charges,
        SUM(IF(t.type <> ".ST_SALESINVOICE." AND t.type <> ".ST_BANKPAYMENT.",
-       (t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount)";
-    if ($convert)
-       $sql .= " * rate";
-    $sql .= " * -1, 0)) AS credits,
-               SUM(t.alloc";
-       if ($convert)
-               $sql .= " * rate";
-       $sql .= ") AS Allocated,
+               (t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) * -1, 0)) AS credits,
+               SUM(t.alloc) AS Allocated,
                SUM(IF(t.type = ".ST_SALESINVOICE." OR t.type = ".ST_BANKPAYMENT.",
-                       (t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount - t.alloc)";
-    if ($convert)
-       $sql .= " * rate";
-    $sql .= ", 
-       ((t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) * -1 + t.alloc)";
-    if ($convert)
-       $sql .= " * rate";
-    $sql .= ")) AS OutStanding
+                       (t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount - t.alloc),
+               ((t.ov_amount + t.ov_gst + t.ov_freight + t.ov_freight_tax + t.ov_discount) * -1 + t.alloc))) AS OutStanding
                FROM ".TB_PREF."debtor_trans t
        WHERE t.debtor_no = ".db_escape($debtorno)
                ." AND t.type <> ".ST_CUSTDELIVERY;
@@ -164,18 +149,19 @@ function print_customer_balances()
                if (!$convert && $currency != $myrow['curr_code']) continue;
                
                $accumulate = 0;
+               $rate = $convert ? get_exchange_rate_from_home_currency($myrow['curr_code'], Today()) : 1;
                $bal = get_open_balance($myrow['debtor_no'], $from, $convert);
                $init[0] = $init[1] = 0.0;
-               $init[0] = round2(abs($bal['charges']), $dec);
-               $init[1] = round2(Abs($bal['credits']), $dec);
-               $init[2] = round2($bal['Allocated'], $dec);
+               $init[0] = round2(abs($bal['charges']*$rate), $dec);
+               $init[1] = round2(Abs($bal['credits']*$rate), $dec);
+               $init[2] = round2($bal['Allocated']*$rate, $dec);
                if ($show_balance)
                {
                        $init[3] = $init[0] - $init[1];
                        $accumulate += $init[3];
                }       
                else    
-                       $init[3] = round2($bal['OutStanding'], $dec);
+                       $init[3] = round2($bal['OutStanding']*$rate, $dec);
 
                $res = get_transactions($myrow['debtor_no'], $from, $to);
                if ($no_zeros && db_num_rows($res) == 0) continue;
@@ -211,10 +197,6 @@ function print_customer_balances()
                        if ($trans['type'] == ST_SALESINVOICE)
                                $rep->DateCol(3, 4,     $trans['due_date'], true);
                        $item[0] = $item[1] = 0.0;
-                       if ($convert)
-                               $rate = $trans['rate'];
-                       else
-                               $rate = 1.0;
                        if ($trans['type'] == ST_CUSTCREDIT || $trans['type'] == ST_CUSTPAYMENT || $trans['type'] == ST_BANKDEPOSIT)
                                $trans['TotalAmount'] *= -1;
                        if ($trans['TotalAmount'] > 0.0)

diff --git a/reporting/rep105.php b/reporting/rep105.php
index cccf289f05dcf496eedc139e93672ae9ba43a487..b57536756935fe20ce004431c422b8fb190cc704 100644 (file)
--- a/reporting/rep105.php
+++ b/reporting/rep105.php
@@ -111,7 +111,7 @@ function print_order_status_list()
 
        $aligns = array('left', 'left', 'right', 'right', 'right', 'right',     'right');
 
-       $headers = array(_('Code'),     _('Description'), _('Ordered'), _('Invoiced'),
+       $headers = array(_('Code'),     _('Description'), _('Ordered'), _('Delivered'),
                _('Outstanding'), '');
 
     $params =   array(         0 => $comments,

diff --git a/reporting/rep107.php b/reporting/rep107.php
index 41483f9f41d349619defd69d8c4970965fffe7e1..69b95c97054df1d1c7b2138eee301284e382f396 100644 (file)
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -88,7 +88,9 @@ 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))
                                continue;

diff --git a/reporting/rep108.php b/reporting/rep108.php
index 59a558903e3292e717166aac0042b737e8f723c1..1a122c0435df2359fbdaf62297d78d7ba5388a70 100644 (file)
--- a/reporting/rep108.php
+++ b/reporting/rep108.php
@@ -44,7 +44,7 @@ function getTransactions($debtorno, $date, $show_also_allocated)
                                        AND ABS(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight +
                                ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) > 1e-6";
        if (!$show_also_allocated)
-               $sql .= " AND ABS (ABS(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight +
+               $sql .= " AND ABS(ABS(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight +
                                ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) - alloc) > 1e-6";
        $sql .= " ORDER BY ".TB_PREF."debtor_trans.tran_date";
 

diff --git a/reporting/rep112.php b/reporting/rep112.php
index b2d6879ed07582ffe522fd092b6c5fbf00116b6e..062d136538e693a2f173bfb4a786eb28c087eab2 100644 (file)
--- a/reporting/rep112.php
+++ b/reporting/rep112.php
@@ -33,7 +33,8 @@ function get_receipt($type, $trans_no)
 {
     $sql = "SELECT ".TB_PREF."debtor_trans.*,
                                (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + 
-                               ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) AS Total, 
+                               ".TB_PREF."debtor_trans.ov_freight_tax) AS Total,
+                               ".TB_PREF."debtor_trans.ov_discount,
                                ".TB_PREF."debtors_master.name AS DebtorName,  ".TB_PREF."debtors_master.debtor_ref,
                                ".TB_PREF."debtors_master.curr_code, ".TB_PREF."debtors_master.payment_terms, "
                                .TB_PREF."debtors_master.tax_id AS tax_id,
@@ -136,17 +137,24 @@ function print_receipts()
                                $rep->TextColLines(1, 5, $memo, -2);
                        }
 
-                       $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
+                       $rep->row = $rep->bottomMargin + (16 * $rep->lineHeight);
 
                        $rep->TextCol(3, 6, _("Total Allocated"), -2);
                        $rep->AmountCol(6, 7, $total_allocated, $dec, -2);
                        $rep->NewLine();
                        $rep->TextCol(3, 6, _("Left to Allocate"), -2);
-                       $rep->AmountCol(6, 7, $myrow['Total'] - $total_allocated, $dec, -2);
+                       $rep->AmountCol(6, 7, $myrow['Total'] + $myrow['ov_discount'] - $total_allocated, $dec, -2);
+                       if (floatcmp($myrow['ov_discount'], 0))
+                       {
+                               $rep->NewLine();
+                               $rep->TextCol(3, 6, _("Discount"), - 2);
+                               $rep->AmountCol(6, 7, -$myrow['ov_discount'], $dec, -2);
+                       }       
                        $rep->NewLine();
                        $rep->Font('bold');
                        $rep->TextCol(3, 6, _("TOTAL RECEIPT"), - 2);
                        $rep->AmountCol(6, 7, $myrow['Total'], $dec, -2);
+
                        $words = price_in_words($myrow['Total'], ST_CUSTPAYMENT);
                        if ($words != "")
                        {

diff --git a/reporting/rep201.php b/reporting/rep201.php
index 6a9f2c2edf15fa5b912ea90130e4e16a5b5ca1d7..6fc122ddb88353807a753806c344e9f088153483 100644 (file)
--- a/reporting/rep201.php
+++ b/reporting/rep201.php
@@ -27,30 +27,18 @@ include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 print_supplier_balances();
 
-function get_open_balance($supplier_id, $to, $convert)
+function get_open_balance($supplier_id, $to)
 {
        $to = date2sql($to);
 
     $sql = "SELECT SUM(IF(".TB_PREF."supp_trans.type = ".ST_SUPPINVOICE." OR ".TB_PREF."supp_trans.type = ".ST_BANKDEPOSIT.", 
-       (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount)";
-    if ($convert)
-       $sql .= " * rate";
-    $sql .= ", 0)) AS charges,
+       (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount), 0)) AS charges,
        SUM(IF(".TB_PREF."supp_trans.type <> ".ST_SUPPINVOICE." AND ".TB_PREF."supp_trans.type <> ".ST_BANKDEPOSIT.", 
-       (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount)";
-    if ($convert)
-       $sql .= "* rate";
-    $sql .= ", 0)) AS credits,
-               SUM(".TB_PREF."supp_trans.alloc";
-       if ($convert)
-               $sql .= " * rate";
-       $sql .= ") AS Allocated,
+       (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount), 0)) AS credits,
+               SUM(".TB_PREF."supp_trans.alloc) AS Allocated,
                SUM(IF(".TB_PREF."supp_trans.type = ".ST_SUPPINVOICE." OR ".TB_PREF."supp_trans.type = ".ST_BANKDEPOSIT.",
                (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount - ".TB_PREF."supp_trans.alloc),
-               (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount + ".TB_PREF."supp_trans.alloc))";
-    if ($convert)
-       $sql .= " * rate";
-    $sql .= ") AS OutStanding
+               (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount + ".TB_PREF."supp_trans.alloc))) AS OutStanding
                FROM ".TB_PREF."supp_trans
        WHERE ".TB_PREF."supp_trans.tran_date < '$to'
                AND ".TB_PREF."supp_trans.supplier_id = '$supplier_id' GROUP BY supplier_id";
@@ -154,7 +142,7 @@ function print_supplier_balances()
                if (!$convert && $currency != $myrow['curr_code'])
                        continue;
                $accumulate = 0;
-               $bal = get_open_balance($myrow['supplier_id'], $from, $convert);
+               $bal = get_open_balance($myrow['supplier_id'], $from);
                $init[0] = $init[1] = 0.0;
                $init[0] = round2(abs($bal['charges']), $dec);
                $init[1] = round2(Abs($bal['credits']), $dec);
@@ -191,6 +179,8 @@ function print_supplier_balances()
                while ($trans=db_fetch($res))
                {
                        if ($no_zeros && floatcmp(abs($trans['TotalAmount']), $trans['Allocated']) == 0) continue;
+                       $rate = $convert ? get_exchange_rate_from_home_currency($myrow['curr_code'], Today()) : 1;
+
                        $rep->NewLine(1, 2);
                        $rep->TextCol(0, 1, $systypes_array[$trans['type']]);
                        $rep->TextCol(1, 2,     $trans['reference']);
@@ -198,10 +188,6 @@ function print_supplier_balances()
                        if ($trans['type'] == ST_SUPPINVOICE)
                                $rep->DateCol(3, 4,     $trans['due_date'], true);
                        $item[0] = $item[1] = 0.0;
-                       if ($convert)
-                               $rate = $trans['rate'];
-                       else
-                               $rate = 1.0;
                        if ($trans['TotalAmount'] > 0.0)
                        {
                                $item[0] = round2(abs($trans['TotalAmount']) * $rate, $dec);

diff --git a/reporting/rep210.php b/reporting/rep210.php
index 5b23068103070335433f44ff56dcd8f549f14178..a519fc97659e8a17269604ce1a2f21442b20be54 100644 (file)
--- a/reporting/rep210.php
+++ b/reporting/rep210.php
@@ -33,7 +33,8 @@ print_remittances();
 function get_remittance($type, $trans_no)
 {
        $sql = "SELECT ".TB_PREF."supp_trans.*, 
-               (".TB_PREF."supp_trans.ov_amount+".TB_PREF."supp_trans.ov_gst+".TB_PREF."supp_trans.ov_discount) AS Total, 
+               (".TB_PREF."supp_trans.ov_amount+".TB_PREF."supp_trans.ov_gst) AS Total,
+               ".TB_PREF."supp_trans.ov_discount,
                ".TB_PREF."suppliers.supp_name,  ".TB_PREF."suppliers.supp_account_no, 
                ".TB_PREF."suppliers.curr_code, ".TB_PREF."suppliers.payment_terms, ".TB_PREF."suppliers.gst_no AS tax_id, 
                ".TB_PREF."suppliers.address
@@ -143,18 +144,27 @@ function print_remittances()
                                $rep->NewLine();
                                $rep->TextColLines(1, 5, $memo, -2);
                        }
-                       $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
+                       $rep->row = $rep->bottomMargin + (16 * $rep->lineHeight);
 
                        $rep->TextCol(3, 6, _("Total Allocated"), -2);
                        $rep->AmountCol(6, 7, $total_allocated, $dec, -2);
                        $rep->NewLine();
                        $rep->TextCol(3, 6, _("Left to Allocate"), -2);
                        $myrow['Total'] *= -1;
-                       $rep->AmountCol(6, 7, $myrow['Total'] - $total_allocated, $dec, -2);
+                       $myrow['ov_discount'] *= -1;
+                       $rep->AmountCol(6, 7, $myrow['Total'] + $myrow['ov_discount'] - $total_allocated, $dec, -2);
+                       if (floatcmp($myrow['ov_discount'], 0))
+                       {
+                               $rep->NewLine();
+                               $rep->TextCol(3, 6, _("Discount"), - 2);
+                               $rep->AmountCol(6, 7, -$myrow['ov_discount'], $dec, -2);
+                       }       
+
                        $rep->NewLine();
                        $rep->Font('bold');
                        $rep->TextCol(3, 6, _("TOTAL REMITTANCE"), - 2);
                        $rep->AmountCol(6, 7, $myrow['Total'], $dec, -2);
+
                        $words = price_in_words($myrow['Total'], ST_SUPPAYMENT);
                        if ($words != "")
                        {

diff --git a/reporting/rep305.php b/reporting/rep305.php
index 17aae03f6fc25cc54991f899223b906e5a4deb2a..2c75640b85f40ce2f69517a8fb7cb5f6cb629f38 100644 (file)
--- a/reporting/rep305.php
+++ b/reporting/rep305.php
@@ -63,6 +63,7 @@ function getSuppInvDetails($grn_item_id)
        $sql = "SELECT
                        ".TB_PREF."supp_invoice_items.supp_trans_no inv_no,
                        ".TB_PREF."supp_invoice_items.quantity inv_qty,
+                       ".TB_PREF."supp_trans.rate,
                        IF (".TB_PREF."supp_trans.tax_included = 1, ".TB_PREF."supp_invoice_items.unit_price - ".TB_PREF."supp_invoice_items.unit_tax, ".TB_PREF."supp_invoice_items.unit_price) inv_price
                        FROM ".TB_PREF."grn_items, ".TB_PREF."supp_trans, ".TB_PREF."supp_invoice_items
                        WHERE ".TB_PREF."grn_items.id = ".TB_PREF."supp_invoice_items.grn_item_id
@@ -131,9 +132,6 @@ function print_grn_valuation()
                        }
                        $stock_id = $trans['item_code'];
                }
-               $curr = get_supplier_currency($trans['supplier_id']);
-               $rate = get_exchange_rate_from_home_currency($curr, sql2date($trans['delivery_date']));
-               $trans['std_cost_unit'] *= $rate;
 
                $rep->NewLine();
                $rep->TextCol(0, 1, $trans['item_code']);
@@ -147,7 +145,7 @@ function print_grn_valuation()
                        $suppinv = getSuppInvDetails($trans['grn_item_id']);
                        while ($inv=db_fetch($suppinv))
                        {       
-                               $inv['inv_price'] *= $rate;
+                               $inv['inv_price'] *= $inv['rate'];
                                $rep->TextCol(4, 5, $inv['inv_no']);
                                $rep->AmountCol(5, 6, $inv['inv_qty'], $qdec);
                                $rep->AmountCol(6, 7, $inv['inv_price'], $dec);
@@ -160,9 +158,12 @@ function print_grn_valuation()
                                $grandtotal += $amt;
                        }
                }
-       
+               
                if ($trans['qty_recd'] - $trans['quantity_inv'] !=0 )
                {
+                       $curr = get_supplier_currency($trans['supplier_id']);
+                       $rate = get_exchange_rate_from_home_currency($curr, sql2date($trans['delivery_date']));
+                       $trans['unit_price'] *= $rate;
                        $rep->TextCol(4, 5, "--");
                        $rep->AmountCol(5, 6, $trans['qty_recd'] - $trans['quantity_inv'], $qdec);
                        $rep->AmountCol(7, 8, $trans['unit_price'], $dec);

diff --git a/reporting/rep306.php b/reporting/rep306.php
index 77f367471c8ab0271610dd98f48dea033ab0a46f..94bca60ab18f1515dd9143fa8860bef09cf574c5 100644 (file)
--- a/reporting/rep306.php
+++ b/reporting/rep306.php
@@ -170,14 +170,13 @@ function print_inventory_purchase()
                {
                        if ($stock_description != '')
                        {
-                               $stock_dec = get_qty_dec($stock_id);
                                if ($supplier_name != '')
                                {
                                        $rep->NewLine(2, 3);
                                        $rep->TextCol(0, 1, _('Total'));
                                        $rep->TextCol(1, 4, $stock_description);
                                        $rep->TextCol(4, 5, $supplier_name);
-                                       $rep->AmountCol(5, 7, $total_qty, $stock_dec);
+                                       $rep->AmountCol(5, 7, $total_qty, get_qty_dec($stock_id));
                                        $rep->AmountCol(7, 8, $total_supp, $dec);
                                        $rep->Line($rep->row - 2);
                                        $rep->NewLine();
@@ -197,7 +196,7 @@ function print_inventory_purchase()
                                $rep->TextCol(0, 1, _('Total'));
                                $rep->TextCol(1, 4, $stock_description);
                                $rep->TextCol(4, 5, $supplier_name);
-                               $rep->AmountCol(5, 7, $total_qty, $stock_dec);
+                               $rep->AmountCol(5, 7, $total_qty, get_qty_dec($stock_id));
                                $rep->AmountCol(7, 8, $total_supp, $dec);
                                $rep->Line($rep->row - 2);
                                $rep->NewLine();
@@ -262,7 +261,7 @@ function print_inventory_purchase()
                        $rep->TextCol(0, 1, _('Total'));
                        $rep->TextCol(1, 4, $stock_description);
                        $rep->TextCol(4, 5, $supplier_name);
-                       $rep->AmountCol(5, 7, $total_qty, $stock_dec);
+                       $rep->AmountCol(5, 7, $total_qty, get_qty_dec($stock_id));
                        $rep->AmountCol(7, 8, $total_supp, $dec);
                        $rep->Line($rep->row - 2);
                        $rep->NewLine();
@@ -277,7 +276,7 @@ function print_inventory_purchase()
                $rep->TextCol(0, 1, _('Total'));
                $rep->TextCol(1, 4, $stock_description);
                $rep->TextCol(4, 5, $supplier_name);
-               $rep->AmountCol(5, 7, $total_qty, $stock_dec);
+               $rep->AmountCol(5, 7, $total_qty, get_qty_dec($stock_id));
                $rep->AmountCol(7, 8, $total_supp, $dec);
                $rep->Line($rep->row - 2);
                $rep->NewLine();

diff --git a/reporting/rep309.php b/reporting/rep309.php
index 4c8f449e3f30f39ca832a09b7fdddc195e2ab077..1bb9ba06a7df49c8abd83794b3da93cd48c800a0 100644 (file)
--- a/reporting/rep309.php
+++ b/reporting/rep309.php
@@ -37,7 +37,7 @@ function getTransactions($category, $from, $to)
                        category.description AS cat_description,
                        item.stock_id,
                        item.description,
-                       line.unit_price,
+                       line.unit_price * trans.rate AS unit_price,
                        SUM(line.quantity) as quantity
                FROM ".TB_PREF."stock_master item,
                        ".TB_PREF."stock_category category,

diff --git a/sales/allocations/customer_allocate.php b/sales/allocations/customer_allocate.php
index 7f7fe7b1b31c030173da3e8a1089e7b5a9c53c19..cf0005fe04e7d9e5c0f5ea122c4a94bfa06bc8c9 100644 (file)
--- a/sales/allocations/customer_allocate.php
+++ b/sales/allocations/customer_allocate.php
@@ -36,6 +36,7 @@ function clear_allocations()
                unset($_SESSION['alloc']->allocs);
                unset($_SESSION['alloc']);
        }
+       //session_register('alloc');
 }
 
 //--------------------------------------------------------------------------------
@@ -44,19 +45,27 @@ function edit_allocations_for_transaction($type, $trans_no)
 {
        global $systypes_array;
 
-    display_heading(sprintf(_("Allocation of %s # %d"), $systypes_array[$_SESSION['alloc']->type],
-       $_SESSION['alloc']->trans_no));
+       $cart = $_SESSION['alloc'];
 
-    display_heading($_SESSION['alloc']->person_name);
+    display_heading(sprintf(_("Allocation of %s # %d"), $systypes_array[$cart->type], $cart->trans_no));
 
-    display_heading2(_("Date:") . " <b>" . $_SESSION['alloc']->date_ . "</b>");
-    display_heading2(_("Total:") . " <b>" . price_format($_SESSION['alloc']->amount) . "</b>");
+    display_heading($cart->person_name);
+
+    display_heading2(_("Date:") . " <b>" . $cart->date_ . "</b>");
+       display_heading2(_("Total:"). " <b>" . price_format($cart->bank_amount).' '.$cart->currency."</b>");
+
+       if ($cart->currency != $cart->person_curr)
+       {
+           $total = _("Total in clearing currency:") . " <b>" . price_format($cart->amount)."</b>"
+               . sprintf(" %s (%s %s/%s)", $cart->person_curr, exrate_format($cart->bank_amount/$cart->amount), $cart->currency, $cart->person_curr);
+       display_heading2($total);
+       }
 
     echo "<br>";
 
        start_form();
        div_start('alloc_tbl');
-    if (count($_SESSION['alloc']->allocs) > 0)
+    if (count($cart->allocs) > 0)
     {
                show_allocatable(true);
                submit_center_first('UpdateDisplay', _("Refresh"), _('Start again allocation of selected amount'), true);
@@ -98,7 +107,7 @@ if (isset($_POST['Cancel']))
 if (isset($_GET['trans_no']) && isset($_GET['trans_type']))
 {
        clear_allocations();
-       $_SESSION['alloc'] = new allocation($_GET['trans_type'], $_GET['trans_no']);
+       $_SESSION['alloc'] = new allocation($_GET['trans_type'], $_GET['trans_no'], @$_GET['debtor_no'], PT_CUSTOMER);
 }
 
 if(get_post('UpdateDisplay'))

diff --git a/sales/allocations/customer_allocation_main.php b/sales/allocations/customer_allocation_main.php
index ef40147e2a8490753961653b0d1d4e1ab9e15b3b..5908ee5770354320253b5203a8dd99a5d65d49b2 100644 (file)
--- a/sales/allocations/customer_allocation_main.php
+++ b/sales/allocations/customer_allocation_main.php
@@ -73,7 +73,7 @@ function alloc_link($row)
 {
        return pager_link(_("Allocate"),
                "/sales/allocations/customer_allocate.php?trans_no="
-                       .$row["trans_no"] . "&trans_type=" . $row["type"], ICON_MONEY);
+                       .$row["trans_no"] . "&trans_type=" . $row["type"]. "&debtor_no=" . $row["debtor_no"], ICON_ALLOC);
 }
 
 function amount_left($row)

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index 5abc5942d4fa61699dca5194d3764681dbabbf5d..4363493bfb678e8edb40477be50b3735ae9be8f5 100644 (file)
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -459,23 +459,25 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
                $ln_itm->qty_dispatched = $ln_itm->quantity-$ln_itm->qty_done;
        }
        // if it's a non-stock item (eg. service) don't show qoh
-       $show_qoh = true;
-       if ($SysPrefs->allow_negative_stock() || !has_stock_holding($ln_itm->mb_flag) ||
-               $ln_itm->qty_dispatched == 0) {
-               $show_qoh = false;
-       }
+       $row_classes = null;
+       if (has_stock_holding($ln_itm->mb_flag) && $ln_itm->qty_dispatched) {
+               // It's a stock : call get_dispatchable_quantity hook  to get which quantity to preset in the
+               // quantity input box. This allows for example a hook to modify the default quantity to what's dispatchable
+               // (if there is not enough in hand), check at other location or other order people etc ...
+               // This hook also returns a 'reason' (css classes) which can be used to theme the row.
 
-       if ($show_qoh) {
                $qoh = get_qoh_on_date($ln_itm->stock_id, $_POST['Location'], $_POST['DispatchDate']);
-       }
+               $q_class =  hook_get_dispatchable_quantity($ln_itm, $_POST['Location'], $_POST['DispatchDate'], $qoh);
+               // Skip line if needed
+               if($q_class === 'skip')  continue;
+               if(is_array($q_class)) {
+                 list($ln_itm->qty_dispatched, $row_classes) = $q_class;
+                       $has_marked = true;
+               }
 
-       if ($show_qoh && ($ln_itm->qty_dispatched > $qoh)) {
-               // oops, we don't have enough of one of the component items
-               start_row("class='stockmankobg'");
-               $has_marked = true;
-       } else {
-               alt_table_row_color($k);
        }
+
+       alt_table_row_color($k, $row_classes);
        view_stock_status_cell($ln_itm->stock_id);
 
        if ($ln_itm->descr_editable)

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index 42a84fb2fd4b83e59abcdafb3aac86a812290665..3b44bc67e8613ee7bb906ae6eed66ff6da497777 100644 (file)
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -18,7 +18,6 @@ include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/banking.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
-//include_once($path_to_root . "/sales/includes/ui/cust_alloc_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
@@ -44,22 +43,25 @@ if (isset($_GET['customer_id']))
        $_POST['customer_id'] = $_GET['customer_id'];
 }
 
-if (!isset($_POST['bank_account']))
-{ // first page call
-       $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT,0);
+if (!isset($_POST['bank_account'])) { // first page call
+       $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT, 0, get_post('customer_id'));
 
        if (isset($_GET['SInvoice'])) {
                //  get date and supplier
                $inv = get_customer_trans($_GET['SInvoice'], ST_SALESINVOICE);
+               $dflt_act = get_default_bank_account($inv['curr_code']);
+               $_POST['bank_account'] = $dflt_act['id'];
                if($inv) {
-                       $_POST['customer_id'] = $inv['debtor_no'];
+                       $_SESSION['alloc']->person_id = $_POST['customer_id'] = $inv['debtor_no'];
+                       $_SESSION['alloc']->read();
                        $_POST['DateBanked'] = sql2date($inv['tran_date']);
                        foreach($_SESSION['alloc']->allocs as $line => $trans) {
                                if ($trans->type == ST_SALESINVOICE && $trans->type_no == $_GET['SInvoice']) {
-                                       $_POST['amount'] =
-                                               $_SESSION['alloc']->amount = price_format($_SESSION['alloc']->allocs[$line]->amount);
-                                       $_SESSION['alloc']->allocs[$line]->current_allocated =
-                                               $_SESSION['alloc']->allocs[$line]->amount;
+                                       $un_allocated = $trans->amount - $trans->amount_allocated;
+                                       if ($un_allocated){
+                                               $_SESSION['alloc']->allocs[$line]->current_allocated = $un_allocated;
+                                               $_POST['amount'] = $_POST['amount'.$line] = price_format($un_allocated);
+                                       }
                                        break;
                                }
                        }
@@ -73,6 +75,7 @@ if (list_updated('BranchID')) {
        // when branch is selected via external editor also customer can change
        $br = get_branch(get_post('BranchID'));
        $_POST['customer_id'] = $br['debtor_no'];
+       $_SESSION['alloc']->person_id = $br['debtor_no'];
        $Ajax->activate('customer_id');
 }
 
@@ -95,13 +98,15 @@ if (isset($_GET['AddedID'])) {
 
        submenu_print(_("&Print This Receipt"), ST_CUSTPAYMENT, $payment_no."-".ST_CUSTPAYMENT, 'prtopt');
 
-       display_note(get_gl_view_str(ST_CUSTPAYMENT, $payment_no, _("&View the GL Journal Entries for this Customer Payment")));
-
-//     hyperlink_params($path_to_root . "/sales/allocations/customer_allocate.php", _("&Allocate this Customer Payment"), "trans_no=$payment_no&trans_type=12");
+       submenu_view(_("&View this Customer Payment"), ST_CUSTPAYMENT, $payment_no);
 
-       hyperlink_no_params($path_to_root . "/sales/inquiry/customer_allocation_inquiry.php?customer_id=", _("Select Another &Customer Transaction for Payment"));
+       submenu_option(_("Enter Another &Customer Payment"), "/sales/customer_payments.php");
+       submenu_option(_("Enter Other &Deposit"), "/gl/gl_bank.php?NewDeposit=Yes");
+       submenu_option(_("Enter Payment to &Supplier"), "/purchasing/supplier_payment.php");
+       submenu_option(_("Enter Other &Payment"), "/gl/gl_bank.php?NewPayment=Yes");
+       submenu_option(_("Bank Account &Transfer"), "/gl/bank_transfer.php");
 
-       hyperlink_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another &Customer Payment"));
+       display_note(get_gl_view_str(ST_CUSTPAYMENT, $payment_no, _("&View the GL Journal Entries for this Customer Payment")));
 
        display_footer_exit();
 }
@@ -136,7 +141,7 @@ function can_process()
                return false;
        } 
        
-       if (!get_post('BranchID')) 
+       if (!get_post('BranchID'))
        {
                display_error(_("This customer has no branch defined."));
                set_focus('BranchID');
@@ -193,14 +198,14 @@ function can_process()
                }       
        }
 
-       if (isset($_POST['_ex_rate']) && !check_num('_ex_rate', 0.000001))
-       {
-               display_error(_("The exchange rate must be numeric and greater than zero."));
-               set_focus('_ex_rate');
-               return false;
-       }
+//     if (isset($_POST['_ex_rate']) && !check_num('_ex_rate', 0.000001))
+//     {
+//             display_error(_("The exchange rate must be numeric and greater than zero."));
+//             set_focus('_ex_rate');
+//             return false;
+//     }
 
-       if ($_POST['discount'] == "") 
+       if (@$_POST['discount'] == "") 
        {
                $_POST['discount'] = 0;
        }
@@ -213,10 +218,18 @@ function can_process()
 
        //if ((input_num('amount') - input_num('discount') <= 0)) {
        if (input_num('amount') <= 0) {
-               display_error(_("The balance of the amount and discout is zero or negative. Please enter valid amounts."));
+               display_error(_("The balance of the amount and discount is zero or negative. Please enter valid amounts."));
                set_focus('discount');
                return false;
        }
+
+       if (isset($_POST['bank_amount']) && input_num('bank_amount')<=0)
+       {
+               display_error(_("The entered payment amount is zero or negative."));
+               set_focus('bank_amount');
+               return false;
+       }
+
        if (!db_has_currency_rates(get_customer_currency($_POST['customer_id']), $_POST['DateBanked'], true))
                return false;
 
@@ -234,33 +247,10 @@ if (isset($_POST['_customer_id_button'])) {
 //     unset($_POST['branch_id']);
        $Ajax->activate('BranchID');
 }
-if (isset($_POST['_DateBanked_changed'])) {
-  $Ajax->activate('_ex_rate');
-}
-
-//Chaitanya : 13-OCT-2011 - To support Edit feature
-if (isset($_POST['ref']) && $_SESSION['alloc']->trans_no == 0) // added by Joe to fix the browser back button
-{
-       $tno = get_customer_trans_from_ref(ST_CUSTPAYMENT, $_POST['ref']);
-       if ($tno != false)
-       {
-               display_error( _("The entered reference is already in use."));
-               display_footer_exit();
-       }
-}
-$new = $_SESSION['alloc']->trans_no == 0;
 
 //----------------------------------------------------------------------------------------------
 
 if (get_post('AddPaymentItem') && can_process()) {
-       
-       $cust_currency = get_customer_currency($_POST['customer_id']);
-       $bank_currency = get_bank_account_currency($_POST['bank_account']);
-       $comp_currency = get_company_currency();
-       if ($comp_currency != $bank_currency && $bank_currency != $cust_currency)
-               $rate = 0;
-       else
-               $rate = input_num('_ex_rate');
 
        new_doc_date($_POST['DateBanked']);
 
@@ -268,14 +258,12 @@ if (get_post('AddPaymentItem') && can_process()) {
        //Chaitanya : 13-OCT-2011 - To support Edit feature
        $payment_no = write_customer_payment($_SESSION['alloc']->trans_no, $_POST['customer_id'], $_POST['BranchID'],
                $_POST['bank_account'], $_POST['DateBanked'], $_POST['ref'],
-               input_num('amount'), input_num('discount'), $_POST['memo_'], $rate, input_num('charge'));
+               input_num('amount'), input_num('discount'), $_POST['memo_'], 0, input_num('charge'), input_num('bank_amount', input_num('amount')));
 
        $_SESSION['alloc']->trans_no = $payment_no;
        $_SESSION['alloc']->write();
 
        unset($_SESSION['alloc']);
-       //Chaitanya : 13-OCT-2011 - To support Edit feature
-       //meta_forward($_SERVER['PHP_SELF'], "AddedID=$payment_no");
        meta_forward($_SERVER['PHP_SELF'], $new_pmt ? "AddedID=$payment_no" : "UpdatedID=$payment_no");
 }
 
@@ -312,24 +300,22 @@ if (isset($_GET['trans_no']) && $_GET['trans_no'] > 0 )
        $_POST['bank_account'] = $myrow["bank_act"];
        $_POST['ref'] =  $myrow["reference"];
        $old_ref = $myrow["reference"];
-       //$_POST['charge'] =  $myrow[""];
+       $charge = get_cust_bank_charge(ST_CUSTPAYMENT, $_POST['trans_no']);
+       $_POST['charge'] =  price_format($charge);
        $_POST['DateBanked'] =  sql2date($myrow['tran_date']);
        $_POST["amount"] = price_format($myrow['Total'] - $myrow['ov_discount']);
+       $_POST["bank_amount"] = price_format($myrow['bank_amount']+$charge);
        $_POST["discount"] = price_format($myrow['ov_discount']);
        $_POST["memo_"] = get_comments_string(ST_CUSTPAYMENT,$_POST['trans_no']);
 
-       if (!isset($_POST['charge'])) // first page call
+       //Prepare allocation cart 
+       if (isset($_POST['trans_no']) && $_POST['trans_no'] > 0 )
+               $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT,$_POST['trans_no']);
+       else
        {
-               //Prepare allocation cart 
-               if (isset($_POST['trans_no']) && $_POST['trans_no'] > 0 )
-                       $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT,$_POST['trans_no']);
-               else
-               {
-                       $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT,0);
-                       $Ajax->activate('alloc_tbl');
-               }
+               $_SESSION['alloc'] = new allocation(ST_CUSTPAYMENT, $_POST['trans_no']);
+               $Ajax->activate('alloc_tbl');
        }
-
 }
 
 //----------------------------------------------------------------------------------------------
@@ -340,12 +326,15 @@ start_form();
        hidden('old_ref', $old_ref);
 
        start_outer_table(TABLESTYLE2, "width=60%", 5);
+
        table_section(1);
 
+       bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, true);
+
        if ($new)
                customer_list_row(_("From Customer:"), 'customer_id', null, false, true);
        else {
-               label_cells(_("From Customer:"), $_POST['customer_name'], "class='label'");
+               label_cells(_("From Customer:"), $_SESSION['alloc']->person_name, "class='label'");
                hidden('customer_id', $_POST['customer_id']);
        }
 
@@ -361,6 +350,13 @@ start_form();
                hidden('BranchID', ANY_NUMERIC);
        }
 
+       if (list_updated('customer_id') || ($new && list_updated('bank_account'))) {
+               $_SESSION['alloc']->set_person($_POST['customer_id'], PT_CUSTOMER);
+               $_SESSION['alloc']->read();
+               $_POST['memo_'] = $_POST['amount'] = $_POST['discount'] = '';
+               $Ajax->activate('alloc_tbl');
+       }
+
        read_customer_data();
 
        set_global_customer($_POST['customer_id']);
@@ -369,55 +365,47 @@ start_form();
        $display_discount_percent = percent_format($_POST['pymt_discount']*100) . "%";
 
        table_section(2);
-       if (!list_updated('bank_account'))
-               $_POST['bank_account'] = get_default_customer_bank_account($_POST['customer_id']);      
 
-       //Chaitanya : 13-OCT-2011 - Is AJAX call really needed ???
-       //bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, true);
-       bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, false);
-       text_row(_("Reference:"), 'ref', null, 20, 40);
+       date_row(_("Date of Deposit:"), 'DateBanked', '', true, 0, 0, 0, null, true);
 
-       table_section(3);
+       ref_row(_("Reference:"), 'ref','' , null, '', ST_CUSTPAYMENT);
 
-       date_row(_("Date of Deposit:"), 'DateBanked', '', true, 0, 0, 0, null, true);
+       table_section(3);
 
        $comp_currency = get_company_currency();
-       $cust_currency = get_customer_currency($_POST['customer_id']);
-       $bank_currency = get_bank_account_currency($_POST['bank_account']);
+       $cust_currency = $_SESSION['alloc']->set_person($_POST['customer_id'], PT_CUSTOMER);
+       if (!$cust_currency)
+               $cust_currency = $comp_currency;
+       $_SESSION['alloc']->currency = $bank_currency = get_bank_account_currency($_POST['bank_account']);
 
-       if ($cust_currency != $bank_currency) {
-               exchange_rate_display($bank_currency, $cust_currency, $_POST['DateBanked'], ($bank_currency == $comp_currency));
+       if ($cust_currency != $bank_currency)
+       {
+               amount_row(_("Payment Amount:"), 'bank_amount', null, '', $bank_currency);
        }
 
-       amount_row(_("Bank Charge:"), 'charge');
+       amount_row(_("Bank Charge:"), 'charge', null, '', $bank_currency);
 
        end_outer_table(1);
 
-       if ($cust_currency == $bank_currency) {
-               div_start('alloc_tbl');
-               show_allocatable(false);
-               div_end();
-       }
+       div_start('alloc_tbl');
+       show_allocatable(false);
+       div_end();
 
        start_table(TABLESTYLE, "width=60%");
 
        label_row(_("Customer prompt payment discount :"), $display_discount_percent);
-       amount_row(_("Amount of Discount:"), 'discount');
 
-       amount_row(_("Amount:"), 'amount');
+       amount_row(_("Amount of Discount:"), 'discount', null, '', $cust_currency);
+
+       amount_row(_("Amount:"), 'amount', null, '', $cust_currency);
 
        textarea_row(_("Memo:"), 'memo_', null, 22, 4);
        end_table(1);
 
-       if ($cust_currency != $bank_currency)
-               display_note(_("Amount and discount are in customer's currency."));
-
-       br();
-
        if ($new)
-               submit_center('AddPaymentItem', _("Update Payment"), true, '', 'default');
-       else
                submit_center('AddPaymentItem', _("Add Payment"), true, '', 'default');
+       else
+               submit_center('AddPaymentItem', _("Update Payment"), true, '', 'default');
 
        br();
 

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index 37c16528cc1808f993770e9f5c035b4292bcfaa9..60491f564b3202acbc4ba095236198337462d906 100644 (file)
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -73,13 +73,14 @@ class cart
        var $payment;
        var $payment_terms; // cached payment terms
        var $credit;
-       
        // prepayment mode:
        var $prepaid;           // true for documents issued in prepayment mode
        var $prep_amount;       // prepayment required for SO, invoiced amount for prepaiament invoice
        var $sum_paid;          // sum of all allocated prepayments both to order and related invoices
        var $alloc;             // sum of payments allocated to this document
        var $prepayments = array(); // allocation records for this document
+       var $ex_rate;
+
        //-------------------------------------------------------------------------
        //
        //  $trans_no==0 => open new/direct document

diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc
index 88e1bd0598e5bcbe98b8282f2eac22034f886e4c..eb65752f817e501fb4d842557d8f250fed5387e8 100644 (file)
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -126,13 +126,16 @@ function get_customer_trans($trans_id, $trans_type)
                ."cust.name AS DebtorName, cust.address, "
                ."cust.curr_code, "
                ."cust.tax_id,
-               trans.prep_amount>0 as prepaid";
+               trans.prep_amount>0 as prepaid,"
+               ."com.memo_";
 
-       if ($trans_type == ST_CUSTPAYMENT) {
+       if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
                // it's a payment so also get the bank account
                // Chaitanya : Added bank_act to support Customer Payment Edit
                $sql .= ",bank_act,".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name,
-                       ".TB_PREF."bank_accounts.account_type AS BankTransType ";
+                       ".TB_PREF."bank_accounts.account_type AS BankTransType,
+                       ".TB_PREF."bank_accounts.bank_curr_code,
+                       ".TB_PREF."bank_trans.amount as bank_amount";
        }
 
        if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
@@ -146,11 +149,12 @@ function get_customer_trans($trans_id, $trans_type)
                .TB_PREF."tax_groups.id AS tax_group_id ";
        }
 
-       $sql .= " FROM ".TB_PREF."debtor_trans trans LEFT JOIN ".TB_PREF."comments com ON trans.type=com.type AND trans.trans_no=com.id
+       $sql .= " FROM ".TB_PREF."debtor_trans trans
+                                       LEFT JOIN ".TB_PREF."comments com ON trans.type=com.type AND trans.trans_no=com.id
                                        LEFT JOIN ".TB_PREF."shippers ON ".TB_PREF."shippers.shipper_id=trans.ship_via, 
                                        ".TB_PREF."debtors_master cust";
 
-       if ($trans_type == ST_CUSTPAYMENT) {
+       if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
                // it's a payment so also get the bank account
                $sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts";
        }
@@ -166,7 +170,7 @@ function get_customer_trans($trans_id, $trans_type)
                AND trans.type=".db_escape($trans_type)."
                AND trans.debtor_no=cust.debtor_no";
 
-       if ($trans_type == ST_CUSTPAYMENT) {
+       if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
                // it's a payment so also get the bank account
                $sql .= " AND ".TB_PREF."bank_trans.trans_no =".db_escape($trans_id)."
                        AND ".TB_PREF."bank_trans.type=$trans_type
@@ -189,7 +193,6 @@ function get_customer_trans($trans_id, $trans_type)
                display_db_error("no debtor trans found for given params", $sql, true);
                exit;
        }
-
        if (db_num_rows($result) > 1) {
                // can't return multiple
                if($go_debug)

diff --git a/sales/includes/db/custalloc_db.inc b/sales/includes/db/custalloc_db.inc
index e9c73f0caed2eb7c8cb0632bff4d9313f230adfa..477002a000c242e61bc778558f119d2be5d9291f 100644 (file)
--- a/sales/includes/db/custalloc_db.inc
+++ b/sales/includes/db/custalloc_db.inc
@@ -33,6 +33,20 @@ function delete_cust_allocation($trans_id)
 }
 
 //----------------------------------------------------------------------------------------
+//     Update debtor trans alloc field according to current status of cust_allocations
+//
+function update_debtor_trans_allocation($trans_type, $trans_no)
+{
+       $sql = "UPDATE `".TB_PREF."debtor_trans` trans,
+                       (SELECT sum(amt) amt from ".TB_PREF."cust_allocations
+                               WHERE (trans_type_to=".db_escape($trans_type)." AND trans_no_to=".db_escape($trans_no).")
+                               OR (trans_type_from=".db_escape($trans_type)." AND trans_no_from=".db_escape($trans_no).")) allocated
+               SET 
+                       trans.alloc=IFNULL(allocated.amt,0)
+               WHERE trans.type=".db_escape($trans_type)." AND trans_no=".db_escape($trans_no);
+
+       db_query($sql, "The debtor transaction record could not be modified for the allocation against it");
+}
 
 function get_cust_allocation($trans_id)
 {
@@ -40,19 +54,6 @@ function get_cust_allocation($trans_id)
        return db_fetch(db_query($sql), "Cannot retrieve customer allocation $trans_id");
 }
 
-//----------------------------------------------------------------------------------------
-
-function update_debtor_trans_allocation($trans_type, $trans_no, $alloc)
-{
-       if ($trans_type == ST_SALESORDER)
-               $sql = "UPDATE ".TB_PREF."sales_orders SET alloc = alloc + $alloc
-                       WHERE trans_type=".db_escape($trans_type)." AND order_no = ".db_escape($trans_no);
-       else
-               $sql = "UPDATE ".TB_PREF."debtor_trans SET alloc = alloc + $alloc
-                       WHERE type=".db_escape($trans_type)." AND trans_no = ".db_escape($trans_no);
-       db_query($sql, "The debtor transaction record could not be modified for the allocation against it");
-}
-
 //-------------------------------------------------------------------------------------------------------------
 
 function void_cust_allocations($type, $type_no, $date="")
@@ -102,8 +103,8 @@ function get_allocatable_from_cust_sql($customer_id=null, $settled)
                trans.due_date,
                debtor.address,
                trans.version,
-               round(abs(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc),6) <= 0 AS settled
-
+               round(abs(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc),6) <= 0 AS settled,
+               trans.debtor_no
         FROM "
                .TB_PREF."debtor_trans as trans, "
                .TB_PREF."debtors_master as debtor"
@@ -243,10 +244,10 @@ function get_allocatable_from_cust_transactions($customer_id, $trans_no=null, $t
        return db_query($sql." ORDER BY trans_no", "Cannot retreive alloc to transactions");
 }
 
-function get_sql_for_customer_allocation_inquiry()
+function get_sql_for_customer_allocation_inquiry($from, $to, $customer, $filterType, $settled)
 {
-       $data_after = date2sql($_POST['TransAfterDate']);
-       $date_to = date2sql($_POST['TransToDate']);
+       $data_after = date2sql($from);
+       $date_to = date2sql($to);
 
        $sql = "SELECT 
                trans.type,
@@ -272,25 +273,25 @@ function get_sql_for_customer_allocation_inquiry()
                AND trans.tran_date >= '$data_after'
                AND trans.tran_date <= '$date_to'";
 
-       if ($_POST['customer_id'] != ALL_TEXT)
-               $sql .= " AND trans.debtor_no = ".db_escape($_POST['customer_id']);
+       if ($customer != ALL_TEXT)
+               $sql .= " AND trans.debtor_no = ".db_escape($customer);
 
-       if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT)
+       if (isset($filterType) && $filterType != ALL_TEXT)
        {
-               if ($_POST['filterType'] == '1' || $_POST['filterType'] == '2')
+               if ($filterType == '1' || $filterType == '2')
                {
                        $sql .= " AND trans.type = ".ST_SALESINVOICE." ";
                }
-               elseif ($_POST['filterType'] == '3')
+               elseif ($filterType == '3')
                {
                        $sql .= " AND trans.type = " . ST_CUSTPAYMENT;
                }
-               elseif ($_POST['filterType'] == '4')
+               elseif ($filterType == '4')
                {
                        $sql .= " AND trans.type = ".ST_CUSTCREDIT." ";
                }
 
-       if ($_POST['filterType'] == '2')
+       if ($filterType == '2')
        {
                $today =  date2sql(Today());
                $sql .= " AND trans.due_date < '$today'
@@ -305,12 +306,13 @@ function get_sql_for_customer_allocation_inquiry()
        }
 
 
-       if (!check_value('showSettled'))
+       if (!$settled)
        {
                $sql .= " AND (round(IF(trans.prep_amount,trans.prep_amount, abs(trans.ov_amount + trans.ov_gst + "
                ."trans.ov_freight + trans.ov_freight_tax + "
                ."trans.ov_discount)) - trans.alloc,6) != 0) ";
        }
+
        return $sql;
 }
 
@@ -332,16 +334,14 @@ function credit_sales_invoice_allocate($invoice_no, $credit_no, $amount, $date)
 
                while(($free < $amount) && ($alloc = db_fetch($result))) {
                        $unalloc = min($alloc['amt'], $amount-$free);
-                       update_debtor_trans_allocation($alloc['trans_type_to'], $alloc['trans_no_to'], 
-                               -$unalloc);
-                       update_debtor_trans_allocation($alloc['trans_type_from'], $alloc['trans_no_from'], 
-                               -$unalloc);
 
                        delete_cust_allocation($alloc['id']);
                        if ($unalloc < $alloc['amt'])
                                add_cust_allocation($alloc['amt']-$unalloc, $alloc['trans_type_from'],
                                        $alloc['trans_no_from'], ST_SALESINVOICE, $invoice_no);
 
+                       update_debtor_trans_allocation($alloc['trans_type_to'], $alloc['trans_no_to']);
+                       update_debtor_trans_allocation($alloc['trans_type_from'], $alloc['trans_no_from']);
                        $free += $unalloc;
                }
        }
@@ -352,8 +352,8 @@ function credit_sales_invoice_allocate($invoice_no, $credit_no, $amount, $date)
  Check all credit notes allocated to this invoice for summarized freight charges."));
                return false;
        }
-       update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no, $amount);
-       update_debtor_trans_allocation(ST_CUSTCREDIT, $credit_no, $amount);
+       update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no);
+       update_debtor_trans_allocation(ST_CUSTCREDIT, $credit_no);
        add_cust_allocation($amount, ST_CUSTCREDIT, $credit_no, ST_SALESINVOICE, $invoice_no);
 
        exchange_variation(ST_CUSTCREDIT, $credit_no, ST_SALESINVOICE, $invoice_no, $date,

diff --git a/sales/includes/db/payment_db.inc b/sales/includes/db/payment_db.inc
index baabf0fed5623c83f2fe7ec010981226ba25d745..4aa4d4e1ff6f5f89efe5468e2852948955d93664 100644 (file)
--- a/sales/includes/db/payment_db.inc
+++ b/sales/includes/db/payment_db.inc
@@ -11,22 +11,28 @@
 ***********************************************************************/
 /*
   Write/update customer payment.
+
+  Warning: $rate is leaved here for extensions compatibility reasons, will be removed in 2.4
+       since 2.3.17 is not used: use $bank_amount instead.
+
+       $amount - in customer currency (ex. discount)
+       $discount - in customer currency
+       $bank_amount - in bank currency (before charge)
+       $charge - in bank currency
 */
 function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_account,
-       $date_, $ref, $amount, $discount, $memo_, $rate=0, $charge=0)
+       $date_, $ref, $amount, $discount, $memo_, $rate=0, $charge=0, $bank_amount=0)
 {
        global $Refs;
 
        begin_transaction();
-       $args = func_get_args(); while (count($args) < 11) $args[] = 0;
+       $args = func_get_args(); while (count($args) < 12) $args[] = 0;
        $args = (object)array_combine(array('trans_no', 'customer_id', 'branch_id', 'bank_account', 
-               'date_', 'ref', 'amount', 'discount', 'memo_','rate','charge'), $args);
+               'date_', 'ref', 'amount', 'discount', 'memo_','rate','charge', 'bank_amount'), $args);
        hook_db_prewrite($args, ST_CUSTPAYMENT);
 
        $company_record = get_company_prefs();
-       
-       //Chaitanya : 13_OCT_2011 : Voiding Tasks first
-       //Reason : After modifying the customer trans, it was getting voided later
+
        if ($trans_no != 0) {
          delete_comments(ST_CUSTPAYMENT, $trans_no);
          void_bank_trans(ST_CUSTPAYMENT, $trans_no, true);
@@ -34,16 +40,28 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou
          void_cust_allocations(ST_CUSTPAYMENT, $trans_no, $date_);
        }
 
+       $bank = get_bank_account($bank_account);
+
+       if (!$bank_amount)      // backward compatibility workaround
+       {
+               if(!$rate)
+                       $rate = get_exchange_rate_from_to(get_customer_currency($customer_id),
+                               $bank['bank_curr_code'], $date_ );
+
+               $bank_amount = $amount/$rate;
+       }
+
+       // do not use $rate here: global rate stored in exrate table is always used
        $payment_no = write_customer_trans(ST_CUSTPAYMENT, $trans_no, $customer_id, $branch_id, 
-               $date_, $ref, $amount, $discount, 0, 0, 0, 0, 0, 0, "", 0, $rate);
-   
+               $date_, $ref, $amount, $discount);
+
        $bank_gl_account = get_bank_gl_account($bank_account);
 
        $total = 0;
+
        /* Bank account entry first */
-       $total += add_gl_trans_customer(ST_CUSTPAYMENT, $payment_no, $date_,
-               $bank_gl_account, 0, 0, $amount - $charge,  $customer_id,
-               "Cannot insert a GL transaction for the bank account debit", $rate);
+       $total += add_gl_trans(ST_CUSTPAYMENT, $payment_no, $date_,
+               $bank_gl_account, 0, 0, '', ($bank_amount - $charge),  $bank['bank_curr_code'], PT_CUSTOMER, $customer_id);
 
        if ($branch_id != ANY_NUMERIC) {
 
@@ -61,29 +79,34 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou
        /* Now Credit Debtors account with receipts + discounts */
        $total += add_gl_trans_customer(ST_CUSTPAYMENT, $payment_no, $date_,
                $debtors_account, 0, 0, -($discount + $amount), $customer_id,
-               "Cannot insert a GL transaction for the debtors account credit", $rate);
+               "Cannot insert a GL transaction for the debtors account credit");
        }
        if ($discount != 0)     {
                /* Now Debit discount account with discounts allowed*/
                $total += add_gl_trans_customer(ST_CUSTPAYMENT, $payment_no, $date_,
                        $discount_account, 0, 0, $discount, $customer_id,
-                       "Cannot insert a GL transaction for the payment discount debit", $rate);
+                       "Cannot insert a GL transaction for the payment discount debit");
        }
 
        if ($charge != 0)       {
                /* Now Debit bank charge account with charges */
                $charge_act = get_bank_charge_account($bank_account);
-               $total += add_gl_trans_customer(ST_CUSTPAYMENT, $payment_no, $date_,
-                       $charge_act, 0, 0, $charge, $customer_id,
-                       "Cannot insert a GL transaction for the payment bank charge debit", $rate);
+               $total += add_gl_trans(ST_CUSTPAYMENT, $payment_no, $date_,     $charge_act, 0, 0, '', 
+                       $charge, $bank['bank_curr_code'], PT_CUSTOMER,  $customer_id);
+       }
+
+
+       /*Post a balance post if $total != 0 due to variance in AR and bank posted values*/
+       if ($total != 0)
+       {
+               $variance_act = get_company_pref('exchange_diff_act');
+               add_gl_trans(ST_CUSTPAYMENT, $payment_no, $date_,       $variance_act, 0, 0, '',
+                       -$total, null, PT_CUSTOMER,  $customer_id);
        }
-       /*Post a balance post if $total != 0 */
-       add_gl_balance(ST_CUSTPAYMENT, $payment_no, $date_, -$total, PT_CUSTOMER, $customer_id);        
 
        /*now enter the bank_trans entry */
        add_bank_trans(ST_CUSTPAYMENT, $payment_no, $bank_account, $ref,
-               $date_, $amount - $charge, PT_CUSTOMER, $customer_id,
-               get_customer_currency($customer_id), "", $rate);
+               $date_, $bank_amount - $charge, PT_CUSTOMER, $customer_id);
 
        add_comments(ST_CUSTPAYMENT, $payment_no, $date_, $memo_);
 
@@ -111,5 +134,36 @@ function void_customer_payment($type, $type_no)
        commit_transaction();
 }
 
+/*
+       Retrieve bank charge amount from GL postings for customer payment.
+       . Bank charge is not stored explicitly in database as of 2.3.xx
+       . Due to roundings the retrieved charge can differ from the original amount when bank_curr!=home_curr && bank_curr!=cust_curr
+*/
+function get_cust_bank_charge($type, $trans_no)
+{
+
+       // restore charge amount from amounts in bank currency if possible, otherwise calculate from GL posting with exchange rate used for amount posting
+       $sql = "SELECT  IF(act.bank_curr_code=home_curr.value, charge.amount,
+                                       IF(act.bank_curr_code=debtor.curr_code, -(trans.amount-ar.ov_amount+ar.ov_discount),
+                                       IFNULL(charge.amount*trans.amount/pmt.amount, 0)))
+                       FROM ".TB_PREF."bank_trans trans
+                               LEFT JOIN ".TB_PREF."bank_accounts act ON trans.bank_act=act.id
+                               LEFT JOIN ".TB_PREF."sys_prefs charge_act ON charge_act.name='bank_charge_act'
+                               LEFT JOIN ".TB_PREF."sys_prefs home_curr ON home_curr.name='curr_default'
+                               LEFT JOIN ".TB_PREF."gl_trans charge ON charge.type=trans.type AND charge.type_no=trans.trans_no AND charge.account=charge_act.value
+                               LEFT JOIN ".TB_PREF."gl_trans pmt ON pmt.type=trans.type AND pmt.type_no=trans.trans_no AND pmt.account=act.account_code
+                               LEFT JOIN ".TB_PREF."debtors_master debtor ON trans.person_id=debtor.debtor_no AND trans.person_type_id=".PT_CUSTOMER."
+                               LEFT JOIN ".TB_PREF."debtor_trans ar ON trans.type=ar.type AND trans.trans_no=ar.trans_no
+                       WHERE pmt.amount!=0 AND charge.amount!=0 AND trans.amount!=0
+                               AND trans.type=".db_escape($type)." AND trans.trans_no=".db_escape($trans_no);
+
+       $result = db_query($sql, "cannot retrieve bank charge");
+
+       if (!db_num_rows($result))
+               return 0;
+
+       $myrow = db_fetch($result);
+       return $myrow['0'];
+}
 
 ?>
\ No newline at end of file

diff --git a/sales/includes/db/sales_credit_db.inc b/sales/includes/db/sales_credit_db.inc
index 0fb76057b1d9e059dbfe548be44132032e73545f..0330efce8a9c7b39d6959369d232ff4afbc7d93a 100644 (file)
--- a/sales/includes/db/sales_credit_db.inc
+++ b/sales/includes/db/sales_credit_db.inc
@@ -41,6 +41,8 @@ function write_credit_note(&$credit_note, $write_off_acc)
        $company_data = get_company_prefs();
        $branch_data = get_branch_accounts($credit_note->Branch);
 
+       add_new_exchange_rate(get_customer_currency($credit_note->customer_id), $credit_date, $credit_note->ex_rate);
+
        $credit_note_total = $credit_note->get_items_total_dispatch();
        $freight_tax = $credit_note->get_shipping_tax();
 

diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc
index 9c378f77fb8617d4e17512cde51b046fc51e6ae6..b7b8320b25cfcc213f9bbbb2cc82a15743757565 100644 (file)
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -24,6 +24,9 @@ function write_sales_delivery(&$delivery,$bo_policy)
        hook_db_prewrite($delivery, ST_CUSTDELIVERY);
 
        $customer = get_customer($delivery->customer_id);
+
+       add_new_exchange_rate($customer['curr_code'], $delivery->document_date, $delivery->ex_rate);
+
        $delivery_items_total = $delivery->get_items_total_dispatch();
        $freight_tax = $delivery->get_shipping_tax();
 

diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc
index 585b7a0f957f022fc9d0bfe21def7757b33f2408..d37463c49c7d34f99bcbea12259f85fbcf4eaac2 100644 (file)
--- a/sales/includes/db/sales_invoice_db.inc
+++ b/sales/includes/db/sales_invoice_db.inc
@@ -32,6 +32,8 @@ function write_sales_invoice(&$invoice)
 
        $customer = get_customer($invoice->customer_id);
 
+       add_new_exchange_rate($customer['curr_code'], $date_, $invoice->ex_rate);
+
        // offer price values without freight costs
        $items_total = $invoice->get_items_total_dispatch();
        $freight_tax = $invoice->get_shipping_tax();
@@ -196,8 +198,8 @@ function write_sales_invoice(&$invoice)
                                _('Cash invoice').' '.$invoice_no);
                        add_cust_allocation($amount, ST_CUSTPAYMENT, $pmtno, ST_SALESINVOICE, $invoice_no);
 
-                       update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no, $amount);
-                       update_debtor_trans_allocation(ST_CUSTPAYMENT, $pmtno, $amount);
+                       update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no);
+                       update_debtor_trans_allocation(ST_CUSTPAYMENT, $pmtno);
                }
        }
 //_vd($allocs);
@@ -242,7 +244,7 @@ function void_sales_invoice($type, $type_no)
                $deliveries = get_sales_parent_numbers($type, $type_no);
 
                if ($deliveries !== 0) {
-                       if (count($deliveries) == 1 && get_reference(ST_CUSTDELIVERY, $deliveries[0]) == "auto")
+                       if ($type == ST_SALESINVOICE && count($deliveries) == 1 && get_reference(ST_CUSTDELIVERY, $deliveries[0]) == "auto")
                        {
                                void_sales_delivery(ST_CUSTDELIVERY, $deliveries[0], false);
                                $date_ = Today();
@@ -252,7 +254,7 @@ function void_sales_invoice($type, $type_no)
                        else
                        {
                                $srcdetails = get_sales_parent_lines($type, $type_no);
-                                       while ($row = db_fetch($srcdetails)) {
+                               while ($row = db_fetch($srcdetails)) {
                                        update_parent_line($type, $row['id'], -$row['quantity']);
                                }
                        }

diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc
index fb57fa457e3914f82d22e63f45a899b22b2ae098..b3cd6553952df0fa6b4118c549e894c1ae49c4be 100644 (file)
--- a/sales/includes/db/sales_order_db.inc
+++ b/sales/includes/db/sales_order_db.inc
@@ -167,8 +167,11 @@ function update_sales_order($order)
        $total = $order->get_trans_total();
 
        begin_transaction();
+       hook_db_prewrite($order, $order->trans_type);
+
        if ($order->trans_type == ST_SALESORDER)
                $allocs = get_payments_for($order_no, ST_SALESORDER);
+
        $sql = "UPDATE ".TB_PREF."sales_orders SET type =".db_escape($order->so_type)." ,
                debtor_no = " . db_escape($order->customer_id) . ",
                branch_code = " . db_escape($order->Branch) . ",
@@ -192,6 +195,17 @@ function update_sales_order($order)
         AND trans_type=".$order->trans_type." AND version=".$version;
        db_query($sql, "order Cannot be Updated, this can be concurrent edition conflict");
 
+       $id_tokeep = array();
+       foreach ($order->line_items as $line) {
+               array_push($id_tokeep , $line->id);
+       }
+       $id_list = implode(', ', $id_tokeep);
+       
+       $sql = "DELETE FROM ".TB_PREF."sales_order_details WHERE order_no =" . db_escape($order_no) . " AND trans_type=".$order->trans_type;
+       $sql .= " AND id NOT IN ($id_list)";
+
+       db_query($sql, "Old order Cannot be Deleted");
+
        if ($loc_notification == 1)
        {
                include_once($path_to_root . "/inventory/includes/inventory_db.inc");
@@ -260,6 +274,8 @@ function update_sales_order($order)
                reallocate_payments($order_no, ST_SALESORDER, $ord_date, $total, $allocs);
        add_audit_trail($order->trans_type, $order_no, $order->document_date, _("Updated."));
        $Refs->save($order->trans_type, $order_no, $order->reference);
+
+       hook_db_postwrite($order, $order->trans_type);
        commit_transaction();
        if ($loc_notification == 1 && count($st_ids) > 0)
        {
@@ -627,6 +643,7 @@ function get_sql_for_sales_orders_view($selected_customer, $trans_type, $trans_n
                                        sorder.deliver_to";
        return $sql;
 }
+
 //--------------------------------------------------------------------------------------------------
 function update_prepaid_so_line($line_id, $qty_invoiced)
 {
@@ -659,4 +676,3 @@ function is_sales_order_started($order_no)
        $result = db_fetch(db_query($sql, "cannot retrieve sales invoices for sales order"));
        return $result[0];
 }
-?>
\ No newline at end of file

diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc
index b75aac1ef7091f11bb7ec1aba8619bcfb0b11ee7..07006fb6fa8d2f114294f7692fc56162a481bb41 100644 (file)
--- a/sales/includes/ui/sales_credit_ui.inc
+++ b/sales/includes/ui/sales_credit_ui.inc
@@ -92,7 +92,7 @@ function display_credit_header(&$order)
                table_section(2);
                
                label_row(_("Customer Currency:"), $order->customer_currency);
-               exchange_rate_display($order->customer_currency, get_company_currency(),
+               exchange_rate_display(get_company_currency(), $order->customer_currency,
                        $_POST['OrderDate']);
        }
        table_section(3);

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 52e7557d69c906eb9b5a38870e6bc472a6f82e71..ed3227379291e8227ba946bb3934624787c31dc9 100644 (file)
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -373,7 +373,6 @@ function display_order_header(&$order, $editable, $date_text)
                        $row = get_customer_to_order($_POST['customer_id']);
                        if ($row['dissallow_invoices'] == 1)
                                $customer_error = _("The selected customer account is currently on hold. Please contact the credit control personnel to discuss.");
-               
                }
        }
 
@@ -381,10 +380,10 @@ function display_order_header(&$order, $editable, $date_text)
 
        table_section(2);
 
-       if (!is_company_currency($order->customer_currency))
+       if (!is_company_currency($order->customer_currency) && in_array($order->trans_type, array(ST_SALESINVOICE, ST_CUSTDELIVERY)))
        {
                label_row(_("Customer Currency:"), $order->customer_currency);
-               exchange_rate_display($order->customer_currency, get_company_currency(),
+               exchange_rate_display(get_company_currency(), $order->customer_currency,
                        ($editable ? $_POST['OrderDate'] : $order->document_date));
        }
 
@@ -521,7 +520,7 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
        }
        else    // prepare new line
        {
-               sales_items_list_cells(null,'stock_id', null, false, true);
+               sales_items_list_cells(null,'stock_id', null, false, true, true);
                if (list_updated('stock_id')) {
                            $Ajax->activate('price');
                            $Ajax->activate('units');

diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php
index 298d1b07793e1b6dd105cdb5276eb75cf88da8b9..7fa66013580c8bc16d71ba7f974966941ec594a5 100644 (file)
--- a/sales/inquiry/customer_allocation_inquiry.php
+++ b/sales/inquiry/customer_allocation_inquiry.php
@@ -95,7 +95,7 @@ function alloc_link($row)
        $link = 
        pager_link(_("Allocation"),
                "/sales/allocations/customer_allocate.php?trans_no=" . $row["trans_no"] 
-               ."&trans_type=" . $row["type"], ICON_MONEY);
+               ."&trans_type=" . $row["type"]."&debtor_no=" . $row["debtor_no"], ICON_ALLOC);
 
        if ($row["type"] == ST_CUSTCREDIT && $row['TotalAmount'] > 0)
        {
@@ -103,12 +103,12 @@ function alloc_link($row)
                return $link;
        }
        elseif (($row["type"] == ST_CUSTPAYMENT || $row["type"] == ST_BANKDEPOSIT) &&
-               (floatcmp($row['TotalAmount'], $row['Allocated']) > 0))
+               (floatcmp($row['TotalAmount'], $row['Allocated']) >= 0))
        {
                /*its a receipt  which could have an allocation*/
                return $link;
        }
-       elseif ($row["type"] == ST_CUSTPAYMENT && $row['TotalAmount'] < 0)
+       elseif ($row["type"] == ST_CUSTPAYMENT && $row['TotalAmount'] <= 0)
        {
                /*its a negative receipt */
                return '';
@@ -136,7 +136,8 @@ function fmt_credit($row)
 }
 //------------------------------------------------------------------------------------------------
 
-$sql = get_sql_for_customer_allocation_inquiry();
+$sql = get_sql_for_customer_allocation_inquiry(get_post('TransAfterDate'), get_post('TransToDate'),
+               get_post('customer_id'), get_post('filterType'), check_value('showSettled'));
 
 //------------------------------------------------------------------------------------------------
 $cols = array(

diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index 91b4d670b3b601bb9bdbcd480217ed1c23d10440..b96b99dd1e7f3692ec00babeb090e65ab3bd7cc8 100644 (file)
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -109,7 +109,7 @@ function check_overdue($row)
                return (date1_greater_date2(Today(), sql2date($row['delivery_date'])));
        else
                return ($row['type'] == 0
-                       && date1_greater_date2(Today(), sql2date($row['ord_date']))
+                       && date1_greater_date2(Today(), sql2date($row['delivery_date']))
                        && ($row['TotDelivered'] < $row['TotQuantity']));
 }
 
@@ -128,7 +128,7 @@ function prt_link($row)
 function edit_link($row) 
 {
        global $page_nested;
-       
+
        if ($page_nested)
                return '';
        global $trans_type;
@@ -261,6 +261,7 @@ if($show_dates) {
        start_row();
 }
 stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true, true);
+
 if (!@$_GET['popup'])
        customer_list_cells(_("Select a customer: "), 'customer_id', null, true, true);
 if ($trans_type == ST_SALESQUOTE)

diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index 9396aa9137e3712d3a5b28d9470e347358137b17..b7226e1fd9e350070ba94f721b08043cb90d60a4 100644 (file)
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -120,7 +120,10 @@ function handle_submit(&$selected_id)
                        add_crm_person($_POST['CustName'], $_POST['cust_ref'], '', $_POST['address'], 
                                $_POST['phone'], $_POST['phone2'], $_POST['fax'], $_POST['email'], '', '');
 
-                       add_crm_contact('cust_branch', 'general', $selected_branch, db_insert_id());
+                       $pers_id = db_insert_id();
+                       add_crm_contact('cust_branch', 'general', $selected_branch, $pers_id);
+
+                       add_crm_contact('customer', 'general', $selected_id, $pers_id);
                }
                commit_transaction();
 

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 452cc30dfa9a6137ecd6e08ad858dca35c3ff6ca..1bb20d1741eb146b0068f703079ff7e572a6d708 100644 (file)
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -293,6 +293,7 @@ function copy_to_cart()
                $cart->dimension_id = $_POST['dimension_id'];
                $cart->dimension2_id = $_POST['dimension2_id'];
        }
+       $cart->ex_rate = input_num('_ex_rate', null);
 }
 
 //-----------------------------------------------------------------------------
@@ -324,9 +325,9 @@ function copy_from_cart()
        if ($cart->trans_type!=ST_SALESORDER && $cart->trans_type!=ST_SALESQUOTE) { // 2008-11-12 Joe Hunt
                $_POST['dimension_id'] = $cart->dimension_id;
                $_POST['dimension2_id'] = $cart->dimension2_id;
-       }       
+       }
        $_POST['cart_id'] = $cart->cart_id;
-               
+       $_POST['_ex_rate'] = $cart->ex_rate;
 }
 //--------------------------------------------------------------------------------
 

diff --git a/sales/view/view_receipt.php b/sales/view/view_receipt.php
index f829fda5f0855d1fdf3573c22d7c12b602383bb7..09e9e51ec190698dde0e8f9e533d8977de043970 100644 (file)
--- a/sales/view/view_receipt.php
+++ b/sales/view/view_receipt.php
@@ -36,18 +36,18 @@ echo "<br>";
 start_table(TABLESTYLE, "width=80%");
 start_row();
 label_cells(_("From Customer"), $receipt['DebtorName'], "class='tableheader2'");
-label_cells(_("Into Bank Account"), $receipt['bank_account_name'], "class='tableheader2'");
+label_cells(_("Reference"), $receipt['reference'], "class='tableheader2'");
 label_cells(_("Date of Deposit"), sql2date($receipt['tran_date']), "class='tableheader2'");
 end_row();
 start_row();
-label_cells(_("Payment Currency"), $receipt['curr_code'], "class='tableheader2'");
+label_cells(_("Customer Currency"), $receipt['curr_code'], "class='tableheader2'");
 label_cells(_("Amount"), price_format($receipt['Total'] - $receipt['ov_discount']), "class='tableheader2'");
 label_cells(_("Discount"), price_format($receipt['ov_discount']), "class='tableheader2'");
 end_row();
 start_row();
-label_cells(_("Payment Type"), 
-       $bank_transfer_types[$receipt['BankTransType']], "class='tableheader2'");
-label_cells(_("Reference"), $receipt['reference'], "class='tableheader2'", "colspan=4");
+label_cells(_("Into Bank Account"), $receipt['bank_account_name'].' ['.$receipt['bank_curr_code'].']', "class='tableheader2'");
+label_cells(_("Bank Amount"), price_format($receipt['bank_amount']), "class='tableheader2'");
+label_cells(_("Payment Type"), $bank_transfer_types[$receipt['BankTransType']], "class='tableheader2'");
 end_row();
 comments_display_row(ST_CUSTPAYMENT, $trans_id);
 

diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index 260a82ab17454013269653b409af591104de4f39..a31f4399574bacaf153e579a6848dc8c17ec6276 100644 (file)
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -95,7 +95,7 @@ label_row(_("Reference"), $_SESSION['View']->reference, "class='tableheader2'",
 label_row(_("Telephone"), $_SESSION['View']->phone, "class='tableheader2'", "colspan=3");
 ;label_row(_("E-mail"), "<a href='mailto:" . $_SESSION['View']->email . "'>" . $_SESSION['View']->email . "</a>",
        "class='tableheader2'", "colspan=3");
-label_row(_("Comments"), $_SESSION['View']->Comments, "class='tableheader2'", "colspan=3");
+label_row(_("Comments"), nl2br($_SESSION['View']->Comments), "class='tableheader2'", "colspan=3");
 end_table();
 
 if ($_GET['trans_type'] != ST_SALESQUOTE)

diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql
index 8689abb5aa5d0b3ecdb39918eeb483307e1f623d..fb7e2a3be05074ce70b96258b6c536f4a57ace51 100644 (file)
--- a/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@ -2083,6 +2083,7 @@ INSERT INTO `0_sys_prefs` VALUES('default_workorder_required', 'glsetup.manuf',
 INSERT INTO `0_sys_prefs` VALUES('version_id', 'system', 'varchar', 11, '2.3rc');
 INSERT INTO `0_sys_prefs` VALUES('auto_curr_reval', 'setup.company', 'smallint', 6, '1');
 INSERT INTO `0_sys_prefs` VALUES('grn_clearing_act', 'glsetup.purchase', 'varchar', 15, '1550');
+INSERT INTO `0_sys_prefs` VALUES('bcc_email', 'setup.company', 'varchar', 100, '');
 INSERT INTO `0_sys_prefs` VALUES('deferred_income_act', 'glsetup.sales', 'varchar', '15', '');
 INSERT INTO `0_sys_prefs` VALUES('gl_closing_date','setup.closing_date', 'date', 8, '');
 INSERT INTO `0_sys_prefs` VALUES('bcc_email', 'setup.company', 'varchar', 100, '');

diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql
index dc701b2c222afdc08ca38d8e7ead5d1d3dd879b1..ebbfd87ed5f42539a9a2164612eaf6c99e29ce10 100644 (file)
--- a/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@ -1842,6 +1842,7 @@ INSERT INTO `0_sys_prefs` VALUES('default_workorder_required', 'glsetup.manuf',
 INSERT INTO `0_sys_prefs` VALUES('version_id', 'system', 'varchar', 11, '2.3rc');
 INSERT INTO `0_sys_prefs` VALUES('auto_curr_reval', 'setup.company', 'smallint', 6, '1');
 INSERT INTO `0_sys_prefs` VALUES('grn_clearing_act', 'glsetup.purchase', 'varchar', 15, '1550');
+INSERT INTO `0_sys_prefs` VALUES('bcc_email', 'setup.company', 'varchar', 100, '');
 INSERT INTO `0_sys_prefs` VALUES('deferred_income_act', 'glsetup.sales', 'varchar', '15', '');
 INSERT INTO `0_sys_prefs` VALUES('gl_closing_date','setup.closing_date', 'date', 8, '');
 INSERT INTO `0_sys_prefs` VALUES('bcc_email', 'setup.company', 'varchar', 100, '');

diff --git a/themes/aqua/images/alloc.png b/themes/aqua/images/alloc.png
new file mode 100644 (file)
index 0000000..2f734ca
Binary files /dev/null and b/themes/aqua/images/alloc.png differ

diff --git a/themes/cool/images/alloc.png b/themes/cool/images/alloc.png
new file mode 100644 (file)
index 0000000..2f734ca
Binary files /dev/null and b/themes/cool/images/alloc.png differ

diff --git a/themes/cool/renderer.php b/themes/cool/renderer.php
index cb3ac0cabba15aa6cdeb1a12c76766ad725544f6..1e597b26acb343e4b2ac4f0202f20fdd321c7c7a 100644 (file)
--- a/themes/cool/renderer.php
+++ b/themes/cool/renderer.php
@@ -156,7 +156,7 @@
                        }
 
                        echo "<table width=100% cellpadding='0' cellspacing='0'>";
-                       foreach ($elected_app->modules as $module)
+                       foreach ($selected_app->modules as $module)
                        {
                        if (!$_SESSION["wa_current_user"]->check_module_access($module))
                                continue;

diff --git a/themes/default/images/alloc.png b/themes/default/images/alloc.png
new file mode 100644 (file)
index 0000000..2f734ca
Binary files /dev/null and b/themes/default/images/alloc.png differ