Merged changes from main CVS up to 2.1.5

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 74e657f488df8f15c64b724ed359f18b8499fa60..5a65f2cbdbac2c1f015ee926626b5fff197de193 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,45 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+26-Aug-2009 Janusz Dobrowolski
+! Merged changes from main trunk  2.1.4-2.1.5 (see below)
+
+$ /config.php
+  /includes/ui/ui_view.inc
+  /includes/current_user.inc
+  /includes/ui/ui_input.inc
+  /inventory/purchasing_data.php
+  /install/save.php
+  /gl/manage/gl_accounts.php
+  /gl/includes/gl_db_accounts.inc
+  /gl/includes/db/gl_db_bank_accounts.inc
+  /gl/manage/gl_quick_entries.php
+  /gl/manage/gl_account_classes.php
+  /gl/includes/db/gl_db_bank_trans.inc
+  /purchasing/includes/db/invoice_db.inc
+  /purchasing/includes/ui/invoice_ui.inc
+  /purchasing/includes/ui/po_ui.inc
+  /purchasing/includes/supp_trans_class.inc
+  /purchasing/po_receive_items.php
+  /purchasing/view/view_grn.php
+  /purchasing/view/view_po.php
+  /purchasing/supplier_payment.php
+  /purchasing/includes/purchasing_db.inc
+  /purchasing/includes/db/invoice_db.inc
+  /reporting/reports_main.php
+  /reporting/includes/header2.inc
+  /reporting/rep209.php
+  /reporting/rep109.php
+  /reporting/rep702.php
+  /sales/customer_payments.php
+  /sales/customer_credit_invoice.php
+  /sales/customer_delivery.php
+  /sales/customer_invoice.php
+  /sales/includes/db/payments_db.inc
+  /sales/includes/db/sales_order_db.inc
+  /sales/manage/sales_points.php
+  /taxes/tax_calc.inc
+
 26-Aug-2009 Joe Hunt
 # Changed the text Manifactoring => Manifacturing
 $ /reporting/reports_main.php
@@ -963,6 +1002,109 @@ $ /.htaccess
   /sales/inquiry/sales_deliveries_view.php
   /sales/inquiry/sales_orders_view.php
 
+------------------------------- Release 2.1.5 ----------------------------------
+26-Aug-2009 Joe Hung
+! Release 2.1.5
+$ config.php
+# If no dimensions in system, then there were 2 destination selectors in report Balance Sheet
+$ /reporting/reports_main.php
+! Code cleanup
+$ /taxes/tax_calc.inc
+  /lang/new_language_template/LC_MESSAGES/empty.po (new extraction)
+  
+24-Aug-2009 Joe Hunt
+# A Purchasing Price of 12.34 with a conversion factor of 100,0000 caused a false internal rounding error of 12.00.
+! The Purchasing Price, price can now have up to 6 decimals (fractions of hundredth's) and are presented correctly.
+  If you need to increase the decimals in a current value, then you have to delete it and create it again with new values.
+  This is for safety reasons.
+$ /includes/current_user.inc
+  /includes/ui/ui_input.inc
+  /inventory/purchasing_data.php
+  /purchasing/po_receive_items.php
+  /purchasing/includes/ui/invoice_ui.inc
+  /purchasing/includes/ui/po_ui.inc
+  /purchasing/view/view_grn.php
+  /purchasing/view/view_po.php
+  /reporting/rep209.php
+  
+21-Aut-2009 Joe Hunt
+# [0000162] Deleting a GL account may cause problems with quick entries 
+$ /gl/manage/gl_accounts.php
+
+20-Aug-2009 Joe Hunt
+# If account code2 is used in the accounts the report Chart of Accounts gave a bad index and didn't print the code.
+$ /gl/includes/gl_db_accounts.inc
+# If setting the delivered items in PO Receive Items to 0 the value is not updated 
+$ /purchasing/po_receive_items.php
+
+19-Aug-2009 Joe Hunt
+! Change of Quick Entries to use the Tax Types instead, due to complexity using the Tax Groups in EU.
+  If you for need more than one Tax Type row in a Quick Entry, please keep the rows together and use the same action type.
+$ /gl/includes/db/gl_db_bank_accounts.inc
+  /gl/manage/gl_quick_entries.php
+  /includes/ui/ui_view.inc
+  
+18-Aug-2009 Joe Hunt
+! When using Quick Entries in Supplier Invoices/credit notes the tax sum now shows correctly.
+$ /purchasing/includes/db/invoice_db.inc
+  /purchasing/includes/ui/invoice_ui.inc
+  /purchasing/includes/supp_trans_class.inc
+  
+18-Aug-2009 Joe Hunt
+! Quick Entries uses Tax Groups instead of Item Tax Types for calculating taxes (Please change the item lines for tax).
+  Quick Entry Lines of type Supplier Invoice. When using, the Supplier Tax Group Id overrides the The Tax Group set on the line.
+$ /gl/includes/db/gl_db_bank_accounts.inc
+  /gl/manage/gl_quick_entries.php
+  /includes/ui/ui_view.inc
+  /taxes/tax_calc.inc
+  
+17-Aug-2009 Janusz Dobrowolski
+# [0000158] Added missing check for POS usage before deletion.
+$ /sales/manage/sales_points.php
+
+17-Aug-2009 Joe Hunt
+# [0000160] Customer payments in different currencies (bank account exchange error). Fixed so diff bank_curr/home_curr and cust/supp curr is readonly.
+$ /gl/includes/db/gl_db_bank_trans.inc
+  /purchasing/supplier_payment.php
+  /sales/customer_payments.php
+  /sales/includes/db/payments_db.inc
+
+14-Aug-2009 Janusz Dobrowolski
+# [0000161] Fixed reference edition on sales invoice/deliery/credit.
+$ /sales/customer_credit_invoice.php
+  /sales/customer_delivery.php
+  /sales/customer_invoice.php
+
+12-Aug-2009 Joe Hunt
+# [0000159] Memo field's GL entries are not saved (gl_trans) in supplier invoice
+$ /purchasing/includes/purchasing_db.inc
+  /purchasing/includes/db/invoice_db.inc
+# memo field was not written in list of journal entries.
+$ /reporting/rep702.php
+  
+08-Aug-2009 Janusz Dobrowolski
+# Fixed bug in calculation of taxes for quick entries using multiply tax rates
+$ /includes/ui/ui_view.inc
+
+08-Aug-2009 Janusz Dobrowolski
+# [0000152] Config_db.php changed after failed company database creation
+$ /install/save.php
+
+08-Aug-2009 Joe Hunt
+# [0000153] not possible to make a new balance sheet GL account cl (old style)
+$ /gl/manage/gl_account_classes.php
+
+04-Aug-2009 Joe Hunt
+# [0000150] Logo on printed papers is placed on top of the adress rule nr 1
+$ /reporting/includes/header2.inc
+# [0000145] Email sales order doesn't work if no email on branch but on customer
+$ /sales/includes/db/sales_order_db.inc
+  /reporting/rep109.php
+! Changed so $use_oldstyle_convert=1 variable in config.php (line 78) gives fully backwards compatibility in 
+  Balance Sheet, PL Statements and Monthly Bread Down reports.
+$ /gl/manage/gl_account_classes.php.  
+
+>>>>>>> 1.265
 ------------------------------- Release 2.1.4 ----------------------------------
 30-Jul-2009 Joe Hunt
 ! Release 2.1.4
@@ -1019,7 +1161,7 @@ $ /includes/db/manufacturing.inc
 $ /admin/attachments.php
 # [0000140] Numeric format bug in credit limit input.
 $ /purchasing/manage/suppliers.php
-# [0000143] Bad format of PO popup window (jackel7007).
+# [0000143] Bad format of PO popup window (Softechmatrix).
 $ /purchasing/view/view_grn.php
 
 09-Jul-2009 Janusz Dobrowolski

diff --git a/config.php b/config.php
index c1508a559772772ac08d2e0b8a246f6aa85e465e..61d2c0c0298c4c2c2635bd30be57bd47350450bd 100644 (file)
--- a/config.php
+++ b/config.php
@@ -23,8 +23,8 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
        // Log file for error/warning messages. Should be set to any location
        // writable by www server. When set to empty string logging is switched off. 
        // Special value 'syslog' can be used for system logger usage (see php manual).
-       $error_logfile = '';
-       //$error_logfile = dirname(__FILE__).'/tmp/errors.log';
+       //$error_logfile = '';
+       $error_logfile = dirname(__FILE__).'/tmp/errors.log';
        $debug                  = 1;
        $show_sql               = 0;
        $go_debug               = 1;
@@ -56,7 +56,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
        // Main Title
        $app_title = "FrontAccounting";
        // application version
-       $version                = "2.2m4 CVS";
+       $version                = "2.2m5 CVS";
 
        // Build for development purposes
        $build_version  = date("d.m.Y", filemtime("$path_to_root/CHANGELOG.txt"));

diff --git a/doc/quick_entries.txt b/doc/quick_entries.txt
index 1b9dfd5cf26adb65a1e0cdaaa99edfd4a039eb37..90db1293cce73404548ec88bc2b9946ff78d0694 100644 (file)
--- a/doc/quick_entries.txt
+++ b/doc/quick_entries.txt
@@ -20,8 +20,8 @@ Currently following type of operations are defined:
 
 a) Post constant amount to selected GL account.
 b) Post percent part of base amount to selected GL account
-c) Post taxes for selected item tax type, using base amount as net value.
-d) Post taxes for selected item tax type, using base amount as value with tax included.
+c) Post taxes for selected tax type, using base amount as net value.
+d) Post taxes for selected tax type, using base amount as value with tax included.
 e) Post remainder from previous calculations to selected GL acount.
 
 After most operations the base amount can be increased, decreased or not changed 
@@ -33,7 +33,8 @@ bill, gazolin or other kind of simple bills. Later on you can create
 more sophisticated entry lines.
 
 If tax should be includes in the base amount you can first select a line
-'Tax included, reduce base and select the correct item tax type.
+'Tax included, reduce base and select the correct tax type.
+If more lines with other Tax Types are needed, group them together and use the same action. 
 And a line with 'Remainder' put on the account you want to put the rest on.
 That's it!
 

diff --git a/gl/includes/db/gl_db_accounts.inc b/gl/includes/db/gl_db_accounts.inc
index 474ea713b633cfdc151397eae39589b7f1ff02d6..26612b58225cfd95eb7c9b4b84e9c3f1031b5133 100644 (file)
--- a/gl/includes/db/gl_db_accounts.inc
+++ b/gl/includes/db/gl_db_accounts.inc
@@ -56,6 +56,10 @@ function get_gl_accounts_all($balance=-1)
        elseif ($balance == 0)  
                $where ="WHERE ctype>".CL_EQUITY." OR ctype=0"; // backwards compatibility
        $sql = "SELECT ".TB_PREF."chart_master.account_code, ".TB_PREF."chart_master.account_code2, ".TB_PREF."chart_master.account_name, 
+               ".TB_PREF."chart_types.name AS AccountTypeName,".TB_PREF."chart_types.id AS AccountType
+               $where";
+
+       $sql = "SELECT ".TB_PREF."chart_master.account_code, ".TB_PREF."chart_master.account_name, ".TB_PREF."chart_master.account_code2,
                ".TB_PREF."chart_types.name AS AccountTypeName,".TB_PREF."chart_types.id AS AccountType,
                ".TB_PREF."chart_types.parent, ".TB_PREF."chart_class.class_name AS AccountClassName, ".TB_PREF."chart_class.cid AS ClassID, 
                ".TB_PREF."chart_class.ctype AS ClassType

