0000593,0001093: Prepayments made against orders implemented.

diff --git a/admin/gl_setup.php b/admin/gl_setup.php
index 1e02b810576a7b931ca9de63dd6e7a92749c56ac..670ee1a17c6093c94a5d8839e74bf08c9c2162c0 100644 (file)
--- a/admin/gl_setup.php
+++ b/admin/gl_setup.php
@@ -62,7 +62,7 @@ function can_process()
 if (isset($_POST['submit']) && can_process())
 {
        update_company_prefs( get_post( array( 'retained_earnings_act', 'profit_loss_year_act',
-               'debtors_act', 'pyt_discount_act', 'creditors_act', 'freight_act',
+               'debtors_act', 'pyt_discount_act', 'creditors_act', 'freight_act', 'deferred_income_act',
                'exchange_diff_act', 'bank_charge_act', 'default_sales_act', 'default_sales_discount_act',
                'default_prompt_payment_act', 'default_inventory_act', 'default_cogs_act',
                'default_adj_act', 'default_inv_sales_act', 'default_assembly_act', 'legal_text',
@@ -99,6 +99,7 @@ $_POST['profit_loss_year_act']  = $myrow["profit_loss_year_act"];
 $_POST['debtors_act']  = $myrow["debtors_act"];
 $_POST['creditors_act']  = $myrow["creditors_act"];
 $_POST['freight_act'] = $myrow["freight_act"];
+$_POST['deferred_income_act'] = $myrow["deferred_income_act"];
 $_POST['pyt_discount_act']  = $myrow["pyt_discount_act"];
 
 $_POST['exchange_diff_act'] = $myrow["exchange_diff_act"];
@@ -160,6 +161,9 @@ textarea_row(_("Legal Text on Invoice:"), 'legal_text', $_POST['legal_text'], 32
 
 gl_all_accounts_list_row(_("Shipping Charged Account:"), 'freight_act', $_POST['freight_act']);
 
+gl_all_accounts_list_row(_("Deferred Income Account:"), 'deferred_income_act', $_POST['deferred_income_act'], true, false,
+       _("Not used"), false, false, false);
+
 //---------------
 
 table_section_title(_("Customers and Sales Defaults"));

diff --git a/applications/customers.php b/applications/customers.php
index eab888c05127d202064fba4f5df50c2b7ae3f472..5399c3975ce9fd2b63c8ead751c25ac145e5dd5d 100644 (file)
--- a/applications/customers.php
+++ b/applications/customers.php
@@ -39,6 +39,8 @@ class customers_app extends application
                $this->add_rapp_function(0, "","");
                $this->add_rapp_function(0, _("Customer &Payments"),
                        "sales/customer_payments.php?", 'SA_SALESPAYMNT', MENU_TRANSACTION);
+               $this->add_lapp_function(0, _("Invoice &Prepaid Orders"),
+                       "sales/inquiry/sales_orders_view.php?PrepaidOrders=Yes", 'SA_SALESINVOICE', MENU_TRANSACTION);
                $this->add_rapp_function(0, _("Customer &Credit Notes"),
                        "sales/credit_note_entry.php?NewCredit=Yes", 'SA_SALESCREDIT', MENU_TRANSACTION);
                $this->add_rapp_function(0, _("&Allocate Customer Payments or Credit Notes"),
@@ -51,7 +53,6 @@ class customers_app extends application
                        "sales/inquiry/sales_orders_view.php?type=30", 'SA_SALESTRANSVIEW', MENU_INQUIRY);
                $this->add_lapp_function(1, _("Customer Transaction &Inquiry"),
                        "sales/inquiry/customer_inquiry.php?", 'SA_SALESTRANSVIEW', MENU_INQUIRY);
-               $this->add_lapp_function(1, "","");
                $this->add_lapp_function(1, _("Customer Allocation &Inquiry"),
                        "sales/inquiry/customer_allocation_inquiry.php?", 'SA_SALESALLOC', MENU_INQUIRY);
 

diff --git a/applications/suppliers.php b/applications/suppliers.php
index b67c66608722c8e51af09ec49127af749a298a93..8bc5582ccbacbd008a20c94633c3af49e3bf0783 100644 (file)
--- a/applications/suppliers.php
+++ b/applications/suppliers.php
@@ -40,7 +40,6 @@ class suppliers_app extends application
                        "purchasing/inquiry/po_search_completed.php?", 'SA_SUPPTRANSVIEW', MENU_INQUIRY);
                $this->add_lapp_function(1, _("Supplier Transaction &Inquiry"),
                        "purchasing/inquiry/supplier_inquiry.php?", 'SA_SUPPTRANSVIEW', MENU_INQUIRY);
-               $this->add_lapp_function(1, "","");
                $this->add_lapp_function(1, _("Supplier Allocation &Inquiry"),
                        "purchasing/inquiry/supplier_allocation_inquiry.php?", 'SA_SUPPLIERALLOC', MENU_INQUIRY);
 

diff --git a/gl/includes/db/gl_db_accounts.inc b/gl/includes/db/gl_db_accounts.inc
index 3cddd5e9a1227728e4208c31815c573d1e42cb00..ce11a325607e6bfb2807ec86cc991f371e714de0 100644 (file)
--- a/gl/includes/db/gl_db_accounts.inc
+++ b/gl/includes/db/gl_db_accounts.inc
@@ -96,6 +96,7 @@ function gl_account_in_company_defaults($acc)
                OR name='profit_loss_year_act'
                OR name='retained_earnings_act'
                OR name='freight_act'
+               OR name='deferred_income_act'
                OR name='default_sales_act' 
                OR name='default_sales_discount_act'
                OR name='default_prompt_payment_act'

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index 536143a3764be6ba2b470847190d01d7c3c6be8e..ea4b38e26782ae333bff60262e024e5912eb5d21 100644 (file)
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -42,7 +42,7 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension
                else
                        $memo_ = $_SESSION["wa_current_user"]->username . " - " . $memo_;
        }
-       if (!is_subledger_account($account))
+       if (!is_subledger_account($account) && $account==get_company_pref('deffered_income_act') || $account==get_company_pref('grn_clearing_act'))
                $person_id = $person_type_id = null;
 
        $sql = "INSERT INTO ".TB_PREF."gl_trans ( type, type_no, tran_date,

diff --git a/includes/data_checks.inc b/includes/data_checks.inc
index f50e94540319f94d40b1a684c2e93f7de3751081..cfb87a61e5c4d9c89c396431eab442b359dfa018 100644 (file)
--- a/includes/data_checks.inc
+++ b/includes/data_checks.inc
@@ -498,3 +498,15 @@ function check_is_closed($type, $type_no, $msg=null)
        exit;
     }
 }
+
+function check_deferred_income_act($msg)
+{
+       global $path_to_root;
+
+    if (!get_company_pref('deferred_income_act')) 
+    {
+       display_error($msg, true);
+       end_page();
+       exit;
+    }
+}

diff --git a/includes/db/allocations_db.inc b/includes/db/allocations_db.inc
new file mode 100644 (file)
index 0000000..8e28432
--- /dev/null
+++ b/includes/db/allocations_db.inc
@@ -0,0 +1,117 @@
+<?php
+/**********************************************************************
+       Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+       This program is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+       See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+//
+// Functions below are unified interface to allocations (should supersede currently separate cust/supp allocations in a future)
+//
+//----------------------------------------------------------------------------------------
+//
+//     Returns table of payments currently allocated to selected transaction.
+//
+function get_payments_for($trans_no, $trans_type)
+{
+       $allocations = array();
+
+       $sql = "(SELECT * FROM ".TB_PREF."cust_allocations
+                       WHERE (trans_type_to=".db_escape($trans_type)." AND trans_no_to=".db_escape($trans_no)."))
+               UNION
+                       (SELECT * FROM ".TB_PREF."supp_allocations
+                       WHERE (trans_type_to=".db_escape($trans_type)." AND trans_no_to=".db_escape($trans_no)."))";
+       $result = db_query($sql, "error reading current allocations");
+
+       while($dat = db_fetch($result))
+       {
+               $allocations[] = $dat;
+       }
+
+       return $allocations;
+}
+
+//
+//     Unified inteface to (re)allocate payments to supp/cust/transaction
+//
+function allocate_payment($type_from, $no_from, $type_to, $no_to, $amount, $date)
+{
+       $date = date2sql($date); // FIXME types
+       if (in_array($type_to, array(ST_SALESORDER, ST_CUSTCREDIT, ST_CUSTDELIVERY, ST_SALESINVOICE)))
+       {
+               $allocations = 'cust_allocations';
+               $payments='debtor_trans';
+               $transactions = $type_to == ST_SALESORDER ? 'sales_orders' : 'debtor_trans';
+               $where = $type_to == ST_SALESORDER ? "order_no=".db_escape($no_to) : "type=".db_escape($type_to)." AND trans_no=".db_escape($no_to);
+       }
+       else
+       {
+               $allocations = 'supp_allocations';
+               $payments='supp_trans';
+               $transactions = $type_to == ST_PURCHORDER ? 'purch_orders' : 'supp_trans';
+               $where = $type_to == ST_PURCHORDER ? "order_no=".db_escape($no_to) : "type=".db_escape($type_to)." AND trans_no=".db_escape($no_to);
+       }
+
+       // add/update/delete allocation
+       if (floatcmp($amount, 0) != 0)
+       {
+               $sql = "REPLACE ".TB_PREF.$allocations." SET amt = ". db_escape($amount).",date_alloc='$date'"
+                       .",trans_type_from=".db_escape($type_from).",trans_no_from=".db_escape($no_from)
+                       .",trans_type_to=".db_escape($type_to).",trans_no_to=".db_escape($no_to);
+       }
+       else {
+               $sql = "DELETE FROM ".TB_PREF.$allocations."
+                       WHERE trans_type_from=".db_escape($type_from)." AND trans_no_from=".db_escape($no_from)
+               ." AND trans_type_to=".db_escape($type_to)." AND trans_no_to=".db_escape($no_to);
+       }
+       db_query($sql, "The existing allocations could not be updated");
+
+       // referesh allocation summaries
+       $sql = "UPDATE ".TB_PREF.$transactions." trans,
+                               (SELECT SUM(amt) amt FROM ".TB_PREF.$allocations." WHERE trans_type_to=".db_escape($type_to)." AND trans_no_to=".db_escape($no_to).") paym
+                        SET alloc = paym.amt
+                        WHERE $where";
+       db_query($sql, "The transaction allocations could not be updated");
+
+       $sql = "UPDATE ".TB_PREF.$payments." trans,
+                               (SELECT SUM(amt) amt FROM ".TB_PREF.$allocations." WHERE trans_type_from=".db_escape($type_from)." AND trans_no_from=".db_escape($no_from).") paym
+                        SET alloc = paym.amt
+                        WHERE type=".db_escape($type_from)." AND trans_no=".db_escape($no_from);
+
+       return db_query($sql, "The payment allocations could not be updated");
+}
+
+//----------------------------------------------------------------------------------------
+//
+//     Reallocates allocations to selected transaction.
+//  $allocs is table of payments which should be reallocated
+//  $free_remainder should be true if old allacations should be freed when not allocated to new transaction.
+//
+function reallocate_payments($trans_no, $trans_type, $alloc_date, $max_alloc, $allocs, $free_remainder=true)
+{
+
+       foreach($allocs as $alloc)
+       {
+               $amount = min($alloc['amt'], $max_alloc);
+               $remainder = $alloc['amt'] - $amount;
+
+               $max_alloc = floatcmp($max_alloc, $amount) > 0 ? $max_alloc-$amount : 0;
+
+               $same_to =  $trans_type == $alloc['trans_type_to'] && $trans_no == $alloc['trans_no_to'];
+               if (!$same_to || ($remainder > 0))
+               {
+                       allocate_payment($alloc['trans_type_from'], $alloc['trans_no_from'], $trans_type, $trans_no, $amount, $alloc_date);
+               }
+               if (!$same_to && ($remainder > 0 || $free_remainder))
+               {
+                       allocate_payment($alloc['trans_type_from'], $alloc['trans_no_from'], 
+                               $alloc['trans_type_to'], $alloc['trans_no_to'], $free_remainder ? 0 : $remainder, $alloc_date);
+               }
+               if (!$free_remainder && $max_alloc==0)
+                       break;
+       }
+}

diff --git a/includes/db_pager.inc b/includes/db_pager.inc
index 64a79eda8e633cd4316147599bc1be0062fa0346..f06d650139c5ce8f4840227dfa798c8235c60e08 100644 (file)
--- a/includes/db_pager.inc
+++ b/includes/db_pager.inc
@@ -39,15 +39,12 @@ class db_pager {
            $prev_page, 
            $next_page,
            $first_page;
-           
+
        var $page_len,
            $rec_count;
-       
-       var $select,
-               $where,
-           $from,
-               $group,
-               $order;
+
+       var $order = array();
+
        var     $extra_where;
        
        var $ready = false; // this var is false after change in sql before first
@@ -75,27 +72,6 @@ class db_pager {
                if ($sql != $this->sql) {
                    $this->sql = $sql;
                    $this->ready = false;
-               $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;
                }
        }
        //
@@ -132,8 +108,14 @@ class db_pager {
            $ord = $this->columns[$col]['ord'];
            $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;
        }
        //
@@ -174,7 +156,7 @@ class db_pager {
                } else 
                  return false;
                return true;
-       }           
+       }
        //
        //      Calculates page numbers for html controls.
        //
@@ -210,7 +192,7 @@ class db_pager {
        //  $flds: array( fldname1, fldname2=>type,...)
        function set_columns($flds)
        {
-               $this->columns = array();
+               $this->columns = $this->order = array();
                if (!is_array($flds)) {
                        $flds = array($flds);
                }
@@ -242,7 +224,9 @@ class db_pager {
                                case 'skip':            // skip the column (no header)
                                        unset($c['head']); break;
                        }
-                       $this->columns[] = $c;  
+                       if (@$c['ord'])
+                               array_push($this->order, count($this->columns));
+                       $this->columns[] = $c;
                }
        }
        //
@@ -252,50 +236,40 @@ 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) {
-                       $group = $group == '' ? "*" : "DISTINCT $group";
+               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";
 
-                       return "SELECT COUNT($group) FROM $from $where";
-               }
 
-               $sql = "$select FROM $from $where";
-               if ($group) $sql.= " GROUP BY $group";
            $ord = array();
 
-           foreach ($this->columns as $col) {
+               $sql = "SELECT * FROM ($this->sql) $where AS _dummyname";
+
+           foreach ($this->order as $n) {
+               $col = $this->columns[$n];
                if (isset($col['ord'])) {
                        if ( $col['ord'] != '' && isset($col['name'])) {
                            $ord[] = $col['name'] .' '. $col['ord'];
                            }
                        }
            }
-                               
            if (count($ord)) {
                        $sql .= " ORDER BY " . implode($ord, ',');
-               } else {
-                       if($order)
-                               $sql .= " ORDER BY $order"; // original base query order
                }
 
            $page_len = $this->page_len;
            $offset = ($this->curr_page - 1) * $page_len;
 
+
            $sql .= " LIMIT $offset, $page_len";
 
                return $sql;
-               
+
        }
        //
        //      Initialization after changing record set
@@ -303,7 +277,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');
@@ -313,7 +287,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
@@ -321,7 +295,7 @@ class db_pager {
                                if (isset($col['ord']) && $col['ord'] != '' 
                                                &&  !isset($col['name'])) {
                                                        display_warning("Result field names must be set
-                                                               for all intially ordered db_pager columns.");
+                                                               for all initially ordered db_pager columns.");
                                }
                                }
                }
@@ -395,7 +369,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 ?

diff --git a/includes/ui/allocation_cart.inc b/includes/ui/allocation_cart.inc
index d408c80a6d0c52e4d7419974af23a749bf1ad089..f67c5f15ba66c7aaca7025c9dfb69a53ea310edf 100644 (file)
--- a/includes/ui/allocation_cart.inc
+++ b/includes/ui/allocation_cart.inc
@@ -114,7 +114,7 @@ class allocation
                        $this->person_id = get_post($this->person_type ? 'supplier_id':'customer_id');
                        $this->date_ = get_post($this->person_type ? 'DatePaid':'DateBanked', Today());
                }
-
+               
        /* Now populate the array of possible (and previous actual) allocations 
                for this customer/supplier. First get the transactions that have 
                outstanding balances ie Total-alloc >0 */
@@ -126,6 +126,7 @@ class allocation
 
                while ($myrow = db_fetch($trans_items))
                {
+//_vd($myrow);
                        $this->add_item($myrow["type"], $myrow["trans_no"],
                                sql2date($myrow["tran_date"]),
                                sql2date($myrow["due_date"]),
@@ -146,9 +147,9 @@ class allocation
                else
                        $trans_items = get_allocatable_to_cust_transactions($this->person_id, 
                                $trans_no, $type);
-
                while ($myrow = db_fetch($trans_items))
                {
+//_vd($myrow);
                        $this->add_or_update_item ($myrow["type"], $myrow["trans_no"],
                                sql2date($myrow["tran_date"]),
                                sql2date($myrow["due_date"]),
@@ -164,9 +165,9 @@ class allocation
                begin_transaction();
 
                if ($this->person_type)
-                       clear_supp_alloctions($this->type, $this->trans_no, $this->date_);
+                       clear_supp_alloctions($this->type, $this->trans_no);
                else
-                       clear_cust_alloctions($this->type, $this->trans_no, $this->date_);
+                       clear_cust_alloctions($this->type, $this->trans_no);
 
                // now add the new allocations
                $total_allocated = 0;
@@ -185,22 +186,22 @@ class allocation
                                        add_cust_allocation($alloc_item->current_allocated,
                                                $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);
                                }
                                // Exchange Variations Joe Hunt 2008-09-20 ////////////////////
-                               exchange_variation($this->type, $this->trans_no,
+                               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);
-                               
 
                                //////////////////////////////////////////////////////////////
                                $total_allocated += $alloc_item->current_allocated;
                        }
 
-               }  /*end of the loop through the array of allocations made */
+               }  //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);
@@ -265,29 +266,31 @@ function show_allocatable($show_totals) {
                table_header($th);
 
                foreach ($_SESSION['alloc']->allocs as $alloc_item)
-           {
-                       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->due_date, "align=right");
-               amount_cell($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));
-
-               $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;'>"
-                                . _("All") . "</a>");
-                       label_cell("<a href='#' name=DeAll$counter onclick='allocate_none(this.name.substr(5));return true;'>"
-                                . _("None") . "</a>".hidden("un_allocated" . $counter, 
-                                price_format($un_allocated), false));
-                       end_row();
-
-               $total_allocated += input_num('amount' . $counter);
+               {
+                   if ($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->due_date, "align=right");
+                       amount_cell($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));
+
+                       $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;'>"
+                                        . _("All") . "</a>");
+                               label_cell("<a href='#' name=DeAll$counter onclick='allocate_none(this.name.substr(5));return true;'>"
+                                        . _("None") . "</a>".hidden("un_allocated" . $counter, 
+                                        price_format($un_allocated), false));
+                               end_row();
+
+                       $total_allocated += input_num('amount' . $counter);
+                       }
                    $counter++;
                }
                if ($show_totals) {
@@ -325,7 +328,7 @@ function check_allocations()
        $total_allocated = 0;
 
        for ($counter = 0; $counter < $_POST["TotalNumberOfAllocs"]; $counter++)
-       {
+       if (isset($_POST['amount' . $counter])) {
                if (!check_num('amount' . $counter, 0))
                {
                        display_error(_("The entry for one or more amounts is invalid or negative."));

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index e85e38995f574d4fd02638a162020c8f5a9ae41c..5f7601497e2a9850a6b375c24800f4e6cd65b7d7 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -1484,14 +1484,16 @@ function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $sub
 //-----------------------------------------------------------------------------------------------
 // Payment type selector for current user.
 //
-function sale_payment_list($name, $category, $selected_id=null, $submit_on_change=true)
+function sale_payment_list($name, $category, $selected_id=null, $submit_on_change=true, $prepayments=true)
 {
        $sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms";
-       
+
        if ($category == PM_CASH) // only cash
                        $sql .= " WHERE days_before_due=0 AND day_in_following_month=0";
-       if ($category == PM_CREDIT) // only delayed payments
-                       $sql .= " WHERE days_before_due!=0 OR day_in_following_month!=0";
+       elseif ($category == PM_CREDIT) // only delayed payments
+                       $sql .= " WHERE days_before_due".($prepayments ? '!=': '>')."0 OR day_in_following_month!=0";
+       elseif (!$prepayments)
+                       $sql .= " WHERE days_before_due>=0";
 
        return combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms',
        array(
@@ -1501,13 +1503,13 @@ function sale_payment_list($name, $category, $selected_id=null, $submit_on_chang
 
 }
 
-function sale_payment_list_cells($label, $name, $category, $selected_id=null, $submit_on_change=true)
+function sale_payment_list_cells($label, $name, $category, $selected_id=null, $submit_on_change=true, $prepayments=true)
 {
        if ($label != null)
                echo "<td class='label'>$label</td>\n";
        echo "<td>";
 
-       echo sale_payment_list($name, $category, $selected_id, $submit_on_change);
+       echo sale_payment_list($name, $category, $selected_id, $submit_on_change, $prepayments);
 
        echo "</td>\n";
 }

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 938f0a33768292029ec17229134f21c74b218268..9eaa6135ddbbd77efb66008e826ade3701470377 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -468,20 +468,20 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0)
 function display_footer_exit()
 {
        br(2);
-       end_page(false, false, true);
+       end_page(false, true);
        exit;
 }
 
 //--------------------------------------------------------------------------------------
 
-function display_allocations($alloc_result, $total, $payments=false)
+function display_allocations($alloc_result, $total, $title, $show_summary=true)
 {
        global $systypes_array;
 
        if (!$alloc_result || db_num_rows($alloc_result) == 0)
                return;
 
-    display_heading2(($payments ? _("Payments") : _("Allocations")));
+    display_heading2($title);
 
     start_table(TABLESTYLE, "width=80%");
 
@@ -492,7 +492,6 @@ function display_allocations($alloc_result, $total, $payments=false)
 
     while ($alloc_row = db_fetch($alloc_result))
     {
-
        alt_table_row_color($k);
 
        label_cell($systypes_array[$alloc_row['type']]);
@@ -512,12 +511,14 @@ function display_allocations($alloc_result, $total, $payments=false)
        label_cell(_("Total Allocated:"), "align=right colspan=5");
        amount_cell($total_allocated);
        end_row();
-       start_row();
-    label_cell(_("Left to Allocate:"), "align=right colspan=5");
-    $total = round2($total, user_price_dec());
-    amount_cell($total - $total_allocated);
-    end_row();
-
+       if ($show_summary)
+       {
+               start_row();
+           label_cell(_("Left to Allocate:"), "align=right colspan=5");
+           $total = round2($total, user_price_dec());
+       amount_cell($total - $total_allocated);
+       end_row();
+       }
     end_table(1);
 }
 
@@ -529,11 +530,11 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to
        {
                case PT_CUSTOMER :
                        $alloc_result = get_allocatable_to_cust_transactions($person_id, $type_no, $type);
-                       display_allocations($alloc_result, $total);
+                       display_allocations($alloc_result, $total, _("Allocations"));
                        return;
                case PT_SUPPLIER :
                        $alloc_result = get_allocatable_to_supp_transactions($person_id, $type_no, $type);
-                       display_allocations($alloc_result, $total);
+                       display_allocations($alloc_result, $total, _("Allocations"));
                        return;
        }
 }
@@ -546,11 +547,11 @@ function display_allocations_to($person_type, $person_id, $type, $type_no, $tota
        {
                case PT_CUSTOMER :
                        $alloc_result = get_allocatable_from_cust_transactions($person_id, $type_no, $type);
-                       display_allocations($alloc_result, $total, true);
+                       display_allocations($alloc_result, $total, $type == ST_SALESORDER ? _("Pre-Payments") : _("Payments"), false);
                        return;
                case PT_SUPPLIER :
                        $alloc_result = get_allocatable_from_supp_transactions($person_id, $type_no, $type);
-                       display_allocations($alloc_result, $total, true);
+                       display_allocations($alloc_result, $total, $type == ST_PURCHORDER ? _("Pre-Payments") : _("Payments"), false);
                        return;
        }
 }

diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po
index 544060b546edd43fe73fdaaff806bc9d0c065fa1..d81832e435d58bad5d2094f0b50fa9afc4e4fd67 100644 (file)
--- a/lang/new_language_template/LC_MESSAGES/empty.po
+++ b/lang/new_language_template/LC_MESSAGES/empty.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-10 11:14+0100\n"
+"POT-Creation-Date: 2012-06-16 10:52+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,1497 +17,1870 @@ msgstr ""
 "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:52
-#: themes/default/renderer.php:78
+#: ../frontaccounting.php:75
+#: ../access/logout.php:18
+#: ../themes/default/renderer.php:52
+#: ../themes/default/renderer.php:78
 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:39 access/login.php:69
+#: ../access/login.php:39
+#: ../access/login.php:69
 msgid "Authorization timeout"
 msgstr ""
 
-#: access/login.php:39 access/login.php:76
+#: ../access/login.php:39
+#: ../access/login.php:76
 msgid "Login"
 msgstr ""
 
-#: access/login.php:76 admin/inst_upgrade.php:137
+#: ../access/login.php:76
+#: ../admin/inst_upgrade.php:137
 msgid "Version"
 msgstr ""
 
-#: access/login.php:79
+#: ../access/login.php:79
 msgid "User name"
 msgstr ""
 
-#: access/login.php:83 admin/change_current_user_password.php:78
-#: admin/users.php:191
+#: ../access/login.php:83
+#: ../admin/change_current_user_password.php:78
+#: ../admin/users.php:191
 msgid "Password:"
 msgstr ""
 
-#: access/login.php:92 admin/create_coy.php:249 admin/create_coy.php:331
+#: ../access/login.php:92
+#: ../admin/create_coy.php:249
+#: ../admin/create_coy.php:331
+#: ../includes/sysnames.inc:194
 msgid "Company"
 msgstr ""
 
-#: access/login.php:101
+#: ../access/login.php:101
 msgid "Login -->"
 msgstr ""
 
-#: access/login.php:132 admin/display_prefs.php:111
-#: themes/default/renderer.php:123
+#: ../access/login.php:132
+#: ../admin/display_prefs.php:111
+#: ../themes/default/renderer.php:123
 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:72
+#: ../admin/attachments.php:72
 msgid "Attach Documents"
 msgstr ""
 
-#: admin/attachments.php:119
+#: ../admin/attachments.php:123
 msgid "Attachment has been inserted."
 msgstr ""
 
-#: admin/attachments.php:125
+#: ../admin/attachments.php:129
 msgid "Attachment has been updated."
 msgstr ""
 
-#: admin/attachments.php:137
+#: ../admin/attachments.php:141
 msgid "Attachment has been deleted."
 msgstr ""
 
-#: admin/attachments.php:155 admin/view_print_transaction.php:72
-#: admin/void_transaction.php:155 gl/inquiry/journal_inquiry.php:47
-#: inventory/includes/item_adjustments_ui.inc:47
-#: manufacturing/work_order_add_finished.php:203
-#: manufacturing/work_order_costs.php:150
-#: manufacturing/work_order_entry.php:379
-#: manufacturing/work_order_entry.php:387
-#: manufacturing/includes/work_order_issue_ui.inc:161
-#: sales/inquiry/customer_allocation_inquiry.php:47
+#: ../admin/attachments.php:159
+#: ../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
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:47
 msgid "Type:"
 msgstr ""
 
-#: admin/attachments.php:167 admin/view_print_transaction.php:126
-#: admin/void_transaction.php:179 dimensions/inquiry/search_dimensions.php:127
-#: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:234
-#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
-#: gl/inquiry/journal_inquiry.php:120 gl/inquiry/journal_inquiry.php:133
-#: includes/ui/allocation_cart.inc:263
-#: inventory/inquiry/stock_movements.php:81
-#: manufacturing/search_work_orders.php:159
-#: manufacturing/includes/manufacturing_ui.inc:157
-#: manufacturing/includes/manufacturing_ui.inc:200
-#: manufacturing/includes/manufacturing_ui.inc:236
-#: manufacturing/includes/manufacturing_ui.inc:276
-#: manufacturing/includes/manufacturing_ui.inc:280
-#: manufacturing/includes/manufacturing_ui.inc:331
-#: purchasing/view/view_po.php:115 purchasing/view/view_po.php:140
-#: purchasing/inquiry/po_search_completed.php:121
-#: purchasing/inquiry/po_search.php:130
-#: purchasing/inquiry/supplier_allocation_inquiry.php:127
-#: purchasing/inquiry/supplier_inquiry.php:169
-#: purchasing/inquiry/supplier_inquiry.php.orig:163
-#: purchasing/allocations/supplier_allocation_main.php:95
-#: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep203.php:91
-#: reporting/rep601.php:76 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep710.php:76
-#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
-#: reporting/includes/doctext.inc:224
-#: sales/allocations/customer_allocation_main.php:94
-#: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129
-#: sales/view/view_sales_order.php:161
-#: sales/inquiry/customer_allocation_inquiry.php:145
-#: sales/inquiry/customer_inquiry.php:225
-#: sales/inquiry/customer_inquiry.php.orig:225
+#: ../admin/attachments.php:171
+#: ../admin/view_print_transaction.php:126
+#: ../admin/void_transaction.php:181
+#: ../dimensions/inquiry/search_dimensions.php:127
+#: ../dimensions/view/view_dimension.php:54
+#: ../gl/bank_account_reconcile.php:232
+#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/gl_account_inquiry.php:126
+#: ../gl/inquiry/journal_inquiry.php:127
+#: ../gl/inquiry/journal_inquiry.php:140
+#: ../includes/ui/allocation_cart.inc:264
+#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php.orig:79
+#: ../manufacturing/search_work_orders.php:159
+#: ../manufacturing/includes/manufacturing_ui.inc:157
+#: ../manufacturing/includes/manufacturing_ui.inc:200
+#: ../manufacturing/includes/manufacturing_ui.inc:236
+#: ../manufacturing/includes/manufacturing_ui.inc:276
+#: ../manufacturing/includes/manufacturing_ui.inc:280
+#: ../manufacturing/includes/manufacturing_ui.inc:331
+#: ../purchasing/view/view_po.php:115
+#: ../purchasing/view/view_po.php:140
+#: ../purchasing/inquiry/po_search_completed.php:120
+#: ../purchasing/inquiry/po_search_completed.php.orig:119
+#: ../purchasing/inquiry/po_search.php:130
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:126
+#: ../purchasing/inquiry/supplier_inquiry.php:174
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:171
+#: ../purchasing/allocations/supplier_allocation_main.php:95
+#: ../reporting/rep101.php:130
+#: ../reporting/rep201.php:118
+#: ../reporting/rep203.php:91
+#: ../reporting/rep601.php:76
+#: ../reporting/rep602.php:80
+#: ../reporting/rep704.php:79
+#: ../reporting/rep704.php:82
+#: ../reporting/rep704.php:85
+#: ../reporting/rep710.php:76
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+#: ../reporting/includes/doctext.inc:246
+#: ../sales/allocations/customer_allocation_main.php:94
+#: ../sales/view/view_sales_order.php:109
+#: ../sales/view/view_sales_order.php:142
+#: ../sales/view/view_sales_order.php:179
+#: ../sales/view/view_sales_order.php.orig:96
+#: ../sales/view/view_sales_order.php.orig:129
+#: ../sales/view/view_sales_order.php.orig:161
+#: ../sales/inquiry/customer_allocation_inquiry.php:145
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:145
+#: ../sales/inquiry/customer_inquiry.php:201
+#: ../sales/inquiry/customer_inquiry.php.orig:225
 msgid "#"
 msgstr ""
 
-#: admin/attachments.php:167 admin/attachments.php:217
-#: admin/crm_categories.php:88 admin/inst_upgrade.php:137
-#: admin/payment_terms.php:127 admin/printers.php:84
-#: admin/print_profiles.php:148 gl/inquiry/tax_inquiry.php:82
-#: gl/manage/gl_quick_entries.php:186 gl/manage/gl_quick_entries.php:224
-#: includes/ui/view_package.php:22 inventory/manage/item_codes.php:125
-#: inventory/manage/item_units.php:94 inventory/manage/movement_types.php:95
-#: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:56
-#: inventory/view/view_transfer.php:56 manufacturing/manage/bom_edit.php:70
-#: manufacturing/includes/manufacturing_ui.inc:28
-#: purchasing/includes/ui/invoice_ui.inc:471
-#: purchasing/includes/ui/invoice_ui.inc:483
-#: purchasing/po_receive_items.php:62 reporting/rep104.php:109
-#: reporting/rep105.php:112 reporting/rep204.php:82 reporting/rep303.php:109
-#: reporting/rep303.php:115 reporting/rep304.php:112 reporting/rep305.php:95
-#: reporting/rep401.php:69 sales/create_recurrent_invoices.php:115
-#: sales/manage/credit_status.php:97 sales/manage/recurrent_invoices.php:102
-#: sales/inquiry/sales_orders_view.php:293
-#: sales/inquiry/sales_orders_view.php:297
-#: sales/inquiry/sales_orders_view.php.orig:293
-#: sales/inquiry/sales_orders_view.php.orig:297 taxes/tax_groups.php:124
-#: taxes/tax_types.php:115
+#: ../admin/attachments.php:171
+#: ../admin/attachments.php:221
+#: ../admin/crm_categories.php:88
+#: ../admin/inst_upgrade.php:137
+#: ../admin/payment_terms.php:127
+#: ../admin/printers.php:84
+#: ../admin/print_profiles.php:148
+#: ../gl/inquiry/tax_inquiry.php:82
+#: ../gl/manage/gl_quick_entries.php:186
+#: ../gl/manage/gl_quick_entries.php:224
+#: ../includes/ui/view_package.php:22
+#: ../inventory/manage/item_codes.php:125
+#: ../inventory/manage/item_units.php:94
+#: ../inventory/manage/movement_types.php:95
+#: ../inventory/manage/sales_kits.php:40
+#: ../inventory/view/view_adjustment.php:56
+#: ../inventory/view/view_transfer.php:56
+#: ../manufacturing/manage/bom_edit.php:70
+#: ../manufacturing/includes/manufacturing_ui.inc:28
+#: ../purchasing/includes/ui/invoice_ui.inc:492
+#: ../purchasing/includes/ui/invoice_ui.inc:504
+#: ../purchasing/po_receive_items.php:62
+#: ../reporting/rep104.php:109
+#: ../reporting/rep105.php:112
+#: ../reporting/rep204.php:82
+#: ../reporting/rep303.php:109
+#: ../reporting/rep303.php:115
+#: ../reporting/rep304.php:112
+#: ../reporting/rep305.php:95
+#: ../reporting/rep401.php:69
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/manage/credit_status.php:97
+#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/inquiry/sales_orders_view.php:317
+#: ../sales/inquiry/sales_orders_view.php:321
+#: ../sales/inquiry/sales_orders_view.php.orig:294
+#: ../sales/inquiry/sales_orders_view.php.orig:298
+#: ../taxes/tax_groups.php:123
+#: ../taxes/tax_groups.php.orig:125
+#: ../taxes/tax_groups.php.sav:125
+#: ../taxes/tax_types.php:115
 msgid "Description"
 msgstr ""
 
-#: admin/attachments.php:167 admin/backups.php:63 admin/backups.php:149
+#: ../admin/attachments.php:171
+#: ../admin/backups.php:63
+#: ../admin/backups.php:149
 msgid "Filename"
 msgstr ""
 
-#: admin/attachments.php:167
+#: ../admin/attachments.php:171
 msgid "Size"
 msgstr ""
 
-#: admin/attachments.php:167
+#: ../admin/attachments.php:171
 msgid "Filetype"
 msgstr ""
 
-#: admin/attachments.php:167
+#: ../admin/attachments.php:171
 msgid "Date Uploaded"
 msgstr ""
 
-#: admin/attachments.php:182 admin/create_coy.php:273
-#: 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:111 gl/manage/bank_accounts.php:130
-#: gl/manage/bank_accounts.php.orig:130 gl/manage/currencies.php:164
-#: gl/manage/exchange_rates.php:94 gl/manage/gl_account_classes.php:132
-#: gl/manage/gl_account_types.php:154 gl/manage/gl_quick_entries.php:196
-#: gl/manage/gl_quick_entries.php:295 gl/includes/ui/gl_bank_ui.inc:166
-#: gl/includes/ui/gl_bank_ui.inc.orig:166 gl/includes/ui/gl_journal_ui.inc:122
-#: includes/ui/contacts_view.inc:64 includes/ui/simple_crud_class.inc:52
-#: inventory/prices.php:145 inventory/purchasing_data.php:146
-#: inventory/includes/item_adjustments_ui.inc:87
-#: inventory/includes/stock_transfers_ui.inc:79
-#: inventory/manage/item_categories.php:121
-#: inventory/manage/item_codes.php:140 inventory/manage/item_units.php:110
-#: inventory/manage/locations.php:161 inventory/manage/movement_types.php:106
-#: inventory/manage/sales_kits.php:55 manufacturing/search_work_orders.php:109
-#: manufacturing/manage/bom_edit.php:86
-#: manufacturing/manage/work_centres.php:114
-#: manufacturing/includes/work_order_issue_ui.inc:58
-#: purchasing/includes/ui/invoice_ui.inc:520
-#: purchasing/includes/ui/po_ui.inc:266
-#: purchasing/inquiry/po_search_completed.php:106
-#: purchasing/inquiry/po_search.php:87 sales/manage/credit_status.php:119
-#: sales/manage/customer_branches.php:159
-#: sales/manage/recurrent_invoices.php:130 sales/manage/sales_areas.php:103
-#: sales/manage/sales_groups.php:99 sales/manage/sales_people.php:119
-#: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121
-#: sales/inquiry/customer_inquiry.php:198
-#: sales/inquiry/customer_inquiry.php.orig:198
-#: sales/inquiry/sales_deliveries_view.php:154
-#: sales/inquiry/sales_orders_view.php:126
-#: sales/inquiry/sales_orders_view.php.orig:126
-#: sales/includes/ui/sales_credit_ui.inc:197
-#: sales/includes/ui/sales_order_ui.inc:202 taxes/item_tax_types.php:139
-#: taxes/tax_groups.php:142 taxes/tax_types.php:132
+#: ../admin/attachments.php:186
+#: ../admin/create_coy.php:273
+#: ../admin/crm_categories.php:106
+#: ../admin/fiscalyears.php:164
+#: ../admin/inst_lang.php:100
+#: ../admin/payment_terms.php:142
+#: ../admin/printers.php:96
+#: ../admin/shipping_companies.php:106
+#: ../admin/tags.php:140
+#: ../admin/users.php:144
+#: ../dimensions/inquiry/search_dimensions.php:120
+#: ../gl/inquiry/journal_inquiry.php:118
+#: ../gl/manage/bank_accounts.php:133
+#: ../gl/manage/currencies.php:164
+#: ../gl/manage/exchange_rates.php:94
+#: ../gl/manage/gl_account_classes.php:132
+#: ../gl/manage/gl_account_types.php:154
+#: ../gl/manage/gl_quick_entries.php:196
+#: ../gl/manage/gl_quick_entries.php:295
+#: ../gl/includes/ui/gl_bank_ui.inc:184
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:158
+#: ../gl/includes/ui/gl_journal_ui.inc:134
+#: ../includes/ui/contacts_view.inc:64
+#: ../includes/ui/simple_crud_class.inc:52
+#: ../includes/ui/ui_input.inc:956
+#: ../inventory/prices.php:145
+#: ../inventory/purchasing_data.php:146
+#: ../inventory/purchasing_data.php.orig:75
+#: ../inventory/includes/item_adjustments_ui.inc:87
+#: ../inventory/includes/stock_transfers_ui.inc:79
+#: ../inventory/manage/item_categories.php:121
+#: ../inventory/manage/item_codes.php:140
+#: ../inventory/manage/item_units.php:110
+#: ../inventory/manage/locations.php:161
+#: ../inventory/manage/movement_types.php:106
+#: ../inventory/manage/sales_kits.php:55
+#: ../manufacturing/search_work_orders.php:109
+#: ../manufacturing/manage/bom_edit.php:86
+#: ../manufacturing/manage/work_centres.php:114
+#: ../manufacturing/includes/work_order_issue_ui.inc:58
+#: ../purchasing/includes/ui/invoice_ui.inc:542
+#: ../purchasing/includes/ui/po_ui.inc:273
+#: ../purchasing/inquiry/po_search_completed.php:105
+#: ../purchasing/inquiry/po_search_completed.php.orig:104
+#: ../purchasing/inquiry/po_search.php:87
+#: ../sales/manage/credit_status.php:119
+#: ../sales/manage/customer_branches.php:159
+#: ../sales/manage/recurrent_invoices.php:130
+#: ../sales/manage/sales_areas.php:103
+#: ../sales/manage/sales_groups.php:99
+#: ../sales/manage/sales_people.php:119
+#: ../sales/manage/sales_points.php:99
+#: ../sales/manage/sales_types.php:121
+#: ../sales/inquiry/sales_deliveries_view.php:154
+#: ../sales/inquiry/sales_deliveries_view.php.orig:154
+#: ../sales/inquiry/sales_orders_view.php:136
+#: ../sales/inquiry/sales_orders_view.php.orig:127
+#: ../sales/includes/ui/sales_credit_ui.inc:197
+#: ../sales/includes/ui/sales_order_ui.inc:202
+#: ../sales/includes/ui/sales_order_ui.inc.orig:202
+#: ../taxes/item_tax_types.php:139
+#: ../taxes/tax_groups.php:137
+#: ../taxes/tax_groups.php.orig:139
+#: ../taxes/tax_groups.php.sav:139
+#: ../taxes/tax_types.php:132
 msgid "Edit"
 msgstr ""
 
-#: admin/attachments.php:183 gl/inquiry/journal_inquiry.php:128
+#: ../admin/attachments.php:187
+#: ../gl/inquiry/journal_inquiry.php:135
 msgid "View"
 msgstr ""
 
-#: admin/attachments.php:184
+#: ../admin/attachments.php:188
 msgid "Download"
 msgstr ""
 
-#: admin/attachments.php:185 admin/create_coy.php:274
-#: admin/crm_categories.php:110 admin/fiscalyears.php:166
-#: admin/inst_chart.php:80 admin/inst_lang.php:109 admin/inst_module.php:144
-#: admin/inst_theme.php:102 admin/payment_terms.php:143 admin/printers.php:97
-#: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:146
-#: gl/gl_budget.php:137 gl/manage/bank_accounts.php:131
-#: gl/manage/bank_accounts.php.orig:131 gl/manage/currencies.php:166
-#: gl/manage/exchange_rates.php:99 gl/manage/gl_account_classes.php:133
-#: gl/manage/gl_account_types.php:155 gl/manage/gl_quick_entries.php:197
-#: gl/manage/gl_quick_entries.php:296 gl/includes/ui/gl_bank_ui.inc:168
-#: gl/includes/ui/gl_bank_ui.inc.orig:168 gl/includes/ui/gl_journal_ui.inc:124
-#: includes/ui/contacts_view.inc:67 includes/ui/simple_crud_class.inc:54
-#: includes/ui/ui_input.inc:281 inventory/prices.php:146
-#: inventory/purchasing_data.php:147
-#: inventory/includes/item_adjustments_ui.inc:89
-#: inventory/includes/stock_transfers_ui.inc:81
-#: inventory/manage/item_categories.php:122
-#: inventory/manage/item_codes.php:141 inventory/manage/item_units.php:111
-#: inventory/manage/locations.php:162 inventory/manage/movement_types.php:107
-#: inventory/manage/sales_kits.php:56 manufacturing/manage/bom_edit.php:87
-#: manufacturing/manage/work_centres.php:115
-#: manufacturing/includes/work_order_issue_ui.inc:60
-#: purchasing/includes/ui/invoice_ui.inc:284
-#: purchasing/includes/ui/po_ui.inc:268 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:204 taxes/item_tax_types.php:140
-#: taxes/tax_groups.php:143 taxes/tax_types.php:133
+#: ../admin/attachments.php:189
+#: ../admin/create_coy.php:274
+#: ../admin/crm_categories.php:110
+#: ../admin/fiscalyears.php:166
+#: ../admin/inst_chart.php:80
+#: ../admin/inst_lang.php:109
+#: ../admin/inst_module.php:144
+#: ../admin/inst_theme.php:102
+#: ../admin/payment_terms.php:143
+#: ../admin/printers.php:97
+#: ../admin/shipping_companies.php:107
+#: ../admin/tags.php:141
+#: ../admin/users.php:146
+#: ../gl/gl_budget.php:137
+#: ../gl/manage/bank_accounts.php:134
+#: ../gl/manage/currencies.php:166
+#: ../gl/manage/exchange_rates.php:99
+#: ../gl/manage/gl_account_classes.php:133
+#: ../gl/manage/gl_account_types.php:155
+#: ../gl/manage/gl_quick_entries.php:197
+#: ../gl/manage/gl_quick_entries.php:296
+#: ../gl/includes/ui/gl_bank_ui.inc:186
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:160
+#: ../gl/includes/ui/gl_journal_ui.inc:136
+#: ../includes/ui/contacts_view.inc:67
+#: ../includes/ui/simple_crud_class.inc:54
+#: ../includes/ui/ui_input.inc:285
+#: ../inventory/prices.php:146
+#: ../inventory/purchasing_data.php:147
+#: ../inventory/purchasing_data.php.orig:80
+#: ../inventory/includes/item_adjustments_ui.inc:89
+#: ../inventory/includes/stock_transfers_ui.inc:81
+#: ../inventory/manage/item_categories.php:122
+#: ../inventory/manage/item_codes.php:141
+#: ../inventory/manage/item_units.php:111
+#: ../inventory/manage/locations.php:162
+#: ../inventory/manage/movement_types.php:107
+#: ../inventory/manage/sales_kits.php:56
+#: ../manufacturing/manage/bom_edit.php:87
+#: ../manufacturing/manage/work_centres.php:115
+#: ../manufacturing/includes/work_order_issue_ui.inc:60
+#: ../purchasing/includes/ui/invoice_ui.inc:304
+#: ../purchasing/includes/ui/po_ui.inc:275
+#: ../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:204
+#: ../sales/includes/ui/sales_order_ui.inc.orig:204
+#: ../taxes/item_tax_types.php:140
+#: ../taxes/tax_groups.php:138
+#: ../taxes/tax_groups.php.orig:140
+#: ../taxes/tax_groups.php.sav:140
+#: ../taxes/tax_types.php:133
 msgid "Delete"
 msgstr ""
 
-#: admin/attachments.php:211 admin/attachments.php:216
+#: ../admin/attachments.php:215
+#: ../admin/attachments.php:220
 msgid "Transaction #"
 msgstr ""
 
-#: admin/attachments.php:218
+#: ../admin/attachments.php:222
 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:261 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:127 gl/manage/bank_accounts.php.orig:127
-#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:127
-#: gl/manage/gl_quick_entries.php:230 includes/system_tests.inc:38
-#: includes/system_tests.inc:113 includes/system_tests.inc:126
-#: includes/ui/sav.ui_lists.inc:1649 includes/ui/ui_lists.inc:1638
-#: includes/ui/ui_lists.inc.orig:1649 purchasing/manage/suppliers.php:117
-#: reporting/rep101.php:126 reporting/rep102.php:112 reporting/rep102.php:114
-#: reporting/rep104.php:103 reporting/rep106.php:73 reporting/rep114.php:73
-#: reporting/rep201.php:114 reporting/rep202.php:116 reporting/rep202.php:118
-#: reporting/rep203.php:87 reporting/rep303.php:101 reporting/rep303.php:105
-#: reporting/rep501.php:109 sales/manage/sales_points.php:94
-#: sales/manage/sales_points.php:95 sales/manage/sales_types.php:119
-#: taxes/item_tax_types.php:129 taxes/tax_groups.php:139
+#: ../admin/backups.php:98
+#: ../admin/create_coy.php:261
+#: ../admin/fiscalyears.php:155
+#: ../admin/inst_lang.php:85
+#: ../admin/inst_lang.php:97
+#: ../dimensions/inquiry/search_dimensions.php:107
+#: ../gl/manage/bank_accounts.php:130
+#: ../gl/manage/currencies.php:162
+#: ../gl/manage/gl_account_classes.php:127
+#: ../gl/manage/gl_quick_entries.php:230
+#: ../includes/system_tests.inc:38
+#: ../includes/system_tests.inc:113
+#: ../includes/system_tests.inc:126
+#: ../includes/ui/ui_lists.inc:1674
+#: ../includes/ui/ui_lists.inc.orig:1672
+#: ../purchasing/manage/suppliers.php:122
+#: ../purchasing/manage/suppliers.php.orig:132
+#: ../reporting/rep101.php:126
+#: ../reporting/rep102.php:112
+#: ../reporting/rep102.php:114
+#: ../reporting/rep104.php:103
+#: ../reporting/rep106.php:73
+#: ../reporting/rep114.php:73
+#: ../reporting/rep201.php:114
+#: ../reporting/rep202.php:116
+#: ../reporting/rep202.php:118
+#: ../reporting/rep203.php:87
+#: ../reporting/rep303.php:101
+#: ../reporting/rep303.php:105
+#: ../reporting/rep501.php:109
+#: ../sales/manage/sales_points.php:94
+#: ../sales/manage/sales_points.php:95
+#: ../sales/manage/sales_types.php:119
+#: ../taxes/item_tax_types.php:129
 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: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:589
-#: sales/includes/ui/sales_order_ui.inc:636
+#: ../admin/backups.php:181
+#: ../sales/includes/ui/sales_order_ui.inc:589
+#: ../sales/includes/ui/sales_order_ui.inc:645
+#: ../sales/includes/ui/sales_order_ui.inc.orig:589
+#: ../sales/includes/ui/sales_order_ui.inc.orig:637
 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:72
+#: ../admin/change_current_user_password.php:16
+#: ../admin/change_current_user_password.php:85
+#: ../themes/default/renderer.php:72
 msgid "Change password"
 msgstr ""
 
-#: admin/change_current_user_password.php:28 admin/users.php:40
+#: ../admin/change_current_user_password.php:28
+#: ../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:35
+#: ../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:42
 msgid "The passwords entered are not the same."
 msgstr ""
 
-#: admin/change_current_user_password.php:56
+#: ../admin/change_current_user_password.php:56
 msgid "Password cannot be changed in demo mode."
 msgstr ""
 
-#: admin/change_current_user_password.php:61
+#: ../admin/change_current_user_password.php:61
 msgid "Your password has been updated."
 msgstr ""
 
-#: admin/change_current_user_password.php:73 admin/users.php:180
+#: ../admin/change_current_user_password.php:73
+#: ../admin/users.php:180
 msgid "User login:"
 msgstr ""
 
-#: admin/change_current_user_password.php:79
+#: ../admin/change_current_user_password.php:79
 msgid "Repeat password:"
 msgstr ""
 
-#: admin/change_current_user_password.php:81
+#: ../admin/change_current_user_password.php:81
 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 inventory/manage/items.php:83
+#: ../admin/company_preferences.php:59
+#: ../inventory/manage/items.php:87
+#: ../inventory/manage/items.php.orig:85
 msgid ""
 "The file size is over the maximum allowed. The maximum size allowed in KB is"
 msgstr ""
 
-#: admin/company_preferences.php:64 inventory/manage/items.php:73
+#: ../admin/company_preferences.php:64
+#: ../inventory/manage/items.php:77
+#: ../inventory/manage/items.php:92
+#: ../inventory/manage/items.php.orig:75
 msgid "Only graphics files can be uploaded"
 msgstr ""
 
-#: admin/company_preferences.php:72 admin/company_preferences.php:93
-#: inventory/manage/items.php:91
+#: ../admin/company_preferences.php:72
+#: ../admin/company_preferences.php:93
+#: ../inventory/manage/items.php:100
+#: ../inventory/manage/items.php.orig:93
 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:115
+#: ../admin/company_preferences.php:115
 msgid "Company setup has been updated."
 msgstr ""
 
-#: admin/company_preferences.php:159
+#: ../admin/company_preferences.php:159
 msgid "Name (to appear on reports):"
 msgstr ""
 
-#: admin/company_preferences.php:160 admin/shipping_companies.php:142
-#: includes/ui/contacts_view.inc:109 inventory/manage/locations.php:202
-#: sales/manage/customers.php:227 sales/manage/customers.php.orig:228
-#: sales/includes/ui/sales_order_ui.inc:627
+#: ../admin/company_preferences.php:160
+#: ../admin/shipping_companies.php:142
+#: ../includes/ui/contacts_view.inc:109
+#: ../inventory/manage/locations.php:202
+#: ../sales/manage/customers.php:231
+#: ../sales/manage/sav.customers.php:231
+#: ../sales/includes/ui/sales_order_ui.inc:636
+#: ../sales/includes/ui/sales_order_ui.inc.orig:628
 msgid "Address:"
 msgstr ""
 
-#: admin/company_preferences.php:161
+#: ../admin/company_preferences.php:161
 msgid "Domicile:"
 msgstr ""
 
-#: admin/company_preferences.php:163 admin/shipping_companies.php:138
-#: purchasing/manage/suppliers.php:126 sales/manage/customer_branches.php:260
+#: ../admin/company_preferences.php:163
+#: ../admin/shipping_companies.php:138
+#: ../purchasing/manage/suppliers.php:135
+#: ../purchasing/manage/suppliers.php.orig:114
+#: ../sales/manage/customer_branches.php:262
 msgid "Phone Number:"
 msgstr ""
 
-#: admin/company_preferences.php:164 includes/ui/contacts_view.inc:104
-#: purchasing/manage/suppliers.php:156 sales/manage/customer_branches.php:262
-#: sales/manage/customers.php:250 sales/manage/customers.php.orig:251
+#: ../admin/company_preferences.php:164
+#: ../includes/ui/contacts_view.inc:104
+#: ../purchasing/manage/suppliers.php:138
+#: ../purchasing/manage/suppliers.php.orig:116
+#: ../sales/manage/customer_branches.php:264
+#: ../sales/manage/customers.php:254
+#: ../sales/manage/sav.customers.php:254
 msgid "Fax Number:"
 msgstr ""
 
-#: admin/company_preferences.php:165 admin/users.php:202
+#: ../admin/company_preferences.php:165
+#: ../admin/users.php:202
 msgid "Email Address:"
 msgstr ""
 
-#: admin/company_preferences.php:167
+#: ../admin/company_preferences.php:167
 msgid "Official Company Number:"
 msgstr ""
 
-#: admin/company_preferences.php:168 purchasing/manage/suppliers.php:91
-#: sales/manage/customers.php:229 sales/manage/customers.php.orig:230
+#: ../admin/company_preferences.php:168
+#: ../purchasing/manage/suppliers.php:96
+#: ../purchasing/manage/suppliers.php.orig:97
+#: ../sales/manage/customers.php:233
+#: ../sales/manage/sav.customers.php:233
 msgid "GSTNo:"
 msgstr ""
 
-#: admin/company_preferences.php:170
+#: ../admin/company_preferences.php:170
 msgid "Home Currency:"
 msgstr ""
 
-#: admin/company_preferences.php:171 gl/gl_budget.php:63
+#: ../admin/company_preferences.php:171
+#: ../gl/gl_budget.php:63
 msgid "Fiscal Year:"
 msgstr ""
 
-#: admin/company_preferences.php:172
+#: ../admin/company_preferences.php:172
 msgid "Tax Periods:"
 msgstr ""
 
-#: admin/company_preferences.php:172
+#: ../admin/company_preferences.php:172
 msgid "Months."
 msgstr ""
 
-#: admin/company_preferences.php:173
+#: ../admin/company_preferences.php:173
 msgid "Tax Last Period:"
 msgstr ""
 
-#: admin/company_preferences.php:173
+#: ../admin/company_preferences.php:173
 msgid "Months back."
 msgstr ""
 
-#: admin/company_preferences.php:177
+#: ../admin/company_preferences.php:177
 msgid "Company Logo:"
 msgstr ""
 
-#: admin/company_preferences.php:178
+#: ../admin/company_preferences.php:178
 msgid "New Company Logo (.jpg)"
 msgstr ""
 
-#: admin/company_preferences.php:179
+#: ../admin/company_preferences.php:179
 msgid "Delete Company Logo:"
 msgstr ""
 
-#: admin/company_preferences.php:181
+#: ../admin/company_preferences.php:181
 msgid "Use Dimensions:"
 msgstr ""
 
-#: admin/company_preferences.php:182
+#: ../admin/company_preferences.php:182
 msgid "Base for auto price calculations:"
 msgstr ""
 
-#: admin/company_preferences.php:183
+#: ../admin/company_preferences.php:183
 msgid "No base price list"
 msgstr ""
 
-#: admin/company_preferences.php:184
+#: ../admin/company_preferences.php:184
 msgid "Add Price from Std Cost:"
 msgstr ""
 
-#: admin/company_preferences.php:186
+#: ../admin/company_preferences.php:186
 msgid "Round to nearest:"
 msgstr ""
 
-#: admin/company_preferences.php:189
+#: ../admin/company_preferences.php:189
 msgid "Search Item List"
 msgstr ""
 
-#: admin/company_preferences.php:190
+#: ../admin/company_preferences.php:190
 msgid "Search Customer List"
 msgstr ""
 
-#: admin/company_preferences.php:191
+#: ../admin/company_preferences.php:191
 msgid "Search Supplier List"
 msgstr ""
 
-#: admin/company_preferences.php:193
+#: ../admin/company_preferences.php:193
 msgid "Automatic Revaluation Currency Accounts"
 msgstr ""
 
-#: admin/company_preferences.php:194
+#: ../admin/company_preferences.php:194
 msgid "Time Zone on Reports"
 msgstr ""
 
-#: admin/company_preferences.php:195
+#: ../admin/company_preferences.php:195
 msgid "Login Timeout:"
 msgstr ""
 
-#: admin/company_preferences.php:195
+#: ../admin/company_preferences.php:195
 msgid "seconds"
 msgstr ""
 
-#: admin/company_preferences.php:196
+#: ../admin/company_preferences.php:196
 msgid "Version Id"
 msgstr ""
 
-#: admin/company_preferences.php:201 admin/display_prefs.php:142
-#: admin/forms_setup.php:61 admin/gl_setup.php:221 admin/inst_chart.php:74
-#: admin/inst_lang.php:103 admin/inst_module.php:138 admin/inst_module.php:156
-#: admin/inst_module.php:199 admin/inst_theme.php:96
-#: dimensions/dimension_entry.php:293 gl/gl_bank.php:401 gl/gl_budget.php:135
-#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:257
-#: gl/includes/ui/gl_bank_ui.inc.orig:257 gl/includes/ui/gl_journal_ui.inc:221
-#: includes/ui/db_pager_view.inc:174 includes/ui/simple_crud_class.inc:56
-#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:203
-#: includes/ui/ui_input.inc:894 inventory/adjustments.php:235
-#: inventory/cost_update.php:116 inventory/reorder_level.php:97
-#: inventory/transfers.php:236 inventory/includes/item_adjustments_ui.inc:157
-#: inventory/includes/stock_transfers_ui.inc:137
-#: inventory/manage/sales_kits.php:208 manufacturing/work_order_entry.php:459
-#: manufacturing/includes/work_order_issue_ui.inc:131
-#: purchasing/includes/ui/po_ui.inc:299 purchasing/includes/ui/po_ui.inc:442
-#: purchasing/po_receive_items.php:333 sales/credit_note_entry.php:282
-#: sales/customer_credit_invoice.php:382 sales/customer_delivery.php:523
-#: sales/customer_invoice.php:580 sales/inquiry/sales_orders_view.php:321
-#: sales/inquiry/sales_orders_view.php.orig:321
-#: sales/includes/ui/sales_credit_ui.inc:293
-#: sales/includes/ui/sales_order_ui.inc:237
-#: sales/includes/ui/sales_order_ui.inc:555
+#: ../admin/company_preferences.php:201
+#: ../admin/display_prefs.php:144
+#: ../admin/forms_setup.php:61
+#: ../admin/gl_setup.php:235
+#: ../admin/gl_setup.php.orig:231
+#: ../admin/inst_chart.php:74
+#: ../admin/inst_lang.php:103
+#: ../admin/inst_module.php:138
+#: ../admin/inst_module.php:156
+#: ../admin/inst_module.php:199
+#: ../admin/inst_theme.php:96
+#: ../dimensions/dimension_entry.php:293
+#: ../gl/gl_bank.php:403
+#: ../gl/gl_budget.php:135
+#: ../gl/manage/gl_quick_entries.php:60
+#: ../gl/includes/ui/gl_bank_ui.inc:275
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:249
+#: ../gl/includes/ui/gl_journal_ui.inc:257
+#: ../includes/ui/db_pager_view.inc:174
+#: ../includes/ui/simple_crud_class.inc:56
+#: ../includes/ui/simple_crud_class.inc:227
+#: ../includes/ui/ui_input.inc:207
+#: ../includes/ui/ui_input.inc:901
+#: ../inventory/adjustments.php:235
+#: ../inventory/cost_update.php:116
+#: ../inventory/reorder_level.php:97
+#: ../inventory/transfers.php:236
+#: ../inventory/includes/item_adjustments_ui.inc:157
+#: ../inventory/includes/stock_transfers_ui.inc:137
+#: ../inventory/manage/sales_kits.php:208
+#: ../manufacturing/work_order_entry.php:459
+#: ../manufacturing/includes/work_order_issue_ui.inc:131
+#: ../purchasing/includes/ui/po_ui.inc:306
+#: ../purchasing/includes/ui/po_ui.inc:457
+#: ../purchasing/po_receive_items.php:331
+#: ../sales/credit_note_entry.php:282
+#: ../sales/customer_credit_invoice.php:382
+#: ../sales/customer_delivery.php:531
+#: ../sales/customer_invoice.php:682
+#: ../sales/inquiry/sales_orders_view.php:349
+#: ../sales/inquiry/sales_orders_view.php.orig:322
+#: ../sales/includes/ui/sales_credit_ui.inc:293
+#: ../sales/includes/ui/sales_order_ui.inc:237
+#: ../sales/includes/ui/sales_order_ui.inc:555
+#: ../sales/includes/ui/sales_order_ui.inc.orig:237
+#: ../sales/includes/ui/sales_order_ui.inc.orig:555
 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:145 admin/create_coy.php:212
+#: ../admin/create_coy.php:145
+#: ../admin/create_coy.php:212
 msgid "Cannot open the configuration file - "
 msgstr ""
 
-#: admin/create_coy.php:147 admin/create_coy.php:214
+#: ../admin/create_coy.php:147
+#: ../admin/create_coy.php:214
 msgid "Cannot write to the configuration file - "
 msgstr ""
 
-#: admin/create_coy.php:149 admin/create_coy.php:185 admin/create_coy.php:216
+#: ../admin/create_coy.php:149
+#: ../admin/create_coy.php:185
+#: ../admin/create_coy.php:216
 msgid "The configuration file "
 msgstr ""
 
-#: admin/create_coy.php:149 admin/create_coy.php:185 admin/create_coy.php:216
-#: admin/db/maintenance_db.inc:248
+#: ../admin/create_coy.php:149
+#: ../admin/create_coy.php:185
+#: ../admin/create_coy.php:216
+#: ../admin/db/maintenance_db.inc:250
+#: ../admin/db/maintenance_db.inc.orig:248
 msgid ""
 " is not writable. Change its permissions so it is, then re-run the operation."
 msgstr ""
 
-#: admin/create_coy.php:161
+#: ../admin/create_coy.php:161
 msgid "New company has been created."
 msgstr ""
 
-#: admin/create_coy.php:161
+#: ../admin/create_coy.php:161
 msgid "Company has been updated."
 msgstr ""
 
-#: admin/create_coy.php:178
+#: ../admin/create_coy.php:178
 msgid ""
 "Broken company subdirectories system. You have to remove this company "
 "manually."
 msgstr ""
 
-#: admin/create_coy.php:194
+#: ../admin/create_coy.php:194
 msgid "Cannot rename subdirectory to temporary name."
 msgstr ""
 
-#: admin/create_coy.php:200
+#: ../admin/create_coy.php:200
 msgid "Cannot rename company subdirectory"
 msgstr ""
 
-#: admin/create_coy.php:206
+#: ../admin/create_coy.php:206
 msgid "Error removing Database: "
 msgstr ""
 
-#: admin/create_coy.php:206
+#: ../admin/create_coy.php:206
 msgid ", please remove it manually"
 msgstr ""
 
-#: admin/create_coy.php:225
+#: ../admin/create_coy.php:225
 msgid "Cannot remove temporary renamed company data directory "
 msgstr ""
 
-#: admin/create_coy.php:228
+#: ../admin/create_coy.php:228
 msgid "Selected company has been deleted"
 msgstr ""
 
-#: admin/create_coy.php:242
+#: ../admin/create_coy.php:242
 msgid "Are you sure you want to delete company no. "
 msgstr ""
 
-#: admin/create_coy.php:249
+#: ../admin/create_coy.php:249
 msgid "Database Host"
 msgstr ""
 
-#: admin/create_coy.php:249 admin/create_coy.php:336 admin/create_coy.php:342
+#: ../admin/create_coy.php:249
+#: ../admin/create_coy.php:336
+#: ../admin/create_coy.php:342
 msgid "Database User"
 msgstr ""
 
-#: admin/create_coy.php:250 admin/create_coy.php:338 admin/create_coy.php:343
+#: ../admin/create_coy.php:250
+#: ../admin/create_coy.php:338
+#: ../admin/create_coy.php:343
 msgid "Database Name"
 msgstr ""
 
-#: admin/create_coy.php:250 admin/create_coy.php:339 admin/create_coy.php:344
+#: ../admin/create_coy.php:250
+#: ../admin/create_coy.php:339
+#: ../admin/create_coy.php:344
 msgid "Table Pref"
 msgstr ""
 
-#: admin/create_coy.php:250 admin/create_coy.php:346 admin/inst_lang.php:36
-#: admin/print_profiles.php:162
+#: ../admin/create_coy.php:250
+#: ../admin/create_coy.php:346
+#: ../admin/inst_lang.php:36
+#: ../admin/print_profiles.php:162
 msgid "Default"
 msgstr ""
 
-#: admin/create_coy.php:259 admin/fiscalyears.php:159 admin/inst_lang.php:85
-#: admin/inst_lang.php:97 dimensions/inquiry/search_dimensions.php:107
-#: gl/manage/bank_accounts.php:125 gl/manage/bank_accounts.php.orig:125
-#: gl/manage/currencies.php:162 gl/manage/gl_account_classes.php:127
-#: gl/manage/gl_quick_entries.php:230 includes/system_tests.inc:38
-#: includes/system_tests.inc:113 includes/system_tests.inc:126
-#: includes/ui/sav.ui_lists.inc:1650 includes/ui/ui_lists.inc:1639
-#: includes/ui/ui_lists.inc.orig:1650 purchasing/manage/suppliers.php:117
-#: reporting/rep101.php:125 reporting/rep102.php:111 reporting/rep102.php:113
-#: reporting/rep104.php:105 reporting/rep106.php:75 reporting/rep114.php:75
-#: reporting/rep201.php:113 reporting/rep202.php:115 reporting/rep202.php:117
-#: reporting/rep203.php:86 reporting/rep303.php:96 reporting/rep303.php:104
-#: reporting/rep501.php:107 sales/manage/sales_points.php:94
-#: sales/manage/sales_points.php:95 sales/manage/sales_types.php:119
-#: taxes/item_tax_types.php:133 taxes/tax_groups.php:137
+#: ../admin/create_coy.php:259
+#: ../admin/fiscalyears.php:159
+#: ../admin/inst_lang.php:85
+#: ../admin/inst_lang.php:97
+#: ../dimensions/inquiry/search_dimensions.php:107
+#: ../gl/manage/bank_accounts.php:128
+#: ../gl/manage/currencies.php:162
+#: ../gl/manage/gl_account_classes.php:127
+#: ../gl/manage/gl_quick_entries.php:230
+#: ../includes/system_tests.inc:38
+#: ../includes/system_tests.inc:113
+#: ../includes/system_tests.inc:126
+#: ../includes/ui/ui_lists.inc:1675
+#: ../includes/ui/ui_lists.inc.orig:1673
+#: ../purchasing/manage/suppliers.php:122
+#: ../purchasing/manage/suppliers.php.orig:132
+#: ../reporting/rep101.php:125
+#: ../reporting/rep102.php:111
+#: ../reporting/rep102.php:113
+#: ../reporting/rep104.php:105
+#: ../reporting/rep106.php:75
+#: ../reporting/rep114.php:75
+#: ../reporting/rep201.php:113
+#: ../reporting/rep202.php:115
+#: ../reporting/rep202.php:117
+#: ../reporting/rep203.php:86
+#: ../reporting/rep303.php:96
+#: ../reporting/rep303.php:104
+#: ../reporting/rep501.php:107
+#: ../sales/manage/sales_points.php:94
+#: ../sales/manage/sales_points.php:95
+#: ../sales/manage/sales_types.php:119
+#: ../taxes/item_tax_types.php:133
 msgid "Yes"
 msgstr ""
 
-#: admin/create_coy.php:288
+#: ../admin/create_coy.php:288
 msgid "The marked company is the current company which cannot be deleted."
 msgstr ""
 
-#: admin/create_coy.php:335 admin/create_coy.php:341 admin/printers.php:84
+#: ../admin/create_coy.php:335
+#: ../admin/create_coy.php:341
+#: ../admin/printers.php:84
 msgid "Host"
 msgstr ""
 
-#: admin/create_coy.php:337
+#: ../admin/create_coy.php:337
 msgid "Database Password"
 msgstr ""
 
-#: admin/create_coy.php:339 admin/inst_chart.php:68 admin/inst_chart.php:70
-#: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:127
-#: admin/inst_theme.php:91 admin/inst_theme.php:93 admin/inst_upgrade.php:149
-#: gl/manage/gl_account_types.php:190 includes/ui/allocation_cart.inc:286
+#: ../admin/create_coy.php:339
+#: ../admin/inst_chart.php:68
+#: ../admin/inst_chart.php:70
+#: ../admin/inst_lang.php:87
+#: ../admin/inst_lang.php:90
+#: ../admin/inst_module.php:127
+#: ../admin/inst_theme.php:91
+#: ../admin/inst_theme.php:93
+#: ../admin/inst_upgrade.php:149
+#: ../gl/manage/gl_account_types.php:190
+#: ../includes/ui/allocation_cart.inc:288
 msgid "None"
 msgstr ""
 
-#: admin/create_coy.php:350
+#: ../admin/create_coy.php:350
 msgid "Database Script"
 msgstr ""
 
-#: admin/create_coy.php:351
+#: ../admin/create_coy.php:351
 msgid "New script Admin Password"
 msgstr ""
 
-#: admin/create_coy.php:355 gl/gl_budget.php:136
+#: ../admin/create_coy.php:355
+#: ../gl/gl_budget.php:136
 msgid "Save"
 msgstr ""
 
-#: admin/create_coy.php:377
+#: ../admin/create_coy.php:377
 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:62
 msgid "Cannot delete this category because there are contacts related to it."
 msgstr ""
 
-#: admin/crm_categories.php:68
+#: ../admin/crm_categories.php:68
 msgid "Category has been deleted"
 msgstr ""
 
-#: admin/crm_categories.php:88
+#: ../admin/crm_categories.php:88
 msgid "Type id"
 msgstr ""
 
-#: admin/crm_categories.php:88
+#: ../admin/crm_categories.php:88
 msgid "Action id"
 msgstr ""
 
-#: admin/crm_categories.php:88 sales/manage/customer_branches.php:293
+#: ../admin/crm_categories.php:88
+#: ../sales/manage/customer_branches.php:295
 msgid "Short Name"
 msgstr ""
 
-#: admin/crm_categories.php:135 admin/crm_categories.php:139
+#: ../admin/crm_categories.php:135
+#: ../admin/crm_categories.php:139
 msgid "Contact Category Type:"
 msgstr ""
 
-#: admin/crm_categories.php:136 admin/crm_categories.php:140
+#: ../admin/crm_categories.php:136
+#: ../admin/crm_categories.php:140
 msgid "Contact Category Subtype:"
 msgstr ""
 
-#: admin/crm_categories.php:143
+#: ../admin/crm_categories.php:143
 msgid "Category Short Name:"
 msgstr ""
 
-#: admin/crm_categories.php:144
+#: ../admin/crm_categories.php:144
 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:59
+#: ../admin/display_prefs.php:59
 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:61
+#: ../admin/display_prefs.php:61
 msgid "Display settings have been updated."
 msgstr ""
 
-#: admin/display_prefs.php:70
+#: ../admin/display_prefs.php:70
 msgid "Decimal Places"
 msgstr ""
 
-#: admin/display_prefs.php:72
+#: ../admin/display_prefs.php:72
 msgid "Prices/Amounts:"
 msgstr ""
 
-#: admin/display_prefs.php:73
+#: ../admin/display_prefs.php:73
 msgid "Quantities:"
 msgstr ""
 
-#: admin/display_prefs.php:74
+#: ../admin/display_prefs.php:74
 msgid "Exchange Rates:"
 msgstr ""
 
-#: admin/display_prefs.php:75
+#: ../admin/display_prefs.php:75
 msgid "Percentages:"
 msgstr ""
 
-#: admin/display_prefs.php:77
+#: ../admin/display_prefs.php:77
 msgid "Dateformat and Separators"
 msgstr ""
 
-#: admin/display_prefs.php:79
+#: ../admin/display_prefs.php:79
 msgid "Dateformat:"
 msgstr ""
 
-#: admin/display_prefs.php:81
+#: ../admin/display_prefs.php:81
 msgid "Date Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:86
+#: ../admin/display_prefs.php:86
 msgid "Thousand Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:91
+#: ../admin/display_prefs.php:91
 msgid "Decimal Separator:"
 msgstr ""
 
-#: admin/display_prefs.php:98 admin/inst_lang.php:35
+#: ../admin/display_prefs.php:98
+#: ../admin/inst_lang.php:35
 msgid "Language"
 msgstr ""
 
-#: admin/display_prefs.php:100 admin/users.php:206
+#: ../admin/display_prefs.php:100
+#: ../admin/users.php:206
 msgid "Language:"
 msgstr ""
 
-#: admin/display_prefs.php:103 applications/setup.php:42
-#: includes/sysnames.inc:94
+#: ../admin/display_prefs.php:103
+#: ../applications/setup.php:42
+#: ../includes/sysnames.inc:94
 msgid "Miscellaneous"
 msgstr ""
 
-#: admin/display_prefs.php:105
+#: ../admin/display_prefs.php:105
 msgid "Show hints for new users:"
 msgstr ""
 
-#: admin/display_prefs.php:107
+#: ../admin/display_prefs.php:107
 msgid "Show GL Information:"
 msgstr ""
 
-#: admin/display_prefs.php:109
+#: ../admin/display_prefs.php:109
 msgid "Show Item Codes:"
 msgstr ""
 
-#: admin/display_prefs.php:116
+#: ../admin/display_prefs.php:116
 msgid "Page Size:"
 msgstr ""
 
-#: admin/display_prefs.php:118
+#: ../admin/display_prefs.php:118
 msgid "Start-up Tab"
 msgstr ""
 
-#: admin/display_prefs.php:126 admin/users.php:210
+#: ../admin/display_prefs.php:126
+#: ../admin/users.php:210
 msgid "Printing profile"
 msgstr ""
 
-#: admin/display_prefs.php:127 admin/users.php:211
+#: ../admin/display_prefs.php:127
+#: ../admin/users.php:211
 msgid "Browser printing support"
 msgstr ""
 
-#: admin/display_prefs.php:129
+#: ../admin/display_prefs.php:129
 msgid "Use popup window to display reports:"
 msgstr ""
 
-#: admin/display_prefs.php:130 admin/users.php:214
+#: ../admin/display_prefs.php:130
+#: ../admin/users.php:214
 msgid "Set this option to on if your browser directly supports pdf files"
 msgstr ""
 
-#: admin/display_prefs.php:132
+#: ../admin/display_prefs.php:132
 msgid "Use icons instead of text links:"
 msgstr ""
 
-#: admin/display_prefs.php:133
+#: ../admin/display_prefs.php:133
 msgid "Set this option to on for using icons instead of text links"
 msgstr ""
 
-#: admin/display_prefs.php:135
+#: ../admin/display_prefs.php:135
 msgid "Query page size:"
 msgstr ""
 
-#: admin/display_prefs.php:137
+#: ../admin/display_prefs.php:137
 msgid "Remember last document date:"
 msgstr ""
 
-#: admin/display_prefs.php:138
+#: ../admin/display_prefs.php:138
 msgid ""
 "If set document date is remembered on subsequent documents, otherwise "
 "default is current date"
 msgstr ""
 
-#: admin/fiscalyears.php:25
+#: ../admin/display_prefs.php:140
+msgid "Transaction days:"
+msgstr ""
+
+#: ../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 thera 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/sav.ui_lists.inc:659 includes/ui/ui_lists.inc:648
-#: includes/ui/ui_lists.inc.orig:659 manufacturing/search_work_orders.php:108
-#: reporting/rep501.php:85 reporting/rep710.php:109
-#: reporting/includes/excel_report.inc:234
-#: reporting/includes/pdf_report.inc:266
+#: ../admin/fiscalyears.php:138
+#: ../dimensions/inquiry/search_dimensions.php:133
+#: ../dimensions/inquiry/search_dimensions.php:139
+#: ../includes/ui/ui_input.inc:954
+#: ../includes/ui/ui_lists.inc:675
+#: ../includes/ui/ui_lists.inc.orig:675
+#: ../manufacturing/search_work_orders.php:108
+#: ../reporting/rep501.php:85
+#: ../reporting/rep710.php:109
+#: ../reporting/includes/excel_report.inc:234
+#: ../reporting/includes/pdf_report.inc:266
 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
+#: ../admin/gl_setup.php.orig:16
 msgid "System and General GL Setup"
 msgstr ""
 
-#: admin/gl_setup.php:30
+#: ../admin/gl_setup.php:30
+#: ../admin/gl_setup.php.orig:30
 msgid "The delivery over-receive allowance must be between 0 and 100."
 msgstr ""
 
-#: admin/gl_setup.php:37
+#: ../admin/gl_setup.php:37
+#: ../admin/gl_setup.php.orig:37
 msgid "The invoice over-charge allowance must be between 0 and 100."
 msgstr ""
 
-#: admin/gl_setup.php:44
+#: ../admin/gl_setup.php:44
+#: ../admin/gl_setup.php.orig: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
+#: ../admin/gl_setup.php.orig:52
 msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced"
 msgstr ""
 
-#: admin/gl_setup.php:75
+#: ../admin/gl_setup.php:75
+#: ../admin/gl_setup.php.orig:75
 msgid "The general GL setup has been updated."
 msgstr ""
 
-#: admin/gl_setup.php:132
+#: ../admin/gl_setup.php:138
+#: ../admin/gl_setup.php.orig:137
 msgid "General GL"
 msgstr ""
 
-#: admin/gl_setup.php:134
+#: ../admin/gl_setup.php:140
+#: ../admin/gl_setup.php.orig:139
 msgid "Past Due Days Interval:"
 msgstr ""
 
-#: admin/gl_setup.php:134 admin/gl_setup.php:169 admin/gl_setup.php:177
-#: admin/gl_setup.php:214 admin/payment_terms.php:140
+#: ../admin/gl_setup.php:140
+#: ../admin/gl_setup.php:180
+#: ../admin/gl_setup.php:188
+#: ../admin/gl_setup.php:206
+#: ../admin/gl_setup.php:228
+#: ../admin/gl_setup.php.orig:139
+#: ../admin/gl_setup.php.orig:176
+#: ../admin/gl_setup.php.orig:184
+#: ../admin/gl_setup.php.orig:202
+#: ../admin/gl_setup.php.orig:224
+#: ../admin/payment_terms.php:140
 msgid "days"
 msgstr ""
 
-#: admin/gl_setup.php:136
+#: ../admin/gl_setup.php:142
+#: ../admin/gl_setup.php.orig:141
 msgid "Retained Earnings:"
 msgstr ""
 
-#: admin/gl_setup.php:138
+#: ../admin/gl_setup.php:144
+#: ../admin/gl_setup.php.orig:143
 msgid "Profit/Loss Year:"
 msgstr ""
 
-#: admin/gl_setup.php:140
+#: ../admin/gl_setup.php:146
+#: ../admin/gl_setup.php.orig:145
 msgid "Exchange Variances Account:"
 msgstr ""
 
-#: admin/gl_setup.php:142
+#: ../admin/gl_setup.php:148
+#: ../admin/gl_setup.php.orig:147
+#: ../gl/manage/bank_accounts.php:193
 msgid "Bank Charges Account:"
 msgstr ""
 
-#: admin/gl_setup.php:146
+#: ../admin/gl_setup.php:150
+#: ../admin/gl_setup.php.orig:149
+msgid "Tax Algorithm:"
+msgstr ""
+
+#: ../admin/gl_setup.php:154
+#: ../admin/gl_setup.php.orig:153
 msgid "Customers and Sales"
 msgstr ""
 
-#: admin/gl_setup.php:148
+#: ../admin/gl_setup.php:156
+#: ../admin/gl_setup.php.orig:155
 msgid "Default Credit Limit:"
 msgstr ""
 
-#: admin/gl_setup.php:150
+#: ../admin/gl_setup.php:158
+#: ../admin/gl_setup.php.orig:157
 msgid "Accumulate batch shipping:"
 msgstr ""
 
-#: admin/gl_setup.php:152
+#: ../admin/gl_setup.php:160
+#: ../admin/gl_setup.php.orig:159
 msgid "Legal Text on Invoice:"
 msgstr ""
 
-#: admin/gl_setup.php:154
+#: ../admin/gl_setup.php:162
+#: ../admin/gl_setup.php.orig:161
 msgid "Shipping Charged Account:"
 msgstr ""
 
-#: admin/gl_setup.php:158
+#: ../admin/gl_setup.php:164
+msgid "Deferred Income Account:"
+msgstr ""
+
+#: ../admin/gl_setup.php:165
+msgid "Not used"
+msgstr ""
+
+#: ../admin/gl_setup.php:169
+#: ../admin/gl_setup.php.orig:165
 msgid "Customers and Sales Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:160
+#: ../admin/gl_setup.php:171
+#: ../admin/gl_setup.php.orig:167
 msgid "Receivable Account:"
 msgstr ""
 
-#: admin/gl_setup.php:162 admin/gl_setup.php:200
-#: inventory/manage/item_categories.php:192 inventory/manage/items.php:352
-#: sales/manage/customer_branches.php:250
+#: ../admin/gl_setup.php:173
+#: ../admin/gl_setup.php:214
+#: ../admin/gl_setup.php.orig:169
+#: ../admin/gl_setup.php.orig:210
+#: ../inventory/manage/item_categories.php:192
+#: ../inventory/manage/items.php:361
+#: ../inventory/manage/items.php.orig:354
+#: ../sales/manage/customer_branches.php:251
 msgid "Sales Account:"
 msgstr ""
 
-#: admin/gl_setup.php:165 sales/manage/customer_branches.php:251
+#: ../admin/gl_setup.php:176
+#: ../admin/gl_setup.php.orig:172
+#: ../sales/manage/customer_branches.php:252
 msgid "Sales Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:167 sales/manage/customer_branches.php:253
+#: ../admin/gl_setup.php:178
+#: ../admin/gl_setup.php.orig:174
+#: ../sales/manage/customer_branches.php:254
 msgid "Prompt Payment Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:169
+#: ../admin/gl_setup.php:180
+#: ../admin/gl_setup.php.orig:176
 msgid "Delivery Required By:"
 msgstr ""
 
-#: admin/gl_setup.php:175
+#: ../admin/gl_setup.php:186
+#: ../admin/gl_setup.php.orig:182
 msgid "Dimension Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:177
+#: ../admin/gl_setup.php:188
+#: ../admin/gl_setup.php.orig:184
 msgid "Dimension Required By After:"
 msgstr ""
 
-#: admin/gl_setup.php:180
+#: ../admin/gl_setup.php:192
+#: ../admin/gl_setup.php.orig:188
 msgid "Suppliers and Purchasing"
 msgstr ""
 
-#: admin/gl_setup.php:182
+#: ../admin/gl_setup.php:194
+#: ../admin/gl_setup.php.orig:190
 msgid "Delivery Over-Receive Allowance:"
 msgstr ""
 
-#: admin/gl_setup.php:184
+#: ../admin/gl_setup.php:196
+#: ../admin/gl_setup.php.orig:192
 msgid "Invoice Over-Charge Allowance:"
 msgstr ""
 
-#: admin/gl_setup.php:186
+#: ../admin/gl_setup.php:198
+#: ../admin/gl_setup.php.orig:194
 msgid "Suppliers and Purchasing Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:188
+#: ../admin/gl_setup.php:200
+#: ../admin/gl_setup.php.orig:196
 msgid "Payable Account:"
 msgstr ""
 
-#: admin/gl_setup.php:190 purchasing/manage/suppliers.php:123
+#: ../admin/gl_setup.php:202
+#: ../admin/gl_setup.php.orig:198
+#: ../purchasing/manage/suppliers.php:132
+#: ../purchasing/manage/suppliers.php.orig:142
 msgid "Purchase Discount Account:"
 msgstr ""
 
-#: admin/gl_setup.php:192
+#: ../admin/gl_setup.php:204
+#: ../admin/gl_setup.php.orig:200
 msgid "GRN Clearing Account:"
 msgstr ""
 
-#: admin/gl_setup.php:192
+#: ../admin/gl_setup.php:204
+#: ../admin/gl_setup.php.orig:200
 msgid "No postings on GRN"
 msgstr ""
 
-#: admin/gl_setup.php:194 reporting/reports_main.php:175
+#: ../admin/gl_setup.php:206
+#: ../admin/gl_setup.php.orig:202
+msgid "Receival Required By:"
+msgstr ""
+
+#: ../admin/gl_setup.php:208
+#: ../admin/gl_setup.php.orig:204
+#: ../reporting/reports_main.php:175
 msgid "Inventory"
 msgstr ""
 
-#: admin/gl_setup.php:196
+#: ../admin/gl_setup.php:210
+#: ../admin/gl_setup.php.orig:206
 msgid "Allow Negative Inventory:"
 msgstr ""
 
-#: admin/gl_setup.php:197
+#: ../admin/gl_setup.php:211
+#: ../admin/gl_setup.php.orig:207
 msgid "Warning:  This may cause a delay in GL postings"
 msgstr ""
 
-#: admin/gl_setup.php:199
+#: ../admin/gl_setup.php:213
+#: ../admin/gl_setup.php.orig:209
 msgid "Items Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:202 inventory/manage/item_categories.php:202
-#: inventory/manage/items.php:356
+#: ../admin/gl_setup.php:216
+#: ../admin/gl_setup.php.orig:212
+#: ../inventory/manage/item_categories.php:202
+#: ../inventory/manage/items.php:365
+#: ../inventory/manage/items.php.orig:358
 msgid "Inventory Account:"
 msgstr ""
 
-#: admin/gl_setup.php:204 inventory/manage/item_categories.php:196
-#: inventory/manage/item_categories.php:204 inventory/manage/items.php:357
-#: inventory/manage/items.php:362
+#: ../admin/gl_setup.php:218
+#: ../admin/gl_setup.php.orig:214
+#: ../inventory/manage/item_categories.php:196
+#: ../inventory/manage/item_categories.php:204
+#: ../inventory/manage/items.php:366
+#: ../inventory/manage/items.php:371
+#: ../inventory/manage/items.php.orig:359
+#: ../inventory/manage/items.php.orig:364
 msgid "C.O.G.S. Account:"
 msgstr ""
 
-#: admin/gl_setup.php:206 inventory/manage/item_categories.php:205
-#: inventory/manage/items.php:358
+#: ../admin/gl_setup.php:220
+#: ../admin/gl_setup.php.orig:216
+#: ../inventory/manage/item_categories.php:205
+#: ../inventory/manage/items.php:367
+#: ../inventory/manage/items.php.orig:360
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
-#: admin/gl_setup.php:208 inventory/manage/item_categories.php:209
-#: inventory/manage/items.php:369
+#: ../admin/gl_setup.php:222
+#: ../admin/gl_setup.php.orig:218
+#: ../inventory/manage/item_categories.php:209
+#: ../inventory/manage/items.php:378
+#: ../inventory/manage/items.php.orig:371
 msgid "Item Assembly Costs Account:"
 msgstr ""
 
-#: admin/gl_setup.php:212
+#: ../admin/gl_setup.php:226
+#: ../admin/gl_setup.php.orig:222
 msgid "Manufacturing Defaults"
 msgstr ""
 
-#: admin/gl_setup.php:214
+#: ../admin/gl_setup.php:228
+#: ../admin/gl_setup.php.orig:224
 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:155
+#: ../admin/inst_chart.php:50
+#: ../admin/inst_lang.php:36
+#: ../admin/inst_module.php:105
+#: ../admin/inst_theme.php:74
+#: ../admin/inst_upgrade.php:155
 msgid "Installed"
 msgstr ""
 
-#: admin/inst_chart.php:50 admin/inst_lang.php:36 admin/inst_module.php:105
-#: admin/inst_theme.php:74 inventory/inquiry/stock_status.php:77
-#: reporting/rep303.php:102
+#: ../admin/inst_chart.php:50
+#: ../admin/inst_lang.php:36
+#: ../admin/inst_module.php:105
+#: ../admin/inst_theme.php:74
+#: ../inventory/inquiry/stock_status.php:71
+#: ../inventory/inquiry/stock_status.php.orig:77
+#: ../reporting/rep303.php:102
 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:128 admin/inst_module.php:129 admin/inst_theme.php:92
+#: ../admin/inst_chart.php:69
+#: ../admin/inst_chart.php:71
+#: ../admin/inst_lang.php:88
+#: ../admin/inst_module.php:128
+#: ../admin/inst_module.php:129
+#: ../admin/inst_theme.php:92
+#: ../includes/sysnames.inc:193
 msgid "Unknown"
 msgstr ""
 
-#: admin/inst_chart.php:74 admin/inst_lang.php:103 admin/inst_module.php:133
-#: admin/inst_module.php:138 admin/inst_theme.php:96
-#: admin/inst_upgrade.php:137
+#: ../admin/inst_chart.php:74
+#: ../admin/inst_lang.php:103
+#: ../admin/inst_module.php:133
+#: ../admin/inst_module.php:138
+#: ../admin/inst_theme.php:96
+#: ../admin/inst_upgrade.php:137
 msgid "Install"
 msgstr ""
 
-#: admin/inst_chart.php:75 admin/inst_module.php:139 admin/inst_theme.php:97
+#: ../admin/inst_chart.php:75
+#: ../admin/inst_module.php:139
+#: ../admin/inst_theme.php:97
 msgid "Upload and install latest extension package"
 msgstr ""
 
-#: admin/inst_chart.php:82 admin/inst_module.php:146 admin/inst_theme.php:104
+#: ../admin/inst_chart.php:82
+#: ../admin/inst_module.php:146
+#: ../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:54
-#: inventory/manage/item_categories.php:98
-#: manufacturing/manage/work_centres.php:101
-#: purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249 reporting/rep501.php:85
-#: reporting/rep709.php:109 reporting/rep709.php:110
-#: sales/manage/customer_branches.php:294 sales/manage/sales_people.php:99
-#: taxes/item_tax_types.php:117
+#: ../admin/inst_lang.php:35
+#: ../admin/printers.php:84
+#: ../admin/shipping_companies.php:91
+#: ../dimensions/dimension_entry.php:271
+#: ../dimensions/inquiry/search_dimensions.php:129
+#: ../dimensions/view/view_dimension.php:54
+#: ../inventory/manage/item_categories.php:98
+#: ../manufacturing/manage/work_centres.php:101
+#: ../purchasing/includes/ui/invoice_ui.inc:265
+#: ../purchasing/includes/ui/invoice_ui.inc:267
+#: ../purchasing/includes/ui/invoice_ui.inc:269
+#: ../reporting/rep501.php:85
+#: ../reporting/rep709.php:109
+#: ../reporting/rep709.php:110
+#: ../sales/manage/customer_branches.php:296
+#: ../sales/manage/sales_people.php:99
+#: ../taxes/item_tax_types.php:117
 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:169
+#: ../admin/inst_module.php:104
+#: ../admin/inst_module.php:169
 msgid "Extension"
 msgstr ""
 
-#: admin/inst_module.php:104 admin/inst_module.php:169
+#: ../admin/inst_module.php:104
+#: ../admin/inst_module.php:169
 msgid "Modules provided"
 msgstr ""
 
-#: admin/inst_module.php:104 admin/inst_module.php:169
+#: ../admin/inst_module.php:104
+#: ../admin/inst_module.php:169
 msgid "Options provided"
 msgstr ""
 
-#: admin/inst_module.php:133
+#: ../admin/inst_module.php:133
 msgid "Install third-party extension."
 msgstr ""
 
-#: admin/inst_module.php:169 includes/ui/sav.ui_lists.inc:659
-#: includes/ui/sav.ui_lists.inc:2131 includes/ui/ui_lists.inc:648
-#: includes/ui/ui_lists.inc:2120 includes/ui/ui_lists.inc.orig:659
-#: includes/ui/ui_lists.inc.orig:2131 reporting/includes/excel_report.inc:232
-#: reporting/includes/pdf_report.inc:264
+#: ../admin/inst_module.php:169
+#: ../includes/ui/ui_lists.inc:675
+#: ../includes/ui/ui_lists.inc:2156
+#: ../includes/ui/ui_lists.inc.orig:675
+#: ../includes/ui/ui_lists.inc.orig:2154
+#: ../reporting/includes/excel_report.inc:232
+#: ../reporting/includes/pdf_report.inc:264
 msgid "Active"
 msgstr ""
 
-#: admin/inst_module.php:232
+#: ../admin/inst_module.php:232
 msgid "Status change for some extensions failed."
 msgstr ""
 
-#: admin/inst_module.php:235
+#: ../admin/inst_module.php:235
 msgid "Current active extensions set has been saved."
 msgstr ""
 
-#: admin/inst_module.php:257
+#: ../admin/inst_module.php:257
 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:80
+#: ../admin/inst_upgrade.php:80
 msgid "Database upgrade finished."
 msgstr ""
 
-#: admin/inst_upgrade.php:84
+#: ../admin/inst_upgrade.php:84
 msgid ""
 "Upgrade cannot be done because database has been already partially upgraded. "
 "Please downgrade database to clean previous version or try forced upgrade."
 msgstr ""
 
-#: admin/inst_upgrade.php:102
+#: ../admin/inst_upgrade.php:102
 msgid "Cannot connect to database for company"
 msgstr ""
 
-#: admin/inst_upgrade.php:114
+#: ../admin/inst_upgrade.php:114
 #, php-format
 msgid "Database upgrade to version %s failed for company '%s'."
 msgstr ""
 
-#: admin/inst_upgrade.php:117
+#: ../admin/inst_upgrade.php:117
 msgid "You should restore company database from latest backup file"
 msgstr ""
 
-#: admin/inst_upgrade.php:129
+#: ../admin/inst_upgrade.php:129
 msgid "All companies data has been successfully updated"
 msgstr ""
 
-#: admin/inst_upgrade.php:137
+#: ../admin/inst_upgrade.php:137
 msgid "Sql file"
 msgstr ""
 
-#: admin/inst_upgrade.php:138
+#: ../admin/inst_upgrade.php:138
 msgid "Force upgrade"
 msgstr ""
 
-#: admin/inst_upgrade.php:161
+#: ../admin/inst_upgrade.php:161
 #, php-format
 msgid "Partially installed (%s)"
 msgstr ""
 
-#: admin/inst_upgrade.php:170
+#: ../admin/inst_upgrade.php:170
 msgid ""
 "Database upgrades marked as partially installed cannot be installed "
 "automatically.\n"
@@ -1515,7881 +1888,9201 @@ msgid ""
 "upgrade."
 msgstr ""
 
-#: admin/inst_upgrade.php:174
+#: ../admin/inst_upgrade.php:174
 msgid "Upgrade system"
 msgstr ""
 
-#: admin/inst_upgrade.php:174
+#: ../admin/inst_upgrade.php:174
 msgid "Save database and perform upgrade"
 msgstr ""
 
-#: admin/payment_terms.php:16 reporting/includes/doctext.inc:242
-#: sales/view/view_invoice.php:74 sales/view/view_sales_order.php:78
+#: ../admin/payment_terms.php:16
+#: ../reporting/includes/doctext.inc:41
+#: ../sales/view/view_invoice.php:76
+#: ../sales/view/view_sales_order.php:82
+#: ../sales/view/view_sales_order.php:90
+#: ../sales/view/view_sales_order.php.orig:78
 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:54 gl/bank_account_reconcile.php:233
-#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
-#: gl/inquiry/journal_inquiry.php:122 gl/inquiry/tax_inquiry.php:82
-#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
-#: gl/manage/gl_quick_entries.php:186 gl/view/accrual_trans.php:52
-#: gl/includes/ui/gl_bank_ui.inc:80 gl/includes/ui/gl_bank_ui.inc.orig:80
-#: includes/ui/ui_view.inc:488 inventory/inquiry/stock_movements.php:81
-#: inventory/manage/item_categories.php:98
-#: manufacturing/search_work_orders.php:161
-#: manufacturing/includes/manufacturing_ui.inc:236
-#: manufacturing/includes/manufacturing_ui.inc:276
-#: manufacturing/includes/manufacturing_ui.inc:280
-#: manufacturing/includes/manufacturing_ui.inc:331
-#: purchasing/inquiry/supplier_allocation_inquiry.php:126
-#: purchasing/inquiry/supplier_inquiry.php:168
-#: purchasing/inquiry/supplier_inquiry.php.orig:162 reporting/rep102.php:132
-#: reporting/rep202.php:137 reporting/rep501.php:85 reporting/rep601.php:76
-#: reporting/rep702.php:58 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep709.php:105 reporting/rep710.php:76
-#: reporting/rep710.php:84 reporting/reports_main.php:252
-#: reporting/reports_main.php:399 reporting/includes/doctext.inc:140
-#: reporting/includes/doctext.inc:181 reporting/includes/doctext.inc:200
-#: sales/inquiry/customer_allocation_inquiry.php:144
-#: sales/inquiry/customer_inquiry.php:224
-#: sales/inquiry/customer_inquiry.php.orig:224
+#: ../admin/payment_terms.php:127
+#: ../dimensions/dimension_entry.php:275
+#: ../dimensions/inquiry/search_dimensions.php:75
+#: ../dimensions/inquiry/search_dimensions.php:130
+#: ../dimensions/view/view_dimension.php:54
+#: ../gl/bank_account_reconcile.php:231
+#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/gl_account_inquiry.php:126
+#: ../gl/inquiry/journal_inquiry.php:129
+#: ../gl/inquiry/tax_inquiry.php:82
+#: ../gl/manage/bank_accounts.php:109
+#: ../gl/manage/gl_quick_entries.php:186
+#: ../gl/view/accrual_trans.php:52
+#: ../gl/includes/ui/gl_bank_ui.inc:92
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:83
+#: ../includes/ui/ui_view.inc:488
+#: ../includes/ui/ui_view.inc.orig:488
+#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php.orig:79
+#: ../inventory/manage/item_categories.php:98
+#: ../manufacturing/search_work_orders.php:161
+#: ../manufacturing/view/wo_costs_view.php:46
+#: ../manufacturing/includes/manufacturing_ui.inc:236
+#: ../manufacturing/includes/manufacturing_ui.inc:276
+#: ../manufacturing/includes/manufacturing_ui.inc:280
+#: ../manufacturing/includes/manufacturing_ui.inc:331
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:125
+#: ../purchasing/inquiry/supplier_inquiry.php:173
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:170
+#: ../reporting/rep102.php:132
+#: ../reporting/rep202.php:137
+#: ../reporting/rep501.php:85
+#: ../reporting/rep601.php:76
+#: ../reporting/rep602.php:80
+#: ../reporting/rep702.php:58
+#: ../reporting/rep704.php:79
+#: ../reporting/rep704.php:82
+#: ../reporting/rep704.php:85
+#: ../reporting/rep709.php:105
+#: ../reporting/rep710.php:76
+#: ../reporting/rep710.php:84
+#: ../reporting/reports_main.php:252
+#: ../reporting/reports_main.php:399
+#: ../reporting/includes/doctext.inc:162
+#: ../reporting/includes/doctext.inc:203
+#: ../reporting/includes/doctext.inc:222
+#: ../sales/inquiry/customer_allocation_inquiry.php:144
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:144
+#: ../sales/inquiry/customer_inquiry.php:200
+#: ../sales/inquiry/customer_inquiry.php.orig:224
 msgid "Type"
 msgstr ""
 
-#: admin/payment_terms.php:127
+#: ../admin/payment_terms.php:127
 msgid "Due After/Days"
 msgstr ""
 
-#: admin/payment_terms.php:140
+#: ../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
-#: gl/manage/gl_accounts.php.orig:198 inventory/manage/items.php:431
-#: purchasing/manage/suppliers.php:286 sales/manage/customers.php:320
-#: sales/manage/customers.php.orig:321
+#: ../admin/security_roles.php:180
+#: ../gl/manage/gl_accounts.php:197
+#: ../inventory/manage/items.php:440
+#: ../inventory/manage/items.php.orig:433
+#: ../purchasing/manage/suppliers.php:291
+#: ../purchasing/manage/suppliers.php.orig:294
+#: ../sales/manage/customers.php:324
+#: ../sales/manage/sav.customers.php:324
 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:227
-#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:259
-#: gl/includes/ui/gl_bank_ui.inc.orig:259 gl/includes/ui/gl_journal_ui.inc:223
-#: includes/ui/simple_crud_class.inc:58 includes/ui/simple_crud_class.inc:231
-#: includes/ui/ui_controls.inc:587 includes/ui/ui_input.inc:206
-#: inventory/includes/item_adjustments_ui.inc:159
-#: inventory/includes/stock_transfers_ui.inc:139
-#: inventory/manage/items.php:414
-#: manufacturing/includes/work_order_issue_ui.inc:133
-#: purchasing/includes/ui/po_ui.inc:444
-#: sales/includes/ui/sales_credit_ui.inc:295
-#: sales/includes/ui/sales_order_ui.inc:557
+#: ../admin/security_roles.php:249
+#: ../admin/void_transaction.php:229
+#: ../gl/manage/gl_quick_entries.php:61
+#: ../gl/includes/ui/gl_bank_ui.inc:277
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:251
+#: ../gl/includes/ui/gl_journal_ui.inc:259
+#: ../includes/ui/simple_crud_class.inc:58
+#: ../includes/ui/simple_crud_class.inc:231
+#: ../includes/ui/ui_controls.inc:594
+#: ../includes/ui/ui_input.inc:210
+#: ../inventory/includes/item_adjustments_ui.inc:159
+#: ../inventory/includes/stock_transfers_ui.inc:139
+#: ../inventory/manage/items.php:423
+#: ../inventory/manage/items.php.orig:416
+#: ../manufacturing/includes/work_order_issue_ui.inc:133
+#: ../purchasing/includes/ui/po_ui.inc:459
+#: ../sales/includes/ui/sales_credit_ui.inc:295
+#: ../sales/includes/ui/sales_order_ui.inc:557
+#: ../sales/includes/ui/sales_order_ui.inc.orig:557
 msgid "Cancel"
 msgstr ""
 
-#: admin/security_roles.php:249 inventory/manage/items.php:414
+#: ../admin/security_roles.php:249
+#: ../inventory/manage/items.php:423
+#: ../inventory/manage/items.php.orig:416
 msgid "Cancel Edition"
 msgstr ""
 
-#: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:256
-#: sales/customer_delivery.php:368 sales/customer_invoice.php:420
-#: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92
-#: sales/view/view_invoice.php:91
+#: ../admin/shipping_companies.php:15
+#: ../sales/customer_credit_invoice.php:256
+#: ../sales/customer_delivery.php:376
+#: ../sales/customer_invoice.php:486
+#: ../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:55 gl/includes/ui/gl_bank_ui.inc.orig:55
-#: inventory/manage/items.php:297 manufacturing/manage/work_centres.php:137
+#: ../admin/shipping_companies.php:134
+#: ../gl/manage/gl_account_types.php:188
+#: ../gl/includes/ui/gl_bank_ui.inc:56
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:58
+#: ../inventory/manage/items.php:306
+#: ../inventory/manage/items.php.orig:299
+#: ../manufacturing/manage/work_centres.php:137
 msgid "Name:"
 msgstr ""
 
-#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:155
-#: sales/manage/customer_branches.php:259
+#: ../admin/shipping_companies.php:136
+#: ../purchasing/manage/suppliers.php.orig:113
+#: ../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:127
-#: sales/manage/customer_branches.php:261 sales/manage/customers.php:249
-#: sales/manage/customers.php.orig:250
+#: ../admin/shipping_companies.php:140
+#: ../includes/ui/contacts_view.inc:103
+#: ../inventory/manage/locations.php:205
+#: ../purchasing/manage/suppliers.php:136
+#: ../purchasing/manage/suppliers.php.orig:115
+#: ../sales/manage/customer_branches.php:263
+#: ../sales/manage/customers.php:253
+#: ../sales/manage/sav.customers.php:253
 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 reporting/reports_main.php:273
-#: reporting/reports_main.php:281 reporting/reports_main.php:292
-#: reporting/reports_main.php:320 reporting/reports_main.php:327
-#: reporting/reports_main.php:337 reporting/reports_main.php:362
-#: reporting/reports_main.php:368 reporting/reports_main.php:377
+#: ../admin/tags.php:40
+#: ../reporting/reports_main.php:273
+#: ../reporting/reports_main.php:281
+#: ../reporting/reports_main.php:292
+#: ../reporting/reports_main.php:320
+#: ../reporting/reports_main.php:327
+#: ../reporting/reports_main.php:337
+#: ../reporting/reports_main.php:362
+#: ../reporting/reports_main.php:368
+#: ../reporting/reports_main.php:377
 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:86
-#: 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:86
+#: ../reporting/includes/header2.inc:98
+#: ../sales/manage/sales_people.php:99
 msgid "Phone"
 msgstr ""
 
-#: admin/users.php:115 sales/manage/customer_branches.php:300
-#: sales/view/view_sales_order.php:83
+#: ../admin/users.php:115
+#: ../sales/manage/customer_branches.php:302
+#: ../sales/view/view_sales_order.php:96
+#: ../sales/view/view_sales_order.php.orig:83
 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:188
-#: purchasing/inquiry/po_search_completed.php:113
-#: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:209
-#: sales/inquiry/customer_inquiry.php.orig:209
-#: sales/inquiry/sales_deliveries_view.php:160
-#: sales/inquiry/sales_orders_view.php:117
-#: sales/inquiry/sales_orders_view.php.orig:117
+#: ../admin/view_print_transaction.php:43
+#: ../admin/view_print_transaction.php:45
+#: ../admin/view_print_transaction.php:129
+#: ../includes/ui/ui_controls.inc:195
+#: ../purchasing/inquiry/po_search_completed.php:112
+#: ../purchasing/inquiry/po_search_completed.php.orig:111
+#: ../purchasing/inquiry/po_search.php:93
+#: ../sales/inquiry/customer_inquiry.php:185
+#: ../sales/inquiry/customer_inquiry.php.orig:209
+#: ../sales/inquiry/sales_deliveries_view.php:160
+#: ../sales/inquiry/sales_deliveries_view.php.orig:160
+#: ../sales/inquiry/sales_orders_view.php:125
+#: ../sales/inquiry/sales_orders_view.php.orig:116
 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:164
+#: ../admin/view_print_transaction.php:79
+#: ../admin/void_transaction.php:166
 msgid "from #:"
 msgstr ""
 
-#: admin/view_print_transaction.php:81 admin/void_transaction.php:166
+#: ../admin/view_print_transaction.php:81
+#: ../admin/void_transaction.php:168
 msgid "to #:"
 msgstr ""
 
-#: admin/view_print_transaction.php:83 admin/void_transaction.php:168
-#: dimensions/inquiry/search_dimensions.php:88
-#: gl/inquiry/journal_inquiry.php:53 manufacturing/search_work_orders.php:78
-#: purchasing/includes/ui/invoice_ui.inc:453
-#: purchasing/inquiry/po_search_completed.php:77
-#: purchasing/inquiry/po_search.php:76
-#: purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: purchasing/inquiry/supplier_inquiry.php:58
-#: purchasing/inquiry/supplier_inquiry.php.orig:54
-#: sales/inquiry/customer_allocation_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:58
-#: sales/inquiry/customer_inquiry.php.orig:58
-#: sales/inquiry/sales_deliveries_view.php:116
-#: sales/inquiry/sales_orders_view.php:245
-#: sales/inquiry/sales_orders_view.php.orig:245
+#: ../admin/view_print_transaction.php:83
+#: ../admin/void_transaction.php:170
+#: ../dimensions/inquiry/search_dimensions.php:88
+#: ../gl/inquiry/journal_inquiry.php:53
+#: ../manufacturing/search_work_orders.php:78
+#: ../purchasing/includes/ui/invoice_ui.inc:474
+#: ../purchasing/inquiry/po_search_completed.php:74
+#: ../purchasing/inquiry/po_search_completed.php.orig:75
+#: ../purchasing/inquiry/po_search.php:76
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
+#: ../purchasing/inquiry/supplier_inquiry.php:55
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:55
+#: ../sales/inquiry/customer_allocation_inquiry.php:51
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:51
+#: ../sales/inquiry/customer_inquiry.php:54
+#: ../sales/inquiry/customer_inquiry.php.orig:55
+#: ../sales/inquiry/sales_deliveries_view.php:116
+#: ../sales/inquiry/sales_deliveries_view.php.orig:116
+#: ../sales/inquiry/sales_orders_view.php:269
+#: ../sales/inquiry/sales_orders_view.php.orig:246
 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:180
-#: dimensions/inquiry/search_dimensions.php:128
-#: dimensions/view/view_dimension.php:54 gl/bank_account_reconcile.php:235
-#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/journal_inquiry.php:124
-#: gl/view/bank_transfer_view.php:86 gl/view/gl_deposit_view.php:75
-#: gl/view/gl_payment_view.php:73 gl/view/gl_trans_view.php:35
-#: includes/ui/contacts_view.inc:41 inventory/inquiry/stock_movements.php:81
-#: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:44
-#: manufacturing/search_work_orders.php:160
-#: manufacturing/view/wo_issue_view.php:43
-#: manufacturing/view/wo_production_view.php:44
-#: manufacturing/includes/manufacturing_ui.inc:157
-#: manufacturing/includes/manufacturing_ui.inc:200
-#: manufacturing/includes/manufacturing_ui.inc:276
-#: manufacturing/includes/manufacturing_ui.inc:280
-#: manufacturing/includes/manufacturing_ui.inc:331
-#: purchasing/includes/ui/grn_ui.inc:36 purchasing/includes/ui/grn_ui.inc:53
-#: purchasing/includes/ui/po_ui.inc:314 purchasing/view/view_po.php:115
-#: purchasing/view/view_supp_credit.php:43
-#: purchasing/view/view_supp_invoice.php:46
-#: purchasing/view/view_supp_payment.php:73
-#: purchasing/inquiry/po_search_completed.php:122
-#: purchasing/inquiry/po_search.php:131
-#: purchasing/inquiry/supplier_allocation_inquiry.php:128
-#: purchasing/inquiry/supplier_inquiry.php:170
-#: purchasing/inquiry/supplier_inquiry.php.orig:164
-#: purchasing/allocations/supplier_allocation_main.php:96
-#: reporting/rep501.php:85 reporting/rep601.php:76 reporting/rep702.php:51
-#: reporting/includes/doctext.inc:199 sales/customer_credit_invoice.php:247
-#: sales/customer_credit_invoice.php:249 sales/customer_delivery.php:348
-#: sales/customer_delivery.php:350 sales/customer_invoice.php:392
-#: sales/customer_invoice.php:394
-#: sales/allocations/customer_allocation_main.php:95
-#: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:84
-#: sales/view/view_receipt.php:50 sales/view/view_sales_order.php:81
-#: sales/inquiry/customer_allocation_inquiry.php:146
-#: sales/inquiry/customer_inquiry.php:227
-#: sales/inquiry/customer_inquiry.php.orig:227
-#: 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:373
+#: ../admin/view_print_transaction.php:127
+#: ../admin/void_transaction.php:182
+#: ../dimensions/inquiry/search_dimensions.php:128
+#: ../dimensions/view/view_dimension.php:54
+#: ../gl/bank_account_reconcile.php:233
+#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/journal_inquiry.php:131
+#: ../gl/view/bank_transfer_view.php:86
+#: ../gl/view/gl_deposit_view.php:75
+#: ../gl/view/gl_payment_view.php:73
+#: ../gl/view/gl_trans_view.php:35
+#: ../includes/ui/contacts_view.inc:41
+#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php.orig:79
+#: ../inventory/view/view_adjustment.php:44
+#: ../inventory/view/view_transfer.php:44
+#: ../manufacturing/search_work_orders.php:160
+#: ../manufacturing/view/wo_issue_view.php:43
+#: ../manufacturing/view/wo_production_view.php:44
+#: ../manufacturing/includes/manufacturing_ui.inc:157
+#: ../manufacturing/includes/manufacturing_ui.inc:200
+#: ../manufacturing/includes/manufacturing_ui.inc:276
+#: ../manufacturing/includes/manufacturing_ui.inc:280
+#: ../manufacturing/includes/manufacturing_ui.inc:331
+#: ../purchasing/includes/ui/grn_ui.inc:36
+#: ../purchasing/includes/ui/grn_ui.inc:53
+#: ../purchasing/includes/ui/po_ui.inc:321
+#: ../purchasing/view/view_po.php:115
+#: ../purchasing/view/view_supp_credit.php:43
+#: ../purchasing/view/view_supp_invoice.php:47
+#: ../purchasing/view/view_supp_payment.php:73
+#: ../purchasing/inquiry/po_search_completed.php:121
+#: ../purchasing/inquiry/po_search_completed.php.orig:120
+#: ../purchasing/inquiry/po_search.php:131
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:127
+#: ../purchasing/inquiry/supplier_inquiry.php:175
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:172
+#: ../purchasing/allocations/supplier_allocation_main.php:96
+#: ../reporting/rep501.php:85
+#: ../reporting/rep601.php:76
+#: ../reporting/rep602.php:80
+#: ../reporting/rep702.php:51
+#: ../reporting/includes/doctext.inc:221
+#: ../sales/customer_credit_invoice.php:247
+#: ../sales/customer_credit_invoice.php:249
+#: ../sales/customer_delivery.php:356
+#: ../sales/customer_delivery.php:358
+#: ../sales/customer_invoice.php:458
+#: ../sales/customer_invoice.php:460
+#: ../sales/allocations/customer_allocation_main.php:95
+#: ../sales/view/view_dispatch.php:85
+#: ../sales/view/view_invoice.php:85
+#: ../sales/view/view_receipt.php:50
+#: ../sales/view/view_sales_order.php:94
+#: ../sales/view/view_sales_order.php.orig:81
+#: ../sales/inquiry/customer_allocation_inquiry.php:146
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:146
+#: ../sales/inquiry/customer_inquiry.php:203
+#: ../sales/inquiry/customer_inquiry.php.orig:227
+#: ../sales/inquiry/sales_deliveries_view.php:184
+#: ../sales/inquiry/sales_deliveries_view.php.orig:184
+#: ../sales/includes/ui/sales_credit_ui.inc:85
+#: ../sales/includes/ui/sales_credit_ui.inc:87
+#: ../sales/includes/ui/sales_order_ui.inc:373
+#: ../sales/includes/ui/sales_order_ui.inc.orig:373
 msgid "Reference"
 msgstr ""
 
-#: admin/view_print_transaction.php:128 admin/void_transaction.php:181
-#: dimensions/inquiry/search_dimensions.php:131
-#: dimensions/view/view_dimension.php:54 gl/accruals.php:90
-#: gl/accruals.php:195 gl/bank_account_reconcile.php:236
-#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126
-#: gl/inquiry/journal_inquiry.php:121 gl/view/accrual_trans.php:52
-#: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68
-#: gl/view/gl_payment_view.php:66 gl/view/gl_trans_view.php:36
-#: includes/ui/allocation_cart.inc:263 includes/ui/ui_view.inc:488
-#: inventory/inquiry/stock_movements.php:81
-#: 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_production_view.php:45
-#: manufacturing/includes/manufacturing_ui.inc:157
-#: manufacturing/includes/manufacturing_ui.inc:200
-#: manufacturing/includes/manufacturing_ui.inc:236
-#: manufacturing/includes/manufacturing_ui.inc:277
-#: manufacturing/includes/manufacturing_ui.inc:281
-#: manufacturing/includes/manufacturing_ui.inc:332
-#: purchasing/includes/ui/invoice_ui.inc:103
-#: purchasing/includes/ui/po_ui.inc:328 purchasing/view/view_po.php:140
-#: purchasing/inquiry/supplier_allocation_inquiry.php:131
-#: purchasing/inquiry/supplier_inquiry.php:173
-#: purchasing/inquiry/supplier_inquiry.php.orig:167
-#: purchasing/allocations/supplier_allocation_main.php:97
-#: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep501.php:85
-#: reporting/rep601.php:76 reporting/rep704.php:79 reporting/rep704.php:82
-#: reporting/rep704.php:85 reporting/rep709.php:109 reporting/rep710.php:75
-#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
-#: reporting/includes/doctext.inc:224 reporting/includes/header2.inc:135
-#: sales/customer_delivery.php:378 sales/customer_invoice.php:430
-#: sales/allocations/customer_allocation_main.php:96
-#: sales/view/view_credit.php:69 sales/view/view_sales_order.php:96
-#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
-#: sales/inquiry/customer_allocation_inquiry.php:148
-#: sales/inquiry/customer_inquiry.php:228
-#: sales/inquiry/customer_inquiry.php.orig:228
+#: ../admin/view_print_transaction.php:128
+#: ../admin/void_transaction.php:183
+#: ../dimensions/inquiry/search_dimensions.php:131
+#: ../dimensions/view/view_dimension.php:54
+#: ../gl/accruals.php:94
+#: ../gl/accruals.php:199
+#: ../gl/bank_account_reconcile.php:234
+#: ../gl/inquiry/bank_inquiry.php:70
+#: ../gl/inquiry/gl_account_inquiry.php:126
+#: ../gl/inquiry/journal_inquiry.php:128
+#: ../gl/view/accrual_trans.php:52
+#: ../gl/view/bank_transfer_view.php:83
+#: ../gl/view/gl_deposit_view.php:68
+#: ../gl/view/gl_payment_view.php:66
+#: ../gl/view/gl_trans_view.php:36
+#: ../includes/ui/allocation_cart.inc:264
+#: ../includes/ui/ui_view.inc:488
+#: ../includes/ui/ui_view.inc.orig:488
+#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php.orig:79
+#: ../inventory/view/view_adjustment.php:45
+#: ../inventory/view/view_transfer.php:47
+#: ../manufacturing/search_work_orders.php:166
+#: ../manufacturing/work_order_entry.php:419
+#: ../manufacturing/work_order_entry.php:425
+#: ../manufacturing/view/wo_costs_view.php:46
+#: ../manufacturing/view/wo_production_view.php:45
+#: ../manufacturing/includes/manufacturing_ui.inc:157
+#: ../manufacturing/includes/manufacturing_ui.inc:200
+#: ../manufacturing/includes/manufacturing_ui.inc:236
+#: ../manufacturing/includes/manufacturing_ui.inc:277
+#: ../manufacturing/includes/manufacturing_ui.inc:281
+#: ../manufacturing/includes/manufacturing_ui.inc:332
+#: ../purchasing/includes/ui/invoice_ui.inc:114
+#: ../purchasing/includes/ui/po_ui.inc:335
+#: ../purchasing/view/view_po.php:140
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:130
+#: ../purchasing/inquiry/supplier_inquiry.php:178
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:175
+#: ../purchasing/allocations/supplier_allocation_main.php:97
+#: ../reporting/rep101.php:130
+#: ../reporting/rep107.php:192
+#: ../reporting/rep201.php:118
+#: ../reporting/rep501.php:85
+#: ../reporting/rep601.php:76
+#: ../reporting/rep602.php:80
+#: ../reporting/rep704.php:79
+#: ../reporting/rep704.php:82
+#: ../reporting/rep704.php:85
+#: ../reporting/rep709.php:109
+#: ../reporting/rep710.php:75
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+#: ../reporting/includes/doctext.inc:246
+#: ../reporting/includes/header2.inc:135
+#: ../sales/customer_delivery.php:386
+#: ../sales/customer_invoice.php:501
+#: ../sales/allocations/customer_allocation_main.php:96
+#: ../sales/view/view_credit.php:69
+#: ../sales/view/view_sales_order.php:109
+#: ../sales/view/view_sales_order.php:142
+#: ../sales/view/view_sales_order.php:179
+#: ../sales/view/view_sales_order.php.orig:96
+#: ../sales/view/view_sales_order.php.orig:129
+#: ../sales/view/view_sales_order.php.orig:161
+#: ../sales/inquiry/customer_allocation_inquiry.php:148
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:148
+#: ../sales/inquiry/customer_inquiry.php:204
+#: ../sales/inquiry/customer_inquiry.php.orig:228
 msgid "Date"
 msgstr ""
 
-#: admin/view_print_transaction.php:130 admin/void_transaction.php:182
-#: includes/ui/ui_view.inc:51
+#: ../admin/view_print_transaction.php:130
+#: ../admin/void_transaction.php:184
+#: ../includes/ui/ui_view.inc:51
+#: ../includes/ui/ui_view.inc.orig:51
 msgid "GL"
 msgstr ""
 
-#: admin/void_transaction.php:29
+#: ../admin/void_transaction.php:29
 msgid "Void a Transaction"
 msgstr ""
 
-#: admin/void_transaction.php:124 admin/void_transaction.php:183
-#: includes/ui/sav.ui_lists.inc:20 includes/ui/ui_input.inc:136
-#: includes/ui/ui_input.inc:277 includes/ui/ui_lists.inc:20
-#: includes/ui/ui_lists.inc.orig:20
+#: ../admin/void_transaction.php:126
+#: ../admin/void_transaction.php:185
+#: ../includes/ui/ui_input.inc:137
+#: ../includes/ui/ui_input.inc:281
+#: ../includes/ui/ui_lists.inc:20
+#: ../includes/ui/ui_lists.inc.orig:20
 msgid "Select"
 msgstr ""
 
-#: admin/void_transaction.php:202
+#: ../admin/void_transaction.php:157
+msgid "Transaction Type:"
+msgstr ""
+
+#: ../admin/void_transaction.php:204
 msgid "Transaction #:"
 msgstr ""
 
-#: admin/void_transaction.php:204
+#: ../admin/void_transaction.php:206
 msgid "Voiding Date:"
 msgstr ""
 
-#: admin/void_transaction.php:206 dimensions/dimension_entry.php:283
-#: gl/bank_transfer.php:93 gl/inquiry/journal_inquiry.php:56
-#: gl/manage/revaluate_currencies.php:106 includes/ui/ui_view.inc:308
-#: manufacturing/work_order_add_finished.php:210
-#: manufacturing/work_order_entry.php:451
-#: manufacturing/work_order_release.php:100
-#: purchasing/includes/ui/invoice_ui.inc:161 purchasing/po_entry_items.php:518
-#: purchasing/supplier_payment.php:313 sales/customer_payments.php:413
+#: ../admin/void_transaction.php:208
+#: ../dimensions/dimension_entry.php:283
+#: ../gl/bank_transfer.php:93
+#: ../gl/inquiry/journal_inquiry.php:56
+#: ../gl/manage/revaluate_currencies.php:106
+#: ../includes/ui/ui_view.inc:308
+#: ../includes/ui/ui_view.inc.orig:308
+#: ../manufacturing/work_order_add_finished.php:210
+#: ../manufacturing/work_order_costs.php:146
+#: ../manufacturing/work_order_entry.php:451
+#: ../manufacturing/work_order_release.php:100
+#: ../purchasing/includes/ui/invoice_ui.inc:180
+#: ../purchasing/includes/ui/po_ui.inc:492
+#: ../purchasing/po_entry_items.php:558
+#: ../purchasing/supplier_payment.php:313
+#: ../sales/customer_invoice.php:678
+#: ../sales/customer_payments.php:410
 msgid "Memo:"
 msgstr ""
 
-#: admin/void_transaction.php:211 admin/void_transaction.php:220
+#: ../admin/void_transaction.php:213
+#: ../admin/void_transaction.php:222
 msgid "Void Transaction"
 msgstr ""
 
-#: admin/void_transaction.php:216 admin/void_transaction.php:295
+#: ../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:224
+#: ../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:226 includes/ui/ui_controls.inc:586
+#: ../admin/void_transaction.php:228
+#: ../includes/ui/ui_controls.inc:593
 msgid "Proceed"
 msgstr ""
 
-#: admin/void_transaction.php:240
+#: ../admin/void_transaction.php:242
 msgid "The selected transaction was closed for edition and cannot be voided."
 msgstr ""
 
-#: admin/void_transaction.php:246 gl/accruals.php:32 gl/bank_transfer.php:110
-#: gl/gl_journal.php:156 gl/manage/exchange_rates.php:33
-#: gl/manage/revaluate_currencies.php:53
-#: manufacturing/work_order_add_finished.php:98
-#: manufacturing/work_order_costs.php:83 purchasing/po_receive_items.php:174
-#: purchasing/supplier_payment.php:179 sales/customer_credit_invoice.php:91
-#: sales/sales_order_entry.php:340 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:110
+#: ../gl/gl_journal.php:158
+#: ../gl/manage/close_period.php:34
+#: ../gl/manage/close_period.php.orig:34
+#: ../gl/manage/exchange_rates.php:33
+#: ../gl/manage/revaluate_currencies.php:53
+#: ../manufacturing/work_order_add_finished.php:98
+#: ../manufacturing/work_order_costs.php:80
+#: ../purchasing/po_receive_items.php:174
+#: ../purchasing/supplier_payment.php:179
+#: ../sales/customer_credit_invoice.php:91
+#: ../sales/sales_order_entry.php:345
+#: ../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:252 gl/accruals.php:38 gl/bank_transfer.php:116
-#: gl/gl_bank.php:267 gl/gl_journal.php:162
-#: gl/manage/revaluate_currencies.php:59 inventory/adjustments.php:116
-#: inventory/transfers.php:111 manufacturing/work_order_add_finished.php:104
-#: manufacturing/work_order_costs.php:89
-#: manufacturing/work_order_entry.php:160
-#: manufacturing/work_order_issue.php:85 purchasing/supplier_credit.php:176
-#: purchasing/supplier_invoice.php:174 purchasing/supplier_payment.php:185
-#: sales/create_recurrent_invoices.php:108 sales/credit_note_entry.php:161
-#: sales/customer_credit_invoice.php:95 sales/customer_payments.php:145
+#: ../admin/void_transaction.php:254
 msgid "The entered date is not in fiscal year."
 msgstr ""
 
-#: admin/void_transaction.php:259
+#: ../admin/void_transaction.php:261
 msgid "The transaction number is expected to be numeric and greater than zero."
 msgstr ""
 
-#: admin/void_transaction.php:276
+#: ../admin/void_transaction.php:278
 msgid "The selected transaction has already been voided."
 msgstr ""
 
-#: admin/void_transaction.php:289
+#: ../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:141
+#: ../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/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/rep101.php:175
-#: reporting/rep201.php:167 reporting/rep706.php:181
+#: ../admin/db/fiscalyears_db.inc:214
+#: ../reporting/rep101.php:175
+#: ../reporting/rep201.php:167
+#: ../reporting/rep706.php:181
 msgid "Open Balance"
 msgstr ""
 
-#: admin/db/maintenance_db.inc:150
+#: ../admin/db/maintenance_db.inc:152
+#: ../admin/db/maintenance_db.inc.orig:150
 #, php-format
 msgid "Cannot open the extension setup file '%s' for writing."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:158
+#: ../admin/db/maintenance_db.inc:160
+#: ../admin/db/maintenance_db.inc.orig:158
 #, php-format
 msgid "Cannot write to the extensions setup file '%s'."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:176
+#: ../admin/db/maintenance_db.inc:178
+#: ../admin/db/maintenance_db.inc.orig:176
 msgid "Cannot update system extensions list."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:194
+#: ../admin/db/maintenance_db.inc:196
+#: ../admin/db/maintenance_db.inc.orig:194
 #, php-format
 msgid "Cannot update extensions list for company '%s'."
 msgstr ""
 
-#: admin/db/maintenance_db.inc:231
+#: ../admin/db/maintenance_db.inc:233
+#: ../admin/db/maintenance_db.inc.orig:231
 msgid "Cannot open the languages file - "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:238
+#: ../admin/db/maintenance_db.inc:240
+#: ../admin/db/maintenance_db.inc.orig:238
 msgid "Cannot write to the language file - "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:248
+#: ../admin/db/maintenance_db.inc:250
+#: ../admin/db/maintenance_db.inc.orig:248
 msgid "The language files folder "
 msgstr ""
 
-#: admin/db/maintenance_db.inc:387
+#: ../admin/db/maintenance_db.inc:389
+#: ../admin/db/maintenance_db.inc.orig:386
 #, 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
-#: manufacturing/includes/db/work_orders_db.inc:446
-#: manufacturing/includes/db/work_orders_db.inc:462
-#: sales/includes/db/sales_invoice_db.inc:205
-#: sales/includes/db/sales_invoice_db.inc.orig:208
+#: ../admin/db/voiding_db.inc:114
+#: ../sales/includes/db/sales_invoice_db.inc:249
 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
 msgid "Customer &Credit Notes"
 msgstr ""
 
-#: applications/customers.php:44
+#: ../applications/customers.php:46
 msgid "&Allocate Customer Payments or Credit Notes"
 msgstr ""
 
-#: applications/customers.php:47 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:48
+#: ../applications/customers.php:50
 msgid "Sales Quotation I&nquiry"
 msgstr ""
 
-#: applications/customers.php:50
+#: ../applications/customers.php:52
 msgid "Sales Order &Inquiry"
 msgstr ""
 
-#: applications/customers.php:52
+#: ../applications/customers.php:54
 msgid "Customer Transaction &Inquiry"
 msgstr ""
 
-#: applications/customers.php:55
+#: ../applications/customers.php:57
 msgid "Customer Allocation &Inquiry"
 msgstr ""
 
-#: applications/customers.php:58
+#: ../applications/customers.php:60
 msgid "Customer and Sales &Reports"
 msgstr ""
 
-#: applications/customers.php:61 applications/dimensions.php:34
-#: applications/generalledger.php:55 applications/inventory.php:32
-#: applications/manufacturing.php:34 applications/setup.php:54
-#: applications/suppliers.php:50
+#: ../applications/customers.php:63
+#: ../applications/dimensions.php:34
+#: ../applications/generalledger.php:55
+#: ../applications/inventory.php:32
+#: ../applications/manufacturing.php:34
+#: ../applications/setup.php:54
+#: ../applications/suppliers.php:50
 msgid "Maintenance"
 msgstr ""
 
-#: applications/customers.php:62
+#: ../applications/customers.php:64
 msgid "Add and Manage &Customers"
 msgstr ""
 
-#: applications/customers.php:64
+#: ../applications/customers.php:66
 msgid "Customer &Branches"
 msgstr ""
 
-#: applications/customers.php:66
+#: ../applications/customers.php:68
 msgid "Sales &Groups"
 msgstr ""
 
-#: applications/customers.php:68
+#: ../applications/customers.php:70
 msgid "Recurrent &Invoices"
 msgstr ""
 
-#: applications/customers.php:70
+#: ../applications/customers.php:72
 msgid "Sales T&ypes"
 msgstr ""
 
-#: applications/customers.php:72
+#: ../applications/customers.php:74
 msgid "Sales &Persons"
 msgstr ""
 
-#: applications/customers.php:74
+#: ../applications/customers.php:76
 msgid "Sales &Areas"
 msgstr ""
 
-#: applications/customers.php:76
+#: ../applications/customers.php:78
 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 reporting/reports_main.php:297
-#: reporting/reports_main.php:342 reporting/reports_main.php:382
+#: ../applications/generalledger.php:44
+#: ../reporting/reports_main.php:297
+#: ../reporting/reports_main.php:342
+#: ../reporting/reports_main.php:382
 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:75
+#: ../applications/generalledger.php:74
+msgid "&Closing GL Transactions"
+msgstr ""
+
+#: ../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
 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
 msgid "Standard &Costs"
 msgstr ""
 
-#: applications/manufacturing.php:16
+#: ../applications/manufacturing.php:16
 msgid "&Manufacturing"
 msgstr ""
 
-#: applications/manufacturing.php:19 sales/sales_order_entry.php:112
+#: ../applications/manufacturing.php:19
+#: ../sales/sales_order_entry.php:113
 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:44
+#: ../applications/suppliers.php:44
 msgid "Supplier Allocation &Inquiry"
 msgstr ""
 
-#: applications/suppliers.php:47
+#: ../applications/suppliers.php:47
 msgid "Supplier and Purchasing &Reports"
 msgstr ""
 
-#: applications/suppliers.php:51
+#: ../applications/suppliers.php:51
 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:171
-#: gl/gl_bank.php:255 gl/gl_journal.php:176
-#: gl/manage/revaluate_currencies.php:72 inventory/adjustments.php:103
-#: inventory/transfers.php:99 manufacturing/work_order_add_finished.php:84
-#: manufacturing/work_order_entry.php:139
-#: manufacturing/work_order_issue.php:98 purchasing/po_entry_items.php:363
-#: purchasing/po_receive_items.php:195 purchasing/supplier_credit.php:156
-#: purchasing/supplier_invoice.php:154 purchasing/supplier_payment.php:208
-#: sales/credit_note_entry.php:151 sales/customer_credit_invoice.php:108
-#: sales/customer_delivery.php:172 sales/customer_invoice.php:286
-#: sales/customer_payments.php:158 sales/customer_payments.php:165
-#: sales/customer_payments.php:246 sales/sales_order_entry.php:409
+#: ../dimensions/dimension_entry.php:123
+#: ../gl/bank_transfer.php:171
+#: ../gl/gl_bank.php:257
+#: ../gl/gl_journal.php:178
+#: ../gl/manage/revaluate_currencies.php:72
+#: ../inventory/adjustments.php:103
+#: ../inventory/transfers.php:99
+#: ../manufacturing/work_order_add_finished.php:84
+#: ../manufacturing/work_order_entry.php:139
+#: ../manufacturing/work_order_issue.php:97
+#: ../purchasing/po_entry_items.php:365
+#: ../purchasing/po_receive_items.php:193
+#: ../purchasing/supplier_credit.php:173
+#: ../purchasing/supplier_invoice.php:178
+#: ../purchasing/supplier_payment.php:208
+#: ../sales/credit_note_entry.php:151
+#: ../sales/customer_credit_invoice.php:108
+#: ../sales/customer_delivery.php:180
+#: ../sales/customer_invoice.php:338
+#: ../sales/customer_payments.php:158
+#: ../sales/customer_payments.php:165
+#: ../sales/customer_payments.php:246
+#: ../sales/sales_order_entry.php:420
 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 manufacturing/work_order_entry.php:154
-#: manufacturing/work_order_entry.php:234 purchasing/po_entry_items.php:235
+#: ../dimensions/dimension_entry.php:138
+#: ../manufacturing/work_order_entry.php:154
+#: ../manufacturing/work_order_entry.php:234
+#: ../purchasing/po_entry_items.php:238
 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:60 reporting/reports_main.php:74
-#: reporting/reports_main.php:82 reporting/reports_main.php:134
-#: reporting/reports_main.php:199 reporting/reports_main.php:207
-#: reporting/reports_main.php:239 reporting/reports_main.php:250
-#: reporting/reports_main.php:261 reporting/reports_main.php:277
-#: reporting/reports_main.php:287 reporting/reports_main.php:298
-#: reporting/reports_main.php:310 reporting/reports_main.php:324
-#: reporting/reports_main.php:333 reporting/reports_main.php:343
-#: reporting/reports_main.php:354 reporting/reports_main.php:366
-#: reporting/reports_main.php:374 reporting/reports_main.php:383
-#: reporting/reports_main.php:391 reporting/reports_main.php:397
+#: ../dimensions/dimension_entry.php:277
+#: ../reporting/reports_main.php:34
+#: ../reporting/reports_main.php:60
+#: ../reporting/reports_main.php:74
+#: ../reporting/reports_main.php:82
+#: ../reporting/reports_main.php:134
+#: ../reporting/reports_main.php:199
+#: ../reporting/reports_main.php:207
+#: ../reporting/reports_main.php:239
+#: ../reporting/reports_main.php:250
+#: ../reporting/reports_main.php:261
+#: ../reporting/reports_main.php:277
+#: ../reporting/reports_main.php:287
+#: ../reporting/reports_main.php:298
+#: ../reporting/reports_main.php:310
+#: ../reporting/reports_main.php:324
+#: ../reporting/reports_main.php:333
+#: ../reporting/reports_main.php:343
+#: ../reporting/reports_main.php:354
+#: ../reporting/reports_main.php:366
+#: ../reporting/reports_main.php:374
+#: ../reporting/reports_main.php:383
+#: ../reporting/reports_main.php:391
+#: ../reporting/reports_main.php:397
 msgid "Start Date"
 msgstr ""
 
-#: dimensions/dimension_entry.php:279 manufacturing/work_order_entry.php:420
+#: ../dimensions/dimension_entry.php:279
+#: ../manufacturing/work_order_entry.php:420
 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:186
-#: purchasing/includes/ui/invoice_ui.inc:392
-#: purchasing/includes/ui/invoice_ui.inc:394
+#: ../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
 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:90
-#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:171
-#: gl/manage/gl_quick_entries.php:241 gl/manage/gl_quick_entries.php:333
-#: includes/sysnames.inc:164 purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249 reporting/rep701.php:109
-#: reporting/rep705.php:234 reporting/rep706.php:181 reporting/rep707.php:206
-#: reporting/rep708.php:179
+#: ../dimensions/includes/dimensions_ui.inc:31
+#: ../gl/accruals.php:94
+#: ../gl/inquiry/gl_account_inquiry.php:129
+#: ../gl/inquiry/gl_trial_balance.php:170
+#: ../gl/manage/gl_quick_entries.php:241
+#: ../gl/manage/gl_quick_entries.php:333
+#: ../includes/sysnames.inc:165
+#: ../purchasing/includes/ui/invoice_ui.inc:265
+#: ../purchasing/includes/ui/invoice_ui.inc:267
+#: ../purchasing/includes/ui/invoice_ui.inc:269
+#: ../reporting/rep701.php:109
+#: ../reporting/rep705.php:234
+#: ../reporting/rep706.php:181
+#: ../reporting/rep707.php:206
+#: ../reporting/rep708.php:179
 msgid "Account"
 msgstr ""
 
-#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
-#: gl/bank_account_reconcile.php:237 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/gl_trial_balance.php:177 gl/inquiry/gl_trial_balance.php:179
-#: gl/inquiry/gl_trial_balance.php:181 gl/view/accrual_trans.php:60
-#: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
-#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
-#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
-#: purchasing/inquiry/supplier_allocation_inquiry.php:134
-#: purchasing/inquiry/supplier_inquiry.php:176
-#: purchasing/inquiry/supplier_inquiry.php.orig:170 reporting/rep601.php:77
-#: reporting/rep702.php:52 reporting/rep704.php:80 reporting/rep704.php:83
-#: reporting/rep704.php:86 reporting/rep708.php:179 reporting/rep708.php:180
-#: sales/inquiry/customer_allocation_inquiry.php:152
-#: sales/inquiry/customer_inquiry.php:233
-#: sales/inquiry/customer_inquiry.php.orig:233
+#: ../dimensions/includes/dimensions_ui.inc:31
+#: ../gl/accruals.php:102
+#: ../gl/bank_account_reconcile.php:235
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_account_inquiry.php:143
+#: ../gl/inquiry/gl_trial_balance.php:176
+#: ../gl/inquiry/gl_trial_balance.php:178
+#: ../gl/inquiry/gl_trial_balance.php:180
+#: ../gl/view/accrual_trans.php:60
+#: ../gl/view/gl_trans_view.php:69
+#: ../gl/view/gl_trans_view.php:72
+#: ../gl/view/gl_trans_view.php:75
+#: ../gl/includes/ui/gl_journal_ui.inc:87
+#: ../gl/includes/ui/gl_journal_ui.inc:90
+#: ../gl/includes/ui/gl_journal_ui.inc:93
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:133
+#: ../purchasing/inquiry/supplier_inquiry.php:181
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:178
+#: ../reporting/rep601.php:77
+#: ../reporting/rep602.php:81
+#: ../reporting/rep702.php:52
+#: ../reporting/rep704.php:80
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep708.php:179
+#: ../reporting/rep708.php:180
+#: ../sales/inquiry/customer_allocation_inquiry.php:152
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:152
+#: ../sales/inquiry/customer_inquiry.php:209
+#: ../sales/inquiry/customer_inquiry.php.orig:233
 msgid "Debit"
 msgstr ""
 
-#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98
-#: gl/bank_account_reconcile.php:238 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/gl_trial_balance.php:178 gl/inquiry/gl_trial_balance.php:180
-#: gl/inquiry/gl_trial_balance.php:182 gl/view/accrual_trans.php:60
-#: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
-#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84
-#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
-#: includes/sysnames.inc:85
-#: purchasing/inquiry/supplier_allocation_inquiry.php:135
-#: purchasing/inquiry/supplier_inquiry.php:177
-#: purchasing/inquiry/supplier_inquiry.php.orig:171 reporting/rep601.php:77
-#: reporting/rep702.php:52 reporting/rep704.php:80 reporting/rep704.php:83
-#: reporting/rep704.php:86 reporting/rep708.php:179 reporting/rep708.php:180
-#: sales/inquiry/customer_allocation_inquiry.php:153
-#: sales/inquiry/customer_inquiry.php:234
-#: sales/inquiry/customer_inquiry.php.orig:234
+#: ../dimensions/includes/dimensions_ui.inc:31
+#: ../gl/accruals.php:102
+#: ../gl/bank_account_reconcile.php:236
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_account_inquiry.php:143
+#: ../gl/inquiry/gl_trial_balance.php:177
+#: ../gl/inquiry/gl_trial_balance.php:179
+#: ../gl/inquiry/gl_trial_balance.php:181
+#: ../gl/view/accrual_trans.php:60
+#: ../gl/view/gl_trans_view.php:69
+#: ../gl/view/gl_trans_view.php:72
+#: ../gl/view/gl_trans_view.php:75
+#: ../gl/includes/ui/gl_journal_ui.inc:87
+#: ../gl/includes/ui/gl_journal_ui.inc:90
+#: ../gl/includes/ui/gl_journal_ui.inc:93
+#: ../includes/sysnames.inc:85
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:134
+#: ../purchasing/inquiry/supplier_inquiry.php:182
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:179
+#: ../reporting/rep601.php:77
+#: ../reporting/rep602.php:81
+#: ../reporting/rep702.php:52
+#: ../reporting/rep704.php:80
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep708.php:179
+#: ../reporting/rep708.php:180
+#: ../sales/inquiry/customer_allocation_inquiry.php:153
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:153
+#: ../sales/inquiry/customer_inquiry.php:210
+#: ../sales/inquiry/customer_inquiry.php.orig:234
 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:175
-#: purchasing/inquiry/supplier_allocation_inquiry.php:137
-#: reporting/rep203.php:92 reporting/rep204.php:82 reporting/rep601.php:77
-#: reporting/rep701.php:109 reporting/rep704.php:80 reporting/rep704.php:83
-#: reporting/rep704.php:86 reporting/rep708.php:172
-#: sales/inquiry/customer_allocation_inquiry.php:155
+#: ../dimensions/includes/dimensions_ui.inc:45
+#: ../dimensions/inquiry/search_dimensions.php:134
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_trial_balance.php:174
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:136
+#: ../reporting/rep203.php:92
+#: ../reporting/rep204.php:82
+#: ../reporting/rep601.php:77
+#: ../reporting/rep602.php:81
+#: ../reporting/rep701.php:109
+#: ../reporting/rep704.php:80
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep708.php:172
+#: ../sales/inquiry/customer_allocation_inquiry.php:155
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig: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:91
-#: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:105
-#: gl/includes/ui/gl_bank_ui.inc:25 gl/includes/ui/gl_bank_ui.inc.orig:25
-#: gl/includes/ui/gl_journal_ui.inc:30 includes/ui/contacts_view.inc:94
-#: inventory/includes/item_adjustments_ui.inc:35
-#: inventory/includes/stock_transfers_ui.inc:40
-#: manufacturing/search_work_orders.php:67
-#: manufacturing/work_order_add_finished.php:198
-#: manufacturing/work_order_entry.php:378
-#: manufacturing/work_order_entry.php:385
-#: manufacturing/includes/work_order_issue_ui.inc:156
-#: purchasing/includes/ui/invoice_ui.inc:92
-#: purchasing/includes/ui/po_ui.inc:159 purchasing/includes/ui/po_ui.inc:164
-#: purchasing/supplier_payment.php:286 sales/customer_payments.php:382
+#: ../dimensions/inquiry/search_dimensions.php:73
+#: ../gl/bank_transfer.php:91
+#: ../gl/inquiry/journal_inquiry.php:45
+#: ../gl/manage/revaluate_currencies.php:105
+#: ../gl/includes/ui/gl_bank_ui.inc:26
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:104
+#: ../gl/includes/ui/gl_journal_ui.inc:30
+#: ../includes/ui/contacts_view.inc:94
+#: ../inventory/includes/item_adjustments_ui.inc:35
+#: ../inventory/includes/stock_transfers_ui.inc:40
+#: ../manufacturing/search_work_orders.php:67
+#: ../manufacturing/work_order_add_finished.php:198
+#: ../manufacturing/work_order_costs.php:134
+#: ../manufacturing/work_order_entry.php:378
+#: ../manufacturing/work_order_entry.php:385
+#: ../manufacturing/includes/work_order_issue_ui.inc:156
+#: ../purchasing/includes/ui/invoice_ui.inc:104
+#: ../purchasing/includes/ui/po_ui.inc:166
+#: ../purchasing/includes/ui/po_ui.inc:171
+#: ../purchasing/supplier_payment.php:286
+#: ../sales/customer_payments.php:379
 msgid "Reference:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:75
-#: includes/ui/allocation_cart.inc:284 includes/ui/sav.ui_lists.inc:1898
-#: includes/ui/ui_lists.inc:1887 includes/ui/ui_lists.inc.orig:1898
-#: reporting/rep101.php:112 reporting/rep102.php:94 reporting/rep104.php:95
-#: reporting/rep104.php:99 reporting/rep105.php:93 reporting/rep105.php:97
-#: reporting/rep201.php:100 reporting/rep202.php:98 reporting/rep203.php:72
-#: reporting/rep204.php:75 reporting/rep301.php:90 reporting/rep301.php:97
-#: reporting/rep302.php:103 reporting/rep302.php:110 reporting/rep303.php:84
-#: reporting/rep303.php:91 reporting/rep304.php:96 reporting/rep304.php:101
-#: reporting/rep304.php:106 reporting/rep702.php:59 reporting/rep710.php:84
-#: reporting/rep710.php:85
+#: ../dimensions/inquiry/search_dimensions.php:75
+#: ../includes/ui/allocation_cart.inc:286
+#: ../includes/ui/ui_lists.inc:1923
+#: ../includes/ui/ui_lists.inc.orig:1921
+#: ../reporting/rep101.php:112
+#: ../reporting/rep102.php:94
+#: ../reporting/rep104.php:95
+#: ../reporting/rep104.php:99
+#: ../reporting/rep105.php:93
+#: ../reporting/rep105.php:97
+#: ../reporting/rep201.php:100
+#: ../reporting/rep202.php:98
+#: ../reporting/rep203.php:72
+#: ../reporting/rep204.php:75
+#: ../reporting/rep301.php:90
+#: ../reporting/rep301.php:97
+#: ../reporting/rep302.php:103
+#: ../reporting/rep302.php:110
+#: ../reporting/rep303.php:84
+#: ../reporting/rep303.php:91
+#: ../reporting/rep304.php:96
+#: ../reporting/rep304.php:101
+#: ../reporting/rep304.php:106
+#: ../reporting/rep702.php:59
+#: ../reporting/rep710.php:84
+#: ../reporting/rep710.php:85
 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:50
-#: gl/includes/ui/gl_bank_ui.inc:105 gl/includes/ui/gl_bank_ui.inc.orig:50
-#: gl/includes/ui/gl_bank_ui.inc.orig:105
-#: inventory/inquiry/stock_movements.php:62
-#: purchasing/inquiry/supplier_allocation_inquiry.php:50
-#: purchasing/inquiry/supplier_inquiry.php:53
-#: purchasing/inquiry/supplier_inquiry.php.orig:49
-#: sales/inquiry/customer_inquiry.php:50
-#: sales/inquiry/customer_inquiry.php.orig:50
+#: ../dimensions/inquiry/search_dimensions.php:76
+#: ../gl/inquiry/bank_inquiry.php:49
+#: ../gl/inquiry/gl_trial_balance.php:49
+#: ../gl/inquiry/journal_inquiry.php:48
+#: ../gl/inquiry/profit_loss.php:163
+#: ../gl/includes/ui/gl_bank_ui.inc:51
+#: ../gl/includes/ui/gl_bank_ui.inc:117
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:23
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:53
+#: ../inventory/inquiry/stock_movements.php:58
+#: ../inventory/inquiry/stock_movements.php.orig:60
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:50
+#: ../purchasing/inquiry/supplier_inquiry.php:50
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:50
+#: ../sales/inquiry/customer_inquiry.php:46
+#: ../sales/inquiry/customer_inquiry.php.orig:47
 msgid "From:"
 msgstr ""
 
-#: dimensions/inquiry/search_dimensions.php:77 gl/inquiry/bank_inquiry.php:50
-#: gl/inquiry/gl_trial_balance.php:50 gl/inquiry/journal_inquiry.php:49
-#: gl/inquiry/profit_loss.php:164 gl/includes/ui/gl_bank_ui.inc:105
-#: gl/includes/ui/gl_bank_ui.inc.orig:105
-#: inventory/inquiry/stock_movements.php:63
-#: purchasing/inquiry/supplier_allocation_inquiry.php:51
-#: purchasing/inquiry/supplier_inquiry.php:54
-#: purchasing/inquiry/supplier_inquiry.php.orig:50
-#: sales/inquiry/customer_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php.orig:51
+#: ../dimensions/inquiry/search_dimensions.php:77
+#: ../gl/inquiry/bank_inquiry.php:50
+#: ../gl/inquiry/gl_trial_balance.php:50
+#: ../gl/inquiry/journal_inquiry.php:49
+#: ../gl/inquiry/profit_loss.php:164
+#: ../gl/includes/ui/gl_bank_ui.inc:117
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:23
+#: ../inventory/inquiry/stock_movements.php:59
+#: ../inventory/inquiry/stock_movements.php.orig:61
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:51
+#: ../purchasing/inquiry/supplier_inquiry.php:51
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:51
+#: ../sales/inquiry/customer_inquiry.php:47
+#: ../sales/inquiry/customer_inquiry.php.orig:48
 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:54 includes/ui/allocation_cart.inc:263
-#: purchasing/includes/ui/invoice_ui.inc:112
-#: purchasing/view/view_supp_credit.php:48
-#: purchasing/view/view_supp_invoice.php:51
-#: purchasing/inquiry/supplier_allocation_inquiry.php:132
-#: purchasing/inquiry/supplier_inquiry.php:174
-#: purchasing/inquiry/supplier_inquiry.php.orig:168 reporting/rep101.php:130
-#: reporting/rep201.php:118 reporting/rep203.php:91 reporting/rep501.php:85
-#: reporting/includes/doctext.inc:100 reporting/includes/doctext.inc:122
-#: reporting/includes/doctext.inc:143 reporting/includes/doctext.inc:145
-#: reporting/includes/doctext.inc:166 reporting/includes/doctext.inc:184
-#: reporting/includes/doctext.inc:186 sales/customer_invoice.php:437
-#: sales/view/view_dispatch.php:97 sales/view/view_invoice.php:96
-#: sales/inquiry/customer_allocation_inquiry.php:149
-#: sales/inquiry/customer_inquiry.php:229
-#: sales/inquiry/customer_inquiry.php.orig:229
-#: sales/includes/ui/sales_order_ui.inc:595
+#: ../dimensions/inquiry/search_dimensions.php:132
+#: ../dimensions/view/view_dimension.php:54
+#: ../includes/ui/allocation_cart.inc:264
+#: ../purchasing/includes/ui/invoice_ui.inc:123
+#: ../purchasing/view/view_supp_credit.php:48
+#: ../purchasing/view/view_supp_invoice.php:52
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:131
+#: ../purchasing/inquiry/supplier_inquiry.php:179
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:176
+#: ../reporting/rep101.php:130
+#: ../reporting/rep201.php:118
+#: ../reporting/rep203.php:91
+#: ../reporting/rep501.php:85
+#: ../reporting/includes/doctext.inc:112
+#: ../reporting/includes/doctext.inc:144
+#: ../reporting/includes/doctext.inc:165
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:188
+#: ../reporting/includes/doctext.inc:206
+#: ../reporting/includes/doctext.inc:208
+#: ../sales/customer_invoice.php:508
+#: ../sales/view/view_dispatch.php:97
+#: ../sales/view/view_invoice.php:96
+#: ../sales/inquiry/customer_allocation_inquiry.php:149
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:149
+#: ../sales/inquiry/customer_inquiry.php:205
+#: ../sales/inquiry/customer_inquiry.php.orig:229
+#: ../sales/includes/ui/sales_order_ui.inc:596
+#: ../sales/includes/ui/sales_order_ui.inc.orig:596
 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:48
+#: ../dimensions/view/view_dimension.php:48
 msgid "The dimension number sent is not valid."
 msgstr ""
 
-#: dimensions/view/view_dimension.php:72
+#: ../dimensions/view/view_dimension.php:72
 msgid "This dimension is closed."
 msgstr ""
 
-#: dimensions/view/view_dimension.php:84 gl/inquiry/gl_account_inquiry.php:71
-#: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:65
-#: purchasing/inquiry/po_search.php:64
-#: sales/inquiry/customer_allocation_inquiry.php:44
-#: sales/inquiry/sales_deliveries_view.php:104
-#: sales/inquiry/sales_orders_view.php:227
-#: sales/inquiry/sales_orders_view.php.orig:227
+#: ../dimensions/view/view_dimension.php:84
+#: ../gl/inquiry/gl_account_inquiry.php:71
+#: ../gl/inquiry/tax_inquiry.php:61
+#: ../purchasing/inquiry/po_search_completed.php:62
+#: ../purchasing/inquiry/po_search_completed.php.orig:63
+#: ../purchasing/inquiry/po_search.php:64
+#: ../sales/inquiry/customer_allocation_inquiry.php:44
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:44
+#: ../sales/inquiry/sales_deliveries_view.php:104
+#: ../sales/inquiry/sales_deliveries_view.php.orig:104
+#: ../sales/inquiry/sales_orders_view.php:251
+#: ../sales/inquiry/sales_orders_view.php.orig:228
 msgid "from:"
 msgstr ""
 
-#: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:72
-#: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:66
-#: purchasing/inquiry/po_search.php:65
-#: sales/inquiry/customer_allocation_inquiry.php:45
-#: sales/inquiry/sales_deliveries_view.php:105
-#: sales/inquiry/sales_orders_view.php:228
-#: sales/inquiry/sales_orders_view.php.orig:228
+#: ../dimensions/view/view_dimension.php:85
+#: ../gl/inquiry/gl_account_inquiry.php:72
+#: ../gl/inquiry/tax_inquiry.php:62
+#: ../purchasing/inquiry/po_search_completed.php:63
+#: ../purchasing/inquiry/po_search_completed.php.orig:64
+#: ../purchasing/inquiry/po_search.php:65
+#: ../sales/inquiry/customer_allocation_inquiry.php:45
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:45
+#: ../sales/inquiry/sales_deliveries_view.php:105
+#: ../sales/inquiry/sales_deliveries_view.php.orig:105
+#: ../sales/inquiry/sales_orders_view.php:252
+#: ../sales/inquiry/sales_orders_view.php.orig:229
 msgid "to:"
 msgstr ""
 
-#: dimensions/view/view_dimension.php:86 gl/inquiry/balance_sheet.php:131
-#: gl/inquiry/bank_inquiry.php:52 gl/inquiry/gl_account_inquiry.php:85
-#: gl/inquiry/gl_trial_balance.php:58 gl/inquiry/profit_loss.php:178
-#: gl/inquiry/tax_inquiry.php:63
+#: ../dimensions/view/view_dimension.php:86
+#: ../gl/inquiry/balance_sheet.php:131
+#: ../gl/inquiry/bank_inquiry.php:52
+#: ../gl/inquiry/gl_account_inquiry.php:85
+#: ../gl/inquiry/gl_trial_balance.php:58
+#: ../gl/inquiry/profit_loss.php:178
+#: ../gl/inquiry/tax_inquiry.php:63
 msgid "Show"
 msgstr ""
 
-#: gl/accruals.php:20 includes/access_levels.inc:243
+#: ../gl/accruals.php:20
+#: ../includes/access_levels.inc:245
 msgid "Revenue / Cost Accruals"
 msgstr ""
 
-#: gl/accruals.php:44
+#: ../gl/accruals.php:38
+#: ../gl/bank_transfer.php:116
+#: ../gl/gl_bank.php:269
+#: ../gl/gl_journal.php:164
+#: ../gl/manage/revaluate_currencies.php:59
+#: ../inventory/adjustments.php:116
+#: ../inventory/transfers.php:111
+#: ../manufacturing/work_order_add_finished.php:104
+#: ../manufacturing/work_order_costs.php:86
+#: ../manufacturing/work_order_entry.php:160
+#: ../manufacturing/work_order_issue.php:84
+#: ../purchasing/po_entry_items.php:342
+#: ../purchasing/po_receive_items.php:179
+#: ../purchasing/supplier_credit.php:193
+#: ../purchasing/supplier_invoice.php:198
+#: ../purchasing/supplier_payment.php:185
+#: ../sales/create_recurrent_invoices.php:108
+#: ../sales/credit_note_entry.php:161
+#: ../sales/customer_credit_invoice.php:95
+#: ../sales/customer_delivery.php:161
+#: ../sales/customer_invoice.php:318
+#: ../sales/customer_payments.php:145
+#: ../sales/sales_order_entry.php:350
+msgid ""
+"The entered date is out of fiscal year or is closed for further data entry."
+msgstr ""
+
+#: ../gl/accruals.php:44
 msgid "The amount can not be 0."
 msgstr ""
 
-#: gl/accruals.php:50
+#: ../gl/accruals.php:50
 msgid "The periods must be greater than 0."
 msgstr ""
 
-#: gl/accruals.php:67
+#: ../gl/accruals.php:71
 msgid ""
-"Some of the period dates are outside the fiscal year. Create a new fiscal "
-"year first!"
+"Some of the period dates are outside the fiscal year or are closed for "
+"further data entry. Create a new fiscal year first!"
 msgstr ""
 
-#: gl/accruals.php:82
+#: ../gl/accruals.php:86
 #, php-format
 msgid "Accruals for %s"
 msgstr ""
 
-#: gl/accruals.php:92 gl/accruals.php:94 gl/accruals.php:203
-#: gl/accruals.php:205 gl/gl_budget.php:71 gl/gl_budget.php:72
-#: gl/gl_budget.php:76 gl/inquiry/balance_sheet.php:128
-#: gl/inquiry/balance_sheet.php:130 gl/inquiry/gl_account_inquiry.php:79
-#: gl/inquiry/gl_account_inquiry.php:81 gl/inquiry/gl_account_inquiry.php:134
-#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_trial_balance.php:52
-#: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/profit_loss.php:174
-#: gl/inquiry/profit_loss.php:176 gl/manage/gl_quick_entries.php:261
-#: gl/manage/gl_quick_entries.php:263 gl/manage/gl_quick_entries.php:343
-#: gl/manage/gl_quick_entries.php:345 gl/view/accrual_trans.php:54
-#: gl/view/accrual_trans.php:56 gl/view/gl_deposit_view.php:99
-#: gl/view/gl_deposit_view.php:102 gl/view/gl_payment_view.php:98
-#: gl/view/gl_payment_view.php:101 gl/view/gl_trans_view.php:63
-#: gl/view/gl_trans_view.php:66 gl/includes/ui/gl_bank_ui.inc:132
-#: gl/includes/ui/gl_bank_ui.inc:133 gl/includes/ui/gl_bank_ui.inc:135
-#: gl/includes/ui/gl_bank_ui.inc.orig:132
-#: gl/includes/ui/gl_bank_ui.inc.orig:133
-#: gl/includes/ui/gl_bank_ui.inc.orig:135 gl/includes/ui/gl_journal_ui.inc:83
-#: gl/includes/ui/gl_journal_ui.inc:84 gl/includes/ui/gl_journal_ui.inc:86
-#: includes/sysnames.inc:43 includes/sysnames.inc:165
-#: inventory/manage/item_categories.php:216
-#: inventory/manage/item_categories.php:218 inventory/manage/items.php:341
-#: inventory/manage/items.php:343 purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/manage/suppliers.php:134 purchasing/manage/suppliers.php:135
-#: purchasing/manage/suppliers.php:137 reporting/rep501.php:90
-#: reporting/rep704.php:79 reporting/rep704.php:82 reporting/rep704.php:93
-#: reporting/rep704.php:95 reporting/rep704.php:103 reporting/rep705.php:245
-#: reporting/rep705.php:247 reporting/rep705.php:258 reporting/rep706.php:190
-#: reporting/rep706.php:192 reporting/rep706.php:200 reporting/rep707.php:214
-#: reporting/rep707.php:216 reporting/rep707.php:224 reporting/rep708.php:188
-#: reporting/rep708.php:190 reporting/rep708.php:197
-#: reporting/reports_main.php:265 reporting/reports_main.php:266
-#: reporting/reports_main.php:271 reporting/reports_main.php:272
-#: reporting/reports_main.php:279 reporting/reports_main.php:280
-#: reporting/reports_main.php:290 reporting/reports_main.php:291
-#: reporting/reports_main.php:302 reporting/reports_main.php:303
-#: reporting/reports_main.php:314 reporting/reports_main.php:319
-#: reporting/reports_main.php:326 reporting/reports_main.php:336
-#: reporting/reports_main.php:347 sales/customer_delivery.php:395
-#: sales/customer_delivery.php:403 sales/customer_invoice.php:407
-#: sales/customer_invoice.php:445 sales/manage/customers.php:265
-#: sales/manage/customers.php:267 sales/manage/customers.php.orig:266
-#: sales/manage/customers.php.orig:268
-#: sales/includes/ui/sales_credit_ui.inc:132
-#: sales/includes/ui/sales_credit_ui.inc:137
-#: sales/includes/ui/sales_order_ui.inc:451
-#: sales/includes/ui/sales_order_ui.inc:456
+#: ../gl/accruals.php:96
+#: ../gl/accruals.php:98
+#: ../gl/accruals.php:207
+#: ../gl/accruals.php:209
+#: ../gl/gl_budget.php:71
+#: ../gl/gl_budget.php:72
+#: ../gl/gl_budget.php:76
+#: ../gl/inquiry/balance_sheet.php:128
+#: ../gl/inquiry/balance_sheet.php:130
+#: ../gl/inquiry/gl_account_inquiry.php:79
+#: ../gl/inquiry/gl_account_inquiry.php:81
+#: ../gl/inquiry/gl_account_inquiry.php:134
+#: ../gl/inquiry/gl_account_inquiry.php:136
+#: ../gl/inquiry/gl_trial_balance.php:52
+#: ../gl/inquiry/gl_trial_balance.php:54
+#: ../gl/inquiry/profit_loss.php:174
+#: ../gl/inquiry/profit_loss.php:176
+#: ../gl/manage/gl_quick_entries.php:261
+#: ../gl/manage/gl_quick_entries.php:263
+#: ../gl/manage/gl_quick_entries.php:343
+#: ../gl/manage/gl_quick_entries.php:345
+#: ../gl/view/accrual_trans.php:54
+#: ../gl/view/accrual_trans.php:56
+#: ../gl/view/gl_deposit_view.php:99
+#: ../gl/view/gl_deposit_view.php:102
+#: ../gl/view/gl_payment_view.php:98
+#: ../gl/view/gl_payment_view.php:101
+#: ../gl/view/gl_trans_view.php:68
+#: ../gl/view/gl_trans_view.php:71
+#: ../gl/includes/ui/gl_bank_ui.inc:150
+#: ../gl/includes/ui/gl_bank_ui.inc:151
+#: ../gl/includes/ui/gl_bank_ui.inc:153
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:124
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:125
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:127
+#: ../gl/includes/ui/gl_journal_ui.inc:86
+#: ../gl/includes/ui/gl_journal_ui.inc:87
+#: ../gl/includes/ui/gl_journal_ui.inc:89
+#: ../includes/sysnames.inc:43
+#: ../includes/sysnames.inc:166
+#: ../inventory/manage/item_categories.php:216
+#: ../inventory/manage/item_categories.php:218
+#: ../inventory/manage/items.php:350
+#: ../inventory/manage/items.php:352
+#: ../inventory/manage/items.php.orig:343
+#: ../inventory/manage/items.php.orig:345
+#: ../purchasing/includes/ui/invoice_ui.inc:265
+#: ../purchasing/includes/ui/invoice_ui.inc:267
+#: ../purchasing/manage/suppliers.php:145
+#: ../purchasing/manage/suppliers.php:146
+#: ../purchasing/manage/suppliers.php:148
+#: ../purchasing/manage/suppliers.php.orig:148
+#: ../purchasing/manage/suppliers.php.orig:149
+#: ../purchasing/manage/suppliers.php.orig:151
+#: ../reporting/rep501.php:90
+#: ../reporting/rep704.php:79
+#: ../reporting/rep704.php:82
+#: ../reporting/rep704.php:93
+#: ../reporting/rep704.php:95
+#: ../reporting/rep704.php:103
+#: ../reporting/rep705.php:245
+#: ../reporting/rep705.php:247
+#: ../reporting/rep705.php:258
+#: ../reporting/rep706.php:190
+#: ../reporting/rep706.php:192
+#: ../reporting/rep706.php:200
+#: ../reporting/rep707.php:214
+#: ../reporting/rep707.php:216
+#: ../reporting/rep707.php:224
+#: ../reporting/rep708.php:188
+#: ../reporting/rep708.php:190
+#: ../reporting/rep708.php:197
+#: ../reporting/reports_main.php:265
+#: ../reporting/reports_main.php:266
+#: ../reporting/reports_main.php:271
+#: ../reporting/reports_main.php:272
+#: ../reporting/reports_main.php:279
+#: ../reporting/reports_main.php:280
+#: ../reporting/reports_main.php:290
+#: ../reporting/reports_main.php:291
+#: ../reporting/reports_main.php:302
+#: ../reporting/reports_main.php:303
+#: ../reporting/reports_main.php:314
+#: ../reporting/reports_main.php:319
+#: ../reporting/reports_main.php:326
+#: ../reporting/reports_main.php:336
+#: ../reporting/reports_main.php:347
+#: ../sales/customer_delivery.php:403
+#: ../sales/customer_delivery.php:411
+#: ../sales/customer_invoice.php:473
+#: ../sales/customer_invoice.php:516
+#: ../sales/manage/customers.php:269
+#: ../sales/manage/customers.php:271
+#: ../sales/manage/sav.customers.php:269
+#: ../sales/manage/sav.customers.php:271
+#: ../sales/includes/ui/sales_credit_ui.inc:132
+#: ../sales/includes/ui/sales_credit_ui.inc:137
+#: ../sales/includes/ui/sales_order_ui.inc:451
+#: ../sales/includes/ui/sales_order_ui.inc:456
+#: ../sales/includes/ui/sales_order_ui.inc.orig:451
+#: ../sales/includes/ui/sales_order_ui.inc.orig:456
 msgid "Dimension"
 msgstr ""
 
-#: gl/accruals.php:98 gl/accruals.php:213
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/inquiry/journal_inquiry.php:126 gl/view/accrual_trans.php:60
-#: gl/view/gl_deposit_view.php:100 gl/view/gl_deposit_view.php:103
-#: gl/view/gl_deposit_view.php:106 gl/view/gl_payment_view.php:99
-#: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105
-#: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67
-#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_bank_ui.inc:133
-#: gl/includes/ui/gl_bank_ui.inc:136 gl/includes/ui/gl_bank_ui.inc:139
-#: gl/includes/ui/gl_bank_ui.inc:279 gl/includes/ui/gl_bank_ui.inc.orig:133
-#: gl/includes/ui/gl_bank_ui.inc.orig:136
-#: gl/includes/ui/gl_bank_ui.inc.orig:139
-#: gl/includes/ui/gl_bank_ui.inc.orig:279 gl/includes/ui/gl_journal_ui.inc:84
-#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90
-#: gl/includes/ui/gl_journal_ui.inc:240
-#: inventory/includes/item_adjustments_ui.inc:181
-#: inventory/includes/stock_transfers_ui.inc:161
-#: manufacturing/includes/work_order_issue_ui.inc:169
-#: purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249
-#: sales/customer_credit_invoice.php:366 sales/customer_delivery.php:519
-#: sales/customer_invoice.php:576 sales/includes/ui/sales_credit_ui.inc:339
+#: ../gl/accruals.php:102
+#: ../gl/accruals.php:217
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_account_inquiry.php:143
+#: ../gl/inquiry/journal_inquiry.php:133
+#: ../gl/view/accrual_trans.php:60
+#: ../gl/view/gl_deposit_view.php:100
+#: ../gl/view/gl_deposit_view.php:103
+#: ../gl/view/gl_deposit_view.php:106
+#: ../gl/view/gl_payment_view.php:99
+#: ../gl/view/gl_payment_view.php:102
+#: ../gl/view/gl_payment_view.php:105
+#: ../gl/view/gl_trans_view.php:69
+#: ../gl/view/gl_trans_view.php:72
+#: ../gl/view/gl_trans_view.php:75
+#: ../gl/includes/ui/gl_bank_ui.inc:151
+#: ../gl/includes/ui/gl_bank_ui.inc:154
+#: ../gl/includes/ui/gl_bank_ui.inc:157
+#: ../gl/includes/ui/gl_bank_ui.inc:297
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:125
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:128
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:131
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:271
+#: ../gl/includes/ui/gl_journal_ui.inc:87
+#: ../gl/includes/ui/gl_journal_ui.inc:90
+#: ../gl/includes/ui/gl_journal_ui.inc:93
+#: ../gl/includes/ui/gl_journal_ui.inc:276
+#: ../inventory/includes/item_adjustments_ui.inc:181
+#: ../inventory/includes/stock_transfers_ui.inc:161
+#: ../manufacturing/view/wo_costs_view.php:46
+#: ../manufacturing/includes/work_order_issue_ui.inc:169
+#: ../purchasing/includes/ui/invoice_ui.inc:265
+#: ../purchasing/includes/ui/invoice_ui.inc:267
+#: ../purchasing/includes/ui/invoice_ui.inc:269
+#: ../sales/customer_credit_invoice.php:366
+#: ../sales/customer_delivery.php:527
+#: ../sales/includes/ui/sales_credit_ui.inc:339
 msgid "Memo"
 msgstr ""
 
-#: gl/accruals.php:162
+#: ../gl/accruals.php:166
 msgid "Revenue / Cost Accruals have been processed."
 msgstr ""
 
-#: gl/accruals.php:168
+#: ../gl/accruals.php:172
 msgid "Showing GL Transactions."
 msgstr ""
 
-#: gl/accruals.php:180
+#: ../gl/accruals.php:184
 msgid "Weekly"
 msgstr ""
 
-#: gl/accruals.php:181
+#: ../gl/accruals.php:185
 msgid "Bi-weekly"
 msgstr ""
 
-#: gl/accruals.php:182 gl/manage/gl_quick_entries.php:240
-#: gl/includes/ui/gl_journal_ui.inc:57 sales/create_recurrent_invoices.php:115
-#: 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:115
+#: ../sales/manage/recurrent_invoices.php:102
 msgid "Monthly"
 msgstr ""
 
-#: gl/accruals.php:183
+#: ../gl/accruals.php:187
 msgid "Quarterly"
 msgstr ""
 
-#: gl/accruals.php:195
+#: ../gl/accruals.php:199
 msgid "First date of Accruals"
 msgstr ""
 
-#: gl/accruals.php:197
+#: ../gl/accruals.php:201
 msgid "Accrued Balance Account"
 msgstr ""
 
-#: gl/accruals.php:200
+#: ../gl/accruals.php:204
 msgid "Revenue / Cost Account"
 msgstr ""
 
-#: gl/accruals.php:208 gl/gl_budget.php:91 gl/gl_budget.php:93
-#: gl/inquiry/journal_inquiry.php:125 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:133 gl/includes/ui/gl_bank_ui.inc:136
-#: gl/includes/ui/gl_bank_ui.inc:139 gl/includes/ui/gl_bank_ui.inc.orig:133
-#: gl/includes/ui/gl_bank_ui.inc.orig:136
-#: gl/includes/ui/gl_bank_ui.inc.orig:139 includes/sysnames.inc:132
-#: includes/ui/allocation_cart.inc:263 includes/ui/sav.ui_lists.inc:1163
-#: includes/ui/ui_lists.inc:1152 includes/ui/ui_lists.inc.orig:1163
-#: manufacturing/includes/manufacturing_ui.inc:236
-#: purchasing/includes/ui/invoice_ui.inc:245
-#: purchasing/includes/ui/invoice_ui.inc:247
-#: purchasing/includes/ui/invoice_ui.inc:249
-#: purchasing/view/view_supp_payment.php:60
-#: purchasing/view/view_supp_payment.php:72 reporting/rep102.php:241
-#: reporting/rep107.php:180 reporting/rep109.php:188 reporting/rep110.php:193
-#: reporting/rep111.php:175 reporting/rep113.php:182 reporting/rep202.php:249
-#: reporting/rep209.php:197 reporting/rep706.php:303 reporting/rep707.php:321
-#: reporting/rep710.php:76 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:100
+#: ../gl/view/gl_deposit_view.php:103
+#: ../gl/view/gl_deposit_view.php:106
+#: ../gl/view/gl_payment_view.php:65
+#: ../gl/view/gl_payment_view.php:99
+#: ../gl/view/gl_payment_view.php:102
+#: ../gl/view/gl_payment_view.php:105
+#: ../gl/includes/ui/gl_bank_ui.inc:151
+#: ../gl/includes/ui/gl_bank_ui.inc:154
+#: ../gl/includes/ui/gl_bank_ui.inc:157
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:125
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:128
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:131
+#: ../includes/sysnames.inc:133
+#: ../includes/ui/allocation_cart.inc:264
+#: ../includes/ui/ui_lists.inc:1182
+#: ../includes/ui/ui_lists.inc.orig:1182
+#: ../manufacturing/view/wo_costs_view.php:46
+#: ../manufacturing/includes/manufacturing_ui.inc:236
+#: ../purchasing/includes/ui/invoice_ui.inc:265
+#: ../purchasing/includes/ui/invoice_ui.inc:267
+#: ../purchasing/includes/ui/invoice_ui.inc:269
+#: ../purchasing/view/view_supp_payment.php:60
+#: ../purchasing/view/view_supp_payment.php:72
+#: ../reporting/rep102.php:241
+#: ../reporting/rep107.php:194
+#: ../reporting/rep107.php:251
+#: ../reporting/rep109.php:192
+#: ../reporting/rep110.php:195
+#: ../reporting/rep111.php:177
+#: ../reporting/rep113.php:181
+#: ../reporting/rep202.php:249
+#: ../reporting/rep209.php:200
+#: ../reporting/rep706.php:303
+#: ../reporting/rep707.php:321
+#: ../reporting/rep710.php:76
+#: ../sales/view/view_receipt.php:44
 msgid "Amount"
 msgstr ""
 
-#: gl/accruals.php:208
+#: ../gl/accruals.php:212
 msgid "Search Amount"
 msgstr ""
 
-#: gl/accruals.php:210
+#: ../gl/accruals.php:214
 msgid "Frequency"
 msgstr ""
 
-#: gl/accruals.php:212
+#: ../gl/accruals.php:216
 msgid "Periods"
 msgstr ""
 
-#: gl/accruals.php:216
+#: ../gl/accruals.php:220
 msgid "Show GL Rows"
 msgstr ""
 
-#: gl/accruals.php:217
+#: ../gl/accruals.php:221
 msgid "Process Accruals"
 msgstr ""
 
-#: gl/accruals.php:218
+#: ../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
+#: ../sales/customer_payments.php: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:166 gl/inquiry/bank_inquiry.php:47
-#: gl/inquiry/gl_account_inquiry.php:70
+#: ../gl/bank_account_reconcile.php:164
+#: ../gl/inquiry/bank_inquiry.php:47
+#: ../gl/inquiry/gl_account_inquiry.php:70
 msgid "Account:"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:168
+#: ../gl/bank_account_reconcile.php:166
 msgid "Bank Statement:"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:169
+#: ../gl/bank_account_reconcile.php:167
+#: ../inventory/purchasing_data.php.orig:235
 msgid "New"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:198
+#: ../gl/bank_account_reconcile.php:196
 msgid "Reconcile Date"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:198
+#: ../gl/bank_account_reconcile.php:196
 msgid "Beginning<br>Balance"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
 msgid "Ending<br>Balance"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
 msgid "Account<br>Total"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
 msgid "Reconciled<br>Amount"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:199
+#: ../gl/bank_account_reconcile.php:197
+#: ../reporting/rep602.php:205
 msgid "Difference"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:203
+#: ../gl/bank_account_reconcile.php:201
 msgid "Date of bank statement to reconcile"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:239 gl/inquiry/bank_inquiry.php:71
-#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143
-#: gl/view/accrual_trans.php:60 gl/view/gl_trans_view.php:36
-#: reporting/rep601.php:76 reporting/rep704.php:80 reporting/rep704.php:82
-#: reporting/rep704.php:85
+#: ../gl/bank_account_reconcile.php:237
+#: ../gl/inquiry/bank_inquiry.php:71
+#: ../gl/inquiry/gl_account_inquiry.php:141
+#: ../gl/inquiry/gl_account_inquiry.php:143
+#: ../gl/view/accrual_trans.php:60
+#: ../reporting/rep601.php:76
+#: ../reporting/rep602.php:80
+#: ../reporting/rep704.php:80
+#: ../reporting/rep704.php:82
+#: ../reporting/rep704.php:85
 msgid "Person/Item"
 msgstr ""
 
-#: gl/bank_account_reconcile.php:249
+#: ../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:72
+#: ../gl/bank_transfer.php:72
 msgid "Transfer Date:"
 msgstr ""
 
-#: gl/bank_transfer.php:78 gl/bank_transfer.php:85
-#: sales/customer_payments.php:411
+#: ../gl/bank_transfer.php:78
+#: ../gl/bank_transfer.php:85
+#: ../sales/customer_payments.php:408
 msgid "Amount:"
 msgstr ""
 
-#: gl/bank_transfer.php:79 gl/bank_transfer.php:86
-#: purchasing/supplier_payment.php:299 sales/customer_payments.php:396
+#: ../gl/bank_transfer.php:79
+#: ../gl/bank_transfer.php:86
+#: ../purchasing/supplier_payment.php:299
+#: ../sales/customer_payments.php:393
 msgid "Bank Charge:"
 msgstr ""
 
-#: gl/bank_transfer.php:97
+#: ../gl/bank_transfer.php:97
 msgid "Enter Transfer"
 msgstr ""
 
-#: gl/bank_transfer.php:123 gl/bank_transfer.php:153
-#: purchasing/supplier_payment.php:130 purchasing/supplier_payment.php:136
+#: ../gl/bank_transfer.php:123
+#: ../gl/bank_transfer.php:153
+#: ../purchasing/supplier_payment.php:130
+#: ../purchasing/supplier_payment.php:136
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
-#: gl/bank_transfer.php:128 gl/gl_bank.php:225
+#: ../gl/bank_transfer.php:128
+#: ../gl/gl_bank.php:227
 msgid "The total bank amount cannot be 0."
 msgstr ""
 
-#: gl/bank_transfer.php:139
+#: ../gl/bank_transfer.php:139
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s) for source account."
 msgstr ""
 
-#: gl/bank_transfer.php:145 gl/gl_bank.php:242
+#: ../gl/bank_transfer.php:145
+#: ../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:158 purchasing/supplier_payment.php:144
-#: sales/customer_payments.php:184
+#: ../gl/bank_transfer.php:158
+#: ../purchasing/supplier_payment.php:144
+#: ../sales/customer_payments.php:184
 msgid ""
 "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
 
-#: gl/bank_transfer.php:164 gl/gl_bank.php:249 gl/gl_journal.php:168
-#: gl/manage/revaluate_currencies.php:65 inventory/adjustments.php:96
-#: inventory/transfers.php:93 manufacturing/work_order_add_finished.php:77
-#: manufacturing/work_order_entry.php:132
-#: manufacturing/work_order_issue.php:91 purchasing/po_receive_items.php:188
-#: purchasing/supplier_payment.php:201 sales/credit_note_entry.php:147
-#: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:166
-#: sales/customer_invoice.php:280 sales/customer_payments.php:151
-#: sales/sales_order_entry.php:403
+#: ../gl/bank_transfer.php:164
+#: ../gl/gl_bank.php:251
+#: ../gl/gl_journal.php:170
+#: ../gl/manage/revaluate_currencies.php:65
+#: ../inventory/adjustments.php:96
+#: ../inventory/transfers.php:93
+#: ../manufacturing/work_order_add_finished.php:77
+#: ../manufacturing/work_order_entry.php:132
+#: ../manufacturing/work_order_issue.php:90
+#: ../purchasing/po_receive_items.php:186
+#: ../purchasing/supplier_payment.php:201
+#: ../sales/credit_note_entry.php:147
+#: ../sales/customer_credit_invoice.php:102
+#: ../sales/customer_delivery.php:174
+#: ../sales/customer_invoice.php:332
+#: ../sales/customer_payments.php:151
+#: ../sales/sales_order_entry.php:414
 msgid "You must enter a reference."
 msgstr ""
 
-#: gl/bank_transfer.php:178
+#: ../gl/bank_transfer.php:178
 msgid "The source and destination bank accouts cannot be the same."
 msgstr ""
 
-#: gl/gl_bank.php:34
+#: ../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:73
+#: ../gl/gl_bank.php:73
 #, php-format
 msgid "Payment %d has been entered"
 msgstr ""
 
-#: gl/gl_bank.php:75 gl/gl_bank.php:93
+#: ../gl/gl_bank.php:75
+#: ../gl/gl_bank.php:93
 msgid "&View the GL Postings for this Payment"
 msgstr ""
 
-#: gl/gl_bank.php:77 gl/gl_bank.php:95
+#: ../gl/gl_bank.php:77
+#: ../gl/gl_bank.php:95
 msgid "Enter Another &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:79 gl/gl_bank.php:97
+#: ../gl/gl_bank.php:79
+#: ../gl/gl_bank.php:97
 msgid "Enter A &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:81 gl/gl_journal.php:61 inventory/adjustments.php:50
-#: manufacturing/work_order_entry.php:68 purchasing/po_entry_items.php:109
-#: purchasing/po_entry_items.php:133 purchasing/supplier_credit.php:49
-#: purchasing/supplier_invoice.php:52 sales/credit_note_entry.php:77
-#: sales/customer_credit_invoice.php:62 sales/customer_invoice.php:66
-#: sales/sales_order_entry.php:226
+#: ../gl/gl_bank.php:81
+#: ../gl/gl_journal.php:62
+#: ../inventory/adjustments.php:50
+#: ../manufacturing/work_order_entry.php:68
+#: ../purchasing/po_entry_items.php:112
+#: ../purchasing/po_entry_items.php:136
+#: ../purchasing/supplier_credit.php:84
+#: ../purchasing/supplier_invoice.php:74
+#: ../sales/credit_note_entry.php:77
+#: ../sales/customer_credit_invoice.php:62
+#: ../sales/customer_invoice.php:68
+#: ../sales/sales_order_entry.php:227
 msgid "Add an Attachment"
 msgstr ""
 
-#: gl/gl_bank.php:107
+#: ../gl/gl_bank.php:107
 #, php-format
 msgid "Deposit %d has been entered"
 msgstr ""
 
-#: gl/gl_bank.php:109
+#: ../gl/gl_bank.php:109
 msgid "View the GL Postings for this Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:111
+#: ../gl/gl_bank.php:111
 msgid "Enter Another Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:113
+#: ../gl/gl_bank.php:113
 msgid "Enter A Payment"
 msgstr ""
 
-#: gl/gl_bank.php:124
+#: ../gl/gl_bank.php:122
+#, php-format
+msgid "Deposit %d has been modified"
+msgstr ""
+
+#: ../gl/gl_bank.php:124
 msgid "&View the GL Postings for this Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:126
+#: ../gl/gl_bank.php:126
 msgid "Enter Another &Deposit"
 msgstr ""
 
-#: gl/gl_bank.php:128
+#: ../gl/gl_bank.php:128
 msgid "Enter A &Payment"
 msgstr ""
 
-#: gl/gl_bank.php:219
+#: ../gl/gl_bank.php:221
 msgid "You must enter at least one payment line."
 msgstr ""
 
-#: gl/gl_bank.php:236 purchasing/supplier_payment.php:194
+#: ../gl/gl_bank.php:238
+#: ../purchasing/supplier_payment.php:194
 #, php-format
 msgid "The total bank amount exceeds allowed limit (%s)."
 msgstr ""
 
-#: gl/gl_bank.php:261
+#: ../gl/gl_bank.php:263
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
-#: gl/gl_bank.php:273
+#: ../gl/gl_bank.php:275
 msgid "You have to select customer and customer branch."
 msgstr ""
 
-#: gl/gl_bank.php:277
+#: ../gl/gl_bank.php:279
 msgid "You have to select supplier."
 msgstr ""
 
-#: gl/gl_bank.php:323
+#: ../gl/gl_bank.php:325
 msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_bank.php:395
+#: ../gl/gl_bank.php:397
 msgid "Payment Items"
 msgstr ""
 
-#: gl/gl_bank.php:395
+#: ../gl/gl_bank.php:397
 msgid "Deposit Items"
 msgstr ""
 
-#: gl/gl_bank.php:403
+#: ../gl/gl_bank.php:405
 msgid "Process Payment"
 msgstr ""
 
-#: gl/gl_bank.php:403
+#: ../gl/gl_bank.php:405
 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/manage/gl_accounts.php.orig: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/manage/gl_accounts.php.orig:230
-#: gl/manage/gl_accounts.php.orig:240
+#: ../gl/gl_budget.php:64
+#: ../gl/manage/gl_accounts.php:229
+#: ../gl/manage/gl_accounts.php:239
 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/rep101.php:136
-#: reporting/rep105.php:116 reporting/rep106.php:90 reporting/rep114.php:88
-#: reporting/rep201.php:124 reporting/rep304.php:119 reporting/rep305.php:100
-#: reporting/rep601.php:82 reporting/rep702.php:57 reporting/rep704.php:91
-#: reporting/rep704.php:101 reporting/rep704.php:109 reporting/rep706.php:181
-#: reporting/rep706.php:189 reporting/rep706.php:199 reporting/rep706.php:207
-#: reporting/rep707.php:206 reporting/rep707.php:213 reporting/rep707.php:223
-#: reporting/rep707.php:231 reporting/rep708.php:187 reporting/rep708.php:196
-#: reporting/rep708.php:203 reporting/rep709.php:104 reporting/rep710.php:83
+#: ../gl/gl_budget.php:91
+#: ../gl/gl_budget.php:93
+#: ../gl/inquiry/profit_loss.php:231
+#: ../gl/manage/gl_quick_entries.php:240
+#: ../reporting/rep101.php:136
+#: ../reporting/rep105.php:116
+#: ../reporting/rep106.php:90
+#: ../reporting/rep114.php:88
+#: ../reporting/rep201.php:124
+#: ../reporting/rep304.php:119
+#: ../reporting/rep305.php:100
+#: ../reporting/rep601.php:82
+#: ../reporting/rep602.php:86
+#: ../reporting/rep702.php:57
+#: ../reporting/rep704.php:91
+#: ../reporting/rep704.php:101
+#: ../reporting/rep704.php:109
+#: ../reporting/rep706.php:181
+#: ../reporting/rep706.php:189
+#: ../reporting/rep706.php:199
+#: ../reporting/rep706.php:207
+#: ../reporting/rep707.php:206
+#: ../reporting/rep707.php:213
+#: ../reporting/rep707.php:223
+#: ../reporting/rep707.php:231
+#: ../reporting/rep708.php:187
+#: ../reporting/rep708.php:196
+#: ../reporting/rep708.php:203
+#: ../reporting/rep709.php:104
+#: ../reporting/rep710.php:83
 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:210 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:106
-#: gl/includes/ui/gl_bank_ui.inc:182 gl/includes/ui/gl_bank_ui.inc.orig:182
-#: gl/includes/ui/gl_journal_ui.inc:141
-#: inventory/includes/item_adjustments_ui.inc:63
-#: inventory/includes/item_adjustments_ui.inc:102
-#: manufacturing/includes/manufacturing_ui.inc:178
-#: purchasing/includes/ui/invoice_ui.inc:309
-#: purchasing/includes/ui/invoice_ui.inc:474
-#: purchasing/includes/ui/invoice_ui.inc:544
-#: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140
-#: purchasing/allocations/supplier_allocation_main.php:100
-#: reporting/rep101.php:237 reporting/rep106.php:82 reporting/rep106.php:120
-#: reporting/rep106.php:168 reporting/rep114.php:156 reporting/rep201.php:221
-#: reporting/rep203.php:92 reporting/rep203.php:167 reporting/rep204.php:109
-#: reporting/rep204.php:137 reporting/rep301.php:130 reporting/rep301.php:167
-#: reporting/rep304.php:142 reporting/rep304.php:184 reporting/rep305.php:95
-#: reporting/rep305.php:119 reporting/rep305.php:176 reporting/rep702.php:138
-#: reporting/rep705.php:152 reporting/rep705.php:309 reporting/rep706.php:106
-#: reporting/rep706.php:249 reporting/rep706.php:284 reporting/rep707.php:115
-#: reporting/rep707.php:291 reporting/rep708.php:235
-#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170
-#: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:433
-#: sales/customer_invoice.php:468
-#: sales/allocations/customer_allocation_main.php:99
-#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
-#: sales/view/view_invoice.php:114 sales/view/view_sales_order.php:96
-#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
-#: sales/view/view_sales_order.php:202
-#: sales/includes/ui/sales_credit_ui.inc:168
-#: sales/includes/ui/sales_order_ui.inc:142
+#: ../gl/gl_budget.php:127
+#: ../gl/inquiry/balance_sheet.php:98
+#: ../gl/inquiry/balance_sheet.php:205
+#: ../gl/inquiry/balance_sheet.php:236
+#: ../gl/inquiry/gl_trial_balance.php:209
+#: ../gl/inquiry/profit_loss.php:115
+#: ../gl/inquiry/profit_loss.php:283
+#: ../gl/view/gl_deposit_view.php:132
+#: ../gl/view/gl_payment_view.php:131
+#: ../gl/view/gl_trans_view.php:115
+#: ../gl/includes/ui/gl_bank_ui.inc:200
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:174
+#: ../gl/includes/ui/gl_journal_ui.inc:153
+#: ../inventory/includes/item_adjustments_ui.inc:63
+#: ../inventory/includes/item_adjustments_ui.inc:102
+#: ../manufacturing/includes/manufacturing_ui.inc:178
+#: ../purchasing/includes/ui/invoice_ui.inc:329
+#: ../purchasing/includes/ui/invoice_ui.inc:495
+#: ../purchasing/includes/ui/invoice_ui.inc:566
+#: ../purchasing/po_receive_items.php:63
+#: ../purchasing/view/view_po.php:140
+#: ../purchasing/allocations/supplier_allocation_main.php:100
+#: ../reporting/rep101.php:237
+#: ../reporting/rep106.php:82
+#: ../reporting/rep106.php:115
+#: ../reporting/rep106.php:158
+#: ../reporting/rep114.php:156
+#: ../reporting/rep201.php:221
+#: ../reporting/rep203.php:92
+#: ../reporting/rep203.php:167
+#: ../reporting/rep204.php:109
+#: ../reporting/rep204.php:137
+#: ../reporting/rep301.php:130
+#: ../reporting/rep301.php:167
+#: ../reporting/rep304.php:142
+#: ../reporting/rep304.php:184
+#: ../reporting/rep305.php:95
+#: ../reporting/rep305.php:119
+#: ../reporting/rep305.php:176
+#: ../reporting/rep702.php:138
+#: ../reporting/rep705.php:152
+#: ../reporting/rep705.php:309
+#: ../reporting/rep706.php:106
+#: ../reporting/rep706.php:249
+#: ../reporting/rep706.php:284
+#: ../reporting/rep707.php:115
+#: ../reporting/rep707.php:291
+#: ../reporting/rep708.php:235
+#: ../reporting/includes/doctext.inc:30
+#: ../reporting/includes/doctext.inc:192
+#: ../sales/customer_credit_invoice.php:283
+#: ../sales/customer_delivery.php:441
+#: ../sales/customer_invoice.php:540
+#: ../sales/customer_invoice.php:543
+#: ../sales/allocations/customer_allocation_main.php:99
+#: ../sales/view/view_credit.php:91
+#: ../sales/view/view_dispatch.php:113
+#: ../sales/view/view_invoice.php:116
+#: ../sales/view/view_sales_order.php:109
+#: ../sales/view/view_sales_order.php:142
+#: ../sales/view/view_sales_order.php:179
+#: ../sales/view/view_sales_order.php:220
+#: ../sales/view/view_sales_order.php.orig:96
+#: ../sales/view/view_sales_order.php.orig:129
+#: ../sales/view/view_sales_order.php.orig:161
+#: ../sales/view/view_sales_order.php.orig:202
+#: ../sales/includes/ui/sales_credit_ui.inc:168
+#: ../sales/includes/ui/sales_order_ui.inc:142
+#: ../sales/includes/ui/sales_order_ui.inc.orig:142
 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:149
+#: ../gl/gl_journal.php:36
+#: ../includes/sysnames.inc:22
+#: ../includes/sysnames.inc:150
 msgid "Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:54
+#: ../gl/gl_journal.php:55
 msgid "Journal entry has been entered"
 msgstr ""
 
-#: gl/gl_journal.php:56 gl/gl_journal.php:71
+#: ../gl/gl_journal.php:57
+#: ../gl/gl_journal.php:72
 msgid "&View this Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:59
+#: ../gl/gl_journal.php:60
 msgid "Enter &New Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:69
+#: ../gl/gl_journal.php:70
 msgid "Journal entry has been updated"
 msgstr ""
 
-#: gl/gl_journal.php:73
+#: ../gl/gl_journal.php:74
 msgid "Return to Journal &Inquiry"
 msgstr ""
 
-#: gl/gl_journal.php:86
+#: ../gl/gl_journal.php:87
 msgid ""
 "You can edit directly only journal entries created via Journal Entry page."
 msgstr ""
 
-#: gl/gl_journal.php:87
+#: ../gl/gl_journal.php:88
 msgid "Entry &New Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:143
+#: ../gl/gl_journal.php:145
 msgid "You must enter at least one journal line."
 msgstr ""
 
-#: gl/gl_journal.php:149
+#: ../gl/gl_journal.php:151
+#: ../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:211 gl/gl_journal.php:218
+#: ../gl/gl_journal.php:213
+#: ../gl/gl_journal.php:220
 msgid "Dimension is closed."
 msgstr ""
 
-#: gl/gl_journal.php:225
+#: ../gl/gl_journal.php:227
 msgid "You must enter either a debit amount or a credit amount."
 msgstr ""
 
-#: gl/gl_journal.php:232
+#: ../gl/gl_journal.php:234
 msgid "The debit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_journal.php:237
+#: ../gl/gl_journal.php:239
 msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: gl/gl_journal.php:243 includes/ui/ui_view.inc:672
-#: purchasing/supplier_credit.php:119 purchasing/supplier_invoice.php:119
+#: ../gl/gl_journal.php:245
+#: ../includes/ui/ui_view.inc:673
+#: ../includes/ui/ui_view.inc.orig:672
+#: ../purchasing/supplier_credit.php:136
+#: ../purchasing/supplier_invoice.php:143
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
 
-#: gl/gl_journal.php:250
+#: ../gl/gl_journal.php:252
 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:329
+#: ../gl/gl_journal.php:331
 msgid "Rows"
 msgstr ""
 
-#: gl/gl_journal.php:335
+#: ../gl/gl_journal.php:337
 msgid "Process Journal Entry"
 msgstr ""
 
-#: gl/gl_journal.php:336
+#: ../gl/gl_journal.php:338
 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/rep705.php:319 reporting/rep706.php:272 reporting/rep706.php:297
-#: reporting/rep707.php:303 reporting/rep707.php:309
+#: ../gl/inquiry/balance_sheet.php:228
+#: ../gl/inquiry/profit_loss.php:294
+#: ../reporting/rep705.php:319
+#: ../reporting/rep706.php:272
+#: ../reporting/rep706.php:297
+#: ../reporting/rep707.php:303
+#: ../reporting/rep707.php:309
 msgid "Calculated Return"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:236 includes/sysnames.inc:120
-#: reporting/rep706.php:284
+#: ../gl/inquiry/balance_sheet.php:236
+#: ../includes/sysnames.inc:121
+#: ../reporting/rep706.php:284
 msgid "Liabilities"
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:236 reporting/rep706.php:284
+#: ../gl/inquiry/balance_sheet.php:236
+#: ../reporting/rep706.php:284
 msgid " and "
 msgstr ""
 
-#: gl/inquiry/balance_sheet.php:236 reporting/rep706.php:284
+#: ../gl/inquiry/balance_sheet.php:236
+#: ../reporting/rep706.php:284
 msgid "Equities"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:28 reporting/rep601.php:69
+#: ../gl/inquiry/bank_inquiry.php:28
+#: ../reporting/rep601.php:69
 msgid "Bank Statement"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:78 gl/inquiry/gl_account_inquiry.php:162
-#: reporting/rep601.php:99 reporting/rep704.php:138
+#: ../gl/inquiry/bank_inquiry.php:78
+#: ../gl/inquiry/gl_account_inquiry.php:162
+#: ../reporting/rep601.php:99
+#: ../reporting/rep602.php:103
+#: ../reporting/rep704.php:138
 msgid "Opening Balance"
 msgstr ""
 
-#: gl/inquiry/bank_inquiry.php:123 gl/inquiry/gl_account_inquiry.php:211
-#: gl/inquiry/gl_trial_balance.php:220 reporting/rep601.php:150
-#: reporting/rep704.php:186 reporting/rep708.php:244
+#: ../gl/inquiry/bank_inquiry.php:123
+#: ../gl/inquiry/gl_account_inquiry.php:211
+#: ../gl/inquiry/gl_trial_balance.php:219
+#: ../reporting/rep601.php:150
+#: ../reporting/rep602.php:157
+#: ../reporting/rep704.php:186
+#: ../reporting/rep708.php:244
 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:206
+#: ../gl/inquiry/gl_trial_balance.php:28
+#: ../reporting/rep708.php:206
 msgid "Trial Balance"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:55
+#: ../gl/inquiry/gl_trial_balance.php:55
 msgid "No zero values"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:56 reporting/reports_main.php:301
-#: reporting/reports_main.php:346 reporting/reports_main.php:386
+#: ../gl/inquiry/gl_trial_balance.php:56
+#: ../reporting/reports_main.php:301
+#: ../reporting/reports_main.php:346
+#: ../reporting/reports_main.php:386
 msgid "Only balances"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:90 gl/inquiry/gl_trial_balance.php:142
-#: reporting/rep706.php:302 reporting/rep707.php:320 reporting/rep708.php:51
-#: reporting/rep708.php:117 sales/create_recurrent_invoices.php:115
-#: sales/manage/recurrent_invoices.php:102
+#: ../gl/inquiry/gl_trial_balance.php:88
+#: ../gl/inquiry/gl_trial_balance.php:140
+#: ../reporting/rep706.php:302
+#: ../reporting/rep707.php:320
+#: ../reporting/rep708.php:51
+#: ../reporting/rep708.php:117
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/manage/recurrent_invoices.php:102
 msgid "Group"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:159
+#: ../gl/inquiry/gl_trial_balance.php:158
 msgid "The from date cannot be bigger than the fiscal year end."
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:172 gl/manage/bank_accounts.php:106
-#: gl/manage/bank_accounts.php.orig:106 gl/view/gl_trans_view.php:63
-#: gl/view/gl_trans_view.php:66 gl/view/gl_trans_view.php:69
-#: reporting/rep701.php:109 reporting/rep702.php:51 reporting/rep705.php:234
-#: reporting/rep706.php:181 reporting/rep707.php:206 reporting/rep708.php:179
+#: ../gl/inquiry/gl_trial_balance.php:171
+#: ../gl/manage/bank_accounts.php:109
+#: ../gl/view/gl_trans_view.php:68
+#: ../gl/view/gl_trans_view.php:71
+#: ../gl/view/gl_trans_view.php:74
+#: ../reporting/rep701.php:109
+#: ../reporting/rep702.php:51
+#: ../reporting/rep705.php:234
+#: ../reporting/rep706.php:181
+#: ../reporting/rep707.php:206
+#: ../reporting/rep708.php:179
 msgid "Account Name"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:173 reporting/rep708.php:172
+#: ../gl/inquiry/gl_trial_balance.php:172
+#: ../reporting/rep708.php:172
 msgid "Brought Forward"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:174 reporting/rep708.php:172
+#: ../gl/inquiry/gl_trial_balance.php:173
+#: ../reporting/rep708.php:172
 msgid "This Period"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:193
+#: ../gl/inquiry/gl_trial_balance.php:192
 msgid "Class"
 msgstr ""
 
-#: gl/inquiry/gl_trial_balance.php:228 reporting/rep708.php:265
+#: ../gl/inquiry/gl_trial_balance.php:227
+#: ../reporting/rep708.php:265
 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:123
+#: ../gl/inquiry/journal_inquiry.php:130
 msgid "Trans #"
 msgstr ""
 
-#: gl/inquiry/journal_inquiry.php:127 reporting/rep710.php:75
-#: reporting/rep710.php:85 reporting/reports_main.php:400
+#: ../gl/inquiry/journal_inquiry.php:134
+#: ../reporting/rep710.php:75
+#: ../reporting/rep710.php:85
+#: ../reporting/reports_main.php:400
 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:206
-#: reporting/includes/reports_classes.inc:234
+#: ../gl/inquiry/profit_loss.php:168
+#: ../reporting/rep707.php:206
+#: ../reporting/includes/reports_classes.inc:234
 msgid "Accumulated"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:251
-#: reporting/includes/reports_classes.inc:234
+#: ../gl/inquiry/profit_loss.php:168
+#: ../reporting/rep707.php:251
+#: ../reporting/includes/reports_classes.inc:234
 msgid "Period Y-1"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:168 reporting/rep707.php:242
-#: reporting/includes/reports_classes.inc:234
+#: ../gl/inquiry/profit_loss.php:168
+#: ../reporting/rep707.php:242
+#: ../reporting/includes/reports_classes.inc:234
 msgid "Budget"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:169 reporting/reports_main.php:289
-#: reporting/reports_main.php:335 reporting/reports_main.php:376
+#: ../gl/inquiry/profit_loss.php:169
+#: ../reporting/reports_main.php:289
+#: ../reporting/reports_main.php:335
+#: ../reporting/reports_main.php:376
 msgid "Compare to"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:230
+#: ../gl/inquiry/profit_loss.php:230
 msgid "Group/Account Name"
 msgstr ""
 
-#: gl/inquiry/profit_loss.php:233 reporting/rep707.php:206
+#: ../gl/inquiry/profit_loss.php:233
+#: ../reporting/rep707.php:206
 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 reporting/rep709.php:172
+#: ../gl/inquiry/tax_inquiry.php:82
+#: ../reporting/rep709.php:172
 msgid "Outputs"
 msgstr ""
 
-#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:172
+#: ../gl/inquiry/tax_inquiry.php:82
+#: ../reporting/rep709.php:172
 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 reporting/rep709.php:172
+#: ../gl/inquiry/tax_inquiry.php:100
+#: ../reporting/rep709.php:172
 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 reporting/rep709.php:172
+#: ../gl/inquiry/tax_inquiry.php:106
+#: ../reporting/rep709.php:172
 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 reporting/rep709.php:203
+#: ../gl/inquiry/tax_inquiry.php:119
+#: ../reporting/rep709.php:203
 msgid "Total payable or refund"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:16 gl/manage/bank_accounts.php.orig:16
-#: reporting/reports_main.php:238
+#: ../gl/manage/bank_accounts.php:16
+#: ../reporting/reports_main.php:238
 msgid "Bank Accounts"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:33 gl/manage/bank_accounts.php.orig:33
+#: ../gl/manage/bank_accounts.php:33
 msgid "The bank account name cannot be empty."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:39 gl/manage/bank_accounts.php.orig:39
+#: ../gl/manage/bank_accounts.php:39
 msgid "The GL account selected is already in use. Select another GL account."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:52 gl/manage/bank_accounts.php.orig:52
+#: ../gl/manage/bank_accounts.php:52
 msgid "Bank account has been updated"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:61 gl/manage/bank_accounts.php.orig:61
+#: ../gl/manage/bank_accounts.php:61
 msgid "New bank account has been added"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:76 gl/manage/bank_accounts.php.orig:76
+#: ../gl/manage/bank_accounts.php:76
 msgid ""
 "Cannot delete this bank account because transactions have been created using "
 "this account."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:82 gl/manage/bank_accounts.php.orig:82
+#: ../gl/manage/bank_accounts.php:82
 msgid ""
 "Cannot delete this bank account because POS definitions have been created "
 "using this account."
 msgstr ""
 
-#: gl/manage/bank_accounts.php:87 gl/manage/bank_accounts.php.orig:87
+#: ../gl/manage/bank_accounts.php:87
 msgid "Selected bank account has been deleted"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
-#: gl/view/bank_transfer_view.php:69 gl/view/bank_transfer_view.php:78
-#: gl/view/gl_deposit_view.php:66 gl/view/gl_payment_view.php:64
-#: inventory/prices.php:133 inventory/purchasing_data.php:129
-#: purchasing/view/view_supp_credit.php:49
-#: purchasing/view/view_supp_invoice.php:53
-#: purchasing/inquiry/po_search_completed.php:127
-#: purchasing/inquiry/po_search.php:136
-#: purchasing/inquiry/supplier_allocation_inquiry.php:133
-#: purchasing/inquiry/supplier_allocation_inquiry.php:143
-#: purchasing/inquiry/supplier_inquiry.php:76
-#: purchasing/inquiry/supplier_inquiry.php:175
-#: purchasing/inquiry/supplier_inquiry.php:186
-#: purchasing/inquiry/supplier_inquiry.php.orig:72
-#: purchasing/inquiry/supplier_inquiry.php.orig:169
-#: purchasing/inquiry/supplier_inquiry.php.orig:180
-#: purchasing/allocations/supplier_allocation_main.php:99
-#: purchasing/allocations/supplier_allocation_main.php:107
-#: reporting/rep101.php:138 reporting/rep102.php:131 reporting/rep102.php:137
-#: reporting/rep104.php:114 reporting/rep201.php:126 reporting/rep202.php:136
-#: reporting/rep203.php:99 sales/customer_credit_invoice.php:239
-#: sales/customer_delivery.php:340 sales/customer_invoice.php:402
-#: sales/allocations/customer_allocation_main.php:98
-#: sales/allocations/customer_allocation_main.php:106
-#: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86
-#: sales/view/view_invoice.php:85
-#: sales/inquiry/customer_allocation_inquiry.php:151
-#: sales/inquiry/customer_allocation_inquiry.php:161
-#: sales/inquiry/customer_inquiry.php:80
-#: sales/inquiry/customer_inquiry.php:232
-#: sales/inquiry/customer_inquiry.php:245
-#: sales/inquiry/customer_inquiry.php.orig:80
-#: sales/inquiry/customer_inquiry.php.orig:232
-#: sales/inquiry/customer_inquiry.php.orig:245
-#: sales/inquiry/sales_deliveries_view.php:189
-#: sales/inquiry/sales_orders_view.php:270
-#: sales/inquiry/sales_orders_view.php:284
-#: sales/inquiry/sales_orders_view.php.orig:270
-#: sales/inquiry/sales_orders_view.php.orig:284
+#: ../gl/manage/bank_accounts.php:109
+#: ../gl/view/bank_transfer_view.php:69
+#: ../gl/view/bank_transfer_view.php:78
+#: ../gl/view/gl_deposit_view.php:66
+#: ../gl/view/gl_payment_view.php:64
+#: ../inventory/prices.php:133
+#: ../inventory/purchasing_data.php:129
+#: ../purchasing/view/view_supp_credit.php:49
+#: ../purchasing/view/view_supp_invoice.php:54
+#: ../purchasing/inquiry/po_search_completed.php:126
+#: ../purchasing/inquiry/po_search_completed.php.orig:125
+#: ../purchasing/inquiry/po_search.php:136
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:132
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:142
+#: ../purchasing/inquiry/supplier_inquiry.php:73
+#: ../purchasing/inquiry/supplier_inquiry.php:180
+#: ../purchasing/inquiry/supplier_inquiry.php:192
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:73
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:177
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:189
+#: ../purchasing/allocations/supplier_allocation_main.php:99
+#: ../purchasing/allocations/supplier_allocation_main.php:107
+#: ../reporting/rep101.php:138
+#: ../reporting/rep102.php:131
+#: ../reporting/rep102.php:137
+#: ../reporting/rep104.php:114
+#: ../reporting/rep201.php:126
+#: ../reporting/rep202.php:136
+#: ../reporting/rep203.php:99
+#: ../sales/customer_credit_invoice.php:239
+#: ../sales/customer_delivery.php:348
+#: ../sales/customer_invoice.php:468
+#: ../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_allocation_inquiry.php.orig:151
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:161
+#: ../sales/inquiry/customer_inquiry.php:76
+#: ../sales/inquiry/customer_inquiry.php:208
+#: ../sales/inquiry/customer_inquiry.php:221
+#: ../sales/inquiry/customer_inquiry.php.orig:77
+#: ../sales/inquiry/customer_inquiry.php.orig:232
+#: ../sales/inquiry/customer_inquiry.php.orig:245
+#: ../sales/inquiry/sales_deliveries_view.php:189
+#: ../sales/inquiry/sales_deliveries_view.php.orig:189
+#: ../sales/inquiry/sales_orders_view.php:294
+#: ../sales/inquiry/sales_orders_view.php:308
+#: ../sales/inquiry/sales_orders_view.php.orig:271
+#: ../sales/inquiry/sales_orders_view.php.orig:285
 msgid "Currency"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:106 gl/manage/bank_accounts.php.orig:106
+#: ../gl/manage/bank_accounts.php:109
 msgid "GL Account"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
-#: reporting/includes/doctext.inc:247
+#: ../gl/manage/bank_accounts.php:110
+#: ../reporting/includes/doctext.inc:260
 msgid "Bank"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
-#: includes/ui/ui_view.inc:488
+#: ../gl/manage/bank_accounts.php:110
+#: ../includes/ui/ui_view.inc:488
+#: ../includes/ui/ui_view.inc.orig:488
 msgid "Number"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
+#: ../gl/manage/bank_accounts.php:110
 msgid "Bank Address"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:107 gl/manage/bank_accounts.php.orig:107
+#: ../gl/manage/bank_accounts.php:110
 msgid "Dflt"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:163 gl/manage/bank_accounts.php.orig:163
+#: ../gl/manage/bank_accounts.php:167
 msgid "Bank Account Name:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:167 gl/manage/bank_accounts.php:171
-#: gl/manage/bank_accounts.php.orig:167 gl/manage/bank_accounts.php.orig:171
+#: ../gl/manage/bank_accounts.php:171
+#: ../gl/manage/bank_accounts.php:175
 msgid "Account Type:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:175 gl/manage/bank_accounts.php:179
-#: gl/manage/bank_accounts.php.orig:175 gl/manage/bank_accounts.php.orig:179
+#: ../gl/manage/bank_accounts.php:179
+#: ../gl/manage/bank_accounts.php:183
 msgid "Bank Account Currency:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:182 gl/manage/bank_accounts.php.orig:182
+#: ../gl/manage/bank_accounts.php:186
 msgid "Default currency account:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:185 gl/manage/bank_accounts.php:187
-#: gl/manage/bank_accounts.php.orig:185 gl/manage/bank_accounts.php.orig:187
+#: ../gl/manage/bank_accounts.php:189
+#: ../gl/manage/bank_accounts.php:191
 msgid "Bank Account GL Code:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:189 gl/manage/bank_accounts.php.orig:189
+#: ../gl/manage/bank_accounts.php:194
 msgid "Bank Name:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:190 gl/manage/bank_accounts.php.orig:190
+#: ../gl/manage/bank_accounts.php:195
+#: ../sales/manage/customer_branches.php:255
 msgid "Bank Account Number:"
 msgstr ""
 
-#: gl/manage/bank_accounts.php:191 gl/manage/bank_accounts.php.orig:191
+#: ../gl/manage/bank_accounts.php:196
 msgid "Bank Address:"
 msgstr ""
 
-#: gl/manage/currencies.php:16 includes/access_levels.inc:223
+#: ../gl/manage/close_period.php:25
+#: ../gl/manage/close_period.php.orig:25
+msgid "Closing GL Transactions"
+msgstr ""
+
+#: ../gl/manage/close_period.php:40
+#: ../gl/manage/close_period.php.orig:40
+msgid "Selected date is not in fiscal year or the year is closed."
+msgstr ""
+
+#: ../gl/manage/close_period.php:47
+#: ../gl/manage/close_period.php.orig:47
+msgid "The entered date is earlier than date already selected as closing date."
+msgstr ""
+
+#: ../gl/manage/close_period.php:51
+#: ../gl/manage/close_period.php.orig:51
+msgid "You are not allowed to reopen already closed transactions."
+msgstr ""
+
+#: ../gl/manage/close_period.php:69
+#: ../gl/manage/close_period.php.orig:69
+#, php-format
+msgid ""
+"All transactions resulting in GL accounts changes up to %s has been closed "
+"for further edition."
+msgstr ""
+
+#: ../gl/manage/close_period.php:88
+#: ../gl/manage/close_period.php.orig:88
+msgid ""
+"Using this feature you can prevent entering new transactions <br>\n"
+"\tand disable edition of already entered transactions up to specified date."
+"<br>\n"
+"\tOnly transactions which can generate GL postings are subject to the "
+"constraint."
+msgstr ""
+
+#: ../gl/manage/close_period.php:101
+#: ../gl/manage/close_period.php.orig:101
+msgid "End date of closing period:"
+msgstr ""
+
+#: ../gl/manage/close_period.php:104
+#: ../gl/manage/close_period.php.orig:104
+msgid "Close Transactions"
+msgstr ""
+
+#: ../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
+#: ../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:288
+#: ../includes/ui/ui_view.inc:290
+#: ../includes/ui/ui_view.inc.orig:288
+#: ../includes/ui/ui_view.inc.orig:290
 msgid "Exchange Rate:"
 msgstr ""
 
-#: gl/manage/exchange_rates.php:142
+#: ../gl/manage/exchange_rates.php:142
 msgid "Get current ECB rate"
 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_types.php:128
+#: ../gl/manage/gl_account_classes.php:110
+#: ../gl/manage/gl_account_types.php:128
 msgid "Class Type"
 msgstr ""
 
-#: gl/manage/gl_account_classes.php:112 gl/manage/gl_account_classes.php:169
-#: reporting/rep706.php:211
+#: ../gl/manage/gl_account_classes.php:112
+#: ../gl/manage/gl_account_classes.php:169
+#: ../reporting/rep706.php:211
 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_types.php:192
+#: ../gl/manage/gl_account_classes.php:171
+#: ../gl/manage/gl_account_types.php:192
 msgid "Class Type:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:16 gl/manage/gl_accounts.php.orig:16
-#: reporting/rep701.php:115
+#: ../gl/manage/gl_accounts.php:16
+#: ../reporting/rep701.php:115
 msgid "Chart of Accounts"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:53 gl/manage/gl_accounts.php.orig:53
+#: ../gl/manage/gl_accounts.php:53
 msgid "The account code must be entered."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:59 gl/manage/gl_accounts.php.orig:59
+#: ../gl/manage/gl_accounts.php:59
 msgid "The account name cannot be empty."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:65 gl/manage/gl_accounts.php.orig:65
+#: ../gl/manage/gl_accounts.php:65
 msgid "The account code must be numeric."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:81 gl/manage/gl_accounts.php.orig:81
+#: ../gl/manage/gl_accounts.php:81
 msgid "The account belongs to a bank account and cannot be inactivated."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:90 gl/manage/gl_accounts.php.orig:90
+#: ../gl/manage/gl_accounts.php:90
 msgid "Account data has been updated."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:99 gl/manage/gl_accounts.php.orig:99
+#: ../gl/manage/gl_accounts.php:99
 msgid "New account has been added."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:116 gl/manage/gl_accounts.php.orig:116
+#: ../gl/manage/gl_accounts.php:116
 msgid ""
 "Cannot delete this account because transactions have been created using this "
 "account."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:122 gl/manage/gl_accounts.php.orig:122
+#: ../gl/manage/gl_accounts.php:122
 msgid ""
 "Cannot delete this account because it is used as one of the company default "
 "GL accounts."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:128 gl/manage/gl_accounts.php.orig:128
+#: ../gl/manage/gl_accounts.php:128
 msgid "Cannot delete this account because it is used by a bank account."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:134 gl/manage/gl_accounts.php.orig:134
+#: ../gl/manage/gl_accounts.php:134
 msgid ""
 "Cannot delete this account because it is used by one or more Item Categories."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:140 gl/manage/gl_accounts.php.orig:140
+#: ../gl/manage/gl_accounts.php:140
 msgid "Cannot delete this account because it is used by one or more Items."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:146 gl/manage/gl_accounts.php.orig:146
+#: ../gl/manage/gl_accounts.php:146
 msgid "Cannot delete this account because it is used by one or more Taxes."
 msgstr ""
 
-#: gl/manage/gl_accounts.php:152 gl/manage/gl_accounts.php.orig:152
+#: ../gl/manage/gl_accounts.php:152
 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.orig:158
+#: ../gl/manage/gl_accounts.php:157
 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.orig:164
+#: ../gl/manage/gl_accounts.php:163
 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.orig:182
+#: ../gl/manage/gl_accounts.php:181
 msgid "Selected account has been deleted"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:197 gl/manage/gl_accounts.php.orig:197
+#: ../gl/manage/gl_accounts.php:196
 msgid "New account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:243 gl/manage/gl_accounts.php.orig:243
+#: ../gl/manage/gl_accounts.php:242
 msgid "Account Code 2:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:245 gl/manage/gl_accounts.php.orig:245
+#: ../gl/manage/gl_accounts.php:244
 msgid "Account Name:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:247 gl/manage/gl_accounts.php.orig:247
+#: ../gl/manage/gl_accounts.php:246
 msgid "Account Group:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:249 gl/manage/gl_accounts.php.orig:249
+#: ../gl/manage/gl_accounts.php:248
 msgid "Account Tags:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:251 gl/manage/gl_accounts.php.orig:251
+#: ../gl/manage/gl_accounts.php:250
 msgid "Account status:"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:256 gl/manage/gl_accounts.php.orig:256
+#: ../gl/manage/gl_accounts.php:255
 msgid "Add Account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:260 gl/manage/gl_accounts.php.orig:260
+#: ../gl/manage/gl_accounts.php:259
 msgid "Update Account"
 msgstr ""
 
-#: gl/manage/gl_accounts.php:261 gl/manage/gl_accounts.php.orig:261
+#: ../gl/manage/gl_accounts.php:260
 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_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:201
+#: ../gl/manage/gl_quick_entries.php:58
+#: ../includes/ui/simple_crud_class.inc:221
+#: ../includes/ui/ui_input.inc:205
 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:433
-#: sales/customer_invoice.php:468
+#: ../gl/manage/gl_quick_entries.php:329
+#: ../sales/customer_delivery.php:441
+#: ../sales/customer_invoice.php:540
+#: ../sales/customer_invoice.php:543
 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:212
-#: reporting/reports_main.php:88 reporting/reports_main.php:95
-#: reporting/reports_main.php:102 reporting/reports_main.php:114
-#: reporting/reports_main.php:121 reporting/reports_main.php:127
-#: reporting/reports_main.php:163 reporting/reports_main.php:169
-#: reporting/reports_main.php:219
+#: ../gl/view/gl_deposit_view.php:71
+#: ../gl/includes/db/gl_db_banking.inc:211
+#: ../reporting/reports_main.php:88
+#: ../reporting/reports_main.php:95
+#: ../reporting/reports_main.php:102
+#: ../reporting/reports_main.php:114
+#: ../reporting/reports_main.php:121
+#: ../reporting/reports_main.php:127
+#: ../reporting/reports_main.php:163
+#: ../reporting/reports_main.php:169
+#: ../reporting/reports_main.php:219
 msgid "From"
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:72
+#: ../gl/view/gl_deposit_view.php:72
 msgid "Deposit Type"
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:81
+#: ../gl/view/gl_deposit_view.php:81
 msgid "This deposit has been voided."
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:87
+#: ../gl/view/gl_deposit_view.php:87
 msgid "There are no items for this deposit."
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:92
+#: ../gl/view/gl_deposit_view.php:92
 msgid "Items for this Deposit"
 msgstr ""
 
-#: gl/view/gl_deposit_view.php:94 gl/view/gl_payment_view.php:92
+#: ../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:63 gl/view/gl_trans_view.php:66
-#: gl/view/gl_trans_view.php:69 gl/includes/ui/gl_bank_ui.inc:132
-#: gl/includes/ui/gl_bank_ui.inc:135 gl/includes/ui/gl_bank_ui.inc:138
-#: gl/includes/ui/gl_bank_ui.inc.orig:132
-#: gl/includes/ui/gl_bank_ui.inc.orig:135
-#: gl/includes/ui/gl_bank_ui.inc.orig:138 gl/includes/ui/gl_journal_ui.inc:83
-#: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
-#: reporting/rep701.php:109
+#: ../gl/view/gl_deposit_view.php:99
+#: ../gl/view/gl_deposit_view.php:102
+#: ../gl/view/gl_deposit_view.php:105
+#: ../gl/view/gl_payment_view.php:98
+#: ../gl/view/gl_payment_view.php:101
+#: ../gl/view/gl_payment_view.php:104
+#: ../gl/view/gl_trans_view.php:68
+#: ../gl/view/gl_trans_view.php:71
+#: ../gl/view/gl_trans_view.php:74
+#: ../gl/includes/ui/gl_bank_ui.inc:150
+#: ../gl/includes/ui/gl_bank_ui.inc:153
+#: ../gl/includes/ui/gl_bank_ui.inc:156
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:124
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:127
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:130
+#: ../gl/includes/ui/gl_journal_ui.inc:86
+#: ../gl/includes/ui/gl_journal_ui.inc:89
+#: ../gl/includes/ui/gl_journal_ui.inc:92
+#: ../reporting/rep701.php:109
 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:132 gl/includes/ui/gl_bank_ui.inc:135
-#: gl/includes/ui/gl_bank_ui.inc:138 gl/includes/ui/gl_bank_ui.inc.orig:132
-#: gl/includes/ui/gl_bank_ui.inc.orig:135
-#: gl/includes/ui/gl_bank_ui.inc.orig:138 gl/includes/ui/gl_journal_ui.inc:83
-#: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89
+#: ../gl/view/gl_deposit_view.php:99
+#: ../gl/view/gl_deposit_view.php:102
+#: ../gl/view/gl_deposit_view.php:105
+#: ../gl/view/gl_payment_view.php:98
+#: ../gl/view/gl_payment_view.php:101
+#: ../gl/view/gl_payment_view.php:104
+#: ../gl/includes/ui/gl_bank_ui.inc:150
+#: ../gl/includes/ui/gl_bank_ui.inc:153
+#: ../gl/includes/ui/gl_bank_ui.inc:156
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:124
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:127
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:130
+#: ../gl/includes/ui/gl_journal_ui.inc:86
+#: ../gl/includes/ui/gl_journal_ui.inc:89
+#: ../gl/includes/ui/gl_journal_ui.inc:92
 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:70
+#: ../purchasing/view/view_supp_payment.php:64
+#: ../purchasing/view/view_supp_payment.php:78
+#: ../sales/view/view_receipt.php:48
 msgid "Payment Type"
 msgstr ""
 
-#: gl/view/gl_payment_view.php:79 purchasing/view/view_supp_payment.php:85
+#: ../gl/view/gl_payment_view.php:79
+#: ../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:85
 msgid "There are no items for this payment."
 msgstr ""
 
-#: gl/view/gl_payment_view.php:90
+#: ../gl/view/gl_payment_view.php:90
 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:54
+#: ../gl/view/gl_trans_view.php:39
+#: ../gl/includes/ui/gl_journal_ui.inc:97
+msgid "Counterparty"
+msgstr ""
+
+#: ../gl/view/gl_trans_view.php:59
 msgid "No general ledger transactions have been created for"
 msgstr ""
 
-#: gl/view/gl_trans_view.php:54
+#: ../gl/view/gl_trans_view.php:59
 msgid "number"
 msgstr ""
 
-#: gl/view/gl_trans_view.php:120
+#: ../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:59
+#: ../gl/includes/db/gl_db_banking.inc:62
 msgid "Exchange Variance"
 msgstr ""
 
-#: gl/includes/db/gl_db_banking.inc:212 reporting/reports_main.php:89
-#: reporting/reports_main.php:96 reporting/reports_main.php:103
-#: reporting/reports_main.php:115 reporting/reports_main.php:122
-#: reporting/reports_main.php:128 reporting/reports_main.php:164
-#: reporting/reports_main.php:170 reporting/reports_main.php:220
+#: ../gl/includes/db/gl_db_banking.inc:211
+#: ../reporting/reports_main.php:89
+#: ../reporting/reports_main.php:96
+#: ../reporting/reports_main.php:103
+#: ../reporting/reports_main.php:115
+#: ../reporting/reports_main.php:122
+#: ../reporting/reports_main.php:128
+#: ../reporting/reports_main.php:164
+#: ../reporting/reports_main.php:170
+#: ../reporting/reports_main.php:220
 msgid "To"
 msgstr ""
 
-#: gl/includes/db/gl_db_banking.inc:428
+#: ../gl/includes/db/gl_db_banking.inc:427
+#: ../purchasing/includes/db/invoice_db.inc:136
 msgid "Document reentered."
 msgstr ""
 
-#: gl/includes/db/gl_db_rates.inc:130
+#: ../gl/includes/db/gl_db_rates.inc:130
 #, php-format
 msgid ""
 "Cannot retrieve currency rate from %s page. Please set the rate manually."
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:23 gl/includes/ui/gl_bank_ui.inc.orig:23
-#: gl/includes/ui/gl_journal_ui.inc:27
-#: inventory/includes/item_adjustments_ui.inc:39
-#: inventory/includes/stock_transfers_ui.inc:42
-#: manufacturing/work_order_add_finished.php:208
-#: manufacturing/work_order_costs.php:152
-#: purchasing/allocations/supplier_allocate.php:54
-#: sales/allocations/customer_allocate.php:53
-#: sales/includes/ui/sales_credit_ui.inc:121
+#: ../gl/includes/ui/gl_bank_ui.inc:24
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:28
+#: ../gl/includes/ui/gl_journal_ui.inc:27
+#: ../inventory/includes/item_adjustments_ui.inc:39
+#: ../inventory/includes/stock_transfers_ui.inc:42
+#: ../manufacturing/work_order_add_finished.php:208
+#: ../manufacturing/work_order_costs.php:133
+#: ../purchasing/allocations/supplier_allocate.php:54
+#: ../sales/allocations/customer_allocate.php:53
+#: ../sales/includes/ui/sales_credit_ui.inc:121
 msgid "Date:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:50 gl/includes/ui/gl_bank_ui.inc.orig:50
+#: ../gl/includes/ui/gl_bank_ui.inc:51
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:53
 msgid "Pay To:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:55 gl/includes/ui/gl_bank_ui.inc.orig:55
+#: ../gl/includes/ui/gl_bank_ui.inc:56
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:58
 msgid "To the Order of:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:62 gl/includes/ui/gl_bank_ui.inc.orig:62
-#: inventory/purchasing_data.php:184 inventory/purchasing_data.php:188
-#: purchasing/includes/ui/invoice_ui.inc:73
-#: purchasing/includes/ui/invoice_ui.inc:80
-#: purchasing/includes/ui/po_ui.inc:120 purchasing/includes/ui/po_ui.inc:125
+#: ../gl/includes/ui/gl_bank_ui.inc:63
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:65
+#: ../inventory/purchasing_data.php:184
+#: ../inventory/purchasing_data.php:188
+#: ../inventory/purchasing_data.php.orig:112
+#: ../purchasing/includes/ui/invoice_ui.inc:80
+#: ../purchasing/includes/ui/invoice_ui.inc:88
+#: ../purchasing/includes/ui/invoice_ui.inc:90
+#: ../purchasing/includes/ui/po_ui.inc:125
+#: ../purchasing/includes/ui/po_ui.inc:130
 msgid "Supplier:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:65 gl/includes/ui/gl_bank_ui.inc.orig:65
-#: sales/manage/recurrent_invoices.php:169
-#: sales/includes/ui/sales_credit_ui.inc:29
-#: sales/includes/ui/sales_order_ui.inc:278
+#: ../gl/includes/ui/gl_bank_ui.inc:66
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:68
+#: ../sales/manage/recurrent_invoices.php:169
+#: ../sales/includes/ui/sales_credit_ui.inc:29
+#: ../sales/includes/ui/sales_order_ui.inc:278
+#: ../sales/includes/ui/sales_order_ui.inc.orig:278
 msgid "Customer:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:69 gl/includes/ui/gl_bank_ui.inc.orig:69
-#: sales/customer_payments.php:360 sales/manage/recurrent_invoices.php:172
-#: sales/includes/ui/sales_credit_ui.inc:37
-#: sales/includes/ui/sales_order_ui.inc:285
+#: ../gl/includes/ui/gl_bank_ui.inc:70
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:72
+#: ../sales/customer_payments.php:360
+#: ../sales/manage/recurrent_invoices.php:172
+#: ../sales/includes/ui/sales_credit_ui.inc:37
+#: ../sales/includes/ui/sales_order_ui.inc:285
+#: ../sales/includes/ui/sales_order_ui.inc.orig:285
 msgid "Branch:"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:87 gl/includes/ui/gl_bank_ui.inc.orig:87
-#: gl/includes/ui/gl_journal_ui.inc:58 gl/includes/ui/gl_journal_ui.inc:62
-#: purchasing/includes/ui/invoice_ui.inc:231
+#: ../gl/includes/ui/gl_bank_ui.inc:84
+#: ../gl/includes/ui/gl_bank_ui.inc:87
+#: ../sales/customer_payments.php:369
+msgid "This customer account is on hold."
+msgstr ""
+
+#: ../gl/includes/ui/gl_bank_ui.inc:99
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:90
+#: ../gl/includes/ui/gl_journal_ui.inc:58
+#: ../gl/includes/ui/gl_journal_ui.inc:62
+#: ../purchasing/includes/ui/invoice_ui.inc:251
 msgid "Go"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:167 gl/includes/ui/gl_bank_ui.inc.orig:167
-#: includes/ui/simple_crud_class.inc:52
-#: inventory/includes/item_adjustments_ui.inc:88
-#: inventory/includes/stock_transfers_ui.inc:80
-#: manufacturing/includes/work_order_issue_ui.inc:59
-#: purchasing/includes/ui/invoice_ui.inc:520
-#: purchasing/includes/ui/po_ui.inc:267
-#: sales/includes/ui/sales_credit_ui.inc:198
-#: sales/includes/ui/sales_order_ui.inc:203
+#: ../gl/includes/ui/gl_bank_ui.inc:185
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:159
+#: ../includes/ui/simple_crud_class.inc:52
+#: ../inventory/includes/item_adjustments_ui.inc:88
+#: ../inventory/includes/stock_transfers_ui.inc:80
+#: ../manufacturing/includes/work_order_issue_ui.inc:59
+#: ../purchasing/includes/ui/invoice_ui.inc:542
+#: ../purchasing/includes/ui/po_ui.inc:274
+#: ../sales/includes/ui/sales_credit_ui.inc:198
+#: ../sales/includes/ui/sales_order_ui.inc:203
+#: ../sales/includes/ui/sales_order_ui.inc.orig:203
 msgid "Edit document line"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:169 gl/includes/ui/gl_bank_ui.inc.orig:169
-#: includes/ui/simple_crud_class.inc:54
-#: inventory/includes/item_adjustments_ui.inc:90
-#: inventory/includes/stock_transfers_ui.inc:82
-#: manufacturing/includes/work_order_issue_ui.inc:61
-#: purchasing/includes/ui/invoice_ui.inc:285
-#: purchasing/includes/ui/po_ui.inc:269
-#: sales/includes/ui/sales_credit_ui.inc:200
-#: sales/includes/ui/sales_order_ui.inc:205
+#: ../gl/includes/ui/gl_bank_ui.inc:187
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:161
+#: ../includes/ui/simple_crud_class.inc:54
+#: ../inventory/includes/item_adjustments_ui.inc:90
+#: ../inventory/includes/stock_transfers_ui.inc:82
+#: ../manufacturing/includes/work_order_issue_ui.inc:61
+#: ../purchasing/includes/ui/invoice_ui.inc:305
+#: ../purchasing/includes/ui/po_ui.inc:276
+#: ../sales/includes/ui/sales_credit_ui.inc:200
+#: ../sales/includes/ui/sales_order_ui.inc:205
+#: ../sales/includes/ui/sales_order_ui.inc.orig:205
 msgid "Remove line from document"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:258 gl/includes/ui/gl_bank_ui.inc.orig:258
-#: gl/includes/ui/gl_journal_ui.inc:222 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:443
-#: sales/includes/ui/sales_credit_ui.inc:294
-#: sales/includes/ui/sales_order_ui.inc:556
+#: ../gl/includes/ui/gl_bank_ui.inc:276
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:250
+#: ../gl/includes/ui/gl_journal_ui.inc:258
+#: ../includes/ui/simple_crud_class.inc:56
+#: ../inventory/includes/item_adjustments_ui.inc:158
+#: ../inventory/includes/stock_transfers_ui.inc:138
+#: ../manufacturing/includes/work_order_issue_ui.inc:132
+#: ../purchasing/includes/ui/po_ui.inc:458
+#: ../sales/includes/ui/sales_credit_ui.inc:294
+#: ../sales/includes/ui/sales_order_ui.inc:556
+#: ../sales/includes/ui/sales_order_ui.inc.orig:556
 msgid "Confirm changes"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:260 gl/includes/ui/gl_bank_ui.inc.orig:260
-#: gl/includes/ui/gl_journal_ui.inc:224 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:445
-#: sales/includes/ui/sales_credit_ui.inc:296
-#: sales/includes/ui/sales_order_ui.inc:558
+#: ../gl/includes/ui/gl_bank_ui.inc:278
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:252
+#: ../gl/includes/ui/gl_journal_ui.inc:260
+#: ../includes/ui/simple_crud_class.inc:58
+#: ../inventory/includes/item_adjustments_ui.inc:160
+#: ../inventory/includes/stock_transfers_ui.inc:140
+#: ../manufacturing/includes/work_order_issue_ui.inc:134
+#: ../purchasing/includes/ui/po_ui.inc:460
+#: ../sales/includes/ui/sales_credit_ui.inc:296
+#: ../sales/includes/ui/sales_order_ui.inc:558
+#: ../sales/includes/ui/sales_order_ui.inc.orig:558
 msgid "Cancel changes"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:265 gl/includes/ui/gl_bank_ui.inc.orig:265
-#: gl/includes/ui/gl_journal_ui.inc:228
-#: 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:451
-#: sales/includes/ui/sales_credit_ui.inc:302
-#: sales/includes/ui/sales_order_ui.inc:564
+#: ../gl/includes/ui/gl_bank_ui.inc:283
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:257
+#: ../gl/includes/ui/gl_journal_ui.inc:264
+#: ../inventory/includes/item_adjustments_ui.inc:166
+#: ../inventory/includes/stock_transfers_ui.inc:146
+#: ../manufacturing/includes/work_order_issue_ui.inc:140
+#: ../purchasing/includes/ui/po_ui.inc:466
+#: ../sales/includes/ui/sales_credit_ui.inc:302
+#: ../sales/includes/ui/sales_order_ui.inc:564
+#: ../sales/includes/ui/sales_order_ui.inc.orig:564
 msgid "Add Item"
 msgstr ""
 
-#: gl/includes/ui/gl_bank_ui.inc:266 gl/includes/ui/gl_bank_ui.inc.orig:266
-#: 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:452
-#: sales/includes/ui/sales_credit_ui.inc:303
-#: sales/includes/ui/sales_order_ui.inc:565
+#: ../gl/includes/ui/gl_bank_ui.inc:284
+#: ../gl/includes/ui/gl_bank_ui.inc.orig:258
+#: ../inventory/includes/item_adjustments_ui.inc:167
+#: ../inventory/includes/stock_transfers_ui.inc:147
+#: ../manufacturing/includes/work_order_issue_ui.inc:141
+#: ../purchasing/includes/ui/po_ui.inc:467
+#: ../sales/includes/ui/sales_credit_ui.inc:303
+#: ../sales/includes/ui/sales_order_ui.inc:565
+#: ../sales/includes/ui/sales_order_ui.inc.orig:565
 msgid "Add new item to document"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:38
+#: ../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:123
+#: ../gl/includes/ui/gl_journal_ui.inc:135
 msgid "Edit journal line"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:125
+#: ../gl/includes/ui/gl_journal_ui.inc:137
 msgid "Remove line from journal"
 msgstr ""
 
-#: gl/includes/ui/gl_journal_ui.inc:229
+#: ../gl/includes/ui/gl_journal_ui.inc:200
+#: ../gl/includes/ui/gl_journal_ui.inc:232
+msgid "[Select account]"
+msgstr ""
+
+#: ../gl/includes/ui/gl_journal_ui.inc:265
 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 inventory/manage/items.php:339
-#: reporting/reports_main.php:223
+#: ../includes/access_levels.inc:72
+#: ../inventory/manage/items.php:348
+#: ../inventory/manage/items.php.orig:341
+#: ../reporting/reports_main.php:223
 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: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
+msgid "Reopening GL transactions"
+msgstr ""
+
+#: ../includes/access_levels.inc:232
 msgid "Allow entry on non closed Fiscal years"
 msgstr ""
 
-#: includes/access_levels.inc:232
+#: ../includes/access_levels.inc:234
 msgid "Bank transactions view"
 msgstr ""
 
-#: includes/access_levels.inc:233
+#: ../includes/access_levels.inc:235
 msgid "GL postings view"
 msgstr ""
 
-#: includes/access_levels.inc:234
+#: ../includes/access_levels.inc:236
 msgid "Exchange rate table changes"
 msgstr ""
 
-#: includes/access_levels.inc:235
+#: ../includes/access_levels.inc:237
 msgid "Bank payments"
 msgstr ""
 
-#: includes/access_levels.inc:236
+#: ../includes/access_levels.inc:238
 msgid "Bank deposits"
 msgstr ""
 
-#: includes/access_levels.inc:237
+#: ../includes/access_levels.inc:239
 msgid "Bank account transfers"
 msgstr ""
 
-#: includes/access_levels.inc:238
+#: ../includes/access_levels.inc:240
 msgid "Bank reconciliation"
 msgstr ""
 
-#: includes/access_levels.inc:239
+#: ../includes/access_levels.inc:241
 msgid "Manual journal entries"
 msgstr ""
 
-#: includes/access_levels.inc:240
+#: ../includes/access_levels.inc:242
 msgid "Journal entries to bank related accounts"
 msgstr ""
 
-#: includes/access_levels.inc:241
+#: ../includes/access_levels.inc:243
 msgid "Budget edition"
 msgstr ""
 
-#: includes/access_levels.inc:242
+#: ../includes/access_levels.inc:244
 msgid "Item standard costs"
 msgstr ""
 
-#: includes/access_levels.inc:245
+#: ../includes/access_levels.inc:247
 msgid "GL analytical reports and inquiries"
 msgstr ""
 
-#: includes/access_levels.inc:246
+#: ../includes/access_levels.inc:248
 msgid "Tax reports and inquiries"
 msgstr ""
 
-#: includes/access_levels.inc:247
+#: ../includes/access_levels.inc:249
 msgid "Bank reports and inquiries"
 msgstr ""
 
-#: includes/access_levels.inc:248
+#: ../includes/access_levels.inc:250
 msgid "GL reports and inquiries"
 msgstr ""
 
-#: includes/banking.inc:100
+#: ../includes/banking.inc:100
 #, 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:87 includes/ldap.current_user.inc:96
+#: ../includes/current_user.inc:88
 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:88 includes/ldap.current_user.inc:97
-#: includes/ui/ui_controls.inc:190 includes/ui/ui_view.inc:843
+#: ../includes/current_user.inc:89
+#: ../includes/ui/ui_controls.inc:197
+#: ../includes/ui/ui_view.inc:844
+#: ../includes/ui/ui_view.inc.orig:843
 msgid "Back"
 msgstr ""
 
-#: includes/current_user.inc:98 includes/ldap.current_user.inc:107
+#: ../includes/current_user.inc:99
 msgid "System is available for site admin only until full database upgrade"
 msgstr ""
 
-#: includes/current_user.inc:436 includes/ldap.current_user.inc:544
+#: ../includes/current_user.inc:462
 msgid "Requesting data..."
 msgstr ""
 
-#: includes/errors.inc:123
+#: ../includes/data_checks.inc:495
+#, php-format
+msgid "%s #%s is closed for further edition."
+msgstr ""
+
+#: ../includes/errors.inc:123
 msgid "in file"
 msgstr ""
 
-#: includes/errors.inc:123
+#: ../includes/errors.inc:123
 msgid "at line "
 msgstr ""
 
-#: includes/errors.inc:177
+#: ../includes/errors.inc:177
 msgid "Debug mode database warning:"
 msgstr ""
 
-#: includes/errors.inc:179
+#: ../includes/errors.inc:179
 msgid "DATABASE ERROR :"
 msgstr ""
 
-#: includes/errors.inc:210
+#: ../includes/errors.inc:210
 msgid ""
 "The entered information is a duplicate. Please go back and enter different "
 "values."
 msgstr ""
 
-#: includes/main.inc:41
+#: ../includes/main.inc:44
 msgid "This page is usable only with javascript enabled browsers."
 msgstr ""
 
-#: includes/packages.inc:190
+#: ../includes/packages.inc:190
 #, php-format
 msgid "No key field '%s' in file '%s'"
 msgstr ""
 
-#: includes/packages.inc:295 includes/packages.inc:329
+#: ../includes/packages.inc:295
+#: ../includes/packages.inc:329
 #, php-format
 msgid "Cannot delete outdated '%s' file."
 msgstr ""
 
-#: includes/packages.inc:299
+#: ../includes/packages.inc:299
 msgid "Release file in repository is invalid, or public key is outdated."
 msgstr ""
 
-#: includes/packages.inc:316
+#: ../includes/packages.inc:316
 msgid "Repository version does not match application version."
 msgstr ""
 
-#: includes/packages.inc:333
+#: ../includes/packages.inc:333
 #, php-format
 msgid ""
 "Security alert: broken index file in repository '%s'. Please inform "
 "repository administrator about this issue."
 msgstr ""
 
-#: includes/packages.inc:366
+#: ../includes/packages.inc:366
 #, php-format
 msgid ""
 "Security alert: broken package '%s' in repository. Please inform repository "
 "administrator about this issue."
 msgstr ""
 
-#: includes/packages.inc:621 includes/packages.inc:672
+#: ../includes/packages.inc:621
+#: ../includes/packages.inc:672
 #, php-format
 msgid "Package '%s' not found."
 msgstr ""
 
-#: includes/session.inc:133 includes/session.inc.ldap.inc:39
+#: ../includes/session.inc:133
 msgid "Incorrect Password"
 msgstr ""
 
-#: includes/session.inc:134 includes/session.inc.ldap.inc:40
+#: ../includes/session.inc:134
 msgid "The user and password combination is not valid for the system."
 msgstr ""
 
-#: includes/session.inc:136 includes/session.inc.ldap.inc:42
+#: ../includes/session.inc:136
 msgid ""
 "If you are not an authorized user, please contact your system administrator "
 "to obtain an account to enable you to use the system."
 msgstr ""
 
-#: includes/session.inc:137 includes/session.inc.ldap.inc:43
+#: ../includes/session.inc:137
 msgid "Try again"
 msgstr ""
 
-#: includes/session.inc:156 includes/session.inc.ldap.inc:62
+#: ../includes/session.inc:156
 msgid "Security settings have not been defined for your user account."
 msgstr ""
 
-#: includes/session.inc:157 includes/session.inc.ldap.inc:63
+#: ../includes/session.inc:157
 msgid "Please contact your system administrator."
 msgstr ""
 
-#: includes/session.inc:158 includes/session.inc.ldap.inc:64
+#: ../includes/session.inc:158
 msgid ""
 "Please remove $security_groups and $security_headings arrays from config.php "
 "file!"
 msgstr ""
 
-#: includes/session.inc:160 includes/session.inc.ldap.inc:66
+#: ../includes/session.inc:160
 msgid ""
 "Access to application has been blocked until database upgrade is completed "
 "by system administrator."
 msgstr ""
 
-#: includes/session.inc:174 includes/session.inc.ldap.inc:80
+#: ../includes/session.inc:174
 msgid ""
 "The security settings on your account do not permit you to access this "
 "function"
 msgstr ""
 
-#: includes/session.inc:183 includes/session.inc.ldap.inc:89
+#: ../includes/session.inc:183
 msgid ""
 "System is blocked after source upgrade until database is updated on System/"
 "Software Upgrade page"
 msgstr ""
 
-#: includes/sysnames.inc:23 includes/sysnames.inc:148
+#: ../includes/sysnames.inc:23
+#: ../includes/sysnames.inc:149
 msgid "Bank Payment"
 msgstr ""
 
-#: includes/sysnames.inc:24 includes/sysnames.inc:147
+#: ../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/includes/ui/po_ui.inc:323
-#: purchasing/view/view_po.php:30
+#: ../includes/sysnames.inc:32
+#: ../purchasing/includes/ui/po_ui.inc:330
+#: ../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:28
+#: ../includes/sysnames.inc:34
+#: ../purchasing/supplier_credit.php:58
 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 sales/inquiry/sales_orders_view.php:137
-#: sales/inquiry/sales_orders_view.php:159
-#: sales/inquiry/sales_orders_view.php.orig:137
-#: sales/inquiry/sales_orders_view.php.orig:159
+#: ../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:138
+#: ../sales/inquiry/sales_orders_view.php.orig:160
 msgid "Sales Order"
 msgstr ""
 
-#: includes/sysnames.inc:41 sales/sales_order_entry.php:614
+#: ../includes/sysnames.inc:41
+#: ../sales/sales_order_entry.php:625
 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:471
+#: ../includes/sysnames.inc:54
+#: ../sales/customer_invoice.php:545
 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:82 reporting/rep305.php:95
+#: ../includes/sysnames.inc:61
+#: ../reporting/rep204.php:82
+#: ../reporting/rep305.php:95
 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:161
+#: ../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:180
+#: ../includes/sysnames.inc:86
+#: ../includes/sysnames.inc:181
 msgid "Cash"
 msgstr ""
 
-#: includes/sysnames.inc:96 reporting/rep101.php:137 reporting/rep102.php:123
-#: reporting/rep102.php:130 reporting/rep105.php:107 reporting/rep106.php:81
-#: reporting/rep114.php:93 reporting/rep304.php:112 reporting/rep304.php:122
-#: reporting/reports_main.php:32 reporting/reports_main.php:36
-#: reporting/reports_main.php:43 reporting/reports_main.php:108
-#: reporting/reports_main.php:203 sales/create_recurrent_invoices.php:115
-#: sales/customer_credit_invoice.php:237 sales/customer_delivery.php:338
-#: sales/customer_invoice.php:378
-#: 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:230
-#: sales/inquiry/customer_inquiry.php:244
-#: sales/inquiry/customer_inquiry.php.orig:230
-#: sales/inquiry/customer_inquiry.php.orig:244
-#: sales/inquiry/sales_deliveries_view.php:180
-#: sales/inquiry/sales_orders_view.php:262
-#: sales/inquiry/sales_orders_view.php:276
-#: sales/inquiry/sales_orders_view.php.orig:262
-#: sales/inquiry/sales_orders_view.php.orig:276
+#: ../includes/sysnames.inc:96
+#: ../includes/sysnames.inc:195
+#: ../reporting/rep101.php:137
+#: ../reporting/rep102.php:123
+#: ../reporting/rep102.php:130
+#: ../reporting/rep105.php:107
+#: ../reporting/rep106.php:81
+#: ../reporting/rep114.php:93
+#: ../reporting/rep304.php:112
+#: ../reporting/rep304.php:122
+#: ../reporting/reports_main.php:32
+#: ../reporting/reports_main.php:36
+#: ../reporting/reports_main.php:43
+#: ../reporting/reports_main.php:108
+#: ../reporting/reports_main.php:203
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/customer_credit_invoice.php:237
+#: ../sales/customer_delivery.php:346
+#: ../sales/customer_invoice.php:444
+#: ../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_allocation_inquiry.php.orig:150
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:160
+#: ../sales/inquiry/customer_inquiry.php:206
+#: ../sales/inquiry/customer_inquiry.php:220
+#: ../sales/inquiry/customer_inquiry.php.orig:230
+#: ../sales/inquiry/customer_inquiry.php.orig:244
+#: ../sales/inquiry/sales_deliveries_view.php:180
+#: ../sales/inquiry/sales_deliveries_view.php.orig:180
+#: ../sales/inquiry/sales_orders_view.php:286
+#: ../sales/inquiry/sales_orders_view.php:300
+#: ../sales/inquiry/sales_orders_view.php.orig:263
+#: ../sales/inquiry/sales_orders_view.php.orig:277
 msgid "Customer"
 msgstr ""
 
-#: includes/sysnames.inc:97 includes/sysnames.inc:172
-#: inventory/purchasing_data.php:129 purchasing/includes/ui/grn_ui.inc:20
-#: purchasing/includes/ui/po_ui.inc:316
-#: purchasing/view/view_supp_credit.php:42
-#: purchasing/view/view_supp_invoice.php:45
-#: purchasing/inquiry/po_search_completed.php:123
-#: purchasing/inquiry/po_search.php:132
-#: purchasing/inquiry/supplier_allocation_inquiry.php:129
-#: purchasing/inquiry/supplier_allocation_inquiry.php:142
-#: purchasing/inquiry/supplier_inquiry.php:171
-#: purchasing/inquiry/supplier_inquiry.php:185
-#: purchasing/inquiry/supplier_inquiry.php.orig:165
-#: purchasing/inquiry/supplier_inquiry.php.orig:179
-#: purchasing/allocations/supplier_allocation_main.php:98
-#: purchasing/allocations/supplier_allocation_main.php:106
-#: reporting/rep201.php:125 reporting/rep202.php:128 reporting/rep202.php:135
-#: reporting/rep203.php:98 reporting/rep204.php:88
-#: reporting/reports_main.php:132 reporting/reports_main.php:136
-#: reporting/reports_main.php:143 reporting/reports_main.php:153
-#: reporting/reports_main.php:159
+#: ../includes/sysnames.inc:97
+#: ../includes/sysnames.inc:173
+#: ../includes/sysnames.inc:196
+#: ../inventory/purchasing_data.php:129
+#: ../purchasing/includes/ui/grn_ui.inc:20
+#: ../purchasing/includes/ui/po_ui.inc:323
+#: ../purchasing/view/view_supp_credit.php:42
+#: ../purchasing/view/view_supp_invoice.php:46
+#: ../purchasing/inquiry/po_search_completed.php:122
+#: ../purchasing/inquiry/po_search_completed.php.orig:121
+#: ../purchasing/inquiry/po_search.php:132
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:128
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:141
+#: ../purchasing/inquiry/supplier_inquiry.php:176
+#: ../purchasing/inquiry/supplier_inquiry.php:191
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:173
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:188
+#: ../purchasing/allocations/supplier_allocation_main.php:98
+#: ../purchasing/allocations/supplier_allocation_main.php:106
+#: ../reporting/rep201.php:125
+#: ../reporting/rep202.php:128
+#: ../reporting/rep202.php:135
+#: ../reporting/rep203.php:98
+#: ../reporting/rep204.php:88
+#: ../reporting/reports_main.php:132
+#: ../reporting/reports_main.php:136
+#: ../reporting/reports_main.php:143
+#: ../reporting/reports_main.php:153
+#: ../reporting/reports_main.php:159
 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:119
+#: ../includes/sysnames.inc:113
+msgid "Materials"
+msgstr ""
+
+#: ../includes/sysnames.inc:120
 msgid "Assets"
 msgstr ""
 
-#: includes/sysnames.inc:121
+#: ../includes/sysnames.inc:122
 msgid "Equity"
 msgstr ""
 
-#: includes/sysnames.inc:122
+#: ../includes/sysnames.inc:123
 msgid "Income"
 msgstr ""
 
-#: includes/sysnames.inc:123
+#: ../includes/sysnames.inc:124
 msgid "Cost of Goods Sold"
 msgstr ""
 
-#: includes/sysnames.inc:124
+#: ../includes/sysnames.inc:125
 msgid "Expense"
 msgstr ""
 
-#: includes/sysnames.inc:131
+#: ../includes/sysnames.inc:132
 msgid "Remainder"
 msgstr ""
 
-#: includes/sysnames.inc:133
+#: ../includes/sysnames.inc:134
 msgid "Amount, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:134
+#: ../includes/sysnames.inc:135
 msgid "Amount, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:135
+#: ../includes/sysnames.inc:136
 msgid "% amount of base"
 msgstr ""
 
-#: includes/sysnames.inc:136
+#: ../includes/sysnames.inc:137
 msgid "% amount of base, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:137
+#: ../includes/sysnames.inc:138
 msgid "% amount of base, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:138
+#: ../includes/sysnames.inc:139
 msgid "Taxes added"
 msgstr ""
 
-#: includes/sysnames.inc:139
+#: ../includes/sysnames.inc:140
 msgid "Taxes added, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:140
+#: ../includes/sysnames.inc:141
 msgid "Taxes added, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:141
+#: ../includes/sysnames.inc:142
 msgid "Taxes included"
 msgstr ""
 
-#: includes/sysnames.inc:142
+#: ../includes/sysnames.inc:143
 msgid "Taxes included, increase base"
 msgstr ""
 
-#: includes/sysnames.inc:143
+#: ../includes/sysnames.inc:144
 msgid "Taxes included, reduce base"
 msgstr ""
 
-#: includes/sysnames.inc:150
+#: ../includes/sysnames.inc:151
 msgid "Supplier Invoice/Credit"
 msgstr ""
 
-#: includes/sysnames.inc:156 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:157
+#: ../includes/sysnames.inc:158
 msgid "Purchased"
 msgstr ""
 
-#: includes/sysnames.inc:158
+#: ../includes/sysnames.inc:159
 msgid "Service"
 msgstr ""
 
-#: includes/sysnames.inc:171
+#: ../includes/sysnames.inc:172
 msgid "Customer branch"
 msgstr ""
 
-#: includes/sysnames.inc:173
+#: ../includes/sysnames.inc:174
 msgid "Shipper"
 msgstr ""
 
-#: includes/sysnames.inc:174
+#: ../includes/sysnames.inc:175
 msgid "Company internal"
 msgstr ""
 
-#: includes/sysnames.inc:179
+#: ../includes/sysnames.inc:180
 msgid "Prepayment"
 msgstr ""
 
-#: includes/sysnames.inc:181
+#: ../includes/sysnames.inc:182
 msgid "After No. of Days"
 msgstr ""
 
-#: includes/sysnames.inc:182
+#: ../includes/sysnames.inc:183
 msgid "Day In Following Month"
 msgstr ""
 
-#: includes/system_tests.inc:15 includes/ui/ui_view.inc:210
-#: reporting/rep705.php:250 reporting/rep705.php:261 reporting/rep705.php:270
+#: ../includes/sysnames.inc:187
+msgid "Sum per line taxes"
+msgstr ""
+
+#: ../includes/sysnames.inc:188
+msgid "Taxes from totals"
+msgstr ""
+
+#: ../includes/system_tests.inc:15
+#: ../includes/ui/ui_view.inc:210
+#: ../includes/ui/ui_view.inc.orig:210
+#: ../reporting/rep705.php:250
+#: ../reporting/rep705.php:261
+#: ../reporting/rep705.php:270
 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: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 ""
 
-#: 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:363
+#: ../includes/system_tests.inc:363
 msgid "Extensions configuration files and directories should be writeable"
 msgstr ""
 
-#: includes/system_tests.inc:375
+#: ../includes/system_tests.inc:375
 #, php-format
 msgid "Non-standard theme directory '%s' is not writable"
 msgstr ""
 
-#: includes/system_tests.inc:385
+#: ../includes/system_tests.inc:385
 msgid ""
 "OpenSSL PHP extension have to be enabled to use extension repository system."
 msgstr ""
 
-#: includes/system_tests.inc:388
+#: ../includes/system_tests.inc:388
 msgid ""
 "OpenSSL have to be available on your server to use extension repository "
 "system."
 msgstr ""
 
-#: includes/system_tests.inc:411
+#: ../includes/system_tests.inc:411
 msgid "Test"
 msgstr ""
 
-#: includes/system_tests.inc:411
+#: ../includes/system_tests.inc:411
 msgid "Test type"
 msgstr ""
 
-#: includes/system_tests.inc:411 includes/ui/view_package.php:37
-#: reporting/rep204.php:83 reporting/rep301.php:103
+#: ../includes/system_tests.inc:411
+#: ../includes/ui/view_package.php:37
+#: ../reporting/rep204.php:83
+#: ../reporting/rep301.php:103
 msgid "Value"
 msgstr ""
 
-#: includes/system_tests.inc:411 reporting/reports_main.php:39
-#: reporting/reports_main.php:49 reporting/reports_main.php:57
-#: reporting/reports_main.php:63 reporting/reports_main.php:71
-#: reporting/reports_main.php:79 reporting/reports_main.php:85
-#: reporting/reports_main.php:93 reporting/reports_main.php:100
-#: reporting/reports_main.php:106 reporting/reports_main.php:112
-#: reporting/reports_main.php:119 reporting/reports_main.php:125
-#: reporting/reports_main.php:130 reporting/reports_main.php:139
-#: reporting/reports_main.php:149 reporting/reports_main.php:156
-#: reporting/reports_main.php:160 reporting/reports_main.php:167
-#: reporting/reports_main.php:173 reporting/reports_main.php:182
-#: reporting/reports_main.php:187 reporting/reports_main.php:196
-#: reporting/reports_main.php:204 reporting/reports_main.php:209
-#: reporting/reports_main.php:216 reporting/reports_main.php:222
-#: reporting/reports_main.php:230 reporting/reports_main.php:241
-#: reporting/reports_main.php:247 reporting/reports_main.php:253
-#: reporting/reports_main.php:267 reporting/reports_main.php:274
-#: reporting/reports_main.php:284 reporting/reports_main.php:295
-#: reporting/reports_main.php:304 reporting/reports_main.php:315
-#: reporting/reports_main.php:321 reporting/reports_main.php:330
-#: reporting/reports_main.php:340 reporting/reports_main.php:348
-#: reporting/reports_main.php:358 reporting/reports_main.php:363
-#: reporting/reports_main.php:371 reporting/reports_main.php:380
-#: reporting/reports_main.php:387 reporting/reports_main.php:394
-#: reporting/reports_main.php:401 reporting/includes/excel_report.inc:295
-#: reporting/includes/excel_report.inc:428
-#: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:618
-#: sales/view/view_sales_order.php:85
+#: ../includes/system_tests.inc:411
+#: ../reporting/reports_main.php:39
+#: ../reporting/reports_main.php:49
+#: ../reporting/reports_main.php:57
+#: ../reporting/reports_main.php:63
+#: ../reporting/reports_main.php:71
+#: ../reporting/reports_main.php:79
+#: ../reporting/reports_main.php:85
+#: ../reporting/reports_main.php:93
+#: ../reporting/reports_main.php:100
+#: ../reporting/reports_main.php:106
+#: ../reporting/reports_main.php:112
+#: ../reporting/reports_main.php:119
+#: ../reporting/reports_main.php:125
+#: ../reporting/reports_main.php:130
+#: ../reporting/reports_main.php:139
+#: ../reporting/reports_main.php:149
+#: ../reporting/reports_main.php:156
+#: ../reporting/reports_main.php:160
+#: ../reporting/reports_main.php:167
+#: ../reporting/reports_main.php:173
+#: ../reporting/reports_main.php:182
+#: ../reporting/reports_main.php:187
+#: ../reporting/reports_main.php:196
+#: ../reporting/reports_main.php:204
+#: ../reporting/reports_main.php:209
+#: ../reporting/reports_main.php:216
+#: ../reporting/reports_main.php:222
+#: ../reporting/reports_main.php:230
+#: ../reporting/reports_main.php:241
+#: ../reporting/reports_main.php:247
+#: ../reporting/reports_main.php:253
+#: ../reporting/reports_main.php:267
+#: ../reporting/reports_main.php:274
+#: ../reporting/reports_main.php:284
+#: ../reporting/reports_main.php:295
+#: ../reporting/reports_main.php:304
+#: ../reporting/reports_main.php:315
+#: ../reporting/reports_main.php:321
+#: ../reporting/reports_main.php:330
+#: ../reporting/reports_main.php:340
+#: ../reporting/reports_main.php:348
+#: ../reporting/reports_main.php:358
+#: ../reporting/reports_main.php:363
+#: ../reporting/reports_main.php:371
+#: ../reporting/reports_main.php:380
+#: ../reporting/reports_main.php:387
+#: ../reporting/reports_main.php:394
+#: ../reporting/reports_main.php:401
+#: ../reporting/includes/excel_report.inc:295
+#: ../reporting/includes/excel_report.inc:428
+#: ../reporting/includes/pdf_report.inc:346
+#: ../reporting/includes/pdf_report.inc:618
+#: ../sales/view/view_sales_order.php:98
+#: ../sales/view/view_sales_order.php.orig:85
 msgid "Comments"
 msgstr ""
 
-#: includes/system_tests.inc:435
+#: ../includes/system_tests.inc:435
 msgid "Ok"
 msgstr ""
 
-#: includes/db/audit_trail_db.inc:93
+#: ../includes/db/audit_trail_db.inc:99
 msgid ""
 "Some transactions journal GL postings were not indexed due to lack of audit "
 "trail record."
 msgstr ""
 
-#: includes/db/inventory_db.inc:252
+#: ../includes/db/inventory_db.inc:252
 msgid "Cost was "
 msgstr ""
 
-#: includes/db/inventory_db.inc:252
+#: ../includes/db/inventory_db.inc:252
 msgid " changed to "
 msgstr ""
 
-#: includes/db/inventory_db.inc:252
+#: ../includes/db/inventory_db.inc:252
 msgid " for item "
 msgstr ""
 
-#: includes/db/inventory_db.inc:292
+#: ../includes/db/inventory_db.inc:292
 msgid "Zero/negative inventory handling"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:263
-#: purchasing/allocations/supplier_allocation_main.php:94
-#: sales/allocations/customer_allocation_main.php:93
+#: ../includes/ui/allocation_cart.inc:264
+#: ../purchasing/allocations/supplier_allocation_main.php:94
+#: ../sales/allocations/customer_allocation_main.php:93
 msgid "Transaction Type"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:263 reporting/rep704.php:79
-#: reporting/rep704.php:82 reporting/rep704.php:85 reporting/rep709.php:109
-#: sales/view/view_credit.php:68 sales/view/view_sales_order.php:96
-#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161
-#: sales/inquiry/sales_orders_view.php:224
-#: sales/inquiry/sales_orders_view.php:261
-#: sales/inquiry/sales_orders_view.php:275
-#: sales/inquiry/sales_orders_view.php.orig:224
-#: sales/inquiry/sales_orders_view.php.orig:261
-#: sales/inquiry/sales_orders_view.php.orig:275
+#: ../includes/ui/allocation_cart.inc:264
+#: ../reporting/rep704.php:79
+#: ../reporting/rep704.php:82
+#: ../reporting/rep704.php:85
+#: ../reporting/rep709.php:109
+#: ../sales/view/view_credit.php:68
+#: ../sales/view/view_sales_order.php:109
+#: ../sales/view/view_sales_order.php:142
+#: ../sales/view/view_sales_order.php:179
+#: ../sales/view/view_sales_order.php.orig:96
+#: ../sales/view/view_sales_order.php.orig:129
+#: ../sales/view/view_sales_order.php.orig:161
+#: ../sales/inquiry/sales_orders_view.php:248
+#: ../sales/inquiry/sales_orders_view.php:285
+#: ../sales/inquiry/sales_orders_view.php:299
+#: ../sales/inquiry/sales_orders_view.php.orig:225
+#: ../sales/inquiry/sales_orders_view.php.orig:262
+#: ../sales/inquiry/sales_orders_view.php.orig:276
 msgid "Ref"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:264
+#: ../includes/ui/allocation_cart.inc:265
 msgid "Other Allocations"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:264 includes/ui/ui_view.inc:489
-#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
+#: ../includes/ui/allocation_cart.inc:265
+#: ../includes/ui/ui_view.inc:489
+#: ../includes/ui/ui_view.inc.orig:489
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
 msgid "This Allocation"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:264 includes/ui/allocation_cart.inc:311
-#: includes/ui/ui_view.inc:489
-#: purchasing/allocations/supplier_allocation_main.php:101
-#: reporting/rep112.php:145 reporting/rep210.php:159
-#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186
-#: sales/allocations/customer_allocation_main.php:100
+#: ../includes/ui/allocation_cart.inc:265
+#: ../includes/ui/allocation_cart.inc:314
+#: ../includes/ui/ui_view.inc:489
+#: ../includes/ui/ui_view.inc.orig:489
+#: ../purchasing/allocations/supplier_allocation_main.php:101
+#: ../reporting/rep112.php:141
+#: ../reporting/rep210.php:154
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+#: ../sales/allocations/customer_allocation_main.php:100
 msgid "Left to Allocate"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:294 reporting/rep112.php:142
-#: reporting/rep210.php:156
+#: ../includes/ui/allocation_cart.inc:297
+#: ../reporting/rep112.php:138
+#: ../reporting/rep210.php:151
 msgid "Total Allocated"
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:331
+#: ../includes/ui/allocation_cart.inc:334
 msgid "The entry for one or more amounts is invalid or negative."
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:340
+#: ../includes/ui/allocation_cart.inc:343
 msgid "At least one transaction is overallocated."
 msgstr ""
 
-#: includes/ui/allocation_cart.inc:358
+#: ../includes/ui/allocation_cart.inc:361
 msgid ""
 "These allocations cannot be processed because the amount allocated is more "
 "than the total amount left to allocate."
 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/rep103.php:223
-#: reporting/includes/header2.inc:104 sales/manage/sales_people.php:99
+#: ../includes/ui/contacts_view.inc:41
+#: ../reporting/rep103.php:223
+#: ../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:248
-#: sales/manage/customers.php.orig:249
+#: ../includes/ui/contacts_view.inc:102
+#: ../sales/manage/customers.php:252
+#: ../sales/manage/sav.customers.php:252
 msgid "Phone:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:105 inventory/manage/locations.php:207
-#: purchasing/manage/suppliers.php:157 sales/manage/customer_branches.php:263
-#: sales/manage/customers.php:251 sales/manage/customers.php.orig:252
-#: sales/manage/sales_people.php:158
+#: ../includes/ui/contacts_view.inc:105
+#: ../inventory/manage/locations.php:207
+#: ../purchasing/manage/suppliers.php:139
+#: ../purchasing/manage/suppliers.php.orig:117
+#: ../sales/manage/customer_branches.php:265
+#: ../sales/manage/customers.php:255
+#: ../sales/manage/sales_people.php:158
+#: ../sales/manage/sav.customers.php:255
 msgid "E-mail:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:110 purchasing/manage/suppliers.php:158
-#: sales/manage/customer_branches.php:264
+#: ../includes/ui/contacts_view.inc:110
+#: ../purchasing/manage/suppliers.php:140
+#: ../purchasing/manage/suppliers.php.orig:118
+#: ../sales/manage/customer_branches.php:266
 msgid "Document Language:"
 msgstr ""
 
-#: includes/ui/contacts_view.inc:110 sales/manage/customer_branches.php:264
+#: ../includes/ui/contacts_view.inc:110
+#: ../sales/manage/customer_branches.php:266
 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:132
 msgid "The contact name cannot be empty."
 msgstr ""
 
-#: includes/ui/contacts_view.inc:137
+#: ../includes/ui/contacts_view.inc:137
 msgid "Contact reference cannot be empty."
 msgstr ""
 
-#: includes/ui/contacts_view.inc:142
+#: ../includes/ui/contacts_view.inc:142
 msgid "You have to select at least one category."
 msgstr ""
 
-#: includes/ui/db_pager_view.inc:166 includes/ui/ui_input.inc:892
+#: ../includes/ui/db_pager_view.inc:166
+#: ../includes/ui/ui_input.inc:899
 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/sav.ui_lists.inc:17 includes/ui/ui_lists.inc:17
-#: includes/ui/ui_lists.inc.orig:17
-msgid "Set filter"
+#: ../includes/ui/simple_crud_class.inc:227
+#: ../includes/ui/ui_input.inc:207
+msgid "Submit changes"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:100 includes/ui/ui_lists.inc:100
-#: includes/ui/ui_lists.inc.orig:100
-msgid "Press Space tab for search pattern entry"
+#: ../includes/ui/simple_crud_class.inc:229
+#: ../includes/ui/ui_input.inc:208
+msgid "Clone"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:104 includes/ui/ui_lists.inc:104
-#: includes/ui/ui_lists.inc.orig:104
-msgid "Enter code fragment to search or * for all"
+#: ../includes/ui/simple_crud_class.inc:229
+#: ../includes/ui/ui_input.inc:209
+msgid "Edit new record with current data"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:105 includes/ui/ui_lists.inc:105
-#: includes/ui/ui_lists.inc.orig:105
-msgid "Enter description fragment to search or * for all"
+#: ../includes/ui/simple_crud_class.inc:231
+#: ../includes/ui/ui_input.inc:210
+msgid "Cancel edition"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:449 includes/ui/sav.ui_lists.inc:1367
-#: includes/ui/ui_lists.inc:438 includes/ui/ui_lists.inc:1356
-#: includes/ui/ui_lists.inc.orig:449 includes/ui/ui_lists.inc.orig:1367
-msgid "All Suppliers"
+#: ../includes/ui/ui_controls.inc:79
+msgid "Request from outside of this page is forbidden."
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:453 includes/ui/ui_lists.inc:442
-#: includes/ui/ui_lists.inc.orig:453
-msgid "Press Space tab to filter by name fragment"
+#: ../includes/ui/ui_controls.inc:80
+msgid "CSRF attack detected from: "
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:454 includes/ui/ui_lists.inc:443
-#: includes/ui/ui_lists.inc.orig:454
-msgid "Select supplier"
+#: ../includes/ui/ui_controls.inc:146
+msgid "You should automatically be forwarded."
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:498 includes/ui/ui_lists.inc:487
-#: includes/ui/ui_lists.inc.orig:498
-msgid "All Customers"
+#: ../includes/ui/ui_controls.inc:147
+msgid "If this does not happen"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:502 includes/ui/ui_lists.inc:491
-#: includes/ui/ui_lists.inc.orig:502
-msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
+#: ../includes/ui/ui_controls.inc:147
+msgid "click here"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:503 includes/ui/ui_lists.inc:492
-#: includes/ui/ui_lists.inc.orig:503
-msgid "Select customer"
+#: ../includes/ui/ui_controls.inc:147
+msgid "to continue"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:546 includes/ui/ui_lists.inc:535
-#: includes/ui/ui_lists.inc.orig:546
-msgid "All branches"
+#: ../includes/ui/ui_controls.inc:194
+msgid "View Attachment"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:549 includes/ui/ui_lists.inc:538
-#: includes/ui/ui_lists.inc.orig:549
-msgid "Select customer branch"
+#: ../includes/ui/ui_controls.inc:197
+msgid "Close"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:584 includes/ui/ui_lists.inc:573
-#: includes/ui/ui_lists.inc.orig:584
-msgid "All Locations"
+#: ../includes/ui/ui_controls.inc:457
+#: ../sales/manage/customers.php:23
+#: ../sales/manage/sav.customers.php:23
+msgid "Customers"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:736 includes/ui/sav.ui_lists.inc:801
-#: includes/ui/ui_lists.inc:725 includes/ui/ui_lists.inc:790
-#: includes/ui/ui_lists.inc.orig:736 includes/ui/ui_lists.inc.orig:801
-msgid "All Items"
+#: ../includes/ui/ui_controls.inc:459
+msgid "Branches"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1274 includes/ui/ui_lists.inc:1263
-#: includes/ui/ui_lists.inc.orig:1274
-msgid "All Sales Types"
+#: ../includes/ui/ui_controls.inc:461
+#: ../purchasing/manage/suppliers.php:22
+#: ../purchasing/manage/suppliers.php.orig:23
+msgid "Suppliers"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1603 includes/ui/ui_lists.inc:1592
-#: includes/ui/ui_lists.inc.orig:1603
-msgid "Use Item Sales Accounts"
+#: ../includes/ui/ui_controls.inc:463
+#: ../inventory/transfers.php:230
+#: ../inventory/manage/items.php:22
+#: ../inventory/manage/items.php.orig:21
+msgid "Items"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1915 includes/ui/sav.ui_lists.inc:1932
-#: includes/ui/sav.ui_lists.inc:1949 includes/ui/ui_lists.inc:1904
-#: includes/ui/ui_lists.inc:1921 includes/ui/ui_lists.inc:1938
-#: includes/ui/ui_lists.inc.orig:1915 includes/ui/ui_lists.inc.orig:1932
-#: includes/ui/ui_lists.inc.orig:1949
-msgid "All Types"
+#: ../includes/ui/ui_controls.inc:608
+msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1916 includes/ui/ui_lists.inc:1905
-#: includes/ui/ui_lists.inc.orig:1916 sales/view/view_sales_order.php:127
-msgid "Sales Invoices"
+#: ../includes/ui/ui_input.inc:628
+#: ../reporting/includes/reports_classes.inc:216
+msgid "Click Here to Pick up the date"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1917 includes/ui/sav.ui_lists.inc:1934
-#: includes/ui/sav.ui_lists.inc:1952 includes/ui/ui_lists.inc:1906
-#: includes/ui/ui_lists.inc:1923 includes/ui/ui_lists.inc:1941
-#: includes/ui/ui_lists.inc.orig:1917 includes/ui/ui_lists.inc.orig:1934
-#: includes/ui/ui_lists.inc.orig:1952
-msgid "Overdue Invoices"
+#: ../includes/ui/ui_input.inc:911
+#: ../includes/ui/ui_lists.inc:2156
+#: ../includes/ui/ui_lists.inc.orig:2154
+#: ../reporting/rep301.php:152
+#: ../reporting/rep302.php:166
+#: ../reporting/rep303.php:170
+#: ../reporting/rep304.php:166
+#: ../reporting/rep304.php:170
+#: ../sales/manage/customer_branches.php:304
+msgid "Inactive"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1918 includes/ui/sav.ui_lists.inc:1935
-#: includes/ui/sav.ui_lists.inc:1953 includes/ui/ui_lists.inc:1907
-#: includes/ui/ui_lists.inc:1924 includes/ui/ui_lists.inc:1942
-#: includes/ui/ui_lists.inc.orig:1918 includes/ui/ui_lists.inc.orig:1935
-#: includes/ui/ui_lists.inc.orig:1953 includes/ui/ui_view.inc:484
-msgid "Payments"
+#: ../includes/ui/ui_input.inc:921
+#: ../includes/ui/ui_input.inc:933
+msgid "Current Credit:"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1919 includes/ui/sav.ui_lists.inc:1936
-#: includes/ui/sav.ui_lists.inc:1954 includes/ui/ui_lists.inc:1908
-#: includes/ui/ui_lists.inc:1925 includes/ui/ui_lists.inc:1943
-#: includes/ui/ui_lists.inc.orig:1919 includes/ui/ui_lists.inc.orig:1936
-#: includes/ui/ui_lists.inc.orig:1954 sales/view/view_sales_order.php:158
-msgid "Credit Notes"
+#: ../includes/ui/ui_input.inc:967
+msgid "Bank Balance:"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1920 includes/ui/ui_lists.inc:1909
-#: includes/ui/ui_lists.inc.orig:1920 sales/view/view_sales_order.php:93
-msgid "Delivery Notes"
+#: ../includes/ui/ui_lists.inc:17
+#: ../includes/ui/ui_lists.inc.orig:17
+msgid "Set filter"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1933 includes/ui/sav.ui_lists.inc:1951
-#: includes/ui/ui_lists.inc:1922 includes/ui/ui_lists.inc:1940
-#: includes/ui/ui_lists.inc.orig:1933 includes/ui/ui_lists.inc.orig:1951
-msgid "Invoices"
+#: ../includes/ui/ui_lists.inc:100
+#: ../includes/ui/ui_lists.inc.orig:100
+msgid "Press Space tab for search pattern entry"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1937 includes/ui/sav.ui_lists.inc:1955
-#: includes/ui/ui_lists.inc:1926 includes/ui/ui_lists.inc:1944
-#: includes/ui/ui_lists.inc.orig:1937 includes/ui/ui_lists.inc.orig:1955
-msgid "Overdue Credit Notes"
+#: ../includes/ui/ui_lists.inc:104
+#: ../includes/ui/ui_lists.inc.orig:104
+msgid "Enter code fragment to search or * for all"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1950 includes/ui/ui_lists.inc:1939
-#: includes/ui/ui_lists.inc.orig:1950
-msgid "GRNs"
+#: ../includes/ui/ui_lists.inc:105
+#: ../includes/ui/ui_lists.inc.orig:105
+msgid "Enter description fragment to search or * for all"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1968 includes/ui/ui_lists.inc:1957
-#: includes/ui/ui_lists.inc.orig:1968
-msgid "Automatically put balance on back order"
+#: ../includes/ui/ui_lists.inc:453
+#: ../includes/ui/ui_lists.inc:1386
+#: ../includes/ui/ui_lists.inc.orig:453
+#: ../includes/ui/ui_lists.inc.orig:1386
+msgid "All Suppliers"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1969 includes/ui/ui_lists.inc:1958
-#: includes/ui/ui_lists.inc.orig:1969
-msgid "Cancel any quantites not delivered"
+#: ../includes/ui/ui_lists.inc:457
+#: ../includes/ui/ui_lists.inc.orig:457
+msgid "Press Space tab to filter by name fragment"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1986 includes/ui/ui_lists.inc:1975
-#: includes/ui/ui_lists.inc.orig:1986
-msgid "Items Returned to Inventory Location"
+#: ../includes/ui/ui_lists.inc:458
+#: ../includes/ui/ui_lists.inc.orig:458
+msgid "Select supplier"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:1987 includes/ui/ui_lists.inc:1976
-#: includes/ui/ui_lists.inc.orig:1987
-msgid "Items Written Off"
+#: ../includes/ui/ui_lists.inc:505
+#: ../includes/ui/ui_lists.inc.orig:505
+msgid "All Customers"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2131 includes/ui/ui_input.inc:904
-#: includes/ui/ui_lists.inc:2120 includes/ui/ui_lists.inc.orig:2131
-#: reporting/rep301.php:152 reporting/rep302.php:166 reporting/rep303.php:170
-#: reporting/rep304.php:166 reporting/rep304.php:170
-#: sales/manage/customer_branches.php:302
-msgid "Inactive"
+#: ../includes/ui/ui_lists.inc:509
+#: ../includes/ui/ui_lists.inc.orig:509
+msgid "Press Space tab to filter by name fragment; F2 - entry new customer"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2157 includes/ui/ui_lists.inc:2146
-#: includes/ui/ui_lists.inc.orig:2157
-msgid "New role"
+#: ../includes/ui/ui_lists.inc:510
+#: ../includes/ui/ui_lists.inc.orig:510
+msgid "Select customer"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2215 includes/ui/ui_lists.inc:2204
-#: includes/ui/ui_lists.inc.orig:2215
-msgid "No tags defined."
+#: ../includes/ui/ui_lists.inc:557
+#: ../includes/ui/ui_lists.inc.orig:557
+msgid "All branches"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2215 includes/ui/ui_lists.inc:2204
-#: includes/ui/ui_lists.inc.orig:2215
-msgid "No active tags defined."
+#: ../includes/ui/ui_lists.inc:560
+#: ../includes/ui/ui_lists.inc.orig:560
+msgid "Select customer branch"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2253 includes/ui/ui_lists.inc:2242
-#: includes/ui/ui_lists.inc.orig:2253
-#, php-format
-msgid "Activated for '%s'"
+#: ../includes/ui/ui_lists.inc:600
+#: ../includes/ui/ui_lists.inc.orig:600
+msgid "All Locations"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2256 includes/ui/ui_lists.inc:2245
-#: includes/ui/ui_lists.inc.orig:2256
-msgid "Available and/or installed"
+#: ../includes/ui/ui_lists.inc:752
+#: ../includes/ui/ui_lists.inc:820
+#: ../includes/ui/ui_lists.inc.orig:752
+#: ../includes/ui/ui_lists.inc.orig:820
+msgid "All Items"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2326 includes/ui/ui_lists.inc:2315
-#: includes/ui/ui_lists.inc.orig:2326
-msgid "Standard new company American COA (4 digit)"
+#: ../includes/ui/ui_lists.inc:1293
+#: ../includes/ui/ui_lists.inc.orig:1293
+msgid "All Sales Types"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2328 includes/ui/ui_lists.inc:2317
-#: includes/ui/ui_lists.inc.orig:2328
-msgid "Standard American COA (4 digit) with demo data"
+#: ../includes/ui/ui_lists.inc:1628
+#: ../includes/ui/ui_lists.inc.orig:1626
+msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: includes/ui/sav.ui_lists.inc:2349 includes/ui/ui_lists.inc:2338
-#: includes/ui/ui_lists.inc.orig:2349
-msgid "No payment Link"
+#: ../includes/ui/ui_lists.inc:1940
+#: ../includes/ui/ui_lists.inc:1957
+#: ../includes/ui/ui_lists.inc:1974
+#: ../includes/ui/ui_lists.inc.orig:1938
+#: ../includes/ui/ui_lists.inc.orig:1955
+#: ../includes/ui/ui_lists.inc.orig:1972
+msgid "All Types"
 msgstr ""
 
-#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:203
-msgid "Submit changes"
+#: ../includes/ui/ui_lists.inc:1941
+#: ../includes/ui/ui_lists.inc.orig:1939
+#: ../sales/view/view_sales_order.php:140
+#: ../sales/view/view_sales_order.php.orig:127
+msgid "Sales Invoices"
 msgstr ""
 
-#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:204
-msgid "Clone"
+#: ../includes/ui/ui_lists.inc:1942
+#: ../includes/ui/ui_lists.inc:1959
+#: ../includes/ui/ui_lists.inc:1977
+#: ../includes/ui/ui_lists.inc.orig:1940
+#: ../includes/ui/ui_lists.inc.orig:1957
+#: ../includes/ui/ui_lists.inc.orig:1975
+msgid "Overdue Invoices"
 msgstr ""
 
-#: includes/ui/simple_crud_class.inc:229 includes/ui/ui_input.inc:205
-msgid "Edit new record with current data"
+#: ../includes/ui/ui_lists.inc:1943
+#: ../includes/ui/ui_lists.inc:1960
+#: ../includes/ui/ui_lists.inc:1978
+#: ../includes/ui/ui_lists.inc.orig:1941
+#: ../includes/ui/ui_lists.inc.orig:1958
+#: ../includes/ui/ui_lists.inc.orig:1976
+#: ../includes/ui/ui_view.inc:550
+#: ../includes/ui/ui_view.inc:554
+#: ../includes/ui/ui_view.inc.orig:484
+msgid "Payments"
 msgstr ""
 
-#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_input.inc:206
-msgid "Cancel edition"
+#: ../includes/ui/ui_lists.inc:1944
+#: ../includes/ui/ui_lists.inc:1961
+#: ../includes/ui/ui_lists.inc:1979
+#: ../includes/ui/ui_lists.inc.orig:1942
+#: ../includes/ui/ui_lists.inc.orig:1959
+#: ../includes/ui/ui_lists.inc.orig:1977
+#: ../sales/view/view_sales_order.php:176
+#: ../sales/view/view_sales_order.php.orig:158
+msgid "Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:72
-msgid "Request from outside of this page is forbidden."
+#: ../includes/ui/ui_lists.inc:1945
+#: ../includes/ui/ui_lists.inc.orig:1943
+#: ../sales/view/view_sales_order.php:106
+#: ../sales/view/view_sales_order.php.orig:93
+msgid "Delivery Notes"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:73
-msgid "CSRF attack detected from: "
+#: ../includes/ui/ui_lists.inc:1958
+#: ../includes/ui/ui_lists.inc:1976
+#: ../includes/ui/ui_lists.inc.orig:1956
+#: ../includes/ui/ui_lists.inc.orig:1974
+msgid "Invoices"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:139
-msgid "You should automatically be forwarded."
+#: ../includes/ui/ui_lists.inc:1962
+#: ../includes/ui/ui_lists.inc:1980
+#: ../includes/ui/ui_lists.inc.orig:1960
+#: ../includes/ui/ui_lists.inc.orig:1978
+msgid "Overdue Credit Notes"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:140
-msgid "If this does not happen"
+#: ../includes/ui/ui_lists.inc:1975
+#: ../includes/ui/ui_lists.inc.orig:1973
+msgid "GRNs"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:140
-msgid "click here"
+#: ../includes/ui/ui_lists.inc:1993
+#: ../includes/ui/ui_lists.inc.orig:1991
+msgid "Automatically put balance on back order"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:140
-msgid "to continue"
+#: ../includes/ui/ui_lists.inc:1994
+#: ../includes/ui/ui_lists.inc.orig:1992
+msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:187
-msgid "View Attachment"
+#: ../includes/ui/ui_lists.inc:2011
+#: ../includes/ui/ui_lists.inc.orig:2009
+msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:190
-msgid "Close"
+#: ../includes/ui/ui_lists.inc:2012
+#: ../includes/ui/ui_lists.inc.orig:2010
+msgid "Items Written Off"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:450 sales/manage/customers.php:19
-#: sales/manage/customers.php.orig:20
-msgid "Customers"
+#: ../includes/ui/ui_lists.inc:2182
+#: ../includes/ui/ui_lists.inc.orig:2180
+msgid "New role"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:452
-msgid "Branches"
+#: ../includes/ui/ui_lists.inc:2240
+#: ../includes/ui/ui_lists.inc.orig:2238
+msgid "No tags defined."
 msgstr ""
 
-#: includes/ui/ui_controls.inc:454 purchasing/manage/suppliers.php:19
-msgid "Suppliers"
+#: ../includes/ui/ui_lists.inc:2240
+#: ../includes/ui/ui_lists.inc.orig:2238
+msgid "No active tags defined."
 msgstr ""
 
-#: includes/ui/ui_controls.inc:456 inventory/transfers.php:230
-#: inventory/manage/items.php:19
-msgid "Items"
+#: ../includes/ui/ui_lists.inc:2278
+#: ../includes/ui/ui_lists.inc.orig:2276
+#, php-format
+msgid "Activated for '%s'"
 msgstr ""
 
-#: includes/ui/ui_controls.inc:601
-msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
+#: ../includes/ui/ui_lists.inc:2281
+#: ../includes/ui/ui_lists.inc.orig:2279
+msgid "Available and/or installed"
 msgstr ""
 
-#: includes/ui/ui_input.inc:621 reporting/includes/reports_classes.inc:216
-msgid "Click Here to Pick up the date"
+#: ../includes/ui/ui_lists.inc:2351
+#: ../includes/ui/ui_lists.inc.orig:2349
+msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: includes/ui/ui_input.inc:914 includes/ui/ui_input.inc:926
-msgid "Current Credit:"
+#: ../includes/ui/ui_lists.inc:2353
+#: ../includes/ui/ui_lists.inc.orig:2351
+msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: includes/ui/ui_input.inc:940
-msgid "Bank Balance:"
+#: ../includes/ui/ui_lists.inc:2374
+#: ../includes/ui/ui_lists.inc.orig: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:306
+#: ../includes/ui/ui_view.inc.orig:306
 msgid "Date Voided:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:407 reporting/rep107.php:171
-#: reporting/rep109.php:179 reporting/rep110.php:184 reporting/rep111.php:166
-#: reporting/rep113.php:173 reporting/rep209.php:188
+#: ../includes/ui/ui_view.inc:407
+#: ../includes/ui/ui_view.inc.orig:407
+#: ../reporting/rep107.php:242
+#: ../reporting/rep109.php:183
+#: ../reporting/rep110.php:186
+#: ../reporting/rep111.php:168
+#: ../reporting/rep113.php:172
+#: ../reporting/rep209.php:191
 msgid "Total Tax Excluded"
 msgstr ""
 
-#: includes/ui/ui_view.inc:413 includes/ui/ui_view.inc:432
-#: includes/ui/ui_view.inc:451 reporting/rep107.php:180
-#: reporting/rep109.php:188 reporting/rep110.php:193 reporting/rep111.php:175
-#: reporting/rep113.php:182 reporting/rep209.php:197
+#: ../includes/ui/ui_view.inc:413
+#: ../includes/ui/ui_view.inc:432
+#: ../includes/ui/ui_view.inc:451
+#: ../includes/ui/ui_view.inc.orig:413
+#: ../includes/ui/ui_view.inc.orig:432
+#: ../includes/ui/ui_view.inc.orig:451
+#: ../reporting/rep107.php:251
+#: ../reporting/rep109.php:192
+#: ../reporting/rep110.php:195
+#: ../reporting/rep111.php:177
+#: ../reporting/rep113.php:181
+#: ../reporting/rep209.php:200
 msgid "Included"
 msgstr ""
 
-#: includes/ui/ui_view.inc:484
-#: purchasing/inquiry/supplier_allocation_inquiry.php:100
-msgid "Allocations"
-msgstr ""
-
-#: includes/ui/ui_view.inc:488 reporting/includes/doctext.inc:145
-#: reporting/includes/doctext.inc:186
+#: ../includes/ui/ui_view.inc:488
+#: ../includes/ui/ui_view.inc.orig:488
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
 msgid "Total Amount"
 msgstr ""
 
-#: includes/ui/ui_view.inc:512
+#: ../includes/ui/ui_view.inc:511
+#: ../includes/ui/ui_view.inc.orig:512
 msgid "Total Allocated:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:516
+#: ../includes/ui/ui_view.inc:517
+#: ../includes/ui/ui_view.inc.orig:516
 msgid "Left to Allocate:"
 msgstr ""
 
-#: includes/ui/ui_view.inc:569
+#: ../includes/ui/ui_view.inc:533
+#: ../includes/ui/ui_view.inc:537
+#: ../includes/ui/ui_view.inc.orig:484
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:99
+msgid "Allocations"
+msgstr ""
+
+#: ../includes/ui/ui_view.inc:550
+#: ../includes/ui/ui_view.inc:554
+msgid "Pre-Payments"
+msgstr ""
+
+#: ../includes/ui/ui_view.inc:570
+#: ../includes/ui/ui_view.inc.orig:569
 msgid "No Quick Entries are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:597
+#: ../includes/ui/ui_view.inc:598
+#: ../includes/ui/ui_view.inc.orig:597
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
-#: includes/ui/ui_view.inc:779 purchasing/includes/ui/invoice_ui.inc:452
+#: ../includes/ui/ui_view.inc:780
+#: ../includes/ui/ui_view.inc.orig:779
+#: ../purchasing/includes/ui/invoice_ui.inc:473
 msgid "and"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "January"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "February"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "March"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "April"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "May"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "June"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "July"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "August"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "September"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "October"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "November"
 msgstr ""
 
-#: includes/ui/ui_view.inc:840
+#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc.orig:840
 msgid "December"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
 msgid "Su"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
 msgid "Mo"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
 msgid "Tu"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
 msgid "We"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
 msgid "Th"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
 msgid "Fr"
 msgstr ""
 
-#: includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc.orig:841
 msgid "Sa"
 msgstr ""
 
-#: includes/ui/ui_view.inc:842
+#: ../includes/ui/ui_view.inc:843
+#: ../includes/ui/ui_view.inc.orig:842
 msgid "W"
 msgstr ""
 
-#: includes/ui/view_package.php:7
+#: ../includes/ui/view_package.php:7
 msgid "Package Details"
 msgstr ""
 
-#: includes/ui/view_package.php:14
+#: ../includes/ui/view_package.php:14
 msgid ""
 "The script must be called with a valid package id to review the info for."
 msgstr ""
 
-#: includes/ui/view_package.php:19
+#: ../includes/ui/view_package.php:19
 msgid "Available version"
 msgstr ""
 
-#: includes/ui/view_package.php:20
+#: ../includes/ui/view_package.php:20
 msgid "Package type"
 msgstr ""
 
-#: includes/ui/view_package.php:21
+#: ../includes/ui/view_package.php:21
 msgid "Package content"
 msgstr ""
 
-#: includes/ui/view_package.php:23
+#: ../includes/ui/view_package.php:23
 msgid "Author"
 msgstr ""
 
-#: includes/ui/view_package.php:24
+#: ../includes/ui/view_package.php:24
 msgid "Home page"
 msgstr ""
 
-#: includes/ui/view_package.php:25
+#: ../includes/ui/view_package.php:25
 msgid "Package maintainer"
 msgstr ""
 
-#: includes/ui/view_package.php:26
+#: ../includes/ui/view_package.php:26
 msgid "Installation path"
 msgstr ""
 
-#: includes/ui/view_package.php:27
+#: ../includes/ui/view_package.php:27
 msgid "Minimal software versions"
 msgstr ""
 
-#: includes/ui/view_package.php:28
+#: ../includes/ui/view_package.php:28
 msgid "Right to left"
 msgstr ""
 
-#: includes/ui/view_package.php:29
+#: ../includes/ui/view_package.php:29
 msgid "Charset encoding"
 msgstr ""
 
-#: includes/ui/view_package.php:34
+#: ../includes/ui/view_package.php:34
 #, php-format
 msgid "Content information for package '%s'"
 msgstr ""
 
-#: includes/ui/view_package.php:37
+#: ../includes/ui/view_package.php:37
 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:90 inventory/transfers.php:87
-#: sales/sales_order_entry.php:350
+#: ../inventory/adjustments.php:90
+#: ../inventory/transfers.php:87
+#: ../sales/sales_order_entry.php:355
 msgid "You must enter at least one non empty item line."
 msgstr ""
 
-#: inventory/adjustments.php:110 inventory/transfers.php:105
+#: ../inventory/adjustments.php:110
+#: ../inventory/transfers.php:105
 msgid "The entered date for the adjustment is invalid."
 msgstr ""
 
-#: inventory/adjustments.php:124
+#: ../inventory/adjustments.php:124
 msgid ""
 "The adjustment cannot be processed because an adjustment item would cause a "
 "negative inventory balance :"
 msgstr ""
 
-#: inventory/adjustments.php:154 manufacturing/work_order_issue.php:141
+#: ../inventory/adjustments.php:154
+#: ../manufacturing/work_order_issue.php:141
 msgid "The quantity entered is negative or invalid."
 msgstr ""
 
-#: inventory/adjustments.php:161 manufacturing/work_order_issue.php:148
+#: ../inventory/adjustments.php:161
+#: ../manufacturing/work_order_issue.php:148
 msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
-#: inventory/adjustments.php:230
+#: ../inventory/adjustments.php:230
 msgid "Adjustment Items"
 msgstr ""
 
-#: inventory/adjustments.php:236
+#: ../inventory/adjustments.php:236
 msgid "Process Adjustment"
 msgstr ""
 
-#: inventory/cost_update.php:26
+#: ../inventory/cost_update.php:26
 msgid "Inventory Item Cost Update"
 msgstr ""
 
-#: inventory/cost_update.php:30
+#: ../inventory/cost_update.php:30
 msgid ""
 "There are no costable inventory items defined in the system (Purchased or "
 "manufactured items)."
 msgstr ""
 
-#: inventory/cost_update.php:51
+#: ../inventory/cost_update.php:51
 msgid "The entered cost is not numeric."
 msgstr ""
 
-#: inventory/cost_update.php:57
+#: ../inventory/cost_update.php:57
 msgid "The new cost is the same as the old cost. Cost was not updated."
 msgstr ""
 
-#: inventory/cost_update.php:67
+#: ../inventory/cost_update.php:67
 msgid "Cost has been updated."
 msgstr ""
 
-#: inventory/cost_update.php:71
+#: ../inventory/cost_update.php:71
 msgid "View the GL Journal Entries for this Cost Update"
 msgstr ""
 
-#: inventory/cost_update.php:85 inventory/prices.php:56
-#: inventory/purchasing_data.php:101 inventory/reorder_level.php:43
-#: inventory/inquiry/stock_movements.php:53
-#: inventory/inquiry/stock_status.php:47 inventory/manage/item_codes.php:105
-#: manufacturing/work_order_entry.php:396
-#: manufacturing/work_order_entry.php:401 purchasing/inquiry/po_search.php:74
-#: sales/inquiry/sales_deliveries_view.php:114
-#: sales/inquiry/sales_orders_view.php:239
-#: sales/inquiry/sales_orders_view.php.orig:239
+#: ../inventory/cost_update.php:85
+#: ../inventory/prices.php:56
+#: ../inventory/purchasing_data.php:101
+#: ../inventory/reorder_level.php:43
+#: ../inventory/inquiry/stock_movements.php:49
+#: ../inventory/inquiry/stock_movements.php.orig:51
+#: ../inventory/inquiry/stock_status.php:41
+#: ../inventory/inquiry/stock_status.php.orig:47
+#: ../inventory/manage/item_codes.php:105
+#: ../manufacturing/work_order_entry.php:396
+#: ../manufacturing/work_order_entry.php:401
+#: ../purchasing/inquiry/po_search.php:74
+#: ../sales/inquiry/sales_deliveries_view.php:114
+#: ../sales/inquiry/sales_deliveries_view.php.orig:114
+#: ../sales/inquiry/sales_orders_view.php:263
+#: ../sales/inquiry/sales_orders_view.php.orig:240
 msgid "Item:"
 msgstr ""
 
-#: inventory/cost_update.php:102
+#: ../inventory/cost_update.php:102
 msgid "Standard Material Cost Per Unit"
 msgstr ""
 
-#: inventory/cost_update.php:105
+#: ../inventory/cost_update.php:105
 msgid "Standard Labour Cost Per Unit"
 msgstr ""
 
-#: inventory/cost_update.php:106
+#: ../inventory/cost_update.php:106
 msgid "Standard Overhead Cost Per Unit"
 msgstr ""
 
-#: inventory/prices.php:16
+#: ../inventory/prices.php:16
 msgid "Inventory Item Sales prices"
 msgstr ""
 
-#: inventory/prices.php:27 inventory/inquiry/stock_movements.php:32
-#: inventory/inquiry/stock_status.php:37 inventory/manage/sales_kits.php:24
-#: manufacturing/inquiry/where_used_inquiry.php:21
-#: sales/credit_note_entry.php:49
+#: ../inventory/prices.php:27
+#: ../inventory/inquiry/stock_movements.php:29
+#: ../inventory/inquiry/stock_movements.php.orig:31
+#: ../inventory/inquiry/stock_status.php:32
+#: ../inventory/inquiry/stock_status.php.orig:37
+#: ../inventory/manage/sales_kits.php:24
+#: ../manufacturing/inquiry/where_used_inquiry.php:21
+#: ../sales/credit_note_entry.php:49
 msgid "There are no items defined in the system."
 msgstr ""
 
-#: inventory/prices.php:29
+#: ../inventory/prices.php:29
 msgid ""
 "There are no sales types in the system. Please set up sales types befor "
 "entering pricing."
 msgstr ""
 
-#: inventory/prices.php:70
+#: ../inventory/prices.php:70
 msgid "The price entered must be numeric."
 msgstr ""
 
-#: inventory/prices.php:83
+#: ../inventory/prices.php:83
 msgid "This price has been updated."
 msgstr ""
 
-#: inventory/prices.php:91
+#: ../inventory/prices.php:91
 msgid "The new price has been added."
 msgstr ""
 
-#: inventory/prices.php:105
+#: ../inventory/prices.php:105
 msgid "The selected price has been deleted."
 msgstr ""
 
-#: inventory/prices.php:133 reporting/rep104.php:116
-#: sales/customer_delivery.php:355 sales/customer_invoice.php:400
-#: sales/view/view_credit.php:73 sales/view/view_dispatch.php:93
-#: sales/view/view_invoice.php:92 sales/includes/ui/sales_credit_ui.inc:102
+#: ../inventory/prices.php:133
+#: ../reporting/rep104.php:116
+#: ../sales/customer_delivery.php:363
+#: ../sales/customer_invoice.php:466
+#: ../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:133 inventory/purchasing_data.php:129
-#: purchasing/includes/ui/invoice_ui.inc:484
-#: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41
-#: purchasing/view/view_po.php:45 reporting/rep104.php:109
-#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170
-#: sales/customer_credit_invoice.php:283 sales/customer_delivery.php:433
-#: sales/customer_invoice.php:468 sales/view/view_credit.php:91
-#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
-#: sales/view/view_sales_order.php:202
-#: sales/includes/ui/sales_credit_ui.inc:168
+#: ../inventory/prices.php:133
+#: ../inventory/purchasing_data.php:129
+#: ../inventory/purchasing_data.php.orig:224
+#: ../purchasing/includes/ui/invoice_ui.inc:505
+#: ../purchasing/po_receive_items.php:63
+#: ../purchasing/view/view_grn.php:41
+#: ../purchasing/view/view_po.php:45
+#: ../reporting/rep104.php:109
+#: ../reporting/includes/doctext.inc:30
+#: ../reporting/includes/doctext.inc:192
+#: ../sales/customer_credit_invoice.php:283
+#: ../sales/customer_delivery.php:441
+#: ../sales/customer_invoice.php:540
+#: ../sales/customer_invoice.php:543
+#: ../sales/view/view_credit.php:91
+#: ../sales/view/view_dispatch.php:113
+#: ../sales/view/view_invoice.php:116
+#: ../sales/view/view_sales_order.php:220
+#: ../sales/view/view_sales_order.php.orig:202
+#: ../sales/includes/ui/sales_credit_ui.inc:168
 msgid "Price"
 msgstr ""
 
-#: inventory/prices.php:155
+#: ../inventory/prices.php:155
 msgid "There are no prices set up for this part."
 msgstr ""
 
-#: inventory/prices.php:174
+#: ../inventory/prices.php:174
+#: ../inventory/purchasing_data.php.orig:189
 msgid "Currency:"
 msgstr ""
 
-#: inventory/prices.php:176
+#: ../inventory/prices.php:176
 msgid "Sales Type:"
 msgstr ""
 
-#: inventory/prices.php:184 inventory/purchasing_data.php:191
+#: ../inventory/prices.php:184
+#: ../inventory/purchasing_data.php:191
+#: ../inventory/purchasing_data.php.orig:193
 msgid "Price:"
 msgstr ""
 
-#: inventory/prices.php:184
+#: ../inventory/prices.php:184
 msgid "per"
 msgstr ""
 
-#: inventory/prices.php:188
+#: ../inventory/prices.php:188
 msgid "The price is calculated."
 msgstr ""
 
-#: inventory/purchasing_data.php:16
+#: ../inventory/purchasing_data.php:16
+#: ../inventory/purchasing_data.php.orig:17
 msgid "Supplier Purchasing Data"
 msgstr ""
 
-#: inventory/purchasing_data.php:23 purchasing/po_entry_items.php:64
+#: ../inventory/purchasing_data.php:23
+#: ../inventory/purchasing_data.php.orig:24
+#: ../purchasing/po_entry_items.php:67
 msgid "There are no purchasable inventory items defined in the system."
 msgstr ""
 
-#: inventory/purchasing_data.php:24 purchasing/po_entry_items.php:62
-#: purchasing/supplier_credit.php:32 purchasing/supplier_invoice.php:32
-#: purchasing/supplier_payment.php:40
+#: ../inventory/purchasing_data.php:24
+#: ../inventory/purchasing_data.php.orig:25
+#: ../purchasing/po_entry_items.php:65
+#: ../purchasing/supplier_credit.php:31
+#: ../purchasing/supplier_invoice.php:30
+#: ../purchasing/supplier_payment.php:40
 msgid "There are no suppliers defined in the system."
 msgstr ""
 
-#: inventory/purchasing_data.php:38 inventory/manage/item_codes.php:35
+#: ../inventory/purchasing_data.php:38
+#: ../inventory/purchasing_data.php.orig:39
+#: ../inventory/manage/item_codes.php:35
 msgid "There is no item selected."
 msgstr ""
 
-#: inventory/purchasing_data.php:44
+#: ../inventory/purchasing_data.php:44
+#: ../inventory/purchasing_data.php.orig:45
 msgid "The price entered was not numeric."
 msgstr ""
 
-#: inventory/purchasing_data.php:50
+#: ../inventory/purchasing_data.php:50
+#: ../inventory/purchasing_data.php.orig:51
 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:60
+#: ../inventory/purchasing_data.php:60
+#: ../inventory/purchasing_data.php.orig:61
 msgid "This supplier purchasing data has been added."
 msgstr ""
 
-#: inventory/purchasing_data.php:66
+#: ../inventory/purchasing_data.php:66
+#: ../inventory/purchasing_data.php.orig:67
 msgid "Supplier purchasing data has been updated."
 msgstr ""
 
-#: inventory/purchasing_data.php:77
+#: ../inventory/purchasing_data.php:77
+#: ../inventory/purchasing_data.php.orig:88
 msgid "The purchasing data item has been sucessfully deleted."
 msgstr ""
 
-#: inventory/purchasing_data.php:114
+#: ../inventory/purchasing_data.php:114
 msgid "Entered item is not defined. Please re-enter."
 msgstr ""
 
-#: inventory/purchasing_data.php:123
+#: ../inventory/purchasing_data.php:123
 msgid "There is no purchasing data set up for the part selected"
 msgstr ""
 
-#: inventory/purchasing_data.php:130
+#: ../inventory/purchasing_data.php:130
+#: ../inventory/purchasing_data.php.orig:222
 msgid "Supplier's Unit"
 msgstr ""
 
-#: inventory/purchasing_data.php:130
+#: ../inventory/purchasing_data.php:130
+#: ../inventory/purchasing_data.php.orig:223
 msgid "Conversion Factor"
 msgstr ""
 
-#: inventory/purchasing_data.php:130
+#: ../inventory/purchasing_data.php:130
 msgid "Supplier's Description"
 msgstr ""
 
-#: inventory/purchasing_data.php:192
+#: ../inventory/purchasing_data.php:192
+#: ../inventory/purchasing_data.php.orig:194
 msgid "Suppliers Unit of Measure:"
 msgstr ""
 
-#: inventory/purchasing_data.php:198
+#: ../inventory/purchasing_data.php:198
+#: ../inventory/purchasing_data.php.orig:200
 msgid "Conversion Factor (to our UOM):"
 msgstr ""
 
-#: inventory/purchasing_data.php:200
+#: ../inventory/purchasing_data.php:200
+#: ../inventory/purchasing_data.php.orig:202
 msgid "Supplier's Code or Description:"
 msgstr ""
 
-#: inventory/reorder_level.php:16
+#: ../inventory/purchasing_data.php.orig:116
+msgid "Show all:"
+msgstr ""
+
+#: ../inventory/purchasing_data.php.orig:185
+msgid "Stock item:"
+msgstr ""
+
+#: ../inventory/purchasing_data.php.orig:219
+msgid "Supplier Code/Description"
+msgstr ""
+
+#: ../inventory/purchasing_data.php.orig:220
+#: ../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:243
+#: ../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:282
+#: ../sales/customer_delivery.php:439
+#: ../sales/customer_invoice.php:539
+#: ../sales/customer_invoice.php:542
+#: ../sales/view/view_credit.php:90
+#: ../sales/view/view_dispatch.php:112
+#: ../sales/view/view_invoice.php:115
+#: ../sales/view/view_sales_order.php:219
+#: ../sales/view/view_sales_order.php.orig:201
+#: ../sales/includes/ui/sales_credit_ui.inc:167
+#: ../sales/includes/ui/sales_order_ui.inc:140
+#: ../sales/includes/ui/sales_order_ui.inc.orig:140
+msgid "Item Code"
+msgstr ""
+
+#: ../inventory/purchasing_data.php.orig:221
+#: ../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:243
+#: ../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:282
+#: ../sales/customer_delivery.php:439
+#: ../sales/customer_invoice.php:539
+#: ../sales/customer_invoice.php:542
+#: ../sales/view/view_credit.php:90
+#: ../sales/view/view_dispatch.php:112
+#: ../sales/view/view_invoice.php:115
+#: ../sales/view/view_sales_order.php:219
+#: ../sales/view/view_sales_order.php.orig:201
+#: ../sales/includes/ui/sales_credit_ui.inc:167
+#: ../sales/includes/ui/sales_order_ui.inc:140
+#: ../sales/includes/ui/sales_order_ui.inc.orig:140
+msgid "Item Description"
+msgstr ""
+
+#: ../inventory/reorder_level.php:16
 msgid "Reorder Levels"
 msgstr ""
 
-#: inventory/reorder_level.php:24 inventory/transfers.php:32
+#: ../inventory/reorder_level.php:24
+#: ../inventory/transfers.php:32
 msgid ""
 "There are no inventory items defined in the system (Purchased or "
 "manufactured items)."
 msgstr ""
 
-#: inventory/reorder_level.php:57 inventory/inquiry/stock_status.php:72
-#: inventory/inquiry/stock_status.php:76
-#: manufacturing/search_work_orders.php:162
-#: manufacturing/inquiry/where_used_inquiry.php:45
-#: manufacturing/manage/bom_edit.php:70
-#: purchasing/inquiry/po_search_completed.php:124
-#: purchasing/inquiry/po_search_completed.php:134
-#: purchasing/inquiry/po_search.php:133 purchasing/inquiry/po_search.php:144
-#: reporting/rep105.php:118 reporting/rep301.php:110 reporting/rep302.php:130
-#: reporting/rep303.php:122 reporting/rep304.php:121
-#: reporting/reports_main.php:180 reporting/reports_main.php:186
-#: reporting/reports_main.php:191 reporting/reports_main.php:202
-#: sales/manage/sales_points.php:84
+#: ../inventory/reorder_level.php:57
+#: ../inventory/inquiry/stock_status.php:66
+#: ../inventory/inquiry/stock_status.php:70
+#: ../inventory/inquiry/stock_status.php.orig:72
+#: ../inventory/inquiry/stock_status.php.orig:76
+#: ../manufacturing/search_work_orders.php:162
+#: ../manufacturing/inquiry/where_used_inquiry.php:45
+#: ../manufacturing/manage/bom_edit.php:70
+#: ../purchasing/inquiry/po_search_completed.php:123
+#: ../purchasing/inquiry/po_search_completed.php:133
+#: ../purchasing/inquiry/po_search_completed.php.orig:122
+#: ../purchasing/inquiry/po_search_completed.php.orig:132
+#: ../purchasing/inquiry/po_search.php:133
+#: ../purchasing/inquiry/po_search.php:144
+#: ../reporting/rep105.php:118
+#: ../reporting/rep301.php:110
+#: ../reporting/rep302.php:130
+#: ../reporting/rep303.php:122
+#: ../reporting/rep304.php:121
+#: ../reporting/reports_main.php:180
+#: ../reporting/reports_main.php:186
+#: ../reporting/reports_main.php:191
+#: ../reporting/reports_main.php:202
+#: ../sales/manage/sales_points.php:84
 msgid "Location"
 msgstr ""
 
-#: inventory/reorder_level.php:57 inventory/inquiry/stock_movements.php:82
-#: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:203
-#: sales/sales_order_entry.php:492 sales/includes/ui/sales_order_ui.inc:175
+#: ../inventory/reorder_level.php:57
+#: ../inventory/inquiry/stock_movements.php:78
+#: ../inventory/inquiry/stock_movements.php.orig:80
+#: ../inventory/inquiry/stock_status.php:70
+#: ../inventory/inquiry/stock_status.php.orig:76
+#: ../purchasing/supplier_credit.php:220
+#: ../sales/sales_order_entry.php:503
+#: ../sales/includes/ui/sales_order_ui.inc:175
+#: ../sales/includes/ui/sales_order_ui.inc.orig:175
 msgid "Quantity On Hand"
 msgstr ""
 
-#: inventory/reorder_level.php:57 inventory/inquiry/stock_status.php:76
-#: sales/includes/db/sales_order_db.inc:110
-#: sales/includes/db/sales_order_db.inc:263
+#: ../inventory/reorder_level.php:57
+#: ../inventory/inquiry/stock_status.php:70
+#: ../inventory/inquiry/stock_status.php.orig:76
+#: ../sales/includes/db/sales_order_db.inc:112
+#: ../sales/includes/db/sales_order_db.inc:275
 msgid "Re-Order Level"
 msgstr ""
 
-#: inventory/reorder_level.php:75
+#: ../inventory/reorder_level.php:75
 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:117
+#: ../inventory/transfers.php:117
 msgid "The locations to transfer from and to must be different."
 msgstr ""
 
-#: inventory/transfers.php:127
+#: ../inventory/transfers.php:127
 msgid ""
 "The quantity entered is greater than the available quantity for this item at "
 "the source location :"
 msgstr ""
 
-#: inventory/transfers.php:160
+#: ../inventory/transfers.php:160
 msgid "The quantity entered must be a positive number."
 msgstr ""
 
-#: inventory/transfers.php:237
+#: ../inventory/transfers.php:237
 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
+#: ../sales/includes/ui/sales_order_ui.inc.orig:60
 msgid "For Part :"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:34
-#: manufacturing/work_order_entry.php:210 purchasing/inquiry/po_search.php:67
-#: sales/inquiry/sales_deliveries_view.php:107
-#: sales/inquiry/sales_orders_view.php:230
-#: sales/inquiry/sales_orders_view.php.orig:230
+#: ../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_deliveries_view.php.orig:107
+#: ../sales/inquiry/sales_orders_view.php:254
+#: ../sales/inquiry/sales_orders_view.php.orig:231
 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/includes/ui/po_ui.inc:236 purchasing/po_receive_items.php:62
-#: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45
-#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:169
-#: reporting/includes/doctext.inc:206 sales/customer_credit_invoice.php:282
-#: sales/customer_delivery.php:431 sales/customer_invoice.php:467
-#: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112
-#: sales/view/view_invoice.php:113 sales/view/view_sales_order.php:201
-#: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:140
-msgid "Item Code"
-msgstr ""
-
-#: inventory/includes/item_adjustments_ui.inc:62
-#: inventory/includes/stock_transfers_ui.inc:60
-#: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:40
-#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:29
-#: reporting/includes/doctext.inc:169 reporting/includes/doctext.inc:206
-#: sales/customer_credit_invoice.php:282 sales/customer_delivery.php:431
-#: sales/customer_invoice.php:467 sales/view/view_credit.php:90
-#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
-#: sales/view/view_sales_order.php:201
-#: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:140
-msgid "Item Description"
-msgstr ""
-
-#: inventory/includes/item_adjustments_ui.inc:62
-#: inventory/includes/stock_transfers_ui.inc:60
-#: inventory/manage/item_codes.php:124 inventory/manage/sales_kits.php:40
-#: inventory/view/view_adjustment.php:56 inventory/view/view_transfer.php:56
-#: manufacturing/view/wo_issue_view.php:77
-#: manufacturing/manage/bom_edit.php:71
-#: manufacturing/includes/manufacturing_ui.inc:29
-#: manufacturing/includes/manufacturing_ui.inc:157
-#: manufacturing/includes/manufacturing_ui.inc:332
-#: manufacturing/includes/work_order_issue_ui.inc:33
-#: purchasing/includes/ui/invoice_ui.inc:484
-#: purchasing/includes/ui/po_ui.inc:236 purchasing/view/view_grn.php:40
-#: purchasing/view/view_po.php:45 reporting/rep301.php:103
-#: reporting/rep303.php:109 reporting/rep303.php:115 reporting/rep401.php:69
-#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:170
-#: reporting/includes/doctext.inc:203 sales/view/view_credit.php:90
-#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113
-#: sales/view/view_sales_order.php:201
-#: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:140
+#: ../inventory/includes/item_adjustments_ui.inc:62
+#: ../inventory/includes/stock_transfers_ui.inc:60
+#: ../inventory/manage/item_codes.php:124
+#: ../inventory/manage/sales_kits.php:40
+#: ../inventory/view/view_adjustment.php:56
+#: ../inventory/view/view_transfer.php:56
+#: ../manufacturing/view/wo_issue_view.php:77
+#: ../manufacturing/manage/bom_edit.php:71
+#: ../manufacturing/includes/manufacturing_ui.inc:29
+#: ../manufacturing/includes/manufacturing_ui.inc:157
+#: ../manufacturing/includes/manufacturing_ui.inc:332
+#: ../manufacturing/includes/work_order_issue_ui.inc:33
+#: ../purchasing/includes/ui/invoice_ui.inc:505
+#: ../purchasing/includes/ui/po_ui.inc:243
+#: ../purchasing/view/view_grn.php:40
+#: ../purchasing/view/view_po.php:45
+#: ../reporting/rep301.php:103
+#: ../reporting/rep303.php:109
+#: ../reporting/rep303.php:115
+#: ../reporting/rep401.php:69
+#: ../reporting/includes/doctext.inc:29
+#: ../reporting/includes/doctext.inc:192
+#: ../reporting/includes/doctext.inc:225
+#: ../sales/customer_invoice.php:539
+#: ../sales/view/view_credit.php:90
+#: ../sales/view/view_dispatch.php:112
+#: ../sales/view/view_invoice.php:115
+#: ../sales/view/view_sales_order.php:219
+#: ../sales/view/view_sales_order.php.orig:201
+#: ../sales/includes/ui/sales_credit_ui.inc:167
+#: ../sales/includes/ui/sales_order_ui.inc:140
+#: ../sales/includes/ui/sales_order_ui.inc.orig:140
 msgid "Quantity"
 msgstr ""
 
-#: inventory/includes/item_adjustments_ui.inc:63
-#: inventory/includes/stock_transfers_ui.inc:60
-#: inventory/manage/item_units.php:94
-#: manufacturing/includes/work_order_issue_ui.inc:34
-#: purchasing/includes/ui/po_ui.inc:237 purchasing/view/view_grn.php:41
-#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:30
-#: reporting/includes/doctext.inc:170 sales/view/view_credit.php:91
-#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114
-#: sales/view/view_sales_order.php:201
-#: sales/includes/ui/sales_credit_ui.inc:167
-#: sales/includes/ui/sales_order_ui.inc:142
+#: ../inventory/includes/item_adjustments_ui.inc:63
+#: ../inventory/includes/stock_transfers_ui.inc:60
+#: ../inventory/manage/item_units.php:94
+#: ../manufacturing/includes/work_order_issue_ui.inc:34
+#: ../purchasing/includes/ui/po_ui.inc:244
+#: ../purchasing/view/view_grn.php:41
+#: ../purchasing/view/view_po.php:45
+#: ../reporting/includes/doctext.inc:30
+#: ../reporting/includes/doctext.inc:192
+#: ../sales/view/view_credit.php:91
+#: ../sales/view/view_dispatch.php:113
+#: ../sales/view/view_invoice.php:116
+#: ../sales/view/view_sales_order.php:219
+#: ../sales/view/view_sales_order.php.orig:201
+#: ../sales/includes/ui/sales_credit_ui.inc:167
+#: ../sales/includes/ui/sales_order_ui.inc:142
+#: ../sales/includes/ui/sales_order_ui.inc.orig:142
 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:103
+#: ../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:103
 msgid "Unit Cost"
 msgstr ""
 
-#: inventory/includes/stock_transfers_ui.inc:35
-#: inventory/inquiry/stock_movements.php:60
-#: manufacturing/includes/work_order_issue_ui.inc:164
+#: ../inventory/includes/stock_transfers_ui.inc:35
+#: ../inventory/inquiry/stock_movements.php:56
+#: ../inventory/inquiry/stock_movements.php.orig:58
+#: ../manufacturing/includes/work_order_issue_ui.inc:164
 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:119
+#: ../inventory/includes/db/items_db.inc:119
 msgid ""
 "Cannot delete this item because there are stock movements that refer to this "
 "item."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:122
+#: ../inventory/includes/db/items_db.inc:122
 msgid ""
 "Cannot delete this item record because there are bills of material that "
 "require this part as a component."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:125
-#: inventory/includes/db/items_db.inc:128
+#: ../inventory/includes/db/items_db.inc:125
+#: ../inventory/includes/db/items_db.inc:128
 msgid ""
 "Cannot delete this item because there are existing purchase order items for "
 "it."
 msgstr ""
 
-#: inventory/includes/db/items_db.inc:146
+#: ../inventory/includes/db/items_db.inc:146
 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:28
+#: ../inventory/inquiry/stock_movements.php:26
+#: ../inventory/inquiry/stock_movements.php.orig:27
 msgid "Inventory Item Movement"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:65
+#: ../inventory/inquiry/stock_movements.php:61
+#: ../inventory/inquiry/stock_movements.php.orig:63
 msgid "Show Movements"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:65
-#: purchasing/includes/ui/invoice_ui.inc:453
-#: purchasing/inquiry/supplier_allocation_inquiry.php:57
-#: purchasing/inquiry/supplier_inquiry.php:58
-#: purchasing/inquiry/supplier_inquiry.php.orig:54
-#: sales/inquiry/customer_allocation_inquiry.php:51
-#: sales/inquiry/customer_inquiry.php:58
-#: sales/inquiry/customer_inquiry.php.orig:58
+#: ../inventory/inquiry/stock_movements.php:61
+#: ../inventory/inquiry/stock_movements.php.orig:63
+#: ../purchasing/includes/ui/invoice_ui.inc:474
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
+#: ../purchasing/inquiry/supplier_inquiry.php:55
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:55
+#: ../sales/inquiry/customer_allocation_inquiry.php:51
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:51
+#: ../sales/inquiry/customer_inquiry.php:54
+#: ../sales/inquiry/customer_inquiry.php.orig:55
 msgid "Refresh Inquiry"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:81
+#: ../inventory/inquiry/stock_movements.php:77
+#: ../inventory/inquiry/stock_movements.php.orig:79
 msgid "Detail"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:82
+#: ../inventory/inquiry/stock_movements.php:78
+#: ../inventory/inquiry/stock_movements.php.orig:80
 msgid "Quantity In"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:82
+#: ../inventory/inquiry/stock_movements.php:78
+#: ../inventory/inquiry/stock_movements.php.orig:80
 msgid "Quantity Out"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:97
+#: ../inventory/inquiry/stock_movements.php:93
+#: ../inventory/inquiry/stock_movements.php.orig:95
 msgid "Quantity on hand before"
 msgstr ""
 
-#: inventory/inquiry/stock_movements.php:185
+#: ../inventory/inquiry/stock_movements.php:181
+#: ../inventory/inquiry/stock_movements.php.orig:183
 msgid "Quantity on hand after"
 msgstr ""
 
-#: inventory/inquiry/stock_status.php:19 inventory/inquiry/stock_status.php:21
+#: ../inventory/inquiry/stock_status.php:16
+#: ../inventory/inquiry/stock_status.php.orig:19
+#: ../inventory/inquiry/stock_status.php.orig:21
 msgid "Inventory Item Status"
 msgstr ""
 
-#: inventory/inquiry/stock_status.php:62
+#: ../inventory/inquiry/stock_status.php:56
+#: ../inventory/inquiry/stock_status.php.orig:62
 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:72 inventory/inquiry/stock_status.php:77
-#: reporting/rep303.php:109 reporting/rep303.php:115
+#: ../inventory/inquiry/stock_status.php:66
+#: ../inventory/inquiry/stock_status.php:71
+#: ../inventory/inquiry/stock_status.php.orig:72
+#: ../inventory/inquiry/stock_status.php.orig:77
+#: ../reporting/rep303.php:109
+#: ../reporting/rep303.php:115
 msgid "Demand"
 msgstr ""
 
-#: inventory/inquiry/stock_status.php:77 reporting/rep303.php:109
-#: reporting/rep303.php:115
+#: ../inventory/inquiry/stock_status.php:71
+#: ../inventory/inquiry/stock_status.php.orig:77
+#: ../reporting/rep303.php:109
+#: ../reporting/rep303.php:115
 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:282 sales/customer_delivery.php:432
-#: sales/customer_invoice.php:467
+#: ../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:282
+#: ../sales/customer_delivery.php:440
+#: ../sales/customer_invoice.php:539
+#: ../sales/customer_invoice.php:542
 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:180
+#: ../inventory/manage/item_categories.php:180
 msgid "Category Name:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:182
+#: ../inventory/manage/item_categories.php:182
 msgid "Default values for new items"
 msgstr ""
 
-#: inventory/manage/item_categories.php:184 inventory/manage/items.php:324
+#: ../inventory/manage/item_categories.php:184
+#: ../inventory/manage/items.php:333
+#: ../inventory/manage/items.php.orig:326
 msgid "Item Tax Type:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:186 inventory/manage/items.php:326
+#: ../inventory/manage/item_categories.php:186
+#: ../inventory/manage/items.php:335
+#: ../inventory/manage/items.php.orig:328
 msgid "Item Type:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:188 inventory/manage/items.php:328
+#: ../inventory/manage/item_categories.php:188
+#: ../inventory/manage/items.php:337
+#: ../inventory/manage/items.php.orig:330
 msgid "Units of Measure:"
 msgstr ""
 
-#: inventory/manage/item_categories.php:190 inventory/manage/items.php:332
+#: ../inventory/manage/item_categories.php:190
+#: ../inventory/manage/items.php:341
+#: ../inventory/manage/items.php.orig:334
 msgid "Exclude from sales:"
 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:659
+#: ../inventory/manage/item_codes.php:23
+#: ../sales/sales_order_entry.php:670
 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/items.php:154
-#: inventory/manage/sales_kits.php:88
+#: ../inventory/manage/item_codes.php:55
+#: ../inventory/manage/items.php:163
+#: ../inventory/manage/items.php.orig:156
+#: ../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:115
-#: reporting/rep105.php:117 reporting/rep301.php:103 reporting/rep301.php:109
-#: reporting/rep302.php:122 reporting/rep302.php:129 reporting/rep303.php:121
-#: reporting/rep304.php:112 reporting/rep304.php:120
+#: ../inventory/manage/item_codes.php:125
+#: ../reporting/rep104.php:115
+#: ../reporting/rep105.php:117
+#: ../reporting/rep301.php:103
+#: ../reporting/rep301.php:109
+#: ../reporting/rep302.php:122
+#: ../reporting/rep302.php:129
+#: ../reporting/rep303.php:121
+#: ../reporting/rep304.php:112
+#: ../reporting/rep304.php:120
 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/work_order_entry.php:424
-#: manufacturing/manage/bom_edit.php:228
+#: ../inventory/manage/item_codes.php:179
+#: ../inventory/manage/sales_kits.php:245
+#: ../manufacturing/work_order_add_finished.php:206
+#: ../manufacturing/work_order_entry.php:424
+#: ../manufacturing/manage/bom_edit.php:228
 msgid "Quantity:"
 msgstr ""
 
-#: inventory/manage/item_codes.php:180 inventory/manage/items.php:299
-#: inventory/manage/movement_types.php:129 inventory/manage/sales_kits.php:206
-#: inventory/manage/sales_kits.php:232
-#: manufacturing/manage/work_centres.php:138
-#: sales/manage/credit_status.php:145 sales/manage/recurrent_invoices.php:165
-#: taxes/item_tax_types.php:173 taxes/tax_groups.php:167
-#: taxes/tax_types.php:158
+#: ../inventory/manage/item_codes.php:180
+#: ../inventory/manage/items.php:308
+#: ../inventory/manage/items.php.orig:301
+#: ../inventory/manage/movement_types.php:129
+#: ../inventory/manage/sales_kits.php:206
+#: ../inventory/manage/sales_kits.php:232
+#: ../manufacturing/manage/work_centres.php:138
+#: ../sales/manage/credit_status.php:145
+#: ../sales/manage/recurrent_invoices.php:165
+#: ../taxes/item_tax_types.php:173
+#: ../taxes/tax_groups.php:162
+#: ../taxes/tax_groups.php.orig:164
+#: ../taxes/tax_groups.php.sav:164
+#: ../taxes/tax_types.php:158
 msgid "Description:"
 msgstr ""
 
-#: inventory/manage/item_codes.php:181 inventory/manage/items.php:301
-#: inventory/manage/sales_kits.php:207 inventory/manage/sales_kits.php:233
+#: ../inventory/manage/item_codes.php:181
+#: ../inventory/manage/items.php:310
+#: ../inventory/manage/items.php.orig:303
+#: ../inventory/manage/sales_kits.php:207
+#: ../inventory/manage/sales_kits.php:233
 msgid "Category:"
 msgstr ""
 
-#: inventory/manage/items.php:78
+#: ../inventory/manage/items.php:82
+#: ../inventory/manage/items.php.orig:80
 msgid ""
 "Only graphics files are supported - a file extension of .jpg, .png or .gif "
 "is expected"
 msgstr ""
 
-#: inventory/manage/items.php:104
+#: ../inventory/manage/items.php:113
+#: ../inventory/manage/items.php.orig:106
 msgid ""
 "There are no item categories defined in the system. At least one item "
 "category is required to add a item."
 msgstr ""
 
-#: inventory/manage/items.php:106
+#: ../inventory/manage/items.php:115
+#: ../inventory/manage/items.php.orig:108
 msgid ""
 "There are no item tax types defined in the system. At least one item tax "
 "type is required to add a item."
 msgstr ""
 
-#: inventory/manage/items.php:133
+#: ../inventory/manage/items.php:142
+#: ../inventory/manage/items.php.orig:135
 msgid "The item name must be entered."
 msgstr ""
 
-#: inventory/manage/items.php:139
+#: ../inventory/manage/items.php:148
+#: ../inventory/manage/items.php.orig:141
 msgid "The item code cannot be empty"
 msgstr ""
 
-#: inventory/manage/items.php:147
+#: ../inventory/manage/items.php:156
+#: ../inventory/manage/items.php.orig:149
 msgid ""
 "The item code cannot contain any of the following characters -  & + OR a "
 "space OR quotes"
 msgstr ""
 
-#: inventory/manage/items.php:183
+#: ../inventory/manage/items.php:192
+#: ../inventory/manage/items.php.orig:185
 msgid "Item has been updated."
 msgstr ""
 
-#: inventory/manage/items.php:196
+#: ../inventory/manage/items.php:205
+#: ../inventory/manage/items.php.orig:198
 msgid "A new item has been added."
 msgstr ""
 
-#: inventory/manage/items.php:239
+#: ../inventory/manage/items.php:248
+#: ../inventory/manage/items.php.orig:241
 msgid "Selected item has been deleted."
 msgstr ""
 
-#: inventory/manage/items.php:256 inventory/view/view_adjustment.php:56
-#: inventory/view/view_transfer.php:39 inventory/view/view_transfer.php:56
-#: manufacturing/search_work_orders.php:163
-#: manufacturing/view/wo_issue_view.php:44
-#: manufacturing/view/wo_production_view.php:45
-#: purchasing/includes/ui/invoice_ui.inc:471
-#: purchasing/includes/ui/invoice_ui.inc:483 reporting/rep204.php:82
+#: ../inventory/manage/items.php:265
+#: ../inventory/manage/items.php.orig:258
+#: ../inventory/view/view_adjustment.php:56
+#: ../inventory/view/view_transfer.php:39
+#: ../inventory/view/view_transfer.php:56
+#: ../manufacturing/search_work_orders.php:163
+#: ../manufacturing/view/wo_issue_view.php:44
+#: ../manufacturing/view/wo_production_view.php:45
+#: ../purchasing/includes/ui/invoice_ui.inc:492
+#: ../purchasing/includes/ui/invoice_ui.inc:504
+#: ../reporting/rep204.php:82
 msgid "Item"
 msgstr ""
 
-#: inventory/manage/items.php:261 inventory/manage/items.php:292
+#: ../inventory/manage/items.php:270
+#: ../inventory/manage/items.php:301
+#: ../inventory/manage/items.php.orig:263
+#: ../inventory/manage/items.php.orig:294
 msgid "Item Code:"
 msgstr ""
 
-#: inventory/manage/items.php:330
+#: ../inventory/manage/items.php:339
+#: ../inventory/manage/items.php.orig:332
 msgid "Editable description:"
 msgstr ""
 
-#: inventory/manage/items.php:350 sales/manage/customer_branches.php:248
+#: ../inventory/manage/items.php:359
+#: ../inventory/manage/items.php.orig:352
+#: ../sales/manage/customer_branches.php:249
 msgid "GL Accounts"
 msgstr ""
 
-#: inventory/manage/items.php:373
+#: ../inventory/manage/items.php:382
+#: ../inventory/manage/items.php.orig:375
 msgid "Other"
 msgstr ""
 
-#: inventory/manage/items.php:376
+#: ../inventory/manage/items.php:385
+#: ../inventory/manage/items.php.orig:378
 msgid "Image File (.jpg)"
 msgstr ""
 
-#: inventory/manage/items.php:391
+#: ../inventory/manage/items.php:400
+#: ../inventory/manage/items.php.orig:393
 msgid "No image"
 msgstr ""
 
-#: inventory/manage/items.php:396
+#: ../inventory/manage/items.php:405
+#: ../inventory/manage/items.php.orig:398
 msgid "Delete Image:"
 msgstr ""
 
-#: inventory/manage/items.php:398
+#: ../inventory/manage/items.php:407
+#: ../inventory/manage/items.php.orig:400
 msgid "Item status:"
 msgstr ""
 
-#: inventory/manage/items.php:404
+#: ../inventory/manage/items.php:413
+#: ../inventory/manage/items.php.orig:406
 msgid "Insert New Item"
 msgstr ""
 
-#: inventory/manage/items.php:408
+#: ../inventory/manage/items.php:417
+#: ../inventory/manage/items.php.orig:410
 msgid "Update Item"
 msgstr ""
 
-#: inventory/manage/items.php:411
+#: ../inventory/manage/items.php:420
+#: ../inventory/manage/items.php.orig:413
 msgid "Select this items and return to document entry."
 msgstr ""
 
-#: inventory/manage/items.php:412
+#: ../inventory/manage/items.php:421
+#: ../inventory/manage/items.php.orig:414
 msgid "Clone This Item"
 msgstr ""
 
-#: inventory/manage/items.php:413
+#: ../inventory/manage/items.php:422
+#: ../inventory/manage/items.php.orig:415
 msgid "Delete This Item"
 msgstr ""
 
-#: inventory/manage/items.php:428
+#: ../inventory/manage/items.php:437
+#: ../inventory/manage/items.php.orig:430
 msgid "Select an item:"
 msgstr ""
 
-#: inventory/manage/items.php:429
+#: ../inventory/manage/items.php:438
+#: ../inventory/manage/items.php.orig:431
 msgid "New item"
 msgstr ""
 
-#: inventory/manage/items.php:452 purchasing/manage/suppliers.php:303
-#: sales/manage/customer_branches.php:322 sales/manage/customers.php:338
-#: sales/manage/customers.php.orig:339
+#: ../inventory/manage/items.php:461
+#: ../inventory/manage/items.php.orig:454
+#: ../purchasing/manage/suppliers.php:308
+#: ../purchasing/manage/suppliers.php.orig:311
+#: ../sales/manage/customer_branches.php:324
+#: ../sales/manage/customers.php:342
+#: ../sales/manage/sav.customers.php:342
 msgid "&General settings"
 msgstr ""
 
-#: inventory/manage/items.php:453 purchasing/manage/suppliers.php:305
-#: sales/manage/customers.php:340 sales/manage/customers.php.orig:341
+#: ../inventory/manage/items.php:462
+#: ../inventory/manage/items.php.orig:455
+#: ../purchasing/manage/suppliers.php:310
+#: ../purchasing/manage/suppliers.php.orig:313
+#: ../sales/manage/customers.php:344
+#: ../sales/manage/sav.customers.php:344
 msgid "&Transactions"
 msgstr ""
 
-#: inventory/manage/items.php:454
+#: ../inventory/manage/items.php:463
+#: ../inventory/manage/items.php.orig:456
 msgid "&Status"
 msgstr ""
 
-#: inventory/manage/item_units.php:16
+#: ../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: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:207
+#: ../inventory/view/view_transfer.php:40
+#: ../manufacturing/view/wo_issue_view.php:44
+#: ../manufacturing/includes/manufacturing_ui.inc:29
+#: ../manufacturing/includes/manufacturing_ui.inc:83
+#: ../reporting/includes/doctext.inc:229
 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:75
+#: ../manufacturing/search_work_orders.php:76
+#: ../purchasing/inquiry/po_search_completed.php:72
+#: ../purchasing/inquiry/po_search_completed.php.orig:73
 msgid "for item:"
 msgstr ""
 
-#: manufacturing/search_work_orders.php:78
-#: purchasing/inquiry/po_search_completed.php:77
-#: purchasing/inquiry/po_search.php:76
-#: sales/inquiry/sales_deliveries_view.php:116
-#: sales/inquiry/sales_orders_view.php:245
-#: sales/inquiry/sales_orders_view.php.orig:245
+#: ../manufacturing/search_work_orders.php:78
+#: ../purchasing/inquiry/po_search_completed.php:74
+#: ../purchasing/inquiry/po_search_completed.php.orig:75
+#: ../purchasing/inquiry/po_search.php:76
+#: ../sales/inquiry/sales_deliveries_view.php:116
+#: ../sales/inquiry/sales_deliveries_view.php.orig:116
+#: ../sales/inquiry/sales_orders_view.php:269
+#: ../sales/inquiry/sales_orders_view.php.orig:246
 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:205 sales/inquiry/sales_orders_view.php:266
-#: sales/inquiry/sales_orders_view.php.orig:266
+#: ../manufacturing/search_work_orders.php:167
+#: ../manufacturing/includes/manufacturing_ui.inc:277
+#: ../manufacturing/includes/manufacturing_ui.inc:281
+#: ../reporting/includes/doctext.inc:227
+#: ../sales/inquiry/sales_orders_view.php:290
+#: ../sales/inquiry/sales_orders_view.php.orig:267
 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:38
-#: manufacturing/work_order_release.php:72
+#: ../manufacturing/work_order_add_finished.php:46
+#: ../manufacturing/work_order_costs.php:45
+#: ../manufacturing/work_order_entry.php:56
+#: ../manufacturing/work_order_issue.php:40
+#: ../manufacturing/work_order_release.php:72
 msgid "View this Work Order"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:48
-#: manufacturing/work_order_costs.php:47 manufacturing/work_order_entry.php:65
-#: manufacturing/work_order_issue.php:40
+#: ../manufacturing/work_order_add_finished.php:48
+#: ../manufacturing/work_order_entry.php:65
+#: ../manufacturing/work_order_issue.php:42
 msgid "View the GL Journal Entries for this Work Order"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:50
-#: manufacturing/work_order_entry.php:67
+#: ../manufacturing/work_order_add_finished.php:50
+#: ../manufacturing/work_order_entry.php:67
 msgid "Print the GL Journal Entries for this Work Order"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:52
-#: manufacturing/work_order_costs.php:51 manufacturing/work_order_issue.php:42
+#: ../manufacturing/work_order_add_finished.php:52
+#: ../manufacturing/work_order_costs.php:49
+#: ../manufacturing/work_order_issue.php:44
 msgid "Select another &Work Order to Process"
 msgstr ""
 
-#: manufacturing/work_order_add_finished.php:65
-#: manufacturing/work_order_costs.php:64
-#: manufacturing/work_order_entry.php:341
-#: manufacturing/includes/db/work_order_issues_db.inc:30
-#: manufacturing/includes/db/work_order_produce_items_db.inc:27
+#: ../manufacturing/work_order_add_finished.php:65
+#: ../manufacturing/work_order_costs.php: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:65
-#: sales/allocations/customer_allocate.php:64
+#: ../manufacturing/work_order_add_finished.php:214
+#: ../purchasing/allocations/supplier_allocate.php:65
+#: ../sales/allocations/customer_allocate.php:64
 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:49
+#: ../manufacturing/work_order_costs.php:47
 msgid "Enter another additional cost."
 msgstr ""
 
-#: manufacturing/work_order_costs.php:76
+#: ../manufacturing/work_order_costs.php:73
 msgid "The amount entered is not a valid number or less then zero."
 msgstr ""
 
-#: manufacturing/work_order_costs.php:95
+#: ../manufacturing/work_order_costs.php:92
 msgid ""
 "The additional cost date cannot be before the release date of the work order."
 msgstr ""
 
-#: manufacturing/work_order_costs.php:159
+#: ../manufacturing/work_order_costs.php:143
 msgid "Additional Costs:"
 msgstr ""
 
-#: manufacturing/work_order_costs.php:160
+#: ../manufacturing/work_order_costs.php:144
 msgid "Debit Account"
 msgstr ""
 
-#: manufacturing/work_order_costs.php:167
+#: ../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_entry.php:62
+#: ../manufacturing/work_order_entry.php:62
 msgid "Print this Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:64
+#: ../manufacturing/work_order_entry.php:64
 msgid "Email this Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:80
+#: ../manufacturing/work_order_entry.php:80
 msgid "The work order been updated."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:90
+#: ../manufacturing/work_order_entry.php:90
 msgid "Work order has been deleted."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:100
+#: ../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
+#: ../manufacturing/work_order_entry.php:110
 msgid "Enter a new work order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:111
+#: ../manufacturing/work_order_entry.php:111
 msgid "Select an existing work order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:147
+#: ../manufacturing/work_order_entry.php:147
 msgid "The quantity entered is invalid or less than zero."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:169
+#: ../manufacturing/work_order_entry.php:169
 msgid "The selected item to manufacture does not have a bom."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:178
+#: ../manufacturing/work_order_entry.php:178
 msgid "The labour cost entered is invalid or less than zero."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:186
+#: ../manufacturing/work_order_entry.php:186
 msgid "The cost entered is invalid or less than zero."
 msgstr ""
 
-#: manufacturing/work_order_entry.php:209
+#: ../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
+#: ../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
+#: ../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
+#: ../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
+#: ../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
+#: ../manufacturing/work_order_entry.php:397
+#: ../manufacturing/work_order_entry.php:405
 msgid "Destination Location:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:416
+#: ../manufacturing/work_order_entry.php:416
 msgid "Quantity Required:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:418
+#: ../manufacturing/work_order_entry.php:418
 msgid "Quantity Manufactured:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:437
+#: ../manufacturing/work_order_entry.php:437
 msgid "Credit Labour Account"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:444
+#: ../manufacturing/work_order_entry.php:444
 msgid "Credit Overhead Account"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:449
+#: ../manufacturing/work_order_entry.php:449
 msgid "Released On:"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:459
+#: ../manufacturing/work_order_entry.php:459
 msgid "Save changes to work order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:462
+#: ../manufacturing/work_order_entry.php:462
 msgid "Close This Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:464
+#: ../manufacturing/work_order_entry.php:464
 msgid "Delete This Work Order"
 msgstr ""
 
-#: manufacturing/work_order_entry.php:470
+#: ../manufacturing/work_order_entry.php:470
 msgid "Add Workorder"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:29
+#: ../manufacturing/work_order_issue.php:31
 msgid "Issue Items to Work Order"
 msgstr ""
 
-#: manufacturing/work_order_issue.php:36
+#: ../manufacturing/work_order_issue.php:38
 msgid "The work order issue has been entered."
 msgstr ""
 
-#: manufacturing/work_order_issue.php:79
+#: ../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:57
+#: ../manufacturing/work_order_release.php:57
 msgid ""
 "This Work Order cannot be released. The selected item to manufacture does "
 "not have a bom."
 msgstr ""
 
-#: manufacturing/work_order_release.php:70
+#: ../manufacturing/work_order_release.php:70
 msgid "The work order has been released to manufacturing."
 msgstr ""
 
-#: manufacturing/work_order_release.php:74
+#: ../manufacturing/work_order_release.php:74
 msgid "Select another &work order"
 msgstr ""
 
-#: manufacturing/work_order_release.php:95
+#: ../manufacturing/work_order_release.php:95
 msgid "Work Order #:"
 msgstr ""
 
-#: manufacturing/work_order_release.php:96
+#: ../manufacturing/work_order_release.php:96
 msgid "Work Order Reference:"
 msgstr ""
 
-#: manufacturing/work_order_release.php:98
-#: manufacturing/includes/manufacturing_ui.inc:278
+#: ../manufacturing/work_order_release.php:98
+#: ../manufacturing/includes/manufacturing_ui.inc:278
 msgid "Released Date"
 msgstr ""
 
-#: manufacturing/work_order_release.php:104
+#: ../manufacturing/work_order_release.php:104
 msgid "Release Work Order"
 msgstr ""
 
-#: manufacturing/view/wo_issue_view.php:19
+#: ../manufacturing/view/wo_costs_view.php:20
+msgid "View Work Order Costs"
+msgstr ""
+
+#: ../manufacturing/view/wo_costs_view.php:62
+#, php-format
+msgid "Production Costs for Work Order # %d"
+msgstr ""
+
+#: ../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:69
-#: reporting/rep401.php:74
+#: ../manufacturing/view/wo_issue_view.php:77
+#: ../manufacturing/includes/manufacturing_ui.inc:28
+#: ../manufacturing/includes/manufacturing_ui.inc:83
+#: ../reporting/rep401.php:69
+#: ../reporting/rep401.php:74
 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 reporting/rep409.php:91
+#: ../manufacturing/view/work_order_view.php:56
+#: ../reporting/rep409.php:91
 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:207
+#: ../manufacturing/inquiry/where_used_inquiry.php:44
+#: ../manufacturing/manage/bom_edit.php:71
+#: ../manufacturing/includes/manufacturing_ui.inc:28
+#: ../manufacturing/includes/manufacturing_ui.inc:83
+#: ../reporting/includes/doctext.inc:229
 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:112
+#: ../manufacturing/manage/bom_edit.php:70
+#: ../reporting/rep105.php:112
 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:207
+#: ../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:207
+#: ../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:207
+#: ../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:201
+#: ../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:202
+#: ../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:74
+#: ../manufacturing/includes/db/work_order_produce_items_db.inc:73
 msgid "Production."
 msgstr ""
 
-#: manufacturing/includes/db/work_order_produce_items_db.inc:158
+#: ../manufacturing/includes/db/work_order_produce_items_db.inc:157
 msgid "Reversed the production "
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:278
-#: purchasing/includes/db/po_db.inc:116
-#: sales/includes/db/cust_trans_db.inc:111
-#: sales/includes/db/sales_order_db.inc:249
+#: ../manufacturing/includes/db/work_orders_db.inc:79
+#: ../purchasing/includes/db/po_db.inc:123
+#: ../sales/includes/db/cust_trans_db.inc:114
+#: ../sales/includes/db/sales_order_db.inc:261
 msgid "Updated."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:297
+#: ../manufacturing/includes/db/work_orders_db.inc:100
 msgid "Canceled."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:373
+#: ../manufacturing/includes/db/work_orders_db.inc:176
 msgid "Released."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_db.inc:445
-#: manufacturing/includes/db/work_orders_db.inc:461
-msgid "Voiding Work Order Trans # "
-msgstr ""
-
-#: manufacturing/includes/db/work_orders_quick_db.inc:106
+#: ../manufacturing/includes/db/work_orders_quick_db.inc:89
 msgid "Quick production."
 msgstr ""
 
-#: manufacturing/includes/db/work_orders_quick_db.inc:220
+#: ../manufacturing/includes/db/work_orders_quick_db.inc:169
 msgid "Produced"
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:284
+#: ../purchasing/includes/db/invoice_db.inc:298
 msgid "Supplier invoice adjustment for zero inventory of "
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:284 reporting/rep106.php:81
-#: sales/inquiry/sales_deliveries_view.php:166
-#: sales/inquiry/sales_orders_view.php:145
-#: sales/inquiry/sales_orders_view.php.orig:145
+#: ../purchasing/includes/db/invoice_db.inc:298
+#: ../reporting/rep106.php:81
+#: ../sales/inquiry/sales_deliveries_view.php:166
+#: ../sales/inquiry/sales_deliveries_view.php.orig:166
+#: ../sales/inquiry/sales_orders_view.php:159
+#: ../sales/inquiry/sales_orders_view.php.orig:146
 msgid "Invoice"
 msgstr ""
 
-#: purchasing/includes/db/invoice_db.inc:684
-#: purchasing/includes/db/invoice_db.inc:686
+#: ../purchasing/includes/db/invoice_db.inc:716
+#: ../purchasing/includes/db/invoice_db.inc:718
 msgid "GRN Removal"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:23 purchasing/includes/ui/po_ui.inc:319
-#: sales/view/view_sales_order.php:74
+#: ../purchasing/includes/ui/grn_ui.inc:23
+#: ../purchasing/includes/ui/po_ui.inc:326
+#: ../sales/view/view_sales_order.php:74
+#: ../sales/view/view_sales_order.php.orig:74
 msgid "Order Currency"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:25
+#: ../purchasing/includes/ui/grn_ui.inc:25
 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
+#: ../sales/view/view_sales_order.php:67
+#: ../sales/view/view_sales_order.php.orig:67
 msgid "Ordered On"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:40 purchasing/includes/ui/grn_ui.inc:54
-#: purchasing/includes/ui/po_ui.inc:334 purchasing/includes/ui/po_ui.inc:339
+#: ../purchasing/includes/ui/grn_ui.inc:40
+#: ../purchasing/includes/ui/grn_ui.inc:54
+#: ../purchasing/includes/ui/po_ui.inc:341
+#: ../purchasing/includes/ui/po_ui.inc:346
 msgid "Deliver Into Location"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:46
+#: ../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/includes/ui/po_ui.inc:344
-#: purchasing/view/view_supp_credit.php:44
-#: purchasing/view/view_supp_invoice.php:47
-#: purchasing/inquiry/po_search_completed.php:125
-#: purchasing/inquiry/po_search.php:134
-#: purchasing/inquiry/supplier_inquiry.php:172
-#: purchasing/inquiry/supplier_inquiry.php.orig:166
+#: ../purchasing/includes/ui/grn_ui.inc:49
+#: ../purchasing/includes/ui/grn_ui.inc:55
+#: ../purchasing/includes/ui/po_ui.inc:351
+#: ../purchasing/view/view_supp_credit.php:44
+#: ../purchasing/view/view_supp_invoice.php:48
+#: ../purchasing/inquiry/po_search_completed.php:124
+#: ../purchasing/inquiry/po_search_completed.php.orig:123
+#: ../purchasing/inquiry/po_search.php:134
+#: ../purchasing/inquiry/supplier_inquiry.php:177
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:174
 msgid "Supplier's Reference"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:62 purchasing/includes/ui/po_ui.inc:348
-#: sales/view/view_sales_order.php:79
+#: ../purchasing/includes/ui/grn_ui.inc:62
+#: ../purchasing/includes/ui/po_ui.inc:355
+#: ../sales/view/view_sales_order.php:92
+#: ../sales/view/view_sales_order.php.orig:79
 msgid "Delivery Address"
 msgstr ""
 
-#: purchasing/includes/ui/grn_ui.inc:65 purchasing/includes/ui/po_ui.inc:352
+#: ../purchasing/includes/ui/grn_ui.inc:65
+#: ../purchasing/includes/ui/po_ui.inc:367
 msgid "Order Comments"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:96
-#: purchasing/includes/ui/invoice_ui.inc:99
+#: ../purchasing/includes/ui/invoice_ui.inc:108
+msgid "Source Invoices:"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:110
 msgid "Supplier's Ref.:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:114
+#: ../purchasing/includes/ui/invoice_ui.inc:125
 msgid "Terms:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:126
-#: purchasing/manage/suppliers.php:95 purchasing/manage/suppliers.php:100
+#: ../purchasing/includes/ui/invoice_ui.inc:137
+#: ../purchasing/manage/suppliers.php:100
+#: ../purchasing/manage/suppliers.php:105
+#: ../purchasing/manage/suppliers.php.orig:101
+#: ../purchasing/manage/suppliers.php.orig:106
 msgid "Supplier's Currency:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:130
-#: purchasing/manage/suppliers.php:102 sales/manage/customer_branches.php:246
-#: sales/manage/customers.php:288 sales/manage/customers.php.orig:289
+#: ../purchasing/includes/ui/invoice_ui.inc:141
+#: ../purchasing/manage/suppliers.php:107
+#: ../purchasing/manage/suppliers.php.orig:108
+#: ../sales/manage/customer_branches.php:247
+#: ../sales/manage/customers.php:292
+#: ../sales/manage/sav.customers.php:292
 msgid "Tax Group:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:145
+#: ../purchasing/includes/ui/invoice_ui.inc:159
 msgid "Sub-total:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:153
+#: ../purchasing/includes/ui/invoice_ui.inc:167
 msgid "Invoice Total:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:156
-#: sales/customer_credit_invoice.php:332
-#: sales/includes/ui/sales_credit_ui.inc:233
+#: ../purchasing/includes/ui/invoice_ui.inc:170
+#: ../sales/customer_credit_invoice.php:332
+#: ../sales/includes/ui/sales_credit_ui.inc:233
 msgid "Credit Note Total"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:187
+#: ../purchasing/includes/ui/invoice_ui.inc:175
+#: ../purchasing/includes/ui/po_ui.inc:487
+#: ../purchasing/po_entry_items.php:554
+msgid "Tax algorithm:"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:207
 msgid "Add GL Line"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:188
+#: ../purchasing/includes/ui/invoice_ui.inc:208
 msgid "Reset"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:189
-#: purchasing/po_receive_items.php:334
+#: ../purchasing/includes/ui/invoice_ui.inc:209
+#: ../purchasing/po_receive_items.php:332
 msgid "Clear all GL entry fields"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:207
+#: ../purchasing/includes/ui/invoice_ui.inc:227
 msgid "GL Items for this Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:209
+#: ../purchasing/includes/ui/invoice_ui.inc:229
 msgid "GL Items for this Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:219
+#: ../purchasing/includes/ui/invoice_ui.inc:239
 msgid "Quick Entry:"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:392
+#: ../purchasing/includes/ui/invoice_ui.inc:412
 msgid "Add to Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:394
+#: ../purchasing/includes/ui/invoice_ui.inc:414
 msgid "Add to Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:396 sales/customer_invoice.php:522
+#: ../purchasing/includes/ui/invoice_ui.inc:416
+#: ../sales/customer_invoice.php:601
 msgid "Remove"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:396
-#: purchasing/includes/ui/invoice_ui.inc:431
+#: ../purchasing/includes/ui/invoice_ui.inc:416
+#: ../purchasing/includes/ui/invoice_ui.inc:451
 msgid ""
 "WARNING! Be careful with removal. The operation is executed immediately and "
 "cannot be undone !!!"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:398
+#: ../purchasing/includes/ui/invoice_ui.inc:418
+#, php-format
 msgid ""
-"You are about to remove all yet non-invoiced items from selected delivery "
-"line. This operation also irreversibly changes related order line. Do you "
-"want to continue ?"
+"You are about to remove all yet non-invoiced items from delivery line #%d. "
+"This operation also irreversibly changes related order line. Do you want to "
+"continue ?"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:429
+#: ../purchasing/includes/ui/invoice_ui.inc:449
 msgid "Items Received Yet to be Invoiced"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:434
+#: ../purchasing/includes/ui/invoice_ui.inc:454
 msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:439
+#: ../purchasing/includes/ui/invoice_ui.inc:459
 msgid "Received Items Charged on this Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:441
+#: ../purchasing/includes/ui/invoice_ui.inc:461
 msgid "Received Items Credited on this Note"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:451
+#: ../purchasing/includes/ui/invoice_ui.inc:471
 msgid "Received between"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:462
+#: ../purchasing/includes/ui/invoice_ui.inc:483
 msgid "Add All Items"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:471
-#: purchasing/includes/ui/invoice_ui.inc:483
-#: sales/inquiry/sales_orders_view.php:153
-#: sales/inquiry/sales_orders_view.php.orig:153
+#: ../purchasing/includes/ui/invoice_ui.inc:492
+#: ../purchasing/includes/ui/invoice_ui.inc:504
+#: ../sales/inquiry/sales_orders_view.php:167
+#: ../sales/inquiry/sales_orders_view.php.orig:154
 msgid "Delivery"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:471
+#: ../purchasing/includes/ui/invoice_ui.inc:492
+msgid "Sequence #"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:492
 msgid "P.O."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:472
+#: ../purchasing/includes/ui/invoice_ui.inc:493
 msgid "Received On"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:472 purchasing/view/view_po.php:46
+#: ../purchasing/includes/ui/invoice_ui.inc:493
+#: ../purchasing/view/view_po.php:46
 msgid "Quantity Received"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:472 purchasing/view/view_grn.php:41
-#: purchasing/view/view_po.php:46
+#: ../purchasing/includes/ui/invoice_ui.inc:493
+#: ../purchasing/view/view_grn.php:41
+#: ../purchasing/view/view_po.php:46
 msgid "Quantity Invoiced"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:473
+#: ../purchasing/includes/ui/invoice_ui.inc:494
 msgid "Qty Yet To Invoice"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:473
-#: purchasing/includes/ui/po_ui.inc:238
-#: sales/includes/ui/sales_order_ui.inc:142
+#: ../purchasing/includes/ui/invoice_ui.inc:494
+#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../sales/includes/ui/sales_order_ui.inc:142
+#: ../sales/includes/ui/sales_order_ui.inc.orig:142
 msgid "Price after Tax"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:473
-#: purchasing/includes/ui/po_ui.inc:238
-#: sales/includes/ui/sales_order_ui.inc:142
+#: ../purchasing/includes/ui/invoice_ui.inc:494
+#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../sales/includes/ui/sales_order_ui.inc:142
+#: ../sales/includes/ui/sales_order_ui.inc.orig:142
 msgid "Price before Tax"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:479
+#: ../purchasing/includes/ui/invoice_ui.inc:500
 msgid "Qty Yet To Credit"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:484
+#: ../purchasing/includes/ui/invoice_ui.inc:505
 msgid "Line Value"
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:551
+#: ../purchasing/includes/ui/invoice_ui.inc:573
 msgid ""
 "There are no outstanding items received from this supplier that have not "
 "been invoiced by them."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:554
+#: ../purchasing/includes/ui/invoice_ui.inc:576
 msgid ""
 "There are no received items for the selected supplier that have been "
 "invoiced."
 msgstr ""
 
-#: purchasing/includes/ui/invoice_ui.inc:555
+#: ../purchasing/includes/ui/invoice_ui.inc:577
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:149
+#: ../purchasing/includes/ui/po_ui.inc:156
 msgid "Supplier Currency:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:178 sales/sales_order_entry.php:683
+#: ../purchasing/includes/ui/po_ui.inc:185
+#: ../sales/sales_order_entry.php:694
 msgid "Order Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:670
+#: ../purchasing/includes/ui/po_ui.inc:186
+#: ../sales/sales_order_entry.php:681
 msgid "Delivery Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:179 sales/sales_order_entry.php:664
+#: ../purchasing/includes/ui/po_ui.inc:186
+#: ../sales/sales_order_entry.php:675
 msgid "Invoice Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:190
+#: ../purchasing/includes/ui/po_ui.inc:197
 msgid "Due Date:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:192
+#: ../purchasing/includes/ui/po_ui.inc:199
 msgid "Supplier's Reference:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:193
+#: ../purchasing/includes/ui/po_ui.inc:200
 msgid "Receive Into:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:218
+#: ../purchasing/includes/ui/po_ui.inc:225
 msgid ""
 "The default stock location set up for this user is not a currently defined "
 "stock location. Your system administrator needs to amend your user record."
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:222
+#: ../purchasing/includes/ui/po_ui.inc:229
 msgid "Deliver to:"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:231
+#: ../purchasing/includes/ui/po_ui.inc:238
 msgid "Order Items"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:237 purchasing/po_receive_items.php:62
+#: ../purchasing/includes/ui/po_ui.inc:244
+#: ../purchasing/po_receive_items.php:62
 msgid "Received"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:238
-#: sales/includes/ui/sales_order_ui.inc:610
+#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../sales/includes/ui/sales_order_ui.inc:611
+#: ../sales/includes/ui/sales_order_ui.inc.orig:611
 msgid "Required Delivery Date"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:238 purchasing/view/view_grn.php:41
-#: purchasing/view/view_po.php:46
+#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../purchasing/view/view_grn.php:41
+#: ../purchasing/view/view_po.php:46
 msgid "Line Total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:289 purchasing/po_receive_items.php:114
-#: reporting/rep107.php:146 reporting/rep109.php:148 reporting/rep110.php:159
-#: reporting/rep111.php:135 reporting/rep113.php:148 reporting/rep209.php:167
-#: sales/customer_credit_invoice.php:324 sales/customer_delivery.php:501
-#: sales/customer_invoice.php:563 sales/view/view_dispatch.php:146
-#: sales/view/view_invoice.php:148 sales/includes/ui/sales_credit_ui.inc:217
-#: sales/includes/ui/sales_order_ui.inc:229
+#: ../purchasing/includes/ui/po_ui.inc:296
+#: ../purchasing/po_receive_items.php:114
+#: ../reporting/rep107.php:217
+#: ../reporting/rep109.php:152
+#: ../reporting/rep110.php:161
+#: ../reporting/rep111.php:137
+#: ../reporting/rep113.php:147
+#: ../reporting/rep209.php:167
+#: ../sales/customer_credit_invoice.php:324
+#: ../sales/customer_delivery.php:509
+#: ../sales/customer_invoice.php:645
+#: ../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:229
+#: ../sales/includes/ui/sales_order_ui.inc.orig:229
 msgid "Sub-total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:298 purchasing/po_receive_items.php:122
-#: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93
-#: sales/customer_delivery.php:508 sales/view/view_sales_order.php:244
-#: sales/includes/ui/sales_order_ui.inc:236
+#: ../purchasing/includes/ui/po_ui.inc:305
+#: ../purchasing/po_receive_items.php:122
+#: ../purchasing/view/view_grn.php:79
+#: ../purchasing/view/view_po.php:93
+#: ../sales/customer_delivery.php:516
+#: ../sales/view/view_sales_order.php:262
+#: ../sales/view/view_sales_order.php.orig:244
+#: ../sales/includes/ui/sales_order_ui.inc:236
+#: ../sales/includes/ui/sales_order_ui.inc.orig:236
 msgid "Amount Total"
 msgstr ""
 
-#: purchasing/includes/ui/po_ui.inc:299
-#: purchasing/allocations/supplier_allocate.php:64
-#: sales/allocations/customer_allocate.php:63
-#: sales/includes/ui/sales_order_ui.inc:237
+#: ../purchasing/includes/ui/po_ui.inc:306
+#: ../purchasing/allocations/supplier_allocate.php:64
+#: ../sales/allocations/customer_allocate.php:63
+#: ../sales/includes/ui/sales_order_ui.inc:237
+#: ../sales/includes/ui/sales_order_ui.inc.orig:237
 msgid "Refresh"
 msgstr ""
 
-#: purchasing/po_entry_items.php:38
+#: ../purchasing/includes/ui/po_ui.inc:361
+#: ../sales/view/view_sales_order.php:83
+msgid "Required Pre-Payment"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:362
+msgid "Pre-Payments Allocated"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:488
+#: ../purchasing/po_entry_items.php:555
+#: ../sales/customer_invoice.php:452
+#: ../sales/includes/ui/sales_order_ui.inc:407
+#: ../sales/includes/ui/sales_order_ui.inc:409
+#: ../sales/includes/ui/sales_order_ui.inc.orig:405
+#: ../sales/includes/ui/sales_order_ui.inc.orig:409
+msgid "Payment:"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:488
+#: ../purchasing/po_entry_items.php:555
+msgid "Delayed"
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:490
+#: ../sales/includes/ui/sales_order_ui.inc:622
+#: ../sales/includes/ui/sales_order_ui.inc:624
+msgid "Pre-Payment Required:"
+msgstr ""
+
+#: ../purchasing/po_entry_items.php:38
 msgid "Modify Purchase Order #"
 msgstr ""
 
-#: purchasing/po_entry_items.php:43
+#: ../purchasing/po_entry_items.php:43
 msgid "Purchase Order Entry"
 msgstr ""
 
-#: purchasing/po_entry_items.php:48
+#: ../purchasing/po_entry_items.php:48
 msgid "Direct GRN Entry"
 msgstr ""
 
-#: purchasing/po_entry_items.php:53
+#: ../purchasing/po_entry_items.php:53
 msgid "Direct Purchase Invoice Entry"
 msgstr ""
 
-#: purchasing/po_entry_items.php:74
+#: ../purchasing/po_entry_items.php:77
 msgid "Purchase Order has been entered"
 msgstr ""
 
-#: purchasing/po_entry_items.php:76
+#: ../purchasing/po_entry_items.php:79
 msgid "Purchase Order has been updated"
 msgstr ""
 
-#: purchasing/po_entry_items.php:77
+#: ../purchasing/po_entry_items.php:80
 msgid "&View this order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:79 sales/sales_order_entry.php:105
-#: sales/sales_order_entry.php:125
+#: ../purchasing/po_entry_items.php:82
+#: ../sales/sales_order_entry.php:106
+#: ../sales/sales_order_entry.php:126
 msgid "&Print This Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:81 sales/sales_order_entry.php:106
-#: sales/sales_order_entry.php:126
+#: ../purchasing/po_entry_items.php:84
+#: ../sales/sales_order_entry.php:107
+#: ../sales/sales_order_entry.php:127
 msgid "&Email This Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:83
+#: ../purchasing/po_entry_items.php:86
 msgid "&Receive Items on this Purchase Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:85
+#: ../purchasing/po_entry_items.php:88
 msgid "Enter &Another Purchase Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:87
+#: ../purchasing/po_entry_items.php:90
 msgid "Select An &Outstanding Purchase Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:96
+#: ../purchasing/po_entry_items.php:99
 msgid "Direct GRN has been entered"
 msgstr ""
 
-#: purchasing/po_entry_items.php:98
+#: ../purchasing/po_entry_items.php:101
 msgid "&View this GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:102 purchasing/po_receive_items.php:40
+#: ../purchasing/po_entry_items.php:105
+#: ../purchasing/po_receive_items.php:40
 msgid "View the GL Journal Entries for this Delivery"
 msgstr ""
 
-#: purchasing/po_entry_items.php:107 purchasing/po_receive_items.php:42
+#: ../purchasing/po_entry_items.php:110
+#: ../purchasing/po_receive_items.php:42
 msgid "Entry purchase &invoice for this receival"
 msgstr ""
 
-#: purchasing/po_entry_items.php:112
+#: ../purchasing/po_entry_items.php:115
 msgid "Enter &Another GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:121
+#: ../purchasing/po_entry_items.php:124
 msgid "Direct Purchase Invoice has been entered"
 msgstr ""
 
-#: purchasing/po_entry_items.php:123
+#: ../purchasing/po_entry_items.php:126
 msgid "&View this Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:128 purchasing/supplier_invoice.php:46
+#: ../purchasing/po_entry_items.php:131
+#: ../purchasing/supplier_invoice.php:68
 msgid "View the GL Journal Entries for this Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:130 purchasing/supplier_invoice.php:48
+#: ../purchasing/po_entry_items.php:133
+#: ../purchasing/supplier_invoice.php:70
 msgid "Entry supplier &payment for this invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:136
+#: ../purchasing/po_entry_items.php:139
 msgid "Enter &Another Direct Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:168
+#: ../purchasing/po_entry_items.php:171
 msgid ""
 "This item cannot be deleted because some of it has already been received."
 msgstr ""
 
-#: purchasing/po_entry_items.php:183
+#: ../purchasing/po_entry_items.php:186
 msgid ""
 "This order cannot be cancelled because some of it has already been received."
 msgstr ""
 
-#: purchasing/po_entry_items.php:184
+#: ../purchasing/po_entry_items.php:187
 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:199
+#: ../purchasing/po_entry_items.php:202
 msgid "This purchase order has been cancelled."
 msgstr ""
 
-#: purchasing/po_entry_items.php:201
+#: ../purchasing/po_entry_items.php:204
 msgid "Enter a new purchase order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:213 sales/sales_order_entry.php:464
+#: ../purchasing/po_entry_items.php:216
+#: ../sales/sales_order_entry.php:475
 msgid "Item description cannot be empty."
 msgstr ""
 
-#: purchasing/po_entry_items.php:223
+#: ../purchasing/po_entry_items.php:226
 msgid "The quantity of the order item must be numeric and not less than "
 msgstr ""
 
-#: purchasing/po_entry_items.php:230
+#: ../purchasing/po_entry_items.php:233
 msgid "The price entered must be numeric and not less than zero."
 msgstr ""
 
-#: purchasing/po_entry_items.php:254
+#: ../purchasing/po_entry_items.php:257
 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:255
+#: ../purchasing/po_entry_items.php:258
 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:283
+#: ../purchasing/po_entry_items.php:286
 msgid "The selected item is already on this order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:310
+#: ../purchasing/po_entry_items.php:313
 msgid ""
 "The selected item does not exist or it is a kit part and therefore cannot be "
 "purchased."
 msgstr ""
 
-#: purchasing/po_entry_items.php:326 purchasing/supplier_invoice.php:343
-#: purchasing/supplier_payment.php:118
+#: ../purchasing/po_entry_items.php:329
+#: ../purchasing/supplier_invoice.php:381
+#: ../purchasing/supplier_payment.php:118
 msgid "There is no supplier selected."
 msgstr ""
 
-#: purchasing/po_entry_items.php:333
+#: ../purchasing/po_entry_items.php:336
 msgid "The entered order date is invalid."
 msgstr ""
 
-#: purchasing/po_entry_items.php:340 purchasing/po_receive_items.php:181
-#: sales/sales_order_entry.php:345
-msgid "The entered date is not in fiscal year"
-msgstr ""
-
-#: purchasing/po_entry_items.php:347
+#: ../purchasing/po_entry_items.php:349
 msgid "The entered due date is invalid."
 msgstr ""
 
-#: purchasing/po_entry_items.php:356
+#: ../purchasing/po_entry_items.php:358
 msgid "There is no reference entered for this purchase order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:371 purchasing/supplier_invoice.php:161
+#: ../purchasing/po_entry_items.php:373
+#: ../purchasing/supplier_invoice.php:185
 msgid "You must enter a supplier's invoice reference."
 msgstr ""
 
-#: purchasing/po_entry_items.php:378 purchasing/supplier_invoice.php:187
+#: ../purchasing/po_entry_items.php:380
+#: ../purchasing/supplier_invoice.php:211
 msgid ""
 "This invoice number has already been entered. It cannot be entered again."
 msgstr ""
 
-#: purchasing/po_entry_items.php:384
+#: ../purchasing/po_entry_items.php:386
 msgid "There is no delivery address specified."
 msgstr ""
 
-#: purchasing/po_entry_items.php:390
+#: ../purchasing/po_entry_items.php:392
 msgid "There is no location specified to move any items into."
 msgstr ""
 
-#: purchasing/po_entry_items.php:397
+#: ../purchasing/po_entry_items.php:399
 msgid ""
 "The order cannot be placed because there are no lines entered on this order."
 msgstr ""
 
-#: purchasing/po_entry_items.php:523 sales/sales_order_entry.php:687
+#: ../purchasing/po_entry_items.php:404
+msgid "Required prepayment is greater than total invoice value."
+msgstr ""
+
+#: ../purchasing/po_entry_items.php:492
+msgid "Payment for:"
+msgstr ""
+
+#: ../purchasing/po_entry_items.php:563
+#: ../sales/sales_order_entry.php:698
 msgid "Place Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:524
+#: ../purchasing/po_entry_items.php:564
 msgid "Update Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:525 sales/sales_order_entry.php:686
+#: ../purchasing/po_entry_items.php:565
+#: ../sales/sales_order_entry.php:697
 msgid "Cancel Order"
 msgstr ""
 
-#: purchasing/po_entry_items.php:527
+#: ../purchasing/po_entry_items.php:567
 msgid "Process GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:528
+#: ../purchasing/po_entry_items.php:568
 msgid "Update GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:529
+#: ../purchasing/po_entry_items.php:569
 msgid "Cancel GRN"
 msgstr ""
 
-#: purchasing/po_entry_items.php:532 sales/customer_invoice.php:582
+#: ../purchasing/po_entry_items.php:572
+#: ../sales/customer_invoice.php:684
 msgid "Process Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:533
+#: ../purchasing/po_entry_items.php:573
 msgid "Update Invoice"
 msgstr ""
 
-#: purchasing/po_entry_items.php:534 sales/sales_order_entry.php:667
+#: ../purchasing/po_entry_items.php:574
+#: ../sales/sales_order_entry.php:678
 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:112
-#: sales/customer_delivery.php:432
+#: ../purchasing/po_receive_items.php:62
+#: ../reporting/rep105.php:112
+#: ../sales/customer_delivery.php:440
 msgid "Ordered"
 msgstr ""
 
-#: purchasing/po_receive_items.php:63 reporting/rep101.php:131
-#: reporting/rep105.php:113 reporting/rep105.php:167 reporting/rep201.php:119
-#: reporting/includes/doctext.inc:225
+#: ../purchasing/po_receive_items.php:63
+#: ../reporting/rep101.php:131
+#: ../reporting/rep105.php:113
+#: ../reporting/rep105.php:162
+#: ../reporting/rep201.php:119
+#: ../reporting/includes/doctext.inc:247
 msgid "Outstanding"
 msgstr ""
 
-#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:433
+#: ../purchasing/po_receive_items.php:63
+#: ../sales/customer_delivery.php:441
 msgid "This Delivery"
 msgstr ""
 
-#: purchasing/po_receive_items.php:168 purchasing/po_receive_items.php:224
+#: ../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:229
+#: ../purchasing/po_receive_items.php:227
 msgid ""
 "Entered quantities cannot be greater than the quantity entered on the "
 "purchase order including the allowed over-receive percentage"
 msgstr ""
 
-#: purchasing/po_receive_items.php:231
+#: ../purchasing/po_receive_items.php:229
 msgid ""
 "Modify the ordered items on the purchase order if you wish to increase the "
 "quantities."
 msgstr ""
 
-#: purchasing/po_receive_items.php:249
+#: ../purchasing/po_receive_items.php:247
 msgid ""
 "This order has been changed or invoiced since this delivery was started to "
 "be actioned. Processing halted. To enter a delivery against this purchase "
@@ -9397,153 +11090,167 @@ msgid ""
 "by the other user."
 msgstr ""
 
-#: purchasing/po_receive_items.php:252
+#: ../purchasing/po_receive_items.php:250
 msgid "Select a different purchase order for receiving goods against"
 msgstr ""
 
-#: purchasing/po_receive_items.php:255
+#: ../purchasing/po_receive_items.php:253
 msgid "Re-Read the updated purchase order for receiving goods against"
 msgstr ""
 
-#: purchasing/po_receive_items.php:329
+#: ../purchasing/po_receive_items.php:327
 msgid "Items to Receive"
 msgstr ""
 
-#: purchasing/po_receive_items.php:334
+#: ../purchasing/po_receive_items.php:332
 msgid "Process Receive Items"
 msgstr ""
 
-#: purchasing/supplier_credit.php:43
+#: ../purchasing/supplier_credit.php:63
+#, php-format
+msgid "Modifying Supplier Credit # %d"
+msgstr ""
+
+#: ../purchasing/supplier_credit.php:78
 msgid "Supplier credit note has been processed."
 msgstr ""
 
-#: purchasing/supplier_credit.php:44
+#: ../purchasing/supplier_credit.php:79
 msgid "View this Credit Note"
 msgstr ""
 
-#: purchasing/supplier_credit.php:46
+#: ../purchasing/supplier_credit.php:81
 msgid "View the GL Journal Entries for this Credit Note"
 msgstr ""
 
-#: purchasing/supplier_credit.php:48
+#: ../purchasing/supplier_credit.php:83
 msgid "Enter Another Credit Note"
 msgstr ""
 
-#: purchasing/supplier_credit.php:102 purchasing/supplier_invoice.php:102
+#: ../purchasing/supplier_credit.php:119
+#: ../purchasing/supplier_invoice.php:126
 msgid ""
 "The account code entered is not a valid code, this line cannot be added to "
 "the transaction."
 msgstr ""
 
-#: purchasing/supplier_credit.php:112 purchasing/supplier_invoice.php:112
+#: ../purchasing/supplier_credit.php:129
+#: ../purchasing/supplier_invoice.php:136
 msgid ""
 "The amount entered is not numeric. This line cannot be added to the "
 "transaction."
 msgstr ""
 
-#: purchasing/supplier_credit.php:142
+#: ../purchasing/supplier_credit.php:159
 msgid ""
 "The credit note cannot be processed because the there are no items or values "
 "on the invoice.  Credit notes are expected to have a charge."
 msgstr ""
 
-#: purchasing/supplier_credit.php:149
+#: ../purchasing/supplier_credit.php:166
 msgid "You must enter an credit note reference."
 msgstr ""
 
-#: purchasing/supplier_credit.php:163
+#: ../purchasing/supplier_credit.php:180
 msgid "You must enter a supplier's credit note reference."
 msgstr ""
 
-#: purchasing/supplier_credit.php:170
+#: ../purchasing/supplier_credit.php:187
 msgid ""
 "The credit note as entered cannot be processed because the date entered is "
 "not valid."
 msgstr ""
 
-#: purchasing/supplier_credit.php:182 purchasing/supplier_invoice.php:180
+#: ../purchasing/supplier_credit.php:199
+#: ../purchasing/supplier_invoice.php:204
 msgid ""
 "The invoice as entered cannot be processed because the due date is in an "
 "incorrect format."
 msgstr ""
 
-#: purchasing/supplier_credit.php:189
+#: ../purchasing/supplier_credit.php:206
 msgid ""
 "The credit note total as entered is less than the sum of the the general "
 "ledger entires (if any) and the charges for goods received. There must be a "
 "mistake somewhere, the credit note as entered will not be processed."
 msgstr ""
 
-#: purchasing/supplier_credit.php:201
+#: ../purchasing/supplier_credit.php:218
 msgid ""
 "The return cannot be processed because there is an insufficient quantity for "
 "item:"
 msgstr ""
 
-#: purchasing/supplier_credit.php:245
+#: ../purchasing/supplier_credit.php:262
 msgid "The quantity to credit must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_credit.php:252
+#: ../purchasing/supplier_credit.php:269
 msgid "The price is either not numeric or negative."
 msgstr ""
 
-#: purchasing/supplier_credit.php:354
+#: ../purchasing/supplier_credit.php:371
 msgid "Enter Credit Note"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:28
+#: ../purchasing/supplier_invoice.php:46
 msgid "Enter Supplier Invoice"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:43
+#: ../purchasing/supplier_invoice.php:51
+#, php-format
+msgid "Modifying Purchase Invoice # %d"
+msgstr ""
+
+#: ../purchasing/supplier_invoice.php:65
 msgid "Supplier invoice has been processed."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:44
+#: ../purchasing/supplier_invoice.php:66
 msgid "View this Invoice"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:50
+#: ../purchasing/supplier_invoice.php:72
 msgid "Enter Another Invoice"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:141
+#: ../purchasing/supplier_invoice.php:165
 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:147
+#: ../purchasing/supplier_invoice.php:171
 msgid "You must enter an invoice reference."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:168
+#: ../purchasing/supplier_invoice.php:192
 msgid ""
 "The invoice as entered cannot be processed because the invoice date is in an "
 "incorrect format."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:224
+#: ../purchasing/supplier_invoice.php:253
 msgid "The quantity to invoice must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:231
+#: ../purchasing/supplier_invoice.php:260
 msgid "The price is not numeric."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:244
+#: ../purchasing/supplier_invoice.php:273
 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:245 purchasing/supplier_invoice.php:258
+#: ../purchasing/supplier_invoice.php:274
+#: ../purchasing/supplier_invoice.php:287
 msgid "The over-charge percentage allowance is :"
 msgstr ""
 
-#: purchasing/supplier_invoice.php:257
+#: ../purchasing/supplier_invoice.php:286
 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 "
@@ -9551,3740 +11258,4283 @@ msgid ""
 "necessary."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:325
+#: ../purchasing/supplier_invoice.php:363
 #, php-format
 msgid "All yet non-invoiced items on delivery line # %d has been removed."
 msgstr ""
 
-#: purchasing/supplier_invoice.php:367
+#: ../purchasing/supplier_invoice.php:405
 msgid "Enter Invoice"
 msgstr ""
 
-#: purchasing/supplier_payment.php:31
+#: ../purchasing/supplier_payment.php:31
 msgid "Supplier Payment Entry"
 msgstr ""
 
-#: purchasing/supplier_payment.php:90
+#: ../purchasing/supplier_payment.php:90
 msgid "Invalid purchase invoice number."
 msgstr ""
 
-#: purchasing/supplier_payment.php:96
+#: ../purchasing/supplier_payment.php:96
 msgid "Payment has been sucessfully entered"
 msgstr ""
 
-#: purchasing/supplier_payment.php:98
+#: ../purchasing/supplier_payment.php:98
 msgid "&Print This Remittance"
 msgstr ""
 
-#: purchasing/supplier_payment.php:99
+#: ../purchasing/supplier_payment.php:99
 msgid "&Email This Remittance"
 msgstr ""
 
-#: purchasing/supplier_payment.php:101
+#: ../purchasing/supplier_payment.php:101
 msgid "View the GL &Journal Entries for this Payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:105
+#: ../purchasing/supplier_payment.php:105
 msgid "Enter another supplier &payment"
 msgstr ""
 
-#: purchasing/supplier_payment.php:152 sales/customer_payments.php:192
+#: ../purchasing/supplier_payment.php:152
+#: ../sales/customer_payments.php:192
 msgid "The exchange rate must be numeric and greater than zero."
 msgstr ""
 
-#: purchasing/supplier_payment.php:164
+#: ../purchasing/supplier_payment.php:164
 msgid "The entered discount is invalid or less than zero."
 msgstr ""
 
-#: purchasing/supplier_payment.php:172
+#: ../purchasing/supplier_payment.php:172
 msgid ""
 "The total of the amount and the discount is zero or negative. Please enter "
 "positive values."
 msgstr ""
 
-#: purchasing/supplier_payment.php:273
+#: ../purchasing/supplier_payment.php:273
 msgid "Payment To:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:280
+#: ../purchasing/supplier_payment.php:280
 msgid "From Bank Account:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:288
-#: purchasing/view/view_supp_payment.php:55
+#: ../purchasing/supplier_payment.php:288
+#: ../purchasing/view/view_supp_payment.php:55
 msgid "Date Paid"
 msgstr ""
 
-#: purchasing/supplier_payment.php:311 sales/customer_payments.php:409
+#: ../purchasing/supplier_payment.php:311
+#: ../sales/customer_payments.php:406
 msgid "Amount of Discount:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:312
+#: ../purchasing/supplier_payment.php:312
 msgid "Amount of Payment:"
 msgstr ""
 
-#: purchasing/supplier_payment.php:318
+#: ../purchasing/supplier_payment.php:318
 msgid "The amount and discount are in the bank account's currency."
 msgstr ""
 
-#: purchasing/supplier_payment.php:321
+#: ../purchasing/supplier_payment.php:321
 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:198
+#: ../purchasing/view/view_grn.php:37
+#: ../purchasing/view/view_po.php:41
+#: ../sales/view/view_sales_order.php:216
+#: ../sales/view/view_sales_order.php.orig:198
 msgid "Line Details"
 msgstr ""
 
-#: purchasing/view/view_grn.php:40 reporting/includes/doctext.inc:65
-#: reporting/includes/doctext.inc:170 reporting/includes/doctext.inc:222
-#: sales/inquiry/sales_deliveries_view.php: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
+#: ../sales/inquiry/sales_deliveries_view.php.orig:186
 msgid "Delivery Date"
 msgstr ""
 
-#: purchasing/view/view_grn.php:70 purchasing/view/view_po.php:84
-#: purchasing/view/view_supp_credit.php:60
-#: purchasing/view/view_supp_invoice.php:65 sales/view/view_credit.php:136
-#: sales/view/view_sales_order.php:234
+#: ../purchasing/view/view_grn.php:70
+#: ../purchasing/view/view_po.php:84
+#: ../purchasing/view/view_supp_credit.php:60
+#: ../purchasing/view/view_supp_invoice.php:66
+#: ../sales/view/view_credit.php:136
+#: ../sales/view/view_sales_order.php:252
+#: ../sales/view/view_sales_order.php.orig:234
 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:148
-#: purchasing/inquiry/supplier_inquiry.php:193
-#: purchasing/inquiry/supplier_inquiry.php.orig:187
-#: sales/inquiry/customer_allocation_inquiry.php:165
-#: sales/inquiry/customer_inquiry.php:251
-#: sales/inquiry/customer_inquiry.php.orig:251
-#: sales/inquiry/sales_deliveries_view.php:206
-#: sales/inquiry/sales_orders_view.php:316
-#: sales/inquiry/sales_orders_view.php.orig:316
+#: ../purchasing/view/view_po.php:100
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:147
+#: ../purchasing/inquiry/supplier_inquiry.php:197
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:196
+#: ../sales/inquiry/customer_allocation_inquiry.php:165
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:165
+#: ../sales/inquiry/customer_inquiry.php:227
+#: ../sales/inquiry/customer_inquiry.php.orig:251
+#: ../sales/inquiry/sales_deliveries_view.php:206
+#: ../sales/inquiry/sales_deliveries_view.php.orig:206
+#: ../sales/inquiry/sales_orders_view.php:344
+#: ../sales/inquiry/sales_orders_view.php.orig:317
 msgid "Marked items are overdue."
 msgstr ""
 
-#: purchasing/view/view_po.php:113 sales/view/view_invoice.php:97
-#: 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
+#: ../sales/view/view_sales_order.php.orig: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
+#: ../sales/view/view_sales_order.php.orig: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:50
-#: sales/customer_credit_invoice.php:270 sales/view/view_invoice.php:95
+#: ../purchasing/view/view_supp_credit.php:47
+#: ../purchasing/view/view_supp_invoice.php:51
+#: ../reporting/includes/doctext.inc:141
+#: ../sales/customer_credit_invoice.php:270
+#: ../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:23
+#: ../purchasing/view/view_supp_invoice.php:24
 msgid "View Supplier Invoice"
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:40
+#: ../purchasing/view/view_supp_invoice.php:41
 msgid "SUPPLIER INVOICE"
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:72 reporting/rep107.php:194
-#: sales/view/view_invoice.php:164
+#: ../purchasing/view/view_supp_invoice.php:73
+#: ../reporting/rep107.php:266
+#: ../reporting/rep107.php:272
+#: ../sales/view/view_invoice.php:166
 msgid "TOTAL INVOICE"
 msgstr ""
 
-#: purchasing/view/view_supp_invoice.php:76 sales/view/view_invoice.php:168
+#: ../purchasing/view/view_supp_invoice.php:77
+#: ../sales/view/view_invoice.php:170
 msgid "This invoice has been voided."
 msgstr ""
 
-#: 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
+#: ../sales/view/view_receipt.php:43
 msgid "Payment Currency"
 msgstr ""
 
-#: purchasing/view/view_supp_payment.php:62 sales/customer_delivery.php:433
-#: sales/customer_invoice.php:468 sales/view/view_receipt.php:45
-#: sales/view/view_sales_order.php:202
+#: ../purchasing/view/view_supp_payment.php:62
+#: ../sales/customer_delivery.php:441
+#: ../sales/customer_invoice.php:540
+#: ../sales/customer_invoice.php:543
+#: ../sales/view/view_receipt.php:45
+#: ../sales/view/view_sales_order.php:220
+#: ../sales/view/view_sales_order.php.orig:202
 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:24 sales/manage/customer_branches.php:33
+#: ../purchasing/manage/suppliers.php:27
+#: ../purchasing/manage/suppliers.php.orig:28
+#: ../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:86
+#: ../purchasing/manage/suppliers.php:91
+#: ../purchasing/manage/suppliers.php.orig:92
 msgid "Basic Data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:88
+#: ../purchasing/manage/suppliers.php:93
+#: ../purchasing/manage/suppliers.php.orig:94
 msgid "Supplier Name:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:89
+#: ../purchasing/manage/suppliers.php:94
+#: ../purchasing/manage/suppliers.php.orig:95
 msgid "Supplier Short Name:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:92
+#: ../purchasing/manage/suppliers.php:97
+#: ../purchasing/manage/suppliers.php.orig:98
 msgid "Website:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:103
+#: ../purchasing/manage/suppliers.php:108
+#: ../purchasing/manage/suppliers.php.orig:109
 msgid "Our Customer No:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:105
+#: ../purchasing/manage/suppliers.php:110
+#: ../purchasing/manage/suppliers.php.orig:120
 msgid "Purchasing"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:106
+#: ../purchasing/manage/suppliers.php:111
+#: ../purchasing/manage/suppliers.php.orig:121
 msgid "Bank Name/Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:107 sales/manage/customers.php:259
-#: sales/manage/customers.php.orig:260
+#: ../purchasing/manage/suppliers.php:112
+#: ../purchasing/manage/suppliers.php.orig:122
+#: ../sales/manage/customers.php:263
+#: ../sales/manage/sav.customers.php:263
 msgid "Credit Limit:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:108 sales/manage/customers.php:261
-#: sales/manage/customers.php.orig:262
+#: ../purchasing/manage/suppliers.php:113
+#: ../purchasing/manage/suppliers.php.orig:123
+#: ../sales/manage/customers.php:265
+#: ../sales/manage/sav.customers.php:265
 msgid "Payment Terms:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:114 purchasing/manage/suppliers.php:117
+#: ../purchasing/manage/suppliers.php:119
+#: ../purchasing/manage/suppliers.php:122
+#: ../purchasing/manage/suppliers.php.orig:129
+#: ../purchasing/manage/suppliers.php.orig:132
 msgid "Prices contain tax included:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:119 reporting/rep704.php:92
-#: reporting/rep704.php:102 reporting/rep704.php:110
+#: ../purchasing/manage/suppliers.php:124
+#: ../purchasing/manage/suppliers.php.orig:134
+msgid "Tax Calculation Algorithm:"
+msgstr ""
+
+#: ../purchasing/manage/suppliers.php:128
+#: ../purchasing/manage/suppliers.php.orig:138
+#: ../reporting/rep704.php:92
+#: ../reporting/rep704.php:102
+#: ../reporting/rep704.php:110
 msgid "Accounts"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:120
+#: ../purchasing/manage/suppliers.php:129
+#: ../purchasing/manage/suppliers.php.orig:139
 msgid "Accounts Payable Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:121
+#: ../purchasing/manage/suppliers.php:130
+#: ../purchasing/manage/suppliers.php.orig:140
 msgid "Purchase Account:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:122
+#: ../purchasing/manage/suppliers.php:131
+#: ../purchasing/manage/suppliers.php.orig:141
 msgid "Use Item Inventory/COGS Account"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:125 purchasing/manage/suppliers.php:154
+#: ../purchasing/manage/suppliers.php:134
+#: ../purchasing/manage/suppliers.php:137
+#: ../purchasing/manage/suppliers.php.orig:112
 msgid "Contact Data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:145 sales/manage/customer_branches.php:266
+#: ../purchasing/manage/suppliers.php:140
+#: ../purchasing/manage/suppliers.php.orig:118
+msgid "System default"
+msgstr ""
+
+#: ../purchasing/manage/suppliers.php:157
+#: ../purchasing/manage/suppliers.php.orig:159
+#: ../sales/manage/customer_branches.php:268
 msgid "Addresses"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:146 sales/manage/customer_branches.php:267
+#: ../purchasing/manage/suppliers.php:158
+#: ../purchasing/manage/suppliers.php.orig:160
+#: ../sales/manage/customer_branches.php:269
 msgid "Mailing Address:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:147
+#: ../purchasing/manage/suppliers.php:159
+#: ../purchasing/manage/suppliers.php.orig:161
 msgid "Physical Address:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:149
+#: ../purchasing/manage/suppliers.php:161
+#: ../purchasing/manage/suppliers.php.orig:163
 msgid "General"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:150 sales/manage/customer_branches.php:269
-#: sales/manage/customers.php:282 sales/manage/customers.php.orig:283
+#: ../purchasing/manage/suppliers.php:162
+#: ../purchasing/manage/suppliers.php.orig:164
+#: ../sales/manage/customer_branches.php:271
+#: ../sales/manage/customers.php:286
+#: ../sales/manage/sav.customers.php:286
 msgid "General Notes:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:152
+#: ../purchasing/manage/suppliers.php:164
+#: ../purchasing/manage/suppliers.php.orig:166
 msgid "Supplier status:"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:158
-msgid "System default"
-msgstr ""
-
-#: purchasing/manage/suppliers.php:165
+#: ../purchasing/manage/suppliers.php:170
+#: ../purchasing/manage/suppliers.php.orig:173
 msgid "Update Supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:166
+#: ../purchasing/manage/suppliers.php:171
+#: ../purchasing/manage/suppliers.php.orig:174
 msgid "Update supplier data"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:167
+#: ../purchasing/manage/suppliers.php:172
+#: ../purchasing/manage/suppliers.php.orig:175
 msgid "Select this supplier and return to document entry."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:168
+#: ../purchasing/manage/suppliers.php:173
+#: ../purchasing/manage/suppliers.php.orig:176
 msgid "Delete Supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:169
+#: ../purchasing/manage/suppliers.php:174
+#: ../purchasing/manage/suppliers.php.orig:177
 msgid "Delete supplier data if have been never used"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:173
+#: ../purchasing/manage/suppliers.php:178
+#: ../purchasing/manage/suppliers.php.orig:181
 msgid "Add New Supplier Details"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:192
+#: ../purchasing/manage/suppliers.php:197
+#: ../purchasing/manage/suppliers.php.orig:200
 msgid "The supplier name must be entered."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:199
+#: ../purchasing/manage/suppliers.php:204
+#: ../purchasing/manage/suppliers.php.orig:207
 msgid "The supplier short name must be entered."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:219
+#: ../purchasing/manage/suppliers.php:224
+#: ../purchasing/manage/suppliers.php.orig:227
 msgid "Supplier has been updated."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:237
+#: ../purchasing/manage/suppliers.php:242
+#: ../purchasing/manage/suppliers.php.orig:245
 msgid "A new supplier has been added."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:255
+#: ../purchasing/manage/suppliers.php:260
+#: ../purchasing/manage/suppliers.php.orig:263
 msgid ""
 "Cannot delete this supplier because there are transactions that refer to "
 "this supplier."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:263
+#: ../purchasing/manage/suppliers.php:268
+#: ../purchasing/manage/suppliers.php.orig:271
 msgid ""
 "Cannot delete the supplier record because purchase orders have been created "
 "against this supplier."
 msgstr ""
 
-#: purchasing/manage/suppliers.php:284
-#: purchasing/inquiry/supplier_allocation_inquiry.php:48
+#: ../purchasing/manage/suppliers.php:289
+#: ../purchasing/manage/suppliers.php.orig:292
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:48
 msgid "Select a supplier: "
 msgstr ""
 
-#: purchasing/manage/suppliers.php:285
+#: ../purchasing/manage/suppliers.php:290
+#: ../purchasing/manage/suppliers.php.orig:293
 msgid "New supplier"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:304 sales/manage/customer_branches.php:323
-#: sales/manage/customers.php:339 sales/manage/customers.php.orig:340
+#: ../purchasing/manage/suppliers.php:309
+#: ../purchasing/manage/suppliers.php.orig:312
+#: ../sales/manage/customer_branches.php:325
+#: ../sales/manage/customers.php:343
+#: ../sales/manage/sav.customers.php:343
 msgid "&Contacts"
 msgstr ""
 
-#: purchasing/manage/suppliers.php:306
+#: ../purchasing/manage/suppliers.php:311
+#: ../purchasing/manage/suppliers.php.orig:314
 msgid "Purchase &Orders"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:26
+#: ../purchasing/inquiry/po_search_completed.php:24
+#: ../purchasing/inquiry/po_search_completed.php.orig:25
 msgid "Search Purchase Orders"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:63
-#: purchasing/inquiry/po_search.php:62
-#: sales/inquiry/sales_deliveries_view.php:103
-#: sales/inquiry/sales_orders_view.php:223
-#: sales/inquiry/sales_orders_view.php.orig:223
+#: ../purchasing/inquiry/po_search_completed.php:60
+#: ../purchasing/inquiry/po_search_completed.php.orig:61
+#: ../purchasing/inquiry/po_search.php:62
+#: ../sales/inquiry/sales_deliveries_view.php:103
+#: ../sales/inquiry/sales_deliveries_view.php.orig:103
+#: ../sales/inquiry/sales_orders_view.php:247
+#: ../sales/inquiry/sales_orders_view.php.orig:224
 msgid "#:"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:68
+#: ../purchasing/inquiry/po_search_completed.php:65
+#: ../purchasing/inquiry/po_search_completed.php.orig:66
 msgid "into location:"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:126
-#: purchasing/inquiry/po_search.php:135
-#: sales/inquiry/sales_orders_view.php:265
-#: sales/inquiry/sales_orders_view.php.orig:265
+#: ../purchasing/inquiry/po_search_completed.php:125
+#: ../purchasing/inquiry/po_search_completed.php.orig:124
+#: ../purchasing/inquiry/po_search.php:135
+#: ../sales/inquiry/sales_orders_view.php:289
+#: ../sales/inquiry/sales_orders_view.php.orig:266
 msgid "Order Date"
 msgstr ""
 
-#: purchasing/inquiry/po_search_completed.php:128
-#: purchasing/inquiry/po_search.php:137
-#: sales/inquiry/sales_orders_view.php:268
-#: sales/inquiry/sales_orders_view.php.orig:268
+#: ../purchasing/inquiry/po_search_completed.php:127
+#: ../purchasing/inquiry/po_search_completed.php.orig:126
+#: ../purchasing/inquiry/po_search.php:137
+#: ../sales/inquiry/sales_orders_view.php:292
+#: ../sales/inquiry/sales_orders_view.php.orig:269
 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:55
-#: sales/inquiry/customer_allocation_inquiry.php:49
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:55
+#: ../sales/inquiry/customer_allocation_inquiry.php:49
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:49
 msgid "show settled:"
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:103
-msgid "Pay"
-msgstr ""
-
-#: purchasing/inquiry/supplier_allocation_inquiry.php:130
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:129
 msgid "Supp Reference"
 msgstr ""
 
-#: purchasing/inquiry/supplier_allocation_inquiry.php:136
-#: reporting/rep101.php:131 reporting/rep201.php:119
-#: reporting/includes/doctext.inc:225
-#: sales/inquiry/customer_allocation_inquiry.php:154
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:135
+#: ../reporting/rep101.php:131
+#: ../reporting/rep201.php:119
+#: ../reporting/includes/doctext.inc:247
+#: ../sales/inquiry/customer_allocation_inquiry.php:154
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:154
 msgid "Allocated"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:27
-#: purchasing/inquiry/supplier_inquiry.php.orig:25
+#: ../purchasing/inquiry/supplier_inquiry.php:25
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:25
 msgid "Supplier Inquiry"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:51
-#: purchasing/inquiry/supplier_inquiry.php.orig:47
+#: ../purchasing/inquiry/supplier_inquiry.php:48
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:48
 msgid "Select a supplier:"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:70
-#: purchasing/inquiry/supplier_inquiry.php:71
-#: purchasing/inquiry/supplier_inquiry.php:72
-#: purchasing/inquiry/supplier_inquiry.php.orig:66
-#: purchasing/inquiry/supplier_inquiry.php.orig:67
-#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:118
-#: reporting/rep102.php:119 reporting/rep102.php:120 reporting/rep102.php:240
-#: reporting/rep108.php:150 reporting/rep108.php:151 reporting/rep108.php:152
-#: reporting/rep202.php:122 reporting/rep202.php:123 reporting/rep202.php:124
-#: reporting/rep202.php:154 reporting/rep202.php:155 reporting/rep202.php:156
-#: reporting/rep202.php:248 sales/create_recurrent_invoices.php:115
-#: sales/manage/recurrent_invoices.php:102
-#: sales/inquiry/customer_inquiry.php:75 sales/inquiry/customer_inquiry.php:76
-#: sales/inquiry/customer_inquiry.php:77
-#: sales/inquiry/customer_inquiry.php.orig:75
-#: sales/inquiry/customer_inquiry.php.orig:76
-#: sales/inquiry/customer_inquiry.php.orig:77
+#: ../purchasing/inquiry/supplier_inquiry.php:67
+#: ../purchasing/inquiry/supplier_inquiry.php:68
+#: ../purchasing/inquiry/supplier_inquiry.php:69
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:67
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:68
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:69
+#: ../reporting/rep102.php:118
+#: ../reporting/rep102.php:119
+#: ../reporting/rep102.php:120
+#: ../reporting/rep102.php:240
+#: ../reporting/rep108.php:150
+#: ../reporting/rep108.php:151
+#: ../reporting/rep108.php:152
+#: ../reporting/rep202.php:122
+#: ../reporting/rep202.php:123
+#: ../reporting/rep202.php:124
+#: ../reporting/rep202.php:154
+#: ../reporting/rep202.php:155
+#: ../reporting/rep202.php:156
+#: ../reporting/rep202.php:248
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/inquiry/customer_inquiry.php:71
+#: ../sales/inquiry/customer_inquiry.php:72
+#: ../sales/inquiry/customer_inquiry.php:73
+#: ../sales/inquiry/customer_inquiry.php.orig:72
+#: ../sales/inquiry/customer_inquiry.php.orig:73
+#: ../sales/inquiry/customer_inquiry.php.orig:74
 msgid "Days"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:72
-#: purchasing/inquiry/supplier_inquiry.php.orig:68 reporting/rep102.php:120
-#: reporting/rep108.php:152 reporting/rep202.php:124 reporting/rep202.php:156
-#: sales/inquiry/customer_inquiry.php:77
-#: sales/inquiry/customer_inquiry.php.orig:77
+#: ../purchasing/inquiry/supplier_inquiry.php:69
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:69
+#: ../reporting/rep102.php:120
+#: ../reporting/rep108.php:152
+#: ../reporting/rep202.php:124
+#: ../reporting/rep202.php:156
+#: ../sales/inquiry/customer_inquiry.php:73
+#: ../sales/inquiry/customer_inquiry.php.orig:74
 msgid "Over"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:76
-#: purchasing/inquiry/supplier_inquiry.php.orig:72
-#: sales/inquiry/customer_inquiry.php:80
-#: sales/inquiry/customer_inquiry.php.orig:80
+#: ../purchasing/inquiry/supplier_inquiry.php:73
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:73
+#: ../sales/inquiry/customer_inquiry.php:76
+#: ../sales/inquiry/customer_inquiry.php.orig:77
 msgid "Terms"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:76
-#: purchasing/inquiry/supplier_inquiry.php.orig:72 reporting/rep102.php:123
-#: reporting/rep102.php:238 reporting/rep108.php:154 reporting/rep202.php:128
-#: reporting/rep202.php:246 sales/inquiry/customer_inquiry.php:80
-#: sales/inquiry/customer_inquiry.php.orig:80
+#: ../purchasing/inquiry/supplier_inquiry.php:73
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:73
+#: ../reporting/rep102.php:123
+#: ../reporting/rep102.php:238
+#: ../reporting/rep108.php:154
+#: ../reporting/rep202.php:128
+#: ../reporting/rep202.php:246
+#: ../sales/inquiry/customer_inquiry.php:76
+#: ../sales/inquiry/customer_inquiry.php.orig:77
 msgid "Current"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:77
-#: purchasing/inquiry/supplier_inquiry.php.orig:73 reporting/rep102.php:124
-#: reporting/rep108.php:154 reporting/rep202.php:129
-#: sales/inquiry/customer_inquiry.php:81
-#: sales/inquiry/customer_inquiry.php.orig:81
+#: ../purchasing/inquiry/supplier_inquiry.php:74
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:74
+#: ../reporting/rep102.php:124
+#: ../reporting/rep108.php:154
+#: ../reporting/rep202.php:129
+#: ../sales/inquiry/customer_inquiry.php:77
+#: ../sales/inquiry/customer_inquiry.php.orig:78
 msgid "Total Balance"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:133
-#: purchasing/inquiry/supplier_inquiry.php.orig:127
-#: sales/inquiry/customer_inquiry.php:164
-#: sales/inquiry/customer_inquiry.php.orig:164
+#: ../purchasing/inquiry/supplier_inquiry.php:133
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:130
+#: ../sales/inquiry/customer_inquiry.php:162
+#: ../sales/inquiry/customer_inquiry.php.orig:161
 msgid "Credit This"
 msgstr ""
 
-#: purchasing/inquiry/supplier_inquiry.php:155
-#: purchasing/inquiry/supplier_inquiry.php.orig:149
+#: ../purchasing/inquiry/supplier_inquiry.php:155
+#: ../purchasing/inquiry/supplier_inquiry.php.orig:152
 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:50
+#: ../purchasing/allocations/supplier_allocate.php:50
 msgid "Allocation of"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:55
-#: sales/allocations/customer_allocate.php:54
+#: ../purchasing/allocations/supplier_allocate.php:55
+#: ../sales/allocations/customer_allocate.php:54
 msgid "Total:"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:64
-#: sales/allocations/customer_allocate.php:63
+#: ../purchasing/allocations/supplier_allocate.php:64
+#: ../sales/allocations/customer_allocate.php:63
 msgid "Start again allocation of selected amount"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:65
-#: sales/allocations/customer_allocate.php:64
+#: ../purchasing/allocations/supplier_allocate.php:65
+#: ../sales/allocations/customer_allocate.php:64
 msgid "Process allocations"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:66
-#: purchasing/allocations/supplier_allocate.php:72
-#: sales/allocations/customer_allocate.php:65
-#: sales/allocations/customer_allocate.php:71
+#: ../purchasing/allocations/supplier_allocate.php:66
+#: ../purchasing/allocations/supplier_allocate.php:72
+#: ../sales/allocations/customer_allocate.php:65
+#: ../sales/allocations/customer_allocate.php:71
 msgid "Back to Allocations"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:67
-#: purchasing/allocations/supplier_allocate.php:73
-#: sales/allocations/customer_allocate.php:65
-#: sales/allocations/customer_allocate.php:72
+#: ../purchasing/allocations/supplier_allocate.php:67
+#: ../purchasing/allocations/supplier_allocate.php:73
+#: ../sales/allocations/customer_allocate.php:65
+#: ../sales/allocations/customer_allocate.php:72
 msgid "Abandon allocations and return to selection of allocatable amounts"
 msgstr ""
 
-#: purchasing/allocations/supplier_allocate.php:71
-#: sales/allocations/customer_allocate.php:69
+#: ../purchasing/allocations/supplier_allocate.php:71
+#: ../sales/allocations/customer_allocate.php:69
 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/rep101.php:120 reporting/rep102.php:106 reporting/rep114.php:103
-#: reporting/rep202.php:110 reporting/rep203.php:81
+#: ../reporting/rep101.php:120
+#: ../reporting/rep102.php:106
+#: ../reporting/rep114.php:103
+#: ../reporting/rep202.php:110
+#: ../reporting/rep203.php:81
 msgid "Balances in Home Currency"
 msgstr ""
 
-#: reporting/rep101.php:130 reporting/rep201.php:118 reporting/rep203.php:91
-#: reporting/rep709.php:109 reporting/includes/doctext.inc:145
-#: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:224
+#: ../reporting/rep101.php:130
+#: ../reporting/rep201.php:118
+#: ../reporting/rep203.php:91
+#: ../reporting/rep709.php:109
+#: ../reporting/includes/doctext.inc:167
+#: ../reporting/includes/doctext.inc:208
+#: ../reporting/includes/doctext.inc:246
 msgid "Trans Type"
 msgstr ""
 
-#: reporting/rep101.php:130 reporting/rep201.php:118
-#: reporting/includes/doctext.inc:224
+#: ../reporting/rep101.php:130
+#: ../reporting/rep201.php:118
+#: ../reporting/includes/doctext.inc:246
 msgid "Charges"
 msgstr ""
 
-#: reporting/rep101.php:130 reporting/rep201.php:119
-#: reporting/includes/doctext.inc:225
+#: ../reporting/rep101.php:130
+#: ../reporting/rep201.php:119
+#: ../reporting/includes/doctext.inc:247
 msgid "Credits"
 msgstr ""
 
-#: reporting/rep101.php:139 reporting/rep102.php:134 reporting/rep201.php:127
-#: reporting/rep202.php:139 reporting/rep203.php:100 reporting/rep303.php:124
-#: reporting/reports_main.php:38 reporting/reports_main.php:47
-#: reporting/reports_main.php:138 reporting/reports_main.php:147
-#: reporting/reports_main.php:155 reporting/reports_main.php:195
+#: ../reporting/rep101.php:139
+#: ../reporting/rep102.php:134
+#: ../reporting/rep201.php:127
+#: ../reporting/rep202.php:139
+#: ../reporting/rep203.php:100
+#: ../reporting/rep303.php:124
+#: ../reporting/reports_main.php:38
+#: ../reporting/reports_main.php:47
+#: ../reporting/reports_main.php:138
+#: ../reporting/reports_main.php:147
+#: ../reporting/reports_main.php:155
+#: ../reporting/reports_main.php:195
 msgid "Suppress Zeros"
 msgstr ""
 
-#: reporting/rep101.php:141
+#: ../reporting/rep101.php:141
 msgid "Customer Balances"
 msgstr ""
 
-#: reporting/rep101.php:244 reporting/rep102.php:224 reporting/rep106.php:177
-#: reporting/rep201.php:231 reporting/rep202.php:231 reporting/rep203.php:177
-#: reporting/rep204.php:144 reporting/rep301.php:176 reporting/rep304.php:191
-#: reporting/rep305.php:181
+#: ../reporting/rep101.php:244
+#: ../reporting/rep102.php:224
+#: ../reporting/rep106.php:167
+#: ../reporting/rep201.php:231
+#: ../reporting/rep202.php:231
+#: ../reporting/rep203.php:177
+#: ../reporting/rep204.php:144
+#: ../reporting/rep301.php:176
+#: ../reporting/rep304.php:191
+#: ../reporting/rep305.php:181
 msgid "Grand Total"
 msgstr ""
 
-#: reporting/rep102.php:100 reporting/rep106.php:91 reporting/rep202.php:104
-#: reporting/rep709.php:93 reporting/reports_main.php:46
-#: reporting/reports_main.php:84 reporting/reports_main.php:146
-#: reporting/reports_main.php:181 reporting/reports_main.php:393
+#: ../reporting/rep102.php:100
+#: ../reporting/rep106.php:91
+#: ../reporting/rep202.php:104
+#: ../reporting/rep709.php:93
+#: ../reporting/reports_main.php:46
+#: ../reporting/reports_main.php:84
+#: ../reporting/reports_main.php:146
+#: ../reporting/reports_main.php:181
+#: ../reporting/reports_main.php:393
 msgid "Summary Only"
 msgstr ""
 
-#: reporting/rep102.php:102 reporting/rep202.php:106 reporting/rep709.php:95
+#: ../reporting/rep102.php:102
+#: ../reporting/rep202.php:106
+#: ../reporting/rep709.php:95
 msgid "Detailed Report"
 msgstr ""
 
-#: reporting/rep102.php:129 reporting/rep202.php:134 reporting/rep203.php:97
-#: reporting/rep301.php:108 reporting/reports_main.php:35
-#: reporting/reports_main.php:42 reporting/reports_main.php:61
-#: reporting/reports_main.php:75 reporting/reports_main.php:83
-#: reporting/reports_main.php:135 reporting/reports_main.php:142
-#: reporting/reports_main.php:152 reporting/reports_main.php:178
-#: reporting/reports_main.php:200 reporting/reports_main.php:208
-#: reporting/reports_main.php:240 reporting/reports_main.php:251
-#: reporting/reports_main.php:262 reporting/reports_main.php:278
-#: reporting/reports_main.php:288 reporting/reports_main.php:299
-#: reporting/reports_main.php:311 reporting/reports_main.php:325
-#: reporting/reports_main.php:334 reporting/reports_main.php:344
-#: reporting/reports_main.php:355 reporting/reports_main.php:367
-#: reporting/reports_main.php:375 reporting/reports_main.php:384
-#: reporting/reports_main.php:392 reporting/reports_main.php:398
+#: ../reporting/rep102.php:129
+#: ../reporting/rep202.php:134
+#: ../reporting/rep203.php:97
+#: ../reporting/rep301.php:108
+#: ../reporting/reports_main.php:35
+#: ../reporting/reports_main.php:42
+#: ../reporting/reports_main.php:61
+#: ../reporting/reports_main.php:75
+#: ../reporting/reports_main.php:83
+#: ../reporting/reports_main.php:135
+#: ../reporting/reports_main.php:142
+#: ../reporting/reports_main.php:152
+#: ../reporting/reports_main.php:178
+#: ../reporting/reports_main.php:200
+#: ../reporting/reports_main.php:208
+#: ../reporting/reports_main.php:240
+#: ../reporting/reports_main.php:251
+#: ../reporting/reports_main.php:262
+#: ../reporting/reports_main.php:278
+#: ../reporting/reports_main.php:288
+#: ../reporting/reports_main.php:299
+#: ../reporting/reports_main.php:311
+#: ../reporting/reports_main.php:325
+#: ../reporting/reports_main.php:334
+#: ../reporting/reports_main.php:344
+#: ../reporting/reports_main.php:355
+#: ../reporting/reports_main.php:367
+#: ../reporting/reports_main.php:375
+#: ../reporting/reports_main.php:384
+#: ../reporting/reports_main.php:392
+#: ../reporting/reports_main.php:398
 msgid "End Date"
 msgstr ""
 
-#: reporting/rep102.php:133 reporting/rep202.php:138
-#: reporting/reports_main.php:45 reporting/reports_main.php:110
-#: reporting/reports_main.php:145
+#: ../reporting/rep102.php:133
+#: ../reporting/rep202.php:138
+#: ../reporting/reports_main.php:45
+#: ../reporting/reports_main.php:110
+#: ../reporting/reports_main.php:145
 msgid "Show Also Allocated"
 msgstr ""
 
-#: reporting/rep102.php:138
+#: ../reporting/rep102.php:138
 msgid "Aged Customer Analysis"
 msgstr ""
 
-#: reporting/rep103.php:115
+#: ../reporting/rep103.php:115
 msgid "All Areas"
 msgstr ""
 
-#: reporting/rep103.php:119
+#: ../reporting/rep103.php:119
 msgid "All Sales Folk"
 msgstr ""
 
-#: reporting/rep103.php:123
+#: ../reporting/rep103.php:123
 msgid "Greater than "
 msgstr ""
 
-#: reporting/rep103.php:127
+#: ../reporting/rep103.php:127
 msgid "Less than "
 msgstr ""
 
-#: reporting/rep103.php:136
+#: ../reporting/rep103.php:136
 msgid "Customer Postal Address"
 msgstr ""
 
-#: reporting/rep103.php:136
+#: ../reporting/rep103.php:136
 msgid "Price/Turnover"
 msgstr ""
 
-#: reporting/rep103.php:136
+#: ../reporting/rep103.php:136
 msgid "Branch Contact Information"
 msgstr ""
 
-#: reporting/rep103.php:137
+#: ../reporting/rep103.php:137
 msgid "Branch Delivery Address"
 msgstr ""
 
-#: reporting/rep103.php:142 reporting/reports_main.php:52
+#: ../reporting/rep103.php:142
+#: ../reporting/reports_main.php:52
 msgid "Activity Since"
 msgstr ""
 
-#: reporting/rep103.php:143 reporting/reports_main.php:53
-#: sales/manage/sales_areas.php:16
+#: ../reporting/rep103.php:143
+#: ../reporting/reports_main.php:53
+#: ../sales/manage/sales_areas.php:16
 msgid "Sales Areas"
 msgstr ""
 
-#: reporting/rep103.php:144 reporting/reports_main.php:54
+#: ../reporting/rep103.php:144
+#: ../reporting/reports_main.php:54
 msgid "Sales Folk"
 msgstr ""
 
-#: reporting/rep103.php:145
+#: ../reporting/rep103.php:145
 msgid "Activity"
 msgstr ""
 
-#: reporting/rep103.php:147
+#: ../reporting/rep103.php:147
 msgid "Customer Details Listing"
 msgstr ""
 
-#: reporting/rep103.php:175
+#: ../reporting/rep103.php:175
 msgid "Customers in"
 msgstr ""
 
-#: reporting/rep103.php:196
+#: ../reporting/rep103.php:196
 msgid "Price List"
 msgstr ""
 
-#: reporting/rep103.php:207
+#: ../reporting/rep103.php:207
 msgid "Turnover"
 msgstr ""
 
-#: reporting/rep103.php:216
+#: ../reporting/rep103.php:216
 msgid "Ph"
 msgstr ""
 
-#: reporting/rep104.php:109
+#: ../reporting/rep104.php:109
 msgid "Category/Items"
 msgstr ""
 
-#: reporting/rep104.php:109 reporting/rep301.php:103 reporting/rep303.php:109
-#: reporting/rep303.php:115
+#: ../reporting/rep104.php:109
+#: ../reporting/rep301.php:103
+#: ../reporting/rep303.php:109
+#: ../reporting/rep303.php:115
 msgid "UOM"
 msgstr ""
 
-#: reporting/rep104.php:109
+#: ../reporting/rep104.php:109
 msgid "GP %"
 msgstr ""
 
-#: reporting/rep104.php:117 reporting/reports_main.php:70
+#: ../reporting/rep104.php:117
+#: ../reporting/reports_main.php:70
 msgid "Show GP %"
 msgstr ""
 
-#: reporting/rep104.php:124
+#: ../reporting/rep104.php:124
 msgid "Price Listing"
 msgstr ""
 
-#: reporting/rep104.php:191
+#: ../reporting/rep104.php:191
 msgid "Sales Kits"
 msgstr ""
 
-#: reporting/rep105.php:101
+#: ../reporting/rep105.php:101
 msgid "All Orders"
 msgstr ""
 
-#: reporting/rep105.php:103 reporting/reports_main.php:78
+#: ../reporting/rep105.php:103
+#: ../reporting/reports_main.php:78
 msgid "Back Orders Only"
 msgstr ""
 
-#: reporting/rep105.php:107 reporting/rep204.php:82
-#: sales/inquiry/customer_allocation_inquiry.php:147
-#: sales/inquiry/customer_inquiry.php:226
-#: sales/inquiry/customer_inquiry.php.orig:226
+#: ../reporting/rep105.php:107
+#: ../reporting/rep204.php:82
+#: ../sales/inquiry/customer_allocation_inquiry.php:147
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:147
+#: ../sales/inquiry/customer_inquiry.php:202
+#: ../sales/inquiry/customer_inquiry.php.orig:226
 msgid "Order"
 msgstr ""
 
-#: reporting/rep105.php:107 reporting/rep106.php:81 reporting/rep112.php:168
-#: sales/create_recurrent_invoices.php:115
-#: sales/customer_credit_invoice.php:238 sales/customer_delivery.php:339
-#: sales/customer_invoice.php:379 sales/manage/customers.php:247
-#: sales/manage/customers.php:285 sales/manage/customers.php.orig:248
-#: sales/manage/customers.php.orig:286 sales/manage/recurrent_invoices.php:102
-#: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:231
-#: sales/inquiry/customer_inquiry.php.orig:231
-#: sales/inquiry/sales_deliveries_view.php:182
-#: sales/inquiry/sales_orders_view.php:263
-#: sales/inquiry/sales_orders_view.php:277
-#: sales/inquiry/sales_orders_view.php.orig:263
-#: sales/inquiry/sales_orders_view.php.orig:277
+#: ../reporting/rep105.php:107
+#: ../reporting/rep106.php:81
+#: ../reporting/rep112.php:164
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/customer_credit_invoice.php:238
+#: ../sales/customer_delivery.php:347
+#: ../sales/customer_invoice.php:445
+#: ../sales/manage/customers.php:251
+#: ../sales/manage/customers.php:289
+#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/manage/sav.customers.php:251
+#: ../sales/manage/sav.customers.php:289
+#: ../sales/view/view_credit.php:58
+#: ../sales/inquiry/customer_inquiry.php:207
+#: ../sales/inquiry/customer_inquiry.php.orig:231
+#: ../sales/inquiry/sales_deliveries_view.php:182
+#: ../sales/inquiry/sales_deliveries_view.php.orig:182
+#: ../sales/inquiry/sales_orders_view.php:287
+#: ../sales/inquiry/sales_orders_view.php:301
+#: ../sales/inquiry/sales_orders_view.php.orig:264
+#: ../sales/inquiry/sales_orders_view.php.orig:278
 msgid "Branch"
 msgstr ""
 
-#: reporting/rep105.php:107 reporting/rep106.php:81
+#: ../reporting/rep105.php:107
+#: ../reporting/rep106.php:81
 msgid "Customer Ref"
 msgstr ""
 
-#: reporting/rep105.php:108
+#: ../reporting/rep105.php:108
 msgid "Ord Date"
 msgstr ""
 
-#: reporting/rep105.php:108
+#: ../reporting/rep105.php:108
 msgid "Del Date"
 msgstr ""
 
-#: reporting/rep105.php:108 reporting/rep401.php:69
+#: ../reporting/rep105.php:108
+#: ../reporting/rep401.php:69
 msgid "Loc"
 msgstr ""
 
-#: reporting/rep105.php:112 sales/customer_delivery.php:432
-#: sales/customer_invoice.php:467
+#: ../reporting/rep105.php:112
+#: ../sales/customer_delivery.php:440
+#: ../sales/customer_invoice.php:542
 msgid "Invoiced"
 msgstr ""
 
-#: reporting/rep105.php:119
+#: ../reporting/rep105.php:119
 msgid "Selection"
 msgstr ""
 
-#: reporting/rep105.php:124
+#: ../reporting/rep105.php:124
 msgid "Order Status Listing"
 msgstr ""
 
-#: reporting/rep106.php:82
+#: ../reporting/rep106.php:82
 msgid "Inv Date"
 msgstr ""
 
-#: reporting/rep106.php:82 reporting/rep106.php:86 reporting/rep106.php:87
-#: sales/manage/sales_people.php:99 sales/manage/sales_people.php:159
-#: sales/manage/sales_people.php:161
+#: ../reporting/rep106.php:82
+#: ../reporting/rep106.php:86
+#: ../reporting/rep106.php:87
+#: ../sales/manage/sales_people.php:99
+#: ../sales/manage/sales_people.php:159
+#: ../sales/manage/sales_people.php:161
 msgid "Provision"
 msgstr ""
 
-#: reporting/rep106.php:86
+#: ../reporting/rep106.php:86
 msgid "Salesman"
 msgstr ""
 
-#: reporting/rep106.php:86 reporting/includes/header2.inc:110
-#: sales/manage/sales_people.php:99
+#: ../reporting/rep106.php:86
+#: ../reporting/includes/header2.inc:110
+#: ../sales/manage/sales_people.php:99
 msgid "Email"
 msgstr ""
 
-#: reporting/rep106.php:87 sales/manage/sales_people.php:99
+#: ../reporting/rep106.php:87
+#: ../sales/manage/sales_people.php:99
 msgid "Break Pt."
 msgstr ""
 
-#: reporting/rep106.php:96
+#: ../reporting/rep106.php:96
 msgid "Salesman Listing"
 msgstr ""
 
-#: reporting/rep107.php:66 reporting/rep107.php:89 reporting/rep107.php:94
-#: reporting/includes/doctext.inc:105
+#: ../reporting/rep107.php:85
+#: ../reporting/rep107.php:105
+#: ../reporting/includes/doctext.inc:118
 msgid "INVOICE"
 msgstr ""
 
-#: reporting/rep107.php:149 reporting/rep109.php:151 reporting/rep110.php:162
-#: reporting/rep111.php:138 reporting/rep113.php:151
-#: sales/view/view_credit.php:138 sales/view/view_dispatch.php:155
-#: sales/view/view_invoice.php:157 sales/view/view_sales_order.php:227
-#: sales/includes/ui/sales_credit_ui.inc:222
+#: ../reporting/rep107.php:186
+msgid "Prepayments invoiced to this order up to day:"
+msgstr ""
+
+#: ../reporting/rep107.php:193
+msgid "Invoice reference"
+msgstr ""
+
+#: ../reporting/rep107.php:210
+msgid "Total payments:"
+msgstr ""
+
+#: ../reporting/rep107.php:220
+#: ../reporting/rep109.php:155
+#: ../reporting/rep110.php:164
+#: ../reporting/rep111.php:140
+#: ../reporting/rep113.php:150
+#: ../sales/view/view_credit.php:138
+#: ../sales/view/view_dispatch.php:155
+#: ../sales/view/view_invoice.php:159
+#: ../sales/view/view_sales_order.php:245
+#: ../sales/view/view_sales_order.php.orig:227
+#: ../sales/includes/ui/sales_credit_ui.inc:222
 msgid "Shipping"
 msgstr ""
 
-#: reporting/rep108.php:84 reporting/rep108.php:115
-#: reporting/includes/doctext.inc:216
+#: ../reporting/rep107.php:266
+#: ../reporting/rep109.php:207
+#: ../reporting/rep111.php:192
+msgid "TOTAL ORDER VAT INCL."
+msgstr ""
+
+#: ../reporting/rep107.php:272
+msgid "THIS INVOICE"
+msgstr ""
+
+#: ../reporting/rep108.php:84
+#: ../reporting/rep108.php:115
+#: ../reporting/includes/doctext.inc:238
 msgid "STATEMENT"
 msgstr ""
 
-#: reporting/rep108.php:126
+#: ../reporting/rep108.php:126
 msgid "Outstanding Transactions"
 msgstr ""
 
-#: reporting/rep108.php:169
+#: ../reporting/rep108.php:169
 msgid "Statement"
 msgstr ""
 
-#: reporting/rep108.php:169
+#: ../reporting/rep108.php:169
 msgid "as of"
 msgstr ""
 
-#: reporting/rep109.php:65 reporting/rep109.php:93 reporting/rep109.php:99
-#: reporting/includes/doctext.inc:53
+#: ../reporting/rep109.php:66
+#: ../reporting/rep109.php:94
+#: ../reporting/rep109.php:100
+#: ../reporting/includes/doctext.inc:65
 msgid "SALES ORDER"
 msgstr ""
 
-#: reporting/rep109.php:67 reporting/rep109.php:88 reporting/rep109.php:99
-#: reporting/includes/doctext.inc:53
+#: ../reporting/rep109.php:68
+#: ../reporting/rep109.php:89
+#: ../reporting/rep109.php:100
+#: ../reporting/includes/doctext.inc:65
 msgid "QUOTE"
 msgstr ""
 
-#: reporting/rep109.php:157 reporting/rep111.php:144
+#: ../reporting/rep109.php:161
+#: ../reporting/rep111.php:146
 msgid "TOTAL ORDER EX VAT"
 msgstr ""
 
-#: reporting/rep109.php:203 reporting/rep111.php:190
-msgid "TOTAL ORDER VAT INCL."
-msgstr ""
-
-#: reporting/rep110.php:68
+#: ../reporting/rep110.php:68
 msgid "DELIVERY"
 msgstr ""
 
-#: reporting/rep110.php:70 reporting/rep110.php:97
-#: reporting/includes/doctext.inc:70
+#: ../reporting/rep110.php:70
+#: ../reporting/rep110.php:97
+#: ../reporting/includes/doctext.inc:82
 msgid "PACKING SLIP"
 msgstr ""
 
-#: reporting/rep110.php:92 reporting/rep110.php:103
-#: reporting/includes/doctext.inc:70
+#: ../reporting/rep110.php:92
+#: ../reporting/rep110.php:103
+#: ../reporting/includes/doctext.inc:82
 msgid "DELIVERY NOTE"
 msgstr ""
 
-#: reporting/rep110.php:206
+#: ../reporting/rep110.php:208
 msgid "TOTAL DELIVERY INCL. VAT"
 msgstr ""
 
-#: reporting/rep111.php:61 reporting/rep111.php:86
-#: reporting/includes/doctext.inc:38
+#: ../reporting/rep111.php:61
+#: ../reporting/rep111.php:86
+#: ../reporting/includes/doctext.inc:50
 msgid "SALES QUOTATION"
 msgstr ""
 
-#: reporting/rep112.php:92 reporting/rep112.php:112
-#: reporting/includes/doctext.inc:176
+#: ../reporting/rep112.php:80
+#: ../reporting/rep112.php:101
+#: ../reporting/includes/doctext.inc:198
 msgid "RECEIPT"
 msgstr ""
 
-#: reporting/rep112.php:121 reporting/rep210.php:135
+#: ../reporting/rep112.php:110
+#: ../reporting/rep210.php:124
 msgid "As advance / full / part / payment towards:"
 msgstr ""
 
-#: reporting/rep112.php:149
+#: ../reporting/rep112.php:145
 msgid "TOTAL RECEIPT"
 msgstr ""
 
-#: reporting/rep112.php:159
+#: ../reporting/rep112.php:155
 msgid "Received / Sign"
 msgstr ""
 
-#: reporting/rep112.php:161
+#: ../reporting/rep112.php:157
 msgid "By Cash / Cheque* / Draft No."
 msgstr ""
 
-#: reporting/rep112.php:163
+#: ../reporting/rep112.php:159
 msgid "Dated"
 msgstr ""
 
-#: reporting/rep112.php:166
+#: ../reporting/rep112.php:162
 msgid "Drawn on Bank"
 msgstr ""
 
-#: reporting/rep113.php:66 reporting/rep113.php:91 reporting/rep113.php:96
-#: reporting/includes/doctext.inc:91
+#: ../reporting/rep113.php:66
+#: ../reporting/rep113.php:91
+#: ../reporting/rep113.php:96
+#: ../reporting/includes/doctext.inc:103
 msgid "CREDIT NOTE"
 msgstr ""
 
-#: reporting/rep113.php:195 sales/view/view_credit.php:143
+#: ../reporting/rep113.php:194
+#: ../sales/view/view_credit.php:143
 msgid "TOTAL CREDIT"
 msgstr ""
 
-#: reporting/rep114.php:85
+#: ../reporting/rep114.php:85
 msgid "Sales Summary Report"
 msgstr ""
 
-#: reporting/rep114.php:89 reporting/reports_main.php:62
+#: ../reporting/rep114.php:89
+#: ../reporting/reports_main.php:62
 msgid "Tax Id Only"
 msgstr ""
 
-#: reporting/rep114.php:93
+#: ../reporting/rep114.php:93
 msgid "Tax Id"
 msgstr ""
 
-#: reporting/rep114.php:93
+#: ../reporting/rep114.php:93
 msgid "Total ex. Tax"
 msgstr ""
 
-#: reporting/rep114.php:93 reporting/rep709.php:110 taxes/tax_groups.php:177
+#: ../reporting/rep114.php:93
+#: ../reporting/rep709.php:110
+#: ../taxes/tax_groups.php:171
+#: ../taxes/tax_groups.php.orig:173
+#: ../taxes/tax_groups.php.sav:173
 msgid "Tax"
 msgstr ""
 
-#: reporting/rep201.php:108
+#: ../reporting/rep201.php:108
 msgid "Balances in Home currency"
 msgstr ""
 
-#: reporting/rep201.php:129
+#: ../reporting/rep201.php:129
 msgid "Supplier Balances"
 msgstr ""
 
-#: reporting/rep202.php:142
+#: ../reporting/rep202.php:142
 msgid "currency"
 msgstr ""
 
-#: reporting/rep202.php:143
+#: ../reporting/rep202.php:143
 msgid "Aged Supplier Analysis"
 msgstr ""
 
-#: reporting/rep203.php:102
+#: ../reporting/rep203.php:102
 msgid "Payment Report"
 msgstr ""
 
-#: reporting/rep204.php:82
+#: ../reporting/rep204.php:82
 msgid "Qty Recd"
 msgstr ""
 
-#: reporting/rep204.php:82
+#: ../reporting/rep204.php:82
 msgid "qty Inv"
 msgstr ""
 
-#: reporting/rep204.php:83
+#: ../reporting/rep204.php:83
 msgid "Act Price"
 msgstr ""
 
-#: reporting/rep204.php:90
+#: ../reporting/rep204.php:90
 msgid "Outstanding GRNs Report"
 msgstr ""
 
-#: reporting/rep209.php:88 reporting/rep209.php:107 reporting/rep209.php:112
-#: reporting/includes/doctext.inc:149
+#: ../reporting/rep209.php:88
+#: ../reporting/rep209.php:107
+#: ../reporting/rep209.php:112
+#: ../reporting/includes/doctext.inc:171
 msgid "PURCHASE ORDER"
 msgstr ""
 
-#: reporting/rep209.php:211
+#: ../reporting/rep209.php:214
 msgid "TOTAL PO"
 msgstr ""
 
-#: reporting/rep210.php:94 reporting/rep210.php:121 reporting/rep210.php:126
-#: reporting/includes/doctext.inc:129
+#: ../reporting/rep210.php:82
+#: ../reporting/rep210.php:110
+#: ../reporting/rep210.php:115
+#: ../reporting/includes/doctext.inc:151
 msgid "REMITTANCE"
 msgstr ""
 
-#: reporting/rep210.php:164
+#: ../reporting/rep210.php:159
 msgid "TOTAL REMITTANCE"
 msgstr ""
 
-#: reporting/rep301.php:112
+#: ../reporting/rep301.php:112
 msgid "Inventory Valuation Report"
 msgstr ""
 
-#: reporting/rep302.php:123
+#: ../reporting/rep302.php:123
 msgid "QOH"
 msgstr ""
 
-#: reporting/rep302.php:123
+#: ../reporting/rep302.php:123
 msgid "Cust Ord"
 msgstr ""
 
-#: reporting/rep302.php:123
+#: ../reporting/rep302.php:123
 msgid "Supp Ord"
 msgstr ""
 
-#: reporting/rep302.php:123
+#: ../reporting/rep302.php:123
 msgid "Sugg Ord"
 msgstr ""
 
-#: reporting/rep302.php:132
+#: ../reporting/rep302.php:132
 msgid "Inventory Planning Report"
 msgstr ""
 
-#: reporting/rep303.php:97
+#: ../reporting/rep303.php:97
 msgid "Shortage"
 msgstr ""
 
-#: reporting/rep303.php:109 reporting/rep303.php:115 reporting/rep305.php:95
+#: ../reporting/rep303.php:109
+#: ../reporting/rep303.php:115
+#: ../reporting/rep305.php:95
 msgid "Stock ID"
 msgstr ""
 
-#: reporting/rep303.php:109
+#: ../reporting/rep303.php:109
 msgid "Check"
 msgstr ""
 
-#: reporting/rep303.php:123
+#: ../reporting/rep303.php:123
 msgid "Only Shortage"
 msgstr ""
 
-#: reporting/rep303.php:131
+#: ../reporting/rep303.php:131
 msgid "Stock Check Sheets"
 msgstr ""
 
-#: reporting/rep304.php:112 reporting/rep305.php:95
+#: ../reporting/rep304.php:112
+#: ../reporting/rep305.php:95
 msgid "Qty"
 msgstr ""
 
-#: reporting/rep304.php:112 sales/manage/customer_branches.php:240
-#: sales/manage/customers.php:255 sales/manage/customers.php.orig:256
+#: ../reporting/rep304.php:112
+#: ../sales/manage/customer_branches.php:241
+#: ../sales/manage/customers.php:259
+#: ../sales/manage/sav.customers.php:259
 msgid "Sales"
 msgstr ""
 
-#: reporting/rep304.php:112
+#: ../reporting/rep304.php:112
 msgid "Cost"
 msgstr ""
 
-#: reporting/rep304.php:112
+#: ../reporting/rep304.php:112
 msgid "Contribution"
 msgstr ""
 
-#: reporting/rep304.php:124
+#: ../reporting/rep304.php:124
 msgid "Inventory Sales Report"
 msgstr ""
 
-#: reporting/rep305.php:95
+#: ../reporting/rep305.php:95
 msgid "PO No"
 msgstr ""
 
-#: reporting/rep305.php:95
+#: ../reporting/rep305.php:95
 msgid "Inv"
 msgstr ""
 
-#: reporting/rep305.php:95
+#: ../reporting/rep305.php:95
 msgid "Inv Price"
 msgstr ""
 
-#: reporting/rep305.php:95
+#: ../reporting/rep305.php:95
 msgid "PO Price"
 msgstr ""
 
-#: reporting/rep305.php:102
+#: ../reporting/rep305.php:102
 msgid "GRN Valuation Report"
 msgstr ""
 
-#: reporting/rep401.php:69
+#: ../reporting/rep401.php:69
 msgid "Wrk Ctr"
 msgstr ""
 
-#: reporting/rep401.php:76
+#: ../reporting/rep401.php:76
 msgid "Bill of Material Listing"
 msgstr ""
 
-#: reporting/rep409.php:58 reporting/rep409.php:77 reporting/rep409.php:82
-#: reporting/includes/doctext.inc:192
+#: ../reporting/rep409.php:58
+#: ../reporting/rep409.php:77
+#: ../reporting/rep409.php:82
+#: ../reporting/includes/doctext.inc:214
 msgid "WORK ORDER"
 msgstr ""
 
-#: reporting/rep409.php:132
+#: ../reporting/rep409.php:132
 msgid "Insufficient stock"
 msgstr ""
 
-#: reporting/rep501.php:85
+#: ../reporting/rep501.php:85
 msgid "YTD"
 msgstr ""
 
-#: reporting/rep501.php:92
+#: ../reporting/rep501.php:92
 msgid "Dimension Summary"
 msgstr ""
 
-#: reporting/rep601.php:83 reporting/includes/doctext.inc:247
+#: ../reporting/rep601.php:83
+#: ../reporting/rep602.php:87
+#: ../reporting/includes/doctext.inc:260
 msgid "Bank Account"
 msgstr ""
 
-#: reporting/rep601.php:144
+#: ../reporting/rep601.php:144
+#: ../reporting/rep602.php:151
 msgid "Total Debit / Credit"
 msgstr ""
 
-#: reporting/rep601.php:161
+#: ../reporting/rep601.php:161
+#: ../reporting/rep602.php:167
 msgid "Net Change"
 msgstr ""
 
-#: reporting/rep702.php:51
+#: ../reporting/rep602.php:73
+msgid "Bank Statement w/Reconcile"
+msgstr ""
+
+#: ../reporting/rep602.php:81
+msgid "Reco Date"
+msgstr ""
+
+#: ../reporting/rep602.php:81
+msgid "Narration"
+msgstr ""
+
+#: ../reporting/rep602.php:195
+msgid "Bank Balance"
+msgstr ""
+
+#: ../reporting/rep702.php:51
 msgid "Type/Account"
 msgstr ""
 
-#: reporting/rep702.php:51
+#: ../reporting/rep702.php:51
 msgid "Date/Dim."
 msgstr ""
 
-#: reporting/rep702.php:52
+#: ../reporting/rep702.php:52
 msgid "Person/Item/Memo"
 msgstr ""
 
-#: reporting/rep702.php:62
+#: ../reporting/rep702.php:62
 msgid "List of Journal Entries"
 msgstr ""
 
-#: reporting/rep704.php:67
+#: ../reporting/rep704.php:67
 msgid "GL Account Transactions"
 msgstr ""
 
-#: reporting/rep705.php:243 reporting/rep705.php:256 reporting/rep705.php:267
-#: reporting/reports_main.php:270 reporting/reports_main.php:318
-#: reporting/reports_main.php:361
+#: ../reporting/rep705.php:243
+#: ../reporting/rep705.php:256
+#: ../reporting/rep705.php:267
+#: ../reporting/reports_main.php:270
+#: ../reporting/reports_main.php:318
+#: ../reporting/reports_main.php:361
 msgid "Year"
 msgstr ""
 
-#: reporting/rep705.php:249 reporting/rep705.php:260 reporting/rep705.php:269
-#: reporting/rep706.php:194 reporting/rep706.php:202 reporting/rep706.php:208
-#: reporting/rep707.php:218 reporting/rep707.php:226 reporting/rep707.php:232
+#: ../reporting/rep705.php:249
+#: ../reporting/rep705.php:260
+#: ../reporting/rep705.php:269
+#: ../reporting/rep706.php:194
+#: ../reporting/rep706.php:202
+#: ../reporting/rep706.php:208
+#: ../reporting/rep707.php:218
+#: ../reporting/rep707.php:226
+#: ../reporting/rep707.php:232
 msgid "Tags"
 msgstr ""
 
-#: reporting/rep705.php:250 reporting/rep705.php:261 reporting/rep705.php:270
+#: ../reporting/rep705.php:250
+#: ../reporting/rep705.php:261
+#: ../reporting/rep705.php:270
 msgid "Amounts in thousands"
 msgstr ""
 
-#: reporting/rep705.php:274
+#: ../reporting/rep705.php:274
 msgid "Annual Expense Breakdown"
 msgstr ""
 
-#: reporting/rep706.php:182
+#: ../reporting/rep706.php:182
 msgid "Close Balance"
 msgstr ""
 
-#: reporting/rep707.php:254
+#: ../reporting/rep707.php:254
 msgid "Profit and Loss Statement"
 msgstr ""
 
-#: reporting/rep709.php:91
+#: ../reporting/rep709.php:91
 msgid "Tax Report"
 msgstr ""
 
-#: reporting/rep709.php:109
+#: ../reporting/rep709.php:109
 msgid "Branch Name"
 msgstr ""
 
-#: reporting/rep709.php:110
+#: ../reporting/rep709.php:110
 msgid "Net"
 msgstr ""
 
-#: reporting/rep709.php:110 taxes/item_tax_types.php:185
+#: ../reporting/rep709.php:110
+#: ../taxes/item_tax_types.php:185
 msgid "Rate"
 msgstr ""
 
-#: reporting/rep709.php:172
+#: ../reporting/rep709.php:172
 msgid "Tax Rate"
 msgstr ""
 
-#: reporting/rep709.php:172
+#: ../reporting/rep709.php:172
 msgid "Net Tax"
 msgstr ""
 
-#: reporting/rep710.php:75
+#: ../reporting/rep710.php:75
 msgid "Time"
 msgstr ""
 
-#: reporting/rep710.php:75
+#: ../reporting/rep710.php:75
 msgid "Trans Date"
 msgstr ""
 
-#: reporting/rep710.php:76
+#: ../reporting/rep710.php:76
 msgid "Action"
 msgstr ""
 
-#: reporting/rep710.php:87 reporting/reports_main.php:396
+#: ../reporting/rep710.php:87
+#: ../reporting/reports_main.php:396
 msgid "Audit Trail"
 msgstr ""
 
-#: reporting/rep710.php:107
+#: ../reporting/rep710.php:107
 msgid "Changed"
 msgstr ""
 
-#: reporting/reports_main.php:26
+#: ../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:44
-#: reporting/reports_main.php:66 reporting/reports_main.php:90
-#: reporting/reports_main.php:97 reporting/reports_main.php:109
-#: reporting/reports_main.php:116 reporting/reports_main.php:123
-#: reporting/reports_main.php:129 reporting/reports_main.php:137
-#: reporting/reports_main.php:144 reporting/reports_main.php:154
-#: reporting/reports_main.php:165 reporting/reports_main.php:171
+#: ../reporting/reports_main.php:37
+#: ../reporting/reports_main.php:44
+#: ../reporting/reports_main.php:66
+#: ../reporting/reports_main.php:90
+#: ../reporting/reports_main.php:97
+#: ../reporting/reports_main.php:109
+#: ../reporting/reports_main.php:116
+#: ../reporting/reports_main.php:123
+#: ../reporting/reports_main.php:129
+#: ../reporting/reports_main.php:137
+#: ../reporting/reports_main.php:144
+#: ../reporting/reports_main.php:154
+#: ../reporting/reports_main.php:165
+#: ../reporting/reports_main.php:171
 msgid "Currency Filter"
 msgstr ""
 
-#: reporting/reports_main.php:40 reporting/reports_main.php:50
-#: reporting/reports_main.php:58 reporting/reports_main.php:64
-#: reporting/reports_main.php:72 reporting/reports_main.php:80
-#: reporting/reports_main.php:86 reporting/reports_main.php:140
-#: reporting/reports_main.php:150 reporting/reports_main.php:157
-#: reporting/reports_main.php:161 reporting/reports_main.php:183
-#: reporting/reports_main.php:188 reporting/reports_main.php:197
-#: reporting/reports_main.php:205 reporting/reports_main.php:210
-#: reporting/reports_main.php:217 reporting/reports_main.php:231
-#: reporting/reports_main.php:242 reporting/reports_main.php:248
-#: reporting/reports_main.php:254 reporting/reports_main.php:268
-#: reporting/reports_main.php:275 reporting/reports_main.php:285
-#: reporting/reports_main.php:296 reporting/reports_main.php:305
-#: reporting/reports_main.php:316 reporting/reports_main.php:322
-#: reporting/reports_main.php:331 reporting/reports_main.php:341
-#: reporting/reports_main.php:349 reporting/reports_main.php:359
-#: reporting/reports_main.php:364 reporting/reports_main.php:372
-#: reporting/reports_main.php:381 reporting/reports_main.php:388
-#: reporting/reports_main.php:395 reporting/reports_main.php:402
+#: ../reporting/reports_main.php:40
+#: ../reporting/reports_main.php:50
+#: ../reporting/reports_main.php:58
+#: ../reporting/reports_main.php:64
+#: ../reporting/reports_main.php:72
+#: ../reporting/reports_main.php:80
+#: ../reporting/reports_main.php:86
+#: ../reporting/reports_main.php:140
+#: ../reporting/reports_main.php:150
+#: ../reporting/reports_main.php:157
+#: ../reporting/reports_main.php:161
+#: ../reporting/reports_main.php:183
+#: ../reporting/reports_main.php:188
+#: ../reporting/reports_main.php:197
+#: ../reporting/reports_main.php:205
+#: ../reporting/reports_main.php:210
+#: ../reporting/reports_main.php:217
+#: ../reporting/reports_main.php:231
+#: ../reporting/reports_main.php:242
+#: ../reporting/reports_main.php:248
+#: ../reporting/reports_main.php:254
+#: ../reporting/reports_main.php:268
+#: ../reporting/reports_main.php:275
+#: ../reporting/reports_main.php:285
+#: ../reporting/reports_main.php:296
+#: ../reporting/reports_main.php:305
+#: ../reporting/reports_main.php:316
+#: ../reporting/reports_main.php:322
+#: ../reporting/reports_main.php:331
+#: ../reporting/reports_main.php:341
+#: ../reporting/reports_main.php:349
+#: ../reporting/reports_main.php:359
+#: ../reporting/reports_main.php:364
+#: ../reporting/reports_main.php:372
+#: ../reporting/reports_main.php:381
+#: ../reporting/reports_main.php:388
+#: ../reporting/reports_main.php:395
+#: ../reporting/reports_main.php:402
 msgid "Destination"
 msgstr ""
 
-#: reporting/reports_main.php:41
+#: ../reporting/reports_main.php:41
 msgid "&Aged Customer Analysis"
 msgstr ""
 
-#: reporting/reports_main.php:48 reporting/reports_main.php:148
-#: reporting/reports_main.php:283 reporting/reports_main.php:294
-#: reporting/reports_main.php:329 reporting/reports_main.php:339
-#: reporting/reports_main.php:370 reporting/reports_main.php:379
+#: ../reporting/reports_main.php:48
+#: ../reporting/reports_main.php:148
+#: ../reporting/reports_main.php:283
+#: ../reporting/reports_main.php:294
+#: ../reporting/reports_main.php:329
+#: ../reporting/reports_main.php:339
+#: ../reporting/reports_main.php:370
+#: ../reporting/reports_main.php:379
 msgid "Graphics"
 msgstr ""
 
-#: reporting/reports_main.php:51
+#: ../reporting/reports_main.php:51
 msgid "Customer &Detail Listing"
 msgstr ""
 
-#: reporting/reports_main.php:55
+#: ../reporting/reports_main.php:55
 msgid "Activity Greater Than"
 msgstr ""
 
-#: reporting/reports_main.php:56
+#: ../reporting/reports_main.php:56
 msgid "Activity Less Than"
 msgstr ""
 
-#: reporting/reports_main.php:59
+#: ../reporting/reports_main.php:59
 msgid "Sales &Summary Report"
 msgstr ""
 
-#: reporting/reports_main.php:65
+#: ../reporting/reports_main.php:65
 msgid "&Price Listing"
 msgstr ""
 
-#: reporting/reports_main.php:67 reporting/reports_main.php:76
-#: reporting/reports_main.php:179 reporting/reports_main.php:185
-#: reporting/reports_main.php:190 reporting/reports_main.php:201
+#: ../reporting/reports_main.php:67
+#: ../reporting/reports_main.php:76
+#: ../reporting/reports_main.php:179
+#: ../reporting/reports_main.php:185
+#: ../reporting/reports_main.php:190
+#: ../reporting/reports_main.php:201
 msgid "Inventory Category"
 msgstr ""
 
-#: reporting/reports_main.php:68 sales/manage/sales_types.php:16
+#: ../reporting/reports_main.php:68
+#: ../sales/manage/sales_types.php:16
 msgid "Sales Types"
 msgstr ""
 
-#: reporting/reports_main.php:69 reporting/reports_main.php:192
+#: ../reporting/reports_main.php:69
+#: ../reporting/reports_main.php:192
 msgid "Show Pictures"
 msgstr ""
 
-#: reporting/reports_main.php:73
+#: ../reporting/reports_main.php:73
 msgid "&Order Status Listing"
 msgstr ""
 
-#: reporting/reports_main.php:77
+#: ../reporting/reports_main.php:77
 msgid "Stock Location"
 msgstr ""
 
-#: reporting/reports_main.php:81
+#: ../reporting/reports_main.php:81
 msgid "&Salesman Listing"
 msgstr ""
 
-#: reporting/reports_main.php:87
+#: ../reporting/reports_main.php:87
 msgid "Print &Invoices"
 msgstr ""
 
-#: reporting/reports_main.php:91 reporting/reports_main.php:98
-#: reporting/reports_main.php:104
+#: ../reporting/reports_main.php:91
+#: ../reporting/reports_main.php:98
+#: ../reporting/reports_main.php:104
 msgid "email Customers"
 msgstr ""
 
-#: reporting/reports_main.php:92 reporting/reports_main.php:99
+#: ../reporting/reports_main.php:92
+#: ../reporting/reports_main.php:99
 msgid "Payment Link"
 msgstr ""
 
-#: reporting/reports_main.php:94
+#: ../reporting/reports_main.php:94
 msgid "Print &Credit Notes"
 msgstr ""
 
-#: reporting/reports_main.php:101
+#: ../reporting/reports_main.php:101
 msgid "Print &Deliveries"
 msgstr ""
 
-#: reporting/reports_main.php:105
+#: ../reporting/reports_main.php:105
 msgid "Print as Packing Slip"
 msgstr ""
 
-#: reporting/reports_main.php:107
+#: ../reporting/reports_main.php:107
 msgid "Print &Statements"
 msgstr ""
 
-#: reporting/reports_main.php:111 reporting/reports_main.php:117
-#: reporting/reports_main.php:124 reporting/reports_main.php:166
-#: reporting/reports_main.php:172
+#: ../reporting/reports_main.php:111
+#: ../reporting/reports_main.php:117
+#: ../reporting/reports_main.php:124
+#: ../reporting/reports_main.php:166
+#: ../reporting/reports_main.php:172
 msgid "Email Customers"
 msgstr ""
 
-#: reporting/reports_main.php:113
+#: ../reporting/reports_main.php:113
 msgid "&Print Sales Orders"
 msgstr ""
 
-#: reporting/reports_main.php:118
+#: ../reporting/reports_main.php:118
 msgid "Print as Quote"
 msgstr ""
 
-#: reporting/reports_main.php:120
+#: ../reporting/reports_main.php:120
 msgid "&Print Sales Quotations"
 msgstr ""
 
-#: reporting/reports_main.php:126
+#: ../reporting/reports_main.php:126
 msgid "Print Receipts"
 msgstr ""
 
-#: reporting/reports_main.php:133
+#: ../reporting/reports_main.php:133
 msgid "Supplier &Balances"
 msgstr ""
 
-#: reporting/reports_main.php:141
+#: ../reporting/reports_main.php:141
 msgid "&Aged Supplier Analyses"
 msgstr ""
 
-#: reporting/reports_main.php:151
+#: ../reporting/reports_main.php:151
 msgid "&Payment Report"
 msgstr ""
 
-#: reporting/reports_main.php:158
+#: ../reporting/reports_main.php:158
 msgid "Outstanding &GRNs Report"
 msgstr ""
 
-#: reporting/reports_main.php:162
+#: ../reporting/reports_main.php:162
 msgid "Print Purchase &Orders"
 msgstr ""
 
-#: reporting/reports_main.php:168
-msgid "Print Remittances"
+#: ../reporting/reports_main.php:168
+msgid "Print Remi&ttances"
 msgstr ""
 
-#: reporting/reports_main.php:177
+#: ../reporting/reports_main.php:177
 msgid "Inventory &Valuation Report"
 msgstr ""
 
-#: reporting/reports_main.php:184
+#: ../reporting/reports_main.php:184
 msgid "Inventory &Planning Report"
 msgstr ""
 
-#: reporting/reports_main.php:189
+#: ../reporting/reports_main.php:189
 msgid "Stock &Check Sheets"
 msgstr ""
 
-#: reporting/reports_main.php:193
+#: ../reporting/reports_main.php:193
 msgid "Inventory Column"
 msgstr ""
 
-#: reporting/reports_main.php:194
+#: ../reporting/reports_main.php:194
 msgid "Show Shortage"
 msgstr ""
 
-#: reporting/reports_main.php:198
+#: ../reporting/reports_main.php:198
 msgid "Inventory &Sales Report"
 msgstr ""
 
-#: reporting/reports_main.php:206
+#: ../reporting/reports_main.php:206
 msgid "&GRN Valuation Report"
 msgstr ""
 
-#: reporting/reports_main.php:212
+#: ../reporting/reports_main.php:212
 msgid "Manufacturing"
 msgstr ""
 
-#: reporting/reports_main.php:213
+#: ../reporting/reports_main.php:213
 msgid "&Bill of Material Listing"
 msgstr ""
 
-#: reporting/reports_main.php:214
+#: ../reporting/reports_main.php:214
 msgid "From product"
 msgstr ""
 
-#: reporting/reports_main.php:215
+#: ../reporting/reports_main.php:215
 msgid "To product"
 msgstr ""
 
-#: reporting/reports_main.php:218
+#: ../reporting/reports_main.php:218
 msgid "Print &Work Orders"
 msgstr ""
 
-#: reporting/reports_main.php:221
+#: ../reporting/reports_main.php:221
 msgid "Email Locations"
 msgstr ""
 
-#: reporting/reports_main.php:226
+#: ../reporting/reports_main.php:226
 msgid "Dimension &Summary"
 msgstr ""
 
-#: reporting/reports_main.php:227
+#: ../reporting/reports_main.php:227
 msgid "From Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:228
+#: ../reporting/reports_main.php:228
 msgid "To Dimension"
 msgstr ""
 
-#: reporting/reports_main.php:229
+#: ../reporting/reports_main.php:229
 msgid "Show Balance"
 msgstr ""
 
-#: reporting/reports_main.php:236
+#: ../reporting/reports_main.php:236
 msgid "Banking"
 msgstr ""
 
-#: reporting/reports_main.php:237
+#: ../reporting/reports_main.php:237
 msgid "Bank &Statement"
 msgstr ""
 
-#: reporting/reports_main.php:244
+#: ../reporting/reports_main.php:244
 msgid "General Ledger"
 msgstr ""
 
-#: reporting/reports_main.php:245
+#: ../reporting/reports_main.php:245
 msgid "Chart of &Accounts"
 msgstr ""
 
-#: reporting/reports_main.php:246
+#: ../reporting/reports_main.php:246
 msgid "Show Balances"
 msgstr ""
 
-#: reporting/reports_main.php:249
+#: ../reporting/reports_main.php:249
 msgid "List of &Journal Entries"
 msgstr ""
 
-#: reporting/reports_main.php:260 reporting/reports_main.php:309
-#: reporting/reports_main.php:353
+#: ../reporting/reports_main.php:260
+#: ../reporting/reports_main.php:309
+#: ../reporting/reports_main.php:353
 msgid "GL Account &Transactions"
 msgstr ""
 
-#: reporting/reports_main.php:263 reporting/reports_main.php:312
-#: reporting/reports_main.php:356
+#: ../reporting/reports_main.php:263
+#: ../reporting/reports_main.php:312
+#: ../reporting/reports_main.php:356
 msgid "From Account"
 msgstr ""
 
-#: reporting/reports_main.php:264 reporting/reports_main.php:313
-#: reporting/reports_main.php:357
+#: ../reporting/reports_main.php:264
+#: ../reporting/reports_main.php:313
+#: ../reporting/reports_main.php:357
 msgid "To Account"
 msgstr ""
 
-#: reporting/reports_main.php:269 reporting/reports_main.php:317
-#: reporting/reports_main.php:360
+#: ../reporting/reports_main.php:269
+#: ../reporting/reports_main.php:317
+#: ../reporting/reports_main.php:360
 msgid "Annual &Expense Breakdown"
 msgstr ""
 
-#: reporting/reports_main.php:276 reporting/reports_main.php:323
-#: reporting/reports_main.php:365
+#: ../reporting/reports_main.php:276
+#: ../reporting/reports_main.php:323
+#: ../reporting/reports_main.php:365
 msgid "&Balance Sheet"
 msgstr ""
 
-#: reporting/reports_main.php:282 reporting/reports_main.php:293
-#: reporting/reports_main.php:328 reporting/reports_main.php:338
-#: reporting/reports_main.php:369 reporting/reports_main.php:378
+#: ../reporting/reports_main.php:282
+#: ../reporting/reports_main.php:293
+#: ../reporting/reports_main.php:328
+#: ../reporting/reports_main.php:338
+#: ../reporting/reports_main.php:369
+#: ../reporting/reports_main.php:378
 msgid "Decimal values"
 msgstr ""
 
-#: reporting/reports_main.php:286 reporting/reports_main.php:332
-#: reporting/reports_main.php:373
+#: ../reporting/reports_main.php:286
+#: ../reporting/reports_main.php:332
+#: ../reporting/reports_main.php:373
 msgid "&Profit and Loss Statement"
 msgstr ""
 
-#: reporting/reports_main.php:300 reporting/reports_main.php:345
-#: reporting/reports_main.php:385
+#: ../reporting/reports_main.php:300
+#: ../reporting/reports_main.php:345
+#: ../reporting/reports_main.php:385
 msgid "Zero values"
 msgstr ""
 
-#: reporting/reports_main.php:390
+#: ../reporting/reports_main.php:390
 msgid "Ta&x Report"
 msgstr ""
 
-#: reporting/includes/doctext.inc:18 reporting/includes/doctext.inc:134
-#: sales/view/view_dispatch.php:51 sales/view/view_invoice.php:51
+#: ../reporting/includes/doctext.inc:18
+#: ../reporting/includes/doctext.inc:156
+#: ../sales/view/view_dispatch.php:51
+#: ../sales/view/view_invoice.php:53
 msgid "Charge To"
 msgstr ""
 
-#: 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:283
-#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113
-#: sales/view/view_invoice.php:114 sales/includes/ui/sales_credit_ui.inc:168
-#: sales/includes/ui/sales_order_ui.inc:142
+#: ../reporting/includes/doctext.inc:30
+#: ../sales/customer_credit_invoice.php:283
+#: ../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:142
+#: ../sales/includes/ui/sales_order_ui.inc.orig:142
 msgid "Discount %"
 msgstr ""
 
-#: reporting/includes/doctext.inc:33
+#: ../reporting/includes/doctext.inc:33
 msgid "All amounts stated in"
 msgstr ""
 
-#: reporting/includes/doctext.inc:39
+#: ../reporting/includes/doctext.inc:51
 msgid "Quotation No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:44 reporting/includes/doctext.inc:61
-#: reporting/includes/doctext.inc:82 reporting/includes/doctext.inc:96
-#: reporting/includes/doctext.inc:118 reporting/includes/doctext.inc:139
-#: reporting/includes/doctext.inc:162 reporting/includes/doctext.inc:180
-#: reporting/includes/doctext.inc:218
+#: ../reporting/includes/doctext.inc:56
+#: ../reporting/includes/doctext.inc:73
+#: ../reporting/includes/doctext.inc:94
+#: ../reporting/includes/doctext.inc:108
+#: ../reporting/includes/doctext.inc:131
+#: ../reporting/includes/doctext.inc:161
+#: ../reporting/includes/doctext.inc:184
+#: ../reporting/includes/doctext.inc:202
+#: ../reporting/includes/doctext.inc:240
 msgid "Customers Reference"
 msgstr ""
 
-#: reporting/includes/doctext.inc:45 reporting/includes/doctext.inc:62
-#: reporting/includes/doctext.inc:83 reporting/includes/doctext.inc:97
-#: reporting/includes/doctext.inc:119 reporting/includes/doctext.inc:163
-#: reporting/includes/doctext.inc:219 sales/manage/customer_branches.php:296
+#: ../reporting/includes/doctext.inc:57
+#: ../reporting/includes/doctext.inc:74
+#: ../reporting/includes/doctext.inc:95
+#: ../reporting/includes/doctext.inc:109
+#: ../reporting/includes/doctext.inc:132
+#: ../reporting/includes/doctext.inc:185
+#: ../reporting/includes/doctext.inc:241
+#: ../sales/manage/customer_branches.php:298
 msgid "Sales Person"
 msgstr ""
 
-#: reporting/includes/doctext.inc:46 reporting/includes/doctext.inc:63
-#: reporting/includes/doctext.inc:84 reporting/includes/doctext.inc:98
-#: reporting/includes/doctext.inc:120 reporting/includes/doctext.inc:141
-#: reporting/includes/doctext.inc:164 reporting/includes/doctext.inc:182
-#: reporting/includes/doctext.inc:220
+#: ../reporting/includes/doctext.inc:58
+#: ../reporting/includes/doctext.inc:75
+#: ../reporting/includes/doctext.inc:96
+#: ../reporting/includes/doctext.inc:110
+#: ../reporting/includes/doctext.inc:133
+#: ../reporting/includes/doctext.inc:163
+#: ../reporting/includes/doctext.inc:186
+#: ../reporting/includes/doctext.inc:204
+#: ../reporting/includes/doctext.inc:242
 msgid "Your VAT no."
 msgstr ""
 
-#: reporting/includes/doctext.inc:47
+#: ../reporting/includes/doctext.inc:59
 msgid "Our Quotation No"
 msgstr ""
 
-#: reporting/includes/doctext.inc:48 sales/view/view_sales_order.php:69
-#: sales/inquiry/sales_orders_view.php:280
-#: sales/inquiry/sales_orders_view.php.orig:280
-#: sales/includes/ui/sales_order_ui.inc:605
+#: ../reporting/includes/doctext.inc:60
+#: ../sales/view/view_sales_order.php:69
+#: ../sales/view/view_sales_order.php.orig:69
+#: ../sales/inquiry/sales_orders_view.php:304
+#: ../sales/inquiry/sales_orders_view.php.orig:281
+#: ../sales/includes/ui/sales_order_ui.inc:606
+#: ../sales/includes/ui/sales_order_ui.inc.orig:606
 msgid "Valid until"
 msgstr ""
 
-#: reporting/includes/doctext.inc:54
+#: ../reporting/includes/doctext.inc:65
+msgid "PREPAYMENT ORDER"
+msgstr ""
+
+#: ../reporting/includes/doctext.inc:66
 msgid "Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:64 reporting/includes/doctext.inc:85
-#: reporting/includes/doctext.inc:99 reporting/includes/doctext.inc:142
-#: reporting/includes/doctext.inc:165 reporting/includes/doctext.inc:183
-#: reporting/includes/doctext.inc:221 sales/view/view_dispatch.php:87
-#: sales/view/view_invoice.php:86
+#: ../reporting/includes/doctext.inc:76
+#: ../reporting/includes/doctext.inc:97
+#: ../reporting/includes/doctext.inc:111
+#: ../reporting/includes/doctext.inc:138
+#: ../reporting/includes/doctext.inc:164
+#: ../reporting/includes/doctext.inc:187
+#: ../reporting/includes/doctext.inc:205
+#: ../reporting/includes/doctext.inc:243
+#: ../sales/view/view_dispatch.php:87
+#: ../sales/view/view_invoice.php:87
 msgid "Our Order No"
 msgstr ""
 
-#: reporting/includes/doctext.inc:71 reporting/includes/doctext.inc:121
+#: ../reporting/includes/doctext.inc:83
 msgid "Delivery Note No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:86
+#: ../reporting/includes/doctext.inc:98
 msgid "To Be Invoiced Before"
 msgstr ""
 
-#: reporting/includes/doctext.inc:92
+#: ../reporting/includes/doctext.inc:104
 msgid "Credit No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:93
+#: ../reporting/includes/doctext.inc:105
 msgid "Please quote Credit no. when paying. All amounts stated in"
 msgstr ""
 
-#: reporting/includes/doctext.inc:106
+#: ../reporting/includes/doctext.inc:117
+msgid "PREPAYMENT INVOICE"
+msgstr ""
+
+#: ../reporting/includes/doctext.inc:118
+msgid "FINAL INVOICE"
+msgstr ""
+
+#: ../reporting/includes/doctext.inc:119
 msgid "Invoice No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:108
+#: ../reporting/includes/doctext.inc:121
 msgid "Please quote Invoice no. when paying. All amounts stated in"
 msgstr ""
 
-#: reporting/includes/doctext.inc:130
+#: ../reporting/includes/doctext.inc:137
+msgid "Date of Payment"
+msgstr ""
+
+#: ../reporting/includes/doctext.inc:143
+msgid "Date of Sale"
+msgstr ""
+
+#: ../reporting/includes/doctext.inc:152
 msgid "Remittance No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:131 reporting/includes/doctext.inc:151
+#: ../reporting/includes/doctext.inc:153
+#: ../reporting/includes/doctext.inc:173
 msgid "Order To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:150
+#: ../reporting/includes/doctext.inc:172
 msgid "Purchase Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:154
+#: ../reporting/includes/doctext.inc:176
 msgid "Deliver To"
 msgstr ""
 
-#: reporting/includes/doctext.inc:177
+#: ../reporting/includes/doctext.inc:199
 msgid "Receipt No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:178
+#: ../reporting/includes/doctext.inc:200
 msgid "With thanks from"
 msgstr ""
 
-#: reporting/includes/doctext.inc:193
+#: ../reporting/includes/doctext.inc:215
 msgid "Work Order No."
 msgstr ""
 
-#: reporting/includes/doctext.inc:224
+#: ../reporting/includes/doctext.inc:246
 msgid "DueDate"
 msgstr ""
 
-#: reporting/includes/doctext.inc:259 reporting/includes/pdf_report.inc:1012
+#: ../reporting/includes/doctext.inc:272
+#: ../reporting/includes/pdf_report.inc:1013
 msgid "You can pay through"
 msgstr ""
 
-#: reporting/includes/doctext.inc:263
+#: ../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:600
+#: ../reporting/includes/excel_report.inc:413
+#: ../reporting/includes/pdf_report.inc:600
 msgid "Generated At"
 msgstr ""
 
-#: reporting/includes/excel_report.inc:419
-#: reporting/includes/pdf_report.inc:609
+#: ../reporting/includes/excel_report.inc:419
+#: ../reporting/includes/pdf_report.inc:609
 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:500 reporting/includes/pdf_report.inc:628
+#: ../reporting/includes/header2.inc:143
+#: ../reporting/includes/pdf_report.inc:352
+#: ../reporting/includes/pdf_report.inc:500
+#: ../reporting/includes/pdf_report.inc:628
 msgid "Page"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:583
+#: ../reporting/includes/pdf_report.inc:583
 msgid "Report Period"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:980
+#: ../reporting/includes/pdf_report.inc:980
 msgid "You have no email contact defined for this type of document"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:998
+#: ../reporting/includes/pdf_report.inc:999
 msgid "Dear"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:999
+#: ../reporting/includes/pdf_report.inc:1000
 msgid "Attached you will find "
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1015
+#: ../reporting/includes/pdf_report.inc:1016
 msgid "Kindest regards"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1026
+#: ../reporting/includes/pdf_report.inc:1028
 msgid "There is no contact email set for this document type."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1028
+#: ../reporting/includes/pdf_report.inc:1031
 msgid "Sending document by email failed"
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1031
+#: ../reporting/includes/pdf_report.inc:1031
+#: ../reporting/includes/pdf_report.inc:1034
+msgid "Email:"
+msgstr ""
+
+#: ../reporting/includes/pdf_report.inc:1034
 msgid "has been sent by email to destination."
 msgstr ""
 
-#: reporting/includes/pdf_report.inc:1061
+#: ../reporting/includes/pdf_report.inc:1064
 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:227
+#: ../reporting/includes/reports_classes.inc:227
 msgid "PDF/Printer"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:238
+#: ../reporting/includes/reports_classes.inc:238
 msgid "No Graphics"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:238
+#: ../reporting/includes/reports_classes.inc:238
 msgid "Vertical bars"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:238
+#: ../reporting/includes/reports_classes.inc:238
 msgid "Horizontal bars"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:239
+#: ../reporting/includes/reports_classes.inc:239
 msgid "Dots"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:239
+#: ../reporting/includes/reports_classes.inc:239
 msgid "Lines"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:239
+#: ../reporting/includes/reports_classes.inc:239
 msgid "Pie"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:239
+#: ../reporting/includes/reports_classes.inc:239
 msgid "Donut"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:243
-#: reporting/includes/reports_classes.inc:246
+#: ../reporting/includes/reports_classes.inc:243
+#: ../reporting/includes/reports_classes.inc:246
 msgid "No Type Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:256
+#: ../reporting/includes/reports_classes.inc:256
 msgid "No Account Group Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:271
-#: reporting/includes/reports_classes.inc:277
-#: reporting/includes/reports_classes.inc:283
+#: ../reporting/includes/reports_classes.inc:271
+#: ../reporting/includes/reports_classes.inc:277
+#: ../reporting/includes/reports_classes.inc:283
 msgid "No Dimension Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:289
+#: ../reporting/includes/reports_classes.inc:289
 msgid "No Customer Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:297
+#: ../reporting/includes/reports_classes.inc:297
 msgid "No Supplier Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:379
+#: ../reporting/includes/reports_classes.inc:379
 msgid "No Location Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:382
+#: ../reporting/includes/reports_classes.inc:382
 msgid "No Category Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:391
+#: ../reporting/includes/reports_classes.inc:391
 msgid "No Sales Folk Filter"
 msgstr ""
 
-#: reporting/includes/reports_classes.inc:398
+#: ../reporting/includes/reports_classes.inc:398
 msgid "No Users Filter"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:24
+#: ../sales/create_recurrent_invoices.php:24
 msgid "Create and Print Recurrent Invoices"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:40
+#: ../sales/create_recurrent_invoices.php:40
 #, php-format
 msgid "Recurrent Invoice covers period %s - %s."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:97
+#: ../sales/create_recurrent_invoices.php:97
 #, php-format
 msgid "%s recurrent invoice(s) created, # %s - # %s."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:102
+#: ../sales/create_recurrent_invoices.php:102
 #, php-format
 msgid "&Print Recurrent Invoices # %s - # %s"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:104
+#: ../sales/create_recurrent_invoices.php:104
 #, php-format
 msgid "&Email Recurrent Invoices # %s - # %s"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:115
-#: sales/manage/recurrent_invoices.php:102
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/manage/recurrent_invoices.php:102
 msgid "Template No"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:115
-#: sales/manage/recurrent_invoices.php:102
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/manage/recurrent_invoices.php:102
 msgid "Begin"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:115
-#: sales/manage/recurrent_invoices.php:102
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/manage/recurrent_invoices.php:102
 msgid "End"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:115
-#: sales/manage/recurrent_invoices.php:102
-#: sales/manage/recurrent_invoices.php:185
+#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/manage/recurrent_invoices.php:102
+#: ../sales/manage/recurrent_invoices.php:185
 msgid "Last Created"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:156
+#: ../sales/create_recurrent_invoices.php:156
 msgid "Create Invoices"
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:164
+#: ../sales/create_recurrent_invoices.php:164
 msgid "Marked items are due."
 msgstr ""
 
-#: sales/create_recurrent_invoices.php:166
+#: ../sales/create_recurrent_invoices.php:166
 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:661
+#: ../sales/credit_note_entry.php:51
+#: ../sales/sales_order_entry.php:672
 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:157
+#: ../sales/credit_note_entry.php:157
 msgid "The entered date for the credit note is invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:174
+#: ../sales/credit_note_entry.php:174
 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:175
+#: ../sales/credit_note_entry.php:175
 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:195
+#: ../sales/credit_note_entry.php:195
 msgid "The quantity must be greater than zero."
 msgstr ""
 
-#: sales/credit_note_entry.php:200
+#: ../sales/credit_note_entry.php:200
 msgid "The entered price is negative or invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:205
+#: ../sales/credit_note_entry.php:205
 msgid "The entered discount percent is negative, greater than 100 or invalid."
 msgstr ""
 
-#: sales/credit_note_entry.php:273
+#: ../sales/credit_note_entry.php:273
 msgid "Credit Note Items"
 msgstr ""
 
-#: sales/credit_note_entry.php:283 sales/customer_credit_invoice.php:384
+#: ../sales/credit_note_entry.php:283
+#: ../sales/customer_credit_invoice.php:384
 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:114
+#: ../sales/customer_credit_invoice.php:114
 msgid "The entered shipping cost is invalid or less than zero."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:119 sales/customer_credit_invoice.php:141
+#: ../sales/customer_credit_invoice.php:119
+#: ../sales/customer_credit_invoice.php:141
 msgid ""
 "Selected quantity cannot be less than zero nor more than quantity not "
 "credited yet."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:139
+#: ../sales/customer_credit_invoice.php:139
 msgid ""
 "This page can only be opened if an invoice has been selected for crediting."
 msgstr ""
 
-#: sales/customer_credit_invoice.php:251
+#: ../sales/customer_credit_invoice.php:251
 msgid "Crediting Invoice"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:272
+#: ../sales/customer_credit_invoice.php:272
 msgid "Credit Note Date"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:282
+#: ../sales/customer_credit_invoice.php:282
 msgid "Invoiced Quantity"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:283
+#: ../sales/customer_credit_invoice.php:283
 msgid "Credit Quantity"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:317
+#: ../sales/customer_credit_invoice.php:317
 msgid "Credit Shipping Cost"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:350
-#: sales/includes/ui/sales_credit_ui.inc:323
+#: ../sales/customer_credit_invoice.php:350
+#: ../sales/includes/ui/sales_credit_ui.inc:323
 msgid "Credit Note Type"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:358
-#: sales/includes/ui/sales_credit_ui.inc:331
+#: ../sales/customer_credit_invoice.php:358
+#: ../sales/includes/ui/sales_credit_ui.inc:331
 msgid "Items Returned to Location"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:363
-#: sales/includes/ui/sales_credit_ui.inc:336
+#: ../sales/customer_credit_invoice.php:363
+#: ../sales/includes/ui/sales_credit_ui.inc:336
 msgid "Write off the cost of the items to"
 msgstr ""
 
-#: sales/customer_credit_invoice.php:382
+#: ../sales/customer_credit_invoice.php:382
 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:175
+#: ../sales/customer_delivery.php:50
+#: ../sales/sales_order_entry.php:176
 #, php-format
 msgid "Delivery # %d has been entered."
 msgstr ""
 
-#: sales/customer_delivery.php:52 sales/sales_order_entry.php:177
+#: ../sales/customer_delivery.php:52
+#: ../sales/sales_order_entry.php:178
 msgid "&View This Delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:54 sales/customer_delivery.php:75
-#: sales/sales_order_entry.php:179
+#: ../sales/customer_delivery.php:54
+#: ../sales/customer_delivery.php:75
+#: ../sales/sales_order_entry.php:180
 msgid "&Print Delivery Note"
 msgstr ""
 
-#: sales/customer_delivery.php:55 sales/customer_delivery.php:76
-#: sales/sales_order_entry.php:180
+#: ../sales/customer_delivery.php:55
+#: ../sales/customer_delivery.php:76
+#: ../sales/sales_order_entry.php:181
 msgid "&Email Delivery Note"
 msgstr ""
 
-#: sales/customer_delivery.php:56 sales/customer_delivery.php:77
-#: sales/sales_order_entry.php:181
+#: ../sales/customer_delivery.php:56
+#: ../sales/customer_delivery.php:77
+#: ../sales/sales_order_entry.php:182
 msgid "P&rint as Packing Slip"
 msgstr ""
 
-#: sales/customer_delivery.php:57 sales/customer_delivery.php:78
-#: sales/sales_order_entry.php:182
+#: ../sales/customer_delivery.php:57
+#: ../sales/customer_delivery.php:78
+#: ../sales/sales_order_entry.php:183
 msgid "E&mail as Packing Slip"
 msgstr ""
 
-#: sales/customer_delivery.php:59 sales/sales_order_entry.php:185
+#: ../sales/customer_delivery.php:59
+#: ../sales/sales_order_entry.php:186
 msgid "View the GL Journal Entries for this Dispatch"
 msgstr ""
 
-#: sales/customer_delivery.php:61
+#: ../sales/customer_delivery.php:61
 msgid "Invoice This Delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:63
+#: ../sales/customer_delivery.php:63
 msgid "Select Another Order For Dispatch"
 msgstr ""
 
-#: sales/customer_delivery.php:71
+#: ../sales/customer_delivery.php:71
 #, php-format
 msgid "Delivery Note # %d has been updated."
 msgstr ""
 
-#: sales/customer_delivery.php:73
+#: ../sales/customer_delivery.php:73
 msgid "View this delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:80
+#: ../sales/customer_delivery.php:80
 msgid "Confirm Delivery and Invoice"
 msgstr ""
 
-#: sales/customer_delivery.php:82
+#: ../sales/customer_delivery.php:82
 msgid "Select A Different Delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:94
+#: ../sales/customer_delivery.php:94
+#: ../sales/customer_delivery.php:99
 msgid "Select a different sales order to delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:95
+#: ../sales/customer_delivery.php:95
 msgid "This order has no items. There is nothing to delivery."
 msgstr ""
 
-#: sales/customer_delivery.php:110
+#: ../sales/customer_delivery.php:101
+msgid ""
+"This prepayment order is not yet ready for delivery due to insufficient "
+"amount received."
+msgstr ""
+
+#: ../sales/customer_delivery.php:118
 msgid "Select a different delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:111
+#: ../sales/customer_delivery.php:119
 msgid "This delivery has all items invoiced. There is nothing to modify."
 msgstr ""
 
-#: sales/customer_delivery.php:121
+#: ../sales/customer_delivery.php:129
 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:123
+#: ../sales/customer_delivery.php:131
 msgid "Select a Sales Order to Delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:132
+#: ../sales/customer_delivery.php:140
 msgid ""
 "Selected quantity cannot be less than quantity invoiced nor more than "
 "quantity\tnot dispatched on sales order."
 msgstr ""
 
-#: sales/customer_delivery.php:135
+#: ../sales/customer_delivery.php:143
 msgid "Freight cost cannot be less than zero"
 msgstr ""
 
-#: sales/customer_delivery.php:147
+#: ../sales/customer_delivery.php:155
 msgid "The entered date of delivery is invalid."
 msgstr ""
 
-#: sales/customer_delivery.php:153
-msgid "The entered date of delivery is not in fiscal year."
-msgstr ""
-
-#: sales/customer_delivery.php:159
+#: ../sales/customer_delivery.php:167
 msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
-#: sales/customer_delivery.php:182 sales/customer_invoice.php:297
+#: ../sales/customer_delivery.php:190
+#: ../sales/customer_invoice.php:351
 msgid "The entered shipping value is not numeric."
 msgstr ""
 
-#: sales/customer_delivery.php:188
+#: ../sales/customer_delivery.php:196
 msgid "There are no item quantities on this delivery note."
 msgstr ""
 
-#: sales/customer_delivery.php:291 sales/sales_order_entry.php:490
-#: sales/includes/ui/sales_order_ui.inc:244
+#: ../sales/customer_delivery.php:299
+#: ../sales/sales_order_entry.php:501
+#: ../sales/includes/ui/sales_order_ui.inc:244
+#: ../sales/includes/ui/sales_order_ui.inc.orig:244
 msgid ""
 "The delivery cannot be processed because there is an insufficient quantity "
 "for item:"
 msgstr ""
 
-#: sales/customer_delivery.php:353
+#: ../sales/customer_delivery.php:361
 msgid "For Sales Order"
 msgstr ""
 
-#: sales/customer_delivery.php:362
+#: ../sales/customer_delivery.php:370
 msgid "Delivery From"
 msgstr ""
 
-#: sales/customer_delivery.php:411
+#: ../sales/customer_delivery.php:419
 msgid "Invoice Dead-line"
 msgstr ""
 
-#: sales/customer_delivery.php:421 sales/customer_invoice.php:457
-#: sales/includes/ui/sales_order_ui.inc:82
-#: sales/includes/ui/sales_order_ui.inc:368
+#: ../sales/customer_delivery.php:429
+#: ../sales/customer_invoice.php:528
+#: ../sales/includes/ui/sales_order_ui.inc:82
+#: ../sales/includes/ui/sales_order_ui.inc:368
+#: ../sales/includes/ui/sales_order_ui.inc.orig:82
+#: ../sales/includes/ui/sales_order_ui.inc.orig:368
 msgid ""
 "The selected customer account is currently on hold. Please contact the "
 "credit control personnel to discuss."
 msgstr ""
 
-#: sales/customer_delivery.php:426
+#: ../sales/customer_delivery.php:434
 msgid "Delivery Items"
 msgstr ""
 
-#: sales/customer_delivery.php:432
+#: ../sales/customer_delivery.php:440
 msgid "Max. delivery"
 msgstr ""
 
-#: sales/customer_delivery.php:432 sales/customer_invoice.php:467
-#: sales/includes/ui/sales_order_ui.inc:141
+#: ../sales/customer_delivery.php:440
+#: ../sales/customer_invoice.php:542
+#: ../sales/includes/ui/sales_order_ui.inc:141
+#: ../sales/includes/ui/sales_order_ui.inc.orig:141
 msgid "Delivered"
 msgstr ""
 
-#: sales/customer_delivery.php:493 sales/customer_invoice.php:552
+#: ../sales/customer_delivery.php:501
+#: ../sales/customer_invoice.php:631
 msgid "Shipping Cost"
 msgstr ""
 
-#: sales/customer_delivery.php:513 sales/includes/ui/sales_order_ui.inc:242
+#: ../sales/customer_delivery.php:521
+#: ../sales/includes/ui/sales_order_ui.inc:242
+#: ../sales/includes/ui/sales_order_ui.inc.orig:242
 msgid ""
 "Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
 
-#: sales/customer_delivery.php:517
+#: ../sales/customer_delivery.php:525
 msgid "Action For Balance"
 msgstr ""
 
-#: sales/customer_delivery.php:524 sales/customer_invoice.php:581
+#: ../sales/customer_delivery.php:532
+#: ../sales/customer_invoice.php:683
 msgid "Refresh document page"
 msgstr ""
 
-#: sales/customer_delivery.php:525
+#: ../sales/customer_delivery.php:533
 msgid "Process Dispatch"
 msgstr ""
 
-#: sales/customer_delivery.php:526 sales/customer_invoice.php:583
-#: sales/sales_order_entry.php:709
+#: ../sales/customer_delivery.php:534
+#: ../sales/customer_invoice.php:685
+#: ../sales/sales_order_entry.php:719
 msgid "Check entered data and save document"
 msgstr ""
 
-#: sales/customer_invoice.php:37
+#: ../sales/customer_invoice.php:38
 #, php-format
 msgid "Modifying Sales Invoice # %d."
 msgstr ""
 
-#: sales/customer_invoice.php:40
+#: ../sales/customer_invoice.php:41
 msgid "Issue an Invoice for Delivery Note"
 msgstr ""
 
-#: sales/customer_invoice.php:42
+#: ../sales/customer_invoice.php:43
 msgid "Issue Batch Invoice for Delivery Notes"
 msgstr ""
 
-#: sales/customer_invoice.php:55
+#: ../sales/customer_invoice.php:45
+msgid "Prepayment or Final Invoice Entry"
+msgstr ""
+
+#: ../sales/customer_invoice.php:57
 msgid "Selected deliveries has been processed"
 msgstr ""
 
-#: sales/customer_invoice.php:57 sales/customer_invoice.php:77
-#: sales/sales_order_entry.php:204
+#: ../sales/customer_invoice.php:59
+#: ../sales/customer_invoice.php:79
+#: ../sales/sales_order_entry.php:205
 msgid "&View This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:59 sales/customer_invoice.php:79
+#: ../sales/customer_invoice.php:61
+#: ../sales/customer_invoice.php:81
 msgid "&Print This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:60 sales/customer_invoice.php:80
+#: ../sales/customer_invoice.php:62
+#: ../sales/customer_invoice.php:82
 msgid "&Email This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:62 sales/sales_order_entry.php:217
+#: ../sales/customer_invoice.php:64
+#: ../sales/sales_order_entry.php:218
 msgid "View the GL &Journal Entries for this Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:64
+#: ../sales/customer_invoice.php:66
 msgid "Select Another &Delivery For Invoicing"
 msgstr ""
 
-#: sales/customer_invoice.php:75
+#: ../sales/customer_invoice.php:77
 #, php-format
 msgid "Sales Invoice # %d has been updated."
 msgstr ""
 
-#: sales/customer_invoice.php:82
+#: ../sales/customer_invoice.php:84
 msgid "Select Another &Invoice to Modify"
 msgstr ""
 
-#: sales/customer_invoice.php:121
+#: ../sales/customer_invoice.php:123
 msgid "Select a different delivery to invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:122
+#: ../sales/customer_invoice.php:124
 msgid ""
 "There are no delivered items with a quantity left to invoice. There is "
 "nothing left to invoice."
 msgstr ""
 
-#: sales/customer_invoice.php:131
+#: ../sales/customer_invoice.php:146
 msgid ""
-"There are no delivery notes for this invoice.<br>\n"
-"\t\tMost likely this invoice was created in Front Accounting version prior "
-"to 2.0\n"
-"\t\tand therefore can not be modified."
+"All quantities on this invoice has been credited. There is nothing to modify "
+"on this invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:140
+#: ../sales/customer_invoice.php:152
 msgid ""
-"All quantities on this invoice has been credited. There is nothing to modify "
-"on this invoice"
+"You have to set Deferred Income Account in GL Setup to entry prepayment "
+"invoices."
+msgstr ""
+
+#: ../sales/customer_invoice.php:160
+msgid ""
+"Please select correct Sales Order Prepayment to be invoiced and try again."
 msgstr ""
 
-#: sales/customer_invoice.php:146
+#: ../sales/customer_invoice.php:191
 msgid ""
 "This page can only be opened after delivery selection. Please select "
 "delivery to invoicing first."
 msgstr ""
 
-#: sales/customer_invoice.php:148
+#: ../sales/customer_invoice.php:193
 msgid "Select Delivery to Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:153 sales/customer_invoice.php:308
+#: ../sales/customer_invoice.php:198
+#: ../sales/customer_invoice.php:362
 msgid ""
 "Selected quantity cannot be less than quantity credited nor more than "
 "quantity not invoiced yet."
 msgstr ""
 
-#: sales/customer_invoice.php:261
+#: ../sales/customer_invoice.php:312
 msgid "The entered invoice date is invalid."
 msgstr ""
 
-#: sales/customer_invoice.php:267
-msgid "The entered invoice date is not in fiscal year."
-msgstr ""
-
-#: sales/customer_invoice.php:273
+#: ../sales/customer_invoice.php:325
 msgid "The entered invoice due date is invalid."
 msgstr ""
 
-#: sales/customer_invoice.php:303
+#: ../sales/customer_invoice.php:357
 msgid "There are no item quantities on this invoice."
 msgstr ""
 
-#: sales/customer_invoice.php:383
+#: ../sales/customer_invoice.php:367
+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:449
 msgid "Payment terms:"
 msgstr ""
 
-#: sales/customer_invoice.php:386 sales/includes/ui/sales_order_ui.inc:405
-#: sales/includes/ui/sales_order_ui.inc:409
-msgid "Payment:"
+#: ../sales/customer_invoice.php:534
+#: ../sales/sales_order_entry.php:695
+msgid "Sales Order Items"
 msgstr ""
 
-#: sales/customer_invoice.php:463
+#: ../sales/customer_invoice.php:534
 msgid "Invoice Items"
 msgstr ""
 
-#: sales/customer_invoice.php:468
+#: ../sales/customer_invoice.php:543
 msgid "This Invoice"
 msgstr ""
 
-#: sales/customer_invoice.php:476
+#: ../sales/customer_invoice.php:550
 msgid "Credited"
 msgstr ""
 
-#: sales/customer_invoice.php:570
+#: ../sales/customer_invoice.php:652
 msgid "Invoice Total"
 msgstr ""
 
-#: sales/customer_payments.php:33
+#: ../sales/customer_invoice.php:661
+msgid "Sales order:"
+msgstr ""
+
+#: ../sales/customer_invoice.php:673
+msgid "Payments received:"
+msgstr ""
+
+#: ../sales/customer_invoice.php:674
+msgid "Invoiced here:"
+msgstr ""
+
+#: ../sales/customer_invoice.php:675
+msgid "Left to be invoiced:"
+msgstr ""
+
+#: ../sales/customer_payments.php:33
 msgid "Customer Payment Entry"
 msgstr ""
 
-#: sales/customer_payments.php:37
+#: ../sales/customer_payments.php:37
 msgid "There are no customers defined in the system."
 msgstr ""
 
-#: sales/customer_payments.php:68
+#: ../sales/customer_payments.php:68
 msgid "Invalid sales invoice number."
 msgstr ""
 
-#: sales/customer_payments.php:92
+#: ../sales/customer_payments.php:92
 msgid "The customer payment has been successfully entered."
 msgstr ""
 
-#: sales/customer_payments.php:94 sales/customer_payments.php:109
+#: ../sales/customer_payments.php:94
+#: ../sales/customer_payments.php:109
 msgid "&Print This Receipt"
 msgstr ""
 
-#: sales/customer_payments.php:96 sales/customer_payments.php:111
+#: ../sales/customer_payments.php:96
+#: ../sales/customer_payments.php:111
 msgid "&View the GL Journal Entries for this Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:100 sales/customer_payments.php:115
+#: ../sales/customer_payments.php:100
+#: ../sales/customer_payments.php:115
 msgid "Enter Another &Customer Payment"
 msgstr ""
 
-#: sales/customer_payments.php:107
+#: ../sales/customer_payments.php:107
 msgid "The customer payment has been successfully updated."
 msgstr ""
 
-#: sales/customer_payments.php:128 sales/sales_order_entry.php:327
+#: ../sales/customer_payments.php:128
+#: ../sales/sales_order_entry.php:332
 msgid "There is no customer selected."
 msgstr ""
 
-#: sales/customer_payments.php:135 sales/sales_order_entry.php:334
+#: ../sales/customer_payments.php:135
+#: ../sales/sales_order_entry.php:339
 msgid "This customer has no branch defined."
 msgstr ""
 
-#: sales/customer_payments.php:141
+#: ../sales/customer_payments.php:141
 msgid "The entered date is invalid. Please enter a valid date for the payment."
 msgstr ""
 
-#: sales/customer_payments.php:171 sales/customer_payments.php:177
+#: ../sales/customer_payments.php:171
+#: ../sales/customer_payments.php:177
 msgid "The entered amount is invalid or negative and cannot be processed."
 msgstr ""
 
-#: sales/customer_payments.php:203
+#: ../sales/customer_payments.php:203
 msgid "The entered discount is not a valid number."
 msgstr ""
 
-#: sales/customer_payments.php:210
+#: ../sales/customer_payments.php:210
 msgid ""
 "The balance of the amount and discout is zero or negative. Please enter "
 "valid amounts."
 msgstr ""
 
-#: sales/customer_payments.php:341 sales/customer_payments.php:343
+#: ../sales/customer_payments.php:341
+#: ../sales/customer_payments.php:343
 msgid "From Customer:"
 msgstr ""
 
-#: sales/customer_payments.php:370
-msgid "This customer account is on hold."
-msgstr ""
-
-#: sales/customer_payments.php:380
+#: ../sales/customer_payments.php:378
 msgid "Into Bank Account:"
 msgstr ""
 
-#: sales/customer_payments.php:386
+#: ../sales/customer_payments.php:383
 msgid "Date of Deposit:"
 msgstr ""
 
-#: sales/customer_payments.php:408
+#: ../sales/customer_payments.php:405
 msgid "Customer prompt payment discount :"
 msgstr ""
 
-#: sales/customer_payments.php:417
+#: ../sales/customer_payments.php:414
 msgid "Amount and discount are in customer's currency."
 msgstr ""
 
-#: sales/customer_payments.php:422
+#: ../sales/customer_payments.php:419
 msgid "Update Payment"
 msgstr ""
 
-#: sales/customer_payments.php:424
+#: ../sales/customer_payments.php:421
 msgid "Add Payment"
 msgstr ""
 
-#: sales/sales_order_entry.php:56
+#: ../sales/sales_order_entry.php:56
 msgid "Direct Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:61
+#: ../sales/sales_order_entry.php:61
 msgid "Direct Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:67
+#: ../sales/sales_order_entry.php:67
 #, php-format
 msgid "Modifying Sales Order # %d"
 msgstr ""
 
-#: sales/sales_order_entry.php:73
+#: ../sales/sales_order_entry.php:73
 #, php-format
 msgid "Modifying Sales Quotation # %d"
 msgstr ""
 
-#: sales/sales_order_entry.php:78
+#: ../sales/sales_order_entry.php:78
 msgid "New Sales Order Entry"
 msgstr ""
 
-#: sales/sales_order_entry.php:82
+#: ../sales/sales_order_entry.php:82
 msgid "New Sales Quotation Entry"
 msgstr ""
 
-#: sales/sales_order_entry.php:85
+#: ../sales/sales_order_entry.php:85
 msgid "Sales Order Entry"
 msgstr ""
 
-#: sales/sales_order_entry.php:101
+#: ../sales/sales_order_entry.php:102
 #, php-format
 msgid "Order # %d has been entered."
 msgstr ""
 
-#: sales/sales_order_entry.php:103 sales/sales_order_entry.php:123
+#: ../sales/sales_order_entry.php:104
+#: ../sales/sales_order_entry.php:124
 msgid "&View This Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:109
+#: ../sales/sales_order_entry.php:110
 msgid "Make &Delivery Against This Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:114
+#: ../sales/sales_order_entry.php:115
 msgid "Enter a &New Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:121
+#: ../sales/sales_order_entry.php:122
 #, php-format
 msgid "Order # %d has been updated."
 msgstr ""
 
-#: sales/sales_order_entry.php:129
+#: ../sales/sales_order_entry.php:130
 msgid "Confirm Order Quantities and Make &Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:132
+#: ../sales/sales_order_entry.php:133
 msgid "Select A Different &Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:139
+#: ../sales/sales_order_entry.php:140
 #, php-format
 msgid "Quotation # %d has been entered."
 msgstr ""
 
-#: sales/sales_order_entry.php:141 sales/sales_order_entry.php:159
+#: ../sales/sales_order_entry.php:142
+#: ../sales/sales_order_entry.php:160
 msgid "&View This Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:143 sales/sales_order_entry.php:161
+#: ../sales/sales_order_entry.php:144
+#: ../sales/sales_order_entry.php:162
 msgid "&Print This Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:144 sales/sales_order_entry.php:162
+#: ../sales/sales_order_entry.php:145
+#: ../sales/sales_order_entry.php:163
 msgid "&Email This Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:147 sales/sales_order_entry.php:165
+#: ../sales/sales_order_entry.php:148
+#: ../sales/sales_order_entry.php:166
 msgid "Make &Sales Order Against This Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:150
+#: ../sales/sales_order_entry.php:151
 msgid "Enter a New &Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:157
+#: ../sales/sales_order_entry.php:158
 #, php-format
 msgid "Quotation # %d has been updated."
 msgstr ""
 
-#: sales/sales_order_entry.php:168
+#: ../sales/sales_order_entry.php:169
 msgid "Select A Different &Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:187
+#: ../sales/sales_order_entry.php:188
 msgid "Make &Invoice Against This Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:191
+#: ../sales/sales_order_entry.php:192
 msgid "Enter a New Template &Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:194
+#: ../sales/sales_order_entry.php:195
 msgid "Enter a &New Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:202
+#: ../sales/sales_order_entry.php:203
 #, php-format
 msgid "Invoice # %d has been entered."
 msgstr ""
 
-#: sales/sales_order_entry.php:206
+#: ../sales/sales_order_entry.php:207
 msgid "&Print Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:207
+#: ../sales/sales_order_entry.php:208
 msgid "&Email Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:215
+#: ../sales/sales_order_entry.php:216
 msgid "Print &Receipt"
 msgstr ""
 
-#: sales/sales_order_entry.php:220
+#: ../sales/sales_order_entry.php:221
 msgid "Enter a &New Template Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:223
+#: ../sales/sales_order_entry.php:224
 msgid "Enter a &New Direct Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:356
+#: ../sales/sales_order_entry.php:362
+msgid "Pre-payment required have to be positive and less than total amount."
+msgstr ""
+
+#: ../sales/sales_order_entry.php:367
 msgid ""
 "You must enter the person or company to whom delivery should be made to."
 msgstr ""
 
-#: sales/sales_order_entry.php:363
+#: ../sales/sales_order_entry.php:374
 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:372
+#: ../sales/sales_order_entry.php:383
 msgid "The shipping cost entered is expected to be numeric."
 msgstr ""
 
-#: sales/sales_order_entry.php:378
+#: ../sales/sales_order_entry.php:389
 msgid "The Valid date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:380
+#: ../sales/sales_order_entry.php:391
 msgid "The delivery date is invalid."
 msgstr ""
 
-#: sales/sales_order_entry.php:387
+#: ../sales/sales_order_entry.php:398
 msgid "The requested valid date is before the date of the quotation."
 msgstr ""
 
-#: sales/sales_order_entry.php:389
+#: ../sales/sales_order_entry.php:400
 msgid "The requested delivery date is before the date of the order."
 msgstr ""
 
-#: sales/sales_order_entry.php:398
+#: ../sales/sales_order_entry.php:409
 msgid "You need to define a cash account for your Sales Point."
 msgstr ""
 
-#: sales/sales_order_entry.php:469
+#: ../sales/sales_order_entry.php:480
 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:473
+#: ../sales/sales_order_entry.php:484
 msgid "Price for inventory item must be entered and can not be less than 0"
 msgstr ""
 
-#: sales/sales_order_entry.php:480
+#: ../sales/sales_order_entry.php:491
 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:511
+#: ../sales/sales_order_entry.php:522
 #, php-format
 msgid "Price %s is below Standard Cost %s"
 msgstr ""
 
-#: sales/sales_order_entry.php:536
+#: ../sales/sales_order_entry.php:547
 msgid ""
 "This item cannot be deleted because some of it has already been delivered."
 msgstr ""
 
-#: sales/sales_order_entry.php:565
+#: ../sales/sales_order_entry.php:576
 msgid "Direct delivery entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:566
+#: ../sales/sales_order_entry.php:577
 msgid "Enter a New Sales Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:569
+#: ../sales/sales_order_entry.php:580
 msgid "Direct invoice entry has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:570
+#: ../sales/sales_order_entry.php:581
 msgid "Enter a New Sales Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:575
+#: ../sales/sales_order_entry.php:586
 msgid ""
 "This order cannot be cancelled because some of it has already been invoiced "
 "or dispatched. However, the line item quantities may be modified."
 msgstr ""
 
-#: sales/sales_order_entry.php:580
+#: ../sales/sales_order_entry.php:591
 msgid "This sales quotation has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:581
+#: ../sales/sales_order_entry.php:592
 msgid "Enter a New Sales Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:585
+#: ../sales/sales_order_entry.php:596
 msgid "This sales order has been cancelled as requested."
 msgstr ""
 
-#: sales/sales_order_entry.php:586
+#: ../sales/sales_order_entry.php:597
 msgid "Enter a New Sales Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:665
+#: ../sales/sales_order_entry.php:676
 msgid "Sales Invoice Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:666
+#: ../sales/sales_order_entry.php:677
 msgid "Enter Delivery Details and Confirm Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:668
+#: ../sales/sales_order_entry.php:679
 msgid "Place Invoice"
 msgstr ""
 
-#: sales/sales_order_entry.php:671
+#: ../sales/sales_order_entry.php:682
 msgid "Delivery Note Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:672
+#: ../sales/sales_order_entry.php:683
 msgid "Enter Delivery Details and Confirm Dispatch"
 msgstr ""
 
-#: sales/sales_order_entry.php:673
+#: ../sales/sales_order_entry.php:684
 msgid "Cancel Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:674
+#: ../sales/sales_order_entry.php:685
 msgid "Place Delivery"
 msgstr ""
 
-#: sales/sales_order_entry.php:676
+#: ../sales/sales_order_entry.php:687
 msgid "Quotation Date:"
 msgstr ""
 
-#: sales/sales_order_entry.php:677
+#: ../sales/sales_order_entry.php:688
 msgid "Sales Quotation Items"
 msgstr ""
 
-#: sales/sales_order_entry.php:678
+#: ../sales/sales_order_entry.php:689
 msgid "Enter Delivery Details and Confirm Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:679
+#: ../sales/sales_order_entry.php:690
 msgid "Cancel Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:680
+#: ../sales/sales_order_entry.php:691
 msgid "Place Quotation"
 msgstr ""
 
-#: sales/sales_order_entry.php:681
+#: ../sales/sales_order_entry.php:692
 msgid "Commit Quotations Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:684
-msgid "Sales Order Items"
-msgstr ""
-
-#: sales/sales_order_entry.php:685
+#: ../sales/sales_order_entry.php:696
 msgid "Enter Delivery Details and Confirm Order"
 msgstr ""
 
-#: sales/sales_order_entry.php:688
+#: ../sales/sales_order_entry.php:699
 msgid "Commit Order Changes"
 msgstr ""
 
-#: sales/sales_order_entry.php:710
+#: ../sales/sales_order_entry.php:720
 msgid "You are about to void this Document.\\nDo you want to continue?"
 msgstr ""
 
-#: sales/sales_order_entry.php:713
+#: ../sales/sales_order_entry.php:723
 msgid "Validate changes and update document"
 msgstr ""
 
-#: sales/sales_order_entry.php:717
+#: ../sales/sales_order_entry.php:727
 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:48
+#: ../sales/allocations/customer_allocate.php:48
 #, 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:280 sales/manage/customers.php:318
-#: sales/manage/customers.php.orig:319
-#: sales/inquiry/customer_allocation_inquiry.php:42
-#: sales/inquiry/customer_inquiry.php:48
-#: sales/inquiry/customer_inquiry.php.orig:48
-#: sales/inquiry/sales_orders_view.php:241
-#: sales/inquiry/sales_orders_view.php.orig:241
+#: ../sales/allocations/customer_allocation_main.php:32
+#: ../sales/manage/customer_branches.php:282
+#: ../sales/manage/customers.php:322
+#: ../sales/manage/sav.customers.php:322
+#: ../sales/inquiry/customer_allocation_inquiry.php:42
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:42
+#: ../sales/inquiry/customer_inquiry.php:44
+#: ../sales/inquiry/customer_inquiry.php.orig:45
+#: ../sales/inquiry/sales_orders_view.php:265
+#: ../sales/inquiry/sales_orders_view.php.orig:242
 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:217
+#: ../sales/manage/customer_branches.php:218
 msgid "Main Branch"
 msgstr ""
 
-#: sales/manage/customer_branches.php:236
+#: ../sales/manage/customer_branches.php:237
 msgid "Name and Contact"
 msgstr ""
 
-#: sales/manage/customer_branches.php:237
+#: ../sales/manage/customer_branches.php:238
 msgid "Branch Name:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:238
+#: ../sales/manage/customer_branches.php:239
 msgid "Branch Short Name:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:241 sales/manage/customers.php:286
-#: sales/manage/customers.php.orig:287
+#: ../sales/manage/customer_branches.php:242
+#: ../sales/manage/customers.php:290
+#: ../sales/manage/sav.customers.php:290
 msgid "Sales Person:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:242 sales/manage/customers.php:287
-#: sales/manage/customers.php.orig:288
+#: ../sales/manage/customer_branches.php:243
+#: ../sales/manage/customers.php:291
+#: ../sales/manage/sav.customers.php:291
 msgid "Sales Area:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:243
-#: 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:244
+#: ../sales/manage/customer_branches.php:245
 msgid "Default Inventory Location:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:245
+#: ../sales/manage/customer_branches.php:246
 msgid "Default Shipping Company:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:252
+#: ../sales/manage/customer_branches.php:253
 msgid "Accounts Receivable Account:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:258
+#: ../sales/manage/customer_branches.php:260
 msgid "General contact data"
 msgstr ""
 
-#: sales/manage/customer_branches.php:268
+#: ../sales/manage/customer_branches.php:270
 msgid "Billing Address:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:272
+#: ../sales/manage/customer_branches.php:274
 msgid "Disable this Branch:"
 msgstr ""
 
-#: sales/manage/customer_branches.php:295
-#: sales/inquiry/sales_deliveries_view.php:183
+#: ../sales/manage/customer_branches.php:297
+#: ../sales/inquiry/sales_deliveries_view.php:183
+#: ../sales/inquiry/sales_deliveries_view.php.orig:183
 msgid "Contact"
 msgstr ""
 
-#: sales/manage/customer_branches.php:297
+#: ../sales/manage/customer_branches.php:299
 msgid "Area"
 msgstr ""
 
-#: sales/manage/customer_branches.php:298
+#: ../sales/manage/customer_branches.php:300
 msgid "Phone No"
 msgstr ""
 
-#: sales/manage/customer_branches.php:299
+#: ../sales/manage/customer_branches.php:301
 msgid "Fax No"
 msgstr ""
 
-#: sales/manage/customer_branches.php:301
+#: ../sales/manage/customer_branches.php:303
 msgid "Tax Group"
 msgstr ""
 
-#: sales/manage/customer_branches.php:319
-#: sales/includes/ui/sales_order_ui.inc:299
+#: ../sales/manage/customer_branches.php:321
+#: ../sales/includes/ui/sales_order_ui.inc:299
+#: ../sales/includes/ui/sales_order_ui.inc.orig:299
 msgid ""
 "The selected customer does not have any branches. Please create at least one "
 "branch."
 msgstr ""
 
-#: sales/manage/customers.php:38 sales/manage/customers.php.orig:39
+#: ../sales/manage/customers.php:42
+#: ../sales/manage/sav.customers.php:42
 msgid "The customer name cannot be empty."
 msgstr ""
 
-#: sales/manage/customers.php:45 sales/manage/customers.php.orig:46
+#: ../sales/manage/customers.php:49
+#: ../sales/manage/sav.customers.php:49
 msgid "The customer short name cannot be empty."
 msgstr ""
 
-#: sales/manage/customers.php:52 sales/manage/customers.php.orig:53
+#: ../sales/manage/customers.php:56
+#: ../sales/manage/sav.customers.php:56
 msgid "The credit limit must be numeric and not less than zero."
 msgstr ""
 
-#: sales/manage/customers.php:59 sales/manage/customers.php.orig:60
+#: ../sales/manage/customers.php:63
+#: ../sales/manage/sav.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:66 sales/manage/customers.php.orig:67
+#: ../sales/manage/customers.php:70
+#: ../sales/manage/sav.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:94 sales/manage/customers.php.orig:95
+#: ../sales/manage/customers.php:98
+#: ../sales/manage/sav.customers.php:98
 msgid "Customer has been updated."
 msgstr ""
 
-#: sales/manage/customers.php:123 sales/manage/customers.php.orig:124
+#: ../sales/manage/customers.php:127
+#: ../sales/manage/sav.customers.php:127
 msgid "A new customer has been added."
 msgstr ""
 
-#: sales/manage/customers.php:126 sales/manage/customers.php.orig:127
+#: ../sales/manage/customers.php:130
+#: ../sales/manage/sav.customers.php:130
 msgid ""
 "A default Branch has been automatically created, please check default Branch "
 "values by using link below."
 msgstr ""
 
-#: sales/manage/customers.php:149 sales/manage/customers.php.orig:150
+#: ../sales/manage/customers.php:153
+#: ../sales/manage/sav.customers.php:153
 msgid ""
 "This customer cannot be deleted because there are transactions that refer to "
 "it."
 msgstr ""
 
-#: sales/manage/customers.php:156 sales/manage/customers.php.orig:157
+#: ../sales/manage/customers.php:160
+#: ../sales/manage/sav.customers.php:160
 msgid ""
 "Cannot delete the customer record because orders have been created against "
 "it."
 msgstr ""
 
-#: sales/manage/customers.php:163 sales/manage/customers.php.orig:164
+#: ../sales/manage/customers.php:167
+#: ../sales/manage/sav.customers.php:167
 msgid ""
 "Cannot delete this customer because there are branch records set up against "
 "it."
 msgstr ""
 
-#: sales/manage/customers.php:174 sales/manage/customers.php.orig:175
+#: ../sales/manage/customers.php:178
+#: ../sales/manage/sav.customers.php:178
 msgid "Selected customer has been deleted."
 msgstr ""
 
-#: sales/manage/customers.php:223 sales/manage/customers.php.orig:224
+#: ../sales/manage/customers.php:227
+#: ../sales/manage/sav.customers.php:227
 msgid "Name and Address"
 msgstr ""
 
-#: sales/manage/customers.php:225 sales/manage/customers.php.orig:226
+#: ../sales/manage/customers.php:229
+#: ../sales/manage/sav.customers.php:229
 msgid "Customer Name:"
 msgstr ""
 
-#: sales/manage/customers.php:226 sales/manage/customers.php.orig:227
+#: ../sales/manage/customers.php:230
+#: ../sales/manage/sav.customers.php:230
 msgid "Customer Short Name:"
 msgstr ""
 
-#: sales/manage/customers.php:234 sales/manage/customers.php:238
-#: sales/manage/customers.php.orig:235 sales/manage/customers.php.orig:239
+#: ../sales/manage/customers.php:238
+#: ../sales/manage/customers.php:242
+#: ../sales/manage/sav.customers.php:238
+#: ../sales/manage/sav.customers.php:242
 msgid "Customer's Currency:"
 msgstr ""
 
-#: sales/manage/customers.php:241 sales/manage/customers.php.orig:242
+#: ../sales/manage/customers.php:245
+#: ../sales/manage/sav.customers.php:245
 msgid "Sales Type/Price List:"
 msgstr ""
 
-#: sales/manage/customers.php:244 sales/manage/customers.php.orig:245
+#: ../sales/manage/customers.php:248
+#: ../sales/manage/sav.customers.php:248
 msgid "Customer status:"
 msgstr ""
 
-#: sales/manage/customers.php:257 sales/manage/customers.php.orig:258
+#: ../sales/manage/customers.php:261
+#: ../sales/manage/sav.customers.php:261
 msgid "Discount Percent:"
 msgstr ""
 
-#: sales/manage/customers.php:258 sales/manage/customers.php.orig:259
+#: ../sales/manage/customers.php:262
+#: ../sales/manage/sav.customers.php:262
 msgid "Prompt Payment Discount Percent:"
 msgstr ""
 
-#: sales/manage/customers.php:262 sales/manage/customers.php.orig:263
+#: ../sales/manage/customers.php:266
+#: ../sales/manage/sav.customers.php:266
 msgid "Credit Status:"
 msgstr ""
 
-#: sales/manage/customers.php:275 sales/manage/customers.php.orig:276
+#: ../sales/manage/customers.php:279
+#: ../sales/manage/sav.customers.php:279
 msgid "Customer branches"
 msgstr ""
 
-#: sales/manage/customers.php:277 sales/manage/customers.php.orig:278
+#: ../sales/manage/customers.php:281
+#: ../sales/manage/sav.customers.php:281
 msgid "Select or &Add"
 msgstr ""
 
-#: sales/manage/customers.php:277 sales/manage/customers.php.orig:278
+#: ../sales/manage/customers.php:281
+#: ../sales/manage/sav.customers.php:281
 msgid "&Add or Edit "
 msgstr ""
 
-#: sales/manage/customers.php:295 sales/manage/customers.php.orig:296
+#: ../sales/manage/customers.php:299
+#: ../sales/manage/sav.customers.php:299
 msgid "Add New Customer"
 msgstr ""
 
-#: sales/manage/customers.php:299 sales/manage/customers.php.orig:300
+#: ../sales/manage/customers.php:303
+#: ../sales/manage/sav.customers.php:303
 msgid "Update Customer"
 msgstr ""
 
-#: sales/manage/customers.php:300 sales/manage/customers.php.orig:301
+#: ../sales/manage/customers.php:304
+#: ../sales/manage/sav.customers.php:304
 msgid "Update customer data"
 msgstr ""
 
-#: sales/manage/customers.php:301 sales/manage/customers.php.orig:302
+#: ../sales/manage/customers.php:305
+#: ../sales/manage/sav.customers.php:305
 msgid "Select this customer and return to document entry."
 msgstr ""
 
-#: sales/manage/customers.php:302 sales/manage/customers.php.orig:303
+#: ../sales/manage/customers.php:306
+#: ../sales/manage/sav.customers.php:306
 msgid "Delete Customer"
 msgstr ""
 
-#: sales/manage/customers.php:303 sales/manage/customers.php.orig:304
+#: ../sales/manage/customers.php:307
+#: ../sales/manage/sav.customers.php:307
 msgid "Delete customer data if have been never used"
 msgstr ""
 
-#: sales/manage/customers.php:310 sales/manage/customers.php.orig:311
+#: ../sales/manage/customers.php:314
+#: ../sales/manage/sav.customers.php:314
 msgid ""
 "There are no sales types defined. Please define at least one sales type "
 "before adding a customer."
 msgstr ""
 
-#: sales/manage/customers.php:319 sales/manage/customers.php.orig:320
+#: ../sales/manage/customers.php:323
+#: ../sales/manage/sav.customers.php:323
 msgid "New customer"
 msgstr ""
 
-#: sales/manage/customers.php:341 sales/manage/customers.php.orig:342
+#: ../sales/manage/customers.php:345
+#: ../sales/manage/sav.customers.php:345
 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/sales_areas.php:30
-#: sales/manage/sales_groups.php:30
+#: ../sales/manage/recurrent_invoices.php:36
+#: ../sales/manage/sales_areas.php:30
+#: ../sales/manage/sales_groups.php:30
 msgid "The area 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: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: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: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_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:65
+#: ../sales/view/view_dispatch.php:65
+#: ../sales/view/view_invoice.php:67
 msgid "Charge Branch"
 msgstr ""
 
-#: sales/view/view_dispatch.php:91 sales/view/view_invoice.php:90
-#: 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
+#: ../sales/view/view_sales_order.php.orig: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:43
+#: ../sales/view/view_invoice.php:45
+#, php-format
+msgid "FINAL INVOICE #%d"
+msgstr ""
+
+#: ../sales/view/view_invoice.php:45
+#, php-format
+msgid "PREPAYMENT INVOICE #%d"
+msgstr ""
+
+#: ../sales/view/view_invoice.php:45
 #, php-format
 msgid "SALES INVOICE #%d"
 msgstr ""
 
-#: sales/view/view_invoice.php:152
+#: ../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:39
 msgid "Into Bank Account"
 msgstr ""
 
-#: sales/view/view_receipt.php:40
+#: ../sales/view/view_receipt.php:40
 msgid "Date of Deposit"
 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
+#: ../sales/view/view_sales_order.php.orig:28
 msgid "View Sales Quotation"
 msgstr ""
 
-#: sales/view/view_sales_order.php:29
+#: ../sales/view/view_sales_order.php:29
+#: ../sales/view/view_sales_order.php.orig:29
 #, php-format
 msgid "Sales Quotation #%d"
 msgstr ""
 
-#: sales/view/view_sales_order.php:33
+#: ../sales/view/view_sales_order.php:33
+#: ../sales/view/view_sales_order.php.orig:33
 msgid "View Sales Order"
 msgstr ""
 
-#: sales/view/view_sales_order.php:34
+#: ../sales/view/view_sales_order.php:34
+#: ../sales/view/view_sales_order.php.orig:34
 #, php-format
 msgid "Sales Order #%d"
 msgstr ""
 
-#: sales/view/view_sales_order.php:49
+#: ../sales/view/view_sales_order.php:49
+#: ../sales/view/view_sales_order.php.orig:49
 msgid "Order Information"
 msgstr ""
 
-#: sales/view/view_sales_order.php:60
+#: ../sales/view/view_sales_order.php:60
+#: ../sales/view/view_sales_order.php.orig:60
 msgid "Customer Name"
 msgstr ""
 
-#: sales/view/view_sales_order.php:64
+#: ../sales/view/view_sales_order.php:64
+#: ../sales/view/view_sales_order.php.orig:64
 msgid "Deliver To Branch"
 msgstr ""
 
-#: sales/view/view_sales_order.php:71
+#: ../sales/view/view_sales_order.php:71
+#: ../sales/view/view_sales_order.php.orig:71
 msgid "Requested Delivery"
 msgstr ""
 
-#: sales/view/view_sales_order.php:75
+#: ../sales/view/view_sales_order.php:75
+#: ../sales/view/view_sales_order.php.orig:75
 msgid "Deliver From Location"
 msgstr ""
 
-#: sales/view/view_sales_order.php:82
+#: ../sales/view/view_sales_order.php:86
+msgid "Non-Invoiced Prepayments"
+msgstr ""
+
+#: ../sales/view/view_sales_order.php:87
+msgid "All Payments Allocated"
+msgstr ""
+
+#: ../sales/view/view_sales_order.php:95
+#: ../sales/view/view_sales_order.php.orig:82
 msgid "Telephone"
 msgstr ""
 
-#: sales/view/view_sales_order.php:197
+#: ../sales/view/view_sales_order.php:215
+#: ../sales/view/view_sales_order.php.orig:197
 msgid "This Sales Order is used as a Template."
 msgstr ""
 
-#: sales/view/view_sales_order.php:202
+#: ../sales/view/view_sales_order.php:220
+#: ../sales/view/view_sales_order.php.orig:202
 msgid "Quantity Delivered"
 msgstr ""
 
-#: sales/inquiry/customer_allocation_inquiry.php:25
+#: ../sales/inquiry/customer_allocation_inquiry.php:25
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:25
 msgid "Customer Allocation Inquiry"
 msgstr ""
 
-#: sales/inquiry/customer_allocation_inquiry.php:96
+#: ../sales/inquiry/customer_allocation_inquiry.php:96
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:96
 msgid "Allocation"
 msgstr ""
 
-#: sales/inquiry/customer_allocation_inquiry.php:116
+#: ../sales/inquiry/customer_allocation_inquiry.php:116
+#: ../sales/inquiry/customer_allocation_inquiry.php.orig:116
 msgid "Payment"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:28
-#: sales/inquiry/customer_inquiry.php.orig:28
+#: ../sales/inquiry/customer_inquiry.php:26
+#: ../sales/inquiry/customer_inquiry.php.orig:27
 msgid "Customer Transactions"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:72
-#: sales/inquiry/customer_inquiry.php.orig:72
+#: ../sales/inquiry/customer_inquiry.php:68
+#: ../sales/inquiry/customer_inquiry.php.orig:69
 msgid "CUSTOMER ACCOUNT IS ON HOLD"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:205
-#: sales/inquiry/customer_inquiry.php.orig:205
+#: ../sales/inquiry/customer_inquiry.php:181
+#: ../sales/inquiry/customer_inquiry.php.orig:205
 msgid "Print Receipt"
 msgstr ""
 
-#: sales/inquiry/customer_inquiry.php:235
-#: sales/inquiry/customer_inquiry.php:248
-#: sales/inquiry/customer_inquiry.php.orig:235
-#: sales/inquiry/customer_inquiry.php.orig:248
+#: ../sales/inquiry/customer_inquiry.php:211
+#: ../sales/inquiry/customer_inquiry.php:224
+#: ../sales/inquiry/customer_inquiry.php.orig:235
+#: ../sales/inquiry/customer_inquiry.php.orig:248
 msgid "RB"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:29
+#: ../sales/inquiry/sales_deliveries_view.php:29
+#: ../sales/inquiry/sales_deliveries_view.php.orig:29
 msgid "Search Not Invoiced Deliveries"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:34
+#: ../sales/inquiry/sales_deliveries_view.php:34
+#: ../sales/inquiry/sales_deliveries_view.php.orig:34
 msgid "Search All Deliveries"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:70
+#: ../sales/inquiry/sales_deliveries_view.php:70
+#: ../sales/inquiry/sales_deliveries_view.php.orig: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
+#: ../sales/inquiry/sales_deliveries_view.php.orig:179
 msgid "Delivery #"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:185
+#: ../sales/inquiry/sales_deliveries_view.php:185
+#: ../sales/inquiry/sales_deliveries_view.php.orig:185
 msgid "Cust Ref"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:187
+#: ../sales/inquiry/sales_deliveries_view.php:187
+#: ../sales/inquiry/sales_deliveries_view.php.orig:187
 msgid "Due By"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:188
+#: ../sales/inquiry/sales_deliveries_view.php:188
+#: ../sales/inquiry/sales_deliveries_view.php.orig:188
 msgid "Delivery Total"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:190
+#: ../sales/inquiry/sales_deliveries_view.php:190
+#: ../sales/inquiry/sales_deliveries_view.php.orig:190
 msgid "Batch"
 msgstr ""
 
-#: sales/inquiry/sales_deliveries_view.php:190
+#: ../sales/inquiry/sales_deliveries_view.php:190
+#: ../sales/inquiry/sales_deliveries_view.php.orig:190
 msgid "Batch Invoicing"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:48
-#: sales/inquiry/sales_orders_view.php.orig:48
+#: ../sales/inquiry/sales_orders_view.php:44
+#: ../sales/inquiry/sales_orders_view.php.orig:40
 msgid "Search Outstanding Sales Orders"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:53
-#: sales/inquiry/sales_orders_view.php.orig:53
+#: ../sales/inquiry/sales_orders_view.php:49
+#: ../sales/inquiry/sales_orders_view.php.orig:45
 msgid "Search Template for Invoicing"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:58
-#: sales/inquiry/sales_orders_view.php.orig:58
+#: ../sales/inquiry/sales_orders_view.php:54
+#: ../sales/inquiry/sales_orders_view.php.orig:50
 msgid "Select Template for Delivery"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:63
-#: sales/inquiry/sales_orders_view.php.orig:63
+#: ../sales/inquiry/sales_orders_view.php:59
+msgid "Invoicing Prepayment Orders"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php:64
+#: ../sales/inquiry/sales_orders_view.php.orig:55
 msgid "Search All Sales Orders"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:69
-#: sales/inquiry/sales_orders_view.php.orig:69
+#: ../sales/inquiry/sales_orders_view.php:70
+#: ../sales/inquiry/sales_orders_view.php.orig:61
 msgid "Search All Sales Quotations"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:134
-#: sales/inquiry/sales_orders_view.php.orig:134
+#: ../sales/inquiry/sales_orders_view.php:148
+#: ../sales/inquiry/sales_orders_view.php.orig:135
 msgid "Dispatch"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:176
-#: sales/inquiry/sales_orders_view.php.orig:176
+#: ../sales/inquiry/sales_orders_view.php:191
+#: ../sales/inquiry/sales_orders_view.php.orig:178
 msgid "Set this order as a template for direct deliveries/invoices"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:243
-#: sales/inquiry/sales_orders_view.php.orig:243
+#: ../sales/inquiry/sales_orders_view.php:200
+msgid "Prepayment Invoice"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php:200
+msgid "Final Invoice"
+msgstr ""
+
+#: ../sales/inquiry/sales_orders_view.php:267
+#: ../sales/inquiry/sales_orders_view.php.orig:244
 msgid "Show All:"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:260
-#: sales/inquiry/sales_orders_view.php.orig:260
+#: ../sales/inquiry/sales_orders_view.php:284
+#: ../sales/inquiry/sales_orders_view.php.orig:261
 msgid "Order #"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:264
-#: sales/inquiry/sales_orders_view.php:278
-#: sales/inquiry/sales_orders_view.php.orig:264
-#: sales/inquiry/sales_orders_view.php.orig:278
+#: ../sales/inquiry/sales_orders_view.php:288
+#: ../sales/inquiry/sales_orders_view.php:302
+#: ../sales/inquiry/sales_orders_view.php.orig:265
+#: ../sales/inquiry/sales_orders_view.php.orig:279
 msgid "Cust Order Ref"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:267
-#: sales/inquiry/sales_orders_view.php:281
-#: sales/inquiry/sales_orders_view.php.orig:267
-#: sales/inquiry/sales_orders_view.php.orig:281
+#: ../sales/inquiry/sales_orders_view.php:291
+#: ../sales/inquiry/sales_orders_view.php:305
+#: ../sales/inquiry/sales_orders_view.php.orig:268
+#: ../sales/inquiry/sales_orders_view.php.orig:282
 msgid "Delivery To"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:274
-#: sales/inquiry/sales_orders_view.php.orig:274
+#: ../sales/inquiry/sales_orders_view.php:298
+#: ../sales/inquiry/sales_orders_view.php.orig:275
 msgid "Quote #"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:279
-#: sales/inquiry/sales_orders_view.php.orig:279
+#: ../sales/inquiry/sales_orders_view.php:303
+#: ../sales/inquiry/sales_orders_view.php.orig:280
 msgid "Quote Date"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:282
-#: sales/inquiry/sales_orders_view.php.orig:282
+#: ../sales/inquiry/sales_orders_view.php:306
+#: ../sales/inquiry/sales_orders_view.php.orig:283
 msgid "Quote Total"
 msgstr ""
 
-#: sales/inquiry/sales_orders_view.php:309
-#: sales/inquiry/sales_orders_view.php.orig:309
+#: ../sales/inquiry/sales_orders_view.php:337
+#: ../sales/inquiry/sales_orders_view.php.orig:310
 msgid "Tmpl"
 msgstr ""
 
-#: sales/includes/cart_class.inc:347
+#: ../sales/includes/cart_class.inc:359
 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:292
+#: ../sales/includes/db/custalloc_db.inc:350
 msgid ""
 "Unsuspected overallocation happened due to sparse credit notes exists for "
 "this invoice.\n"
@@ -13292,346 +15542,392 @@ msgid ""
 "charges."
 msgstr ""
 
-#: sales/includes/db/sales_invoice_db.inc:173
-#: sales/includes/db/sales_invoice_db.inc.orig:176
+#: ../sales/includes/db/sales_invoice_db.inc:196
 msgid "Cash invoice"
 msgstr ""
 
-#: sales/includes/db/sales_order_db.inc:107
-#: sales/includes/db/sales_order_db.inc:259
+#: ../sales/includes/db/sales_order_db.inc:109
+#: ../sales/includes/db/sales_order_db.inc:271
 msgid "Stocks below Re-Order Level at "
 msgstr ""
 
-#: sales/includes/db/sales_order_db.inc:110
-#: sales/includes/db/sales_order_db.inc:264
+#: ../sales/includes/db/sales_order_db.inc:112
+#: ../sales/includes/db/sales_order_db.inc:276
 msgid "Below"
 msgstr ""
 
-#: sales/includes/db/sales_order_db.inc:111
-#: sales/includes/db/sales_order_db.inc:265
+#: ../sales/includes/db/sales_order_db.inc:113
+#: ../sales/includes/db/sales_order_db.inc:277
 msgid "Please reorder"
 msgstr ""
 
-#: sales/includes/db/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:379
+#: ../sales/includes/ui/sales_credit_ui.inc:94
+#: ../sales/includes/ui/sales_order_ui.inc:379
+#: ../sales/includes/ui/sales_order_ui.inc.orig:379
 msgid "Customer Currency:"
 msgstr ""
 
-#: sales/includes/ui/sales_credit_ui.inc:112
-#: sales/includes/ui/sales_order_ui.inc:638
+#: ../sales/includes/ui/sales_credit_ui.inc:112
+#: ../sales/includes/ui/sales_order_ui.inc:647
+#: ../sales/includes/ui/sales_order_ui.inc.orig:639
 msgid "Shipping Company:"
 msgstr ""
 
-#: sales/includes/ui/sales_credit_ui.inc:114
-#: sales/includes/ui/sales_order_ui.inc:386
+#: ../sales/includes/ui/sales_credit_ui.inc:114
+#: ../sales/includes/ui/sales_order_ui.inc:386
+#: ../sales/includes/ui/sales_order_ui.inc.orig:386
 msgid "Customer Discount:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:61
+#: ../sales/includes/ui/sales_order_ui.inc:61
+#: ../sales/includes/ui/sales_order_ui.inc.orig:61
 msgid "This item is already on this document. You have been warned."
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:104
+#: ../sales/includes/ui/sales_order_ui.inc:104
+#: ../sales/includes/ui/sales_order_ui.inc.orig:104
 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:224
+#: ../sales/includes/ui/sales_order_ui.inc:224
+#: ../sales/includes/ui/sales_order_ui.inc.orig:224
 msgid "Shipping Charge"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:297
+#: ../sales/includes/ui/sales_order_ui.inc:297
+#: ../sales/includes/ui/sales_order_ui.inc.orig:297
 msgid "No customer found for entered text."
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:323
+#: ../sales/includes/ui/sales_order_ui.inc:323
+#: ../sales/includes/ui/sales_order_ui.inc.orig:323
 #, php-format
 msgid "Customer's payment terms '%s' cannot be selected on this POS"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:373
+#: ../sales/includes/ui/sales_order_ui.inc:373
+#: ../sales/includes/ui/sales_order_ui.inc.orig:373
 msgid "Reference number unique for this document type"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:413
-#: sales/includes/ui/sales_order_ui.inc:415
+#: ../sales/includes/ui/sales_order_ui.inc:413
+#: ../sales/includes/ui/sales_order_ui.inc:415
+#: ../sales/includes/ui/sales_order_ui.inc.orig:413
+#: ../sales/includes/ui/sales_order_ui.inc.orig:415
 msgid "Price List:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:432
+#: ../sales/includes/ui/sales_order_ui.inc:432
+#: ../sales/includes/ui/sales_order_ui.inc.orig:432
 msgid "Date of order receive"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:582
+#: ../sales/includes/ui/sales_order_ui.inc:582
+#: ../sales/includes/ui/sales_order_ui.inc.orig:582
 msgid "Cash payment"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:585
-#: sales/includes/ui/sales_order_ui.inc:616
+#: ../sales/includes/ui/sales_order_ui.inc:585
+#: ../sales/includes/ui/sales_order_ui.inc:617
+#: ../sales/includes/ui/sales_order_ui.inc.orig:585
+#: ../sales/includes/ui/sales_order_ui.inc.orig:617
 msgid "Deliver from Location:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:588
+#: ../sales/includes/ui/sales_order_ui.inc:588
+#: ../sales/includes/ui/sales_order_ui.inc.orig:588
 msgid "Cash account:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:594
+#: ../sales/includes/ui/sales_order_ui.inc:595
+#: ../sales/includes/ui/sales_order_ui.inc.orig:595
 msgid "Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:599
+#: ../sales/includes/ui/sales_order_ui.inc:600
+#: ../sales/includes/ui/sales_order_ui.inc.orig:600
 msgid "Invoice Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:600
+#: ../sales/includes/ui/sales_order_ui.inc:601
+#: ../sales/includes/ui/sales_order_ui.inc.orig:601
 msgid "Invoice before"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:604
+#: ../sales/includes/ui/sales_order_ui.inc:605
+#: ../sales/includes/ui/sales_order_ui.inc.orig:605
 msgid "Quotation Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:609
+#: ../sales/includes/ui/sales_order_ui.inc:610
+#: ../sales/includes/ui/sales_order_ui.inc.orig:610
 msgid "Order Delivery Details"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:622
+#: ../sales/includes/ui/sales_order_ui.inc:631
+#: ../sales/includes/ui/sales_order_ui.inc.orig:623
 msgid "Enter requested day of delivery"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:623
+#: ../sales/includes/ui/sales_order_ui.inc:632
+#: ../sales/includes/ui/sales_order_ui.inc.orig:624
 msgid "Enter Valid until Date"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:624
+#: ../sales/includes/ui/sales_order_ui.inc:633
+#: ../sales/includes/ui/sales_order_ui.inc.orig:625
 msgid "Deliver To:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:625
+#: ../sales/includes/ui/sales_order_ui.inc:634
+#: ../sales/includes/ui/sales_order_ui.inc.orig:626
 msgid "Additional identifier for delivery e.g. name of receiving person"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:628
+#: ../sales/includes/ui/sales_order_ui.inc:637
+#: ../sales/includes/ui/sales_order_ui.inc.orig:629
 msgid "Delivery address. Default is address of customer branch"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:632
+#: ../sales/includes/ui/sales_order_ui.inc:641
+#: ../sales/includes/ui/sales_order_ui.inc.orig:633
 msgid "Contact Phone Number:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:633
+#: ../sales/includes/ui/sales_order_ui.inc:642
+#: ../sales/includes/ui/sales_order_ui.inc.orig:634
 msgid "Phone number of ordering person. Defaults to branch phone number"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:634
+#: ../sales/includes/ui/sales_order_ui.inc:643
+#: ../sales/includes/ui/sales_order_ui.inc.orig:635
 msgid "Customer Reference:"
 msgstr ""
 
-#: sales/includes/ui/sales_order_ui.inc:635
+#: ../sales/includes/ui/sales_order_ui.inc:644
+#: ../sales/includes/ui/sales_order_ui.inc.orig:636
 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
+#: ../taxes/tax_groups.php:17
+#: ../taxes/tax_groups.php.orig:17
+#: ../taxes/tax_groups.php.sav:17
 msgid "Tax Groups"
 msgstr ""
 
-#: taxes/tax_groups.php:27
+#: ../taxes/tax_groups.php:27
+#: ../taxes/tax_groups.php.orig:27
+#: ../taxes/tax_groups.php.sav:27
 msgid ""
 "There are no tax types defined. Define tax types before defining tax groups."
 msgstr ""
 
-#: taxes/tax_groups.php:40
+#: ../taxes/tax_groups.php:40
+#: ../taxes/tax_groups.php.orig:40
+#: ../taxes/tax_groups.php.sav:40
 msgid "The tax group name cannot be empty."
 msgstr ""
 
-#: taxes/tax_groups.php:61
+#: ../taxes/tax_groups.php:60
+#: ../taxes/tax_groups.php.orig:62
+#: ../taxes/tax_groups.php.sav:62
 msgid "Selected tax group has been updated"
 msgstr ""
 
-#: taxes/tax_groups.php:66
+#: ../taxes/tax_groups.php:65
+#: ../taxes/tax_groups.php.orig:67
+#: ../taxes/tax_groups.php.sav:67
 msgid "New tax group has been added"
 msgstr ""
 
-#: taxes/tax_groups.php:81
+#: ../taxes/tax_groups.php:80
+#: ../taxes/tax_groups.php.orig:82
+#: ../taxes/tax_groups.php.sav:82
 msgid ""
 "Cannot delete this tax group because customer branches been created "
 "referring to it."
 msgstr ""
 
-#: taxes/tax_groups.php:87
+#: ../taxes/tax_groups.php:86
+#: ../taxes/tax_groups.php.orig:88
+#: ../taxes/tax_groups.php.sav:88
 msgid ""
 "Cannot delete this tax group because suppliers been created referring to it."
 msgstr ""
 
-#: taxes/tax_groups.php:104
+#: ../taxes/tax_groups.php:103
+#: ../taxes/tax_groups.php.orig:105
+#: ../taxes/tax_groups.php.sav:105
 msgid "Selected tax group has been deleted"
 msgstr ""
 
-#: taxes/tax_groups.php:124
-msgid "Shipping Tax"
-msgstr ""
-
-#: taxes/tax_groups.php:168
-msgid "Tax applied to Shipping:"
+#: ../taxes/tax_groups.php:166
+#: ../taxes/tax_groups.php.orig:168
+#: ../taxes/tax_groups.php.sav:168
+msgid "Select the taxes that are included in this group."
 msgstr ""
 
-#: taxes/tax_groups.php:172
-msgid "Select the taxes that are included in this group."
+#: ../taxes/tax_groups.php:171
+#: ../taxes/tax_groups.php.orig:173
+#: ../taxes/tax_groups.php.sav:173
+msgid "Shipping Tax"
 msgstr ""
 
-#: taxes/tax_types.php:16
+#: ../taxes/tax_types.php:16
 msgid "Tax Types"
 msgstr ""
 
-#: taxes/tax_types.php:30
+#: ../taxes/tax_types.php:30
 msgid "The tax type name cannot be empty."
 msgstr ""
 
-#: taxes/tax_types.php:36
+#: ../taxes/tax_types.php:36
 msgid "The default tax rate must be numeric and not less than zero."
 msgstr ""
 
-#: taxes/tax_types.php:42
+#: ../taxes/tax_types.php:42
 msgid "Selected GL Accounts cannot be used by another tax type."
 msgstr ""
 
-#: taxes/tax_types.php:56
+#: ../taxes/tax_types.php:56
 msgid "New tax type has been added"
 msgstr ""
 
-#: taxes/tax_types.php:67
+#: ../taxes/tax_types.php:67
 msgid "Selected tax type has been updated"
 msgstr ""
 
-#: taxes/tax_types.php:77
+#: ../taxes/tax_types.php:77
 msgid ""
 "Cannot delete this tax type because tax groups been created referring to it."
 msgstr ""
 
-#: taxes/tax_types.php:94
+#: ../taxes/tax_types.php:94
 msgid "Selected tax type has been deleted"
 msgstr ""
 
-#: taxes/tax_types.php:112
+#: ../taxes/tax_types.php:112
 msgid ""
 "To avoid problems with manual journal entry all tax types should have unique "
 "Sales/Purchasing GL accounts."
 msgstr ""
 
-#: taxes/tax_types.php:115
+#: ../taxes/tax_types.php:115
 msgid "Default Rate (%)"
 msgstr ""
 
-#: taxes/tax_types.php:116
+#: ../taxes/tax_types.php:116
 msgid "Sales GL Account"
 msgstr ""
 
-#: taxes/tax_types.php:116
+#: ../taxes/tax_types.php:116
 msgid "Purchasing GL Account"
 msgstr ""
 
-#: taxes/tax_types.php:159
+#: ../taxes/tax_types.php:159
 msgid "Default Rate:"
 msgstr ""
 
-#: taxes/tax_types.php:161
+#: ../taxes/tax_types.php:161
 msgid "Sales GL Account:"
 msgstr ""
 
-#: taxes/tax_types.php:162
+#: ../taxes/tax_types.php:162
 msgid "Purchasing GL Account:"
 msgstr ""
 
-#: themes/default/renderer.php:27
+#: ../themes/default/renderer.php:27
 msgid "Main Menu"
 msgstr ""
 
-#: themes/default/renderer.php:53 themes/default/renderer.php:76
+#: ../themes/default/renderer.php:53
+#: ../themes/default/renderer.php:76
 msgid "Help"
 msgstr ""
 
-#: themes/default/renderer.php:71
+#: ../themes/default/renderer.php:71
 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:35
+#: ../sql/alter2.1.php:36
 msgid "Cannot retrieve bank accounts codes"
 msgstr ""
 
-#: sql/alter2.1.php:43
+#: ../sql/alter2.1.php:44
 msgid "Cannot update bank transactions"
 msgstr ""
 
-#: sql/alter2.1.php:52
+#: ../sql/alter2.1.php:53
 msgid "Cannot select stock identificators"
 msgstr ""
 
-#: sql/alter2.1.php:63
+#: ../sql/alter2.1.php:64
 msgid "Cannot insert stock id into item_codes"
 msgstr ""
 
-#: sql/alter2.1.php:139
+#: ../sql/alter2.1.php:140
 msgid ""
 "Seems that system upgrade to version 2.1 has \n"
 "\t\t\tbeen performed for this company already.<br> If something has gone \n"
@@ -13639,24 +15935,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:84
+#: ../sql/alter2.2.php:85
 msgid "Cannot query max sales order number."
 msgstr ""
 
-#: sql/alter2.2.php:95
+#: ../sql/alter2.2.php:96
 msgid "Cannot store next sales order reference."
 msgstr ""
 
-#: sql/alter2.2.php:250
+#: ../sql/alter2.2.php:251
 msgid ""
 "Cannot upgrade extensions system: file /modules/installed_modules.php is not "
 "writeable"
 msgstr ""
 
-#: sql/alter2.3.php:20
+#: ../sql/alter2.3.php:20
 msgid "Upgrade from version 2.2 to 2.3"
 msgstr ""
+
+#: ../sql/alter2.4.php:19
+msgid "Upgrade from version 2.3 to 2.4"
+msgstr ""

diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc
index 0f7f9b53d01d7365c32166de61407e4ffc74573c..c86cac721dc116da2b756c8db4a3fcfd4f014313 100644 (file)
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -132,9 +132,11 @@ function add_supp_invoice(&$supp_trans) // do not receive as ref because we chan
        $tax_total = 0;
     $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id);
        if ($trans_no) {
+               $allocs = get_payments_for($trans_no, $trans_type); // save allocations
                void_transaction($trans_type, $trans_no, Today(), _("Document reentered."));
                $Refs->restore_last($trans_type, $trans_no);
-       }
+       } else
+               $allocs = get_po_prepayments($supp_trans);
 
     foreach ($taxes as $n => $taxitem)
     {
@@ -428,6 +430,11 @@ function add_supp_invoice(&$supp_trans) // do not receive as ref because we chan
                }
        }
 
+//_vd($allocs);
+       reallocate_payments($invoice_id, ST_SUPPINVOICE, $date_, $to_allocate, $allocs);
+//_vd(get_payments_for($sales_order, ST_PURCHORDER));
+//_vd(get_payments_for($invoice_id, ST_SUPPINVOICE));
+//exit;
        hook_db_postwrite($supp_trans, $supp_trans->trans_type);
     commit_transaction();
 

diff --git a/purchasing/includes/db/po_db.inc b/purchasing/includes/db/po_db.inc
index 45810f1da0b9050b430457a06aaf3f0d64cb0370..4818dda3e386324262c5fc8049d43b4c4ed8cc8e 100644 (file)
--- a/purchasing/includes/db/po_db.inc
+++ b/purchasing/includes/db/po_db.inc
@@ -32,7 +32,7 @@ function add_po(&$po_obj)
 
      /*Insert to purchase order header record */
      $sql = "INSERT INTO ".TB_PREF."purch_orders (supplier_id, Comments, ord_date, reference, 
-       requisition_no, into_stock_location, delivery_address, total, tax_included) VALUES(";
+       requisition_no, into_stock_location, delivery_address, total, tax_included, prep_amount) VALUES(";
      $sql .= db_escape($po_obj->supplier_id) . "," .
          db_escape($po_obj->Comments) . ",'" .
          date2sql($po_obj->orig_order_date) . "', " .
@@ -41,7 +41,8 @@ function add_po(&$po_obj)
          db_escape($po_obj->Location) . ", " .
          db_escape($po_obj->delivery_address) . ", " .
          db_escape($po_obj->get_trans_total()). ", " .
-         db_escape($po_obj->tax_included) . ")";
+         db_escape($po_obj->tax_included). ", " .
+         db_escape($po_obj->prep_amount). ")";
 
        db_query($sql, "The purchase order header record could not be inserted");
 
@@ -86,6 +87,7 @@ function update_po(&$po_obj)
                ord_date='" . date2sql($po_obj->orig_order_date) . "',
                delivery_address=" . db_escape($po_obj->delivery_address).",
                total=". db_escape($po_obj->get_trans_total()).",
+               prep_amount=". db_escape($po_obj->prep_amount).",
                tax_included=". db_escape($po_obj->tax_included);
     $sql .= " WHERE order_no = " . $po_obj->order_no;
        db_query($sql, "The purchase order could not be updated");
@@ -110,6 +112,12 @@ function update_po(&$po_obj)
                db_query($sql, "One of the purchase order detail records could not be updated");
     }
 
+//_vd($po_obj->prepayments);
+       reallocate_payments($po_obj->order_no, ST_PURCHORDER, $po_obj->orig_order_date, $po_obj->get_trans_total(), $po_obj->prepayments);
+//_vd($p = get_payments_for($po_obj->order_no, ST_PURCHORDER));
+//_vd(get_supp_trans($p[0]['trans_no_from'], $p[0]['trans_type_from']));
+//exit;
+
        // add_comments(ST_PURCHORDER, $po_obj->order_no, $po_obj->orig_order_date, $po_obj->Comments);
 
        add_audit_trail($po_obj->trans_type, $po_obj->order_no, Today(), _("Updated."));
@@ -152,6 +160,9 @@ function read_po_header($order_no, &$order)
        $order->supp_ref = $myrow["requisition_no"];
        $order->reference = $myrow["reference"];
        $order->delivery_address = $myrow["delivery_address"];
+       $order->alloc = $myrow["alloc"];
+       $order->prep_amount = $myrow["prep_amount"];
+       $order->prepayments = get_payments_for($order_no, ST_PURCHORDER);
 
        return true;
        }
@@ -350,4 +361,5 @@ function get_sql_for_po_search()
        $sql .= " GROUP BY porder.order_no";
        return $sql;
 }
+
 ?>
\ No newline at end of file

diff --git a/purchasing/includes/db/suppalloc_db.inc b/purchasing/includes/db/suppalloc_db.inc
index 6091e42e9092901d9ba2b50ffd990be80c126281..c16c97557f015b1a3d3cac1e809fe945279ef727 100644 (file)
--- a/purchasing/includes/db/suppalloc_db.inc
+++ b/purchasing/includes/db/suppalloc_db.inc
@@ -51,8 +51,13 @@ function get_supp_trans_allocation_balance($trans_type, $trans_no)
 
 function update_supp_trans_allocation($trans_type, $trans_no, $alloc)
 {
-       $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);
+
+       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");
 }
 
@@ -67,38 +72,31 @@ function void_supp_allocations($type, $type_no, $date="")
 
 function clear_supp_alloctions($type, $type_no, $date="")
 {
-       // clear any allocations for this transaction
-       $sql = "SELECT * FROM ".TB_PREF."supp_allocations
-               WHERE (trans_type_from=".db_escape($type)." AND trans_no_from=".db_escape($type_no).")
-               OR (trans_type_to=".db_escape($type)." AND trans_no_to=".db_escape($type_no).")";
-       $result = db_query($sql, "could not void supp transactions for type=$type and trans_no=$type_no");
-
-       while ($row = db_fetch($result))
-       {
-               $sql = "UPDATE ".TB_PREF."supp_trans SET alloc=alloc - " . $row['amt'] . "
-                       WHERE (type= " . $row['trans_type_from'] . " AND trans_no=" . $row['trans_no_from'] . ")
-                       OR (type=" . $row['trans_type_to'] . " AND trans_no=" . $row['trans_no_to'] . ")";
-               //$sql = "UPDATE ".TB_PREF."supp_trans SET alloc=alloc - " . $row['amt'] . "
-               //      WHERE type=" . $row['trans_type_to'] . " AND trans_no=" . $row['trans_no_to'];
+       $sql = "UPDATE  ".TB_PREF."supp_allocations ca
+                               LEFT JOIN ".TB_PREF."supp_trans paym ON ca.trans_type_from=paym.type AND ca.trans_no_from=paym.trans_no
+                               LEFT JOIN ".TB_PREF."supp_trans st ON ca.trans_type_to=st.type AND ca.trans_no_to=st.trans_no
+                               LEFT JOIN ".TB_PREF."purch_orders po ON ca.trans_type_to=".ST_PURCHORDER." AND ca.trans_no_to=po.order_no
+                       SET paym.alloc=paym.alloc - ca.amt,
+                               st.alloc=st.alloc -  ca.amt,
+                               po.alloc=po.alloc -  ca.amt
+                       WHERE  (ca.trans_type_from=".db_escape($type)." AND ca.trans_no_from=".db_escape($type_no).")
+                               OR (ca.trans_type_to=".db_escape($type)." AND ca.trans_no_to=".db_escape($type_no).")";
                db_query($sql, "could not clear allocation");
-               // 2008-09-20 Joe Hunt
-               if ($date != "")
-                       exchange_variation($type, $type_no, $row['trans_type_to'], $row['trans_no_to'], $date,
-                               $row['amt'], PT_SUPPLIER, true);
-               //////////////////////
-       }
-
 
        // remove any allocations for this transaction
        $sql = "DELETE FROM ".TB_PREF."supp_allocations
-               WHERE (trans_type_from=".db_escape($type)." AND trans_no_from=".db_escape($type_no).")
-               OR (trans_type_to=".db_escape($type)." AND trans_no_to=".db_escape($type_no).")";
+                       WHERE  (trans_type_from=".db_escape($type)." AND trans_no_from=".db_escape($type_no).")
+                               OR (trans_type_to=".db_escape($type)." AND trans_no_to=".db_escape($type_no).")";
 
        db_query($sql, "could not void supp transactions for type=$type and trans_no=$type_no");
+// is this necessary?
+//     if ($date != "")
+//             exchange_variation($type, $type_no, $row['trans_type_to'], $row['trans_no_to'], $date,
+//                     $row['amt'], PT_SUPPLIER, true);
 }
+//-------------------------------------------------------------------------------------------------------------
 
-//----------------------------------------------------------------------------------------
-function get_alloc_supp_sql($extra_fields=null, $extra_conditions=null, $extra_tables=null)
+function get_allocatable_from_supp_sql($supplier_id=null, $settled)
 {
        $sql = "SELECT
                trans.type,
@@ -111,85 +109,138 @@ function get_alloc_supp_sql($extra_fields=null, $extra_conditions=null, $extra_t
                trans.alloc,
                trans.due_date,
                trans.supplier_id,
-               supplier.address";
-
-       if ($extra_fields)
-               $sql .= ", $extra_fields ";
+               supplier.address,
+               round(abs(ov_amount+ov_gst+ov_discount)-alloc,6) <= 0 AS settled
+        FROM "
+               .TB_PREF."supp_trans as trans, "
+               .TB_PREF."suppliers as supplier"
+       ." WHERE trans.supplier_id=supplier.supplier_id
+               AND type IN(".ST_SUPPAYMENT.",".ST_SUPPCREDIT.",".ST_BANKPAYMENT.") AND (trans.ov_amount < 0)";
 
-       $sql .= " FROM ".TB_PREF."supp_trans as trans, ".TB_PREF."suppliers as supplier";
-       if ($extra_tables)
-               $sql .= " ,$extra_tables ";
-
-       $sql .= " WHERE trans.supplier_id=supplier.supplier_id";
+       if (!$settled)
+               $sql .= " AND (round(abs(ov_amount+ov_gst+ov_discount)-alloc,6) > 0)";
 
-       if ($extra_conditions)
-               $sql .= " AND $extra_conditions";
+       if ($supplier_id != null)
+               $sql .= " AND supplier.supplier_id = ".db_escape($supplier_id);
 
        return $sql;
 }
 
-
-//-------------------------------------------------------------------------------------------------------------
-
-function get_allocatable_from_supp_sql($supplier_id, $settled)
+function get_allocatable_purch_orders($supplier_id = null, $trans_no=null, $type=null)
 {
-       $settled_sql = "";
-       if (!$settled)
+       $sql = "SELECT
+               ".ST_PURCHORDER." as type,
+               porder.order_no as trans_no,
+               porder.reference,
+               porder.ord_date,
+               supplier.supp_name AS DebtorName, 
+               supplier.curr_code,
+               total as Total,
+               porder.alloc,
+               porder.ord_date as due_date,
+               supplier.address,
+               amt,
+               requisition_no as supp_ref
+               FROM ".TB_PREF."purch_orders as porder
+                       LEFT JOIN ".TB_PREF."suppliers as supplier ON porder.supplier_id = supplier.supplier_id
+                       LEFT JOIN ".TB_PREF."supp_allocations as alloc ON porder.order_no = alloc.trans_no_to AND alloc.trans_type_to=".ST_PURCHORDER."
+                       LEFT JOIN ".TB_PREF."grn_batch as grn ON porder.order_no = grn.purch_order_no
+               WHERE total>0";
+
+       if ($trans_no != null and $type != null)
        {
-               $settled_sql = "AND round(ABS(ov_amount+ov_gst+ov_discount)-alloc,6) > 0";
+               $sql .= " AND alloc.trans_no_from=".db_escape($trans_no)."
+                                 AND alloc.trans_type_from=".db_escape($type);
        }
+       else
+       {
+               $sql .= " AND round(prep_amount) > 0 AND ISNULL(grn.purch_order_no)"; // only sales orders with prepayment level set and no yet received
+       }
+       if ($supplier_id)
+               $sql .= " AND porder.supplier_id=".db_escape($supplier_id);
 
-       $supp_sql = "";
-       if ($supplier_id != null)
-               $supp_sql = " AND trans.supplier_id = ".db_escape($supplier_id);
-
-       $sql = get_alloc_supp_sql("round(ABS(ov_amount+ov_gst+ov_discount)-alloc,6) <= 0 AS settled",
-               "(type=".ST_SUPPAYMENT." OR type=".ST_SUPPCREDIT." OR type=".ST_BANKPAYMENT.") AND (ov_amount < 0) " . $settled_sql . $supp_sql);
+       $sql .= " GROUP BY porder.order_no, grn.purch_order_no";
 
        return $sql;
 }
-
 //-------------------------------------------------------------------------------------------------------------
 
-function get_allocatable_to_supp_transactions($supplier_id, $trans_no=null, $type=null)
+function get_allocatable_to_supp_transactions($supplier_id=null, $trans_no=null, $type=null)
 {
-       if ($trans_no != null && $type!= null)
+       $sql = "SELECT
+               trans.type,
+               trans.trans_no,
+               IF(trans.supp_reference='',trans.reference,trans.supp_reference) as reference,
+               trans.tran_date,
+               supplier.supp_name, 
+               supplier.curr_code, 
+               ov_amount+ov_gst+ov_discount AS Total,
+               trans.alloc,
+               trans.due_date,
+               trans.supplier_id,
+               amt,
+               supp_reference
+
+        FROM ".TB_PREF."supp_trans as trans
+                       LEFT JOIN ".TB_PREF."supp_allocations as alloc ON trans.trans_no = alloc.trans_no_to AND trans.type = alloc.trans_type_to,"
+                       .TB_PREF."suppliers as supplier
+        WHERE
+                trans.supplier_id=supplier.supplier_id";
+       if ($supplier_id)
+               $sql .= " AND supplier.supplier_id=".db_escape($supplier_id);
+
+       if ($trans_no != null and $type != null)
        {
-               $sql = get_alloc_supp_sql("amt, supp_reference", "trans.trans_no = alloc.trans_no_to
-                       AND trans.type = alloc.trans_type_to
-                       AND alloc.trans_no_from=".db_escape($trans_no)."
-                       AND alloc.trans_type_from=".db_escape($type)."
-                       AND trans.supplier_id=".db_escape($supplier_id),
-                       TB_PREF."supp_allocations as alloc");
+               $sql .= " AND alloc.trans_no_from=".db_escape($trans_no)."
+                                 AND alloc.trans_type_from=".db_escape($type);
        }
        else
        {
-               $sql = get_alloc_supp_sql(null, "round(ABS(ov_amount+ov_gst+ov_discount)-alloc,6) > 0
-                       AND trans.type != ".ST_SUPPAYMENT."
-                       AND trans.supplier_id=".db_escape($supplier_id));
+               $sql .= " AND round(ov_amount+ov_gst+ov_discount-alloc,6) > 0
+                       AND trans.type NOT IN (".implode(',',array(ST_SUPPAYMENT, ST_BANKPAYMENT)).")";
+               $sql .= " GROUP BY type, trans_no";
        }
 
+       $orders = get_allocatable_purch_orders($supplier_id, $trans_no, $type);
+       $sql = "($sql ORDER BY trans_no) \nUNION \n($orders)";
+//_vd($sql);
        return db_query($sql." ORDER BY due_date", "Cannot retreive alloc to transactions");
 }
-
 //-------------------------------------------------------------------------------------------------------------
 
 function get_allocatable_from_supp_transactions($supplier_id, $trans_no=null, $type=null)
 {
-       if ($trans_no != null && $type!= null)
+       $sql = "SELECT
+               trans.type,
+               trans.trans_no,
+               IF(trans.supp_reference='',trans.reference,trans.supp_reference) as reference,
+               trans.tran_date,
+               supplier.supp_name, 
+               supplier.curr_code, 
+               ov_amount+ov_gst+ov_discount AS Total,
+               trans.alloc,
+               trans.due_date,
+               trans.supplier_id,
+               supplier.address,
+               amt,
+               supp_reference
+        FROM  ".TB_PREF."supp_trans as trans,"
+                       .TB_PREF."suppliers as supplier,"
+                       .TB_PREF."supp_allocations as alloc
+        WHERE trans.supplier_id=supplier.supplier_id
+                       AND trans.trans_no = alloc.trans_no_from
+                       AND trans.type = alloc.trans_type_from";
+
+       if ($trans_no != null and $type != null)
        {
-               $sql = get_alloc_supp_sql("amt, supp_reference", "trans.trans_no = alloc.trans_no_from
-                       AND trans.type = alloc.trans_type_from
-                       AND alloc.trans_no_to=".db_escape($trans_no)."
-                       AND alloc.trans_type_to=".db_escape($type)."
-                       AND trans.supplier_id=".db_escape($supplier_id),
-                       TB_PREF."supp_allocations as alloc");
+               $sql .= " AND alloc.trans_no_to=".db_escape($trans_no)."
+                                 AND alloc.trans_type_to=".db_escape($type);
        }
        else
        {
-               $sql = get_alloc_supp_sql(null, "round(ABS(ov_amount+ov_gst+ov_discount)-alloc,6) > 0
-                       AND trans.type != ".ST_SUPPAYMENT."
-                       AND trans.supplier_id=".db_escape($supplier_id));
+               $sql .= " AND round(ABS(ov_amount+ov_gst+ov_discount)-alloc,6) > 0
+                       AND trans.type NOT IN (".implode(',',array(ST_SUPPAYMENT,ST_BANKPAYMENT)).")";
+               $sql .= " GROUP BY type, trans_no";
        }
 
        return db_query($sql." ORDER BY due_date", "Cannot retreive alloc to transactions");

diff --git a/purchasing/includes/po_class.inc b/purchasing/includes/po_class.inc
index c9ec00df2f32362d5ca993b480c1e699026266f4..4eb5c0b74a7873c6a4a8d876f17306be3295211a 100644 (file)
--- a/purchasing/includes/po_class.inc
+++ b/purchasing/includes/po_class.inc
@@ -38,6 +38,10 @@ class purch_order
        
        var $reference;
        
+       var $prep_amount = 0; // prepayment required
+       var $alloc; // sum of payments allocated
+       var $prepayments = array();
+
        function purch_order()
        {
                /*Constructor function initialises a new purchase order object */

diff --git a/purchasing/includes/purchasing_db.inc b/purchasing/includes/purchasing_db.inc
index 51b456a216ec01346ce42f059894b6c4e15c1941..ac9e5e5e6d4991144517ba4c5527b55eb2add739 100644 (file)
--- a/purchasing/includes/purchasing_db.inc
+++ b/purchasing/includes/purchasing_db.inc
@@ -16,6 +16,7 @@ include_once($path_to_root . "/includes/banking.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 
 include_once($path_to_root . "/includes/db/inventory_db.inc");
+include_once($path_to_root . "/includes/db/allocations_db.inc");
 
 include_once($path_to_root . "/purchasing/includes/db/supp_trans_db.inc");
 include_once($path_to_root . "/purchasing/includes/db/po_db.inc");
@@ -114,4 +115,29 @@ function add_or_update_purchase_data($supplier_id, $stock_id, $price, $descripti
        return true;
 }
 
+function get_po_prepayments($supp_trans)
+{
+       // collect purchase order line ids
+       $allocations = array();
+       $line_ids = array();
+       foreach($supp_trans->grn_items as $item)
+               $line_ids[] = $item->po_detail_item;
+
+       if (!count($line_ids))
+               return $allocations;
+
+       $sql = "SELECT DISTINCT allocs.*
+               FROM ".TB_PREF."supp_allocations allocs 
+                       LEFT JOIN ".TB_PREF."purch_order_details line ON line.order_no=allocs.trans_no_to AND trans_type_to=".ST_PURCHORDER."
+               WHERE line.po_detail_item IN(".implode(',', array_values($line_ids)).")";
+//_vd($sql);
+       $result = db_query($sql, "Cannot retrieve po prepayments");
+
+       while($dat = db_fetch($result))
+       {
+               $allocations[] = $dat;
+       }
+
+       return $allocations;
+}
 ?>
\ No newline at end of file

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index 555737055066fcaa2dc2cda0388ba9031571d05a..18093ceff59b4a351259f2c2750ec036b21771f0 100644 (file)
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -27,6 +27,7 @@ function copy_from_cart()
     $_POST['StkLocation'] = $cart->Location;
     $_POST['delivery_address'] = $cart->delivery_address;
     $_POST['tax_algorithm'] = $cart->tax_algorithm;
+       $_POST['prep_amount'] = price_format($cart->prep_amount);
 }
 
 function copy_to_cart()
@@ -44,6 +45,7 @@ function copy_to_cart()
        $cart->delivery_address = $_POST['delivery_address'];
        if (isset($_POST['tax_algorithm']))
            $cart->tax_algorithm = $_POST['tax_algorithm'];
+       $cart->prep_amount = input_num('prep_amount', 0);
 }
 // ------------------------------------------------------------------------------
 
@@ -353,6 +355,14 @@ function display_po_summary(&$po, $is_self=false, $editable=false)
        label_row(_("Delivery Address"), $po->delivery_address, "class='tableheader2'",
                "colspan=9");
 
+       if (!$editable && ($po->prep_amount > 0))
+       {
+               start_row();
+               label_cells(_("Required Pre-Payment"), price_format($po->prep_amount), "class='tableheader2'");
+               label_cells(_("Pre-Payments Allocated"), price_format($po->alloc), "class='tableheader2'");
+               end_row();
+       }
+
     if ($po->Comments != "")
        label_row(_("Order Comments"), $po->Comments, "class='tableheader2'",
                "colspan=9");
@@ -462,6 +472,29 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
 
 //---------------------------------------------------------------------------------------------------
 
+function display_po_footer(&$trans)
+{
+       global $Ajax;
+
+start_table(TABLESTYLE2);
+
+if (list_updated('tax_algorithm')) {
+       $trans->tax_algorithm = $_POST['tax_algorithm'];
+    $Ajax->activate('items_table');
+}
+
+if ($trans->trans_type == ST_SUPPINVOICE) {
+       tax_algorithm_list_row(_("Tax algorithm:"), 'tax_algorithm', null, true);
+       cash_accounts_list_row(_("Payment:"), 'cash_account', null, false, _('Delayed'));
+} elseif ($trans->trans_type == ST_PURCHORDER)
+       amount_row(_("Pre-Payment Required:"), 'prep_amount');
+
+textarea_row(_("Memo:"), 'Comments', null, 70, 4);
+
+end_table();
+}
+//---------------------------------------------------------------------------------------------------
+
 
 
 ?>
\ No newline at end of file

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index 388eb772158c7449dee682d35dfc5b0d8e91705c..53bf85e35d79372f9da723733ddd970a706528ef 100644 (file)
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -399,7 +399,13 @@ function can_commit()
        display_error (_("The order cannot be placed because there are no lines entered on this order."));
        return false;
        }
-               
+       if (floatcmp(input_num('prep_amount'), $_SESSION['PO']->get_trans_total()) > 0)
+       {
+               display_error(_("Required prepayment is greater than total invoice value."));
+               set_focus('prep_amount');
+               return false;
+       }
+
        return true;
 }
 

diff --git a/purchasing/view/view_po.php b/purchasing/view/view_po.php
index ef54291f26ff4839e8654a151ff89f26baba8e23..193bfa471c8a89bfe7dbcf9be47d7673d6cc0b4a 100644 (file)
--- a/purchasing/view/view_po.php
+++ b/purchasing/view/view_po.php
@@ -154,6 +154,8 @@ if (db_num_rows($invoice_result) > 0)
 echo "</td></tr>";
 
 end_table(1); // outer table
+//_vd($purchase_order);
+display_allocations_to(PT_SUPPLIER, $purchase_order->supplier_id, ST_PURCHORDER, $purchase_order->order_no, $total + $tax_total);
 
 //----------------------------------------------------------------------------------------------------
 

diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc
index f279283b10a93e50ae63c6d2cb20ba20495f7b7f..f39254afee2f4a8fd830c47fd5188f43231b6296 100644 (file)
--- a/reporting/includes/doctext.inc
+++ b/reporting/includes/doctext.inc
@@ -32,6 +32,18 @@
        // for links use 'text' => 'url'
        $Footer[0] = _("All amounts stated in") . " - " . @$this->formData['curr_code'];
 
+       if (!in_array($this->formData['doctype'], array(ST_STATEMENT, ST_WORKORDER)))
+       {
+               $id = $this->formData['payment_terms'];
+               $sql = "SELECT terms, days_before_due FROM ".TB_PREF."payment_terms WHERE terms_indicator=".db_escape($id);
+               $result = db_query($sql,"could not get paymentterms");
+               $row = db_fetch($result);
+               $Payment_Terms = _("Payment Terms") . ': ' . $row["terms"];
+               if ($this->formData['doctype'] == ST_SALESINVOICE && $this->formData['prepaid'])
+                       $this->formData['prepaid'] = ($row['days_before_due'] >= 0) ? 'final' : 'partial';
+       }
+
+
        switch ($this->formData['doctype'])
        {
                case ST_SALESQUOTE:
@@ -50,7 +62,7 @@
                        break;
 
                case ST_SALESORDER:
-                       $this->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER"));
+                       $this->title = ($print_as_quote==1 ? _("QUOTE") : ($this->formData['prepaid'] ? _("PREPAYMENT ORDER") : _("SALES ORDER")));
                        $this->formData['document_name'] =_("Order No.");
                        $this->formData['document_date'] = $this->formData['ord_date'];
                        $this->formData['document_number'] = $print_invoice_no == 0 && isset($this->formData['reference'])
@@ -102,7 +114,8 @@
                        break;
 
                case ST_SALESINVOICE:
-                       $this->title = _("INVOICE");
+                       $this->title = $this->formData['prepaid']=='partial' ? _("PREPAYMENT INVOICE")
+                               : ($this->formData['prepaid']=='final' ? _("FINAL INVOICE")  : _("INVOICE"));
                        $this->formData['document_name'] =_("Invoice No.");
                        $this->formData['domicile'] = $this->company['domicile'];
                        $Footer[0] = _("Please quote Invoice no. when paying. All amounts stated in"). " - " . $this->formData['curr_code'];
@@ -118,9 +131,18 @@
                                _("Customers Reference") => $this->formData["customer_ref"],
                                _("Sales Person") => get_salesman_name($this->formData['salesman']),
                                _("Your VAT no.") => $this->formData['tax_id'],
-                               _("Delivery Note No.") => implode(',', $deliveries),
-                               _("Due Date") => sql2date($this->formData['due_date']),
                        );
+                       if ($this->formData['prepaid']=='partial')
+                       {
+                               $aux_info[_("Date of Payment")] = sql2date(get_oldest_payment_date($this->formData['trans_no']));
+                               $aux_info[_("Our Order No")]  = $this->formData['order_'];
+                       } else {
+                               if ($this->formData['prepaid'] =='final')
+                                       $aux_info[_("Invoice Date")] = sql2date($this->formData['tran_date']);
+                               else
+                                       $aux_info[_("Date of Sale")] = sql2date(get_oldest_delivery_date($this->formData['trans_no']));
+                               $aux_info[_("Due Date")]  = sql2date($this->formData['due_date']);
+                       }
                        break;
 
                case ST_SUPPAYMENT:
@@ -233,15 +255,6 @@
                $this->formData['document_number'] = $print_invoice_no == 0 && isset($this->formData['reference'])
                        ? $this->formData['reference'] : @$this->formData['trans_no'];
 
-       if (!isset($Payment_Terms))
-       {
-               $id = $this->formData['payment_terms'];
-               $sql = "SELECT terms FROM ".TB_PREF."payment_terms WHERE terms_indicator=".db_escape($id);
-               $result = db_query($sql,"could not get paymentterms");
-               $row = db_fetch($result);
-               $Payment_Terms = _("Payment Terms") . ': ' . $row["terms"];
-       }
-
        // footer generic content
        if (@$this->formData['bank_name'])
                $Footer[] = _("Bank"). ": ".$this->formData['bank_name']. ", " . _("Bank Account") . ": " . $this->formData['bank_account_number'];

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index ee79d43e2e4173304deb5f008c6e0774dbef46ec..1f5b89b3275b6c56231549389c8ffbb2f86e14d0 100644 (file)
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -386,7 +386,7 @@ class FrontReport extends Cpdf
                        'DebtorName', 'supp_account_no', 'wo_ref', 'debtor_ref','type', 'trans_no', 
                        'StockItemName', 'tax_id', 'order_', 'delivery_date', 'units_issued',
                        'due_date', 'required_by', 'payment_terms', 'curr_code',
-                       'ov_freight', 'ov_gst', 'ov_amount'),
+                       'ov_freight', 'ov_gst', 'ov_amount', 'prepaid'),
                'branch' => array('br_address', 'br_name', 'salesman', 'disable_branch'),
                'sales_order' => array('deliver_to', 'delivery_address', 'customer_ref'),
                'bankaccount' => array('bank_name', 'bank_account_number', 'payment_service')

diff --git a/reporting/rep107.php b/reporting/rep107.php
index 84e56113912477063a284c54014b3a5fc63b7d0e..9220166b4fdbd8a48338a17ab3dd4b66f8601215 100644 (file)
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -25,6 +25,23 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 //----------------------------------------------------------------------------------------------------
+function get_invoice_range($from, $to)
+{
+       global $print_invoice_no;
+
+       $ref = ($print_invoice_no == 1 ? "trans_no" : "reference");
+
+       $sql = "SELECT trans.trans_no, trans.reference
+               FROM ".TB_PREF."debtor_trans trans 
+                       LEFT JOIN ".TB_PREF."voided voided ON trans.type=voided.type AND trans.trans_no=voided.id
+               WHERE trans.type=".ST_SALESINVOICE
+                       ." AND ISNULL(voided.id)"
+                       ." AND trans.reference>=".db_escape(get_reference(ST_SALESINVOICE, $from))
+                       ." AND trans.reference<=".db_escape(get_reference(ST_SALESINVOICE, $to))
+               ." ORDER BY trans.tran_date, trans.$ref";
+
+       return db_query($sql, "Cant retrieve invoice range");
+}
 
 print_invoices();
 
@@ -34,6 +51,8 @@ function print_invoices()
 {
        global $path_to_root, $alternative_tax_include_on_docs, $suppress_tax_rates, $no_zero_lines_amount;
        
+       $show_this_payment = true; // include payments invoiced here in summary
+
        include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
        $from = $_POST['PARAM_0'];
@@ -52,25 +71,23 @@ function print_invoices()
        $from = min($fno[0], $tno[0]);
        $to = max($fno[0], $tno[0]);
 
+       //-------------code-Descr-Qty--uom--tax--prc--Disc-Tot--//
        $cols = array(4, 60, 225, 300, 325, 385, 450, 515);
 
        // $headers in doctext.inc
-       $aligns = array('left', 'left', 'right', 'left', 'right', 'right', 'right');
+       $aligns = array('left', 'left', 'right', 'center', 'right', 'right', 'right');
 
        $params = array('comments' => $comments);
 
        $cur = get_company_Pref('curr_default');
 
        if ($email == 0)
-       {
                $rep = new FrontReport(_('INVOICE'), "InvoiceBulk", user_pagesize());
-               $rep->SetHeaderType('Header2');
-               $rep->currency = $cur;
-               $rep->Font();
-               $rep->Info($params, $cols, null, $aligns);
-       }
-       for ($i = $from; $i <= $to; $i++)
+
+       $range = get_invoice_range($from, $to);
+       while($row = db_fetch($range))
        {
+                       $i = $row['trans_no'];
                        if (!exists_customer_trans(ST_SALESINVOICE, $i))
                                continue;
                        $sign = 1;
@@ -81,21 +98,38 @@ function print_invoices()
                        $branch = get_branch($myrow["branch_code"]);
                        $sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER);
                        if ($email == 1)
-                       {
                                $rep = new FrontReport("", "", user_pagesize());
-                           $rep->SetHeaderType('Header2');
-                               $rep->currency = $cur;
-                               $rep->Font();
-                               $rep->title = _('INVOICE');
-                               $rep->filename = "Invoice" . $myrow['reference'] . ".pdf";
-                               $rep->Info($params, $cols, null, $aligns);
-                       }
-                       else
-                               $rep->title = _('INVOICE');
+                   $rep->SetHeaderType('Header2');
+                       $rep->currency = $cur;
+                       $rep->Font();
+                       $rep->title = _('INVOICE');
+                       $rep->filename = "Invoice" . $myrow['reference'] . ".pdf";
+                       $rep->Info($params, $cols, null, $aligns);
+
                        $contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no'], false);
                        $baccount['payment_service'] = $pay_service;
                        $rep->SetCommonData($myrow, $branch, $sales_order, $baccount, ST_SALESINVOICE, $contacts);
                        $rep->NewPage();
+                       // calculate summary start row for later use
+                       $summary_start_row = $rep->bottomMargin + (20 * $rep->lineHeight);
+
+                       if ($rep->formData['prepaid'])
+                       {
+                               $result = get_sales_order_invoices($myrow['order_']);
+                               $prepayments = array();
+                               while($inv = db_fetch($result))
+                               {
+                                       $prepayments[] = $inv;
+                                       if ($inv['trans_no'] == $i)
+                                       break;
+                               }
+
+                               if (count($prepayments) > ($show_this_payment ? 0 : 1))
+                                       $summary_start_row += (count($prepayments)+3) * $rep->lineHeight;
+                               else
+                                       unset($prepayments);
+                       }
+
                        $result = get_customer_trans_details(ST_SALESINVOICE, $i);
                        $SubTotal = 0;
                        while ($myrow2=db_fetch($result))
@@ -113,22 +147,23 @@ function print_invoices()
                                        $DisplayDiscount ="";
                        else
                                        $DisplayDiscount = number_format2($myrow2["discount_percent"]*100,user_percent_dec()) . "%";
-                               $rep->TextCol(0, 1,     $myrow2['stock_id'], -2);
+                               $c=0;
+                               $rep->TextCol($c++, $c, $myrow2['stock_id'], -2);
                                $oldrow = $rep->row;
-                               $rep->TextColLines(1, 2, $myrow2['StockDescription'], -2);
+                               $rep->TextColLines($c++, $c, $myrow2['StockDescription'], -2);
                                $newrow = $rep->row;
                                $rep->row = $oldrow;
                                if ($Net != 0.0 || !is_service($myrow2['mb_flag']) || !isset($no_zero_lines_amount) || $no_zero_lines_amount == 0)
                                {
-                                       $rep->TextCol(2, 3,     $DisplayQty, -2);
-                                       $rep->TextCol(3, 4,     $myrow2['units'], -2);
-                                       $rep->TextCol(4, 5,     $DisplayPrice, -2);
-                                       $rep->TextCol(5, 6,     $DisplayDiscount, -2);
-                                       $rep->TextCol(6, 7,     $DisplayNet, -2);
+                                       $rep->TextCol($c++, $c, $DisplayQty, -2);
+                                       $rep->TextCol($c++, $c, $myrow2['units'], -2);
+                                       $rep->TextCol($c++, $c, $DisplayPrice, -2);
+                                       $rep->TextCol($c++, $c, $DisplayDiscount, -2);
+                                       $rep->TextCol($c++, $c, $DisplayNet, -2);
                                }
                                $rep->row = $newrow;
                                //$rep->NewLine(1);
-                               if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
+                               if ($rep->row < $summary_start_row)
                                        $rep->NewPage();
                        }
 
@@ -142,7 +177,41 @@ function print_invoices()
                        $DisplaySubTot = number_format2($SubTotal,$dec);
                        $DisplayFreight = number_format2($sign*$myrow["ov_freight"],$dec);
 
-               $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
+                       // set to start of summary line:
+               $rep->row = $summary_start_row;
+                       if (isset($prepayments))
+                       {
+                               // Partial invoices table
+                               $rep->NewLine();
+                               $rep->TextCol(1, 4,_("Prepayments invoiced to this order up to day:"));
+                               $rep->TextCol(1, 4,     str_pad('', 150, '_'));
+                               $rep->cols[3] -= 20;
+                               $rep->aligns[3] = 'right';
+                               $rep->NewLine(); $c = 1; $tot_pym=0;
+                               $rep->TextCol(1, 4,     str_pad('', 150, '_'));
+                               $rep->TextCol($c++, $c, _("Date"));
+                               $rep->TextCol($c++, $c, _("Invoice reference"));
+                               $rep->TextCol($c++, $c, _("Amount"));
+
+                               foreach ($prepayments as $invoice)
+                               {
+                                       if ($show_this_payment || ($invoice['reference'] != $myrow['reference']))
+                                       {
+                                               $rep->NewLine();
+                                               $c = 1; $tot_pym += $invoice['prep_amount'];
+                                               $rep->TextCol($c++, $c, sql2date($invoice['tran_date']));
+                                               $rep->TextCol($c++, $c, $invoice['reference']);
+                                               $rep->TextCol($c++, $c, number_format2($invoice['prep_amount'], $dec));
+                                       }
+                                       if ($invoice['reference']==$myrow['reference']) break;
+                               }
+                               $rep->TextCol(1, 4,     str_pad('', 150, '_'));
+                               $rep->NewLine();
+                               $rep->TextCol(2, 3,     _("Total payments:"));
+                               $rep->TextCol(3, 4,     number_format2($tot_pym, $dec));
+                       }
+
+
                        $doctype = ST_SALESINVOICE;
 
                        $rep->TextCol(3, 6, _("Sub-total"), -2);
@@ -193,9 +262,18 @@ function print_invoices()
                        $DisplayTotal = number_format2($sign*($myrow["ov_freight"] + $myrow["ov_gst"] +
                                $myrow["ov_amount"]+$myrow["ov_freight_tax"]),$dec);
                        $rep->Font('bold');
-                       $rep->TextCol(3, 6, _("TOTAL INVOICE"), - 2);
+                       if (!$myrow['prepaid']) $rep->Font('bold');
+                               $rep->TextCol(3, 6, $rep->formData['prepaid'] ? _("TOTAL ORDER VAT INCL.") : _("TOTAL INVOICE"), - 2);
                        $rep->TextCol(6, 7, $DisplayTotal, -2);
-                       $words = price_in_words($myrow['Total'], ST_SALESINVOICE);
+                       if ($rep->formData['prepaid'])
+                       {
+                               $rep->NewLine();
+                               $rep->Font('bold');
+                               $rep->TextCol(3, 6, $rep->formData['prepaid']=='final' ? _("THIS INVOICE") : _("TOTAL INVOICE"), - 2);
+                               $rep->TextCol(6, 7, number_format2($myrow['prep_amount'], $dec), -2);
+                       }
+                       $words = price_in_words($rep->formData['prepaid'] ? $myrow['prep_amount'] : $myrow['Total']
+                               , array( 'type' => ST_SALESINVOICE, 'currency' => $myrow['curr_code']));
                        if ($words != "")
                        {
                                $rep->NewLine(1);

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 08990e10babfbe463828ef9225cff3e3e14802bf..43ec09f5ea9c0327c0ecbae9f6283dee0adbda1e 100644 (file)
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -61,6 +61,7 @@ function print_sales_orders()
 
        if ($email == 0)
        {
+
                if ($print_as_quote == 0)
                        $rep = new FrontReport(_("SALES ORDER"), "SalesOrderBulk", user_pagesize());
                else

diff --git a/reporting/rep112.php b/reporting/rep112.php
index c510160a1566486adaae4f7f0a74e27917c1a148..044b8437d141f754f81239e49c437efb8be08475 100644 (file)
--- a/reporting/rep112.php
+++ b/reporting/rep112.php
@@ -48,18 +48,6 @@ function get_receipt($type, $trans_no)
     return db_fetch($result);
 }
 
-function get_allocations_for_receipt($debtor_id, $type, $trans_no)
-{
-       $sql = get_alloc_trans_sql("amt, trans.reference, trans.alloc", "trans.trans_no = alloc.trans_no_to
-               AND trans.type = alloc.trans_type_to
-               AND alloc.trans_no_from=$trans_no
-               AND alloc.trans_type_from=$type
-               AND trans.debtor_no=".db_escape($debtor_id),
-               TB_PREF."cust_allocations as alloc");
-       $sql .= " ORDER BY trans_no";
-       return db_query($sql, "Cannot retreive alloc to transactions");
-}
-
 function print_receipts()
 {
        global $path_to_root, $systypes_array;
@@ -114,7 +102,7 @@ function print_receipts()
                        $contacts = get_branch_contacts($myrow['branch_code'], 'invoice', $myrow['debtor_no']);
                        $rep->SetCommonData($myrow, null, $myrow, $baccount, ST_CUSTPAYMENT, $contacts);
                        $rep->NewPage();
-                       $result = get_allocations_for_receipt($myrow['debtor_no'], $myrow['type'], $myrow['trans_no']);
+                       $result = get_allocatable_to_cust_transactions($myrow['debtor_no'], $myrow['trans_no'], $myrow['type']);
 
                        $doctype = ST_CUSTPAYMENT;
 

diff --git a/reporting/rep210.php b/reporting/rep210.php
index 9d8b8d7ddfbf9b0a0c71d3a3115fcf38631a7412..62f9e68b9dd94344f168c45d2be1854888b92e9c 100644 (file)
--- a/reporting/rep210.php
+++ b/reporting/rep210.php
@@ -47,18 +47,6 @@ function get_remittance($type, $trans_no)
     return db_fetch($result);
 }
 
-function get_allocations_for_remittance($supplier_id, $type, $trans_no)
-{
-       $sql = get_alloc_supp_sql("amt, supp_reference, trans.alloc", "trans.trans_no = alloc.trans_no_to
-               AND trans.type = alloc.trans_type_to
-               AND alloc.trans_no_from=".db_escape($trans_no)."
-               AND alloc.trans_type_from=".db_escape($type)."
-               AND trans.supplier_id=".db_escape($supplier_id),
-               TB_PREF."supp_allocations as alloc");
-       $sql .= " ORDER BY trans_no";
-       return db_query($sql, "Cannot retreive alloc to transactions");
-}
-
 function print_remittances()
 {
        global $path_to_root, $systypes_array;
@@ -128,7 +116,7 @@ function print_remittances()
                        $contacts = get_supplier_contacts($myrow['supplier_id'], 'invoice');
                        $rep->SetCommonData($myrow, null, $myrow, $baccount, ST_SUPPAYMENT, $contacts);
                        $rep->NewPage();
-                       $result = get_allocations_for_remittance($myrow['supplier_id'], $myrow['type'], $myrow['trans_no']);
+                       $result = get_allocatable_to_supp_transactions($myrow['supplier_id'], $myrow['trans_no'], $myrow['type']);
 
                        $doctype = ST_SUPPAYMENT;
 

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index df8bad06d9ebd4016d13e8f24174a1cf90420c50..f770e5907053e617d9a9e6b5f0ea268fb6e55b68 100644 (file)
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -92,9 +92,16 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
        if ($ord->count_items() == 0) {
                hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",
                        _("Select a different sales order to delivery"), "OutstandingOnly=1");
-               die ("<br><b>" . _("This order has no items. There is nothing to delivery.") . "</b>");
+               echo "<br><center><b>" . _("This order has no items. There is nothing to delivery.") .
+                       "</center></b>";
+               display_footer_exit();
+       } else if (!$ord->is_released()) {
+               hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",_("Select a different sales order to delivery"),
+                       "OutstandingOnly=1");
+               echo "<br><center><b>"._("This prepayment order is not yet ready for delivery due to insufficient amount received.")
+                       ."</center></b>";
+               display_footer_exit();
        }
-
        // Adjust Shipping Charge based upon previous deliveries TAM
        adjust_shipping_charge($ord, $_GET['OrderNumber']);
  
@@ -106,7 +113,7 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
        check_is_closed(ST_CUSTDELIVERY, $_GET['ModifyDelivery']);
        $_SESSION['Items'] = new Cart(ST_CUSTDELIVERY,$_GET['ModifyDelivery']);
 
-       if ($_SESSION['Items']->count_items() == 0) {
+       if (!$_SESSION['Items']->prepaid && $_SESSION['Items']->count_items() == 0) {
                hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",
                        _("Select a different delivery"), "OutstandingOnly=1");
                echo "<br><center><b>" . _("This delivery has all items invoiced. There is nothing to modify.") .

diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index 5bebcb7498ec398b67bc67d25fe315ee9ea3f385..d71084785717cbc44a37521e08eddb744925a97c 100644 (file)
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -24,6 +24,7 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
 include_once($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 include_once($path_to_root . "/taxes/tax_calc.inc");
+include_once($path_to_root . "/admin/db/shipping_db.inc");
 
 $js = "";
 if ($use_popup_windows) {
@@ -40,8 +41,9 @@ if (isset($_GET['ModifyInvoice'])) {
        $_SESSION['page_title'] = _($help_context = "Issue an Invoice for Delivery Note");
 } elseif (isset($_GET['BatchInvoice'])) {
        $_SESSION['page_title'] = _($help_context = "Issue Batch Invoice for Delivery Notes");
+} elseif (isset($_GET['AllocationNumber']) || isset($_GET['InvoicePrepayments'])) {
+       $_SESSION['page_title'] = _($help_context = "Prepayment or Final Invoice Entry");
 }
-
 page($_SESSION['page_title'], false, false, "", $js);
 
 //-----------------------------------------------------------------------------
@@ -128,13 +130,15 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
 } elseif (isset($_GET['ModifyInvoice']) && $_GET['ModifyInvoice'] > 0) {
 
        check_is_closed(ST_SALESINVOICE, $_GET['ModifyInvoice']);
-
+/*
        if ( get_sales_parent_numbers(ST_SALESINVOICE, $_GET['ModifyInvoice']) == 0) { // 1.xx compatibility hack
                echo"<center><br><b>" . _("There are no delivery notes for this invoice.<br>
                Most likely this invoice was created in Front Accounting version prior to 2.0
                and therefore can not be modified.") . "</b></center>";
                display_footer_exit();
        }
+*/
+       check_is_closed(ST_SALESINVOICE, $_GET['ModifyInvoice']);
        processing_start();
        $_SESSION['Items'] = new Cart(ST_SALESINVOICE, $_GET['ModifyInvoice']);
 
@@ -143,7 +147,46 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
                display_footer_exit();
        }
        copy_from_cart();
-} elseif (!processing_active()) {
+} elseif (isset($_GET['AllocationNumber']) || isset($_GET['InvoicePrepayments'])) {
+
+               check_deferred_income_act(_("You have to set Deferred Income Account in GL Setup to entry prepayment invoices."));
+
+               if (isset($_GET['AllocationNumber']))
+               {
+                       $payments = array(get_cust_allocation($_GET['AllocationNumber']));
+
+                       if (!$payments || ($payments[0]['trans_type_to'] != ST_SALESORDER))
+                       {
+                               display_error(_("Please select correct Sales Order Prepayment to be invoiced and try again."));
+                               display_footer_exit();
+                       }
+                       $order_no = $payments[0]['trans_no_to'];
+               }
+               else {
+                       $order_no = $_GET['InvoicePrepayments'];
+                       $payments =  get_payments_for($_GET['InvoicePrepayments'], ST_SALESORDER);
+               }
+               processing_start();
+
+               $_SESSION['Items'] = new Cart(ST_SALESORDER, $order_no, ST_SALESINVOICE);
+               $_SESSION['Items']->order_no = $order_no;
+               $_SESSION['Items']->src_docs = array($order_no);
+               $_SESSION['Items']->trans_no = 0;
+               $_SESSION['Items']->trans_type = ST_SALESINVOICE;
+               $_SESSION['Items']->prepayments = $payments;
+               // prepayment invoice has all line quantities as stated on order.
+//             foreach($_SESSION['Items']->line_items as &$line)
+//             {
+//                     $line->src_id = $line_id;
+//                     $line->qty_dispatched = $line->quantity;
+//             }
+//             unset($line);
+               $_SESSION['Items']->update_payments();
+
+//             $_SESSION['Items']->alloc = $this_amount;
+               copy_from_cart();
+}
+ elseif (!processing_active()) {
        /* This page can only be called with a delivery for invoicing or invoice no for edit */
        display_error(_("This page can only be opened after delivery selection. Please select delivery to invoicing first."));
 
@@ -151,9 +194,10 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
 
        end_page();
        exit;
-} elseif (!isset($_POST['process_invoice']) && !check_quantities()) {
+} elseif (!isset($_POST['process_invoice']) && (!$_SESSION['Items']->is_prepaid() && !check_quantities())) {
        display_error(_("Selected quantity cannot be less than quantity credited nor more than quantity not invoiced yet."));
 }
+
 if (isset($_POST['Update'])) {
        $Ajax->activate('Items');
 }
@@ -161,11 +205,6 @@ if (isset($_POST['_InvoiceDate_changed'])) {
        $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, $_POST['InvoiceDate']);
        $Ajax->activate('due_date');
 }
-if (list_updated('payment')) {
-       $_SESSION['Items']->payment = get_post('payment');
-       $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, $_POST['InvoiceDate']);
-       $Ajax->activate('due_date');
-}
 
 //-----------------------------------------------------------------------------
 function check_quantities()
@@ -221,34 +260,42 @@ function set_delivery_shipping_sum($delivery_notes)
 function copy_to_cart()
 {
        $cart = &$_SESSION['Items'];
-       $cart->ship_via = $_POST['ship_via'];
-       $cart->freight_cost = input_num('ChargeFreightCost');
-       $cart->document_date =  $_POST['InvoiceDate'];
+       $cart->due_date = $cart->document_date =  $_POST['InvoiceDate'];
+       $cart->Comments = $_POST['Comments'];
        $cart->due_date =  $_POST['due_date'];
-       if ($cart->pos['cash_sale'] || $cart->pos['credit_sale']) {
+       if (($cart->pos['cash_sale'] || $cart->pos['credit_sale']) && isset($_POST['payment'])) {
                $cart->payment = $_POST['payment'];
                $cart->payment_terms = get_payment_terms($_POST['payment']);
        }
-       $cart->Comments = $_POST['Comments'];
        if ($_SESSION['Items']->trans_no == 0)
                $cart->reference = $_POST['ref'];
+       if (!$cart->is_prepaid())
+       {
+               $cart->ship_via = $_POST['ship_via'];
+               $cart->freight_cost = input_num('ChargeFreightCost');
+       }
+
+       $cart->update_payments();
+
        $cart->dimension_id =  $_POST['dimension_id'];
        $cart->dimension2_id =  $_POST['dimension2_id'];
-
 }
 //-----------------------------------------------------------------------------
 
 function copy_from_cart()
 {
        $cart = &$_SESSION['Items'];
-       $_POST['ship_via'] = $cart->ship_via;
-       $_POST['ChargeFreightCost'] = price_format($cart->freight_cost);
+       $_POST['Comments']= $cart->Comments;
        $_POST['InvoiceDate']= $cart->document_date;
-       $_POST['due_date'] = $cart->due_date;
-       $_POST['Comments']= $cart->Comments;
+       $_POST['ref'] = $cart->reference;
        $_POST['cart_id'] = $cart->cart_id;
-       $_POST['ref'] = $cart->reference;
-       $_POST['payment'] = $cart->payment;
+       $_POST['due_date'] = $cart->due_date;
+       $_POST['payment'] = $cart->payment;
+       if (!$_SESSION['Items']->is_prepaid())
+       {
+               $_POST['ship_via'] = $cart->ship_via;
+               $_POST['ChargeFreightCost'] = price_format($cart->freight_cost);
+       }
        $_POST['dimension_id'] = $cart->dimension_id;
        $_POST['dimension2_id'] = $cart->dimension2_id;
 }
@@ -259,6 +306,8 @@ function check_data()
 {
        global $Refs;
 
+       $prepaid = $_SESSION['Items']->is_prepaid();
+
        if (!isset($_POST['InvoiceDate']) || !is_date($_POST['InvoiceDate'])) {
                display_error(_("The entered invoice date is invalid."));
                set_focus('InvoiceDate');
@@ -271,7 +320,8 @@ function check_data()
                return false;
        }
 
-       if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
+
+       if (!$prepaid &&(!isset($_POST['due_date']) || !is_date($_POST['due_date'])))   {
                display_error(_("The entered invoice due date is invalid."));
                set_focus('due_date');
                return false;
@@ -291,24 +341,32 @@ function check_data()
                }
        }
 
-       if ($_POST['ChargeFreightCost'] == "") {
-               $_POST['ChargeFreightCost'] = price_format(0);
-       }
+       if(!$prepaid) 
+       {
+               if ($_POST['ChargeFreightCost'] == "") {
+                       $_POST['ChargeFreightCost'] = price_format(0);
+               }
 
-       if (!check_num('ChargeFreightCost', 0)) {
-               display_error(_("The entered shipping value is not numeric."));
-               set_focus('ChargeFreightCost');
-               return false;
-       }
+               if (!check_num('ChargeFreightCost', 0)) {
+                       display_error(_("The entered shipping value is not numeric."));
+                       set_focus('ChargeFreightCost');
+                       return false;
+               }
 
-       if ($_SESSION['Items']->has_items_dispatch() == 0 && input_num('ChargeFreightCost') == 0) {
-               display_error(_("There are no item quantities on this invoice."));
-               return false;
-       }
+               if ($_SESSION['Items']->has_items_dispatch() == 0 && input_num('ChargeFreightCost') == 0) {
+                       display_error(_("There are no item quantities on this invoice."));
+                       return false;
+               }
 
-       if (!check_quantities()) {
-               display_error(_("Selected quantity cannot be less than quantity credited nor more than quantity not invoiced yet."));
-               return false;
+               if (!check_quantities()) {
+                       display_error(_("Selected quantity cannot be less than quantity credited nor more than quantity not invoiced yet."));
+                       return false;
+               }
+       } else {
+               if (($_SESSION['Items']->payment_terms['days_before_due'] < 0) && !count($_SESSION['Items']->prepayments)) {
+                       display_error(_("There is no non-invoiced payments for this order. If you want to issue final invoice, select delayed or cash payment terms."));
+                       return false;
+               }
        }
 
        return true;
@@ -332,15 +390,20 @@ if (isset($_POST['process_invoice']) && check_data()) {
 }
 
 if(list_updated('payment')) {
-       $order = &$_SESSION['Items'];
+       $order = &$_SESSION['Items']; 
+       copy_to_cart();
        $order->payment = get_post('payment');
        $order->payment_terms = get_payment_terms($order->payment);
-       $order->due_date = get_invoice_duedate($order->payment, $order->document_date);
+       $_POST['due_date'] = $order->due_date = get_invoice_duedate($order->payment, $order->document_date);
+       $_POST['Comments'] = '';
+       $Ajax->activate('due_date');
+       $Ajax->activate('options');
        if ($order->payment_terms['cash_sale']) {
                $_POST['Location'] = $order->Location = $order->pos['pos_location'];
                $order->location_name = $order->pos['location_name'];
        }
 }
+
 // find delivery spans for batch invoice display
 $dspans = array();
 $lastdn = ''; $spanlen=1;
@@ -365,6 +428,7 @@ $dspans[] = $spanlen;
 //-----------------------------------------------------------------------------
 
 $is_batch_invoice = count($_SESSION['Items']->src_docs) > 1;
+$prepaid = $_SESSION['Items']->is_prepaid();
 
 $is_edition = $_SESSION['Items']->trans_type == ST_SALESINVOICE && $_SESSION['Items']->trans_no != 0;
 start_form();
@@ -379,7 +443,7 @@ if ($dim > 0)
        $colspan = 3;
 label_cells(_("Customer"), $_SESSION['Items']->customer_name, "class='tableheader2'");
 label_cells(_("Branch"), get_branch_name($_SESSION['Items']->Branch), "class='tableheader2'");
-if ($_SESSION['Items']->pos['credit_sale'] || $_SESSION['Items']->pos['cash_sale']) {
+if (($_SESSION['Items']->pos['credit_sale'] || $_SESSION['Items']->pos['cash_sale'])) {
        $paymcat = !$_SESSION['Items']->pos['cash_sale'] ? PM_CREDIT :
                (!$_SESSION['Items']->pos['credit_sale'] ? PM_CASH : PM_ANY);
        label_cells(_("Payment terms:"), sale_payment_list('payment', $paymcat),
@@ -420,7 +484,12 @@ if (!isset($_POST['ship_via'])) {
        $_POST['ship_via'] = $_SESSION['Items']->ship_via;
 }
 label_cell(_("Shipping Company"), "class='tableheader2'");
-shippers_list_cells(null, 'ship_via', $_POST['ship_via']);
+if ($prepaid)
+{
+       $shipper = get_shipper($_SESSION['Items']->ship_via);
+       label_cells(null, $shipper['shipper_name']);
+} else
+       shippers_list_cells(null, 'ship_via', $_POST['ship_via']);
 
 if (!isset($_POST['InvoiceDate']) || !is_date($_POST['InvoiceDate'])) {
        $_POST['InvoiceDate'] = new_doc_date();
@@ -462,13 +531,16 @@ if ($row['dissallow_invoices'] == 1)
        exit();
 }      
 
-display_heading(_("Invoice Items"));
+display_heading($prepaid ? _("Sales Order Items") : _("Invoice Items"));
 
 div_start('Items');
 start_table(TABLESTYLE, "width=80%");
-$th = array(_("Item Code"), _("Item Description"), _("Delivered"), _("Units"), _("Invoiced"),
-       _("This Invoice"), _("Price"), _("Tax Type"), _("Discount"), _("Total"));
-
+if ($prepaid)
+       $th = array(_("Item Code"), _("Item Description"), _("Units"), _("Quantity"),
+               _("Price"), _("Tax Type"), _("Discount"), _("Total"));
+else
+       $th = array(_("Item Code"), _("Item Description"), _("Delivered"), _("Units"), _("Invoiced"),
+               _("This Invoice"), _("Price"), _("Tax Type"), _("Discount"), _("Total"));
 if ($is_batch_invoice) {
     $th[] = _("DN");
     $th[] = "";
@@ -486,19 +558,24 @@ $show_qoh = true;
 $dn_line_cnt = 0;
 
 foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
-       if ($ln_itm->quantity == $ln_itm->qty_done) {
+       if (!$prepaid && ($ln_itm->quantity == $ln_itm->qty_done)) {
                continue; // this line was fully invoiced
        }
        alt_table_row_color($k);
        view_stock_status_cell($ln_itm->stock_id);
 
-       text_cells(null, 'Line'.$line.'Desc', $ln_itm->item_description, 30, 50);
+       if ($prepaid)
+               label_cell($ln_itm->item_description);
+       else
+               text_cells(null, 'Line'.$line.'Desc', $ln_itm->item_description, 30, 50);
        $dec = get_qty_dec($ln_itm->stock_id);
-       qty_cell($ln_itm->quantity, false, $dec);
+       if (!$prepaid)
+               qty_cell($ln_itm->quantity, false, $dec);
        label_cell($ln_itm->units);
-       qty_cell($ln_itm->qty_done, false, $dec);
+       if (!$prepaid)
+               qty_cell($ln_itm->qty_done, false, $dec);
 
-       if ($is_batch_invoice) {
+       if ($is_batch_invoice || $prepaid) {
                // for batch invoices we can only remove whole deliveries
                echo '<td nowrap align=right>';
                hidden('Line' . $line, $ln_itm->qty_dispatched );
@@ -549,10 +626,13 @@ $accumulate_shipping = get_company_pref('accumulate_shipping');
 if ($is_batch_invoice && $accumulate_shipping)
        set_delivery_shipping_sum(array_keys($_SESSION['Items']->src_docs));
 
-$colspan = 9;
+$colspan = $prepaid ? 7:9;
 start_row();
 label_cell(_("Shipping Cost"), "colspan=$colspan align=right");
-small_amount_cells(null, 'ChargeFreightCost', null);
+if ($prepaid)
+       label_cell($_POST['ChargeFreightCost'], 'align=right');
+else
+       small_amount_cells(null, 'ChargeFreightCost', null);
 if ($is_batch_invoice) {
 label_cell('', 'colspan=2');
 }
@@ -565,7 +645,7 @@ $display_sub_total = price_format($inv_items_total + input_num('ChargeFreightCos
 label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right", $is_batch_invoice ? 2 : 0);
 
 $taxes = $_SESSION['Items']->get_taxes(input_num('ChargeFreightCost'));
-$tax_total = display_edit_tax_items($taxes, $colspan, $_SESSION['Items']->tax_included, $is_batch_invoice ? 2:0);
+$tax_total = display_edit_tax_items($taxes, $colspan, $_SESSION['Items']->tax_included, $is_batch_invoice ? 2 : 0);
 
 $display_total = price_format(($inv_items_total + input_num('ChargeFreightCost') + $tax_total));
 
@@ -573,12 +653,32 @@ label_row(_("Invoice Total"), $display_total, "colspan=$colspan align=right","al
 
 end_table(1);
 div_end();
-
+div_start('options');
 start_table(TABLESTYLE2);
-textarea_row(_("Memo"), 'Comments', null, 50, 4);
+if ($prepaid)
+{
 
-end_table(1);
+       label_row(_("Sales order:"), get_trans_view_str(ST_SALESORDER, $_SESSION['Items']->order_no, get_reference(ST_SALESORDER, $_SESSION['Items']->order_no)));
 
+       $list = array(); $allocs = 0;
+       if (count($_SESSION['Items']->prepayments))
+       {
+               foreach($_SESSION['Items']->prepayments as $pmt)
+               {
+                       $list[] = get_trans_view_str($pmt['trans_type_from'], $pmt['trans_no_from'], get_reference($pmt['trans_type_from'], $pmt['trans_no_from']));
+                       $allocs += $pmt['amt'];
+               }
+       }
+
+       label_row(_("Payments received:"), implode(',', $list));
+       label_row(_("Invoiced here:"), price_format($_SESSION['Items']->prep_amount), 'class=label');
+       label_row(_("Left to be invoiced:"), price_format($_SESSION['Items']->get_trans_total()-max($_SESSION['Items']->prep_amount, $allocs)), 'class=label');
+}
+
+textarea_row(_("Memo:"), 'Comments', null, 50, 4);
+
+end_table(1);
+div_end();
 submit_center_first('Update', _("Update"),
   _('Refresh document page'), true);
 submit_center_last('process_invoice', _("Process Invoice"),

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index 062d9bad732a49529f6b417d2af54dce4e625a9f..fe2130d38a7384cb0834d390144d396805694abb 100644 (file)
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -74,13 +74,20 @@ class cart
        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
        //-------------------------------------------------------------------------
        //
        //  $trans_no==0 => open new/direct document
-       //  $trans_no!=0 && $no_edit==false => update with parent constarints for reedition
-       //  $trans_no!=0 && $no_edit==true => read only: for view, or later child doc entry
+       //  $trans_no!=0 && $prepare_child==false => update with parent constarints for reedition
+       //  $trans_no!=0 && $prepare_child==true => prepare for child doc entry
+       //      $prepare_child is set to ST_SALESINVOICE for prepayment invoices
        //
-       function Cart($type, $trans_no=0, $prep_child=false) {
+       function Cart($type, $trans_no=0, $prepare_child=false) {
                /*Constructor function initialises a new shopping cart */
                $this->line_items = array();
                $this->sales_type = "";
@@ -91,18 +98,19 @@ class cart
                $this->dimension_id = 0;
                $this->dimension2_id = 0;
                $this->pos = get_sales_point(user_pos());
-               $this->read($type, $trans_no, $prep_child);
+               $this->read($type, $trans_no, $prepare_child);
                $this->cart_id = uniqid('');
        }
        
        //
        //      Prepare cart to new child document entry, just after initial parent doc read.
        //
-       function prepare_child()
+       function prepare_child($type)
        {
                global $Refs;
 
-               $type = get_child_type($this->trans_type);
+               if ($type === true)
+                       $type = get_child_type($this->trans_type);
 
                $this->trans_type = $type;
                $this->reference = $Refs->get_next($this->trans_type);
@@ -111,7 +119,8 @@ class cart
                for($line_no = 0; $line_no < count($this->line_items); $line_no++) {
                        $line = &$this->line_items[$line_no];
                        $line->src_id = $line->id; // save src line ids for update
-                       $line->qty_dispatched = $type == ST_CUSTCREDIT ? '0' : $line->quantity - $line->qty_done;
+                       $line->qty_dispatched = $type == ST_CUSTCREDIT ? '0' : 
+                                (($this->prepaid && $type == ST_SALESINVOICE) ? $line->quantity : $line->quantity - $line->qty_done);
                        $line->qty_old = 0;
                }
                unset($line);
@@ -168,7 +177,7 @@ class cart
        //-------------------------------------------------------------------------
        // Reading document into cart
        //
-       function read($type, $trans_no=0, $prep_child=false) {
+       function read($type, $trans_no=0, $prepare_child=false) {
 
                global $SysPrefs, $Refs;
 
@@ -178,7 +187,8 @@ class cart
                        if ($type == ST_SALESORDER || $type == ST_SALESQUOTE) { // sales order || sales quotation
                                read_sales_order($trans_no[0], $this, $type);
                        } else {        // other type of sales transaction
-                                       read_sales_trans($type, $trans_no, $this); 
+                                       read_sales_trans($type, $trans_no, $this);
+                                       $this->prepayments = get_payments_for($trans_no[0], $type);
                                        if ($this->order_no) { // free hand credit notes have no order_no
                                                $sodata = get_sales_order_header($this->order_no, ST_SALESORDER);
                                                $this->cust_ref = $sodata["customer_ref"];
@@ -187,13 +197,13 @@ class cart
                                                $this->delivery_to = $sodata["deliver_to"];
                                                $this->delivery_address = $sodata["delivery_address"];
                                        // child transaction reedition - update with parent info unless it is freehand
-                                       if (!$prep_child) // this is read for view/reedition
+                                       if (!$this->is_prepaid() && !$prepare_child) // this is read for view/reedition
                                                $this->set_parent_constraints($sodata, $trans_no[0]);
                                        }
                        }
                        // convert document into child and prepare qtys for entry
-                       if ($prep_child)
-                               $this->prepare_child();
+                       if ($prepare_child)
+                               $this->prepare_child($prepare_child);
 
                } else { // new document
                                $this->trans_type = $type;
@@ -245,7 +255,7 @@ class cart
        // $policy - 0 or 1:  writeoff/return for IV, back order/cancel for DN
        function write($policy=0) {
                begin_transaction(); // prevents partial database changes in case of direct delivery/invoice
-               if (count($this->src_docs) == 0 && ($this->trans_type == ST_SALESINVOICE || $this->trans_type == ST_CUSTDELIVERY)) {
+               if (count($this->src_docs) == 0 && ($this->trans_type == ST_SALESINVOICE || $this->trans_type == ST_CUSTDELIVERY) && !$this->is_prepaid()) {
                        // this is direct document - first add parent
                        $ref = $this->reference;
                        $date = $this->document_date;
@@ -515,6 +525,52 @@ class cart
 
                return $total;
        }
+
+       /*
+               Returns true for documents issued in prepayment cycle.
+       */
+       function is_prepaid()
+       {
+               return $this->prepaid; //floatcmp($this->prep_amount, 0) > 0;
+       }
+       /*
+               Order is ready for delivery in prepament mode.
+       */
+       function is_released()
+       {
+               return floatcmp($this->sum_paid, $this->prep_amount) >= 0;
+       }
+
+       /*
+               Check whether order has been already invoiced/send or not.
+       */
+       function is_started()
+       {
+               if ($this->trans_no==0)
+                       return false;
+               $order_no = array_keys($this->trans_no);
+
+               return  is_sales_order_started(reset($order_no));
+       }
+
+       /*
+               Check payment terms and prepayments selected for this invoice,
+               and updates     partial/final invoice value respectively.
+       */
+       function update_payments()
+       {
+               $remainder = prepaid_invoice_remainder($this->order_no);
+
+               // recalculate prepaid part from payments
+               if ($this->payment_terms['days_before_due'] < 0)
+               {       // this is partial invoice for selected prepayments made.
+                       $paid = 0;
+                       foreach($this->prepayments as $payment)
+                               $paid += $payment['amt'];
+                       $this->prep_amount = min($remainder, $paid);
+               } else  // this is final invoice
+                       $this->prep_amount = $remainder;
+       }
 } /* end of class defintion */
 
 class line_details

diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc
index a07bdc4f692b18f17ca8909da84ca835002ee1ca..1d6ffd79833d579edba5c10afa5c7a4d571d38a2 100644 (file)
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -56,7 +56,7 @@ function get_customer_trans_version($type, $trans_no) {
 function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
        $date_, $reference, $Total, $discount=0, $Tax=0, $Freight=0, $FreightTax=0,
        $sales_type=0, $order_no=0, $ship_via=0, $due_date="",
-       $AllocAmt=0, $rate=0, $dimension_id=0, $dimension2_id=0, $payment_terms=null, $tax_included=0)
+       $AllocAmt=0, $rate=0, $dimension_id=0, $dimension2_id=0, $payment_terms=null, $tax_included=0, $prep_amount=0)
 {
        $new = $trans_no==0;
        $curr = get_customer_currency($debtor_no);
@@ -85,7 +85,7 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
                order_, ov_amount, ov_discount,
                ov_gst, ov_freight, ov_freight_tax,
                rate, ship_via, alloc,
-               dimension_id, dimension2_id, payment_terms, tax_included
+               dimension_id, dimension2_id, payment_terms, tax_included, prep_amount
                ) VALUES (".db_escape($trans_no).", ".db_escape($trans_type).",
                ".db_escape($debtor_no).", ".db_escape($BranchNo).",
                '$SQLDate', '$SQLDueDate', ".db_escape($reference).",
@@ -94,7 +94,7 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
                $FreightTax, $rate, ".db_escape($ship_via).", $AllocAmt,
                ".db_escape($dimension_id).", ".db_escape($dimension2_id).", "
                .db_escape($payment_terms, true).", "
-               .db_escape($tax_included).")";
+               .db_escape($tax_included).", ".db_escape($prep_amount).")";
        } else {        // may be optional argument should stay unchanged ?
        $sql = "UPDATE ".TB_PREF."debtor_trans SET
                debtor_no=".db_escape($debtor_no)." , branch_code=".db_escape($BranchNo).",
@@ -106,6 +106,7 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
                dimension_id=".db_escape($dimension_id).", dimension2_id=".db_escape($dimension2_id).",
                payment_terms=".db_escape($payment_terms).",
                tax_included=".db_escape($tax_included)."
+               prep_amount =".db_escape($prep_amount)."
                WHERE trans_no=".db_escape($trans_no)." AND type=".db_escape($trans_type);
        }
        db_query($sql, "The debtor transaction record could not be inserted");
@@ -118,11 +119,14 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
 
 function get_customer_trans($trans_id, $trans_type)
 {
+       global $go_debug;
+
        $sql = "SELECT trans.*,"
                ."ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,"
                ."cust.name AS DebtorName, cust.address, "
                ."cust.curr_code, "
-               ."cust.tax_id ";
+               ."cust.tax_id,
+               trans.prep_amount>0 as prepaid";
 
        if ($trans_type == ST_CUSTPAYMENT) {
                // it's a payment so also get the bank account
@@ -180,12 +184,16 @@ function get_customer_trans($trans_id, $trans_type)
 
        if (db_num_rows($result) == 0) {
                // can't return nothing
+               if($go_debug)
+                       display_backtrace();
                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)
+                       display_backtrace();
                display_db_error("duplicate debtor transactions found for given params", $sql, true);
                exit;
        }
@@ -254,7 +262,7 @@ function void_customer_trans($type, $type_no)
 {
        // clear all values and mark as void
        $sql = "UPDATE ".TB_PREF."debtor_trans SET ov_amount=0, ov_discount=0, ov_gst=0, ov_freight=0,
-               ov_freight_tax=0, alloc=0, version=version+1 WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
+               ov_freight_tax=0, alloc=0, prep_amount=0, version=version+1 WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
 
        db_query($sql, "could not void debtor transactions for type=$type and trans_no=$type_no");
 }
@@ -380,7 +388,7 @@ function get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_i
                        trans.due_date,
                        (ov_amount+ov_gst+ov_freight+ov_freight_tax) AS DeliveryValue,
                        debtor.curr_code,
-                       Sum(line.quantity-line.qty_done) AS Outstanding,
+                       Sum(line.quantity-line.qty_done) AND sorder.prep_amount=0 AS Outstanding,
                        Sum(line.qty_done) AS Done
                FROM "
                 .TB_PREF."sales_orders as sorder, "

diff --git a/sales/includes/db/custalloc_db.inc b/sales/includes/db/custalloc_db.inc
index 896649090fedf2658b5dd85ac8b4b4d1a4d4d289..f2896620d4b0e7f4abd5dff97ff61743c963c70c 100644 (file)
--- a/sales/includes/db/custalloc_db.inc
+++ b/sales/includes/db/custalloc_db.inc
@@ -34,10 +34,22 @@ function delete_cust_allocation($trans_id)
 
 //----------------------------------------------------------------------------------------
 
+function get_cust_allocation($trans_id)
+{
+       $sql = "SELECT * FROM ".TB_PREF."cust_allocations WHERE id = ".db_escape($trans_id);
+       return db_fetch(db_query($sql), "Cannot retrieve customer allocation $trans_id");
+}
+
+//----------------------------------------------------------------------------------------
+
 function update_debtor_trans_allocation($trans_type, $trans_no, $alloc)
 {
-       $sql = "UPDATE ".TB_PREF."debtor_trans SET alloc = alloc + $alloc
-               WHERE type=".db_escape($trans_type)." AND trans_no = ".db_escape($trans_no);
+       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");
 }
 
@@ -52,36 +64,31 @@ function void_cust_allocations($type, $type_no, $date="")
 
 function clear_cust_alloctions($type, $type_no, $date="")
 {
-       // clear any allocations for this transaction
-       $sql = "SELECT * FROM ".TB_PREF."cust_allocations
-               WHERE (trans_type_from=".db_escape($type)." AND trans_no_from=".db_escape($type_no).")
-               OR (trans_type_to=".db_escape($type)." AND trans_no_to=".db_escape($type_no).")";
-       $result = db_query($sql, "could not void debtor transactions for type=$type and trans_no=$type_no");
-
-       while ($row = db_fetch($result))
-       {
-               $sql = "UPDATE ".TB_PREF."debtor_trans SET alloc=alloc - " . $row['amt'] . "
-                       WHERE (type= " . $row['trans_type_from'] . " AND trans_no=" . $row['trans_no_from'] . ")
-                       OR (type=" . $row['trans_type_to'] . " AND trans_no=" . $row['trans_no_to'] . ")";
+       $sql = "UPDATE  ".TB_PREF."cust_allocations ca
+                               LEFT JOIN ".TB_PREF."debtor_trans paym ON ca.trans_type_from=paym.type AND ca.trans_no_from=paym.trans_no
+                               LEFT JOIN ".TB_PREF."debtor_trans dt ON ca.trans_type_to=dt.type AND ca.trans_no_to=dt.trans_no
+                               LEFT JOIN ".TB_PREF."sales_orders so ON ca.trans_type_to=so.trans_type AND ca.trans_no_to=so.order_no
+                       SET paym.alloc=paym.alloc - ca.amt,
+                               dt.alloc=dt.alloc -  ca.amt,
+                               so.alloc=so.alloc -  ca.amt
+                       WHERE  (ca.trans_type_from=".db_escape($type)." AND ca.trans_no_from=".db_escape($type_no).")
+                               OR (ca.trans_type_to=".db_escape($type)." AND ca.trans_no_to=".db_escape($type_no).")";
                db_query($sql, "could not clear allocation");
-               // 2008-09-20 Joe Hunt
-               if ($date != "")
-                       exchange_variation($type, $type_no, $row['trans_type_to'], $row['trans_no_to'], $date,
-                               $row['amt'], PT_CUSTOMER, true);
-               //////////////////////
-       }
-
 
        // remove any allocations for this transaction
        $sql = "DELETE FROM ".TB_PREF."cust_allocations
-               WHERE (trans_type_from=".db_escape($type)." AND trans_no_from=".db_escape($type_no).")
-               OR (trans_type_to=".db_escape($type)." AND trans_no_to=".db_escape($type_no).")";
+                       WHERE  (trans_type_from=".db_escape($type)." AND trans_no_from=".db_escape($type_no).")
+                               OR (trans_type_to=".db_escape($type)." AND trans_no_to=".db_escape($type_no).")";
 
        db_query($sql, "could not void debtor transactions for type=$type and trans_no=$type_no");
+// is this necessary?
+//     if ($date != "")
+//             exchange_variation($type, $type_no, $row['trans_type_to'], $row['trans_no_to'], $date,
+//                     $row['amt'], PT_CUSTOMER, true);
 }
-//----------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------------------
 
-function get_alloc_trans_sql($extra_fields=null, $extra_conditions=null, $extra_tables=null)
+function get_allocatable_from_cust_sql($customer_id=null, $settled)
 {
        $sql = "SELECT
                trans.type,
@@ -89,98 +96,150 @@ function get_alloc_trans_sql($extra_fields=null, $extra_conditions=null, $extra_
                trans.reference,
                trans.tran_date,
                debtor.name AS DebtorName, 
-               debtor.curr_code, 
+               debtor.curr_code,
                ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,
                trans.alloc,
                trans.due_date,
                debtor.address,
-               trans.version ";
-
-       if ($extra_fields)
-               $sql .= ", $extra_fields ";
+               trans.version,
+               round(abs(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc),6) <= 0 AS settled
 
-       $sql .= " FROM ".TB_PREF."debtor_trans as trans, "
-                               .TB_PREF."debtors_master as debtor";
-       if ($extra_tables)
-               $sql .= ",$extra_tables ";
+        FROM "
+               .TB_PREF."debtor_trans as trans, "
+               .TB_PREF."debtors_master as debtor"
+       ." WHERE trans.debtor_no=debtor.debtor_no
+               AND (((type=".ST_CUSTPAYMENT." OR type=".ST_BANKDEPOSIT.") AND (trans.ov_amount > 0))"
+               ." OR (type=".ST_CUSTCREDIT." AND (ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount)>0))";
 
-       $sql .= " WHERE trans.debtor_no=debtor.debtor_no";
+       if (!$settled)
+               $sql .= " AND (round(abs(ov_amount+ov_gst+ov_freight+ov_freight_tax-ov_discount-alloc),6) > 0)";
 
-       if ($extra_conditions)
-               $sql .= " AND $extra_conditions ";
+       if ($customer_id != null)
+               $sql .= " AND trans.debtor_no = ".db_escape($customer_id);
 
        return $sql;
 }
 
-
-//-------------------------------------------------------------------------------------------------------------
-
-function get_allocatable_from_cust_sql($customer_id, $settled)
+function get_allocatable_sales_orders($customer_id = null, $trans_no=null, $type=null)
 {
-       $settled_sql = "";
-       if (!$settled)
+       $sql = "SELECT
+               sorder.trans_type as type,
+               sorder.order_no as trans_no,
+               sorder.reference,
+               sorder.ord_date,
+               debtor.name AS DebtorName, 
+               debtor.curr_code,
+               total-IFNULL(invoiced.amount,0) as Total,
+               sorder.alloc,
+               sorder.delivery_date as due_date,
+               debtor.address,
+               sorder.version,
+               amt
+               FROM ".TB_PREF."sales_orders as sorder
+                       LEFT JOIN ".TB_PREF."debtors_master as debtor ON sorder.debtor_no = debtor.debtor_no
+                       LEFT JOIN ".TB_PREF."cust_allocations as alloc ON sorder.order_no = alloc.trans_no_to AND sorder.trans_type = alloc.trans_type_to
+                       LEFT JOIN (SELECT order_, sum(prep_amount) amount FROM ".TB_PREF."debtor_trans dt
+                       WHERE prep_amount>0 AND dt.type=".ST_SALESINVOICE." GROUP BY order_) as invoiced ON sorder.order_no = invoiced.order_
+               WHERE sorder.trans_type=".ST_SALESORDER;
+
+       if ($trans_no != null and $type != null)
        {
-               $settled_sql = " AND (round(ov_amount+ov_gst+ov_freight+ov_freight_tax-ov_discount-alloc,6) > 0)";
+               $sql .= " AND alloc.trans_no_from=".db_escape($trans_no)."
+                                 AND alloc.trans_type_from=".db_escape($type);
        }
-       $cust_sql = "";
-       if ($customer_id != null)
-               $cust_sql = " AND trans.debtor_no = ".db_escape($customer_id);
+       else
+       {
+               $sql .= " AND round(sorder.prep_amount)>0 and Total>0"; // only sales orders with prepayment level set and no yet fully invoiced
+       }
+       if ($customer_id)
+               $sql .= " AND sorder.debtor_no=".db_escape($customer_id);
 
-       $sql = get_alloc_trans_sql("round(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc,6) <= 0 AS settled",
-               "(type=".ST_CUSTPAYMENT." OR type=".ST_CUSTCREDIT." OR type=".ST_BANKDEPOSIT.") AND (trans.ov_amount > 0) " . $settled_sql . $cust_sql);
+       $sql .= " GROUP BY sorder.order_no";
 
        return $sql;
 }
-
 //-------------------------------------------------------------------------------------------------------------
 
-function get_allocatable_to_cust_transactions($customer_id, $trans_no=null, $type=null)
+function get_allocatable_to_cust_transactions($customer_id = null, $trans_no=null, $type=null)
 {
+       $sql = "SELECT
+               trans.type,
+               trans.trans_no,
+               trans.reference,
+               trans.tran_date,
+               debtor.name AS DebtorName, 
+               debtor.curr_code,
+               ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,
+               trans.alloc,
+               trans.due_date,
+               debtor.address,
+               trans.version,
+               amt
+        FROM ".TB_PREF."debtor_trans as trans
+                       LEFT JOIN ".TB_PREF."cust_allocations as alloc ON trans.trans_no = alloc.trans_no_to AND trans.type = alloc.trans_type_to,"
+                       .TB_PREF."debtors_master as debtor
+        WHERE
+                trans.debtor_no=debtor.debtor_no";
+       if ($customer_id)
+               $sql .= " AND trans.debtor_no=".db_escape($customer_id);
+
        if ($trans_no != null and $type != null)
        {
-               $sql = get_alloc_trans_sql("amt", "trans.trans_no = alloc.trans_no_to
-                       AND trans.type = alloc.trans_type_to
-                       AND alloc.trans_no_from=".db_escape($trans_no)."
-                       AND alloc.trans_type_from=".db_escape($type)."
-                       AND trans.debtor_no=".db_escape($customer_id),
-                       "".TB_PREF."cust_allocations as alloc");
+               $sql .= " AND alloc.trans_no_from=".db_escape($trans_no)."
+                                 AND alloc.trans_type_from=".db_escape($type);
        }
        else
        {
-               $sql = get_alloc_trans_sql(null, "round(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc,6) > 0
-                       AND trans.type <> " . ST_CUSTPAYMENT . "
-                       AND trans.type <> " . ST_BANKDEPOSIT . "
-                       AND trans.type <> " . ST_CUSTCREDIT . "
-                       AND trans.type <> " . ST_CUSTDELIVERY . "
-                       AND trans.debtor_no=".db_escape($customer_id));
+               $sql .= " AND round(IF(prep_amount, prep_amount, ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount)-alloc,6) > 0
+                       AND trans.type NOT IN (".implode(',',array(ST_CUSTPAYMENT,ST_BANKDEPOSIT,ST_CUSTCREDIT,ST_CUSTDELIVERY)).")";
+               $sql .= " GROUP BY type, trans_no";
        }
+       $orders = get_allocatable_sales_orders($customer_id, $trans_no, $type);
+       $sql = "($sql ORDER BY trans_no) \nUNION \n($orders)";
 
-       return db_query($sql." ORDER BY trans_no", "Cannot retreive alloc to transactions");
+       return db_query($sql, "Cannot retreive alloc to transactions");
 }
 
 //-------------------------------------------------------------------------------------------------------------
 
 function get_allocatable_from_cust_transactions($customer_id, $trans_no=null, $type=null)
 {
+
+       $sql = "SELECT
+               trans.type,
+               trans.trans_no,
+               trans.reference,
+               trans.tran_date,
+               debtor.name AS DebtorName, 
+               debtor.curr_code,
+               ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,
+               trans.alloc,
+               trans.due_date,
+               debtor.address,
+               trans.version,
+               amt
+        FROM  ".TB_PREF."debtor_trans as trans,"
+                       .TB_PREF."debtors_master as debtor,"
+                       .TB_PREF."cust_allocations as alloc
+        WHERE trans.debtor_no=debtor.debtor_no
+                       AND trans.trans_no = alloc.trans_no_from
+                       AND trans.type = alloc.trans_type_from";
+
        if ($trans_no != null and $type != null)
        {
-               $sql = get_alloc_trans_sql("amt", "trans.trans_no = alloc.trans_no_from
-                       AND trans.type = alloc.trans_type_from
-                       AND alloc.trans_no_to=".db_escape($trans_no)."
-                       AND alloc.trans_type_to=".db_escape($type)."
-                       AND trans.debtor_no=".db_escape($customer_id),
-                       "".TB_PREF."cust_allocations as alloc");
+               $sql .= " AND alloc.trans_no_to=".db_escape($trans_no)."
+                                 AND alloc.trans_type_to=".db_escape($type);
        }
        else
        {
-               $sql = get_alloc_trans_sql(null, "round(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc,6) > 0
-                       AND trans.type <> " . ST_CUSTPAYMENT . "
-                       AND trans.type <> " . ST_BANKDEPOSIT . "
-                       AND trans.type <> " . ST_CUSTCREDIT . "
-                       AND trans.type <> " . ST_CUSTDELIVERY . "
-                       AND trans.debtor_no=".db_escape($customer_id));
+               $sql .= " AND round(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc,6) > 0
+                       AND trans.type NOT IN (".implode(',',array(ST_CUSTPAYMENT,ST_BANKDEPOSIT,ST_CUSTCREDIT,ST_CUSTDELIVERY)).")";
+               $sql .= " GROUP BY type, trans_no";
        }
 
+       if($customer_id)
+               $sql .= " AND trans.debtor_no=".db_escape($customer_id);
+
        return db_query($sql." ORDER BY trans_no", "Cannot retreive alloc to transactions");
 }
 
@@ -198,12 +257,12 @@ function get_sql_for_customer_allocation_inquiry()
                trans.due_date,
                debtor.name,
                debtor.curr_code,
+               debtor.debtor_no,
        (trans.ov_amount + trans.ov_gst + trans.ov_freight 
                        + trans.ov_freight_tax + trans.ov_discount)     AS TotalAmount,
                trans.alloc AS Allocated,
                ((trans.type = ".ST_SALESINVOICE.")
-                       AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue,
-               trans.debtor_no
+                       AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue
        FROM "
                        .TB_PREF."debtor_trans as trans, "
                        .TB_PREF."debtors_master as debtor
@@ -248,9 +307,9 @@ function get_sql_for_customer_allocation_inquiry()
 
        if (!check_value('showSettled'))
        {
-               $sql .= " AND (round(abs(trans.ov_amount + trans.ov_gst + "
+               $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) ";
+               ."trans.ov_discount)) - trans.alloc,6) != 0) ";
        }
        return $sql;
 }

diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc
index f74afa20ee4a8c474102fb085905cb5487144cb9..9c378f77fb8617d4e17512cde51b046fc51e6ae6 100644 (file)
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -46,7 +46,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
                $delivery->tax_included ? 0 : $freight_tax,
                $delivery->sales_type, $delivery->order_no,
                $delivery->ship_via, $delivery->due_date, 0, 0, $delivery->dimension_id, 
-               $delivery->dimension2_id, $delivery->payment, $delivery->tax_included);
+               $delivery->dimension2_id, $delivery->payment, $delivery->tax_included, $delivery->prep_amount);
 
        if ($trans_no == 0) {
                $delivery->trans_no = array($delivery_no=>0);
@@ -57,6 +57,12 @@ function write_sales_delivery(&$delivery,$bo_policy)
                delete_comments(ST_CUSTDELIVERY, $delivery_no);
        }
 
+       // for prepaid delivery repost income from deffered account
+       if ($delivery->is_prepaid())
+       {
+               $branch_data = get_branch_accounts($delivery->Branch);
+               $total = 0;
+       }
        foreach ($delivery->line_items as $line_no => $delivery_line) {
 
                $line_price = $delivery_line->line_price();
@@ -88,19 +94,26 @@ function write_sales_delivery(&$delivery,$bo_policy)
                                -$delivery_line->qty_dispatched, $delivery_line->standard_cost,1,
                                $line_price, $delivery_line->discount_percent);
 
-
                        $stock_gl_code = get_stock_gl_code($delivery_line->stock_id);
 
+                       // 2008-08-01. If there is a Customer Dimension, then override with this,
+                       // else take the Item Dimension (if any)
+                       $dim = ($delivery->dimension_id != $customer['dimension_id'] ? $delivery->dimension_id : 
+                               ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_code["dimension_id"]));
+                       $dim2 = ($delivery->dimension2_id != $customer['dimension2_id'] ? $delivery->dimension2_id : 
+                               ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_code["dimension2_id"]));
+                       if ($delivery->is_prepaid())
+                       {
+                               $sales_account = ($branch_data['sales_account'] != "" ? $branch_data['sales_account'] : $stock_gl_code['sales_account']);
+
+                               $total += add_gl_trans_customer(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date, $sales_account, $dim, $dim2,
+                                       -$line_taxfree_price*$delivery_line->qty_dispatched, // FIXME - calculation order should be exactly like in invoice to minimalize roundings
+                                       $delivery->customer_id, "The sales price GL posting could not be inserted");
+                       }
                        /* insert gl_trans to credit stock and debit cost of sales at standard cost*/
                        if (is_inventory_item($delivery_line->stock_id) && $delivery_line->standard_cost != 0) {
 
                                /*first the cost of sales entry*/
-                               // 2008-08-01. If there is a Customer Dimension, then override with this,
-                               // else take the Item Dimension (if any)
-                               $dim = ($delivery->dimension_id != $customer['dimension_id'] ? $delivery->dimension_id : 
-                                       ($customer['dimension_id'] != 0 ? $customer["dimension_id"] : $stock_gl_code["dimension_id"]));
-                               $dim2 = ($delivery->dimension2_id != $customer['dimension2_id'] ? $delivery->dimension2_id : 
-                                       ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_code["dimension2_id"]));
 
                                add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no,
                                        $delivery->document_date, $stock_gl_code["cogs_account"], $dim, $dim2, "",
@@ -121,6 +134,13 @@ function write_sales_delivery(&$delivery,$bo_policy)
                } /*quantity dispatched is more than 0 */
        } /*end of order_line loop */
 
+       if ($delivery->is_prepaid())
+       {
+               $deferred_act = get_company_pref('deferred_income_act');
+               add_gl_trans_customer(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date, $deferred_act, 0, 0,
+                       -$total, $delivery->customer_id, "The deferred income GL posting could not be inserted");
+       }
+
        if ($bo_policy == 0) {
                // if cancelling any remaining quantities
                close_sales_order($delivery->order_no);
@@ -141,7 +161,8 @@ function write_sales_delivery(&$delivery,$bo_policy)
        if ($trans_no == 0) {
                        $Refs->save(ST_CUSTDELIVERY, $delivery_no, $delivery->reference);
        }
-
+//_vd(get_gl(ST_CUSTDELIVERY, $delivery_no));
+//exit;
        hook_db_postwrite($delivery, ST_CUSTDELIVERY);
        commit_transaction();
 

diff --git a/sales/includes/db/sales_invoice_db.inc b/sales/includes/db/sales_invoice_db.inc
index ecaf4466f9bb5f6d1b42c195d56cad1bcac13613..2032bcf058d0a55e1f0ab9d97aa81b4e3ba923d5 100644 (file)
--- a/sales/includes/db/sales_invoice_db.inc
+++ b/sales/includes/db/sales_invoice_db.inc
@@ -36,13 +36,14 @@ function write_sales_invoice(&$invoice)
        $items_total = $invoice->get_items_total_dispatch();
        $freight_tax = $invoice->get_shipping_tax();
 
-       update_customer_trans_version(get_parent_type(ST_SALESINVOICE), $invoice->src_docs);
+       if (!$invoice->is_prepaid())
+               update_customer_trans_version(get_parent_type(ST_SALESINVOICE), $invoice->src_docs);
 
        $ov_gst = 0;
        $taxes = $invoice->get_taxes(); // all taxes with freight_tax
-
+       $dec = user_price_dec();
        foreach ($taxes as $taxitem) {
-               $taxitem['Value'] =  round2($taxitem['Value'], user_price_dec());
+               $taxitem['Value'] =  round2($taxitem['Value'], $dec);
                $ov_gst +=  $taxitem['Value'];
        }
 
@@ -59,23 +60,40 @@ function write_sales_invoice(&$invoice)
        if (is_array($sales_order))
                        $sales_order = $sales_order[0]; // assume all crucial SO data are same for every delivery
 
+       if ($trans_no) {
+               $allocs = get_payments_for($trans_no, ST_SALESINVOICE);
+               delete_comments(ST_SALESINVOICE, $trans_no);
+               void_gl_trans(ST_SALESINVOICE, $trans_no, true);
+               void_trans_tax_details(ST_SALESINVOICE, $trans_no);
+       } else
+               $allocs = get_payments_for($invoice->order_no, ST_SALESORDER);
+
+       if ($invoice->is_prepaid()) // selected prepayment is already in cart
+       {
+               $allocs = $invoice->prepayments;
+               // values posted are reduced by prepaid_factor
+               $prepaid_factor = $invoice->prep_amount/$invoice->get_trans_total();
+       } else {
+               $prepaid_factor = 1;
+       }
+
+        // write_customer_trans have to be called after optional void_cust_allocations above
        $invoice_no = write_customer_trans(ST_SALESINVOICE, $trans_no, $invoice->customer_id,
                $invoice->Branch, $date_, $invoice->reference, $items_total, 0,
                $items_added_tax, $invoice->freight_cost, $freight_added_tax,
                $invoice->sales_type, $sales_order, $invoice->ship_via, 
                $invoice->due_date, 0, 0, $invoice->dimension_id, 
-               $invoice->dimension2_id, $invoice->payment, $invoice->tax_included); 
+               $invoice->dimension2_id, $invoice->payment, $invoice->tax_included, $invoice->prep_amount); 
                // 2008-06-14 extra $alloc, 2008-11-12 added dimension_id Joe Hunt
 
        if ($trans_no == 0) {
                $invoice->trans_no = array($invoice_no=>0);
-       } else {
-               delete_comments(ST_SALESINVOICE, $invoice_no);
-               void_gl_trans(ST_SALESINVOICE, $invoice_no, true);
-               void_cust_allocations(ST_SALESINVOICE, $invoice_no); // ?
-               void_trans_tax_details(ST_SALESINVOICE, $invoice_no);
        }
+
        $total = 0;
+       // for prepayments use deferred income account if set
+       $sales_account = $invoice->is_prepaid() ? get_company_pref('deferred_income_act') : 0;
+
        foreach ($invoice->line_items as $line_no => $invoice_line) {
                $qty = $invoice_line->qty_dispatched;
                $line_taxfree_price = get_tax_free_price_for_item($invoice_line->stock_id,
@@ -94,8 +112,12 @@ function write_sales_invoice(&$invoice)
 
                // Update delivery items for the quantity invoiced
                if ($invoice_line->qty_old != $invoice_line->qty_dispatched)
-                       update_parent_line(ST_SALESINVOICE, $invoice_line->src_id, ($invoice_line->qty_dispatched-$invoice_line->qty_old));
-
+               {
+                       if ($invoice->is_prepaid())
+                               update_prepaid_so_line($invoice_line->src_id, $invoice_line->qty_dispatched-$invoice_line->qty_old);
+                       else
+                               update_parent_line(ST_SALESINVOICE, $invoice_line->src_id, ($invoice_line->qty_dispatched-$invoice_line->qty_old));
+               }
                if ($invoice_line->qty_dispatched != 0) {
                        $stock_gl_code = get_stock_gl_code($invoice_line->stock_id);
 
@@ -104,7 +126,8 @@ function write_sales_invoice(&$invoice)
 
                                // 2008-06-14. If there is a Branch Sales Account, then override with this,
                                // else take the Item Sales Account
-                               $sales_account = ($branch_data['sales_account'] != "" ? $branch_data['sales_account'] : $stock_gl_code['sales_account']);
+                               if (!$invoice->is_prepaid())
+                                       $sales_account = ($branch_data['sales_account'] != "" ? $branch_data['sales_account'] : $stock_gl_code['sales_account']);
                                // 2008-08-01. If there is a Customer Dimension, then override with this,
                                // else take the Item Dimension (if any)
                                $dim = ($invoice->dimension_id != $customer['dimension_id'] ? $invoice->dimension_id : 
@@ -112,14 +135,14 @@ function write_sales_invoice(&$invoice)
                                $dim2 = ($invoice->dimension2_id != $customer['dimension2_id'] ? $invoice->dimension2_id : 
                                        ($customer['dimension2_id'] != 0 ? $customer["dimension2_id"] : $stock_gl_code["dimension2_id"]));
                                $total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $sales_account, $dim, $dim2,
-                                       -$line_taxfree_price ,
+                                       -$line_taxfree_price*$prepaid_factor,
                                        $invoice->customer_id, "The sales price GL posting could not be inserted");
 
                                if ($invoice_line->discount_percent != 0) {
 
                                        $total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_,
                                                $branch_data["sales_discount_account"], $dim, $dim2,
-                                               ($line_taxfree_price * $invoice_line->discount_percent),
+                                               ($line_taxfree_price * $invoice_line->discount_percent)*$prepaid_factor,
                                                $invoice->customer_id, "The sales discount GL posting could not be inserted");
                                } /*end of if discount !=0 */
                        }
@@ -128,27 +151,26 @@ function write_sales_invoice(&$invoice)
 
        if (($items_total + $charge_shipping) != 0) {
                $total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $branch_data["receivables_account"], 0, 0,
-                       ($items_total + $charge_shipping + $items_added_tax + $freight_added_tax),
+                       ($items_total + $charge_shipping + $items_added_tax + $freight_added_tax)*$prepaid_factor,
                        $invoice->customer_id, "The total debtor GL posting could not be inserted");
        }
+       $to_allocate = ($items_total + $charge_shipping + $items_added_tax + $freight_added_tax);
 
        if ($charge_shipping != 0) {
                $total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $company_data["freight_act"], 0, 0,
-                       -$invoice->get_tax_free_shipping(), $invoice->customer_id,
+                       -$invoice->get_tax_free_shipping()*$prepaid_factor, $invoice->customer_id,
                        "The freight GL posting could not be inserted");
        }
        // post all taxes
        foreach ($taxes as $taxitem) {
-
                if ($taxitem['Net'] != 0) {
                        $ex_rate = get_exchange_rate_from_home_currency(get_customer_currency($invoice->customer_id), $date_);
                        add_trans_tax_details(ST_SALESINVOICE, $invoice_no, $taxitem['tax_type_id'],
                                $taxitem['rate'], $invoice->tax_included, $taxitem['Value'],
-                                $taxitem['Net'], $ex_rate, $date_, $invoice->reference);
-
+                                $taxitem['Net'], $ex_rate, $date_, $invoice->reference, $date_, $prepaid_factor*$taxitem['Value']);
                        if (isset($taxitem['sales_gl_code']))
                                $total += add_gl_trans_customer(ST_SALESINVOICE, $invoice_no, $date_, $taxitem['sales_gl_code'], 0, 0,
-                                       (-$taxitem['Value']), $invoice->customer_id,
+                                       (-$taxitem['Value'])*$prepaid_factor, $invoice->customer_id,
                                        "A tax GL posting could not be inserted");
                }
        }
@@ -156,7 +178,7 @@ function write_sales_invoice(&$invoice)
        /*Post a balance post if $total != 0 */
        add_gl_balance(ST_SALESINVOICE, $invoice_no, $date_, -$total, PT_CUSTOMER, $invoice->customer_id);      
 
-       add_comments(10, $invoice_no, $date_, $invoice->Comments);
+       add_comments(ST_SALESINVOICE, $invoice_no, $date_, $invoice->Comments);
 
        if ($trans_no == 0) {
                $Refs->save(ST_SALESINVOICE, $invoice_no, $invoice->reference);
@@ -178,7 +200,18 @@ function write_sales_invoice(&$invoice)
                        update_debtor_trans_allocation(ST_CUSTPAYMENT, $pmtno, $amount);
                }
        }
+//_vd($allocs);
+       reallocate_payments($invoice_no, ST_SALESINVOICE, $date_, $to_allocate, $allocs);
+//_vd(get_payments_for($sales_order, ST_SALESORDER));
+//_vd(get_payments_for($invoice_no, ST_SALESINVOICE));
+//_vd(get_gl(ST_SALESINVOICE, $invoice_no));
+//_vd(get_customer_trans($invoice_no, ST_SALESINVOICE));
+//_vd(get_sales_order_header($sales_order, ST_SALESORDER));
        hook_db_postwrite($invoice, ST_SALESINVOICE);
+//$result = get_trans_tax_details(ST_SALESINVOICE, $invoice_no);
+//while($row=db_fetch($result))
+//     _vd($row);
+//exit;
        commit_transaction();
 
        return $invoice_no;
@@ -195,23 +228,33 @@ function void_sales_invoice($type, $type_no)
        void_gl_trans($type, $type_no, true);
 
        // reverse all the changes in parent document(s)
-
-       $deliveries = get_sales_parent_numbers($type, $type_no);
-
-       if ($deliveries !== 0) {
-               if (count($deliveries) == 1 && get_reference(ST_CUSTDELIVERY, $deliveries[0]) == "auto")
+       $factor = get_cust_prepayment_invoice_factor($type_no);
+       if ($factor != 0)
+       {
+               $lines = get_customer_trans_details($type, $type_no);
+               while($line = db_fetch($lines))
                {
-                       void_sales_delivery(ST_CUSTDELIVERY, $deliveries[0], false);
-                       $date_ = Today();
-                       add_audit_trail(ST_CUSTDELIVERY, $deliveries[0], $date_, _("Voided."));
-                       add_voided_entry(ST_CUSTDELIVERY, $deliveries[0], $date_, "");
+                       update_prepaid_so_line($line['src_id'], -$factor*$line['quantity']);
                }
-               else
-               {
-                       
-                       $srcdetails = get_sales_parent_lines($type, $type_no);
-                       while ($row = db_fetch($srcdetails)) {
-                               update_parent_line($type, $row['id'], -$row['quantity']);
+       }
+       else
+       {
+               $deliveries = get_sales_parent_numbers($type, $type_no);
+
+               if ($deliveries !== 0) {
+                       if (count($deliveries) == 1 && get_reference(ST_CUSTDELIVERY, $deliveries[0]) == "auto")
+                       {
+                               void_sales_delivery(ST_CUSTDELIVERY, $deliveries[0], false);
+                               $date_ = Today();
+                               add_audit_trail(ST_CUSTDELIVERY, $deliveries[0], $date_, _("Voided."));
+                               add_voided_entry(ST_CUSTDELIVERY, $deliveries[0], $date_, "");
+                       }
+                       else
+                       {
+                               $srcdetails = get_sales_parent_lines($type, $type_no);
+                                       while ($row = db_fetch($srcdetails)) {
+                                       update_parent_line($type, $row['id'], -$row['quantity']);
+                               }
                        }
                }
        }
@@ -229,4 +272,65 @@ function void_sales_invoice($type, $type_no)
        commit_transaction();
 }
 
-?>
\ No newline at end of file
+function get_cust_prepayment_invoice_factor($trans_no)
+{
+       $sql = "SELECT IF(dt.prep_amount>0, dt.prep_amount/so.total ,0) 
+               FROM ".TB_PREF."debtor_trans dt
+               LEFT JOIN ".TB_PREF."sales_orders so ON so.trans_type=".ST_SALESORDER." AND so.order_no=dt.order_
+                WHERE dt.type=".ST_SALESINVOICE." AND trans_no=".db_escape($trans_no);
+       $row = db_fetch(db_query($sql, 'cannot retrieve prepaid invoice factor'));
+       return $row[0];
+}
+
+function prepaid_invoice_remainder($order)
+{
+       $sql = "SELECT so.total - IFNULL(SUM(inv.prep_amount),0) FROM "
+               .TB_PREF."sales_orders so,
+               ".TB_PREF."debtor_trans inv
+               LEFT JOIN ".TB_PREF."payment_terms pt ON inv.payment_terms=pt.terms_indicator
+               WHERE  so.order_no=".db_escape($order)
+                       ." AND so.trans_type=".ST_SALESORDER
+                       ." AND inv.type=".ST_SALESINVOICE
+                       ." AND inv.order_=so.order_no"
+                       ." AND pt.days_before_due<0";
+
+       $result = db_fetch(db_query($sql, "cannot find final invoice value"));
+       return $result[0];
+}
+
+/*
+       Find oldest delivery date for sales invoice
+*/
+function get_oldest_delivery_date($invoice_no)
+{
+       $sql = "SELECT MIN(trans.tran_date)
+                       FROM
+                               ".TB_PREF."debtor_trans_details del
+                       LEFT JOIN ".TB_PREF."debtor_trans_details inv
+                               ON inv.src_id=del.id
+                       LEFT JOIN ".TB_PREF."debtor_trans trans 
+                               ON trans.type=".ST_CUSTDELIVERY." AND trans.trans_no = del.debtor_trans_no
+                       WHERE
+                               inv.debtor_trans_type=".ST_SALESINVOICE
+                               ." AND inv.debtor_trans_no=".db_escape($invoice_no);
+       $res = db_query($sql, 'cannot find oldest delivery date');
+       $date = db_fetch($res);
+       return $date[0];
+}
+
+/*
+       Find oldest payment date for sales invoice
+*/
+function get_oldest_payment_date($invoice_no)
+{
+       $sql = "SELECT MIN(payment.tran_date)
+                       FROM
+                       ".TB_PREF."cust_allocations alloc,
+                       ".TB_PREF."debtor_trans payment
+                       WHERE
+                               alloc.trans_type_to=".ST_SALESINVOICE." AND alloc.trans_no_to=".db_escape($invoice_no)
+                       ." AND alloc.trans_type_from=payment.type AND alloc.trans_no_from=payment.trans_no";
+       $res = db_query($sql, 'cannot find oldest delivery date');
+       $date = db_fetch($res);
+       return $date[0];
+}

diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc
index 386e3b86b2a1213d8d6419ab2ad9998d0efa4056..1c363a6c0f5c0be5bb3d946fc894bb142b93fa17 100644 (file)
--- a/sales/includes/db/sales_order_db.inc
+++ b/sales/includes/db/sales_order_db.inc
@@ -22,7 +22,7 @@ function add_sales_order(&$order)
        $total = $order->get_trans_total();
        $sql = "INSERT INTO ".TB_PREF."sales_orders (order_no, type, debtor_no, trans_type, branch_code, customer_ref, reference, comments, ord_date,
                order_type, ship_via, deliver_to, delivery_address, contact_phone,
-               freight_cost, from_stk_loc, delivery_date, payment_terms, total)
+               freight_cost, from_stk_loc, delivery_date, payment_terms, total, prep_amount)
                VALUES (" .db_escape($order_no) . "," .db_escape($order_type) . "," . db_escape($order->customer_id) .
                 ", " .db_escape($order->trans_type) . "," .db_escape($order->Branch) . ", ".
                        db_escape($order->cust_ref) .",". 
@@ -38,7 +38,8 @@ function add_sales_order(&$order)
                        db_escape($order->Location) .", " .
                        db_escape($del_date) . "," .
                        db_escape($order->payment) . "," .
-                       db_escape($total). ")";
+                       db_escape($total) . "," .
+                       db_escape($order->prep_amount).")";
 
        db_query($sql, "order Cannot be Added");
 
@@ -91,8 +92,6 @@ function add_sales_order(&$order)
                if ($order->trans_type == ST_SALESORDER && $line->src_id)
                        update_parent_line(ST_SALESORDER, $line->src_id, $line->qty_dispatched); // clear all the quote despite all or the part was ordered
        } /* inserted line items into sales order details */
-       add_audit_trail($order->trans_type, $order_no, $order->document_date);
-       $Refs->save($order->trans_type, $order_no, $order->reference);
 
        add_audit_trail($order->trans_type, $order_no, $order->document_date);
        $Refs->save($order->trans_type, $order_no, $order->reference);
@@ -168,7 +167,8 @@ function update_sales_order($order)
        $total = $order->get_trans_total();
 
        begin_transaction();
-
+       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) . ",
@@ -186,15 +186,12 @@ function update_sales_order($order)
                delivery_date = " .db_escape($del_date). ",
                version = ".($version+1).",
                payment_terms = " .db_escape($order->payment). ",
-               total = ". db_escape($total) ."
+               total = ". db_escape($total). ",
+               prep_amount = ". db_escape($order->prep_amount) ."
         WHERE order_no=" . db_escape($order_no) ."
         AND trans_type=".$order->trans_type." AND version=".$version;
        db_query($sql, "order Cannot be Updated, this can be concurrent edition conflict");
 
-       $sql = "DELETE FROM ".TB_PREF."sales_order_details WHERE order_no =" . db_escape($order_no) . " AND trans_type=".$order->trans_type;
-
-       db_query($sql, "Old order Cannot be Deleted");
-
        if ($loc_notification == 1)
        {
                include_once($path_to_root . "/inventory/includes/inventory_db.inc");
@@ -232,23 +229,35 @@ function update_sales_order($order)
                                }
                        }
                }
-               $sql = "INSERT INTO ".TB_PREF."sales_order_details
-                (id, order_no, trans_type, stk_code,  description, unit_price, quantity,
-                 discount_percent, qty_sent)
-                VALUES (";
-               $sql .= db_escape($line->id ? $line->id : 0) . ","
-                 .$order_no . ",".$order->trans_type.","
-                 .db_escape($line->stock_id) . ","
-                 .db_escape($line->item_description) . ", "
-                 .db_escape($line->price) . ", "
-                 .db_escape($line->quantity) . ", "
-                 .db_escape($line->discount_percent) . ", "
-                 .db_escape($line->qty_done) ." )";
-
-               db_query($sql, "Old order Cannot be Inserted");
-
+               if (!$line->id) //new line
+                       $sql = "INSERT INTO ".TB_PREF."sales_order_details
+                        (order_no, trans_type, stk_code,  description, unit_price, quantity,
+                         discount_percent, qty_sent)
+                        VALUES (".$order_no . ",".$order->trans_type.","
+                                 .db_escape($line->stock_id) . ","
+                                 .db_escape($line->item_description) . ", "
+                                 .db_escape($line->price) . ", "
+                                 .db_escape($line->quantity) . ", "
+                                 .db_escape($line->discount_percent) . ", "
+                                 .db_escape($line->qty_done) ." )";
+               else
+               $sql = "UPDATE ".TB_PREF."sales_order_details
+                       SET id=".db_escape($line->id).",
+                               order_no=$order_no,
+                               trans_type=".$order->trans_type.",
+                               stk_code=".db_escape($line->stock_id).",
+                               description=".db_escape($line->item_description).",
+                               unit_price=".db_escape($line->price).",
+                               quantity=".db_escape($line->quantity).",
+                       discount_percent=".db_escape($line->discount_percent).",
+                           qty_sent=".db_escape($line->qty_done)."
+                        WHERE id = ".db_escape($line->id);
+
+               db_query($sql, "Old order Cannot be updated");
        } /* inserted line items into sales order details */
 
+       if ($order->trans_type == ST_SALESORDER)
+               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);
        commit_transaction();
@@ -289,8 +298,17 @@ function get_sales_order_header($order_no, $trans_type)
          ."ship.shipper_name, "
          ."tax_group.name AS tax_group_name , "
          ."tax_group.id AS tax_group_id, "
-         ."cust.tax_id "
-       ."FROM ".TB_PREF."sales_orders sorder, "
+         ."cust.tax_id,"
+         ."sorder.alloc,"
+         ."IFNULL(allocs.ord_allocs, 0)+IFNULL(inv.inv_allocs ,0) AS sum_paid,"
+         ."sorder.prep_amount>0 as prepaid"
+       ." FROM ".TB_PREF."sales_orders sorder
+                       LEFT JOIN (SELECT trans_no_to, sum(amt) ord_allocs FROM ".TB_PREF."cust_allocations
+                               WHERE trans_type_to=".ST_SALESORDER." AND trans_no_to=".db_escape($order_no).")
+                                allocs ON sorder.trans_type=".ST_SALESORDER." AND allocs.trans_no_to=sorder.order_no
+                       LEFT JOIN (SELECT order_, sum(alloc) inv_allocs FROM ".TB_PREF."debtor_trans 
+                               WHERE type=".ST_SALESINVOICE." AND order_=".db_escape($order_no).")
+                                inv ON sorder.trans_type=".ST_SALESORDER." AND inv.order_=sorder.order_no,"
          .TB_PREF."debtors_master cust,"
          .TB_PREF."sales_types stype, "
          .TB_PREF."tax_groups tax_group, "
@@ -374,6 +392,12 @@ function read_sales_order($order_no, &$order, $trans_type)
        $order->due_date = sql2date($myrow["delivery_date"]);
        $order->document_date = sql2date($myrow["ord_date"]);
 
+       $order->prepaid = $myrow["prepaid"];
+       $order->alloc = $myrow['alloc'];
+       $order->sum_paid = $myrow["sum_paid"]; // sum of all prepayments to so (also invoiced)
+       $order->prep_amount = $myrow["prep_amount"];
+       $order->prepayments = get_payments_for($order_no, $myrow['trans_type']);
+
        $result = get_sales_order_details($order_no, $order->trans_type);
        if (db_num_rows($result) > 0)
        {
@@ -437,8 +461,10 @@ function get_invoice_duedate($terms, $invdate)
 
        if ($myrow['day_in_following_month'] > 0)
                $duedate = add_days(end_month($invdate), $myrow['day_in_following_month']);
-       else
+       elseif ($myrow['days_before_due'] > 0)
                $duedate = add_days($invdate, $myrow['days_before_due']);
+       else
+               $duedate = $invdate;
        return $duedate;
 }
 
@@ -493,6 +519,14 @@ function get_branch_to_order($customer_id, $branch_id) {
            return db_query($sql,"Customer Branch Record Retreive");
 }
 
+/*
+       Supported filters:
+
+       InvoiceTemplates
+       DeliveryTemplates
+       OutstandingOnly
+       PrepaidOrders
+*/
 function get_sql_for_sales_orders_view($selected_customer, $trans_type, $trans_no, $filter, 
        $stock_item=null, $from='', $to='', $ref='', $location='', $customer_id=ALL_TEXT)
 {
@@ -512,8 +546,18 @@ function get_sql_for_sales_orders_view($selected_customer, $trans_type, $trans_n
                        sorder.type,
                        debtor.curr_code,
                        Sum(line.qty_sent) AS TotDelivered,
-                       Sum(line.quantity) AS TotQuantity
-               FROM ".TB_PREF."sales_orders as sorder, "
+                       Sum(line.quantity) AS TotQuantity,
+                       Sum(line.invoiced) AS TotInvoiced,
+                       alloc,
+                       prep_amount,
+                       allocs.ord_payments,
+                       inv.inv_payments,
+                       sorder.total
+               FROM ".TB_PREF."sales_orders as sorder
+               LEFT JOIN (SELECT trans_no_to, sum(amt) ord_payments FROM ".TB_PREF."cust_allocations WHERE trans_type_to=".ST_SALESORDER." GROUP BY trans_no_to)
+                        allocs ON sorder.trans_type=".ST_SALESORDER." AND allocs.trans_no_to=sorder.order_no
+               LEFT JOIN (SELECT order_, sum(prep_amount) inv_payments FROM ".TB_PREF."debtor_trans WHERE type=".ST_SALESINVOICE." GROUP BY order_)
+                                inv ON sorder.trans_type=".ST_SALESORDER." AND inv.order_=sorder.order_no,"
                        .TB_PREF."sales_order_details as line, "
                        .TB_PREF."debtors_master as debtor, "
                        .TB_PREF."cust_branch as branch
@@ -564,6 +608,9 @@ function get_sql_for_sales_orders_view($selected_customer, $trans_type, $trans_n
                if ($filter=='OutstandingOnly')
                        $sql .= " AND line.qty_sent < line.quantity";
 
+               if ($filter=='PrepaidOrders')
+                       $sql .= " AND prep_amount>0";
+
                elseif ($filter=='InvoiceTemplates' || $filter=='DeliveryTemplates')
                        $sql .= " AND sorder.type=1";
 
@@ -579,4 +626,36 @@ 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)
+{
+       $sql = "UPDATE ".TB_PREF."sales_order_details
+               SET invoiced = invoiced + ".(float)$qty_invoiced."
+               WHERE id=".db_escape($line_id);
+
+       db_query($sql, "The document detail record could not be updated with invoiced qty");
+       return true;
+}
+/*
+       Returns array of all issued invoices to sales order $order_no, optinally up to trans_no==$up_to
+*/
+function get_sales_order_invoices($order_no)
+{
+       $sql = "SELECT trans_no, dt.type as type, tran_date, reference, prep_amount
+           FROM ".TB_PREF."debtor_trans dt
+               LEFT JOIN ".TB_PREF."voided v ON v.type=dt.type AND v.id=dt.trans_no
+               WHERE ISNULL(v.id) AND dt.type=".ST_SALESINVOICE." AND dt.order_=".db_escape($order_no)
+               ." ORDER BY dt.tran_date, dt.reference, dt.trans_no";
+
+       return db_query($sql, "cannot retrieve sales invoices for sales order");
+}
+
+function is_sales_order_started($order_no)
+{
+       $sql = "SELECT count(*) FROM ".TB_PREF."sales_order_details WHERE order_no=".db_escape($order_no)." AND trans_type=".ST_SALESORDER
+               ." AND (invoiced!=0 OR qty_sent!=0)";
+
+       $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/sales_db.inc b/sales/includes/sales_db.inc
index e9410251065c33cf4a966ad902055fdcd00711d7..08175b186e7fddf9db0dc560491e654f1c67f918 100644 (file)
--- a/sales/includes/sales_db.inc
+++ b/sales/includes/sales_db.inc
@@ -11,6 +11,7 @@
 ***********************************************************************/
 include_once($path_to_root . "/includes/banking.inc");
 include_once($path_to_root . "/includes/db/inventory_db.inc");
+include_once($path_to_root . "/includes/db/allocations_db.inc");
 include_once($path_to_root . "/sales/includes/db/sales_order_db.inc");
 include_once($path_to_root . "/sales/includes/db/sales_credit_db.inc");
 include_once($path_to_root . "/sales/includes/db/sales_invoice_db.inc");
@@ -273,6 +274,7 @@ function read_sales_trans($doc_type, $trans_no, &$cart)
                        $myrow["tax_group_name"]);
 
                $cart->reference = $myrow["reference"];
+               $cart->prepaid = $myrow["prepaid"];
                $cart->order_no = $myrow["order_"];
                $cart->due_date = sql2date($myrow["due_date"]);
                $cart->document_date = sql2date($myrow["tran_date"]);
@@ -306,6 +308,8 @@ function read_sales_trans($doc_type, $trans_no, &$cart)
                                        @$myrow["src_id"]);
                        }
                }
+               $cart->prepayments = get_payments_for($trans_no, $doc_type);
+
        } // !newdoc
 
        return true;
@@ -405,5 +409,4 @@ function get_sales_child_documents($trans_type, $trans_no)
        return db_query($sql,"The related credit notes could not be retreived");
 }
 
-
 ?>
\ No newline at end of file

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index c9e63a1523c6f68a951687a14631c4642901c861..2170595a986968b819ff621cb729f4906cc8c4d4 100644 (file)
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -119,7 +119,7 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
        if ($order->trans_type == ST_SALESINVOICE || $order->trans_type == ST_SALESORDER) {
                $order->due_date = get_invoice_duedate($order->payment, $order->document_date);
        }
-       if($order->payment_terms['cash_sale']) {
+       if ($order->payment_terms['cash_sale']) {
                $order->set_location($order->pos["pos_location"], $order->pos["location_name"]);
        } else
                $order->set_location($myrow["default_location"], $myrow["location_name"]);
@@ -386,7 +386,8 @@ function display_order_header(&$order, $editable, $date_text)
        label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
 
        table_section(3);
-       if ($order->pos['cash_sale'] || $order->pos['credit_sale']) {
+       if (($order->pos['cash_sale'] || $order->pos['credit_sale']) 
+               && !$order->is_started()) {
                 // editable payment type 
                if (get_post('payment') !== $order->payment) {
                        $order->payment = get_post('payment');
@@ -402,11 +403,10 @@ function display_order_header(&$order, $editable, $date_text)
                $paymcat = !$order->pos['cash_sale'] ? PM_CREDIT : 
                        (!$order->pos['credit_sale'] ? PM_CASH : PM_ANY);
                // all terms are available for SO
-               sale_payment_list_cells(_('Payment:'), 'payment', 
-                       (in_array($order->trans_type, array(ST_SALESQUOTE, ST_SALESORDER)) 
-                       ? PM_ANY : $paymcat), null);
+               $is_order = in_array($order->trans_type, array(ST_SALESQUOTE, ST_SALESORDER));
+               sale_payment_list_cells(_('Payment:'), 'payment', $is_order ? PM_ANY : $paymcat, null, true, $is_order);
        } else {
-               label_cells(_('Payment:'), $order->payment_terms['terms']);
+               label_cells(_('Payment:'), $order->payment_terms['terms'], "class='label'");
        }
 
        if($editable) {
@@ -615,6 +615,14 @@ function display_delivery_details(&$order)
                table_section(1);
 
                locations_list_row(_("Deliver from Location:"), 'Location', null, false, true);
+               if ($order->payment_terms['days_before_due'] < 0)
+               {
+                       $Ajax->addUpdate('items_table', 'prep_amount', price_format($order->get_trans_total())); // bind to items_table update
+                       if (!$order->is_started())
+                               amount_row(_("Pre-Payment Required:"), 'prep_amount');
+                       else
+                               label_row(_("Pre-Payment Required:"), price_format($order->prep_amount), "class='label'");
+               }
                if (list_updated('Location'))
                        $Ajax->activate('items_table');
 

diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php
index 45815855d05b5c4471fd73730b2e8d0f271e8519..fedec4c48ab85c668d30d26ab5892c4f2342aad7 100644 (file)
--- a/sales/inquiry/customer_allocation_inquiry.php
+++ b/sales/inquiry/customer_allocation_inquiry.php
@@ -103,7 +103,7 @@ function alloc_link($row)
                return $link;
        }
        elseif (($row["type"] == ST_CUSTPAYMENT || $row["type"] == ST_BANKDEPOSIT) &&
-               ($row['TotalAmount'] - $row['Allocated']) > 0)
+               (floatcmp($row['TotalAmount'], $row['Allocated']) > 0))
        {
                /*its a receipt  which could have an allocation*/
                return $link;

diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index f8309de9789b3e6de565f41b340ba6e95adf667d..7a7bbbab3d6f474d627db2d898fd673b83acae88 100644 (file)
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -20,9 +20,13 @@ $page_security = 'SA_SALESTRANSVIEW';
 
 set_page_security( @$_POST['order_view_mode'],
        array(  'OutstandingOnly' => 'SA_SALESDELIVERY',
-                       'InvoiceTemplates' => 'SA_SALESINVOICE'),
+                       'InvoiceTemplates' => 'SA_SALESINVOICE',
+                       'DeliveryTemplates' => 'SA_SALESDELIVERY',
+                       'PrepaidOrders' => 'SA_SALESINVOICE'),
        array(  'OutstandingOnly' => 'SA_SALESDELIVERY',
-                       'InvoiceTemplates' => 'SA_SALESINVOICE')
+                       'InvoiceTemplates' => 'SA_SALESINVOICE',
+                       'DeliveryTemplates' => 'SA_SALESDELIVERY',
+                       'PrepaidOrders' => 'SA_SALESINVOICE')
 );
 
 if (get_post('type'))
@@ -49,6 +53,11 @@ if ($trans_type == ST_SALESORDER)
                $_POST['order_view_mode'] = 'DeliveryTemplates';
                $_SESSION['page_title'] = _($help_context = "Select Template for Delivery");
        }
+       elseif (isset($_GET['PrepaidOrders']) && ($_GET['PrepaidOrders'] == true))
+       {
+               $_POST['order_view_mode'] = 'PrepaidOrders';
+               $_SESSION['page_title'] = _($help_context = "Invoicing Prepayment Orders");
+       }
        elseif (!isset($_POST['order_view_mode']))
        {
                $_POST['order_view_mode'] = false;
@@ -131,10 +140,14 @@ function edit_link($row)
 function dispatch_link($row)
 {
        global $trans_type;
+
+       if ($row['ord_payments'] + $row['inv_payments'] < $row['prep_amount'])
+               return '';
+
        if ($trans_type == ST_SALESORDER)
                return pager_link( _("Dispatch"),
                        "/sales/customer_delivery.php?OrderNumber=" .$row['order_no'], ICON_DOC);
-       else            
+       else
                return pager_link( _("Sales Order"),
                        "/sales/sales_order_entry.php?OrderNumber=" .$row['order_no'], ICON_DOC);
 }
@@ -178,6 +191,16 @@ function tmpl_checkbox($row)
        _('Set this order as a template for direct deliveries/invoices'))
        . hidden('last['.$row['order_no'].']', $value, false);
 }
+
+function invoice_prep_link($row)
+{
+       // invoicing should be available only for partially allocated orders
+       return 
+               $row['inv_payments'] < $row['total'] ?
+               pager_link($row['ord_payments']  ? _("Prepayment Invoice") : _("Final Invoice"),
+               "/sales/customer_invoice.php?InvoicePrepayments=" .$row['order_no'], $row['ord_payments']  ? ICON_MONEY : ICON_DOC) : '';
+}
+
 //---------------------------------------------------------------------------------------------
 // Update db record if respective checkbox value has changed.
 //
@@ -299,6 +322,10 @@ if ($_POST['order_view_mode'] == 'OutstandingOnly') {
        array_append($cols, array(
                        array('insert'=>true, 'fun'=>'delivery_link'))
        );
+} else if ($_POST['order_view_mode'] == 'PrepaidOrders') {
+       array_append($cols, array(
+                       array('insert'=>true, 'fun'=>'invoice_prep_link'))
+       );
 
 } elseif ($trans_type == ST_SALESQUOTE) {
         array_append($cols,array(

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 25d804fd5bf572ef14d0cdb3e779ff2e62545cd0..a2e8f020c11976ebeec634e8cd97da839230ea5e 100644 (file)
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -253,6 +253,7 @@ function copy_to_cart()
                        $cart->phone = $cart->cust_ref = $cart->delivery_address = '';
                        $cart->ship_via = 1;
                        $cart->deliver_to = '';
+                       $cart->prep_amount = 0;
                }
        } else {
                $cart->due_date = $_POST['delivery_date'];
@@ -261,6 +262,8 @@ function copy_to_cart()
                $cart->delivery_address = $_POST['delivery_address'];
                $cart->phone = $_POST['phone'];
                $cart->ship_via = $_POST['ship_via'];
+               if (!$cart->trans_no || ($cart->trans_type == ST_SALESORDER && !$cart->is_started()))
+                       $cart->prep_amount = input_num('prep_amount', 0);
        }
        $cart->Location = $_POST['Location'];
        $cart->freight_cost = input_num('freight_cost');
@@ -301,6 +304,7 @@ function copy_from_cart()
 
        $_POST['branch_id'] = $cart->Branch;
        $_POST['sales_type'] = $cart->sales_type;
+       $_POST['prep_amount'] = price_format($cart->prep_amount);
        // POS 
        $_POST['payment'] = $cart->payment;
        if ($cart->trans_type!=ST_SALESORDER && $cart->trans_type!=ST_SALESQUOTE) { // 2008-11-12 Joe Hunt
@@ -353,11 +357,17 @@ function can_process() {
                return false;
        }
        if ($_SESSION['Items']->payment_terms['cash_sale'] == 0) {
-       if (strlen($_POST['deliver_to']) <= 1) {
-               display_error(_("You must enter the person or company to whom delivery should be made to."));
-               set_focus('deliver_to');
-               return false;
-       }
+               if (!$_SESSION['Items']->is_started() && ($_SESSION['Items']->payment_terms['days_before_due'] < 0) && ((input_num('prep_amount')<=0) ||
+                       input_num('prep_amount')>$_SESSION['Items']->get_trans_total())) {
+                       display_error(_("Pre-payment required have to be positive and less than total amount."));
+                       set_focus('prep_amount');
+                       return false;
+               }
+               if (strlen($_POST['deliver_to']) <= 1) {
+                       display_error(_("You must enter the person or company to whom delivery should be made to."));
+                       set_focus('deliver_to');
+                       return false;
+               }
 
 
                if ($_SESSION['Items']->trans_type != ST_SALESQUOTE && strlen($_POST['delivery_address']) <= 1) {
@@ -691,8 +701,7 @@ if ($_SESSION['Items']->trans_type == ST_SALESINVOICE) {
 start_form();
 
 hidden('cart_id');
-$customer_error = display_order_header($_SESSION['Items'],
-       ($_SESSION['Items']->any_already_delivered() == 0), $idate);
+$customer_error = display_order_header($_SESSION['Items'], !$_SESSION['Items']->is_started(), $idate);
 
 if ($customer_error == "") {
        start_table(TABLESTYLE, "width=80%", 10);

diff --git a/sales/view/view_invoice.php b/sales/view/view_invoice.php
index d6a6cb7aba96ed7b5874430f4309d74b1299fb37..6f7de98ae57e116528d70b40498204d500c475d6 100644 (file)
--- a/sales/view/view_invoice.php
+++ b/sales/view/view_invoice.php
@@ -35,12 +35,14 @@ elseif (isset($_POST["trans_no"]))
 // 3 different queries to get the information - what a JOKE !!!!
 
 $myrow = get_customer_trans($trans_id, ST_SALESINVOICE);
+$paym = get_payment_terms($myrow['payment_terms']);
 
 $branch = get_branch($myrow["branch_code"]);
 
 $sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER);
 
-display_heading(sprintf(_("SALES INVOICE #%d"),$trans_id));
+display_heading(sprintf($myrow['prep_amount'] > 0 ? (
+       $paym['days_before_due']>=0 ? _("FINAL INVOICE #%d") : _("PREPAYMENT INVOICE #%d")) : _("SALES INVOICE #%d"),$trans_id));
 
 echo "<br>";
 start_table(TABLESTYLE2, "width=95%");
@@ -73,7 +75,6 @@ echo "</td><td>"; // outer table
 start_table(TABLESTYLE, "width=100%");
 $th = array(_("Payment Terms"));
 table_header($th); 
-$paym = get_payment_terms($myrow['payment_terms']);
 label_row(null, $paym["terms"], "nowrap");
 end_table();
 
@@ -92,10 +93,11 @@ label_cells(_("Shipping Company"), $myrow["shipper_name"], "class='tableheader2'
 label_cells(_("Sales Type"), $myrow["sales_type"], "class='tableheader2'");
 end_row();
 start_row();
-label_cells(_("Invoice Date"), sql2date($myrow["tran_date"]), "class='tableheader2'", "nowrap");
 label_cells(_("Due Date"), sql2date($myrow["due_date"]), "class='tableheader2'", "nowrap");
-label_cells(_("Deliveries"), get_customer_trans_view_str(ST_CUSTDELIVERY, 
-       get_sales_parent_numbers(ST_SALESINVOICE, $trans_id)), "class='tableheader2'");
+if ($myrow['prep_amount']==0)
+       label_cells(_("Deliveries"), get_customer_trans_view_str(ST_CUSTDELIVERY, 
+               get_sales_parent_numbers(ST_SALESINVOICE, $trans_id)), "class='tableheader2'");
+label_cells(_("Invoice Date"), sql2date($myrow["tran_date"]), "class='tableheader2'", "nowrap");
 end_row();
 comments_display_row(ST_SALESINVOICE, $trans_id);
 end_table();

diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index 712c5470981912b20319bbf9d06120b90a07db7c..260a82ab17454013269653b409af591104de4f39 100644 (file)
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -75,12 +75,25 @@ label_cells(_("Order Currency"), $_SESSION['View']->customer_currency, "class='t
 label_cells(_("Deliver From Location"), $_SESSION['View']->location_name, "class='tableheader2'");
 end_row();
 
-label_row(_("Payment Terms"), $_SESSION['View']->payment_terms['terms'], "class='tableheader2'", "colspan=3");
+
+if ($_SESSION['View']->payment_terms['days_before_due']<0)
+{
+start_row();
+label_cells(_("Payment Terms"), $_SESSION['View']->payment_terms['terms'], "class='tableheader2'");
+label_cells(_("Required Pre-Payment"), price_format($_SESSION['View']->prep_amount), "class='tableheader2'");
+end_row();
+start_row();
+label_cells(_("Non-Invoiced Prepayments"), price_format($_SESSION['View']->alloc), "class='tableheader2'");
+label_cells(_("All Payments Allocated"), price_format($_SESSION['View']->sum_paid), "class='tableheader2'");
+end_row();
+} else
+       label_row(_("Payment Terms"), $_SESSION['View']->payment_terms['terms'], "class='tableheader2'", "colspan=3");
+
 label_row(_("Delivery Address"), nl2br($_SESSION['View']->delivery_address),
        "class='tableheader2'", "colspan=3");
 label_row(_("Reference"), $_SESSION['View']->reference, "class='tableheader2'", "colspan=3");
 label_row(_("Telephone"), $_SESSION['View']->phone, "class='tableheader2'", "colspan=3");
-label_row(_("E-mail"), "<a href='mailto:" . $_SESSION['View']->email . "'>" . $_SESSION['View']->email . "</a>",
+;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");
 end_table();
@@ -132,15 +145,20 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
        $inv_numbers = array();
        $invoices_total = 0;
 
-       if ($result = get_sales_child_documents(ST_CUSTDELIVERY, $dn_numbers)) {
+       if ($_SESSION['View']->prepaid)
+               $result = get_sales_order_invoices($_GET['trans_no']);
+       else
+               $result = get_sales_child_documents(ST_CUSTDELIVERY, $dn_numbers);
 
+       if ($result) {
                $k = 0;
 
                while ($inv_row = db_fetch($result))
                {
                        alt_table_row_color($k);
 
-                       $this_total = $inv_row["ov_freight"] + $inv_row["ov_freight_tax"]  + $inv_row["ov_gst"] + $inv_row["ov_amount"];
+                       $this_total = $_SESSION['View']->prepaid ? $inv_row["prep_amount"] : 
+                               $inv_row["ov_freight"] + $inv_row["ov_freight_tax"]  + $inv_row["ov_gst"] + $inv_row["ov_amount"];
                        $invoices_total += $this_total;
 
                        $inv_numbers[] = $inv_row["trans_no"];
@@ -160,10 +178,10 @@ if ($_GET['trans_type'] != ST_SALESQUOTE)
        start_table(TABLESTYLE);
        $th = array(_("#"), _("Ref"), _("Date"), _("Total"));
        table_header($th);
-       
+
        $credits_total = 0;
-       
-       if ($result = get_sales_child_documents(ST_SALESINVOICE, $inv_numbers)) {
+
+       if (get_sales_child_documents(ST_SALESINVOICE, $inv_numbers)) {
                $k = 0;
 
                while ($credits_row = db_fetch($result))
@@ -244,7 +262,9 @@ start_row();
 label_cells(_("Amount Total"), $display_total, "colspan=6 align='right'","align='right'");
 label_cell('', "colspan=2");
 end_row();
-end_table(2);
+end_table();
+
+display_allocations_to(PT_CUSTOMER, $_SESSION['View']->customer_id, $_GET['trans_type'], $_GET['trans_no'], $sub_tot + $tax_total);
 
 end_page(true, false, false, $_GET['trans_type'], $_GET['trans_no']);
 

diff --git a/sql/alter2.4.sql b/sql/alter2.4.sql
index 2d816bc3c1638d64fe42f4f71052631ec586de58..5c44d3795c5b80a2931d85a330850fb1aa68e997 100644 (file)
--- a/sql/alter2.4.sql
+++ b/sql/alter2.4.sql
@@ -47,3 +47,25 @@ ALTER TABLE `0_bank_accounts` ADD COLUMN `bank_charge_act` varchar(15) NOT NULL
 UPDATE `0_bank_accounts` SET `bank_charge_act`=(SELECT `value` FROM 0_sys_prefs WHERE name='bank_charge_act');
 
 ALTER TABLE `0_users` ADD `transaction_days` INT( 6 ) NOT NULL default '30' COMMENT 'Transaction days' AFTER `startup_tab`;
+
+ALTER TABLE `0_purch_orders` ADD COLUMN `prep_amount` double NOT NULL DEFAULT 0 AFTER `total`;
+ALTER TABLE `0_purch_orders` ADD COLUMN `alloc` double NOT NULL DEFAULT 0 AFTER `prep_amount`;
+
+ALTER TABLE `0_sales_orders` ADD COLUMN `prep_amount` double NOT NULL DEFAULT 0 AFTER `total`;
+ALTER TABLE `0_sales_orders` ADD COLUMN `alloc` double NOT NULL DEFAULT 0 AFTER `prep_amount`;
+
+ALTER TABLE `0_cust_allocations` ADD  UNIQUE KEY(`trans_type_from`,`trans_no_from`,`trans_type_to`,`trans_no_to`);
+ALTER TABLE `0_supp_allocations` ADD  UNIQUE KEY(`trans_type_from`,`trans_no_from`,`trans_type_to`,`trans_no_to`);
+
+ALTER TABLE `0_sales_order_details` ADD COLUMN `invoiced` double NOT NULL DEFAULT 0 AFTER `quantity`;
+
+# update sales_order_details.invoiced with sum of invoiced quantities on all related SI
+UPDATE `0_sales_order_details` so
+       LEFT JOIN `0_debtor_trans_details` delivery ON delivery.`debtor_trans_type`=13 AND src_id=so.id
+       LEFT JOIN (SELECT src_id, sum(quantity) as qty FROM `0_debtor_trans_details` WHERE `debtor_trans_type`=10 GROUP BY src_id) inv
+               ON inv.src_id=delivery.id
+       SET `invoiced` = `invoiced`+inv.qty;
+
+ALTER TABLE `0_debtor_trans` ADD COLUMN `prep_amount` double NOT NULL DEFAULT 0 AFTER `alloc`;
+
+INSERT INTO `0_sys_prefs` VALUES ('deferred_income_act', 'glsetup.sales', 'varchar', '15', '');

diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql
index 9819ca99dbf0fe0a65ea2c8faa61daa3015b65ea..3fa13d5ad800c6c7f310857b748e3df6f610d86d 100644 (file)
--- a/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@ -574,7 +574,8 @@ CREATE TABLE IF NOT EXISTS `0_cust_allocations` (
   `trans_type_from` int(11) default NULL,
   `trans_no_to` int(11) default NULL,
   `trans_type_to` int(11) default NULL,
-  PRIMARY KEY  (`id`),
+  PRIMARY KEY (`id`),
+  UNIQUE KEY (`trans_type_from`,`trans_no_from`,`trans_type_to`,`trans_no_to`),
   KEY `From` (`trans_type_from`,`trans_no_from`),
   KEY `To` (`trans_type_to`,`trans_no_to`)
 ) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
@@ -689,6 +690,7 @@ CREATE TABLE IF NOT EXISTS `0_debtor_trans` (
   `ov_freight_tax` double NOT NULL default '0',
   `ov_discount` double NOT NULL default '0',
   `alloc` double NOT NULL default '0',
+  `prep_amount` double NOT NULL DEFAULT '0',
   `rate` double NOT NULL default '1',
   `ship_via` int(11) default NULL,
   `dimension_id` int(11) NOT NULL default '0',
@@ -704,14 +706,14 @@ CREATE TABLE IF NOT EXISTS `0_debtor_trans` (
 -- Dumping data for table `0_debtor_trans`
 --
 
-INSERT INTO `0_debtor_trans` VALUES(17, 10, 0, 2, 2, '2009-06-21', '2009-06-22', '1', 1, 2, 50, 2.5, 0, 0, 0, 0, 1, 1, 0, 0, 4, 0);
-INSERT INTO `0_debtor_trans` VALUES(18, 10, 1, 3, 3, '2009-06-21', '2009-07-01', '2', 2, 3, 35.89, 1.79, 0, 0, 0, 37.68, 1.3932, 1, 2, 0, 3, 0);
-INSERT INTO `0_debtor_trans` VALUES(19, 10, 0, 2, 2, '2009-06-21', '2009-06-22', '3', 1, 5, 50, 0, 5, 0, 0, 0, 1, 1, 0, 0, 4, 0);
-INSERT INTO `0_debtor_trans` VALUES(3, 11, 0, 3, 3, '2009-06-21', '0000-00-00', '1', 2, 3, 35.89, 1.79, 0, 0, 0, 37.68, 1.3932, 1, 2, 0, 3, 0);
-INSERT INTO `0_debtor_trans` VALUES(2, 13, 0, 1, 1, '2009-06-21', '2009-06-22', '1', 2, 1, 60.8, 0, 10, 0, 0, 0, 1.6445729799917, 1, 0, 0, 3, 0);
-INSERT INTO `0_debtor_trans` VALUES(3, 13, 1, 2, 2, '2009-06-21', '2009-06-22', 'auto', 1, 2, 50, 2.5, 0, 0, 0, 0, 1, 1, 0, 0, 4, 0);
-INSERT INTO `0_debtor_trans` VALUES(4, 13, 1, 3, 3, '2009-06-21', '2009-07-01', 'auto', 2, 3, 35.89, 1.79, 0, 0, 0, 0, 1.3932, 1, 2, 0, 3, 0);
-INSERT INTO `0_debtor_trans` VALUES(5, 13, 1, 2, 2, '2009-06-21', '2009-06-22', 'auto', 1, 5, 50, 0, 5, 0, 0, 0, 1, 1, 0, 0, 4, 0);
+INSERT INTO `0_debtor_trans` VALUES(17, 10, 0, 2, 2, '2009-06-21', '2009-06-22', '1', 1, 2, 50, 2.5, 0, 0, 0, 0, 0, 1, 1, 0, 0, 4, 0);
+INSERT INTO `0_debtor_trans` VALUES(18, 10, 1, 3, 3, '2009-06-21', '2009-07-01', '2', 2, 3, 35.89, 1.79, 0, 0, 0, 37.68, 0, 1.3932, 1, 2, 0, 3, 0);
+INSERT INTO `0_debtor_trans` VALUES(19, 10, 0, 2, 2, '2009-06-21', '2009-06-22', '3', 1, 5, 50, 0, 5, 0, 0, 0, 0, 1, 1, 0, 0, 4, 0);
+INSERT INTO `0_debtor_trans` VALUES(3, 11, 0, 3, 3, '2009-06-21', '0000-00-00', '1', 2, 3, 35.89, 1.79, 0, 0, 0, 37.68, 0, 1.3932, 1, 2, 0, 3, 0);
+INSERT INTO `0_debtor_trans` VALUES(2, 13, 0, 1, 1, '2009-06-21', '2009-06-22', '1', 2, 1, 60.8, 0, 10, 0, 0, 0, 0, 1.6445729799917, 1, 0, 0, 3, 0);
+INSERT INTO `0_debtor_trans` VALUES(3, 13, 1, 2, 2, '2009-06-21', '2009-06-22', 'auto', 1, 2, 50, 2.5, 0, 0, 0, 0, 0, 1, 1, 0, 0, 4, 0);
+INSERT INTO `0_debtor_trans` VALUES(4, 13, 1, 3, 3, '2009-06-21', '2009-07-01', 'auto', 2, 3, 35.89, 1.79, 0, 0, 0, 0, 0, 1.3932, 1, 2, 0, 3, 0);
+INSERT INTO `0_debtor_trans` VALUES(5, 13, 1, 2, 2, '2009-06-21', '2009-06-22', 'auto', 1, 5, 50, 0, 5, 0, 0, 0, 0, 1, 1, 0, 0, 4, 0);
 
 -- --------------------------------------------------------
 
@@ -1338,6 +1340,8 @@ CREATE TABLE IF NOT EXISTS `0_purch_orders` (
   `into_stock_location` varchar(5) NOT NULL default '',
   `delivery_address` tinytext NOT NULL,
   `total` double NOT NULL default '0',
+  `prep_amount` double NOT NULL DEFAULT '0',
+  `alloc` double NOT NULL DEFAULT '0',
   `tax_included` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`order_no`),
   KEY `ord_date` (`ord_date`)
@@ -1347,8 +1351,8 @@ CREATE TABLE IF NOT EXISTS `0_purch_orders` (
 -- Dumping data for table `0_purch_orders`
 --
 
-INSERT INTO `0_purch_orders` VALUES(1, 2, '', '2009-06-01', '1', '', 'DEF', 'Delivery 1\nDelivery 2\nDelivery 3', 0, 0);
-INSERT INTO `0_purch_orders` VALUES(2, 3, '', '2009-06-21', '2', '', 'DEF', 'Delivery 1\nDelivery 2\nDelivery 3', 0, 0);
+INSERT INTO `0_purch_orders` VALUES(1, 2, '', '2009-06-01', '1', '', 'DEF', 'Delivery 1\nDelivery 2\nDelivery 3', 0, 0, 0, 0);
+INSERT INTO `0_purch_orders` VALUES(2, 3, '', '2009-06-21', '2', '', 'DEF', 'Delivery 1\nDelivery 2\nDelivery 3', 0, 0, 0, 0);
 
 -- --------------------------------------------------------
 
@@ -1545,6 +1549,8 @@ CREATE TABLE IF NOT EXISTS `0_sales_orders` (
   `delivery_date` date NOT NULL default '0000-00-00',
   `payment_terms` int(11) default NULL,
   `total` double NOT NULL default '0',
+  `prep_amount` double NOT NULL DEFAULT '0',
+  `alloc` double NOT NULL DEFAULT '0',
   PRIMARY KEY  (`trans_type`,`order_no`)
 ) ENGINE=InnoDB;
 
@@ -1552,11 +1558,11 @@ CREATE TABLE IF NOT EXISTS `0_sales_orders` (
 -- Dumping data for table `0_sales_orders`
 --
 
-INSERT INTO `0_sales_orders` VALUES(1, 30, 1, 0, 1, 1, '1', '', '', '2009-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Beefeater Ltd.', 10, 'DEF', '2009-06-22', 3, 0);
-INSERT INTO `0_sales_orders` VALUES(2, 30, 1, 0, 2, 2, '2', '', '', '2009-06-21', 1, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Ghostbusters Corp.', 0, 'DEF', '2009-06-22', 4, 0);
-INSERT INTO `0_sales_orders` VALUES(3, 30, 1, 0, 3, 3, '3', '', '', '2009-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Brezan', 0, 'DEF', '2009-07-01', 3, 0);
-INSERT INTO `0_sales_orders` VALUES(4, 30, 0, 0, 1, 1, '4', '', '', '2009-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Beefeater Ltd.', 0, 'DEF', '2009-06-22', 3, 0);
-INSERT INTO `0_sales_orders` VALUES(5, 30, 1, 0, 2, 2, '5', '', '', '2009-06-21', 1, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Ghostbusters Corp.', 5, 'DEF', '2009-06-22', 4, 0);
+INSERT INTO `0_sales_orders` VALUES(1, 30, 1, 0, 1, 1, '1', '', '', '2009-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Beefeater Ltd.', 10, 'DEF', '2009-06-22', 3, 0, 0, 0);
+INSERT INTO `0_sales_orders` VALUES(2, 30, 1, 0, 2, 2, '2', '', '', '2009-06-21', 1, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Ghostbusters Corp.', 0, 'DEF', '2009-06-22', 4, 0, 0, 0);
+INSERT INTO `0_sales_orders` VALUES(3, 30, 1, 0, 3, 3, '3', '', '', '2009-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Brezan', 0, 'DEF', '2009-07-01', 3, 0, 0, 0);
+INSERT INTO `0_sales_orders` VALUES(4, 30, 0, 0, 1, 1, '4', '', '', '2009-06-21', 2, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Beefeater Ltd.', 0, 'DEF', '2009-06-22', 3, 0, 0, 0);
+INSERT INTO `0_sales_orders` VALUES(5, 30, 1, 0, 2, 2, '5', '', '', '2009-06-21', 1, 1, 'Address 1\nAddress 2\nAddress 3', '', '', 'Ghostbusters Corp.', 5, 'DEF', '2009-06-22', 4, 0, 0, 0);
 
 -- --------------------------------------------------------
 
@@ -1921,6 +1927,7 @@ CREATE TABLE IF NOT EXISTS `0_supp_allocations` (
   `trans_no_to` int(11) default NULL,
   `trans_type_to` int(11) default NULL,
   PRIMARY KEY  (`id`),
+  UNIQUE KEY(`trans_type_from`,`trans_no_from`,`trans_type_to`,`trans_no_to`),
   KEY `From` (`trans_type_from`,`trans_no_from`),
   KEY `To` (`trans_type_to`,`trans_no_to`)
 ) ENGINE=InnoDB  AUTO_INCREMENT=2 ;
@@ -2076,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 ('deferred_income_act', 'glsetup.sales', 'varchar', '15', '');
 
 -- --------------------------------------------------------
 

diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql
index 69d6b9971f755e205b1689f217b34c51d583548f..c4becdf6b59d1e37fa22961c343cf8ae7cff9262 100644 (file)
--- a/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@ -541,6 +541,7 @@ CREATE TABLE IF NOT EXISTS `0_cust_allocations` (
   `trans_no_to` int(11) default NULL,
   `trans_type_to` int(11) default NULL,
   PRIMARY KEY  (`id`),
+  UNIQUE KEY(`trans_type_from`,`trans_no_from`,`trans_type_to`,`trans_no_to`),
   KEY `From` (`trans_type_from`,`trans_no_from`),
   KEY `To` (`trans_type_to`,`trans_no_to`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 ;
@@ -648,6 +649,7 @@ CREATE TABLE IF NOT EXISTS `0_debtor_trans` (
   `ov_freight_tax` double NOT NULL default '0',
   `ov_discount` double NOT NULL default '0',
   `alloc` double NOT NULL default '0',
+  `prep_amount` double NOT NULL DEFAULT '0',
   `rate` double NOT NULL default '1',
   `ship_via` int(11) default NULL,
   `dimension_id` int(11) NOT NULL default '0',
@@ -1169,6 +1171,8 @@ CREATE TABLE IF NOT EXISTS `0_purch_orders` (
   `into_stock_location` varchar(5) NOT NULL default '',
   `delivery_address` tinytext NOT NULL,
   `total` double NOT NULL default '0',
+  `prep_amount` double NOT NULL DEFAULT '0',
+  `alloc` double NOT NULL DEFAULT '0',
   `tax_included` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`order_no`),
   KEY `ord_date` (`ord_date`)
@@ -1367,6 +1371,8 @@ CREATE TABLE IF NOT EXISTS `0_sales_orders` (
   `delivery_date` date NOT NULL default '0000-00-00',
   `payment_terms` int(11) default NULL,
   `total` double NOT NULL default '0',
+  `prep_amount` double NOT NULL DEFAULT '0',
+  `alloc` double NOT NULL DEFAULT '0',
   PRIMARY KEY  (`trans_type`,`order_no`)
 ) ENGINE=InnoDB;
 
@@ -1689,6 +1695,7 @@ CREATE TABLE IF NOT EXISTS `0_supp_allocations` (
   `trans_no_to` int(11) default NULL,
   `trans_type_to` int(11) default NULL,
   PRIMARY KEY  (`id`),
+  UNIQUE KEY(`trans_type_from`,`trans_no_from`,`trans_type_to`,`trans_no_to`),
   KEY `From` (`trans_type_from`,`trans_no_from`),
   KEY `To` (`trans_type_to`,`trans_no_to`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 ;
@@ -1835,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('deferred_income_act', 'glsetup.sales', 'varchar', '15', '');
 
 -- --------------------------------------------------------