From f12dbe7523bb1abc6cd69b009ef8f0be838f5348 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Mon, 6 Oct 2008 14:16:35 +0000 Subject: [PATCH] Merged bugfixes upto [0000072] (version 2.0.3). --- CHANGELOG.txt | 296 +- admin/company_preferences.php | 11 +- admin/create_coy.php | 24 +- admin/db/company_db.inc | 6 +- admin/db/maintenance_db.inc | 5 +- admin/db/voiding_db.inc | 11 + admin/fiscalyears.php | 7 +- admin/gl_setup.php | 18 +- admin/inst_lang.php | 3 +- admin/inst_module.php | 3 +- config.php | 2 +- dimensions/includes/dimensions_ui.inc | 45 +- dimensions/inquiry/search_dimensions.php | 12 +- dimensions/view/view_dimension.php | 1 + gl/bank_transfer.php | 6 +- gl/gl_bank.php | 27 + gl/gl_budget.php | 60 +- gl/includes/db/gl_db_bank_trans.inc | 2 +- gl/includes/db/gl_db_rates.inc | 12 +- gl/includes/db/gl_db_trans.inc | 2 +- gl/includes/ui/gl_bank_ui.inc | 2 +- gl/inquiry/bank_inquiry.php | 10 +- gl/manage/exchange_rates.php | 3 + includes/banking.inc | 105 +- includes/db/comments_db.inc | 2 +- includes/db/connect_db.inc | 2 - includes/errors.inc | 2 +- includes/lang/language.php | 1 + includes/prefs/sysprefs.inc | 6 + includes/session.inc | 27 +- includes/ui/ui_controls.inc | 92 +- includes/ui/ui_input.inc | 18 +- includes/ui/ui_lists.inc | 44 +- includes/ui/ui_view.inc | 58 +- index.php | 1 + install/index.php | 4 +- install/save.php | 17 +- inventory/cost_update.php | 10 +- inventory/includes/db/items_adjust_db.inc | 2 + inventory/includes/item_adjustments_ui.inc | 2 +- inventory/includes/stock_transfers_ui.inc | 2 +- inventory/inquiry/stock_movements.php | 6 +- inventory/inquiry/stock_status.php | 2 +- inventory/manage/items.php | 56 +- inventory/prices.php | 5 +- inventory/purchasing_data.php | 12 +- inventory/reorder_level.php | 2 +- inventory/view/view_adjustment.php | 1 + js/inserts.js | 20 +- js/utils.js | 29 +- lang/en_US/LC_MESSAGES/en_US.mo | Bin 797 -> 879 bytes .../LC_MESSAGES/empty.po | 9458 ++++++----------- .../includes/db/work_order_issues_db.inc | 8 + .../db/work_order_produce_items_db.inc | 2 +- .../includes/db/work_orders_quick_db.inc | 22 +- .../includes/work_order_issue_ui.inc | 2 +- manufacturing/inquiry/where_used_inquiry.php | 2 +- manufacturing/view/wo_issue_view.php | 1 + manufacturing/view/wo_production_view.php | 1 + manufacturing/view/work_order_view.php | 3 +- purchasing/allocations/supplier_allocate.php | 10 +- .../allocations/supplier_allocation_main.php | 9 + purchasing/includes/db/grn_db.inc | 41 +- purchasing/includes/db/invoice_db.inc | 81 +- purchasing/includes/db/supp_trans_db.inc | 129 +- purchasing/includes/db/suppalloc_db.inc | 75 +- purchasing/includes/ui/invoice_ui.inc | 14 +- purchasing/includes/ui/po_ui.inc | 7 +- .../inquiry/supplier_allocation_inquiry.php | 4 +- purchasing/inquiry/supplier_inquiry.php | 2 +- purchasing/manage/suppliers.php | 9 + purchasing/po_entry_items.php | 59 +- purchasing/supplier_credit.php | 12 + purchasing/supplier_credit_grns.php | 4 +- purchasing/supplier_invoice.php | 12 + purchasing/supplier_invoice_grns.php | 4 +- purchasing/supplier_payment.php | 15 +- purchasing/view/view_po.php | 8 +- purchasing/view/view_supp_credit.php | 11 +- reporting/includes/doctext.inc | 4 +- reporting/includes/doctext2.inc | 8 +- reporting/includes/reports_classes.inc | 102 +- reporting/includes/tcpdf.php | 1216 ++- reporting/rep108.php | 2 +- reporting/rep301.php | 6 +- reporting/rep303.php | 34 +- reporting/rep601.php | 137 + reporting/rep702.php | 12 +- reporting/reports_main.php | 11 +- sales/allocations/customer_allocate.php | 13 +- .../allocations/customer_allocation_main.php | 12 +- sales/credit_note_entry.php | 13 +- sales/customer_credit_invoice.php | 9 - sales/customer_invoice.php | 7 +- sales/customer_payments.php | 19 +- sales/includes/cart_class.inc | 9 +- sales/includes/db/cust_trans_db.inc | 7 +- sales/includes/db/custalloc_db.inc | 11 +- sales/includes/db/payment_db.inc | 6 +- sales/includes/db/sales_credit_db.inc | 29 +- sales/includes/db/sales_delivery_db.inc | 6 +- sales/includes/db/sales_invoice_db.inc | 2 +- sales/includes/sales_db.inc | 4 +- sales/includes/ui/sales_credit_ui.inc | 48 +- sales/includes/ui/sales_order_ui.inc | 42 +- sales/manage/customer_branches.php | 10 + sales/manage/customers.php | 26 +- sales/sales_order_entry.php | 33 +- sql/alter.sql | 7 +- 109 files changed, 6017 insertions(+), 6929 deletions(-) create mode 100644 reporting/rep601.php diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 9eee9b86..b5396a5b 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,13 +19,307 @@ Legend: ! -> Note $ -> Affected files +------------------------------- Release 2.0.3 -------------------------------------------- +07-Oct-2008 Joe Hunt +! Release 2.0.3 +$ config.php +# Bug [0000072] Item stock movement should check for if there is empty Inventory. +$ /inventory/inquiry/stock_movements.php + +05-Oct-2008 Janusz Dobrowolski +# Bugfix [0000063] Bad update of parent document lines after edition of sales documents. +$ /sales/includes/cart_class.inc + /sales/includes/sales_db.inc + /sales/includes/db/sales_credit_db.inc + /sales/includes/db/sales_delivery_db.inc + /sales/includes/db/sales_invoice_db.inc +# Bugfix [0000071] Ordering for customer with bad history available after F4 - Return +$ /sales/manage/customers.php + +04-Oct-2008 Joe Hunt +# Bug [0000069] Constraint on voiding delivery note if a non voided, linked invoice exists. +$ /admin/db/voiding_db.inc +# Bug [0000061] Cost Update doesn't compute correctly after inventory adjust. +$ /inventory/includes/db/item_adjust_db.inc + +01-Oct-2008 Joe Hunt +# When deleting the last module in FA a parce error arose: +$ /admin/inst_module.php + /admin/inst_lang.php + +30-Sep-2008 Janusz Dobrowolski +# Bug [0000067] Settled supplier documents were displayed as overdued. +$ /purchasing/inquiry/supplier_inquiry.php + /purchasing/inquiry/supplier_allocation_inquiry.php +# Bug [0000068] Removed unneeded constraint on edition of fully allocated sales doc. +$ /sales/allocations/customer_allocation_main.php + +29-Sep-2008 Janusz Dobrowolski +# Bug [0000065] Changing item type during adding new item caused record reset. +$ /inventory/manage/items.php + +26-Sep-2008 Joe Hunt +# Bug [0000064] Credit This on an invoice should automatically allocate the credit to that invoice +$ /sales/includes/db/sales_credit_db.inc + +26-Sep-2008 Janusz Dobrowolski +# Bug [0000062] Delivery Modifitication - duplicated tax details. +$ /sales/includes/db/sales_delivery_db.inc + +25-Sep-2008 Joe Hunt +# if MySQL is in strict sql mode, a couple of files didn't pass that. Better not use strict sql mode. + This is not necessary, because FA handle this internally. in my.ini(win) or my.cnf(linux) set sql-mode="". +$ /gl/gl_budget.php + /includes/db/comments_db.inc + /inventory/cost_update.php + /purchasing/includes/db/supp_trans_db.inc + /sales/includes/db/cust_trans_db.inc +# Bug [0000060] table prefix error message and inconsistency at install +$ /admin/db/maintenance_db.inc + /install/index.php + /install/save.php +# Bug [0000061] Delivery Modifitication (standard cost change) +$ /sales/includes/db/sales_delivery_db.inc + +------------------------------- Release 2.0.2 -------------------------------------------- +23-Sep-2008 Joe Hunt +! Release 2.0.2 +$ config.php +! Increased time_out to 3 minutes. +$ /install/save.php + +23-Sep-2008 Joe Hunt +# Bug [0000059] Direct Invoice or Delivery Notes doesn't account for negative inventory flag +$ /sales/sales_order_entry.php + +21-Sep-2008 Janusz Dobrowolski ++ Added submit_on_change option for date fields +$ /includes/ui/ui_input.inc ++ Automatic exchange rate update after document date change +$ /gl/bank_transfer.php + /gl/gl_bank.php + /gl/includes/db/gl_db_rates.inc + /gl/includes/ui/gl_bank_ui.inc + /includes/banking.inc + /includes/ui/ui_view.inc + /purchasing/supplier_payment.php + /sales/customer_payments.php + /sales/includes/cart_class.inc +# Sales/purchase terms update after document date change [0000058] +$ /purchasing/includes/ui/invoice_ui.inc + /purchasing/includes/ui/po_ui.inc + /sales/customer_invoice.php +# Fixed edit line total, price update after date change +$ /sales/includes/ui/sales_credit_ui.inc + /sales/includes/ui/sales_order_ui.inc +# Fixed unneeded page reload on enter key in text inputs +$ /js/inserts.js +# Fixed session variables conflicts with some third party software (e.g. XRMS) +$ /includes/lang/language.php +# Fixed calendar flicker, removed buttons from exchange_rate_display() +$ /includes/ui/ui_view.inc +! Default delivery required by changed to 1 day. +$ /includes/prefs/sysprefs.inc +# Small bug fix +$ /sales/includes/sales_db.inc + +20-Sep-2008 Joe Hunt +# Fix for exchange variation when allocating payments. re-inserted in System and GL Setup. +$ /admin/gl_setup.php + /admin/db/company_db + /includes/banking.inc + /purchasing/allocations/supplier_allocate.php + /purchasing/includes/db/suppalloc_db.inc + /sales/allocations/customer_allocate.php + /sales/includes/db/custalloc_db.inc + /sales/includes/db/payment_db.inc + /sales/includes/db/sales_credit_db.inc +! New tcpdf.php file. Minor bugfixes from tcpdf.org + /reporting/includes/tcpdf.php +! Layout adjustments + /dimensions/includes/dimensions_ui.inc + /dimensions/view/view_dimension.php + /inventory/view/view_adjustment.php + /manufacturing/view/work_order_view.php + +18-Sep-2008 Janusz Dobrowolski ++ Support for calling external pages during document entry (e.g. for adding customer/supplier/items). +$ /index.php + /includes/ui/ui_controls.inc + /includes/ui/ui_input.inc + /includes/ui/ui_lists.inc + /js/inserts.js ++ Add/view on F4 in customer/supplier selectors +$ /gl/gl_bank.php ++ Add/view on F4 in supplier/items selectors +$ /purchasing/po_entry_items.php + /inventory/manage/items.php ++ Add/view on F4 in supplier selector +$ /purchasing/supplier_credit.php + /purchasing/supplier_invoice.php + /purchasing/supplier_payment.php + /purchasing/allocations/supplier_allocation_main.php + /purchasing/manage/suppliers.php + /inventory/purchasing_data.php ++ Add/view on F4 in customer selector + /sales/credit_note_entry.php + /sales/customer_payments.php + /sales/sales_order_entry.php + /sales/allocations/customer_allocation_main.php + /sales/includes/ui/sales_credit_ui.inc + /sales/includes/ui/sales_order_ui.inc + /sales/manage/customer_branches.php + /sales/manage/customers.php +# Syntax error introduced in previous update fixed +$ /inventory/prices.php +# Fixed retreiving of exchange rates [0000057] +$ /gl/manage/exchange_rates.php + /includes/banking.inc + /includes/ui/ui_view.inc + +18-Sep-2008 Joe Hunt ++ New Report - Bank Statement. +$ /reporting/reports_main.php + /reporting/rep601.php (new file) + +17-Sep-2008 Joe Hunt +! New PDF tcpdf.php file. Support for cid-0 fonts (Chinese, Japanese, Korean, CJK, Asian fonts) without embedding. + New cid-0 fonts will be available for download when release 2.0.2 is shipping. Reduces file size enormouusly +$ /reporting/includes/tcpdf.php +! Inventory column option in Report Stock Sheet Check. +$ /reporting/reports_main.php + /reporting/rep303.php + +11-Sep-2008 Janusz Dobrowolski +# Fixed slash quotation problems on direct POST values display. +$ /includes/session.inc + /includes/db/connect_db.inc +# Added missing db_escape on person_id. +$ /gl/includes/db/gl_db_bank_trans.inc + /gl/includes/db/gl_db_trans.inc +# Added error message and suppressed db update on failed ECB exchange rate read. +$ /includes/ui/ui_view.inc + +10-Sep-2008 Janusz Dobrowolski +# Fixed company folders renaming after company remove. +$ /admin/create_coy.php +# Fixed list selectors' behaviour during search. +$ /includes/ui/ui_lists.inc +# Fixed page update after item search. Closes bugs [0000051],[0000054]. +$ /inventory/cost_update.php + /inventory/prices.php + /inventory/purchasing_data.php + /inventory/reorder_level.php + /inventory/includes/item_adjustments_ui.inc + /inventory/includes/stock_transfers_ui.inc + /inventory/inquiry/stock_status.php + /inventory/manage/items.php + /manufacturing/includes/work_order_issue_ui.inc + /manufacturing/inquiry/where_used_inquiry.php + /purchasing/includes/ui/po_ui.inc + /sales/includes/ui/sales_credit_ui.inc + /sales/includes/ui/sales_order_ui.inc + +09-Sep-2008 Joe Hunt +# Bug [0000055] Rasmus detected a cost diff. bug and changed some code for us. Very appreciated. +$ /purchasing/includes/db/invoice_db.inc + +------------------------------- Release 2.0.1 -------------------------------------------- +07-Sep-2008 Joe Hunt +! Release 2.0.1 +$ config.php + +05-Sep-2008 Janusz Dobrowolski +# Bug [0000046] Sales invoice not working on some php versions (php bug #40509) +$ /sales/includes/sales_db.inc + /sales/includes/db/sales_credit_db.inc +! Obsolete code removed +$ /sales/customer_credit_invoice.php + +05-Sep-2008 Joe Hunt +# Bug [0000053] Missing GL postings on item issue on Work Order +$ /manufacturing/includes/db/work_order_quick_db.inc + /manufacturing/includes/db/work_order_issues_db.inc + /manufacturing/includes/db/work_order_produce_items_db.inc +! Bad layout in aging on report Statements +$ /reporting/rep108.php + +04-Sep-2008 Joe Hunt +# Bug [0000050] Invoice no. on all sales reports +$ /reporting/includes/doctext.inc + /reporting/includes/doctext2.inc + +04-Sep-2008 Joe Hunt +# Bug [0000052] Inventory Valuation Report +$ /reporting/rep301.php + +04-Sep-2008 Joe Hunt +# Bug [0000047] Not possible to view delivery sequence +$ /purchasing/supplier_credit_grns.php + /purchasing/supplier_invoice_grns.php + /purchasing/includes/db/grn_db.inc + /purchasing/includes/ui/invoice_ui.inc + /purchasing/view/view_po.php + /purchasing/view/view_supp_credit.php +# Bug [0000048] Crediting invoice and choosing gl account for items to be written off doesn't work +$ /sales/includes/db/sales_credit_db.inc + +03-Sep-2008 Janusz Dobrowolski +# Fixed fatal error handling in php5 +$ /includes/errors.inc + /includes/session.inc +# Fixed display of errors while saving sales documents +$ /sales/sales_order_entry.php + +03-Sep-2008 Joe Hunt +# Bug [0000044] Standard Cost error on credit note. Reopened. Stock Movement forgot the credit note. +$ /inventory/inquiry/stock_movements.php + /purchasing/includes/db/grn_db.inc + /purchasing/includes/invoice_db.inc + +03-Sep-2008 Joe Hunt +# Bug [0000043] Inventory Adjustment Session doesn't update standard cost +# Bug [0000044] Standard Cost error on credit note +$ /inventory/includes/db/items_adjust_db.inc + /purchasing/includes/db/grn_db.inc + /purchasing/includes/invoice_db.inc +# Bug [0000045] Cannot close fiscal year +$ /admin/fiscalyears.php +# Update screen bug in Bank Account Inquiry. + $ /gl/inquiry/bank_inquiry.php + +02-Sep-2008 Joe Hunt +# Bug when selecting report, List of Journal Entries, by type. Nothing selected. +$ /reporting/includes/reports_classes.inc +$ /reporting/rep702.php + +01-Sep-2008 Joe Hunt +! Up-to-date translation file (some strings were missing, single quotations in .inc files) +$ /lang/new_language_template/LC_MASSAGES/empty.po + /lang/en_US/LC_MESSAGES/en_US.mo + +31-Aug-2008 Janusz Dobrowolski ++ Added ajax support for file uploading +$ /js/utils.js +# Final fix for logo file upload +$ /admin/company_preferences.php +# Fixed item image file upload +$ /inventory/manage/items.php + +30-Aug-2008 Janusz Dobrowolski +! Up to date translation file +$ /lang/new_language_template/LC_MASSAGES/empty.po +# Fixed broken &'s in backup files [0000040] +$ /admin/db/maintenance_db.inc +# Temporary fix (sync page reload) for uploading logo file +$ /admin/company_preferences.php -------------------------------2.0 Final -------------------------------------------- 21_aug-2008 Joe Hunt ! config.php file. Version changed to 2.0 $ config.php ! Set time out to 120 seconds. $ /install/save.php -! fixing $amp in backup +# Removed js warnings on index pages $ /js/utils.js 20-Aug-2008 Joe Hunt diff --git a/admin/company_preferences.php b/admin/company_preferences.php index b75bba35..6804b549 100644 --- a/admin/company_preferences.php +++ b/admin/company_preferences.php @@ -10,10 +10,9 @@ include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/admin/db/company_db.inc"); - //------------------------------------------------------------------------------------------------- -if (isset($_POST['submit']) && $_POST['submit'] != "") +if (isset($_POST['update']) && $_POST['update'] != "") { $input_error = 0; @@ -53,7 +52,6 @@ if (isset($_POST['submit']) && $_POST['submit'] != "") } elseif (file_exists($filename)) { - display_notification(_('Attempting to overwrite an existing item image')); $result = unlink($filename); if (!$result) { @@ -66,11 +64,10 @@ if (isset($_POST['submit']) && $_POST['submit'] != "") { $result = move_uploaded_file($_FILES['pic']['tmp_name'], $filename); $_POST['coy_logo'] = $_FILES['pic']['name']; - $message = ($result)?_('File url') ."$filename" : "Somthing is wrong with uploading a file."; + if(!$result) + display_error(_('Error uploading logo file')); } - /* EOF Add Image upload for New Item - by Ori */ } - if ($input_error != 1) { update_company_setup($_POST['coy_name'], $_POST['coy_no'], $_POST['gst_no'], $_POST['tax_prd'], $_POST['tax_last'], @@ -169,7 +166,7 @@ end_row(); end_table(1); hidden('coy_logo', $_POST['coy_logo']); -submit_center('submit', _("Update"), true, '', true); +submit_center('update', _("Update"), true, '', true); end_form(2); //------------------------------------------------------------------------------------------------- diff --git a/admin/create_coy.php b/admin/create_coy.php index b40b41d7..8324fa7d 100644 --- a/admin/create_coy.php +++ b/admin/create_coy.php @@ -58,7 +58,6 @@ function check_data() function remove_connection($id) { global $db_connections; - $dbase = $db_connections[$id]['dbname']; $err = db_drop_db($db_connections[$id]); unset($db_connections[$id]); @@ -163,9 +162,22 @@ function handle_delete() $id = $_GET['id']; + $cdir = $comp_path.'/'.$id; + @flush_dir($cdir); + if (!rmdir($cdir)) + { + display_error(_("Cannot remove company data directory ") . $cdir); + return; + } + for($i = $id+1; $i < count($db_connections); $i++) { + if (!rename($comp_path.'/'.$i, $comp_path.'/'.($i-1))) { + display_error(_("Cannot rename company subdirectory")); + return; + } + } $err = remove_connection($id); if ($err == 0) - display_error(_("Error removing Database: ") . $dbase . _(", please remove it manuallly")); + display_error(_("Error removing Database: ") . $dbase . _(", please remove it manually")); if ($def_coy == $id) $def_coy = 0; @@ -179,14 +191,6 @@ function handle_delete() if ($error != 0) return; - $cdir = $comp_path.'/'.$id; - flush_dir($cdir); - if (!rmdir($cdir)) - { - display_error(_("Cannot remove company data directory ") . $cdir); - return; - } - meta_forward($_SERVER['PHP_SELF']); } diff --git a/admin/db/company_db.inc b/admin/db/company_db.inc index ea99d872..8a832211 100644 --- a/admin/db/company_db.inc +++ b/admin/db/company_db.inc @@ -1,8 +1,9 @@ encoding)."\n"; $out.="# User: ".$_SESSION["wa_current_user"]->name."\n\n"; // write users comment @@ -411,7 +412,7 @@ function db_export($conn, $filename, $zip='no', $comment='') // run through each field for ($k = 0; $k < $nf = db_num_fields($res2); $k++) { - $out .= db_escape($row2[$k]); + $out .= db_escape(@html_entity_decode($row2[$k], ENT_COMPAT, $_SESSION['language']->encoding)); if ($k < ($nf - 1)) $out .= ", "; } diff --git a/admin/db/voiding_db.inc b/admin/db/voiding_db.inc index 2dd72d37..e81dd1b0 100644 --- a/admin/db/voiding_db.inc +++ b/admin/db/voiding_db.inc @@ -35,6 +35,17 @@ function void_transaction($type, $type_no, $date_, $memo_) case 13 : // it's a customer dispatch if (!exists_customer_trans($type, $type_no)) return false; + if ($type == 13) // added 04 Oct 2008 by Joe Hunt. If delivery note has a not voided invoice, then NO. + { + $delivery = get_customer_trans($type_no, $type); + if ($delivery['trans_link'] != 0) + { + $inv = get_customer_trans($delivery['trans_link'], 10); + if ($inv['ov_amount'] != 0 || $inv['ov_discount'] != 0 || $inv['ov_gst'] != 0 || + $inv['ov_freight'] != 0 || $inv['ov_freight_tax'] != 0 || $inv['alloc'] != 0) + return false; + } + } post_void_customer_trans($type, $type_no); break; diff --git a/admin/fiscalyears.php b/admin/fiscalyears.php index 9bbf4040..8dfe4a8f 100644 --- a/admin/fiscalyears.php +++ b/admin/fiscalyears.php @@ -52,16 +52,15 @@ function handle_submit() { global $selected_id, $Mode; - if (!check_data()) - return false; - if ($selected_id != -1) { - update_fiscalyear($_POST['from_date'], $_POST['closed']); + update_fiscalyear($selected_id, $_POST['closed']); display_notification(_('Selected fiscal year has been updated')); } else { + if (!check_data()) + return false; add_fiscalyear($_POST['from_date'], $_POST['to_date'], $_POST['closed']); display_notification(_('New fiscal year has been added')); } diff --git a/admin/gl_setup.php b/admin/gl_setup.php index 044a111a..b6939747 100644 --- a/admin/gl_setup.php +++ b/admin/gl_setup.php @@ -14,23 +14,23 @@ include_once($path_to_root . "/admin/db/company_db.inc"); //------------------------------------------------------------------------------------------------- -function can_process() +function can_process() { - if (!check_num('po_over_receive', 0, 100)) + if (!check_num('po_over_receive', 0, 100)) { display_error(_("The delivery over-receive allowance must be between 0 and 100.")); set_focus('po_over_receive'); return false; } - if (!check_num('po_over_charge', 0, 100)) + if (!check_num('po_over_charge', 0, 100)) { display_error(_("The invoice over-charge allowance must be between 0 and 100.")); set_focus('po_over_charge'); return false; } - if (!check_num('past_due_days', 0, 100)) + if (!check_num('past_due_days', 0, 100)) { display_error(_("The past due days interval allowance must be between 0 and 100.")); set_focus('past_due_days'); @@ -41,10 +41,11 @@ function can_process() //------------------------------------------------------------------------------------------------- -if (isset($_POST['submit']) && can_process()) +if (isset($_POST['submit']) && can_process()) { update_company_gl_setup($_POST['debtors_act'], $_POST['pyt_discount_act'], $_POST['creditors_act'], $_POST['freight_act'], + $_POST['exchange_diff_act'], $_POST['default_sales_act'], $_POST['default_sales_discount_act'], $_POST['default_prompt_payment_act'], @@ -77,6 +78,7 @@ $_POST['creditors_act'] = $myrow["creditors_act"]; $_POST['freight_act'] = $myrow["freight_act"]; $_POST['pyt_discount_act'] = $myrow["pyt_discount_act"]; +$_POST['exchange_diff_act'] = $myrow["exchange_diff_act"]; $_POST['default_sales_act'] = $myrow["default_sales_act"]; $_POST['default_sales_discount_act'] = $myrow["default_sales_discount_act"]; $_POST['default_prompt_payment_act'] = $myrow["default_prompt_payment_act"]; @@ -109,15 +111,15 @@ table_section_title(_("General GL")); //gl_all_accounts_list_row(_("Payroll Account:"), 'payroll_act', $_POST['payroll_act']); text_row(_("Past Due Days Interval:"), 'past_due_days', $_POST['past_due_days'], 6, 6, '', "", _("days")); + +gl_all_accounts_list_row(_("Exchange Variances Account:"), 'exchange_diff_act', $_POST['exchange_diff_act']); + //--------------- table_section_title(_("Customers and Sales")); text_row(_("Default Credit Limit:"), 'default_credit_limit', $_POST['default_credit_limit'], 12, 12); -// Not used in FA2.0. -//gl_all_accounts_list_row(_("Sales Exchange Variances Account:"), 'exchange_diff_act', $_POST['exchange_diff_act']); - gl_all_accounts_list_row(_("Shipping Charged Account:"), 'freight_act', $_POST['freight_act']); //--------------- diff --git a/admin/inst_lang.php b/admin/inst_lang.php index 98776618..bd23d383 100644 --- a/admin/inst_lang.php +++ b/admin/inst_lang.php @@ -95,7 +95,8 @@ function write_lang() $msg .= "*/\n\n\n"; $msg .= "\$installed_languages = array (\n"; - $msg .= "\t0 => "; + if ($n > 0) + $msg .= "\t0 => "; for ($i = 0; $i < $n; $i++) { if ($i > 0) diff --git a/admin/inst_module.php b/admin/inst_module.php index d0d8a366..1e001768 100644 --- a/admin/inst_module.php +++ b/admin/inst_module.php @@ -130,7 +130,8 @@ function write_modules() $msg .= "\n\n"; $msg .= "\$installed_modules = array (\n"; - $msg .= "\t0 => "; + if ($n > 0) + $msg .= "\t0 => "; for ($i = 0; $i < $n; $i++) { if ($i > 0) diff --git a/config.php b/config.php index 731e26f3..7e9a6e57 100644 --- a/config.php +++ b/config.php @@ -38,7 +38,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_ // Main Title $app_title = "FrontAccounting"; // application version - $version = "2.0"; + $version = "2.0.3"; // Build for development purposes $build_version = date("d.m.Y", filemtime("$path_to_root/CHANGELOG.txt")); diff --git a/dimensions/includes/dimensions_ui.inc b/dimensions/includes/dimensions_ui.inc index bc56479f..ae69b98b 100644 --- a/dimensions/includes/dimensions_ui.inc +++ b/dimensions/includes/dimensions_ui.inc @@ -8,7 +8,11 @@ function display_dimension_payments($id) { global $path_to_root, $table_style; - $result = get_bank_trans(null, null, payment_person_types::dimension(), $id); + $sql = "SELECT ".TB_PREF."gl_trans.*,".TB_PREF."chart_master.account_name FROM + ".TB_PREF."gl_trans,".TB_PREF."chart_master WHERE + ".TB_PREF."gl_trans.account = ".TB_PREF."chart_master.account_code AND + (dimension_id = $id OR dimension2_id = $id) ORDER BY account,tran_date"; + $result = db_query($sql, "Transactions could not be calculated"); echo "
"; @@ -20,37 +24,50 @@ function display_dimension_payments($id) { display_heading2(_("Transactions for this Dimension")); start_table($table_style); - $th = array(_("Type"), _("#"), _("Reference"), + $th = array(_("Type"), _("#"), _("Account"), _("Date"), _("Debit"), _("Credit")); table_header($th); - $total = $k = 0; - + $total = $grand_total = $k = 0; + $account = ""; while ($myrow = db_fetch($result)) { + if ($account != $myrow["account"]) + { + if ($account != "") + { + start_row(); + label_cell(_("Total"), "colspan=4"); + display_debit_or_credit_cells($total); + end_row(); + $total = 0; + } + $account = $myrow["account"]; + } alt_table_row_color($k); - // projects are always in home currency...get the home equivalent of the banktrans - // from it's gl postings - $home_value = get_gl_trans_value($myrow["bank_act"], $myrow["type"], $myrow["trans_no"]); - label_cell(systypes::name($myrow["type"])); - label_cell(get_trans_view_str($myrow["type"], $myrow["trans_no"])); - label_cell($myrow["ref"]); - label_cell(sql2date($myrow["trans_date"])); - display_debit_or_credit_cells($home_value); + label_cell(get_gl_view_str($myrow["type"], $myrow["type_no"], $myrow["type_no"], true)); + label_cell($myrow["account"]." ".$myrow['account_name']); + label_cell(sql2date($myrow["tran_date"])); + display_debit_or_credit_cells($myrow["amount"]); - $total += $home_value; + $total += $myrow["amount"]; + $grand_total += $myrow["amount"]; end_row(); } - start_row(); label_cell(_("Total"), "colspan=4"); display_debit_or_credit_cells($total); end_row(); + start_row(); + label_cell(_("Grand Total"), "colspan=4"); + display_debit_or_credit_cells($grand_total); + end_row(); + end_table(); } } diff --git a/dimensions/inquiry/search_dimensions.php b/dimensions/inquiry/search_dimensions.php index a263905c..6f689ec9 100644 --- a/dimensions/inquiry/search_dimensions.php +++ b/dimensions/inquiry/search_dimensions.php @@ -26,10 +26,10 @@ else //----------------------------------------------------------------------------------- // Ajax updates // -if (get_post('SearchOrders')) +if (get_post('SearchOrders')) { $Ajax->activate('dim_table'); -} elseif (get_post('_OrderNumber_changed')) +} elseif (get_post('_OrderNumber_changed')) { $disable = get_post('OrderNumber') !== ''; @@ -63,7 +63,7 @@ start_row(); ref_cells(_("Reference:"), 'OrderNumber', '',null, '', true); -number_list_cells(_("Type"), 'type_', null, 0, 2); +number_list_cells(_("Type"), 'type_', null, 1, 2, _("All")); date_cells(_("From:"), 'FromDate', '', null, 0, 0, -5); date_cells(_("To:"), 'ToDate'); @@ -136,8 +136,8 @@ while ($myrow = db_fetch($result)) { $sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans WHERE tran_date >= '" . date2sql($_POST['FromDate']) . "' AND - tran_date <= '" . date2sql($_POST['ToDate']) . "' AND dimension_id = " . - $myrow['id']; + tran_date <= '" . date2sql($_POST['ToDate']) . "' AND (dimension_id = " . + $myrow['id']." OR dimension2_id = " .$myrow['id'].")"; $res = db_query($sql, "Transactions could not be calculated"); $row = db_fetch_row($res); @@ -171,7 +171,7 @@ while ($myrow = db_fetch($result)) if (!$outstanding_only) label_cell(($myrow["closed"] ? _("Yes") : _("No"))); amount_cell($row[0]); - + label_cell($myrow["closed"] == 0 ? ("" . _("Edit") . "") :''); end_row(); diff --git a/dimensions/view/view_dimension.php b/dimensions/view/view_dimension.php index 5929432c..843da185 100644 --- a/dimensions/view/view_dimension.php +++ b/dimensions/view/view_dimension.php @@ -25,6 +25,7 @@ if ($_GET['trans_no'] != "") display_heading(systypes::name(systypes::dimension()) . " # " . $id); +br(1); $myrow = get_dimension($id); if (strlen($myrow[0]) == 0) diff --git a/gl/bank_transfer.php b/gl/bank_transfer.php index d40436d9..78089f5a 100644 --- a/gl/bank_transfer.php +++ b/gl/bank_transfer.php @@ -37,6 +37,10 @@ if (isset($_GET['AddedID'])) safeExit(); } +if (isset($_POST['_DatePaid_changed'])) { + $Ajax->activate('_ex_rate'); +} + //---------------------------------------------------------------------------------------- function gl_payment_controls() @@ -54,7 +58,7 @@ function gl_payment_controls() bank_accounts_list_row(_("To Account:"), 'ToBankAccount', null, true); - date_row(_("Transfer Date:"), 'DatePaid'); + date_row(_("Transfer Date:"), 'DatePaid', '', null, 0, 0, 0, null, true); $from_currency = get_bank_account_currency($_POST['FromBankAccount']); $to_currency = get_bank_account_currency($_POST['ToBankAccount']); diff --git a/gl/gl_bank.php b/gl/gl_bank.php index d827877d..ce8c40fd 100644 --- a/gl/gl_bank.php +++ b/gl/gl_bank.php @@ -33,6 +33,30 @@ check_db_has_bank_accounts(_("There are no bank accounts defined in the system." check_db_has_bank_trans_types(_("There are no bank payment types defined in the system.")); +//---------------------------------------------------------------------------------------- +if ($ret = context_restore()) { + if(isset($ret['supplier_id'])) + $_POST['person_id'] = $ret['supplier_id']; + if(isset($ret['customer_id'])) + $_POST['person_id'] = $ret['customer_id']; + set_focus('person_id'); + if(isset($ret['branch_id'])) { + $_POST['PersonDetailID'] = $ret['branch_id']; + set_focus('PersonDetailID'); + } +} +if (isset($_POST['_person_id_editor'])) { + if ($_POST['PayType']==payment_person_types::supplier()) + $editor = '/purchasing/manage/suppliers.php?supplier_id='; + else + $editor = '/sales/manage/customers.php?debtor_no='; + +// $_SESSION['pay_items'] should stay unchanged during call +// +context_call($path_to_root.$editor.$_POST['person_id'], + array('bank_account', 'date_', 'PayType', 'person_id', + 'PersonDetailID', 'type', 'ref', 'memo_') ); +} //-------------------------------------------------------------------------------------------------- function line_start_focus() { global $Ajax; @@ -74,6 +98,9 @@ if (isset($_GET['AddedDep'])) display_footer_exit(); } +if (isset($_POST['_date__changed'])) { + $Ajax->activate('_ex_rate'); +} //-------------------------------------------------------------------------------------------------- function handle_new_order($type) diff --git a/gl/gl_budget.php b/gl/gl_budget.php index b503a61c..d9d4dde9 100644 --- a/gl/gl_budget.php +++ b/gl/gl_budget.php @@ -28,14 +28,14 @@ function exists_gl_budget($date_, $account, $dimension, $dimension2) function add_update_gl_budget_trans($date_, $account, $dimension, $dimension2, $amount) { $date = date2sql($date_); - + if (exists_gl_budget($date, $account, $dimension, $dimension2)) $sql = "UPDATE ".TB_PREF."budget_trans SET amount=$amount WHERE account='$account' AND dimension_id=$dimension AND dimension2_id=$dimension2 AND tran_date='$date'"; else $sql = "INSERT INTO ".TB_PREF."budget_trans (tran_date, - account, dimension_id, dimension2_id, amount) VALUES ('$date', - '$account', $dimension, $dimension2, $amount)"; + account, dimension_id, dimension2_id, amount, memo_) VALUES ('$date', + '$account', $dimension, $dimension2, $amount, '')"; db_query($sql, "The GL budget transaction could not be saved"); } @@ -43,18 +43,18 @@ function add_update_gl_budget_trans($date_, $account, $dimension, $dimension2, $ function delete_gl_budget_trans($date_, $account, $dimension, $dimension2) { $date = date2sql($date_); - + $sql = "DELETE FROM ".TB_PREF."budget_trans WHERE account='$account' AND dimension_id=$dimension AND dimension2_id=$dimension2 AND tran_date='$date'"; db_query($sql, "The GL budget transaction could not be deleted"); } -function get_only_budget_trans_from_to($from_date, $to_date, $account, $dimension=0, $dimension2=0) +function get_only_budget_trans_from_to($from_date, $to_date, $account, $dimension=0, $dimension2=0) { $from = date2sql($from_date); $to = date2sql($to_date); - + $sql = "SELECT SUM(amount) FROM ".TB_PREF."budget_trans WHERE account='$account' AND tran_date >= '$from' AND tran_date <= '$to' AND dimension_id = $dimension AND dimension2_id = $dimension2"; @@ -66,28 +66,28 @@ function get_only_budget_trans_from_to($from_date, $to_date, $account, $dimensio //------------------------------------------------------------------------------------- -if (isset($_POST['add']) || isset($_POST['delete'])) +if (isset($_POST['add']) || isset($_POST['delete'])) { begin_transaction(); - + for ($i = 0, $da = $_POST['begin']; date1_greater_date2($_POST['end'], $da); $i++) { if (isset($_POST['add'])) add_update_gl_budget_trans($da, $_POST['account'], $_POST['dim1'], $_POST['dim2'], input_num('amount'.$i)); - else + else delete_gl_budget_trans($da, $_POST['account'], $_POST['dim1'], $_POST['dim2']); $da = add_months($da, 1); } commit_transaction(); - + if (isset($_POST['add'])) display_notification_centered(_("The Budget has been saved.")); - else + else display_notification_centered(_("The Budget has been deleted.")); - - //meta_forward($_SERVER['PHP_SELF']); + + //meta_forward($_SERVER['PHP_SELF']); $Ajax->activate('budget_tbl'); -} +} if (isset($_POST['submit']) || isset($_POST['update'])) $Ajax->activate('budget_tbl'); @@ -95,16 +95,16 @@ if (isset($_POST['submit']) || isset($_POST['update'])) start_form(); -if (db_has_gl_accounts()) +if (db_has_gl_accounts()) { $dim = get_company_pref('use_dimension'); start_table($table_style2); fiscalyears_list_row(_("Fiscal Year:"), 'fyear', null); gl_all_accounts_list_row(_("Account Code:"), 'account', null); - if (!isset($_POST['dim1'])) - $_POST['dim1'] = 0; - if (!isset($_POST['dim2'])) - $_POST['dim2'] = 0; + if (!isset($_POST['dim1'])) + $_POST['dim1'] = 0; + if (!isset($_POST['dim2'])) + $_POST['dim2'] = 0; if ($dim == 2) { dimensions_list_row(_("Dimension")." 1", 'dim1', $_POST['dim1'], true, null, false, 1); @@ -124,13 +124,13 @@ if (db_has_gl_accounts()) end_table(1); div_start('budget_tbl'); start_table($table_style2); - $showdims = (($dim == 1 && $_POST['dim1'] == 0) || + $showdims = (($dim == 1 && $_POST['dim1'] == 0) || ($dim == 2 && $_POST['dim1'] == 0 && $_POST['dim2'] == 0)); - if ($showdims) + if ($showdims) $th = array(_("Period"), _("Amount"), _("Dim. incl."), _("Last Year")); - else + else $th = array(_("Period"), _("Amount"), _("Last Year")); - table_header($th); + table_header($th); $year = $_POST['fyear']; if (get_post('update') == '') { $sql = "SELECT * FROM ".TB_PREF."fiscal_year WHERE id=$year"; @@ -149,16 +149,16 @@ if (db_has_gl_accounts()) start_row(); if (get_post('update') == '') $_POST['amount'.$i] = number_format2(get_only_budget_trans_from_to( - $date_, $date_, $_POST['account'], $_POST['dim1'], $_POST['dim2']), 0); - - label_cell($date_); + $date_, $date_, $_POST['account'], $_POST['dim1'], $_POST['dim2']), 0); + + label_cell($date_); amount_cells(null, 'amount'.$i, null, 15, null, 0); if ($showdims) { $d = get_budget_trans_from_to($date_, $date_, $_POST['account'], $_POST['dim1'], $_POST['dim2']); label_cell(number_format2($d, 0), "nowrap align=right"); $btotal += $d; - } + } $lamount = get_gl_trans_from_to(add_years($date_, -1), add_years(end_month($date_), -1), $_POST['account'], $_POST['dim1'], $_POST['dim2']); $total += input_num('amount'.$i); $ltotal += $lamount; @@ -178,9 +178,9 @@ if (db_has_gl_accounts()) submit_center_first('update', _("Update"), '', null); submit('add', _("Save"), true, '', true); submit_center_last('delete', _("Delete"), '', true); -} +} end_form(); - + end_page(); - + ?> diff --git a/gl/includes/db/gl_db_bank_trans.inc b/gl/includes/db/gl_db_bank_trans.inc index 6aebe6f4..200277fb 100644 --- a/gl/includes/db/gl_db_bank_trans.inc +++ b/gl/includes/db/gl_db_bank_trans.inc @@ -29,7 +29,7 @@ function add_bank_trans($type, $trans_no, $bank_act, $ref, $date_, $bank_trans_t trans_date, bank_trans_type_id, amount, person_type_id, person_id) "; $sql .= "VALUES ($type, $trans_no, '$bank_act', ".db_escape($ref).", '$sqlDate', '$bank_trans_type_id', - $amount_bank, $person_type_id, '$person_id')"; + $amount_bank, $person_type_id, ". db_escape($person_id).")"; if ($err_msg == "") $err_msg = "The bank transaction could not be inserted"; diff --git a/gl/includes/db/gl_db_rates.inc b/gl/includes/db/gl_db_rates.inc index 0a2c2276..cba2e5af 100644 --- a/gl/includes/db/gl_db_rates.inc +++ b/gl/includes/db/gl_db_rates.inc @@ -18,14 +18,18 @@ function get_exchange_rate($rate_id) return db_fetch($result); } +// Retrieves buy exchange rate for given currency/date, zero if no result function get_date_exchange_rate($curr_code, $date_) { $date = date2sql($date_); - $sql = "SELECT date_ FROM ".TB_PREF."exchange_rates WHERE curr_code='$curr_code' + $sql = "SELECT rate_buy FROM ".TB_PREF."exchange_rates WHERE curr_code='$curr_code' AND date_='$date'"; $result = db_query($sql, "could not get exchange rate for $curr_code - $date_"); - return (db_num_rows($result) == 1); + if(db_num_rows($result) == 0) + return 0; + $row = db_fetch($result); + return $row[0]; } //--------------------------------------------------------------------------------------------- @@ -100,11 +104,11 @@ function get_ecb_rate($curr_b) $contents = str_replace (" |i"; preg_match ( $from_mask, $contents, $out ); - $val_a = $out[1]; + $val_a = isset($out[1]) ? $out[1] : 0; $val_a = str_replace ( ',', '', $val_a ); $to_mask = "||i"; preg_match ( $to_mask, $contents, $out ); - $val_b = $out[1]; + $val_b = isset($out[1]) ? $out[1] : 0; $val_b = str_replace ( ',', '', $val_b ); if ($val_b) { diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc index ecd12fae..79b03d80 100644 --- a/gl/includes/db/gl_db_trans.inc +++ b/gl/includes/db/gl_db_trans.inc @@ -40,7 +40,7 @@ function add_gl_trans($type, $trans_id, $date_, $account, $dimension, $dimension '$account', $dimension, $dimension2, ".db_escape($memo_).", $amount_in_home_currency"; if ($person_type_id != null) - $sql .= ", $person_type_id, '$person_id'"; + $sql .= ", $person_type_id, ". db_escape($person_id); $sql .= ") "; diff --git a/gl/includes/ui/gl_bank_ui.inc b/gl/includes/ui/gl_bank_ui.inc index 3ea9b9d9..61c5250a 100644 --- a/gl/includes/ui/gl_bank_ui.inc +++ b/gl/includes/ui/gl_bank_ui.inc @@ -13,7 +13,7 @@ function display_bank_header(&$order) bank_accounts_list_row( $payment ? _("From:") : _("To:"), 'bank_account', null, true); - date_row(_("Date:"), 'date_'); + date_row(_("Date:"), 'date_', '', null, 0, 0, 0, null, true); echo ""; // inner table diff --git a/gl/inquiry/bank_inquiry.php b/gl/inquiry/bank_inquiry.php index d45570c9..f6ffdba7 100644 --- a/gl/inquiry/bank_inquiry.php +++ b/gl/inquiry/bank_inquiry.php @@ -23,7 +23,7 @@ check_db_has_bank_accounts(_("There are no bank accounts defined in the system." //----------------------------------------------------------------------------------- // Ajax updates // -if (get_post('Show')) +if (get_post('Show')) { $Ajax->activate('trans_tbl'); } @@ -58,15 +58,15 @@ $sql = "SELECT ".TB_PREF."bank_trans.*,name AS BankTransType FROM ".TB_PREF."ban $result = db_query($sql,"The transactions for '" . $_POST['bank_account'] . "' could not be retrieved"); +div_start('trans_tbl'); $act = get_bank_account($_POST["bank_account"]); display_heading($act['bank_account_name']." - ".$act['bank_curr_code']); -div_start('trans_tbl'); start_table($table_style); $th = array(_("Type"), _("#"), _("Reference"), _("Type"), _("Date"), _("Debit"), _("Credit"), _("Balance"), _("Person/Item"), ""); -table_header($th); +table_header($th); $sql = "SELECT SUM(amount) FROM ".TB_PREF."bank_trans WHERE bank_act='" . $_POST['bank_account'] . "' AND trans_date < '$date_after'"; @@ -83,7 +83,7 @@ end_row(); $running_total = $bfw; $j = 1; $k = 0; //row colour counter -while ($myrow = db_fetch($result)) +while ($myrow = db_fetch($result)) { alt_table_row_color($k); @@ -105,7 +105,7 @@ while ($myrow = db_fetch($result)) if ($j == 12) { $j = 1; - table_header($th); + table_header($th); } $j++; } diff --git a/gl/manage/exchange_rates.php b/gl/manage/exchange_rates.php index 669895b1..5cd3ed21 100644 --- a/gl/manage/exchange_rates.php +++ b/gl/manage/exchange_rates.php @@ -140,6 +140,9 @@ function display_rate_edit() if (isset($_POST['get_rate'])) { $_POST['BuyRate'] = exrate_format(get_ecb_rate($_POST['curr_abrev'])); + if ($_POST['BuyRate'] == 0) { + display_error(_('This currency is not listed by ECB. Enter exchange rate manually.')); + } $Ajax->activate('BuyRate'); } small_amount_row(_("Exchange Rate:"), 'BuyRate', null, '', diff --git a/includes/banking.inc b/includes/banking.inc index d3ca75bd..2c0fa945 100644 --- a/includes/banking.inc +++ b/includes/banking.inc @@ -8,7 +8,7 @@ function is_bank_account($account_code) { $sql= "SELECT account_code FROM ".TB_PREF."bank_accounts WHERE account_code='$account_code'"; $result = db_query($sql, "retreive bank account currency"); - + return (db_num_rows($result) > 0); } @@ -26,9 +26,9 @@ function get_company_currency() $sql= "SELECT curr_default FROM ".TB_PREF."company"; $result = db_query($sql, "retreive company currency"); - if (db_num_rows($result) == 0) + if (db_num_rows($result) == 0) display_db_error("Could not find the requested currency. Fatal.", $sql); - + $myrow = db_fetch_row($result); return $myrow[0]; } @@ -39,9 +39,9 @@ function get_bank_account_currency($bankAccount) { $sql= "SELECT bank_curr_code FROM ".TB_PREF."bank_accounts WHERE account_code='$bankAccount'"; $result = db_query($sql, "retreive bank account currency"); - + $myrow = db_fetch_row($result); - return $myrow[0]; + return $myrow[0]; } //---------------------------------------------------------------------------------- @@ -49,23 +49,23 @@ function get_bank_account_currency($bankAccount) function get_customer_currency($customer_id) { $sql = "SELECT curr_code FROM ".TB_PREF."debtors_master WHERE debtor_no = '$customer_id'"; - + $result = db_query($sql, "Retreive currency of customer $customer_id"); - - $myrow=db_fetch_row($result); - return $myrow[0]; + + $myrow=db_fetch_row($result); + return $myrow[0]; } -//---------------------------------------------------------------------------------- +//---------------------------------------------------------------------------------- function get_supplier_currency($supplier_id) { $sql = "SELECT curr_code FROM ".TB_PREF."suppliers WHERE supplier_id = '$supplier_id'"; - + $result = db_query($sql, "Retreive currency of supplier $supplier_id"); - - $myrow=db_fetch_row($result); - return $myrow[0]; + + $myrow=db_fetch_row($result); + return $myrow[0]; } //---------------------------------------------------------------------------------- @@ -74,29 +74,30 @@ function get_exchange_rate_from_home_currency($currency_code, $date_) { if ($currency_code == get_company_currency()) return 1.0000; - + $date = date2sql($date_); - - $sql = "SELECT rate_buy, max(date_) as date_ FROM ".TB_PREF."exchange_rates WHERE curr_code = '$currency_code' + + $sql = "SELECT rate_buy, max(date_) as date_ FROM ".TB_PREF."exchange_rates WHERE curr_code = '$currency_code' AND date_ <= '$date' GROUP BY rate_buy ORDER BY date_ Desc LIMIT 1"; - + $result = db_query($sql, "could not query exchange rates"); - - if (db_num_rows($result) == 0) + + if (db_num_rows($result) == 0) { // no stored exchange rate, just return 1 + display_error(_("Cannot retrieve currency exchange rate for this date. Please add exchange rate manually on Exchange Rates page.") ); return 1.000; } - - $myrow = db_fetch_row($result); - return $myrow[0]; + + $myrow = db_fetch_row($result); + return $myrow[0]; } //---------------------------------------------------------------------------------- function get_exchange_rate_to_home_currency($currency_code, $date_) { - return 1 / get_exchange_rate_from_home_currency($currency_code, $date_); + return 1 / get_exchange_rate_from_home_currency($currency_code, $date_); } //---------------------------------------------------------------------------------- @@ -107,25 +108,25 @@ function to_home_currency($amount, $currency_code, $date_) return round($amount / $ex_rate, user_price_dec()); } -//---------------------------------------------------------------------------------- +//---------------------------------------------------------------------------------- function get_exchange_rate_from_to($from_curr_code, $to_curr_code, $date_) { // echo "converting from $from_curr_code to $to_curr_code
"; if ($from_curr_code == $to_curr_code) return 1.0000; - + $home_currency = get_company_currency(); - if ($to_curr_code == $home_currency) + if ($to_curr_code == $home_currency) { return get_exchange_rate_to_home_currency($from_curr_code, $date_); - } - - if ($from_curr_code == $home_currency) + } + + if ($from_curr_code == $home_currency) { - return get_exchange_rate_from_home_currency($to_curr_code, $date_); - } - + return get_exchange_rate_from_home_currency($to_curr_code, $date_); + } + // neither from or to are the home currency return get_exchange_rate_to_home_currency($from_curr_code, $date_) / get_exchange_rate_to_home_currency($to_curr_code, $date_); } @@ -135,9 +136,45 @@ function get_exchange_rate_from_to($from_curr_code, $to_curr_code, $date_) function exchange_from_to($amount, $from_curr_code, $to_curr_code, $date_) { $ex_rate = get_exchange_rate_from_to($from_curr_code, $to_curr_code, $date_); - return $amount / $ex_rate; + return $amount / $ex_rate; } //-------------------------------------------------------------------------------- +// Exchange Variations Joe Hunt 2008-09-20 //////////////////////////////////////// + +function exchange_variation($pyt_type, $pyt_no, $type, $trans_no, $pyt_date, $amount, $person_type, $neg=false) +{ + if ($person_type == payment_person_types::customer()) + { + $trans = get_customer_trans($trans_no, $type); + $ar_ap_act = $trans['receivables_account']; + $person_id = $trans['debtor_no']; + $curr = $trans['curr_code']; + } + else + { + $trans = get_supp_trans($trans_no, $type); + $supp_accs = get_supplier_accounts($trans['supplier_id']); + $ar_ap_act = $supp_accs['payable_account']; + $person_id = $trans['supplier_id']; + $curr = $trans['SupplierCurrCode']; + } + if (is_company_currency($curr)) + return; + $exc_var_act = get_company_pref('exchange_diff_act'); + $inv_amt = to_home_currency($amount, $curr, sql2date($trans['tran_date'])); + $pay_amt = to_home_currency($amount, $curr, $pyt_date); + if ($inv_amt != $pay_amt) + { + $diff = $inv_amt - $pay_amt; + if ($person_type == payment_person_types::supplier()) + $diff = -$diff; + if ($neg) + $diff = -$diff; + $memo = systypes::name($type)." ".$trans_no; + add_gl_trans($pyt_type, $pyt_no, $pyt_date, $ar_ap_act, 0, 0, $memo, -$diff, null, $person_type, $person_id); + add_gl_trans($pyt_type, $pyt_no, $pyt_date, $exc_var_act, 0, 0, $memo, $diff, null, $person_type, $person_id); + } +} ?> \ No newline at end of file diff --git a/includes/db/comments_db.inc b/includes/db/comments_db.inc index fd7af9c5..9a484da2 100644 --- a/includes/db/comments_db.inc +++ b/includes/db/comments_db.inc @@ -30,7 +30,7 @@ function update_comments($type, $id, $date_, $memo_) if ($date_ == null) { delete_comments($type, $id); - add_comments($type, $id, '', $memo_); + add_comments($type, $id, Today(), $memo_); } else { diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc index f7d214be..3fc2bcfb 100644 --- a/includes/db/connect_db.inc +++ b/includes/db/connect_db.inc @@ -79,8 +79,6 @@ function db_escape($value = "", $nullify = false) //reset default if second parameter is skipped $nullify = ($nullify === null) ? (false) : ($nullify); - //undo slashes for poorly configured servers - $value = (get_magic_quotes_gpc()) ? (stripslashes($value)) : ($value); //check for null/unset/empty strings if ((!isset($value)) || (is_null($value)) || ($value === "")) { diff --git a/includes/errors.inc b/includes/errors.inc index 04874a39..536d23ad 100644 --- a/includes/errors.inc +++ b/includes/errors.inc @@ -11,7 +11,6 @@ $msg_colors = array( //----------------------------------------------------------------------------- // Error handler - collects all php/user messages for // display in message box. -// FIX: fatal errors ? function error_handler($errno, $errstr, $file, $line) { global $messages; @@ -65,6 +64,7 @@ function error_box() { echo "
"; $before_box = ob_get_clean(); // save html content before error box // Necessary restart instead of get_contents/clean calls due to a bug in php 4.3.2 + register_shutdown_function('ob_end_flush'); ob_start('output_html'); echo "
"; } diff --git a/includes/lang/language.php b/includes/lang/language.php index 629a15a0..72a0b3e4 100644 --- a/includes/lang/language.php +++ b/includes/lang/language.php @@ -77,6 +77,7 @@ class language } +session_name('FrontAccounting'); session_start(); // this is to fix the "back-do-you-want-to-refresh" issue - thanx PHPFreaks header("Cache-control: private"); diff --git a/includes/prefs/sysprefs.inc b/includes/prefs/sysprefs.inc index 3c5df2f0..95c2eacd 100644 --- a/includes/prefs/sysprefs.inc +++ b/includes/prefs/sysprefs.inc @@ -39,6 +39,12 @@ class sys_prefs return get_company_pref('default_workorder_required'); } + function default_delivery_required_by() + { // FIX this in next major release +// return get_company_pref('default_delivery_required'); + return 1; + } + function default_dimension_required_by() { return get_company_pref('default_dim_required'); diff --git a/includes/session.inc b/includes/session.inc index 34e01cd2..0e7d3113 100644 --- a/includes/session.inc +++ b/includes/session.inc @@ -15,9 +15,9 @@ // Fatal errors are not send to error_handler, // so we must check the output if ($text && preg_match('/\bFatal error(<.*?>)?:(.*)/i', $text, $m)) { - $Ajax->aCommands = array(); // Don't update page on errors - - $messages[] = array(E_ERROR, $m[0], null, null); + $Ajax->aCommands = array(); // Don't update page via ajax on errors + $text = preg_replace('/\bFatal error(<.*?>)?:(.*)/i','', $text); + $messages[] = array(E_ERROR, $m[2], null, null); } $Ajax->run(); return in_ajax() ? fmt_errors() : ($before_box.fmt_errors().$text); @@ -108,6 +108,23 @@ } } + //----------------------------------------------------------------------------- + // Removing magic quotes from nested arrays/variables + // + function strip_quotes($data) + { + if(get_magic_quotes_gpc()) { + if(is_array($data)) { + foreach($data as $k => $v) { + $data[$k] = strip_quotes($data[$k]); + } + } else + return stripslashes($data); + } + return $data; + } + + //---------------------------------------------------------------------------------------- if (!isset($_SESSION["wa_current_user"]) || (isset($_SESSION["wa_current_user"]) && !$_SESSION["wa_current_user"]->logged_in())) @@ -154,6 +171,8 @@ check_page_security($page_security); - +// POST vars cleanup needed for direct reuse. +// We quote all values later with db_escape() before db update. + $_POST = strip_quotes($_POST); ?> \ No newline at end of file diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc index c9bae54f..1883ba2a 100644 --- a/includes/ui/ui_controls.inc +++ b/includes/ui/ui_controls.inc @@ -53,7 +53,8 @@ function meta_forward($forward_to, $params="") echo "\n"; echo "

" . _("You should automatically be forwarded."); echo " " . _("If this does not happen") . " " . "" . _("click here") . " " . _("to continue") . ".

\n"; - $Ajax->redirect($forward_to.'?'.$params); + if ($params !='') $params = '?'.$params; + $Ajax->redirect($forward_to.$params); exit; } @@ -163,15 +164,21 @@ function delete_link_cell($param, $title=false) .($title ? " title='$title'":'') .">" . _("Delete") . "", "nowrap"); } -function edit_button_cell($name, $value, $title=false) +function edit_button($name, $value, $title=false) { // php silently changes dots,spaces,'[' and characters 128-159 // to underscore in POST names, to maintain compatibility with register_globals - - label_cell("'=2E',' '=>'=20','='=>'=3D','['=>'=5B'))) ."\" value=\"$value\"" - .($title ? " title='$title'":'')." />\n"); + .($title ? " title='$title'":'')." />\n"; +} + +function edit_button_cell($name, $value, $title=false) +{ + echo ""; + edit_button($name, $value, $title); + echo ""; } //----------------------------------------------------------------------------------- @@ -223,4 +230,79 @@ function div_end() echo ""; } } + +/* + External page call with saving current context. + $call - url of external page + $ctx - optional. name of SESSION context object or array of names of POST + variables saved on call +*/ +function context_call($call, $ctx='') +{ + if (is_array($ctx)) + { + foreach($ctx as $postname) + { + $context[$postname] = get_post($postname); + } + } else + $context = isset($_SESSION[$ctx]) ? $_SESSION[$ctx] : null; + + array_unshift($_SESSION['Context'], array('name' => $ctx, + 'ctx' => $context, + 'caller' => $_SERVER['PHP_SELF'], + 'ret' => array())); + meta_forward($call); +} +/* + Restores context after external page call and + returns array of data passed by external page. +*/ +function context_restore() +{ + if ( count($_SESSION['Context'])) { + if ($_SERVER['PHP_SELF'] == $_SESSION['Context'][0]['caller']) { + $ctx = array_shift($_SESSION['Context']); + if ($ctx) { + if (is_array($ctx['ctx'])) { + foreach($ctx['ctx'] as $name => $val) + { + $_POST[$name] = $val; + } + } else + if ($ctx['name']!='') + $_SESSION[$ctx['name']] = $ctx['ctx']; + return $ctx['ret']; + } + } + } + return false; +} + +/* + Return to caller page if the page was called from external context. +*/ +function context_return($ret) +{ + if ( count($_SESSION['Context'])) { + $ctx = &$_SESSION['Context'][0]; + $ctx['ret'] = $ret; + meta_forward( $ctx['caller'] ); + } +} +/* + Clearing context stack after page cancel. +*/ +function context_reset() +{ + $_SESSION['Context'] = array(); +} + +/* + Context stack initialization +*/ +if (!isset($_SESSION['Context'])) { + context_reset(); +} + ?> \ No newline at end of file diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc index f1fb3691..3c2151bc 100644 --- a/includes/ui/ui_input.inc +++ b/includes/ui/ui_input.inc @@ -191,6 +191,13 @@ function submit_row($name, $value, $right=true, $extra="", $title=false, $async= submit_cells($name, $value, $extra, $title, $async); echo "\n"; } + +function submit_return($name, $value, $title=false, $async=false) +{ + if (count($_SESSION['Context'])) { + submit($name, $value, true, $title, $async); + } +} //--------------------------------------------------------------------------------- function button($name, $value, $onclick, $title=false) @@ -392,7 +399,8 @@ function text_row_ex($label, $name, $size, $max=null, $title=null, $value=null, //----------------------------------------------------------------------------------- -function date_cells($label, $name, $title = null, $init=null, $inc_days=0, $inc_months=0, $inc_years=0, $params=null) +function date_cells($label, $name, $title = null, $init=null, $inc_days=0, + $inc_months=0, $inc_years=0, $params=null, $submit_on_change=false) { global $use_date_picker, $path_to_root; if (!isset($_POST[$name]) || $_POST[$name] == "") @@ -421,13 +429,15 @@ function date_cells($label, $name, $title = null, $init=null, $inc_days=0, $inc_ . " "._(\n"; else $post_label = ""; - text_cells_ex($label, $name, 9, 12, $_POST[$name], $title, $params, $post_label); + text_cells_ex($label, $name, 9, 12, $_POST[$name], $title, $params, $post_label, $submit_on_change); } -function date_row($label, $name, $title=null, $init=null, $inc_days=0, $inc_months=0, $inc_years=0, $params=null) +function date_row($label, $name, $title=null, $init=null, $inc_days=0, $inc_months=0, + $inc_years=0, $params=null, $submit_on_change=false) { echo ""; - date_cells($label, $name, $title, $init, $inc_days, $inc_months, $inc_years, $params); + date_cells($label, $name, $title, $init, $inc_days, $inc_months, + $inc_years, $params, $submit_on_change); echo "\n"; } diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc index 86968c9f..0ce2546a 100644 --- a/includes/ui/ui_lists.inc +++ b/includes/ui/ui_lists.inc @@ -32,6 +32,7 @@ $opts = array( // default options // submit on select parameters 'default' => '', // default value when $_POST is not set 'select_submit' => false, //submit on select: true/false + 'edit_submit' => false, // call editor on F4 'async' => true, // select update via ajax (true) vs _page_body reload // search box parameters 'sel_hint' => null, @@ -67,7 +68,7 @@ $opts = array( // default options if(!count($opts['search'])) { $opts['search'] = array($by_id ? $valfield : $namefield); } - if ($opts['sel_hint'] === null) + if ($opts['sel_hint'] === null) $opts['sel_hint'] = $by_id || $search_box==false ? '' : _('Press Space tab for search pattern entry'); @@ -84,7 +85,6 @@ $opts = array( // default options $limit = ''; if (isset($_POST[$select_submit])) { - if ($by_id) $txt = $_POST[$name]; if (!$opts['async']) @@ -98,6 +98,7 @@ $opts = array( // default options $rel = "rel='$search_box'"; // set relation to list if ($opts['search_submit']) { if (isset($_POST[$search_submit])) { + $selected_id = ''; // ignore selected_id while search if (!$opts['async']) $Ajax->activate('_page_body'); else @@ -139,7 +140,13 @@ $opts = array( // default options $descr = $opts['format']==null ? $contact_row[1] : call_user_func($opts['format'], $contact_row); $sel = ''; - if ((string)($selected_id) === $value) { + if (get_post($search_submit) && ($txt === $value)) { + $selected_id = $value; + } + if (get_post($search_submit) && ($txt === $value)) { + $selected_id = $value; + } + if ((string)($selected_id) === $value) { $sel = 'selected'; $found = $value; } @@ -167,11 +174,12 @@ $opts = array( // default options $_POST[$name] = $selected_id; if ($by_id && $search_box != false) { - $txt = $_POST[$name]; - $Ajax->addUpdate($name, $search_box, $txt); + $txt = $found; + $Ajax->addUpdate($name, $search_box, $txt ? $txt : ''); } + $aspect = $opts['edit_submit'] ? " aspect='editable'" : ''; $selector = "\n"; + . $opts['sel_hint']."'$aspect $rel>".$selector."\n"; $Ajax->addUpdate($name, "_{$name}_sel", $selector); @@ -212,6 +220,15 @@ $opts = array( // default options return $str; } + +/* + Helper function. + Returns true if selector $name is subject to update. +*/ +function list_updated($name) +{ + return isset($_POST['_'.$name.'_update']) || isset($_POST['_'.$name.'_button']); +} //---------------------------------------------------------------------------------------------- // Universal array combo generator // $items is array of options 'value' => 'description' @@ -225,6 +242,7 @@ $opts = array( // default options 'spec_option'=>false, // option text or false 'spec_id' => 0, // option id 'select_submit' => false, //submit on select: true/false + 'edit_submit' => false, // call editor on F4 'async' => true, // select update via ajax (true) vs _page_body reload 'default' => '', // default value when $_POST is not set // search box parameters @@ -281,8 +299,9 @@ $opts = array( // default options $_POST[$name] = $first_id; } + $aspect = $opts['edit_submit'] ? " aspect='editable'" : ''; $selector = "\n"; + . $opts['sel_hint']."'$aspect >".$selector."\n"; $Ajax->addUpdate($name, "_{$name}_sel", $selector); @@ -325,6 +344,7 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_ array( 'format' => '_format_add_curr', 'search_box' => $mode!=0, + 'edit_submit' => true, 'type' => 1, 'spec_option' => $spec_option === true ? _("All Suppliers") : $spec_option, 'spec_id' => $all_items, @@ -370,8 +390,9 @@ return combo_input($name, $selected_id, $sql, 'debtor_no', 'name', 'spec_option' => $spec_option === true ? _("All Customers") : $spec_option, 'spec_id' => $all_items, 'select_submit'=> $submit_on_change, + 'edit_submit' => true, // call editor on F4 'async' => false, - 'sel_hint' => $mode ? _('Press Space tab to filter by name fragment') : + 'sel_hint' => $mode ? _('Press Space tab to filter by name fragment; F4 - entry new customer') : _('Select customer') ) ); } @@ -755,7 +776,8 @@ function stock_purchasable_items_list($name, $selected_id=null, $all_option=false, $submit_on_change=false) { $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change, - array('where'=>array("mb_flag!= 'M'"))); + array('where'=>array("mb_flag!= 'M'"), + 'edit_submit' => true)); return $str; } @@ -765,7 +787,9 @@ function stock_purchasable_items_list_cells($label, $name, $selected_id=null, if ($label != null) echo "$label\n"; $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change, - array('where'=>array("mb_flag!= 'M'"), 'cells'=>true)); + array('where'=>array("mb_flag!= 'M'"), + 'edit_submit' => true, + 'cells'=>true)); return $str; } diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index 7ca792ae..5925579b 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -271,37 +271,40 @@ function get_trans_view_str($type, $trans_no, $label="") } //-------------------------------------------------------------------------------------- - -function exchange_rate_display($from_currency, $to_currency, $date_, $buttons=true) +// Displays currency exchange rate for given date. +// When there is no exrate for today, +// gets it form ECB and stores in local database. +// +function exchange_rate_display($from_currency, $to_currency, $date_) { global $Ajax; - $hint = _('Get daily ECB exchange rate and save for later use in invoicing process'); + if ($from_currency != $to_currency) { - if ($buttons && isset($_POST['get_rate'])) - { - $comp_currency = get_company_currency(); - if ($from_currency == $comp_currency) - $currency = $to_currency; - else - $currency = $from_currency; - $rate = get_ecb_rate($currency); - if (get_date_exchange_rate($currency, $date_)) - update_exchange_rate($currency, $date_, $rate, $rate); - else - add_exchange_rate($currency, $date_, $rate, $rate); - if ($from_currency == $comp_currency) - $rate = 1 / $rate; - $Ajax->activate('get_rate'); - } + $comp_currency = get_company_currency(); + if ($from_currency == $comp_currency) + $currency = $to_currency; else + $currency = $from_currency; + $rate = 0; + if ($date_ == Today()) { + $rate = get_date_exchange_rate($currency, $date_); + if (!$rate) { + $rate = get_ecb_rate($currency); + if ($rate) + add_exchange_rate($currency, $date_, $rate, $rate); + } + } + if (!$rate) $rate = get_exchange_rate_from_to($to_currency, $from_currency, $date_); + + if ($from_currency == $comp_currency) + $rate = 1 / $rate; + $rate = number_format2($rate, user_exrate_dec()); - label_row(_("Exchange Rate:"),"1 " . $from_currency . " = " . $rate . " " . $to_currency . - ($buttons?" " . submit('get_rate',_("Get"), false, $hint, true):"")); - if($buttons) { - $Ajax->addUpdate('get_rate','_ex_rate', $rate); - } + label_row(_("Exchange Rate:"),"1 " . $from_currency + . " = " . $rate . " " . $to_currency ); + $Ajax->addUpdate('_ex_rate','_ex_rate', $rate); } } @@ -840,6 +843,9 @@ function CC() { "; $js .= " dateField.value = dateString; + setFocus(dateField.name); + if (dateField.className=='searchbox') + dateField.onblur(); hide(); } return; @@ -1000,19 +1006,19 @@ function CC() { if(document.getElementById){ calendar = document.getElementById(calendarId); calendar.innerHTML = calendarDrawTable(currentYear, currentMonth); - setProperty('display', 'block'); var fieldPos = new positionInfo(dateField); var calendarPos = new positionInfo(calendarId); var x = fieldPos.getElementLeft(); var y = fieldPos.getElementBottom(); setProperty('left', x + 'px'); setProperty('top', y + 'px'); + setProperty('display', 'block'); if (document.all) { - setElementProperty('display', 'block', 'CCIframe'); setElementProperty('left', x + 'px', 'CCIframe'); setElementProperty('top', y + 'px', 'CCIframe'); setElementProperty('width', calendarPos.getElementWidth() + 'px', 'CCIframe'); setElementProperty('height', calendarPos.getElementHeight() + 'px', 'CCIframe'); + setElementProperty('display', 'block', 'CCIframe'); } } } diff --git a/index.php b/index.php index 8afa8b92..3ff73e1c 100644 --- a/index.php +++ b/index.php @@ -11,4 +11,5 @@ if (isset($_GET['application'])) $app->selected_application = $_GET['application']; $app->display(); + context_reset(); ?> \ No newline at end of file diff --git a/install/index.php b/install/index.php index a02fb38e..221d207c 100644 --- a/install/index.php +++ b/install/index.php @@ -213,9 +213,9 @@ function change_os(type) { - Table Prefix: + Table Prefix ( 0_ ): - + />   diff --git a/install/save.php b/install/save.php index 32ab2a0f..05460553 100644 --- a/install/save.php +++ b/install/save.php @@ -1,7 +1,7 @@ 0) { - display_note(get_gl_view_str(systypes::cost_update(), $update_no, _("View the GL Journal Entries for this Cost Update")), 1, 0); + display_note(get_gl_view_str(systypes::cost_update(), $update_no, _("View the GL Journal Entries for this Cost Update")), 0, 1); } } } -if (isset($_POST['_stock_id_update'])) +if (list_updated('stock_id')) $Ajax->activate('cost_table'); //----------------------------------------------------------------------------------------- diff --git a/inventory/includes/db/items_adjust_db.inc b/inventory/includes/db/items_adjust_db.inc index bab75ba7..c824e003 100644 --- a/inventory/includes/db/items_adjust_db.inc +++ b/inventory/includes/db/items_adjust_db.inc @@ -61,6 +61,8 @@ function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $type, display_db_error("Cannot do inventory adjustment for Service item : $stock_id", ""); } + update_average_material_cost(null, $stock_id, $standard_cost, $quantity, $date_); + add_stock_move(systypes::inventory_adjustment(), $stock_id, $adj_id, $location, $date_, $reference, $quantity, $standard_cost, $type); diff --git a/inventory/includes/item_adjustments_ui.inc b/inventory/includes/item_adjustments_ui.inc index 6d0a7740..30e56103 100644 --- a/inventory/includes/item_adjustments_ui.inc +++ b/inventory/includes/item_adjustments_ui.inc @@ -131,7 +131,7 @@ function adjustment_edit_item_controls(&$order, $line_no=-1) else { stock_costable_items_list_cells(null, 'stock_id', null, false, true); - if(isset($_POST['_stock_id_update'])) { + if (list_updated('stock_id')) { $Ajax->activate('units'); $Ajax->activate('qty'); $Ajax->activate('std_cost'); diff --git a/inventory/includes/stock_transfers_ui.inc b/inventory/includes/stock_transfers_ui.inc index 63d7c970..26609a1b 100644 --- a/inventory/includes/stock_transfers_ui.inc +++ b/inventory/includes/stock_transfers_ui.inc @@ -116,7 +116,7 @@ function transfer_edit_item_controls(&$order, $line_no=-1) else { stock_costable_items_list_cells(null, 'stock_id', null, false, true); - if(isset($_POST['_stock_id_update'])) { + if (list_updated('stock_id')) { $Ajax->activate('units'); $Ajax->activate('qty'); } diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php index 0f4b21da..e8591e8f 100644 --- a/inventory/inquiry/stock_movements.php +++ b/inventory/inquiry/stock_movements.php @@ -19,7 +19,9 @@ if ($use_date_picker) page(_("Inventory Item Movement"), false, false, "", $js); //------------------------------------------------------------------------------------------------ -if(get_post('ShowMoves')) +check_db_has_stock_items(_("There are no items defined in the system.")); + +if(get_post('ShowMoves')) { $Ajax->activate('doc_tbl'); } @@ -134,7 +136,7 @@ while ($myrow = db_fetch($result)) $person = $cust_row['name'] . " (" . $cust_row['br_name'] . ")"; } - elseif ($myrow["type"] == 25) + elseif ($myrow["type"] == 25 || $myrow['type'] == 21) { // get the supplier name $sql = "SELECT supp_name FROM ".TB_PREF."suppliers WHERE supplier_id = '" . $myrow["person_id"] . "'"; diff --git a/inventory/inquiry/stock_status.php b/inventory/inquiry/stock_status.php index ae076456..2461c188 100644 --- a/inventory/inquiry/stock_status.php +++ b/inventory/inquiry/stock_status.php @@ -18,7 +18,7 @@ include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/inventory/includes/inventory_db.inc"); -if (isset($_POST['_stock_id_update'])) +if (list_updated('stock_id')) $Ajax->activate('status_tbl'); //---------------------------------------------------------------------------------------------------- diff --git a/inventory/manage/items.php b/inventory/manage/items.php index 24335def..99091def 100644 --- a/inventory/manage/items.php +++ b/inventory/manage/items.php @@ -13,29 +13,23 @@ include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/inventory/includes/inventory_db.inc"); $user_comp = user_company(); -$new_item = (!isset($_POST['stock_id']) || $_POST['stock_id'] == ""); +$new_item = get_post('stock_id')==''; //------------------------------------------------------------------------------------ if (isset($_GET['stock_id'])) { - $stock_id = strtoupper($_GET['stock_id']); + $_POST['stock_id'] = $stock_id = strtoupper($_GET['stock_id']); } else if (isset($_POST['stock_id'])) { $stock_id = strtoupper($_POST['stock_id']); } -if(get_post('_stock_id_update')) { - $_POST['NewStockID'] = $_POST['stock_id']; - if ($new_item) { - clear_data(); - set_focus('NewStockID'); - } else { - set_focus('description'); - } +if (list_updated('stock_id')) { + $_POST['NewStockID'] = get_post('stock_id'); + clear_data(); $Ajax->activate('details'); $Ajax->activate('controls'); -// unset($_POST['New']); } $upload_file = ""; if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '') @@ -67,7 +61,6 @@ if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '') } elseif (file_exists($filename)) { - display_notification(_('Attempting to overwrite an existing item image')); $result = unlink($filename); if (!$result) { @@ -79,7 +72,6 @@ if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '') if ($upload_file == 'Yes') { $result = move_uploaded_file($_FILES['pic']['tmp_name'], $filename); - $message = ($result)?_('File url') ."$filename" : "Somthing is wrong with uploading a file."; } /* EOF Add Image upload for New Item - by Ori */ } @@ -91,8 +83,6 @@ check_db_has_item_tax_types(_("There are no item tax types defined in the system function clear_data() { - global $new_item; - unset($_POST['long_description']); unset($_POST['description']); unset($_POST['category_id']); @@ -102,7 +92,6 @@ function clear_data() unset($_POST['NewStockID']); unset($_POST['dimension_id']); unset($_POST['dimension2_id']); - $new_item = true; } //------------------------------------------------------------------------------------ @@ -148,8 +137,6 @@ if (isset($_POST['addupdate'])) $_POST['dimension_id'], $_POST['dimension2_id']); display_notification(_("Item has been updated.")); - set_focus('stock_id'); - $Ajax->activate('details'); //update image if any } else { //it is a NEW part @@ -163,10 +150,9 @@ if (isset($_POST['addupdate'])) display_notification(_("A new item has been added.")); $_POST['stock_id'] = $_POST['NewStockID']; - $new_item = false; + } set_focus('stock_id'); $Ajax->activate('_page_body'); - } } } @@ -226,14 +212,18 @@ if (isset($_POST['delete']) && strlen($_POST['delete']) > 1) if (file_exists($filename)) unlink($filename); display_notification(_("Selected item has been deleted.")); - $new_item = true; $_POST['stock_id'] = ''; clear_data(); set_focus('stock_id'); $Ajax->activate('_page_body'); -// meta_forward($_SERVER['PHP_SELF']); } } +//-------------------------------------------------------------------------------------------- + +if (isset($_POST['select'])) +{ + context_return(array('stock_id' => $_POST['stock_id'])); +} //------------------------------------------------------------------------------------ @@ -245,14 +235,11 @@ if (db_has_stock_items()) start_row(); stock_items_list_cells(_("Select an item:"), 'stock_id', null, _('New item'), true); -// submit_cells('SelectStockItem', _("Edit Item")); + $new_item = get_post('stock_id')==''; end_row(); end_table(); } -//hyperlink_params($_SERVER['PHP_SELF'], _("Enter a new item"), "New=1"); -//echo "
"; - div_start('details'); start_table("$table_style2 width=40%"); @@ -260,7 +247,7 @@ table_section_title(_("Item")); //------------------------------------------------------------------------------------ -if (!isset($_POST['NewStockID']) || $new_item) +if ($new_item) { /*If the page was called without $_POST['NewStockID'] passed to page then assume a new item is to be entered show a form with a part Code field other wise the form showing the fields with the existing entries against the part will show for editing with only a hidden stock_id field. New is set to flag that the page may have called itself and still be entering a new part, in which case the page needs to know not to go looking up details for an existing part*/ @@ -287,9 +274,8 @@ if (!isset($_POST['NewStockID']) || $new_item) } else { // Must be modifying an existing item + $_POST['NewStockID'] = $_POST['stock_id']; - if (!$new_item) - { $myrow = get_item($_POST['NewStockID']); $_POST['long_description'] = $myrow["long_description"]; @@ -309,7 +295,7 @@ else label_row(_("Item Code:"),$_POST['NewStockID']); hidden('NewStockID', $_POST['NewStockID']); - } + set_focus('description'); } text_row(_("Name:"), 'description', null, 52, 50); @@ -322,14 +308,18 @@ start_table("$table_style2 width=40%"); start_row(); label_cells(_("Image File (.jpg)") . ":", ""); // Add Image upload for New Item - by Joe +$stock_img_link = "["; if (isset($_POST["; + // 31/08/08 - rand() call is necessary here to avoid caching problems. Thanks to Peter D. + $stock_img_link .= $_POST['NewStockID'].".jpg". + "]' src='$comp_path/$user_comp/images/".$_POST['NewStockID'].".jpg?nocache=".rand()."'"; } else { - $stock_img_link = "No Image"; + $stock_img_link .= _("No image"). "]'"; } +$stock_img_link .= " width='$pic_width' height='$pic_height' border='0'>"; label_cell($stock_img_link, "valign=top align=center rowspan=5"); end_row(); @@ -392,7 +382,7 @@ if (!isset($_POST['NewStockID']) || $new_item) else { submit_center_first('addupdate', _("Update Item"), '', true); - + submit_return('select', _("Return"), _("Select this items and return to document entry."), true); submit_center_last('delete', _("Delete This Item"), '', true); } diff --git a/inventory/prices.php b/inventory/prices.php index 5a3238ff..4da07b47 100644 --- a/inventory/prices.php +++ b/inventory/prices.php @@ -102,12 +102,11 @@ if ($Mode == 'RESET') $selected_id = -1; } -if (isset($_POST['_stock_id_update'])) { +if (list_updated('stock_id')) { $Ajax->activate('price_table'); $Ajax->activate('price_details'); } -if (isset($_POST['_stock_id_update']) || isset($_POST['_sales_type_id_update']) - || isset($_POST['_curr_abrev_update']) ) { +if (list_updated('stock_id') || isset($_POST['_curr_abrev_update']) ) { // after change of stock, currency or salestype selector // display default calculated price for new settings. // If we have this price already in db it is overwritten later. diff --git a/inventory/purchasing_data.php b/inventory/purchasing_data.php index 67b670ff..3e2f77b6 100644 --- a/inventory/purchasing_data.php +++ b/inventory/purchasing_data.php @@ -13,6 +13,16 @@ include_once($path_to_root . "/includes/data_checks.inc"); check_db_has_purchasable_items(_("There are no purchasable inventory items defined in the system.")); check_db_has_suppliers(_("There are no suppliers defined in the system.")); +//---------------------------------------------------------------------------------------- +if ($ret = context_restore()) { + if(isset($ret['supplier_id'])) + $_POST['supplier_id'] = $ret['supplier_id']; +} +if (isset($_POST['_supplier_id_editor'])) { + context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], + array( 'supplier_id', 'stock_id','_stock_id_edit', 'price', + 'suppliers_uom', 'supplier_description','conversion_factor')); +} simple_page_mode(true); //-------------------------------------------------------------------------------------------------- @@ -92,7 +102,7 @@ if (isset($_POST['_selected_id_update']) ) $Ajax->activate('_page_body'); } -if (isset($_POST['_stock_id_update'])) +if (list_updated('stock_id')) $Ajax->activate('price_table'); //-------------------------------------------------------------------------------------------------- diff --git a/inventory/reorder_level.php b/inventory/reorder_level.php index 83283d5b..3a683437 100644 --- a/inventory/reorder_level.php +++ b/inventory/reorder_level.php @@ -19,7 +19,7 @@ check_db_has_costable_items(_("There are no inventory items defined in the syste if (isset($_GET['stock_id'])) $_POST['stock_id'] = $_GET['stock_id']; -if (isset($_POST['_stock_id_update'])) +if (list_updated('stock_id')) { $Ajax->activate('show_heading'); $Ajax->activate('reorders'); diff --git a/inventory/view/view_adjustment.php b/inventory/view/view_adjustment.php index a4eb1fe9..9aac2fd8 100644 --- a/inventory/view/view_adjustment.php +++ b/inventory/view/view_adjustment.php @@ -18,6 +18,7 @@ if (isset($_GET["trans_no"])) display_heading(systypes::name(systypes::inventory_adjustment()) . " #$trans_no"); +br(1); $adjustment_items = get_stock_adjustment_items($trans_no); $k = 0; $header_shown = false; diff --git a/js/inserts.js b/js/inserts.js index ff479f30..0eb4369f 100644 --- a/js/inserts.js +++ b/js/inserts.js @@ -138,6 +138,12 @@ function _set_combo_select(e) { setFocus(box.name); return false; } + if (this.getAttribute('aspect') == 'editable' && key==115) { + // F4: call related database editor - not available in non-js fallback mode + JsHttpRequest.request('_'+this.name+'_editor', this.form); + return false; // prevent default binding + // TODO: preventDefault, stopPropagation when needed + } } } @@ -155,7 +161,19 @@ var inserts = { } if (e.className == 'combo' || e.className == 'combo2') { _set_combo_input(e); - } + } + else + if(e.type == 'text' ) { + e.onkeydown = function(ev) { + ev = ev||window.event; + key = ev.keyCode||ev.which; + if(key == 13) { + if(e.className == 'searchbox') e.onblur(); + return false; + } + return true; + } + } }, 'input.combo2,input[aspect="fallback"]': function(e) { diff --git a/js/utils.js b/js/utils.js index dcc0c8d2..761917a2 100644 --- a/js/utils.js +++ b/js/utils.js @@ -10,25 +10,28 @@ // JsHttpRequest.request= function(trigger, form) { - var submitObj = typeof(trigger) == "string" ? document.getElementsByName(trigger)[0] : trigger; form = form || (submitObj && submitObj.form); + var upload = form && form.enctype=='multipart/form-data'; + var url = form ? form.action : window.location.toString(); + var content = this.formInputs(trigger, form, upload); + if (!form) url = url.substring(0, url.indexOf('?')); - var values = this.formValues(trigger, form); if (!submitObj) - values[trigger] = 1; + content[trigger] = 1; // this is to avoid caching problems - values['_random'] = Math.random()*1234567; + content['_random'] = Math.random()*1234567; + JsHttpRequest.query( - 'POST '+url, // backend - values, + (upload ? "form." : "")+"POST "+url, // force form loader + content, // Function is called when an answer arrives. function(result, errors) { // Write the answer. @@ -78,13 +81,11 @@ false // do not disable caching ); } - // returns input field values submitted when form button 'name' is pressed - // - JsHttpRequest.formValues = function(inp, objForm) + // collect all form input values plus inp trigger value + JsHttpRequest.formInputs = function(inp, objForm, upload) { var submitObj = inp; var q = {}; - if (typeof(inp) == "string") submitObj = document.getElementsByName(inp)[0]; @@ -99,7 +100,14 @@ for( var i=0; i < formElements.length; i++) { var el = formElements[i]; + var name = el.name; if (!el.name) continue; + if(upload) { // for form containing file inputs collect all + // form elements and add value of trigger submit button + // (internally form is submitted via form.submit() not button click()) + q[name] = submitObj.type=='submit' && el==submitObj ? el.value : el; + continue; + } if (el.type ) if( ((el.type == 'radio' || el.type == 'checkbox') && el.checked == false) @@ -107,7 +115,6 @@ continue; if (el.disabled && el.disabled == true) continue; - var name = el.name; if (name) { if(el.type=='select-multiple') diff --git a/lang/en_US/LC_MESSAGES/en_US.mo b/lang/en_US/LC_MESSAGES/en_US.mo index 6bdf1f6eb3606b2b83cc9828a73c83812eb06510..f8761bad590e6f218b7330d2be81d8b544e94eae 100644 GIT binary patch delta 231 zcmbQs_MWZ&o)F7a1|VPqVi_Rz0b*_-t^r~YSOLT!{z@R00OGAcECj^ofS4bM9|AEC z5Pt+>X(k4Se?S_fUWyr_UJXct)Y}7Tkoq7X4N{*3q!}3)lz>bG0679^1_MwI3|K+r z#6~G07grz8FxQ|+1y4U`A3cRI$B>Crrg2&78W<`VSX!A_ZZ=`u&xo!n#4%#>8zw^l D5D6Zd delta 161 zcmaFQHkYmbo)F7a1|VPsVi_QI0b+I_&H-W&=m27FAnpWWAs_}R<_F>xK+FTgJAhc4 ziGkrLkOrxH2xNoQy#>-Bbqvf9bpk+|5y%A!g8|4sAYfu(p14qI;+1|b6J0}N1tViC QQ?t#vjQbfUyE1D50A;xn\n" "Language-Team: Translators\n" "MIME-Version: 1.0\n" @@ -12,1309 +12,1110 @@ msgstr "" "X-Poedit-Country: UNITED KINGDOM\n" "X-Poedit-SourceCharset: iso-8859-1\n" "X-Poedit-Basepath: c:\\Apache2\\htdocs\\account2\n" +"X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: c:\\Apache2\\htdocs\\account2\n" -# c:\Apache2\htdocs\account/config.php:118 -#: c:\Apache2\htdocs\account2/config.php:138 +#: c:\Apache2\htdocs\account2/config.php:143 msgid "Inquiries" msgstr "" -# c:\Apache2\htdocs\account/config.php:119 -#: c:\Apache2\htdocs\account2/config.php:139 +#: c:\Apache2\htdocs\account2/config.php:144 msgid "Accountant" msgstr "" -# c:\Apache2\htdocs\account/config.php:120 -#: c:\Apache2\htdocs\account2/config.php:140 +#: c:\Apache2\htdocs\account2/config.php:145 msgid "System Administrator" msgstr "" -# c:\Apache2\htdocs\account/applications/customers.php:7 -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:277 -# c:\Apache2\htdocs\account/includes/page/header.inc:42 -#: c:\Apache2\htdocs\account2/config.php:153 +#: c:\Apache2\htdocs\account2/config.php:158 #: c:\Apache2\htdocs\account2/admin/inst_module.php:16 #: c:\Apache2\htdocs\account2/applications/customers.php:9 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:276 +#: c:\Apache2\htdocs\account2/reporting/rep304.php:127 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:283 msgid "Sales" msgstr "" -# c:\Apache2\htdocs\account/applications/suppliers.php:7 -# c:\Apache2\htdocs\account/includes/page/header.inc:43 -#: c:\Apache2\htdocs\account2/config.php:154 +#: c:\Apache2\htdocs\account2/config.php:159 #: c:\Apache2\htdocs\account2/admin/inst_module.php:16 #: c:\Apache2\htdocs\account2/applications/suppliers.php:9 msgid "Purchases" msgstr "" -# c:\Apache2\htdocs\account/applications/inventory.php:7 -# c:\Apache2\htdocs\account/includes/page/header.inc:44 -#: c:\Apache2\htdocs\account2/config.php:155 +#: c:\Apache2\htdocs\account2/config.php:160 #: c:\Apache2\htdocs\account2/admin/inst_module.php:16 #: c:\Apache2\htdocs\account2/applications/inventory.php:9 msgid "Items and Inventory" msgstr "" -# c:\Apache2\htdocs\account/applications/manufacturing.php:7 -# c:\Apache2\htdocs\account/includes/page/header.inc:45 -#: c:\Apache2\htdocs\account2/config.php:156 +#: c:\Apache2\htdocs\account2/config.php:161 #: c:\Apache2\htdocs\account2/admin/inst_module.php:16 #: c:\Apache2\htdocs\account2/applications/manufacturing.php:9 msgid "Manufacturing" msgstr "" -# c:\Apache2\htdocs\account/applications/dimensions.php:8 -# c:\Apache2\htdocs\account/inventory/manage/items.php:355 -# c:\Apache2\htdocs\account/reporting/reports_main.php:123 -# c:\Apache2\htdocs\account/reporting/reports_main.php:126 -# c:\Apache2\htdocs\account/reporting/reports_main.php:131 -# c:\Apache2\htdocs\account/includes/page/header.inc:46 -#: c:\Apache2\htdocs\account2/config.php:157 +#: c:\Apache2\htdocs\account2/config.php:162 #: c:\Apache2\htdocs\account2/admin/inst_module.php:17 #: c:\Apache2\htdocs\account2/applications/dimensions.php:10 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:355 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:133 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:136 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:375 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:141 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:144 msgid "Dimensions" msgstr "" -# c:\Apache2\htdocs\account/applications/generalledger.php:7 -# c:\Apache2\htdocs\account/includes/page/header.inc:47 -#: c:\Apache2\htdocs\account2/config.php:158 +#: c:\Apache2\htdocs\account2/config.php:163 #: c:\Apache2\htdocs\account2/admin/inst_module.php:17 #: c:\Apache2\htdocs\account2/applications/generalledger.php:9 msgid "Banking and General Ledger" msgstr "" -# c:\Apache2\htdocs\account/applications/setup.php:7 -# c:\Apache2\htdocs\account/includes/page/header.inc:48 -#: c:\Apache2\htdocs\account2/config.php:159 +#: c:\Apache2\htdocs\account2/config.php:164 #: c:\Apache2\htdocs\account2/admin/inst_module.php:17 #: c:\Apache2\htdocs\account2/applications/setup.php:9 msgid "Setup" msgstr "" -# c:\Apache2\htdocs\account/boxaccounting.php:63 -# c:\Apache2\htdocs\account/boxaccounting.php:64 -#: c:\Apache2\htdocs\account2/frontaccounting.php:56 -#: c:\Apache2\htdocs\account2/frontaccounting.php:57 +#: c:\Apache2\htdocs\account2/frontaccounting.php:58 +#: c:\Apache2\htdocs\account2/frontaccounting.php:59 msgid "Main Menu" msgstr "" -# c:\Apache2\htdocs\account/boxaccounting.php:65 -# c:\Apache2\htdocs\account/access/logout.php:7 -# c:\Apache2\htdocs\account/includes/page/header.inc:55 -#: c:\Apache2\htdocs\account2/frontaccounting.php:58 +#: c:\Apache2\htdocs\account2/frontaccounting.php:60 #: c:\Apache2\htdocs\account2/access/logout.php:8 -#: c:\Apache2\htdocs\account2/includes/page/header.inc:129 +#: c:\Apache2\htdocs\account2/themes/aqua/renderer.php:57 +#: c:\Apache2\htdocs\account2/themes/cool/renderer.php:57 +#: c:\Apache2\htdocs\account2/themes/default/renderer.php:57 +#: c:\Apache2\htdocs\account2/themes/fancy/renderer.php:33 +#: c:\Apache2\htdocs\account2/themes/picme/renderer.php:33 msgid "Logout" msgstr "" -# c:\Apache2\htdocs\account/access/login.php:38 #: c:\Apache2\htdocs\account2/access/login.php:43 msgid "Version" msgstr "" -# c:\Apache2\htdocs\account/access/logout.php:21 #: c:\Apache2\htdocs\account2/access/logout.php:22 msgid "Thank you for using" msgstr "" -# c:\Apache2\htdocs\account/access/logout.php:33 #: c:\Apache2\htdocs\account2/access/logout.php:34 msgid "Click here to Login Again." msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:14 #: c:\Apache2\htdocs\account2/admin/backups.php:14 msgid "Backup and Restore Database - Error" msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:15 #: c:\Apache2\htdocs\account2/admin/backups.php:15 msgid "Backup paths have not been set correctly." msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:15 #: c:\Apache2\htdocs\account2/admin/backups.php:15 msgid "Please contact System Administrator." msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:23 #: c:\Apache2\htdocs\account2/admin/backups.php:23 msgid "Backup and Restore Database" msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:46 #: c:\Apache2\htdocs\account2/admin/backups.php:46 msgid "This extension can not be be viewed: " msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:53 #: c:\Apache2\htdocs\account2/admin/backups.php:53 msgid "Are you sure you want to delete the backup file - " msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:63 -#: c:\Apache2\htdocs\account2/admin/backups.php:63 +#: c:\Apache2\htdocs\account2/admin/backups.php:64 msgid "Please select a file to upload." msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:74 -#: c:\Apache2\htdocs\account2/admin/backups.php:74 +#: c:\Apache2\htdocs\account2/admin/backups.php:75 msgid "Backup scripts" msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:83 -# c:\Apache2\htdocs\account/admin/backups.php:95 -#: c:\Apache2\htdocs\account2/admin/backups.php:83 -#: c:\Apache2\htdocs\account2/admin/backups.php:95 +#: c:\Apache2\htdocs\account2/admin/backups.php:84 +#: c:\Apache2\htdocs\account2/admin/backups.php:96 msgid "Create Backup" msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:83 -#: c:\Apache2\htdocs\account2/admin/backups.php:83 +#: c:\Apache2\htdocs\account2/admin/backups.php:84 msgid "Compression" msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:84 -#: c:\Apache2\htdocs\account2/admin/backups.php:84 +#: c:\Apache2\htdocs\account2/admin/backups.php:85 msgid "Restore Backup" msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:85 -#: c:\Apache2\htdocs\account2/admin/backups.php:85 +#: c:\Apache2\htdocs\account2/admin/backups.php:86 msgid "View Backup" msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:86 -#: c:\Apache2\htdocs\account2/admin/backups.php:86 +#: c:\Apache2\htdocs\account2/admin/backups.php:87 msgid "Delete Backup" msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:87 -#: c:\Apache2\htdocs\account2/admin/backups.php:87 +#: c:\Apache2\htdocs\account2/admin/backups.php:88 msgid "Download Backup" msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:88 -#: c:\Apache2\htdocs\account2/admin/backups.php:88 +#: c:\Apache2\htdocs\account2/admin/backups.php:89 msgid "Upload Backup" msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:95 -# c:\Apache2\htdocs\account/reporting/reports_main.php:24 -# c:\Apache2\htdocs\account/reporting/reports_main.php:31 -# c:\Apache2\htdocs\account/reporting/reports_main.php:35 -# c:\Apache2\htdocs\account/reporting/reports_main.php:41 -# c:\Apache2\htdocs\account/reporting/reports_main.php:48 -# c:\Apache2\htdocs\account/reporting/reports_main.php:55 -# c:\Apache2\htdocs\account/reporting/reports_main.php:61 -# c:\Apache2\htdocs\account/reporting/reports_main.php:68 -# c:\Apache2\htdocs\account/reporting/reports_main.php:76 -# c:\Apache2\htdocs\account/reporting/reports_main.php:83 -# c:\Apache2\htdocs\account/reporting/reports_main.php:89 -# c:\Apache2\htdocs\account/reporting/reports_main.php:93 -# c:\Apache2\htdocs\account/reporting/reports_main.php:100 -# c:\Apache2\htdocs\account/reporting/reports_main.php:107 -# c:\Apache2\htdocs\account/reporting/reports_main.php:111 -# c:\Apache2\htdocs\account/reporting/reports_main.php:116 -# c:\Apache2\htdocs\account/reporting/reports_main.php:122 -# c:\Apache2\htdocs\account/reporting/reports_main.php:130 -# c:\Apache2\htdocs\account/reporting/reports_main.php:133 -# c:\Apache2\htdocs\account/reporting/reports_main.php:145 -# c:\Apache2\htdocs\account/reporting/reports_main.php:150 -# c:\Apache2\htdocs\account/reporting/reports_main.php:162 -# c:\Apache2\htdocs\account/reporting/reports_main.php:167 -# c:\Apache2\htdocs\account/reporting/reports_main.php:173 -# c:\Apache2\htdocs\account/reporting/reports_main.php:180 -# c:\Apache2\htdocs\account/reporting/reports_main.php:187 -# c:\Apache2\htdocs\account/reporting/reports_main.php:197 -# c:\Apache2\htdocs\account/reporting/reports_main.php:201 -# c:\Apache2\htdocs\account/reporting/reports_main.php:206 -# c:\Apache2\htdocs\account/reporting/reports_main.php:212 -# c:\Apache2\htdocs\account/reporting/reports_main.php:218 -# c:\Apache2\htdocs\account/reporting/reports_main.php:227 -# c:\Apache2\htdocs\account/reporting/reports_main.php:230 -# c:\Apache2\htdocs\account/reporting/reports_main.php:234 -# c:\Apache2\htdocs\account/reporting/reports_main.php:239 -# c:\Apache2\htdocs\account/reporting/reports_main.php:244 -# c:\Apache2\htdocs\account/reporting/reports_main.php:250 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:63 -# c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:238 -#: c:\Apache2\htdocs\account2/admin/backups.php:95 +#: c:\Apache2\htdocs\account2/admin/backups.php:96 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:25 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:32 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:36 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:42 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:49 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:54 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:62 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:67 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:73 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:81 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:88 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:95 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:100 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:103 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:110 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:117 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:121 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:126 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:132 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:43 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:50 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:55 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:63 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:68 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:74 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:82 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:89 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:96 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:101 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:104 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:111 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:118 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:122 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:127 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:134 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:140 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:155 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:160 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:172 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:177 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:184 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:148 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:163 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:168 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:180 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:185 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:192 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:199 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:209 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:213 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:219 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:226 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:232 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:241 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:244 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:200 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:207 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:217 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:221 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:227 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:234 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:240 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:249 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:255 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:260 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:266 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:252 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:257 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:263 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:268 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:274 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:60 -#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:238 +#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:221 +#: c:\Apache2\htdocs\account2/reporting/includes/backup/pdf_report.inc:234 +#: c:\Apache2\htdocs\account2/reporting/includes/backup2/pdf_report.inc:234 msgid "Comments" msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:144 -#: c:\Apache2\htdocs\account2/admin/backups.php:144 +#: c:\Apache2\htdocs\account2/admin/backups.php:145 msgid "File successfully deleted." msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:145 -# c:\Apache2\htdocs\account/admin/backups.php:162 -#: c:\Apache2\htdocs\account2/admin/backups.php:145 -#: c:\Apache2\htdocs\account2/admin/backups.php:162 -#: c:\Apache2\htdocs\account2/admin/inst_module.php:265 +#: c:\Apache2\htdocs\account2/admin/backups.php:146 +#: c:\Apache2\htdocs\account2/admin/backups.php:164 +#: c:\Apache2\htdocs\account2/admin/inst_module.php:267 msgid "Filename" msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:152 -#: c:\Apache2\htdocs\account2/admin/backups.php:152 +#: c:\Apache2\htdocs\account2/admin/backups.php:153 msgid "Backup is being downloaded..." msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:161 -#: c:\Apache2\htdocs\account2/admin/backups.php:161 +#: c:\Apache2\htdocs\account2/admin/backups.php:163 msgid "Backup successfully generated." msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:176 -#: c:\Apache2\htdocs\account2/admin/backups.php:176 +#: c:\Apache2\htdocs\account2/admin/backups.php:178 msgid "Restore backup completed." msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:186 -#: c:\Apache2\htdocs\account2/admin/backups.php:186 +#: c:\Apache2\htdocs\account2/admin/backups.php:188 msgid "Uploaded file has been restored." msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:190 -#: c:\Apache2\htdocs\account2/admin/backups.php:190 +#: c:\Apache2\htdocs\account2/admin/backups.php:192 msgid "Backup was not uploaded into the system." msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:235 -# c:\Apache2\htdocs\account/admin/create_coy.php:163 -# c:\Apache2\htdocs\account/admin/fiscalyears.php:138 -# c:\Apache2\htdocs\account/admin/inst_lang.php:255 -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:144 -# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:108 -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:133 -# c:\Apache2\htdocs\account/reporting/rep104.php:82 -# c:\Apache2\htdocs\account/reporting/rep501.php:99 -# c:\Apache2\htdocs\account/taxes/item_tax_types.php:114 -# c:\Apache2\htdocs\account/taxes/tax_groups.php:156 -# c:\Apache2\htdocs\account/taxes/tax_types.php:109 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1467 -#: c:\Apache2\htdocs\account2/admin/backups.php:238 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:202 -#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:143 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:263 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:146 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:109 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:133 -#: c:\Apache2\htdocs\account2/reporting/rep104.php:82 +#: c:\Apache2\htdocs\account2/admin/backups.php:240 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:223 +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:134 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:265 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:172 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:106 +#: c:\Apache2\htdocs\account2/reporting/rep104.php:76 #: c:\Apache2\htdocs\account2/reporting/rep106.php:62 #: c:\Apache2\htdocs\account2/reporting/rep501.php:99 -#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:102 -#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:116 -#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:153 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1679 +#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:118 +#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:115 +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:150 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1366 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:170 msgid "No" msgstr "" -# c:\Apache2\htdocs\account/admin/backups.php:267 -#: c:\Apache2\htdocs\account2/admin/backups.php:270 +#: c:\Apache2\htdocs\account2/admin/backups.php:272 msgid "cannot find backup directory" msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:7 -# c:\Apache2\htdocs\account/applications/setup.php:9 -# c:\Apache2\htdocs\account/applications/setup.php:10 +#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:7 +#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:84 +#: c:\Apache2\htdocs\account2/themes/aqua/renderer.php:51 +#: c:\Apache2\htdocs\account2/themes/cool/renderer.php:51 +#: c:\Apache2\htdocs\account2/themes/default/renderer.php:51 +#: c:\Apache2\htdocs\account2/themes/fancy/renderer.php:30 +#: c:\Apache2\htdocs\account2/themes/picme/renderer.php:30 +msgid "Change password" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:22 +#: c:\Apache2\htdocs\account2/admin/users.php:31 +msgid "The password entered must be at least 4 characters long." +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:29 +#: c:\Apache2\htdocs\account2/admin/users.php:38 +msgid "The password cannot contain the user login." +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:36 +msgid "The passwords entered are not the same." +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:50 +msgid "Your password has been updated." +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:65 +#: c:\Apache2\htdocs\account2/admin/users.php:155 +msgid "User login:" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:71 +#: c:\Apache2\htdocs\account2/admin/users.php:163 +msgid "Password:" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:76 +msgid "Repeat password:" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/change_current_user_password.php:80 +msgid "Enter your new password in the fields." +msgstr "" + #: c:\Apache2\htdocs\account2/admin/company_preferences.php:7 #: c:\Apache2\htdocs\account2/applications/setup.php:11 #: c:\Apache2\htdocs\account2/applications/setup.php:12 msgid "Company Setup" msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:24 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:24 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:23 msgid "The company name must be entered." msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:34 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:36 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:40 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:55 +msgid "Only jpg files are supported - a file extension of .jpg is expected" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:45 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:60 +msgid "The file size is over the maximum allowed. The maximum size allowed in KB is" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:50 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:65 +msgid "Only graphics files can be uploaded" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:58 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:73 +msgid "The existing image could not be removed" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:68 +msgid "Error uploading logo file" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:80 msgid "Company setup has been updated." msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:69 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:74 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:120 msgid "Name (to appear on reports):" msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:70 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:75 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:121 msgid "Official Company Number:" msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:71 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:76 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:122 msgid "Tax Authority Reference:" msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:73 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:78 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:124 msgid "Tax Periods:" msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:73 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:78 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:124 msgid "Months." msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:74 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:79 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:125 msgid "Tax Last Period:" msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:74 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:79 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:125 msgid "Months back." msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:76 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:81 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:127 msgid "Home Currency:" msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:77 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:82 -#: c:\Apache2\htdocs\account2/gl/gl_budget.php:97 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:128 +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:102 msgid "Fiscal Year:" msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:79 -# c:\Apache2\htdocs\account/admin/shipping_companies.php:154 -# c:\Apache2\htdocs\account/inventory/manage/locations.php:170 -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:185 -# c:\Apache2\htdocs\account/sales/manage/customers.php:274 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:364 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:84 -#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:155 -#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:172 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:185 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:254 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:413 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:130 +#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:154 +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:173 +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:181 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:224 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:427 msgid "Address:" msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:81 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:86 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:132 msgid "Telephone Number:" msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:82 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:87 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:133 msgid "Facsimile Number:" msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:83 -# c:\Apache2\htdocs\account/admin/users.php:195 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:88 -#: c:\Apache2\htdocs\account2/admin/users.php:198 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:134 +#: c:\Apache2\htdocs\account2/admin/users.php:176 msgid "Email Address:" msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:84 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:89 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:135 msgid "Company Logo:" msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:85 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:90 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:136 +msgid "New Company Logo (.jpg)" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:138 msgid "Domicile:" msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:87 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:92 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:140 msgid "Use Dimensions:" msgstr "" -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:94 -msgid "No Item List" +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:141 +msgid "Base for auto price calculations:" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:142 +msgid "No base price list" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:144 +msgid "Search Item List" msgstr "" -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:95 -msgid "No Customer List" +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:145 +msgid "Search Customer List" msgstr "" -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:96 -msgid "No Supplier List" +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:146 +msgid "Search Supplier List" msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:91 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:100 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:150 msgid "Custom Field Name" msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:91 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:100 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:150 msgid "Custom Field Value" msgstr "" -# c:\Apache2\htdocs\account/admin/company_preferences.php:110 -# c:\Apache2\htdocs\account/admin/display_prefs.php:89 -# c:\Apache2\htdocs\account/admin/forms_setup.php:45 -# c:\Apache2\htdocs\account/admin/gl_setup.php:191 -# c:\Apache2\htdocs\account/gl/gl_deposit.php:245 -# c:\Apache2\htdocs\account/gl/gl_payment.php:246 -# c:\Apache2\htdocs\account/inventory/adjustments.php:226 -# c:\Apache2\htdocs\account/inventory/cost_update.php:112 -# c:\Apache2\htdocs\account/inventory/reorder_level.php:78 -# c:\Apache2\htdocs\account/inventory/transfers.php:237 -# c:\Apache2\htdocs\account/inventory/transfers.php:241 -# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:192 -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:291 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:244 -# c:\Apache2\htdocs\account/sales/credit_note_entry.php:269 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:385 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:479 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:236 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:223 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:171 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:222 -# c:\Apache2\htdocs\account/includes/ui/ui_input.inc:47 -# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:158 -# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:142 -# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:125 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:320 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:212 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:327 -#: c:\Apache2\htdocs\account2/admin/company_preferences.php:119 -#: c:\Apache2\htdocs\account2/admin/display_prefs.php:91 +#: c:\Apache2\htdocs\account2/admin/company_preferences.php:169 +#: c:\Apache2\htdocs\account2/admin/display_prefs.php:93 #: c:\Apache2\htdocs\account2/admin/forms_setup.php:45 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:192 -#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:250 -#: c:\Apache2\htdocs\account2/gl/gl_payment.php:247 -#: c:\Apache2\htdocs\account2/inventory/adjustments.php:230 -#: c:\Apache2\htdocs\account2/inventory/cost_update.php:116 -#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:81 -#: c:\Apache2\htdocs\account2/inventory/transfers.php:246 -#: c:\Apache2\htdocs\account2/inventory/transfers.php:250 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:201 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:296 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:247 -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:247 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:364 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:438 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:432 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:247 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:223 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:175 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:225 -#: c:\Apache2\htdocs\account2/includes/ui/ui_input.inc:75 -#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:160 -#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:142 -#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:125 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:329 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:230 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:365 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:187 +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:252 +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:255 +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:178 +#: c:\Apache2\htdocs\account2/inventory/adjustments.php:224 +#: c:\Apache2\htdocs\account2/inventory/cost_update.php:120 +#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:86 +#: c:\Apache2\htdocs\account2/inventory/transfers.php:226 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:402 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:302 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:244 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:380 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:449 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:459 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:285 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:237 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:176 +#: c:\Apache2\htdocs\account2/includes/ui/ui_input.inc:149 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:155 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:135 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:117 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:328 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:271 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:376 msgid "Update" msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:12 #: c:\Apache2\htdocs\account2/admin/create_coy.php:12 msgid "Create/Update Company" msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:79 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:88 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:43 +msgid "This database settings are already used by another company." +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/create_coy.php:48 +msgid "You cannot have table set without prefix together with prefixed sets in the same database." +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/create_coy.php:109 msgid "Error creating Database: " msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:79 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:88 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:109 msgid ", Please create it manually" msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:91 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:103 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:124 msgid "Error uploading Database Script, please upload it manually" msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:67 -# c:\Apache2\htdocs\account/admin/create_coy.php:120 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:111 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:153 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:132 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:174 msgid "Cannot open the configuration file - " msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:69 -# c:\Apache2\htdocs\account/admin/create_coy.php:122 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:113 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:155 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:134 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:176 msgid "Cannot write to the configuration file - " msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:71 -# c:\Apache2\htdocs\account/admin/create_coy.php:124 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:115 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:157 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:136 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:178 msgid "The configuration file " msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:71 -# c:\Apache2\htdocs\account/admin/create_coy.php:124 -# c:\Apache2\htdocs\account/admin/inst_lang.php:136 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:115 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:157 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:136 -#: c:\Apache2\htdocs\account2/admin/inst_module.php:169 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:136 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:178 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:138 +#: c:\Apache2\htdocs\account2/admin/inst_module.php:171 msgid " is not writable. Change its permissions so it is, then re-run the operation." msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:128 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:147 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:168 msgid "Error removing Database: " msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:128 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:147 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:168 msgid ", please remove it manuallly" msgstr "" -#: c:\Apache2\htdocs\account2/admin/create_coy.php:165 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:186 msgid "Cannot remove company data directory " msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:144 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:183 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:204 msgid "Are you sure you want to delete company no. " msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:151 -# c:\Apache2\htdocs\account/admin/create_coy.php:232 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:190 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:272 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:211 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:293 msgid "Company" msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:151 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:190 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:211 msgid "Database Host" msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:151 -# c:\Apache2\htdocs\account/admin/create_coy.php:234 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:190 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:274 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:211 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:295 msgid "Database User" msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:152 -# c:\Apache2\htdocs\account/admin/create_coy.php:236 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:191 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:277 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:212 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:298 msgid "Database Name" msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:152 -# c:\Apache2\htdocs\account/admin/create_coy.php:238 -# c:\Apache2\htdocs\account/admin/create_coy.php:240 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:191 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:279 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:281 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:212 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:300 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:302 msgid "Table Pref" msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:152 -# c:\Apache2\htdocs\account/admin/create_coy.php:241 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:191 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:282 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:212 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:303 msgid "Default" msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:161 -# c:\Apache2\htdocs\account/admin/fiscalyears.php:142 -# c:\Apache2\htdocs\account/admin/inst_lang.php:253 -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:144 -# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:112 -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:133 -# c:\Apache2\htdocs\account/reporting/rep104.php:84 -# c:\Apache2\htdocs\account/reporting/rep501.php:97 -# c:\Apache2\htdocs\account/taxes/item_tax_types.php:118 -# c:\Apache2\htdocs\account/taxes/tax_groups.php:154 -# c:\Apache2\htdocs\account/taxes/tax_types.php:107 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1459 -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:159 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:200 -#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:147 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:261 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:146 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:113 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:133 -#: c:\Apache2\htdocs\account2/reporting/rep104.php:84 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:221 +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:138 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:263 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:172 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:110 +#: c:\Apache2\htdocs\account2/reporting/rep104.php:78 #: c:\Apache2\htdocs\account2/reporting/rep106.php:64 #: c:\Apache2\htdocs\account2/reporting/rep501.php:97 -#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:102 -#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:120 -#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:151 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1671 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:164 +#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:118 +#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:119 +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:148 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1365 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:170 msgid "Yes" msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:176 -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:147 -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:142 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:143 -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:165 -# c:\Apache2\htdocs\account/includes/ui/ui_controls.inc:149 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:187 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:295 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:214 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:149 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:142 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:148 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:260 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:243 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:244 -#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:155 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:235 +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:143 +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:166 +#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:115 +#: c:\Apache2\htdocs\account2/admin/users.php:120 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:175 +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:108 +#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:100 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:166 +#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:102 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:115 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:135 +#: c:\Apache2\htdocs\account2/inventory/prices.php:139 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:152 +#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:88 +#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:89 +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:129 +#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:97 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:149 +#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:110 +#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:107 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:173 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:271 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:262 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:264 +#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:110 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:195 +#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:92 +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:125 +#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:119 +#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:124 +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:156 +#: c:\Apache2\htdocs\account2/taxes/tax_types.php:112 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:144 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:87 +#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:157 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:89 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:78 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:49 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:181 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:289 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:129 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:291 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:193 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:182 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:126 msgid "Edit" msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:178 -# c:\Apache2\htdocs\account/admin/inst_lang.php:259 -# c:\Apache2\htdocs\account/includes/ui/ui_controls.inc:154 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:216 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:267 -#: c:\Apache2\htdocs\account2/admin/inst_module.php:280 -#: c:\Apache2\htdocs\account2/gl/gl_budget.php:170 -#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:160 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:130 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:237 +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:145 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:270 +#: c:\Apache2\htdocs\account2/admin/inst_module.php:282 +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:167 +#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:116 +#: c:\Apache2\htdocs\account2/admin/users.php:123 +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:180 +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:109 +#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:101 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:168 +#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:103 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:116 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:136 +#: c:\Apache2\htdocs\account2/inventory/prices.php:140 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:153 +#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:89 +#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:90 +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:130 +#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:98 +#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:111 +#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:108 +#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:111 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:196 +#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:93 +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:126 +#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:120 +#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:125 +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:157 +#: c:\Apache2\htdocs\account2/taxes/tax_types.php:113 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:146 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:89 +#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:163 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:91 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:80 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:51 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:226 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:323 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:195 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:184 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:128 msgid "Delete" msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:183 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:221 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:242 msgid "The marked company is the current company which cannot be deleted." msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:233 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:273 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:294 msgid "Host" msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:151 -# c:\Apache2\htdocs\account/admin/create_coy.php:235 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:276 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:297 msgid "Database Password" msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:238 -# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:167 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:221 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:214 -# c:\Apache2\htdocs\account/taxes/tax_groups.php:219 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:279 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:168 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:220 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:223 -#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:213 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:300 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:162 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:211 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:215 +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:209 msgid "None" msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:244 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:285 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:306 msgid "Database Script" msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:254 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:289 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:310 msgid "New script Admin Password" msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:249 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:292 -msgid "Choose from Database scripts in SQL folder. No Datase is created without a script." +#: c:\Apache2\htdocs\account2/admin/create_coy.php:313 +msgid "Choose from Database scripts in SQL folder. No Database is created without a script." msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:250 -# c:\Apache2\htdocs\account/admin/inst_lang.php:312 -# c:\Apache2\htdocs\account/includes/ui/ui_input.inc:45 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:293 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:321 -#: c:\Apache2\htdocs\account2/admin/inst_module.php:329 -#: c:\Apache2\htdocs\account2/gl/gl_budget.php:169 -#: c:\Apache2\htdocs\account2/includes/ui/ui_input.inc:73 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:314 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:324 +#: c:\Apache2\htdocs\account2/admin/inst_module.php:331 +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:179 msgid "Save" msgstr "" -# c:\Apache2\htdocs\account/admin/create_coy.php:278 -#: c:\Apache2\htdocs\account2/admin/create_coy.php:321 +#: c:\Apache2\htdocs\account2/admin/create_coy.php:342 msgid "Create a new company" msgstr "" -# c:\Apache2\htdocs\account/admin/display_prefs.php:7 -# c:\Apache2\htdocs\account/applications/setup.php:13 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:7 #: c:\Apache2\htdocs\account2/applications/setup.php:15 msgid "Display Setup" msgstr "" -# c:\Apache2\htdocs\account/admin/display_prefs.php:32 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:34 msgid "Display settings have been updated." msgstr "" -# c:\Apache2\htdocs\account/admin/display_prefs.php:38 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:40 msgid "Decimal Places" msgstr "" -# c:\Apache2\htdocs\account/admin/display_prefs.php:40 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:42 msgid "Prices/Amounts:" msgstr "" -# c:\Apache2\htdocs\account/admin/display_prefs.php:41 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:43 msgid "Quantities:" msgstr "" -# c:\Apache2\htdocs\account/admin/display_prefs.php:42 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:44 msgid "Exchange Rates:" msgstr "" -# c:\Apache2\htdocs\account/admin/display_prefs.php:43 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:45 msgid "Percentages:" msgstr "" -# c:\Apache2\htdocs\account/admin/display_prefs.php:45 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:47 msgid "Dateformat and Separators" msgstr "" -# c:\Apache2\htdocs\account/admin/display_prefs.php:47 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:49 msgid "Dateformat:" msgstr "" -# c:\Apache2\htdocs\account/admin/display_prefs.php:49 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:51 msgid "Date Separator:" msgstr "" -# c:\Apache2\htdocs\account/admin/display_prefs.php:54 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:56 msgid "Thousand Separator:" msgstr "" -# c:\Apache2\htdocs\account/admin/display_prefs.php:59 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:61 msgid "Decimal Separator:" msgstr "" -# c:\Apache2\htdocs\account/admin/display_prefs.php:64 -# c:\Apache2\htdocs\account/applications/setup.php:21 -# c:\Apache2\htdocs\account/includes/types.inc:137 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:66 #: c:\Apache2\htdocs\account2/applications/setup.php:23 #: c:\Apache2\htdocs\account2/includes/types.inc:143 msgid "Miscellaneous" msgstr "" -# c:\Apache2\htdocs\account/admin/display_prefs.php:66 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:68 -msgid "Show GL Information:" +msgid "Show hints for new users:" msgstr "" -# c:\Apache2\htdocs\account/admin/display_prefs.php:68 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:70 -msgid "Show Item Codes:" +msgid "Show GL Information:" msgstr "" -# c:\Apache2\htdocs\account/admin/display_prefs.php:70 -# c:\Apache2\htdocs\account/includes/page/footer.inc:29 #: c:\Apache2\htdocs\account2/admin/display_prefs.php:72 -#: c:\Apache2\htdocs\account2/includes/page/footer.inc:31 +msgid "Show Item Codes:" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/display_prefs.php:74 +#: c:\Apache2\htdocs\account2/themes/aqua/renderer.php:98 +#: c:\Apache2\htdocs\account2/themes/cool/renderer.php:98 +#: c:\Apache2\htdocs\account2/themes/default/renderer.php:98 +#: c:\Apache2\htdocs\account2/themes/fancy/renderer.php:38 +#: c:\Apache2\htdocs\account2/themes/picme/renderer.php:38 msgid "Theme:" msgstr "" -# c:\Apache2\htdocs\account/admin/display_prefs.php:75 -#: c:\Apache2\htdocs\account2/admin/display_prefs.php:77 +#: c:\Apache2\htdocs\account2/admin/display_prefs.php:79 msgid "Page Size:" msgstr "" -# c:\Apache2\htdocs\account/admin/display_prefs.php:80 -# c:\Apache2\htdocs\account/admin/inst_lang.php:236 -# c:\Apache2\htdocs\account/admin/inst_lang.php:302 -#: c:\Apache2\htdocs\account2/admin/display_prefs.php:82 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:244 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:310 +#: c:\Apache2\htdocs\account2/admin/display_prefs.php:84 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:246 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:313 msgid "Language" msgstr "" -# c:\Apache2\htdocs\account/admin/display_prefs.php:85 -# c:\Apache2\htdocs\account/admin/users.php:199 -#: c:\Apache2\htdocs\account2/admin/display_prefs.php:87 -#: c:\Apache2\htdocs\account2/admin/users.php:202 +#: c:\Apache2\htdocs\account2/admin/display_prefs.php:89 +#: c:\Apache2\htdocs\account2/admin/users.php:180 msgid "Language:" msgstr "" -# c:\Apache2\htdocs\account/admin/fiscalyears.php:7 -# c:\Apache2\htdocs\account/applications/setup.php:19 #: c:\Apache2\htdocs\account2/admin/fiscalyears.php:13 #: c:\Apache2\htdocs\account2/applications/setup.php:21 msgid "Fiscal Years" msgstr "" -# c:\Apache2\htdocs\account/admin/fiscalyears.php:36 -#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:38 +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:31 msgid "Invalid BEGIN date in fiscal year." msgstr "" -# c:\Apache2\htdocs\account/admin/fiscalyears.php:41 -#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:44 +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:37 msgid "Invalid END date in fiscal year." msgstr "" -# c:\Apache2\htdocs\account/admin/fiscalyears.php:46 -#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:50 +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:43 msgid "BEGIN date bigger than END date." msgstr "" -# c:\Apache2\htdocs\account/admin/fiscalyears.php:87 -#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:92 +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:61 +msgid "Selected fiscal year has been updated" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:66 +msgid "New fiscal year has been added" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:84 msgid "Cannot delete this fiscal year because items have been created referring to it." msgstr "" -# c:\Apache2\htdocs\account/admin/fiscalyears.php:121 -#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:126 +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:100 +msgid "Selected fiscal year has been deleted" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:117 msgid "Fiscal Year Begin" msgstr "" -# c:\Apache2\htdocs\account/admin/fiscalyears.php:121 -#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:126 +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:117 msgid "Fiscal Year End" msgstr "" -# c:\Apache2\htdocs\account/admin/fiscalyears.php:121 -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:99 -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:89 -# c:\Apache2\htdocs\account/reporting/rep501.php:75 -# c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:168 -#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:126 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:101 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:89 +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:117 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:127 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:167 #: c:\Apache2\htdocs\account2/reporting/rep501.php:75 -#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:168 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:527 +#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:151 +#: c:\Apache2\htdocs\account2/reporting/includes/backup/pdf_report.inc:164 +#: c:\Apache2\htdocs\account2/reporting/includes/backup2/pdf_report.inc:164 msgid "Closed" msgstr "" -# c:\Apache2\htdocs\account/admin/fiscalyears.php:154 -#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:159 +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:153 msgid "The marked fiscal year is the current fiscal year which cannot be deleted." msgstr "" -# c:\Apache2\htdocs\account/admin/fiscalyears.php:176 -# c:\Apache2\htdocs\account/admin/fiscalyears.php:181 -#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:181 -#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:186 +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:177 +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:182 msgid "Fiscal Year Begin:" msgstr "" -# c:\Apache2\htdocs\account/admin/fiscalyears.php:177 -# c:\Apache2\htdocs\account/admin/fiscalyears.php:182 -#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:182 -#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:187 +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:178 +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:183 msgid "Fiscal Year End:" msgstr "" -# c:\Apache2\htdocs\account/admin/fiscalyears.php:185 -#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:190 +#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:187 msgid "Is Closed:" msgstr "" -# c:\Apache2\htdocs\account/admin/fiscalyears.php:215 -#: c:\Apache2\htdocs\account2/admin/fiscalyears.php:220 -msgid "Enter a New Fiscal Year" -msgstr "" - -# c:\Apache2\htdocs\account/admin/forms_setup.php:7 -# c:\Apache2\htdocs\account/applications/setup.php:14 #: c:\Apache2\htdocs\account2/admin/forms_setup.php:7 #: c:\Apache2\htdocs\account2/applications/setup.php:16 msgid "Forms Setup" msgstr "" -# c:\Apache2\htdocs\account/admin/forms_setup.php:27 #: c:\Apache2\htdocs\account2/admin/forms_setup.php:27 msgid "Forms settings have been updated." msgstr "" -# c:\Apache2\htdocs\account/admin/forms_setup.php:35 #: c:\Apache2\htdocs\account2/admin/forms_setup.php:35 msgid "Form" msgstr "" -# c:\Apache2\htdocs\account/admin/forms_setup.php:35 #: c:\Apache2\htdocs\account2/admin/forms_setup.php:35 msgid "Next Reference" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:7 -# c:\Apache2\htdocs\account/applications/setup.php:18 #: c:\Apache2\htdocs\account2/admin/gl_setup.php:7 #: c:\Apache2\htdocs\account2/applications/setup.php:20 msgid "System and General GL Setup" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:21 #: c:\Apache2\htdocs\account2/admin/gl_setup.php:21 msgid "The delivery over-receive allowance must be between 0 and 100." msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:28 #: c:\Apache2\htdocs\account2/admin/gl_setup.php:28 msgid "The invoice over-charge allowance must be between 0 and 100." msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:35 #: c:\Apache2\htdocs\account2/admin/gl_setup.php:35 msgid "The past due days interval allowance must be between 0 and 100." msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:65 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:66 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:64 msgid "The general GL setup has been updated." msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:113 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:114 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:104 msgid "General GL" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:115 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:116 -msgid "Retained Earning Clearing Account:" -msgstr "" - -# c:\Apache2\htdocs\account/admin/gl_setup.php:116 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:117 -msgid "Payroll Account:" -msgstr "" - -# c:\Apache2\htdocs\account/admin/gl_setup.php:117 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:118 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:111 msgid "Past Due Days Interval:" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:117 -# c:\Apache2\htdocs\account/admin/gl_setup.php:179 -# c:\Apache2\htdocs\account/admin/gl_setup.php:185 -# c:\Apache2\htdocs\account/admin/payment_terms.php:160 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:118 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:180 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:186 -#: c:\Apache2\htdocs\account2/admin/payment_terms.php:164 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:111 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:175 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:181 +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:158 msgid "days" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:121 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:122 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:114 msgid "Customers and Sales" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:123 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:124 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:116 msgid "Default Credit Limit:" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:125 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:126 -msgid "Sales Exchange Variances Account:" -msgstr "" - -# c:\Apache2\htdocs\account/admin/gl_setup.php:127 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:128 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:121 msgid "Shipping Charged Account:" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:131 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:132 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:125 msgid "Customers and Sales Defaults" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:133 -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:303 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:134 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:302 -msgid "Accounts Receivable Account:" +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:127 +msgid "Receivable Account:" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:135 -# c:\Apache2\htdocs\account/admin/gl_setup.php:165 -# c:\Apache2\htdocs\account/inventory/manage/items.php:332 -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:299 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:136 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:166 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:332 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:298 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:129 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:161 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:352 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:306 msgid "Sales Account:" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:137 -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:301 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:138 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:300 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:132 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:308 msgid "Sales Discount Account:" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:139 -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:305 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:140 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:304 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:134 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:312 msgid "Prompt Payment Discount Account:" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:143 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:144 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:138 msgid "Suppliers and Purchasing" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:145 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:146 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:140 msgid "Delivery Over-Receive Allowance:" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:147 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:148 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:142 msgid "Invoice Over-Charge Allowance:" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:149 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:150 -msgid "Purchases Exchange Variances Account:" +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:148 +msgid "Suppliers and Purchasing Defaults" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:151 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:152 -msgid "Goods Received Clearing Account:" +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:150 +msgid "Payable Account:" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:153 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:154 -msgid "Suppliers and Purchasing Defaults" +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:152 +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:206 +msgid "Purchase Discount Account:" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:155 -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:206 #: c:\Apache2\htdocs\account2/admin/gl_setup.php:156 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:206 -msgid "Accounts Payable Account:" +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:113 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:114 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:119 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:123 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:128 +msgid "Inventory" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:157 -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:210 #: c:\Apache2\htdocs\account2/admin/gl_setup.php:158 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:210 -msgid "Purchase Discount Account:" -msgstr "" - -# c:\Apache2\htdocs\account/admin/gl_setup.php:161 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:162 -msgid "Inventory Defaults" +msgid "Allow Negative Inventory:" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:163 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:164 -msgid "Allow Negative Inventory:" +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:160 +msgid "Items Defaults" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:167 -# c:\Apache2\htdocs\account/inventory/manage/items.php:334 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:168 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:334 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:163 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:354 msgid "Inventory Account:" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:169 -# c:\Apache2\htdocs\account/inventory/manage/items.php:338 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:170 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:338 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:165 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:358 msgid "C.O.G.S. Account:" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:171 -# c:\Apache2\htdocs\account/inventory/manage/items.php:339 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:172 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:339 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:167 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:359 msgid "Inventory Adjustments Account:" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:173 -# c:\Apache2\htdocs\account/inventory/manage/items.php:349 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:174 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:349 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:169 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:369 msgid "Item Assembly Costs Account:" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:177 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:178 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:173 msgid "Manufacturing Defaults" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:179 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:180 -msgid "Default Work Order Required By After:" +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:175 +msgid "Work Order Required By After:" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:183 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:184 +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:179 msgid "Dimension Defaults" msgstr "" -# c:\Apache2\htdocs\account/admin/gl_setup.php:185 -#: c:\Apache2\htdocs\account2/admin/gl_setup.php:186 -msgid "Default Dimension Required By After:" +#: c:\Apache2\htdocs\account2/admin/gl_setup.php:181 +msgid "Dimension Required By After:" msgstr "" -# c:\Apache2\htdocs\account/admin/inst_lang.php:7 -# c:\Apache2\htdocs\account/applications/setup.php:30 #: c:\Apache2\htdocs\account2/admin/inst_lang.php:7 #: c:\Apache2\htdocs\account2/applications/setup.php:32 msgid "Install/Update Languages" msgstr "" -# c:\Apache2\htdocs\account/admin/inst_lang.php:119 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:119 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:121 msgid "Cannot open the languages file - " msgstr "" -# c:\Apache2\htdocs\account/admin/inst_lang.php:126 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:126 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:128 msgid "Cannot write to the language file - " msgstr "" -# c:\Apache2\htdocs\account/admin/inst_lang.php:136 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:136 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:138 msgid "The language file " msgstr "" -# c:\Apache2\htdocs\account/admin/inst_lang.php:230 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:238 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:240 msgid "Are you sure you want to delete language no. " msgstr "" -# c:\Apache2\htdocs\account/admin/inst_lang.php:236 -# c:\Apache2\htdocs\account/admin/inst_lang.php:303 -# c:\Apache2\htdocs\account/admin/shipping_companies.php:104 -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:229 -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:98 -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:101 -# c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:35 -# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:114 -# c:\Apache2\htdocs\account/inventory/manage/item_categories.php:77 -# c:\Apache2\htdocs\account/manufacturing/manage/work_centres.php:97 -# c:\Apache2\htdocs\account/reporting/rep501.php:75 -# c:\Apache2\htdocs\account/reporting/rep709.php:171 -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:169 -# c:\Apache2\htdocs\account/sales/manage/sales_people.php:87 -# c:\Apache2\htdocs\account/taxes/item_tax_types.php:103 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:197 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:199 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:201 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:244 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:311 -#: c:\Apache2\htdocs\account2/admin/inst_module.php:265 -#: c:\Apache2\htdocs\account2/admin/inst_module.php:321 -#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:105 -#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:238 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:100 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:103 -#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:35 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:115 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:246 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:314 +#: c:\Apache2\htdocs\account2/admin/inst_module.php:267 +#: c:\Apache2\htdocs\account2/admin/inst_module.php:323 +#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:103 +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:235 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:126 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:129 +#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:38 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:112 #: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:78 -#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:98 +#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:96 #: c:\Apache2\htdocs\account2/reporting/rep501.php:75 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:171 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:168 -#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:92 -#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:104 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:191 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:189 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:180 +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:108 +#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:103 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:193 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:195 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:197 msgid "Name" msgstr "" -# c:\Apache2\htdocs\account/admin/inst_lang.php:236 -# c:\Apache2\htdocs\account/admin/inst_lang.php:304 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:244 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:312 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:246 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:315 msgid "Encoding" msgstr "" -# c:\Apache2\htdocs\account/admin/inst_lang.php:236 -# c:\Apache2\htdocs\account/admin/inst_lang.php:306 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:244 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:314 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:246 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:317 msgid "Right To Left" msgstr "" -# c:\Apache2\htdocs\account/admin/inst_lang.php:264 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:272 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:275 msgid "The marked language is the current language which cannot be deleted." msgstr "" -# c:\Apache2\htdocs\account/admin/inst_lang.php:308 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:316 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:317 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:319 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:320 msgid "Language File" msgstr "" -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:320 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:323 msgid "Select your language files from your local harddisk." msgstr "" -# c:\Apache2\htdocs\account/admin/inst_lang.php:341 -#: c:\Apache2\htdocs\account2/admin/inst_lang.php:350 +#: c:\Apache2\htdocs\account2/admin/inst_lang.php:353 msgid "Create a new language" msgstr "" @@ -1323,183 +1124,148 @@ msgstr "" msgid "Install/Update Modules" msgstr "" -#: c:\Apache2\htdocs\account2/admin/inst_module.php:152 +#: c:\Apache2\htdocs\account2/admin/inst_module.php:154 msgid "Cannot open the modules file - " msgstr "" -#: c:\Apache2\htdocs\account2/admin/inst_module.php:159 +#: c:\Apache2\htdocs\account2/admin/inst_module.php:161 msgid "Cannot write to the modules file - " msgstr "" -#: c:\Apache2\htdocs\account2/admin/inst_module.php:169 +#: c:\Apache2\htdocs\account2/admin/inst_module.php:171 msgid "The modules file " msgstr "" -#: c:\Apache2\htdocs\account2/admin/inst_module.php:259 +#: c:\Apache2\htdocs\account2/admin/inst_module.php:261 msgid "Are you sure you want to delete module: " msgstr "" -#: c:\Apache2\htdocs\account2/admin/inst_module.php:265 +#: c:\Apache2\htdocs\account2/admin/inst_module.php:267 msgid "Tab" msgstr "" -#: c:\Apache2\htdocs\account2/admin/inst_module.php:265 -#: c:\Apache2\htdocs\account2/admin/inst_module.php:322 +#: c:\Apache2\htdocs\account2/admin/inst_module.php:267 +#: c:\Apache2\htdocs\account2/admin/inst_module.php:324 msgid "Folder" msgstr "" -#: c:\Apache2\htdocs\account2/admin/inst_module.php:320 +#: c:\Apache2\htdocs\account2/admin/inst_module.php:322 msgid "Menu Tab" msgstr "" -#: c:\Apache2\htdocs\account2/admin/inst_module.php:324 +#: c:\Apache2\htdocs\account2/admin/inst_module.php:326 msgid "Module File" msgstr "" -#: c:\Apache2\htdocs\account2/admin/inst_module.php:325 +#: c:\Apache2\htdocs\account2/admin/inst_module.php:327 msgid "SQL File" msgstr "" -#: c:\Apache2\htdocs\account2/admin/inst_module.php:328 +#: c:\Apache2\htdocs\account2/admin/inst_module.php:330 msgid "Select your module PHP file from your local harddisk." msgstr "" -#: c:\Apache2\htdocs\account2/admin/inst_module.php:358 +#: c:\Apache2\htdocs\account2/admin/inst_module.php:360 msgid "Create a new module" msgstr "" -# c:\Apache2\htdocs\account/admin/payment_terms.php:7 -# c:\Apache2\htdocs\account/applications/setup.php:22 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:17 #: c:\Apache2\htdocs\account2/admin/payment_terms.php:7 #: c:\Apache2\htdocs\account2/applications/setup.php:24 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:17 msgid "Payment Terms" msgstr "" -# c:\Apache2\htdocs\account/admin/payment_terms.php:33 -#: c:\Apache2\htdocs\account2/admin/payment_terms.php:33 +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:22 msgid "The number of days or the day in the following month must be numeric." msgstr "" -# c:\Apache2\htdocs\account/admin/payment_terms.php:38 -#: c:\Apache2\htdocs\account2/admin/payment_terms.php:39 +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:28 msgid "The Terms description must be entered." msgstr "" -# c:\Apache2\htdocs\account/admin/payment_terms.php:43 -#: c:\Apache2\htdocs\account2/admin/payment_terms.php:45 +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:34 msgid "When the check box to indicate a day in the following month is the due date, the due date cannot be a day after the 30th. A number between 1 and 30 is expected." msgstr "" -# c:\Apache2\htdocs\account/admin/payment_terms.php:48 -#: c:\Apache2\htdocs\account2/admin/payment_terms.php:51 +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:40 msgid "When the check box is not checked to indicate that the term expects a number of days after which accounts are due, the number entered should be less than 500 days." msgstr "" -# c:\Apache2\htdocs\account/admin/payment_terms.php:109 -#: c:\Apache2\htdocs\account2/admin/payment_terms.php:113 +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:65 +msgid "Selected payment terms have been updated" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:84 +msgid "New payment terms have been added" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:102 msgid "Cannot delete this payment term, because customer accounts have been created referring to this term." msgstr "" -# c:\Apache2\htdocs\account/admin/payment_terms.php:118 -#: c:\Apache2\htdocs\account2/admin/payment_terms.php:122 +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:111 msgid "Cannot delete this payment term, because supplier accounts have been created referring to this term" msgstr "" -# c:\Apache2\htdocs\account/admin/payment_terms.php:139 -# c:\Apache2\htdocs\account/gl/manage/bank_trans_types.php:94 -# c:\Apache2\htdocs\account/inventory/manage/movement_types.php:91 -# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:46 -# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:48 -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:91 -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:49 -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:110 -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:141 -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:204 -# c:\Apache2\htdocs\account/reporting/rep104.php:88 -# c:\Apache2\htdocs\account/reporting/rep105.php:101 -# c:\Apache2\htdocs\account/reporting/rep204.php:71 -# c:\Apache2\htdocs\account/reporting/rep303.php:124 -# c:\Apache2\htdocs\account/reporting/rep401.php:60 -# c:\Apache2\htdocs\account/sales/manage/credit_status.php:89 -# c:\Apache2\htdocs\account/taxes/tax_groups.php:143 -# c:\Apache2\htdocs\account/taxes/tax_types.php:98 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:21 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:302 -#: c:\Apache2\htdocs\account2/admin/payment_terms.php:143 -#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:95 -#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:79 -#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:92 +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:119 +msgid "Selected payment terms have been deleted" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:137 +#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:90 +#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:75 +#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:88 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:46 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:48 -#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:91 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:51 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:108 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:140 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:204 -#: c:\Apache2\htdocs\account2/reporting/rep104.php:88 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:101 +#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:94 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:53 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:111 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:141 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:218 +#: c:\Apache2\htdocs\account2/reporting/rep104.php:82 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:99 #: c:\Apache2\htdocs\account2/reporting/rep204.php:70 -#: c:\Apache2\htdocs\account2/reporting/rep303.php:124 -#: c:\Apache2\htdocs\account2/reporting/rep401.php:60 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:179 -#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:89 -#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:140 -#: c:\Apache2\htdocs\account2/taxes/tax_types.php:95 +#: c:\Apache2\htdocs\account2/reporting/rep303.php:122 +#: c:\Apache2\htdocs\account2/reporting/rep401.php:58 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:197 +#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:90 +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:137 +#: c:\Apache2\htdocs\account2/taxes/tax_types.php:97 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:21 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:296 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:300 msgid "Description" msgstr "" -# c:\Apache2\htdocs\account/admin/payment_terms.php:139 -#: c:\Apache2\htdocs\account2/admin/payment_terms.php:143 +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:137 msgid "Following Month On" msgstr "" -# c:\Apache2\htdocs\account/admin/payment_terms.php:139 -#: c:\Apache2\htdocs\account2/admin/payment_terms.php:143 +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:137 msgid "Due After (Days)" msgstr "" -# c:\Apache2\htdocs\account/admin/payment_terms.php:147 -# c:\Apache2\htdocs\account/admin/payment_terms.php:156 -#: c:\Apache2\htdocs\account2/admin/payment_terms.php:151 -#: c:\Apache2\htdocs\account2/admin/payment_terms.php:160 +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:145 +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:154 msgid "N/A" msgstr "" -# c:\Apache2\htdocs\account/admin/payment_terms.php:177 -#: c:\Apache2\htdocs\account2/admin/payment_terms.php:181 -msgid "New Payment Term" -msgstr "" - -# c:\Apache2\htdocs\account/admin/payment_terms.php:201 -#: c:\Apache2\htdocs\account2/admin/payment_terms.php:205 +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:200 msgid "Terms Description:" msgstr "" -# c:\Apache2\htdocs\account/admin/payment_terms.php:203 -#: c:\Apache2\htdocs\account2/admin/payment_terms.php:207 +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:202 msgid "Due After A Given No. Of Days:" msgstr "" -# c:\Apache2\htdocs\account/admin/payment_terms.php:213 -#: c:\Apache2\htdocs\account2/admin/payment_terms.php:217 +#: c:\Apache2\htdocs\account2/admin/payment_terms.php:212 msgid "Days (Or Day In Following Month):" msgstr "" -# c:\Apache2\htdocs\account/admin/shipping_companies.php:7 -# c:\Apache2\htdocs\account/applications/setup.php:23 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:346 -# c:\Apache2\htdocs\account/sales/view/view_credit.php:65 -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:79 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:8 #: c:\Apache2\htdocs\account2/admin/shipping_companies.php:7 #: c:\Apache2\htdocs\account2/applications/setup.php:25 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:241 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:322 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:301 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:254 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:335 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:326 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:65 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:83 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:83 @@ -1507,193 +1273,132 @@ msgstr "" msgid "Shipping Company" msgstr "" -# c:\Apache2\htdocs\account/admin/shipping_companies.php:26 -#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:26 +#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:17 msgid "The shipping company name cannot be empty." msgstr "" -# c:\Apache2\htdocs\account/admin/shipping_companies.php:74 -#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:75 +#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:35 +msgid "New shipping company has been added" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:51 +msgid "Selected shipping company has been updated" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:67 msgid "Cannot delete this shipping company because sales orders have been created using this shipper." msgstr "" -# c:\Apache2\htdocs\account/admin/shipping_companies.php:86 -#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:87 +#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:79 msgid "Cannot delete this shipping company because invoices have been created using this shipping company." msgstr "" -# c:\Apache2\htdocs\account/admin/shipping_companies.php:104 -#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:105 +#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:85 +msgid "Selected shipping company has been deleted" +msgstr "" + +#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:103 msgid "Contact Person" msgstr "" -# c:\Apache2\htdocs\account/admin/shipping_companies.php:104 -#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:105 +#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:103 msgid "Phone Number" msgstr "" -# c:\Apache2\htdocs\account/admin/shipping_companies.php:104 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:21 -#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:105 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:27 +#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:103 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:28 msgid "Address" msgstr "" -# c:\Apache2\htdocs\account/admin/shipping_companies.php:125 -#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:126 -msgid "New Shipping Company" -msgstr "" - -# c:\Apache2\htdocs\account/admin/shipping_companies.php:148 -# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:165 -# c:\Apache2\htdocs\account/inventory/manage/items.php:293 -# c:\Apache2\htdocs\account/manufacturing/manage/work_centres.php:135 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:45 -#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:149 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:166 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:296 -#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:136 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:45 +#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:148 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:160 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:312 +#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:133 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:48 msgid "Name:" msgstr "" -# c:\Apache2\htdocs\account/admin/shipping_companies.php:150 -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:270 -#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:151 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:269 +#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:150 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:276 msgid "Contact Person:" msgstr "" -# c:\Apache2\htdocs\account/admin/shipping_companies.php:152 -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:272 -#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:153 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:271 +#: c:\Apache2\htdocs\account2/admin/shipping_companies.php:152 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:278 msgid "Phone Number:" msgstr "" -# c:\Apache2\htdocs\account/admin/users.php:7 #: c:\Apache2\htdocs\account2/admin/users.php:7 msgid "Users" msgstr "" -# c:\Apache2\htdocs\account/admin/users.php:27 -#: c:\Apache2\htdocs\account2/admin/users.php:27 -msgid "A new user has been added." +#: c:\Apache2\htdocs\account2/admin/users.php:22 +msgid "The user login entered must be at least 4 characters long." msgstr "" -# c:\Apache2\htdocs\account/admin/users.php:32 -#: c:\Apache2\htdocs\account2/admin/users.php:32 +#: c:\Apache2\htdocs\account2/admin/users.php:62 msgid "The selected user has been updated." msgstr "" -# c:\Apache2\htdocs\account/admin/users.php:37 -#: c:\Apache2\htdocs\account2/admin/users.php:37 -msgid "User has been deleted." -msgstr "" - -# c:\Apache2\htdocs\account/admin/users.php:47 -#: c:\Apache2\htdocs\account2/admin/users.php:47 -msgid "The user login entered must be at least 4 characters long." -msgstr "" - -# c:\Apache2\htdocs\account/admin/users.php:55 -#: c:\Apache2\htdocs\account2/admin/users.php:56 -msgid "The password entered must be at least 4 characters long." +#: c:\Apache2\htdocs\account2/admin/users.php:69 +msgid "A new user has been added." msgstr "" -# c:\Apache2\htdocs\account/admin/users.php:61 -#: c:\Apache2\htdocs\account2/admin/users.php:63 -msgid "The password cannot contain the user login." +#: c:\Apache2\htdocs\account2/admin/users.php:80 +msgid "User has been deleted." msgstr "" -# c:\Apache2\htdocs\account/admin/users.php:115 -# c:\Apache2\htdocs\account/admin/users.php:118 -#: c:\Apache2\htdocs\account2/admin/users.php:118 -#: c:\Apache2\htdocs\account2/admin/users.php:121 +#: c:\Apache2\htdocs\account2/admin/users.php:96 +#: c:\Apache2\htdocs\account2/admin/users.php:99 msgid "User login" msgstr "" -# c:\Apache2\htdocs\account/admin/users.php:115 -# c:\Apache2\htdocs\account/admin/users.php:118 -# c:\Apache2\htdocs\account/admin/users.php:191 -#: c:\Apache2\htdocs\account2/admin/users.php:118 -#: c:\Apache2\htdocs\account2/admin/users.php:121 -#: c:\Apache2\htdocs\account2/admin/users.php:194 +#: c:\Apache2\htdocs\account2/admin/users.php:96 +#: c:\Apache2\htdocs\account2/admin/users.php:99 +#: c:\Apache2\htdocs\account2/admin/users.php:172 msgid "Full Name" msgstr "" -# c:\Apache2\htdocs\account/admin/users.php:115 -# c:\Apache2\htdocs\account/admin/users.php:118 -# c:\Apache2\htdocs\account/sales/manage/sales_people.php:87 -#: c:\Apache2\htdocs\account2/admin/users.php:118 -#: c:\Apache2\htdocs\account2/admin/users.php:121 +#: c:\Apache2\htdocs\account2/admin/users.php:96 +#: c:\Apache2\htdocs\account2/admin/users.php:99 #: c:\Apache2\htdocs\account2/reporting/rep106.php:75 -#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:92 +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:108 msgid "Phone" msgstr "" -# c:\Apache2\htdocs\account/admin/users.php:116 -# c:\Apache2\htdocs\account/admin/users.php:119 -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:170 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:61 -#: c:\Apache2\htdocs\account2/admin/users.php:119 -#: c:\Apache2\htdocs\account2/admin/users.php:122 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:169 +#: c:\Apache2\htdocs\account2/admin/users.php:97 +#: c:\Apache2\htdocs\account2/admin/users.php:100 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:181 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:58 msgid "E-mail" msgstr "" -# c:\Apache2\htdocs\account/admin/users.php:116 -# c:\Apache2\htdocs\account/admin/users.php:119 -#: c:\Apache2\htdocs\account2/admin/users.php:119 -#: c:\Apache2\htdocs\account2/admin/users.php:122 +#: c:\Apache2\htdocs\account2/admin/users.php:97 +#: c:\Apache2\htdocs\account2/admin/users.php:100 msgid "Last Visit" msgstr "" -# c:\Apache2\htdocs\account/admin/users.php:116 -# c:\Apache2\htdocs\account/admin/users.php:119 -#: c:\Apache2\htdocs\account2/admin/users.php:119 -#: c:\Apache2\htdocs\account2/admin/users.php:122 +#: c:\Apache2\htdocs\account2/admin/users.php:97 +#: c:\Apache2\htdocs\account2/admin/users.php:100 msgid "Access Level" msgstr "" -# c:\Apache2\htdocs\account/admin/users.php:151 -#: c:\Apache2\htdocs\account2/admin/users.php:154 -msgid "New User" +#: c:\Apache2\htdocs\account2/admin/users.php:159 +msgid "User Login:" msgstr "" -# c:\Apache2\htdocs\account/admin/users.php:173 -#: c:\Apache2\htdocs\account2/admin/users.php:176 -msgid "User login:" +#: c:\Apache2\htdocs\account2/admin/users.php:169 +msgid "Enter a new password to change, leave empty to keep current." msgstr "" -# c:\Apache2\htdocs\account/admin/users.php:178 -#: c:\Apache2\htdocs\account2/admin/users.php:181 -msgid "User Login:" +#: c:\Apache2\htdocs\account2/admin/users.php:174 +msgid "Telephone No.:" msgstr "" -# c:\Apache2\htdocs\account/admin/users.php:182 -#: c:\Apache2\htdocs\account2/admin/users.php:185 -msgid "Password:" -msgstr "" - -# c:\Apache2\htdocs\account/admin/users.php:188 -#: c:\Apache2\htdocs\account2/admin/users.php:191 -msgid "Enter a new password to change, leave empty to keep current." -msgstr "" - -# c:\Apache2\htdocs\account/admin/users.php:193 -#: c:\Apache2\htdocs\account2/admin/users.php:196 -msgid "Telephone No.:" -msgstr "" - -# c:\Apache2\htdocs\account/admin/users.php:197 -#: c:\Apache2\htdocs\account2/admin/users.php:200 +#: c:\Apache2\htdocs\account2/admin/users.php:178 msgid "Access Level:" msgstr "" -# c:\Apache2\htdocs\account/admin/view_print_transaction.php:8 -# c:\Apache2\htdocs\account/applications/setup.php:27 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:16 #: c:\Apache2\htdocs\account2/applications/setup.php:29 msgid "View or Print Transactions" @@ -1703,489 +1408,296 @@ msgstr "" msgid "Only documents can be printed." msgstr "" -# c:\Apache2\htdocs\account/admin/view_print_transaction.php:25 -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:148 -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:329 -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:336 -# c:\Apache2\htdocs\account/sales/customer_payments.php:199 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:35 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:85 -# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:57 -# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:149 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:28 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:152 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:335 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:342 -#: c:\Apache2\htdocs\account2/sales/customer_payments.php:189 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:154 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:341 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:349 +#: c:\Apache2\htdocs\account2/sales/customer_payments.php:191 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:37 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:85 -#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:57 -#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:149 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:86 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:46 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:145 msgid "Type:" msgstr "" -# c:\Apache2\htdocs\account/admin/view_print_transaction.php:27 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:35 msgid "from #:" msgstr "" -# c:\Apache2\htdocs\account/admin/view_print_transaction.php:29 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:37 msgid "to #:" msgstr "" -# c:\Apache2\htdocs\account/admin/view_print_transaction.php:31 -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:52 -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:45 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:34 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:33 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:45 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:41 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:39 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:40 -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:49 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:39 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:54 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:45 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:37 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:36 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:79 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:70 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:61 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:59 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:47 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:43 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:41 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:43 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:93 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:81 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:6 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:44 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:115 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:91 msgid "Search" msgstr "" -# c:\Apache2\htdocs\account/admin/view_print_transaction.php:45 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:53 msgid "The starting transaction number is expected to be numeric and greater than zero." msgstr "" -# c:\Apache2\htdocs\account/admin/view_print_transaction.php:51 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:59 msgid "The ending transaction number is expected to be numeric and greater than zero." msgstr "" -# c:\Apache2\htdocs\account/admin/view_print_transaction.php:90 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:103 msgid "There are no transactions for the given parameters." msgstr "" -# c:\Apache2\htdocs\account/admin/view_print_transaction.php:96 -# c:\Apache2\htdocs\account/admin/view_print_transaction.php:98 -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:98 -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:101 -# c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:35 -# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:58 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:93 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:96 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:99 -# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:57 -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:88 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:195 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:60 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:63 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:105 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:108 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:98 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:101 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:158 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:162 -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:97 -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:122 -# c:\Apache2\htdocs\account/reporting/rep101.php:70 -# c:\Apache2\htdocs\account/reporting/rep201.php:71 -# c:\Apache2\htdocs\account/reporting/rep203.php:76 -# c:\Apache2\htdocs\account/reporting/rep704.php:63 -# c:\Apache2\htdocs\account/reporting/rep704.php:66 -# c:\Apache2\htdocs\account/reporting/rep704.php:69 -# c:\Apache2\htdocs\account/reporting/rep709.php:171 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:187 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:62 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:65 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:161 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:164 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:70 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:101 -# c:\Apache2\htdocs\account/dimensions/includes/dimensions_ui.inc:23 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:149 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:192 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:228 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:268 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:272 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:323 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:45 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:113 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:115 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:120 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:122 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:100 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:103 -#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:35 -#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:60 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:91 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:94 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:97 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:60 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:88 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:193 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:126 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:129 +#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:38 +#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:67 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:98 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:101 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:104 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:67 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:114 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:186 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:60 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:63 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:110 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:113 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:103 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:106 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:160 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:164 -#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:97 -#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:122 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:135 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:138 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:127 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:130 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:167 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:171 +#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:98 +#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:123 #: c:\Apache2\htdocs\account2/reporting/rep101.php:71 #: c:\Apache2\htdocs\account2/reporting/rep201.php:70 #: c:\Apache2\htdocs\account2/reporting/rep203.php:75 #: c:\Apache2\htdocs\account2/reporting/rep704.php:63 #: c:\Apache2\htdocs\account2/reporting/rep704.php:66 #: c:\Apache2\htdocs\account2/reporting/rep704.php:69 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:171 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:194 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:189 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:188 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:62 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:65 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:172 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:183 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:68 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:101 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:133 #: c:\Apache2\htdocs\account2/dimensions/includes/dimensions_ui.inc:23 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:149 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:192 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:228 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:268 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:272 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:323 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:54 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:150 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:193 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:229 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:269 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:273 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:324 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:55 msgid "#" msgstr "" -# c:\Apache2\htdocs\account/admin/view_print_transaction.php:96 -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:98 -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:101 -# c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:35 -# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:58 -# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:76 -# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:66 -# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:64 -# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:57 -# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:34 -# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:35 -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:88 -# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:32 -# c:\Apache2\htdocs\account/manufacturing/view/wo_production_view.php:33 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:60 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:63 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:105 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:108 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:98 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:101 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:124 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:128 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:158 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:162 -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:97 -# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:32 -# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:38 -# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:61 -# c:\Apache2\htdocs\account/reporting/rep501.php:75 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:257 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:322 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:62 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:65 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:119 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:122 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:161 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:164 -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:72 -# c:\Apache2\htdocs\account/sales/view/view_receipt.php:36 -# c:\Apache2\htdocs\account/dimensions/includes/dimensions_ui.inc:23 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:149 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:192 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:228 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:268 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:272 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:323 -# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:28 -# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:43 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:223 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:113 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:120 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:100 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:103 -#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:35 -#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:60 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:126 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:129 +#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:38 +#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:67 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:76 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:66 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:64 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:60 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:67 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:34 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:35 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:88 -#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:32 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:114 +#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:35 #: c:\Apache2\htdocs\account2/manufacturing/view/wo_production_view.php:33 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:60 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:63 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:110 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:113 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:103 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:106 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:126 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:135 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:138 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:127 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:130 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:130 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:160 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:164 -#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:97 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:134 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:167 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:171 +#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:98 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:32 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:38 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:61 #: c:\Apache2\htdocs\account2/reporting/rep501.php:75 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:231 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:233 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:302 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:304 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:285 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:287 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:244 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:246 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:315 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:317 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:310 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:312 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:62 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:65 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:131 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:134 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:172 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:197 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:137 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:183 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:216 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:76 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:76 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:36 #: c:\Apache2\htdocs\account2/dimensions/includes/dimensions_ui.inc:23 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:149 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:192 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:228 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:268 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:272 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:323 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:150 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:193 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:229 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:269 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:273 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:324 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:28 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:43 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:225 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:48 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:50 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:234 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:227 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:76 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:78 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:235 msgid "Reference" msgstr "" -# c:\Apache2\htdocs\account/admin/view_print_transaction.php:96 -# c:\Apache2\htdocs\account/admin/view_print_transaction.php:98 -# c:\Apache2\htdocs\account/admin/view_print_transaction.php:109 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:113 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:115 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:120 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:122 -#: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:135 +#: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:136 msgid "View" msgstr "" -# c:\Apache2\htdocs\account/admin/view_print_transaction.php:96 -# c:\Apache2\htdocs\account/admin/view_print_transaction.php:98 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:113 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:115 -#: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:137 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:149 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:129 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:262 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:244 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:245 +#: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:138 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:174 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:153 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:273 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:263 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:265 msgid "Print" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:51 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:113 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:115 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:120 #: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:122 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:51 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:52 msgid "GL" msgstr "" -# c:\Apache2\htdocs\account/admin/view_print_transaction.php:110 -#: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:138 +#: c:\Apache2\htdocs\account2/admin/view_print_transaction.php:139 msgid "View GL" msgstr "" -# c:\Apache2\htdocs\account/admin/void_transaction.php:7 -# c:\Apache2\htdocs\account/applications/setup.php:26 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:15 #: c:\Apache2\htdocs\account2/applications/setup.php:28 msgid "Void a Transaction" msgstr "" -# c:\Apache2\htdocs\account/admin/void_transaction.php:25 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:27 msgid "Transaction Type:" msgstr "" -# c:\Apache2\htdocs\account/admin/void_transaction.php:27 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:29 msgid "Transaction #:" msgstr "" -# c:\Apache2\htdocs\account/admin/void_transaction.php:29 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:31 msgid "Voiding Date:" msgstr "" -# c:\Apache2\htdocs\account/admin/void_transaction.php:31 -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:239 -# c:\Apache2\htdocs\account/gl/bank_transfer.php:78 -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:155 -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:381 -# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:82 -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:409 -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:100 -# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:119 -# c:\Apache2\htdocs\account/sales/customer_payments.php:203 -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:303 -# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:157 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:146 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:33 -#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:248 +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:245 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:80 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:159 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:387 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:87 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:414 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:161 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:394 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:86 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:368 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:97 -#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:125 -#: c:\Apache2\htdocs\account2/sales/customer_payments.php:193 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:315 -#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:157 +#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:134 +#: c:\Apache2\htdocs\account2/sales/customer_payments.php:195 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:322 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:140 msgid "Memo:" msgstr "" -# c:\Apache2\htdocs\account/admin/void_transaction.php:36 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:38 msgid "Void Transaction" msgstr "" -# c:\Apache2\htdocs\account/admin/void_transaction.php:40 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:42 msgid "Are you sure you want to void this transaction ? This action cannot be undone." msgstr "" -# c:\Apache2\htdocs\account/admin/void_transaction.php:41 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:43 msgid "Proceed" msgstr "" -# c:\Apache2\htdocs\account/admin/void_transaction.php:42 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:224 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:172 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:223 -# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:159 -# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:143 -# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:126 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:321 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:213 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:328 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:44 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:224 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:176 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:226 -#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:161 -#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:143 -#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:126 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:239 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:178 +#: c:\Apache2\htdocs\account2/includes/ui/ui_input.inc:150 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:157 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:137 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:119 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:330 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:231 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:366 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:273 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:378 msgid "Cancel" msgstr "" -# c:\Apache2\htdocs\account/admin/void_transaction.php:54 -# c:\Apache2\htdocs\account/gl/bank_transfer.php:96 -# c:\Apache2\htdocs\account/gl/gl_journal.php:86 -# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:31 -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:76 -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:154 -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:151 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:49 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:56 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:98 -#: c:\Apache2\htdocs\account2/gl/gl_journal.php:89 -#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:33 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:76 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:156 +#: c:\Apache2\htdocs\account2/gl/gl_journal.php:88 +#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:23 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:78 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:160 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:151 #: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:75 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:193 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:187 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:197 msgid "The entered date is invalid." msgstr "" -# c:\Apache2\htdocs\account/admin/void_transaction.php:59 -# c:\Apache2\htdocs\account/gl/bank_transfer.php:101 -# c:\Apache2\htdocs\account/gl/gl_deposit.php:118 -# c:\Apache2\htdocs\account/gl/gl_journal.php:91 -# c:\Apache2\htdocs\account/gl/gl_payment.php:119 -# c:\Apache2\htdocs\account/inventory/adjustments.php:106 -# c:\Apache2\htdocs\account/inventory/transfers.php:106 -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:81 -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:133 -# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:57 -# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:95 -# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:95 -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:156 -# c:\Apache2\htdocs\account/sales/credit_note_entry.php:123 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:54 -# c:\Apache2\htdocs\account/sales/customer_payments.php:55 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:62 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:104 -#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:123 -#: c:\Apache2\htdocs\account2/gl/gl_journal.php:95 -#: c:\Apache2\htdocs\account2/gl/gl_payment.php:122 -#: c:\Apache2\htdocs\account2/inventory/adjustments.php:111 -#: c:\Apache2\htdocs\account2/inventory/transfers.php:111 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:82 +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:130 +#: c:\Apache2\htdocs\account2/gl/gl_journal.php:94 +#: c:\Apache2\htdocs\account2/inventory/adjustments.php:103 +#: c:\Apache2\htdocs\account2/inventory/transfers.php:101 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:84 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:135 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:60 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:69 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:102 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:101 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:157 -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:123 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:127 #: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:79 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:55 msgid "The entered date is not in fiscal year." msgstr "" -# c:\Apache2\htdocs\account/admin/void_transaction.php:65 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:69 msgid "The transaction number is expected to be numeric and greater than zero." msgstr "" -# c:\Apache2\htdocs\account/admin/void_transaction.php:82 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:87 msgid "The selected transaction has already been voided." msgstr "" -# c:\Apache2\htdocs\account/admin/void_transaction.php:94 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:100 msgid "Selected transaction has been voided." msgstr "" -# c:\Apache2\htdocs\account/admin/void_transaction.php:100 #: c:\Apache2\htdocs\account2/admin/void_transaction.php:106 msgid "The entered transaction does not exist or cannot be voided." msgstr "" -# c:\Apache2\htdocs\account/applications/customers.php:9 -# c:\Apache2\htdocs\account/applications/dimensions.php:12 -# c:\Apache2\htdocs\account/applications/generalledger.php:9 -# c:\Apache2\htdocs\account/applications/inventory.php:9 -# c:\Apache2\htdocs\account/applications/manufacturing.php:9 -# c:\Apache2\htdocs\account/applications/suppliers.php:9 #: c:\Apache2\htdocs\account2/applications/customers.php:11 #: c:\Apache2\htdocs\account2/applications/dimensions.php:14 #: c:\Apache2\htdocs\account2/applications/generalledger.php:11 @@ -2195,8 +1707,6 @@ msgstr "" msgid "Transactions" msgstr "" -# c:\Apache2\htdocs\account/applications/customers.php:10 -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:29 #: c:\Apache2\htdocs\account2/applications/customers.php:12 msgid "Sales Order Entry" msgstr "" @@ -2225,27 +1735,18 @@ msgstr "" msgid "Template Invoice" msgstr "" -# c:\Apache2\htdocs\account/applications/customers.php:12 #: c:\Apache2\htdocs\account2/applications/customers.php:22 msgid "Customer Payments" msgstr "" -# c:\Apache2\htdocs\account/applications/customers.php:15 #: c:\Apache2\htdocs\account2/applications/customers.php:23 msgid "Customer Credit Notes" msgstr "" -# c:\Apache2\htdocs\account/applications/customers.php:16 #: c:\Apache2\htdocs\account2/applications/customers.php:24 msgid "Allocate Customer Payments or Credit Notes" msgstr "" -# c:\Apache2\htdocs\account/applications/customers.php:18 -# c:\Apache2\htdocs\account/applications/dimensions.php:16 -# c:\Apache2\htdocs\account/applications/generalledger.php:15 -# c:\Apache2\htdocs\account/applications/inventory.php:13 -# c:\Apache2\htdocs\account/applications/manufacturing.php:13 -# c:\Apache2\htdocs\account/applications/suppliers.php:18 #: c:\Apache2\htdocs\account2/applications/customers.php:26 #: c:\Apache2\htdocs\account2/applications/dimensions.php:18 #: c:\Apache2\htdocs\account2/applications/generalledger.php:18 @@ -2255,33 +1756,23 @@ msgstr "" msgid "Inquiries and Reports" msgstr "" -# c:\Apache2\htdocs\account/applications/customers.php:19 #: c:\Apache2\htdocs\account2/applications/customers.php:27 msgid "Sales Order Inquiry" msgstr "" -# c:\Apache2\htdocs\account/applications/customers.php:20 #: c:\Apache2\htdocs\account2/applications/customers.php:28 msgid "Customer Transaction Inquiry" msgstr "" -# c:\Apache2\htdocs\account/applications/customers.php:22 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:13 #: c:\Apache2\htdocs\account2/applications/customers.php:30 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:15 msgid "Customer Allocation Inquiry" msgstr "" -# c:\Apache2\htdocs\account/applications/customers.php:24 #: c:\Apache2\htdocs\account2/applications/customers.php:32 msgid "Customer and Sales Reports" msgstr "" -# c:\Apache2\htdocs\account/applications/customers.php:26 -# c:\Apache2\htdocs\account/applications/generalledger.php:24 -# c:\Apache2\htdocs\account/applications/inventory.php:18 -# c:\Apache2\htdocs\account/applications/manufacturing.php:19 -# c:\Apache2\htdocs\account/applications/suppliers.php:26 #: c:\Apache2\htdocs\account2/applications/customers.php:34 #: c:\Apache2\htdocs\account2/applications/dimensions.php:30 #: c:\Apache2\htdocs\account2/applications/generalledger.php:27 @@ -2291,38 +1782,26 @@ msgstr "" msgid "Maintenance" msgstr "" -# c:\Apache2\htdocs\account/applications/customers.php:27 #: c:\Apache2\htdocs\account2/applications/customers.php:35 msgid "Add and Manage Customers" msgstr "" -# c:\Apache2\htdocs\account/applications/customers.php:28 -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:7 #: c:\Apache2\htdocs\account2/applications/customers.php:36 #: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:7 msgid "Customer Branches" msgstr "" -# c:\Apache2\htdocs\account/applications/customers.php:29 -# c:\Apache2\htdocs\account/reporting/reports_main.php:38 -# c:\Apache2\htdocs\account/sales/manage/sales_types.php:7 #: c:\Apache2\htdocs\account2/applications/customers.php:37 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:39 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:40 #: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:7 msgid "Sales Types" msgstr "" -# c:\Apache2\htdocs\account/applications/customers.php:30 -# c:\Apache2\htdocs\account/sales/manage/sales_people.php:7 #: c:\Apache2\htdocs\account2/applications/customers.php:38 #: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:7 msgid "Sales Persons" msgstr "" -# c:\Apache2\htdocs\account/applications/customers.php:31 -# c:\Apache2\htdocs\account/reporting/rep103.php:135 -# c:\Apache2\htdocs\account/reporting/reports_main.php:34 -# c:\Apache2\htdocs\account/sales/manage/sales_areas.php:8 #: c:\Apache2\htdocs\account2/applications/customers.php:39 #: c:\Apache2\htdocs\account2/reporting/rep103.php:135 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:35 @@ -2330,926 +1809,617 @@ msgstr "" msgid "Sales Areas" msgstr "" -# c:\Apache2\htdocs\account/applications/customers.php:32 #: c:\Apache2\htdocs\account2/applications/customers.php:40 msgid "Credit Status Setup" msgstr "" -# c:\Apache2\htdocs\account/applications/dimensions.php:13 -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:8 #: c:\Apache2\htdocs\account2/applications/dimensions.php:15 #: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:18 msgid "Dimension Entry" msgstr "" -# c:\Apache2\htdocs\account/applications/dimensions.php:14 #: c:\Apache2\htdocs\account2/applications/dimensions.php:16 msgid "Outstanding Dimensions" msgstr "" -# c:\Apache2\htdocs\account/applications/dimensions.php:17 #: c:\Apache2\htdocs\account2/applications/dimensions.php:19 msgid "Dimension Inquiry" msgstr "" -# c:\Apache2\htdocs\account/applications/dimensions.php:19 #: c:\Apache2\htdocs\account2/applications/dimensions.php:21 msgid "Dimension Reports" msgstr "" -# c:\Apache2\htdocs\account/applications/generalledger.php:10 -# c:\Apache2\htdocs\account/manufacturing/view/work_order_view.php:57 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1853 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1866 #: c:\Apache2\htdocs\account2/applications/generalledger.php:12 #: c:\Apache2\htdocs\account2/manufacturing/view/work_order_view.php:57 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2089 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2106 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1632 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1650 msgid "Payments" msgstr "" -# c:\Apache2\htdocs\account/applications/generalledger.php:11 #: c:\Apache2\htdocs\account2/applications/generalledger.php:13 msgid "Deposits" msgstr "" -# c:\Apache2\htdocs\account/applications/generalledger.php:12 #: c:\Apache2\htdocs\account2/applications/generalledger.php:14 msgid "Bank Account Transfers" msgstr "" -# c:\Apache2\htdocs\account/applications/generalledger.php:13 -# c:\Apache2\htdocs\account/gl/gl_journal.php:21 -# c:\Apache2\htdocs\account/includes/types.inc:6 #: c:\Apache2\htdocs\account2/applications/generalledger.php:15 -#: c:\Apache2\htdocs\account2/gl/gl_journal.php:24 +#: c:\Apache2\htdocs\account2/gl/gl_journal.php:22 #: c:\Apache2\htdocs\account2/includes/types.inc:6 msgid "Journal Entry" msgstr "" #: c:\Apache2\htdocs\account2/applications/generalledger.php:16 -#: c:\Apache2\htdocs\account2/gl/gl_budget.php:7 +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:9 msgid "Budget Entry" msgstr "" -# c:\Apache2\htdocs\account/applications/generalledger.php:16 #: c:\Apache2\htdocs\account2/applications/generalledger.php:19 msgid "Bank Account Inquiry" msgstr "" -# c:\Apache2\htdocs\account/applications/generalledger.php:17 #: c:\Apache2\htdocs\account2/applications/generalledger.php:20 msgid "GL Account Inquiry" msgstr "" -# c:\Apache2\htdocs\account/applications/generalledger.php:19 -# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:8 -# c:\Apache2\htdocs\account/reporting/rep708.php:89 -# c:\Apache2\htdocs\account/reporting/reports_main.php:181 -# c:\Apache2\htdocs\account/reporting/reports_main.php:213 -# c:\Apache2\htdocs\account/reporting/reports_main.php:240 #: c:\Apache2\htdocs\account2/applications/generalledger.php:22 #: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:18 #: c:\Apache2\htdocs\account2/reporting/rep708.php:89 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:193 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:227 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:256 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:201 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:235 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:264 msgid "Trial Balance" msgstr "" -# c:\Apache2\htdocs\account/applications/generalledger.php:21 #: c:\Apache2\htdocs\account2/applications/generalledger.php:24 msgid "Banking Reports" msgstr "" -# c:\Apache2\htdocs\account/applications/generalledger.php:22 #: c:\Apache2\htdocs\account2/applications/generalledger.php:25 msgid "General Ledger Reports" msgstr "" -# c:\Apache2\htdocs\account/applications/generalledger.php:25 -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:7 #: c:\Apache2\htdocs\account2/applications/generalledger.php:28 #: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:7 msgid "Bank Accounts" msgstr "" -# c:\Apache2\htdocs\account/applications/generalledger.php:26 #: c:\Apache2\htdocs\account2/applications/generalledger.php:29 msgid "Payment, Deposit and Transfer Types" msgstr "" -# c:\Apache2\htdocs\account/applications/generalledger.php:28 -# c:\Apache2\htdocs\account/gl/manage/currencies.php:7 #: c:\Apache2\htdocs\account2/applications/generalledger.php:31 #: c:\Apache2\htdocs\account2/gl/manage/currencies.php:7 msgid "Currencies" msgstr "" -# c:\Apache2\htdocs\account/applications/generalledger.php:29 -# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:7 #: c:\Apache2\htdocs\account2/applications/generalledger.php:32 #: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:14 msgid "Exchange Rates" msgstr "" -# c:\Apache2\htdocs\account/applications/generalledger.php:31 -# c:\Apache2\htdocs\account/inventory/manage/items.php:330 -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:297 #: c:\Apache2\htdocs\account2/applications/generalledger.php:34 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:330 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:296 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:350 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:303 msgid "GL Accounts" msgstr "" -# c:\Apache2\htdocs\account/applications/generalledger.php:32 -# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:7 #: c:\Apache2\htdocs\account2/applications/generalledger.php:35 #: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:7 msgid "GL Account Groups" msgstr "" -# c:\Apache2\htdocs\account/applications/generalledger.php:33 -# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:7 #: c:\Apache2\htdocs\account2/applications/generalledger.php:36 #: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:7 msgid "GL Account Classes" msgstr "" -# c:\Apache2\htdocs\account/applications/inventory.php:10 -# c:\Apache2\htdocs\account/inventory/transfers.php:17 #: c:\Apache2\htdocs\account2/applications/inventory.php:12 #: c:\Apache2\htdocs\account2/inventory/transfers.php:19 msgid "Inventory Location Transfers" msgstr "" -# c:\Apache2\htdocs\account/applications/inventory.php:11 #: c:\Apache2\htdocs\account2/applications/inventory.php:13 msgid "Inventory Adjustments" msgstr "" -# c:\Apache2\htdocs\account/applications/inventory.php:14 #: c:\Apache2\htdocs\account2/applications/inventory.php:16 msgid "Inventory Item Movements" msgstr "" -# c:\Apache2\htdocs\account/applications/inventory.php:15 -# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:9 -# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:11 #: c:\Apache2\htdocs\account2/applications/inventory.php:17 #: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:9 #: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:11 msgid "Inventory Item Status" msgstr "" -# c:\Apache2\htdocs\account/applications/inventory.php:16 #: c:\Apache2\htdocs\account2/applications/inventory.php:18 msgid "Inventory Reports" msgstr "" -# c:\Apache2\htdocs\account/applications/inventory.php:19 -# c:\Apache2\htdocs\account/inventory/transfers.php:227 -# c:\Apache2\htdocs\account/inventory/manage/items.php:7 #: c:\Apache2\htdocs\account2/applications/inventory.php:21 -#: c:\Apache2\htdocs\account2/inventory/transfers.php:236 +#: c:\Apache2\htdocs\account2/inventory/transfers.php:220 #: c:\Apache2\htdocs\account2/inventory/manage/items.php:7 msgid "Items" msgstr "" -# c:\Apache2\htdocs\account/applications/inventory.php:20 -# c:\Apache2\htdocs\account/inventory/manage/item_categories.php:7 #: c:\Apache2\htdocs\account2/applications/inventory.php:22 #: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:7 msgid "Item Categories" msgstr "" -# c:\Apache2\htdocs\account/applications/inventory.php:21 -# c:\Apache2\htdocs\account/inventory/manage/locations.php:7 #: c:\Apache2\htdocs\account2/applications/inventory.php:23 #: c:\Apache2\htdocs\account2/inventory/manage/locations.php:7 msgid "Inventory Locations" msgstr "" -# c:\Apache2\htdocs\account/applications/inventory.php:22 -# c:\Apache2\htdocs\account/inventory/manage/movement_types.php:7 #: c:\Apache2\htdocs\account2/applications/inventory.php:24 #: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:7 msgid "Inventory Movement Types" msgstr "" -# c:\Apache2\htdocs\account/applications/inventory.php:23 -# c:\Apache2\htdocs\account/taxes/item_tax_types.php:8 #: c:\Apache2\htdocs\account2/applications/inventory.php:25 #: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:8 msgid "Item Tax Types" msgstr "" #: c:\Apache2\htdocs\account2/applications/inventory.php:26 -#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:7 +#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:6 msgid "Units of Measure" msgstr "" -# c:\Apache2\htdocs\account/applications/inventory.php:25 -# c:\Apache2\htdocs\account/inventory/reorder_level.php:7 #: c:\Apache2\htdocs\account2/applications/inventory.php:27 #: c:\Apache2\htdocs\account2/inventory/reorder_level.php:7 msgid "Reorder Levels" msgstr "" -# c:\Apache2\htdocs\account/applications/inventory.php:27 #: c:\Apache2\htdocs\account2/applications/inventory.php:29 msgid "Pricing and Costs" msgstr "" -# c:\Apache2\htdocs\account/applications/inventory.php:28 #: c:\Apache2\htdocs\account2/applications/inventory.php:30 msgid "Sales Pricing" msgstr "" -# c:\Apache2\htdocs\account/applications/inventory.php:29 #: c:\Apache2\htdocs\account2/applications/inventory.php:31 msgid "Purchasing Pricing" msgstr "" -# c:\Apache2\htdocs\account/applications/inventory.php:30 #: c:\Apache2\htdocs\account2/applications/inventory.php:32 msgid "Standard Costs" msgstr "" -# c:\Apache2\htdocs\account/applications/manufacturing.php:10 -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:8 #: c:\Apache2\htdocs\account2/applications/manufacturing.php:12 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:18 msgid "Work Order Entry" msgstr "" -# c:\Apache2\htdocs\account/applications/manufacturing.php:11 #: c:\Apache2\htdocs\account2/applications/manufacturing.php:13 msgid "Outstanding Work Orders" msgstr "" -# c:\Apache2\htdocs\account/applications/manufacturing.php:15 -# c:\Apache2\htdocs\account/manufacturing/inquiry/where_used_inquiry.php:7 #: c:\Apache2\htdocs\account2/applications/manufacturing.php:17 #: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:7 msgid "Inventory Item Where Used Inquiry" msgstr "" -# c:\Apache2\htdocs\account/applications/manufacturing.php:16 #: c:\Apache2\htdocs\account2/applications/manufacturing.php:18 msgid "Work Order Inquiry" msgstr "" -# c:\Apache2\htdocs\account/applications/manufacturing.php:17 #: c:\Apache2\htdocs\account2/applications/manufacturing.php:19 -msgid "Manufactoring Reports" +msgid "Manufacturing Reports" msgstr "" -# c:\Apache2\htdocs\account/applications/manufacturing.php:20 #: c:\Apache2\htdocs\account2/applications/manufacturing.php:22 msgid "Bills Of Material" msgstr "" -# c:\Apache2\htdocs\account/applications/manufacturing.php:21 -# c:\Apache2\htdocs\account/manufacturing/manage/work_centres.php:7 #: c:\Apache2\htdocs\account2/applications/manufacturing.php:23 #: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:7 msgid "Work Centres" msgstr "" -# c:\Apache2\htdocs\account/applications/setup.php:11 #: c:\Apache2\htdocs\account2/applications/setup.php:13 msgid "User Accounts Setup" msgstr "" -# c:\Apache2\htdocs\account/applications/setup.php:15 #: c:\Apache2\htdocs\account2/applications/setup.php:17 msgid "Taxes" msgstr "" -# c:\Apache2\htdocs\account/applications/setup.php:16 -# c:\Apache2\htdocs\account/taxes/tax_groups.php:8 #: c:\Apache2\htdocs\account2/applications/setup.php:18 #: c:\Apache2\htdocs\account2/taxes/tax_groups.php:8 msgid "Tax Groups" msgstr "" -# c:\Apache2\htdocs\account/applications/setup.php:25 #: c:\Apache2\htdocs\account2/applications/setup.php:27 msgid "Maintanance" msgstr "" -# c:\Apache2\htdocs\account/applications/setup.php:28 #: c:\Apache2\htdocs\account2/applications/setup.php:30 msgid "Backup and Restore" msgstr "" -# c:\Apache2\htdocs\account/applications/setup.php:29 #: c:\Apache2\htdocs\account2/applications/setup.php:31 msgid "Create/Update Companies" msgstr "" -# c:\Apache2\htdocs\account/applications/suppliers.php:10 -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:25 #: c:\Apache2\htdocs\account2/applications/suppliers.php:12 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:24 msgid "Purchase Order Entry" msgstr "" -# c:\Apache2\htdocs\account/applications/suppliers.php:11 #: c:\Apache2\htdocs\account2/applications/suppliers.php:13 msgid "Outstanding Purchase Orders Maintenance" msgstr "" -# c:\Apache2\htdocs\account/applications/suppliers.php:12 #: c:\Apache2\htdocs\account2/applications/suppliers.php:14 msgid "Payments to Suppliers" msgstr "" -# c:\Apache2\htdocs\account/applications/suppliers.php:14 #: c:\Apache2\htdocs\account2/applications/suppliers.php:16 msgid "Supplier Invoices" msgstr "" -# c:\Apache2\htdocs\account/applications/suppliers.php:15 #: c:\Apache2\htdocs\account2/applications/suppliers.php:17 msgid "Supplier Credit Notes" msgstr "" -# c:\Apache2\htdocs\account/applications/suppliers.php:16 #: c:\Apache2\htdocs\account2/applications/suppliers.php:18 msgid "Allocate Supplier Payments or Credit Notes" msgstr "" -# c:\Apache2\htdocs\account/applications/suppliers.php:19 #: c:\Apache2\htdocs\account2/applications/suppliers.php:21 msgid "Purchase Orders Inquiry" msgstr "" -# c:\Apache2\htdocs\account/applications/suppliers.php:20 #: c:\Apache2\htdocs\account2/applications/suppliers.php:22 msgid "Supplier Transaction Inquiry" msgstr "" -# c:\Apache2\htdocs\account/applications/suppliers.php:22 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:11 #: c:\Apache2\htdocs\account2/applications/suppliers.php:24 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:13 msgid "Supplier Allocation Inquiry" msgstr "" -# c:\Apache2\htdocs\account/applications/suppliers.php:24 #: c:\Apache2\htdocs\account2/applications/suppliers.php:26 msgid "Supplier and Purchasing Reports" msgstr "" -# c:\Apache2\htdocs\account/applications/suppliers.php:27 -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:7 #: c:\Apache2\htdocs\account2/applications/suppliers.php:29 #: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:7 msgid "Suppliers" msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:35 #: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:38 msgid "The dimension has been entered." msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:46 #: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:49 msgid "The dimension has been updated." msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:56 #: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:59 msgid "The dimension has been deleted." msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:66 #: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:69 msgid "The dimension has been closed. There can be no more changes to it." msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:76 #: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:79 msgid "Enter a new dimension" msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:78 #: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:81 msgid "Select an existing dimension" msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:97 -#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:100 +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:97 msgid "The dimension reference must be entered." msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:103 -# c:\Apache2\htdocs\account/gl/bank_transfer.php:124 -# c:\Apache2\htdocs\account/gl/gl_deposit.php:106 -# c:\Apache2\htdocs\account/gl/gl_journal.php:101 -# c:\Apache2\htdocs\account/gl/gl_payment.php:109 -# c:\Apache2\htdocs\account/inventory/adjustments.php:95 -# c:\Apache2\htdocs\account/inventory/transfers.php:96 -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:58 -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:109 -# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:68 -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:271 -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:166 -# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:78 -# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:78 -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:167 -# c:\Apache2\htdocs\account/sales/credit_note_entry.php:113 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:66 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:209 -# c:\Apache2\htdocs\account/sales/customer_payments.php:67 -#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:107 +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:104 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:125 -#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:109 -#: c:\Apache2\htdocs\account2/gl/gl_journal.php:107 -#: c:\Apache2\htdocs\account2/gl/gl_payment.php:110 -#: c:\Apache2\htdocs\account2/inventory/adjustments.php:98 -#: c:\Apache2\htdocs\account2/inventory/transfers.php:99 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:62 +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:118 +#: c:\Apache2\htdocs\account2/gl/gl_journal.php:106 +#: c:\Apache2\htdocs\account2/inventory/adjustments.php:90 +#: c:\Apache2\htdocs\account2/inventory/transfers.php:89 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:64 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:114 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:73 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:273 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:170 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:82 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:245 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:174 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:82 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:81 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:170 -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:113 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:117 #: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:92 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:157 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:209 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:158 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:229 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:67 msgid "The entered reference is already in use." msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:110 -#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:115 +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:112 msgid "The dimension name must be entered." msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:116 -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:128 -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:198 -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:170 -#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:122 +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:119 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:129 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:201 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:167 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:137 msgid "The date entered is in an invalid format." msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:122 -#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:129 +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:126 msgid "The required by date entered is in an invalid format." msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:164 -#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:172 +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:169 msgid "This dimension cannot be deleted because it has already been processed." msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:199 -#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:208 +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:205 msgid "The dimension sent is not valid." msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:206 -#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:215 +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:212 msgid "This dimension is closed and cannot be edited." msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:220 -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:226 -#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:229 -#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:235 +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:226 +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:232 msgid "Dimension Reference:" msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:233 -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:39 -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:98 -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:101 -# c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:35 -# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:58 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:93 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:96 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:99 -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:89 -# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:57 -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:88 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:124 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:128 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:158 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:162 -# c:\Apache2\htdocs\account/reporting/rep102.php:147 -# c:\Apache2\htdocs\account/reporting/rep202.php:156 -# c:\Apache2\htdocs\account/reporting/rep501.php:75 -# c:\Apache2\htdocs\account/reporting/rep702.php:46 -# c:\Apache2\htdocs\account/reporting/rep704.php:63 -# c:\Apache2\htdocs\account/reporting/rep704.php:66 -# c:\Apache2\htdocs\account/reporting/rep704.php:69 -# c:\Apache2\htdocs\account/reporting/rep709.php:178 -# c:\Apache2\htdocs\account/reporting/reports_main.php:149 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:119 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:122 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:161 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:164 -# c:\Apache2\htdocs\account/dimensions/includes/dimensions_ui.inc:23 -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:463 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:268 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:272 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:323 -#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:242 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:41 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:100 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:103 -#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:35 -#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:60 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:91 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:94 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:97 -#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:89 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:60 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:88 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:126 +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:239 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:66 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:126 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:129 +#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:38 +#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:67 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:98 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:101 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:104 +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:92 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:67 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:114 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:130 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:160 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:164 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:152 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:160 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:134 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:167 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:171 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:111 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:112 #: c:\Apache2\htdocs\account2/reporting/rep501.php:75 #: c:\Apache2\htdocs\account2/reporting/rep702.php:46 #: c:\Apache2\htdocs\account2/reporting/rep704.php:63 #: c:\Apache2\htdocs\account2/reporting/rep704.php:66 #: c:\Apache2\htdocs\account2/reporting/rep704.php:69 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:178 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:159 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:131 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:196 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:167 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:134 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:172 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:137 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:183 #: c:\Apache2\htdocs\account2/dimensions/includes/dimensions_ui.inc:23 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:475 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:268 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:272 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:323 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:481 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:269 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:273 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:324 msgid "Type" msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:235 -# c:\Apache2\htdocs\account/reporting/reports_main.php:43 -# c:\Apache2\htdocs\account/reporting/reports_main.php:147 -# c:\Apache2\htdocs\account/reporting/reports_main.php:156 -# c:\Apache2\htdocs\account/reporting/reports_main.php:169 -# c:\Apache2\htdocs\account/reporting/reports_main.php:175 -# c:\Apache2\htdocs\account/reporting/reports_main.php:182 -# c:\Apache2\htdocs\account/reporting/reports_main.php:192 -# c:\Apache2\htdocs\account/reporting/reports_main.php:203 -# c:\Apache2\htdocs\account/reporting/reports_main.php:208 -# c:\Apache2\htdocs\account/reporting/reports_main.php:214 -# c:\Apache2\htdocs\account/reporting/reports_main.php:223 -# c:\Apache2\htdocs\account/reporting/reports_main.php:232 -# c:\Apache2\htdocs\account/reporting/reports_main.php:236 -# c:\Apache2\htdocs\account/reporting/reports_main.php:241 -# c:\Apache2\htdocs\account/reporting/reports_main.php:247 -#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:244 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:44 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:51 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:157 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:166 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:179 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:186 +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:241 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:45 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:52 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:129 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:165 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:174 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:187 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:194 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:204 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:215 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:221 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:228 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:237 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:246 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:251 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:257 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:263 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:202 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:212 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:223 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:229 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:236 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:245 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:254 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:259 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:265 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:271 msgid "Start Date" msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:237 -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:364 -#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:246 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:370 +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:243 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:377 msgid "Date Required By" msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:249 -#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:258 +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:252 +msgid "Save changes to dimension" +msgstr "" + +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:253 msgid "Close This Dimension" msgstr "" -# c:\Apache2\htdocs\account/dimensions/dimension_entry.php:250 -#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:259 +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:253 +msgid "Mark this dimension as closed" +msgstr "" + +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:254 msgid "Delete This Dimension" msgstr "" -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:17 +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:254 +msgid "Delete unused dimension" +msgstr "" + +#: c:\Apache2\htdocs\account2/dimensions/dimension_entry.php:258 +msgid "Add" +msgstr "" + #: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:19 -msgid "Search Outstanding Dimensionss" +msgid "Search Outstanding Dimensions" msgstr "" -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:22 #: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:24 msgid "Search Dimensions" msgstr "" -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:37 -# c:\Apache2\htdocs\account/gl/bank_transfer.php:76 -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:35 -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:143 -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:328 -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:334 -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:98 -# c:\Apache2\htdocs\account/sales/customer_payments.php:201 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:87 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:18 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:87 -# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:38 -# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:46 -# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:144 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:75 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:77 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:87 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:92 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:48 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:39 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:64 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:78 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:35 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:147 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:334 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:59 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:149 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:340 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:347 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:95 -#: c:\Apache2\htdocs\account2/sales/customer_payments.php:191 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:87 +#: c:\Apache2\htdocs\account2/sales/customer_payments.php:193 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:89 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:91 #: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:18 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:87 -#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:38 -#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:46 -#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:144 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:27 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:35 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:140 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:73 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:75 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:87 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:92 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:85 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:90 msgid "Reference:" msgstr "" -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:40 -# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:29 -# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:25 -# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:34 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:38 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:36 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:32 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:40 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:16 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:42 -#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:31 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:29 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:37 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:67 +#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:37 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:35 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:43 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:40 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:38 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:35 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:40 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:16 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:36 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:14 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:43 msgid "From:" msgstr "" -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:41 -# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:30 -# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:26 -# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:35 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:39 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:37 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:33 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:16 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:43 -#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:32 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:30 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:38 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:68 +#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:38 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:36 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:44 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:41 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:39 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:36 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:16 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:37 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:14 msgid "To:" msgstr "" -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:43 -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:39 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:45 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:39 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:70 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:63 msgid "Only Overdue:" msgstr "" -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:47 -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:41 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:49 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:41 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:74 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:66 msgid "Only Open:" msgstr "" -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:98 -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:101 -# c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:35 -# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:58 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:93 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:96 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:99 -# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:74 -# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:59 -# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:57 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:27 -# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:57 -# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:35 -# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:38 -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:89 -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:363 -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:369 -# c:\Apache2\htdocs\account/manufacturing/view/wo_production_view.php:34 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:195 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:60 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:63 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:125 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:128 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:159 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:163 -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:122 -# c:\Apache2\htdocs\account/reporting/rep101.php:70 -# c:\Apache2\htdocs\account/reporting/rep201.php:71 -# c:\Apache2\htdocs\account/reporting/rep501.php:75 -# c:\Apache2\htdocs\account/reporting/rep704.php:63 -# c:\Apache2\htdocs\account/reporting/rep704.php:66 -# c:\Apache2\htdocs\account/reporting/rep704.php:69 -# c:\Apache2\htdocs\account/reporting/rep709.php:171 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:363 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:187 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:62 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:65 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:119 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:122 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:161 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:164 -# c:\Apache2\htdocs\account/sales/view/view_credit.php:60 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:70 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:101 -# c:\Apache2\htdocs\account/dimensions/includes/dimensions_ui.inc:24 -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:463 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:149 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:192 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:228 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:269 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:273 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:324 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:87 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:237 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:5 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:45 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:100 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:103 -#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:35 -#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:60 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:91 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:94 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:97 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:126 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:129 +#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:38 +#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:67 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:98 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:101 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:104 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:74 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:59 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:57 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:27 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:60 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:67 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:35 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:38 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:89 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:369 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:375 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:115 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:376 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:382 #: c:\Apache2\htdocs\account2/manufacturing/view/wo_production_view.php:34 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:193 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:186 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:60 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:63 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:127 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:130 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:161 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:165 -#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:122 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:131 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:134 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:168 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:172 +#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:123 #: c:\Apache2\htdocs\account2/reporting/rep101.php:71 #: c:\Apache2\htdocs\account2/reporting/rep201.php:70 #: c:\Apache2\htdocs\account2/reporting/rep501.php:75 #: c:\Apache2\htdocs\account2/reporting/rep704.php:63 #: c:\Apache2\htdocs\account2/reporting/rep704.php:66 #: c:\Apache2\htdocs\account2/reporting/rep704.php:69 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:171 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:332 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:311 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:194 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:189 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:345 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:336 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:188 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:62 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:65 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:131 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:134 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:172 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:137 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:183 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:60 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:68 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:101 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:133 #: c:\Apache2\htdocs\account2/dimensions/includes/dimensions_ui.inc:24 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:475 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:149 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:192 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:228 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:269 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:273 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:324 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:481 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:150 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:193 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:229 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:270 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:274 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:325 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:85 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:239 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:241 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:5 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:54 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:55 msgid "Date" msgstr "" -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:99 -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:102 -# c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:35 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:195 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:125 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:128 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:159 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:163 -# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:37 -# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:43 -# c:\Apache2\htdocs\account/reporting/rep101.php:70 -# c:\Apache2\htdocs\account/reporting/rep201.php:71 -# c:\Apache2\htdocs\account/reporting/rep203.php:76 -# c:\Apache2\htdocs\account/reporting/rep501.php:75 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:369 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:187 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:119 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:122 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:161 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:164 -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:84 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:89 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:12 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:101 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:104 -#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:35 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:193 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:127 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:130 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:161 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:165 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:127 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:130 +#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:38 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:186 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:131 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:134 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:168 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:172 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:37 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:43 #: c:\Apache2\htdocs\account2/reporting/rep101.php:71 #: c:\Apache2\htdocs\account2/reporting/rep201.php:70 #: c:\Apache2\htdocs\account2/reporting/rep203.php:75 #: c:\Apache2\htdocs\account2/reporting/rep501.php:75 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:317 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:194 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:131 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:342 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:188 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:134 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:172 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:137 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:183 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:88 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:88 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:87 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:12 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:386 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:400 msgid "Due Date" msgstr "" -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:99 -# c:\Apache2\htdocs\account/dimensions/inquiry/search_dimensions.php:102 -# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:59 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:94 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:97 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:100 -# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:77 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:126 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:129 -# c:\Apache2\htdocs\account/reporting/rep203.php:77 -# c:\Apache2\htdocs\account/reporting/rep204.php:71 -# c:\Apache2\htdocs\account/reporting/rep701.php:36 -# c:\Apache2\htdocs\account/reporting/rep704.php:64 -# c:\Apache2\htdocs\account/reporting/rep704.php:67 -# c:\Apache2\htdocs\account/reporting/rep704.php:70 -# c:\Apache2\htdocs\account/reporting/rep708.php:55 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:120 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:123 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:101 -#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:104 -#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:61 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:92 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:95 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:98 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:81 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:128 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:131 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:127 +#: c:\Apache2\htdocs\account2/dimensions/inquiry/search_dimensions.php:130 +#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:68 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:99 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:102 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:105 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:88 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:132 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:135 #: c:\Apache2\htdocs\account2/reporting/rep203.php:76 #: c:\Apache2\htdocs\account2/reporting/rep204.php:70 #: c:\Apache2\htdocs\account2/reporting/rep701.php:36 @@ -3257,258 +2427,232 @@ msgstr "" #: c:\Apache2\htdocs\account2/reporting/rep704.php:67 #: c:\Apache2\htdocs\account2/reporting/rep704.php:70 #: c:\Apache2\htdocs\account2/reporting/rep708.php:55 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:132 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:135 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:138 msgid "Balance" msgstr "" -# c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:8 -#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:8 +#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:11 msgid "View Dimension" msgstr "" -# c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:29 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:261 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:317 -#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:29 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:261 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:317 +#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:32 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:262 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:318 msgid "The work order number sent is not valid." msgstr "" -# c:\Apache2\htdocs\account/dimensions/view/view_dimension.php:53 -#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:53 +#: c:\Apache2\htdocs\account2/dimensions/view/view_dimension.php:56 msgid "This dimension is closed." msgstr "" -# c:\Apache2\htdocs\account/gl/bank_transfer.php:17 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:19 msgid "Transfer between Bank Accounts" msgstr "" -# c:\Apache2\htdocs\account/gl/bank_transfer.php:19 -# c:\Apache2\htdocs\account/gl/gl_deposit.php:23 -# c:\Apache2\htdocs\account/gl/gl_payment.php:25 -# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:19 -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:28 -# c:\Apache2\htdocs\account/sales/customer_payments.php:24 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:21 -#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:25 -#: c:\Apache2\htdocs\account2/gl/gl_payment.php:25 +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:32 #: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:21 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:30 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:25 msgid "There are no bank accounts defined in the system." msgstr "" -# c:\Apache2\htdocs\account/gl/bank_transfer.php:20 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:22 msgid "There are no bank transfer types defined in the system." msgstr "" -# c:\Apache2\htdocs\account/gl/bank_transfer.php:29 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:31 msgid "Transfer has been entered" msgstr "" -# c:\Apache2\htdocs\account/gl/bank_transfer.php:31 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:33 msgid "View the GL Journal Entries for this Transfer" msgstr "" -# c:\Apache2\htdocs\account/gl/bank_transfer.php:33 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:35 msgid "Enter Another Transfer" msgstr "" -# c:\Apache2\htdocs\account/gl/bank_transfer.php:51 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:53 msgid "From Account:" msgstr "" -# c:\Apache2\htdocs\account/gl/bank_transfer.php:53 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:55 msgid "To Account:" msgstr "" -# c:\Apache2\htdocs\account/gl/bank_transfer.php:55 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:57 msgid "Transfer Date:" msgstr "" -# c:\Apache2\htdocs\account/gl/bank_transfer.php:61 -# c:\Apache2\htdocs\account/gl/bank_transfer.php:67 -# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:117 -# c:\Apache2\htdocs\account/sales/customer_payments.php:177 -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:409 -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:427 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:63 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:69 -#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:123 -#: c:\Apache2\htdocs\account2/sales/customer_payments.php:168 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:421 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:439 +#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:132 +#: c:\Apache2\htdocs\account2/sales/customer_payments.php:170 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:428 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:446 msgid "Amount:" msgstr "" -# c:\Apache2\htdocs\account/gl/bank_transfer.php:74 -# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:55 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:76 -#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:55 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:44 msgid "Transfer Type:" msgstr "" -# c:\Apache2\htdocs\account/gl/bank_transfer.php:85 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:87 msgid "Enter Transfer" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:128 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:111 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:125 msgid "The entered amount is invalid or less than zero." msgstr "" -# c:\Apache2\htdocs\account/gl/bank_transfer.php:118 -# c:\Apache2\htdocs\account/gl/gl_deposit.php:101 -# c:\Apache2\htdocs\account/gl/gl_journal.php:96 -# c:\Apache2\htdocs\account/gl/gl_payment.php:104 -# c:\Apache2\htdocs\account/inventory/adjustments.php:89 -# c:\Apache2\htdocs\account/inventory/transfers.php:91 -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:52 -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:103 -# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:62 -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:160 -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:161 -# c:\Apache2\htdocs\account/sales/credit_note_entry.php:108 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:60 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:203 -# c:\Apache2\htdocs\account/sales/customer_payments.php:61 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:118 -#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:103 -#: c:\Apache2\htdocs\account2/gl/gl_journal.php:101 -#: c:\Apache2\htdocs\account2/gl/gl_payment.php:104 -#: c:\Apache2\htdocs\account2/inventory/adjustments.php:91 -#: c:\Apache2\htdocs\account2/inventory/transfers.php:93 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:55 +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:112 +#: c:\Apache2\htdocs\account2/gl/gl_journal.php:100 +#: c:\Apache2\htdocs\account2/inventory/adjustments.php:83 +#: c:\Apache2\htdocs\account2/inventory/transfers.php:83 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:57 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:107 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:66 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:163 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:75 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:167 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:163 -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:109 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:113 #: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:86 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:151 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:203 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:152 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:223 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:61 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:237 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:223 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:242 msgid "You must enter a reference." msgstr "" -# c:\Apache2\htdocs\account/gl/bank_transfer.php:130 #: c:\Apache2\htdocs\account2/gl/bank_transfer.php:132 msgid "The source and destination bank accouts cannot be the same." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:13 -#: c:\Apache2\htdocs\account2/gl/gl_budget.php:13 +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:22 +msgid "Bank Account Payment Entry" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:26 +msgid "Bank Account Deposit Entry" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:34 +#: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:32 +#: c:\Apache2\htdocs\account2/sales/customer_payments.php:27 +msgid "There are no bank payment types defined in the system." +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:51 +msgid "Payment has been entered" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:53 +msgid "View the GL Postings for this Payment" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:55 +msgid "Enter Another Payment" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:57 +msgid "Enter A Deposit" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:67 +msgid "Deposit has been entered" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:69 +msgid "View the GL Postings for this Deposit" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:71 +msgid "Enter Another Deposit" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:73 +msgid "Enter A Payment" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:105 +msgid "You must enter at least one payment line." +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:124 +msgid "The entered date for the payment is invalid." +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:165 +msgid "The amount entered is not a valid number or is less than zero." +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:172 +msgid "The source and destination accouts cannot be the same." +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:180 +msgid "You cannot make a payment to a bank account. Please use the transfer funds facility for this." +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:182 +msgid "You cannot make a deposit from a bank account. Please use the transfer funds facility for this." +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:249 +msgid "Payment Items" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:249 +msgid "Deposit Items" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:257 +msgid "Process Payment" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_bank.php:257 +msgid "Process Deposit" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:15 #: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:13 msgid "There are no account groups defined. Please define at least one account group before entering accounts." msgstr "" -#: c:\Apache2\htdocs\account2/gl/gl_budget.php:82 +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:84 msgid "The Budget has been saved." msgstr "" -#: c:\Apache2\htdocs\account2/gl/gl_budget.php:84 +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:86 msgid "The Budget has been deleted." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:217 -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:221 -#: c:\Apache2\htdocs\account2/gl/gl_budget.php:98 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:222 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:226 +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:103 +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:223 +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:229 msgid "Account Code:" msgstr "" -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:55 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:57 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:93 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:96 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:56 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:59 -# c:\Apache2\htdocs\account/inventory/manage/items.php:357 -# c:\Apache2\htdocs\account/inventory/manage/items.php:359 -# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:110 -# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:112 -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:215 -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:217 -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:219 -# c:\Apache2\htdocs\account/reporting/rep501.php:80 -# c:\Apache2\htdocs\account/reporting/rep704.php:63 -# c:\Apache2\htdocs\account/reporting/rep704.php:66 -# c:\Apache2\htdocs\account/reporting/rep704.php:77 -# c:\Apache2\htdocs\account/reporting/rep704.php:79 -# c:\Apache2\htdocs\account/reporting/rep704.php:87 -# c:\Apache2\htdocs\account/reporting/rep705.php:133 -# c:\Apache2\htdocs\account/reporting/rep705.php:135 -# c:\Apache2\htdocs\account/reporting/rep705.php:145 -# c:\Apache2\htdocs\account/reporting/rep706.php:64 -# c:\Apache2\htdocs\account/reporting/rep706.php:66 -# c:\Apache2\htdocs\account/reporting/rep706.php:73 -# c:\Apache2\htdocs\account/reporting/rep707.php:78 -# c:\Apache2\htdocs\account/reporting/rep707.php:80 -# c:\Apache2\htdocs\account/reporting/rep707.php:87 -# c:\Apache2\htdocs\account/reporting/rep708.php:71 -# c:\Apache2\htdocs\account/reporting/rep708.php:73 -# c:\Apache2\htdocs\account/reporting/rep708.php:80 -# c:\Apache2\htdocs\account/reporting/reports_main.php:132 -# c:\Apache2\htdocs\account/reporting/reports_main.php:160 -# c:\Apache2\htdocs\account/reporting/reports_main.php:161 -# c:\Apache2\htdocs\account/reporting/reports_main.php:165 -# c:\Apache2\htdocs\account/reporting/reports_main.php:166 -# c:\Apache2\htdocs\account/reporting/reports_main.php:171 -# c:\Apache2\htdocs\account/reporting/reports_main.php:172 -# c:\Apache2\htdocs\account/reporting/reports_main.php:178 -# c:\Apache2\htdocs\account/reporting/reports_main.php:179 -# c:\Apache2\htdocs\account/reporting/reports_main.php:185 -# c:\Apache2\htdocs\account/reporting/reports_main.php:186 -# c:\Apache2\htdocs\account/reporting/reports_main.php:196 -# c:\Apache2\htdocs\account/reporting/reports_main.php:200 -# c:\Apache2\htdocs\account/reporting/reports_main.php:205 -# c:\Apache2\htdocs\account/reporting/reports_main.php:211 -# c:\Apache2\htdocs\account/reporting/reports_main.php:217 -# c:\Apache2\htdocs\account/sales/manage/customers.php:299 -# c:\Apache2\htdocs\account/sales/manage/customers.php:301 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:110 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:111 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:113 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:47 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:48 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:50 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:109 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:110 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:112 -# c:\Apache2\htdocs\account/includes/types.inc:25 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:197 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:199 -#: c:\Apache2\htdocs\account2/gl/gl_budget.php:105 -#: c:\Apache2\htdocs\account2/gl/gl_budget.php:106 #: c:\Apache2\htdocs\account2/gl/gl_budget.php:110 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:58 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:60 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:91 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:94 +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:111 +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:115 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:64 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:66 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:98 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:101 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:56 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:59 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:357 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:359 -#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:116 -#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:118 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:377 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:379 +#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:125 +#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:127 +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:211 +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:213 #: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:215 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:217 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:219 #: c:\Apache2\htdocs\account2/reporting/rep501.php:80 #: c:\Apache2\htdocs\account2/reporting/rep704.php:63 #: c:\Apache2\htdocs\account2/reporting/rep704.php:66 @@ -3527,67 +2671,46 @@ msgstr "" #: c:\Apache2\htdocs\account2/reporting/rep708.php:71 #: c:\Apache2\htdocs\account2/reporting/rep708.php:73 #: c:\Apache2\htdocs\account2/reporting/rep708.php:80 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:170 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:171 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:175 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:176 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:181 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:182 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:178 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:179 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:183 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:184 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:189 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:190 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:197 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:198 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:208 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:212 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:217 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:224 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:231 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:279 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:281 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:110 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:111 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:113 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:47 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:205 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:206 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:216 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:220 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:225 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:232 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:239 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:249 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:251 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:114 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:115 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:117 #: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:48 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:50 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:109 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:110 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:112 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:49 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:51 #: c:\Apache2\htdocs\account2/includes/types.inc:26 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:191 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:193 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:195 msgid "Dimension" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:150 -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:285 -#: c:\Apache2\htdocs\account2/gl/gl_budget.php:118 -#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:155 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:297 +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:123 +#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:146 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:301 msgid "Get" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep105.php:105 -# c:\Apache2\htdocs\account/reporting/rep702.php:45 -# c:\Apache2\htdocs\account/reporting/rep704.php:75 -# c:\Apache2\htdocs\account/reporting/rep704.php:85 -# c:\Apache2\htdocs\account/reporting/rep704.php:93 -# c:\Apache2\htdocs\account/reporting/rep706.php:55 -# c:\Apache2\htdocs\account/reporting/rep706.php:63 -# c:\Apache2\htdocs\account/reporting/rep706.php:72 -# c:\Apache2\htdocs\account/reporting/rep706.php:79 -# c:\Apache2\htdocs\account/reporting/rep707.php:70 -# c:\Apache2\htdocs\account/reporting/rep707.php:77 -# c:\Apache2\htdocs\account/reporting/rep707.php:86 -# c:\Apache2\htdocs\account/reporting/rep707.php:93 -# c:\Apache2\htdocs\account/reporting/rep708.php:70 -# c:\Apache2\htdocs\account/reporting/rep708.php:79 -# c:\Apache2\htdocs\account/reporting/rep708.php:86 -# c:\Apache2\htdocs\account/reporting/rep709.php:177 -#: c:\Apache2\htdocs\account2/gl/gl_budget.php:124 -#: c:\Apache2\htdocs\account2/gl/gl_budget.php:126 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:105 +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:130 +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:132 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:103 #: c:\Apache2\htdocs\account2/reporting/rep106.php:79 +#: c:\Apache2\htdocs\account2/reporting/rep304.php:132 #: c:\Apache2\htdocs\account2/reporting/rep702.php:45 #: c:\Apache2\htdocs\account2/reporting/rep704.php:75 #: c:\Apache2\htdocs\account2/reporting/rep704.php:85 @@ -3603,131 +2726,56 @@ msgstr "" #: c:\Apache2\htdocs\account2/reporting/rep708.php:70 #: c:\Apache2\htdocs\account2/reporting/rep708.php:79 #: c:\Apache2\htdocs\account2/reporting/rep708.php:86 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:177 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:195 msgid "Period" msgstr "" -# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:61 -# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:71 -# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:58 -# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:89 -# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:56 -# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:88 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:195 -# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:51 -# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:60 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:187 -# c:\Apache2\htdocs\account/sales/view/view_receipt.php:31 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:111 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:114 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:117 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:110 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:113 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:116 -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:393 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:228 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:197 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:199 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:201 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:67 -#: c:\Apache2\htdocs\account2/gl/gl_budget.php:124 -#: c:\Apache2\htdocs\account2/gl/gl_budget.php:126 +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:130 +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:132 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:61 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:71 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:58 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:89 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:56 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:88 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:193 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:186 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:51 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:60 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:256 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:264 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:215 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:216 #: c:\Apache2\htdocs\account2/reporting/rep706.php:256 #: c:\Apache2\htdocs\account2/reporting/rep707.php:290 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:194 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:188 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:31 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:111 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:114 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:117 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:110 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:113 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:116 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:405 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:228 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:191 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:115 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:118 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:121 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:412 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:229 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:193 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:195 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:78 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:197 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:79 msgid "Amount" msgstr "" -#: c:\Apache2\htdocs\account2/gl/gl_budget.php:124 +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:130 msgid "Dim. incl." msgstr "" -#: c:\Apache2\htdocs\account2/gl/gl_budget.php:124 -#: c:\Apache2\htdocs\account2/gl/gl_budget.php:126 +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:130 +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:132 msgid "Last Year" msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:111 -# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:110 -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:50 -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:143 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:61 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:64 -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:122 -# c:\Apache2\htdocs\account/reporting/rep101.php:148 -# c:\Apache2\htdocs\account/reporting/rep201.php:149 -# c:\Apache2\htdocs\account/reporting/rep203.php:77 -# c:\Apache2\htdocs\account/reporting/rep203.php:139 -# c:\Apache2\htdocs\account/reporting/rep204.php:98 -# c:\Apache2\htdocs\account/reporting/rep204.php:126 -# c:\Apache2\htdocs\account/reporting/rep301.php:111 -# c:\Apache2\htdocs\account/reporting/rep301.php:145 -# c:\Apache2\htdocs\account/reporting/rep705.php:206 -# c:\Apache2\htdocs\account/reporting/rep705.php:216 -# c:\Apache2\htdocs\account/reporting/rep705.php:271 -# c:\Apache2\htdocs\account/reporting/rep705.php:281 -# c:\Apache2\htdocs\account/reporting/rep706.php:125 -# c:\Apache2\htdocs\account/reporting/rep706.php:136 -# c:\Apache2\htdocs\account/reporting/rep706.php:197 -# c:\Apache2\htdocs\account/reporting/rep706.php:217 -# c:\Apache2\htdocs\account/reporting/rep707.php:157 -# c:\Apache2\htdocs\account/reporting/rep707.php:168 -# c:\Apache2\htdocs\account/reporting/rep707.php:228 -# c:\Apache2\htdocs\account/reporting/rep707.php:241 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:284 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:379 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:63 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:66 -# c:\Apache2\htdocs\account/sales/view/view_credit.php:82 -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:100 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:70 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:101 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:141 -# c:\Apache2\htdocs\account/dimensions/includes/dimensions_ui.inc:50 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:149 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:98 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:149 -# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:75 -# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:111 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:170 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:246 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:340 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:37 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:40 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:104 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:110 -#: c:\Apache2\htdocs\account2/gl/gl_budget.php:162 +#: c:\Apache2\htdocs\account2/gl/gl_budget.php:170 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:111 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:110 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:52 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:142 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:54 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:143 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:61 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:64 -#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:122 +#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:123 #: c:\Apache2\htdocs\account2/reporting/rep101.php:151 #: c:\Apache2\htdocs\account2/reporting/rep106.php:71 #: c:\Apache2\htdocs\account2/reporting/rep106.php:109 @@ -3735,10 +2783,12 @@ msgstr "" #: c:\Apache2\htdocs\account2/reporting/rep201.php:149 #: c:\Apache2\htdocs\account2/reporting/rep203.php:76 #: c:\Apache2\htdocs\account2/reporting/rep203.php:140 -#: c:\Apache2\htdocs\account2/reporting/rep204.php:96 -#: c:\Apache2\htdocs\account2/reporting/rep204.php:124 +#: c:\Apache2\htdocs\account2/reporting/rep204.php:97 +#: c:\Apache2\htdocs\account2/reporting/rep204.php:125 #: c:\Apache2\htdocs\account2/reporting/rep301.php:111 #: c:\Apache2\htdocs\account2/reporting/rep301.php:145 +#: c:\Apache2\htdocs\account2/reporting/rep304.php:157 +#: c:\Apache2\htdocs\account2/reporting/rep304.php:222 #: c:\Apache2\htdocs\account2/reporting/rep705.php:201 #: c:\Apache2\htdocs\account2/reporting/rep705.php:211 #: c:\Apache2\htdocs\account2/reporting/rep705.php:266 @@ -3751,9 +2801,9 @@ msgstr "" #: c:\Apache2\htdocs\account2/reporting/rep707.php:182 #: c:\Apache2\htdocs\account2/reporting/rep707.php:242 #: c:\Apache2\htdocs\account2/reporting/rep707.php:261 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:267 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:354 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:326 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:281 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:367 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:352 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:63 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:66 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:82 @@ -3764,328 +2814,152 @@ msgstr "" #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:133 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:173 #: c:\Apache2\htdocs\account2/dimensions/includes/dimensions_ui.inc:50 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:149 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:101 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:152 -#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:75 -#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:113 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:170 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:240 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:335 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:46 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:49 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:109 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:87 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:160 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:106 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:65 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:104 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:171 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:243 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:340 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:47 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:50 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:153 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:84 msgid "Total" msgstr "" -# c:\Apache2\htdocs\account/gl/gl_deposit.php:19 -#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:21 -msgid "Bank Account Deposit Entry" -msgstr "" - -# c:\Apache2\htdocs\account/gl/gl_deposit.php:25 -# c:\Apache2\htdocs\account/gl/gl_payment.php:27 -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:30 -# c:\Apache2\htdocs\account/sales/customer_payments.php:26 -#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:27 -#: c:\Apache2\htdocs\account2/gl/gl_payment.php:27 -#: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:32 -#: c:\Apache2\htdocs\account2/sales/customer_payments.php:27 -msgid "There are no bank payment types defined in the system." -msgstr "" - -# c:\Apache2\htdocs\account/gl/gl_deposit.php:34 -#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:36 -msgid "Deposit has been entered" -msgstr "" - -# c:\Apache2\htdocs\account/gl/gl_deposit.php:36 -#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:38 -msgid "View the GL Postings for this Deposit" -msgstr "" - -# c:\Apache2\htdocs\account/gl/gl_deposit.php:38 -#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:40 -msgid "Enter Another Deposit" -msgstr "" - -# c:\Apache2\htdocs\account/gl/gl_deposit.php:112 -#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:116 -msgid "The entered date for the deposit is invalid." -msgstr "" - -#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:158 -#: c:\Apache2\htdocs\account2/gl/gl_payment.php:155 -msgid "The amount entered is not a valid number or is less than zero." -msgstr "" - -# c:\Apache2\htdocs\account/gl/gl_deposit.php:164 -# c:\Apache2\htdocs\account/gl/gl_payment.php:163 -#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:165 -#: c:\Apache2\htdocs\account2/gl/gl_payment.php:162 -msgid "The source and destination accouts cannot be the same." -msgstr "" - -# c:\Apache2\htdocs\account/gl/gl_deposit.php:170 -#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:172 -msgid "You cannot make a deposit from a bank account. Please use the transfer funds facility for this." -msgstr "" - -# c:\Apache2\htdocs\account/gl/gl_deposit.php:237 -#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:242 -msgid "Deposit Items" +#: c:\Apache2\htdocs\account2/gl/gl_journal.php:38 +msgid "Journal entry has been entered" msgstr "" -# c:\Apache2\htdocs\account/gl/gl_deposit.php:247 -#: c:\Apache2\htdocs\account2/gl/gl_deposit.php:252 -msgid "Process Deposit" +#: c:\Apache2\htdocs\account2/gl/gl_journal.php:40 +msgid "View this Journal Entry" msgstr "" -# c:\Apache2\htdocs\account/gl/gl_journal.php:30 -#: c:\Apache2\htdocs\account2/gl/gl_journal.php:33 -msgid "Journal entry has been entered" +#: c:\Apache2\htdocs\account2/gl/gl_journal.php:42 +msgid "Enter Another Journal Entry" msgstr "" -# c:\Apache2\htdocs\account/gl/gl_journal.php:32 -#: c:\Apache2\htdocs\account2/gl/gl_journal.php:35 -msgid "View this Journal Entry" +#: c:\Apache2\htdocs\account2/gl/gl_journal.php:74 +msgid "You must enter at least one journal line." msgstr "" -# c:\Apache2\htdocs\account/gl/gl_journal.php:34 -#: c:\Apache2\htdocs\account2/gl/gl_journal.php:37 -msgid "Enter Another Journal Entry" +#: c:\Apache2\htdocs\account2/gl/gl_journal.php:80 +msgid "The journal must balance (debits equal to credits) before it can be processed." msgstr "" -# c:\Apache2\htdocs\account/gl/gl_journal.php:127 -# c:\Apache2\htdocs\account/gl/gl_journal.php:133 -#: c:\Apache2\htdocs\account2/gl/gl_journal.php:134 -#: c:\Apache2\htdocs\account2/gl/gl_journal.php:141 +#: c:\Apache2\htdocs\account2/gl/gl_journal.php:133 +#: c:\Apache2\htdocs\account2/gl/gl_journal.php:140 msgid "Dimension is closed." msgstr "" -# c:\Apache2\htdocs\account/gl/gl_journal.php:146 -#: c:\Apache2\htdocs\account2/gl/gl_journal.php:148 +#: c:\Apache2\htdocs\account2/gl/gl_journal.php:147 msgid "You must enter either a debit amount or a credit amount." msgstr "" -#: c:\Apache2\htdocs\account2/gl/gl_journal.php:155 +#: c:\Apache2\htdocs\account2/gl/gl_journal.php:154 msgid "The debit amount entered is not a valid number or is less than zero." msgstr "" -#: c:\Apache2\htdocs\account2/gl/gl_journal.php:160 +#: c:\Apache2\htdocs\account2/gl/gl_journal.php:159 msgid "The credit amount entered is not a valid number or is less than zero." msgstr "" -# c:\Apache2\htdocs\account/gl/gl_journal.php:184 -#: c:\Apache2\htdocs\account2/gl/gl_journal.php:168 +#: c:\Apache2\htdocs\account2/gl/gl_journal.php:167 msgid "You cannot make a journal entry for a bank account. Please use one of the banking functions for bank transactions." msgstr "" -# c:\Apache2\htdocs\account/gl/gl_journal.php:263 -#: c:\Apache2\htdocs\account2/gl/gl_journal.php:248 +#: c:\Apache2\htdocs\account2/gl/gl_journal.php:247 msgid "Rows" msgstr "" -# c:\Apache2\htdocs\account/gl/gl_journal.php:274 -#: c:\Apache2\htdocs\account2/gl/gl_journal.php:257 +#: c:\Apache2\htdocs\account2/gl/gl_journal.php:253 msgid "Process Journal Entry" msgstr "" -# c:\Apache2\htdocs\account/gl/gl_journal.php:278 -#: c:\Apache2\htdocs\account2/gl/gl_journal.php:261 -msgid "The journal must balance (debits equal to credits) before it can be processed." -msgstr "" - -# c:\Apache2\htdocs\account/gl/gl_payment.php:21 -#: c:\Apache2\htdocs\account2/gl/gl_payment.php:21 -msgid "Bank Account Payment Entry" -msgstr "" - -# c:\Apache2\htdocs\account/gl/gl_payment.php:36 -#: c:\Apache2\htdocs\account2/gl/gl_payment.php:36 -msgid "Payment has been entered" -msgstr "" - -# c:\Apache2\htdocs\account/gl/gl_payment.php:38 -#: c:\Apache2\htdocs\account2/gl/gl_payment.php:38 -msgid "View the GL Postings for this Payment" -msgstr "" - -# c:\Apache2\htdocs\account/gl/gl_payment.php:40 -#: c:\Apache2\htdocs\account2/gl/gl_payment.php:40 -msgid "Enter Another Payment" -msgstr "" - -# c:\Apache2\htdocs\account/gl/gl_payment.php:114 -#: c:\Apache2\htdocs\account2/gl/gl_payment.php:116 -msgid "The entered date for the payment is invalid." -msgstr "" - -# c:\Apache2\htdocs\account/gl/gl_payment.php:169 -#: c:\Apache2\htdocs\account2/gl/gl_payment.php:169 -msgid "You cannot make a payment to a bank account. Please use the transfer funds facility for this." -msgstr "" - -# c:\Apache2\htdocs\account/gl/gl_payment.php:238 -#: c:\Apache2\htdocs\account2/gl/gl_payment.php:239 -msgid "Payment Items" -msgstr "" - -# c:\Apache2\htdocs\account/gl/gl_payment.php:248 -#: c:\Apache2\htdocs\account2/gl/gl_payment.php:249 -msgid "Process Payment" +#: c:\Apache2\htdocs\account2/gl/gl_journal.php:254 +msgid "Process journal entry only if debits equal to credits" msgstr "" -# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:17 #: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:19 msgid "Bank Statement" msgstr "" -# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:27 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:46 -#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:29 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:49 +#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:35 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:55 msgid "Account:" msgstr "" -# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:32 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:50 -# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:29 -#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:34 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:53 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:33 +#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:40 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:59 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:39 msgid "Show" msgstr "" -# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:59 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:94 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:97 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:100 -# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:79 -# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:81 -# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:83 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:57 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:60 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:63 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:126 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:129 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:160 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:164 -# c:\Apache2\htdocs\account/reporting/rep702.php:40 -# c:\Apache2\htdocs\account/reporting/rep704.php:64 -# c:\Apache2\htdocs\account/reporting/rep704.php:67 -# c:\Apache2\htdocs\account/reporting/rep704.php:70 -# c:\Apache2\htdocs\account/reporting/rep708.php:62 -# c:\Apache2\htdocs\account/reporting/rep708.php:63 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:120 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:123 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:162 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:165 -# c:\Apache2\htdocs\account/dimensions/includes/dimensions_ui.inc:24 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:48 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:51 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:54 -#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:61 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:92 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:95 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:98 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:83 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:85 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:87 +#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:68 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:99 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:102 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:105 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:90 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:92 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:94 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:57 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:60 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:63 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:128 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:131 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:162 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:166 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:132 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:135 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:169 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:173 #: c:\Apache2\htdocs\account2/reporting/rep702.php:40 #: c:\Apache2\htdocs\account2/reporting/rep704.php:64 #: c:\Apache2\htdocs\account2/reporting/rep704.php:67 #: c:\Apache2\htdocs\account2/reporting/rep704.php:70 #: c:\Apache2\htdocs\account2/reporting/rep708.php:62 #: c:\Apache2\htdocs\account2/reporting/rep708.php:63 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:132 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:135 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:173 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:138 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:184 #: c:\Apache2\htdocs\account2/dimensions/includes/dimensions_ui.inc:24 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:48 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:51 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:54 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:49 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:52 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:55 msgid "Debit" msgstr "" -# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:59 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:94 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:97 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:100 -# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:80 -# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:82 -# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:84 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:57 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:60 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:63 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:126 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:129 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:160 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:164 -# c:\Apache2\htdocs\account/reporting/rep702.php:40 -# c:\Apache2\htdocs\account/reporting/rep704.php:64 -# c:\Apache2\htdocs\account/reporting/rep704.php:67 -# c:\Apache2\htdocs\account/reporting/rep704.php:70 -# c:\Apache2\htdocs\account/reporting/rep708.php:62 -# c:\Apache2\htdocs\account/reporting/rep708.php:63 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:120 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:123 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:162 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:165 -# c:\Apache2\htdocs\account/dimensions/includes/dimensions_ui.inc:24 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:48 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:51 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:54 -#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:61 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:92 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:95 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:98 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:84 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:86 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:88 +#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:68 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:99 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:102 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:105 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:91 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:93 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:95 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:57 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:60 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:63 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:128 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:131 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:162 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:166 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:132 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:135 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:169 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:173 #: c:\Apache2\htdocs\account2/reporting/rep702.php:40 #: c:\Apache2\htdocs\account2/reporting/rep704.php:64 #: c:\Apache2\htdocs\account2/reporting/rep704.php:67 #: c:\Apache2\htdocs\account2/reporting/rep704.php:70 #: c:\Apache2\htdocs\account2/reporting/rep708.php:62 #: c:\Apache2\htdocs\account2/reporting/rep708.php:63 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:132 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:135 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:173 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:138 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:184 #: c:\Apache2\htdocs\account2/dimensions/includes/dimensions_ui.inc:24 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:48 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:51 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:54 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:49 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:52 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:55 msgid "Credit" msgstr "" -# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:59 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:94 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:97 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:100 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:27 -# c:\Apache2\htdocs\account/reporting/rep704.php:64 -# c:\Apache2\htdocs\account/reporting/rep704.php:66 -# c:\Apache2\htdocs\account/reporting/rep704.php:69 -#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:61 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:92 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:95 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:98 +#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:68 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:99 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:102 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:105 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:27 #: c:\Apache2\htdocs\account2/reporting/rep704.php:64 #: c:\Apache2\htdocs\account2/reporting/rep704.php:66 @@ -4093,162 +2967,91 @@ msgstr "" msgid "Person/Item" msgstr "" -# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:67 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:105 -# c:\Apache2\htdocs\account/reporting/rep704.php:118 -#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:69 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:113 +#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:76 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:120 #: c:\Apache2\htdocs\account2/reporting/rep704.php:122 msgid "Opening Balance" msgstr "" -# c:\Apache2\htdocs\account/gl/inquiry/bank_inquiry.php:106 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:146 -# c:\Apache2\htdocs\account/reporting/rep704.php:155 -#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:108 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:154 +#: c:\Apache2\htdocs\account2/gl/inquiry/bank_inquiry.php:115 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:161 #: c:\Apache2\htdocs\account2/reporting/rep704.php:159 msgid "Ending Balance" msgstr "" -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:18 #: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:21 msgid "General Ledger Account Inquiry" msgstr "" -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:48 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:27 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:26 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:32 -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:42 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:51 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:30 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:29 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:57 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:54 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:52 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:34 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:86 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:74 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:108 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:84 msgid "from:" msgstr "" -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:49 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:28 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:27 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:33 -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:43 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:52 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:31 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:30 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:58 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:55 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:53 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:35 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:87 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:75 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:109 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:85 msgid "to:" msgstr "" -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:94 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:97 -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:100 -# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:89 -# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:88 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:57 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:60 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:63 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:375 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:475 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:111 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:114 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:117 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:241 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:48 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:51 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:54 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:187 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:110 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:113 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:116 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:238 -# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:177 -# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:161 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:197 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:199 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:201 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:249 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:380 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:92 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:95 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:98 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:99 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:102 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:105 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:89 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:88 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:57 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:60 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:63 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:354 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:434 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:428 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:111 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:114 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:117 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:241 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:48 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:51 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:54 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:191 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:110 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:113 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:116 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:241 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:364 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:445 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:455 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:115 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:118 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:121 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:259 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:49 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:52 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:55 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:195 #: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:179 -#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:161 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:191 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:159 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:153 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:193 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:195 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:269 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:197 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:317 msgid "Memo" msgstr "" -# c:\Apache2\htdocs\account/gl/inquiry/gl_account_inquiry.php:84 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:161 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_account_inquiry.php:168 msgid "No general ledger transactions have been created for this account on the selected dates." msgstr "" -# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:27 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:31 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:37 msgid "No zero values" msgstr "" -# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:73 -# c:\Apache2\htdocs\account/reporting/rep701.php:36 -# c:\Apache2\htdocs\account/reporting/rep705.php:122 -# c:\Apache2\htdocs\account/reporting/rep706.php:55 -# c:\Apache2\htdocs\account/reporting/rep707.php:70 -# c:\Apache2\htdocs\account/reporting/rep708.php:62 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:197 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:199 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:201 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:77 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:84 #: c:\Apache2\htdocs\account2/reporting/rep701.php:36 #: c:\Apache2\htdocs\account2/reporting/rep705.php:126 #: c:\Apache2\htdocs\account2/reporting/rep706.php:63 #: c:\Apache2\htdocs\account2/reporting/rep707.php:78 #: c:\Apache2\htdocs\account2/reporting/rep708.php:62 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:191 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:193 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:195 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:197 msgid "Account" msgstr "" -# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:74 -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:88 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:56 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:59 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:62 -# c:\Apache2\htdocs\account/reporting/rep701.php:36 -# c:\Apache2\htdocs\account/reporting/rep702.php:39 -# c:\Apache2\htdocs\account/reporting/rep705.php:122 -# c:\Apache2\htdocs\account/reporting/rep706.php:55 -# c:\Apache2\htdocs\account/reporting/rep707.php:70 -# c:\Apache2\htdocs\account/reporting/rep708.php:62 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:78 -#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:88 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:85 +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:91 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:56 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:59 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:62 @@ -4261,1087 +3064,822 @@ msgstr "" msgid "Account Name" msgstr "" -# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:75 -# c:\Apache2\htdocs\account/reporting/rep708.php:55 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:79 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:86 #: c:\Apache2\htdocs\account2/reporting/rep708.php:55 msgid "Brought Forward" msgstr "" -# c:\Apache2\htdocs\account/gl/inquiry/gl_trial_balance.php:76 -# c:\Apache2\htdocs\account/reporting/rep708.php:55 -#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:80 +#: c:\Apache2\htdocs\account2/gl/inquiry/gl_trial_balance.php:87 #: c:\Apache2\htdocs\account2/reporting/rep708.php:55 msgid "This Period" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:31 -#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:30 +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:24 msgid "The bank account name cannot be empty." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:69 -#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:69 +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:36 +msgid "Bank account has been updated" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:44 +#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:41 +msgid "New bank account has been added" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:63 msgid "Cannot delete this bank account because transactions have been created using this account." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:88 -#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:88 +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:68 +#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:73 +msgid "Selected bank account has been deleted" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:91 msgid "GL Account" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:88 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:23 -#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:88 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:29 +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:91 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:30 msgid "Bank" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:89 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:124 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:128 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:119 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:122 -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:463 -#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:89 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:126 +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:92 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:130 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:131 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:134 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:134 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:475 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:137 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:481 msgid "Number" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:89 -# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:60 -# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:69 -# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:57 -# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:55 -# c:\Apache2\htdocs\account/inventory/prices.php:117 -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:144 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:61 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:106 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:109 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:99 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:102 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:125 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:64 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:159 -# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:38 -# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:45 -# c:\Apache2\htdocs\account/reporting/rep101.php:79 -# c:\Apache2\htdocs\account/reporting/rep102.php:146 -# c:\Apache2\htdocs\account/reporting/rep102.php:150 -# c:\Apache2\htdocs\account/reporting/rep201.php:80 -# c:\Apache2\htdocs\account/reporting/rep202.php:155 -# c:\Apache2\htdocs\account/reporting/rep203.php:85 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:250 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:315 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:63 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:120 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:66 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:162 -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:126 -# c:\Apache2\htdocs\account/sales/view/view_credit.php:61 -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:73 -#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:89 +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:92 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:60 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:69 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:57 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:55 -#: c:\Apache2\htdocs\account2/inventory/prices.php:120 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:149 +#: c:\Apache2\htdocs\account2/inventory/prices.php:127 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:136 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:61 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:111 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:114 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:104 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:107 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:127 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:136 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:139 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:128 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:131 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:131 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:66 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:161 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:168 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:38 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:45 #: c:\Apache2\htdocs\account2/reporting/rep101.php:79 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:151 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:155 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:110 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:114 +#: c:\Apache2\htdocs\account2/reporting/rep104.php:87 #: c:\Apache2\htdocs\account2/reporting/rep201.php:78 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:159 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:111 #: c:\Apache2\htdocs\account2/reporting/rep203.php:83 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:223 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:294 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:280 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:236 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:307 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:305 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:63 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:132 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:69 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:173 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:198 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:175 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:135 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:70 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:184 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:217 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:193 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:61 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:77 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:77 msgid "Currency" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:89 -#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:89 +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:92 msgid "Bank Address" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:114 -#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:114 -msgid "New Bank Account" -msgstr "" - -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:138 -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:142 #: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:138 -#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:142 +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:143 msgid "Bank Account GL Code:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:145 -#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:145 +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:147 msgid "Account Type:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:147 -#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:147 +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:149 msgid "Bank Name:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:148 -#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:148 +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:150 msgid "Bank Account Name:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:149 -#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:149 +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:151 msgid "Bank Account Number:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:153 -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:157 -#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:153 -#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:157 +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:155 +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:159 msgid "Bank Account Currency:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/bank_accounts.php:160 -#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:160 +#: c:\Apache2\htdocs\account2/gl/manage/bank_accounts.php:162 msgid "Bank Address:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/bank_trans_types.php:8 #: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:8 msgid "Bank Transaction Types" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/bank_trans_types.php:35 -#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:35 +#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:26 msgid "The bank transaction type name cannot be empty." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/bank_trans_types.php:68 -#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:69 +#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:36 +msgid "Selected bank account settings has been updated" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:58 msgid "Cannot delete this bank transaction type because bank transactions have been created referring to it." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/bank_trans_types.php:113 -#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:114 -msgid "New Bank Transaction Type" -msgstr "" - -# c:\Apache2\htdocs\account/gl/manage/bank_trans_types.php:130 -# c:\Apache2\htdocs\account/inventory/manage/items.php:295 -# c:\Apache2\htdocs\account/inventory/manage/movement_types.php:126 -# c:\Apache2\htdocs\account/manufacturing/manage/work_centres.php:136 -# c:\Apache2\htdocs\account/sales/manage/credit_status.php:136 -# c:\Apache2\htdocs\account/taxes/item_tax_types.php:163 -# c:\Apache2\htdocs\account/taxes/tax_groups.php:202 -# c:\Apache2\htdocs\account/taxes/tax_types.php:149 -#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:131 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:298 -#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:127 -#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:137 -#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:136 -#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:165 -#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:198 -#: c:\Apache2\htdocs\account2/taxes/tax_types.php:141 +#: c:\Apache2\htdocs\account2/gl/manage/bank_trans_types.php:124 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:314 +#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:124 +#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:134 +#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:138 +#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:162 +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:194 +#: c:\Apache2\htdocs\account2/taxes/tax_types.php:143 msgid "Description:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:30 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:30 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:20 msgid "The currency abbreviation must be entered." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:35 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:36 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:26 msgid "The currency name must be entered." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:40 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:42 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:32 msgid "The currency symbol must be entered." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:45 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:48 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:38 msgid "The hundredths name must be entered." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:91 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:95 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:60 +msgid "Selected currency settings has been updated" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:67 +msgid "New currency has been added" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:86 msgid "Cannot delete this currency, because customer accounts have been created referring to this currency." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:100 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:104 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:95 msgid "Cannot delete this currency, because supplier accounts have been created referring to this currency." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:109 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:113 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:104 msgid "Cannot delete this currency, because the company preferences uses this currency." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:119 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:123 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:114 msgid "Cannot delete this currency, because thre are bank accounts that use this currency." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:151 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:155 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:129 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:96 +msgid "Selected currency has been deleted" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:145 msgid "Abbreviation" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:151 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:155 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:145 msgid "Symbol" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:151 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:155 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:145 msgid "Currency Name" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:152 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:156 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:146 msgid "Hundredths name" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:152 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:156 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:146 msgid "Country" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:182 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:186 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:177 msgid "The marked currency is the home currency which cannot be deleted." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:207 -# c:\Apache2\htdocs\account/gl/manage/currencies.php:211 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:211 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:215 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:203 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:207 msgid "Currency Abbreviation:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:214 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:218 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:210 msgid "Currency Symbol:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:215 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:219 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:211 msgid "Currency Name:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:216 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:220 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:212 msgid "Hundredths Name:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:217 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:221 +#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:213 msgid "Country:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/currencies.php:249 -#: c:\Apache2\htdocs\account2/gl/manage/currencies.php:253 -msgid "Enter a New Currency" -msgstr "" - -#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:39 +#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:29 msgid "The exchange rate must be numeric and greater than zero." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:41 -#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:45 +#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:35 msgid "The exchange rate cannot be zero or a negative number." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:96 -#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:101 +#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:90 msgid "Date to Use From" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:96 -#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:101 +#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:90 msgid "Exchange Rate" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:144 -# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:148 -#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:148 -#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:152 +#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:132 +#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:138 msgid "Date to Use From:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:150 -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:284 -#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:154 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:296 +#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:145 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:300 msgid "Exchange Rate:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:156 -#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:161 +#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:146 +msgid "Get current ECB rate" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:153 msgid "Exchange rates are entered against the company currency." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:195 -#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:200 +#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:184 msgid "Select a currency :" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:210 -#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:215 +#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:200 msgid "The selected currency is the company currency." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:211 -#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:216 +#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:201 msgid "The company currency is the base currency so exchange rates cannot be set for it." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/exchange_rates.php:218 -#: c:\Apache2\htdocs\account2/gl/manage/exchange_rates.php:223 -msgid "Enter a New Exchange Rate" -msgstr "" - -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:7 -# c:\Apache2\htdocs\account/reporting/rep701.php:42 -# c:\Apache2\htdocs\account/reporting/reports_main.php:143 #: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:7 #: c:\Apache2\htdocs\account2/reporting/rep701.php:42 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:153 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:161 msgid "Chart of Accounts" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:43 #: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:43 msgid "The account code must be entered." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:48 #: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:49 msgid "The account name cannot be empty." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:53 #: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:55 msgid "The account code must be numeric." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:78 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:83 +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:66 +msgid "Account data has been updated." +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:72 +msgid "New account has been added." +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:90 msgid "Cannot delete this account because transactions have been created using this account." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:104 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:109 +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:111 msgid "Cannot delete this account because it is used as one of the company default GL accounts." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:114 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:119 +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:121 msgid "Cannot delete this account because it is used by a bank account." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:128 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:133 +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:135 msgid "Cannot delete this account because it is used by one or more Items." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:138 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:143 +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:145 msgid "Cannot delete this account because it is used by one or more Taxes." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:152 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:157 +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:159 msgid "Cannot delete this account because it is used by one or more Customer Branches." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:165 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:170 +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:172 msgid "Cannot delete this account because it is used by one or more suppliers." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:191 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:196 -msgid "Select an Account:" +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:188 +msgid "Selected account has been deleted" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:194 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:199 -msgid "Edit Account" +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:200 +msgid "Select an Account:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:198 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:203 -msgid "New Account" +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:202 +msgid "New account" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:224 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:229 +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:232 msgid "Account Code 2:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:226 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:231 +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:234 msgid "Account Name:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:228 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:233 +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:236 msgid "Account Group:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:230 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:235 +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:238 msgid "Tax Type:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:230 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:235 +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:238 msgid "No Tax" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:236 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:241 +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:244 msgid "Add Account" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:240 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:245 +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:248 msgid "Update Account" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_accounts.php:241 -#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:246 +#: c:\Apache2\htdocs\account2/gl/manage/gl_accounts.php:249 msgid "Delete account" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:30 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:30 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:21 msgid "The account class name cannot be empty." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:72 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:73 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:40 +msgid "Selected account class settings has been updated" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:45 +msgid "New account class has been added" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:63 msgid "Cannot delete this account class because GL account types have been created referring to it." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:97 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:98 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:79 +msgid "Selected account class has been deleted" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:95 msgid "Class ID" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:97 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:98 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:95 msgid "Class Name" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:97 -# c:\Apache2\htdocs\account/reporting/rep706.php:82 -# c:\Apache2\htdocs\account/reporting/reports_main.php:168 -# c:\Apache2\htdocs\account/reporting/reports_main.php:202 -# c:\Apache2\htdocs\account/reporting/reports_main.php:231 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:98 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:95 #: c:\Apache2\htdocs\account2/reporting/rep706.php:90 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:178 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:214 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:245 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:186 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:222 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:253 msgid "Balance Sheet" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:126 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:127 -msgid "New Account Class" -msgstr "" - -# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:142 -# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:148 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:143 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:149 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:141 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:147 msgid "Class ID:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:151 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:152 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:150 msgid "Class Name:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_account_classes.php:153 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:154 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_classes.php:152 msgid "Balance Sheet:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:31 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:31 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:22 msgid "The account group name cannot be empty." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:37 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:38 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:29 msgid "You cannot set an account group to be a subgroup of itself." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:79 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:80 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:47 +msgid "Selected account type has been updated" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:52 +msgid "New account type has been added" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:70 msgid "Cannot delete this account group because GL accounts have been created referring to it." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:89 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:90 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:80 msgid "Cannot delete this account group because GL account groups have been created referring to it." msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:114 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:115 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:112 msgid "Subgroup Of" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:114 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:115 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:112 msgid "Class Type" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:146 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:147 -msgid "New Account Group" -msgstr "" - -# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:167 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:168 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:162 msgid "Subgroup Of:" msgstr "" -# c:\Apache2\htdocs\account/gl/manage/gl_account_types.php:169 -#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:170 +#: c:\Apache2\htdocs\account2/gl/manage/gl_account_types.php:164 msgid "Class Type:" msgstr "" -# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:8 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:8 msgid "View Bank Transfer" msgstr "" -# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:58 -# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:53 -# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:45 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:58 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:53 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:45 msgid "From Bank Account" msgstr "" -# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:67 -# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:55 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:67 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:55 msgid "To Bank Account" msgstr "" -# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:75 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:75 msgid "Transfer Type" msgstr "" -# c:\Apache2\htdocs\account/gl/view/bank_transfer_view.php:82 -# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:68 #: c:\Apache2\htdocs\account2/gl/view/bank_transfer_view.php:82 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:68 msgid "This transfer has been voided." msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:8 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:8 msgid "View Bank Deposit" msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:39 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:39 msgid "GL Deposit" msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:62 -# c:\Apache2\htdocs\account/reporting/reports_main.php:50 -# c:\Apache2\htdocs\account/reporting/reports_main.php:63 -# c:\Apache2\htdocs\account/reporting/reports_main.php:95 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:62 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:56 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:64 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:75 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:105 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:57 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:65 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:76 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:106 msgid "From" msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:63 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:63 msgid "Deposit Type" msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:72 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:72 msgid "This deposit has been voided." msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:78 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:78 msgid "There are no items for this deposit." msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:83 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:83 msgid "Items for this Deposit" msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:85 -# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:83 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:85 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:83 msgid "Item Amounts are Shown in :" msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:88 -# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:87 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:56 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:59 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:62 -# c:\Apache2\htdocs\account/reporting/rep701.php:36 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:110 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:113 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:116 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:47 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:50 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:53 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:109 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:112 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:115 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:88 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:87 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:56 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:59 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:62 #: c:\Apache2\htdocs\account2/reporting/rep701.php:36 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:110 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:113 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:116 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:47 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:50 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:53 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:109 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:112 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:115 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:114 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:117 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:120 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:48 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:51 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:54 msgid "Account Code" msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_deposit_view.php:88 -# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:87 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:110 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:113 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:116 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:47 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:50 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:53 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:109 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:112 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:115 #: c:\Apache2\htdocs\account2/gl/view/gl_deposit_view.php:88 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:87 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:110 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:113 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:116 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:47 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:50 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:53 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:109 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:112 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:115 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:114 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:117 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:120 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:48 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:51 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:54 msgid "Account Description" msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:8 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:8 msgid "View Bank Payment" msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:37 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:37 msgid "GL Payment" msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:60 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:60 msgid "Pay To" msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:61 -# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:52 -# c:\Apache2\htdocs\account/sales/view/view_receipt.php:35 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:61 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:52 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:35 msgid "Payment Type" msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:70 -# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:67 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:70 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:67 msgid "This payment has been voided." msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:76 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:76 msgid "There are no items for this payment." msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_payment_view.php:81 #: c:\Apache2\htdocs\account2/gl/view/gl_payment_view.php:81 msgid "Items for this Payment" msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:7 -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:26 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:7 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:26 msgid "General Ledger Transaction Details" msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:17 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:17 msgid "The script must be called with a valid transaction type and transaction number to review the general ledger postings for." msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:47 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:47 msgid "No general ledger transactions have been created for" msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:47 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:47 msgid "number" msgstr "" -# c:\Apache2\htdocs\account/gl/view/gl_trans_view.php:95 #: c:\Apache2\htdocs\account2/gl/view/gl_trans_view.php:95 msgid "This transaction has been voided." msgstr "" -# c:\Apache2\htdocs\account/inventory/adjustments.php:17 #: c:\Apache2\htdocs\account2/inventory/adjustments.php:19 msgid "Item Adjustments Note" msgstr "" -# c:\Apache2\htdocs\account/inventory/adjustments.php:21 #: c:\Apache2\htdocs\account2/inventory/adjustments.php:23 msgid "There are no inventory items defined in the system which can be adjusted (Purchased or Manufactured)." msgstr "" -# c:\Apache2\htdocs\account/inventory/adjustments.php:23 -# c:\Apache2\htdocs\account/inventory/transfers.php:24 #: c:\Apache2\htdocs\account2/inventory/adjustments.php:25 -#: c:\Apache2\htdocs\account2/inventory/transfers.php:26 +#: c:\Apache2\htdocs\account2/inventory/transfers.php:25 msgid "There are no inventory movement types defined in the system. Please define at least one inventory adjustment type." msgstr "" -# c:\Apache2\htdocs\account/inventory/adjustments.php:32 #: c:\Apache2\htdocs\account2/inventory/adjustments.php:34 msgid "Items adjustment has been processed" msgstr "" -# c:\Apache2\htdocs\account/inventory/adjustments.php:33 #: c:\Apache2\htdocs\account2/inventory/adjustments.php:35 msgid "View this adjustment" msgstr "" -# c:\Apache2\htdocs\account/inventory/adjustments.php:35 #: c:\Apache2\htdocs\account2/inventory/adjustments.php:37 msgid "View the GL Postings for this Adjustment" msgstr "" -# c:\Apache2\htdocs\account/inventory/adjustments.php:37 #: c:\Apache2\htdocs\account2/inventory/adjustments.php:39 msgid "Enter Another Adjustment" msgstr "" -# c:\Apache2\htdocs\account/inventory/adjustments.php:101 -# c:\Apache2\htdocs\account/inventory/transfers.php:101 -#: c:\Apache2\htdocs\account2/inventory/adjustments.php:105 -#: c:\Apache2\htdocs\account2/inventory/transfers.php:105 +#: c:\Apache2\htdocs\account2/inventory/adjustments.php:77 +#: c:\Apache2\htdocs\account2/inventory/transfers.php:77 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:207 +msgid "You must enter at least one non empty item line." +msgstr "" + +#: c:\Apache2\htdocs\account2/inventory/adjustments.php:97 +#: c:\Apache2\htdocs\account2/inventory/transfers.php:95 msgid "The entered date for the adjustment is invalid." msgstr "" -# c:\Apache2\htdocs\account/inventory/adjustments.php:112 -#: c:\Apache2\htdocs\account2/inventory/adjustments.php:118 +#: c:\Apache2\htdocs\account2/inventory/adjustments.php:111 msgid "The adjustment cannot be processed because an adjustment item would cause a negative inventory balance :" msgstr "" -#: c:\Apache2\htdocs\account2/inventory/adjustments.php:145 +#: c:\Apache2\htdocs\account2/inventory/adjustments.php:141 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:125 msgid "The quantity entered is negative or invalid." msgstr "" -# c:\Apache2\htdocs\account/inventory/adjustments.php:151 -# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:122 -#: c:\Apache2\htdocs\account2/inventory/adjustments.php:152 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:130 +#: c:\Apache2\htdocs\account2/inventory/adjustments.php:148 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:132 msgid "The entered standard cost is negative or invalid." msgstr "" -# c:\Apache2\htdocs\account/inventory/adjustments.php:218 -#: c:\Apache2\htdocs\account2/inventory/adjustments.php:222 +#: c:\Apache2\htdocs\account2/inventory/adjustments.php:218 msgid "Adjustment Items" msgstr "" -# c:\Apache2\htdocs\account/inventory/adjustments.php:229 -#: c:\Apache2\htdocs\account2/inventory/adjustments.php:233 +#: c:\Apache2\htdocs\account2/inventory/adjustments.php:225 msgid "Process Adjustment" msgstr "" -# c:\Apache2\htdocs\account/inventory/cost_update.php:17 #: c:\Apache2\htdocs\account2/inventory/cost_update.php:17 msgid "Inventory Item Cost Update" msgstr "" -# c:\Apache2\htdocs\account/inventory/cost_update.php:21 #: c:\Apache2\htdocs\account2/inventory/cost_update.php:21 msgid "There are no costable inventory items defined in the system (Purchased or manufactured items)." msgstr "" -# c:\Apache2\htdocs\account/inventory/cost_update.php:41 -#: c:\Apache2\htdocs\account2/inventory/cost_update.php:43 +#: c:\Apache2\htdocs\account2/inventory/cost_update.php:42 msgid "The entered cost is not numeric." msgstr "" -# c:\Apache2\htdocs\account/inventory/cost_update.php:46 -#: c:\Apache2\htdocs\account2/inventory/cost_update.php:49 +#: c:\Apache2\htdocs\account2/inventory/cost_update.php:48 msgid "The new cost is the same as the old cost. Cost was not updated." msgstr "" -# c:\Apache2\htdocs\account/inventory/cost_update.php:55 -#: c:\Apache2\htdocs\account2/inventory/cost_update.php:59 +#: c:\Apache2\htdocs\account2/inventory/cost_update.php:58 msgid "Cost has been updated." msgstr "" -# c:\Apache2\htdocs\account/inventory/cost_update.php:59 -#: c:\Apache2\htdocs\account2/inventory/cost_update.php:63 +#: c:\Apache2\htdocs\account2/inventory/cost_update.php:62 msgid "View the GL Journal Entries for this Cost Update" msgstr "" -# c:\Apache2\htdocs\account/inventory/cost_update.php:71 -# c:\Apache2\htdocs\account/inventory/prices.php:45 -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:113 -# c:\Apache2\htdocs\account/inventory/reorder_level.php:31 -# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:30 -# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:30 -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:345 -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:350 -# c:\Apache2\htdocs\account/manufacturing/inquiry/bom_cost_inquiry.php:22 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:32 -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:47 -#: c:\Apache2\htdocs\account2/inventory/cost_update.php:75 -#: c:\Apache2\htdocs\account2/inventory/prices.php:45 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:117 -#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:31 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:33 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:30 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:351 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:356 +#: c:\Apache2\htdocs\account2/inventory/cost_update.php:76 +#: c:\Apache2\htdocs\account2/inventory/prices.php:47 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:104 +#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:34 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:39 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:32 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:358 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:363 #: c:\Apache2\htdocs\account2/manufacturing/inquiry/bom_cost_inquiry.php:22 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:35 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:91 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:79 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:59 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:113 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:89 msgid "Item:" msgstr "" -# c:\Apache2\htdocs\account/inventory/cost_update.php:92 -#: c:\Apache2\htdocs\account2/inventory/cost_update.php:96 -msgid "Last Cost" -msgstr "" - -# c:\Apache2\htdocs\account/inventory/cost_update.php:95 -#: c:\Apache2\htdocs\account2/inventory/cost_update.php:99 +#: c:\Apache2\htdocs\account2/inventory/cost_update.php:102 msgid "Standard Material Cost Per Unit" msgstr "" -# c:\Apache2\htdocs\account/inventory/cost_update.php:100 -#: c:\Apache2\htdocs\account2/inventory/cost_update.php:104 +#: c:\Apache2\htdocs\account2/inventory/cost_update.php:107 msgid "Standard Labour Cost Per Unit" msgstr "" -# c:\Apache2\htdocs\account/inventory/cost_update.php:102 -#: c:\Apache2\htdocs\account2/inventory/cost_update.php:106 +#: c:\Apache2\htdocs\account2/inventory/cost_update.php:109 msgid "Standard Overhead Cost Per Unit" msgstr "" -# c:\Apache2\htdocs\account/inventory/prices.php:7 #: c:\Apache2\htdocs\account2/inventory/prices.php:7 msgid "Inventory Item Sales prices" msgstr "" -# c:\Apache2\htdocs\account/inventory/prices.php:16 -# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:23 -# c:\Apache2\htdocs\account/manufacturing/inquiry/where_used_inquiry.php:13 -# c:\Apache2\htdocs\account/sales/credit_note_entry.php:28 -#: c:\Apache2\htdocs\account2/inventory/prices.php:16 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:23 +#: c:\Apache2\htdocs\account2/inventory/prices.php:18 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:25 #: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:12 -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:37 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:38 msgid "There are no items defined in the system." msgstr "" -# c:\Apache2\htdocs\account/inventory/prices.php:18 -#: c:\Apache2\htdocs\account2/inventory/prices.php:18 +#: c:\Apache2\htdocs\account2/inventory/prices.php:20 msgid "There are no sales types in the system. Please set up sales types befor entering pricing." msgstr "" -# c:\Apache2\htdocs\account/inventory/prices.php:73 -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:166 -#: c:\Apache2\htdocs\account2/inventory/prices.php:73 +#: c:\Apache2\htdocs\account2/inventory/prices.php:61 msgid "The price entered must be numeric." msgstr "" -# c:\Apache2\htdocs\account/inventory/prices.php:84 -#: c:\Apache2\htdocs\account2/inventory/prices.php:86 +#: c:\Apache2\htdocs\account2/inventory/prices.php:74 msgid "This price has been updated." msgstr "" -# c:\Apache2\htdocs\account/inventory/prices.php:91 -#: c:\Apache2\htdocs\account2/inventory/prices.php:94 +#: c:\Apache2\htdocs\account2/inventory/prices.php:82 msgid "The new price has been added." msgstr "" -# c:\Apache2\htdocs\account/inventory/prices.php:105 -#: c:\Apache2\htdocs\account2/inventory/prices.php:108 +#: c:\Apache2\htdocs\account2/inventory/prices.php:96 msgid "The selected price has been deleted." msgstr "" -# c:\Apache2\htdocs\account/inventory/prices.php:117 -# c:\Apache2\htdocs\account/reporting/rep104.php:94 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:336 -# c:\Apache2\htdocs\account/sales/view/view_credit.php:64 -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:80 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:68 -#: c:\Apache2\htdocs\account2/inventory/prices.php:120 -#: c:\Apache2\htdocs\account2/reporting/rep104.php:94 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:309 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:293 +#: c:\Apache2\htdocs\account2/inventory/prices.php:127 +#: c:\Apache2\htdocs\account2/reporting/rep104.php:89 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:322 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:318 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:64 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:84 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:84 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:72 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:100 msgid "Sales Type" msgstr "" -# c:\Apache2\htdocs\account/inventory/prices.php:117 -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:144 -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:50 -# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:28 -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:38 -# c:\Apache2\htdocs\account/reporting/rep104.php:88 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:284 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:379 -# c:\Apache2\htdocs\account/sales/view/view_credit.php:82 -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:100 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:141 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:303 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:168 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:37 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:40 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:104 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:110 -#: c:\Apache2\htdocs\account2/inventory/prices.php:120 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:149 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:52 +#: c:\Apache2\htdocs\account2/inventory/prices.php:127 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:136 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:54 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:28 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:38 -#: c:\Apache2\htdocs\account2/reporting/rep104.php:88 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:267 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:354 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:326 +#: c:\Apache2\htdocs\account2/reporting/rep104.php:82 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:281 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:367 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:352 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:82 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:104 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:104 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:173 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:297 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:168 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:46 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:49 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:109 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:87 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:301 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:166 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:47 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:50 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:153 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:84 msgid "Price" msgstr "" -# c:\Apache2\htdocs\account/inventory/prices.php:140 -#: c:\Apache2\htdocs\account2/inventory/prices.php:143 +#: c:\Apache2\htdocs\account2/inventory/prices.php:147 msgid "There are no prices set up for this part." msgstr "" -# c:\Apache2\htdocs\account/inventory/prices.php:156 -#: c:\Apache2\htdocs\account2/inventory/prices.php:159 +#: c:\Apache2\htdocs\account2/inventory/prices.php:166 msgid "Currency:" msgstr "" -# c:\Apache2\htdocs\account/inventory/prices.php:158 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:235 -#: c:\Apache2\htdocs\account2/inventory/prices.php:161 +#: c:\Apache2\htdocs\account2/inventory/prices.php:168 msgid "Sales Type:" msgstr "" -# c:\Apache2\htdocs\account/inventory/prices.php:160 -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:210 -#: c:\Apache2\htdocs\account2/inventory/prices.php:163 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:215 +#: c:\Apache2\htdocs\account2/inventory/prices.php:170 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:203 msgid "Price:" msgstr "" -# c:\Apache2\htdocs\account/inventory/prices.php:164 -#: c:\Apache2\htdocs\account2/inventory/prices.php:167 -msgid "Add/Update Price" -msgstr "" - -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:8 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:8 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:6 msgid "Supplier Purchasing Data" msgstr "" -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:15 -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:32 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:15 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:13 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:31 msgid "There are no purchasable inventory items defined in the system." msgstr "" -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:16 -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:30 -# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:22 -# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:22 -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:26 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:16 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:14 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:29 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:24 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:24 @@ -5349,995 +3887,741 @@ msgstr "" msgid "There are no suppliers defined in the system." msgstr "" -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:41 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:41 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:26 msgid "There is no item selected." msgstr "" -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:46 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:47 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:32 msgid "The price entered was not numeric." msgstr "" -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:51 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:53 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:38 msgid "The conversion factor entered was not numeric. The conversion factor is the number by which the price must be divided by to get the unit price in our unit of measure." msgstr "" -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:65 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:69 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:54 msgid "This supplier purchasing data has been added." msgstr "" -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:78 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:82 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:65 msgid "Supplier purchasing data has been updated." msgstr "" -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:102 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:106 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:80 msgid "The purchasing data item has been sucessfully deleted." msgstr "" -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:124 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:128 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:115 msgid "Entered item is not defined. Please re-enter." msgstr "" -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:138 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:143 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:130 msgid "There is no purchasing data set up for the part selected" msgstr "" -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:144 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:60 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:105 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:108 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:98 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:101 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:124 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:158 -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:151 -# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:31 -# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:37 -# c:\Apache2\htdocs\account/reporting/rep201.php:78 -# c:\Apache2\htdocs\account/reporting/rep202.php:146 -# c:\Apache2\htdocs\account/reporting/rep202.php:153 -# c:\Apache2\htdocs\account/reporting/rep203.php:83 -# c:\Apache2\htdocs\account/reporting/rep204.php:77 -# c:\Apache2\htdocs\account/reporting/reports_main.php:70 -# c:\Apache2\htdocs\account/reporting/reports_main.php:71 -# c:\Apache2\htdocs\account/reporting/reports_main.php:77 -# c:\Apache2\htdocs\account/reporting/reports_main.php:84 -# c:\Apache2\htdocs\account/reporting/reports_main.php:90 -# c:\Apache2\htdocs\account/reporting/reports_main.php:94 -# c:\Apache2\htdocs\account/includes/types.inc:140 -# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:11 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:225 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:149 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:136 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:60 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:110 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:113 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:103 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:106 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:126 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:160 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:151 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:135 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:138 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:127 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:130 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:130 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:167 +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:142 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:31 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:37 #: c:\Apache2\htdocs\account2/reporting/rep201.php:77 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:151 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:158 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:103 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:110 #: c:\Apache2\htdocs\account2/reporting/rep203.php:82 #: c:\Apache2\htdocs\account2/reporting/rep204.php:76 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:83 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:84 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:86 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:89 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:91 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:96 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:98 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:101 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:85 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:87 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:90 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:92 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:97 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:99 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:102 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:104 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:103 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:105 #: c:\Apache2\htdocs\account2/includes/types.inc:146 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:11 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:227 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:229 msgid "Supplier" msgstr "" -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:145 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:150 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:137 msgid "Supplier's Unit" msgstr "" -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:145 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:150 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:137 msgid "Supplier's Description" msgstr "" -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:203 -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:207 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:51 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:51 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:62 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:57 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:70 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:208 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:212 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:51 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:51 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:197 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:201 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:55 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:60 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:57 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:70 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:62 msgid "Supplier:" msgstr "" -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:211 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:216 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:204 msgid "Suppliers Unit of Measure:" msgstr "" -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:217 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:222 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:210 msgid "Conversion Factor (to our UOM):" msgstr "" -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:218 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:224 +#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:212 msgid "Supplier's Code or Description:" msgstr "" -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:224 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:230 -msgid "Update Purchasing Data" -msgstr "" - -# c:\Apache2\htdocs\account/inventory/purchasing_data.php:228 -#: c:\Apache2\htdocs\account2/inventory/purchasing_data.php:234 -msgid "Add Purchasing Data" -msgstr "" - -# c:\Apache2\htdocs\account/inventory/reorder_level.php:15 -# c:\Apache2\htdocs\account/inventory/transfers.php:22 #: c:\Apache2\htdocs\account2/inventory/reorder_level.php:15 -#: c:\Apache2\htdocs\account2/inventory/transfers.php:24 +#: c:\Apache2\htdocs\account2/inventory/transfers.php:23 msgid "There are no inventory items defined in the system (Purchased or manufactured items)." msgstr "" -# c:\Apache2\htdocs\account/inventory/reorder_level.php:42 -# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:53 -# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:57 -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:88 -# c:\Apache2\htdocs\account/manufacturing/inquiry/where_used_inquiry.php:45 -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:91 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:105 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:98 -# c:\Apache2\htdocs\account/reporting/rep105.php:107 -# c:\Apache2\htdocs\account/reporting/rep301.php:91 -# c:\Apache2\htdocs\account/reporting/rep302.php:177 -# c:\Apache2\htdocs\account/reporting/rep303.php:130 -# c:\Apache2\htdocs\account/reporting/reports_main.php:105 -# c:\Apache2\htdocs\account/reporting/reports_main.php:110 -# c:\Apache2\htdocs\account/reporting/reports_main.php:114 -#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:42 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:53 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:57 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:88 -#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:44 -#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:91 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:110 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:103 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:107 +#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:47 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:56 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:60 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:114 +#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:48 +#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:94 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:135 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:127 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:105 #: c:\Apache2\htdocs\account2/reporting/rep301.php:91 -#: c:\Apache2\htdocs\account2/reporting/rep302.php:177 -#: c:\Apache2\htdocs\account2/reporting/rep303.php:130 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:115 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:120 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:124 +#: c:\Apache2\htdocs\account2/reporting/rep302.php:175 +#: c:\Apache2\htdocs\account2/reporting/rep303.php:128 +#: c:\Apache2\htdocs\account2/reporting/rep304.php:134 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:116 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:121 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:125 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:132 msgid "Location" msgstr "" -# c:\Apache2\htdocs\account/inventory/reorder_level.php:42 -# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:58 -# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:57 -#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:42 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:61 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:57 +#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:47 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:68 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:60 msgid "Quantity On Hand" msgstr "" -# c:\Apache2\htdocs\account/inventory/reorder_level.php:42 -# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:57 -#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:42 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:57 -#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:128 -#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:269 +#: c:\Apache2\htdocs\account2/inventory/reorder_level.php:47 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:60 +#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:134 +#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:274 msgid "Re-Order Level" msgstr "" -# c:\Apache2\htdocs\account/inventory/transfers.php:33 -#: c:\Apache2\htdocs\account2/inventory/transfers.php:35 +#: c:\Apache2\htdocs\account2/inventory/transfers.php:34 msgid "Inventory transfer has been processed" msgstr "" -# c:\Apache2\htdocs\account/inventory/transfers.php:34 -#: c:\Apache2\htdocs\account2/inventory/transfers.php:36 +#: c:\Apache2\htdocs\account2/inventory/transfers.php:35 msgid "View this transfer" msgstr "" -# c:\Apache2\htdocs\account/inventory/transfers.php:36 -#: c:\Apache2\htdocs\account2/inventory/transfers.php:38 +#: c:\Apache2\htdocs\account2/inventory/transfers.php:37 msgid "Enter Another Inventory Transfer" msgstr "" -# c:\Apache2\htdocs\account/inventory/transfers.php:111 -#: c:\Apache2\htdocs\account2/inventory/transfers.php:117 +#: c:\Apache2\htdocs\account2/inventory/transfers.php:107 msgid "The locations to transfer from and to must be different." msgstr "" -# c:\Apache2\htdocs\account/inventory/transfers.php:119 -#: c:\Apache2\htdocs\account2/inventory/transfers.php:126 +#: c:\Apache2\htdocs\account2/inventory/transfers.php:117 msgid "The quantity entered is greater than the available quantity for this item at the source location :" msgstr "" -# c:\Apache2\htdocs\account/inventory/adjustments.php:139 -# c:\Apache2\htdocs\account/inventory/transfers.php:151 -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:64 -# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:110 -#: c:\Apache2\htdocs\account2/inventory/transfers.php:158 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:116 -msgid "The quantity entered is not a valid number." -msgstr "" - -# c:\Apache2\htdocs\account/inventory/transfers.php:157 -#: c:\Apache2\htdocs\account2/inventory/transfers.php:165 +#: c:\Apache2\htdocs\account2/inventory/transfers.php:150 msgid "The quantity entered must be a positive number." msgstr "" -# c:\Apache2\htdocs\account/inventory/transfers.php:238 -#: c:\Apache2\htdocs\account2/inventory/transfers.php:247 +#: c:\Apache2\htdocs\account2/inventory/transfers.php:227 msgid "Process Transfer" msgstr "" -# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:16 #: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:19 msgid "Inventory Item Movement" msgstr "" -# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:32 -# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:37 -# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:152 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:35 -#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:37 -#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:152 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:41 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:26 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:148 msgid "From Location:" msgstr "" -# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:37 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:40 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:46 msgid "Show Movements" msgstr "" -# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:57 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:60 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:46 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:47 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:43 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:41 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:44 +msgid "Refresh Inquiry" +msgstr "" + +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:67 msgid "Detail" msgstr "" -# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:58 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:61 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:68 msgid "Quantity In" msgstr "" -# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:58 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:61 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:68 msgid "Quantity Out" msgstr "" -# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:76 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:79 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:86 msgid "Quantity on hand before" msgstr "" -# c:\Apache2\htdocs\account/inventory/inquiry/stock_movements.php:168 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:171 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_movements.php:180 msgid "Quantity on hand after" msgstr "" -# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:43 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:43 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:45 msgid "This is a service and cannot have a stock holding, only the total quantity on outstanding sales orders is shown." msgstr "" -# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:53 -# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:58 -# c:\Apache2\htdocs\account/reporting/rep303.php:124 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:53 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:58 -#: c:\Apache2\htdocs\account2/reporting/rep303.php:124 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:56 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:61 +#: c:\Apache2\htdocs\account2/reporting/rep303.php:122 msgid "Demand" msgstr "" -# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:58 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:58 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:61 msgid "Available" msgstr "" -# c:\Apache2\htdocs\account/inventory/inquiry/stock_status.php:58 -#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:58 +#: c:\Apache2\htdocs\account2/inventory/inquiry/stock_status.php:61 msgid "On Order" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:52 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:52 -msgid "Only jpg files are supported - a file extension of .jpg is expected" -msgstr "" - -# c:\Apache2\htdocs\account/inventory/manage/items.php:57 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:57 -msgid "The file size is over the maximum allowed. The maximum size allowed in KB is" -msgstr "" - -# c:\Apache2\htdocs\account/inventory/manage/items.php:62 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:62 -msgid "Only graphics files can be uploaded" -msgstr "" - -# c:\Apache2\htdocs\account/inventory/manage/items.php:67 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:67 -msgid "Attempting to overwrite an existing item image" -msgstr "" - -# c:\Apache2\htdocs\account/inventory/manage/items.php:71 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:71 -msgid "The existing image could not be removed" -msgstr "" - -# c:\Apache2\htdocs\account/inventory/manage/items.php:79 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:79 -msgid "File url" -msgstr "" - -# c:\Apache2\htdocs\account/inventory/manage/items.php:85 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:85 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:86 msgid "There are no item categories defined in the system. At least one item category is required to add a item." msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:87 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:87 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:88 msgid "There are no item tax types defined in the system. At least one item tax type is required to add a item." msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:114 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:114 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:117 msgid "The item name must be entered." msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:119 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:120 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:123 msgid "The item code cannot be empty" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:126 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:128 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:131 msgid "The item code cannot contain any of the following characters - & + OR a space OR quotes" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:166 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:169 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:148 +msgid "Item has been updated." +msgstr "" + +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:161 +msgid "A new item has been added." +msgstr "" + +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:179 msgid "Cannot delete this item because there are stock movements that refer to this item." msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:175 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:178 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:188 msgid "Cannot delete this item record because there are bills of material that require this part as a component." msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:184 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:187 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:197 msgid "Cannot delete this item record because there are existing sales orders for this part." msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:193 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:196 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:206 msgid "Cannot delete this item because there are existing purchase order items for it." msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:224 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:227 -msgid "Select an item:" +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:225 +msgid "Selected item has been deleted." msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:225 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:228 -msgid "Edit Item" +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:243 +msgid "Select an item:" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:230 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:233 -msgid "Enter a new item" +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:244 +msgid "New item" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:235 -# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:46 -# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:30 -# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:48 -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:88 -# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:33 -# c:\Apache2\htdocs\account/manufacturing/view/wo_production_view.php:34 -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:165 -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:141 -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:204 -# c:\Apache2\htdocs\account/reporting/rep204.php:71 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:302 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:238 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:256 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:46 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:30 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:48 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:88 -#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:33 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:114 +#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:36 #: c:\Apache2\htdocs\account2/manufacturing/view/wo_production_view.php:34 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:163 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:140 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:204 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:181 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:141 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:218 #: c:\Apache2\htdocs\account2/reporting/rep204.php:70 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:296 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:300 msgid "Item" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:246 -# c:\Apache2\htdocs\account/inventory/manage/items.php:288 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:249 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:291 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:265 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:307 msgid "Item Code:" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:301 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:304 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:320 msgid "Image File (.jpg)" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:315 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:318 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:331 +msgid "No image" +msgstr "" + +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:338 msgid "Category:" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:317 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:320 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:340 msgid "Item Tax Type:" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:319 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:322 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:342 msgid "Item Type:" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:325 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:325 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:345 msgid "Units of Measure:" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:370 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:370 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:391 msgid "Insert New Item" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:375 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:375 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:395 msgid "Update Item" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/items.php:377 -#: c:\Apache2\htdocs\account2/inventory/manage/items.php:377 +#: c:\Apache2\htdocs\account2/inventory/manage/items.php:397 msgid "Delete This Item" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/item_categories.php:33 -#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:33 +#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:25 msgid "The item category description cannot be empty." msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/item_categories.php:61 -#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:62 +#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:34 +msgid "Selected item category has been updated" +msgstr "" + +#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:39 +msgid "New item category has been added" +msgstr "" + +#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:56 msgid "Cannot delete this item category because items have been created using this item category." msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/item_categories.php:96 -#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:97 -msgid "New Item Category" +#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:61 +msgid "Selected item category has been deleted" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/item_categories.php:115 -#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:116 +#: c:\Apache2\htdocs\account2/inventory/manage/item_categories.php:115 msgid "Category Name:" msgstr "" -#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:33 +#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:24 msgid "The unit of measure code cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:39 +#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:30 msgid "The unit of measure description cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:45 -msgid "The number of decimal places must be integer." +#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:37 +msgid "Selected unit has been updated" msgstr "" -#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:65 -msgid "Cannot delete this unit of measure because items have been created using this units." +#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:39 +msgid "New unit has been added" +msgstr "" + +#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:53 +msgid "Cannot delete this unit of measure because items have been created using this unit." +msgstr "" + +#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:59 +msgid "Selected unit has been deleted" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:28 -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:38 -# c:\Apache2\htdocs\account/sales/view/view_credit.php:82 -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:100 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:140 -# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:75 -# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:70 -# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:44 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:167 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:37 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:40 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:103 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:110 -#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:79 +#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:75 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:28 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:38 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:82 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:104 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:104 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:172 -#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:75 -#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:70 -#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:44 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:167 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:46 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:49 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:108 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:87 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:65 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:60 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:25 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:165 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:47 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:50 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:152 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:84 msgid "Unit" msgstr "" -#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:79 +#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:75 msgid "Decimals" msgstr "" -#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:102 -msgid "New Unit of Measure" +#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:87 +#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:124 +msgid "User Quantity Decimals" msgstr "" -#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:122 -#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:125 +#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:118 +#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:121 msgid "Unit Abbreviation:" msgstr "" -#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:126 +#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:122 msgid "Descriptive Name:" msgstr "" -#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:127 +#: c:\Apache2\htdocs\account2/inventory/manage/item_units.php:124 msgid "Decimal Places:" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/locations.php:37 -#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:37 +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:30 msgid "The location code must be five characters or less long." msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/locations.php:42 -#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:43 +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:36 msgid "The location name must be entered." msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/locations.php:73 -#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:75 +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:47 +msgid "Selected location has been updated" +msgstr "" + +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:56 +msgid "New location has been added" +msgstr "" + +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:70 msgid "Cannot delete this location because item movements have been created using this location." msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/locations.php:82 -#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:84 +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:79 msgid "Cannot delete this location because it is used by some work orders records." msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/locations.php:91 -#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:93 +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:88 msgid "Cannot delete this location because it is used by some branch records as the default location to deliver from." msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/locations.php:119 -#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:121 -msgid "Location Code" +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:103 +msgid "Selected location has been deleted" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/locations.php:119 -#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:121 -msgid "Location Name" +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:119 +msgid "Location Code" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/locations.php:139 -#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:141 -msgid "New Location" +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:119 +msgid "Location Name" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/locations.php:160 -# c:\Apache2\htdocs\account/inventory/manage/locations.php:164 -#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:162 -#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:166 +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:163 +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:167 msgid "Location Code:" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/locations.php:167 -#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:169 +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:170 msgid "Location Name:" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/locations.php:168 -#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:170 +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:171 msgid "Contact for deliveries:" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/locations.php:172 -#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:174 +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:175 msgid "Telephone No:" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/locations.php:173 -#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:175 +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:176 msgid "Facsimile No:" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/locations.php:174 -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:186 -# c:\Apache2\htdocs\account/sales/manage/customers.php:276 -# c:\Apache2\htdocs\account/sales/manage/sales_people.php:138 -#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:176 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:186 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:256 -#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:149 +#: c:\Apache2\htdocs\account2/inventory/manage/locations.php:177 +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:182 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:226 +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:168 msgid "Email:" msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/movement_types.php:33 -#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:33 +#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:25 msgid "The inventory movement type name cannot be empty." msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/movement_types.php:65 -#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:66 +#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:34 +msgid "Selected movement type has been updated" +msgstr "" + +#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:39 +msgid "New movement type has been added" +msgstr "" + +#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:56 msgid "Cannot delete this inventory movement type because item transactions have been created referring to it." msgstr "" -# c:\Apache2\htdocs\account/inventory/manage/movement_types.php:109 -#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:110 -msgid "New Inventory Movement Type" +#: c:\Apache2\htdocs\account2/inventory/manage/movement_types.php:71 +msgid "Selected movement type has been deleted" msgstr "" -# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:8 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:8 msgid "View Inventory Adjustment" msgstr "" -# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:33 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:33 msgid "At Location" msgstr "" -# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:36 -# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:37 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:36 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:37 msgid "Adjustment Type" msgstr "" -# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:46 -# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:48 -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:92 -# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:68 -# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:27 -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:38 -# c:\Apache2\htdocs\account/reporting/rep301.php:85 -# c:\Apache2\htdocs\account/reporting/rep303.php:124 -# c:\Apache2\htdocs\account/reporting/rep401.php:60 -# c:\Apache2\htdocs\account/sales/view/view_credit.php:81 -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:99 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:140 -# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:74 -# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:70 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:22 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:149 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:324 -# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:43 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:303 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:167 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:37 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:39 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:103 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:109 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:46 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:48 -#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:92 -#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:68 +#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:95 +#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:71 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:27 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:38 #: c:\Apache2\htdocs\account2/reporting/rep301.php:85 -#: c:\Apache2\htdocs\account2/reporting/rep303.php:124 -#: c:\Apache2\htdocs\account2/reporting/rep401.php:60 +#: c:\Apache2\htdocs\account2/reporting/rep303.php:122 +#: c:\Apache2\htdocs\account2/reporting/rep401.php:58 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:81 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:103 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:103 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:172 -#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:74 -#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:70 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:64 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:60 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:22 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:149 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:324 -#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:43 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:297 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:167 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:46 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:48 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:108 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:85 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:150 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:325 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:24 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:301 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:165 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:47 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:49 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:152 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:82 msgid "Quantity" msgstr "" -# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:47 -# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:48 -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:92 -# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:68 -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:49 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:283 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:378 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:47 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:48 -#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:92 -#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:68 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:51 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:266 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:353 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:325 +#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:95 +#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:71 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:53 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:280 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:366 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:351 msgid "Units" msgstr "" -# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:47 -# c:\Apache2\htdocs\account/reporting/rep301.php:85 -# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:75 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:22 -# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:44 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:47 #: c:\Apache2\htdocs\account2/reporting/rep301.php:85 -#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:75 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:65 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:22 -#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:44 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:25 msgid "Unit Cost" msgstr "" -# c:\Apache2\htdocs\account/inventory/view/view_adjustment.php:63 #: c:\Apache2\htdocs\account2/inventory/view/view_adjustment.php:63 msgid "This adjustment has been voided." msgstr "" -# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:8 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:8 msgid "View Inventory Transfer" msgstr "" -# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:31 -# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:33 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:22 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:76 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:31 -#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:33 +#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:36 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:22 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:76 msgid "From Location" msgstr "" -# c:\Apache2\htdocs\account/inventory/view/view_transfer.php:32 #: c:\Apache2\htdocs\account2/inventory/view/view_transfer.php:32 msgid "To Location" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:15 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:15 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:16 msgid "Search Outstanding Work Orders" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:20 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:20 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:21 msgid "Search Work Orders" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:37 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:37 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:61 msgid "at Location:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:43 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:31 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:43 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:34 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:68 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:57 msgid "for item:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:89 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:89 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:70 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:61 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:59 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:115 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:91 +msgid "Select documents" +msgstr "" + +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:115 msgid "Required" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:89 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:818 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:270 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:89 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1018 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:270 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:115 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:787 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:271 msgid "Manufactured" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:89 -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:126 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:269 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:273 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:89 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:175 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:269 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:273 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:115 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:193 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:270 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:274 msgid "Required By" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:115 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:115 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:153 +msgid "Release" +msgstr "" + +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:160 msgid "Issue" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:116 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:116 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:161 msgid "Produce" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:117 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:117 +#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:162 msgid "Costs" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:117 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:117 -msgid "Not Released" -msgstr "" - -# c:\Apache2\htdocs\account/manufacturing/search_work_orders.php:138 -#: c:\Apache2\htdocs\account2/manufacturing/search_work_orders.php:138 -msgid "Release" -msgstr "" - -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:7 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:17 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:19 msgid "Produce or Unassemble Finished Items From Work Order" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:26 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:29 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:31 msgid "The manufacturing process has been entered." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:28 -# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:24 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:31 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:26 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:33 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:28 msgid "Select another Work Order to Process" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:40 -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:294 -# c:\Apache2\htdocs\account/manufacturing/includes/db/work_order_issues_db.inc:14 -# c:\Apache2\htdocs\account/manufacturing/includes/db/work_order_produce_items_db.inc:11 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:43 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:298 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:45 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:304 #: c:\Apache2\htdocs\account2/manufacturing/includes/db/work_order_issues_db.inc:14 #: c:\Apache2\htdocs\account2/manufacturing/includes/db/work_order_produce_items_db.inc:11 msgid "The order number sent is not valid." msgstr "" -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:69 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:71 msgid "The quantity entered is not a valid number or less then zero." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:86 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:88 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:90 msgid "The production date cannot be before the release date of the work order." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:98 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:101 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:103 msgid "The unassembling cannot be processed because there is insufficient stock." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:149 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:153 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:155 msgid "Produce Finished Items" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:149 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:153 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:155 msgid "Return Items to Work Order" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:151 -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:368 -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:274 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:155 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:374 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:157 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:381 #: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:272 msgid "Quantity:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:153 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:187 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:178 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:18 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:17 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:18 -# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:46 -# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:48 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:80 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:157 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:185 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:185 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:18 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:159 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:177 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:177 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:16 #: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:17 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:18 -#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:46 -#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:48 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:84 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:35 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:37 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:130 msgid "Date:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:159 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:246 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:237 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:163 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:249 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:248 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:165 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:235 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:239 msgid "Process" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:160 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:164 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_add_finished.php:166 msgid "Process And Close Order" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:17 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:21 msgid "There are no manufacturable items defined in the system." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:38 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:42 msgid "The work order been added." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:49 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:53 msgid "The work order been updated." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:59 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:63 msgid "Work order has been deleted." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:69 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:73 msgid "This work order has been closed. There can be no more issues against it." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:79 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:83 msgid "Enter a new work order" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:80 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:84 msgid "Select an existing work order" msgstr "" @@ -6346,7 +4630,6 @@ msgstr "" msgid "The quantity entered is invalid or less than zero." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:141 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:144 msgid "The selected item to manufacture does not have a bom." msgstr "" @@ -6355,806 +4638,623 @@ msgstr "" msgid "The cost entered is invalid or less than zero." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:175 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:176 msgid "The work order cannot be processed because there is an insufficient quantity for component:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:176 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:30 -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:45 -# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:37 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:177 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:33 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:89 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:77 -#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:37 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:57 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:111 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:87 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:26 msgid "Location:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:188 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:190 msgid "The selected item cannot be unassembled because there is insufficient stock." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:212 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:216 msgid "The quantity cannot be changed to be less than the quantity already manufactured for this order." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:257 #: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:261 msgid "This work order cannot be deleted because it has already been processed." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:302 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:306 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:312 msgid "This work order is closed and cannot be edited." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:346 -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:352 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:352 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:358 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:359 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:365 msgid "Destination Location:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:360 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:366 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:373 msgid "Quantity Required:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:362 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:368 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:375 msgid "Quantity Manufactured:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:375 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:381 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:388 msgid "Total Additional Costs:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:379 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:385 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:392 msgid "Released On:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:393 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:399 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:402 +msgid "Save changes to work order" +msgstr "" + +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:405 msgid "Close This Work Order" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_entry.php:395 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:401 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:407 msgid "Delete This Work Order" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:9 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:18 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_entry.php:413 +msgid "Add Workorder" +msgstr "" + +#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:20 msgid "Issue Items to Work Order" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:22 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:24 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:26 msgid "The work order issue has been entered." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:52 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:54 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:63 msgid "The entered date for the issue is invalid." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:75 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:81 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:90 msgid "The issue cannot be processed because an entered item would cause a negative inventory balance :" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:93 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:99 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:108 msgid "The process cannot be completed because there is an insufficient total quantity for a component." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:94 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:100 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:109 msgid "Component is :" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:95 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:101 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:110 msgid "From location :" msgstr "" -# c:\Apache2\htdocs\account/inventory/adjustments.php:145 -# c:\Apache2\htdocs\account/manufacturing/work_order_add_finished.php:70 -# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:116 -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:129 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:123 -msgid "The quantity entered must be greater than zero." -msgstr "" - -# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:182 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:191 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:203 msgid "Items to Issue" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_issue.php:195 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:204 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_issue.php:209 msgid "Process Issue" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:7 #: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:16 msgid "Work Order Release to Manufacturing" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:35 #: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:38 msgid "This work order has already been released." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:42 #: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:46 msgid "This Work Order cannot be released. The selected item to manufacture does not have a bom." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:55 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:60 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:59 msgid "The work order has been released to manufacturing." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:57 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:62 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:61 msgid "Select another work order" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:77 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:82 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:81 msgid "Work Order #:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:78 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:83 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:82 msgid "Work Order Reference:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:80 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:270 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:85 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:270 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:84 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:271 msgid "Released Date" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/work_order_release.php:86 -#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:91 +#: c:\Apache2\htdocs\account2/manufacturing/work_order_release.php:90 msgid "Release Work Order" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/inquiry/bom_cost_inquiry.php:7 #: c:\Apache2\htdocs\account2/manufacturing/inquiry/bom_cost_inquiry.php:7 msgid "Costed Bill Of Material Inquiry" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/inquiry/bom_cost_inquiry.php:14 -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:15 #: c:\Apache2\htdocs\account2/manufacturing/inquiry/bom_cost_inquiry.php:14 #: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:15 msgid "There are no manufactured or kit items defined in the system." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/inquiry/bom_cost_inquiry.php:29 #: c:\Apache2\htdocs\account2/manufacturing/inquiry/bom_cost_inquiry.php:29 msgid "All Costs Are In:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/inquiry/bom_cost_inquiry.php:34 #: c:\Apache2\htdocs\account2/manufacturing/inquiry/bom_cost_inquiry.php:34 msgid "Enter an item code above, to view the costed bill of material for." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/inquiry/where_used_inquiry.php:20 #: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:19 msgid "Select an item to display its parent item(s)." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/inquiry/where_used_inquiry.php:38 -#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:37 +#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:41 msgid "The selected item is not used in any BOMs." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/inquiry/where_used_inquiry.php:45 -#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:44 +#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:48 msgid "Parent Item" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/inquiry/where_used_inquiry.php:45 -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:92 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:21 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:76 -#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:44 -#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:92 +#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:48 +#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:95 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:21 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:76 msgid "Work Centre" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/inquiry/where_used_inquiry.php:45 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:269 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:273 -#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:44 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:269 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:273 +#: c:\Apache2\htdocs\account2/manufacturing/inquiry/where_used_inquiry.php:48 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:270 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:274 msgid "Quantity Required" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:7 #: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:7 msgid "Bill Of Materials" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:17 #: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:17 msgid "There are no work centres defined in the system. BOMs require at least one work centre be defined." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:91 -# c:\Apache2\htdocs\account/reporting/rep105.php:101 -#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:91 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:101 +#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:94 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:99 msgid "Code" msgstr "" -#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:121 +#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:125 msgid "The quantity entered must be numeric and greater than zero." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:177 -#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:173 +#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:141 +msgid "Selected component has been updated" +msgstr "" + +#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:171 +msgid "A new component part has been added to the bill of material for this item." +msgstr "" + +#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:177 msgid "The selected component is already on this bom. You can modify it's quantity but it cannot appear more than once on the same bom." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:183 -#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:179 +#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:183 msgid "The selected component is a parent of the current item. Recursive BOMs are not allowed." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:196 -#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:192 -msgid "The component item has been deleted from this bom." +#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:195 +msgid "The component item has been deleted from this bom" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:205 -#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:201 +#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:209 msgid "Select a manufacturable item:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:225 -#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:223 -msgid "Add a new Component" -msgstr "" - -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:250 -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:259 -#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:248 -#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:257 +#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:250 +#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:255 msgid "Component:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:267 -#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:265 +#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:268 msgid "Location to Draw From:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:268 -#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:266 +#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:269 msgid "Work Centre Added:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/manage/bom_edit.php:277 -#: c:\Apache2\htdocs\account2/manufacturing/manage/bom_edit.php:275 -msgid "Add/Update" +#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:25 +msgid "The work centre name cannot be empty." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/manage/work_centres.php:33 -#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:33 -msgid "The work centre name cannot be empty." +#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:35 +msgid "Selected work center has been updated" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/manage/work_centres.php:63 -#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:64 +#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:40 +msgid "New work center has been added" +msgstr "" + +#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:55 msgid "Cannot delete this work centre because BOMs have been created referring to it." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/manage/work_centres.php:72 -#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:73 +#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:64 msgid "Cannot delete this work centre because work order requirements have been created referring to it." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/manage/work_centres.php:97 -#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:98 -msgid "description" +#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:80 +msgid "Selected work center has been deleted" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/manage/work_centres.php:117 -#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:118 -msgid "New Work Centre" +#: c:\Apache2\htdocs\account2/manufacturing/manage/work_centres.php:96 +msgid "description" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/view/work_order_view.php:17 #: c:\Apache2\htdocs\account2/manufacturing/view/work_order_view.php:17 msgid "View Work Order" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/view/work_order_view.php:41 #: c:\Apache2\htdocs\account2/manufacturing/view/work_order_view.php:41 msgid "BOM for item:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/view/work_order_view.php:46 #: c:\Apache2\htdocs\account2/manufacturing/view/work_order_view.php:46 msgid "Work Order Requirements" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/view/work_order_view.php:51 #: c:\Apache2\htdocs\account2/manufacturing/view/work_order_view.php:51 msgid "Issues" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/view/work_order_view.php:54 #: c:\Apache2\htdocs\account2/manufacturing/view/work_order_view.php:54 msgid "Productions" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/view/work_order_view.php:65 #: c:\Apache2\htdocs\account2/manufacturing/view/work_order_view.php:65 msgid "This work order has been voided." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:7 -#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:7 +#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:10 msgid "View Work Order Issue" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:32 -#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:32 +#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:35 msgid "Issue #" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:32 -# c:\Apache2\htdocs\account/manufacturing/view/wo_production_view.php:33 -#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:32 +#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:35 #: c:\Apache2\htdocs\account2/manufacturing/view/wo_production_view.php:33 msgid "For Work Order #" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:33 -#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:33 +#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:36 msgid "To Work Centre" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:33 -#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:33 +#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:36 msgid "Date of Issue" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:50 -#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:50 +#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:53 msgid "This issue has been voided." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:63 -#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:63 +#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:66 msgid "There are no items for this issue." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:68 -# c:\Apache2\htdocs\account/reporting/rep401.php:60 -# c:\Apache2\htdocs\account/reporting/rep401.php:65 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:21 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:76 -#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:68 -#: c:\Apache2\htdocs\account2/reporting/rep401.php:60 -#: c:\Apache2\htdocs\account2/reporting/rep401.php:65 +#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:71 +#: c:\Apache2\htdocs\account2/reporting/rep401.php:58 +#: c:\Apache2\htdocs\account2/reporting/rep401.php:63 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:21 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:76 msgid "Component" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/view/wo_issue_view.php:105 -#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:105 +#: c:\Apache2\htdocs\account2/manufacturing/view/wo_issue_view.php:108 msgid "Items for this Issue" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/view/wo_production_view.php:8 #: c:\Apache2\htdocs\account2/manufacturing/view/wo_production_view.php:8 msgid "View Work Order Production" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/view/wo_production_view.php:33 #: c:\Apache2\htdocs\account2/manufacturing/view/wo_production_view.php:33 msgid "Production #" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/view/wo_production_view.php:34 #: c:\Apache2\htdocs\account2/manufacturing/view/wo_production_view.php:34 msgid "Quantity Manufactured" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/view/wo_production_view.php:50 #: c:\Apache2\htdocs\account2/manufacturing/view/wo_production_view.php:50 msgid "This production has been voided." msgstr "" -#: c:\Apache2\htdocs\account2/modules/wiki/local/config.php:29 -#: c:\Apache2\htdocs\account2/includes/page/header.inc:127 -msgid "Help" -msgstr "" - -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:21 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:20 msgid "Modify Purchase Order #" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:42 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:41 msgid "Purchase Order has been entered" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:44 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:43 msgid "Purchase Order has been updated" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:45 -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:41 -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:58 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:44 msgid "View this order" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:47 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:46 msgid "Receive Items on this Purchase Order" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:49 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:48 msgid "Enter Another Purchase Order" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:51 #: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:50 msgid "Select An Outstanding Purchase Order" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:103 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:102 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:82 msgid "This item cannot be deleted because some of it has already been received." msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:117 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:116 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:97 msgid "This order cannot be cancelled because some of it has already been received." msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:118 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:117 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:98 msgid "The line item quantities may be modified to quantities more than already received. prices cannot be altered for lines that have already been received and quantities cannot be reduced below the quantity already received." msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:130 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:129 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:110 msgid "This purchase order has been cancelled." msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:132 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:131 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:112 msgid "Enter a new purchase order" msgstr "" -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:155 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:125 msgid "The quantity of the order item must be numeric and not less than zero." msgstr "" -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:162 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:132 msgid "The price entered must be numeric and not less than zero." msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:187 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:185 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:155 msgid "You are attempting to make the quantity ordered a quantity less than has already been invoiced or received. This is prohibited." msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:188 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:186 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:156 msgid "The quantity received can only be modified by entering a negative receipt and the quantity invoiced can only be reduced by entering a credit note against this item." msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:216 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:215 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:186 msgid "The selected item is already on this order." msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:244 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:244 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:215 msgid "The selected item does not exist or it is a kit part and therefore cannot be purchased." msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:257 -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:116 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:257 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:229 msgid "The entered order date is invalid." msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:265 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:266 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:238 msgid "There is no reference entered for this purchase order." msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:278 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:281 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:253 msgid "There is no delivery address specified." msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:284 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:288 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:260 msgid "There is no location specified to move any items into." msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:290 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:295 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:267 msgid "The order cannot be placed because there are no lines entered on this order." msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:415 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:420 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:376 msgid "Update Order" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:417 -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:469 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:422 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:441 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:411 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:378 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:440 msgid "Place Order" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:418 -# c:\Apache2\htdocs\account/purchasing/po_entry_items.php:421 -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:438 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:423 -#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:426 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:440 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:410 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:379 +#: c:\Apache2\htdocs\account2/purchasing/po_entry_items.php:382 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:439 msgid "Cancel Order" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:13 #: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:15 msgid "Receive Purchase Order Items" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:22 #: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:24 msgid "Purchase Order Delivery has been processed" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:24 #: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:26 msgid "View this Delivery" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:30 #: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:32 msgid "Select a different purchase order for receiving items against" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:40 #: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:42 msgid "This page can only be opened if a purchase order has been selected. Please select a purchase order first." msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:49 -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:110 -# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:27 -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:38 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:283 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:378 -# c:\Apache2\htdocs\account/sales/view/view_credit.php:81 -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:99 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:140 -# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:74 -# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:70 -# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:43 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:167 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:36 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:39 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:103 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:109 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:51 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:108 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:53 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:111 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:27 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:38 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:266 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:353 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:325 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:280 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:366 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:351 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:81 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:103 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:103 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:172 -#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:74 -#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:70 -#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:43 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:167 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:45 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:48 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:108 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:85 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:64 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:60 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:24 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:165 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:46 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:49 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:152 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:82 msgid "Item Code" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:49 -# c:\Apache2\htdocs\account/reporting/rep105.php:101 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:378 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:51 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:101 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:353 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:53 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:99 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:366 msgid "Ordered" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:49 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:51 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:53 msgid "Received" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:50 -# c:\Apache2\htdocs\account/reporting/rep101.php:71 -# c:\Apache2\htdocs\account/reporting/rep105.php:102 -# c:\Apache2\htdocs\account/reporting/rep105.php:155 -# c:\Apache2\htdocs\account/reporting/rep201.php:72 -# c:\Apache2\htdocs\account/taxes/tax_types.php:99 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:46 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:52 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:54 #: c:\Apache2\htdocs\account2/reporting/rep101.php:72 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:102 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:155 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:100 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:154 #: c:\Apache2\htdocs\account2/reporting/rep201.php:71 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:55 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:56 msgid "Outstanding" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:50 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:379 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:52 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:354 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:54 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:367 msgid "This Delivery" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:98 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:100 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:103 msgid "Total value of items received" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:148 -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:194 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:150 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:199 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:154 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:203 msgid "There is nothing to process. Please enter valid quantities greater than zero." msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:199 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:204 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:208 msgid "Entered quantities cannot be greater than the quantity entered on the purchase order including the allowed over-receive percentage" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:201 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:206 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:210 msgid "Modify the ordered items on the purchase order if you wish to increase the quantities." msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:219 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:224 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:228 msgid "This order has been changed or invoiced since this delivery was started to be actioned. Processing halted. To enter a delivery against this purchase order, it must be re-selected and re-read again to update the changes made by the other user." msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:221 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:226 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:230 msgid "Select a different purchase order for receiving goods against" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:222 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:227 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:231 msgid "Re-Read the updated purchase order for receiving goods against" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:287 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:292 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:298 msgid "Items to Receive" msgstr "" -# c:\Apache2\htdocs\account/purchasing/po_receive_items.php:293 -#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:298 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:303 msgid "Process Receive Items" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:18 -# c:\Apache2\htdocs\account/includes/types.inc:17 +#: c:\Apache2\htdocs\account2/purchasing/po_receive_items.php:303 +#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:140 +msgid "Clear all GL entry fields" +msgstr "" + #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:20 #: c:\Apache2\htdocs\account2/includes/types.inc:18 msgid "Supplier Credit Note" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:33 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:35 msgid "Supplier credit note has been processed." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:34 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:36 msgid "View this Credit Note" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:36 -# c:\Apache2\htdocs\account/sales/credit_note_entry.php:42 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:30 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:38 -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:51 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:52 #: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:50 #: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:65 msgid "View the GL Journal Entries for this Credit Note" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:38 -# c:\Apache2\htdocs\account/sales/credit_note_entry.php:44 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:40 -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:53 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:54 msgid "Enter Another Credit Note" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:66 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:68 msgid "The credit note cannot be processed because the there are no items or values on the invoice. Credit notes are expected to have a charge." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:72 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:75 msgid "You must enter an credit note reference." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:84 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:89 msgid "You must enter a supplier's credit note reference." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:90 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:96 msgid "The credit note as entered cannot be processed because the date entered is not valid." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:100 -# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:100 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:108 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:107 msgid "The invoice as entered cannot be processed because the due date is in an incorrect format." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:106 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:115 msgid "The credit note total as entered is less than the sum of the the general ledger entires (if any) and the charges for goods received. There must be a mistake somewhere, the credit note as entered will not be processed." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit.php:162 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:171 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit.php:173 msgid "Enter Credit Note" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:9 -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:12 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:14 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:15 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:14 msgid "Select Received Items to Add" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:16 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:18 msgid "To enter supplier transactions the supplier must first be selected from the supplier selection screen, then the link to enter a supplier credit note must be clicked on." msgstr "" @@ -7163,553 +5263,441 @@ msgstr "" msgid "The quantity to credit must be numeric and greater than zero." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:44 #: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:41 msgid "The price is either not numeric or negative." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:88 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:86 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:88 msgid "Return to Credit Note Entry" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:98 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:96 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:98 msgid "There are no received items for the selected supplier that have been invoiced." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:99 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:97 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:99 msgid "Credits can only be applied to invoiced items." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:110 -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:141 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:108 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:140 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:235 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:111 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:141 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:256 msgid "Delivery" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:110 -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:165 -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:141 -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:204 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:108 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:163 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:140 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:204 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:111 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:181 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:141 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:218 msgid "Sequence #" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:110 -# c:\Apache2\htdocs\account/reporting/rep105.php:96 -# c:\Apache2\htdocs\account/reporting/rep204.php:71 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:119 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:122 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:161 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:164 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:108 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:96 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:111 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:94 #: c:\Apache2\htdocs\account2/reporting/rep204.php:70 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:131 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:134 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:172 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:137 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:183 msgid "Order" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:111 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:378 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:109 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:353 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:325 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:86 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:112 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:366 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:351 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:83 msgid "Delivered" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:111 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:109 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:112 msgid "Total Qty Received" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:111 -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:165 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:109 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:163 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:112 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:181 msgid "Qty Already Invoiced" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:112 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:110 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:113 msgid "Qty Yet To Invoice" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:112 -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:166 -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:143 -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:205 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:110 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:164 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:142 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:205 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:113 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:182 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:143 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:219 msgid "Order Price" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:112 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:303 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:110 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:297 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:113 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:301 msgid "Line Value" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:163 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:161 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:179 msgid "Delivery Item Selected For Adding To A Supplier Credit Note" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:166 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:164 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:182 msgid "Quantity to Credit" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:166 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:164 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:182 msgid "Credit Price" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_credit_grns.php:179 -#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:177 +#: c:\Apache2\htdocs\account2/purchasing/supplier_credit_grns.php:196 msgid "Add to Credit Note" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:17 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:19 msgid "Enter Supplier Invoice" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:33 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:35 msgid "Supplier invoice has been processed." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:34 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:36 msgid "View this Invoice" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:36 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:31 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:38 #: c:\Apache2\htdocs\account2/sales/customer_invoice.php:51 msgid "View the GL Journal Entries for this Invoice" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:38 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:40 msgid "Enter Another Invoice" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:66 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:68 msgid "The invoice cannot be processed because the there are no items or values on the invoice. Invoices are expected to have a charge." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:72 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:74 msgid "You must enter an invoice reference." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:84 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:88 msgid "You must enter a supplier's invoice reference." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:90 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:95 msgid "The invoice as entered cannot be processed because the invoice date is in an incorrect format." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:110 #: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:118 msgid "This invoice number has already been entered. It cannot be entered again." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice.php:169 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:177 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice.php:179 msgid "Enter Invoice" msgstr "" -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:38 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:36 msgid "The quantity to invoice must be numeric and greater than zero." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:47 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:45 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:43 msgid "The price is not numeric." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:56 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:57 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:55 msgid "The price being invoiced is more than the purchase order price by more than the allowed over-charge percentage. The system is set up to prohibit this. See the system administrator to modify the set up parameters if necessary." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:57 -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:68 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:58 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:71 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:56 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:69 msgid "The over-charge percentage allowance is :" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:67 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:70 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:68 msgid "The quantity being invoiced is more than the outstanding quantity by more than the allowed over-charge percentage. The system is set up to prohibit this. See the system administrator to modify the set up parameters if necessary." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:117 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:116 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:117 msgid "Back to Supplier Invoice Entry" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:130 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:129 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:130 msgid "There are no outstanding items received from this supplier that have not been invoiced by them." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:138 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:137 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:138 msgid "Items Received Yet to be Invoiced" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:141 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:140 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:141 msgid "P.O." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:142 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:141 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:142 msgid "Received On" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:142 -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:39 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:141 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:142 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:39 msgid "Quantity Received" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:142 -# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:28 -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:39 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:141 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:142 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:28 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:39 msgid "Quantity Invoiced" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:143 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:142 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:143 msgid "Uninvoiced Quantity" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:202 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:202 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:216 msgid "Delivery Item Selected For Adding To A Supplier Invoice" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:204 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:204 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:218 msgid "Quantity Outstanding" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:205 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:205 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:219 msgid "Quantity to Invoice" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:205 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:205 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:219 msgid "Actual Price" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_invoice_grns.php:219 -#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:219 +#: c:\Apache2\htdocs\account2/purchasing/supplier_invoice_grns.php:234 msgid "Add to Invoice" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:16 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:18 msgid "Supplier Payment Entry" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:38 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:40 msgid "Payment has been sucessfully entered" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:40 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:42 msgid "View the GL Journal Entries for this Payment" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:43 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:44 msgid "Allocate this Payment" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:46 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:46 msgid "Enter another supplier payment" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:74 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:71 msgid "From Bank Account:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:76 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:73 msgid "Amount of Payment:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:77 -# c:\Apache2\htdocs\account/sales/customer_payments.php:179 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:74 -#: c:\Apache2\htdocs\account2/sales/customer_payments.php:170 +#: c:\Apache2\htdocs\account2/sales/customer_payments.php:172 msgid "Amount of Discount:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:79 -# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:46 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:76 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:46 msgid "Date Paid" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:85 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:82 msgid "Payment To:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:96 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:85 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:93 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:85 msgid "Payment Type:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:107 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:104 msgid "Enter Payment" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:111 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:108 msgid "The amount and discount are in the bank account's currency." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:139 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:137 msgid "The entered discount is invalid or less than zero." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_payment.php:145 #: c:\Apache2\htdocs\account2/purchasing/supplier_payment.php:144 msgid "The total of the amount and the discount negative. Please enter positive values." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:9 #: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:13 msgid "Add GL Items" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:15 #: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:18 msgid "To enter a supplier invoice or credit note the supplier must first be selected." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:47 -#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:50 +#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:55 msgid "The account code entered is not a valid code, this line cannot be added to the transaction." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:56 -#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:60 +#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:65 msgid "The amount entered is not numeric. This line cannot be added to the transaction." msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:87 -#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:93 +#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:101 msgid "Back to Invoice Entry" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:91 -#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:97 +#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:105 msgid "Back to Credit Note Entry" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:101 -#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:107 +#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:115 msgid "Enter a GL Line" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:107 -#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:113 +#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:122 msgid "GL Account Selection:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/supplier_trans_gl.php:123 -#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:129 +#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:139 msgid "Add GL Line" msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:18 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:21 +#: c:\Apache2\htdocs\account2/purchasing/supplier_trans_gl.php:140 +msgid "Reset" +msgstr "" + +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:19 msgid "Allocate Supplier Payment or Credit Note" msgstr "" -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:48 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:42 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:43 msgid "The entry for one or more amounts is invalid or negative." msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:69 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:63 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:67 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:61 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:69 msgid "These allocations cannot be processed because the amount allocated is more than the total amount left to allocate." msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:183 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:174 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:181 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:173 msgid "Allocation of" msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:188 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:179 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:186 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:186 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:178 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:178 msgid "Total:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:195 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:60 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:63 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:187 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:62 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:65 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:193 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:186 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:60 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:63 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:194 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:188 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:62 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:65 msgid "Transaction Type" msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:196 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:188 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:194 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:195 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:187 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:189 msgid "Other Allocations" msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:196 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:188 -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:464 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:194 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:195 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:476 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:187 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:189 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:482 msgid "This Allocation" msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:196 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:237 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:188 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:230 -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:464 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:194 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:240 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:195 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:241 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:476 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:187 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:228 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:189 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:233 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:482 msgid "Left to Allocate" msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:220 -# c:\Apache2\htdocs\account/reporting/rep104.php:74 -# c:\Apache2\htdocs\account/reporting/rep104.php:78 -# c:\Apache2\htdocs\account/reporting/rep105.php:82 -# c:\Apache2\htdocs\account/reporting/rep105.php:86 -# c:\Apache2\htdocs\account/reporting/rep301.php:72 -# c:\Apache2\htdocs\account/reporting/rep301.php:79 -# c:\Apache2\htdocs\account/reporting/rep302.php:150 -# c:\Apache2\htdocs\account/reporting/rep302.php:157 -# c:\Apache2\htdocs\account/reporting/rep303.php:111 -# c:\Apache2\htdocs\account/reporting/rep303.php:118 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:213 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:218 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:209 #: c:\Apache2\htdocs\account2/reporting/rep101.php:56 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:119 -#: c:\Apache2\htdocs\account2/reporting/rep104.php:74 -#: c:\Apache2\htdocs\account2/reporting/rep104.php:78 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:82 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:86 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:78 +#: c:\Apache2\htdocs\account2/reporting/rep104.php:68 +#: c:\Apache2\htdocs\account2/reporting/rep104.php:72 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:80 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:84 #: c:\Apache2\htdocs\account2/reporting/rep201.php:55 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:127 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:79 #: c:\Apache2\htdocs\account2/reporting/rep203.php:59 #: c:\Apache2\htdocs\account2/reporting/rep204.php:63 #: c:\Apache2\htdocs\account2/reporting/rep301.php:72 #: c:\Apache2\htdocs\account2/reporting/rep301.php:79 -#: c:\Apache2\htdocs\account2/reporting/rep302.php:150 -#: c:\Apache2\htdocs\account2/reporting/rep302.php:157 -#: c:\Apache2\htdocs\account2/reporting/rep303.php:111 -#: c:\Apache2\htdocs\account2/reporting/rep303.php:118 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:221 +#: c:\Apache2\htdocs\account2/reporting/rep302.php:148 +#: c:\Apache2\htdocs\account2/reporting/rep302.php:155 +#: c:\Apache2\htdocs\account2/reporting/rep303.php:109 +#: c:\Apache2\htdocs\account2/reporting/rep303.php:116 +#: c:\Apache2\htdocs\account2/reporting/rep304.php:114 +#: c:\Apache2\htdocs\account2/reporting/rep304.php:121 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:213 msgid "All" msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:228 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:221 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:230 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:230 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:218 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:222 msgid "Total Allocated" msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:251 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:241 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:254 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:252 -msgid "There are no unsettled transactions to allocate." +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:234 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:238 +msgid "Refresh" +msgstr "" + +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:234 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:238 +msgid "Start again allocation of selected amount" msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:255 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:244 -#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:258 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:255 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:235 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:239 +msgid "Process allocations" +msgstr "" + +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:236 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:242 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:240 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:246 msgid "Back to Allocations" msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:16 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:237 +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:243 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:240 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:247 +msgid "Abandon allocations and return to selection of allocatable amounts" +msgstr "" + +#: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocate.php:241 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:244 +msgid "There are no unsettled transactions to allocate." +msgstr "" + #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:16 msgid "Supplier Allocations" msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:35 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:35 msgid "Select a Supplier: " msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:38 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:34 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:38 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:34 msgid "Show Settled Items:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:61 -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:64 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:63 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:66 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:61 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:64 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:63 @@ -7717,733 +5705,497 @@ msgstr "" msgid "Left To Allocate" msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:94 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:96 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:94 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:97 msgid "Allocate" msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:101 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:105 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:101 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:106 msgid "Marked items are settled." msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocation_main.php:104 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:108 #: c:\Apache2\htdocs\account2/purchasing/allocations/supplier_allocation_main.php:104 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:109 msgid "There are no allocations to be done." msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:12 #: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:15 msgid "Search Outstanding Purchase Orders" msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:25 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:24 -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:41 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:28 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:27 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:85 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:71 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:52 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:50 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:107 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:81 msgid "#:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:106 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:109 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:99 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:102 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:159 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:163 -# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:33 -# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:39 -# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:20 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:253 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:111 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:114 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:104 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:107 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:161 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:165 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:136 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:139 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:128 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:131 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:168 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:172 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:33 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:39 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:20 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:255 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:257 msgid "Supplier's Reference" msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:106 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:109 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:99 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:102 -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:125 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:111 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:114 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:104 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:107 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:174 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:136 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:139 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:128 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:131 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:192 msgid "Order Date" msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:106 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:109 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:99 -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:102 -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:126 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:111 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:114 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:104 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:107 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:175 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:136 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:139 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:128 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:131 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:193 msgid "Order Total" msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:144 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:150 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:175 msgid "Receive" msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search.php:160 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:166 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search.php:191 msgid "Marked orders have overdue items." msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:11 #: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:14 msgid "Search Purchase Orders" msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/po_search_completed.php:29 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:32 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/po_search_completed.php:55 msgid "into location:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:36 -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:135 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:38 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:135 +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:130 msgid "Select a supplier: " msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:43 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:37 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:45 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:39 msgid "show settled:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:113 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:147 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:115 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:149 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:125 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:162 msgid "There are no transactions to display for the given dates." msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:125 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:128 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:127 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:130 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:131 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:134 msgid "Supp Reference" msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:126 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:129 -# c:\Apache2\htdocs\account/reporting/rep101.php:71 -# c:\Apache2\htdocs\account/reporting/rep201.php:72 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:120 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:123 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:46 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:128 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:131 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:132 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:135 #: c:\Apache2\htdocs\account2/reporting/rep101.php:72 #: c:\Apache2\htdocs\account2/reporting/rep201.php:71 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:132 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:135 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:55 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:138 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:56 msgid "Allocated" msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:181 -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:459 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:183 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:471 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:187 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:477 msgid "Allocations" msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_allocation_inquiry.php:198 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:220 -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:82 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:207 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:250 -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:188 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:200 -#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:222 -#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:82 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:219 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:283 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:270 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:263 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_allocation_inquiry.php:206 +#: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:229 +#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:83 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:222 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:294 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:289 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:281 msgid "Marked items are overdue." msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:12 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:14 msgid "Supplier Inquiry" msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:34 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:36 msgid "Select a supplier:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:58 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:59 -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:60 -# c:\Apache2\htdocs\account/reporting/rep102.php:132 -# c:\Apache2\htdocs\account/reporting/rep102.php:133 -# c:\Apache2\htdocs\account/reporting/rep102.php:134 -# c:\Apache2\htdocs\account/reporting/rep202.php:140 -# c:\Apache2\htdocs\account/reporting/rep202.php:141 -# c:\Apache2\htdocs\account/reporting/rep202.php:142 -# c:\Apache2\htdocs\account/reporting/rep202.php:171 -# c:\Apache2\htdocs\account/reporting/rep202.php:172 -# c:\Apache2\htdocs\account/reporting/rep202.php:173 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:61 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:62 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:63 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:79 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:60 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:61 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:62 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:138 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:139 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:140 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:255 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:145 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:146 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:147 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:175 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:176 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:177 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:263 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:64 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:97 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:98 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:99 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:214 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:97 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:98 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:99 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:127 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:128 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:129 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:215 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:65 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:66 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:91 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:67 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:92 msgid "Days" msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:60 -# c:\Apache2\htdocs\account/reporting/rep102.php:134 -# c:\Apache2\htdocs\account/reporting/rep202.php:142 -# c:\Apache2\htdocs\account/reporting/rep202.php:173 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:63 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:80 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:62 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:140 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:147 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:177 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:66 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:92 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:99 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:99 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:129 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:67 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:93 msgid "Over" msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:64 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:66 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:66 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:69 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:70 msgid "Terms" msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:64 -# c:\Apache2\htdocs\account/reporting/rep102.php:137 -# c:\Apache2\htdocs\account/reporting/rep202.php:146 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:66 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:75 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:66 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:143 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:253 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:151 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:261 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:69 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:87 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:102 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:212 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:103 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:213 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:70 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:88 msgid "Current" msgstr "" -# c:\Apache2\htdocs\account/purchasing/inquiry/supplier_inquiry.php:65 -# c:\Apache2\htdocs\account/reporting/rep102.php:138 -# c:\Apache2\htdocs\account/reporting/rep202.php:147 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:67 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:76 #: c:\Apache2\htdocs\account2/purchasing/inquiry/supplier_inquiry.php:67 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:144 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:152 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:70 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:88 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:103 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:104 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:71 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:89 msgid "Total Balance" msgstr "" -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:14 -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:22 #: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:13 #: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:21 msgid "There are no tax groups defined in the system. At least one tax group is required before proceeding." msgstr "" -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:40 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:39 +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:31 msgid "The supplier name must be entered." msgstr "" -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:104 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:104 -msgid "Cannot delete this supplier because there are transactions that refer to this supplier." +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:55 +msgid "Supplier has been updated." msgstr "" -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:115 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:115 -msgid "Cannot delete the supplier record because purchase orders have been created against this supplier." +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:78 +msgid "A new supplier has been added." msgstr "" -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:136 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:136 -msgid "Edit Supplier" +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:98 +msgid "Cannot delete this supplier because there are transactions that refer to this supplier." +msgstr "" + +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:109 +msgid "Cannot delete the supplier record because purchase orders have been created against this supplier." msgstr "" -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:145 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:145 -msgid "Enter a new supplier" +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:131 +msgid "New supplier" msgstr "" -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:184 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:184 +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:180 msgid "Supplier Name:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:187 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:187 +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:183 msgid "Bank Account:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:192 -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:197 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:105 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:192 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:197 +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:188 +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:193 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:103 msgid "Supplier's Currency:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:200 -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:287 -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:112 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:84 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:262 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:266 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:200 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:286 +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:196 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:293 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:107 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:296 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:301 msgid "Tax Group:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:202 -# c:\Apache2\htdocs\account/sales/manage/customers.php:311 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:202 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:291 +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:198 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:261 msgid "Payment Terms:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:204 -# c:\Apache2\htdocs\account/reporting/rep704.php:76 -# c:\Apache2\htdocs\account/reporting/rep704.php:86 -# c:\Apache2\htdocs\account/reporting/rep704.php:94 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:204 +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:200 #: c:\Apache2\htdocs\account2/reporting/rep704.php:76 #: c:\Apache2\htdocs\account2/reporting/rep704.php:86 #: c:\Apache2\htdocs\account2/reporting/rep704.php:94 msgid "Accounts" msgstr "" -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:208 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:208 +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:202 +msgid "Accounts Payable Account:" +msgstr "" + +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:204 msgid "Purchase Account:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:230 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:230 +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:226 msgid "Update Supplier" msgstr "" -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:231 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:231 +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:227 +msgid "Update supplier data" +msgstr "" + +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:228 msgid "Delete Supplier" msgstr "" -# c:\Apache2\htdocs\account/purchasing/manage/suppliers.php:235 -#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:235 +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:229 +msgid "Delete supplier data if have been never used" +msgstr "" + +#: c:\Apache2\htdocs\account2/purchasing/manage/suppliers.php:233 msgid "Add New Supplier Details" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:8 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:8 msgid "View Purchase Order Delivery" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:14 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:14 msgid "This page must be called with a Purchase Order Delivery number to review." msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:20 -# c:\Apache2\htdocs\account/includes/types.inc:19 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:20 #: c:\Apache2\htdocs\account2/includes/types.inc:20 msgid "Purchase Order Delivery" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:24 -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:34 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:137 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:24 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:34 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:169 msgid "Line Details" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:27 -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:38 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:283 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:378 -# c:\Apache2\htdocs\account/sales/view/view_credit.php:81 -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:99 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:140 -# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:74 -# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:70 -# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:43 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:167 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:36 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:39 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:103 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:109 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:27 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:38 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:266 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:353 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:325 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:280 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:366 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:351 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:81 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:103 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:103 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:172 -#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:74 -#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:70 -#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:43 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:167 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:45 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:48 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:108 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:85 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:64 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:60 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:24 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:165 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:46 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:49 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:152 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:82 msgid "Item Description" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:27 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:10 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:37 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:27 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:197 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:216 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:10 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:46 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:47 msgid "Delivery Date" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:28 -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:39 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:168 #: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:28 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:39 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:168 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:166 msgid "Line Total" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:56 -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:76 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:158 -#: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:56 -#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:76 +#: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:57 +#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:77 msgid "Total Excluding Tax/Shipping" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_grn.php:61 -#: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:61 +#: c:\Apache2\htdocs\account2/purchasing/view/view_grn.php:62 msgid "This delivery has been voided." msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:9 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:9 msgid "View Purchase Order" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:15 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:15 msgid "This page must be called with a purchase order number to review." msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:18 -# c:\Apache2\htdocs\account/includes/types.inc:15 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:232 -# c:\Apache2\htdocs\account/reporting/includes/form_types.inc:9 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:18 #: c:\Apache2\htdocs\account2/includes/types.inc:16 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:234 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:236 msgid "Purchase Order" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:39 #: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:39 msgid "Requested By" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:95 -#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:95 +#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:96 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:32 msgid "Deliveries" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:97 -#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:97 +#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:98 msgid "Delivered On" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_po.php:120 -#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:120 +#: c:\Apache2\htdocs\account2/purchasing/view/view_po.php:121 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:34 msgid "Invoices/Credits" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:9 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:9 msgid "View Supplier Credit Note" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:27 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:27 msgid "SUPPLIER CREDIT NOTE" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:36 -# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:42 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:272 -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:83 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:36 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:42 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:255 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:268 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:87 msgid "Invoice Date" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:49 -# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:57 -# c:\Apache2\htdocs\account/sales/view/view_credit.php:127 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:49 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:57 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:127 msgid "Sub Total" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:55 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:55 msgid "TOTAL CREDIT NOTE" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_supp_credit.php:59 -# c:\Apache2\htdocs\account/sales/view/view_credit.php:138 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_credit.php:59 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:138 msgid "This credit note has been voided." msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:14 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:14 msgid "View Supplier Invoice" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:32 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:32 msgid "SUPPLIER INVOICE" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:64 -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:149 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:68 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:64 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:154 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:79 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:80 msgid "TOTAL INVOICE" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_supp_invoice.php:68 -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:153 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_invoice.php:68 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:158 msgid "This invoice has been voided." msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:13 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:13 msgid "View Payment to Supplier" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:38 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:38 msgid "Payment to Supplier" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:44 -# c:\Apache2\htdocs\account/reporting/reports_main.php:74 -# c:\Apache2\htdocs\account/reporting/reports_main.php:80 -# c:\Apache2\htdocs\account/reporting/reports_main.php:87 -# c:\Apache2\htdocs\account/reporting/reports_main.php:92 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:44 msgid "To Supplier" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:50 -# c:\Apache2\htdocs\account/sales/view/view_receipt.php:30 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:50 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:30 msgid "Payment Currency" msgstr "" -# c:\Apache2\htdocs\account/purchasing/view/view_supp_payment.php:57 #: c:\Apache2\htdocs\account2/purchasing/view/view_supp_payment.php:57 msgid "Supplier's Currency" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep101.php:63 -# c:\Apache2\htdocs\account/reporting/rep102.php:125 -# c:\Apache2\htdocs\account/reporting/rep202.php:134 -# c:\Apache2\htdocs\account/reporting/rep203.php:69 #: c:\Apache2\htdocs\account2/reporting/rep101.php:64 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:131 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:139 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:90 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:91 #: c:\Apache2\htdocs\account2/reporting/rep203.php:68 msgid "Balances in Home Currency" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep101.php:70 -# c:\Apache2\htdocs\account/reporting/rep201.php:71 -# c:\Apache2\htdocs\account/reporting/rep203.php:76 -# c:\Apache2\htdocs\account/reporting/rep709.php:171 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:45 #: c:\Apache2\htdocs\account2/reporting/rep101.php:71 #: c:\Apache2\htdocs\account2/reporting/rep201.php:70 #: c:\Apache2\htdocs\account2/reporting/rep203.php:75 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:171 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:54 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:189 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:55 msgid "Trans Type" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep101.php:70 -# c:\Apache2\htdocs\account/reporting/rep201.php:71 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:45 #: c:\Apache2\htdocs\account2/reporting/rep101.php:71 #: c:\Apache2\htdocs\account2/reporting/rep201.php:70 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:54 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:55 msgid "Charges" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep101.php:70 -# c:\Apache2\htdocs\account/reporting/rep201.php:72 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:46 #: c:\Apache2\htdocs\account2/reporting/rep101.php:71 #: c:\Apache2\htdocs\account2/reporting/rep201.php:71 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:55 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:56 msgid "Credits" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep101.php:76 -# c:\Apache2\htdocs\account/reporting/rep102.php:143 -# c:\Apache2\htdocs\account/reporting/rep201.php:77 -# c:\Apache2\htdocs\account/reporting/rep202.php:152 -# c:\Apache2\htdocs\account/reporting/rep203.php:82 -# c:\Apache2\htdocs\account/reporting/reports_main.php:20 -# c:\Apache2\htdocs\account/reporting/reports_main.php:26 -# c:\Apache2\htdocs\account/reporting/reports_main.php:44 -# c:\Apache2\htdocs\account/reporting/reports_main.php:72 -# c:\Apache2\htdocs\account/reporting/reports_main.php:78 -# c:\Apache2\htdocs\account/reporting/reports_main.php:85 -# c:\Apache2\htdocs\account/reporting/reports_main.php:148 -# c:\Apache2\htdocs\account/reporting/reports_main.php:157 -# c:\Apache2\htdocs\account/reporting/reports_main.php:170 -# c:\Apache2\htdocs\account/reporting/reports_main.php:176 -# c:\Apache2\htdocs\account/reporting/reports_main.php:183 -# c:\Apache2\htdocs\account/reporting/reports_main.php:193 -# c:\Apache2\htdocs\account/reporting/reports_main.php:204 -# c:\Apache2\htdocs\account/reporting/reports_main.php:209 -# c:\Apache2\htdocs\account/reporting/reports_main.php:215 -# c:\Apache2\htdocs\account/reporting/reports_main.php:224 -# c:\Apache2\htdocs\account/reporting/reports_main.php:233 -# c:\Apache2\htdocs\account/reporting/reports_main.php:237 -# c:\Apache2\htdocs\account/reporting/reports_main.php:242 -# c:\Apache2\htdocs\account/reporting/reports_main.php:248 #: c:\Apache2\htdocs\account2/reporting/rep101.php:77 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:149 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:108 #: c:\Apache2\htdocs\account2/reporting/rep201.php:76 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:157 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:109 #: c:\Apache2\htdocs\account2/reporting/rep203.php:81 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:22 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:27 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:45 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:52 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:85 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:90 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:97 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:158 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:167 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:180 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:187 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:46 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:53 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:86 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:91 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:98 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:130 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:166 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:175 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:188 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:195 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:205 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:216 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:222 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:229 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:238 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:247 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:252 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:258 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:264 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:203 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:213 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:224 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:230 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:237 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:246 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:255 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:260 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:266 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:272 msgid "End Date" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep101.php:77 -# c:\Apache2\htdocs\account/reporting/rep102.php:137 -# c:\Apache2\htdocs\account/reporting/rep102.php:144 -# c:\Apache2\htdocs\account/reporting/rep105.php:96 -# c:\Apache2\htdocs\account/reporting/reports_main.php:18 -# c:\Apache2\htdocs\account/reporting/reports_main.php:19 -# c:\Apache2\htdocs\account/reporting/reports_main.php:25 -# c:\Apache2\htdocs\account/reporting/reports_main.php:32 -# c:\Apache2\htdocs\account/reporting/reports_main.php:36 -# c:\Apache2\htdocs\account/reporting/reports_main.php:42 -# c:\Apache2\htdocs\account/reporting/reports_main.php:49 -# c:\Apache2\htdocs\account/reporting/reports_main.php:56 -# c:\Apache2\htdocs\account/reporting/reports_main.php:62 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:248 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:313 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:62 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:120 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:162 -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:125 -# c:\Apache2\htdocs\account/sales/view/view_credit.php:38 -# c:\Apache2\htdocs\account/includes/types.inc:139 #: c:\Apache2\htdocs\account2/reporting/rep101.php:78 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:143 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:150 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:96 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:102 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:109 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:94 #: c:\Apache2\htdocs\account2/reporting/rep106.php:70 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:20 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:21 @@ -8452,302 +6204,226 @@ msgstr "" #: c:\Apache2\htdocs\account2/reporting/reports_main.php:28 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:33 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:37 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:43 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:50 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:55 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:63 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:68 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:44 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:51 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:56 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:64 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:69 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:74 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:221 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:292 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:278 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:70 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:75 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:234 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:305 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:303 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:62 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:132 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:173 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:197 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:174 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:135 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:184 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:216 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:192 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:38 #: c:\Apache2\htdocs\account2/includes/types.inc:145 msgid "Customer" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep101.php:81 -# c:\Apache2\htdocs\account/reporting/reports_main.php:19 #: c:\Apache2\htdocs\account2/reporting/rep101.php:81 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:21 msgid "Customer Balances" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep101.php:155 -# c:\Apache2\htdocs\account/reporting/rep102.php:226 -# c:\Apache2\htdocs\account/reporting/rep201.php:159 -# c:\Apache2\htdocs\account/reporting/rep202.php:241 -# c:\Apache2\htdocs\account/reporting/rep203.php:149 -# c:\Apache2\htdocs\account/reporting/rep204.php:133 -# c:\Apache2\htdocs\account/reporting/rep301.php:154 #: c:\Apache2\htdocs\account2/reporting/rep101.php:158 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:239 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:198 #: c:\Apache2\htdocs\account2/reporting/rep106.php:169 #: c:\Apache2\htdocs\account2/reporting/rep201.php:159 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:247 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:199 #: c:\Apache2\htdocs\account2/reporting/rep203.php:150 -#: c:\Apache2\htdocs\account2/reporting/rep204.php:131 +#: c:\Apache2\htdocs\account2/reporting/rep204.php:132 #: c:\Apache2\htdocs\account2/reporting/rep301.php:154 +#: c:\Apache2\htdocs\account2/reporting/rep304.php:233 msgid "Grand Total" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep102.php:119 -# c:\Apache2\htdocs\account/reporting/rep202.php:128 -# c:\Apache2\htdocs\account/reporting/rep709.php:149 -# c:\Apache2\htdocs\account/reporting/reports_main.php:30 -# c:\Apache2\htdocs\account/reporting/reports_main.php:82 -# c:\Apache2\htdocs\account/reporting/reports_main.php:249 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:125 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:84 #: c:\Apache2\htdocs\account2/reporting/rep106.php:80 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:133 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:149 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:85 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:167 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:30 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:53 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:93 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:265 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:54 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:94 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:273 msgid "Summary Only" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep102.php:121 -# c:\Apache2\htdocs\account/reporting/rep202.php:130 -# c:\Apache2\htdocs\account/reporting/rep709.php:151 -# c:\Apache2\htdocs\account/reporting/reports_main.php:106 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:127 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:135 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:151 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:116 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:86 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:87 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:169 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:117 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:133 msgid "Detailed Report" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep102.php:151 -# c:\Apache2\htdocs\account/reporting/reports_main.php:25 -#: c:\Apache2\htdocs\account2/reporting/rep102.php:156 +#: c:\Apache2\htdocs\account2/reporting/rep102.php:115 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:26 msgid "Aged Customer Analysis" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep103.php:107 #: c:\Apache2\htdocs\account2/reporting/rep103.php:107 msgid "All Areas" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep103.php:111 #: c:\Apache2\htdocs\account2/reporting/rep103.php:111 msgid "All Sales Folk" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep103.php:115 #: c:\Apache2\htdocs\account2/reporting/rep103.php:115 msgid "Greater than " msgstr "" -# c:\Apache2\htdocs\account/reporting/rep103.php:119 #: c:\Apache2\htdocs\account2/reporting/rep103.php:119 msgid "Less than " msgstr "" -# c:\Apache2\htdocs\account/reporting/rep103.php:128 #: c:\Apache2\htdocs\account2/reporting/rep103.php:128 msgid "Customer Postal Address" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep103.php:128 #: c:\Apache2\htdocs\account2/reporting/rep103.php:128 msgid "Price/Turnover" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep103.php:128 #: c:\Apache2\htdocs\account2/reporting/rep103.php:128 msgid "Branch Contact Information" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep103.php:129 #: c:\Apache2\htdocs\account2/reporting/rep103.php:129 msgid "Branch Delivery Address" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep103.php:134 -# c:\Apache2\htdocs\account/reporting/reports_main.php:33 #: c:\Apache2\htdocs\account2/reporting/rep103.php:134 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:34 msgid "Activity Since" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep103.php:136 -# c:\Apache2\htdocs\account/reporting/reports_main.php:35 #: c:\Apache2\htdocs\account2/reporting/rep103.php:136 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:36 msgid "Sales Folk" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep103.php:137 #: c:\Apache2\htdocs\account2/reporting/rep103.php:137 msgid "Activity" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep103.php:139 #: c:\Apache2\htdocs\account2/reporting/rep103.php:139 msgid "Customer Details Listing" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep103.php:167 #: c:\Apache2\htdocs\account2/reporting/rep103.php:167 msgid "Customers in" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep103.php:191 #: c:\Apache2\htdocs\account2/reporting/rep103.php:191 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:270 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:257 msgid "Price List" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep103.php:193 #: c:\Apache2\htdocs\account2/reporting/rep103.php:193 msgid "Turnover" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep103.php:196 #: c:\Apache2\htdocs\account2/reporting/rep103.php:196 msgid "Ph" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep103.php:197 -# c:\Apache2\htdocs\account/sales/manage/sales_people.php:87 #: c:\Apache2\htdocs\account2/reporting/rep103.php:197 -#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:92 +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:108 msgid "Fax" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep104.php:88 -#: c:\Apache2\htdocs\account2/reporting/rep104.php:88 +#: c:\Apache2\htdocs\account2/reporting/rep104.php:82 msgid "Category/Items" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep104.php:88 -#: c:\Apache2\htdocs\account2/reporting/rep104.php:88 +#: c:\Apache2\htdocs\account2/reporting/rep104.php:82 msgid "GP %" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep104.php:93 -# c:\Apache2\htdocs\account/reporting/rep105.php:106 -# c:\Apache2\htdocs\account/reporting/rep301.php:85 -# c:\Apache2\htdocs\account/reporting/rep301.php:90 -# c:\Apache2\htdocs\account/reporting/rep302.php:169 -# c:\Apache2\htdocs\account/reporting/rep302.php:176 -# c:\Apache2\htdocs\account/reporting/rep303.php:124 -# c:\Apache2\htdocs\account/reporting/rep303.php:129 -#: c:\Apache2\htdocs\account2/reporting/rep104.php:93 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:106 +#: c:\Apache2\htdocs\account2/reporting/rep104.php:88 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:104 #: c:\Apache2\htdocs\account2/reporting/rep301.php:85 #: c:\Apache2\htdocs\account2/reporting/rep301.php:90 -#: c:\Apache2\htdocs\account2/reporting/rep302.php:169 -#: c:\Apache2\htdocs\account2/reporting/rep302.php:176 -#: c:\Apache2\htdocs\account2/reporting/rep303.php:124 -#: c:\Apache2\htdocs\account2/reporting/rep303.php:129 +#: c:\Apache2\htdocs\account2/reporting/rep302.php:167 +#: c:\Apache2\htdocs\account2/reporting/rep302.php:174 +#: c:\Apache2\htdocs\account2/reporting/rep303.php:122 +#: c:\Apache2\htdocs\account2/reporting/rep303.php:127 +#: c:\Apache2\htdocs\account2/reporting/rep304.php:127 +#: c:\Apache2\htdocs\account2/reporting/rep304.php:133 msgid "Category" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep104.php:95 -# c:\Apache2\htdocs\account/reporting/reports_main.php:40 -#: c:\Apache2\htdocs\account2/reporting/rep104.php:95 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:41 +#: c:\Apache2\htdocs\account2/reporting/rep104.php:90 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:42 msgid "Show GP %" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep104.php:102 -# c:\Apache2\htdocs\account/reporting/reports_main.php:36 -#: c:\Apache2\htdocs\account2/reporting/rep104.php:102 +#: c:\Apache2\htdocs\account2/reporting/rep104.php:97 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:37 msgid "Price Listing" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep104.php:119 -#: c:\Apache2\htdocs\account2/reporting/rep104.php:119 -msgid "Prices" -msgstr "" - -# c:\Apache2\htdocs\account/reporting/rep105.php:90 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:90 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:88 msgid "All Orders" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep105.php:92 -# c:\Apache2\htdocs\account/reporting/reports_main.php:47 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:92 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:48 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:90 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:49 msgid "Back Orders Only" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep105.php:96 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:249 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:314 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:162 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:165 -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:125 -# c:\Apache2\htdocs\account/sales/view/view_credit.php:49 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:96 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:94 #: c:\Apache2\htdocs\account2/reporting/rep106.php:70 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:222 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:293 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:279 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:173 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:197 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:174 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:235 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:306 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:304 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:184 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:216 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:192 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:49 msgid "Branch" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep105.php:96 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:96 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:94 #: c:\Apache2\htdocs\account2/reporting/rep106.php:70 msgid "Customer Ref" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep105.php:97 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:97 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:95 msgid "Ord Date" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep105.php:97 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:97 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:95 msgid "Del Date" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep105.php:97 -# c:\Apache2\htdocs\account/reporting/rep401.php:60 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:97 -#: c:\Apache2\htdocs\account2/reporting/rep401.php:60 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:95 +#: c:\Apache2\htdocs\account2/reporting/rep401.php:58 msgid "Loc" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep105.php:101 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:101 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:325 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:99 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:351 msgid "Invoiced" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep105.php:108 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:108 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:106 msgid "Selection" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep105.php:113 -# c:\Apache2\htdocs\account/reporting/reports_main.php:42 -#: c:\Apache2\htdocs\account2/reporting/rep105.php:113 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:43 +#: c:\Apache2\htdocs\account2/reporting/rep105.php:111 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:44 msgid "Order Status Listing" msgstr "" -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:166 #: c:\Apache2\htdocs\account2/reporting/rep106.php:70 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:246 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:230 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:265 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:251 msgid "Invoice" msgstr "" @@ -8758,9 +6434,9 @@ msgstr "" #: c:\Apache2\htdocs\account2/reporting/rep106.php:71 #: c:\Apache2\htdocs\account2/reporting/rep106.php:75 #: c:\Apache2\htdocs\account2/reporting/rep106.php:76 -#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:92 -#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:150 -#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:152 +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:108 +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:169 +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:171 msgid "Provision" msgstr "" @@ -8768,68 +6444,53 @@ msgstr "" msgid "Salesman" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/sales_people.php:87 #: c:\Apache2\htdocs\account2/reporting/rep106.php:75 -#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:92 +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:108 msgid "Email" msgstr "" #: c:\Apache2\htdocs\account2/reporting/rep106.php:76 -#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:92 +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:108 msgid "Break Pt." msgstr "" #: c:\Apache2\htdocs\account2/reporting/rep106.php:85 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:50 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:51 msgid "Salesman Listing" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep107.php:59 -# c:\Apache2\htdocs\account/reporting/rep107.php:84 -# c:\Apache2\htdocs\account/reporting/rep107.php:95 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:32 #: c:\Apache2\htdocs\account2/reporting/rep107.php:60 #: c:\Apache2\htdocs\account2/reporting/rep107.php:89 #: c:\Apache2\htdocs\account2/reporting/rep107.php:100 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:41 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:42 msgid "INVOICE" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep107.php:89 -# c:\Apache2\htdocs\account/reporting/rep107.php:95 -# c:\Apache2\htdocs\account/sales/view/view_credit.php:30 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:34 #: c:\Apache2\htdocs\account2/reporting/rep107.php:94 #: c:\Apache2\htdocs\account2/reporting/rep107.php:100 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:43 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:44 msgid "CREDIT NOTE" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep108.php:72 -# c:\Apache2\htdocs\account/reporting/rep108.php:99 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:44 -#: c:\Apache2\htdocs\account2/reporting/rep108.php:72 -#: c:\Apache2\htdocs\account2/reporting/rep108.php:99 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:53 +#: c:\Apache2\htdocs\account2/reporting/rep108.php:73 +#: c:\Apache2\htdocs\account2/reporting/rep108.php:100 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:54 msgid "STATEMENT" msgstr "" #: c:\Apache2\htdocs\account2/reporting/rep109.php:58 #: c:\Apache2\htdocs\account2/reporting/rep109.php:77 #: c:\Apache2\htdocs\account2/reporting/rep109.php:88 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:39 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext2.inc:37 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:40 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext2.inc:38 msgid "QUOTE" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep109.php:68 -# c:\Apache2\htdocs\account/reporting/rep109.php:88 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:30 #: c:\Apache2\htdocs\account2/reporting/rep109.php:60 #: c:\Apache2\htdocs\account2/reporting/rep109.php:82 #: c:\Apache2\htdocs\account2/reporting/rep109.php:88 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:39 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext2.inc:37 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:40 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext2.inc:38 msgid "SALES ORDER" msgstr "" @@ -8839,234 +6500,184 @@ msgstr "" #: c:\Apache2\htdocs\account2/reporting/rep110.php:74 #: c:\Apache2\htdocs\account2/reporting/rep110.php:79 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:37 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext2.inc:41 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:38 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext2.inc:42 msgid "DELIVERY NOTE" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep201.php:64 #: c:\Apache2\htdocs\account2/reporting/rep201.php:63 msgid "Balances in Home currency" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep201.php:82 -# c:\Apache2\htdocs\account/reporting/reports_main.php:71 #: c:\Apache2\htdocs\account2/reporting/rep201.php:80 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:84 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:85 msgid "Supplier Balances" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep202.php:159 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:163 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:115 msgid "currency" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep202.php:160 -#: c:\Apache2\htdocs\account2/reporting/rep202.php:164 +#: c:\Apache2\htdocs\account2/reporting/rep202.php:116 msgid "Aged Supplier Analysis" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep203.php:87 -# c:\Apache2\htdocs\account/reporting/reports_main.php:84 #: c:\Apache2\htdocs\account2/reporting/rep203.php:85 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:96 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:97 msgid "Payment Report" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep204.php:71 #: c:\Apache2\htdocs\account2/reporting/rep204.php:70 msgid "GRN" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep204.php:71 #: c:\Apache2\htdocs\account2/reporting/rep204.php:70 msgid "Qty Recd" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep204.php:71 #: c:\Apache2\htdocs\account2/reporting/rep204.php:70 msgid "qty Inv" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep204.php:72 #: c:\Apache2\htdocs\account2/reporting/rep204.php:71 msgid "Std Cost" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep204.php:72 -# c:\Apache2\htdocs\account/reporting/rep301.php:85 #: c:\Apache2\htdocs\account2/reporting/rep204.php:71 #: c:\Apache2\htdocs\account2/reporting/rep301.php:85 msgid "Value" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep204.php:80 -# c:\Apache2\htdocs\account/reporting/reports_main.php:90 #: c:\Apache2\htdocs\account2/reporting/rep204.php:78 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:101 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:102 msgid "Outstanding GRNs Report" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep209.php:78 -# c:\Apache2\htdocs\account/reporting/rep209.php:98 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:28 #: c:\Apache2\htdocs\account2/reporting/rep209.php:79 #: c:\Apache2\htdocs\account2/reporting/rep209.php:94 #: c:\Apache2\htdocs\account2/reporting/rep209.php:99 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:35 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:36 msgid "PURCHASE ORDER" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep301.php:93 -# c:\Apache2\htdocs\account/reporting/reports_main.php:103 #: c:\Apache2\htdocs\account2/reporting/rep301.php:93 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:113 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:114 msgid "Inventory Valuation Report" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep302.php:170 -#: c:\Apache2\htdocs\account2/reporting/rep302.php:170 +#: c:\Apache2\htdocs\account2/reporting/rep302.php:168 msgid "QOH" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep302.php:170 -#: c:\Apache2\htdocs\account2/reporting/rep302.php:170 +#: c:\Apache2\htdocs\account2/reporting/rep302.php:168 msgid "Cust Ord" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep302.php:170 -#: c:\Apache2\htdocs\account2/reporting/rep302.php:170 +#: c:\Apache2\htdocs\account2/reporting/rep302.php:168 msgid "Supp Ord" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep302.php:170 -#: c:\Apache2\htdocs\account2/reporting/rep302.php:170 +#: c:\Apache2\htdocs\account2/reporting/rep302.php:168 msgid "Sugg Ord" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep302.php:179 -# c:\Apache2\htdocs\account/reporting/reports_main.php:108 -#: c:\Apache2\htdocs\account2/reporting/rep302.php:179 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:118 +#: c:\Apache2\htdocs\account2/reporting/rep302.php:177 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:119 msgid "Inventory Planning Report" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep303.php:124 -#: c:\Apache2\htdocs\account2/reporting/rep303.php:124 +#: c:\Apache2\htdocs\account2/reporting/rep303.php:122 msgid "Difference" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep303.php:137 -# c:\Apache2\htdocs\account/reporting/reports_main.php:112 -#: c:\Apache2\htdocs\account2/reporting/rep303.php:137 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:122 +#: c:\Apache2\htdocs\account2/reporting/rep303.php:135 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:123 msgid "Stock Check Sheets" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep401.php:60 -#: c:\Apache2\htdocs\account2/reporting/rep401.php:60 +#: c:\Apache2\htdocs\account2/reporting/rep304.php:127 +msgid "Cost" +msgstr "" + +#: c:\Apache2\htdocs\account2/reporting/rep304.php:127 +msgid "Contribution" +msgstr "" + +#: c:\Apache2\htdocs\account2/reporting/rep304.php:136 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:128 +msgid "Inventory Sales Report" +msgstr "" + +#: c:\Apache2\htdocs\account2/reporting/rep401.php:58 msgid "Wrk Ctr" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep401.php:67 -# c:\Apache2\htdocs\account/reporting/reports_main.php:119 -#: c:\Apache2\htdocs\account2/reporting/rep401.php:67 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:129 +#: c:\Apache2\htdocs\account2/reporting/rep401.php:65 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:137 msgid "Bill of Material Listing" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep501.php:75 #: c:\Apache2\htdocs\account2/reporting/rep501.php:75 msgid "YTD" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep501.php:82 -# c:\Apache2\htdocs\account/reporting/reports_main.php:126 #: c:\Apache2\htdocs\account2/reporting/rep501.php:82 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:136 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:144 msgid "Dimension Summary" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep702.php:39 #: c:\Apache2\htdocs\account2/reporting/rep702.php:39 msgid "Type/Account" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep702.php:39 #: c:\Apache2\htdocs\account2/reporting/rep702.php:39 msgid "Date/Dim." msgstr "" -# c:\Apache2\htdocs\account/reporting/rep702.php:40 #: c:\Apache2\htdocs\account2/reporting/rep702.php:40 msgid "Person/Item/Memo" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep702.php:49 -# c:\Apache2\htdocs\account/reporting/reports_main.php:146 #: c:\Apache2\htdocs\account2/reporting/rep702.php:49 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:156 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:164 msgid "List of Journal Entries" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep704.php:30 -# c:\Apache2\htdocs\account/reporting/reports_main.php:155 -# c:\Apache2\htdocs\account/reporting/reports_main.php:191 -# c:\Apache2\htdocs\account/reporting/reports_main.php:222 #: c:\Apache2\htdocs\account2/reporting/rep704.php:30 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:165 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:203 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:236 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:173 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:211 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:244 msgid "GL Account Transactions" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep705.php:131 -# c:\Apache2\htdocs\account/reporting/rep705.php:143 -# c:\Apache2\htdocs\account/reporting/rep705.php:153 -# c:\Apache2\htdocs\account/reporting/reports_main.php:164 -# c:\Apache2\htdocs\account/reporting/reports_main.php:199 -# c:\Apache2\htdocs\account/reporting/reports_main.php:229 #: c:\Apache2\htdocs\account2/reporting/rep705.php:135 #: c:\Apache2\htdocs\account2/reporting/rep705.php:147 #: c:\Apache2\htdocs\account2/reporting/rep705.php:157 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:174 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:211 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:243 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:182 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:219 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:251 msgid "Year" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep705.php:137 -# c:\Apache2\htdocs\account/reporting/rep705.php:147 -# c:\Apache2\htdocs\account/reporting/rep705.php:155 #: c:\Apache2\htdocs\account2/reporting/rep705.php:141 #: c:\Apache2\htdocs\account2/reporting/rep705.php:151 #: c:\Apache2\htdocs\account2/reporting/rep705.php:159 msgid "Info" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep705.php:137 -# c:\Apache2\htdocs\account/reporting/rep705.php:147 -# c:\Apache2\htdocs\account/reporting/rep705.php:155 #: c:\Apache2\htdocs\account2/reporting/rep705.php:141 #: c:\Apache2\htdocs\account2/reporting/rep705.php:151 #: c:\Apache2\htdocs\account2/reporting/rep705.php:159 msgid "Amounts in thousands" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep705.php:159 -# c:\Apache2\htdocs\account/reporting/reports_main.php:163 -# c:\Apache2\htdocs\account/reporting/reports_main.php:198 -# c:\Apache2\htdocs\account/reporting/reports_main.php:228 #: c:\Apache2\htdocs\account2/reporting/rep705.php:163 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:173 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:210 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:242 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:181 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:218 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:250 msgid "Annual Expense Breakdown" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep705.php:289 -# c:\Apache2\htdocs\account/reporting/rep706.php:210 -# c:\Apache2\htdocs\account/reporting/rep707.php:247 #: c:\Apache2\htdocs\account2/reporting/rep705.php:284 #: c:\Apache2\htdocs\account2/reporting/rep706.php:229 #: c:\Apache2\htdocs\account2/reporting/rep706.php:235 @@ -9075,489 +6686,350 @@ msgstr "" msgid "Calculated Return" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep706.php:55 #: c:\Apache2\htdocs\account2/reporting/rep706.php:63 msgid "Open Balance" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep706.php:56 #: c:\Apache2\htdocs\account2/reporting/rep706.php:64 msgid "Close Balance" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep706.php:254 -# c:\Apache2\htdocs\account/reporting/rep707.php:289 #: c:\Apache2\htdocs\account2/reporting/rep706.php:255 #: c:\Apache2\htdocs\account2/reporting/rep707.php:289 msgid "Group" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep707.php:70 -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:163 #: c:\Apache2\htdocs\account2/reporting/rep707.php:78 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:172 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:178 msgid "Accumulated" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep707.php:70 #: c:\Apache2\htdocs\account2/reporting/rep707.php:78 msgid "Achieved %" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep707.php:103 -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:163 #: c:\Apache2\htdocs\account2/reporting/rep707.php:111 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:172 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:178 msgid "Budget" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep707.php:112 -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:163 #: c:\Apache2\htdocs\account2/reporting/rep707.php:120 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:172 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:178 msgid "Period Y-1" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep707.php:115 -# c:\Apache2\htdocs\account/reporting/reports_main.php:174 -# c:\Apache2\htdocs\account/reporting/reports_main.php:207 -# c:\Apache2\htdocs\account/reporting/reports_main.php:235 #: c:\Apache2\htdocs\account2/reporting/rep707.php:123 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:185 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:220 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:250 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:193 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:228 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:258 msgid "Profit and Loss Statement" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep709.php:140 -# c:\Apache2\htdocs\account/reporting/reports_main.php:246 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:140 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:262 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:158 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:270 msgid "Tax Report" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep709.php:171 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:171 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:189 msgid "Branch Name" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep709.php:172 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:172 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:190 msgid "Net" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep709.php:172 -# c:\Apache2\htdocs\account/taxes/tax_groups.php:210 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:172 -#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:206 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:190 +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:202 msgid "Tax" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep709.php:225 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:225 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:255 msgid "Total Outputs" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep709.php:268 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:268 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:298 msgid "Total Inputs" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep709.php:275 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:275 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:305 msgid "Tax Rate" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep709.php:275 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:275 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:305 msgid "Outputs" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep709.php:275 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:275 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:305 msgid "Output Tax" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep709.php:275 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:275 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:305 msgid "Inputs" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep709.php:275 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:275 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:305 msgid "Input Tax" msgstr "" -# c:\Apache2\htdocs\account/reporting/rep709.php:318 -#: c:\Apache2\htdocs\account2/reporting/rep709.php:318 +#: c:\Apache2\htdocs\account2/reporting/rep709.php:357 msgid "No tax specified" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:7 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:14 -msgid "Reports and Analysis" +#: c:\Apache2\htdocs\account2/reporting/rep709.php:392 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:160 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:161 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:164 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:173 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:181 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:186 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:193 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:201 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:211 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:218 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:222 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:228 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:235 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:244 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:250 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:253 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:258 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:264 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:270 +msgid "General Ledger" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:23 -# c:\Apache2\htdocs\account/reporting/reports_main.php:29 -# c:\Apache2\htdocs\account/reporting/reports_main.php:52 -# c:\Apache2\htdocs\account/reporting/reports_main.php:58 -# c:\Apache2\htdocs\account/reporting/reports_main.php:65 -# c:\Apache2\htdocs\account/reporting/reports_main.php:75 -# c:\Apache2\htdocs\account/reporting/reports_main.php:81 -# c:\Apache2\htdocs\account/reporting/reports_main.php:88 -# c:\Apache2\htdocs\account/reporting/reports_main.php:97 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:24 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:29 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:58 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:70 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:77 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:87 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:92 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:99 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:107 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:14 +msgid "Reports and Analysis" +msgstr "" + +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:24 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:29 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:38 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:59 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:71 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:78 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:88 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:93 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:100 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:108 msgid "Currency Filter" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:31 -# c:\Apache2\htdocs\account/reporting/reports_main.php:84 -# c:\Apache2\htdocs\account/reporting/reports_main.php:175 -# c:\Apache2\htdocs\account/reporting/reports_main.php:183 -# c:\Apache2\htdocs\account/reporting/reports_main.php:210 -# c:\Apache2\htdocs\account/reporting/reports_main.php:217 -# c:\Apache2\htdocs\account/reporting/reports_main.php:240 -# c:\Apache2\htdocs\account/reporting/reports_main.php:246 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:31 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:94 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:183 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:95 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:191 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:218 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:225 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:248 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:254 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:199 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:226 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:233 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:256 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:262 msgid "Graphics" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:32 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:33 msgid "Customer Detail Listing" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:35 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:36 msgid "Activity Greater Than" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:35 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:36 msgid "Activity Less Than" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:37 -# c:\Apache2\htdocs\account/reporting/reports_main.php:45 -# c:\Apache2\htdocs\account/reporting/reports_main.php:104 -# c:\Apache2\htdocs\account/reporting/reports_main.php:109 -# c:\Apache2\htdocs\account/reporting/reports_main.php:113 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:38 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:46 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:114 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:119 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:123 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:39 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:47 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:115 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:120 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:124 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:131 msgid "Inventory Category" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:39 -# c:\Apache2\htdocs\account/reporting/reports_main.php:115 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:40 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:125 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:41 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:126 msgid "Show Pictures" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:46 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:47 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:48 msgid "Stock Location" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:49 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:55 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:56 msgid "Print Invoices/Credit Notes" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:51 -# c:\Apache2\htdocs\account/reporting/reports_main.php:64 -# c:\Apache2\htdocs\account/reporting/reports_main.php:96 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:57 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:65 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:76 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:106 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:58 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:66 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:77 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:107 msgid "To" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:53 -# c:\Apache2\htdocs\account/reporting/reports_main.php:59 -# c:\Apache2\htdocs\account/reporting/reports_main.php:66 -# c:\Apache2\htdocs\account/reporting/reports_main.php:98 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:24 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:59 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:71 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:78 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:108 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:24 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:30 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:60 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:72 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:79 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:109 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:25 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:31 msgid "Bank Account" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:54 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:60 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:66 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:61 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:67 msgid "email Customers" msgstr "" -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:61 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:62 msgid "Payment Link" msgstr "" -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:63 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:64 msgid "Print Deliveries" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:56 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:68 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:69 msgid "Print Statements" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:60 -# c:\Apache2\htdocs\account/reporting/reports_main.php:67 -# c:\Apache2\htdocs\account/reporting/reports_main.php:99 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:72 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:79 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:109 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:73 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:80 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:110 msgid "Email Customers" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:62 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:74 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:75 msgid "Print Sales Orders" msgstr "" -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:80 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:81 msgid "Print as Quote" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:77 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:89 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:90 msgid "Aged Supplier Analyses" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:94 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:104 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:105 msgid "Print Purchase Orders" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:102 -# c:\Apache2\htdocs\account/reporting/reports_main.php:103 -# c:\Apache2\htdocs\account/reporting/reports_main.php:108 -# c:\Apache2\htdocs\account/reporting/reports_main.php:112 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:112 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:113 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:118 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:122 -msgid "Inventory" -msgstr "" - -# c:\Apache2\htdocs\account/reporting/reports_main.php:118 -# c:\Apache2\htdocs\account/reporting/reports_main.php:119 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:128 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:129 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:136 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:137 msgid "Manufactoring" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:120 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:130 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:138 msgid "From component" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:121 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:131 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:139 msgid "To component" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:127 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:137 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:145 msgid "From Dimension" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:128 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:138 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:146 msgid "To Dimension" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:129 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:139 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:147 msgid "Show Balance" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:135 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:145 -msgid "Banking" -msgstr "" - -# c:\Apache2\htdocs\account/reporting/reports_main.php:142 -# c:\Apache2\htdocs\account/reporting/reports_main.php:143 -# c:\Apache2\htdocs\account/reporting/reports_main.php:146 -# c:\Apache2\htdocs\account/reporting/reports_main.php:155 -# c:\Apache2\htdocs\account/reporting/reports_main.php:163 -# c:\Apache2\htdocs\account/reporting/reports_main.php:168 -# c:\Apache2\htdocs\account/reporting/reports_main.php:174 -# c:\Apache2\htdocs\account/reporting/reports_main.php:181 -# c:\Apache2\htdocs\account/reporting/reports_main.php:191 -# c:\Apache2\htdocs\account/reporting/reports_main.php:198 -# c:\Apache2\htdocs\account/reporting/reports_main.php:202 -# c:\Apache2\htdocs\account/reporting/reports_main.php:207 -# c:\Apache2\htdocs\account/reporting/reports_main.php:213 -# c:\Apache2\htdocs\account/reporting/reports_main.php:222 -# c:\Apache2\htdocs\account/reporting/reports_main.php:228 -# c:\Apache2\htdocs\account/reporting/reports_main.php:231 -# c:\Apache2\htdocs\account/reporting/reports_main.php:235 -# c:\Apache2\htdocs\account/reporting/reports_main.php:240 -# c:\Apache2\htdocs\account/reporting/reports_main.php:246 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:152 #: c:\Apache2\htdocs\account2/reporting/reports_main.php:153 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:156 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:165 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:173 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:178 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:185 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:193 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:203 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:210 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:214 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:220 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:227 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:236 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:242 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:245 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:250 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:256 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:262 -msgid "General Ledger" +msgid "Banking" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:144 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:154 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:162 msgid "Show Balances" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:158 -# c:\Apache2\htdocs\account/reporting/reports_main.php:194 -# c:\Apache2\htdocs\account/reporting/reports_main.php:225 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:168 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:206 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:239 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:176 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:214 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:247 msgid "From Account" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:159 -# c:\Apache2\htdocs\account/reporting/reports_main.php:195 -# c:\Apache2\htdocs\account/reporting/reports_main.php:226 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:169 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:207 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:240 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:177 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:215 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:248 msgid "To Account" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:177 -# c:\Apache2\htdocs\account/reporting/reports_main.php:210 -# c:\Apache2\htdocs\account/reporting/reports_main.php:238 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:188 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:223 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:253 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:196 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:231 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:261 msgid "Compare to" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:184 -# c:\Apache2\htdocs\account/reporting/reports_main.php:216 -# c:\Apache2\htdocs\account/reporting/reports_main.php:243 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:196 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:230 -#: c:\Apache2\htdocs\account2/reporting/reports_main.php:259 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:204 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:238 +#: c:\Apache2\htdocs\account2/reporting/reports_main.php:267 msgid "Zero values" msgstr "" -# c:\Apache2\htdocs\account/sales/credit_note_entry.php:24 -# c:\Apache2\htdocs\account/includes/types.inc:11 -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:25 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:26 #: c:\Apache2\htdocs\account2/includes/types.inc:11 msgid "Customer Credit Note" msgstr "" -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:28 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:29 #, php-format msgid "Modifying Customer Credit Note #%d" msgstr "" -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:30 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:31 msgid "Modifying Customer Credit Note" msgstr "" -# c:\Apache2\htdocs\account/sales/credit_note_entry.php:30 -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:424 -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:39 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:422 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:392 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:40 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:421 msgid "There are no customers, or there are no customers with branches. Please define customers and customer branches." msgstr "" -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:47 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:48 #, php-format msgid "Credit Note # %d has been processed" msgstr "" -# c:\Apache2\htdocs\account/sales/credit_note_entry.php:40 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:28 -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:49 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:50 msgid "View this credit note" msgstr "" -# c:\Apache2\htdocs\account/sales/credit_note_entry.php:118 -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:119 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:123 msgid "The entered date for the credit note is invalid." msgstr "" -# c:\Apache2\htdocs\account/sales/credit_note_entry.php:138 -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:135 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:139 msgid "For credit notes created to write off the stock, a general ledger account is required to be selected." msgstr "" -# c:\Apache2\htdocs\account/sales/credit_note_entry.php:139 -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:136 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:140 msgid "Please select an account to write the cost of the stock off to, then click on Process again." msgstr "" -# c:\Apache2\htdocs\account/sales/credit_note_entry.php:171 -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:153 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:158 msgid "The quantity must be greater than zero." msgstr "" -# c:\Apache2\htdocs\account/sales/credit_note_entry.php:176 -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:158 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:163 msgid "The entered price is negative or invalid." msgstr "" -# c:\Apache2\htdocs\account/sales/credit_note_entry.php:181 -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:163 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:168 msgid "The entered discount percent is negative, greater than 100 or invalid." msgstr "" -# c:\Apache2\htdocs\account/sales/credit_note_entry.php:256 -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:238 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:235 msgid "Credit Note Items" msgstr "" -# c:\Apache2\htdocs\account/sales/credit_note_entry.php:273 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:387 -#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:248 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:366 +#: c:\Apache2\htdocs\account2/sales/credit_note_entry.php:245 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:382 msgid "Process Credit Note" msgstr "" @@ -9570,13 +7042,10 @@ msgstr "" msgid "Modifying Credit Invoice" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:17 #: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:32 msgid "Credit all or part of an Invoice" msgstr "" -# c:\Apache2\htdocs\account/sales/credit_note_entry.php:39 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:27 #: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:44 msgid "Credit Note has been processed" msgstr "" @@ -9595,114 +7064,85 @@ msgstr "" msgid "Credit Note has been updated" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:72 #: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:98 msgid "The entered shipping cost is invalid or less than zero." msgstr "" -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:199 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:113 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:103 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:147 +msgid "Selected quantity cannot be less than zero nor more than quantity not credited yet." +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:116 msgid "This invoice can not be credited using the automatic facility." msgstr "" -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:40 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:142 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:145 msgid "This page can only be opened if an invoice has been selected for crediting." msgstr "" -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:259 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:236 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:249 msgid "Crediting Invoice" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:274 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:257 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:270 msgid "Credit Note Date" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:283 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:266 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:280 msgid "Invoiced Quantity" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:284 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:267 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:281 msgid "Credit Quantity" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:284 -# c:\Apache2\htdocs\account/sales/view/view_credit.php:82 -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:100 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:40 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:104 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:110 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:267 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:281 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:82 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:104 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:104 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:49 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:109 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:87 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:50 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:153 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:84 msgid "Discount %" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:314 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:302 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:315 msgid "Credit Shipping Cost" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:321 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:457 -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:140 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:64 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:147 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:309 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:416 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:415 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:322 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:427 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:442 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:145 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:145 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:75 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:155 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:76 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:201 msgid "Sub-total" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:329 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:159 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:317 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:169 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:330 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:215 msgid "Credit Note Total" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:343 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:232 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:331 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:252 +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:348 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:301 msgid "Credit Note Type" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:347 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:352 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1911 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:334 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:337 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2153 -msgid "Items Written Off" +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:356 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:309 +msgid "Items Returned to Location" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:348 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:353 -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:367 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1910 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:335 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:338 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:350 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2152 -msgid "Items Returned to Inventory Location" +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:361 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:314 +msgid "Write off the cost of the items to" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:373 -#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:352 -msgid "Write Off the Cost of the Items to" +#: c:\Apache2\htdocs\account2/sales/customer_credit_invoice.php:380 +msgid "Update credit value for quantities entered" msgstr "" #: c:\Apache2\htdocs\account2/sales/customer_delivery.php:27 @@ -9768,116 +7208,118 @@ msgstr "" msgid "This order has no items. There is nothing to delivery." msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:100 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:101 msgid "Select a different delivery" msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:101 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:102 msgid "This delivery has all items invoiced. There is nothing to modify." msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:111 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:112 msgid "This page can only be opened if an order or delivery note has been selected. Please select it first." msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:113 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:114 msgid "Select a Sales Order to Delivery" msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:119 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:178 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:120 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:179 msgid "" "Selected quantity cannot be less than quantity invoiced nor more than quantity\n" "\t\tnot dispatched on sales order." msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:123 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:124 msgid "Freight cost cannot be less than zero" msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:132 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:133 msgid "The entered date of delivery is invalid." msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:138 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:139 msgid "The entered date of delivery is not in fiscal year." msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:144 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:145 msgid "The entered dead-line for invoice is invalid." msgstr "" -# c:\Apache2\htdocs\account/sales/customer_invoice.php:216 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:167 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:220 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:168 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:240 msgid "The entered shipping value is not numeric." msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:173 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:174 msgid "There are no item quantities on this delivery note." msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:251 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:261 msgid "The delivery cannot be processed because there is an insufficient quantity for item:" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_invoice.php:329 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:307 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:320 msgid "For Sales Order" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_invoice.php:341 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:316 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:329 msgid "Delivery From" msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:344 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:357 msgid "Invoice Dead-line" msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:350 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:363 msgid "Delivery Items" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_invoice.php:379 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:354 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:326 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:367 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:352 msgid "Tax Type" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_invoice.php:379 -# c:\Apache2\htdocs\account/sales/view/view_receipt.php:32 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:141 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:354 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:326 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:367 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:352 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:32 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:173 msgid "Discount" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_invoice.php:451 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:410 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:405 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:421 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:432 msgid "Shipping Cost" msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:423 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:434 msgid "Amount Total" msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:428 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:439 msgid "Marked items have insufficient quantities in stock as on day of delivery." msgstr "" -# c:\Apache2\htdocs\account/sales/customer_invoice.php:473 -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:432 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:443 msgid "Action For Balance" msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:439 +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:450 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:460 +msgid "Refresh document page" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:451 msgid "Process Dispatch" msgstr "" +#: c:\Apache2\htdocs\account2/sales/customer_delivery.php:452 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:462 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:461 +msgid "Check entered data and save document" +msgstr "" + #: c:\Apache2\htdocs\account2/sales/customer_invoice.php:27 #, php-format msgid "Modifying Sales Invoice # %d." @@ -9902,7 +7344,6 @@ msgstr "" #: c:\Apache2\htdocs\account2/sales/customer_invoice.php:47 #: c:\Apache2\htdocs\account2/sales/customer_invoice.php:64 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:116 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:116 msgid "View This Invoice" msgstr "" @@ -9951,519 +7392,399 @@ msgstr "" msgid "Select Delivery to Invoice" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_invoice.php:187 -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:112 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:184 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:140 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:251 +msgid "Selected quantity cannot be less than quantity credited nor more than quantity not invoiced yet." +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:204 msgid "The entered invoice date is invalid." msgstr "" -# c:\Apache2\htdocs\account/sales/customer_invoice.php:192 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:190 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:210 msgid "The entered invoice date is not in fiscal year." msgstr "" -# c:\Apache2\htdocs\account/sales/customer_invoice.php:197 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:196 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:216 msgid "The entered invoice due date is invalid." msgstr "" -# c:\Apache2\htdocs\account/sales/customer_invoice.php:222 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:226 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:246 msgid "There are no item quantities on this invoice." msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:290 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:315 msgid "Delivery Notes:" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_invoice.php:375 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:322 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:347 msgid "Invoice Items" msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:326 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:352 msgid "This Invoice" msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:329 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:250 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:355 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:256 msgid "DN" msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:334 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:360 msgid "Credited" msgstr "" -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:379 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:406 msgid "Remove" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_invoice.php:464 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:422 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:449 msgid "Invoice Total" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_invoice.php:480 -#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:433 +#: c:\Apache2\htdocs\account2/sales/customer_invoice.php:461 msgid "Process Invoice" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_payments.php:18 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:19 msgid "Customer Payment Entry" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_payments.php:22 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:23 msgid "There are no customers defined in the system." msgstr "" -# c:\Apache2\htdocs\account/sales/customer_payments.php:34 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:34 msgid "The customer payment has been successfully entered." msgstr "" -# c:\Apache2\htdocs\account/sales/customer_payments.php:36 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:36 msgid "View the GL Journal Entries for this Customer Payment" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_payments.php:37 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:38 msgid "Allocate this Customer Payment" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_payments.php:38 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:40 msgid "Enter Another Customer Payment" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_payments.php:50 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:51 msgid "The entered date is invalid. Please enter a valid date for the payment." msgstr "" -# c:\Apache2\htdocs\account/sales/customer_payments.php:73 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:73 msgid "The entered amount is invalid or negative and cannot be processed." msgstr "" -# c:\Apache2\htdocs\account/sales/customer_payments.php:82 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:79 msgid "The entered discount is not a valid number." msgstr "" -# c:\Apache2\htdocs\account/sales/customer_payments.php:88 #: c:\Apache2\htdocs\account2/sales/customer_payments.php:85 msgid "The balance of the amount and discout is zero or negative. Please enter valid amounts." msgstr "" -# c:\Apache2\htdocs\account/sales/customer_payments.php:153 -#: c:\Apache2\htdocs\account2/sales/customer_payments.php:150 +#: c:\Apache2\htdocs\account2/sales/customer_payments.php:153 msgid "From Customer:" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_payments.php:157 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:58 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:58 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:33 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:209 -#: c:\Apache2\htdocs\account2/sales/customer_payments.php:153 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:58 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:58 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:33 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:198 +#: c:\Apache2\htdocs\account2/sales/customer_payments.php:155 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:62 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:36 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:184 msgid "Branch:" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_payments.php:171 -#: c:\Apache2\htdocs\account2/sales/customer_payments.php:164 +#: c:\Apache2\htdocs\account2/sales/customer_payments.php:166 msgid "This customer account is on hold." msgstr "" -# c:\Apache2\htdocs\account/sales/customer_payments.php:181 -#: c:\Apache2\htdocs\account2/sales/customer_payments.php:172 +#: c:\Apache2\htdocs\account2/sales/customer_payments.php:174 msgid "Customer prompt payment discount :" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_payments.php:183 -#: c:\Apache2\htdocs\account2/sales/customer_payments.php:174 +#: c:\Apache2\htdocs\account2/sales/customer_payments.php:176 msgid "Date of Deposit:" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_payments.php:189 -#: c:\Apache2\htdocs\account2/sales/customer_payments.php:180 +#: c:\Apache2\htdocs\account2/sales/customer_payments.php:182 msgid "Into Bank Account:" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_payments.php:211 -#: c:\Apache2\htdocs\account2/sales/customer_payments.php:201 +#: c:\Apache2\htdocs\account2/sales/customer_payments.php:203 msgid "Amount and discount are in customer's currency." msgstr "" -# c:\Apache2\htdocs\account/sales/customer_payments.php:215 -#: c:\Apache2\htdocs\account2/sales/customer_payments.php:205 +#: c:\Apache2\htdocs\account2/sales/customer_payments.php:207 msgid "Add Payment" msgstr "" -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:30 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:30 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:31 msgid "Direct Sales Delivery" msgstr "" -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:35 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:35 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:36 msgid "Direct Sales Invoice" msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:21 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:40 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:40 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:41 msgid "Modifying Sales Order" msgstr "" -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:41 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:41 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:42 #, php-format msgid "Modifying Sales Order # %d" msgstr "" -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:46 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:46 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:47 msgid "New Sales Order Entry" msgstr "" #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:58 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:58 #, php-format msgid "Order # %d has been entered." msgstr "" #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:60 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:77 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:60 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:77 msgid "View This Order" msgstr "" #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:62 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:79 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:62 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:79 msgid "Print This Order" msgstr "" #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:65 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:65 msgid "Make Delivery Against This Order" msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:45 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:67 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:67 msgid "Enter a New Order" msgstr "" #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:75 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:75 #, php-format msgid "Order # %d has been updated." msgstr "" #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:82 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:82 msgid "Confirm Order Quantities and Make Delivery" msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:62 #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:85 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:85 msgid "Select A Different Order" msgstr "" #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:93 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:93 #, php-format msgid "Delivery # %d has been entered." msgstr "" #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:95 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:95 msgid "View This Delivery" msgstr "" #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:97 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:97 msgid "Print Delivery Note" msgstr "" #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:100 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:100 msgid "Make Invoice Against This Delivery" msgstr "" #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:104 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:104 msgid "Enter a New Template Delivery" msgstr "" #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:106 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:106 msgid "Enter a New Delivery" msgstr "" #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:114 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:114 #, php-format msgid "Invoice # %d has been entered." msgstr "" #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:118 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:118 msgid "Print Sales Invoice" msgstr "" #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:122 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:122 msgid "Enter a New Template Invoice" msgstr "" #: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:124 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:124 msgid "Enter a New Direct Invoice" msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:125 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:198 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:191 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:202 msgid "The entered date is not in fiscal year" msgstr "" -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:203 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:195 -msgid "You must enter at least one non empty item line." -msgstr "" - -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:139 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:208 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:199 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:212 msgid "You must enter the person or company to whom delivery should be made to." msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:145 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:213 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:203 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:217 msgid "You should enter the street address in the box provided. Orders cannot be accepted without a valid street address." msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:154 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:222 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:211 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:226 msgid "The shipping cost entered is expected to be numeric." msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:160 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:227 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:215 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:231 msgid "The delivery date is invalid." msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:166 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:232 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:219 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:237 msgid "The requested delivery date is before the date of the order." msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:235 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:276 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:260 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:280 msgid "The item could not be updated because you are attempting to set the quantity ordered to less than 0, or the discount percent to more than 100." msgstr "" -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:280 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:284 msgid "Price for item must be entered and can not be less than 0" msgstr "" -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:287 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:269 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:291 msgid "You attempting to make the quantity ordered a quantity less than has already been delivered. The quantity delivered cannot be modified retrospectively." msgstr "" -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:313 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:294 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:316 msgid "This item cannot be deleted because some of it has already been delivered." msgstr "" -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:341 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:321 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:344 msgid "Direct delivery entry has been cancelled as requested." msgstr "" -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:343 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:347 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:323 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:327 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:346 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:350 msgid "Enter a New Sales Delivery" msgstr "" -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:345 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:325 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:348 msgid "Direct invoice entry has been cancelled as requested." msgstr "" -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:351 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:331 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:354 msgid "This order cannot be cancelled because some of it has already been invoiced or dispatched. However, the line item quantities may be modified." msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:330 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:356 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:336 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:359 msgid "This sales order has been cancelled as requested." msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:331 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:358 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:338 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:361 msgid "Enter a New Sales Order" msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:422 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:420 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:390 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:419 msgid "There are no inventory items defined in the system." msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:428 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:425 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:395 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:424 msgid "Invoice Date:" msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:429 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:426 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:396 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:425 msgid "Sales Invoice Items" msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:430 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:427 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:397 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:426 msgid "Enter Delivery Details and Confirm Invoice" msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:431 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:428 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:398 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:427 msgid "Cancel Invoice" msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:463 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:429 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:399 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:428 msgid "Place Invoice" msgstr "" -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:431 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:401 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:430 msgid "Delivery Date:" msgstr "" -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:432 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:402 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:431 msgid "Delivery Note Items" msgstr "" -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:433 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:403 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:432 msgid "Enter Delivery Details and Confirm Dispatch" msgstr "" -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:434 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:404 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:433 msgid "Cancel Delivery" msgstr "" -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:435 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:405 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:434 msgid "Place Delivery" msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:435 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:109 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:437 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:407 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:109 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:436 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:107 msgid "Order Date:" msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:436 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:438 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:408 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:437 msgid "Sales Order Items" msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:437 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:439 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:409 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:438 msgid "Enter Delivery Details and Confirm Order" msgstr "" -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:470 -#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:442 -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:412 +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:441 msgid "Commit Order Changes" msgstr "" -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:13 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:18 -msgid "Allocate Customer Payment or Credit Note" +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:464 +msgid "Validate changes and update document" msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:45 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:39 -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:43 -msgid "The entry for one or more amounts is invalid." +#: c:\Apache2\htdocs\account2/sales/sales_order_entry.php:468 +msgid "Cancels document entry or removes sales order when editing an old document" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:18 +msgid "Allocate Customer Payment or Credit Note" msgstr "" -# c:\Apache2\htdocs\account/purchasing/allocations/supplier_allocate.php:51 -# c:\Apache2\htdocs\account/sales/allocations/customer_allocate.php:45 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:50 msgid "The entry for an amount to allocate was negative. A positive allocation amount is expected." msgstr "" -#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:181 +#: c:\Apache2\htdocs\account2/sales/allocations/customer_allocate.php:173 #, php-format msgid "Allocation of %s # %d" msgstr "" -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:12 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:12 msgid "Customer Allocations" msgstr "" -# c:\Apache2\htdocs\account/sales/allocations/customer_allocation_main.php:31 -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:30 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:30 -# c:\Apache2\htdocs\account/sales/manage/customers.php:217 -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:149 #: c:\Apache2\htdocs\account2/sales/allocations/customer_allocation_main.php:31 #: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:32 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:33 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:197 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:148 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:34 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:172 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:159 msgid "Select a customer: " msgstr "" -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:109 -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:151 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:121 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:162 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:128 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:178 msgid "The selected customer has no transactions for the given dates." msgstr "" -# c:\Apache2\htdocs\account/sales/inquiry/customer_allocation_inquiry.php:151 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:163 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_allocation_inquiry.php:166 msgid "Allocation" msgstr "" @@ -10471,13 +7792,11 @@ msgstr "" msgid "Customer Transactions" msgstr "" -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:58 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:61 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:62 msgid "CUSTOMER ACCOUNT IS ON HOLD" msgstr "" -# c:\Apache2\htdocs\account/sales/inquiry/customer_inquiry.php:194 -#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:206 +#: c:\Apache2\htdocs\account2/sales/inquiry/customer_inquiry.php:217 msgid "Credit This" msgstr "" @@ -10496,19 +7815,18 @@ msgid "" "\t\t the same customer branch." msgstr "" -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:197 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:216 msgid "Delivery #" msgstr "" -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:198 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:217 msgid "Due By" msgstr "" -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:198 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_deliveries_view.php:217 msgid "Delivery Total" msgstr "" -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:16 #: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:19 msgid "Search Outstanding Sales Orders" msgstr "" @@ -10521,428 +7839,440 @@ msgstr "" msgid "Select Template for Delivery" msgstr "" -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:21 #: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:34 msgid "Search All Sales Orders" msgstr "" -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:125 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:174 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:192 msgid "Order #" msgstr "" -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:125 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:174 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:192 msgid "Cust Order #" msgstr "" -# c:\Apache2\htdocs\account/sales/inquiry/sales_orders_view.php:126 -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:175 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:193 msgid "Delivery To" msgstr "" -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:181 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:199 msgid "Tmpl" msgstr "" -#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:225 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:246 msgid "Dispatch" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/credit_status.php:7 +#: c:\Apache2\htdocs\account2/sales/inquiry/sales_orders_view.php:261 +msgid "Set this order as a template for direct deliveries/invoices" +msgstr "" + #: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:7 msgid "Credit Status" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/credit_status.php:29 -#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:29 +#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:21 msgid "The credit status description cannot be empty." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/credit_status.php:64 -#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:64 +#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:35 +msgid "New credit status has been added" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:43 +msgid "Selected credit status has been updated" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:58 msgid "Cannot delete this credit status because customer accounts have been created referring to it." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/credit_status.php:89 -#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:89 +#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:74 +msgid "Selected credit status has been deleted" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:90 msgid "Dissallow Invoices" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/credit_status.php:100 -#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:100 +#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:101 msgid "Invoice OK" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/credit_status.php:104 -#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:104 +#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:105 msgid "NO INVOICING" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/credit_status.php:118 -#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:118 -msgid "New Credit Status" -msgstr "" - -# c:\Apache2\htdocs\account/sales/manage/credit_status.php:138 -#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:138 +#: c:\Apache2\htdocs\account2/sales/manage/credit_status.php:140 msgid "Dissallow invoicing ?" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:57 -# c:\Apache2\htdocs\account/sales/manage/customers.php:7 #: c:\Apache2\htdocs\account2/sales/manage/customers.php:7 msgid "Customers" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:30 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:29 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:20 msgid "The customer name cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:35 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:26 msgid "The credit limit must be numeric and not less than zero." msgstr "" -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:41 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:32 msgid "The payment discount must be numeric and is expected to be less than 100% and greater than or equal to 0." msgstr "" -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:47 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:38 msgid "The discount percentage must be numeric and is expected to be less than 100% and greater than or equal to 0." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:101 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:81 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:73 msgid "Customer has been updated." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:123 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:103 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:95 msgid "A new customer has been added." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:125 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:105 -msgid "Add branches for this customer" -msgstr "" - -# c:\Apache2\htdocs\account/sales/manage/customers.php:156 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:136 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:126 msgid "This customer cannot be deleted because there are transactions that refer to it." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:166 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:146 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:136 msgid "Cannot delete the customer record because orders have been created against it." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:176 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:156 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:146 msgid "Cannot delete this customer because there are branch records set up against it." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:209 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:189 -msgid "There are no sales types defined. Please define at least one sales type before adding a customer." +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:157 +msgid "Selected customer has been deleted." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:218 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:198 -msgid "Edit Customer" +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:165 +msgid "There are no sales types defined. Please define at least one sales type before adding a customer." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:227 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:207 -msgid "Enter a new customer" +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:173 +msgid "New customer" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:273 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:253 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:223 msgid "Customer Name:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:277 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:257 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:227 msgid "GSTNo:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:283 -# c:\Apache2\htdocs\account/sales/manage/customers.php:287 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:263 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:267 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:233 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:237 msgid "Customer's Currency:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:296 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:276 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:246 msgid "Sales Type/Price List:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:307 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:287 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:257 msgid "Discount Percent:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:308 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:288 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:258 msgid "Prompt Payment Discount Percent:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:309 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:289 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:259 msgid "Credit Limit:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:312 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:292 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:262 msgid "Credit Status:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:320 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:300 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:265 +msgid "Customer branches" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:266 +msgid "Add or Edit" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:275 msgid "Add New Customer" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:324 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:304 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:279 msgid "Update Customer" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customers.php:325 -#: c:\Apache2\htdocs\account2/sales/manage/customers.php:305 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:280 +msgid "Update customer data" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:281 msgid "Delete Customer" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:14 +#: c:\Apache2\htdocs\account2/sales/manage/customers.php:282 +msgid "Delete customer data if have been never used" +msgstr "" + #: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:13 msgid "There are no customers defined in the system. Please define a customer to add customer branches." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:16 #: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:15 msgid "There are no sales people defined in the system. At least one sales person is required before proceeding." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:18 #: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:17 msgid "There are no sales areas defined in the system. At least one sales area is required before proceeding." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:20 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:19 -msgid "There are no shipping companies defined in the system. At least one shipping company is required before proceeding." +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:19 +msgid "There are no shipping companies defined in the system. At least one shipping company is required before proceeding." +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:51 +msgid "The Branch name cannot be empty." +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:82 +msgid "Selected customer branch has been updated" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:56 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:55 -msgid "The Branch name cannot be empty." +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:105 +msgid "New customer branch has been added" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:125 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:124 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:126 msgid "Cannot delete this branch because customer transactions have been created to this branch." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:136 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:135 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:137 msgid "Cannot delete this branch because sales orders exist for it. Purge old sales orders first." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:169 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:168 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:143 +msgid "Selected customer branch has been deleted" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:180 msgid "Contact" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:169 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:168 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:180 msgid "Sales Person" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:169 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:168 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:180 msgid "Area" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:170 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:169 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:181 msgid "Phone No" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:170 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:169 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:181 msgid "Fax No" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_credit_invoice.php:263 -# c:\Apache2\htdocs\account/sales/customer_invoice.php:326 -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:170 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:169 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:181 msgid "Tax Group" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:192 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:55 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:191 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:202 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:203 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:193 msgid "The selected customer does not have any branches. Please create at least one branch." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:200 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:199 -msgid "New Customer Branch" -msgstr "" - -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:248 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:247 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:251 msgid "Main Branch" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:267 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:266 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:273 msgid "Name and Contact" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:269 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:268 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:275 msgid "Branch Name:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:273 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:272 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:279 msgid "Fax Number:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:275 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:274 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:281 msgid "E-mail:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:279 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:278 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:285 msgid "Sales Person:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:281 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:280 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:287 msgid "Sales Area:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:283 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:282 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:289 msgid "Default Inventory Location:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:285 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:284 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:291 msgid "Default Shipping Company:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:289 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:288 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:295 msgid "Disable this Branch:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:307 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:306 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:310 +msgid "Accounts Receivable Account:" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:314 msgid "Addresses" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:309 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:308 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:316 msgid "Mailing Address:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/customer_branches.php:311 -#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:310 +#: c:\Apache2\htdocs\account2/sales/manage/customer_branches.php:318 msgid "Billing Address:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/sales_areas.php:29 -#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:29 +#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:22 msgid "The area description cannot be empty." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/sales_areas.php:63 -#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:63 +#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:31 +msgid "Selected sales area has been updated" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:36 +msgid "New sales area has been added" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:58 msgid "Cannot delete this area because customer branches have been created using this area." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/sales_areas.php:80 -#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:80 -msgid "Area Name" +#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:65 +msgid "Selected sales area has been deleted" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/sales_areas.php:97 -#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:97 -msgid "New Sales Area" +#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:82 +msgid "Area Name" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/sales_areas.php:117 -#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:117 +#: c:\Apache2\htdocs\account2/sales/manage/sales_areas.php:122 msgid "Area Name:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/sales_people.php:31 -#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:31 +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:23 msgid "The sales person name cannot be empty." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/sales_people.php:111 -#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:119 -msgid "New Sales Person" +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:29 +msgid "Salesman provision cannot be less than 0 or more than 100%." +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:34 +msgid "Salesman provision breakpoint must be numeric and not less than 0." +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:68 +msgid "Selected sales person data have been updated" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:70 +msgid "New sales person data have been added" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:91 +msgid "Selected sales person data have been deleted" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/sales_people.php:135 -#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:146 +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:165 msgid "Sales person name:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/sales_people.php:136 -#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:147 +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:166 msgid "Telephone number:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/sales_people.php:137 -#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:148 +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:167 msgid "Fax number:" msgstr "" -#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:151 +#: c:\Apache2\htdocs\account2/sales/manage/sales_people.php:170 msgid "Break Pt.:" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/sales_types.php:29 -#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:29 +#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:19 msgid "The sales type description cannot be empty." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/sales_types.php:65 -#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:65 +#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:26 +msgid "Calculation factor must be valid positive number." +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:39 +msgid "New sales type has been added" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:50 +msgid "Selected sales type has been updated" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:67 msgid "Cannot delete this sale type because customer transactions have been created using this sales type." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/sales_types.php:78 -#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:78 +#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:80 msgid "Cannot delete this sale type because customers are currently set up to use this sales type." msgstr "" -# c:\Apache2\htdocs\account/sales/manage/sales_types.php:94 -#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:94 +#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:85 +msgid "Selected sales type has been deleted" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:103 msgid "Type Name" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/sales_types.php:111 -#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:112 -msgid "New Sales type" +#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:103 +msgid "Factor" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:103 +msgid "Tax Incl" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:116 +msgid "Base" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:126 +msgid "Marked sales type is the company base pricelist for prices calculations." +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:153 +msgid "Sales Type Name" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:154 +msgid "Calculation factor" msgstr "" -# c:\Apache2\htdocs\account/sales/manage/sales_types.php:127 -#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:131 -msgid "Sales Type Name:" +#: c:\Apache2\htdocs\account2/sales/manage/sales_types.php:155 +msgid "Tax included" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_credit.php:15 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:15 msgid "View Credit Note" msgstr "" @@ -10952,9 +8282,6 @@ msgstr "" msgid "CREDIT NOTE #%d" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_credit.php:59 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:70 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:101 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:59 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:68 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:101 @@ -10962,26 +8289,19 @@ msgstr "" msgid "Ref" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_credit.php:116 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:117 msgid "There are no line items on this credit note." msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_credit.php:129 -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:142 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:168 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:65 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:152 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:129 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:147 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:147 -#: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:201 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:76 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:160 +#: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:202 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:77 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:206 msgid "Shipping" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_credit.php:134 #: c:\Apache2\htdocs\account2/sales/view/view_credit.php:134 msgid "TOTAL CREDIT" msgstr "" @@ -10995,38 +8315,29 @@ msgstr "" msgid "DISPATCH NOTE #%d" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:38 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:6 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:42 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:42 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:6 msgid "Charge To" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:52 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:56 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:56 msgid "Charge Branch" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:61 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:7 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:65 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:65 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:7 msgid "Delivered To" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:74 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:18 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:78 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:78 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:18 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:19 msgid "Our Order No" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:78 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:46 #: c:\Apache2\htdocs\account2/sales/view/view_dispatch.php:82 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:82 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:43 @@ -11049,7 +8360,6 @@ msgstr "" msgid "This dispatch has been voided." msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:7 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:14 msgid "View Sales Invoice" msgstr "" @@ -11059,12 +8369,10 @@ msgstr "" msgid "SALES INVOICE #%d" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_invoice.php:134 #: c:\Apache2\htdocs\account2/sales/view/view_invoice.php:139 msgid "There are no line items on this invoice." msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_receipt.php:7 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:7 msgid "View Customer Payment" msgstr "" @@ -11074,29 +8382,22 @@ msgstr "" msgid "Customer Payment #%d" msgstr "" -# c:\Apache2\htdocs\account/reporting/reports_main.php:21 -# c:\Apache2\htdocs\account/reporting/reports_main.php:27 -# c:\Apache2\htdocs\account/sales/view/view_receipt.php:25 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:25 msgid "From Customer" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_receipt.php:26 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:26 msgid "Into Bank Account" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_receipt.php:27 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:27 msgid "Date of Deposit" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_receipt.php:42 #: c:\Apache2\htdocs\account2/sales/view/view_receipt.php:42 msgid "This customer payment has been voided." msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:17 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:17 msgid "View Sales Order" msgstr "" @@ -11106,404 +8407,422 @@ msgstr "" msgid "Sales Order #%d" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:33 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:30 msgid "Order Information" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:43 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:40 msgid "Customer Name" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:47 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:44 msgid "Deliver To Branch" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:50 -# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:19 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:47 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:19 msgid "Ordered On" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:51 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:48 msgid "Requested Delivery" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:54 -# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:14 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:228 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:51 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:14 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:230 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:232 msgid "Order Currency" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:55 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:52 msgid "Deliver From Location" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:58 -# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:51 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:257 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:55 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:51 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:259 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:261 msgid "Delivery Address" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:60 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:57 msgid "Telephone" msgstr "" #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:66 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2091 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1634 msgid "Delivery Notes" msgstr "" -# c:\Apache2\htdocs\account/applications/customers.php:14 -# c:\Apache2\htdocs\account/sales/sales_order_entry.php:25 -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:35 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1851 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:99 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2087 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1630 msgid "Sales Invoices" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:37 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1854 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1867 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:130 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2090 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2107 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1633 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1651 msgid "Credit Notes" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:141 #: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:173 msgid "Quantity Delivered" msgstr "" -#: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:203 +#: c:\Apache2\htdocs\account2/sales/view/view_sales_order.php:204 msgid "Total Order Value" msgstr "" -#: c:\Apache2\htdocs\account2/sql/sales_order_entry.php:264 -msgid "Price for item must be entered and can not be less then 0" +#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:26 +msgid "The item tax type description cannot be empty." +msgstr "" + +#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:51 +msgid "Selected item tax type has been updated" msgstr "" -# c:\Apache2\htdocs\account/taxes/item_tax_types.php:34 -#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:34 -msgid "The item tax type description cannot be empty." +#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:56 +msgid "New item tax type has been added" msgstr "" -# c:\Apache2\htdocs\account/taxes/item_tax_types.php:78 -#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:79 +#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:71 msgid "Cannot delete this item tax type because items have been created referring to it." msgstr "" -# c:\Apache2\htdocs\account/taxes/item_tax_types.php:103 -#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:104 -msgid "Tax exempt" +#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:87 +msgid "Selected item tax type has been deleted" msgstr "" -# c:\Apache2\htdocs\account/taxes/item_tax_types.php:132 -#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:134 -msgid "New Item Tax type" +#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:103 +msgid "Tax exempt" msgstr "" -# c:\Apache2\htdocs\account/taxes/item_tax_types.php:165 -#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:167 +#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:164 msgid "Is Fully Tax-exempt:" msgstr "" -# c:\Apache2\htdocs\account/taxes/item_tax_types.php:172 -#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:174 +#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:171 msgid "Select which taxes this item tax type is exempt from." msgstr "" -# c:\Apache2\htdocs\account/taxes/item_tax_types.php:175 -#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:177 +#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:174 msgid "Tax Name" msgstr "" -#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:177 +#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:174 msgid "Rate" msgstr "" -# c:\Apache2\htdocs\account/taxes/item_tax_types.php:175 -#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:177 +#: c:\Apache2\htdocs\account2/taxes/item_tax_types.php:174 msgid "Is exempt" msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_groups.php:27 -#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:27 +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:18 msgid "There are no tax types defined. Define tax types before defining tax groups." msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_groups.php:40 -#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:40 +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:31 msgid "The tax group name cannot be empty." msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_groups.php:51 -#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:52 +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:43 msgid "An entered tax rate is invalid or less than zero." msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_groups.php:108 -#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:105 +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:72 +msgid "Selected tax group has been updated" +msgstr "" + +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:77 +msgid "New tax group has been added" +msgstr "" + +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:95 msgid "Cannot delete this tax group because customer branches been created referring to it." msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_groups.php:117 -#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:114 +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:104 msgid "Cannot delete this tax group because suppliers been created referring to it." msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_groups.php:143 -#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:140 -msgid "Tax Shipping" +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:121 +msgid "Selected tax group has been deleted" msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_groups.php:171 -#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:168 -msgid "New Tax Group" +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:137 +msgid "Tax Shipping" msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_groups.php:203 -#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:199 +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:195 msgid "Tax Shipping:" msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_groups.php:207 -#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:203 +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:199 msgid "Select the taxes that are included in this group." msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_groups.php:210 -# c:\Apache2\htdocs\account/taxes/tax_types.php:98 -#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:206 -#: c:\Apache2\htdocs\account2/taxes/tax_types.php:95 +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:202 +#: c:\Apache2\htdocs\account2/taxes/tax_types.php:97 msgid "Default Rate (%)" msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_groups.php:210 -#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:206 +#: c:\Apache2\htdocs\account2/taxes/tax_groups.php:202 msgid "Rate (%)" msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_types.php:7 #: c:\Apache2\htdocs\account2/taxes/tax_types.php:6 msgid "Tax Types" msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_types.php:26 -#: c:\Apache2\htdocs\account2/taxes/tax_types.php:25 +#: c:\Apache2\htdocs\account2/taxes/tax_types.php:18 msgid "The tax type name cannot be empty." msgstr "" -#: c:\Apache2\htdocs\account2/taxes/tax_types.php:31 +#: c:\Apache2\htdocs\account2/taxes/tax_types.php:24 msgid "The default tax rate must be numeric and not less than zero." msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_types.php:72 -#: c:\Apache2\htdocs\account2/taxes/tax_types.php:68 +#: c:\Apache2\htdocs\account2/taxes/tax_types.php:39 +msgid "New tax type has been added" +msgstr "" + +#: c:\Apache2\htdocs\account2/taxes/tax_types.php:50 +msgid "Selected tax type has been updated" +msgstr "" + +#: c:\Apache2\htdocs\account2/taxes/tax_types.php:63 msgid "Cannot delete this tax type because tax groups been created referring to it." msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_types.php:99 -#: c:\Apache2\htdocs\account2/taxes/tax_types.php:96 -msgid "Sales GL Account" +#: c:\Apache2\htdocs\account2/taxes/tax_types.php:80 +msgid "Selected tax type has been deleted" msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_types.php:99 -#: c:\Apache2\htdocs\account2/taxes/tax_types.php:96 -msgid "Purchasing GL Account" +#: c:\Apache2\htdocs\account2/taxes/tax_types.php:98 +msgid "Sales GL Account" msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_types.php:127 -#: c:\Apache2\htdocs\account2/taxes/tax_types.php:120 -msgid "New Tax Type" +#: c:\Apache2\htdocs\account2/taxes/tax_types.php:98 +msgid "Purchasing GL Account" msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_types.php:150 -#: c:\Apache2\htdocs\account2/taxes/tax_types.php:142 +#: c:\Apache2\htdocs\account2/taxes/tax_types.php:144 msgid "Default Rate:" msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_types.php:152 -#: c:\Apache2\htdocs\account2/taxes/tax_types.php:144 +#: c:\Apache2\htdocs\account2/taxes/tax_types.php:146 msgid "Sales GL Account:" msgstr "" -# c:\Apache2\htdocs\account/taxes/tax_types.php:153 -#: c:\Apache2\htdocs\account2/taxes/tax_types.php:145 +#: c:\Apache2\htdocs\account2/taxes/tax_types.php:147 msgid "Purchasing GL Account:" msgstr "" -# c:\Apache2\htdocs\account/themes/aqua/renderer.php:6 -# c:\Apache2\htdocs\account/themes/cool/renderer.php:7 -# c:\Apache2\htdocs\account/themes/default/renderer.php:7 -#: c:\Apache2\htdocs\account2/themes/aqua/renderer.php:6 +#: c:\Apache2\htdocs\account2/themes/aqua/renderer.php:7 #: c:\Apache2\htdocs\account2/themes/cool/renderer.php:7 #: c:\Apache2\htdocs\account2/themes/default/renderer.php:7 +#: c:\Apache2\htdocs\account2/themes/fancy/renderer.php:7 +#: c:\Apache2\htdocs\account2/themes/newwave/renderer.php:6 +#: c:\Apache2\htdocs\account2/themes/picme/renderer.php:7 #: c:\Apache2\htdocs\account2/includes/page/header.inc:18 msgid "Main Menu" msgstr "" -# c:\Apache2\htdocs\account/dimensions/includes/dimensions_ui.inc:17 +#: c:\Apache2\htdocs\account2/themes/aqua/renderer.php:50 +#: c:\Apache2\htdocs\account2/themes/cool/renderer.php:50 +#: c:\Apache2\htdocs\account2/themes/default/renderer.php:50 +#: c:\Apache2\htdocs\account2/themes/fancy/renderer.php:29 +#: c:\Apache2\htdocs\account2/themes/picme/renderer.php:29 +msgid "Preferences" +msgstr "" + +#: c:\Apache2\htdocs\account2/themes/aqua/renderer.php:55 +#: c:\Apache2\htdocs\account2/themes/cool/renderer.php:55 +#: c:\Apache2\htdocs\account2/themes/default/renderer.php:55 +#: c:\Apache2\htdocs\account2/themes/fancy/renderer.php:32 +#: c:\Apache2\htdocs\account2/themes/picme/renderer.php:32 +msgid "Help" +msgstr "" + #: c:\Apache2\htdocs\account2/dimensions/includes/dimensions_ui.inc:17 msgid "There are no transactions for this dimension." msgstr "" -# c:\Apache2\htdocs\account/dimensions/includes/dimensions_ui.inc:21 #: c:\Apache2\htdocs\account2/dimensions/includes/dimensions_ui.inc:21 msgid "Transactions for this Dimension" msgstr "" -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:48 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:48 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:48 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:48 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:43 +msgid "Pay To:" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:48 +msgid "To the Order of:" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:52 msgid "Work Order:" msgstr "" -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:54 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:54 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:19 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:186 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:54 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:54 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:19 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:178 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:58 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:20 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:175 msgid "Customer:" msgstr "" -# c:\Apache2\htdocs\account/gl/includes/ui/gl_deposit_ui.inc:228 -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:175 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_deposit_ui.inc:228 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:145 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:90 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:79 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:50 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:194 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:183 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:127 +msgid "Edit document line" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:147 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:92 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:81 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:52 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:227 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:196 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:185 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:129 +msgid "Remove line from document" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:238 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:177 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:156 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:136 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:118 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:329 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:272 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:377 +msgid "Confirm changes" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:240 #: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:179 -msgid "Add item" +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:158 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:138 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:120 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:331 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:274 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:379 +msgid "Cancel changes" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:245 +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:183 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:164 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:144 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:126 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:336 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:280 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:385 +msgid "Add Item" +msgstr "" + +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_bank_ui.inc:246 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:165 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:145 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:127 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:337 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:281 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:386 +msgid "Add new item to document" msgstr "" -# c:\Apache2\htdocs\account/gl/includes/ui/gl_journal_ui.inc:27 #: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:27 msgid "Reverse Transaction:" msgstr "" -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:40 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:40 -msgid "Pay To:" +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:88 +msgid "Edit journal line" msgstr "" -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:45 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:45 -msgid "To the Order of:" +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:90 +msgid "Remove line from journal" msgstr "" -# c:\Apache2\htdocs\account/gl/includes/ui/gl_payment_ui.inc:226 -# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:163 -# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:147 -# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:130 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:325 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:217 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:332 -#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_payment_ui.inc:229 -#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:165 -#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:147 -#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:130 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:334 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:237 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:372 -msgid "Add Item" +#: c:\Apache2\htdocs\account2/gl/includes/ui/gl_journal_ui.inc:184 +msgid "Add new line to journal" +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/current_user.inc:268 +msgid "Requesting data..." +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/errors.inc:44 +msgid "in file" +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/errors.inc:44 +msgid "at line " msgstr "" -# c:\Apache2\htdocs\account/includes/errors.inc:8 -#: c:\Apache2\htdocs\account2/includes/errors.inc:8 +#: c:\Apache2\htdocs\account2/includes/errors.inc:77 msgid "DATABASE ERROR :" msgstr "" -# c:\Apache2\htdocs\account/includes/errors.inc:33 -#: c:\Apache2\htdocs\account2/includes/errors.inc:33 +#: c:\Apache2\htdocs\account2/includes/errors.inc:104 msgid "The entered information is a duplicate. Please go back and enter different values." msgstr "" -# c:\Apache2\htdocs\account/includes/errors.inc:34 -# c:\Apache2\htdocs\account/includes/session.inc:39 -# c:\Apache2\htdocs\account/includes/session.inc:66 -# c:\Apache2\htdocs\account/includes/ui/ui_controls.inc:64 -#: c:\Apache2\htdocs\account2/includes/errors.inc:34 -#: c:\Apache2\htdocs\account2/includes/session.inc:58 -#: c:\Apache2\htdocs\account2/includes/session.inc:85 -#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:66 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:660 -msgid "Back" +#: c:\Apache2\htdocs\account2/includes/main.inc:31 +msgid "This page is usable only with javascript enabled browsers." msgstr "" -# c:\Apache2\htdocs\account/includes/session.inc:35 -#: c:\Apache2\htdocs\account2/includes/session.inc:54 +#: c:\Apache2\htdocs\account2/includes/session.inc:69 msgid "Incorrect Password" msgstr "" -# c:\Apache2\htdocs\account/includes/session.inc:36 -#: c:\Apache2\htdocs\account2/includes/session.inc:55 +#: c:\Apache2\htdocs\account2/includes/session.inc:70 msgid "The user and password combination is not valid for the system." msgstr "" -# c:\Apache2\htdocs\account/includes/session.inc:38 -#: c:\Apache2\htdocs\account2/includes/session.inc:57 +#: c:\Apache2\htdocs\account2/includes/session.inc:72 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\account/includes/session.inc:53 -#: c:\Apache2\htdocs\account2/includes/session.inc:72 +#: c:\Apache2\htdocs\account2/includes/session.inc:73 +#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:67 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:630 +msgid "Back" +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/session.inc:87 msgid "Security settings have not been defined for your user account." msgstr "" -# c:\Apache2\htdocs\account/includes/session.inc:54 -#: c:\Apache2\htdocs\account2/includes/session.inc:73 +#: c:\Apache2\htdocs\account2/includes/session.inc:88 msgid "Please contact your system administrator." msgstr "" -# c:\Apache2\htdocs\account/includes/session.inc:62 -#: c:\Apache2\htdocs\account2/includes/session.inc:81 +#: c:\Apache2\htdocs\account2/includes/session.inc:96 msgid "Access denied" msgstr "" -# c:\Apache2\htdocs\account/includes/session.inc:64 -#: c:\Apache2\htdocs\account2/includes/session.inc:83 +#: c:\Apache2\htdocs\account2/includes/session.inc:98 msgid "The security settings on your account do not permit you to access this function" msgstr "" -# c:\Apache2\htdocs\account/includes/types.inc:7 #: c:\Apache2\htdocs\account2/includes/types.inc:7 msgid "Bank Payment" msgstr "" -# c:\Apache2\htdocs\account/includes/types.inc:8 #: c:\Apache2\htdocs\account2/includes/types.inc:8 msgid "Bank Deposit" msgstr "" -# c:\Apache2\htdocs\account/includes/types.inc:9 #: c:\Apache2\htdocs\account2/includes/types.inc:9 msgid "Funds Transfer" msgstr "" -# c:\Apache2\htdocs\account/includes/types.inc:10 -# c:\Apache2\htdocs\account/reporting/includes/form_types.inc:5 #: c:\Apache2\htdocs\account2/includes/types.inc:10 msgid "Sales Invoice" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_receipt.php:20 -# c:\Apache2\htdocs\account/includes/types.inc:12 #: c:\Apache2\htdocs\account2/includes/types.inc:12 msgid "Customer Payment" msgstr "" @@ -11512,970 +8831,881 @@ msgstr "" msgid "Delivery Note" msgstr "" -# c:\Apache2\htdocs\account/includes/types.inc:13 #: c:\Apache2\htdocs\account2/includes/types.inc:14 msgid "Location Transfer" msgstr "" -# c:\Apache2\htdocs\account/includes/types.inc:14 #: c:\Apache2\htdocs\account2/includes/types.inc:15 msgid "Inventory Adjustment" msgstr "" -# c:\Apache2\htdocs\account/includes/types.inc:16 #: c:\Apache2\htdocs\account2/includes/types.inc:17 msgid "Supplier Invoice" msgstr "" -# c:\Apache2\htdocs\account/includes/types.inc:18 #: c:\Apache2\htdocs\account2/includes/types.inc:19 msgid "Supplier Payment" msgstr "" -# c:\Apache2\htdocs\account/includes/types.inc:20 -# c:\Apache2\htdocs\account/includes/types.inc:138 -# c:\Apache2\htdocs\account/reporting/includes/form_types.inc:11 #: c:\Apache2\htdocs\account2/includes/types.inc:21 #: c:\Apache2\htdocs\account2/includes/types.inc:144 msgid "Work Order" msgstr "" -# c:\Apache2\htdocs\account/includes/types.inc:21 -# c:\Apache2\htdocs\account/reporting/includes/form_types.inc:12 #: c:\Apache2\htdocs\account2/includes/types.inc:22 msgid "Work Order Issue" msgstr "" -# c:\Apache2\htdocs\account/includes/types.inc:22 -# c:\Apache2\htdocs\account/reporting/includes/form_types.inc:13 #: c:\Apache2\htdocs\account2/includes/types.inc:23 msgid "Work Order Production" msgstr "" -# c:\Apache2\htdocs\account/sales/view/view_sales_order.php:19 -# c:\Apache2\htdocs\account/includes/types.inc:23 -# c:\Apache2\htdocs\account/reporting/includes/form_types.inc:7 #: c:\Apache2\htdocs\account2/includes/types.inc:24 msgid "Sales Order" msgstr "" -# c:\Apache2\htdocs\account/includes/types.inc:24 #: c:\Apache2\htdocs\account2/includes/types.inc:25 msgid "Cost Update" msgstr "" -# c:\Apache2\htdocs\account/includes/types.inc:107 #: c:\Apache2\htdocs\account2/includes/types.inc:113 msgid "Savings Account" msgstr "" -# c:\Apache2\htdocs\account/includes/types.inc:108 #: c:\Apache2\htdocs\account2/includes/types.inc:114 msgid "Chequing Account" msgstr "" -# c:\Apache2\htdocs\account/includes/types.inc:109 #: c:\Apache2\htdocs\account2/includes/types.inc:115 msgid "Credit Account" msgstr "" -# c:\Apache2\htdocs\account/includes/types.inc:110 #: c:\Apache2\htdocs\account2/includes/types.inc:116 msgid "Cash Account" msgstr "" -# c:\Apache2\htdocs\account/includes/types.inc:251 #: c:\Apache2\htdocs\account2/includes/types.inc:257 msgid "Assemble" msgstr "" -# c:\Apache2\htdocs\account/includes/types.inc:252 #: c:\Apache2\htdocs\account2/includes/types.inc:258 msgid "Unassemble" msgstr "" -# c:\Apache2\htdocs\account/includes/types.inc:253 #: c:\Apache2\htdocs\account2/includes/types.inc:259 msgid "Advanced Manufacture" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_controls.inc:51 -#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:53 +#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:54 msgid "You should automatically be forwarded." msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_controls.inc:52 -#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:54 +#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:55 msgid "If this does not happen" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_controls.inc:52 -#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:54 +#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:55 msgid "click here" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_controls.inc:52 -#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:54 +#: c:\Apache2\htdocs\account2/includes/ui/ui_controls.inc:55 msgid "to continue" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:28 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:32 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:65 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:69 +#: c:\Apache2\htdocs\account2/includes/ui/ui_input.inc:147 +msgid "Add new" +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/ui/ui_input.inc:421 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:166 +msgid "Click Here to Pick up the date" +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:9 +msgid "Set filter" +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:12 +msgid "Select" +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:72 +msgid "Press Space tab for search pattern entry" +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:76 +msgid "Enter code fragment to search or * for all" +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:77 +msgid "Enter description fragment to search or * for all" +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:329 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1152 msgid "All Suppliers" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:103 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:107 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:172 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:176 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:333 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:374 +msgid "Press Space tab to filter by name fragment" +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:334 +msgid "Select supplier" +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:370 msgid "All Customers" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:186 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:254 -msgid "All Branches" +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:375 +msgid "Select customer" +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:411 +msgid "All branches" +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:414 +msgid "Select customer branch" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:256 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:327 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:447 msgid "All Locations" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:538 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:542 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:613 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:617 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:726 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:757 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:770 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:799 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:655 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:659 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:730 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:734 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:848 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:879 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:937 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:941 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:998 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:527 +#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:149 +#: c:\Apache2\htdocs\account2/reporting/includes/backup/pdf_report.inc:162 +#: c:\Apache2\htdocs\account2/reporting/includes/backup2/pdf_report.inc:162 +msgid "Active" +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:604 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:651 msgid "All Items" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:819 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1019 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:788 msgid "Purchased" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:820 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1020 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:789 msgid "Service" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1160 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1164 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1367 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1371 -msgid "All Work Centres" +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1069 +msgid "All Sales Types" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1850 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1863 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2086 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2103 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1319 +msgid "Use Item Sales Accounts" +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1629 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1647 msgid "All Types" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1852 -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1865 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2088 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2105 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1631 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1649 msgid "Overdue Invoices" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1864 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2104 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1648 msgid "Invoices" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1868 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2108 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1652 msgid "Overdue Credit Notes" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1883 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2124 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1665 msgid "Automatically put balance on back order" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_lists.inc:1884 -#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:2125 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1666 msgid "Cancel any quantites not delivered" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_msgs.inc:59 -#: c:\Apache2\htdocs\account2/includes/ui/ui_msgs.inc:59 +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1684 +msgid "Items Returned to Inventory Location" +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/ui/ui_lists.inc:1685 +msgid "Items Written Off" +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/ui/ui_msgs.inc:54 msgid "in units of : " msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:301 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:313 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:278 +msgid "Get daily ECB exchange rate and save for later use in invoicing process" +msgstr "" + +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:320 msgid "Date Voided:" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:392 -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:408 -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:426 -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:66 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:404 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:420 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:438 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:77 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:411 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:427 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:445 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:78 msgid "Included" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:463 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:475 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:481 msgid "Total Amount" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:485 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:497 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:503 msgid "Total Allocated:" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:489 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:501 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:507 msgid "Left to Allocate:" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:650 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627 msgid "January" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:650 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627 msgid "February" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:650 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627 msgid "March" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:650 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627 msgid "April" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:650 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627 msgid "May" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:650 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627 msgid "June" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:651 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627 msgid "July" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:651 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627 msgid "August" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:651 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627 msgid "September" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:651 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627 msgid "October" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:651 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627 msgid "November" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:651 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:658 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:627 msgid "December" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:652 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:659 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:628 msgid "Su" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:652 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:659 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:628 msgid "Mo" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:652 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:659 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:628 msgid "Tu" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:652 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:659 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:628 msgid "We" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:652 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:659 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:628 msgid "Th" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:652 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:659 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:628 msgid "Fr" msgstr "" -# c:\Apache2\htdocs\account/includes/ui/ui_view.inc:652 -#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:659 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:628 msgid "Sa" msgstr "" -# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:17 -# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:17 -# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:17 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:17 -#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:17 -#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:17 -#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:17 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:15 +#: c:\Apache2\htdocs\account2/includes/ui/ui_view.inc:629 +msgid "W" +msgstr "" + +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:11 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:11 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:11 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:14 msgid "For Part :" msgstr "" -# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:53 -#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:53 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:42 msgid "Detail:" msgstr "" -# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:58 -#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:58 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:47 msgid "Positive Adjustment" msgstr "" -# c:\Apache2\htdocs\account/inventory/includes/item_adjustments_ui.inc:58 -#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:58 +#: c:\Apache2\htdocs\account2/inventory/includes/item_adjustments_ui.inc:47 msgid "Negative Adjustment" msgstr "" -# c:\Apache2\htdocs\account/inventory/includes/stock_transfers_ui.inc:38 -#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:38 +#: c:\Apache2\htdocs\account2/inventory/includes/stock_transfers_ui.inc:27 msgid "To Location:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:15 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:15 msgid "The bill of material for this item is empty." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:22 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:54 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:22 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:54 msgid "Total Cost" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:70 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:70 msgid "There are no Requirements for this Order." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:77 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:77 msgid "Unit Quantity" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:77 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:77 msgid "Total Quantity" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:77 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:77 msgid "Units Issued" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:77 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:77 msgid "On Hand" msgstr "" -# c:\Apache2\htdocs\account/sales/customer_invoice.php:469 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:130 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:130 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:131 msgid "Marked items have insufficient quantities in stock." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:144 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:144 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:145 msgid "There are no Productions for this Order." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:187 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:187 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:188 msgid "There are no Issues for this Order." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:223 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:223 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:224 msgid "There are no Payments for this Order." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:268 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:272 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:323 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:268 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:272 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:323 -msgid "Manufactured Item" -msgstr "" - -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:269 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:273 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:324 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:269 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:273 #: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:324 +msgid "Manufactured Item" +msgstr "" + +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:270 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:274 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:325 msgid "Into Location" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:303 -# c:\Apache2\htdocs\account/manufacturing/includes/manufacturing_ui.inc:348 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:303 -#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:348 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:304 +#: c:\Apache2\htdocs\account2/manufacturing/includes/manufacturing_ui.inc:349 msgid "This work order is closed." msgstr "" -# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:150 -#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:150 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:146 msgid "Return Items to Location" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:150 -#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:150 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:146 msgid "Issue Items to Work order" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:153 -#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:153 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:149 msgid "To Work Centre:" msgstr "" -# c:\Apache2\htdocs\account/manufacturing/includes/work_order_issue_ui.inc:155 -#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:155 +#: c:\Apache2\htdocs\account2/manufacturing/includes/work_order_issue_ui.inc:151 msgid "Issue Date:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:16 +#: c:\Apache2\htdocs\account2/purchasing/includes/db/invoice_db.inc:202 +#: c:\Apache2\htdocs\account2/purchasing/includes/db/invoice_db.inc:206 +msgid "Cost diff." +msgstr "" + #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:16 msgid "For Purchase Order" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:32 -# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:44 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:243 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:248 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:32 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:44 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:245 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:250 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:247 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:252 msgid "Deliver Into Location" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:38 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:38 msgid "Date Items Received" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/grn_ui.inc:54 -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:261 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/grn_ui.inc:54 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:263 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:265 msgid "Order Comments" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:79 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:77 msgid "Supplier's Ref.:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:91 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:89 msgid "Terms:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:130 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:124 msgid "Sub-total:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:138 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:132 msgid "Invoice Total:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:140 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:134 msgid "Credit Note Total:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:179 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:173 msgid "GL Items for this Invoice" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:181 #: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:175 msgid "GL Items for this Credit Note" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:287 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:281 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:182 +msgid "Moves to additional costs posting page" +msgstr "" + +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:284 msgid "Received Items Charged on this Invoice" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:289 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:283 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:286 msgid "Received Items Credited on this Note" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/invoice_ui.inc:302 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:296 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:292 +msgid "Moves to GRN selection page" +msgstr "" + +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:300 msgid "Delivery Sequence #" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:80 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:80 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/invoice_ui.inc:324 +msgid "Remove item from document" +msgstr "" + +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:78 msgid "Supplier Currency:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:111 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:111 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:109 msgid "Supplier's Reference:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:119 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:119 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:117 msgid "Receive Into:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:123 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:123 -msgid "Get Address" -msgstr "" - -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:146 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:146 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:143 msgid "The default stock location set up for this user is not a currently defined stock location. Your system administrator needs to amend your user record." msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:150 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:150 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:147 msgid "Deliver to:" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:163 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:163 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:160 msgid "Order Items" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:168 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:168 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:396 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:166 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:410 msgid "Required Delivery Date" msgstr "" -# c:\Apache2\htdocs\account/purchasing/includes/ui/po_ui.inc:209 -#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:211 +#: c:\Apache2\htdocs\account2/purchasing/includes/ui/po_ui.inc:212 msgid "Total Excluding Shipping/Tax" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:4 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:4 msgid "Cust no" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:13 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:13 msgid "Your Ref" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:14 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:14 msgid "Our Ref." msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:15 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:15 msgid "Your VAT no." msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:16 #: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:16 msgid "Our VAT No." msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:19 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:19 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:18 +msgid "Customers Reference:" +msgstr "" + +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:20 msgid "Domicile" msgstr "" -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:22 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:23 msgid "All amounts stated in" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:20 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:25 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:26 msgid "Please quote Invoice no. when paying. All amounts stated in" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:22 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:28 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:29 msgid "Phone/Fax/Email" msgstr "" -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:31 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:63 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:32 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:64 msgid "You can pay through" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:45 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:54 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:55 msgid "DueDate" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:51 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:60 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:61 msgid "Dear Sirs" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:52 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:61 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:62 msgid "Attached you will find " msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:53 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:62 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:63 msgid "Kindest regards" msgstr "" -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:67 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:68 msgid "Delivery Note No." msgstr "" -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:67 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:68 msgid "Invoice No." msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:58 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:69 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:70 msgid "Order no." msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:69 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:80 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:81 msgid "TOTAL ORDER EX VAT" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:70 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:81 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:82 msgid "TOTAL PO EX VAT" msgstr "" -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:82 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:83 msgid "TOTAL DELIVERY INCL. VAT" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:74 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:86 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:87 msgid "Outstanding Transactions" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:77 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:89 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:90 msgid "Statement" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/doctext.inc:78 -#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:90 +#: c:\Apache2\htdocs\account2/reporting/includes/doctext.inc:91 msgid "as of" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:166 -#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:166 -msgid "Active" +#: c:\Apache2\htdocs\account2/reporting/includes/header2.inc:37 +#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:227 +#: c:\Apache2\htdocs\account2/reporting/includes/backup/header2a.inc:40 +#: c:\Apache2\htdocs\account2/reporting/includes/backup/pdf_report.inc:240 +#: c:\Apache2\htdocs\account2/reporting/includes/backup2/header2.inc:37 +#: c:\Apache2\htdocs\account2/reporting/includes/backup2/pdf_report.inc:240 +msgid "Page" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:210 -#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:210 +#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:193 +#: c:\Apache2\htdocs\account2/reporting/includes/backup/pdf_report.inc:206 +#: c:\Apache2\htdocs\account2/reporting/includes/backup2/pdf_report.inc:206 msgid "Print Out Date" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:217 -#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:217 +#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:200 +#: c:\Apache2\htdocs\account2/reporting/includes/backup/pdf_report.inc:213 +#: c:\Apache2\htdocs\account2/reporting/includes/backup2/pdf_report.inc:213 msgid "Fiscal Year" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:244 -# c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:316 -#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:244 -#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:316 -msgid "Page" -msgstr "" - -# c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:656 -#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:702 +#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:441 +#: c:\Apache2\htdocs\account2/reporting/includes/backup/pdf_report.inc:458 +#: c:\Apache2\htdocs\account2/reporting/includes/backup2/pdf_report.inc:460 msgid "sent to" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/pdf_report.inc:658 -#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:704 +#: c:\Apache2\htdocs\account2/reporting/includes/pdf_report.inc:443 +#: c:\Apache2\htdocs\account2/reporting/includes/backup/pdf_report.inc:460 +#: c:\Apache2\htdocs\account2/reporting/includes/backup2/pdf_report.inc:462 msgid "NOT sent to" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:30 #: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:30 msgid "Report Classes:" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:35 #: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:35 msgid "Reports For Class: " msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:112 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:112 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:113 +msgid "Invalid date format" +msgstr "" + +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:118 msgid "Display: " msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:123 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:123 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:129 msgid "No Currency Filter" msgstr "" -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:168 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:174 msgid "No Payment Link" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:176 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:182 msgid "No Graphics" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:176 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:182 msgid "Vertical bars" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:176 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:182 msgid "Horizontal bars" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:176 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:182 msgid "Dots" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:176 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:182 msgid "Lines" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:176 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:182 msgid "Pie" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:176 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:182 msgid "Donut" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:167 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:180 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:186 msgid "No Type Filter" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:177 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:190 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:196 msgid "No Account Group Filter" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:194 -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:202 -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:210 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:207 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:215 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:223 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:213 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:221 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:229 msgid "No Dimension Filter" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:216 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:229 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:235 msgid "No Customer Filter" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:233 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:237 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:243 msgid "No Supplier Filter" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:225 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:242 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:248 msgid "IV" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:226 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:243 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:249 msgid "CN" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:250 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:277 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:283 msgid "No Location Filter" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:254 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:281 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:287 msgid "No Category Filter" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:262 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:289 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:295 msgid "No Area Filter" msgstr "" -# c:\Apache2\htdocs\account/reporting/includes/reports_classes.inc:266 -#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:293 +#: c:\Apache2\htdocs\account2/reporting/includes/reports_classes.inc:299 msgid "No Sales Folk Filter" msgstr "" -#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:125 -#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:265 +#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:131 +#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:270 msgid "Stocks below Re-Order Level at " msgstr "" -#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:128 -#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:270 +#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:134 +#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:275 msgid "Below" msgstr "" -#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:129 -#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:271 +#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:135 +#: c:\Apache2\htdocs\account2/sales/includes/db/sales_order_db.inc:276 msgid "Please reorder" msgstr "" -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:57 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:227 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:61 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:244 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:89 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:246 msgid "Customer Currency:" msgstr "" -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:70 -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:236 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:74 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:274 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:120 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:278 msgid "Customer Discount:" msgstr "" -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:378 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:89 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:428 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:132 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:445 msgid "Shipping Company:" msgstr "" -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:240 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:260 -msgid "Items Returned to Location" -msgstr "" - -# c:\Apache2\htdocs\account/sales/includes/ui/sales_credit_ui.inc:246 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_credit_ui.inc:266 -msgid "Write off the cost of the items to" -msgstr "" - -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:15 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:14 msgid "This item is already on this order. You have been warned." msgstr "" -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:51 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:34 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:33 msgid "The selected customer account is currently on hold. Please contact the credit control personnel to discuss." msgstr "" -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:82 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:56 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:49 msgid "The selected customer and branch are not valid, or the customer does not have any branches." msgstr "" -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:146 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:145 msgid "Total Excluding Shipping" msgstr "" -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:272 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:191 +msgid "No customer found for entered text." +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:235 +msgid "Reference number unique for this document type" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:259 msgid "Price List:" msgstr "" -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:385 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:291 +msgid "Date of order receive" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:399 msgid "Delivery Details" msgstr "" -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:346 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:390 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:404 msgid "Invoice Delivery Details" msgstr "" -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:391 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:405 msgid "Invoice before" msgstr "" -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:350 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:395 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:409 msgid "Order Delivery Details" msgstr "" -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:358 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:407 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:419 msgid "Deliver from Location:" msgstr "" -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:362 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:411 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:422 +msgid "Enter requested day of delivery" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:424 msgid "Deliver To:" msgstr "" -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:365 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:414 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:425 +msgid "Additional identifier for delivery e.g. name of receiving person" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:428 +msgid "Delivery address. Default is address of customer branch" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:429 msgid "Contact Phone Number:" msgstr "" -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:373 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:422 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:430 +msgid "Phone number of ordering person. Defaults to branch phone number" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:438 msgid "Customer Reference:" msgstr "" -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:374 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:423 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:439 +msgid "Customer reference number for this order (if any)" +msgstr "" + +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:440 msgid "Comments:" msgstr "" -# c:\Apache2\htdocs\account/sales/includes/ui/sales_order_ui.inc:376 -#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:425 +#: c:\Apache2\htdocs\account2/sales/includes/ui/sales_order_ui.inc:442 msgid "Shipping Charge:" msgstr "" diff --git a/manufacturing/includes/db/work_order_issues_db.inc b/manufacturing/includes/db/work_order_issues_db.inc index 9474da08..b78bb080 100644 --- a/manufacturing/includes/db/work_order_issues_db.inc +++ b/manufacturing/includes/db/work_order_issues_db.inc @@ -62,6 +62,14 @@ function get_work_order_issues($woid) return db_query($sql, "The work order issues could not be retrieved"); } +function get_additional_issues($woid) +{ + $sql = "SELECT ".TB_PREF."wo_issues.*, ".TB_PREF."wo_issue_items.* + FROM ".TB_PREF."wo_issues, ".TB_PREF."wo_issue_items + WHERE ".TB_PREF."wo_issues.issue_no=".TB_PREF."wo_issue_items.issue_id + AND ".TB_PREF."wo_issues.workorder_id=$woid ORDER BY ".TB_PREF."wo_issue_items.id"; + return db_query($sql, "The work order issues could not be retrieved"); +} //-------------------------------------------------------------------------------------- function get_work_order_issue($issue_no) diff --git a/manufacturing/includes/db/work_order_produce_items_db.inc b/manufacturing/includes/db/work_order_produce_items_db.inc index fd7d9655..6c2010c9 100644 --- a/manufacturing/includes/db/work_order_produce_items_db.inc +++ b/manufacturing/includes/db/work_order_produce_items_db.inc @@ -38,7 +38,7 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo) // ------------------------------------------------------------------------- - work_order_quick_costs($woid, $details["stock_id"], $quantity, $date_, 0); + work_order_quick_costs($woid, $details["stock_id"], $quantity, $date_, 0, true); // ------------------------------------------------------------------------- if ($memo_) diff --git a/manufacturing/includes/db/work_orders_quick_db.inc b/manufacturing/includes/db/work_orders_quick_db.inc index cb16e374..1eccbdcf 100644 --- a/manufacturing/includes/db/work_orders_quick_db.inc +++ b/manufacturing/includes/db/work_orders_quick_db.inc @@ -71,7 +71,7 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, //-------------------------------------------------------------------------------------- -function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $additional_costs) +function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $additional_costs, $advanced=false) { $result = get_bom($stock_id); @@ -84,11 +84,31 @@ function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $addition $bom_cost = $bom_item["standard_cost"] * $bom_item["quantity"] * $units_reqd; + if ($advanced) + { + // insert a -ve stock move for each item + add_stock_move(systypes::work_order(), $bom_item["component"], $woid, + $bom_item["loc_code"], $date_, "", -$bom_item["quantity"] * $units_reqd, 0); + } add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $bom_accounts["inventory_account"], 0, 0, null, -$bom_cost); $total_cost += $bom_cost; } + if ($advanced) + { + // also take the additional issues + $res = get_additional_issues($woid); + while ($item = db_fetch($res)) + { + $standard_cost = get_standard_cost($item['stock_id']); + $issue_cost = $standard_cost * $item['qty_issued']; + $issue = get_stock_gl_code($item['stock_id']); + add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $issue["inventory_account"], 0, 0, + null, -$issue_cost); + $total_cost += $issue_cost; + } + } // credit additional costs $item_accounts = get_stock_gl_code($stock_id); add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $item_accounts["assembly_account"], diff --git a/manufacturing/includes/work_order_issue_ui.inc b/manufacturing/includes/work_order_issue_ui.inc index 9d6b9dd2..8508364e 100644 --- a/manufacturing/includes/work_order_issue_ui.inc +++ b/manufacturing/includes/work_order_issue_ui.inc @@ -94,7 +94,7 @@ function issue_edit_item_controls(&$order, $line_no=-1) stock_component_items_list_cells(null, 'stock_id', $wo_details["stock_id"], null, false, true); - if(isset($_POST['_stock_id_update'])) { + if (list_updated('stock_id')) { $Ajax->activate('units'); $Ajax->activate('qty'); $Ajax->activate('std_cost'); diff --git a/manufacturing/inquiry/where_used_inquiry.php b/manufacturing/inquiry/where_used_inquiry.php index e7958dca..5abcc70e 100644 --- a/manufacturing/inquiry/where_used_inquiry.php +++ b/manufacturing/inquiry/where_used_inquiry.php @@ -22,7 +22,7 @@ echo "
"; set_global_stock_item($_POST['stock_id']); -if (isset($_POST['_stock_id_update'])) +if (list_updated('stock_id')) $Ajax->activate('usage_table'); if (isset($_POST['stock_id'])) diff --git a/manufacturing/view/wo_issue_view.php b/manufacturing/view/wo_issue_view.php index e3ba38bc..b82eb3b5 100644 --- a/manufacturing/view/wo_issue_view.php +++ b/manufacturing/view/wo_issue_view.php @@ -31,6 +31,7 @@ function display_wo_issue($issue_no) $myrow = get_work_order_issue($issue_no); + br(1); start_table($table_style); $th = array(_("Issue #"), _("Reference"), _("For Work Order #"), _("Item"), _("From Location"), _("To Work Centre"), _("Date of Issue")); diff --git a/manufacturing/view/wo_production_view.php b/manufacturing/view/wo_production_view.php index 02450db5..64e287e7 100644 --- a/manufacturing/view/wo_production_view.php +++ b/manufacturing/view/wo_production_view.php @@ -29,6 +29,7 @@ function display_wo_production($prod_id) $myrow = get_work_order_produce($prod_id); + br(1); start_table($table_style); $th = array(_("Production #"), _("Reference"), _("For Work Order #"), _("Item"), _("Quantity Manufactured"), _("Date")); diff --git a/manufacturing/view/work_order_view.php b/manufacturing/view/work_order_view.php index d63f2de3..7b114995 100644 --- a/manufacturing/view/work_order_view.php +++ b/manufacturing/view/work_order_view.php @@ -25,6 +25,7 @@ if ($_GET['trans_no'] != "") display_heading(systypes::name(systypes::work_order()) . " # " . $woid); +br(1); $myrow = get_work_order($woid); if ($myrow["type"] == wo_types::advanced()) @@ -35,7 +36,7 @@ else echo "
"; // display the WO requirements -echo "
"; +br(1); if ($myrow["released"] == false) { display_heading2(_("BOM for item:") . " " . $myrow["StockItemName"]); diff --git a/purchasing/allocations/supplier_allocate.php b/purchasing/allocations/supplier_allocate.php index 995b2735..fd617a29 100644 --- a/purchasing/allocations/supplier_allocate.php +++ b/purchasing/allocations/supplier_allocate.php @@ -74,7 +74,7 @@ function handle_process() begin_transaction(); // clear all the allocations for this payment/credit - clear_supp_alloctions($_SESSION['alloc']->type, $_SESSION['alloc']->trans_no); + clear_supp_alloctions($_SESSION['alloc']->type, $_SESSION['alloc']->trans_no, $_SESSION['alloc']->date_); // now add the new allocations $total_allocated = 0; @@ -88,6 +88,14 @@ function handle_process() update_supp_trans_allocation($alloc_item->type, $alloc_item->type_no, $alloc_item->current_allocated); + + // Exchange Variations Joe Hunt 2008-09-20 //////////////////////////////////////// + + exchange_variation($_SESSION['alloc']->type, $_SESSION['alloc']->trans_no, + $alloc_item->type, $alloc_item->type_no, $_SESSION['alloc']->date_, + $alloc_item->current_allocated, payment_person_types::supplier()); + + /////////////////////////////////////////////////////////////////////////// $total_allocated += $alloc_item->current_allocated; } diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php index 55e32abb..7f63cb6f 100644 --- a/purchasing/allocations/supplier_allocation_main.php +++ b/purchasing/allocations/supplier_allocation_main.php @@ -15,6 +15,15 @@ if ($use_popup_windows) $js .= get_js_open_window(900, 500); page(_("Supplier Allocations"), false, false, "", $js); +//-------------------------------------------------------------------------------- +if ($ret = context_restore()) { + if(isset($ret['supplier_id'])) + $_POST['supplier_id'] = $ret['supplier_id']; +} +if (isset($_POST['_supplier_id_editor'])) { + context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'] ); +} + //-------------------------------------------------------------------------------- function display_allocatable_transactions() diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc index 756c972f..3b5443f6 100644 --- a/purchasing/includes/db/grn_db.inc +++ b/purchasing/includes/db/grn_db.inc @@ -4,7 +4,10 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, $adj_only=false) { - $currency = get_supplier_currency($supplier); + if ($supplier != null) + $currency = get_supplier_currency($supplier); + else + $currency = null; if ($currency != null) $price_in_home_currency = to_home_currency($price, $currency, $date); else @@ -125,6 +128,42 @@ function add_grn_detail_item($grn_batch_id, $po_detail_item, $item_code, $descri } //---------------------------------------------------------------------------------------- +function get_grn_batch_from_item($item) +{ + $sql = "SELECT grn_batch_id FROM ".TB_PREF."grn_items WHERE id=$item"; + $result = db_query($sql, "Could not retreive GRN batch id"); + $row = db_fetch_row($result); + return $row[0]; +} + +function set_grn_item_credited(&$entered_grn, $supplier, $transno, $date) +{ + $mcost = update_average_material_cost($supplier, $entered_grn->item_code, + $entered_grn->chg_price, $entered_grn->this_quantity_inv, $date); + + $sql = "SELECT ".TB_PREF."grn_batch.*, ".TB_PREF."grn_items.* + FROM ".TB_PREF."grn_batch, ".TB_PREF."grn_items + WHERE ".TB_PREF."grn_items.grn_batch_id=".TB_PREF."grn_batch.id + AND ".TB_PREF."grn_items.id=$entered_grn->id + AND ".TB_PREF."grn_items.item_code='$entered_grn->item_code' "; + $result = db_query($sql, "Could not retreive GRNS"); + $myrow = db_fetch($result); + + $sql = "UPDATE ".TB_PREF."purch_order_details + SET quantity_received = quantity_received + $entered_grn->this_quantity_inv, + std_cost_unit=$mcost, + act_price=$entered_grn->chg_price + WHERE po_detail_item = ".$myrow["po_detail_item"]; + db_query($sql, "a purchase order details record could not be updated. This receipt of goods has not been processed "); + + //$sql = "UPDATE ".TB_PREF."grn_items SET qty_recd=0, quantity_inv=0 WHERE id=$entered_grn->id"; + $sql = "UPDATE ".TB_PREF."grn_items SET qty_recd=qty_recd+$entered_grn->this_quantity_inv, + quantity_inv=quantity_inv+$entered_grn->this_quantity_inv WHERE id=$entered_grn->id"; + db_query($sql); + + add_stock_move(21, $entered_grn->item_code, $transno, $myrow['loc_code'], $date, "", + $entered_grn->this_quantity_inv, $mcost, $supplier, 1, $entered_grn->chg_price); +} function get_grn_items($grn_batch_id=0, $supplier_id="", $outstanding_only=false, $is_invoiced_only=false) diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc index 014e5ce8..59366cce 100644 --- a/purchasing/includes/db/invoice_db.inc +++ b/purchasing/includes/db/invoice_db.inc @@ -51,11 +51,14 @@ function update_supp_received_items_for_invoice($id, $po_detail_item, $qty_invoi { if ($chg_price != null) { - $sql = "SELECT act_price FROM ".TB_PREF."purch_order_details WHERE + $sql = "SELECT act_price, unit_price FROM ".TB_PREF."purch_order_details WHERE po_detail_item = $po_detail_item"; $result = db_query($sql, "The old actual price of the purchase order line could not be retrieved"); $row = db_fetch_row($result); $ret = $row[0]; + + $unit_price = $row[1]; //Added by Rasmus + $sql = "SELECT delivery_date FROM ".TB_PREF."grn_batch,".TB_PREF."grn_items WHERE ".TB_PREF."grn_batch.id = ".TB_PREF."grn_items.grn_batch_id AND ".TB_PREF."grn_items.id=$id"; $result = db_query($sql, "The old delivery date from the received record cout not be retrieved"); @@ -66,6 +69,7 @@ function update_supp_received_items_for_invoice($id, $po_detail_item, $qty_invoi { $ret = 0; $date = ""; + $unit_price = 0; // Added by Rasmus } $sql = "UPDATE ".TB_PREF."purch_order_details SET qty_invoiced = qty_invoiced + $qty_invoiced "; @@ -80,7 +84,7 @@ function update_supp_received_items_for_invoice($id, $po_detail_item, $qty_invoi SET quantity_inv = quantity_inv + $qty_invoiced WHERE id = $id"; db_query($sql, "The quantity invoiced off the items received record could not be updated"); - return array($ret, $date); + return array($ret, $date, $unit_price); } function get_deliveries_between($stock_id, $from, $to) @@ -170,45 +174,60 @@ function add_supp_invoice($supp_trans) // do not receive as ref because we chang if (!$supp_trans->is_invoice) { $entered_grn->this_quantity_inv = -$entered_grn->this_quantity_inv; + set_grn_item_credited($entered_grn, $supp_trans->supplier_id, $invoice_id, $date_); } $line_taxfree = $entered_grn->taxfree_charge_price($supp_trans->tax_group_id); $line_tax = $entered_grn->full_charge_price($supp_trans->tax_group_id) - $line_taxfree; - - $old = update_supp_received_items_for_invoice($entered_grn->id, $entered_grn->po_detail_item, - $entered_grn->this_quantity_inv, $entered_grn->chg_price); $stock_gl_code = get_stock_gl_code($entered_grn->item_code); add_gl_trans_supplier($trans_type, $invoice_id, $date_, $stock_gl_code["inventory_account"], $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $entered_grn->this_quantity_inv * $line_taxfree, $supp_trans->supplier_id); // -------------- if price changed since po received. 16 Aug 2008 Joe Hunt - $old_price = $old[0]; - if ($old_price != $entered_grn->chg_price) // price-change, so update + if($supp_trans->is_invoice) { - $diff = $entered_grn->chg_price - $old_price; - $old_date = sql2date($old[1]); - // only update the diff (last parameter, adj_only is set to true). - $mat_cost = update_average_material_cost($supp_trans->supplier_id, $entered_grn->item_code, - $diff, $entered_grn->this_quantity_inv, $old_date, true); - // function just above this - $deliveries = get_deliveries_between($entered_grn->item_code, $old_date, $date_); - if ($deliveries[0] != 0) // have deliveries been done during the period? - { - - $amt = ($mat_cost - $deliveries[1]) * $deliveries[0]; // $amt in home currency - - add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["cogs_account"], - $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], _("Cost diff."), - $amt, null, null, null, - "The general ledger transaction could not be added for the price variance of the inventory item"); - add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["inventory_account"], - 0, 0, _("Cost diff."), -$amt, null, null, null, - "The general ledger transaction could not be added for the price variance of the inventory item"); - update_stock_move_pid(13, $entered_grn->item_code, $old_date, $date_, 0, $mat_cost); - } - update_stock_move_pid(25, $entered_grn->item_code, $old_date, $old_date, $supp_trans->supplier_id, $mat_cost); - } + $old = update_supp_received_items_for_invoice($entered_grn->id, $entered_grn->po_detail_item, + $entered_grn->this_quantity_inv, $entered_grn->chg_price); + // Since the standard cost is always calculated on basis of the po unit_price, + // this is also the price that should be the base of calculating the price diff. + // In cases where there is two different po invoices on the same delivery with different unit prices this will not work either + + //$old_price = $old[0]; + + $old_price = $old[2]; + + + + /* + If statement is removed. Should always check for deliveries nomatter if there has been a price change. + */ + //if ($old_price != $entered_grn->chg_price) // price-change, so update + //{ + $diff = $entered_grn->chg_price - $old_price; + $old_date = sql2date($old[1]); + // only update the diff (last parameter, adj_only is set to true). + $mat_cost = update_average_material_cost($supp_trans->supplier_id, $entered_grn->item_code, + $diff, $entered_grn->this_quantity_inv, $old_date, true); + // function just above this + $deliveries = get_deliveries_between($entered_grn->item_code, $old_date, $date_); + if ($deliveries[0] != 0) // have deliveries been done during the period? + { + + $amt = ($mat_cost - $deliveries[1]) * $deliveries[0]; // $amt in home currency + + add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["cogs_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], _("Cost diff."), + $amt, null, null, null, + "The general ledger transaction could not be added for the price variance of the inventory item"); + add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["inventory_account"], + 0, 0, _("Cost diff."), -$amt, null, null, null, + "The general ledger transaction could not be added for the price variance of the inventory item"); + update_stock_move_pid(13, $entered_grn->item_code, $old_date, $date_, 0, $mat_cost); + } + update_stock_move_pid(25, $entered_grn->item_code, $old_date, $old_date, $supp_trans->supplier_id, $mat_cost); + //} + } // ---------------------------------------------------------------------- add_supp_invoice_item($trans_type, $invoice_id, $entered_grn->item_code, @@ -357,4 +376,4 @@ function void_supp_invoice($type, $type_no) //---------------------------------------------------------------------------------------- -?> \ No newline at end of file +?> diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc index b38e787a..0ddabcec 100644 --- a/purchasing/includes/db/supp_trans_db.inc +++ b/purchasing/includes/db/supp_trans_db.inc @@ -2,86 +2,89 @@ //------------------------------------------------------------------------------------------------------------- -function add_supp_trans($type, $supplier_id, $date_, $due_date, $reference, $supp_reference, +function add_supp_trans($type, $supplier_id, $date_, $due_date, $reference, $supp_reference, $amount, $amount_tax, $discount, $err_msg="") { $date = date2sql($date_); - $due_date = date2sql($due_date); - - $trans_no = get_next_trans_no($type); + if ($due_date == "") + $due_date = "0000-00-00"; + else + $due_date = date2sql($due_date); + + $trans_no = get_next_trans_no($type); $curr = get_supplier_currency($supplier_id); - $rate = get_exchange_rate_from_home_currency($curr, $date_); + $rate = get_exchange_rate_from_home_currency($curr, $date_); - $sql = "INSERT INTO ".TB_PREF."supp_trans (trans_no, type, supplier_id, tran_date, due_date, + $sql = "INSERT INTO ".TB_PREF."supp_trans (trans_no, type, supplier_id, tran_date, due_date, reference, supp_reference, ov_amount, ov_gst, rate, ov_discount) "; $sql .= "VALUES ($trans_no, $type, $supplier_id, '$date', '$due_date', ".db_escape($reference).", ".db_escape($supp_reference).", $amount, $amount_tax, $rate, $discount)"; - + if ($err_msg == "") $err_msg = "Cannot insert a supplier transaction record"; - - db_query($sql, $err_msg); - return $trans_no; + db_query($sql, $err_msg); + + return $trans_no; } //------------------------------------------------------------------------------------------------------------- function get_supp_trans($trans_no, $trans_type=-1) { - $sql = "SELECT ".TB_PREF."supp_trans.*, (".TB_PREF."supp_trans.ov_amount+".TB_PREF."supp_trans.ov_gst+".TB_PREF."supp_trans.ov_discount) AS Total, + $sql = "SELECT ".TB_PREF."supp_trans.*, (".TB_PREF."supp_trans.ov_amount+".TB_PREF."supp_trans.ov_gst+".TB_PREF."supp_trans.ov_discount) AS Total, ".TB_PREF."suppliers.supp_name AS supplier_name, ".TB_PREF."suppliers.curr_code AS SupplierCurrCode "; - - if ($trans_type == 22) + + if ($trans_type == 22) { // it's a payment so also get the bank account - $sql .= ", ".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name, ".TB_PREF."bank_accounts.bank_curr_code, + $sql .= ", ".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name, ".TB_PREF."bank_accounts.bank_curr_code, ".TB_PREF."bank_trans_types.name AS BankTransType, ".TB_PREF."bank_trans.amount AS BankAmount, - ".TB_PREF."bank_trans.ref "; - } - - $sql .= " FROM ".TB_PREF."supp_trans, ".TB_PREF."suppliers "; + ".TB_PREF."bank_trans.ref "; + } - if ($trans_type == 22) + $sql .= " FROM ".TB_PREF."supp_trans, ".TB_PREF."suppliers "; + + if ($trans_type == 22) { // it's a payment so also get the bank account - $sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts, ".TB_PREF."bank_trans_types "; - } - - $sql .= " WHERE ".TB_PREF."supp_trans.trans_no=$trans_no + $sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts, ".TB_PREF."bank_trans_types "; + } + + $sql .= " WHERE ".TB_PREF."supp_trans.trans_no=$trans_no AND ".TB_PREF."supp_trans.supplier_id=".TB_PREF."suppliers.supplier_id"; - + if ($trans_type > 0) - $sql .= " AND ".TB_PREF."supp_trans.type=$trans_type "; - - if ($trans_type == 22) + $sql .= " AND ".TB_PREF."supp_trans.type=$trans_type "; + + if ($trans_type == 22) { // it's a payment so also get the bank account $sql .= " AND ".TB_PREF."bank_trans.trans_no =$trans_no - AND ".TB_PREF."bank_trans.type=$trans_type + AND ".TB_PREF."bank_trans.type=$trans_type AND ".TB_PREF."bank_trans_types.id = ".TB_PREF."bank_trans.bank_trans_type_id - AND ".TB_PREF."bank_accounts.account_code=".TB_PREF."bank_trans.bank_act "; - } - + AND ".TB_PREF."bank_accounts.account_code=".TB_PREF."bank_trans.bank_act "; + } + $result = db_query($sql, "Cannot retreive a supplier transaction"); - - if (db_num_rows($result) == 0) + + if (db_num_rows($result) == 0) { // can't return nothing display_db_error("no supplier trans found for given params", $sql, true); exit; } - - if (db_num_rows($result) > 1) + + if (db_num_rows($result) > 1) { // can't return multiple display_db_error("duplicate supplier transactions found for given params", $sql, true); exit; - } - - return db_fetch($result); + } + + return db_fetch($result); } //---------------------------------------------------------------------------------------- @@ -89,24 +92,24 @@ function get_supp_trans($trans_no, $trans_type=-1) function get_supplier_transactions($extra_fields=null, $extra_conditions=null, $extra_tables=null) { $sql = "SELECT ".TB_PREF."supp_trans.*, - ov_amount+ov_gst+ov_discount AS Total, + ov_amount+ov_gst+ov_discount AS Total, ".TB_PREF."suppliers.supp_name, ".TB_PREF."suppliers.address, ".TB_PREF."suppliers.curr_code "; - + if ($extra_fields) - $sql .= ", $extra_fields "; - + $sql .= ", $extra_fields "; + $sql .= " FROM ".TB_PREF."supp_trans, ".TB_PREF."suppliers "; if ($extra_tables) $sql .= " ,$extra_tables "; - + $sql .= " WHERE ".TB_PREF."supp_trans.supplier_id=".TB_PREF."suppliers.supplier_id"; - + if ($extra_conditions) - $sql .= " AND $extra_conditions "; - - $sql .= " ORDER BY trans_no"; - + $sql .= " AND $extra_conditions "; + + $sql .= " ORDER BY trans_no"; + return db_query($sql, "Cannot retreive supplier transactions"); } @@ -116,21 +119,21 @@ function exists_supp_trans($type, $type_no) { if ($type == 25) return exists_grn($type_no); - + $sql = "SELECT trans_no FROM ".TB_PREF."supp_trans WHERE type=$type AND trans_no=$type_no"; - $result = db_query($sql, "Cannot retreive a supplier transaction"); - - return (db_num_rows($result) > 0); + $result = db_query($sql, "Cannot retreive a supplier transaction"); + + return (db_num_rows($result) > 0); } //---------------------------------------------------------------------------------------- function void_supp_trans($type, $type_no) { - $sql = "UPDATE ".TB_PREF."supp_trans SET ov_amount=0, ov_discount=0, ov_gst=0, + $sql = "UPDATE ".TB_PREF."supp_trans SET ov_amount=0, ov_discount=0, ov_gst=0, alloc=0 WHERE type=$type AND trans_no=$type_no"; - + db_query($sql, "could not void supp transactions for type=$type and trans_no=$type_no"); } @@ -138,24 +141,24 @@ function void_supp_trans($type, $type_no) function post_void_supp_trans($type, $type_no) { - if ($type == 22) + if ($type == 22) { void_supp_payment($type, $type_no); return true; } - - if ($type == 20 || $type == 21) + + if ($type == 20 || $type == 21) { void_supp_invoice($type, $type_no); - return true; + return true; } - - if ($type == 25) + + if ($type == 25) { return void_grn($type_no); - } - - return false; + } + + return false; } //---------------------------------------------------------------------------------------- diff --git a/purchasing/includes/db/suppalloc_db.inc b/purchasing/includes/db/suppalloc_db.inc index 24fab3ba..750bea5f 100644 --- a/purchasing/includes/db/suppalloc_db.inc +++ b/purchasing/includes/db/suppalloc_db.inc @@ -2,15 +2,15 @@ //---------------------------------------------------------------------------------------- -function add_supp_allocation($amount, $trans_type_from, $trans_no_from, +function add_supp_allocation($amount, $trans_type_from, $trans_no_from, $trans_type_to, $trans_no_to, $date_) { $date = date2sql($date_); $sql = "INSERT INTO ".TB_PREF."supp_allocations ( - amt, date_alloc, - trans_type_from, trans_no_from, trans_no_to, trans_type_to) + amt, date_alloc, + trans_type_from, trans_no_from, trans_no_to, trans_type_to) VALUES ($amount, '$date', $trans_type_from, $trans_no_from, $trans_no_to, $trans_type_to)"; - + db_query($sql, "A supplier allocation could not be added to the database"); } @@ -27,11 +27,11 @@ function delete_supp_allocation($trans_id) function get_supp_trans_allocation_balance($trans_type, $trans_no) { - $sql = "SELECT (ov_amount+ov_gst-ov_discount-alloc) AS BalToAllocate + $sql = "SELECT (ov_amount+ov_gst-ov_discount-alloc) AS BalToAllocate FROM ".TB_PREF."supp_trans WHERE trans_no=$trans_no AND type=$trans_type"; $result = db_query($sql,"calculate the allocation"); - $myrow = db_fetch_row($result); - + $myrow = db_fetch_row($result); + return $myrow[0]; } @@ -46,38 +46,43 @@ function update_supp_trans_allocation($trans_type, $trans_no, $alloc) //------------------------------------------------------------------------------------------------------------- -function void_supp_allocations($type, $type_no) +function void_supp_allocations($type, $type_no, $date="") { - return clear_supp_alloctions($type, $type_no); + return clear_supp_alloctions($type, $type_no, $date); } //------------------------------------------------------------------------------------------------------------- -function clear_supp_alloctions($type, $type_no) +function clear_supp_alloctions($type, $type_no, $date="") { // clear any allocations for this transaction - $sql = "SELECT * FROM ".TB_PREF."supp_allocations - WHERE (trans_type_from=$type AND trans_no_from=$type_no) + $sql = "SELECT * FROM ".TB_PREF."supp_allocations + WHERE (trans_type_from=$type AND trans_no_from=$type_no) OR (trans_type_to=$type AND trans_no_to=$type_no)"; $result = db_query($sql, "could not void supp transactions for type=$type and trans_no=$type_no"); - + while ($row = db_fetch($result)) { $sql = "UPDATE ".TB_PREF."supp_trans SET alloc=alloc - " . $row['amt'] . " - WHERE (type= " . $row['trans_type_from'] . " AND trans_no=" . $row['trans_no_from'] . ") + WHERE (type= " . $row['trans_type_from'] . " AND trans_no=" . $row['trans_no_from'] . ") OR (type=" . $row['trans_type_to'] . " AND trans_no=" . $row['trans_no_to'] . ")"; //$sql = "UPDATE ".TB_PREF."supp_trans SET alloc=alloc - " . $row['amt'] . " // WHERE type=" . $row['trans_type_to'] . " AND trans_no=" . $row['trans_no_to']; - db_query($sql, "could not clear allocation"); + db_query($sql, "could not clear allocation"); + // 2008-09-20 Joe Hunt + if ($date != "") + exchange_variation($type, $type_no, $row['trans_type_to'], $row['trans_no_to'], $date, + $row['amt'], payment_person_types::supplier(), true); + ////////////////////// } - + // remove any allocations for this transaction - $sql = "DELETE FROM ".TB_PREF."supp_allocations - WHERE (trans_type_from=$type AND trans_no_from=$type_no) + $sql = "DELETE FROM ".TB_PREF."supp_allocations + WHERE (trans_type_from=$type AND trans_no_from=$type_no) OR (trans_type_to=$type AND trans_no_to=$type_no)"; - - db_query($sql, "could not void supp transactions for type=$type and trans_no=$type_no"); + + db_query($sql, "could not void supp transactions for type=$type and trans_no=$type_no"); } //------------------------------------------------------------------------------------------------------------- @@ -85,38 +90,38 @@ function clear_supp_alloctions($type, $type_no) function get_allocatable_from_supp_transactions($supplier_id, $settled) { $settled_sql = ""; - if (!$settled) + if (!$settled) { $settled_sql = "AND round(ABS(ov_amount+ov_gst+ov_discount)-alloc,6) > 0"; } - + $supp_sql = ""; if ($supplier_id != null) - $supp_sql = " AND ".TB_PREF."supp_trans.supplier_id = $supplier_id"; - - return get_supplier_transactions("round(ABS(ov_amount+ov_gst+ov_discount)-alloc,6) <= 0 AS settled", - "(type=22 OR type=21 OR type=1) AND (ov_amount < 0) " . $settled_sql . $supp_sql); + $supp_sql = " AND ".TB_PREF."supp_trans.supplier_id = $supplier_id"; + + return get_supplier_transactions("round(ABS(ov_amount+ov_gst+ov_discount)-alloc,6) <= 0 AS settled", + "(type=22 OR type=21 OR type=1) AND (ov_amount < 0) " . $settled_sql . $supp_sql); } //------------------------------------------------------------------------------------------------------------- function get_allocatable_to_supp_transactions($supplier_id, $trans_no=null, $type=null) -{ - if ($trans_no != null && $type!= null) +{ + if ($trans_no != null && $type!= null) { - return get_supplier_transactions("amt", "".TB_PREF."supp_trans.trans_no = ".TB_PREF."supp_allocations.trans_no_to + return get_supplier_transactions("amt", "".TB_PREF."supp_trans.trans_no = ".TB_PREF."supp_allocations.trans_no_to AND ".TB_PREF."supp_trans.type = ".TB_PREF."supp_allocations.trans_type_to AND ".TB_PREF."supp_allocations.trans_no_from=$trans_no - AND ".TB_PREF."supp_allocations.trans_type_from=$type - AND ".TB_PREF."supp_trans.supplier_id=$supplier_id", - "".TB_PREF."supp_allocations"); - } - else + AND ".TB_PREF."supp_allocations.trans_type_from=$type + AND ".TB_PREF."supp_trans.supplier_id=$supplier_id", + "".TB_PREF."supp_allocations"); + } + else { return get_supplier_transactions(null, "round(ABS(ov_amount+ov_gst+ov_discount)-alloc,6) > 0 AND ".TB_PREF."supp_trans.type != 22 AND ".TB_PREF."supp_trans.supplier_id=$supplier_id"); - } + } } diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc index 196db747..2b60ae37 100644 --- a/purchasing/includes/ui/invoice_ui.inc +++ b/purchasing/includes/ui/invoice_ui.inc @@ -44,6 +44,8 @@ function copy_to_trans(&$supp_trans) function invoice_header(&$supp_trans) { + global $Ajax; + // if vars have been lost, recopy if (!isset($_POST['tran_date'])) copy_from_trans($supp_trans); @@ -83,6 +85,13 @@ function invoice_header(&$supp_trans) echo ""; date_row(_("Date") . ":", 'tran_date', '', null, 0, 0, 0, "", true); + if (isset($_POST['_tran_date_changed'])) { + $Ajax->activate('_ex_rate'); + $supp_trans->tran_date = $_POST['tran_date']; + get_duedate_from_terms($supp_trans); + $_POST['due_date'] = $supp_trans->due_date; + $Ajax->activate('due_date'); + } date_row(_("Due Date") . ":", 'due_date'); @@ -297,7 +306,7 @@ function display_grn_items(&$supp_trans, $mode=0) div_start('grn_items'); echo "
"; - $th = array(_("Delivery Sequence #"), _("Item"), _("Description"), + $th = array(_("Delivery"), _("Item"), _("Description"), _("Quantity"), _("Price"), _("Line Value")); table_header($th); @@ -312,7 +321,8 @@ function display_grn_items(&$supp_trans, $mode=0) alt_table_row_color($k); - label_cell(get_trans_view_str(25,$entered_grn->id)); + $grn_batch = get_grn_batch_from_item($entered_grn->id); + label_cell(get_trans_view_str(25,$grn_batch)); label_cell($entered_grn->item_code); label_cell($entered_grn->item_description); qty_cell(abs($entered_grn->this_quantity_inv), false, get_qty_dec($entered_grn->item_code)); diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc index 8edf3dfe..f9e820b9 100644 --- a/purchasing/includes/ui/po_ui.inc +++ b/purchasing/includes/ui/po_ui.inc @@ -104,7 +104,10 @@ function display_po_header(&$order) // if (!is_date_in_fiscalyear($_POST['OrderDate'])) // $_POST['OrderDate'] = end_fiscalyear(); //} - date_row(_("Order Date:"), 'OrderDate', '', $_POST['OrderDate'], 0, 0, 0); + date_row(_("Order Date:"), 'OrderDate', '', $_POST['OrderDate'], 0, 0, 0, null, true); + if (isset($_POST['_OrderDate_changed'])) { + $Ajax->activate('_ex_rate'); + } text_row(_("Supplier's Reference:"), 'Requisition', null, 16, 15); @@ -297,7 +300,7 @@ function po_item_controls(&$order, $stock_id=null) hidden('line_no', ($_SESSION['PO']->lines_on_order + 1)); stock_purchasable_items_list_cells(null, 'stock_id', null, false, true); - if(isset($_POST['_stock_id_update'])) { + if (list_updated('stock_id')) { $Ajax->activate('price'); $Ajax->activate('units'); $Ajax->activate('qty'); diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php index 2c3a6fae..cc15d580 100644 --- a/purchasing/inquiry/supplier_allocation_inquiry.php +++ b/purchasing/inquiry/supplier_allocation_inquiry.php @@ -141,7 +141,7 @@ if (db_num_rows($result) == 0) while ($myrow = db_fetch($result)) { - if ($myrow['OverDue'] == 1) + if (($myrow['TotalAmount']>$myrow['Allocated']) && $myrow['OverDue'] == 1) { start_row("class='overduebg'"); $over_due = true; @@ -178,8 +178,6 @@ if (db_num_rows($result) == 0) $balance = $myrow["TotalAmount"] - $myrow["Allocated"]; amount_cell($balance); - //if (($myrow["type"] == 1 || $myrow["type"] == 21 || $myrow["type"] == 22) && - // $myrow["Void"] == 0) if (($myrow["type"] == 1 || $myrow["type"] == 21 || $myrow["type"] == 22) && $balance > 0) { diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php index 7fd80c33..74d4ea91 100644 --- a/purchasing/inquiry/supplier_inquiry.php +++ b/purchasing/inquiry/supplier_inquiry.php @@ -179,7 +179,7 @@ if (db_num_rows($result) == 0) while ($myrow = db_fetch($result)) { - if ($myrow['OverDue'] == 1) + if ($myrow['OverDue'] == 1 && $myrow['Settled'] == 0) { start_row("class='overduebg'"); $over_due = true; diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php index 5ab0ea8f..3ac981fe 100644 --- a/purchasing/manage/suppliers.php +++ b/purchasing/manage/suppliers.php @@ -12,6 +12,10 @@ include($path_to_root . "/includes/ui.inc"); check_db_has_tax_groups(_("There are no tax groups defined in the system. At least one tax group is required before proceeding.")); +if (isset($_GET['supplier_id'])) +{ + $_POST['supplier_id'] = $_GET['supplier_id']; +} $new_supplier = get_post('supplier_id') == ''; if (isset($_POST['submit'])) @@ -120,6 +124,10 @@ elseif (isset($_POST['delete']) && $_POST['delete'] != "") $Ajax->activate('_page_body'); } //end if Delete supplier } +elseif (isset($_POST['select'])) +{ + context_return(array('supplier_id' => $_POST['supplier_id'])); +} start_form(); @@ -225,6 +233,7 @@ if (!$new_supplier) { submit_center_first('submit', _("Update Supplier"), _('Update supplier data'), true); + submit_return('select', _("Return"), _("Select this supplier and return to document entry."), true); submit_center_last('delete', _("Delete Supplier"), _('Delete supplier data if have been never used'), true); } diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php index be9dc188..b9bab552 100644 --- a/purchasing/po_entry_items.php +++ b/purchasing/po_entry_items.php @@ -31,6 +31,26 @@ check_db_has_suppliers(_("There are no suppliers defined in the system.")); check_db_has_purchasable_items(_("There are no purchasable inventory items defined in the system.")); //--------------------------------------------------------------------------------------------------------------- +if ($ret = context_restore()) { + // return from supplier/items editors + copy_from_cart(); + if(isset($ret['supplier_id'])) + $_POST['supplier_id'] = $ret['supplier_id']; + if(isset($ret['stock_id'])) { + $_POST['stock_id'] = $_POST['_stock_id_edit'] = $ret['stock_id']; + set_focus('qty'); + } +} +if (isset($_POST['_supplier_id_editor'])) { + copy_to_cart(); + context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], 'PO'); +} + +if (isset($_POST['_stock_id_editor'])) { + copy_to_cart(); + context_call($path_to_root.'/inventory/manage/items.php?stock_id='.$_POST['stock_id'], 'PO'); +} +//------------------------------------------------------------------------------ if (isset($_GET['AddedID'])) { @@ -51,8 +71,31 @@ if (isset($_GET['AddedID'])) display_footer_exit(); } +//-------------------------------------------------------------------------------------------------- +function copy_from_cart() +{ + $_POST['supplier_id'] = $_SESSION['PO']->supplier_id; + $_POST['OrderDate'] = $_SESSION['PO']->orig_order_date; + $_POST['Requisition'] = $_SESSION['PO']->requisition_no; + $_POST['ref'] = $_SESSION['PO']->reference; + $_POST['Comments'] = $_SESSION['PO']->Comments; + $_POST['StkLocation'] = $_SESSION['PO']->Location; + $_POST['delivery_address'] = $_SESSION['PO']->delivery_address; +} + +function copy_to_cart() +{ + $_SESSION['PO']->supplier_id = $_POST['supplier_id']; + $_SESSION['PO']->orig_order_date = $_POST['OrderDate']; + $_SESSION['PO']->reference = $_POST['ref']; + $_SESSION['PO']->requisition_no = $_POST['Requisition']; + $_SESSION['PO']->Comments = $_POST['Comments']; + $_SESSION['PO']->Location = $_POST['StkLocation']; + $_SESSION['PO']->delivery_address = $_POST['delivery_address']; +} //-------------------------------------------------------------------------------------------------- + function line_start_focus() { global $Ajax; @@ -278,13 +321,7 @@ function handle_commit_order() if (can_commit()) { - $_SESSION['PO']->supplier_id = $_POST['supplier_id']; - $_SESSION['PO']->orig_order_date = $_POST['OrderDate']; - $_SESSION['PO']->reference = $_POST['ref']; - $_SESSION['PO']->requisition_no = $_POST['Requisition']; - $_SESSION['PO']->Comments = $_POST['Comments']; - $_SESSION['PO']->Location = $_POST['StkLocation']; - $_SESSION['PO']->delivery_address = $_POST['delivery_address']; + copy_to_cart(); if ($_SESSION['PO']->order_no == 0) { @@ -339,13 +376,7 @@ if (isset($_GET['ModifyOrderNumber']) && $_GET['ModifyOrderNumber'] != "") /*read in all the selected order into the Items cart */ read_po($_SESSION['PO']->order_no, $_SESSION['PO']); - $_POST['supplier_id'] = $_SESSION['PO']->supplier_id; - $_POST['OrderDate'] = $_SESSION['PO']->orig_order_date; - $_POST['Requisition'] = $_SESSION['PO']->requisition_no; - $_POST['ref'] = $_SESSION['PO']->reference; - $_POST['Comments'] = $_SESSION['PO']->Comments; - $_POST['StkLocation'] = $_SESSION['PO']->Location; - $_POST['delivery_address'] = $_SESSION['PO']->delivery_address; + copy_from_cart(); } if (isset($_POST['CancelUpdate']) || isset($_POST['UpdateLine'])) { diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php index 5729fcf5..3f7e8ee7 100644 --- a/purchasing/supplier_credit.php +++ b/purchasing/supplier_credit.php @@ -23,6 +23,18 @@ page(_("Supplier Credit Note"), false, false, "", $js); check_db_has_suppliers(_("There are no suppliers defined in the system.")); +//--------------------------------------------------------------------------------------------------------------- +if ($ret = context_restore()) { + // return from supplier editor + copy_from_trans($_SESSION['supp_trans']); + if(isset($ret['supplier_id'])) + $_POST['supplier_id'] = $ret['supplier_id']; +} +if (isset($_POST['_supplier_id_editor'])) { + copy_to_trans($_SESSION['supp_trans']); + context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], 'supp_trans'); +} + //--------------------------------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) diff --git a/purchasing/supplier_credit_grns.php b/purchasing/supplier_credit_grns.php index b9bfbe33..6c3abd1f 100644 --- a/purchasing/supplier_credit_grns.php +++ b/purchasing/supplier_credit_grns.php @@ -11,6 +11,8 @@ include_once($path_to_root . "/purchasing/includes/purchasing_db.inc"); $js = ""; if ($use_date_picker) $js .= get_js_date_picker(); +if ($use_popup_windows) + $js .= get_js_open_window(900, 500); page(_("Select Received Items to Add"), false, false, "", $js); if (!isset($_SESSION['supp_trans'])) @@ -161,7 +163,7 @@ if ($id || get_post('AddGRNToTrans')) { $Ajax->activate('grn_selector'); } -if (get_post('AddGRNToTrans')) +if (get_post('AddGRNToTrans')) { $Ajax->activate('grn_table'); $Ajax->activate('grn_items'); diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php index 07b41b28..24aff075 100644 --- a/purchasing/supplier_invoice.php +++ b/purchasing/supplier_invoice.php @@ -23,6 +23,18 @@ page(_("Enter Supplier Invoice"), false, false, "", $js); check_db_has_suppliers(_("There are no suppliers defined in the system.")); +//--------------------------------------------------------------------------------------------------------------- +if ($ret = context_restore()) { + // return from supplier editor + copy_from_trans($_SESSION['supp_trans']); + if(isset($ret['supplier_id'])) + $_POST['supplier_id'] = $ret['supplier_id']; +} +if (isset($_POST['_supplier_id_editor'])) { + copy_to_trans($_SESSION['supp_trans']); + context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], 'supp_trans'); +} + //--------------------------------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) diff --git a/purchasing/supplier_invoice_grns.php b/purchasing/supplier_invoice_grns.php index 541a4c4d..c334a699 100644 --- a/purchasing/supplier_invoice_grns.php +++ b/purchasing/supplier_invoice_grns.php @@ -11,6 +11,8 @@ include_once($path_to_root . "/purchasing/includes/purchasing_db.inc"); $js = ""; if ($use_date_picker) $js .= get_js_date_picker(); +if ($use_popup_windows) + $js .= get_js_open_window(900, 500); page(_("Select Received Items to Add"), false, false, "", $js); if (!isset($_SESSION['supp_trans'])) @@ -194,7 +196,7 @@ if (find_submit('grn_item_id') || get_post('AddGRNToTrans')) { $Ajax->activate('grn_selector'); } -if (get_post('AddGRNToTrans')) +if (get_post('AddGRNToTrans')) { $Ajax->activate('grn_table'); $Ajax->activate('grn_items'); diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php index a6021942..28e16c6f 100644 --- a/purchasing/supplier_payment.php +++ b/purchasing/supplier_payment.php @@ -31,6 +31,19 @@ check_db_has_bank_accounts(_("There are no bank accounts defined in the system." check_db_has_bank_trans_types(_("There are no bank payment types defined in the system.")); +//---------------------------------------------------------------------------------------- +if ($ret = context_restore()) { + if(isset($ret['supplier_id'])) + $_POST['supplier_id'] = $ret['supplier_id']; +} +if (isset($_POST['_supplier_id_editor'])) { + context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'], + array( 'supplier_id', 'bank_account', 'DatePaid', + 'PaymentType', 'ref', 'amount', 'discount', 'memo_') ); +} +if (isset($_POST['_DatePaid_changed'])) { + $Ajax->activate('_ex_rate'); +} //---------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) @@ -73,7 +86,7 @@ function display_controls() amount_row(_("Amount of Payment:"), 'amount'); amount_row(_("Amount of Discount:"), 'discount'); - date_row(_("Date Paid") . ":", 'DatePaid'); + date_row(_("Date Paid") . ":", 'DatePaid', '', null, 0, 0, 0, null, true); echo "
"; echo ""; // outer table diff --git a/purchasing/view/view_po.php b/purchasing/view/view_po.php index fe164822..144192df 100644 --- a/purchasing/view/view_po.php +++ b/purchasing/view/view_po.php @@ -6,10 +6,14 @@ $path_to_root="../.."; include($path_to_root . "/purchasing/includes/po_class.inc"); include($path_to_root . "/includes/session.inc"); -page(_("View Purchase Order"), true); - include($path_to_root . "/purchasing/includes/purchasing_ui.inc"); +$js = ""; +if ($use_popup_windows) + $js .= get_js_open_window(900, 500); +page(_("View Purchase Order"), true, false, "", $js); + + if (!isset($_GET['trans_no'])) { die ("
" . _("This page must be called with a purchase order number to review.")); diff --git a/purchasing/view/view_supp_credit.php b/purchasing/view/view_supp_credit.php index d5fc40e1..64ed9b8c 100644 --- a/purchasing/view/view_supp_credit.php +++ b/purchasing/view/view_supp_credit.php @@ -6,14 +6,17 @@ $path_to_root="../.."; include_once($path_to_root . "/purchasing/includes/purchasing_db.inc"); include_once($path_to_root . "/includes/session.inc"); -page(_("View Supplier Credit Note"), true); - include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc"); +$js = ""; +if ($use_popup_windows) + $js .= get_js_open_window(900, 500); +page(_("View Supplier Credit Note"), true, false, "", $js); + if (isset($_GET["trans_no"])) { $trans_no = $_GET["trans_no"]; -} +} elseif (isset($_POST["trans_no"])) { $trans_no = $_POST["trans_no"]; @@ -58,7 +61,7 @@ end_table(1); $voided = is_voided_display(21, $trans_no, _("This credit note has been voided.")); -if (!$voided) +if (!$voided) { $tax_total = 0; // ?????? display_allocations_from(payment_person_types::supplier(), $supp_trans->supplier_id, 21, $trans_no, -($supp_trans->ov_amount + $tax_total)); diff --git a/reporting/includes/doctext.inc b/reporting/includes/doctext.inc index 5753447d..0208c46b 100644 --- a/reporting/includes/doctext.inc +++ b/reporting/includes/doctext.inc @@ -18,7 +18,7 @@ if (isset($header2type)) $doc_Customers_Ref = _("Customers Reference:"); $doc_Our_Order_No = _("Our Order No"); $doc_Domicile = _("Domicile"); - if($doctype == 13) { + if($doctype == 13 || $doctype == 8 || $doctype == 9) { $doc_Bank_Account = ''; $doc_Please_Quote = _("All amounts stated in"); } else { @@ -65,7 +65,7 @@ if (isset($emailtype)) } if (isset($header2type) || isset($linetype)) { - $doc_Invoice_no = $doctype==13 ? _("Delivery Note No.") : _("Invoice No."); + $doc_Invoice_no = ($doctype==13 ? _("Delivery Note No.") : (($doctype==8 || $doctype==9) ? _("Order no.") : _("Invoice No."))); $doc_Delivery_no = "Delivery Note No."; $doc_Order_no = _("Order no."); } diff --git a/reporting/includes/doctext2.inc b/reporting/includes/doctext2.inc index 0bbe57e7..7c33519b 100644 --- a/reporting/includes/doctext2.inc +++ b/reporting/includes/doctext2.inc @@ -18,7 +18,7 @@ if (isset($header2type)) $doc_Customers_Ref = "Customers Reference:"; $doc_Our_Order_No = "Our Order No"; $doc_Domicile = "Domicile"; - if($doctype == 13) { + if($doctype == 13 || $doctype == 8 || $doctype == 9) { $doc_Bank_Account = ''; $doc_Please_Quote = "All amounts stated in"; } else { @@ -35,11 +35,11 @@ if (isset($header2type)) if ($doctype == 8) $this->title = "PURCHASE ORDER"; else if ($doctype == 9) - $this->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER")); + $this->title = ($print_as_quote==1 ? "QUOTE" : "SALES ORDER"); else if ($doctype == 10) $this->title = "INVOICE"; else if ($doctype == 13) - $this->title = _("DELIVERY NOTE"); + $this->title = "DELIVERY NOTE"; else $this->title = "CREDIT NOTE"; if ($doctype == 8) @@ -65,7 +65,7 @@ if (isset($emailtype)) } if (isset($header2type) || isset($linetype)) { - $doc_Invoice_no = $doctype==13 ? "Delivery Note No." : "Invoice No."; + $doc_Invoice_no = ($doctype==13 ? "Delivery Note No." : (($doctype==8 || $doctype==9) ? "Order no." : "Invoice No.")); $doc_Order_no = "Order no."; } if (isset($linetype)) diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc index 995a39d7..0dabe11c 100644 --- a/reporting/includes/reports_classes.inc +++ b/reporting/includes/reports_classes.inc @@ -1,24 +1,24 @@ ar_classes = array(); } - function addReportClass($class_name) + function addReportClass($class_name) { $this->ar_classes[$class_name] = array(); } - function addReport($class_name, $id, $rep_name, $params=null) + function addReport($class_name, $id, $rep_name, $params=null) { $this->ar_classes[$class_name][] = new Report($id,$rep_name,$params); } - function getDisplay($class=null) + function getDisplay($class=null) { global $table_style2; $temp = array_values($this->ar_classes); @@ -28,12 +28,12 @@ class BoxReports $st_reports = ""; $st_params = ""; $st_classes = "" . _("Report Classes:") . "
"; - foreach($this->ar_classes as $key=>$value) + foreach($this->ar_classes as $key=>$value) { $style = $class_counter==0 ? '' : $style = "style='display:none'"; $st_classes .= "$key
"; $st_reports .= ""; - foreach($value as $report) + foreach($value as $report) { $st_reports .= ""; $st_params .= "
" . _("Reports For Class: ") . " $key
" . $report->name . "
"; @@ -71,27 +71,27 @@ class BoxReports } } -class Report +class Report { var $id; var $name; var $ar_params; - function Report($id, $name, $ar_params) + function Report($id, $name, $ar_params) { $this->id = $id; $this->name = $name; $this->ar_params = $ar_params; } - function getDisplay() + function getDisplay() { global $comp_path, $path_to_root, $use_date_picker; $rep_file = $comp_path.'/'.user_company(). - "/reporting/rep".$this->id.".php"; + "/reporting/rep".$this->id.".php"; if (!file_exists($rep_file)) $rep_file = $path_to_root ."/reporting/rep".$this->id.".php"; - + $st = "