diff --git a/gl/includes/db/gl_db_bank_accounts.inc b/gl/includes/db/gl_db_bank_accounts.inc
index 2a28580595616123957ab5b8fc6f9b0e30358c58..53f3facfbc9ba0c168ce77e455b75a772e94e096 100644 (file)
--- a/gl/includes/db/gl_db_bank_accounts.inc
+++ b/gl/includes/db/gl_db_bank_accounts.inc
@@ -166,12 +166,12 @@ function get_quick_entry($selected_id)
 function get_quick_entry_lines($qid)
 {
        $sql = "SELECT ".TB_PREF."quick_entry_lines.*, ".TB_PREF."chart_master.account_name,
-                       ".TB_PREF."item_tax_types.name as tax_name
+                       ".TB_PREF."tax_types.name as tax_name
                FROM ".TB_PREF."quick_entry_lines
                LEFT JOIN ".TB_PREF."chart_master ON
                        ".TB_PREF."quick_entry_lines.dest_id = ".TB_PREF."chart_master.account_code
-               LEFT JOIN ".TB_PREF."item_tax_types ON
-                       ".TB_PREF."quick_entry_lines.dest_id = ".TB_PREF."item_tax_types.id
+               LEFT JOIN ".TB_PREF."tax_types ON
+                       ".TB_PREF."quick_entry_lines.dest_id = ".TB_PREF."tax_types.id
                WHERE 
                        qid=$qid
                ORDER by id";

diff --git a/gl/includes/db/gl_db_bank_trans.inc b/gl/includes/db/gl_db_bank_trans.inc
index de2ce4862920f121b5d256b89b5c79c63855f6d9..c9f550c82419aff60614b087b662a0f417447075 100644 (file)
--- a/gl/includes/db/gl_db_bank_trans.inc
+++ b/gl/includes/db/gl_db_bank_trans.inc
@@ -16,7 +16,7 @@
 // $date_ is display date (non-sql)
 
 function add_bank_trans($type, $trans_no, $bank_act, $ref, $date_,
-       $amount, $person_type_id, $person_id, $currency="", $err_msg="")
+       $amount, $person_type_id, $person_id, $currency="", $err_msg="", $rate=0)
 {
        $sqlDate = date2sql($date_);
 
@@ -24,7 +24,10 @@ function add_bank_trans($type, $trans_no, $bank_act, $ref, $date_,
        if ($currency != "")
        {
        $bank_account_currency = get_bank_account_currency($bank_act);
-       $to_bank_currency = get_exchange_rate_from_to($currency, $bank_account_currency, $date_);
+       if ($rate == 0)
+               $to_bank_currency = get_exchange_rate_from_to($currency, $bank_account_currency, $date_);
+       else
+               $to_bank_currency = 1 / $rate;
        $amount_bank = ($amount / $to_bank_currency);
        }
        else

diff --git a/gl/manage/gl_account_classes.php b/gl/manage/gl_account_classes.php
index 29b6eb3e63870ed4fabe0f8df0fb9909cb7cbca7..de419e72c6524492344f1b9df0f9babdc37a1742 100644 (file)
--- a/gl/manage/gl_account_classes.php
+++ b/gl/manage/gl_account_classes.php
@@ -24,6 +24,7 @@ simple_page_mode(true);
 
 function can_process() 
 {
+       global $use_oldstyle_convert;
        if (!is_numeric($_POST['id'])) 
        {
                display_error( _("The account class ID must be numeric."));
@@ -36,7 +37,8 @@ function can_process()
                set_focus('name');
                return false;
        }
-
+       if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
+               $_POST['Balance'] = check_value('Balance');
        return true;
 }
 
@@ -108,6 +110,8 @@ $result = get_account_classes(check_value('show_inactive'));
 start_form();
 start_table($table_style);
 $th = array(_("Class ID"), _("Class Name"), _("Class Type"), "", "");
+if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
+       $th[2] = _("Balance Sheet");
 inactive_control_column($th);
 table_header($th);
 
@@ -119,7 +123,13 @@ while ($myrow = db_fetch($result))
 
        label_cell($myrow["cid"]);
        label_cell($myrow['class_name']);
-       label_cell($class_types[$myrow["ctype"]]);
+       if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
+       {
+               $myrow['ctype'] = ($myrow["ctype"] >= CL_ASSETS && $myrow["ctype"] < CL_INCOME ? 1 : 0);
+               label_cell(($myrow['ctype'] == 1 ? _("Yes") : _("No")));
+       }       
+       else    
+               label_cell($class_types[$myrow["ctype"]]);
        inactive_control_cell($myrow["cid"], $myrow["inactive"], 'chart_class', 'cid');
        edit_button_cell("Edit".$myrow["cid"], _("Edit"));
        delete_button_cell("Delete".$myrow["cid"], _("Delete"));
@@ -139,7 +149,10 @@ if ($selected_id != -1)
 
        $_POST['id']  = $myrow["cid"];
        $_POST['name']  = $myrow["class_name"];
-       $_POST['ctype']  = $myrow["ctype"];
+       if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
+               $_POST['ctype'] = ($myrow["ctype"] >= CL_ASSETS && $myrow["ctype"] < CL_INCOME ? 1 : 0);
+       else
+               $_POST['ctype']  = $myrow["ctype"];
        hidden('selected_id', $selected_id);
  }
        hidden('id');
@@ -154,7 +167,10 @@ else
 
 text_row_ex(_("Class Name:"), 'name', 50, 60);
 
-class_types_list_row(_("Class Type:"), 'ctype', null);
+if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
+       check_row(_("Balance Sheet"), 'ctype', null);
+else
+       class_types_list_row(_("Class Type:"), 'ctype', null);
 
 end_table(1);
 

diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php
index c78becaa1605fd725238840aeddb6cec4bcd915e..f3e5bc95fb759afdf7270734c5ac95d0eb444b09 100644 (file)
--- a/gl/manage/gl_accounts.php
+++ b/gl/manage/gl_accounts.php
@@ -187,6 +187,17 @@ function can_delete($selected_account)
                return false;
        }                                                                       
        
+       $sql= "SELECT COUNT(*) FROM ".TB_PREF."quick_entry_lines WHERE 
+               dest_id='$selected_account' AND UPPER(LEFT(action, 1)) <> 'T'";
+       $result = db_query($sql,"Couldn't test for existing suppliers GL codes");
+
+       $myrow = db_fetch_row($result);
+       if ($myrow[0] > 0) 
+       {
+               display_error(_("Cannot delete this account because it is used by one or more Quick Entry Lines."));
+               return false;
+       }                                                                       
+
        return true;
 }
 

diff --git a/gl/manage/gl_quick_entries.php b/gl/manage/gl_quick_entries.php
index faa958a89385b42b59586913f7833b3bf01baeeb..c35f03398cfd097db94ab13a8adb724ac3e4534e 100644 (file)
--- a/gl/manage/gl_quick_entries.php
+++ b/gl/manage/gl_quick_entries.php
@@ -302,7 +302,8 @@ if ($selected_id != -1)
 
        if ($actn == 't') 
        {
-               item_tax_types_list_row(_("Item Tax Type").":",'dest_id', null);
+               //item_tax_types_list_row(_("Item Tax Type").":",'dest_id', null);
+               tax_types_list_row(_("Tax Type").":", 'dest_id', null);
        } 
        else 
        {
@@ -340,4 +341,4 @@ if ($selected_id != -1)
 
 end_page();
 
-?>
+?>
\ No newline at end of file

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 59ed4109e3226e334e84e820ad05daf012d65029..4f216955b8726c0ed6c7ca8b44cf5857e9cc7195 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -155,6 +155,19 @@ function price_format($number) {
        $_SESSION["wa_current_user"]->prefs->price_dec());
 }
 
+function price_decimal_format($number, &$dec)
+{
+       $dec = user_price_dec();
+       $str = strval($number);
+       $pos = strpos($str, '.');
+       if ($pos !== false)
+       {
+               $len = strlen(substr($str, $pos + 1));
+               if ($len > $dec)
+                       $dec = $len;
+       }
+       return number_format2($number, $dec);
+}
 // 2008-06-15. Added extra parameter $stock_id and reference for $dec
 //--------------------------------------------------------------------
 function qty_format($number, $stock_id=null, &$dec) {

diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 2ae54e80aa82db5ee29d987e4b2853d782ce2aed..298b964401aa7cda0aa880961ec0c6a887596c3f 100644 (file)
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -386,6 +386,12 @@ function email_cell($label, $params="", $id=null)
        label_cell("<a href='mailto:$label'>$label</a>", $params, $id);
 }
 
+function amount_decimal_cell($label, $params="", $id=null)
+{
+       $dec = 0;
+       label_cell(price_decimal_format($label, $dec), "nowrap align=right ".$params, $id);
+}
+
 function amount_cell($label, $bold=false, $params="", $id=null)
 {
        if ($bold)

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index e2233c026bcb4c83a5a44036d4742500a810bde5..78b54a0a9bcaab348697c421a9436d3bdbfcdba6 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -524,7 +524,109 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
                        $cart->clear_items();
                $qe = get_quick_entry($id);
                if ($descr != '') $qe['description'] .= ': '.$descr;
-               $qe_lines = get_quick_entry_lines($id);
+               $result = get_quick_entry_lines($id);
+               $totrate = 0;
+               while ($row = db_fetch($result))
+               {
+                       $qe_lines[] = $row;
+
+                       switch (strtolower($row['action'])) {
+                               case "t": // post taxes calculated on base amount
+                               case "t+": // ditto & increase base amount
+                               case "t-": // ditto & reduce base amount
+                                       if (substr($qe_line['action'],0,1) != 'T') 
+                                               $totrate += get_tax_type_default_rate($row['dest_id']);
+                       }
+               }
+               $first = true;
+               $taxbase = 0;
+               foreach($qe_lines as $qe_line)
+               {
+                       switch (strtolower($qe_line['action'])) {
+                               case "=": // post current base amount to GL account
+                                       $part = $base;
+                                       break;
+                               case "a": // post amount to GL account and reduce base
+                                       $part = $qe_line['amount'];
+                                       break;
+                               case "a+": // post amount to GL account and increase base
+                                       $part = $qe_line['amount']; $base += $part;
+                                       break;
+                               case "a-": // post amount to GL account and reduce base
+                                       $part = $qe_line['amount']; $base -= $part;
+                                       break;
+                               case "%":       // store acc*amount% to GL account
+                                       $part = round2($base * $qe_line['amount'] / 100, user_price_dec());
+                                       break;
+                               case "%+":      // ditto & increase base amount
+                                       $part = round2($base * $qe_line['amount'] / 100, user_price_dec());
+                                       $base += $part;
+                                       break;
+                               case "%-":      // ditto & reduce base amount
+                                       $part = round2($base * $qe_line['amount'] / 100, user_price_dec());
+                                       $base -= $part;
+                                       break;
+                               case "t": // post taxes calculated on base amount
+                               case "t+": // ditto & increase base amount
+                               case "t-": // ditto & reduce base amount
+                                       if ($first)
+                                       {
+                                               $taxbase = $base/($totrate+100);
+                                               $first = false;
+                                       }
+
+                                       if (substr($qe_line['action'],0,1) != 'T') 
+                                               $part = $taxbase;
+                                       else
+                                               $part = $base;
+                                       $item_tax = get_tax_type($qe_line['dest_id']);
+                                       if ($type == QE_SUPPINV && substr($qe_line['action'],0,1) != 'T')
+                                       {
+                                               $taxgroup = $cart->tax_group_id;
+                                               $rates = 0;
+                                               $res = get_tax_group_items($cart->tax_group_id);
+                                               while ($row = db_fetch($res))
+                                                       $rates += $row['rate'];
+                                               if ($rates == 0)
+                                                       continue 2;
+                                       }
+                                       $tax = round2($part * $item_tax['rate'],  user_price_dec());
+                                       if ($tax==0) continue 2;
+                                       $gl_code = ($type == QE_DEPOSIT || ($type == QE_JOURNAL && $base < 0)) 
+                                               ? $item_tax['sales_gl_code'] : $item_tax['purchasing_gl_code'];
+                                       if (!is_tax_gl_unique($gl_code)) {
+                                               display_error(_("Cannot post to GL account used by more than one tax type."));
+                                               break 2;
+                                       }
+                                       if ($type != QE_SUPPINV)
+                                               $cart->add_gl_item($gl_code, 
+                                                       $qe_line['dimension_id'], $qe_line['dimension2_id'], 
+                                                       $tax, $qe['description']);
+                                       else 
+                                       {
+                                               $acc_name = get_gl_account_name($gl_code);
+                                               $cart->add_gl_codes_to_trans($gl_code, 
+                                                       $acc_name, $qe_line['dimension_id'], 
+                                                       $qe_line['dimension2_id'], $tax, $qe['description']);
+                                       }
+                                       if (strpos($qe_line['action'], '+'))
+                                               $base += $tax;
+                                       elseif (strpos($qe_line['action'], '-'))
+                                               $base -= $tax;
+                                       continue 2;
+                       }
+                       if ($type != QE_SUPPINV)
+                               $cart->add_gl_item($qe_line['dest_id'], $qe_line['dimension_id'],
+                                       $qe_line['dimension2_id'], $part, $qe['description']);
+                       else 
+                       {
+                               $acc_name = get_gl_account_name($qe_line['dest_id']);
+                               $cart->add_gl_codes_to_trans($qe_line['dest_id'], 
+                                       $acc_name, $qe_line['dimension_id'], 
+                                       $qe_line['dimension2_id'], $part, $qe['description']);
+                       }
+               }
+/*             
                while ($qe_line = db_fetch($qe_lines))
                {
                        switch (strtolower($qe_line['action'])) {
@@ -554,15 +656,24 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
                                case "t": // post taxes calculated on base amount
                                case "t+": // ditto & increase base amount
                                case "t-": // ditto & reduce base amount
-                                       $taxes = get_taxes_for_item_tax($qe_line['dest_id']);
+                                       //$taxes = get_taxes_for_item_tax($qe_line['dest_id']);
+                                       if ($type == QE_SUPPINV)
+                                               $qe_line['dest_id'] = $cart->tax_group_id;
+                                       $taxes = array();
+                                       $res = get_tax_group_items($qe_line['dest_id']);
+                                       while ($row = db_fetch($res))
+                                               $taxes[] = $row;
                                        $tax_total = 0;
+                                       $totrate = 0;
+                                       // find total tax 
+                                       if (substr($qe_line['action'],0,1) != 'T') {
+                                               foreach ($taxes as $index => $item_tax) {
+                                                       $totrate += $item_tax['rate'];
+                                               }
+                                       }
+                                       $taxbase = $base/($totrate+100);
                                        foreach ($taxes as $index => $item_tax) {
-                                               if(substr($qe_line['action'],0,1) != 'T')
-                                                       $tax = round2($base * $item_tax['rate'] 
-                                                               / ($item_tax['rate'] + 100),  user_price_dec());
-                                               else
-                                                       $tax = round2($base * $item_tax['rate'] / 100,  user_price_dec());
-
+                                               $tax = round2($taxbase * $item_tax['rate'],  user_price_dec());
                                                $gl_code = ($type == QE_DEPOSIT || ($type == QE_JOURNAL && $base < 0)) 
                                                        ? $item_tax['sales_gl_code'] : $item_tax['purchasing_gl_code'];
                                                $tax_total += $tax;
@@ -600,6 +711,7 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
                                        $qe_line['dimension2_id'], $part, $qe['description']);
                        }
                }
+*/             
        }       
        return $bank_amount;
 }

diff --git a/install/save.php b/install/save.php
index e832d87a8ae28d25c1028594a2f146ee5babad01..2df68e9f96cee8de2a1442480b32a3548d28c90f 100644 (file)
--- a/install/save.php
+++ b/install/save.php
@@ -349,36 +349,43 @@ $db = mysql_connect($database_host, $database_username, $database_password);
 if (!$db)
 {
        display_error('Database host name, username and/or password incorrect. MySQL Error:<br />'.mysql_error());
-}
-
-$err = write_config_db($table_prefix != "");
-if ($err == -1)
-       display_error("Cannot open the configuration file ($config_filename)");
-else if ($err == -2)
-       display_error("Cannot write to the configuration file ($config_filename)");
-else if ($err == -3)
-       display_error("The configuration file $config_filename is not writable. Change its permissions so it is, then re-run step 4.");
-
-if($install_tables == true)
-{
-       if (!mysql_select_db($database_name, $db))
-       {
-
-               // Try to create the database
-               mysql_query('CREATE DATABASE '.$database_name);
-               mysql_select_db($database_name, $db);
+} else {
+       $result = true;
+       if($install_tables == true)
+       {
+               if (!mysql_select_db($database_name, $db))
+               {
+                       // Try to create the database
+                       if (!($result = mysql_query('CREATE DATABASE '.$database_name))) {
+                               display_error(_("Cannot create database").
+                                       " '$database_name'");
+                       } else
+                               $result = mysql_select_db($database_name, $db);
+               }
+               if($result) {
+                       $import_filename = $path_to_root."/sql/en_US-demo.sql";
+                       db_import($import_filename, $db_connections[$id]);
+               }
+       }
+       else
+       {
+               $result = mysql_select_db($database_name, $db);
+       }
+       if ($result) {
+               $sql = "UPDATE ".$table_prefix."users SET password = '" . md5($admin_password) . "', email = ".db_escape($admin_email)." WHERE user_id = 'admin'";
+               db_query($sql, "could not update admin account");
+               $sql = "UPDATE ".$table_prefix."company SET coy_name = ".db_escape($company_name)." WHERE coy_code = 1";
+               db_query($sql, "could not update company name. Do it manually later in Setup");
+       
+               $err = write_config_db($table_prefix != "");
+               if ($err == -1)
+                       display_error("Cannot open the configuration file ($config_filename)");
+               else if ($err == -2)
+                       display_error("Cannot write to the configuration file ($config_filename)");
+               else if ($err == -3)
+                       display_error("The configuration file $config_filename is not writable. Change its permissions so it is, then re-run step 4.");
        }
-       $import_filename = $path_to_root."/sql/en_US-demo.sql";
-       db_import($import_filename, $db_connections[$id]);
-}
-else
-{
-       mysql_select_db($database_name, $db);
 }
-$sql = "UPDATE ".$table_prefix."users SET password = '" . md5($admin_password) . "', email = ".db_escape($admin_email)." WHERE user_id = 'admin'";
-db_query($sql, "could not update admin account");
-$sql = "UPDATE ".$table_prefix."company SET coy_name = ".db_escape($company_name)." WHERE coy_code = 1";
-db_query($sql, "could not update company name. Do it manually later in Setup");
 
 session_unset();
 session_destroy();

diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php
index 503689018ed0015251767bdcefee702c638b51d1..3d64db513b7f32b31dc0de489400e11ea0ca48fd 100644 (file)
--- a/inventory/purchasing_data.php
+++ b/inventory/purchasing_data.php
@@ -157,7 +157,7 @@ else
                        alt_table_row_color($k);
 
             label_cell($myrow["supp_name"]);
-            amount_cell($myrow["price"]);
+            amount_decimal_cell($myrow["price"]);
             label_cell($myrow["curr_code"]);
             label_cell($myrow["suppliers_uom"]);
             qty_cell($myrow['conversion_factor'], false, user_exrate_dec());
@@ -181,6 +181,7 @@ else
 
 //-----------------------------------------------------------------------------------------------
 
+$dec2 = 6;
 if ($Mode =='Edit')
 {
 
@@ -194,7 +195,7 @@ if ($Mode =='Edit')
        $myrow = db_fetch($result);
 
     $supp_name = $myrow["supp_name"];
-    $_POST['price'] = price_format($myrow["price"]);
+    $_POST['price'] = price_decimal_format($myrow["price"], $dec2);
     $_POST['suppliers_uom'] = $myrow["suppliers_uom"];
     $_POST['supplier_description'] = $myrow["supplier_description"];
     $_POST['conversion_factor'] = exrate_format($myrow["conversion_factor"]);
@@ -214,7 +215,7 @@ else
        supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true);
        $_POST['price'] = $_POST['suppliers_uom'] = $_POST['conversion_factor'] = $_POST['supplier_description'] = "";
 }
-amount_row(_("Price:"), 'price', null,'', get_supplier_currency($selected_id));
+amount_row(_("Price:"), 'price', null,'', get_supplier_currency($selected_id), $dec2);
 text_row(_("Suppliers Unit of Measure:"), 'suppliers_uom', null, 50, 51);
 
 if (!isset($_POST['conversion_factor']) || $_POST['conversion_factor'] == "")

diff --git a/lang/new_language_template/LC_MESSAGES/empty.po b/lang/new_language_template/LC_MESSAGES/empty.po
index 1367ca29df78f6b52ae0f2c334edc83ec87a4f01..df596a75d0e3f7497c966857c4872f184f16c2ba 100644 (file)
--- a/lang/new_language_template/LC_MESSAGES/empty.po
+++ b/lang/new_language_template/LC_MESSAGES/empty.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FrontAccounting\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-25 11:58+0100\n"
-"PO-Revision-Date: 2009-06-25 11:59+0100\n"
+"POT-Creation-Date: 2009-08-26 09:15+0100\n"
+"PO-Revision-Date: 2009-08-26 09:15+0100\n"
 "Last-Translator: FrontAccounting <info@frontaccounting.com>\n"
 "Language-Team: Translators\n"
 "MIME-Version: 1.0\n"
@@ -82,79 +82,79 @@ msgstr ""
 msgid "Click here to Login Again."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/admin/attachments.php:57
+#: c:\Apache2\htdocs\account21/admin/attachments.php:71
 msgid "Attach Documents"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/admin/attachments.php:104
+#: c:\Apache2\htdocs\account21/admin/attachments.php:118
 msgid "Attachment has been inserted."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/admin/attachments.php:121
+#: c:\Apache2\htdocs\account21/admin/attachments.php:135
 msgid "Attachment has been updated."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/admin/attachments.php:134
+#: c:\Apache2\htdocs\account21/admin/attachments.php:148
 msgid "Attachment has been deleted."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/admin/attachments.php:151
+#: c:\Apache2\htdocs\account21/admin/attachments.php:165
 msgid "Type:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/admin/attachments.php:178
+#: c:\Apache2\htdocs\account21/admin/attachments.php:192
 msgid "#"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/admin/attachments.php:178
-#: c:\Apache2\htdocs\account21/admin/attachments.php:233
+#: c:\Apache2\htdocs\account21/admin/attachments.php:192
+#: c:\Apache2\htdocs\account21/admin/attachments.php:247
 msgid "Description"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/admin/attachments.php:178
+#: c:\Apache2\htdocs\account21/admin/attachments.php:192
 #: c:\Apache2\htdocs\account21/admin/backups.php:62
 #: c:\Apache2\htdocs\account21/admin/backups.php:140
 msgid "Filename"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/admin/attachments.php:178
+#: c:\Apache2\htdocs\account21/admin/attachments.php:192
 msgid "Size"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/admin/attachments.php:178
+#: c:\Apache2\htdocs\account21/admin/attachments.php:192
 msgid "Filetype"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/admin/attachments.php:178
+#: c:\Apache2\htdocs\account21/admin/attachments.php:192
 msgid "Date Uploaded"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/admin/attachments.php:195
+#: c:\Apache2\htdocs\account21/admin/attachments.php:209
 #: c:\Apache2\htdocs\account21/admin/create_coy.php:239
 #: c:\Apache2\htdocs\account21/admin/fiscalyears.php:151
 msgid "Edit"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/admin/attachments.php:196
+#: c:\Apache2\htdocs\account21/admin/attachments.php:210
 msgid "View"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/admin/attachments.php:197
+#: c:\Apache2\htdocs\account21/admin/attachments.php:211
 msgid "Download"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/admin/attachments.php:198
+#: c:\Apache2\htdocs\account21/admin/attachments.php:212
 #: c:\Apache2\htdocs\account21/admin/create_coy.php:240
 #: c:\Apache2\htdocs\account21/admin/fiscalyears.php:153
 msgid "Delete"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/admin/attachments.php:227
-#: c:\Apache2\htdocs\account21/admin/attachments.php:232
+#: c:\Apache2\htdocs\account21/admin/attachments.php:241
+#: c:\Apache2\htdocs\account21/admin/attachments.php:246
 msgid "Transaction #"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/admin/attachments.php:235
+#: c:\Apache2\htdocs\account21/admin/attachments.php:249
 msgid "Attached File"
 msgstr ""
 
@@ -2033,6 +2033,8 @@ msgid "The dimension reference must be entered."
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:112
+#: c:\Apache2\htdocs\account21/gl/bank_transfer.php:135
+#: c:\Apache2\htdocs\account21/gl/gl_bank.php:151
 msgid "The entered reference is already in use."
 msgstr ""
 
@@ -2066,6 +2068,11 @@ msgid "Dimension Reference:"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/dimensions/dimension_entry.php:247
+#: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:75
+#: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:173
+#: c:\Apache2\htdocs\account21/dimensions/view/view_dimension.php:54
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:187
+#: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:255
 msgid "Type"
 msgstr ""
 
@@ -2119,12 +2126,10 @@ msgid "All"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:76
-#: c:\Apache2\htdocs\account21/gl/inquiry/bank_inquiry.php:46
 msgid "From:"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:77
-#: c:\Apache2\htdocs\account21/gl/inquiry/bank_inquiry.php:47
 msgid "To:"
 msgstr ""
 
@@ -2139,10 +2144,6 @@ msgstr ""
 #: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:174
 #: c:\Apache2\htdocs\account21/dimensions/view/view_dimension.php:54
 #: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:258
-#: c:\Apache2\htdocs\account21/gl/inquiry/bank_inquiry.php:75
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:107
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:110
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:113
 msgid "Date"
 msgstr ""
 
@@ -2152,10 +2153,6 @@ msgid "Due Date"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/dimensions/inquiry/search_dimensions.php:177
-#: c:\Apache2\htdocs\account21/gl/inquiry/bank_inquiry.php:76
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:108
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:111
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:114
 msgid "Balance"
 msgstr ""
 
@@ -2176,21 +2173,124 @@ msgid "This dimension is closed."
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/dimensions/view/view_dimension.php:84
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:66
 msgid "from:"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/dimensions/view/view_dimension.php:85
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:67
 msgid "to:"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/dimensions/view/view_dimension.php:86
-#: c:\Apache2\htdocs\account21/gl/inquiry/bank_inquiry.php:49
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:68
 msgid "Show"
 msgstr ""
 
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:16
+msgid "Quick Entries"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:58
+msgid "Add new"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:73
+msgid "The Quick Entry description cannot be empty."
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:79
+msgid "The base amount description cannot be empty."
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:99
+msgid "Selected quick entry has been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:105
+msgid "New quick entry has been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:134
+msgid "Selected quick entry line has been updated"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:140
+msgid "New quick entry line has been added"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:152
+msgid "Selected quick entry has been deleted"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:157
+msgid "The Quick Entry has Quick Entry Lines. Cannot be deleted."
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:165
+msgid "Selected quick entry line has been deleted"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:173
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:230
+msgid "Base Amount"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:228
+msgid "Entry Type"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:230
+msgid "Base Amount Description"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:232
+msgid "Default Base Amount"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:243
+msgid "Quick Entry Lines"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:249
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:251
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:253
+msgid "Post"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:249
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:251
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:253
+msgid "Account/Tax Type"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:249
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:251
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:253
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:366
+msgid "Amount"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:249
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:251
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:370
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:372
+msgid "Dimension"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:330
+msgid "Posted"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:346
+msgid "Tax Types"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:360
+msgid "Account"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/gl_quick_entries.php:364
+msgid "Part"
+msgstr ""
+
 #: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:33
 msgid "Reconcile Bank Account"
 msgstr ""
@@ -2198,7 +2298,6 @@ msgstr ""
 #: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:35
 #: c:\Apache2\htdocs\account21/gl/bank_transfer.php:30
 #: c:\Apache2\htdocs\account21/gl/gl_bank.php:41
-#: c:\Apache2\htdocs\account21/gl/inquiry/bank_inquiry.php:30
 msgid "There are no bank accounts defined in the system."
 msgstr ""
 
@@ -2211,8 +2310,6 @@ msgid "Reconcile this transaction"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:169
-#: c:\Apache2\htdocs\account21/gl/inquiry/bank_inquiry.php:44
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:64
 msgid "Account:"
 msgstr ""
 
@@ -2253,26 +2350,14 @@ msgid "Date of bank statement to reconcile"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:259
-#: c:\Apache2\htdocs\account21/gl/inquiry/bank_inquiry.php:76
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:108
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:111
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:114
 msgid "Debit"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:260
-#: c:\Apache2\htdocs\account21/gl/inquiry/bank_inquiry.php:76
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:108
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:111
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:114
 msgid "Credit"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/gl/bank_account_reconcile.php:261
-#: c:\Apache2\htdocs\account21/gl/inquiry/bank_inquiry.php:76
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:108
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:111
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:114
 msgid "Person/Item"
 msgstr ""
 
@@ -2323,7 +2408,6 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account21/gl/bank_transfer.php:128
 #: c:\Apache2\htdocs\account21/gl/gl_bank.php:145
-#: c:\Apache2\htdocs\account21/gl/gl_journal.php:108
 msgid "You must enter a reference."
 msgstr ""
 
@@ -2404,6 +2488,7 @@ msgid "Budget Entry"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/gl/gl_budget.php:24
+#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:22
 msgid "There are no account groups defined. Please define at least one account group before entering accounts."
 msgstr ""
 
@@ -2416,20 +2501,13 @@ msgid "The Budget has been deleted."
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/gl/gl_budget.php:112
+#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:242
+#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:248
 msgid "Account Code:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/gl_budget.php:119
-#: c:\Apache2\htdocs\account21/gl/gl_budget.php:120
-#: c:\Apache2\htdocs\account21/gl/gl_budget.php:124
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:73
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:75
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:107
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:110
-msgid "Dimension"
-msgstr ""
-
 #: c:\Apache2\htdocs\account21/gl/gl_budget.php:132
+#: c:\Apache2\htdocs\account21/gl/manage/exchange_rates.php:135
 msgid "Get"
 msgstr ""
 
@@ -2438,11 +2516,6 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/gl_budget.php:139
-#: c:\Apache2\htdocs\account21/gl/gl_budget.php:141
-msgid "Amount"
-msgstr ""
-
 #: c:\Apache2\htdocs\account21/gl/gl_budget.php:139
 msgid "Dim. incl."
 msgstr ""
@@ -2453,6 +2526,7 @@ msgid "Last Year"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/gl/gl_budget.php:179
+#: c:\Apache2\htdocs\account21/gl/inquiry/gl_trial_balance.php:135
 msgid "Total"
 msgstr ""
 
@@ -2528,6 +2602,7 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account21/gl/inquiry/bank_inquiry.php:123
 #: c:\Apache2\htdocs\account21/gl/inquiry/gl_account_inquiry.php:171
+#: c:\Apache2\htdocs\account21/gl/inquiry/gl_trial_balance.php:145
 msgid "Ending Balance"
 msgstr ""
 
@@ -2557,16 +2632,8 @@ msgstr ""
 msgid "Only balances"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/inquiry/gl_trial_balance.php:63
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:309
-msgid "Account"
-msgstr ""
-
 #: c:\Apache2\htdocs\account21/gl/inquiry/gl_trial_balance.php:64
 #: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:113
-#: c:\Apache2\htdocs\account21/gl/view/gl_trans_view.php:65
-#: c:\Apache2\htdocs\account21/gl/view/gl_trans_view.php:68
-#: c:\Apache2\htdocs\account21/gl/view/gl_trans_view.php:71
 msgid "Account Name"
 msgstr ""
 
@@ -2643,10 +2710,6 @@ msgid "Selected bank account has been deleted"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:113
-#: c:\Apache2\htdocs\account21/gl/view/bank_transfer_view.php:69
-#: c:\Apache2\htdocs\account21/gl/view/bank_transfer_view.php:78
-#: c:\Apache2\htdocs\account21/gl/view/gl_deposit_view.php:66
-#: c:\Apache2\htdocs\account21/gl/view/gl_payment_view.php:64
 msgid "Currency"
 msgstr ""
 
@@ -2666,33 +2729,34 @@ msgstr ""
 msgid "Bank Address"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:163
+#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:164
 msgid "Bank Account Name:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:165
+#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:168
+#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:172
 msgid "Account Type:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:169
-#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:173
+#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:176
+#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:180
 msgid "Bank Account Currency:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:177
-#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:179
+#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:184
+#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:186
 msgid "Bank Account GL Code:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:181
+#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:188
 msgid "Bank Name:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:182
+#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:189
 msgid "Bank Account Number:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:183
+#: c:\Apache2\htdocs\account21/gl/manage/bank_accounts.php:190
 msgid "Bank Address:"
 msgstr ""
 
@@ -2741,7 +2805,6 @@ msgid "Cannot delete this currency, because thre are bank accounts that use this
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/gl/manage/currencies.php:138
-#: c:\Apache2\htdocs\account21/gl/manage/gl_account_types.php:111
 msgid "Selected currency has been deleted"
 msgstr ""
 
@@ -2887,39 +2950,43 @@ msgstr ""
 msgid "Cannot delete this account because it is used by one or more suppliers."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:197
+#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:192
+msgid "Cannot delete this account because it is used by one or more Quick Entry Lines."
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:208
 msgid "Selected account has been deleted"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:209
+#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:220
 msgid "Select an Account:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:211
+#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:222
 msgid "New account"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:240
+#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:251
 msgid "Account Code 2:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:242
+#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:253
 msgid "Account Name:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:244
+#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:255
 msgid "Account Group:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:250
+#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:261
 msgid "Add Account"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:254
+#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:265
 msgid "Update Account"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:255
+#: c:\Apache2\htdocs\account21/gl/manage/gl_accounts.php:266
 msgid "Delete account"
 msgstr ""
 
@@ -2927,54 +2994,57 @@ msgstr ""
 msgid "GL Account Classes"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:29
+#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:30
 msgid "The account class ID must be numeric."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:35
+#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:36
 msgid "The account class name cannot be empty."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:54
+#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:56
 msgid "Selected account class settings has been updated"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:59
+#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:61
 msgid "New account class has been added"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:77
+#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:79
 msgid "Cannot delete this account class because GL account types have been created referring to it."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:93
+#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:95
 msgid "Selected account class has been deleted"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:109
+#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:111
 msgid "Class ID"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:109
+#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:111
 msgid "Class Name"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:109
-#: c:\Apache2\htdocs\account21/gl/manage/gl_account_types.php:127
+#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:111
 msgid "Class Type"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:147
-#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:153
+#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:113
+#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:172
+msgid "Balance Sheet"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:160
+#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:166
 msgid "Class ID:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:156
+#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:169
 msgid "Class Name:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:158
-#: c:\Apache2\htdocs\account21/gl/manage/gl_account_types.php:187
+#: c:\Apache2\htdocs\account21/gl/manage/gl_account_classes.php:174
 msgid "Class Type:"
 msgstr ""
 
@@ -3027,93 +3097,8 @@ msgstr ""
 msgid "Subgroup Of:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:16
-msgid "Quick Entries"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:58
-msgid "Add new"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:73
-msgid "The Quick Entry description cannot be empty."
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:79
-msgid "The base amount description cannot be empty."
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:99
-msgid "Selected quick entry has been updated"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:105
-msgid "New quick entry has been added"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:117
-msgid "Selected quick entry line has been updated"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:123
-msgid "New quick entry line has been added"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:135
-msgid "Selected quick entry has been deleted"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:140
-msgid "The Quick Entry has Quick Entry Lines. Cannot be deleted."
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:148
-msgid "Selected quick entry line has been deleted"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:156
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:213
-msgid "Base Amount"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:211
-msgid "Entry Type"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:213
-msgid "Base Amount Description"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:215
-msgid "Default Base Amount"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:226
-msgid "Quick Entry Lines"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:232
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:234
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:236
-msgid "Post"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:232
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:234
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:236
-msgid "Account/Tax Type"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:297
-msgid "Posted"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:305
-msgid "Item Tax Type"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:313
-msgid "Part"
+#: c:\Apache2\htdocs\account21/gl/manage/gl_quick_entries.php:306
+msgid "Tax Type"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/gl/view/bank_transfer_view.php:17
@@ -3233,6 +3218,10 @@ msgstr ""
 msgid "This transaction has been voided."
 msgstr ""
 
+#: c:\Apache2\htdocs\account21/install/save.php:360
+msgid "Cannot create database"
+msgstr ""
+
 #: c:\Apache2\htdocs\account21/inventory/adjustments.php:28
 msgid "Item Adjustments Note"
 msgstr ""
@@ -3242,6 +3231,7 @@ msgid "There are no inventory items defined in the system which can be adjusted
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/inventory/adjustments.php:34
+#: c:\Apache2\htdocs\account21/inventory/transfers.php:34
 msgid "There are no inventory movement types defined in the system. Please define at least one inventory adjustment type."
 msgstr ""
 
@@ -3262,10 +3252,12 @@ msgid "Enter &Another Adjustment"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/inventory/adjustments.php:86
+#: c:\Apache2\htdocs\account21/inventory/transfers.php:86
 msgid "You must enter at least one non empty item line."
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/inventory/adjustments.php:106
+#: c:\Apache2\htdocs\account21/inventory/transfers.php:104
 msgid "The entered date for the adjustment is invalid."
 msgstr ""
 
@@ -3316,6 +3308,9 @@ msgstr ""
 #: c:\Apache2\htdocs\account21/inventory/cost_update.php:85
 #: c:\Apache2\htdocs\account21/inventory/prices.php:56
 #: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:124
+#: c:\Apache2\htdocs\account21/inventory/reorder_level.php:43
+#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_movements.php:49
+#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_status.php:41
 msgid "Item:"
 msgstr ""
 
@@ -3336,6 +3331,8 @@ msgid "Inventory Item Sales prices"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/inventory/prices.php:27
+#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_movements.php:30
+#: c:\Apache2\htdocs\account21/inventory/inquiry/stock_status.php:34
 msgid "There are no items defined in the system."
 msgstr ""
 
@@ -3381,7 +3378,7 @@ msgid "Sales Type:"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/inventory/prices.php:181
-#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:225
+#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:226
 msgid "Price:"
 msgstr ""
 
@@ -3449,20 +3446,20 @@ msgstr ""
 msgid "Supplier's Description"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:218
-#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:222
+#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:219
+#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:223
 msgid "Supplier:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:226
+#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:227
 msgid "Suppliers Unit of Measure:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:232
+#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:233
 msgid "Conversion Factor (to our UOM):"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:234
+#: c:\Apache2\htdocs\account21/inventory/purchasing_data.php:235
 msgid "Supplier's Code or Description:"
 msgstr ""
 
@@ -3521,7 +3518,6 @@ msgid "The quantity entered must be a positive number."
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/inventory/transfers.php:229
-#: c:\Apache2\htdocs\account21/inventory/manage/items.php:16
 msgid "Items"
 msgstr ""
 
@@ -3661,6 +3657,9 @@ msgid "New item"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/inventory/manage/items.php:289
+#: c:\Apache2\htdocs\account21/inventory/view/view_adjustment.php:56
+#: c:\Apache2\htdocs\account21/inventory/view/view_transfer.php:39
+#: c:\Apache2\htdocs\account21/inventory/view/view_transfer.php:57
 msgid "Item"
 msgstr ""
 
@@ -3795,11 +3794,15 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account21/inventory/manage/item_codes.php:122
 #: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:42
+#: c:\Apache2\htdocs\account21/inventory/view/view_adjustment.php:56
+#: c:\Apache2\htdocs\account21/inventory/view/view_transfer.php:57
 msgid "Quantity"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/inventory/manage/item_codes.php:122
 #: c:\Apache2\htdocs\account21/inventory/manage/sales_kits.php:42
+#: c:\Apache2\htdocs\account21/inventory/view/view_adjustment.php:57
+#: c:\Apache2\htdocs\account21/inventory/view/view_transfer.php:57
 msgid "Units"
 msgstr ""
 
@@ -4983,43 +4986,43 @@ msgstr ""
 msgid "Enter another supplier &payment"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:93
+#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:90
 msgid "From Bank Account:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:95
+#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:92
 msgid "Amount of Payment:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:96
+#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:93
 msgid "Amount of Discount:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:98
+#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:95
 msgid "Date Paid"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:105
+#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:99
 msgid "Payment To:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:125
+#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:117
 msgid "Enter Payment"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:129
+#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:121
 msgid "The amount and discount are in the bank account's currency."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:153
+#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:145
 msgid "The exchange rate must be numeric and greater than zero."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:165
+#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:157
 msgid "The entered discount is invalid or less than zero."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:172
+#: c:\Apache2\htdocs\account21/purchasing/supplier_payment.php:164
 msgid "The total of the amount and the discount is zero or negative. Please enter positive values."
 msgstr ""
 
@@ -5128,6 +5131,8 @@ msgstr ""
 #: c:\Apache2\htdocs\account21/purchasing/inquiry/po_search.php:176
 #: c:\Apache2\htdocs\account21/purchasing/inquiry/po_search_completed.php:158
 #: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:213
+#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_credit.php:45
+#: c:\Apache2\htdocs\account21/purchasing/view/view_supp_invoice.php:48
 msgid "Supplier's Reference"
 msgstr ""
 
@@ -5175,11 +5180,13 @@ msgid "Supp Reference"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_allocation_inquiry.php:183
+#: c:\Apache2\htdocs\account21/reporting/rep101.php:84
 msgid "Allocated"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_allocation_inquiry.php:195
 #: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:233
+#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:90
 msgid "Marked items are overdue."
 msgstr ""
 
@@ -5194,10 +5201,15 @@ msgstr ""
 #: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:68
 #: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:69
 #: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:70
+#: c:\Apache2\htdocs\account21/reporting/rep102.php:108
+#: c:\Apache2\htdocs\account21/reporting/rep102.php:109
+#: c:\Apache2\htdocs\account21/reporting/rep102.php:110
+#: c:\Apache2\htdocs\account21/reporting/rep102.php:225
 msgid "Days"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:70
+#: c:\Apache2\htdocs\account21/reporting/rep102.php:110
 msgid "Over"
 msgstr ""
 
@@ -5206,10 +5218,13 @@ msgid "Terms"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:74
+#: c:\Apache2\htdocs\account21/reporting/rep102.php:113
+#: c:\Apache2\htdocs\account21/reporting/rep102.php:223
 msgid "Current"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/purchasing/inquiry/supplier_inquiry.php:75
+#: c:\Apache2\htdocs\account21/reporting/rep102.php:114
 msgid "Total Balance"
 msgstr ""
 
@@ -5346,43 +5361,48 @@ msgstr ""
 msgid "Add New Supplier Details"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:17
+#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:21
 msgid "View Purchase Order Delivery"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:23
+#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:27
 msgid "This page must be called with a Purchase Order Delivery number to review."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:29
+#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:33
 msgid "Purchase Order Delivery"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:33
+#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:37
+#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:41
 msgid "Line Details"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:36
+#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:40
+#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:45
 msgid "Item Description"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:36
+#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:40
 msgid "Delivery Date"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:37
+#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:41
+#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:46
 msgid "Line Total"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:37
+#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:41
+#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:46
 msgid "Quantity Invoiced"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:66
+#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:70
+#: c:\Apache2\htdocs\account21/purchasing/view/view_po.php:84
 msgid "Total Excluding Tax/Shipping"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:71
+#: c:\Apache2\htdocs\account21/purchasing/view/view_grn.php:75
 msgid "This delivery has been voided."
 msgstr ""
 
@@ -5505,8 +5525,6 @@ msgstr ""
 #: c:\Apache2\htdocs\account21/reporting/rep101.php:90
 #: c:\Apache2\htdocs\account21/reporting/rep102.php:113
 #: c:\Apache2\htdocs\account21/reporting/rep102.php:120
-#: c:\Apache2\htdocs\account21/reporting/rep105.php:105
-#: c:\Apache2\htdocs\account21/reporting/rep106.php:81
 msgid "Customer"
 msgstr ""
 
@@ -5516,12 +5534,10 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/rep101.php:175
 #: c:\Apache2\htdocs\account21/reporting/rep102.php:209
-#: c:\Apache2\htdocs\account21/reporting/rep106.php:177
 msgid "Grand Total"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/rep102.php:95
-#: c:\Apache2\htdocs\account21/reporting/rep106.php:91
 msgid "Summary Only"
 msgstr ""
 
@@ -5634,6 +5650,7 @@ msgid "Back Orders Only"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/rep105.php:105
+#: c:\Apache2\htdocs\account21/reporting/rep204.php:81
 msgid "Order"
 msgstr ""
 
@@ -5834,15 +5851,19 @@ msgstr ""
 msgid "Stock Check Sheets"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/rep304.php:105
+#: c:\Apache2\htdocs\account21/reporting/rep304.php:114
+msgid "Qty"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/reporting/rep304.php:114
 msgid "Cost"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/rep304.php:105
+#: c:\Apache2\htdocs\account21/reporting/rep304.php:114
 msgid "Contribution"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/rep304.php:114
+#: c:\Apache2\htdocs\account21/reporting/rep304.php:126
 msgid "Inventory Sales Report"
 msgstr ""
 
@@ -5863,6 +5884,10 @@ msgid "Dimension Summary"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/rep601.php:83
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:78
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:90
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:97
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:131
 msgid "Bank Account"
 msgstr ""
 
@@ -5889,26 +5914,46 @@ msgstr ""
 #: c:\Apache2\htdocs\account21/reporting/rep705.php:147
 #: c:\Apache2\htdocs\account21/reporting/rep705.php:159
 #: c:\Apache2\htdocs\account21/reporting/rep705.php:169
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:216
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:259
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:297
+#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:147
+#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:159
+#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:169
 msgid "Year"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/rep705.php:153
 #: c:\Apache2\htdocs\account21/reporting/rep705.php:163
 #: c:\Apache2\htdocs\account21/reporting/rep705.php:171
+#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:153
+#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:163
+#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:171
 msgid "Info"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/rep705.php:153
 #: c:\Apache2\htdocs\account21/reporting/rep705.php:163
 #: c:\Apache2\htdocs\account21/reporting/rep705.php:171
+#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:153
+#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:163
+#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:171
 msgid "Amounts in thousands"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/rep705.php:175
+#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:175
 msgid "Annual Expense Breakdown"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/rep705.php:361
+#: c:\Apache2\htdocs\account21/reporting/rep706.php:319
+#: c:\Apache2\htdocs\account21/reporting/rep706.php:325
+#: c:\Apache2\htdocs\account21/reporting/rep707.php:335
+#: c:\Apache2\htdocs\account21/reporting/rep707.php:341
+#: c:\Apache2\htdocs\account21/reporting/backup/rep705.php:355
+#: c:\Apache2\htdocs\account21/reporting/backup/rep706.php:289
+#: c:\Apache2\htdocs\account21/reporting/backup/rep706.php:295
 msgid "Calculated Return"
 msgstr ""
 
@@ -5922,11 +5967,6 @@ msgstr ""
 msgid "Close Balance"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/rep706.php:104
-#: c:\Apache2\htdocs\account21/reporting/backup/rep706.php:104
-msgid "Balance Sheet"
-msgstr ""
-
 #: c:\Apache2\htdocs\account21/reporting/rep706.php:341
 msgid "Liabilities"
 msgstr ""
@@ -5942,37 +5982,30 @@ msgstr ""
 #: c:\Apache2\htdocs\account21/reporting/rep706.php:356
 #: c:\Apache2\htdocs\account21/reporting/rep707.php:357
 #: c:\Apache2\htdocs\account21/reporting/backup/rep706.php:314
-#: c:\Apache2\htdocs\account21/reporting/backup/rep707.php:351
 msgid "Group"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/rep707.php:92
-#: c:\Apache2\htdocs\account21/reporting/backup/rep707.php:92
 msgid "Accumulated"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/rep707.php:92
-#: c:\Apache2\htdocs\account21/reporting/backup/rep707.php:92
 msgid "Achieved %"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/rep707.php:125
-#: c:\Apache2\htdocs\account21/reporting/backup/rep707.php:125
 msgid "Budget"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/rep707.php:134
-#: c:\Apache2\htdocs\account21/reporting/backup/rep707.php:134
 msgid "Period Y-1"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/rep707.php:137
-#: c:\Apache2\htdocs\account21/reporting/backup/rep707.php:137
 msgid "Profit and Loss Statement"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/rep709.php:88
-#: c:\Apache2\htdocs\account21/reporting/backup/rep709.php:240
 msgid "Tax Report"
 msgstr ""
 
@@ -5981,12 +6014,10 @@ msgid "Ref"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/rep709.php:106
-#: c:\Apache2\htdocs\account21/reporting/backup/rep709.php:271
 msgid "Branch Name"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/rep709.php:107
-#: c:\Apache2\htdocs\account21/reporting/backup/rep709.php:272
 msgid "Net"
 msgstr ""
 
@@ -5995,12 +6026,10 @@ msgid "Rate"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/rep709.php:107
-#: c:\Apache2\htdocs\account21/reporting/backup/rep709.php:272
 msgid "Tax"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/rep709.php:161
-#: c:\Apache2\htdocs\account21/reporting/backup/rep709.php:392
 msgid "Tax Rate"
 msgstr ""
 
@@ -6066,9 +6095,9 @@ msgstr ""
 #: c:\Apache2\htdocs\account21/reporting/reports_main.php:294
 #: c:\Apache2\htdocs\account21/reporting/reports_main.php:298
 #: c:\Apache2\htdocs\account21/reporting/reports_main.php:304
-#: c:\Apache2\htdocs\account21/reporting/reports_main.php:312
-#: c:\Apache2\htdocs\account21/reporting/reports_main.php:319
-#: c:\Apache2\htdocs\account21/reporting/reports_main.php:326
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:311
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:318
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:325
 msgid "Comments"
 msgstr ""
 
@@ -6104,9 +6133,8 @@ msgstr ""
 #: c:\Apache2\htdocs\account21/reporting/reports_main.php:295
 #: c:\Apache2\htdocs\account21/reporting/reports_main.php:299
 #: c:\Apache2\htdocs\account21/reporting/reports_main.php:305
-#: c:\Apache2\htdocs\account21/reporting/reports_main.php:306
-#: c:\Apache2\htdocs\account21/reporting/reports_main.php:313
-#: c:\Apache2\htdocs\account21/reporting/reports_main.php:320
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:312
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:319
 msgid "Destination"
 msgstr ""
 
@@ -6121,7 +6149,7 @@ msgstr ""
 #: c:\Apache2\htdocs\account21/reporting/reports_main.php:267
 #: c:\Apache2\htdocs\account21/reporting/reports_main.php:275
 #: c:\Apache2\htdocs\account21/reporting/reports_main.php:303
-#: c:\Apache2\htdocs\account21/reporting/reports_main.php:311
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:310
 msgid "Graphics"
 msgstr ""
 
@@ -6315,10 +6343,9 @@ msgstr ""
 #: c:\Apache2\htdocs\account21/reporting/reports_main.php:289
 #: c:\Apache2\htdocs\account21/reporting/reports_main.php:296
 #: c:\Apache2\htdocs\account21/reporting/reports_main.php:300
-#: c:\Apache2\htdocs\account21/reporting/reports_main.php:307
-#: c:\Apache2\htdocs\account21/reporting/reports_main.php:314
-#: c:\Apache2\htdocs\account21/reporting/reports_main.php:322
-#: c:\Apache2\htdocs\account21/reporting/backup/rep709.php:486
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:306
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:313
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:321
 msgid "General Ledger"
 msgstr ""
 
@@ -6366,23 +6393,23 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/reports_main.php:229
 #: c:\Apache2\htdocs\account21/reporting/reports_main.php:270
-#: c:\Apache2\htdocs\account21/reporting/reports_main.php:307
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:306
 msgid "&Profit and Loss Statement"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/reports_main.php:232
 #: c:\Apache2\htdocs\account21/reporting/reports_main.php:273
-#: c:\Apache2\htdocs\account21/reporting/reports_main.php:310
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:309
 msgid "Compare to"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/reports_main.php:241
 #: c:\Apache2\htdocs\account21/reporting/reports_main.php:281
-#: c:\Apache2\htdocs\account21/reporting/reports_main.php:317
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:316
 msgid "Zero values"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/reports_main.php:322
+#: c:\Apache2\htdocs\account21/reporting/reports_main.php:321
 msgid "Ta&x Report"
 msgstr ""
 
@@ -6464,6 +6491,7 @@ msgid "Modifying Customer Credit Note"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/sales/credit_note_entry.php:51
+#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:491
 msgid "There are no customers, or there are no customers with branches. Please define customers and customer branches."
 msgstr ""
 
@@ -6519,7 +6547,7 @@ msgid "Credit Note Items"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/sales/credit_note_entry.php:281
-#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:388
+#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:391
 msgid "Process Credit Note"
 msgstr ""
 
@@ -6567,53 +6595,53 @@ msgstr ""
 msgid "This page can only be opened if an invoice has been selected for crediting."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:255
+#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:258
 msgid "Crediting Invoice"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:276
+#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:279
 msgid "Credit Note Date"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:286
+#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:289
 msgid "Invoiced Quantity"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:287
+#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:290
 msgid "Credit Quantity"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:287
+#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:290
 msgid "Discount %"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:321
+#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:324
 msgid "Credit Shipping Cost"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:328
-#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:447
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:495
+#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:331
+#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:448
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:498
 msgid "Sub-total"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:336
+#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:339
 msgid "Credit Note Total"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:354
+#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:357
 msgid "Credit Note Type"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:362
+#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:365
 msgid "Items Returned to Location"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:367
+#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:370
 msgid "Write off the cost of the items to"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:386
+#: c:\Apache2\htdocs\account21/sales/customer_credit_invoice.php:389
 msgid "Update credit value for quantities entered"
 msgstr ""
 
@@ -6631,19 +6659,23 @@ msgid "Deliver Items for a Sales Order"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/sales/customer_delivery.php:50
+#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:109
 #, php-format
 msgid "Delivery # %d has been entered."
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/sales/customer_delivery.php:52
+#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:111
 msgid "&View This Delivery"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/sales/customer_delivery.php:54
+#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:113
 msgid "&Print Delivery Note"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/sales/customer_delivery.php:56
+#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:115
 msgid "View the GL Journal Entries for this Dispatch"
 msgstr ""
 
@@ -6721,7 +6753,7 @@ msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/sales/customer_delivery.php:178
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:278
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:281
 msgid "The entered shipping value is not numeric."
 msgstr ""
 
@@ -6735,74 +6767,71 @@ msgid ""
 "\t\tnot dispatched on sales order."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:272
+#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:273
+#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:347
 msgid "The delivery cannot be processed because there is an insufficient quantity for item:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:332
+#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:333
 msgid "For Sales Order"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:341
+#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:342
 msgid "Delivery From"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:369
+#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:370
 msgid "Invoice Dead-line"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:378
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:390
+#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:379
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:393
 msgid "The selected customer account is currently on hold. Please contact the credit control personnel to discuss."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:383
+#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:384
 msgid "Delivery Items"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:386
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:400
-msgid "Delivered"
-msgstr ""
-
 #: c:\Apache2\htdocs\account21/sales/customer_delivery.php:387
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:401
-msgid "Tax Type"
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:403
+msgid "Delivered"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:387
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:401
+#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:388
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:404
 msgid "Discount"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:441
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:485
+#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:442
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:488
 msgid "Shipping Cost"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:454
+#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:455
 msgid "Amount Total"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:459
+#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:460
 msgid "Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:463
+#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:464
 msgid "Action For Balance"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:470
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:513
+#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:471
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:516
 msgid "Refresh document page"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:471
+#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:472
 msgid "Process Dispatch"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:472
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:515
+#: c:\Apache2\htdocs\account21/sales/customer_delivery.php:473
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:518
+#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:533
 msgid "Check entered data and save document"
 msgstr ""
 
@@ -6829,6 +6858,7 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account21/sales/customer_invoice.php:57
 #: c:\Apache2\htdocs\account21/sales/customer_invoice.php:73
+#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:133
 msgid "&View This Invoice"
 msgstr ""
 
@@ -6838,6 +6868,7 @@ msgid "&Print This Invoice"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/sales/customer_invoice.php:61
+#: c:\Apache2\htdocs\account21/sales/sales_order_entry.php:137
 msgid "View the GL &Journal Entries for this Invoice"
 msgstr ""
 
@@ -6882,55 +6913,55 @@ msgid "Select Delivery to Invoice"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/sales/customer_invoice.php:153
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:289
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:292
 msgid "Selected quantity cannot be less than quantity credited nor more than quantity not invoiced yet."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:242
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:245
 msgid "The entered invoice date is invalid."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:248
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:251
 msgid "The entered invoice date is not in fiscal year."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:254
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:257
 msgid "The entered invoice due date is invalid."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:284
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:287
 msgid "There are no item quantities on this invoice."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:355
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:358
 msgid "Delivery Notes:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:396
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:399
 msgid "Invoice Items"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:401
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:404
 msgid "This Invoice"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:404
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:407
 msgid "DN"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:409
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:412
 msgid "Credited"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:455
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:458
 msgid "Remove"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:502
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:505
 msgid "Invoice Total"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:514
+#: c:\Apache2\htdocs\account21/sales/customer_invoice.php:517
 msgid "Process Invoice"
 msgstr ""
 
@@ -6998,11 +7029,11 @@ msgstr ""
 msgid "Into Bank Account:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_payments.php:235
+#: c:\Apache2\htdocs\account21/sales/customer_payments.php:236
 msgid "Amount and discount are in customer's currency."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/customer_payments.php:239
+#: c:\Apache2\htdocs\account21/sales/customer_payments.php:240
 msgid "Add Payment"
 msgstr ""
 
@@ -7240,10 +7271,6 @@ msgid "Customer Allocations"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/sales/allocations/customer_allocation_main.php:44
-#: c:\Apache2\htdocs\account21/sales/inquiry/customer_allocation_inquiry.php:42
-#: c:\Apache2\htdocs\account21/sales/inquiry/customer_inquiry.php:44
-#: c:\Apache2\htdocs\account21/sales/manage/customers.php:192
-#: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:177
 msgid "Select a customer: "
 msgstr ""
 
@@ -7597,6 +7624,7 @@ msgid "Sales Area:"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/sales/manage/customer_branches.php:309
+#: c:\Apache2\htdocs\account21/sales/manage/recurrent_invoices.php:179
 msgid "Sales Group:"
 msgstr ""
 
@@ -7782,47 +7810,51 @@ msgstr ""
 msgid "Selected point of sale has been updated"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:68
+#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:70
+msgid "Cannot delete this POS because it is used in users setup."
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:73
 msgid "Selected point of sale has been deleted"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:84
+#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:90
 msgid "POS Name"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:84
+#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:90
 msgid "Credit sale"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:84
+#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:90
 msgid "Cash sale"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:84
+#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:90
 msgid "Default account"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:111
+#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:117
 msgid "To have cash POS first define at least one cash bank account."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:130
+#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:136
 msgid "Point of Sale Name"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:132
+#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:138
 msgid "Allowed credit sale"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:133
+#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:139
 msgid "Allowed cash sale"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:134
+#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:140
 msgid "Default cash account"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:141
+#: c:\Apache2\htdocs\account21/sales/manage/sales_points.php:147
 msgid "POS location"
 msgstr ""
 
@@ -8133,8 +8165,6 @@ msgid "Is exempt"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/taxes/tax_groups.php:17
-#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:127
-#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:120
 msgid "Tax Groups"
 msgstr ""
 
@@ -8191,10 +8221,6 @@ msgstr ""
 msgid "Rate (%)"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/taxes/tax_types.php:16
-msgid "Tax Types"
-msgstr ""
-
 #: c:\Apache2\htdocs\account21/taxes/tax_types.php:30
 msgid "The tax type name cannot be empty."
 msgstr ""
@@ -8249,11 +8275,6 @@ msgstr ""
 
 #: c:\Apache2\htdocs\account21/themes/aqua/renderer.php:16
 #: c:\Apache2\htdocs\account21/themes/cool/renderer.php:16
-#: c:\Apache2\htdocs\account21/themes/default/renderer.php:16
-#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:17
-#: c:\Apache2\htdocs\account21/themes/fancy/renderer.php:17
-#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:17
-#: c:\Apache2\htdocs\account21/themes/newwave/renderer.php:6
 msgid "Main Menu"
 msgstr ""
 
@@ -8261,24 +8282,11 @@ msgstr ""
 #: c:\Apache2\htdocs\account21/themes/aqua/renderer.php:70
 #: c:\Apache2\htdocs\account21/themes/cool/renderer.php:46
 #: c:\Apache2\htdocs\account21/themes/cool/renderer.php:70
-#: c:\Apache2\htdocs\account21/themes/default/renderer.php:47
-#: c:\Apache2\htdocs\account21/themes/default/renderer.php:70
-#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:40
-#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:47
-#: c:\Apache2\htdocs\account21/themes/fancy/renderer.php:43
-#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:40
-#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:47
-#: c:\Apache2\htdocs\account21/themes/newwave/renderer.php:37
 msgid "Help"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/themes/aqua/renderer.php:65
 #: c:\Apache2\htdocs\account21/themes/cool/renderer.php:65
-#: c:\Apache2\htdocs\account21/themes/default/renderer.php:65
-#: c:\Apache2\htdocs\account21/themes/elegant/renderer.php:43
-#: c:\Apache2\htdocs\account21/themes/fancy/renderer.php:40
-#: c:\Apache2\htdocs\account21/themes/modern/renderer.php:43
-#: c:\Apache2\htdocs\account21/themes/newwave/renderer.php:48
 msgid "Preferences"
 msgstr ""
 
@@ -8386,6 +8394,116 @@ msgstr ""
 msgid "Balance for this Dimension"
 msgstr ""
 
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:337
+msgid "Date Voided:"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:424
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:440
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:458
+msgid "Included"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:494
+msgid "Total Amount"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:518
+msgid "Total Allocated:"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:522
+msgid "Left to Allocate:"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:558
+msgid "No Quick Entries are defined."
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743
+msgid "January"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743
+msgid "February"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743
+msgid "March"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743
+msgid "April"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743
+msgid "May"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743
+msgid "June"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743
+msgid "July"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743
+msgid "August"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743
+msgid "September"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743
+msgid "October"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743
+msgid "November"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:743
+msgid "December"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:744
+msgid "Su"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:744
+msgid "Mo"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:744
+msgid "Tu"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:744
+msgid "We"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:744
+msgid "Th"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:744
+msgid "Fr"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:744
+msgid "Sa"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:745
+msgid "W"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/doc/backup/ui_view.inc:746
+msgid "Back"
+msgstr ""
+
 #: c:\Apache2\htdocs\account21/gl/includes/db/gl_db_banking.inc:35
 #: c:\Apache2\htdocs\account21/gl/includes/db/gl_db_banking.inc:38
 msgid "Exchange Variance"
@@ -8460,7 +8578,7 @@ msgstr ""
 msgid "Cannot retrieve exchange rate for currency %s as of %s. Please add exchange rate manually on Exchange Rates page."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/includes/current_user.inc:324
+#: c:\Apache2\htdocs\account21/includes/current_user.inc:338
 msgid "Requesting data..."
 msgstr ""
 
@@ -8481,6 +8599,7 @@ msgid "The entered information is a duplicate. Please go back and enter differen
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/includes/main.inc:41
+#: c:\Apache2\htdocs\account21/includes/backup/main.inc:41
 msgid "This page is usable only with javascript enabled browsers."
 msgstr ""
 
@@ -8499,11 +8618,6 @@ msgstr ""
 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 ""
 
-#: c:\Apache2\htdocs\account21/includes/session.inc:41
-#: c:\Apache2\htdocs\account21/includes/backup/session.inc:41
-msgid "Back"
-msgstr ""
-
 #: c:\Apache2\htdocs\account21/includes/session.inc:55
 #: c:\Apache2\htdocs\account21/includes/backup/session.inc:55
 msgid "Security settings have not been defined for your user account."
@@ -8736,7 +8850,7 @@ msgstr ""
 msgid "to continue"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/includes/ui/ui_input.inc:525
+#: c:\Apache2\htdocs\account21/includes/ui/ui_input.inc:531
 msgid "Click Here to Pick up the date"
 msgstr ""
 
@@ -8860,112 +8974,6 @@ msgstr ""
 msgid "in units of : "
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:337
-msgid "Date Voided:"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:424
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:440
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:458
-msgid "Included"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:494
-msgid "Total Amount"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:518
-msgid "Total Allocated:"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:522
-msgid "Left to Allocate:"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:558
-msgid "No Quick Entries are defined."
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:716
-msgid "January"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:716
-msgid "February"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:716
-msgid "March"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:716
-msgid "April"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:716
-msgid "May"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:716
-msgid "June"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:716
-msgid "July"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:716
-msgid "August"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:716
-msgid "September"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:716
-msgid "October"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:716
-msgid "November"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:716
-msgid "December"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:717
-msgid "Su"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:717
-msgid "Mo"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:717
-msgid "Tu"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:717
-msgid "We"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:717
-msgid "Th"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:717
-msgid "Fr"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:717
-msgid "Sa"
-msgstr ""
-
-#: c:\Apache2\htdocs\account21/includes/ui/ui_view.inc:718
-msgid "W"
-msgstr ""
-
 #: c:\Apache2\htdocs\account21/inventory/includes/item_adjustments_ui.inc:20
 #: c:\Apache2\htdocs\account21/inventory/includes/stock_transfers_ui.inc:20
 msgid "For Part :"
@@ -9099,130 +9107,130 @@ msgstr ""
 msgid "Order Comments"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:97
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:100
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:99
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:102
 msgid "Supplier's Ref.:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:115
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:117
 msgid "Terms:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:143
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:145
 msgid "Sub-total:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:151
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:153
 msgid "Invoice Total:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:185
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:187
 msgid "Add GL Line"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:186
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:188
 msgid "Reset"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:187
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:189
 msgid "Clear all GL entry fields"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:207
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:209
 msgid "GL Items for this Invoice"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:209
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:211
 msgid "GL Items for this Credit Note"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:219
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:221
 msgid "Quick Entry:"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:385
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:390
 msgid "Add to Invoice"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:387
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:392
 msgid "Add to Credit Note"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:389
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:424
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:394
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:429
 msgid "WARNING! Be careful with removal. The operation is executed immediately and cannot be undone !!!"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:391
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:396
 #, php-format
 msgid "You are about to remove all yet non-invoiced items from delivery line #%d. This operation also irreversibly changes related order line. Do you want to continue ?"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:422
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:427
 msgid "Items Received Yet to be Invoiced"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:427
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:432
 msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:432
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:437
 msgid "Received Items Charged on this Invoice"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:434
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:439
 msgid "Received Items Credited on this Note"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:446
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:451
 msgid "Received between"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:447
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:452
 msgid "and"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:458
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:463
 msgid "Add All Items"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:467
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:472
 msgid "Sequence #"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:467
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:472
 msgid "P.O."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:468
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:473
 msgid "Received On"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:469
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:474
 msgid "Qty Yet To Invoice"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:469
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:474
 msgid "Order Price"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:474
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:479
 msgid "Qty Yet To Credit"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:479
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:484
 msgid "Line Value"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:545
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:550
 msgid "There are no outstanding items received from this supplier that have not been invoiced by them."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:548
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:553
 msgid "There are no received items for the selected supplier that have been invoiced."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:549
+#: c:\Apache2\htdocs\account21/purchasing/includes/ui/invoice_ui.inc:554
 msgid "Credits can only be applied to invoiced items."
 msgstr ""
 
@@ -9259,14 +9267,10 @@ msgid "Total Excluding Shipping/Tax"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/backup/excel_report.inc:187
-#: c:\Apache2\htdocs\account21/reporting/includes/excel_report.inc:203
-#: c:\Apache2\htdocs\account21/reporting/includes/pdf_report.inc:204
 msgid "Print Out Date"
 msgstr ""
 
 #: c:\Apache2\htdocs\account21/reporting/backup/excel_report.inc:194
-#: c:\Apache2\htdocs\account21/reporting/includes/excel_report.inc:209
-#: c:\Apache2\htdocs\account21/reporting/includes/pdf_report.inc:211
 msgid "Fiscal Year"
 msgstr ""
 
@@ -9274,106 +9278,110 @@ msgstr ""
 msgid "Cust no"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:23
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:18
+msgid "Order To"
+msgstr ""
+
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:31
 msgid "Your Ref"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:24
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:32
 msgid "Our Ref."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:25
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:33
 msgid "Your VAT no."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:26
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:34
 msgid "Our VAT No."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:28
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:36
 msgid "Customers Reference"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:30
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:38
 msgid "Domicile"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:33
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:41
 msgid "All amounts stated in"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:37
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:45
 msgid "Please quote Invoice no. when paying. All amounts stated in"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:38
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:46
 msgid "Please quote Credit no. when paying. All amounts stated in"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:41
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:49
 msgid "Phone/Fax/Email"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:44
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:76
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:52
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:84
 msgid "You can pay through"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:67
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:75
 msgid "DueDate"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:73
-msgid "Dear Sirs"
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:81
+msgid "Dear"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:74
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:82
 msgid "Attached you will find "
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:75
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:83
 msgid "Kindest regards"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:80
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:82
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:88
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:90
 msgid "Delivery Note No."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:80
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:83
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:88
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:91
 msgid "Order no."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:81
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:89
 msgid "Invoice No."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:81
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:89
 msgid "Credit No."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:94
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:102
 msgid "TOTAL ORDER EX VAT"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:95
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:103
 msgid "TOTAL PO EX VAT"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:96
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:104
 msgid "TOTAL DELIVERY INCL. VAT"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:100
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:108
 msgid "Outstanding Transactions"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:103
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:111
 msgid "Statement"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:104
+#: c:\Apache2\htdocs\account21/reporting/includes/doctext.inc:112
 msgid "as of"
 msgstr ""
 
@@ -9382,15 +9390,15 @@ msgstr ""
 msgid "Page"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/pdf_report.inc:462
+#: c:\Apache2\htdocs\account21/reporting/includes/pdf_report.inc:452
 msgid "Sending document by email failed"
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/pdf_report.inc:465
+#: c:\Apache2\htdocs\account21/reporting/includes/pdf_report.inc:455
 msgid "has been sent by email."
 msgstr ""
 
-#: c:\Apache2\htdocs\account21/reporting/includes/pdf_report.inc:503
+#: c:\Apache2\htdocs\account21/reporting/includes/pdf_report.inc:494
 msgid "Report has been sent to network printer "
 msgstr ""
 

diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc
index 56961e85ee6f366b78875b495bfb473b00bfcc9f..ab817cf9a65ccea93f446b8ca0b03c4a4c7a6d0e 100644 (file)
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -182,7 +182,7 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
 
                $memo_ = $entered_gl_code->memo_;
                $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $entered_gl_code->gl_code,
-                       $entered_gl_code->gl_dim, $entered_gl_code->gl_dim2, $entered_gl_code->amount, $supp_trans->supplier_id);
+                       $entered_gl_code->gl_dim, $entered_gl_code->gl_dim2, $entered_gl_code->amount, $supp_trans->supplier_id, "", 0, $memo_);
 
                add_supp_invoice_gl_item($trans_type, $invoice_id, $entered_gl_code->gl_code,
                        $entered_gl_code->amount, $memo_);
@@ -262,6 +262,7 @@ function add_supp_invoice($supp_trans, $invoice_no=0) // do not receive as ref b
                        $entered_grn->this_quantity_inv, $entered_grn->id, $entered_grn->po_detail_item, "");
     } /* end of GRN postings */
     /* Now the TAX account */
+    $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id, 0, false); // 2009.08-18 Joe Hunt. We have already got the gl lines
     foreach ($taxes as $taxitem)
     {
        if ($taxitem['Net'] != 0)

diff --git a/purchasing/includes/purchasing_db.inc b/purchasing/includes/purchasing_db.inc
index 850d22910f8821a4c87c851f96cbfb7fb55c7aa1..dc9ceccd20293ae65ef70634d37428d1daf61ee3 100644 (file)
--- a/purchasing/includes/purchasing_db.inc
+++ b/purchasing/includes/purchasing_db.inc
@@ -32,12 +32,12 @@ include_once($path_to_root . "/purchasing/includes/db/suppliers_db.inc");
 // $amount is in SUPPLIERS'S currency
 
 function add_gl_trans_supplier($type, $type_no, $date_, $account, $dimension, $dimension2,  
-       $amount, $supplier_id, $err_msg="", $rate=0)
+       $amount, $supplier_id, $err_msg="", $rate=0, $memo="")
 {
        if ($err_msg == "")
                $err_msg = "The supplier GL transaction could not be inserted"; 
                
-       return add_gl_trans($type, $type_no, $date_, $account, $dimension, $dimension2, "", 
+       return add_gl_trans($type, $type_no, $date_, $account, $dimension, $dimension2, $memo, 
                $amount, get_supplier_currency($supplier_id), 
                payment_person_types::supplier(), $supplier_id, $err_msg, $rate);
 }

diff --git a/purchasing/includes/supp_trans_class.inc b/purchasing/includes/supp_trans_class.inc
index 74d95dc77b7c8ab132c62c7dc15e6f458931f88a..98bd4fcdc88f10868b74141fd6b216791cca9952 100644 (file)
--- a/purchasing/includes/supp_trans_class.inc
+++ b/purchasing/includes/supp_trans_class.inc
@@ -90,7 +90,7 @@ class supp_trans
                $this->gl_codes = array();              
        }
        
-    function get_taxes($tax_group_id=null, $shipping_cost=0)
+    function get_taxes($tax_group_id=null, $shipping_cost=0, $gl_codes=true)
     {
        $items = array();
        $prices = array();
@@ -107,12 +107,26 @@ class supp_trans
                $prices[] =round( ($ln_itm->this_quantity_inv * $ln_itm->taxfree_charge_price($tax_group_id, $tax_group)),
                         user_price_dec());
         }
-        
+
         if ($tax_group_id == null)
                $tax_group_id = $this->tax_group_id;            
         
         $taxes = get_tax_for_items($items, $prices, $shipping_cost, $tax_group_id);
-        
+
+///////////////// Joe Hunt 2009.08.18
+
+               if ($gl_codes)
+               {
+                       foreach ($this->gl_codes as $gl_code)
+                       {
+                               $index = is_tax_account($gl_code->gl_code);
+                               if ($index !== false)
+                               {
+                                       $taxes[$index]['Value'] += $gl_code->amount;
+                               }       
+                       }
+               }       
+////////////////               
         return $taxes;
     }          
     
@@ -131,8 +145,10 @@ class supp_trans
                         user_price_dec());
 
                foreach ($this->gl_codes as $gl_line)
-                       $total += $gl_line->amount;
-                       
+               {       //////// 2009-08-18 Joe Hunt
+                       if (!is_tax_account($gl_line->gl_code))
+                               $total += $gl_line->amount;
+               }       
                return $total;
     }
 

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index 2f99a616529a6f7332b8c7973f4a900dfa2b4a52..cee5abbda36d252205c39a506ad9fae1adae828a 100644 (file)
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -44,7 +44,9 @@ function copy_to_trans(&$supp_trans)
        {
                foreach ( $supp_trans->gl_codes as $gl_line)
                {
-                       $supp_trans->ov_amount += $gl_line->amount;
+                       ////////// 2009-08-18 Joe Hunt
+                       if (!is_tax_account($gl_line->gl_code))
+                               $supp_trans->ov_amount += $gl_line->amount;
                }
        }
 }
@@ -288,9 +290,11 @@ function display_gl_items(&$supp_trans, $mode=0)
                                label_cell("");
                        }       
                        end_row();
-
-                       $total_gl_value += $entered_gl_code->amount;
-
+                       /////////// 2009-08-18 Joe Hunt
+                       if ($mode > 1 && !is_tax_account($entered_gl_code->gl_code))
+                               $total_gl_value += $entered_gl_code->amount;
+                       else    
+                               $total_gl_value += $entered_gl_code->amount;
                        $i++;
                        if ($i > 15)
                        {
@@ -376,7 +380,8 @@ function display_grn_items_for_selection(&$supp_trans, $k)
             else               
                qty_cells(null, 'This_QuantityCredited'.$n, number_format2(max($myrow["quantity_inv"], 0), $dec), 
                        null, null, $dec);
-            amount_cells(null, 'ChgPrice'.$n, price_format($myrow["unit_price"]));
+            $dec2 = 0;                 
+            amount_cells(null, 'ChgPrice'.$n, price_decimal_format($myrow["unit_price"], $dec2), null, null, $dec2);
             if ($supp_trans->is_invoice)
                amount_cell(round2($myrow["unit_price"] * ($myrow["qty_recd"] - $myrow["quantity_inv"]), user_price_dec()));
             else       
@@ -507,7 +512,7 @@ function display_grn_items(&$supp_trans, $mode=0)
                                qty_cell($entered_grn->prev_quantity_inv, false, $dec);
             }
                        qty_cell(abs($entered_grn->this_quantity_inv), true, $dec);
-                       amount_cell($entered_grn->chg_price);
+                       amount_decimal_cell($entered_grn->chg_price);
                        amount_cell( round2($entered_grn->chg_price * abs($entered_grn->this_quantity_inv), user_price_dec()), true);
 
                        if ($mode == 1)

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index aa0d8bcc442ab8fe1dab6eba7ff29220a3db6dc9..9ca5cda89c00800416c9b2b47479eeb7ba08a628 100644 (file)
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -190,7 +190,7 @@ function display_po_items(&$order, $editable=true)
                 qty_cell($po_line->qty_received, false, get_qty_dec($po_line->stock_id));
                        label_cell($po_line->units);
                 label_cell($po_line->req_del_date);
-                       amount_cell($po_line->price);
+                       amount_decimal_cell($po_line->price);
                 amount_cell($line_total);
 
                 if ($editable)
@@ -279,6 +279,7 @@ function po_item_controls(&$order, $stock_id=null)
    global $Ajax;
        start_row();
 
+       $dec2 = 0;
        $id = find_submit('Edit');
        if (($id != -1) && $stock_id != null)
        {
@@ -287,7 +288,8 @@ function po_item_controls(&$order, $stock_id=null)
                $_POST['stock_id'] = $order->line_items[$id]->stock_id;
                        $dec = get_qty_dec($_POST['stock_id']);
                $_POST['qty'] = qty_format($order->line_items[$id]->quantity, $_POST['stock_id'], $dec);
-               $_POST['price'] = price_format($order->line_items[$id]->price);
+               //$_POST['price'] = price_format($order->line_items[$id]->price);
+               $_POST['price'] = price_decimal_format($order->line_items[$id]->price, $dec2);
                $_POST['req_del_date'] = $order->line_items[$id]->req_del_date;
 
                $_POST['units'] = $order->line_items[$id]->units;
@@ -315,7 +317,8 @@ function po_item_controls(&$order, $stock_id=null)
 
                $dec = $item_info["decimals"];
                $_POST['qty'] = number_format2(get_purchase_conversion_factor ($order->supplier_id, $_POST['stock_id']), $dec);
-               $_POST['price'] = price_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']));
+               //$_POST['price'] = price_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']));
+               $_POST['price'] = price_decimal_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']), $dec2);
                $_POST['req_del_date'] = add_days(Today(), 10);
                $qty_rcvd = '';
        }
@@ -325,7 +328,7 @@ function po_item_controls(&$order, $stock_id=null)
 
        label_cell($_POST['units'], '', 'units');
        date_cells(null, 'req_del_date', '', null, 0, 0, 0);
-       amount_cells(null, 'price', null);
+       amount_cells(null, 'price', null, null, null, $dec2);
 
        //$line_total = $_POST['qty'] * $_POST['price'] * (1 - $_POST['Disc'] / 100);
        $line_total = round(input_num('qty') * input_num('price'),  user_price_dec());

diff --git a/purchasing/po_receive_items.php b/purchasing/po_receive_items.php
index a6f12cee33b26e352950adc1e627709c7d6fca2d..2bcd6085343995db86bd367ea16ddc6b2116bda5 100644 (file)
--- a/purchasing/po_receive_items.php
+++ b/purchasing/po_receive_items.php
@@ -80,7 +80,7 @@ function display_po_receive_items()
 
                $qty_outstanding = $ln_itm->quantity - $ln_itm->qty_received;
 
-               if ($ln_itm->receive_qty == 0)
+                       if (!isset($_POST['Update']) && !isset($_POST['ProcessGoodsReceived']) && $ln_itm->receive_qty == 0)
                {   //If no quantites yet input default the balance to be received
                $ln_itm->receive_qty = $qty_outstanding;
                }
@@ -104,7 +104,7 @@ function display_po_receive_items()
                        else
                                label_cell(number_format2($ln_itm->receive_qty, $dec), "align=right");
 
-                       amount_cell($ln_itm->price);
+                       amount_decimal_cell($ln_itm->price);
                        amount_cell($line_total);
                        end_row();
                }

diff --git a/purchasing/view/view_grn.php b/purchasing/view/view_grn.php
index 9a8cbc7fb6b5233c822103ecf62083398a8fcb4b..b0c37d7f7c85b29cc08595f9b9a3ac4017eb35bb 100644 (file)
--- a/purchasing/view/view_grn.php
+++ b/purchasing/view/view_grn.php
@@ -58,7 +58,7 @@ foreach ($purchase_order->line_items as $stock_item)
        $dec = get_qty_dec($stock_item->stock_id);
        qty_cell($stock_item->qty_received, false, $dec);
        label_cell($stock_item->units);
-       amount_cell($stock_item->price);
+       amount_decimal_cell($stock_item->price);
        amount_cell($line_total);
        qty_cell($stock_item->qty_inv, false, $dec);
        end_row();

diff --git a/purchasing/view/view_po.php b/purchasing/view/view_po.php
index 57ff3a470bfc3a512f076a0601da6df39808a478..81028338c80d2be97fa7444662e6c8a4a922fa4f 100644 (file)
--- a/purchasing/view/view_po.php
+++ b/purchasing/view/view_po.php
@@ -70,7 +70,7 @@ foreach ($purchase_order->line_items as $stock_item)
        $dec = get_qty_dec($stock_item->stock_id);
        qty_cell($stock_item->quantity, false, $dec);
        label_cell($stock_item->units);
-       amount_cell($stock_item->price);
+       amount_decimal_cell($stock_item->price);
        amount_cell($line_total);
        label_cell($stock_item->req_del_date);
        qty_cell($stock_item->qty_received, false, $dec);

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index fd48fba92ff16b869678724f60d01407b3b68e8c..64f391de30daf9e1f6501871aa551601d2d208d0 100644 (file)
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -58,7 +58,7 @@
                if ($this->company['coy_logo'] != '')
                {
                        $logo = $comp_path .'/'. user_company() . "/images/" . $this->company['coy_logo'];
-                       $this->AddImage($logo, $ccol, $this->row - 10, 0, 40);
+                       $this->AddImage($logo, $ccol, $this->row, 0, 40);
                }
                else
                {

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 00b06d2ef1f2c513bcf288a527f8e419f9fe6162..31a769df1114bb1ff4dc68558119897c2bd8d621 100644 (file)
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -161,6 +161,8 @@ function print_sales_orders()
                        if ($myrow['contact_email'] == '')
                        {
                                $myrow['contact_email'] = $branch['email'];
+                               if ($myrow['contact_email'] == '')
+                                       $myrow['contact_email'] = $myrow['master_email'];
                                $myrow['DebtorName'] = $branch['br_name'];
                        }
                        $myrow['reference'] = $i;

diff --git a/reporting/rep209.php b/reporting/rep209.php
index 046738d025e47900f17d3530add9cc4db2d3dc3d..b9a8a049509fd75b3252f9abc339b2bced951cd1 100644 (file)
--- a/reporting/rep209.php
+++ b/reporting/rep209.php
@@ -125,7 +125,8 @@ function print_po()
                        }       
                        $Net = round2(($myrow2["unit_price"] * $myrow2["quantity_ordered"]), user_price_dec());
                        $SubTotal += $Net;
-                       $DisplayPrice = number_format2($myrow2["unit_price"],$dec);
+                       $dec2 = 0;
+                       $DisplayPrice = price_decimal_format($myrow2["unit_price"],$dec2);
                        $DisplayQty = number_format2($myrow2["quantity_ordered"],get_qty_dec($myrow2['item_code']));
                        $DisplayNet = number_format2($Net,$dec);
                        //$rep->TextCol(0, 1,   $myrow2['item_code'], -2);

diff --git a/reporting/rep702.php b/reporting/rep702.php
index b1a96672fac0b538990033aca83d095c39de7d17..26a09c2da78f9baec4f0077765c5837c74b01dec 100644 (file)
--- a/reporting/rep702.php
+++ b/reporting/rep702.php
@@ -88,7 +88,12 @@ function print_list_of_journal_entries()
             $coms =  payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"]);
             $memo = get_comments_string($myrow['type'], $myrow['type_no']);
             if ($memo != '')
-               $coms .= ($coms!= "")?"/":"" . $memo;
+            {
+               if ($coms == "")
+                       $coms = $memo;
+               else
+                       $coms .= " / ".$memo;
+            }          
             $rep->TextCol(3, 6, $coms);
             $rep->NewLine(2);
         }

diff --git a/reporting/reports_main.php b/reporting/reports_main.php
index 9fa4a81c47c9fe7193c8f2ff7140f8419625e9e9..d02f01f737b42ec4e3d499edb5dad160ed504780 100644 (file)
--- a/reporting/reports_main.php
+++ b/reporting/reports_main.php
@@ -314,7 +314,6 @@ else
                        new ReportParam(_('End Date'),'DATEENDM'),
                        new ReportParam(_('Graphics'),'GRAPHIC'),
                        new ReportParam(_('Comments'),'TEXTBOX'),
-                       new ReportParam(_('Destination'),'DESTINATION'),
                        new ReportParam(_('Destination'),'DESTINATION')));
        $reports->addReport(_('General Ledger'),707,_('&Profit and Loss Statement'),
        array(  new ReportParam(_('Start Date'),'DATEBEGINM'),

diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index 70f244fa7449146faa293aa2f0de1ec46b55d1c5..b8aa6da84cce2cbde7e033a1c2eeccbcfdaec560 100644 (file)
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -178,24 +178,27 @@ function check_quantities()
 
 function copy_to_cart()
 {
-  $cart = &$_SESSION['Items'];
-  $cart->ship_via = $_POST['ShipperID'];
-  $cart->freight_cost = input_num('ChargeFreightCost');
-  $cart->document_date =  $_POST['CreditDate'];
-  $cart->Location = $_POST['Location'];
-  $cart->Comments = $_POST['CreditText'];
+       $cart = &$_SESSION['Items'];
+       $cart->ship_via = $_POST['ShipperID'];
+       $cart->freight_cost = input_num('ChargeFreightCost');
+       $cart->document_date =  $_POST['CreditDate'];
+       $cart->Location = $_POST['Location'];
+       $cart->Comments = $_POST['CreditText'];
+       if ($_SESSION['Items']->trans_no == 0)
+               $cart->reference = $_POST['ref'];
 }
 //-----------------------------------------------------------------------------
 
 function copy_from_cart()
 {
-  $cart = &$_SESSION['Items'];
-  $_POST['ShipperID'] = $cart->ship_via;
-  $_POST['ChargeFreightCost'] = price_format($cart->freight_cost);
-  $_POST['CreditDate']= $cart->document_date;
-  $_POST['Location']= $cart->Location;
-  $_POST['CreditText']= $cart->Comments;
-  $_POST['cart_id'] = $cart->cart_id;
+       $cart = &$_SESSION['Items'];
+       $_POST['ShipperID'] = $cart->ship_via;
+       $_POST['ChargeFreightCost'] = price_format($cart->freight_cost);
+       $_POST['CreditDate']= $cart->document_date;
+       $_POST['Location']= $cart->Location;
+       $_POST['CreditText']= $cart->Comments;
+       $_POST['cart_id'] = $cart->cart_id;
+       $_POST['ref'] = $cart->reference;
 }
 //-----------------------------------------------------------------------------
 
@@ -248,7 +251,7 @@ function display_credit_items()
 //             $_POST['ref'] = references::get_next(11);
 
     if ($_SESSION['Items']->trans_no==0) {
-               ref_cells(_("Reference"), 'ref', '', $_SESSION['Items']->reference, "class='tableheader2'");
+               ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
        } else {
                label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
        }

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index c0da3f3bb2741fdcae21e7175ca05b4580d2c98b..23cbd79a10a2ed31f3bf1478eb9ee29660932012 100644 (file)
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -220,6 +220,7 @@ function copy_from_cart()
        $_POST['Location'] = $cart->Location;
        $_POST['Comments'] = $cart->Comments;
        $_POST['cart_id'] = $cart->cart_id;
+       $_POST['ref'] = $cart->reference;
 }
 //------------------------------------------------------------------------------
 
@@ -326,7 +327,7 @@ start_row();
 //     $_POST['ref'] = references::get_next(13);
 
 if ($_SESSION['Items']->trans_no==0) {
-       ref_cells(_("Reference"), 'ref', '', $_SESSION['Items']->reference, "class='tableheader2'");
+       ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
 } else {
        label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
 }

diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index a73abf5025675bd8770c94b61e0bdb00d12db005..249a0aa91573678b522508b1ed10e8e411f79a4b 100644 (file)
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -221,6 +221,8 @@ function copy_to_cart()
        $cart->document_date =  $_POST['InvoiceDate'];
        $cart->due_date =  $_POST['due_date'];
        $cart->Comments = $_POST['Comments'];
+       if ($_SESSION['Items']->trans_no == 0)
+               $cart->reference = $_POST['ref'];
 }
 //-----------------------------------------------------------------------------
 
@@ -233,6 +235,7 @@ function copy_from_cart()
        $_POST['due_date'] = $cart->due_date;
        $_POST['Comments']= $cart->Comments;
        $_POST['cart_id'] = $cart->cart_id;
+       $_POST['ref'] = $cart->reference;
 }
 
 //-----------------------------------------------------------------------------
@@ -349,7 +352,7 @@ end_row();
 start_row();
 
 if ($_SESSION['Items']->trans_no == 0) {
-       ref_cells(_("Reference"), 'ref', '', $_SESSION['Items']->reference, "class='tableheader2'");
+       ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
 } else {
        label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
 }

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index f00a88dab6364a8a6e51674adb1531c8e4047e3f..b7b1e1da290eb17ae67ca9dce091d3b94bd807d4 100644 (file)
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -238,11 +238,12 @@ start_form();
 
 
 
+               $comp_currency = get_company_currency();
                $cust_currency = get_customer_currency($_POST['customer_id']);
                $bank_currency = get_bank_account_currency($_POST['bank_account']);
 
                if ($cust_currency != $bank_currency) {
-                       exchange_rate_display($bank_currency, $cust_currency, $_POST['DateBanked'], true);
+                       exchange_rate_display($bank_currency, $cust_currency, $_POST['DateBanked'], ($bank_currency == $comp_currency));
                }
 
                amount_row(_("Bank Charge:"), 'charge');

diff --git a/sales/includes/db/payment_db.inc b/sales/includes/db/payment_db.inc
index 8ae5bdf3c1d3e0f4fd7227f1f80b11c0ce2fe70f..e88bf4d630431be8b33dbb29ddc8aa07182a760b 100644 (file)
--- a/sales/includes/db/payment_db.inc
+++ b/sales/includes/db/payment_db.inc
@@ -74,7 +74,7 @@ function write_customer_payment($trans_no, $customer_id, $branch_id, $bank_accou
        /*now enter the bank_trans entry */
        add_bank_trans(12, $payment_no, $bank_account, $ref,
                $date_, $amount - $charge, payment_person_types::customer(), $customer_id,
-               get_customer_currency($customer_id));
+               get_customer_currency($customer_id), "", $rate);
 
        add_comments(12, $payment_no, $date_, $memo_);
 

diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc
index 23529f2dcf798ec59e27dd127c2f657fa5c5ed15..55d9b8ff990b58e6ab83924d17c9bfd9795e5582 100644 (file)
--- a/sales/includes/db/sales_order_db.inc
+++ b/sales/includes/db/sales_order_db.inc
@@ -259,6 +259,7 @@ function get_sales_order_header($order_no)
        $sql = "SELECT ".TB_PREF."sales_orders.*, "
          .TB_PREF."debtors_master.name, "
          .TB_PREF."debtors_master.curr_code, "
+         .TB_PREF."debtors_master.email AS master_email, "
          .TB_PREF."locations.location_name, "
          .TB_PREF."debtors_master.payment_terms, "
          .TB_PREF."debtors_master.discount, "

diff --git a/sales/manage/sales_points.php b/sales/manage/sales_points.php
index 6282cf7f6d5e5c2fc3ab2679338284d06bbaeb62..09be7f193bc00575f2349e194355f37524051733 100644 (file)
--- a/sales/manage/sales_points.php
+++ b/sales/manage/sales_points.php
@@ -64,9 +64,15 @@ if ($Mode=='UPDATE_ITEM' && can_process())
 
 if ($Mode == 'Delete')
 {
-       delete_sales_point($selected_id);
-       display_notification(_('Selected point of sale has been deleted'));
-       $Mode = 'RESET';
+       $sql = "SELECT * FROM ".TB_PREF."users WHERE print_profile=".db_escape($selected_id);
+       $res = db_query($sql, "canot check pos usage");
+       if (db_num_rows($res)) {
+               display_error(_("Cannot delete this POS because it is used in users setup."));
+       } else {
+               delete_sales_point($selected_id);
+               display_notification(_('Selected point of sale has been deleted'));
+               $Mode = 'RESET';
+       }
 }
 
 if ($Mode == 'RESET')

diff --git a/taxes/tax_calc.inc b/taxes/tax_calc.inc
index 397c5f501f3d7eae3c0eef49de6fd847d9240663..1209d62133eca1f355f073e7f2a464b95b999aaa 100644 (file)
--- a/taxes/tax_calc.inc
+++ b/taxes/tax_calc.inc
@@ -15,32 +15,6 @@ include_once($path_to_root . "/taxes/db/item_tax_types_db.inc");
 
 //---------------------------------------------------------------------------------
 
-// returns the tax cost for a given item
-/*
-function get_tax_value_for_item($stock_id, $price, $tax_group)
-{
-       // if price is zero, then can't be taxed
-       if ($price == 0)
-               return 0;
-               
-       $ret_tax_array = get_tax_group_items_as_array($tax_group);                      
-               
-       $tax_array = get_taxes_for_item($stock_id, $ret_tax_array);
-       if ($tax_array == null)
-               return 0;
-       
-       $tax_multiplier = 0;    
-
-       // loop for all items
-       foreach ($tax_array as $taxitem) {
-               $tax_multiplier += $taxitem["rate"];
-       }
-       
-       return $price * ($tax_multiplier / 100);        
-}
-*/
-//---------------------------------------------------------------------------------
-
 // returns the price of a given item minus any included taxes
 // for item $stock_id with line price $price,
 // with applicable tax rates $tax_group_array or group id $tax_group
@@ -232,57 +206,6 @@ function get_tax_for_items($items, $prices, $shipping_cost, $tax_group, $tax_inc
 
        return $ret_tax_array;
 }
-//
-//     Get all taxes for given tax_type_id. This can be used when 
-//     no tax group exemptions are active (local sales).
-//     To be used in quick entries.
-//
-function get_taxes_for_item_tax($tax_type_id)
-{
-       $item_tax_type = get_item_tax_type($tax_type_id);
-       
-       // if the item is exempt from all taxes then return 0
-       if ($item_tax_type["exempt"])
-               return null;
-               
-       // get the exemptions for this item tax type
-       $item_tax_type_exemptions_db = get_item_tax_type_exemptions($tax_type_id);
-       
-       // read them all into an array to minimize db querying
-       $item_tax_type_exemptions = array();
-       while ($item_tax_type_exemp = db_fetch($item_tax_type_exemptions_db))
-       {
-               $item_tax_type_exemptions[] = $item_tax_type_exemp["tax_type_id"];
-       }
-       
-       $ret_tax_array = array();
-
-       $tax_rates = get_all_tax_types_simple();
-       // if any of the taxes are in the exemptions, then skip
-       while($tax_rate = db_fetch($tax_rates)) 
-       { 
-               
-               $skip = false;                  
-               
-               // if it's in the exemptions, skip
-               foreach ($item_tax_type_exemptions as $exemption) 
-               {
-                       if (($tax_rate['id'] == $exemption)) 
-                       {
-                       $skip = true;
-                       break;
-                       }
-               }
-               
-               if (!$skip) 
-               {
-                       $index = $tax_rate['id'];
-                       $ret_tax_array[$index] = $tax_rate;
-               }
-       }
-       
-       return $ret_tax_array;
-}
 
 function is_tax_account($account_code)
 {

diff --git a/update.html b/update.html
index b14ec82fde45709448207806c6b6c138400e7b8f..2d822faec7946e61d60798ce942fab3cd2b234ad 100644 (file)
--- a/update.html
+++ b/update.html
@@ -56,7 +56,9 @@ Mark the checkbox 'Install' and press 'Upgrade System'.  This will
 upgrade ALL your companies.</strong></li><li style="font-weight: bold;">If something goes wrong during upgrade, you can enter here again and try 'Force Upgrade', and press 'Upgrade System' again.</li><li><strong style="font-weight: bold;"></strong><strong>There are no database changes during a major and minor release. Like from 2.1 to 2.1.1 - 2.1.5 .</strong></li><li style="font-weight: bold;">When
 updating from release 2.1.2 to 2.1.3, please go into Bank and General
 Ledger tab. Enter Account Classes. Change the Class Types to a proper
-value for all classes.</li>
+value for all classes.</li><li style="font-weight: bold;">When updating from release 2.1.4 to 2.1.5, please go into Bank and General Ledger tab. Enter Quick Entries. <br />The&nbsp;Tax now uses Tax Types instead of Item Tax Types. The reason for changing this is for the complex rules inside the EU.<br />Change
+to correct Tax Type. If you need more Tax Type lines in the same Quick
+Entry, please group them together and use the same action type.</li>
 </ul>
 
 <p style="font-weight: bold;">&nbsp;</p>