From: Janusz Dobrowolski Date: Sun, 27 Oct 2013 15:52:01 +0000 (+0100) Subject: Merged last changes from stable. X-Git-Tag: v2.4.2~19^2~329^2 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=1571869d54be48452fdbe08f25130972ff0a7b5a;p=fa-stable.git Merged last changes from stable. --- 1571869d54be48452fdbe08f25130972ff0a7b5a diff --cc .hgtags index 1f9c5743,ee59e5d3..19512328 --- a/.hgtags +++ b/.hgtags @@@ -57,4 -57,5 +57,6 @@@ a8b119b77f054c85223eb3a256268a3d5a61b3c b2ead0b2a3e30c13254288eddf587b5d8140d731 version_2_3_8 06e6f1abb26edd035aa34a5180da99ca72fce5dd version_2_3_11 05b037ff3c0b294819843e6bc5ca6ee7b6555176 version_2_3_12 +180d185518cfc3e4fbb6b9ba2279436145c30ebc unstable_2.3.13 + a253b76db0fb0a972672c174f4af7a7ad85df066 version_2_3_13 + 2515a2808a2de65f2eeed795b98e3ef7dbf328ea version_2_3_14 diff --cc gl/includes/db/gl_db_banking.inc index f3f9a995,e6d65d92..964eac0c --- a/gl/includes/db/gl_db_banking.inc +++ b/gl/includes/db/gl_db_banking.inc @@@ -301,10 -314,9 +312,10 @@@ function write_bank_transaction($trans_ $args = func_get_args(); if (count($args) < 11) $args[] = true; $args = (object)array_combine(array('trans_type', 'trans_no', 'from_account', 'items', 'date_', - 'person_type_id', 'person_id', 'person_detail_id', 'ref', 'memo_', 'use_transaction'), + 'person_type_id', 'person_id', 'person_detail_id', 'ref', 'memo_', 'use_transaction', 'settled_amount'), $args); hook_db_prewrite($args, $trans_type); + $aid = 0; if ($trans_no) { $old_trans = $trans_no; diff --cc gl/inquiry/gl_trial_balance.php index 484ba459,0ca22c2e..bfb6a547 --- a/gl/inquiry/gl_trial_balance.php +++ b/gl/inquiry/gl_trial_balance.php @@@ -46,7 -46,12 +46,12 @@@ function gl_inquiry_controls( start_table(TABLESTYLE_NOBORDER); - date_cells(_("From:"), 'TransFromDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); + $date = today(); - if (!isset($_POST['TransFromDate'])) - $_POST['TransFromDate'] = begin_month($date); + if (!isset($_POST['TransToDate'])) + $_POST['TransToDate'] = end_month($date); ++ if (!isset($_POST['TransFromDate'])) ++ $_POST['TransFromDate'] = add_days(end_month($date), -$_SESSION["wa_current_user"]->prefs->transaction_days()); + date_cells(_("From:"), 'TransFromDate'); date_cells(_("To:"), 'TransToDate'); if ($dim >= 1) dimensions_list_cells(_("Dimension")." 1:", 'Dimension', null, true, " ", false, 1); @@@ -64,10 -69,10 +69,10 @@@ function display_trial_balance($type, $typename) { - global $path_to_root; - global $path_to_root, $clear_trial_balance_opening; - - global $k, $pdeb, $pcre, $cdeb, $ccre, $tdeb, $tcre, $pbal, $cbal, $tbal; - $printtitle = 0; //Flag for printing type name ++ global $path_to_root, $clear_trial_balance_opening, ++ $k, $pdeb, $pcre, $cdeb, $ccre, $tdeb, $tcre, $pbal, $cbal, $tbal; + - global $k, $pdeb, $pcre, $cdeb, $ccre, $tdeb, $tcre, $pbal, $cbal, $tbal; - $printtitle = 0; //Flag for printing type name ++ $printtitle = 0; //Flag for printing type name $k = 0; @@@ -83,13 -90,22 +88,22 @@@ { //Print Type Title if it has atleast one non-zero account if (!$printtitle) - { + { start_row("class='inquirybg' style='font-weight:bold'"); label_cell(_("Group")." - ".$type ." - ".$typename, "colspan=8"); - end_row(); - $printtitle = 1; - } - + end_row(); + $printtitle = 1; + } + + // FA doesn't really clear the closed year, therefore the brought forward balance includes all the transactions from the past, even though the balance is null. + // If we want to remove the balanced part for the past years, this option removes the common part from from the prev and tot figures. + if (@$clear_trial_balance_opening) + { + $open = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $begin, $begin, false, true); + $offset = min($open['debit'], $open['credit']); + } else + $offset = 0; + $prev = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $begin, $_POST['TransFromDate'], false, false); $curr = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $_POST['TransFromDate'], $_POST['TransToDate'], true, true); $tot = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $begin, $_POST['TransToDate'], false, true); diff --cc gl/inquiry/profit_loss.php index f7ba9176,3e7a26f4..8d9144d6 --- a/gl/inquiry/profit_loss.php +++ b/gl/inquiry/profit_loss.php @@@ -160,7 -160,12 +160,12 @@@ function inquiry_controls( $dim = get_company_pref('use_dimension'); start_table(TABLESTYLE_NOBORDER); - date_cells(_("From:"), 'TransFromDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); + $date = today(); - if (!isset($_POST['TransFromDate'])) - $_POST['TransFromDate'] = begin_month($date); + if (!isset($_POST['TransToDate'])) + $_POST['TransToDate'] = end_month($date); ++ if (!isset($_POST['TransFromDate'])) ++ $_POST['TransFromDate'] = add_days(end_month($date), -$_SESSION["wa_current_user"]->prefs->transaction_days()); + date_cells(_("From:"), 'TransFromDate'); date_cells(_("To:"), 'TransToDate'); //Compare Combo diff --cc gl/view/gl_deposit_view.php index 88b9a2f2,88d315aa..21dfcc32 --- a/gl/view/gl_deposit_view.php +++ b/gl/view/gl_deposit_view.php @@@ -68,7 -68,12 +68,12 @@@ label_cells(_("Amount"), number_format2 label_cells(_("Date"), sql2date($to_trans['trans_date']), "class='tableheader2'"); end_row(); start_row(); - label_cells(_("From"), get_counterparty_name(ST_BANKDEPOSIT, $trans_no), "class='tableheader2'", "colspan=$colspan1"); -label_cells(_("From"), payment_person_name($to_trans['person_type_id'], $to_trans['person_id']), "class='tableheader2'", "colspan=$colspan1"); ++label_cells(_("From"), get_counterparty_name(BT_BANKDEPOSIT, $to_trans['trans_no']), "class='tableheader2'", "colspan=$colspan1"); + if ($show_currencies) + { + label_cells(_("Settle currency"), $to_trans['settle_curr'], "class='tableheader2'"); + label_cells(_("Settled amount"), number_format2($to_trans['settled_amount'], user_price_dec()), "class='tableheader2'"); + } label_cells(_("Deposit Type"), $bank_transfer_types[$to_trans['account_type']], "class='tableheader2'"); end_row(); start_row(); diff --cc gl/view/gl_payment_view.php index 681373c2,344eec35..b3490641 --- a/gl/view/gl_payment_view.php +++ b/gl/view/gl_payment_view.php @@@ -66,7 -66,12 +66,12 @@@ label_cells(_("Amount"), number_format2 label_cells(_("Date"), sql2date($from_trans['trans_date']), "class='tableheader2'"); end_row(); start_row(); - label_cells(_("Pay To"), get_counterparty_name(ST_BANKPAYMENT, $trans_no), "class='tableheader2'", "colspan=$colspan1"); -label_cells(_("Pay To"), payment_person_name($from_trans['person_type_id'], $from_trans['person_id']), "class='tableheader2'", "colspan=$colspan1"); ++label_cells(_("Pay To"), get_counterparty_name(ST_BANKPAYMENT, $from_trans['trans_no']), "class='tableheader2'", "colspan=$colspan1"); + if ($show_currencies) + { + label_cells(_("Settle currency"), $from_trans['settle_curr'], "class='tableheader2'"); + label_cells(_("Settled amount"), number_format2($from_trans['settled_amount'], user_price_dec()), "class='tableheader2'"); + } label_cells(_("Payment Type"), $bank_transfer_types[$from_trans['account_type']], "class='tableheader2'"); end_row(); start_row(); diff --cc includes/app_entries.inc index eabfdd80,00000000..1fa7bb73 mode 100644,000000..100644 --- a/includes/app_entries.inc +++ b/includes/app_entries.inc @@@ -1,54 -1,0 +1,54 @@@ +. +***********************************************************************/ +/* + This file contains all application entry points. +*/ + +/* + Transaction editors. First paraneter is transaction number, second (optional) transaction type. +*/ +$trans_editors = array( + + ST_JOURNAL => "/gl/gl_journal.php?ModifyGL=Yes&trans_no=%d&trans_type=%d", + ST_BANKPAYMENT => "/gl/gl_bank.php?ModifyPayment=Yes&trans_no=%d&trans_type=%d", + ST_BANKDEPOSIT => "/gl/gl_bank.php?ModifyDeposit=Yes&trans_no=%d&trans_type=%d", + //ST_BANKTRANSFER => , + + ST_SALESINVOICE => "/sales/customer_invoice.php?ModifyInvoice=%d", +// 11=> +// free hand (debtors_trans.order_==0) +// "/sales/credit_note_entry.php?ModifyCredit=%d" +// credit invoice +// "/sales/customer_credit_invoice.php?ModifyCredit=%d" + ST_CUSTCREDIT => "/sales/customer_credit_invoice.php?ModifyCredit=%s", - //ST_CUSTPAYMENT => , ++ ST_CUSTPAYMENT => "/sales/customer_payments.php?trans_no=%d", + ST_CUSTDELIVERY => "/sales/customer_delivery.php?ModifyDelivery=%d", + + //ST_LOCTRANSFER => , + //ST_INVADJUST => , + + ST_PURCHORDER => "/purchasing/po_entry_items.php?ModifyOrderNumber=%d", + ST_SUPPINVOICE => "/purchasing/supplier_invoice.php?ModifyInvoice=%d", + + //ST_SUPPCREDIT => , + //ST_SUPPAYMENT => , + //ST_SUPPRECEIVE => , + + //ST_WORKORDER => , + //ST_MANUISSUE => , + //ST_MANURECEIVE => , + + ST_SALESORDER => "/sales/sales_order_entry.php?ModifyOrderNumber=%d", + ST_SALESQUOTE => "/sales/sales_order_entry.php?ModifyQuotationNumber=%d", + //ST_COSTUPDATE => , + //ST_DIMENSION => , +); diff --cc includes/prefs/userprefs.inc index 400ef1e1,e14c08b5..bd72d667 --- a/includes/prefs/userprefs.inc +++ b/includes/prefs/userprefs.inc @@@ -50,9 -49,9 +50,10 @@@ class user_pref $this->price_dec = 2; $this->language = $dflt_lang; $this->theme = 'default'; - + $this->transaction_days = -30; + } else { + global $path_to_root; $this->language = $user["language"]; $_SESSION['language']->set_language($this->language); @@@ -84,7 -83,8 +85,10 @@@ $this->sticky_date = 0; $this->startup_tab = "orders"; } + $this->transaction_days = $user['transaction_days']; ++ + if (!file_exists("$path_to_root/themes/$this->theme")) + $this->theme = "default"; } } diff --cc includes/session.inc index 9a3efc26,0089095b..22644aec --- a/includes/session.inc +++ b/includes/session.inc @@@ -354,10 -358,7 +358,9 @@@ foreach ($installed_extensions as $ext // ini_set('session.save_path', dirname(__FILE__).'/../tmp/'); ini_set('session.gc_maxlifetime', 36000); // 10hrs - ini_set('session.cache_limiter', 'private'); // prevent 'page expired' errors +hook_session_start(@$_POST["company_login_name"]); + $Session_manager = new SessionManager(); $Session_manager->sessionStart('FA'.md5(dirname(__FILE__))); @@@ -368,11 -369,10 +371,11 @@@ include_once($path_to_root . "/config.p get_text_init(); if ($login_delay > 0) - @include_once($path_to_root . "/faillog.php"); + @include_once($path_to_root . "/tmp/faillog.php"); // Page Initialisation -if (!isset($_SESSION['language']) || !method_exists($_SESSION['language'], 'set_language')) +if (!isset($_SESSION['wa_current_user']) || !$_SESSION['wa_current_user']->logged_in() + || !isset($_SESSION['language']) || !method_exists($_SESSION['language'], 'set_language')) { $l = array_search_value($dflt_lang, $installed_languages, 'code'); $_SESSION['language'] = new language($l['name'], $l['code'], $l['encoding'], @@@ -456,12 -455,19 +459,22 @@@ if (strstr($_SERVER['PHP_SELF'], 'logou // Incorrect password login_fail(); } + elseif(isset($_SESSION['timeout']) && !$_SESSION['timeout']['post']) + { + // in case of GET request redirect to avoid confirmation dialog + // after return from menu option + header("HTTP/1.1 303 See Other"); + header("Location: ".$_SESSION['timeout']['uri']); + exit(); + } + $lang = &$_SESSION['language']; + $lang->set_language($_SESSION['language']->code); } } else - set_global_connection(); + { set_global_connection(); + if (db_fixed()) + db_set_encoding($_SESSION['language']->encoding); + } if (!isset($_SESSION["App"])) { $_SESSION["App"] = new front_accounting(); diff --cc includes/types.inc index 94d5c4e0,37ec321c..cd4e3dc3 --- a/includes/types.inc +++ b/includes/types.inc @@@ -300,19 -226,30 +300,43 @@@ define('PTT_CASH', 2) define('PTT_DAYS', 3); define('PTT_FOLLOWING', 4); +//---------------------------------------------------------------------------------- +// Tax calculation algorithms used in als and purchase (depends on supplier's invoicing software) + +define('TCA_TOTALS', 1); // taxes are calculated from respective net totals for all lines +define('TCA_LINES', 2); // taxes calculated for every line, then summed +// +// Bank account owner types +// +define('BO_UNKNOWN', 0); +define('BO_COMPANY', 1); +define('BO_CUSTBRANCH', 2); +define('BO_SUPPLIER', 3); + include_once($path_to_root . '/includes/sysnames.inc'); + //--------------------------------------------------------------------------------- + // Constants optionally redefined locally + // + defined('ICON_EDIT') || define('ICON_EDIT', 'edit.gif'); + defined('ICON_DELETE') || define('ICON_DELETE', 'delete.gif'); + defined('ICON_ADD') || define('ICON_ADD', 'ok.gif'); + defined('ICON_UPDATE') || define('ICON_UPDATE', 'ok.gif'); + defined('ICON_OK') || define('ICON_OK', 'ok.gif'); + defined('ICON_CANCEL') || define('ICON_CANCEL', 'cancel.png'); + defined('ICON_GL') || define('ICON_GL', 'gl.png'); + defined('ICON_PRINT') || define('ICON_PRINT', 'print.png'); + defined('ICON_PDF') || define('ICON_PDF', 'pdf.gif'); + defined('ICON_DOC') || define('ICON_DOC', 'invoice.gif'); + defined('ICON_CREDIT') || define('ICON_CREDIT', 'credit.gif'); + defined('ICON_RECEIVE') || define('ICON_RECEIVE', 'receive.gif'); + defined('ICON_DOWN') || define('ICON_DOWN', 'download.gif'); + defined('ICON_MONEY') || define('ICON_MONEY', 'money.png'); + defined('ICON_REMOVE') || define('ICON_REMOVE', 'remove.png'); + defined('ICON_REPORT') || define('ICON_REPORT', 'report.png'); + defined('ICON_VIEW') || define('ICON_VIEW', 'view.gif'); + defined('ICON_SUBMIT') || define('ICON_SUBMIT', 'ok.gif'); + defined('ICON_ESCAPE') || define('ICON_ESCAPE', 'escape.png'); + defined('ICON_ALLOC') || define('ICON_ALLOC', 'alloc.png'); + ?> diff --cc includes/ui/allocation_cart.inc index f67c5f15,1be54f5c..37c436a0 --- a/includes/ui/allocation_cart.inc +++ b/includes/ui/allocation_cart.inc @@@ -141,15 -162,15 +162,16 @@@ class allocatio NB existing entries where still some of the trans outstanding entered from above logic will be overwritten with the prev alloc detail below */ - if ($this->person_type) + if ($this->person_type==PT_SUPPLIER) $trans_items = get_allocatable_to_supp_transactions($this->person_id, - $trans_no, $type); + $this->trans_no, $this->type); else $trans_items = get_allocatable_to_cust_transactions($this->person_id, - $trans_no, $type); + $this->trans_no, $this->type); + while ($myrow = db_fetch($trans_items)) { +//_vd($myrow); $this->add_or_update_item ($myrow["type"], $myrow["trans_no"], sql2date($myrow["tran_date"]), sql2date($myrow["due_date"]), @@@ -164,10 -185,10 +186,10 @@@ { begin_transaction(); - if ($this->person_type) - clear_supp_alloctions($this->type, $this->trans_no); + if ($this->person_type == PT_SUPPLIER) + clear_supp_alloctions($this->type, $this->trans_no, $this->date_); else - clear_cust_alloctions($this->type, $this->trans_no, $this->date_); + clear_cust_alloctions($this->type, $this->trans_no); // now add the new allocations $total_allocated = 0; @@@ -187,15 -210,12 +211,13 @@@ $this->type, $this->trans_no, $alloc_item->type, $alloc_item->type_no, $this->date_); - update_debtor_trans_allocation($alloc_item->type, - $alloc_item->type_no, $alloc_item->current_allocated); + update_debtor_trans_allocation($alloc_item->type, $alloc_item->type_no); } // Exchange Variations Joe Hunt 2008-09-20 //////////////////// - exchange_variation($this->type, $this->trans_no, + if (!in_array($alloc_item->type, array(ST_SALESQUOTE, ST_SALESORDER, ST_PURCHORDER))) + exchange_variation($this->type, $this->trans_no, $alloc_item->type, $alloc_item->type_no, $this->date_, - $alloc_item->current_allocated, - $this->person_type ? PT_SUPPLIER : PT_CUSTOMER); + $amount, $this->person_type); ////////////////////////////////////////////////////////////// $total_allocated += $alloc_item->current_allocated; @@@ -327,8 -354,9 +356,10 @@@ function check_allocations( $total_allocated = 0; - for ($counter = 0; $counter < $_POST["TotalNumberOfAllocs"]; $counter++) - if (isset($_POST['amount' . $counter])) { + for ($counter = 0; $counter < get_post("TotalNumberOfAllocs"); $counter++) + { + if (!isset($_POST['amount'.$counter])) continue; ++ if (!check_num('amount' . $counter, 0)) { display_error(_("The entry for one or more amounts is invalid or negative.")); diff --cc includes/ui/ui_view.inc index 63f540b6,9a9eb093..5ed17abd --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@@ -499,7 -559,7 +558,7 @@@ function display_allocations($alloc_res label_cell(sql2date($alloc_row['tran_date'])); $alloc_row['Total'] = round2($alloc_row['Total'], user_price_dec()); $alloc_row['amt'] = round2($alloc_row['amt'], user_price_dec()); -- if ($payments && ($alloc_row['type'] == ST_SUPPAYMENT || $alloc_row['type'] == ST_BANKPAYMENT || $alloc_row['type'] == ST_SUPPCREDIT)) ++ if ($alloc_row['type'] == ST_SUPPAYMENT || $alloc_row['type'] == ST_BANKPAYMENT || $alloc_row['type'] == ST_SUPPCREDIT) $alloc_row['Total'] = -$alloc_row['Total']; amount_cell($alloc_row['Total']); amount_cell($alloc_row['Total'] - $alloc_row['amt']); diff --cc install/lang/new_language_template/LC_MESSAGES/empty.po index 4c2227d7,e0fac6cf..41b44f62 --- a/install/lang/new_language_template/LC_MESSAGES/empty.po +++ b/install/lang/new_language_template/LC_MESSAGES/empty.po @@@ -8,517 -7,498 +8,527 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2012-09-18 14:11+0200\n" -"POT-Creation-Date: 2012-03-07 20:46+0100\n" -"PO-Revision-Date: 2013-01-17 11:34+0100\n" -"Last-Translator: Translation Team \n" ++"POT-Creation-Date: 2013-10-27 15:08+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:20 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:41 -#: install/index.php:20 -#: install/index.php:41 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:20 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:41 msgid "FrontAccouting ERP Installation Wizard" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:42 -#: install/index.php:42 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:42 #, php-format msgid "Step %d: %s" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:49 -#: install/index.php:49 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49 msgid "Chart of accounts" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:49 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:76 -#: install/index.php:49 -#: install/index.php:76 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76 msgid "Encoding" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:49 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:76 -#: install/index.php:49 -#: install/index.php:76 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76 msgid "Description" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:49 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:76 -#: install/index.php:49 -#: install/index.php:76 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76 msgid "Install" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:66 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:94 -#: install/index.php:66 -#: install/index.php:94 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:66 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:94 msgid "Installed" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:76 -#: install/index.php:76 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76 msgid "Language" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:124 -#: install/index.php:124 -msgid "Cannot connect to database. User or password is invalid or you have no permittions to create database." ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:124 +msgid "" +"Cannot connect to database. User or password is invalid or you have no " +"permittions to create database." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:160 -#: install/index.php:160 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:160 msgid "Cannot save system configuration file 'config.php'." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:167 -#: install/index.php:167 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:167 msgid "Cannot open 'config_db.php' configuration file." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:170 -#: install/index.php:170 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:170 msgid "Cannot write to the 'config_db.php' configuration file." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:173 -#: install/index.php:173 -msgid "Configuration file 'config_db.php' is not writable. Change its permissions so it is, then re-run installation step." ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:173 +msgid "" +"Configuration file 'config_db.php' is not writable. Change its permissions " +"so it is, then re-run installation step." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:211 -#: install/index.php:211 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:211 msgid "Host name cannot be empty." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:215 -#: install/index.php:215 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:215 msgid "Database user name cannot be empty." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:219 -#: install/index.php:219 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:219 msgid "Database name cannot be empty." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:272 -#: install/index.php:272 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:272 msgid "Company name cannot be empty." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:276 -#: install/index.php:276 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:276 msgid "Company admin name cannot be empty." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:280 -#: install/index.php:280 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:280 msgid "Company admin password cannot be empty." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:284 -#: install/index.php:284 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:284 msgid "Company admin passwords differ." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:316 -#: install/index.php:316 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:316 msgid "System Diagnostics" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:318 -#: install/index.php:318 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:318 msgid "Select install wizard language:" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:324 -#: install/index.php:324 -msgid "All application preliminary requirements seems to be correct. Please press Continue button below." ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:324 +msgid "" +"All application preliminary requirements seems to be correct. Please press " +"Continue button below." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:325 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:351 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:358 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:365 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:389 -#: install/index.php:325 -#: install/index.php:351 -#: install/index.php:358 -#: install/index.php:365 -#: install/index.php:389 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:325 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:351 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:358 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:365 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:389 msgid "Continue >>" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:327 -#: install/index.php:327 -msgid "Application cannot be installed. Please fix problems listed below in red, and press Refresh button." ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:327 +msgid "" +"Application cannot be installed. Please fix problems listed below in red, " +"and press Refresh button." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:328 -#: install/index.php:328 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:328 msgid "Refresh" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:338 -#: install/index.php:338 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:338 msgid "Database Server Settings" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:340 -#: install/index.php:340 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:340 msgid "Server Host:" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:341 -#: install/index.php:341 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:341 msgid "Database User:" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:342 -#: install/index.php:342 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:342 msgid "Database Password:" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:343 -#: install/index.php:343 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:343 msgid "Database Name:" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:344 -#: install/index.php:344 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:344 msgid "Use '0_' Table Prefix:" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:344 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:38 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:113 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:126 -#: install/index.php:344 -#: includes/system_tests.inc:38 -#: includes/system_tests.inc:113 -#: includes/system_tests.inc:126 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:344 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:38 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:113 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:126 msgid "Yes" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:344 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:38 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:113 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:126 -#: install/index.php:344 -#: includes/system_tests.inc:38 -#: includes/system_tests.inc:113 -#: includes/system_tests.inc:126 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:344 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:38 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:113 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:126 msgid "No" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:345 -#: install/index.php:345 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:345 msgid "Install Additional Language Packs from FA Repository:" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:346 -#: install/index.php:346 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:346 msgid "Install Additional COAs from FA Repository:" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:348 -#: install/index.php:348 -msgid "Use table prefix if you share selected database for more than one FA company." ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:348 +msgid "" +"Use table prefix if you share selected database for more than one FA company." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:349 -#: install/index.php:349 -msgid "Do not select additional langs nor COAs if you have no working internet connection right now. You can install them later." ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:349 +msgid "" +"Do not select additional langs nor COAs if you have no working internet " +"connection right now. You can install them later." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:350 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:357 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:364 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:388 -#: install/index.php:350 -#: install/index.php:357 -#: install/index.php:364 -#: install/index.php:388 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:350 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:357 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:364 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:388 msgid "<< Back" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:355 -#: install/index.php:355 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:355 msgid "User Interface Languages Selection" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:362 -#: install/index.php:362 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:362 msgid "Charts of Accounts Selection" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:379 -#: install/index.php:379 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:379 msgid "Company Settings" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:381 -#: install/index.php:381 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:381 msgid "Company Name:" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:382 -#: install/index.php:382 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:382 msgid "Admin Login:" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:383 -#: install/index.php:383 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:383 msgid "Admin Password:" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:384 -#: install/index.php:384 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:384 msgid "Reenter Password:" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:385 -#: install/index.php:385 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:385 msgid "Select Chart of Accounts:" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:386 -#: install/index.php:386 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:386 msgid "Select Default Language:" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:393 -#: install/index.php:393 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:393 msgid "FrontAccounting ERP has been installed successsfully." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:394 -#: install/index.php:394 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:394 msgid "Please do not forget to remove install wizard folder." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:397 -#: install/index.php:397 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:397 msgid "Click here to start." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:15 -#: includes/system_tests.inc:15 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:15 msgid "Info" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:16 -#: includes/system_tests.inc:16 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:16 msgid "Optional" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:17 -#: includes/system_tests.inc:17 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:17 msgid "Recommended" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:18 -#: includes/system_tests.inc:18 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:18 msgid "Required " msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:24 -#: includes/system_tests.inc:24 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:24 msgid "MySQL version" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:28 -#: includes/system_tests.inc:28 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:28 msgid "Upgrade MySQL server to version at least 4.1" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:35 -#: includes/system_tests.inc:35 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:35 msgid "PHP MySQL extension" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:40 -#: includes/system_tests.inc:40 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:40 msgid "Your PHP has to have MySQL extension enabled." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:46 -#: includes/system_tests.inc:46 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:46 msgid "PHP version" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:50 -#: includes/system_tests.inc:50 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:50 msgid "Upgrade PHP to version at least 4.3.3" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:57 -#: includes/system_tests.inc:57 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:57 msgid "Server system" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:67 -#: includes/system_tests.inc:67 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:67 msgid "Session save path" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:79 -#: includes/system_tests.inc:79 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:79 msgid "Removed install wizard folder" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:82 -#: includes/system_tests.inc:82 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:82 msgid "Not removed" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:83 -#: includes/system_tests.inc:83 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:83 msgid "Remove or rename install wizard folder for security reasons." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:90 -#: includes/system_tests.inc:90 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:90 msgid "Browser type" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:94 -#: includes/system_tests.inc:94 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:94 msgid "Any browser is supported" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:101 -#: includes/system_tests.inc:101 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:101 msgid "Http server type" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:105 -#: includes/system_tests.inc:105 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:105 msgid "Any server is supported" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:112 -#: includes/system_tests.inc:112 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:112 msgid "Native gettext" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:116 -#: includes/system_tests.inc:116 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:116 msgid "In case of no gettext support, php emulation is used" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:124 -#: includes/system_tests.inc:124 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:124 msgid "Debugging mode" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:128 -#: includes/system_tests.inc:128 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:128 msgid "To switch debugging on set $go_debug>0 in config.php file" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:137 -#: includes/system_tests.inc:137 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:137 msgid "Error logging" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:145 -#: includes/system_tests.inc:145 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:145 msgid "Disabled" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:148 -#: includes/system_tests.inc:148 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:148 msgid "To switch error logging set $error_logging in config.php file" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:151 -#: includes/system_tests.inc:151 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:151 msgid "Log file is not writeable" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:161 -#: includes/system_tests.inc:161 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:161 msgid "Current database version" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:165 -#: includes/system_tests.inc:165 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:165 msgid "Database structure seems to be not upgraded to current version" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:180 -#: includes/system_tests.inc:180 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:180 msgid "Company subdirectories consistency" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:193 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:200 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:208 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:225 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:340 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:349 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:358 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:366 -#: includes/system_tests.inc:193 -#: includes/system_tests.inc:200 -#: includes/system_tests.inc:208 -#: includes/system_tests.inc:225 -#: includes/system_tests.inc:340 -#: includes/system_tests.inc:349 -#: includes/system_tests.inc:358 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:193 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:200 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:208 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:225 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:340 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:349 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:358 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:366 #, php-format msgid "'%s' is not writeable" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:221 -#: includes/system_tests.inc:221 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:221 msgid "Temporary directory" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:233 -#: includes/system_tests.inc:233 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:233 msgid "Language configuration consistency" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:242 -#: includes/system_tests.inc:242 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:242 msgid "Languages folder should be writeable." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:251 -#: includes/system_tests.inc:251 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:251 msgid "Languages configuration file should be writeable." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:270 -#: includes/system_tests.inc:270 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:270 #, php-format msgid "Missing %s translation file." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:275 -#: includes/system_tests.inc:275 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:275 #, php-format msgid "Missing system locale: %s" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:288 -#: includes/system_tests.inc:288 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:288 msgid "Main config file" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:295 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:317 -#: includes/system_tests.inc:295 -#: includes/system_tests.inc:317 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:295 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:317 #, php-format msgid "Can't write '%s' file. Check FA directory write permissions." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:296 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:318 -#: includes/system_tests.inc:296 -#: includes/system_tests.inc:318 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:296 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:318 #, php-format msgid "'%s' file exists." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:300 -#: includes/system_tests.inc:300 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:300 #, php-format msgid "'%s' file should be read-only" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:309 -#: includes/system_tests.inc:309 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:309 msgid "Database auth file" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:322 -#: includes/system_tests.inc:322 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:322 #, php-format -msgid "'%s' file should be read-only if you do not plan to add or change companies" +msgid "" +"'%s' file should be read-only if you do not plan to add or change companies" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:333 -#: includes/system_tests.inc:333 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:333 msgid "Extensions system" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:371 -#: includes/system_tests.inc:363 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:371 msgid "Extensions configuration files and directories should be writeable" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:384 -#: includes/system_tests.inc:375 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:384 #, php-format msgid "Non-standard theme directory '%s' is not writable" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:394 -#: includes/system_tests.inc:385 -msgid "OpenSSL PHP extension have to be enabled to use extension repository system." ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:394 +msgid "" +"OpenSSL PHP extension have to be enabled to use extension repository system." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:397 -#: includes/system_tests.inc:388 -msgid "OpenSSL have to be available on your server to use extension repository system." ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:397 +msgid "" +"OpenSSL have to be available on your server to use extension repository " +"system." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420 -#: includes/system_tests.inc:411 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420 msgid "Test" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420 -#: includes/system_tests.inc:411 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420 msgid "Test type" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420 -#: includes/system_tests.inc:411 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420 msgid "Value" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420 -#: includes/system_tests.inc:411 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420 msgid "Comments" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:444 -#: includes/system_tests.inc:435 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:444 msgid "Ok" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:190 -#: includes/packages.inc:190 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:189 #, php-format msgid "No key field '%s' in file '%s'" msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:295 - #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:329 -#: includes/packages.inc:295 -#: includes/packages.inc:329 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:294 ++msgid "Cannot download repo index file." ++msgstr "" ++ ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:306 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:343 #, php-format msgid "Cannot delete outdated '%s' file." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:299 -#: includes/packages.inc:299 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:310 msgid "Release file in repository is invalid, or public key is outdated." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:316 -#: includes/packages.inc:316 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:327 msgid "Repository version does not match application version." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:333 -#: includes/packages.inc:333 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:335 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:377 + #, php-format -msgid "Security alert: broken index file in repository '%s'. Please inform repository administrator about this issue." ++msgid "Cannot download '%s' file." + msgstr "" + -#: includes/packages.inc:366 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:347 #, php-format -msgid "Security alert: broken package '%s' in repository. Please inform repository administrator about this issue." +msgid "" +"Security alert: broken index file in repository '%s'. Please inform " +"repository administrator about this issue." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:366 -#: includes/packages.inc:621 -#: includes/packages.inc:672 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:383 #, php-format -msgid "Package '%s' not found." +msgid "" +"Security alert: broken package '%s' in repository. Please inform repository " +"administrator about this issue." msgstr "" - #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:621 - #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:672 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:638 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:699 +#, php-format +msgid "Package '%s' not found." +msgstr "" diff --cc install/lang/pl_PL/LC_MESSAGES/pl_PL.mo index 2bc5ea9b,702f65af..20e75937 Binary files differ diff --cc install/lang/pl_PL/LC_MESSAGES/pl_PL.po index 5fc3546d,3ad76a1b..07affeae --- a/install/lang/pl_PL/LC_MESSAGES/pl_PL.po +++ b/install/lang/pl_PL/LC_MESSAGES/pl_PL.po @@@ -7,535 -7,491 +7,545 @@@ msgid " msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2012-09-18 14:11+0200\n" -"POT-Creation-Date: 2011-03-31 10:54+0200\n" ++"POT-Creation-Date: 2013-10-27 15:08+0100\n" "PO-Revision-Date: \n" -"Last-Translator: Translation Team \n" +"Last-Translator: Janusz Dobrowolski \n" "Language-Team: \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:20 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:41 -#: install/index.php:20 -#: install/index.php:40 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:20 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:41 msgid "FrontAccouting ERP Installation Wizard" msgstr "Instalator FrontAccounting ERP" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:42 -#: install/index.php:41 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:42 #, php-format msgid "Step %d: %s" msgstr "Krok %d: %s" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:49 -#: install/index.php:48 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49 msgid "Chart of accounts" msgstr "Plan kont" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:49 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:76 -#: install/index.php:48 -#: install/index.php:75 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76 msgid "Encoding" msgstr "Kodowanie" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:49 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:76 -#: install/index.php:48 -#: install/index.php:75 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76 msgid "Description" msgstr "Opis" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:49 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:76 -#: install/index.php:48 -#: install/index.php:75 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76 msgid "Install" msgstr "Zainstaluj" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:66 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:94 -#: install/index.php:65 -#: install/index.php:93 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:66 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:94 msgid "Installed" msgstr "Zainstalowany" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:76 -#: install/index.php:75 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76 msgid "Language" msgstr "Jêzyk" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:124 -#: install/index.php:123 -msgid "Cannot connect to database. User or password is invalid or you have no permittions to create database." -msgstr "Nie mo¿na po³aæzyæ siê z baz± danych. Login lub has³o jest niepoprawne, lub brak uprawnieñ do tworzenia bazy danych." ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:124 +msgid "" +"Cannot connect to database. User or password is invalid or you have no " +"permittions to create database." +msgstr "" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:160 -#: install/index.php:159 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:160 msgid "Cannot save system configuration file 'config.php'." msgstr "Nie mo¿na zapisaæ pliku konfiguracyjnego 'config.php'." - #: /tmp/fa_unstable.sav3/devel/../install/index.php:167 -#: install/index.php:166 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:167 msgid "Cannot open 'config_db.php' configuration file." msgstr "Nie mo¿na utworzyæ pliku konfiguracji 'config_db.php'." - #: /tmp/fa_unstable.sav3/devel/../install/index.php:170 -#: install/index.php:169 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:170 msgid "Cannot write to the 'config_db.php' configuration file." msgstr "Nie mo¿na zapisaæ pliku konfiguracji 'config_db.php'." - #: /tmp/fa_unstable.sav3/devel/../install/index.php:173 -#: install/index.php:172 -msgid "Configuration file 'config_db.php' is not writable. Change its permissions so it is, then re-run installation step." -msgstr "Plik konfiguracji 'config_db.php' jest zabezpieczony przed zapisem. Zmieñ prawa dostêpu i powtórz krok instalacji." ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:173 +msgid "" +"Configuration file 'config_db.php' is not writable. Change its permissions " +"so it is, then re-run installation step." +msgstr "" +"Plik konfiguracji 'config_db.php' jest zabezpieczony przed zapisem. Zmieñ " +"prawa dostêpu i powtórz krok instalacji." - #: /tmp/fa_unstable.sav3/devel/../install/index.php:211 -#: install/index.php:211 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:211 msgid "Host name cannot be empty." msgstr "Adres serwera nie mo¿e byæ pusty." - #: /tmp/fa_unstable.sav3/devel/../install/index.php:215 -#: install/index.php:215 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:215 msgid "Database user name cannot be empty." msgstr "Nazwa u¿ytkownika nie mo¿e by pusta." - #: /tmp/fa_unstable.sav3/devel/../install/index.php:219 -#: install/index.php:219 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:219 msgid "Database name cannot be empty." msgstr "Nazwa bazy danych nie mo¿e byæ pusta." - #: /tmp/fa_unstable.sav3/devel/../install/index.php:272 -#: install/index.php:272 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:272 msgid "Company name cannot be empty." msgstr "Nazwa firmy nie mo¿e by pusta." - #: /tmp/fa_unstable.sav3/devel/../install/index.php:276 -#: install/index.php:276 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:276 msgid "Company admin name cannot be empty." msgstr "Nazwa administratora nie mo¿e byæ pusta." - #: /tmp/fa_unstable.sav3/devel/../install/index.php:280 -#: install/index.php:280 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:280 msgid "Company admin password cannot be empty." msgstr "Has³o administratora nie mo¿e by puste." - #: /tmp/fa_unstable.sav3/devel/../install/index.php:284 -#: install/index.php:284 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:284 msgid "Company admin passwords differ." msgstr "Wprowadzone has³a ró¿ni± siê." - #: /tmp/fa_unstable.sav3/devel/../install/index.php:316 -#: install/index.php:316 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:316 msgid "System Diagnostics" msgstr "Diagnostyka Systemu" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:318 -#: install/index.php:318 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:318 msgid "Select install wizard language:" msgstr "Wybierz jêzyk u¿ywany przy instalacji:" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:324 -#: install/index.php:324 -msgid "All application preliminary requirements seems to be correct. Please press Continue button below." -msgstr "Wszystkie wymagania systemu wydaj± siê byæ spe³nione. Kliknij klawisz poni¿ej aby rozpocz±æ instalacjê." - -#: install/index.php:325 -#: install/index.php:351 -#: install/index.php:358 -#: install/index.php:365 -#: install/index.php:384 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:324 +msgid "" +"All application preliminary requirements seems to be correct. Please press " +"Continue button below." +msgstr "" +"Wszystkie wymagania systemu wydaj± siê byæ spe³nione. Kliknij klawisz " +"poni¿ej aby rozpocz±æ instalacjê." + - #: /tmp/fa_unstable.sav3/devel/../install/index.php:325 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:351 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:358 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:365 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:389 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:325 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:351 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:358 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:365 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:389 msgid "Continue >>" msgstr "Kontynuuj >>" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:327 -#: install/index.php:327 -msgid "Application cannot be installed. Please fix problems listed below in red, and press Refresh button." -msgstr "Aplikacja nie mo¿e byæ zainstalowana. Usuñ wskazane problemy i kliknij klawisz 'Od¶wie¿'." ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:327 +msgid "" +"Application cannot be installed. Please fix problems listed below in red, " +"and press Refresh button." +msgstr "" +"Aplikacja nie mo¿e byæ zainstalowana. Usuñ wskazane problemy i kliknij " +"klawisz 'Od¶wie¿'." - #: /tmp/fa_unstable.sav3/devel/../install/index.php:328 -#: install/index.php:328 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:328 msgid "Refresh" msgstr "Od¶wierz" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:338 -#: install/index.php:338 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:338 msgid "Database Server Settings" msgstr "Ustawienia Serwera Bazy Danych" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:340 -#: install/index.php:340 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:340 msgid "Server Host:" msgstr "Adres Serwera:" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:341 -#: install/index.php:341 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:341 msgid "Database User:" msgstr "Nazwa U¿ytkownika:" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:342 -#: install/index.php:342 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:342 msgid "Database Password:" msgstr "Has³o:" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:343 -#: install/index.php:343 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:343 msgid "Database Name:" msgstr "Nazwa Bazy Danych:" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:344 -#: install/index.php:344 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:344 msgid "Use '0_' Table Prefix:" msgstr "Prefiks '0_' dla Nazw Tablic:" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:344 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:38 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:113 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:126 -#: install/index.php:344 -#: includes/system_tests.inc:38 -#: includes/system_tests.inc:113 -#: includes/system_tests.inc:126 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:344 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:38 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:113 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:126 msgid "Yes" msgstr "Tak" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:344 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:38 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:113 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:126 -#: install/index.php:344 -#: includes/system_tests.inc:38 -#: includes/system_tests.inc:113 -#: includes/system_tests.inc:126 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:344 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:38 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:113 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:126 msgid "No" msgstr "Nie" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:345 -#: install/index.php:345 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:345 msgid "Install Additional Language Packs from FA Repository:" msgstr "Instalacja Dodatkowych Jêzyków z Repozytorium FA:" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:346 -#: install/index.php:346 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:346 msgid "Install Additional COAs from FA Repository:" msgstr "Instalacja Dodatkowych Planów Kont z Repozytorium FA:" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:348 -#: install/index.php:348 -msgid "Use table prefix if you share selected database for more than one FA company." ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:348 +msgid "" +"Use table prefix if you share selected database for more than one FA company." msgstr "U¿yj prefiksu je¶li ta sama baza danych bêdzie u¿ywana dla kilku firm." - #: /tmp/fa_unstable.sav3/devel/../install/index.php:349 -#: install/index.php:349 -msgid "Do not select additional langs nor COAs if you have no working internet connection right now. You can install them later." -msgstr "Nie zaznaczaj wyboru dodatkowych jêzyków ani planów kont je¶li w tej chwili nie masz dostêpu do internetu. Bêdziesz je móg³ zainstalowaæ równie¿ pó¼niej." ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:349 +msgid "" +"Do not select additional langs nor COAs if you have no working internet " +"connection right now. You can install them later." +msgstr "" +"Nie zaznaczaj wyboru dodatkowych jêzyków ani planów kont je¶li w tej chwili " +"nie masz dostêpu do internetu. Bêdziesz je móg³ zainstalowaæ równie¿ pó¼niej." - #: /tmp/fa_unstable.sav3/devel/../install/index.php:350 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:357 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:364 - #: /tmp/fa_unstable.sav3/devel/../install/index.php:388 -#: install/index.php:350 -#: install/index.php:357 -#: install/index.php:364 -#: install/index.php:383 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:350 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:357 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:364 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:388 msgid "<< Back" msgstr "<< Wróæ" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:355 -#: install/index.php:355 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:355 msgid "User Interface Languages Selection" msgstr "Wybór Jêzyków Interfejsu U¿ytkownika" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:362 -#: install/index.php:362 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:362 msgid "Charts of Accounts Selection" msgstr "Wybór Planów Kont" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:379 -#: install/index.php:374 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:379 msgid "Company Settings" msgstr "Ustawienia Firmy" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:381 -#: install/index.php:376 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:381 msgid "Company Name:" msgstr "Nazwa Firmy:" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:382 -#: install/index.php:377 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:382 msgid "Admin Login:" msgstr "Login Administratora:" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:383 -#: install/index.php:378 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:383 msgid "Admin Password:" msgstr "Has³o Administratora:" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:384 -#: install/index.php:379 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:384 msgid "Reenter Password:" msgstr "Powtórz Has³o:" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:385 -#: install/index.php:380 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:385 msgid "Select Chart of Accounts:" msgstr "Wybierz Planów Kont:" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:386 -#: install/index.php:381 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:386 msgid "Select Default Language:" msgstr "Wybierz Jêzyk Domy¶lny:" - #: /tmp/fa_unstable.sav3/devel/../install/index.php:393 -#: install/index.php:388 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:393 msgid "FrontAccounting ERP has been installed successsfully." msgstr "Aplikacja FrontAccounting ERP zosta³a zainstalowana pomy¶lnie." - #: /tmp/fa_unstable.sav3/devel/../install/index.php:394 -#: install/index.php:389 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:394 msgid "Please do not forget to remove install wizard folder." msgstr "Nie zapomnij usun±æ folderu instalatora." - #: /tmp/fa_unstable.sav3/devel/../install/index.php:397 -#: install/index.php:392 ++#: /home/janusz/FA/fa_unstable/devel/../install/index.php:397 msgid "Click here to start." msgstr "Kliknij tutaj, aby rozpocz±æ pracê." - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:15 -#: includes/system_tests.inc:15 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:15 msgid "Info" msgstr "Informacja" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:16 -#: includes/system_tests.inc:16 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:16 msgid "Optional" msgstr "Opcjonalne" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:17 -#: includes/system_tests.inc:17 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:17 msgid "Recommended" msgstr "Zalecane" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:18 -#: includes/system_tests.inc:18 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:18 msgid "Required " msgstr "Wymagane" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:24 -#: includes/system_tests.inc:24 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:24 msgid "MySQL version" msgstr "Wersja MySQL" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:28 -#: includes/system_tests.inc:28 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:28 msgid "Upgrade MySQL server to version at least 4.1" msgstr "U¿yj wersji serwera MySQL minimum 4.1" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:35 -#: includes/system_tests.inc:35 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:35 msgid "PHP MySQL extension" msgstr "Rozszerzenie PHP MySQL" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:40 -#: includes/system_tests.inc:40 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:40 msgid "Your PHP has to have MySQL extension enabled." msgstr "PHP musi mieæ w³±czone rozszerzenie MySQL." - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:46 -#: includes/system_tests.inc:46 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:46 msgid "PHP version" msgstr "Wersja PHP" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:50 -#: includes/system_tests.inc:50 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:50 msgid "Upgrade PHP to version at least 4.3.3" msgstr "Zainstaluj PHP w wersji co najmniej 4.3.3" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:57 -#: includes/system_tests.inc:57 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:57 msgid "Server system" msgstr "System serwera" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:67 -#: includes/system_tests.inc:67 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:67 msgid "Session save path" msgstr "Katalog zapisu pliku sesji" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:79 -#: includes/system_tests.inc:79 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:79 msgid "Removed install wizard folder" msgstr "Folder instalatora usuniêty" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:82 -#: includes/system_tests.inc:82 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:82 msgid "Not removed" msgstr "Nie usuniêty" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:83 -#: includes/system_tests.inc:83 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:83 msgid "Remove or rename install wizard folder for security reasons." msgstr "Ze wzglêdów bezpieczeñstwa usuñ lub zmieñ nazwê folderu instalatora." - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:90 -#: includes/system_tests.inc:90 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:90 msgid "Browser type" msgstr "Typ przegl±darki" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:94 -#: includes/system_tests.inc:94 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:94 msgid "Any browser is supported" msgstr "Mo¿e byæ u¿yty dowolny typ przegl±darki" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:101 -#: includes/system_tests.inc:101 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:101 msgid "Http server type" msgstr "Serwer http" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:105 -#: includes/system_tests.inc:105 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:105 msgid "Any server is supported" msgstr "Dowolny" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:112 -#: includes/system_tests.inc:112 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:112 msgid "Native gettext" msgstr "Biblioteka Gettext " - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:116 -#: includes/system_tests.inc:116 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:116 msgid "In case of no gettext support, php emulation is used" msgstr "W przypadku braku wsparcia systemu, gettext jest emulowany." - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:124 -#: includes/system_tests.inc:124 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:124 msgid "Debugging mode" msgstr "Tryb debug" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:128 -#: includes/system_tests.inc:128 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:128 msgid "To switch debugging on set $go_debug>0 in config.php file" msgstr "Aby w³±czyæ tryb debug ustaw $go_debug>0 in config.php file" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:137 -#: includes/system_tests.inc:137 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:137 msgid "Error logging" msgstr "Logowanie b³êdów" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:145 -#: includes/system_tests.inc:145 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:145 msgid "Disabled" msgstr "Wy³±czony" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:148 -#: includes/system_tests.inc:148 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:148 msgid "To switch error logging set $error_logging in config.php file" -msgstr "Aby w³±czyæ logowanie b³êdów ustaw zmienn± $error_logging w pliku config.php" +msgstr "" +"Aby w³±czyæ logowanie b³êdów ustaw zmienn± $error_logging w pliku config.php" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:151 -#: includes/system_tests.inc:151 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:151 msgid "Log file is not writeable" msgstr "Logfile jest niezapisywalny" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:161 -#: includes/system_tests.inc:161 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:161 msgid "Current database version" msgstr "Aktualna wersja bazy danych" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:165 -#: includes/system_tests.inc:165 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:165 msgid "Database structure seems to be not upgraded to current version" msgstr "Struktura bazy danych nie jest zaktualizowana do bie¿±cej wersji" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:180 -#: includes/system_tests.inc:180 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:180 msgid "Company subdirectories consistency" msgstr "Prawid³owa struktura folderów firmowych" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:193 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:200 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:208 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:225 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:340 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:349 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:358 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:366 -#: includes/system_tests.inc:193 -#: includes/system_tests.inc:200 -#: includes/system_tests.inc:208 -#: includes/system_tests.inc:225 -#: includes/system_tests.inc:340 -#: includes/system_tests.inc:349 -#: includes/system_tests.inc:358 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:193 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:200 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:208 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:225 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:340 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:349 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:358 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:366 #, php-format msgid "'%s' is not writeable" msgstr "'%s' jest niezapisywalny" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:221 -#: includes/system_tests.inc:221 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:221 msgid "Temporary directory" msgstr "Katalog plików tymczasowych" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:233 -#: includes/system_tests.inc:233 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:233 msgid "Language configuration consistency" msgstr "Konfiguracja jêzykowa" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:242 -#: includes/system_tests.inc:242 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:242 msgid "Languages folder should be writeable." msgstr "Folder jêzyków musi byæ zapisywalny" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:251 -#: includes/system_tests.inc:251 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:251 msgid "Languages configuration file should be writeable." msgstr "Pliki konfiguracyjny jêzyków musi byæ zapisywalny." - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:270 -#: includes/system_tests.inc:270 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:270 #, php-format msgid "Missing %s translation file." msgstr "Brak pliku t³umaczeñ %s" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:275 -#: includes/system_tests.inc:275 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:275 #, php-format msgid "Missing system locale: %s" msgstr "Lokalizacja '%s' nie jest zainstalowana w systemie" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:288 -#: includes/system_tests.inc:288 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:288 msgid "Main config file" msgstr "G³ówny plik konfiguracyjny " - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:295 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:317 -#: includes/system_tests.inc:295 -#: includes/system_tests.inc:317 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:295 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:317 #, php-format msgid "Can't write '%s' file. Check FA directory write permissions." msgstr "Nie mo¿na zapisaæ pliku '%s'. Sprawd¼ prawa zapisu do foderu FA." - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:296 - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:318 -#: includes/system_tests.inc:296 -#: includes/system_tests.inc:318 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:296 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:318 #, php-format msgid "'%s' file exists." msgstr "Plik '%s' istnieje." - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:300 -#: includes/system_tests.inc:300 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:300 #, php-format msgid "'%s' file should be read-only" msgstr "Plik '%s powinien byæ zabezpieczony przed zapisem" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:309 -#: includes/system_tests.inc:309 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:309 msgid "Database auth file" msgstr "Pik configuracyjny bazy danych" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:322 -#: includes/system_tests.inc:322 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:322 #, php-format -msgid "'%s' file should be read-only if you do not plan to add or change companies" -msgstr "Plik '%s' powinien byæ zabezpieczony przed zapisem je¶li nie planujesz dodawania ani zmiany firm" +msgid "" +"'%s' file should be read-only if you do not plan to add or change companies" +msgstr "" +"Plik '%s' powinien byæ zabezpieczony przed zapisem je¶li nie planujesz " +"dodawania ani zmiany firm" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:333 -#: includes/system_tests.inc:333 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:333 msgid "Extensions system" msgstr "System rozszerzeñ" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:371 -#: includes/system_tests.inc:363 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:371 msgid "Extensions configuration files and directories should be writeable" msgstr "Pliki konfiguracyjne i foldery rozszerzeñ powinny byæ zapisywalne" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:384 -#: includes/system_tests.inc:375 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:384 #, php-format msgid "Non-standard theme directory '%s' is not writable" msgstr "Niestandardowy folder tematu '%s' jest zazpieczony przed zapisem" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:394 -#: includes/system_tests.inc:385 -msgid "OpenSSL PHP extension have to be enabled to use extension repository system." ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:394 +msgid "" +"OpenSSL PHP extension have to be enabled to use extension repository system." msgstr "System pakietów wymaga zaisnatlowanego rozszerzenia PHP OpenSSL." - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:397 -#: includes/system_tests.inc:388 -msgid "OpenSSL have to be available on your server to use extension repository system." -msgstr "Serwer musi mieæ zainstalowane OpenSSL ¿eby mo¿na by³o korzystaæ z repozytorium pakietów rozszerzeñ FA." ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:397 +msgid "" +"OpenSSL have to be available on your server to use extension repository " +"system." +msgstr "" +"Serwer musi mieæ zainstalowane OpenSSL ¿eby mo¿na by³o korzystaæ z " +"repozytorium pakietów rozszerzeñ FA." - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420 -#: includes/system_tests.inc:411 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420 msgid "Test" msgstr "Test" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420 -#: includes/system_tests.inc:411 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420 msgid "Test type" msgstr "Typ testu" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420 -#: includes/system_tests.inc:411 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420 msgid "Value" msgstr "Warto¶æ" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:420 -#: includes/system_tests.inc:411 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420 msgid "Comments" msgstr "Komentarz" - #: /tmp/fa_unstable.sav3/devel/../includes/system_tests.inc:444 -#: includes/system_tests.inc:435 ++#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:444 msgid "Ok" msgstr "Ok" - #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:190 -#: includes/packages.inc:190 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:189 #, php-format msgid "No key field '%s' in file '%s'" -msgstr "Brak pola '%s' w pliku '%s'" +msgstr "" + - #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:295 - #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:329 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:294 ++msgid "Cannot download repo index file." ++msgstr "" ++ ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:306 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:343 +#, fuzzy, php-format +msgid "Cannot delete outdated '%s' file." +msgstr "Nie mo¿na usun±æ pliku." - #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:299 -#: includes/packages.inc:295 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:310 msgid "Release file in repository is invalid, or public key is outdated." -msgstr "Plik kontrolny wydania jest uszkodzony, lub klucz publiczny jest nieaktualny." +msgstr "" +"Plik kontrolny wydania jest uszkodzony, lub klucz publiczny jest nieaktualny." - #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:316 -#: includes/packages.inc:311 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:327 msgid "Repository version does not match application version." msgstr "Wersja repozytorium nie zgadza siê z wersj± aplikacji." - #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:333 -#: includes/packages.inc:325 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:335 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:377 ++#, fuzzy, php-format ++msgid "Cannot download '%s' file." ++msgstr "Nie mo¿na usun±æ pliku." ++ ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:347 #, php-format -msgid "Security alert: broken index file in repository '%s'. Please inform repository administrator about this issue." -msgstr "Alarm bezpieczeñstwa: uszkodzony plik indeksu repozytorium '%s'. Poinformuj administratora repozytorium o tym problemie." +msgid "" +"Security alert: broken index file in repository '%s'. Please inform " +"repository administrator about this issue." +msgstr "" +"Alarm bezpieczeñstwa: uszkodzony plik indeksu repozytorium '%s'. Poinformuj " +"administratora repozytorium o tym problemie." - #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:366 -#: includes/packages.inc:358 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:383 #, php-format -msgid "Security alert: broken package '%s' in repository. Please inform repository administrator about this issue." -msgstr "Alarm bezpieczeñstwa: uszkodzony plik '%s' w repozytorium. Poinformuj administratora repozytorium o tym problemie." +msgid "" +"Security alert: broken package '%s' in repository. Please inform repository " +"administrator about this issue." +msgstr "" +"Alarm bezpieczeñstwa: uszkodzony plik '%s' w repozytorium. Poinformuj " +"administratora repozytorium o tym problemie." - #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:621 - #: /tmp/fa_unstable.sav3/devel/../includes/packages.inc:672 -#: includes/packages.inc:613 -#: includes/packages.inc:664 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:638 ++#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:699 #, php-format msgid "Package '%s' not found." msgstr "Pakiet '%s' nie zosta³ znaleziony." diff --cc inventory/includes/db/items_trans_db.inc index 923d18c4,a7591dd3..b54c1980 --- a/inventory/includes/db/items_trans_db.inc +++ b/inventory/includes/db/items_trans_db.inc @@@ -69,10 -64,11 +70,11 @@@ function stock_cost_update($stock_id, $ add_gl_trans_std_cost(ST_COSTUPDATE, $update_no, $date_, $stock_gl_code["inventory_account"], 0, 0, $memo_, $value_of_change); - } + } } - add_audit_trail(ST_COSTUPDATE, $update_no, $date_); + if ($update_no != -1) + add_audit_trail(ST_COSTUPDATE, $update_no, $date_); commit_transaction(); return $update_no; diff --cc inventory/inquiry/stock_movements.php index a18f9a79,df25e102..2c2e0974 --- a/inventory/inquiry/stock_movements.php +++ b/inventory/inquiry/stock_movements.php @@@ -53,9 -57,9 +53,9 @@@ end_table() start_table(TABLESTYLE_NOBORDER); start_row(); - locations_list_cells(_("From Location:"), 'StockLocation', null); + locations_list_cells(_("From Location:"), 'StockLocation', null, true); -date_cells(_("From:"), 'AfterDate', '', null, -30); +date_cells(_("From:"), 'AfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); date_cells(_("To:"), 'BeforeDate'); submit_cells('ShowMoves',_("Show Movements"),'',_('Refresh Inquiry'), 'default'); diff --cc inventory/manage/items.php index 9a91acc2,f4d3b988..eb7c0ec5 --- a/inventory/manage/items.php +++ b/inventory/manage/items.php @@@ -18,9 -17,8 +18,8 @@@ if ($use_popup_windows $js .= get_js_open_window(900, 500); if ($use_date_picker) $js .= get_js_date_picker(); -- - page(_($help_context = "Items"), @$_REQUEST['popup'], false, "", $js); + + page(_($help_context = "Items"), @$_REQUEST['popup'], false, "", $js); include_once($path_to_root . "/includes/date_functions.inc"); include_once($path_to_root . "/includes/ui.inc"); diff --cc lang/new_language_template/LC_MESSAGES/empty.po index 39e655ec,464084e2..0adc91ca --- a/lang/new_language_template/LC_MESSAGES/empty.po +++ b/lang/new_language_template/LC_MESSAGES/empty.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2012-09-18 14:10+0200\n" -"POT-Creation-Date: 2013-09-05 14:17+0200\n" ++"POT-Creation-Date: 2013-10-27 08:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -22,10 -21,8 +22,10 @@@ msgid "Main Menu" msgstr "" -#: frontaccounting.php:75 access/logout.php:18 themes/default/renderer.php:70 -#: themes/default/renderer.php:83 +#: ../frontaccounting.php:75 +#: ../access/logout.php:18 - #: ../themes/default/renderer.php:53 - #: ../themes/default/renderer.php:82 ++#: ../themes/default/renderer.php:70 ++#: ../themes/default/renderer.php:83 msgid "Logout" msgstr "" @@@ -45,46 -42,37 +45,45 @@@ msgstr " msgid "Too many failed login attempts.
Please wait a while or try later." msgstr "" -#: access/login.php:49 access/login.php:80 +#: ../access/login.php:49 - #: ../access/login.php:79 ++#: ../access/login.php:80 msgid "Authorization timeout" msgstr "" -#: access/login.php:49 access/login.php:87 +#: ../access/login.php:49 - #: ../access/login.php:86 ++#: ../access/login.php:87 msgid "Login" msgstr "" - #: ../access/login.php:86 -#: access/login.php:87 admin/inst_upgrade.php:137 ++#: ../access/login.php:87 +#: ../admin/inst_upgrade.php:141 msgid "Version" msgstr "" - #: ../access/login.php:89 -#: access/login.php:90 ++#: ../access/login.php:90 msgid "User name" msgstr "" - #: ../access/login.php:93 - #: ../admin/change_current_user_password.php:78 -#: access/login.php:94 admin/users.php:191 ++#: ../access/login.php:94 +#: ../admin/users.php:191 msgid "Password:" msgstr "" - #: ../access/login.php:103 - #: ../access/login.php:110 -#: access/login.php:104 access/login.php:111 admin/create_coy.php:253 -#: admin/create_coy.php:336 ++#: ../access/login.php:104 ++#: ../access/login.php:111 +#: ../admin/create_coy.php:253 +#: ../admin/create_coy.php:336 +#: ../includes/sysnames.inc:194 msgid "Company" msgstr "" - #: ../access/login.php:117 -#: access/login.php:118 ++#: ../access/login.php:118 msgid "Login -->" msgstr "" - #: ../access/login.php:148 - #: ../admin/display_prefs.php:111 - #: ../themes/default/renderer.php:127 -#: access/login.php:149 admin/display_prefs.php:112 -#: themes/default/renderer.php:129 ++#: ../access/login.php:149 ++#: ../admin/display_prefs.php:112 ++#: ../themes/default/renderer.php:129 msgid "Theme:" msgstr "" @@@ -96,299 -84,200 +95,292 @@@ msgstr " msgid "Click here to Login Again." msgstr "" - #: ../admin/attachments.php:72 -#: admin/attachments.php:74 ++#: ../admin/attachments.php:74 msgid "Attach Documents" msgstr "" - #: ../admin/attachments.php:84 - msgid "No transaction has been selected." -#: admin/attachments.php:86 ++#: ../admin/attachments.php:86 + msgid "Selected transaction does not exists." msgstr "" - #: ../admin/attachments.php:86 -#: admin/attachments.php:88 ++#: ../admin/attachments.php:88 msgid "Select attachment file." msgstr "" - #: ../admin/attachments.php:121 -#: admin/attachments.php:125 ++#: ../admin/attachments.php:125 msgid "Attachment has been inserted." msgstr "" - #: ../admin/attachments.php:127 -#: admin/attachments.php:131 ++#: ../admin/attachments.php:131 msgid "Attachment has been updated." msgstr "" - #: ../admin/attachments.php:140 -#: admin/attachments.php:146 ++#: ../admin/attachments.php:146 msgid "Attachment has been deleted." msgstr "" - #: ../admin/attachments.php:158 -#: admin/attachments.php:164 admin/view_print_transaction.php:72 -#: admin/void_transaction.php:157 gl/inquiry/journal_inquiry.php:47 -#: inventory/includes/item_adjustments_ui.inc:47 -#: manufacturing/work_order_add_finished.php:203 -#: manufacturing/work_order_costs.php:150 -#: manufacturing/work_order_entry.php:379 -#: manufacturing/work_order_entry.php:387 -#: manufacturing/includes/work_order_issue_ui.inc:161 -#: sales/inquiry/customer_allocation_inquiry.php:47 ++#: ../admin/attachments.php:164 +#: ../admin/view_print_transaction.php:72 +#: ../gl/inquiry/journal_inquiry.php:47 +#: ../inventory/includes/item_adjustments_ui.inc:47 +#: ../manufacturing/work_order_add_finished.php:203 +#: ../manufacturing/work_order_costs.php:136 +#: ../manufacturing/work_order_entry.php:379 +#: ../manufacturing/work_order_entry.php:387 +#: ../manufacturing/includes/work_order_issue_ui.inc:161 +#: ../sales/inquiry/customer_allocation_inquiry.php:47 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:47 msgid "Type:" msgstr "" - #: ../admin/attachments.php:170 - #: ../admin/view_print_transaction.php:126 - #: ../admin/void_transaction.php:181 - #: ../dimensions/inquiry/search_dimensions.php:127 - #: ../dimensions/view/view_dimension.php:54 - #: ../gl/bank_account_reconcile.php:232 - #: ../gl/inquiry/bank_inquiry.php:70 - #: ../gl/inquiry/gl_account_inquiry.php:126 - #: ../gl/inquiry/journal_inquiry.php:127 - #: ../gl/inquiry/journal_inquiry.php:140 - #: ../includes/ui/allocation_cart.inc:264 - #: ../inventory/inquiry/stock_movements.php:77 - #: ../inventory/inquiry/stock_movements.php.orig:79 - #: ../manufacturing/search_work_orders.php:159 - #: ../manufacturing/includes/manufacturing_ui.inc:157 - #: ../manufacturing/includes/manufacturing_ui.inc:200 - #: ../manufacturing/includes/manufacturing_ui.inc:236 - #: ../manufacturing/includes/manufacturing_ui.inc:276 - #: ../manufacturing/includes/manufacturing_ui.inc:280 - #: ../manufacturing/includes/manufacturing_ui.inc:331 - #: ../purchasing/view/view_po.php:115 - #: ../purchasing/view/view_po.php:140 - #: ../purchasing/inquiry/po_search_completed.php:120 - #: ../purchasing/inquiry/po_search_completed.php.orig:119 - #: ../purchasing/inquiry/po_search.php:130 - #: ../purchasing/inquiry/supplier_allocation_inquiry.php:126 - #: ../purchasing/inquiry/supplier_inquiry.php:174 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:171 - #: ../purchasing/allocations/supplier_allocation_main.php:95 - #: ../reporting/rep101.php:130 - #: ../reporting/rep201.php:118 - #: ../reporting/rep203.php:91 - #: ../reporting/rep601.php:76 - #: ../reporting/rep602.php:80 - #: ../reporting/rep704.php:79 - #: ../reporting/rep704.php:82 - #: ../reporting/rep704.php:85 - #: ../reporting/rep710.php:76 - #: ../reporting/includes/doctext.inc:167 - #: ../reporting/includes/doctext.inc:208 - #: ../reporting/includes/doctext.inc:246 - #: ../sales/allocations/customer_allocation_main.php:94 - #: ../sales/view/view_sales_order.php:109 - #: ../sales/view/view_sales_order.php:142 - #: ../sales/view/view_sales_order.php:179 - #: ../sales/view/view_sales_order.php.orig:96 - #: ../sales/view/view_sales_order.php.orig:129 - #: ../sales/view/view_sales_order.php.orig:161 - #: ../sales/inquiry/customer_allocation_inquiry.php:145 - #: ../sales/inquiry/customer_inquiry.php:201 - msgid "#" - msgstr "" - - #: ../admin/attachments.php:170 - #: ../admin/attachments.php:220 - #: ../admin/crm_categories.php:88 - #: ../admin/inst_upgrade.php:141 - #: ../admin/payment_terms.php:127 - #: ../admin/printers.php:84 - #: ../admin/print_profiles.php:148 - #: ../gl/inquiry/tax_inquiry.php:82 - #: ../gl/manage/gl_quick_entries.php:186 - #: ../gl/manage/gl_quick_entries.php:224 - #: ../includes/ui/view_package.php:22 - #: ../inventory/manage/item_codes.php:125 - #: ../inventory/manage/item_units.php:94 - #: ../inventory/manage/movement_types.php:95 - #: ../inventory/manage/sales_kits.php:40 - #: ../inventory/view/view_adjustment.php:56 - #: ../inventory/view/view_transfer.php:56 - #: ../manufacturing/manage/bom_edit.php:70 - #: ../manufacturing/includes/manufacturing_ui.inc:28 - #: ../purchasing/includes/ui/invoice_ui.inc:492 - #: ../purchasing/includes/ui/invoice_ui.inc:504 - #: ../purchasing/po_receive_items.php:62 - #: ../reporting/rep104.php:109 - #: ../reporting/rep105.php:112 - #: ../reporting/rep204.php:82 - #: ../reporting/rep303.php:109 - #: ../reporting/rep303.php:115 - #: ../reporting/rep304.php:112 - #: ../reporting/rep305.php:98 - #: ../reporting/rep401.php:69 - #: ../sales/create_recurrent_invoices.php:132 - #: ../sales/manage/credit_status.php:97 - #: ../sales/manage/recurrent_invoices.php:102 - #: ../sales/inquiry/sales_orders_view.php:317 - #: ../sales/inquiry/sales_orders_view.php:321 - #: ../taxes/tax_groups.php:123 - #: ../taxes/tax_groups.php.orig:125 - #: ../taxes/tax_groups.php.sav:125 - #: ../taxes/tax_types.php:115 - msgid "Description" - msgstr "" - - #: ../admin/attachments.php:170 - #: ../admin/backups.php:63 - #: ../admin/backups.php:149 - msgid "Filename" - msgstr "" - - #: ../admin/attachments.php:170 - msgid "Size" - msgstr "" - - #: ../admin/attachments.php:170 - msgid "Filetype" - msgstr "" - - #: ../admin/attachments.php:170 - msgid "Date Uploaded" - msgstr "" - - #: ../admin/attachments.php:185 -#: admin/attachments.php:180 admin/create_coy.php:277 -#: admin/crm_categories.php:115 admin/fiscalyears.php:164 -#: admin/inst_lang.php:100 admin/payment_terms.php:142 admin/printers.php:96 -#: admin/shipping_companies.php:106 admin/tags.php:140 admin/users.php:144 -#: dimensions/inquiry/search_dimensions.php:120 -#: gl/inquiry/journal_inquiry.php:118 gl/manage/bank_accounts.php:130 -#: gl/manage/currencies.php:164 gl/manage/exchange_rates.php:94 -#: gl/manage/gl_account_classes.php:132 gl/manage/gl_account_types.php:154 -#: gl/manage/gl_quick_entries.php:196 gl/manage/gl_quick_entries.php:295 -#: gl/includes/ui/gl_bank_ui.inc:186 gl/includes/ui/gl_journal_ui.inc:122 -#: includes/ui/contacts_view.inc:64 includes/ui/simple_crud_class.inc:52 -#: inventory/prices.php:158 inventory/purchasing_data.php:164 -#: inventory/includes/item_adjustments_ui.inc:87 -#: inventory/includes/stock_transfers_ui.inc:79 -#: inventory/manage/item_categories.php:121 -#: inventory/manage/item_codes.php:140 inventory/manage/item_units.php:110 -#: inventory/manage/locations.php:161 inventory/manage/movement_types.php:106 -#: inventory/manage/sales_kits.php:55 manufacturing/search_work_orders.php:109 -#: manufacturing/manage/bom_edit.php:86 -#: manufacturing/manage/work_centres.php:114 -#: manufacturing/includes/work_order_issue_ui.inc:58 -#: purchasing/includes/ui/invoice_ui.inc:533 -#: purchasing/includes/ui/po_ui.inc:263 -#: purchasing/inquiry/po_search_completed.php:106 -#: purchasing/inquiry/po_search.php:87 sales/manage/credit_status.php:119 -#: sales/manage/customer_branches.php:159 -#: sales/manage/recurrent_invoices.php:130 sales/manage/sales_areas.php:103 -#: sales/manage/sales_groups.php:99 sales/manage/sales_people.php:119 -#: sales/manage/sales_points.php:99 sales/manage/sales_types.php:121 -#: sales/inquiry/customer_inquiry.php:198 -#: sales/inquiry/sales_deliveries_view.php:154 -#: sales/inquiry/sales_orders_view.php:128 -#: sales/includes/ui/sales_credit_ui.inc:197 -#: sales/includes/ui/sales_order_ui.inc:208 taxes/item_tax_types.php:139 -#: taxes/tax_groups.php:142 taxes/tax_types.php:132 ++#: ../admin/attachments.php:180 +#: ../admin/create_coy.php:277 - #: ../admin/crm_categories.php:106 ++#: ../admin/crm_categories.php:115 +#: ../admin/fiscalyears.php:164 +#: ../admin/inst_lang.php:100 +#: ../admin/payment_terms.php:142 +#: ../admin/printers.php:96 +#: ../admin/shipping_companies.php:106 +#: ../admin/tags.php:140 +#: ../admin/users.php:144 +#: ../dimensions/inquiry/search_dimensions.php:120 +#: ../gl/inquiry/journal_inquiry.php:118 +#: ../gl/manage/bank_accounts.php:133 +#: ../gl/manage/currencies.php:164 +#: ../gl/manage/exchange_rates.php:94 +#: ../gl/manage/gl_account_classes.php:132 +#: ../gl/manage/gl_account_types.php:154 +#: ../gl/manage/gl_quick_entries.php:196 +#: ../gl/manage/gl_quick_entries.php:295 - #: ../gl/includes/ui/gl_bank_ui.inc:184 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:158 ++#: ../gl/includes/ui/gl_bank_ui.inc:186 +#: ../gl/includes/ui/gl_journal_ui.inc:134 +#: ../includes/ui/contacts_view.inc:64 +#: ../includes/ui/simple_crud_class.inc:52 - #: ../includes/ui/ui_input.inc:960 - #: ../inventory/prices.php:145 - #: ../inventory/purchasing_data.php:146 - #: ../inventory/purchasing_data.php.orig:75 ++#: ../includes/ui/ui_input.inc:961 ++#: ../inventory/prices.php:158 ++#: ../inventory/purchasing_data.php:164 +#: ../inventory/includes/item_adjustments_ui.inc:87 +#: ../inventory/includes/stock_transfers_ui.inc:79 +#: ../inventory/manage/item_categories.php:121 +#: ../inventory/manage/item_codes.php:140 +#: ../inventory/manage/item_units.php:110 +#: ../inventory/manage/locations.php:161 +#: ../inventory/manage/movement_types.php:106 +#: ../inventory/manage/sales_kits.php:55 +#: ../manufacturing/search_work_orders.php:109 +#: ../manufacturing/manage/bom_edit.php:86 +#: ../manufacturing/manage/work_centres.php:114 +#: ../manufacturing/includes/work_order_issue_ui.inc:58 - #: ../purchasing/includes/ui/invoice_ui.inc:542 - #: ../purchasing/includes/ui/po_ui.inc:273 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:542 +#: ../purchasing/includes/ui/po_ui.inc.orig:273 +#: ../purchasing/inquiry/po_search_completed.php:105 +#: ../purchasing/inquiry/po_search_completed.php.orig:104 +#: ../purchasing/inquiry/po_search.php:87 +#: ../sales/manage/credit_status.php:119 +#: ../sales/manage/customer_branches.php:159 +#: ../sales/manage/recurrent_invoices.php:130 +#: ../sales/manage/sales_areas.php:103 +#: ../sales/manage/sales_groups.php:99 +#: ../sales/manage/sales_people.php:119 +#: ../sales/manage/sales_points.php:99 +#: ../sales/manage/sales_types.php:121 +#: ../sales/inquiry/sales_deliveries_view.php:154 - #: ../sales/inquiry/sales_orders_view.php:136 ++#: ../sales/inquiry/sales_orders_view.php.orig:136 +#: ../sales/includes/ui/sales_credit_ui.inc:197 - #: ../sales/includes/ui/sales_order_ui.inc.orig:202 ++#: ../sales/includes/ui/sales_order_ui.inc:209 +#: ../taxes/item_tax_types.php:139 ++#: ../taxes/sav.tax_types.php:211 ++#: ../taxes/sav.tax_types.php:262 +#: ../taxes/tax_groups.php:137 - #: ../taxes/tax_groups.php.orig:139 - #: ../taxes/tax_groups.php.sav:139 +#: ../taxes/tax_types.php:132 msgid "Edit" msgstr "" - #: ../admin/attachments.php:186 -#: admin/attachments.php:185 gl/inquiry/journal_inquiry.php:135 ++#: ../admin/attachments.php:185 +#: ../gl/inquiry/journal_inquiry.php:135 msgid "View" msgstr "" - #: ../admin/attachments.php:187 -#: admin/attachments.php:190 ++#: ../admin/attachments.php:190 msgid "Download" msgstr "" - #: ../admin/attachments.php:188 -#: admin/attachments.php:195 admin/create_coy.php:278 -#: admin/crm_categories.php:119 admin/fiscalyears.php:166 -#: admin/inst_chart.php:80 admin/inst_lang.php:109 admin/inst_module.php:143 -#: admin/inst_theme.php:102 admin/payment_terms.php:143 admin/printers.php:97 -#: admin/shipping_companies.php:107 admin/tags.php:141 admin/users.php:146 -#: gl/gl_budget.php:137 gl/manage/bank_accounts.php:131 -#: gl/manage/currencies.php:166 gl/manage/exchange_rates.php:99 -#: gl/manage/gl_account_classes.php:133 gl/manage/gl_account_types.php:155 -#: gl/manage/gl_quick_entries.php:197 gl/manage/gl_quick_entries.php:296 -#: gl/includes/ui/gl_bank_ui.inc:188 gl/includes/ui/gl_journal_ui.inc:124 -#: includes/ui/contacts_view.inc:67 includes/ui/simple_crud_class.inc:54 -#: includes/ui/ui_input.inc:285 inventory/prices.php:159 -#: inventory/purchasing_data.php:165 -#: inventory/includes/item_adjustments_ui.inc:89 -#: inventory/includes/stock_transfers_ui.inc:81 -#: inventory/manage/item_categories.php:122 -#: inventory/manage/item_codes.php:141 inventory/manage/item_units.php:111 -#: inventory/manage/locations.php:162 inventory/manage/movement_types.php:107 -#: inventory/manage/sales_kits.php:56 manufacturing/manage/bom_edit.php:87 -#: manufacturing/manage/work_centres.php:115 -#: manufacturing/includes/work_order_issue_ui.inc:60 -#: purchasing/includes/ui/invoice_ui.inc:297 -#: purchasing/includes/ui/po_ui.inc:265 sales/manage/credit_status.php:120 -#: sales/manage/customer_branches.php:163 -#: sales/manage/recurrent_invoices.php:131 sales/manage/sales_areas.php:104 -#: sales/manage/sales_groups.php:100 sales/manage/sales_people.php:120 -#: sales/manage/sales_points.php:100 sales/manage/sales_types.php:122 -#: sales/includes/ui/sales_credit_ui.inc:199 -#: sales/includes/ui/sales_order_ui.inc:210 taxes/item_tax_types.php:140 -#: taxes/tax_groups.php:143 taxes/tax_types.php:133 ++#: ../admin/attachments.php:195 +#: ../admin/create_coy.php:278 - #: ../admin/crm_categories.php:110 ++#: ../admin/crm_categories.php:119 +#: ../admin/fiscalyears.php:166 +#: ../admin/inst_chart.php:80 +#: ../admin/inst_lang.php:109 - #: ../admin/inst_module.php:144 ++#: ../admin/inst_module.php:143 +#: ../admin/inst_theme.php:102 +#: ../admin/payment_terms.php:143 +#: ../admin/printers.php:97 +#: ../admin/shipping_companies.php:107 +#: ../admin/tags.php:141 +#: ../admin/users.php:146 +#: ../gl/gl_budget.php:137 +#: ../gl/manage/bank_accounts.php:134 +#: ../gl/manage/currencies.php:166 +#: ../gl/manage/exchange_rates.php:99 +#: ../gl/manage/gl_account_classes.php:133 +#: ../gl/manage/gl_account_types.php:155 +#: ../gl/manage/gl_quick_entries.php:197 +#: ../gl/manage/gl_quick_entries.php:296 - #: ../gl/includes/ui/gl_bank_ui.inc:186 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:160 ++#: ../gl/includes/ui/gl_bank_ui.inc:188 +#: ../gl/includes/ui/gl_journal_ui.inc:136 +#: ../includes/ui/contacts_view.inc:67 +#: ../includes/ui/simple_crud_class.inc:54 +#: ../includes/ui/ui_input.inc:286 - #: ../inventory/prices.php:146 - #: ../inventory/purchasing_data.php:147 - #: ../inventory/purchasing_data.php.orig:80 ++#: ../inventory/prices.php:159 ++#: ../inventory/purchasing_data.php:165 +#: ../inventory/includes/item_adjustments_ui.inc:89 +#: ../inventory/includes/stock_transfers_ui.inc:81 +#: ../inventory/manage/item_categories.php:122 +#: ../inventory/manage/item_codes.php:141 +#: ../inventory/manage/item_units.php:111 +#: ../inventory/manage/locations.php:162 +#: ../inventory/manage/movement_types.php:107 +#: ../inventory/manage/sales_kits.php:56 +#: ../manufacturing/manage/bom_edit.php:87 +#: ../manufacturing/manage/work_centres.php:115 +#: ../manufacturing/includes/work_order_issue_ui.inc:60 - #: ../purchasing/includes/ui/invoice_ui.inc:304 - #: ../purchasing/includes/ui/po_ui.inc:275 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:304 +#: ../purchasing/includes/ui/po_ui.inc.orig:275 +#: ../sales/manage/credit_status.php:120 +#: ../sales/manage/customer_branches.php:163 +#: ../sales/manage/recurrent_invoices.php:131 +#: ../sales/manage/sales_areas.php:104 +#: ../sales/manage/sales_groups.php:100 +#: ../sales/manage/sales_people.php:120 +#: ../sales/manage/sales_points.php:100 +#: ../sales/manage/sales_types.php:122 +#: ../sales/includes/ui/sales_credit_ui.inc:199 - #: ../sales/includes/ui/sales_order_ui.inc.orig:204 ++#: ../sales/includes/ui/sales_order_ui.inc:211 +#: ../taxes/item_tax_types.php:140 ++#: ../taxes/sav.tax_types.php:212 +#: ../taxes/tax_groups.php:138 - #: ../taxes/tax_groups.php.orig:140 - #: ../taxes/tax_groups.php.sav:140 +#: ../taxes/tax_types.php:133 msgid "Delete" msgstr "" - #: ../admin/attachments.php:214 - #: ../admin/attachments.php:219 -#: admin/attachments.php:202 admin/view_print_transaction.php:126 -#: admin/void_transaction.php:181 dimensions/inquiry/search_dimensions.php:127 -#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:234 -#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126 -#: gl/inquiry/journal_inquiry.php:127 gl/inquiry/journal_inquiry.php:140 -#: includes/ui/allocation_cart.inc:263 -#: inventory/inquiry/stock_movements.php:82 -#: manufacturing/search_work_orders.php:159 -#: manufacturing/includes/manufacturing_ui.inc:157 -#: manufacturing/includes/manufacturing_ui.inc:200 -#: manufacturing/includes/manufacturing_ui.inc:236 -#: manufacturing/includes/manufacturing_ui.inc:276 -#: manufacturing/includes/manufacturing_ui.inc:280 -#: manufacturing/includes/manufacturing_ui.inc:331 -#: purchasing/view/view_po.php:115 purchasing/view/view_po.php:140 -#: purchasing/inquiry/po_search_completed.php:121 -#: purchasing/inquiry/po_search.php:130 -#: purchasing/inquiry/supplier_allocation_inquiry.php:127 -#: purchasing/inquiry/supplier_inquiry.php:169 -#: purchasing/allocations/supplier_allocation_main.php:95 -#: reporting/rep101.php:118 reporting/rep201.php:110 reporting/rep203.php:93 -#: reporting/rep306.php:141 reporting/rep601.php:79 reporting/rep704.php:83 -#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep710.php:78 -#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186 -#: reporting/includes/doctext.inc:224 -#: sales/allocations/customer_allocation_main.php:94 -#: sales/view/view_sales_order.php:96 sales/view/view_sales_order.php:129 -#: sales/view/view_sales_order.php:161 -#: sales/inquiry/customer_allocation_inquiry.php:144 -#: sales/inquiry/customer_inquiry.php:225 ++#: ../admin/attachments.php:202 ++#: ../admin/view_print_transaction.php:126 ++#: ../admin/void_transaction.php:181 ++#: ../dimensions/inquiry/search_dimensions.php:127 ++#: ../dimensions/view/view_dimension.php:55 ++#: ../gl/bank_account_reconcile.php:232 ++#: ../gl/inquiry/bank_inquiry.php:70 ++#: ../gl/inquiry/gl_account_inquiry.php:126 ++#: ../gl/inquiry/journal_inquiry.php:127 ++#: ../gl/inquiry/journal_inquiry.php:140 ++#: ../includes/ui/allocation_cart.inc.orig:264 ++#: ../inventory/inquiry/stock_movements.php:78 ++#: ../manufacturing/search_work_orders.php:159 ++#: ../manufacturing/includes/manufacturing_ui.inc:157 ++#: ../manufacturing/includes/manufacturing_ui.inc:200 ++#: ../manufacturing/includes/manufacturing_ui.inc:236 ++#: ../manufacturing/includes/manufacturing_ui.inc:276 ++#: ../manufacturing/includes/manufacturing_ui.inc:280 ++#: ../manufacturing/includes/manufacturing_ui.inc:331 ++#: ../purchasing/view/view_po.php:115 ++#: ../purchasing/view/view_po.php:140 ++#: ../purchasing/inquiry/po_search_completed.php:120 ++#: ../purchasing/inquiry/po_search_completed.php.orig:119 ++#: ../purchasing/inquiry/po_search.php:130 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:126 ++#: ../purchasing/inquiry/supplier_inquiry.php:174 ++#: ../purchasing/allocations/supplier_allocation_main.php:95 ++#: ../reporting/rep101.php:118 ++#: ../reporting/rep201.php:110 ++#: ../reporting/rep203.php:93 ++#: ../reporting/rep306.php:141 ++#: ../reporting/rep601.php:79 ++#: ../reporting/rep602.php:80 ++#: ../reporting/rep704.php:83 ++#: ../reporting/rep704.php:86 ++#: ../reporting/rep704.php:89 ++#: ../reporting/rep710.php:78 ++#: ../reporting/includes/doctext.inc:167 ++#: ../reporting/includes/doctext.inc:208 ++#: ../reporting/includes/doctext.inc:246 ++#: ../sales/allocations/customer_allocation_main.php:94 ++#: ../sales/view/view_sales_order.php:109 ++#: ../sales/view/view_sales_order.php:142 ++#: ../sales/view/view_sales_order.php:179 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:145 ++#: ../sales/inquiry/customer_inquiry.php.orig:201 + msgid "#" + msgstr "" + -#: admin/attachments.php:203 admin/attachments.php:247 -#: admin/crm_categories.php:97 admin/inst_upgrade.php:137 -#: admin/payment_terms.php:127 admin/printers.php:84 -#: admin/print_profiles.php:148 gl/inquiry/tax_inquiry.php:82 -#: gl/manage/gl_quick_entries.php:186 gl/manage/gl_quick_entries.php:224 -#: includes/ui/view_package.php:32 inventory/manage/item_codes.php:125 -#: inventory/manage/item_units.php:94 inventory/manage/movement_types.php:95 -#: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:56 -#: inventory/view/view_transfer.php:56 manufacturing/manage/bom_edit.php:70 -#: manufacturing/includes/manufacturing_ui.inc:28 -#: purchasing/includes/ui/invoice_ui.inc:484 -#: purchasing/includes/ui/invoice_ui.inc:496 -#: purchasing/po_receive_items.php:62 reporting/rep104.php:111 -#: reporting/rep105.php:114 reporting/rep204.php:84 reporting/rep303.php:121 -#: reporting/rep303.php:127 reporting/rep304.php:114 reporting/rep305.php:101 -#: reporting/rep306.php:141 reporting/rep307.php:117 reporting/rep308.php:149 -#: reporting/rep309.php:98 reporting/rep401.php:71 -#: sales/create_recurrent_invoices.php:134 sales/manage/credit_status.php:97 -#: sales/manage/recurrent_invoices.php:102 -#: sales/inquiry/sales_orders_view.php:295 -#: sales/inquiry/sales_orders_view.php:299 taxes/tax_groups.php:124 -#: taxes/tax_types.php:115 ++#: ../admin/attachments.php:203 ++#: ../admin/attachments.php:247 ++#: ../admin/crm_categories.php:97 ++#: ../admin/inst_upgrade.php:141 ++#: ../admin/payment_terms.php:127 ++#: ../admin/printers.php:84 ++#: ../admin/print_profiles.php:148 ++#: ../gl/inquiry/tax_inquiry.php:82 ++#: ../gl/manage/gl_quick_entries.php:186 ++#: ../gl/manage/gl_quick_entries.php:224 ++#: ../includes/ui/view_package.php:32 ++#: ../inventory/manage/item_codes.php:125 ++#: ../inventory/manage/item_units.php:94 ++#: ../inventory/manage/movement_types.php:95 ++#: ../inventory/manage/sales_kits.php:40 ++#: ../inventory/view/view_adjustment.php:56 ++#: ../inventory/view/view_transfer.php:56 ++#: ../manufacturing/manage/bom_edit.php:70 ++#: ../manufacturing/includes/manufacturing_ui.inc:28 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:492 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:504 ++#: ../purchasing/po_receive_items.php:62 ++#: ../reporting/rep104.php:111 ++#: ../reporting/rep105.php:114 ++#: ../reporting/rep204.php:84 ++#: ../reporting/rep303.php:121 ++#: ../reporting/rep303.php:127 ++#: ../reporting/rep304.php:114 ++#: ../reporting/rep305.php:101 ++#: ../reporting/rep306.php:141 ++#: ../reporting/rep307.php:117 ++#: ../reporting/rep308.php:149 ++#: ../reporting/rep309.php:98 ++#: ../reporting/rep401.php:71 ++#: ../sales/create_recurrent_invoices.php:134 ++#: ../sales/manage/credit_status.php:97 ++#: ../sales/manage/recurrent_invoices.php:102 ++#: ../sales/inquiry/sales_orders_view.php.orig:317 ++#: ../sales/inquiry/sales_orders_view.php.orig:321 ++#: ../taxes/sav.tax_types.php:190 ++#: ../taxes/tax_groups.php:123 ++#: ../taxes/tax_types.php:115 + msgid "Description" + msgstr "" + -#: admin/attachments.php:204 admin/backups.php:63 admin/backups.php:149 ++#: ../admin/attachments.php:204 ++#: ../admin/backups.php:63 ++#: ../admin/backups.php:149 + msgid "Filename" + msgstr "" + -#: admin/attachments.php:205 ++#: ../admin/attachments.php:205 + msgid "Size" + msgstr "" + -#: admin/attachments.php:206 ++#: ../admin/attachments.php:206 + msgid "Filetype" + msgstr "" + -#: admin/attachments.php:207 ++#: ../admin/attachments.php:207 + msgid "Date Uploaded" + msgstr "" + -#: admin/attachments.php:241 admin/attachments.php:246 ++#: ../admin/attachments.php:241 ++#: ../admin/attachments.php:246 msgid "Transaction #" msgstr "" - #: ../admin/attachments.php:221 -#: admin/attachments.php:248 ++#: ../admin/attachments.php:248 msgid "Attached File" msgstr "" @@@ -425,39 -310,21 +417,39 @@@ msgstr " msgid "Database backup failed." msgstr "" -#: admin/backups.php:98 admin/create_coy.php:265 admin/fiscalyears.php:155 -#: admin/inst_lang.php:85 admin/inst_lang.php:97 -#: admin/void_transaction.php:125 dimensions/inquiry/search_dimensions.php:107 -#: gl/manage/bank_accounts.php:127 gl/manage/currencies.php:162 -#: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230 -#: includes/system_tests.inc:38 includes/system_tests.inc:113 -#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1675 -#: purchasing/manage/suppliers.php:120 reporting/rep101.php:114 -#: reporting/rep102.php:114 reporting/rep102.php:116 reporting/rep104.php:105 -#: reporting/rep106.php:75 reporting/rep114.php:74 reporting/rep201.php:106 -#: reporting/rep202.php:118 reporting/rep202.php:120 reporting/rep203.php:89 -#: reporting/rep303.php:113 reporting/rep303.php:117 reporting/rep501.php:113 -#: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95 -#: sales/manage/sales_types.php:119 taxes/item_tax_types.php:129 -#: taxes/tax_groups.php:139 +#: ../admin/backups.php:98 +#: ../admin/create_coy.php:265 +#: ../admin/fiscalyears.php:155 +#: ../admin/inst_lang.php:85 +#: ../admin/inst_lang.php:97 +#: ../dimensions/inquiry/search_dimensions.php:107 +#: ../gl/manage/bank_accounts.php:130 +#: ../gl/manage/currencies.php:162 +#: ../gl/manage/gl_account_classes.php:127 +#: ../gl/manage/gl_quick_entries.php:230 +#: ../includes/system_tests.inc:38 +#: ../includes/system_tests.inc:113 +#: ../includes/system_tests.inc:126 - #: ../includes/ui/ui_lists.inc:1674 ++#: ../includes/ui/ui_lists.inc:1679 +#: ../purchasing/manage/suppliers.php:122 - #: ../purchasing/manage/suppliers.php.orig:132 - #: ../reporting/rep101.php:126 - #: ../reporting/rep102.php:112 ++#: ../purchasing/manage/suppliers.php.orig:122 ++#: ../reporting/rep101.php:114 +#: ../reporting/rep102.php:114 - #: ../reporting/rep104.php:103 - #: ../reporting/rep106.php:73 - #: ../reporting/rep114.php:73 - #: ../reporting/rep201.php:114 - #: ../reporting/rep202.php:116 ++#: ../reporting/rep102.php:116 ++#: ../reporting/rep104.php:105 ++#: ../reporting/rep106.php:75 ++#: ../reporting/rep114.php:74 ++#: ../reporting/rep201.php:106 +#: ../reporting/rep202.php:118 - #: ../reporting/rep203.php:87 - #: ../reporting/rep303.php:101 - #: ../reporting/rep303.php:105 - #: ../reporting/rep501.php:109 ++#: ../reporting/rep202.php:120 ++#: ../reporting/rep203.php:89 ++#: ../reporting/rep303.php:113 ++#: ../reporting/rep303.php:117 ++#: ../reporting/rep501.php:113 +#: ../sales/manage/sales_points.php:94 +#: ../sales/manage/sales_points.php:95 +#: ../sales/manage/sales_types.php:119 +#: ../taxes/item_tax_types.php:129 msgid "No" msgstr "" @@@ -477,7 -344,11 +469,11 @@@ msgstr " msgid "You can only upload *.sql backup files" msgstr "" -#: admin/backups.php:168 ++#: ../admin/backups.php:168 + msgid "File uploaded to backup directory" + msgstr "" + -#: admin/backups.php:171 +#: ../admin/backups.php:171 msgid "File was not uploaded into the system." msgstr "" @@@ -485,9 -356,8 +481,9 @@@ msgid "Create backup" msgstr "" -#: admin/backups.php:181 sales/includes/ui/sales_order_ui.inc:594 -#: sales/includes/ui/sales_order_ui.inc:642 +#: ../admin/backups.php:181 - #: ../sales/includes/ui/sales_order_ui.inc.orig:589 - #: ../sales/includes/ui/sales_order_ui.inc.orig:645 ++#: ../sales/includes/ui/sales_order_ui.inc:595 ++#: ../sales/includes/ui/sales_order_ui.inc:651 msgid "Comments:" msgstr "" @@@ -536,44 -406,52 +532,56 @@@ msgstr " msgid "Upload file" msgstr "" -#: admin/change_current_user_password.php:16 -#: admin/change_current_user_password.php:99 themes/default/renderer.php:77 +#: ../admin/change_current_user_password.php:16 - #: ../admin/change_current_user_password.php:85 - #: ../themes/default/renderer.php:76 ++#: ../admin/change_current_user_password.php:99 ++#: ../themes/default/renderer.php:77 msgid "Change password" msgstr "" - #: ../admin/change_current_user_password.php:28 -#: admin/change_current_user_password.php:33 ++#: ../admin/change_current_user_password.php:33 + msgid "Invalid password entered." + msgstr "" + -#: admin/change_current_user_password.php:40 admin/users.php:40 ++#: ../admin/change_current_user_password.php:40 +#: ../admin/users.php:40 msgid "The password entered must be at least 4 characters long." msgstr "" - #: ../admin/change_current_user_password.php:35 -#: admin/change_current_user_password.php:47 admin/users.php:47 ++#: ../admin/change_current_user_password.php:47 +#: ../admin/users.php:47 msgid "The password cannot contain the user login." msgstr "" - #: ../admin/change_current_user_password.php:42 -#: admin/change_current_user_password.php:54 ++#: ../admin/change_current_user_password.php:54 msgid "The passwords entered are not the same." msgstr "" - #: ../admin/change_current_user_password.php:56 -#: admin/change_current_user_password.php:68 ++#: ../admin/change_current_user_password.php:68 msgid "Password cannot be changed in demo mode." msgstr "" - #: ../admin/change_current_user_password.php:61 -#: admin/change_current_user_password.php:73 ++#: ../admin/change_current_user_password.php:73 msgid "Your password has been updated." msgstr "" - #: ../admin/change_current_user_password.php:73 -#: admin/change_current_user_password.php:85 admin/users.php:180 ++#: ../admin/change_current_user_password.php:85 +#: ../admin/users.php:180 msgid "User login:" msgstr "" - #: ../admin/change_current_user_password.php:79 - msgid "Repeat password:" -#: admin/change_current_user_password.php:91 ++#: ../admin/change_current_user_password.php:91 + msgid "Current Password:" + msgstr "" + -#: admin/change_current_user_password.php:92 ++#: ../admin/change_current_user_password.php:92 + msgid "New Password:" + msgstr "" + -#: admin/change_current_user_password.php:93 ++#: ../admin/change_current_user_password.php:93 + msgid "Repeat New Password:" msgstr "" - #: ../admin/change_current_user_password.php:81 -#: admin/change_current_user_password.php:95 ++#: ../admin/change_current_user_password.php:95 msgid "Enter your new password in the fields." msgstr "" @@@ -596,24 -473,17 +604,21 @@@ msgid " "expected" msgstr "" -#: admin/company_preferences.php:59 inventory/manage/items.php:85 +#: ../admin/company_preferences.php:59 - #: ../inventory/manage/items.php:87 - #: ../inventory/manage/items.php.orig:85 ++#: ../inventory/manage/items.php.orig:87 msgid "" "The file size is over the maximum allowed. The maximum size allowed in KB is" msgstr "" -#: admin/company_preferences.php:64 inventory/manage/items.php:75 +#: ../admin/company_preferences.php:64 - #: ../inventory/manage/items.php:77 - #: ../inventory/manage/items.php:92 - #: ../inventory/manage/items.php.orig:75 ++#: ../inventory/manage/items.php.orig:77 ++#: ../inventory/manage/items.php.orig:92 msgid "Only graphics files can be uploaded" msgstr "" -#: admin/company_preferences.php:72 admin/company_preferences.php:93 -#: inventory/manage/items.php:93 +#: ../admin/company_preferences.php:72 +#: ../admin/company_preferences.php:93 - #: ../inventory/manage/items.php:100 - #: ../inventory/manage/items.php.orig:93 ++#: ../inventory/manage/items.php.orig:100 msgid "The existing image could not be removed" msgstr "" @@@ -621,195 -491,162 +626,198 @@@ msgid "Error uploading logo file" msgstr "" - #: ../admin/company_preferences.php:115 -#: admin/company_preferences.php:116 ++#: ../admin/company_preferences.php:116 msgid "Company setup has been updated." msgstr "" - #: ../admin/company_preferences.php:159 -#: admin/company_preferences.php:164 ++#: ../admin/company_preferences.php:164 msgid "Name (to appear on reports):" msgstr "" - #: ../admin/company_preferences.php:160 -#: admin/company_preferences.php:165 admin/shipping_companies.php:142 -#: includes/ui/contacts_view.inc:109 inventory/manage/locations.php:202 -#: sales/manage/customers.php:231 sales/includes/ui/sales_order_ui.inc:633 ++#: ../admin/company_preferences.php:165 +#: ../admin/shipping_companies.php:142 +#: ../includes/ui/contacts_view.inc:109 +#: ../inventory/manage/locations.php:202 - #: ../sales/manage/customers.php:231 ++#: ../sales/manage/customers.php:234 +#: ../sales/manage/sav.customers.php:231 - #: ../sales/includes/ui/sales_order_ui.inc.orig:636 ++#: ../sales/includes/ui/sales_order_ui.inc:642 msgid "Address:" msgstr "" - #: ../admin/company_preferences.php:161 -#: admin/company_preferences.php:166 ++#: ../admin/company_preferences.php:166 msgid "Domicile:" msgstr "" - #: ../admin/company_preferences.php:163 -#: admin/company_preferences.php:168 admin/shipping_companies.php:138 -#: purchasing/manage/suppliers.php:129 sales/manage/customer_branches.php:260 ++#: ../admin/company_preferences.php:168 +#: ../admin/shipping_companies.php:138 +#: ../purchasing/manage/suppliers.php:135 - #: ../purchasing/manage/suppliers.php.orig:114 ++#: ../purchasing/manage/suppliers.php.orig:135 +#: ../sales/manage/customer_branches.php:262 msgid "Phone Number:" msgstr "" - #: ../admin/company_preferences.php:164 -#: admin/company_preferences.php:169 includes/ui/contacts_view.inc:104 -#: purchasing/manage/suppliers.php:159 sales/manage/customer_branches.php:262 -#: sales/manage/customers.php:254 ++#: ../admin/company_preferences.php:169 +#: ../includes/ui/contacts_view.inc:104 +#: ../purchasing/manage/suppliers.php:138 - #: ../purchasing/manage/suppliers.php.orig:116 ++#: ../purchasing/manage/suppliers.php.orig:138 +#: ../sales/manage/customer_branches.php:264 - #: ../sales/manage/customers.php:254 ++#: ../sales/manage/customers.php:257 +#: ../sales/manage/sav.customers.php:254 msgid "Fax Number:" msgstr "" - #: ../admin/company_preferences.php:165 -#: admin/company_preferences.php:170 admin/users.php:202 ++#: ../admin/company_preferences.php:170 +#: ../admin/users.php:202 msgid "Email Address:" msgstr "" - #: ../admin/company_preferences.php:167 -#: admin/company_preferences.php:172 ++#: ../admin/company_preferences.php:172 + msgid "BCC Address for all outgoing mails:" + msgstr "" + -#: admin/company_preferences.php:174 ++#: ../admin/company_preferences.php:174 msgid "Official Company Number:" msgstr "" - #: ../admin/company_preferences.php:168 -#: admin/company_preferences.php:175 purchasing/manage/suppliers.php:94 -#: sales/manage/customers.php:233 ++#: ../admin/company_preferences.php:175 +#: ../purchasing/manage/suppliers.php:96 - #: ../purchasing/manage/suppliers.php.orig:97 - #: ../sales/manage/customers.php:233 ++#: ../purchasing/manage/suppliers.php.orig:96 ++#: ../sales/manage/customers.php:236 +#: ../sales/manage/sav.customers.php:233 msgid "GSTNo:" msgstr "" - #: ../admin/company_preferences.php:170 -#: admin/company_preferences.php:177 ++#: ../admin/company_preferences.php:177 msgid "Home Currency:" msgstr "" - #: ../admin/company_preferences.php:171 -#: admin/company_preferences.php:178 gl/gl_budget.php:63 ++#: ../admin/company_preferences.php:178 +#: ../gl/gl_budget.php:63 msgid "Fiscal Year:" msgstr "" - #: ../admin/company_preferences.php:172 -#: admin/company_preferences.php:179 ++#: ../admin/company_preferences.php:179 msgid "Tax Periods:" msgstr "" - #: ../admin/company_preferences.php:172 -#: admin/company_preferences.php:179 ++#: ../admin/company_preferences.php:179 msgid "Months." msgstr "" - #: ../admin/company_preferences.php:173 -#: admin/company_preferences.php:180 ++#: ../admin/company_preferences.php:180 msgid "Tax Last Period:" msgstr "" - #: ../admin/company_preferences.php:173 -#: admin/company_preferences.php:180 ++#: ../admin/company_preferences.php:180 msgid "Months back." msgstr "" - #: ../admin/company_preferences.php:177 -#: admin/company_preferences.php:184 ++#: ../admin/company_preferences.php:184 msgid "Company Logo:" msgstr "" - #: ../admin/company_preferences.php:178 -#: admin/company_preferences.php:185 ++#: ../admin/company_preferences.php:185 msgid "New Company Logo (.jpg)" msgstr "" - #: ../admin/company_preferences.php:179 -#: admin/company_preferences.php:186 ++#: ../admin/company_preferences.php:186 msgid "Delete Company Logo:" msgstr "" - #: ../admin/company_preferences.php:181 -#: admin/company_preferences.php:188 ++#: ../admin/company_preferences.php:188 msgid "Use Dimensions:" msgstr "" - #: ../admin/company_preferences.php:182 -#: admin/company_preferences.php:189 ++#: ../admin/company_preferences.php:189 msgid "Base for auto price calculations:" msgstr "" - #: ../admin/company_preferences.php:183 -#: admin/company_preferences.php:190 ++#: ../admin/company_preferences.php:190 msgid "No base price list" msgstr "" - #: ../admin/company_preferences.php:184 -#: admin/company_preferences.php:191 ++#: ../admin/company_preferences.php:191 msgid "Add Price from Std Cost:" msgstr "" - #: ../admin/company_preferences.php:186 -#: admin/company_preferences.php:193 ++#: ../admin/company_preferences.php:193 msgid "Round to nearest:" msgstr "" - #: ../admin/company_preferences.php:189 -#: admin/company_preferences.php:196 ++#: ../admin/company_preferences.php:196 msgid "Search Item List" msgstr "" - #: ../admin/company_preferences.php:190 -#: admin/company_preferences.php:197 ++#: ../admin/company_preferences.php:197 msgid "Search Customer List" msgstr "" - #: ../admin/company_preferences.php:191 -#: admin/company_preferences.php:198 ++#: ../admin/company_preferences.php:198 msgid "Search Supplier List" msgstr "" - #: ../admin/company_preferences.php:193 -#: admin/company_preferences.php:200 ++#: ../admin/company_preferences.php:200 msgid "Automatic Revaluation Currency Accounts" msgstr "" - #: ../admin/company_preferences.php:194 -#: admin/company_preferences.php:201 ++#: ../admin/company_preferences.php:201 msgid "Time Zone on Reports" msgstr "" - #: ../admin/company_preferences.php:195 -#: admin/company_preferences.php:202 ++#: ../admin/company_preferences.php:202 msgid "Login Timeout:" msgstr "" - #: ../admin/company_preferences.php:195 -#: admin/company_preferences.php:202 ++#: ../admin/company_preferences.php:202 msgid "seconds" msgstr "" - #: ../admin/company_preferences.php:196 -#: admin/company_preferences.php:203 ++#: ../admin/company_preferences.php:203 msgid "Version Id" msgstr "" - #: ../admin/company_preferences.php:201 - #: ../admin/display_prefs.php:144 -#: admin/company_preferences.php:208 admin/display_prefs.php:143 -#: admin/forms_setup.php:61 admin/gl_setup.php:226 admin/inst_chart.php:74 -#: admin/inst_lang.php:103 admin/inst_module.php:137 admin/inst_module.php:155 -#: admin/inst_module.php:198 admin/inst_theme.php:96 -#: dimensions/dimension_entry.php:293 gl/gl_bank.php:408 gl/gl_budget.php:135 -#: gl/manage/gl_quick_entries.php:60 gl/includes/ui/gl_bank_ui.inc:277 -#: gl/includes/ui/gl_journal_ui.inc:221 includes/ui/db_pager_view.inc:174 -#: includes/ui/simple_crud_class.inc:56 includes/ui/simple_crud_class.inc:227 -#: includes/ui/ui_input.inc:207 includes/ui/ui_input.inc:905 -#: inventory/adjustments.php:233 inventory/cost_update.php:136 -#: inventory/reorder_level.php:111 inventory/transfers.php:234 -#: inventory/includes/item_adjustments_ui.inc:157 -#: inventory/includes/stock_transfers_ui.inc:137 -#: inventory/manage/sales_kits.php:208 manufacturing/work_order_entry.php:459 -#: manufacturing/includes/work_order_issue_ui.inc:131 -#: purchasing/includes/ui/po_ui.inc:296 purchasing/includes/ui/po_ui.inc:439 -#: purchasing/po_receive_items.php:334 sales/credit_note_entry.php:284 -#: sales/customer_credit_invoice.php:380 sales/customer_delivery.php:533 -#: sales/customer_invoice.php:582 sales/inquiry/sales_orders_view.php:323 -#: sales/includes/ui/sales_credit_ui.inc:293 -#: sales/includes/ui/sales_order_ui.inc:243 -#: sales/includes/ui/sales_order_ui.inc:560 ++#: ../admin/company_preferences.php:208 ++#: ../admin/display_prefs.php:145 +#: ../admin/forms_setup.php:61 - #: ../admin/gl_setup.php.orig:235 ++#: ../admin/gl_setup.php:241 +#: ../admin/inst_chart.php:74 +#: ../admin/inst_lang.php:103 - #: ../admin/inst_module.php:138 - #: ../admin/inst_module.php:156 - #: ../admin/inst_module.php:199 ++#: ../admin/inst_module.php:137 ++#: ../admin/inst_module.php:155 ++#: ../admin/inst_module.php:198 +#: ../admin/inst_theme.php:96 +#: ../dimensions/dimension_entry.php:293 - #: ../gl/gl_bank.php:406 ++#: ../gl/gl_bank.php:416 +#: ../gl/gl_budget.php:135 +#: ../gl/manage/gl_quick_entries.php:60 - #: ../gl/includes/ui/gl_bank_ui.inc:275 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:249 ++#: ../gl/includes/ui/gl_bank_ui.inc:277 +#: ../gl/includes/ui/gl_journal_ui.inc:257 +#: ../includes/ui/db_pager_view.inc:174 +#: ../includes/ui/simple_crud_class.inc:56 +#: ../includes/ui/simple_crud_class.inc:227 +#: ../includes/ui/ui_input.inc:208 - #: ../includes/ui/ui_input.inc:905 - #: ../inventory/adjustments.php:235 - #: ../inventory/cost_update.php:116 - #: ../inventory/reorder_level.php:97 - #: ../inventory/transfers.php:236 ++#: ../includes/ui/ui_input.inc:906 ++#: ../inventory/adjustments.php:233 ++#: ../inventory/cost_update.php:136 ++#: ../inventory/reorder_level.php:111 ++#: ../inventory/transfers.php:234 +#: ../inventory/includes/item_adjustments_ui.inc:157 +#: ../inventory/includes/stock_transfers_ui.inc:137 +#: ../inventory/manage/sales_kits.php:208 +#: ../manufacturing/work_order_entry.php:459 +#: ../manufacturing/includes/work_order_issue_ui.inc:131 - #: ../purchasing/includes/ui/po_ui.inc:306 +#: ../purchasing/includes/ui/po_ui.inc.orig:306 - #: ../purchasing/includes/ui/po_ui.inc.orig:457 - #: ../purchasing/po_receive_items.php:331 ++#: ../purchasing/includes/ui/po_ui.inc.orig:455 ++#: ../purchasing/po_receive_items.php:332 +#: ../sales/credit_note_entry.php:284 +#: ../sales/customer_credit_invoice.php:380 - #: ../sales/customer_delivery.php.orig:536 ++#: ../sales/customer_delivery.php:547 +#: ../sales/customer_invoice.php:684 - #: ../sales/inquiry/sales_orders_view.php:349 ++#: ../sales/inquiry/sales_orders_view.php.orig:349 +#: ../sales/includes/ui/sales_credit_ui.inc:293 - #: ../sales/includes/ui/sales_order_ui.inc.orig:237 - #: ../sales/includes/ui/sales_order_ui.inc.orig:555 ++#: ../sales/includes/ui/sales_order_ui.inc:244 ++#: ../sales/includes/ui/sales_order_ui.inc:561 ++#: ../taxes/sav.tax_types.php:255 msgid "Update" msgstr "" @@@ -939,38 -761,20 +947,38 @@@ msgstr " msgid "Default" msgstr "" -#: admin/create_coy.php:263 admin/fiscalyears.php:159 admin/inst_lang.php:85 -#: admin/inst_lang.php:97 dimensions/inquiry/search_dimensions.php:107 -#: gl/manage/bank_accounts.php:125 gl/manage/currencies.php:162 -#: gl/manage/gl_account_classes.php:127 gl/manage/gl_quick_entries.php:230 -#: includes/system_tests.inc:38 includes/system_tests.inc:113 -#: includes/system_tests.inc:126 includes/ui/ui_lists.inc:1676 -#: purchasing/manage/suppliers.php:120 reporting/rep101.php:113 -#: reporting/rep102.php:113 reporting/rep102.php:115 reporting/rep104.php:107 -#: reporting/rep106.php:77 reporting/rep114.php:76 reporting/rep201.php:105 -#: reporting/rep202.php:117 reporting/rep202.php:119 reporting/rep203.php:88 -#: reporting/rep303.php:108 reporting/rep303.php:116 reporting/rep501.php:111 -#: sales/manage/sales_points.php:94 sales/manage/sales_points.php:95 -#: sales/manage/sales_types.php:119 taxes/item_tax_types.php:133 -#: taxes/tax_groups.php:137 +#: ../admin/create_coy.php:263 +#: ../admin/fiscalyears.php:159 +#: ../admin/inst_lang.php:85 +#: ../admin/inst_lang.php:97 +#: ../dimensions/inquiry/search_dimensions.php:107 +#: ../gl/manage/bank_accounts.php:128 +#: ../gl/manage/currencies.php:162 +#: ../gl/manage/gl_account_classes.php:127 +#: ../gl/manage/gl_quick_entries.php:230 +#: ../includes/system_tests.inc:38 +#: ../includes/system_tests.inc:113 +#: ../includes/system_tests.inc:126 - #: ../includes/ui/ui_lists.inc:1675 ++#: ../includes/ui/ui_lists.inc:1680 +#: ../purchasing/manage/suppliers.php:122 - #: ../purchasing/manage/suppliers.php.orig:132 - #: ../reporting/rep101.php:125 - #: ../reporting/rep102.php:111 ++#: ../purchasing/manage/suppliers.php.orig:122 ++#: ../reporting/rep101.php:113 +#: ../reporting/rep102.php:113 - #: ../reporting/rep104.php:105 - #: ../reporting/rep106.php:75 - #: ../reporting/rep114.php:75 - #: ../reporting/rep201.php:113 - #: ../reporting/rep202.php:115 ++#: ../reporting/rep102.php:115 ++#: ../reporting/rep104.php:107 ++#: ../reporting/rep106.php:77 ++#: ../reporting/rep114.php:76 ++#: ../reporting/rep201.php:105 +#: ../reporting/rep202.php:117 - #: ../reporting/rep203.php:86 - #: ../reporting/rep303.php:96 - #: ../reporting/rep303.php:104 - #: ../reporting/rep501.php:107 ++#: ../reporting/rep202.php:119 ++#: ../reporting/rep203.php:88 ++#: ../reporting/rep303.php:108 ++#: ../reporting/rep303.php:116 ++#: ../reporting/rep501.php:111 +#: ../sales/manage/sales_points.php:94 +#: ../sales/manage/sales_points.php:95 +#: ../sales/manage/sales_types.php:119 +#: ../taxes/item_tax_types.php:133 msgid "Yes" msgstr "" @@@ -994,17 -796,10 +1002,18 @@@ msgstr " msgid "Database Password" msgstr "" -#: admin/create_coy.php:344 admin/inst_chart.php:68 admin/inst_chart.php:70 -#: admin/inst_lang.php:87 admin/inst_lang.php:90 admin/inst_module.php:126 -#: admin/inst_theme.php:91 admin/inst_theme.php:93 admin/inst_upgrade.php:149 -#: gl/manage/gl_account_types.php:190 includes/ui/allocation_cart.inc:286 +#: ../admin/create_coy.php:344 +#: ../admin/inst_chart.php:68 +#: ../admin/inst_chart.php:70 +#: ../admin/inst_lang.php:87 +#: ../admin/inst_lang.php:90 - #: ../admin/inst_module.php:127 ++#: ../admin/inst_module.php:126 +#: ../admin/inst_theme.php:91 +#: ../admin/inst_theme.php:93 +#: ../admin/inst_upgrade.php:153 +#: ../gl/manage/gl_account_types.php:190 - #: ../includes/ui/allocation_cart.inc:288 ++#: ../includes/ui/allocation_cart.inc.orig:288 ++#: ../taxes/sav.tax_types.php:168 msgid "None" msgstr "" @@@ -1041,42 -835,39 +1050,42 @@@ msgstr " msgid "New contact category has been added" msgstr "" - #: ../admin/crm_categories.php:62 -#: admin/crm_categories.php:71 ++#: ../admin/crm_categories.php:71 msgid "Cannot delete this category because there are contacts related to it." msgstr "" - #: ../admin/crm_categories.php:68 -#: admin/crm_categories.php:77 ++#: ../admin/crm_categories.php:77 msgid "Category has been deleted" msgstr "" - #: ../admin/crm_categories.php:88 - msgid "Type id" -#: admin/crm_categories.php:97 ++#: ../admin/crm_categories.php:97 + msgid "Category Type" msgstr "" - #: ../admin/crm_categories.php:88 - msgid "Action id" -#: admin/crm_categories.php:97 ++#: ../admin/crm_categories.php:97 + msgid "Category Subtype" msgstr "" - #: ../admin/crm_categories.php:88 -#: admin/crm_categories.php:97 sales/manage/customer_branches.php:293 ++#: ../admin/crm_categories.php:97 +#: ../sales/manage/customer_branches.php:295 msgid "Short Name" msgstr "" - #: ../admin/crm_categories.php:135 - #: ../admin/crm_categories.php:139 -#: admin/crm_categories.php:144 admin/crm_categories.php:148 ++#: ../admin/crm_categories.php:144 ++#: ../admin/crm_categories.php:148 msgid "Contact Category Type:" msgstr "" - #: ../admin/crm_categories.php:136 - #: ../admin/crm_categories.php:140 -#: admin/crm_categories.php:145 admin/crm_categories.php:149 ++#: ../admin/crm_categories.php:145 ++#: ../admin/crm_categories.php:149 msgid "Contact Category Subtype:" msgstr "" - #: ../admin/crm_categories.php:143 -#: admin/crm_categories.php:152 ++#: ../admin/crm_categories.php:152 msgid "Category Short Name:" msgstr "" - #: ../admin/crm_categories.php:144 -#: admin/crm_categories.php:153 ++#: ../admin/crm_categories.php:153 msgid "Category Description:" msgstr "" @@@ -1088,138 -879,128 +1097,138 @@@ msgstr " msgid "Query size must be integer and greater than zero." msgstr "" - #: ../admin/display_prefs.php:59 -#: admin/display_prefs.php:60 ++#: ../admin/display_prefs.php:60 msgid "" "Display settings have been updated. Keep in mind that changed settings are " "restored on every login in demo mode." msgstr "" - #: ../admin/display_prefs.php:61 -#: admin/display_prefs.php:62 ++#: ../admin/display_prefs.php:62 msgid "Display settings have been updated." msgstr "" - #: ../admin/display_prefs.php:70 -#: admin/display_prefs.php:71 ++#: ../admin/display_prefs.php:71 msgid "Decimal Places" msgstr "" - #: ../admin/display_prefs.php:72 -#: admin/display_prefs.php:73 ++#: ../admin/display_prefs.php:73 msgid "Prices/Amounts:" msgstr "" - #: ../admin/display_prefs.php:73 -#: admin/display_prefs.php:74 ++#: ../admin/display_prefs.php:74 msgid "Quantities:" msgstr "" - #: ../admin/display_prefs.php:74 -#: admin/display_prefs.php:75 ++#: ../admin/display_prefs.php:75 msgid "Exchange Rates:" msgstr "" - #: ../admin/display_prefs.php:75 -#: admin/display_prefs.php:76 ++#: ../admin/display_prefs.php:76 msgid "Percentages:" msgstr "" - #: ../admin/display_prefs.php:77 -#: admin/display_prefs.php:78 ++#: ../admin/display_prefs.php:78 msgid "Dateformat and Separators" msgstr "" - #: ../admin/display_prefs.php:79 -#: admin/display_prefs.php:80 ++#: ../admin/display_prefs.php:80 msgid "Dateformat:" msgstr "" - #: ../admin/display_prefs.php:81 -#: admin/display_prefs.php:82 ++#: ../admin/display_prefs.php:82 msgid "Date Separator:" msgstr "" - #: ../admin/display_prefs.php:86 -#: admin/display_prefs.php:87 ++#: ../admin/display_prefs.php:87 msgid "Thousand Separator:" msgstr "" - #: ../admin/display_prefs.php:91 -#: admin/display_prefs.php:92 ++#: ../admin/display_prefs.php:92 msgid "Decimal Separator:" msgstr "" - #: ../admin/display_prefs.php:98 -#: admin/display_prefs.php:99 admin/inst_lang.php:35 ++#: ../admin/display_prefs.php:99 +#: ../admin/inst_lang.php:35 msgid "Language" msgstr "" - #: ../admin/display_prefs.php:100 -#: admin/display_prefs.php:101 admin/users.php:206 ++#: ../admin/display_prefs.php:101 +#: ../admin/users.php:206 msgid "Language:" msgstr "" - #: ../admin/display_prefs.php:103 -#: admin/display_prefs.php:104 applications/setup.php:42 -#: includes/sysnames.inc:94 ++#: ../admin/display_prefs.php:104 +#: ../applications/setup.php:42 +#: ../includes/sysnames.inc:94 msgid "Miscellaneous" msgstr "" - #: ../admin/display_prefs.php:105 -#: admin/display_prefs.php:106 ++#: ../admin/display_prefs.php:106 msgid "Show hints for new users:" msgstr "" - #: ../admin/display_prefs.php:107 -#: admin/display_prefs.php:108 ++#: ../admin/display_prefs.php:108 msgid "Show GL Information:" msgstr "" - #: ../admin/display_prefs.php:109 -#: admin/display_prefs.php:110 ++#: ../admin/display_prefs.php:110 msgid "Show Item Codes:" msgstr "" - #: ../admin/display_prefs.php:116 -#: admin/display_prefs.php:117 ++#: ../admin/display_prefs.php:117 msgid "Page Size:" msgstr "" - #: ../admin/display_prefs.php:118 -#: admin/display_prefs.php:119 ++#: ../admin/display_prefs.php:119 msgid "Start-up Tab" msgstr "" - #: ../admin/display_prefs.php:126 -#: admin/display_prefs.php:127 admin/users.php:210 ++#: ../admin/display_prefs.php:127 +#: ../admin/users.php:210 msgid "Printing profile" msgstr "" - #: ../admin/display_prefs.php:127 -#: admin/display_prefs.php:128 admin/users.php:211 ++#: ../admin/display_prefs.php:128 +#: ../admin/users.php:211 msgid "Browser printing support" msgstr "" - #: ../admin/display_prefs.php:129 -#: admin/display_prefs.php:130 ++#: ../admin/display_prefs.php:130 msgid "Use popup window to display reports:" msgstr "" - #: ../admin/display_prefs.php:130 -#: admin/display_prefs.php:131 admin/users.php:214 ++#: ../admin/display_prefs.php:131 +#: ../admin/users.php:214 msgid "Set this option to on if your browser directly supports pdf files" msgstr "" - #: ../admin/display_prefs.php:132 -#: admin/display_prefs.php:133 ++#: ../admin/display_prefs.php:133 msgid "Use icons instead of text links:" msgstr "" - #: ../admin/display_prefs.php:133 -#: admin/display_prefs.php:134 ++#: ../admin/display_prefs.php:134 msgid "Set this option to on for using icons instead of text links" msgstr "" - #: ../admin/display_prefs.php:135 -#: admin/display_prefs.php:136 ++#: ../admin/display_prefs.php:136 msgid "Query page size:" msgstr "" - #: ../admin/display_prefs.php:137 -#: admin/display_prefs.php:138 ++#: ../admin/display_prefs.php:138 msgid "Remember last document date:" msgstr "" - #: ../admin/display_prefs.php:138 -#: admin/display_prefs.php:139 ++#: ../admin/display_prefs.php:139 msgid "" "If set document date is remembered on subsequent documents, otherwise " "default is current date" msgstr "" - #: ../admin/display_prefs.php:140 -#: admin/fiscalyears.php:25 ++#: ../admin/display_prefs.php:141 +msgid "Transaction days:" +msgstr "" + +#: ../admin/fiscalyears.php:25 msgid "Fiscal Years" msgstr "" @@@ -1251,11 -1032,11 +1260,11 @@@ msgstr " msgid "New fiscal year has been added" msgstr "" -#: admin/fiscalyears.php:102 +#: ../admin/fiscalyears.php:102 - msgid "Cannot delete this fiscal year because thera are fiscal years before." + msgid "Cannot delete this fiscal year because there are fiscal years before." msgstr "" -#: admin/fiscalyears.php:107 +#: ../admin/fiscalyears.php:107 msgid "Cannot delete this fiscal year because the fiscal year is not closed." msgstr "" @@@ -1278,16 -1059,11 +1287,16 @@@ msgstr " msgid "Fiscal Year End" msgstr "" -#: admin/fiscalyears.php:138 dimensions/inquiry/search_dimensions.php:133 -#: dimensions/inquiry/search_dimensions.php:139 includes/ui/ui_lists.inc:676 -#: manufacturing/search_work_orders.php:108 reporting/rep501.php:87 -#: reporting/rep710.php:113 reporting/includes/excel_report.inc:234 -#: reporting/includes/pdf_report.inc:266 +#: ../admin/fiscalyears.php:138 +#: ../dimensions/inquiry/search_dimensions.php:133 +#: ../dimensions/inquiry/search_dimensions.php:139 - #: ../includes/ui/ui_input.inc:958 ++#: ../includes/ui/ui_input.inc:959 +#: ../includes/ui/ui_lists.inc:675 +#: ../manufacturing/search_work_orders.php:108 - #: ../reporting/rep501.php:85 - #: ../reporting/rep710.php:109 ++#: ../reporting/rep501.php:87 ++#: ../reporting/rep710.php:113 +#: ../reporting/includes/excel_report.inc:234 +#: ../reporting/includes/pdf_report.inc:266 msgid "Closed" msgstr "" @@@ -1333,232 -1107,194 +1342,227 @@@ msgstr " msgid "Next Reference" msgstr "" -#: admin/gl_setup.php:16 +#: ../admin/gl_setup.php:16 - #: ../admin/gl_setup.php.orig:16 msgid "System and General GL Setup" msgstr "" -#: admin/gl_setup.php:30 +#: ../admin/gl_setup.php:30 - #: ../admin/gl_setup.php.orig:30 msgid "The delivery over-receive allowance must be between 0 and 100." msgstr "" -#: admin/gl_setup.php:37 +#: ../admin/gl_setup.php:37 - #: ../admin/gl_setup.php.orig:37 msgid "The invoice over-charge allowance must be between 0 and 100." msgstr "" -#: admin/gl_setup.php:44 +#: ../admin/gl_setup.php:44 - #: ../admin/gl_setup.php.orig:44 msgid "The past due days interval allowance must be between 0 and 100." msgstr "" -#: admin/gl_setup.php:52 +#: ../admin/gl_setup.php:52 - #: ../admin/gl_setup.php.orig:52 msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced" msgstr "" - #: ../admin/gl_setup.php:75 - #: ../admin/gl_setup.php.orig:75 -#: admin/gl_setup.php:59 admin/db/fiscalyears_db.inc:141 ++#: ../admin/gl_setup.php:59 ++#: ../admin/db/fiscalyears_db.inc:141 + msgid "" + "The Retained Earnings Account should be a Balance Account or the Profit and " + "Loss Year Account should be an Expense Account (preferred the last one in " + "the Expense Class)" + msgstr "" + -#: admin/gl_setup.php:80 ++#: ../admin/gl_setup.php:80 msgid "The general GL setup has been updated." msgstr "" - #: ../admin/gl_setup.php.orig:138 -#: admin/gl_setup.php:137 ++#: ../admin/gl_setup.php:144 msgid "General GL" msgstr "" - #: ../admin/gl_setup.php.orig:140 -#: admin/gl_setup.php:139 ++#: ../admin/gl_setup.php:146 msgid "Past Due Days Interval:" msgstr "" - #: ../admin/gl_setup.php.orig:140 - #: ../admin/gl_setup.php.orig:180 - #: ../admin/gl_setup.php.orig:188 - #: ../admin/gl_setup.php.orig:206 - #: ../admin/gl_setup.php.orig:228 -#: admin/gl_setup.php:139 admin/gl_setup.php:174 admin/gl_setup.php:182 -#: admin/gl_setup.php:219 admin/payment_terms.php:140 ++#: ../admin/gl_setup.php:146 ++#: ../admin/gl_setup.php:186 ++#: ../admin/gl_setup.php:194 ++#: ../admin/gl_setup.php:212 ++#: ../admin/gl_setup.php:234 +#: ../admin/payment_terms.php:140 msgid "days" msgstr "" - #: ../admin/gl_setup.php.orig:142 -#: admin/gl_setup.php:141 ++#: ../admin/gl_setup.php:148 msgid "Retained Earnings:" msgstr "" - #: ../admin/gl_setup.php.orig:144 -#: admin/gl_setup.php:143 ++#: ../admin/gl_setup.php:150 msgid "Profit/Loss Year:" msgstr "" - #: ../admin/gl_setup.php.orig:146 -#: admin/gl_setup.php:145 ++#: ../admin/gl_setup.php:152 msgid "Exchange Variances Account:" msgstr "" - #: ../admin/gl_setup.php.orig:148 -#: admin/gl_setup.php:147 ++#: ../admin/gl_setup.php:154 +#: ../gl/manage/bank_accounts.php:193 msgid "Bank Charges Account:" msgstr "" - #: ../admin/gl_setup.php.orig:150 -#: admin/gl_setup.php:151 ++#: ../admin/gl_setup.php:156 +msgid "Tax Algorithm:" +msgstr "" + - #: ../admin/gl_setup.php.orig:154 ++#: ../admin/gl_setup.php:160 msgid "Customers and Sales" msgstr "" - #: ../admin/gl_setup.php.orig:156 -#: admin/gl_setup.php:153 ++#: ../admin/gl_setup.php:162 msgid "Default Credit Limit:" msgstr "" - #: ../admin/gl_setup.php.orig:158 -#: admin/gl_setup.php:155 ++#: ../admin/gl_setup.php:164 msgid "Accumulate batch shipping:" msgstr "" - #: ../admin/gl_setup.php.orig:160 -#: admin/gl_setup.php:157 ++#: ../admin/gl_setup.php:166 msgid "Legal Text on Invoice:" msgstr "" - #: ../admin/gl_setup.php.orig:162 -#: admin/gl_setup.php:159 ++#: ../admin/gl_setup.php:168 msgid "Shipping Charged Account:" msgstr "" - #: ../admin/gl_setup.php.orig:164 -#: admin/gl_setup.php:163 ++#: ../admin/gl_setup.php:170 +msgid "Deferred Income Account:" +msgstr "" + - #: ../admin/gl_setup.php.orig:165 ++#: ../admin/gl_setup.php:171 +msgid "Not used" +msgstr "" + - #: ../admin/gl_setup.php.orig:169 ++#: ../admin/gl_setup.php:175 msgid "Customers and Sales Defaults" msgstr "" - #: ../admin/gl_setup.php.orig:171 -#: admin/gl_setup.php:165 ++#: ../admin/gl_setup.php:177 msgid "Receivable Account:" msgstr "" - #: ../admin/gl_setup.php.orig:173 - #: ../admin/gl_setup.php.orig:214 - #: ../inventory/manage/item_categories.php:192 - #: ../inventory/manage/items.php:361 - #: ../inventory/manage/items.php.orig:354 -#: admin/gl_setup.php:167 admin/gl_setup.php:205 -#: inventory/manage/item_categories.php:192 inventory/manage/items.php:354 -#: sales/manage/customer_branches.php:250 ++#: ../admin/gl_setup.php:179 ++#: ../admin/gl_setup.php:220 ++#: ../inventory/manage/item_categories.php:196 ++#: ../inventory/manage/items.php.orig:366 +#: ../sales/manage/customer_branches.php:251 msgid "Sales Account:" msgstr "" - #: ../admin/gl_setup.php.orig:176 -#: admin/gl_setup.php:170 sales/manage/customer_branches.php:251 ++#: ../admin/gl_setup.php:182 +#: ../sales/manage/customer_branches.php:252 msgid "Sales Discount Account:" msgstr "" - #: ../admin/gl_setup.php.orig:178 -#: admin/gl_setup.php:172 sales/manage/customer_branches.php:253 ++#: ../admin/gl_setup.php:184 +#: ../sales/manage/customer_branches.php:254 msgid "Prompt Payment Discount Account:" msgstr "" - #: ../admin/gl_setup.php.orig:180 -#: admin/gl_setup.php:174 ++#: ../admin/gl_setup.php:186 msgid "Delivery Required By:" msgstr "" - #: ../admin/gl_setup.php.orig:186 -#: admin/gl_setup.php:180 ++#: ../admin/gl_setup.php:192 msgid "Dimension Defaults" msgstr "" - #: ../admin/gl_setup.php.orig:188 -#: admin/gl_setup.php:182 ++#: ../admin/gl_setup.php:194 msgid "Dimension Required By After:" msgstr "" - #: ../admin/gl_setup.php.orig:192 -#: admin/gl_setup.php:185 ++#: ../admin/gl_setup.php:198 msgid "Suppliers and Purchasing" msgstr "" - #: ../admin/gl_setup.php.orig:194 -#: admin/gl_setup.php:187 ++#: ../admin/gl_setup.php:200 msgid "Delivery Over-Receive Allowance:" msgstr "" - #: ../admin/gl_setup.php.orig:196 -#: admin/gl_setup.php:189 ++#: ../admin/gl_setup.php:202 msgid "Invoice Over-Charge Allowance:" msgstr "" - #: ../admin/gl_setup.php.orig:198 -#: admin/gl_setup.php:191 ++#: ../admin/gl_setup.php:204 msgid "Suppliers and Purchasing Defaults" msgstr "" - #: ../admin/gl_setup.php.orig:200 -#: admin/gl_setup.php:193 ++#: ../admin/gl_setup.php:206 msgid "Payable Account:" msgstr "" - #: ../admin/gl_setup.php.orig:202 -#: admin/gl_setup.php:195 purchasing/manage/suppliers.php:126 ++#: ../admin/gl_setup.php:208 +#: ../purchasing/manage/suppliers.php:132 - #: ../purchasing/manage/suppliers.php.orig:142 ++#: ../purchasing/manage/suppliers.php.orig:132 msgid "Purchase Discount Account:" msgstr "" - #: ../admin/gl_setup.php.orig:204 -#: admin/gl_setup.php:197 ++#: ../admin/gl_setup.php:210 msgid "GRN Clearing Account:" msgstr "" - #: ../admin/gl_setup.php.orig:204 -#: admin/gl_setup.php:197 ++#: ../admin/gl_setup.php:210 msgid "No postings on GRN" msgstr "" - #: ../admin/gl_setup.php.orig:206 -#: admin/gl_setup.php:199 reporting/reports_main.php:206 ++#: ../admin/gl_setup.php:212 +msgid "Receival Required By:" +msgstr "" + - #: ../admin/gl_setup.php.orig:208 - #: ../reporting/reports_main.php:175 ++#: ../admin/gl_setup.php:214 msgid "Inventory" msgstr "" - #: ../admin/gl_setup.php.orig:210 -#: admin/gl_setup.php:201 ++#: ../admin/gl_setup.php:216 msgid "Allow Negative Inventory:" msgstr "" - #: ../admin/gl_setup.php.orig:211 -#: admin/gl_setup.php:202 ++#: ../admin/gl_setup.php:217 msgid "Warning: This may cause a delay in GL postings" msgstr "" - #: ../admin/gl_setup.php.orig:213 -#: admin/gl_setup.php:204 ++#: ../admin/gl_setup.php:219 msgid "Items Defaults" msgstr "" - #: ../admin/gl_setup.php.orig:216 - #: ../inventory/manage/item_categories.php:202 - #: ../inventory/manage/items.php:365 - #: ../inventory/manage/items.php.orig:358 -#: admin/gl_setup.php:207 inventory/manage/item_categories.php:202 -#: inventory/manage/items.php:358 ++#: ../admin/gl_setup.php:222 ++#: ../inventory/manage/item_categories.php:206 ++#: ../inventory/manage/items.php.orig:370 msgid "Inventory Account:" msgstr "" - #: ../admin/gl_setup.php.orig:218 - #: ../inventory/manage/item_categories.php:196 - #: ../inventory/manage/item_categories.php:204 - #: ../inventory/manage/items.php:366 - #: ../inventory/manage/items.php:371 - #: ../inventory/manage/items.php.orig:359 - #: ../inventory/manage/items.php.orig:364 -#: admin/gl_setup.php:209 inventory/manage/item_categories.php:196 -#: inventory/manage/item_categories.php:204 inventory/manage/items.php:359 -#: inventory/manage/items.php:364 ++#: ../admin/gl_setup.php:224 ++#: ../inventory/manage/item_categories.php:200 ++#: ../inventory/manage/item_categories.php:208 ++#: ../inventory/manage/items.php.orig:371 ++#: ../inventory/manage/items.php.orig:376 msgid "C.O.G.S. Account:" msgstr "" - #: ../admin/gl_setup.php.orig:220 - #: ../inventory/manage/item_categories.php:205 - #: ../inventory/manage/items.php:367 - #: ../inventory/manage/items.php.orig:360 -#: admin/gl_setup.php:211 inventory/manage/item_categories.php:205 -#: inventory/manage/items.php:360 ++#: ../admin/gl_setup.php:226 ++#: ../inventory/manage/item_categories.php:209 ++#: ../inventory/manage/items.php.orig:372 msgid "Inventory Adjustments Account:" msgstr "" - #: ../admin/gl_setup.php.orig:222 - #: ../inventory/manage/item_categories.php:209 - #: ../inventory/manage/items.php:378 - #: ../inventory/manage/items.php.orig:371 -#: admin/gl_setup.php:213 inventory/manage/item_categories.php:209 -#: inventory/manage/items.php:371 ++#: ../admin/gl_setup.php:228 ++#: ../inventory/manage/item_categories.php:213 ++#: ../inventory/manage/items.php.orig:383 msgid "Item Assembly Costs Account:" msgstr "" - #: ../admin/gl_setup.php.orig:226 -#: admin/gl_setup.php:217 ++#: ../admin/gl_setup.php:232 msgid "Manufacturing Defaults" msgstr "" - #: ../admin/gl_setup.php.orig:228 -#: admin/gl_setup.php:219 ++#: ../admin/gl_setup.php:234 msgid "Work Order Required By After:" msgstr "" @@@ -1582,13 -1315,9 +1586,13 @@@ msgstr " msgid "Installed" msgstr "" -#: admin/inst_chart.php:50 admin/inst_lang.php:36 admin/inst_module.php:105 -#: admin/inst_theme.php:74 inventory/inquiry/stock_status.php:77 -#: reporting/rep303.php:114 +#: ../admin/inst_chart.php:50 +#: ../admin/inst_lang.php:36 +#: ../admin/inst_module.php:105 +#: ../admin/inst_theme.php:74 +#: ../inventory/inquiry/stock_status.php:71 +#: ../inventory/inquiry/stock_status.php.orig:77 - #: ../reporting/rep303.php:102 ++#: ../reporting/rep303.php:114 msgid "Available" msgstr "" @@@ -1598,34 -1325,22 +1602,34 @@@ msgid "Encoding" msgstr "" -#: admin/inst_chart.php:69 admin/inst_chart.php:71 admin/inst_lang.php:88 -#: admin/inst_module.php:127 admin/inst_module.php:128 admin/inst_theme.php:92 +#: ../admin/inst_chart.php:69 +#: ../admin/inst_chart.php:71 +#: ../admin/inst_lang.php:88 ++#: ../admin/inst_module.php:127 +#: ../admin/inst_module.php:128 - #: ../admin/inst_module.php:129 +#: ../admin/inst_theme.php:92 +#: ../includes/sysnames.inc:193 msgid "Unknown" msgstr "" -#: admin/inst_chart.php:74 admin/inst_lang.php:103 admin/inst_module.php:132 -#: admin/inst_module.php:137 admin/inst_theme.php:96 -#: admin/inst_upgrade.php:137 +#: ../admin/inst_chart.php:74 +#: ../admin/inst_lang.php:103 - #: ../admin/inst_module.php:133 - #: ../admin/inst_module.php:138 ++#: ../admin/inst_module.php:132 ++#: ../admin/inst_module.php:137 +#: ../admin/inst_theme.php:96 +#: ../admin/inst_upgrade.php:141 msgid "Install" msgstr "" -#: admin/inst_chart.php:75 admin/inst_module.php:138 admin/inst_theme.php:97 +#: ../admin/inst_chart.php:75 - #: ../admin/inst_module.php:139 ++#: ../admin/inst_module.php:138 +#: ../admin/inst_theme.php:97 msgid "Upload and install latest extension package" msgstr "" -#: admin/inst_chart.php:82 admin/inst_module.php:145 admin/inst_theme.php:104 +#: ../admin/inst_chart.php:82 - #: ../admin/inst_module.php:146 ++#: ../admin/inst_module.php:145 +#: ../admin/inst_theme.php:104 #, php-format msgid "" "You are about to remove package \\'%s\\'.\n" @@@ -1636,23 -1351,18 +1640,23 @@@ msgstr " msgid "Install/Update Languages" msgstr "" -#: admin/inst_lang.php:35 admin/printers.php:84 -#: admin/shipping_companies.php:91 dimensions/dimension_entry.php:271 -#: dimensions/inquiry/search_dimensions.php:129 -#: dimensions/view/view_dimension.php:55 -#: inventory/manage/item_categories.php:98 -#: manufacturing/manage/work_centres.php:101 -#: purchasing/includes/ui/invoice_ui.inc:258 -#: purchasing/includes/ui/invoice_ui.inc:260 -#: purchasing/includes/ui/invoice_ui.inc:262 reporting/rep501.php:87 -#: reporting/rep709.php:111 reporting/rep709.php:112 -#: sales/manage/customer_branches.php:294 sales/manage/sales_people.php:99 -#: taxes/item_tax_types.php:117 +#: ../admin/inst_lang.php:35 +#: ../admin/printers.php:84 +#: ../admin/shipping_companies.php:91 +#: ../dimensions/dimension_entry.php:271 +#: ../dimensions/inquiry/search_dimensions.php:129 - #: ../dimensions/view/view_dimension.php:54 ++#: ../dimensions/view/view_dimension.php:55 +#: ../inventory/manage/item_categories.php:98 +#: ../manufacturing/manage/work_centres.php:101 - #: ../purchasing/includes/ui/invoice_ui.inc:265 - #: ../purchasing/includes/ui/invoice_ui.inc:267 - #: ../purchasing/includes/ui/invoice_ui.inc:269 - #: ../reporting/rep501.php:85 - #: ../reporting/rep709.php:109 - #: ../reporting/rep709.php:110 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:265 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:267 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:269 ++#: ../reporting/rep501.php:87 ++#: ../reporting/rep709.php:111 ++#: ../reporting/rep709.php:112 +#: ../sales/manage/customer_branches.php:296 +#: ../sales/manage/sales_people.php:99 +#: ../taxes/item_tax_types.php:117 msgid "Name" msgstr "" @@@ -1735,42 -1443,37 +1739,42 @@@ msgstr " msgid "Selected extension has been successfully deleted" msgstr "" -#: admin/inst_module.php:104 admin/inst_module.php:168 +#: ../admin/inst_module.php:104 - #: ../admin/inst_module.php:169 ++#: ../admin/inst_module.php:168 msgid "Extension" msgstr "" -#: admin/inst_module.php:104 admin/inst_module.php:168 +#: ../admin/inst_module.php:104 - #: ../admin/inst_module.php:169 ++#: ../admin/inst_module.php:168 msgid "Modules provided" msgstr "" -#: admin/inst_module.php:104 admin/inst_module.php:168 +#: ../admin/inst_module.php:104 - #: ../admin/inst_module.php:169 ++#: ../admin/inst_module.php:168 msgid "Options provided" msgstr "" - #: ../admin/inst_module.php:133 -#: admin/inst_module.php:132 ++#: ../admin/inst_module.php:132 msgid "Install third-party extension." msgstr "" - #: ../admin/inst_module.php:169 -#: admin/inst_module.php:168 includes/ui/ui_lists.inc:676 -#: includes/ui/ui_lists.inc:2156 reporting/includes/excel_report.inc:232 -#: reporting/includes/pdf_report.inc:264 ++#: ../admin/inst_module.php:168 +#: ../includes/ui/ui_lists.inc:675 - #: ../includes/ui/ui_lists.inc:2156 ++#: ../includes/ui/ui_lists.inc:2160 +#: ../reporting/includes/excel_report.inc:232 +#: ../reporting/includes/pdf_report.inc:264 msgid "Active" msgstr "" - #: ../admin/inst_module.php:232 -#: admin/inst_module.php:231 ++#: ../admin/inst_module.php:231 msgid "Status change for some extensions failed." msgstr "" - #: ../admin/inst_module.php:235 -#: admin/inst_module.php:234 ++#: ../admin/inst_module.php:234 msgid "Current active extensions set has been saved." msgstr "" - #: ../admin/inst_module.php:257 -#: admin/inst_module.php:256 ++#: ../admin/inst_module.php:256 msgid "Extensions:" msgstr "" @@@ -1851,12 -1554,8 +1855,11 @@@ msgstr " msgid "Save database and perform upgrade" msgstr "" -#: admin/payment_terms.php:16 reporting/includes/doctext.inc:242 -#: sales/view/view_invoice.php:74 sales/view/view_sales_order.php:78 +#: ../admin/payment_terms.php:16 +#: ../reporting/includes/doctext.inc:41 +#: ../sales/view/view_invoice.php:76 +#: ../sales/view/view_sales_order.php:82 +#: ../sales/view/view_sales_order.php:90 - #: ../sales/view/view_sales_order.php.orig:78 msgid "Payment Terms" msgstr "" @@@ -1892,53 -1591,31 +1895,48 @@@ msgstr " msgid "Selected payment terms have been deleted" msgstr "" -#: admin/payment_terms.php:127 dimensions/dimension_entry.php:275 -#: dimensions/inquiry/search_dimensions.php:75 -#: dimensions/inquiry/search_dimensions.php:130 -#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:233 -#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126 -#: gl/inquiry/journal_inquiry.php:129 gl/inquiry/tax_inquiry.php:82 -#: gl/manage/bank_accounts.php:106 gl/manage/gl_quick_entries.php:186 -#: gl/view/accrual_trans.php:52 gl/includes/ui/gl_bank_ui.inc:93 -#: includes/ui/ui_view.inc:547 inventory/inquiry/stock_movements.php:82 -#: inventory/manage/item_categories.php:98 -#: manufacturing/search_work_orders.php:161 -#: manufacturing/includes/manufacturing_ui.inc:236 -#: manufacturing/includes/manufacturing_ui.inc:276 -#: manufacturing/includes/manufacturing_ui.inc:280 -#: manufacturing/includes/manufacturing_ui.inc:331 -#: purchasing/inquiry/supplier_allocation_inquiry.php:126 -#: purchasing/inquiry/supplier_inquiry.php:168 reporting/rep102.php:134 -#: reporting/rep202.php:139 reporting/rep501.php:87 reporting/rep601.php:79 -#: reporting/rep702.php:60 reporting/rep704.php:83 reporting/rep704.php:86 -#: reporting/rep704.php:89 reporting/rep709.php:107 reporting/rep710.php:78 -#: reporting/rep710.php:86 reporting/reports_main.php:327 -#: reporting/reports_main.php:491 reporting/includes/doctext.inc:140 -#: reporting/includes/doctext.inc:181 reporting/includes/doctext.inc:200 -#: sales/inquiry/customer_allocation_inquiry.php:143 -#: sales/inquiry/customer_inquiry.php:224 +#: ../admin/payment_terms.php:127 +#: ../dimensions/dimension_entry.php:275 +#: ../dimensions/inquiry/search_dimensions.php:75 +#: ../dimensions/inquiry/search_dimensions.php:130 - #: ../dimensions/view/view_dimension.php:54 ++#: ../dimensions/view/view_dimension.php:55 +#: ../gl/bank_account_reconcile.php:231 +#: ../gl/inquiry/bank_inquiry.php:70 +#: ../gl/inquiry/gl_account_inquiry.php:126 +#: ../gl/inquiry/journal_inquiry.php:129 +#: ../gl/inquiry/tax_inquiry.php:82 +#: ../gl/manage/bank_accounts.php:109 +#: ../gl/manage/gl_quick_entries.php:186 +#: ../gl/view/accrual_trans.php:52 - #: ../gl/includes/ui/gl_bank_ui.inc:92 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:83 - #: ../includes/ui/ui_view.inc:488 - #: ../inventory/inquiry/stock_movements.php:77 - #: ../inventory/inquiry/stock_movements.php.orig:79 ++#: ../gl/includes/ui/gl_bank_ui.inc:93 ++#: ../includes/ui/ui_view.inc.orig:488 ++#: ../inventory/inquiry/stock_movements.php:78 +#: ../inventory/manage/item_categories.php:98 +#: ../manufacturing/search_work_orders.php:161 +#: ../manufacturing/view/wo_costs_view.php:46 +#: ../manufacturing/includes/manufacturing_ui.inc:236 +#: ../manufacturing/includes/manufacturing_ui.inc:276 +#: ../manufacturing/includes/manufacturing_ui.inc:280 +#: ../manufacturing/includes/manufacturing_ui.inc:331 - #: ../purchasing/inquiry/supplier_allocation_inquiry.php:125 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:125 +#: ../purchasing/inquiry/supplier_inquiry.php:173 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:170 - #: ../reporting/rep102.php:132 - #: ../reporting/rep202.php:137 - #: ../reporting/rep501.php:85 - #: ../reporting/rep601.php:76 ++#: ../reporting/rep102.php:134 ++#: ../reporting/rep202.php:139 ++#: ../reporting/rep501.php:87 ++#: ../reporting/rep601.php:79 +#: ../reporting/rep602.php:80 - #: ../reporting/rep702.php:58 - #: ../reporting/rep704.php:79 - #: ../reporting/rep704.php:82 - #: ../reporting/rep704.php:85 - #: ../reporting/rep709.php:105 - #: ../reporting/rep710.php:76 - #: ../reporting/rep710.php:84 - #: ../reporting/reports_main.php:252 - #: ../reporting/reports_main.php:399 ++#: ../reporting/rep702.php:60 ++#: ../reporting/rep704.php:83 ++#: ../reporting/rep704.php:86 ++#: ../reporting/rep704.php:89 ++#: ../reporting/rep709.php:107 ++#: ../reporting/rep710.php:78 ++#: ../reporting/rep710.php:86 +#: ../reporting/includes/doctext.inc:162 +#: ../reporting/includes/doctext.inc:203 +#: ../reporting/includes/doctext.inc:222 - #: ../sales/inquiry/customer_allocation_inquiry.php:144 - #: ../sales/inquiry/customer_inquiry.php:200 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:144 ++#: ../sales/inquiry/customer_inquiry.php.orig:200 msgid "Type" msgstr "" @@@ -2133,14 -1807,9 +2131,12 @@@ msgstr " msgid "Role:" msgstr "" -#: admin/security_roles.php:180 gl/manage/gl_accounts.php:199 -#: inventory/manage/items.php:433 purchasing/manage/suppliers.php:289 -#: sales/manage/customers.php:326 +#: ../admin/security_roles.php:180 +#: ../gl/manage/gl_accounts.php:198 - #: ../inventory/manage/items.php:440 - #: ../inventory/manage/items.php.orig:433 - #: ../purchasing/manage/suppliers.php:291 - #: ../purchasing/manage/suppliers.php.orig:294 - #: ../sales/manage/customers.php:326 ++#: ../inventory/manage/items.php.orig:445 ++#: ../purchasing/manage/suppliers.php.orig:291 ++#: ../sales/manage/customers.php:329 +#: ../sales/manage/sav.customers.php:324 msgid "Show inactive:" msgstr "" @@@ -2181,40 -1849,28 +2177,40 @@@ msgstr " msgid "Delete This Role" msgstr "" -#: admin/security_roles.php:249 admin/void_transaction.php:229 -#: gl/manage/gl_quick_entries.php:61 gl/includes/ui/gl_bank_ui.inc:279 -#: gl/includes/ui/gl_journal_ui.inc:223 includes/ui/simple_crud_class.inc:58 -#: includes/ui/simple_crud_class.inc:231 includes/ui/ui_controls.inc:589 -#: includes/ui/ui_input.inc:210 inventory/includes/item_adjustments_ui.inc:159 -#: inventory/includes/stock_transfers_ui.inc:139 -#: inventory/manage/items.php:416 -#: manufacturing/includes/work_order_issue_ui.inc:133 -#: purchasing/includes/ui/po_ui.inc:441 -#: sales/includes/ui/sales_credit_ui.inc:295 -#: sales/includes/ui/sales_order_ui.inc:562 +#: ../admin/security_roles.php:249 +#: ../admin/void_transaction.php:229 +#: ../gl/manage/gl_quick_entries.php:61 - #: ../gl/includes/ui/gl_bank_ui.inc:277 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:251 ++#: ../gl/includes/ui/gl_bank_ui.inc:279 +#: ../gl/includes/ui/gl_journal_ui.inc:259 +#: ../includes/ui/simple_crud_class.inc:58 +#: ../includes/ui/simple_crud_class.inc:231 - #: ../includes/ui/ui_controls.inc:594 ++#: ../includes/ui/ui_controls.inc:596 +#: ../includes/ui/ui_input.inc:211 +#: ../inventory/includes/item_adjustments_ui.inc:159 +#: ../inventory/includes/stock_transfers_ui.inc:139 - #: ../inventory/manage/items.php:423 - #: ../inventory/manage/items.php.orig:416 ++#: ../inventory/manage/items.php.orig:428 +#: ../manufacturing/includes/work_order_issue_ui.inc:133 - #: ../purchasing/includes/ui/po_ui.inc.orig:459 ++#: ../purchasing/includes/ui/po_ui.inc.orig:457 +#: ../sales/includes/ui/sales_credit_ui.inc:295 - #: ../sales/includes/ui/sales_order_ui.inc.orig:557 ++#: ../sales/includes/ui/sales_order_ui.inc:563 ++#: ../taxes/sav.tax_types.php:173 ++#: ../taxes/sav.tax_types.php:253 ++#: ../taxes/sav.tax_types.php:256 msgid "Cancel" msgstr "" -#: admin/security_roles.php:249 inventory/manage/items.php:416 +#: ../admin/security_roles.php:249 - #: ../inventory/manage/items.php:423 - #: ../inventory/manage/items.php.orig:416 ++#: ../inventory/manage/items.php.orig:428 msgid "Cancel Edition" msgstr "" -#: admin/shipping_companies.php:15 sales/customer_credit_invoice.php:254 -#: sales/customer_delivery.php:368 sales/customer_invoice.php:422 -#: sales/view/view_credit.php:74 sales/view/view_dispatch.php:92 -#: sales/view/view_invoice.php:91 +#: ../admin/shipping_companies.php:15 +#: ../sales/customer_credit_invoice.php:254 - #: ../sales/customer_delivery.php.orig:381 ++#: ../sales/customer_delivery.php:382 +#: ../sales/customer_invoice.php:488 +#: ../sales/view/view_credit.php:74 +#: ../sales/view/view_dispatch.php:92 +#: ../sales/view/view_invoice.php:92 msgid "Shipping Company" msgstr "" @@@ -2264,30 -1918,20 +2260,27 @@@ msgstr " msgid "Address" msgstr "" -#: admin/shipping_companies.php:134 gl/manage/gl_account_types.php:188 -#: gl/includes/ui/gl_bank_ui.inc:57 inventory/manage/items.php:299 -#: manufacturing/manage/work_centres.php:137 +#: ../admin/shipping_companies.php:134 +#: ../gl/manage/gl_account_types.php:188 - #: ../gl/includes/ui/gl_bank_ui.inc:56 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:58 - #: ../inventory/manage/items.php:306 - #: ../inventory/manage/items.php.orig:299 ++#: ../gl/includes/ui/gl_bank_ui.inc:57 ++#: ../inventory/manage/items.php.orig:308 +#: ../manufacturing/manage/work_centres.php:137 msgid "Name:" msgstr "" -#: admin/shipping_companies.php:136 purchasing/manage/suppliers.php:158 -#: sales/manage/customer_branches.php:259 +#: ../admin/shipping_companies.php:136 - #: ../purchasing/manage/suppliers.php.orig:113 +#: ../sales/manage/customer_branches.php:261 msgid "Contact Person:" msgstr "" -#: admin/shipping_companies.php:140 includes/ui/contacts_view.inc:103 -#: inventory/manage/locations.php:205 purchasing/manage/suppliers.php:130 -#: sales/manage/customer_branches.php:261 sales/manage/customers.php:253 +#: ../admin/shipping_companies.php:140 +#: ../includes/ui/contacts_view.inc:103 +#: ../inventory/manage/locations.php:205 +#: ../purchasing/manage/suppliers.php:136 - #: ../purchasing/manage/suppliers.php.orig:115 ++#: ../purchasing/manage/suppliers.php.orig:136 +#: ../sales/manage/customer_branches.php:263 - #: ../sales/manage/customers.php:253 ++#: ../sales/manage/customers.php:256 +#: ../sales/manage/sav.customers.php:253 msgid "Secondary Phone Number:" msgstr "" @@@ -2299,16 -1943,11 +2292,7 @@@ msgstr " msgid "Unspecified tag type" msgstr "" -#: admin/tags.php:40 reporting/reports_main.php:350 -#: reporting/reports_main.php:359 reporting/reports_main.php:371 -#: reporting/reports_main.php:402 reporting/reports_main.php:410 -#: reporting/reports_main.php:421 reporting/reports_main.php:449 -#: reporting/reports_main.php:456 reporting/reports_main.php:466 +#: ../admin/tags.php:40 - #: ../reporting/reports_main.php:273 - #: ../reporting/reports_main.php:281 - #: ../reporting/reports_main.php:292 - #: ../reporting/reports_main.php:320 - #: ../reporting/reports_main.php:327 - #: ../reporting/reports_main.php:337 - #: ../reporting/reports_main.php:362 - #: ../reporting/reports_main.php:368 - #: ../reporting/reports_main.php:377 msgid "Account Tags" msgstr "" @@@ -2383,19 -2020,14 +2367,18 @@@ msgstr " msgid "Full Name" msgstr "" -#: admin/users.php:114 includes/ui/contacts_view.inc:41 -#: inventory/manage/locations.php:146 reporting/rep106.php:88 -#: reporting/includes/header2.inc:98 sales/manage/sales_people.php:99 +#: ../admin/users.php:114 +#: ../includes/ui/contacts_view.inc:41 +#: ../inventory/manage/locations.php:146 - #: ../reporting/rep106.php:86 ++#: ../reporting/rep106.php:88 +#: ../reporting/includes/header2.inc:98 +#: ../sales/manage/sales_people.php:99 msgid "Phone" msgstr "" -#: admin/users.php:115 sales/manage/customer_branches.php:300 -#: sales/view/view_sales_order.php:83 +#: ../admin/users.php:115 +#: ../sales/manage/customer_branches.php:302 +#: ../sales/view/view_sales_order.php:96 - #: ../sales/view/view_sales_order.php.orig:83 msgid "E-mail" msgstr "" @@@ -2435,16 -2067,12 +2418,17 @@@ msgstr " msgid "View or Print Transactions" msgstr "" -#: admin/view_print_transaction.php:43 admin/view_print_transaction.php:45 -#: admin/view_print_transaction.php:129 includes/ui/ui_controls.inc:188 -#: purchasing/inquiry/po_search_completed.php:113 -#: purchasing/inquiry/po_search.php:93 sales/inquiry/customer_inquiry.php:209 -#: sales/inquiry/sales_deliveries_view.php:160 -#: sales/inquiry/sales_orders_view.php:119 +#: ../admin/view_print_transaction.php:43 +#: ../admin/view_print_transaction.php:45 +#: ../admin/view_print_transaction.php:129 +#: ../includes/ui/ui_controls.inc:195 +#: ../purchasing/inquiry/po_search_completed.php:112 +#: ../purchasing/inquiry/po_search_completed.php.orig:111 +#: ../purchasing/inquiry/po_search.php:93 - #: ../sales/inquiry/customer_inquiry.php:185 ++#: ../sales/inquiry/customer_inquiry.php.orig:185 +#: ../sales/inquiry/sales_deliveries_view.php:160 +#: ../sales/inquiry/sales_orders_view.php:125 ++#: ../sales/inquiry/sales_orders_view.php.orig:125 msgid "Print" msgstr "" @@@ -2462,22 -2088,18 +2446,24 @@@ msgstr " msgid "to #:" msgstr "" -#: admin/view_print_transaction.php:83 admin/void_transaction.php:170 -#: dimensions/inquiry/search_dimensions.php:88 -#: gl/inquiry/journal_inquiry.php:53 manufacturing/search_work_orders.php:78 -#: purchasing/includes/ui/invoice_ui.inc:466 -#: purchasing/inquiry/po_search_completed.php:77 -#: purchasing/inquiry/po_search.php:76 -#: purchasing/inquiry/supplier_allocation_inquiry.php:57 -#: purchasing/inquiry/supplier_inquiry.php:58 -#: sales/inquiry/customer_allocation_inquiry.php:51 -#: sales/inquiry/customer_inquiry.php:58 -#: sales/inquiry/sales_deliveries_view.php:116 -#: sales/inquiry/sales_orders_view.php:247 +#: ../admin/view_print_transaction.php:83 +#: ../admin/void_transaction.php:170 +#: ../dimensions/inquiry/search_dimensions.php:88 +#: ../gl/inquiry/journal_inquiry.php:53 +#: ../manufacturing/search_work_orders.php:78 - #: ../purchasing/includes/ui/invoice_ui.inc:474 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:474 +#: ../purchasing/inquiry/po_search_completed.php:74 +#: ../purchasing/inquiry/po_search_completed.php.orig:75 +#: ../purchasing/inquiry/po_search.php:76 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:57 +#: ../purchasing/inquiry/supplier_inquiry.php:55 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:55 +#: ../sales/inquiry/customer_allocation_inquiry.php:51 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:51 +#: ../sales/inquiry/customer_inquiry.php:54 ++#: ../sales/inquiry/customer_inquiry.php.orig:54 +#: ../sales/inquiry/sales_deliveries_view.php:116 - #: ../sales/inquiry/sales_orders_view.php:269 ++#: ../sales/inquiry/sales_orders_view.php.orig:269 msgid "Search" msgstr "" @@@ -2493,144 -2115,92 +2479,135 @@@ msgid " "zero." msgstr "" -#: admin/view_print_transaction.php:127 admin/void_transaction.php:182 -#: dimensions/inquiry/search_dimensions.php:128 -#: dimensions/view/view_dimension.php:55 gl/bank_account_reconcile.php:235 -#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/journal_inquiry.php:131 -#: gl/view/bank_transfer_view.php:86 gl/view/gl_deposit_view.php:75 -#: gl/view/gl_payment_view.php:73 gl/view/gl_trans_view.php:35 -#: includes/ui/contacts_view.inc:41 inventory/inquiry/stock_movements.php:82 -#: inventory/view/view_adjustment.php:44 inventory/view/view_transfer.php:44 -#: manufacturing/search_work_orders.php:160 -#: manufacturing/view/wo_issue_view.php:43 -#: manufacturing/view/wo_production_view.php:44 -#: manufacturing/includes/manufacturing_ui.inc:157 -#: manufacturing/includes/manufacturing_ui.inc:200 -#: manufacturing/includes/manufacturing_ui.inc:276 -#: manufacturing/includes/manufacturing_ui.inc:280 -#: manufacturing/includes/manufacturing_ui.inc:331 -#: purchasing/includes/ui/grn_ui.inc:32 purchasing/includes/ui/grn_ui.inc:64 -#: purchasing/includes/ui/po_ui.inc:311 purchasing/view/view_po.php:115 -#: purchasing/view/view_supp_credit.php:43 -#: purchasing/view/view_supp_invoice.php:46 -#: purchasing/view/view_supp_payment.php:73 -#: purchasing/inquiry/po_search_completed.php:122 -#: purchasing/inquiry/po_search.php:131 -#: purchasing/inquiry/supplier_allocation_inquiry.php:128 -#: purchasing/inquiry/supplier_inquiry.php:170 -#: purchasing/allocations/supplier_allocation_main.php:96 -#: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep702.php:53 -#: reporting/includes/doctext.inc:199 sales/customer_credit_invoice.php:245 -#: sales/customer_credit_invoice.php:247 sales/customer_delivery.php:348 -#: sales/customer_delivery.php:350 sales/customer_invoice.php:394 -#: sales/customer_invoice.php:396 -#: sales/allocations/customer_allocation_main.php:95 -#: sales/view/view_dispatch.php:85 sales/view/view_invoice.php:84 -#: sales/view/view_receipt.php:39 sales/view/view_sales_order.php:81 -#: sales/inquiry/customer_allocation_inquiry.php:145 -#: sales/inquiry/customer_inquiry.php:227 -#: sales/inquiry/sales_deliveries_view.php:184 -#: sales/includes/ui/sales_credit_ui.inc:85 -#: sales/includes/ui/sales_credit_ui.inc:87 -#: sales/includes/ui/sales_order_ui.inc:378 +#: ../admin/view_print_transaction.php:127 +#: ../admin/void_transaction.php:182 +#: ../dimensions/inquiry/search_dimensions.php:128 - #: ../dimensions/view/view_dimension.php:54 ++#: ../dimensions/view/view_dimension.php:55 +#: ../gl/bank_account_reconcile.php:233 +#: ../gl/inquiry/bank_inquiry.php:70 +#: ../gl/inquiry/journal_inquiry.php:131 +#: ../gl/view/bank_transfer_view.php:86 - #: ../gl/view/gl_deposit_view.php:75 - #: ../gl/view/gl_payment_view.php:73 ++#: ../gl/view/gl_deposit_view.php:80 ++#: ../gl/view/gl_payment_view.php:78 +#: ../gl/view/gl_trans_view.php:35 +#: ../includes/ui/contacts_view.inc:41 - #: ../inventory/inquiry/stock_movements.php:77 - #: ../inventory/inquiry/stock_movements.php.orig:79 ++#: ../inventory/inquiry/stock_movements.php:78 +#: ../inventory/view/view_adjustment.php:44 +#: ../inventory/view/view_transfer.php:44 +#: ../manufacturing/search_work_orders.php:160 +#: ../manufacturing/view/wo_issue_view.php:43 +#: ../manufacturing/view/wo_production_view.php:44 +#: ../manufacturing/includes/manufacturing_ui.inc:157 +#: ../manufacturing/includes/manufacturing_ui.inc:200 +#: ../manufacturing/includes/manufacturing_ui.inc:276 +#: ../manufacturing/includes/manufacturing_ui.inc:280 +#: ../manufacturing/includes/manufacturing_ui.inc:331 - #: ../purchasing/includes/ui/grn_ui.inc:36 - #: ../purchasing/includes/ui/grn_ui.inc:53 - #: ../purchasing/includes/ui/po_ui.inc:321 ++#: ../purchasing/includes/ui/grn_ui.inc:32 ++#: ../purchasing/includes/ui/grn_ui.inc:64 +#: ../purchasing/includes/ui/po_ui.inc.orig:321 +#: ../purchasing/view/view_po.php:115 +#: ../purchasing/view/view_supp_credit.php:43 +#: ../purchasing/view/view_supp_invoice.php:47 +#: ../purchasing/view/view_supp_payment.php:73 +#: ../purchasing/inquiry/po_search_completed.php:121 +#: ../purchasing/inquiry/po_search_completed.php.orig:120 +#: ../purchasing/inquiry/po_search.php:131 - #: ../purchasing/inquiry/supplier_allocation_inquiry.php:127 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:127 +#: ../purchasing/inquiry/supplier_inquiry.php:175 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:172 +#: ../purchasing/allocations/supplier_allocation_main.php:96 - #: ../reporting/rep501.php:85 - #: ../reporting/rep601.php:76 ++#: ../reporting/rep501.php:87 ++#: ../reporting/rep601.php:79 +#: ../reporting/rep602.php:80 - #: ../reporting/rep702.php:51 ++#: ../reporting/rep702.php:53 +#: ../reporting/includes/doctext.inc:221 +#: ../sales/customer_credit_invoice.php:245 +#: ../sales/customer_credit_invoice.php:247 - #: ../sales/customer_delivery.php.orig:361 - #: ../sales/customer_delivery.php.orig:363 ++#: ../sales/customer_delivery.php:362 ++#: ../sales/customer_delivery.php:364 +#: ../sales/customer_invoice.php:460 +#: ../sales/customer_invoice.php:462 +#: ../sales/allocations/customer_allocation_main.php:95 +#: ../sales/view/view_dispatch.php:85 +#: ../sales/view/view_invoice.php:85 - #: ../sales/view/view_receipt.php:50 ++#: ../sales/view/view_receipt.php:39 +#: ../sales/view/view_sales_order.php:94 - #: ../sales/view/view_sales_order.php.orig:81 - #: ../sales/inquiry/customer_allocation_inquiry.php:146 - #: ../sales/inquiry/customer_inquiry.php:203 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:146 ++#: ../sales/inquiry/customer_inquiry.php.orig:203 +#: ../sales/inquiry/sales_deliveries_view.php:184 +#: ../sales/includes/ui/sales_credit_ui.inc:85 +#: ../sales/includes/ui/sales_credit_ui.inc:87 - #: ../sales/includes/ui/sales_order_ui.inc.orig:373 ++#: ../sales/includes/ui/sales_order_ui.inc:379 msgid "Reference" msgstr "" -#: admin/view_print_transaction.php:128 admin/void_transaction.php:183 -#: dimensions/inquiry/search_dimensions.php:131 -#: dimensions/view/view_dimension.php:55 gl/accruals.php:90 -#: gl/accruals.php:195 gl/bank_account_reconcile.php:236 -#: gl/inquiry/bank_inquiry.php:70 gl/inquiry/gl_account_inquiry.php:126 -#: gl/inquiry/journal_inquiry.php:128 gl/view/accrual_trans.php:52 -#: gl/view/bank_transfer_view.php:83 gl/view/gl_deposit_view.php:68 -#: gl/view/gl_payment_view.php:66 gl/view/gl_trans_view.php:36 -#: includes/ui/allocation_cart.inc:263 includes/ui/ui_view.inc:547 -#: inventory/inquiry/stock_movements.php:84 -#: inventory/view/view_adjustment.php:45 inventory/view/view_transfer.php:47 -#: manufacturing/search_work_orders.php:166 -#: manufacturing/work_order_entry.php:419 -#: manufacturing/work_order_entry.php:425 -#: manufacturing/view/wo_production_view.php:45 -#: manufacturing/includes/manufacturing_ui.inc:157 -#: manufacturing/includes/manufacturing_ui.inc:200 -#: manufacturing/includes/manufacturing_ui.inc:236 -#: manufacturing/includes/manufacturing_ui.inc:277 -#: manufacturing/includes/manufacturing_ui.inc:281 -#: manufacturing/includes/manufacturing_ui.inc:332 -#: purchasing/includes/ui/invoice_ui.inc:116 -#: purchasing/includes/ui/po_ui.inc:325 purchasing/view/view_po.php:140 -#: purchasing/inquiry/supplier_allocation_inquiry.php:131 -#: purchasing/inquiry/supplier_inquiry.php:173 -#: purchasing/allocations/supplier_allocation_main.php:97 -#: reporting/rep101.php:118 reporting/rep201.php:110 reporting/rep306.php:141 -#: reporting/rep501.php:87 reporting/rep601.php:79 reporting/rep704.php:83 -#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep709.php:111 -#: reporting/rep710.php:77 reporting/includes/doctext.inc:145 -#: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:224 -#: reporting/includes/header2.inc:135 sales/customer_delivery.php:378 -#: sales/customer_invoice.php:432 -#: sales/allocations/customer_allocation_main.php:96 -#: sales/view/view_credit.php:69 sales/view/view_sales_order.php:96 -#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161 -#: sales/inquiry/customer_allocation_inquiry.php:147 -#: sales/inquiry/customer_inquiry.php:228 +#: ../admin/view_print_transaction.php:128 +#: ../admin/void_transaction.php:183 +#: ../dimensions/inquiry/search_dimensions.php:131 - #: ../dimensions/view/view_dimension.php:54 ++#: ../dimensions/view/view_dimension.php:55 +#: ../gl/accruals.php:94 +#: ../gl/accruals.php:199 +#: ../gl/bank_account_reconcile.php:234 +#: ../gl/inquiry/bank_inquiry.php:70 +#: ../gl/inquiry/gl_account_inquiry.php:126 +#: ../gl/inquiry/journal_inquiry.php:128 +#: ../gl/view/accrual_trans.php:52 +#: ../gl/view/bank_transfer_view.php:83 +#: ../gl/view/gl_deposit_view.php:68 +#: ../gl/view/gl_payment_view.php:66 +#: ../gl/view/gl_trans_view.php:36 - #: ../includes/ui/allocation_cart.inc:264 - #: ../includes/ui/ui_view.inc:488 - #: ../inventory/inquiry/stock_movements.php:77 - #: ../inventory/inquiry/stock_movements.php.orig:79 ++#: ../includes/ui/allocation_cart.inc.orig:264 ++#: ../includes/ui/ui_view.inc.orig:488 ++#: ../inventory/inquiry/stock_movements.php:80 +#: ../inventory/view/view_adjustment.php:45 +#: ../inventory/view/view_transfer.php:47 +#: ../manufacturing/search_work_orders.php:166 +#: ../manufacturing/work_order_entry.php:419 +#: ../manufacturing/work_order_entry.php:425 +#: ../manufacturing/view/wo_costs_view.php:46 +#: ../manufacturing/view/wo_production_view.php:45 +#: ../manufacturing/includes/manufacturing_ui.inc:157 +#: ../manufacturing/includes/manufacturing_ui.inc:200 +#: ../manufacturing/includes/manufacturing_ui.inc:236 +#: ../manufacturing/includes/manufacturing_ui.inc:277 +#: ../manufacturing/includes/manufacturing_ui.inc:281 +#: ../manufacturing/includes/manufacturing_ui.inc:332 - #: ../purchasing/includes/ui/invoice_ui.inc:114 - #: ../purchasing/includes/ui/po_ui.inc:335 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:114 +#: ../purchasing/includes/ui/po_ui.inc.orig:335 +#: ../purchasing/view/view_po.php:140 - #: ../purchasing/inquiry/supplier_allocation_inquiry.php:130 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:130 +#: ../purchasing/inquiry/supplier_inquiry.php:178 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:175 +#: ../purchasing/allocations/supplier_allocation_main.php:97 - #: ../reporting/rep101.php:130 - #: ../reporting/rep107.php:192 - #: ../reporting/rep201.php:118 - #: ../reporting/rep501.php:85 - #: ../reporting/rep601.php:76 ++#: ../reporting/rep101.php:118 ++#: ../reporting/rep201.php:110 ++#: ../reporting/rep306.php:141 ++#: ../reporting/rep501.php:87 ++#: ../reporting/rep601.php:79 +#: ../reporting/rep602.php:80 - #: ../reporting/rep704.php:79 - #: ../reporting/rep704.php:82 - #: ../reporting/rep704.php:85 - #: ../reporting/rep709.php:109 - #: ../reporting/rep710.php:75 ++#: ../reporting/rep704.php:83 ++#: ../reporting/rep704.php:86 ++#: ../reporting/rep704.php:89 ++#: ../reporting/rep709.php:111 ++#: ../reporting/rep710.php:77 +#: ../reporting/includes/doctext.inc:167 +#: ../reporting/includes/doctext.inc:208 +#: ../reporting/includes/doctext.inc:246 +#: ../reporting/includes/header2.inc:135 - #: ../sales/customer_delivery.php.orig:391 ++#: ../sales/customer_delivery.php:392 +#: ../sales/customer_invoice.php:503 +#: ../sales/allocations/customer_allocation_main.php:96 +#: ../sales/view/view_credit.php:69 +#: ../sales/view/view_sales_order.php:109 +#: ../sales/view/view_sales_order.php:142 +#: ../sales/view/view_sales_order.php:179 - #: ../sales/view/view_sales_order.php.orig:96 - #: ../sales/view/view_sales_order.php.orig:129 - #: ../sales/view/view_sales_order.php.orig:161 - #: ../sales/inquiry/customer_allocation_inquiry.php:148 - #: ../sales/inquiry/customer_inquiry.php:204 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:148 ++#: ../sales/inquiry/customer_inquiry.php.orig:204 msgid "Date" msgstr "" -#: admin/view_print_transaction.php:130 admin/void_transaction.php:184 -#: includes/ui/ui_view.inc:51 +#: ../admin/view_print_transaction.php:130 +#: ../admin/void_transaction.php:184 +#: ../includes/ui/ui_view.inc:51 ++#: ../includes/ui/ui_view.inc.orig:51 msgid "GL" msgstr "" @@@ -2658,22 -2222,15 +2635,23 @@@ msgstr " msgid "Voiding Date:" msgstr "" -#: admin/void_transaction.php:208 dimensions/dimension_entry.php:283 -#: gl/bank_transfer.php:98 gl/inquiry/journal_inquiry.php:56 -#: gl/manage/revaluate_currencies.php:106 includes/ui/ui_view.inc:344 -#: manufacturing/work_order_add_finished.php:210 -#: manufacturing/work_order_entry.php:451 -#: manufacturing/work_order_release.php:103 -#: purchasing/includes/ui/invoice_ui.inc:174 purchasing/po_entry_items.php:529 -#: purchasing/supplier_payment.php:326 sales/customer_payments.php:406 -#: sales/customer_payments.php.sav:413 +#: ../admin/void_transaction.php:208 +#: ../dimensions/dimension_entry.php:283 +#: ../gl/bank_transfer.php:98 +#: ../gl/inquiry/journal_inquiry.php:56 +#: ../gl/manage/revaluate_currencies.php:106 - #: ../includes/ui/ui_view.inc:308 ++#: ../includes/ui/ui_view.inc:344 ++#: ../includes/ui/ui_view.inc.orig:308 +#: ../manufacturing/work_order_add_finished.php:210 +#: ../manufacturing/work_order_costs.php:146 +#: ../manufacturing/work_order_entry.php:451 - #: ../manufacturing/work_order_release.php:100 - #: ../purchasing/includes/ui/invoice_ui.inc:180 - #: ../purchasing/includes/ui/po_ui.inc.orig:492 - #: ../purchasing/po_entry_items.php.orig:558 - #: ../purchasing/supplier_payment.php:316 ++#: ../manufacturing/work_order_release.php:103 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:180 ++#: ../purchasing/includes/ui/po_ui.inc.orig:490 ++#: ../purchasing/po_entry_items.php.orig:562 ++#: ../purchasing/supplier_payment.php.orig:316 +#: ../sales/customer_invoice.php:680 - #: ../sales/customer_payments.php:413 ++#: ../sales/customer_payments.php.orig:413 msgid "Memo:" msgstr "" @@@ -2693,8 -2248,7 +2671,8 @@@ msgid " "undone." msgstr "" -#: admin/void_transaction.php:228 includes/ui/ui_controls.inc:588 +#: ../admin/void_transaction.php:228 - #: ../includes/ui/ui_controls.inc:593 ++#: ../includes/ui/ui_controls.inc:595 msgid "Proceed" msgstr "" @@@ -2702,23 -2256,15 +2680,23 @@@ msgid "The selected transaction was closed for edition and cannot be voided." msgstr "" -#: admin/void_transaction.php:248 gl/accruals.php:32 gl/bank_transfer.php:115 -#: gl/gl_journal.php:156 gl/manage/exchange_rates.php:33 -#: gl/manage/revaluate_currencies.php:53 -#: manufacturing/work_order_add_finished.php:98 -#: manufacturing/work_order_costs.php:83 purchasing/po_receive_items.php:174 -#: purchasing/supplier_payment.php:183 sales/customer_credit_invoice.php:91 -#: sales/sales_order_entry.php:350 sales/manage/recurrent_invoices.php:41 -#: sales/manage/recurrent_invoices.php:46 -#: sales/manage/recurrent_invoices.php:51 +#: ../admin/void_transaction.php:248 +#: ../gl/accruals.php:32 +#: ../gl/bank_transfer.php:115 +#: ../gl/gl_journal.php:161 +#: ../gl/manage/close_period.php:34 - #: ../gl/manage/close_period.php.orig:34 +#: ../gl/manage/exchange_rates.php:33 +#: ../gl/manage/revaluate_currencies.php:53 +#: ../manufacturing/work_order_add_finished.php:98 +#: ../manufacturing/work_order_costs.php:80 +#: ../purchasing/po_receive_items.php:174 - #: ../purchasing/supplier_payment.php:174 ++#: ../purchasing/supplier_payment.php:185 ++#: ../purchasing/supplier_payment.php.orig:174 +#: ../sales/customer_credit_invoice.php:91 - #: ../sales/sales_order_entry.php:359 ++#: ../sales/sales_order_entry.php:360 +#: ../sales/manage/recurrent_invoices.php:41 +#: ../sales/manage/recurrent_invoices.php:46 +#: ../sales/manage/recurrent_invoices.php:51 msgid "The entered date is invalid." msgstr "" @@@ -2744,22 -2300,12 +2722,15 @@@ msgid " "been set in System and General GL Setup" msgstr "" - #: ../admin/db/fiscalyears_db.inc:141 - msgid "" - "The Retained Earnings Account should be a Balance Account or the Profit and " - "Loss Year Account should be an Expense Account (preferred the last one in " - "the Expense Class)" - msgstr "" - -#: admin/db/fiscalyears_db.inc:166 admin/db/fiscalyears_db.inc:168 +#: ../admin/db/fiscalyears_db.inc:166 +#: ../admin/db/fiscalyears_db.inc:168 msgid "Closing Year" msgstr "" -#: admin/db/fiscalyears_db.inc:214 reporting/rep101.php:175 -#: reporting/rep201.php:170 reporting/rep706.php:185 +#: ../admin/db/fiscalyears_db.inc:214 +#: ../reporting/rep101.php:175 - #: ../reporting/rep201.php:167 - #: ../reporting/rep706.php:181 ++#: ../reporting/rep201.php:170 ++#: ../reporting/rep706.php:185 msgid "Open Balance" msgstr "" @@@ -3027,10 -2555,8 +2998,7 @@@ msgstr " msgid "Ta&x Inquiry" msgstr "" -#: applications/generalledger.php:44 reporting/reports_main.php:377 -#: reporting/reports_main.php:427 reporting/reports_main.php:472 +#: ../applications/generalledger.php:44 - #: ../reporting/reports_main.php:297 - #: ../reporting/reports_main.php:342 - #: ../reporting/reports_main.php:382 msgid "Trial &Balance" msgstr "" @@@ -3400,31 -2921,19 +3368,34 @@@ msgstr " msgid "The dimension reference must be entered." msgstr "" -#: dimensions/dimension_entry.php:123 gl/bank_transfer.php:176 -#: gl/gl_bank.php:253 gl/gl_journal.php:176 -#: gl/manage/revaluate_currencies.php:72 inventory/adjustments.php:101 -#: inventory/transfers.php:97 manufacturing/work_order_add_finished.php:84 -#: manufacturing/work_order_entry.php:139 -#: manufacturing/work_order_issue.php:96 purchasing/po_entry_items.php:366 -#: purchasing/po_receive_items.php:195 purchasing/supplier_credit.php:156 -#: purchasing/supplier_invoice.php:154 purchasing/supplier_payment.php:212 -#: sales/create_recurrent_invoices.php:57 sales/credit_note_entry.php:181 -#: sales/customer_credit_invoice.php:205 sales/customer_delivery.php:312 -#: sales/customer_invoice.php:319 sales/customer_payments.php:164 -#: sales/customer_payments.php:171 sales/customer_payments.php.sav:164 -#: sales/customer_payments.php.sav:171 sales/sales_order_entry.php:442 +#: ../dimensions/dimension_entry.php:123 +#: ../gl/bank_transfer.php:176 - #: ../gl/gl_bank.php:258 ++#: ../gl/gl_bank.php:257 +#: ../gl/gl_journal.php:181 +#: ../gl/manage/revaluate_currencies.php:72 - #: ../inventory/adjustments.php:103 - #: ../inventory/transfers.php:99 ++#: ../inventory/adjustments.php:101 ++#: ../inventory/transfers.php:97 +#: ../manufacturing/work_order_add_finished.php:84 +#: ../manufacturing/work_order_entry.php:139 +#: ../manufacturing/work_order_issue.php:97 +#: ../purchasing/po_entry_items.php:368 - #: ../purchasing/po_entry_items.php.orig:365 ++#: ../purchasing/po_entry_items.php.orig:368 +#: ../purchasing/po_receive_items.php:193 - #: ../purchasing/supplier_credit.php:173 ++#: ../purchasing/supplier_credit.php:172 +#: ../purchasing/supplier_invoice.php:179 - #: ../purchasing/supplier_payment.php:203 - #: ../sales/create_recurrent_invoices.php:55 ++#: ../purchasing/supplier_payment.php:214 ++#: ../purchasing/supplier_payment.php.orig:203 ++#: ../sales/create_recurrent_invoices.php:57 +#: ../sales/credit_note_entry.php:181 +#: ../sales/customer_credit_invoice.php:205 - #: ../sales/customer_delivery.php.orig:184 ++#: ../sales/customer_delivery.php:324 +#: ../sales/customer_invoice.php:379 - #: ../sales/customer_payments.php:158 - #: ../sales/customer_payments.php:165 - #: ../sales/customer_payments.php:248 - #: ../sales/sales_order_entry.php:457 ++#: ../sales/customer_payments.php:169 ++#: ../sales/customer_payments.php:176 ++#: ../sales/customer_payments.php.orig:158 ++#: ../sales/customer_payments.php.orig:165 ++#: ../sales/customer_payments.php.orig:248 ++#: ../sales/sales_order_entry.php:458 msgid "The entered reference is already in use." msgstr "" @@@ -3432,11 -2941,8 +3403,11 @@@ msgid "The dimension name must be entered." msgstr "" -#: dimensions/dimension_entry.php:138 manufacturing/work_order_entry.php:154 -#: manufacturing/work_order_entry.php:234 purchasing/po_entry_items.php:238 +#: ../dimensions/dimension_entry.php:138 +#: ../manufacturing/work_order_entry.php:154 +#: ../manufacturing/work_order_entry.php:234 +#: ../purchasing/po_entry_items.php:241 - #: ../purchasing/po_entry_items.php.orig:238 ++#: ../purchasing/po_entry_items.php.orig:241 msgid "The date entered is in an invalid format." msgstr "" @@@ -3457,30 -2962,20 +3428,12 @@@ msgstr " msgid "Dimension Reference:" msgstr "" -#: dimensions/dimension_entry.php:277 reporting/reports_main.php:34 -#: reporting/reports_main.php:64 reporting/reports_main.php:80 -#: reporting/reports_main.php:89 reporting/reports_main.php:151 -#: reporting/reports_main.php:233 reporting/reports_main.php:242 -#: reporting/reports_main.php:248 reporting/reports_main.php:258 -#: reporting/reports_main.php:266 reporting/reports_main.php:274 -#: reporting/reports_main.php:311 reporting/reports_main.php:325 -#: reporting/reports_main.php:337 reporting/reports_main.php:355 -#: reporting/reports_main.php:366 reporting/reports_main.php:378 -#: reporting/reports_main.php:391 reporting/reports_main.php:407 -#: reporting/reports_main.php:417 reporting/reports_main.php:428 -#: reporting/reports_main.php:440 reporting/reports_main.php:454 -#: reporting/reports_main.php:463 reporting/reports_main.php:473 -#: reporting/reports_main.php:482 reporting/reports_main.php:489 +#: ../dimensions/dimension_entry.php:277 +#: ../reporting/reports_main.php:34 - #: ../reporting/reports_main.php:60 - #: ../reporting/reports_main.php:74 - #: ../reporting/reports_main.php:82 - #: ../reporting/reports_main.php:134 - #: ../reporting/reports_main.php:199 - #: ../reporting/reports_main.php:207 - #: ../reporting/reports_main.php:239 - #: ../reporting/reports_main.php:250 - #: ../reporting/reports_main.php:261 - #: ../reporting/reports_main.php:277 - #: ../reporting/reports_main.php:287 - #: ../reporting/reports_main.php:298 - #: ../reporting/reports_main.php:310 - #: ../reporting/reports_main.php:324 - #: ../reporting/reports_main.php:333 - #: ../reporting/reports_main.php:343 - #: ../reporting/reports_main.php:354 - #: ../reporting/reports_main.php:366 - #: ../reporting/reports_main.php:374 - #: ../reporting/reports_main.php:383 - #: ../reporting/reports_main.php:391 - #: ../reporting/reports_main.php:397 ++#: ../reporting/reports_main.php:64 ++#: ../reporting/reports_main.php:80 ++#: ../reporting/reports_main.php:89 ++#: ../reporting/reports_main.php:151 msgid "Start Date" msgstr "" @@@ -3525,11 -3019,10 +3478,12 @@@ msgstr " msgid "Delete unused dimension" msgstr "" -#: dimensions/dimension_entry.php:302 includes/ui/simple_crud_class.inc:225 -#: purchasing/includes/ui/invoice_ui.inc:199 -#: purchasing/includes/ui/invoice_ui.inc:405 -#: purchasing/includes/ui/invoice_ui.inc:407 +#: ../dimensions/dimension_entry.php:302 +#: ../includes/ui/simple_crud_class.inc:225 - #: ../purchasing/includes/ui/invoice_ui.inc:206 - #: ../purchasing/includes/ui/invoice_ui.inc:412 - #: ../purchasing/includes/ui/invoice_ui.inc:414 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:206 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:412 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:414 ++#: ../taxes/sav.tax_types.php:172 msgid "Add" msgstr "" @@@ -3541,105 -3034,61 +3495,98 @@@ msgstr " msgid "Balance for this Dimension" msgstr "" -#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:90 -#: gl/inquiry/gl_account_inquiry.php:129 gl/inquiry/gl_trial_balance.php:185 -#: gl/manage/gl_quick_entries.php:241 gl/manage/gl_quick_entries.php:333 -#: includes/sysnames.inc:164 purchasing/includes/ui/invoice_ui.inc:258 -#: purchasing/includes/ui/invoice_ui.inc:260 -#: purchasing/includes/ui/invoice_ui.inc:262 reporting/rep701.php:111 -#: reporting/rep705.php:238 reporting/rep706.php:185 reporting/rep707.php:210 -#: reporting/rep708.php:192 +#: ../dimensions/includes/dimensions_ui.inc:31 +#: ../gl/accruals.php:94 +#: ../gl/inquiry/gl_account_inquiry.php:129 - #: ../gl/inquiry/gl_trial_balance.php:170 +#: ../gl/manage/gl_quick_entries.php:241 +#: ../gl/manage/gl_quick_entries.php:333 +#: ../includes/sysnames.inc:165 - #: ../purchasing/includes/ui/invoice_ui.inc:265 - #: ../purchasing/includes/ui/invoice_ui.inc:267 - #: ../purchasing/includes/ui/invoice_ui.inc:269 - #: ../reporting/rep701.php:109 - #: ../reporting/rep705.php:234 - #: ../reporting/rep706.php:181 - #: ../reporting/rep707.php:206 - #: ../reporting/rep708.php:179 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:265 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:267 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:269 ++#: ../reporting/rep701.php:111 ++#: ../reporting/rep705.php:238 ++#: ../reporting/rep706.php:185 ++#: ../reporting/rep707.php:210 ++#: ../reporting/rep708.php:192 msgid "Account" msgstr "" -#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98 -#: gl/bank_account_reconcile.php:237 gl/inquiry/bank_inquiry.php:71 -#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143 -#: gl/inquiry/gl_trial_balance.php:191 gl/inquiry/gl_trial_balance.php:193 -#: gl/inquiry/gl_trial_balance.php:195 gl/view/accrual_trans.php:60 -#: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67 -#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84 -#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90 -#: purchasing/inquiry/supplier_allocation_inquiry.php:134 -#: purchasing/inquiry/supplier_inquiry.php:176 reporting/rep601.php:80 -#: reporting/rep702.php:54 reporting/rep704.php:84 reporting/rep704.php:87 -#: reporting/rep704.php:90 reporting/rep708.php:192 reporting/rep708.php:193 -#: sales/inquiry/customer_allocation_inquiry.php:151 -#: sales/inquiry/customer_inquiry.php:233 +#: ../dimensions/includes/dimensions_ui.inc:31 +#: ../gl/accruals.php:102 +#: ../gl/bank_account_reconcile.php:235 +#: ../gl/inquiry/bank_inquiry.php:71 +#: ../gl/inquiry/gl_account_inquiry.php:141 +#: ../gl/inquiry/gl_account_inquiry.php:143 - #: ../gl/inquiry/gl_trial_balance.php:176 - #: ../gl/inquiry/gl_trial_balance.php:178 - #: ../gl/inquiry/gl_trial_balance.php:180 +#: ../gl/view/accrual_trans.php:60 +#: ../gl/view/gl_trans_view.php:69 +#: ../gl/view/gl_trans_view.php:72 +#: ../gl/view/gl_trans_view.php:75 +#: ../gl/includes/ui/gl_journal_ui.inc:87 +#: ../gl/includes/ui/gl_journal_ui.inc:90 +#: ../gl/includes/ui/gl_journal_ui.inc:93 - #: ../purchasing/inquiry/supplier_allocation_inquiry.php:133 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:133 +#: ../purchasing/inquiry/supplier_inquiry.php:181 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:178 - #: ../reporting/rep601.php:77 ++#: ../reporting/rep601.php:80 +#: ../reporting/rep602.php:81 - #: ../reporting/rep702.php:52 - #: ../reporting/rep704.php:80 - #: ../reporting/rep704.php:83 - #: ../reporting/rep704.php:86 - #: ../reporting/rep708.php:179 - #: ../reporting/rep708.php:180 - #: ../sales/inquiry/customer_allocation_inquiry.php:152 - #: ../sales/inquiry/customer_inquiry.php:209 ++#: ../reporting/rep702.php:54 ++#: ../reporting/rep704.php:84 ++#: ../reporting/rep704.php:87 ++#: ../reporting/rep704.php:90 ++#: ../reporting/rep708.php:192 ++#: ../reporting/rep708.php:193 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:152 ++#: ../sales/inquiry/customer_inquiry.php.orig:209 msgid "Debit" msgstr "" -#: dimensions/includes/dimensions_ui.inc:31 gl/accruals.php:98 -#: gl/bank_account_reconcile.php:238 gl/inquiry/bank_inquiry.php:71 -#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143 -#: gl/inquiry/gl_trial_balance.php:192 gl/inquiry/gl_trial_balance.php:194 -#: gl/inquiry/gl_trial_balance.php:196 gl/view/accrual_trans.php:60 -#: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67 -#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_journal_ui.inc:84 -#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90 -#: includes/sysnames.inc:85 -#: purchasing/inquiry/supplier_allocation_inquiry.php:135 -#: purchasing/inquiry/supplier_inquiry.php:177 reporting/rep601.php:80 -#: reporting/rep702.php:54 reporting/rep704.php:84 reporting/rep704.php:87 -#: reporting/rep704.php:90 reporting/rep708.php:192 reporting/rep708.php:193 -#: sales/inquiry/customer_allocation_inquiry.php:152 -#: sales/inquiry/customer_inquiry.php:234 +#: ../dimensions/includes/dimensions_ui.inc:31 +#: ../gl/accruals.php:102 +#: ../gl/bank_account_reconcile.php:236 +#: ../gl/inquiry/bank_inquiry.php:71 +#: ../gl/inquiry/gl_account_inquiry.php:141 +#: ../gl/inquiry/gl_account_inquiry.php:143 - #: ../gl/inquiry/gl_trial_balance.php:177 - #: ../gl/inquiry/gl_trial_balance.php:179 - #: ../gl/inquiry/gl_trial_balance.php:181 +#: ../gl/view/accrual_trans.php:60 +#: ../gl/view/gl_trans_view.php:69 +#: ../gl/view/gl_trans_view.php:72 +#: ../gl/view/gl_trans_view.php:75 +#: ../gl/includes/ui/gl_journal_ui.inc:87 +#: ../gl/includes/ui/gl_journal_ui.inc:90 +#: ../gl/includes/ui/gl_journal_ui.inc:93 +#: ../includes/sysnames.inc:85 - #: ../purchasing/inquiry/supplier_allocation_inquiry.php:134 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:134 +#: ../purchasing/inquiry/supplier_inquiry.php:182 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:179 - #: ../reporting/rep601.php:77 ++#: ../reporting/rep601.php:80 +#: ../reporting/rep602.php:81 - #: ../reporting/rep702.php:52 - #: ../reporting/rep704.php:80 - #: ../reporting/rep704.php:83 - #: ../reporting/rep704.php:86 - #: ../reporting/rep708.php:179 - #: ../reporting/rep708.php:180 - #: ../sales/inquiry/customer_allocation_inquiry.php:153 - #: ../sales/inquiry/customer_inquiry.php:210 ++#: ../reporting/rep702.php:54 ++#: ../reporting/rep704.php:84 ++#: ../reporting/rep704.php:87 ++#: ../reporting/rep704.php:90 ++#: ../reporting/rep708.php:192 ++#: ../reporting/rep708.php:193 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:153 ++#: ../sales/inquiry/customer_inquiry.php.orig:210 msgid "Credit" msgstr "" -#: dimensions/includes/dimensions_ui.inc:45 -#: dimensions/inquiry/search_dimensions.php:134 gl/inquiry/bank_inquiry.php:71 -#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_trial_balance.php:189 -#: purchasing/inquiry/supplier_allocation_inquiry.php:137 -#: reporting/rep101.php:122 reporting/rep201.php:114 reporting/rep203.php:94 -#: reporting/rep204.php:84 reporting/rep307.php:117 reporting/rep601.php:80 -#: reporting/rep701.php:111 reporting/rep704.php:84 reporting/rep704.php:87 -#: reporting/rep704.php:90 reporting/rep708.php:185 -#: sales/inquiry/customer_allocation_inquiry.php:154 +#: ../dimensions/includes/dimensions_ui.inc:45 +#: ../dimensions/inquiry/search_dimensions.php:134 +#: ../gl/inquiry/bank_inquiry.php:71 +#: ../gl/inquiry/gl_account_inquiry.php:141 - #: ../gl/inquiry/gl_trial_balance.php:174 - #: ../purchasing/inquiry/supplier_allocation_inquiry.php:136 - #: ../reporting/rep203.php:92 - #: ../reporting/rep204.php:82 - #: ../reporting/rep601.php:77 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:136 ++#: ../reporting/rep101.php:122 ++#: ../reporting/rep201.php:114 ++#: ../reporting/rep203.php:94 ++#: ../reporting/rep204.php:84 ++#: ../reporting/rep307.php:117 ++#: ../reporting/rep601.php:80 +#: ../reporting/rep602.php:81 - #: ../reporting/rep701.php:109 - #: ../reporting/rep704.php:80 - #: ../reporting/rep704.php:83 - #: ../reporting/rep704.php:86 - #: ../reporting/rep708.php:172 - #: ../sales/inquiry/customer_allocation_inquiry.php:155 ++#: ../reporting/rep701.php:111 ++#: ../reporting/rep704.php:84 ++#: ../reporting/rep704.php:87 ++#: ../reporting/rep704.php:90 ++#: ../reporting/rep708.php:185 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:155 msgid "Balance" msgstr "" @@@ -3651,91 -3100,56 +3598,93 @@@ msgstr " msgid "Search Dimensions" msgstr "" -#: dimensions/inquiry/search_dimensions.php:73 gl/bank_transfer.php:79 -#: gl/inquiry/journal_inquiry.php:45 gl/manage/revaluate_currencies.php:105 -#: gl/includes/ui/gl_bank_ui.inc:26 gl/includes/ui/gl_journal_ui.inc:30 -#: includes/ui/contacts_view.inc:94 -#: inventory/includes/item_adjustments_ui.inc:35 -#: inventory/includes/stock_transfers_ui.inc:40 -#: manufacturing/search_work_orders.php:67 -#: manufacturing/work_order_add_finished.php:198 -#: manufacturing/work_order_entry.php:378 -#: manufacturing/work_order_entry.php:385 -#: manufacturing/includes/work_order_issue_ui.inc:156 -#: purchasing/includes/ui/invoice_ui.inc:105 -#: purchasing/includes/ui/po_ui.inc:176 purchasing/includes/ui/po_ui.inc:181 -#: purchasing/supplier_payment.php:300 sales/customer_payments.php:370 -#: sales/customer_payments.php.sav:377 +#: ../dimensions/inquiry/search_dimensions.php:73 +#: ../gl/bank_transfer.php:79 +#: ../gl/inquiry/journal_inquiry.php:45 +#: ../gl/manage/revaluate_currencies.php:105 +#: ../gl/includes/ui/gl_bank_ui.inc:26 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:104 +#: ../gl/includes/ui/gl_journal_ui.inc:30 +#: ../includes/ui/contacts_view.inc:94 +#: ../inventory/includes/item_adjustments_ui.inc:35 +#: ../inventory/includes/stock_transfers_ui.inc:40 +#: ../manufacturing/search_work_orders.php:67 +#: ../manufacturing/work_order_add_finished.php:198 +#: ../manufacturing/work_order_costs.php:134 +#: ../manufacturing/work_order_entry.php:378 +#: ../manufacturing/work_order_entry.php:385 +#: ../manufacturing/includes/work_order_issue_ui.inc:156 - #: ../purchasing/includes/ui/invoice_ui.inc:104 - #: ../purchasing/includes/ui/po_ui.inc:166 - #: ../purchasing/includes/ui/po_ui.inc:171 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:104 +#: ../purchasing/includes/ui/po_ui.inc.orig:166 +#: ../purchasing/includes/ui/po_ui.inc.orig:171 - #: ../purchasing/supplier_payment.php:289 - #: ../sales/customer_payments.php:382 ++#: ../purchasing/supplier_payment.php.orig:289 ++#: ../sales/customer_payments.php.orig:382 msgid "Reference:" msgstr "" -#: dimensions/inquiry/search_dimensions.php:75 -#: includes/ui/allocation_cart.inc:284 includes/ui/ui_lists.inc:1923 -#: reporting/rep101.php:100 reporting/rep102.php:96 reporting/rep104.php:97 -#: reporting/rep104.php:101 reporting/rep105.php:95 reporting/rep105.php:99 -#: reporting/rep201.php:92 reporting/rep202.php:100 reporting/rep203.php:74 -#: reporting/rep204.php:77 reporting/rep301.php:92 reporting/rep301.php:99 -#: reporting/rep302.php:105 reporting/rep302.php:112 reporting/rep303.php:96 -#: reporting/rep303.php:103 reporting/rep304.php:98 reporting/rep304.php:103 -#: reporting/rep304.php:108 reporting/rep306.php:120 reporting/rep306.php:125 -#: reporting/rep306.php:130 reporting/rep306.php:135 reporting/rep307.php:103 -#: reporting/rep307.php:110 reporting/rep308.php:138 reporting/rep308.php:143 -#: reporting/rep309.php:92 reporting/rep702.php:61 reporting/rep710.php:86 -#: reporting/rep710.php:87 +#: ../dimensions/inquiry/search_dimensions.php:75 - #: ../includes/ui/allocation_cart.inc:286 - #: ../includes/ui/ui_lists.inc:1923 - #: ../reporting/rep101.php:112 - #: ../reporting/rep102.php:94 - #: ../reporting/rep104.php:95 - #: ../reporting/rep104.php:99 - #: ../reporting/rep105.php:93 - #: ../reporting/rep105.php:97 - #: ../reporting/rep201.php:100 - #: ../reporting/rep202.php:98 - #: ../reporting/rep203.php:72 - #: ../reporting/rep204.php:75 - #: ../reporting/rep301.php:90 - #: ../reporting/rep301.php:97 - #: ../reporting/rep302.php:103 - #: ../reporting/rep302.php:110 - #: ../reporting/rep303.php:84 - #: ../reporting/rep303.php:91 - #: ../reporting/rep304.php:96 - #: ../reporting/rep304.php:101 - #: ../reporting/rep304.php:106 - #: ../reporting/rep702.php:59 - #: ../reporting/rep710.php:84 - #: ../reporting/rep710.php:85 ++#: ../includes/ui/allocation_cart.inc.orig:286 ++#: ../includes/ui/ui_lists.inc:1927 ++#: ../reporting/rep101.php:100 ++#: ../reporting/rep102.php:96 ++#: ../reporting/rep104.php:97 ++#: ../reporting/rep104.php:101 ++#: ../reporting/rep105.php:95 ++#: ../reporting/rep105.php:99 ++#: ../reporting/rep201.php:92 ++#: ../reporting/rep202.php:100 ++#: ../reporting/rep203.php:74 ++#: ../reporting/rep204.php:77 ++#: ../reporting/rep301.php:92 ++#: ../reporting/rep301.php:99 ++#: ../reporting/rep302.php:105 ++#: ../reporting/rep302.php:112 ++#: ../reporting/rep303.php:96 ++#: ../reporting/rep303.php:103 ++#: ../reporting/rep304.php:98 ++#: ../reporting/rep304.php:103 ++#: ../reporting/rep304.php:108 ++#: ../reporting/rep306.php:120 ++#: ../reporting/rep306.php:125 ++#: ../reporting/rep306.php:130 ++#: ../reporting/rep306.php:135 ++#: ../reporting/rep307.php:103 ++#: ../reporting/rep307.php:110 ++#: ../reporting/rep308.php:138 ++#: ../reporting/rep308.php:143 ++#: ../reporting/rep309.php:92 ++#: ../reporting/rep702.php:61 ++#: ../reporting/rep710.php:86 ++#: ../reporting/rep710.php:87 msgid "All" msgstr "" -#: dimensions/inquiry/search_dimensions.php:76 gl/inquiry/bank_inquiry.php:49 -#: gl/inquiry/gl_trial_balance.php:54 gl/inquiry/journal_inquiry.php:48 -#: gl/inquiry/profit_loss.php:168 gl/includes/ui/gl_bank_ui.inc:52 -#: gl/includes/ui/gl_bank_ui.inc:120 inventory/inquiry/stock_movements.php:62 -#: purchasing/inquiry/supplier_allocation_inquiry.php:50 -#: purchasing/inquiry/supplier_inquiry.php:53 -#: sales/inquiry/customer_inquiry.php:50 +#: ../dimensions/inquiry/search_dimensions.php:76 +#: ../gl/inquiry/bank_inquiry.php:49 - #: ../gl/inquiry/gl_trial_balance.php:49 ++#: ../gl/inquiry/gl_trial_balance.php:54 +#: ../gl/inquiry/journal_inquiry.php:48 - #: ../gl/inquiry/profit_loss.php:163 - #: ../gl/includes/ui/gl_bank_ui.inc:51 - #: ../gl/includes/ui/gl_bank_ui.inc:117 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:23 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:53 ++#: ../gl/inquiry/profit_loss.php:168 ++#: ../gl/includes/ui/gl_bank_ui.inc:52 ++#: ../gl/includes/ui/gl_bank_ui.inc:120 +#: ../inventory/inquiry/stock_movements.php:58 - #: ../inventory/inquiry/stock_movements.php.orig:60 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:50 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:50 +#: ../purchasing/inquiry/supplier_inquiry.php:50 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:50 +#: ../sales/inquiry/customer_inquiry.php:46 ++#: ../sales/inquiry/customer_inquiry.php.orig:46 msgid "From:" msgstr "" -#: dimensions/inquiry/search_dimensions.php:77 gl/inquiry/bank_inquiry.php:50 -#: gl/inquiry/gl_trial_balance.php:55 gl/inquiry/journal_inquiry.php:49 -#: gl/inquiry/profit_loss.php:169 inventory/inquiry/stock_movements.php:63 -#: purchasing/inquiry/supplier_allocation_inquiry.php:51 -#: purchasing/inquiry/supplier_inquiry.php:54 -#: sales/inquiry/customer_inquiry.php:51 +#: ../dimensions/inquiry/search_dimensions.php:77 +#: ../gl/inquiry/bank_inquiry.php:50 - #: ../gl/inquiry/gl_trial_balance.php:50 ++#: ../gl/inquiry/gl_trial_balance.php:55 +#: ../gl/inquiry/journal_inquiry.php:49 - #: ../gl/inquiry/profit_loss.php:164 - #: ../gl/includes/ui/gl_bank_ui.inc:117 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:23 ++#: ../gl/inquiry/profit_loss.php:169 +#: ../inventory/inquiry/stock_movements.php:59 - #: ../inventory/inquiry/stock_movements.php.orig:61 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:51 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:51 +#: ../purchasing/inquiry/supplier_inquiry.php:51 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:51 +#: ../sales/inquiry/customer_inquiry.php:47 ++#: ../sales/inquiry/customer_inquiry.php.orig:47 msgid "To:" msgstr "" @@@ -3749,32 -3163,22 +3698,30 @@@ msgstr " msgid "Only Open:" msgstr "" -#: dimensions/inquiry/search_dimensions.php:132 -#: dimensions/view/view_dimension.php:55 includes/ui/allocation_cart.inc:263 -#: purchasing/includes/ui/invoice_ui.inc:125 -#: purchasing/view/view_supp_credit.php:48 -#: purchasing/view/view_supp_invoice.php:51 -#: purchasing/inquiry/supplier_allocation_inquiry.php:132 -#: purchasing/inquiry/supplier_inquiry.php:174 reporting/rep101.php:118 -#: reporting/rep201.php:110 reporting/rep203.php:93 reporting/rep501.php:87 -#: reporting/includes/doctext.inc:100 reporting/includes/doctext.inc:122 -#: reporting/includes/doctext.inc:143 reporting/includes/doctext.inc:145 -#: reporting/includes/doctext.inc:184 reporting/includes/doctext.inc:186 -#: sales/customer_invoice.php:439 sales/view/view_dispatch.php:97 -#: sales/view/view_invoice.php:96 -#: sales/inquiry/customer_allocation_inquiry.php:148 -#: sales/inquiry/customer_inquiry.php:229 -#: sales/includes/ui/sales_order_ui.inc:601 +#: ../dimensions/inquiry/search_dimensions.php:132 - #: ../dimensions/view/view_dimension.php:54 - #: ../includes/ui/allocation_cart.inc:264 - #: ../purchasing/includes/ui/invoice_ui.inc:123 ++#: ../dimensions/view/view_dimension.php:55 ++#: ../includes/ui/allocation_cart.inc.orig:264 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:123 +#: ../purchasing/view/view_supp_credit.php:48 +#: ../purchasing/view/view_supp_invoice.php:52 - #: ../purchasing/inquiry/supplier_allocation_inquiry.php:131 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:131 +#: ../purchasing/inquiry/supplier_inquiry.php:179 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:176 - #: ../reporting/rep101.php:130 - #: ../reporting/rep201.php:118 - #: ../reporting/rep203.php:91 - #: ../reporting/rep501.php:85 ++#: ../reporting/rep101.php:118 ++#: ../reporting/rep201.php:110 ++#: ../reporting/rep203.php:93 ++#: ../reporting/rep501.php:87 +#: ../reporting/includes/doctext.inc:112 +#: ../reporting/includes/doctext.inc:144 +#: ../reporting/includes/doctext.inc:165 +#: ../reporting/includes/doctext.inc:167 - #: ../reporting/includes/doctext.inc:188 +#: ../reporting/includes/doctext.inc:206 +#: ../reporting/includes/doctext.inc:208 +#: ../sales/customer_invoice.php:510 +#: ../sales/view/view_dispatch.php:97 +#: ../sales/view/view_invoice.php:96 - #: ../sales/inquiry/customer_allocation_inquiry.php:149 - #: ../sales/inquiry/customer_inquiry.php:205 - #: ../sales/includes/ui/sales_order_ui.inc.orig:596 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:149 ++#: ../sales/inquiry/customer_inquiry.php.orig:205 ++#: ../sales/includes/ui/sales_order_ui.inc:602 msgid "Due Date" msgstr "" @@@ -3786,45 -3190,36 +3733,47 @@@ msgstr " msgid "View Dimension" msgstr "" - #: ../dimensions/view/view_dimension.php:48 -#: dimensions/view/view_dimension.php:49 ++#: ../dimensions/view/view_dimension.php:49 msgid "The dimension number sent is not valid." msgstr "" - #: ../dimensions/view/view_dimension.php:72 -#: dimensions/view/view_dimension.php:73 ++#: ../dimensions/view/view_dimension.php:73 msgid "This dimension is closed." msgstr "" - #: ../dimensions/view/view_dimension.php:84 -#: dimensions/view/view_dimension.php:85 gl/inquiry/gl_account_inquiry.php:71 -#: gl/inquiry/tax_inquiry.php:61 purchasing/inquiry/po_search_completed.php:65 -#: purchasing/inquiry/po_search.php:64 -#: sales/inquiry/customer_allocation_inquiry.php:44 -#: sales/inquiry/sales_deliveries_view.php:104 -#: sales/inquiry/sales_orders_view.php:229 ++#: ../dimensions/view/view_dimension.php:85 +#: ../gl/inquiry/gl_account_inquiry.php:71 +#: ../gl/inquiry/tax_inquiry.php:61 +#: ../purchasing/inquiry/po_search_completed.php:62 +#: ../purchasing/inquiry/po_search_completed.php.orig:63 +#: ../purchasing/inquiry/po_search.php:64 +#: ../sales/inquiry/customer_allocation_inquiry.php:44 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:44 +#: ../sales/inquiry/sales_deliveries_view.php:104 - #: ../sales/inquiry/sales_orders_view.php:251 ++#: ../sales/inquiry/sales_orders_view.php.orig:251 msgid "from:" msgstr "" - #: ../dimensions/view/view_dimension.php:85 -#: dimensions/view/view_dimension.php:86 gl/inquiry/gl_account_inquiry.php:72 -#: gl/inquiry/tax_inquiry.php:62 purchasing/inquiry/po_search_completed.php:66 -#: purchasing/inquiry/po_search.php:65 -#: sales/inquiry/customer_allocation_inquiry.php:45 -#: sales/inquiry/sales_deliveries_view.php:105 -#: sales/inquiry/sales_orders_view.php:230 ++#: ../dimensions/view/view_dimension.php:86 +#: ../gl/inquiry/gl_account_inquiry.php:72 +#: ../gl/inquiry/tax_inquiry.php:62 +#: ../purchasing/inquiry/po_search_completed.php:63 +#: ../purchasing/inquiry/po_search_completed.php.orig:64 +#: ../purchasing/inquiry/po_search.php:65 +#: ../sales/inquiry/customer_allocation_inquiry.php:45 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:45 +#: ../sales/inquiry/sales_deliveries_view.php:105 - #: ../sales/inquiry/sales_orders_view.php:252 ++#: ../sales/inquiry/sales_orders_view.php.orig:252 msgid "to:" msgstr "" - #: ../dimensions/view/view_dimension.php:86 -#: dimensions/view/view_dimension.php:87 gl/inquiry/balance_sheet.php:131 -#: gl/inquiry/bank_inquiry.php:52 gl/inquiry/gl_account_inquiry.php:85 -#: gl/inquiry/gl_trial_balance.php:63 gl/inquiry/profit_loss.php:183 -#: gl/inquiry/tax_inquiry.php:63 ++#: ../dimensions/view/view_dimension.php:87 +#: ../gl/inquiry/balance_sheet.php:131 +#: ../gl/inquiry/bank_inquiry.php:52 +#: ../gl/inquiry/gl_account_inquiry.php:85 - #: ../gl/inquiry/gl_trial_balance.php:58 - #: ../gl/inquiry/profit_loss.php:178 ++#: ../gl/inquiry/gl_trial_balance.php:63 ++#: ../gl/inquiry/profit_loss.php:183 +#: ../gl/inquiry/tax_inquiry.php:63 msgid "Show" msgstr "" @@@ -3833,36 -3227,7 +3782,37 @@@ msgid "Revenue / Cost Accruals" msgstr "" -#: gl/accruals.php:44 +#: ../gl/accruals.php:38 +#: ../gl/bank_transfer.php:121 - #: ../gl/gl_bank.php:270 ++#: ../gl/gl_bank.php:269 +#: ../gl/gl_journal.php:167 +#: ../gl/manage/revaluate_currencies.php:59 - #: ../inventory/adjustments.php:116 - #: ../inventory/transfers.php:111 ++#: ../inventory/adjustments.php:114 ++#: ../inventory/transfers.php:109 +#: ../manufacturing/work_order_add_finished.php:104 +#: ../manufacturing/work_order_costs.php:86 +#: ../manufacturing/work_order_entry.php:160 +#: ../manufacturing/work_order_issue.php:84 +#: ../purchasing/po_entry_items.php:345 - #: ../purchasing/po_entry_items.php.orig:342 ++#: ../purchasing/po_entry_items.php.orig:345 +#: ../purchasing/po_receive_items.php:179 - #: ../purchasing/supplier_credit.php:193 ++#: ../purchasing/supplier_credit.php:192 +#: ../purchasing/supplier_invoice.php:199 - #: ../purchasing/supplier_payment.php:180 - #: ../sales/create_recurrent_invoices.php:119 ++#: ../purchasing/supplier_payment.php:191 ++#: ../purchasing/supplier_payment.php.orig:180 ++#: ../sales/create_recurrent_invoices.php:121 +#: ../sales/credit_note_entry.php:157 +#: ../sales/customer_credit_invoice.php:95 +#: ../sales/customer_delivery.php:165 - #: ../sales/customer_delivery.php.orig:165 +#: ../sales/customer_invoice.php:318 - #: ../sales/customer_payments.php:145 - #: ../sales/sales_order_entry.php:364 ++#: ../sales/customer_payments.php:156 ++#: ../sales/customer_payments.php.orig:145 ++#: ../sales/sales_order_entry.php:365 +msgid "" +"The entered date is out of fiscal year or is closed for further data entry." +msgstr "" + +#: ../gl/accruals.php:44 msgid "The amount can not be 0." msgstr "" @@@ -3881,145 -3246,73 +3831,126 @@@ msgstr " msgid "Accruals for %s" msgstr "" -#: gl/accruals.php:92 gl/accruals.php:94 gl/accruals.php:203 -#: gl/accruals.php:205 gl/gl_budget.php:71 gl/gl_budget.php:72 -#: gl/gl_budget.php:76 gl/inquiry/balance_sheet.php:128 -#: gl/inquiry/balance_sheet.php:130 gl/inquiry/gl_account_inquiry.php:79 -#: gl/inquiry/gl_account_inquiry.php:81 gl/inquiry/gl_account_inquiry.php:134 -#: gl/inquiry/gl_account_inquiry.php:136 gl/inquiry/gl_trial_balance.php:57 -#: gl/inquiry/gl_trial_balance.php:59 gl/inquiry/profit_loss.php:179 -#: gl/inquiry/profit_loss.php:181 gl/manage/gl_quick_entries.php:261 -#: gl/manage/gl_quick_entries.php:263 gl/manage/gl_quick_entries.php:343 -#: gl/manage/gl_quick_entries.php:345 gl/view/accrual_trans.php:54 -#: gl/view/accrual_trans.php:56 gl/view/gl_deposit_view.php:99 -#: gl/view/gl_deposit_view.php:102 gl/view/gl_payment_view.php:98 -#: gl/view/gl_payment_view.php:101 gl/view/gl_trans_view.php:63 -#: gl/view/gl_trans_view.php:66 gl/includes/ui/gl_bank_ui.inc:152 -#: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:155 -#: gl/includes/ui/gl_journal_ui.inc:83 gl/includes/ui/gl_journal_ui.inc:84 -#: gl/includes/ui/gl_journal_ui.inc:86 includes/sysnames.inc:43 -#: includes/sysnames.inc:165 inventory/manage/item_categories.php:216 -#: inventory/manage/item_categories.php:218 inventory/manage/items.php:343 -#: inventory/manage/items.php:345 purchasing/includes/ui/invoice_ui.inc:258 -#: purchasing/includes/ui/invoice_ui.inc:260 -#: purchasing/manage/suppliers.php:137 purchasing/manage/suppliers.php:138 -#: purchasing/manage/suppliers.php:140 reporting/rep103.php:243 -#: reporting/rep103.php:255 reporting/rep205.php:161 reporting/rep205.php:173 -#: reporting/rep501.php:92 reporting/rep704.php:83 reporting/rep704.php:86 -#: reporting/rep704.php:97 reporting/rep704.php:99 reporting/rep704.php:107 -#: reporting/rep705.php:249 reporting/rep705.php:251 reporting/rep705.php:262 -#: reporting/rep706.php:194 reporting/rep706.php:196 reporting/rep706.php:204 -#: reporting/rep707.php:218 reporting/rep707.php:220 reporting/rep707.php:228 -#: reporting/rep708.php:201 reporting/rep708.php:203 reporting/rep708.php:210 -#: reporting/reports_main.php:341 reporting/reports_main.php:342 -#: reporting/reports_main.php:348 reporting/reports_main.php:349 -#: reporting/reports_main.php:357 reporting/reports_main.php:358 -#: reporting/reports_main.php:369 reporting/reports_main.php:370 -#: reporting/reports_main.php:382 reporting/reports_main.php:383 -#: reporting/reports_main.php:395 reporting/reports_main.php:401 -#: reporting/reports_main.php:409 reporting/reports_main.php:420 -#: reporting/reports_main.php:432 sales/customer_delivery.php:395 -#: sales/customer_delivery.php:403 sales/customer_invoice.php:409 -#: sales/customer_invoice.php:447 sales/manage/customers.php:270 -#: sales/manage/customers.php:272 sales/includes/ui/sales_credit_ui.inc:132 -#: sales/includes/ui/sales_credit_ui.inc:137 -#: sales/includes/ui/sales_order_ui.inc:456 -#: sales/includes/ui/sales_order_ui.inc:461 +#: ../gl/accruals.php:96 +#: ../gl/accruals.php:98 +#: ../gl/accruals.php:207 +#: ../gl/accruals.php:209 +#: ../gl/gl_budget.php:71 +#: ../gl/gl_budget.php:72 +#: ../gl/gl_budget.php:76 +#: ../gl/inquiry/balance_sheet.php:128 +#: ../gl/inquiry/balance_sheet.php:130 +#: ../gl/inquiry/gl_account_inquiry.php:79 +#: ../gl/inquiry/gl_account_inquiry.php:81 +#: ../gl/inquiry/gl_account_inquiry.php:134 +#: ../gl/inquiry/gl_account_inquiry.php:136 - #: ../gl/inquiry/gl_trial_balance.php:52 - #: ../gl/inquiry/gl_trial_balance.php:54 - #: ../gl/inquiry/profit_loss.php:174 - #: ../gl/inquiry/profit_loss.php:176 ++#: ../gl/inquiry/gl_trial_balance.php:57 ++#: ../gl/inquiry/gl_trial_balance.php:59 ++#: ../gl/inquiry/profit_loss.php:179 ++#: ../gl/inquiry/profit_loss.php:181 +#: ../gl/manage/gl_quick_entries.php:261 +#: ../gl/manage/gl_quick_entries.php:263 +#: ../gl/manage/gl_quick_entries.php:343 +#: ../gl/manage/gl_quick_entries.php:345 +#: ../gl/view/accrual_trans.php:54 +#: ../gl/view/accrual_trans.php:56 - #: ../gl/view/gl_deposit_view.php:99 - #: ../gl/view/gl_deposit_view.php:102 - #: ../gl/view/gl_payment_view.php:98 - #: ../gl/view/gl_payment_view.php:101 ++#: ../gl/view/gl_deposit_view.php:104 ++#: ../gl/view/gl_deposit_view.php:107 ++#: ../gl/view/gl_payment_view.php:103 ++#: ../gl/view/gl_payment_view.php:106 +#: ../gl/view/gl_trans_view.php:68 +#: ../gl/view/gl_trans_view.php:71 - #: ../gl/includes/ui/gl_bank_ui.inc:150 - #: ../gl/includes/ui/gl_bank_ui.inc:151 ++#: ../gl/includes/ui/gl_bank_ui.inc:152 +#: ../gl/includes/ui/gl_bank_ui.inc:153 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:124 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:125 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:127 ++#: ../gl/includes/ui/gl_bank_ui.inc:155 +#: ../gl/includes/ui/gl_journal_ui.inc:86 +#: ../gl/includes/ui/gl_journal_ui.inc:87 +#: ../gl/includes/ui/gl_journal_ui.inc:89 +#: ../includes/sysnames.inc:43 +#: ../includes/sysnames.inc:166 - #: ../inventory/manage/item_categories.php:216 - #: ../inventory/manage/item_categories.php:218 - #: ../inventory/manage/items.php:350 - #: ../inventory/manage/items.php:352 - #: ../inventory/manage/items.php.orig:343 - #: ../inventory/manage/items.php.orig:345 - #: ../purchasing/includes/ui/invoice_ui.inc:265 - #: ../purchasing/includes/ui/invoice_ui.inc:267 ++#: ../inventory/manage/item_categories.php:220 ++#: ../inventory/manage/item_categories.php:222 ++#: ../inventory/manage/items.php.orig:355 ++#: ../inventory/manage/items.php.orig:357 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:265 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:267 +#: ../purchasing/manage/suppliers.php:145 +#: ../purchasing/manage/suppliers.php:146 +#: ../purchasing/manage/suppliers.php:148 ++#: ../purchasing/manage/suppliers.php.orig:145 ++#: ../purchasing/manage/suppliers.php.orig:146 +#: ../purchasing/manage/suppliers.php.orig:148 - #: ../purchasing/manage/suppliers.php.orig:149 - #: ../purchasing/manage/suppliers.php.orig:151 - #: ../reporting/rep501.php:90 - #: ../reporting/rep704.php:79 - #: ../reporting/rep704.php:82 - #: ../reporting/rep704.php:93 - #: ../reporting/rep704.php:95 - #: ../reporting/rep704.php:103 - #: ../reporting/rep705.php:245 - #: ../reporting/rep705.php:247 - #: ../reporting/rep705.php:258 - #: ../reporting/rep706.php:190 - #: ../reporting/rep706.php:192 - #: ../reporting/rep706.php:200 - #: ../reporting/rep707.php:214 - #: ../reporting/rep707.php:216 - #: ../reporting/rep707.php:224 - #: ../reporting/rep708.php:188 - #: ../reporting/rep708.php:190 - #: ../reporting/rep708.php:197 - #: ../reporting/reports_main.php:265 - #: ../reporting/reports_main.php:266 - #: ../reporting/reports_main.php:271 - #: ../reporting/reports_main.php:272 - #: ../reporting/reports_main.php:279 - #: ../reporting/reports_main.php:280 - #: ../reporting/reports_main.php:290 - #: ../reporting/reports_main.php:291 - #: ../reporting/reports_main.php:302 - #: ../reporting/reports_main.php:303 - #: ../reporting/reports_main.php:314 - #: ../reporting/reports_main.php:319 - #: ../reporting/reports_main.php:326 - #: ../reporting/reports_main.php:336 - #: ../reporting/reports_main.php:347 - #: ../sales/customer_delivery.php.orig:408 - #: ../sales/customer_delivery.php.orig:416 ++#: ../reporting/rep103.php:243 ++#: ../reporting/rep103.php:255 ++#: ../reporting/rep205.php:161 ++#: ../reporting/rep205.php:173 ++#: ../reporting/rep501.php:92 ++#: ../reporting/rep704.php:83 ++#: ../reporting/rep704.php:86 ++#: ../reporting/rep704.php:97 ++#: ../reporting/rep704.php:99 ++#: ../reporting/rep704.php:107 ++#: ../reporting/rep705.php:249 ++#: ../reporting/rep705.php:251 ++#: ../reporting/rep705.php:262 ++#: ../reporting/rep706.php:194 ++#: ../reporting/rep706.php:196 ++#: ../reporting/rep706.php:204 ++#: ../reporting/rep707.php:218 ++#: ../reporting/rep707.php:220 ++#: ../reporting/rep707.php:228 ++#: ../reporting/rep708.php:201 ++#: ../reporting/rep708.php:203 ++#: ../reporting/rep708.php:210 ++#: ../sales/customer_delivery.php:409 ++#: ../sales/customer_delivery.php:417 +#: ../sales/customer_invoice.php:475 +#: ../sales/customer_invoice.php:518 - #: ../sales/manage/customers.php:270 - #: ../sales/manage/customers.php:272 ++#: ../sales/manage/customers.php:273 ++#: ../sales/manage/customers.php:275 +#: ../sales/manage/sav.customers.php:269 +#: ../sales/manage/sav.customers.php:271 +#: ../sales/includes/ui/sales_credit_ui.inc:132 +#: ../sales/includes/ui/sales_credit_ui.inc:137 - #: ../sales/includes/ui/sales_order_ui.inc.orig:451 - #: ../sales/includes/ui/sales_order_ui.inc.orig:456 ++#: ../sales/includes/ui/sales_order_ui.inc:457 ++#: ../sales/includes/ui/sales_order_ui.inc:462 msgid "Dimension" msgstr "" -#: gl/accruals.php:98 gl/accruals.php:213 gl/inquiry/bank_inquiry.php:71 -#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143 -#: gl/inquiry/journal_inquiry.php:133 gl/view/accrual_trans.php:60 -#: gl/view/gl_deposit_view.php:100 gl/view/gl_deposit_view.php:103 -#: gl/view/gl_deposit_view.php:106 gl/view/gl_payment_view.php:99 -#: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105 -#: gl/view/gl_trans_view.php:64 gl/view/gl_trans_view.php:67 -#: gl/view/gl_trans_view.php:70 gl/includes/ui/gl_bank_ui.inc:153 -#: gl/includes/ui/gl_bank_ui.inc:156 gl/includes/ui/gl_bank_ui.inc:159 -#: gl/includes/ui/gl_bank_ui.inc:312 gl/includes/ui/gl_journal_ui.inc:84 -#: gl/includes/ui/gl_journal_ui.inc:87 gl/includes/ui/gl_journal_ui.inc:90 -#: gl/includes/ui/gl_journal_ui.inc:240 -#: inventory/includes/item_adjustments_ui.inc:181 -#: inventory/includes/stock_transfers_ui.inc:161 -#: manufacturing/includes/work_order_issue_ui.inc:169 -#: purchasing/includes/ui/invoice_ui.inc:258 -#: purchasing/includes/ui/invoice_ui.inc:260 -#: purchasing/includes/ui/invoice_ui.inc:262 -#: sales/customer_credit_invoice.php:364 sales/customer_delivery.php:529 -#: sales/customer_invoice.php:578 sales/includes/ui/sales_credit_ui.inc:339 +#: ../gl/accruals.php:102 +#: ../gl/accruals.php:217 ++#: ../gl/inquiry/bank_inquiry.php:71 +#: ../gl/inquiry/gl_account_inquiry.php:141 +#: ../gl/inquiry/gl_account_inquiry.php:143 +#: ../gl/inquiry/journal_inquiry.php:133 +#: ../gl/view/accrual_trans.php:60 - #: ../gl/view/gl_deposit_view.php:100 - #: ../gl/view/gl_deposit_view.php:103 - #: ../gl/view/gl_deposit_view.php:106 - #: ../gl/view/gl_payment_view.php:99 - #: ../gl/view/gl_payment_view.php:102 - #: ../gl/view/gl_payment_view.php:105 ++#: ../gl/view/gl_deposit_view.php:105 ++#: ../gl/view/gl_deposit_view.php:108 ++#: ../gl/view/gl_deposit_view.php:111 ++#: ../gl/view/gl_payment_view.php:104 ++#: ../gl/view/gl_payment_view.php:107 ++#: ../gl/view/gl_payment_view.php:110 +#: ../gl/view/gl_trans_view.php:69 +#: ../gl/view/gl_trans_view.php:72 +#: ../gl/view/gl_trans_view.php:75 - #: ../gl/includes/ui/gl_bank_ui.inc:151 - #: ../gl/includes/ui/gl_bank_ui.inc:154 - #: ../gl/includes/ui/gl_bank_ui.inc:157 - #: ../gl/includes/ui/gl_bank_ui.inc:297 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:125 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:128 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:131 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:271 ++#: ../gl/includes/ui/gl_bank_ui.inc:153 ++#: ../gl/includes/ui/gl_bank_ui.inc:156 ++#: ../gl/includes/ui/gl_bank_ui.inc:159 ++#: ../gl/includes/ui/gl_bank_ui.inc:312 +#: ../gl/includes/ui/gl_journal_ui.inc:87 +#: ../gl/includes/ui/gl_journal_ui.inc:90 +#: ../gl/includes/ui/gl_journal_ui.inc:93 +#: ../gl/includes/ui/gl_journal_ui.inc:276 +#: ../inventory/includes/item_adjustments_ui.inc:181 +#: ../inventory/includes/stock_transfers_ui.inc:161 +#: ../manufacturing/view/wo_costs_view.php:46 +#: ../manufacturing/includes/work_order_issue_ui.inc:169 - #: ../purchasing/includes/ui/invoice_ui.inc:265 - #: ../purchasing/includes/ui/invoice_ui.inc:267 - #: ../purchasing/includes/ui/invoice_ui.inc:269 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:265 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:267 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:269 +#: ../sales/customer_credit_invoice.php:364 - #: ../sales/customer_delivery.php.orig:532 ++#: ../sales/customer_delivery.php:543 +#: ../sales/includes/ui/sales_credit_ui.inc:339 msgid "Memo" msgstr "" @@@ -4039,11 -3332,9 +3970,11 @@@ msgstr " msgid "Bi-weekly" msgstr "" -#: gl/accruals.php:182 gl/manage/gl_quick_entries.php:240 -#: gl/includes/ui/gl_journal_ui.inc:57 sales/create_recurrent_invoices.php:134 -#: sales/manage/recurrent_invoices.php:102 +#: ../gl/accruals.php:186 +#: ../gl/manage/gl_quick_entries.php:240 +#: ../gl/includes/ui/gl_journal_ui.inc:57 - #: ../sales/create_recurrent_invoices.php:132 ++#: ../sales/create_recurrent_invoices.php:134 +#: ../sales/manage/recurrent_invoices.php:102 msgid "Monthly" msgstr "" @@@ -4063,54 -3354,28 +3994,49 @@@ msgstr " msgid "Revenue / Cost Account" msgstr "" -#: gl/accruals.php:208 gl/gl_budget.php:91 gl/gl_budget.php:93 -#: gl/inquiry/journal_inquiry.php:132 gl/inquiry/tax_inquiry.php:82 -#: gl/manage/gl_quick_entries.php:261 gl/manage/gl_quick_entries.php:263 -#: gl/manage/gl_quick_entries.php:265 gl/manage/gl_quick_entries.php:339 -#: gl/view/bank_transfer_view.php:70 gl/view/bank_transfer_view.php:80 -#: gl/view/gl_deposit_view.php:67 gl/view/gl_deposit_view.php:100 -#: gl/view/gl_deposit_view.php:103 gl/view/gl_deposit_view.php:106 -#: gl/view/gl_payment_view.php:65 gl/view/gl_payment_view.php:99 -#: gl/view/gl_payment_view.php:102 gl/view/gl_payment_view.php:105 -#: gl/includes/ui/gl_bank_ui.inc:153 gl/includes/ui/gl_bank_ui.inc:156 -#: gl/includes/ui/gl_bank_ui.inc:159 includes/sysnames.inc:132 -#: includes/ui/allocation_cart.inc:263 includes/ui/ui_lists.inc:1187 -#: manufacturing/includes/manufacturing_ui.inc:236 -#: purchasing/includes/ui/invoice_ui.inc:258 -#: purchasing/includes/ui/invoice_ui.inc:260 -#: purchasing/includes/ui/invoice_ui.inc:262 -#: purchasing/view/view_supp_payment.php:60 -#: purchasing/view/view_supp_payment.php:72 reporting/rep102.php:245 -#: reporting/rep107.php:184 reporting/rep109.php:189 reporting/rep110.php:193 -#: reporting/rep111.php:174 reporting/rep113.php:178 reporting/rep202.php:253 -#: reporting/rep209.php:192 reporting/rep706.php:309 reporting/rep707.php:327 -#: reporting/rep710.php:78 sales/view/view_receipt.php:44 +#: ../gl/accruals.php:212 +#: ../gl/gl_budget.php:91 +#: ../gl/gl_budget.php:93 +#: ../gl/inquiry/journal_inquiry.php:132 +#: ../gl/inquiry/tax_inquiry.php:82 +#: ../gl/manage/gl_quick_entries.php:261 +#: ../gl/manage/gl_quick_entries.php:263 +#: ../gl/manage/gl_quick_entries.php:265 +#: ../gl/manage/gl_quick_entries.php:339 +#: ../gl/view/bank_transfer_view.php:70 +#: ../gl/view/bank_transfer_view.php:80 +#: ../gl/view/gl_deposit_view.php:67 - #: ../gl/view/gl_deposit_view.php:100 - #: ../gl/view/gl_deposit_view.php:103 - #: ../gl/view/gl_deposit_view.php:106 ++#: ../gl/view/gl_deposit_view.php:105 ++#: ../gl/view/gl_deposit_view.php:108 ++#: ../gl/view/gl_deposit_view.php:111 +#: ../gl/view/gl_payment_view.php:65 - #: ../gl/view/gl_payment_view.php:99 - #: ../gl/view/gl_payment_view.php:102 - #: ../gl/view/gl_payment_view.php:105 - #: ../gl/includes/ui/gl_bank_ui.inc:151 - #: ../gl/includes/ui/gl_bank_ui.inc:154 - #: ../gl/includes/ui/gl_bank_ui.inc:157 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:125 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:128 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:131 ++#: ../gl/view/gl_payment_view.php:104 ++#: ../gl/view/gl_payment_view.php:107 ++#: ../gl/view/gl_payment_view.php:110 ++#: ../gl/includes/ui/gl_bank_ui.inc:153 ++#: ../gl/includes/ui/gl_bank_ui.inc:156 ++#: ../gl/includes/ui/gl_bank_ui.inc:159 +#: ../includes/sysnames.inc:133 - #: ../includes/ui/allocation_cart.inc:264 - #: ../includes/ui/ui_lists.inc:1182 ++#: ../includes/ui/allocation_cart.inc.orig:264 ++#: ../includes/ui/ui_lists.inc:1185 +#: ../manufacturing/view/wo_costs_view.php:46 +#: ../manufacturing/includes/manufacturing_ui.inc:236 - #: ../purchasing/includes/ui/invoice_ui.inc:265 - #: ../purchasing/includes/ui/invoice_ui.inc:267 - #: ../purchasing/includes/ui/invoice_ui.inc:269 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:265 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:267 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:269 +#: ../purchasing/view/view_supp_payment.php:60 +#: ../purchasing/view/view_supp_payment.php:72 - #: ../reporting/rep102.php:241 - #: ../reporting/rep107.php:194 - #: ../reporting/rep107.php:251 - #: ../reporting/rep109.php:192 - #: ../reporting/rep110.php:195 - #: ../reporting/rep111.php:177 - #: ../reporting/rep113.php:181 - #: ../reporting/rep202.php:249 - #: ../reporting/rep209.php:200 - #: ../reporting/rep706.php:303 - #: ../reporting/rep707.php:321 - #: ../reporting/rep710.php:76 ++#: ../reporting/rep102.php:245 ++#: ../reporting/rep109.php:190 ++#: ../reporting/rep110.php:193 ++#: ../reporting/rep111.php:173 ++#: ../reporting/rep113.php:178 ++#: ../reporting/rep202.php:253 ++#: ../reporting/rep209.php:195 ++#: ../reporting/rep706.php:309 ++#: ../reporting/rep707.php:327 ++#: ../reporting/rep710.php:78 +#: ../sales/view/view_receipt.php:44 msgid "Amount" msgstr "" @@@ -4142,12 -3407,9 +4068,14 @@@ msgstr " msgid "Reconcile Bank Account" msgstr "" -#: gl/bank_account_reconcile.php:35 gl/bank_transfer.php:30 gl/gl_bank.php:49 -#: gl/inquiry/bank_inquiry.php:30 purchasing/supplier_payment.php:42 -#: sales/customer_payments.php:39 sales/customer_payments.php.sav:39 +#: ../gl/bank_account_reconcile.php:35 +#: ../gl/bank_transfer.php:30 +#: ../gl/gl_bank.php:49 +#: ../gl/inquiry/bank_inquiry.php:30 +#: ../purchasing/supplier_payment.php:42 - #: ../sales/customer_payments.php:39 ++#: ../purchasing/supplier_payment.php.orig:42 ++#: ../sales/customer_payments.php:38 ++#: ../sales/customer_payments.php.orig:39 msgid "There are no bank accounts defined in the system." msgstr "" @@@ -4169,8 -3430,7 +4097,8 @@@ msgstr " msgid "Bank Statement:" msgstr "" -#: gl/bank_account_reconcile.php:169 +#: ../gl/bank_account_reconcile.php:167 - #: ../inventory/purchasing_data.php.orig:235 ++#: ../taxes/sav.tax_types.php:183 msgid "New" msgstr "" @@@ -4203,16 -3462,11 +4131,16 @@@ msgstr " msgid "Date of bank statement to reconcile" msgstr "" -#: gl/bank_account_reconcile.php:239 gl/inquiry/bank_inquiry.php:71 -#: gl/inquiry/gl_account_inquiry.php:141 gl/inquiry/gl_account_inquiry.php:143 -#: gl/view/accrual_trans.php:60 gl/view/gl_trans_view.php:36 -#: reporting/rep601.php:79 reporting/rep704.php:84 reporting/rep704.php:86 -#: reporting/rep704.php:89 +#: ../gl/bank_account_reconcile.php:237 +#: ../gl/inquiry/bank_inquiry.php:71 +#: ../gl/inquiry/gl_account_inquiry.php:141 +#: ../gl/inquiry/gl_account_inquiry.php:143 +#: ../gl/view/accrual_trans.php:60 - #: ../reporting/rep601.php:76 ++#: ../reporting/rep601.php:79 +#: ../reporting/rep602.php:80 - #: ../reporting/rep704.php:80 - #: ../reporting/rep704.php:82 - #: ../reporting/rep704.php:85 ++#: ../reporting/rep704.php:84 ++#: ../reporting/rep704.php:86 ++#: ../reporting/rep704.php:89 msgid "Person/Item" msgstr "" @@@ -4250,32 -3502,27 +4178,39 @@@ msgstr " msgid "Transfer Date:" msgstr "" -#: gl/bank_transfer.php:87 gl/bank_transfer.php:94 -#: sales/customer_payments.php:404 sales/customer_payments.php.sav:411 +#: ../gl/bank_transfer.php:87 +#: ../gl/bank_transfer.php:94 - #: ../sales/customer_payments.php:411 ++#: ../sales/customer_payments.php.orig:411 msgid "Amount:" msgstr "" -#: gl/bank_transfer.php:88 gl/bank_transfer.php:95 -#: purchasing/supplier_payment.php:313 sales/customer_payments.php:389 -#: sales/customer_payments.php.sav:396 +#: ../gl/bank_transfer.php:88 +#: ../gl/bank_transfer.php:95 - #: ../purchasing/supplier_payment.php:302 - #: ../sales/customer_payments.php:396 ++#: ../purchasing/supplier_payment.php.orig:302 ++#: ../sales/customer_payments.php.orig:396 msgid "Bank Charge:" msgstr "" -#: gl/bank_transfer.php:102 ++#: ../gl/bank_transfer.php:90 ++msgid "Incoming Amount:" ++msgstr "" ++ +#: ../gl/bank_transfer.php:102 msgid "Enter Transfer" msgstr "" -#: gl/bank_transfer.php:128 gl/bank_transfer.php:158 gl/bank_transfer.php:190 -#: purchasing/supplier_payment.php:126 purchasing/supplier_payment.php:132 +#: ../gl/bank_transfer.php:128 +#: ../gl/bank_transfer.php:158 - #: ../purchasing/supplier_payment.php:125 - #: ../purchasing/supplier_payment.php:131 ++#: ../gl/bank_transfer.php:190 ++#: ../purchasing/supplier_payment.php:135 ++#: ../purchasing/supplier_payment.php:141 ++#: ../purchasing/supplier_payment.php.orig:125 ++#: ../purchasing/supplier_payment.php.orig:131 msgid "The entered amount is invalid or less than zero." msgstr "" -#: gl/bank_transfer.php:133 gl/gl_bank.php:223 +#: ../gl/bank_transfer.php:133 - #: ../gl/gl_bank.php:228 ++#: ../gl/gl_bank.php:227 msgid "The total bank amount cannot be 0." msgstr "" @@@ -4284,39 -3531,28 +4219,42 @@@ msgid "The total bank amount exceeds allowed limit (%s) for source account." msgstr "" -#: gl/bank_transfer.php:150 gl/gl_bank.php:240 +#: ../gl/bank_transfer.php:150 - #: ../gl/gl_bank.php:245 ++#: ../gl/gl_bank.php:244 #, php-format msgid "" "The bank transaction would result in exceed of authorized overdraft limit " "for transaction: %s #%s on %s." msgstr "" -#: gl/bank_transfer.php:163 purchasing/supplier_payment.php:140 -#: sales/customer_payments.php:190 sales/customer_payments.php.sav:190 +#: ../gl/bank_transfer.php:163 - #: ../purchasing/supplier_payment.php:139 - #: ../sales/customer_payments.php:184 ++#: ../purchasing/supplier_payment.php:149 ++#: ../purchasing/supplier_payment.php.orig:139 ++#: ../sales/customer_payments.php:195 ++#: ../sales/customer_payments.php.orig:184 msgid "" "The Bank Charge Account has not been set in System and General GL Setup." msgstr "" -#: gl/bank_transfer.php:169 gl/gl_bank.php:247 gl/gl_journal.php:168 -#: gl/manage/revaluate_currencies.php:65 inventory/adjustments.php:94 -#: inventory/transfers.php:91 manufacturing/work_order_add_finished.php:77 -#: manufacturing/work_order_entry.php:132 -#: manufacturing/work_order_issue.php:89 purchasing/po_receive_items.php:188 -#: purchasing/supplier_payment.php:205 sales/credit_note_entry.php:147 -#: sales/customer_credit_invoice.php:102 sales/customer_delivery.php:166 -#: sales/customer_invoice.php:280 sales/customer_payments.php:157 -#: sales/customer_payments.php.sav:157 sales/sales_order_entry.php:413 +#: ../gl/bank_transfer.php:169 - #: ../gl/gl_bank.php:252 ++#: ../gl/gl_bank.php:251 +#: ../gl/gl_journal.php:173 +#: ../gl/manage/revaluate_currencies.php:65 - #: ../inventory/adjustments.php:96 - #: ../inventory/transfers.php:93 ++#: ../inventory/adjustments.php:94 ++#: ../inventory/transfers.php:91 +#: ../manufacturing/work_order_add_finished.php:77 +#: ../manufacturing/work_order_entry.php:132 +#: ../manufacturing/work_order_issue.php:90 +#: ../purchasing/po_receive_items.php:186 - #: ../purchasing/supplier_payment.php:196 ++#: ../purchasing/supplier_payment.php:207 ++#: ../purchasing/supplier_payment.php.orig:196 +#: ../sales/credit_note_entry.php:147 +#: ../sales/customer_credit_invoice.php:102 +#: ../sales/customer_delivery.php:178 - #: ../sales/customer_delivery.php.orig:178 +#: ../sales/customer_invoice.php:332 - #: ../sales/customer_payments.php:151 - #: ../sales/sales_order_entry.php:428 ++#: ../sales/customer_payments.php:162 ++#: ../sales/customer_payments.php.orig:151 ++#: ../sales/sales_order_entry.php:429 msgid "You must enter a reference." msgstr "" @@@ -4324,7 -3560,11 +4262,11 @@@ msgid "The source and destination bank accouts cannot be the same." msgstr "" -#: gl/bank_transfer.php:195 ++#: ../gl/bank_transfer.php:195 + msgid "The incomming bank amount cannot be 0." + msgstr "" + -#: gl/gl_bank.php:34 +#: ../gl/gl_bank.php:34 msgid "Bank Account Payment Entry" msgstr "" @@@ -4340,116 -3580,113 +4282,131 @@@ msgstr " msgid "Modify Bank Deposit Entry" msgstr "" - #: ../gl/gl_bank.php:76 -#: gl/gl_bank.php:74 ++#: ../gl/gl_bank.php:77 #, php-format msgid "Payment %d has been entered" msgstr "" - #: ../gl/gl_bank.php:78 - #: ../gl/gl_bank.php:96 -#: gl/gl_bank.php:76 gl/gl_bank.php:94 ++#: ../gl/gl_bank.php:79 ++#: ../gl/gl_bank.php:97 msgid "&View the GL Postings for this Payment" msgstr "" - #: ../gl/gl_bank.php:80 - #: ../gl/gl_bank.php:98 -#: gl/gl_bank.php:78 gl/gl_bank.php:96 ++#: ../gl/gl_bank.php:81 ++#: ../gl/gl_bank.php:99 msgid "Enter Another &Payment" msgstr "" - #: ../gl/gl_bank.php:82 - #: ../gl/gl_bank.php:100 -#: gl/gl_bank.php:80 gl/gl_bank.php:98 ++#: ../gl/gl_bank.php:83 ++#: ../gl/gl_bank.php:101 msgid "Enter A &Deposit" msgstr "" - #: ../gl/gl_bank.php:84 -#: gl/gl_bank.php:82 gl/gl_journal.php:61 inventory/adjustments.php:50 -#: manufacturing/work_order_entry.php:68 purchasing/po_entry_items.php:112 -#: purchasing/po_entry_items.php:136 purchasing/supplier_credit.php:49 -#: purchasing/supplier_invoice.php:52 sales/credit_note_entry.php:77 -#: sales/customer_credit_invoice.php:62 sales/customer_invoice.php:66 -#: sales/sales_order_entry.php:234 ++#: ../gl/gl_bank.php:85 +#: ../gl/gl_journal.php:63 +#: ../inventory/adjustments.php:50 +#: ../manufacturing/work_order_entry.php:68 +#: ../purchasing/po_entry_items.php:115 +#: ../purchasing/po_entry_items.php:139 - #: ../purchasing/po_entry_items.php.orig:112 - #: ../purchasing/po_entry_items.php.orig:136 - #: ../purchasing/supplier_credit.php:84 ++#: ../purchasing/po_entry_items.php.orig:115 ++#: ../purchasing/po_entry_items.php.orig:139 ++#: ../purchasing/supplier_credit.php:83 +#: ../purchasing/supplier_invoice.php:75 +#: ../sales/credit_note_entry.php:77 +#: ../sales/customer_credit_invoice.php:62 +#: ../sales/customer_invoice.php:69 +#: ../sales/sales_order_entry.php:240 msgid "Add an Attachment" msgstr "" - #: ../gl/gl_bank.php:110 -#: gl/gl_bank.php:92 ++#: ../gl/gl_bank.php:95 + #, php-format + msgid "Payment %d has been modified" + msgstr "" + -#: gl/gl_bank.php:108 ++#: ../gl/gl_bank.php:111 #, php-format msgid "Deposit %d has been entered" msgstr "" - #: ../gl/gl_bank.php:112 -#: gl/gl_bank.php:110 ++#: ../gl/gl_bank.php:113 msgid "View the GL Postings for this Deposit" msgstr "" - #: ../gl/gl_bank.php:114 -#: gl/gl_bank.php:112 ++#: ../gl/gl_bank.php:115 msgid "Enter Another Deposit" msgstr "" - #: ../gl/gl_bank.php:116 -#: gl/gl_bank.php:114 ++#: ../gl/gl_bank.php:117 msgid "Enter A Payment" msgstr "" - #: ../gl/gl_bank.php:125 -#: gl/gl_bank.php:123 ++#: ../gl/gl_bank.php:126 #, php-format msgid "Deposit %d has been modified" msgstr "" - #: ../gl/gl_bank.php:127 -#: gl/gl_bank.php:125 ++#: ../gl/gl_bank.php:128 msgid "&View the GL Postings for this Deposit" msgstr "" - #: ../gl/gl_bank.php:129 -#: gl/gl_bank.php:127 ++#: ../gl/gl_bank.php:130 msgid "Enter Another &Deposit" msgstr "" - #: ../gl/gl_bank.php:131 -#: gl/gl_bank.php:129 ++#: ../gl/gl_bank.php:132 msgid "Enter A &Payment" msgstr "" - #: ../gl/gl_bank.php:222 -#: gl/gl_bank.php:217 ++#: ../gl/gl_bank.php:221 msgid "You must enter at least one payment line." msgstr "" - #: ../gl/gl_bank.php:239 - #: ../purchasing/supplier_payment.php:189 -#: gl/gl_bank.php:234 purchasing/supplier_payment.php:198 ++#: ../gl/gl_bank.php:238 ++#: ../purchasing/supplier_payment.php:200 ++#: ../purchasing/supplier_payment.php.orig:189 #, php-format msgid "The total bank amount exceeds allowed limit (%s)." msgstr "" - #: ../gl/gl_bank.php:264 -#: gl/gl_bank.php:259 ++#: ../gl/gl_bank.php:263 msgid "The entered date for the payment is invalid." msgstr "" - #: ../gl/gl_bank.php:276 -#: gl/gl_bank.php:271 ++#: ../gl/gl_bank.php:275 msgid "You have to select customer and customer branch." msgstr "" - #: ../gl/gl_bank.php:280 -#: gl/gl_bank.php:275 ++#: ../gl/gl_bank.php:279 msgid "You have to select supplier." msgstr "" - #: ../gl/gl_bank.php:328 -#: gl/gl_bank.php:324 ++#: ../gl/gl_bank.php:287 ++msgid "Settled amount have to be positive number." ++msgstr "" ++ ++#: ../gl/gl_bank.php:332 msgid "The amount entered is not a valid number or is less than zero." msgstr "" - #: ../gl/gl_bank.php:400 -#: gl/gl_bank.php:330 gl/manage/exchange_rates.php:39 ++#: ../gl/gl_bank.php:338 ++#: ../gl/manage/exchange_rates.php:39 + msgid "The exchange rate cannot be zero or a negative number." + msgstr "" + -#: gl/gl_bank.php:402 ++#: ../gl/gl_bank.php:410 msgid "Payment Items" msgstr "" - #: ../gl/gl_bank.php:400 -#: gl/gl_bank.php:402 ++#: ../gl/gl_bank.php:410 msgid "Deposit Items" msgstr "" - #: ../gl/gl_bank.php:408 -#: gl/gl_bank.php:410 ++#: ../gl/gl_bank.php:418 msgid "Process Payment" msgstr "" - #: ../gl/gl_bank.php:408 -#: gl/gl_bank.php:410 ++#: ../gl/gl_bank.php:418 msgid "Process Deposit" msgstr "" @@@ -4483,36 -3717,18 +4440,40 @@@ msgstr " msgid "Get" msgstr "" -#: gl/gl_budget.php:91 gl/gl_budget.php:93 gl/inquiry/profit_loss.php:236 -#: gl/manage/gl_quick_entries.php:240 reporting/rep101.php:126 -#: reporting/rep105.php:118 reporting/rep106.php:92 reporting/rep114.php:90 -#: reporting/rep201.php:118 reporting/rep304.php:121 reporting/rep305.php:106 -#: reporting/rep306.php:148 reporting/rep307.php:122 reporting/rep308.php:155 -#: reporting/rep309.php:103 reporting/rep601.php:85 reporting/rep702.php:59 -#: reporting/rep704.php:95 reporting/rep704.php:105 reporting/rep704.php:113 -#: reporting/rep706.php:185 reporting/rep706.php:193 reporting/rep706.php:203 -#: reporting/rep706.php:211 reporting/rep707.php:210 reporting/rep707.php:217 -#: reporting/rep707.php:227 reporting/rep707.php:235 reporting/rep708.php:200 -#: reporting/rep708.php:209 reporting/rep708.php:216 reporting/rep709.php:106 -#: reporting/rep710.php:85 +#: ../gl/gl_budget.php:91 +#: ../gl/gl_budget.php:93 - #: ../gl/inquiry/profit_loss.php:231 ++#: ../gl/inquiry/profit_loss.php:236 +#: ../gl/manage/gl_quick_entries.php:240 - #: ../reporting/rep101.php:136 - #: ../reporting/rep105.php:116 - #: ../reporting/rep106.php:90 - #: ../reporting/rep114.php:88 - #: ../reporting/rep201.php:124 - #: ../reporting/rep304.php:119 - #: ../reporting/rep305.php:103 - #: ../reporting/rep601.php:82 ++#: ../reporting/rep101.php:126 ++#: ../reporting/rep105.php:118 ++#: ../reporting/rep106.php:92 ++#: ../reporting/rep114.php:90 ++#: ../reporting/rep201.php:118 ++#: ../reporting/rep304.php:121 ++#: ../reporting/rep305.php:106 ++#: ../reporting/rep306.php:148 ++#: ../reporting/rep307.php:122 ++#: ../reporting/rep308.php:155 ++#: ../reporting/rep309.php:103 ++#: ../reporting/rep601.php:85 +#: ../reporting/rep602.php:86 - #: ../reporting/rep702.php:57 - #: ../reporting/rep704.php:91 - #: ../reporting/rep704.php:101 - #: ../reporting/rep704.php:109 - #: ../reporting/rep706.php:181 - #: ../reporting/rep706.php:189 - #: ../reporting/rep706.php:199 - #: ../reporting/rep706.php:207 - #: ../reporting/rep707.php:206 - #: ../reporting/rep707.php:213 - #: ../reporting/rep707.php:223 - #: ../reporting/rep707.php:231 - #: ../reporting/rep708.php:187 - #: ../reporting/rep708.php:196 - #: ../reporting/rep708.php:203 - #: ../reporting/rep709.php:104 - #: ../reporting/rep710.php:83 ++#: ../reporting/rep702.php:59 ++#: ../reporting/rep704.php:95 ++#: ../reporting/rep704.php:105 ++#: ../reporting/rep704.php:113 ++#: ../reporting/rep706.php:185 ++#: ../reporting/rep706.php:193 ++#: ../reporting/rep706.php:203 ++#: ../reporting/rep706.php:211 ++#: ../reporting/rep707.php:210 ++#: ../reporting/rep707.php:217 ++#: ../reporting/rep707.php:227 ++#: ../reporting/rep707.php:235 ++#: ../reporting/rep708.php:200 ++#: ../reporting/rep708.php:209 ++#: ../reporting/rep708.php:216 ++#: ../reporting/rep709.php:106 ++#: ../reporting/rep710.php:85 msgid "Period" msgstr "" @@@ -4525,74 -3740,42 +4486,77 @@@ msgstr " msgid "Last Year" msgstr "" -#: gl/gl_budget.php:127 gl/inquiry/balance_sheet.php:98 -#: gl/inquiry/balance_sheet.php:205 gl/inquiry/balance_sheet.php:236 -#: gl/inquiry/gl_trial_balance.php:224 gl/inquiry/profit_loss.php:115 -#: gl/inquiry/profit_loss.php:288 gl/view/gl_deposit_view.php:132 -#: gl/view/gl_payment_view.php:131 gl/view/gl_trans_view.php:106 -#: gl/includes/ui/gl_bank_ui.inc:202 gl/includes/ui/gl_journal_ui.inc:141 -#: inventory/includes/item_adjustments_ui.inc:63 -#: inventory/includes/item_adjustments_ui.inc:102 -#: manufacturing/includes/manufacturing_ui.inc:178 -#: purchasing/includes/ui/invoice_ui.inc:322 -#: purchasing/includes/ui/invoice_ui.inc:487 -#: purchasing/includes/ui/invoice_ui.inc:557 -#: purchasing/po_receive_items.php:63 purchasing/view/view_po.php:140 -#: purchasing/allocations/supplier_allocation_main.php:100 -#: reporting/rep101.php:234 reporting/rep106.php:84 reporting/rep106.php:119 -#: reporting/rep106.php:162 reporting/rep114.php:161 reporting/rep201.php:223 -#: reporting/rep203.php:94 reporting/rep203.php:171 reporting/rep204.php:113 -#: reporting/rep204.php:141 reporting/rep301.php:133 reporting/rep301.php:170 -#: reporting/rep304.php:146 reporting/rep304.php:188 reporting/rep305.php:101 -#: reporting/rep305.php:127 reporting/rep305.php:183 reporting/rep306.php:141 -#: reporting/rep306.php:176 reporting/rep306.php:196 reporting/rep306.php:212 -#: reporting/rep306.php:261 reporting/rep306.php:276 reporting/rep306.php:287 -#: reporting/rep309.php:126 reporting/rep309.php:153 reporting/rep702.php:142 -#: reporting/rep705.php:152 reporting/rep705.php:315 reporting/rep706.php:106 -#: reporting/rep706.php:255 reporting/rep706.php:290 reporting/rep707.php:115 -#: reporting/rep707.php:297 reporting/rep708.php:253 -#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170 -#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:433 -#: sales/customer_invoice.php:470 -#: sales/allocations/customer_allocation_main.php:99 -#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113 -#: sales/view/view_invoice.php:114 sales/view/view_sales_order.php:96 -#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161 -#: sales/view/view_sales_order.php:202 -#: sales/includes/ui/sales_credit_ui.inc:168 -#: sales/includes/ui/sales_order_ui.inc:146 +#: ../gl/gl_budget.php:127 +#: ../gl/inquiry/balance_sheet.php:98 +#: ../gl/inquiry/balance_sheet.php:205 +#: ../gl/inquiry/balance_sheet.php:236 - #: ../gl/inquiry/gl_trial_balance.php:209 +#: ../gl/inquiry/profit_loss.php:115 - #: ../gl/inquiry/profit_loss.php:283 - #: ../gl/view/gl_deposit_view.php:132 - #: ../gl/view/gl_payment_view.php:131 ++#: ../gl/inquiry/profit_loss.php:288 ++#: ../gl/view/gl_deposit_view.php:137 ++#: ../gl/view/gl_payment_view.php:136 +#: ../gl/view/gl_trans_view.php:115 - #: ../gl/includes/ui/gl_bank_ui.inc:200 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:174 ++#: ../gl/includes/ui/gl_bank_ui.inc:202 +#: ../gl/includes/ui/gl_journal_ui.inc:153 +#: ../inventory/includes/item_adjustments_ui.inc:63 +#: ../inventory/includes/item_adjustments_ui.inc:102 +#: ../manufacturing/includes/manufacturing_ui.inc:178 - #: ../purchasing/includes/ui/invoice_ui.inc:329 - #: ../purchasing/includes/ui/invoice_ui.inc:495 - #: ../purchasing/includes/ui/invoice_ui.inc:566 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:329 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:495 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:566 +#: ../purchasing/po_receive_items.php:63 +#: ../purchasing/view/view_po.php:140 +#: ../purchasing/allocations/supplier_allocation_main.php:100 - #: ../reporting/rep101.php:237 - #: ../reporting/rep106.php:82 - #: ../reporting/rep106.php:115 - #: ../reporting/rep106.php:158 - #: ../reporting/rep114.php:156 - #: ../reporting/rep201.php:221 - #: ../reporting/rep203.php:92 - #: ../reporting/rep203.php:167 - #: ../reporting/rep204.php:109 - #: ../reporting/rep204.php:137 - #: ../reporting/rep301.php:130 - #: ../reporting/rep301.php:167 - #: ../reporting/rep304.php:142 - #: ../reporting/rep304.php:184 - #: ../reporting/rep305.php:98 - #: ../reporting/rep305.php:122 - #: ../reporting/rep305.php:178 - #: ../reporting/rep702.php:138 ++#: ../reporting/rep101.php:234 ++#: ../reporting/rep106.php:84 ++#: ../reporting/rep106.php:119 ++#: ../reporting/rep106.php:162 ++#: ../reporting/rep114.php:161 ++#: ../reporting/rep201.php:223 ++#: ../reporting/rep203.php:94 ++#: ../reporting/rep203.php:171 ++#: ../reporting/rep204.php:113 ++#: ../reporting/rep204.php:141 ++#: ../reporting/rep301.php:133 ++#: ../reporting/rep301.php:170 ++#: ../reporting/rep304.php:146 ++#: ../reporting/rep304.php:188 ++#: ../reporting/rep305.php:101 ++#: ../reporting/rep305.php:127 ++#: ../reporting/rep305.php:183 ++#: ../reporting/rep306.php:141 ++#: ../reporting/rep306.php:176 ++#: ../reporting/rep306.php:196 ++#: ../reporting/rep306.php:212 ++#: ../reporting/rep306.php:261 ++#: ../reporting/rep306.php:276 ++#: ../reporting/rep306.php:287 ++#: ../reporting/rep309.php:126 ++#: ../reporting/rep309.php:153 ++#: ../reporting/rep702.php:142 +#: ../reporting/rep705.php:152 - #: ../reporting/rep705.php:309 ++#: ../reporting/rep705.php:315 +#: ../reporting/rep706.php:106 - #: ../reporting/rep706.php:249 - #: ../reporting/rep706.php:284 ++#: ../reporting/rep706.php:255 ++#: ../reporting/rep706.php:290 +#: ../reporting/rep707.php:115 - #: ../reporting/rep707.php:291 - #: ../reporting/rep708.php:235 ++#: ../reporting/rep707.php:297 ++#: ../reporting/rep708.php:253 +#: ../reporting/includes/doctext.inc:30 +#: ../reporting/includes/doctext.inc:192 +#: ../sales/customer_credit_invoice.php:281 - #: ../sales/customer_delivery.php.orig:446 ++#: ../sales/customer_delivery.php:447 +#: ../sales/customer_invoice.php:542 +#: ../sales/customer_invoice.php:545 +#: ../sales/allocations/customer_allocation_main.php:99 +#: ../sales/view/view_credit.php:91 +#: ../sales/view/view_dispatch.php:113 +#: ../sales/view/view_invoice.php:116 +#: ../sales/view/view_sales_order.php:109 +#: ../sales/view/view_sales_order.php:142 +#: ../sales/view/view_sales_order.php:179 +#: ../sales/view/view_sales_order.php:220 - #: ../sales/view/view_sales_order.php.orig:96 - #: ../sales/view/view_sales_order.php.orig:129 - #: ../sales/view/view_sales_order.php.orig:161 - #: ../sales/view/view_sales_order.php.orig:202 +#: ../sales/includes/ui/sales_credit_ui.inc:168 - #: ../sales/includes/ui/sales_order_ui.inc.orig:142 ++#: ../sales/includes/ui/sales_order_ui.inc:147 msgid "Total" msgstr "" @@@ -4665,10 -3843,8 +4629,10 @@@ msgstr " msgid "The credit amount entered is not a valid number or is less than zero." msgstr "" -#: gl/gl_journal.php:243 includes/ui/ui_view.inc:732 -#: purchasing/supplier_credit.php:119 purchasing/supplier_invoice.php:119 +#: ../gl/gl_journal.php:248 - #: ../includes/ui/ui_view.inc:674 - #: ../purchasing/supplier_credit.php:136 ++#: ../includes/ui/ui_view.inc.orig:674 ++#: ../purchasing/supplier_credit.php:135 +#: ../purchasing/supplier_invoice.php:144 msgid "Cannot post to GL account used by more than one tax type." msgstr "" @@@ -4698,52 -3874,37 +4662,51 @@@ msgstr " msgid "As at:" msgstr "" -#: gl/inquiry/balance_sheet.php:228 gl/inquiry/profit_loss.php:299 -#: reporting/rep705.php:325 reporting/rep706.php:278 reporting/rep706.php:303 -#: reporting/rep707.php:309 reporting/rep707.php:315 +#: ../gl/inquiry/balance_sheet.php:228 - #: ../gl/inquiry/profit_loss.php:294 - #: ../reporting/rep705.php:319 - #: ../reporting/rep706.php:272 - #: ../reporting/rep706.php:297 - #: ../reporting/rep707.php:303 ++#: ../gl/inquiry/profit_loss.php:299 ++#: ../reporting/rep705.php:325 ++#: ../reporting/rep706.php:278 ++#: ../reporting/rep706.php:303 +#: ../reporting/rep707.php:309 ++#: ../reporting/rep707.php:315 msgid "Calculated Return" msgstr "" -#: gl/inquiry/balance_sheet.php:236 includes/sysnames.inc:120 -#: reporting/rep706.php:290 +#: ../gl/inquiry/balance_sheet.php:236 +#: ../includes/sysnames.inc:121 - #: ../reporting/rep706.php:284 ++#: ../reporting/rep706.php:290 msgid "Liabilities" msgstr "" -#: gl/inquiry/balance_sheet.php:236 reporting/rep706.php:290 +#: ../gl/inquiry/balance_sheet.php:236 - #: ../reporting/rep706.php:284 ++#: ../reporting/rep706.php:290 msgid " and " msgstr "" -#: gl/inquiry/balance_sheet.php:236 reporting/rep706.php:290 +#: ../gl/inquiry/balance_sheet.php:236 - #: ../reporting/rep706.php:284 ++#: ../reporting/rep706.php:290 msgid "Equities" msgstr "" -#: gl/inquiry/bank_inquiry.php:28 reporting/rep601.php:72 +#: ../gl/inquiry/bank_inquiry.php:28 - #: ../reporting/rep601.php:69 ++#: ../reporting/rep601.php:72 msgid "Bank Statement" msgstr "" -#: gl/inquiry/bank_inquiry.php:78 gl/inquiry/gl_account_inquiry.php:162 -#: reporting/rep601.php:104 reporting/rep704.php:144 +#: ../gl/inquiry/bank_inquiry.php:78 +#: ../gl/inquiry/gl_account_inquiry.php:162 - #: ../reporting/rep601.php:99 ++#: ../reporting/rep601.php:104 +#: ../reporting/rep602.php:103 - #: ../reporting/rep704.php:138 ++#: ../reporting/rep704.php:144 msgid "Opening Balance" msgstr "" - #: ../gl/inquiry/bank_inquiry.php:123 -#: gl/inquiry/bank_inquiry.php:124 gl/inquiry/gl_account_inquiry.php:211 -#: gl/inquiry/gl_trial_balance.php:234 reporting/rep601.php:157 -#: reporting/rep704.php:192 reporting/rep708.php:262 ++#: ../gl/inquiry/bank_inquiry.php:124 +#: ../gl/inquiry/gl_account_inquiry.php:211 - #: ../gl/inquiry/gl_trial_balance.php:219 - #: ../reporting/rep601.php:150 ++#: ../reporting/rep601.php:157 +#: ../reporting/rep602.php:157 - #: ../reporting/rep704.php:186 - #: ../reporting/rep708.php:244 ++#: ../reporting/rep704.php:192 ++#: ../reporting/rep708.php:262 msgid "Ending Balance" msgstr "" @@@ -4768,73 -3929,57 +4731,20 @@@ msgid " "No general ledger transactions have been created for the specified criteria." msgstr "" -#: gl/inquiry/gl_trial_balance.php:28 reporting/rep708.php:219 +#: ../gl/inquiry/gl_trial_balance.php:28 - #: ../reporting/rep708.php:206 ++#: ../reporting/rep708.php:219 msgid "Trial Balance" msgstr "" - #: ../gl/inquiry/gl_trial_balance.php:55 -#: gl/inquiry/gl_trial_balance.php:60 ++#: ../gl/inquiry/gl_trial_balance.php:60 msgid "No zero values" msgstr "" - #: ../gl/inquiry/gl_trial_balance.php:56 - #: ../reporting/reports_main.php:301 - #: ../reporting/reports_main.php:346 - #: ../reporting/reports_main.php:386 -#: gl/inquiry/gl_trial_balance.php:61 reporting/reports_main.php:381 -#: reporting/reports_main.php:431 reporting/reports_main.php:476 ++#: ../gl/inquiry/gl_trial_balance.php:61 msgid "Only balances" msgstr "" - #: ../gl/inquiry/gl_trial_balance.php:88 - #: ../gl/inquiry/gl_trial_balance.php:140 - #: ../reporting/rep706.php:302 - #: ../reporting/rep707.php:320 - #: ../reporting/rep708.php:51 - #: ../reporting/rep708.php:117 - #: ../sales/create_recurrent_invoices.php:132 - #: ../sales/manage/recurrent_invoices.php:102 -#: gl/inquiry/gl_trial_balance.php:95 gl/inquiry/gl_trial_balance.php:156 -#: reporting/rep706.php:308 reporting/rep707.php:326 reporting/rep708.php:51 -#: reporting/rep708.php:126 sales/create_recurrent_invoices.php:134 -#: sales/manage/recurrent_invoices.php:102 --msgid "Group" --msgstr "" -- - #: ../gl/inquiry/gl_trial_balance.php:158 -#: gl/inquiry/gl_trial_balance.php:173 --msgid "The from date cannot be bigger than the fiscal year end." --msgstr "" -- - #: ../gl/inquiry/gl_trial_balance.php:171 - #: ../gl/manage/bank_accounts.php:109 - #: ../gl/view/gl_trans_view.php:68 - #: ../gl/view/gl_trans_view.php:71 - #: ../gl/view/gl_trans_view.php:74 - #: ../reporting/rep701.php:109 - #: ../reporting/rep702.php:51 - #: ../reporting/rep705.php:234 - #: ../reporting/rep706.php:181 - #: ../reporting/rep707.php:206 - #: ../reporting/rep708.php:179 -#: gl/inquiry/gl_trial_balance.php:186 gl/manage/bank_accounts.php:106 -#: gl/view/gl_trans_view.php:63 gl/view/gl_trans_view.php:66 -#: gl/view/gl_trans_view.php:69 reporting/rep701.php:111 -#: reporting/rep702.php:53 reporting/rep705.php:238 reporting/rep706.php:185 -#: reporting/rep707.php:210 reporting/rep708.php:192 --msgid "Account Name" --msgstr "" -- - #: ../gl/inquiry/gl_trial_balance.php:172 - #: ../reporting/rep708.php:172 -#: gl/inquiry/gl_trial_balance.php:187 reporting/rep708.php:185 --msgid "Brought Forward" --msgstr "" -- - #: ../gl/inquiry/gl_trial_balance.php:173 - #: ../reporting/rep708.php:172 -#: gl/inquiry/gl_trial_balance.php:188 reporting/rep708.php:185 --msgid "This Period" --msgstr "" -- - #: ../gl/inquiry/gl_trial_balance.php:192 -#: gl/inquiry/gl_trial_balance.php:207 gl/manage/gl_account_types.php:128 --msgid "Class" --msgstr "" -- - #: ../gl/inquiry/gl_trial_balance.php:227 - #: ../reporting/rep708.php:265 -#: gl/inquiry/gl_trial_balance.php:242 reporting/rep708.php:283 --msgid "" --"The Opening Balance is not in balance, probably due to a non closed Previous " --"Fiscalyear." --msgstr "" -- -#: gl/inquiry/journal_inquiry.php:27 +#: ../gl/inquiry/journal_inquiry.php:27 msgid "Journal Inquiry" msgstr "" @@@ -4854,10 -3999,8 +4764,9 @@@ msgstr " msgid "Trans #" msgstr "" -#: gl/inquiry/journal_inquiry.php:134 reporting/rep710.php:77 -#: reporting/rep710.php:87 reporting/reports_main.php:492 +#: ../gl/inquiry/journal_inquiry.php:134 - #: ../reporting/rep710.php:75 - #: ../reporting/rep710.php:85 - #: ../reporting/reports_main.php:400 ++#: ../reporting/rep710.php:77 ++#: ../reporting/rep710.php:87 msgid "User" msgstr "" @@@ -4865,37 -4008,31 +4774,34 @@@ msgid "Profit & Loss Drilldown" msgstr "" - #: ../gl/inquiry/profit_loss.php:168 - #: ../reporting/rep707.php:206 - #: ../reporting/includes/reports_classes.inc:238 -#: gl/inquiry/profit_loss.php:173 reporting/rep707.php:210 -#: reporting/includes/reports_classes.inc:245 ++#: ../gl/inquiry/profit_loss.php:173 ++#: ../reporting/rep707.php:210 ++#: ../reporting/includes/reports_classes.inc:245 msgid "Accumulated" msgstr "" - #: ../gl/inquiry/profit_loss.php:168 - #: ../reporting/rep707.php:251 - #: ../reporting/includes/reports_classes.inc:238 -#: gl/inquiry/profit_loss.php:173 reporting/rep707.php:255 -#: reporting/includes/reports_classes.inc:245 ++#: ../gl/inquiry/profit_loss.php:173 ++#: ../reporting/rep707.php:255 ++#: ../reporting/includes/reports_classes.inc:245 msgid "Period Y-1" msgstr "" - #: ../gl/inquiry/profit_loss.php:168 - #: ../reporting/rep707.php:242 - #: ../reporting/includes/reports_classes.inc:238 -#: gl/inquiry/profit_loss.php:173 reporting/rep707.php:246 -#: reporting/includes/reports_classes.inc:245 ++#: ../gl/inquiry/profit_loss.php:173 ++#: ../reporting/rep707.php:246 ++#: ../reporting/includes/reports_classes.inc:245 msgid "Budget" msgstr "" - #: ../gl/inquiry/profit_loss.php:169 - #: ../reporting/reports_main.php:289 - #: ../reporting/reports_main.php:335 - #: ../reporting/reports_main.php:376 -#: gl/inquiry/profit_loss.php:174 reporting/reports_main.php:368 -#: reporting/reports_main.php:419 reporting/reports_main.php:465 ++#: ../gl/inquiry/profit_loss.php:174 msgid "Compare to" msgstr "" - #: ../gl/inquiry/profit_loss.php:230 -#: gl/inquiry/profit_loss.php:235 ++#: ../gl/inquiry/profit_loss.php:235 msgid "Group/Account Name" msgstr "" - #: ../gl/inquiry/profit_loss.php:233 - #: ../reporting/rep707.php:206 -#: gl/inquiry/profit_loss.php:238 reporting/rep707.php:210 ++#: ../gl/inquiry/profit_loss.php:238 ++#: ../reporting/rep707.php:210 msgid "Achieved %" msgstr "" @@@ -4903,13 -4040,11 +4809,13 @@@ msgid "Tax Inquiry" msgstr "" -#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:183 +#: ../gl/inquiry/tax_inquiry.php:82 - #: ../reporting/rep709.php:176 ++#: ../reporting/rep709.php:183 msgid "Outputs" msgstr "" -#: gl/inquiry/tax_inquiry.php:82 reporting/rep709.php:183 +#: ../gl/inquiry/tax_inquiry.php:82 - #: ../reporting/rep709.php:176 ++#: ../reporting/rep709.php:183 msgid "Inputs" msgstr "" @@@ -4917,8 -4052,7 +4823,8 @@@ msgid "Charged on sales" msgstr "" -#: gl/inquiry/tax_inquiry.php:100 reporting/rep709.php:183 +#: ../gl/inquiry/tax_inquiry.php:100 - #: ../reporting/rep709.php:176 ++#: ../reporting/rep709.php:183 msgid "Output Tax" msgstr "" @@@ -4926,8 -4060,7 +4832,8 @@@ msgid "Paid on purchases" msgstr "" -#: gl/inquiry/tax_inquiry.php:106 reporting/rep709.php:183 +#: ../gl/inquiry/tax_inquiry.php:106 - #: ../reporting/rep709.php:176 ++#: ../reporting/rep709.php:183 msgid "Input Tax" msgstr "" @@@ -4935,13 -4068,11 +4841,12 @@@ msgid "Net payable or collectible" msgstr "" -#: gl/inquiry/tax_inquiry.php:119 reporting/rep709.php:214 +#: ../gl/inquiry/tax_inquiry.php:119 - #: ../reporting/rep709.php:207 ++#: ../reporting/rep709.php:214 msgid "Total payable or refund" msgstr "" -#: gl/manage/bank_accounts.php:16 reporting/reports_main.php:310 +#: ../gl/manage/bank_accounts.php:16 - #: ../reporting/reports_main.php:238 msgid "Bank Accounts" msgstr "" @@@ -4977,51 -4108,37 +4882,64 @@@ msgstr " msgid "Selected bank account has been deleted" msgstr "" -#: gl/manage/bank_accounts.php:106 gl/view/bank_transfer_view.php:69 -#: gl/view/bank_transfer_view.php:78 gl/view/gl_deposit_view.php:66 -#: gl/view/gl_payment_view.php:64 inventory/prices.php:146 -#: inventory/purchasing_data.php:147 purchasing/view/view_supp_credit.php:49 -#: purchasing/view/view_supp_invoice.php:53 -#: purchasing/inquiry/po_search_completed.php:127 -#: purchasing/inquiry/po_search.php:136 -#: purchasing/inquiry/supplier_allocation_inquiry.php:133 -#: purchasing/inquiry/supplier_allocation_inquiry.php:143 -#: purchasing/inquiry/supplier_inquiry.php:76 -#: purchasing/inquiry/supplier_inquiry.php:175 -#: purchasing/inquiry/supplier_inquiry.php:186 -#: purchasing/allocations/supplier_allocation_main.php:99 -#: purchasing/allocations/supplier_allocation_main.php:107 -#: reporting/rep101.php:128 reporting/rep102.php:133 reporting/rep102.php:139 -#: reporting/rep103.php:232 reporting/rep104.php:116 reporting/rep201.php:120 -#: reporting/rep202.php:138 reporting/rep203.php:101 reporting/rep205.php:150 -#: sales/customer_credit_invoice.php:237 sales/customer_delivery.php:340 -#: sales/customer_invoice.php:404 -#: sales/allocations/customer_allocation_main.php:98 -#: sales/allocations/customer_allocation_main.php:106 -#: sales/view/view_credit.php:70 sales/view/view_dispatch.php:86 -#: sales/view/view_invoice.php:85 -#: sales/inquiry/customer_allocation_inquiry.php:150 -#: sales/inquiry/customer_allocation_inquiry.php:160 -#: sales/inquiry/customer_inquiry.php:80 -#: sales/inquiry/customer_inquiry.php:232 -#: sales/inquiry/customer_inquiry.php:245 -#: sales/inquiry/sales_deliveries_view.php:189 -#: sales/inquiry/sales_orders_view.php:272 -#: sales/inquiry/sales_orders_view.php:286 ++#: ../gl/manage/bank_accounts.php:109 ++#: ../gl/view/gl_trans_view.php:68 ++#: ../gl/view/gl_trans_view.php:71 ++#: ../gl/view/gl_trans_view.php:74 ++#: ../reporting/rep701.php:111 ++#: ../reporting/rep702.php:53 ++#: ../reporting/rep705.php:238 ++#: ../reporting/rep706.php:185 ++#: ../reporting/rep707.php:210 ++#: ../reporting/rep708.php:192 ++msgid "Account Name" ++msgstr "" ++ +#: ../gl/manage/bank_accounts.php:109 +#: ../gl/view/bank_transfer_view.php:69 +#: ../gl/view/bank_transfer_view.php:78 +#: ../gl/view/gl_deposit_view.php:66 +#: ../gl/view/gl_payment_view.php:64 - #: ../inventory/prices.php:133 - #: ../inventory/purchasing_data.php:129 ++#: ../inventory/prices.php:146 ++#: ../inventory/purchasing_data.php:147 +#: ../purchasing/view/view_supp_credit.php:49 +#: ../purchasing/view/view_supp_invoice.php:54 +#: ../purchasing/inquiry/po_search_completed.php:126 +#: ../purchasing/inquiry/po_search_completed.php.orig:125 +#: ../purchasing/inquiry/po_search.php:136 - #: ../purchasing/inquiry/supplier_allocation_inquiry.php:132 - #: ../purchasing/inquiry/supplier_allocation_inquiry.php:142 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:132 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:142 +#: ../purchasing/inquiry/supplier_inquiry.php:73 +#: ../purchasing/inquiry/supplier_inquiry.php:180 +#: ../purchasing/inquiry/supplier_inquiry.php:192 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:73 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:177 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:189 +#: ../purchasing/allocations/supplier_allocation_main.php:99 +#: ../purchasing/allocations/supplier_allocation_main.php:107 - #: ../reporting/rep101.php:138 - #: ../reporting/rep102.php:131 - #: ../reporting/rep102.php:137 - #: ../reporting/rep104.php:114 - #: ../reporting/rep201.php:126 - #: ../reporting/rep202.php:136 - #: ../reporting/rep203.php:99 ++#: ../reporting/rep101.php:128 ++#: ../reporting/rep102.php:133 ++#: ../reporting/rep102.php:139 ++#: ../reporting/rep103.php:232 ++#: ../reporting/rep104.php:116 ++#: ../reporting/rep201.php:120 ++#: ../reporting/rep202.php:138 ++#: ../reporting/rep203.php:101 ++#: ../reporting/rep205.php:150 +#: ../sales/customer_credit_invoice.php:237 - #: ../sales/customer_delivery.php.orig:353 ++#: ../sales/customer_delivery.php:354 +#: ../sales/customer_invoice.php:470 +#: ../sales/allocations/customer_allocation_main.php:98 +#: ../sales/allocations/customer_allocation_main.php:106 +#: ../sales/view/view_credit.php:70 +#: ../sales/view/view_dispatch.php:86 +#: ../sales/view/view_invoice.php:86 - #: ../sales/inquiry/customer_allocation_inquiry.php:151 - #: ../sales/inquiry/customer_allocation_inquiry.php:161 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:151 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:161 +#: ../sales/inquiry/customer_inquiry.php:76 - #: ../sales/inquiry/customer_inquiry.php:208 - #: ../sales/inquiry/customer_inquiry.php:221 ++#: ../sales/inquiry/customer_inquiry.php.orig:76 ++#: ../sales/inquiry/customer_inquiry.php.orig:208 ++#: ../sales/inquiry/customer_inquiry.php.orig:221 +#: ../sales/inquiry/sales_deliveries_view.php:189 - #: ../sales/inquiry/sales_orders_view.php:294 - #: ../sales/inquiry/sales_orders_view.php:308 ++#: ../sales/inquiry/sales_orders_view.php.orig:294 ++#: ../sales/inquiry/sales_orders_view.php.orig:308 msgid "Currency" msgstr "" @@@ -5034,8 -4150,7 +4952,8 @@@ msgstr " msgid "Bank" msgstr "" -#: gl/manage/bank_accounts.php:107 includes/ui/ui_view.inc:547 +#: ../gl/manage/bank_accounts.php:110 - #: ../includes/ui/ui_view.inc:488 ++#: ../includes/ui/ui_view.inc.orig:488 msgid "Number" msgstr "" @@@ -5083,56 -4194,7 +5001,48 @@@ msgstr " msgid "Bank Address:" msgstr "" -#: gl/manage/currencies.php:16 includes/access_levels.inc:223 +#: ../gl/manage/close_period.php:25 - #: ../gl/manage/close_period.php.orig:25 +msgid "Closing GL Transactions" +msgstr "" + +#: ../gl/manage/close_period.php:40 - #: ../gl/manage/close_period.php.orig:40 +msgid "Selected date is not in fiscal year or the year is closed." +msgstr "" + +#: ../gl/manage/close_period.php:47 - #: ../gl/manage/close_period.php.orig:47 +msgid "The entered date is earlier than date already selected as closing date." +msgstr "" + +#: ../gl/manage/close_period.php:51 - #: ../gl/manage/close_period.php.orig:51 +msgid "You are not allowed to reopen already closed transactions." +msgstr "" + +#: ../gl/manage/close_period.php:69 - #: ../gl/manage/close_period.php.orig:69 +#, php-format +msgid "" +"All transactions resulting in GL accounts changes up to %s has been closed " +"for further edition." +msgstr "" + +#: ../gl/manage/close_period.php:88 - #: ../gl/manage/close_period.php.orig:88 +msgid "" +"Using this feature you can prevent entering new transactions
\n" +"\tand disable edition of already entered transactions up to specified date." +"
\n" +"\tOnly transactions which can generate GL postings are subject to the " +"constraint." +msgstr "" + +#: ../gl/manage/close_period.php:101 - #: ../gl/manage/close_period.php.orig:101 +msgid "End date of closing period:" +msgstr "" + +#: ../gl/manage/close_period.php:104 - #: ../gl/manage/close_period.php.orig:104 +msgid "Close Transactions" +msgstr "" + +#: ../gl/manage/currencies.php:16 +#: ../includes/access_levels.inc:223 msgid "Currencies" msgstr "" @@@ -5245,11 -4306,7 +5155,7 @@@ msgstr " msgid "Exchange Rates" msgstr "" - #: ../gl/manage/exchange_rates.php:39 - msgid "The exchange rate cannot be zero or a negative number." - msgstr "" - -#: gl/manage/exchange_rates.php:45 +#: ../gl/manage/exchange_rates.php:45 msgid "The exchange rate for the date is already there." msgstr "" @@@ -5258,17 -4314,15 +5164,18 @@@ msgid "Date to Use From:" msgstr "" -#: gl/manage/exchange_rates.php:141 includes/ui/ui_view.inc:325 +#: ../gl/manage/exchange_rates.php:141 - #: ../includes/ui/ui_view.inc:288 - #: ../includes/ui/ui_view.inc:290 ++#: ../includes/ui/ui_view.inc:325 ++#: ../includes/ui/ui_view.inc.orig:288 ++#: ../includes/ui/ui_view.inc.orig:290 msgid "Exchange Rate:" msgstr "" -#: gl/manage/exchange_rates.php:142 +#: ../gl/manage/exchange_rates.php:142 - msgid "Get current ECB rate" + msgid "Get current rate from" msgstr "" -#: gl/manage/exchange_rates.php:148 +#: ../gl/manage/exchange_rates.php:148 msgid "Exchange rates are entered against the company currency." msgstr "" @@@ -5332,14 -4386,12 +5239,13 @@@ msgstr " msgid "Class Name" msgstr "" -#: gl/manage/gl_account_classes.php:110 +#: ../gl/manage/gl_account_classes.php:110 - #: ../gl/manage/gl_account_types.php:128 msgid "Class Type" msgstr "" -#: gl/manage/gl_account_classes.php:112 gl/manage/gl_account_classes.php:169 -#: reporting/rep706.php:215 +#: ../gl/manage/gl_account_classes.php:112 +#: ../gl/manage/gl_account_classes.php:169 - #: ../reporting/rep706.php:211 ++#: ../reporting/rep706.php:215 msgid "Balance Sheet" msgstr "" @@@ -5352,13 -4403,11 +5258,12 @@@ msgstr " msgid "Class Name:" msgstr "" -#: gl/manage/gl_account_classes.php:171 +#: ../gl/manage/gl_account_classes.php:171 - #: ../gl/manage/gl_account_types.php:192 msgid "Class Type:" msgstr "" -#: gl/manage/gl_accounts.php:16 reporting/rep701.php:117 +#: ../gl/manage/gl_accounts.php:16 - #: ../reporting/rep701.php:115 ++#: ../reporting/rep701.php:117 msgid "Chart of Accounts" msgstr "" @@@ -5532,7 -4580,7 +5437,11 @@@ msgstr " msgid "Subgroup Of" msgstr "" -#: gl/manage/gl_account_types.php:187 ++#: ../gl/manage/gl_account_types.php:128 ++msgid "Class" ++msgstr "" ++ +#: ../gl/manage/gl_account_types.php:187 msgid "ID:" msgstr "" @@@ -5540,13 -4588,16 +5449,18 @@@ msgid "Subgroup Of:" msgstr "" -#: gl/manage/gl_account_types.php:192 ++#: ../gl/manage/gl_account_types.php:192 + msgid "Class:" + msgstr "" + -#: gl/manage/gl_quick_entries.php:16 +#: ../gl/manage/gl_quick_entries.php:16 msgid "Quick Entries" msgstr "" -#: gl/manage/gl_quick_entries.php:58 includes/ui/simple_crud_class.inc:221 -#: includes/ui/ui_input.inc:205 +#: ../gl/manage/gl_quick_entries.php:58 +#: ../includes/ui/simple_crud_class.inc:221 +#: ../includes/ui/ui_input.inc:206 ++#: ../taxes/sav.tax_types.php:252 msgid "Add new" msgstr "" @@@ -5635,10 -4683,8 +5549,10 @@@ msgstr " msgid "Posted" msgstr "" -#: gl/manage/gl_quick_entries.php:329 sales/customer_delivery.php:433 -#: sales/customer_invoice.php:470 +#: ../gl/manage/gl_quick_entries.php:329 - #: ../sales/customer_delivery.php.orig:446 ++#: ../sales/customer_delivery.php:447 +#: ../sales/customer_invoice.php:542 +#: ../sales/customer_invoice.php:545 msgid "Tax Type" msgstr "" @@@ -5710,78 -4752,52 +5624,80 @@@ msgstr " msgid "GL Deposit" msgstr "" -#: gl/view/gl_deposit_view.php:71 gl/includes/db/gl_db_banking.inc:212 -#: reporting/reports_main.php:96 reporting/reports_main.php:106 -#: reporting/reports_main.php:114 reporting/reports_main.php:128 -#: reporting/reports_main.php:136 reporting/reports_main.php:143 -#: reporting/reports_main.php:192 reporting/reports_main.php:199 -#: reporting/reports_main.php:289 +#: ../gl/view/gl_deposit_view.php:71 - #: ../gl/includes/db/gl_db_banking.inc:211 - #: ../reporting/reports_main.php:88 - #: ../reporting/reports_main.php:95 - #: ../reporting/reports_main.php:102 ++#: ../gl/includes/db/gl_db_banking.inc:212 ++#: ../reporting/reports_main.php:96 ++#: ../reporting/reports_main.php:106 +#: ../reporting/reports_main.php:114 - #: ../reporting/reports_main.php:121 - #: ../reporting/reports_main.php:127 - #: ../reporting/reports_main.php:163 - #: ../reporting/reports_main.php:169 - #: ../reporting/reports_main.php:219 ++#: ../reporting/reports_main.php:128 ++#: ../reporting/reports_main.php:136 ++#: ../reporting/reports_main.php:143 ++#: ../reporting/reports_main.php:192 msgid "From" msgstr "" - #: ../gl/view/gl_deposit_view.php:72 -#: gl/view/gl_deposit_view.php:72 ++#: ../gl/view/gl_deposit_view.php:74 ++#: ../gl/view/gl_payment_view.php:72 ++msgid "Settle currency" ++msgstr "" ++ ++#: ../gl/view/gl_deposit_view.php:75 ++#: ../gl/view/gl_payment_view.php:73 ++msgid "Settled amount" ++msgstr "" ++ ++#: ../gl/view/gl_deposit_view.php:77 msgid "Deposit Type" msgstr "" - #: ../gl/view/gl_deposit_view.php:81 -#: gl/view/gl_deposit_view.php:81 ++#: ../gl/view/gl_deposit_view.php:86 msgid "This deposit has been voided." msgstr "" - #: ../gl/view/gl_deposit_view.php:87 -#: gl/view/gl_deposit_view.php:87 ++#: ../gl/view/gl_deposit_view.php:92 msgid "There are no items for this deposit." msgstr "" - #: ../gl/view/gl_deposit_view.php:92 -#: gl/view/gl_deposit_view.php:92 ++#: ../gl/view/gl_deposit_view.php:97 msgid "Items for this Deposit" msgstr "" - #: ../gl/view/gl_deposit_view.php:94 - #: ../gl/view/gl_payment_view.php:92 -#: gl/view/gl_deposit_view.php:94 gl/view/gl_payment_view.php:92 --msgid "Item Amounts are Shown in :" -msgstr "" - -#: gl/view/gl_deposit_view.php:99 gl/view/gl_deposit_view.php:102 -#: gl/view/gl_deposit_view.php:105 gl/view/gl_payment_view.php:98 -#: gl/view/gl_payment_view.php:101 gl/view/gl_payment_view.php:104 -#: gl/view/gl_trans_view.php:63 gl/view/gl_trans_view.php:66 -#: gl/view/gl_trans_view.php:69 gl/includes/ui/gl_bank_ui.inc:152 -#: gl/includes/ui/gl_bank_ui.inc:155 gl/includes/ui/gl_bank_ui.inc:158 -#: gl/includes/ui/gl_journal_ui.inc:83 gl/includes/ui/gl_journal_ui.inc:86 -#: gl/includes/ui/gl_journal_ui.inc:89 reporting/rep701.php:111 ++#: ../gl/view/gl_deposit_view.php:99 ++#: ../gl/view/gl_payment_view.php:97 ++msgid "Item Amounts are Shown in:" +msgstr "" + - #: ../gl/view/gl_deposit_view.php:99 - #: ../gl/view/gl_deposit_view.php:102 - #: ../gl/view/gl_deposit_view.php:105 - #: ../gl/view/gl_payment_view.php:98 - #: ../gl/view/gl_payment_view.php:101 - #: ../gl/view/gl_payment_view.php:104 ++#: ../gl/view/gl_deposit_view.php:104 ++#: ../gl/view/gl_deposit_view.php:107 ++#: ../gl/view/gl_deposit_view.php:110 ++#: ../gl/view/gl_payment_view.php:103 ++#: ../gl/view/gl_payment_view.php:106 ++#: ../gl/view/gl_payment_view.php:109 +#: ../gl/view/gl_trans_view.php:68 +#: ../gl/view/gl_trans_view.php:71 +#: ../gl/view/gl_trans_view.php:74 - #: ../gl/includes/ui/gl_bank_ui.inc:150 - #: ../gl/includes/ui/gl_bank_ui.inc:153 - #: ../gl/includes/ui/gl_bank_ui.inc:156 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:124 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:127 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:130 ++#: ../gl/includes/ui/gl_bank_ui.inc:152 ++#: ../gl/includes/ui/gl_bank_ui.inc:155 ++#: ../gl/includes/ui/gl_bank_ui.inc:158 +#: ../gl/includes/ui/gl_journal_ui.inc:86 +#: ../gl/includes/ui/gl_journal_ui.inc:89 +#: ../gl/includes/ui/gl_journal_ui.inc:92 - #: ../reporting/rep701.php:109 ++#: ../reporting/rep701.php:111 msgid "Account Code" msgstr "" - #: ../gl/view/gl_deposit_view.php:99 - #: ../gl/view/gl_deposit_view.php:102 - #: ../gl/view/gl_deposit_view.php:105 - #: ../gl/view/gl_payment_view.php:98 - #: ../gl/view/gl_payment_view.php:101 - #: ../gl/view/gl_payment_view.php:104 - #: ../gl/includes/ui/gl_bank_ui.inc:150 - #: ../gl/includes/ui/gl_bank_ui.inc:153 - #: ../gl/includes/ui/gl_bank_ui.inc:156 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:124 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:127 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:130 -#: gl/view/gl_deposit_view.php:99 gl/view/gl_deposit_view.php:102 -#: gl/view/gl_deposit_view.php:105 gl/view/gl_payment_view.php:98 -#: gl/view/gl_payment_view.php:101 gl/view/gl_payment_view.php:104 -#: gl/includes/ui/gl_bank_ui.inc:152 gl/includes/ui/gl_bank_ui.inc:155 -#: gl/includes/ui/gl_bank_ui.inc:158 gl/includes/ui/gl_journal_ui.inc:83 -#: gl/includes/ui/gl_journal_ui.inc:86 gl/includes/ui/gl_journal_ui.inc:89 ++#: ../gl/view/gl_deposit_view.php:104 ++#: ../gl/view/gl_deposit_view.php:107 ++#: ../gl/view/gl_deposit_view.php:110 ++#: ../gl/view/gl_payment_view.php:103 ++#: ../gl/view/gl_payment_view.php:106 ++#: ../gl/view/gl_payment_view.php:109 ++#: ../gl/includes/ui/gl_bank_ui.inc:152 ++#: ../gl/includes/ui/gl_bank_ui.inc:155 ++#: ../gl/includes/ui/gl_bank_ui.inc:158 +#: ../gl/includes/ui/gl_journal_ui.inc:86 +#: ../gl/includes/ui/gl_journal_ui.inc:89 +#: ../gl/includes/ui/gl_journal_ui.inc:92 msgid "Account Description" msgstr "" @@@ -5797,23 -4813,20 +5713,23 @@@ msgstr " msgid "Pay To" msgstr "" - #: ../gl/view/gl_payment_view.php:70 -#: gl/view/gl_payment_view.php:70 purchasing/view/view_supp_payment.php:64 -#: purchasing/view/view_supp_payment.php:78 sales/view/view_receipt.php:50 ++#: ../gl/view/gl_payment_view.php:75 +#: ../purchasing/view/view_supp_payment.php:64 +#: ../purchasing/view/view_supp_payment.php:78 - #: ../sales/view/view_receipt.php:48 ++#: ../sales/view/view_receipt.php:50 msgid "Payment Type" msgstr "" - #: ../gl/view/gl_payment_view.php:79 -#: gl/view/gl_payment_view.php:79 purchasing/view/view_supp_payment.php:85 ++#: ../gl/view/gl_payment_view.php:84 +#: ../purchasing/view/view_supp_payment.php:85 msgid "This payment has been voided." msgstr "" - #: ../gl/view/gl_payment_view.php:85 -#: gl/view/gl_payment_view.php:85 ++#: ../gl/view/gl_payment_view.php:90 msgid "There are no items for this payment." msgstr "" - #: ../gl/view/gl_payment_view.php:90 -#: gl/view/gl_payment_view.php:90 ++#: ../gl/view/gl_payment_view.php:95 msgid "Items for this Payment" msgstr "" @@@ -5839,184 -4846,155 +5755,176 @@@ msgstr " msgid "This transaction has been voided." msgstr "" -#: gl/includes/db/gl_db_banking.inc:44 gl/includes/db/gl_db_banking.inc:47 -#: gl/includes/db/gl_db_banking.inc:59 gl/includes/db/gl_db_banking.inc:62 +#: ../gl/includes/db/gl_db_banking.inc:44 +#: ../gl/includes/db/gl_db_banking.inc:47 - #: ../gl/includes/db/gl_db_banking.inc:59 - #: ../gl/includes/db/gl_db_banking.inc:62 ++#: ../gl/includes/db/gl_db_banking.inc:60 ++#: ../gl/includes/db/gl_db_banking.inc:63 ++#: ../gl/includes/db/gl_db_banking.inc:255 msgid "Exchange Variance" msgstr "" - #: ../gl/includes/db/gl_db_banking.inc:211 - #: ../reporting/reports_main.php:89 - #: ../reporting/reports_main.php:96 - #: ../reporting/reports_main.php:103 -#: gl/includes/db/gl_db_banking.inc:212 reporting/reports_main.php:97 -#: reporting/reports_main.php:107 reporting/reports_main.php:115 -#: reporting/reports_main.php:129 reporting/reports_main.php:137 -#: reporting/reports_main.php:144 reporting/reports_main.php:193 -#: reporting/reports_main.php:200 reporting/reports_main.php:290 ++#: ../gl/includes/db/gl_db_banking.inc:212 ++#: ../reporting/reports_main.php:97 ++#: ../reporting/reports_main.php:107 +#: ../reporting/reports_main.php:115 - #: ../reporting/reports_main.php:122 - #: ../reporting/reports_main.php:128 - #: ../reporting/reports_main.php:164 - #: ../reporting/reports_main.php:170 - #: ../reporting/reports_main.php:220 ++#: ../reporting/reports_main.php:129 ++#: ../reporting/reports_main.php:137 ++#: ../reporting/reports_main.php:144 ++#: ../reporting/reports_main.php:193 msgid "To" msgstr "" - #: ../gl/includes/db/gl_db_banking.inc:427 - #: ../purchasing/includes/db/invoice_db.inc:136 -#: gl/includes/db/gl_db_banking.inc:439 ++#: ../gl/includes/db/gl_db_banking.inc:444 ++#: ../purchasing/includes/db/invoice_db.inc.orig:136 msgid "Document reentered." msgstr "" - #: ../gl/includes/db/gl_db_rates.inc:130 -#: gl/includes/db/gl_db_trans.inc:93 ++#: ../gl/includes/db/gl_db_trans.inc:96 #, php-format - msgid "" - "Cannot retrieve currency rate from %s page. Please set the rate manually." + msgid "Rounding error %s encountered for trans_type:%s,trans_no:%s" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:24 gl/includes/ui/gl_journal_ui.inc:27 -#: inventory/includes/item_adjustments_ui.inc:39 -#: inventory/includes/stock_transfers_ui.inc:42 -#: manufacturing/work_order_add_finished.php:208 -#: manufacturing/work_order_costs.php:152 -#: purchasing/allocations/supplier_allocate.php:53 -#: sales/allocations/customer_allocate.php:52 -#: sales/includes/ui/sales_credit_ui.inc:121 +#: ../gl/includes/ui/gl_bank_ui.inc:24 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:28 +#: ../gl/includes/ui/gl_journal_ui.inc:27 +#: ../inventory/includes/item_adjustments_ui.inc:39 +#: ../inventory/includes/stock_transfers_ui.inc:42 +#: ../manufacturing/work_order_add_finished.php:208 +#: ../manufacturing/work_order_costs.php:133 - #: ../purchasing/allocations/supplier_allocate.php:54 - #: ../sales/allocations/customer_allocate.php:53 ++#: ../purchasing/allocations/supplier_allocate.php:56 ++#: ../sales/allocations/customer_allocate.php:54 +#: ../sales/includes/ui/sales_credit_ui.inc:121 msgid "Date:" msgstr "" - #: ../gl/includes/ui/gl_bank_ui.inc:51 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:53 -#: gl/includes/ui/gl_bank_ui.inc:52 ++#: ../gl/includes/ui/gl_bank_ui.inc:52 msgid "Pay To:" msgstr "" - #: ../gl/includes/ui/gl_bank_ui.inc:56 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:58 -#: gl/includes/ui/gl_bank_ui.inc:57 ++#: ../gl/includes/ui/gl_bank_ui.inc:57 msgid "To the Order of:" msgstr "" - #: ../gl/includes/ui/gl_bank_ui.inc:63 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:65 - #: ../inventory/purchasing_data.php:184 - #: ../inventory/purchasing_data.php:188 - #: ../inventory/purchasing_data.php.orig:112 - #: ../purchasing/includes/ui/invoice_ui.inc:80 - #: ../purchasing/includes/ui/invoice_ui.inc:88 - #: ../purchasing/includes/ui/invoice_ui.inc:90 - #: ../purchasing/includes/ui/po_ui.inc:125 - #: ../purchasing/includes/ui/po_ui.inc:130 -#: gl/includes/ui/gl_bank_ui.inc:64 inventory/purchasing_data.php:208 -#: inventory/purchasing_data.php:212 purchasing/includes/ui/invoice_ui.inc:86 -#: purchasing/includes/ui/invoice_ui.inc:93 -#: purchasing/includes/ui/po_ui.inc:127 purchasing/includes/ui/po_ui.inc:132 ++#: ../gl/includes/ui/gl_bank_ui.inc:64 ++#: ../inventory/purchasing_data.php:208 ++#: ../inventory/purchasing_data.php:212 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:80 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:88 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:90 +#: ../purchasing/includes/ui/po_ui.inc.orig:125 +#: ../purchasing/includes/ui/po_ui.inc.orig:130 msgid "Supplier:" msgstr "" - #: ../gl/includes/ui/gl_bank_ui.inc:66 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:68 -#: gl/includes/ui/gl_bank_ui.inc:67 sales/manage/recurrent_invoices.php:169 -#: sales/includes/ui/sales_credit_ui.inc:29 -#: sales/includes/ui/sales_order_ui.inc:284 ++#: ../gl/includes/ui/gl_bank_ui.inc:67 +#: ../sales/manage/recurrent_invoices.php:169 +#: ../sales/includes/ui/sales_credit_ui.inc:29 - #: ../sales/includes/ui/sales_order_ui.inc.orig:278 ++#: ../sales/includes/ui/sales_order_ui.inc:285 msgid "Customer:" msgstr "" - #: ../gl/includes/ui/gl_bank_ui.inc:70 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:72 - #: ../sales/customer_payments.php:363 -#: gl/includes/ui/gl_bank_ui.inc:71 sales/customer_payments.php:348 -#: sales/customer_payments.php.sav:355 sales/manage/recurrent_invoices.php:172 -#: sales/includes/ui/sales_credit_ui.inc:37 -#: sales/includes/ui/sales_order_ui.inc:291 ++#: ../gl/includes/ui/gl_bank_ui.inc:71 ++#: ../sales/customer_payments.php.orig:363 +#: ../sales/manage/recurrent_invoices.php:172 +#: ../sales/includes/ui/sales_credit_ui.inc:37 - #: ../sales/includes/ui/sales_order_ui.inc.orig:285 ++#: ../sales/includes/ui/sales_order_ui.inc:292 msgid "Branch:" msgstr "" - #: ../gl/includes/ui/gl_bank_ui.inc:84 - #: ../gl/includes/ui/gl_bank_ui.inc:87 - #: ../sales/customer_payments.php:372 -#: gl/includes/ui/gl_bank_ui.inc:85 gl/includes/ui/gl_bank_ui.inc:88 -#: sales/customer_payments.php:363 sales/customer_payments.php.sav:370 ++#: ../gl/includes/ui/gl_bank_ui.inc:85 ++#: ../gl/includes/ui/gl_bank_ui.inc:88 ++#: ../sales/customer_payments.php.orig:372 msgid "This customer account is on hold." msgstr "" - #: ../gl/includes/ui/gl_bank_ui.inc:99 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:90 -#: gl/includes/ui/gl_bank_ui.inc:101 gl/includes/ui/gl_journal_ui.inc:58 -#: gl/includes/ui/gl_journal_ui.inc:62 -#: purchasing/includes/ui/invoice_ui.inc:244 ++#: ../gl/includes/ui/gl_bank_ui.inc:101 +#: ../gl/includes/ui/gl_journal_ui.inc:58 +#: ../gl/includes/ui/gl_journal_ui.inc:62 - #: ../purchasing/includes/ui/invoice_ui.inc:251 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:251 msgid "Go" msgstr "" - #: ../gl/includes/ui/gl_bank_ui.inc:185 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:159 -#: gl/includes/ui/gl_bank_ui.inc:120 ++#: ../gl/includes/ui/gl_bank_ui.inc:120 + msgid "Into:" + msgstr "" + -#: gl/includes/ui/gl_bank_ui.inc:187 includes/ui/simple_crud_class.inc:52 -#: inventory/includes/item_adjustments_ui.inc:88 -#: inventory/includes/stock_transfers_ui.inc:80 -#: manufacturing/includes/work_order_issue_ui.inc:59 -#: purchasing/includes/ui/invoice_ui.inc:533 -#: purchasing/includes/ui/po_ui.inc:264 -#: sales/includes/ui/sales_credit_ui.inc:198 -#: sales/includes/ui/sales_order_ui.inc:209 ++#: ../gl/includes/ui/gl_bank_ui.inc:187 +#: ../includes/ui/simple_crud_class.inc:52 +#: ../inventory/includes/item_adjustments_ui.inc:88 +#: ../inventory/includes/stock_transfers_ui.inc:80 +#: ../manufacturing/includes/work_order_issue_ui.inc:59 - #: ../purchasing/includes/ui/invoice_ui.inc:542 - #: ../purchasing/includes/ui/po_ui.inc:274 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:542 +#: ../purchasing/includes/ui/po_ui.inc.orig:274 +#: ../sales/includes/ui/sales_credit_ui.inc:198 - #: ../sales/includes/ui/sales_order_ui.inc.orig:203 ++#: ../sales/includes/ui/sales_order_ui.inc:210 msgid "Edit document line" msgstr "" - #: ../gl/includes/ui/gl_bank_ui.inc:187 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:161 -#: gl/includes/ui/gl_bank_ui.inc:189 includes/ui/simple_crud_class.inc:54 -#: inventory/includes/item_adjustments_ui.inc:90 -#: inventory/includes/stock_transfers_ui.inc:82 -#: manufacturing/includes/work_order_issue_ui.inc:61 -#: purchasing/includes/ui/invoice_ui.inc:298 -#: purchasing/includes/ui/po_ui.inc:266 -#: sales/includes/ui/sales_credit_ui.inc:200 -#: sales/includes/ui/sales_order_ui.inc:211 ++#: ../gl/includes/ui/gl_bank_ui.inc:189 +#: ../includes/ui/simple_crud_class.inc:54 +#: ../inventory/includes/item_adjustments_ui.inc:90 +#: ../inventory/includes/stock_transfers_ui.inc:82 +#: ../manufacturing/includes/work_order_issue_ui.inc:61 - #: ../purchasing/includes/ui/invoice_ui.inc:305 - #: ../purchasing/includes/ui/po_ui.inc:276 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:305 +#: ../purchasing/includes/ui/po_ui.inc.orig:276 +#: ../sales/includes/ui/sales_credit_ui.inc:200 - #: ../sales/includes/ui/sales_order_ui.inc.orig:205 ++#: ../sales/includes/ui/sales_order_ui.inc:212 msgid "Remove line from document" msgstr "" - #: ../gl/includes/ui/gl_bank_ui.inc:276 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:250 -#: gl/includes/ui/gl_bank_ui.inc:278 gl/includes/ui/gl_journal_ui.inc:222 -#: includes/ui/simple_crud_class.inc:56 -#: inventory/includes/item_adjustments_ui.inc:158 -#: inventory/includes/stock_transfers_ui.inc:138 -#: manufacturing/includes/work_order_issue_ui.inc:132 -#: purchasing/includes/ui/po_ui.inc:440 -#: sales/includes/ui/sales_credit_ui.inc:294 -#: sales/includes/ui/sales_order_ui.inc:561 ++#: ../gl/includes/ui/gl_bank_ui.inc:278 +#: ../gl/includes/ui/gl_journal_ui.inc:258 +#: ../includes/ui/simple_crud_class.inc:56 +#: ../inventory/includes/item_adjustments_ui.inc:158 +#: ../inventory/includes/stock_transfers_ui.inc:138 +#: ../manufacturing/includes/work_order_issue_ui.inc:132 - #: ../purchasing/includes/ui/po_ui.inc.orig:458 ++#: ../purchasing/includes/ui/po_ui.inc.orig:456 +#: ../sales/includes/ui/sales_credit_ui.inc:294 - #: ../sales/includes/ui/sales_order_ui.inc.orig:556 ++#: ../sales/includes/ui/sales_order_ui.inc:562 msgid "Confirm changes" msgstr "" - #: ../gl/includes/ui/gl_bank_ui.inc:278 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:252 -#: gl/includes/ui/gl_bank_ui.inc:280 gl/includes/ui/gl_journal_ui.inc:224 -#: includes/ui/simple_crud_class.inc:58 -#: inventory/includes/item_adjustments_ui.inc:160 -#: inventory/includes/stock_transfers_ui.inc:140 -#: manufacturing/includes/work_order_issue_ui.inc:134 -#: purchasing/includes/ui/po_ui.inc:442 -#: sales/includes/ui/sales_credit_ui.inc:296 -#: sales/includes/ui/sales_order_ui.inc:563 ++#: ../gl/includes/ui/gl_bank_ui.inc:280 +#: ../gl/includes/ui/gl_journal_ui.inc:260 +#: ../includes/ui/simple_crud_class.inc:58 +#: ../inventory/includes/item_adjustments_ui.inc:160 +#: ../inventory/includes/stock_transfers_ui.inc:140 +#: ../manufacturing/includes/work_order_issue_ui.inc:134 - #: ../purchasing/includes/ui/po_ui.inc.orig:460 ++#: ../purchasing/includes/ui/po_ui.inc.orig:458 +#: ../sales/includes/ui/sales_credit_ui.inc:296 - #: ../sales/includes/ui/sales_order_ui.inc.orig:558 ++#: ../sales/includes/ui/sales_order_ui.inc:564 msgid "Cancel changes" msgstr "" - #: ../gl/includes/ui/gl_bank_ui.inc:283 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:257 -#: gl/includes/ui/gl_bank_ui.inc:285 gl/includes/ui/gl_journal_ui.inc:228 -#: inventory/includes/item_adjustments_ui.inc:166 -#: inventory/includes/stock_transfers_ui.inc:146 -#: manufacturing/includes/work_order_issue_ui.inc:140 -#: purchasing/includes/ui/po_ui.inc:448 -#: sales/includes/ui/sales_credit_ui.inc:302 -#: sales/includes/ui/sales_order_ui.inc:569 ++#: ../gl/includes/ui/gl_bank_ui.inc:285 +#: ../gl/includes/ui/gl_journal_ui.inc:264 +#: ../inventory/includes/item_adjustments_ui.inc:166 +#: ../inventory/includes/stock_transfers_ui.inc:146 +#: ../manufacturing/includes/work_order_issue_ui.inc:140 - #: ../purchasing/includes/ui/po_ui.inc.orig:466 ++#: ../purchasing/includes/ui/po_ui.inc.orig:464 +#: ../sales/includes/ui/sales_credit_ui.inc:302 - #: ../sales/includes/ui/sales_order_ui.inc.orig:564 ++#: ../sales/includes/ui/sales_order_ui.inc:570 msgid "Add Item" msgstr "" - #: ../gl/includes/ui/gl_bank_ui.inc:284 - #: ../gl/includes/ui/gl_bank_ui.inc.orig:258 -#: gl/includes/ui/gl_bank_ui.inc:286 -#: inventory/includes/item_adjustments_ui.inc:167 -#: inventory/includes/stock_transfers_ui.inc:147 -#: manufacturing/includes/work_order_issue_ui.inc:141 -#: purchasing/includes/ui/po_ui.inc:449 -#: sales/includes/ui/sales_credit_ui.inc:303 -#: sales/includes/ui/sales_order_ui.inc:570 ++#: ../gl/includes/ui/gl_bank_ui.inc:286 +#: ../inventory/includes/item_adjustments_ui.inc:167 +#: ../inventory/includes/stock_transfers_ui.inc:147 +#: ../manufacturing/includes/work_order_issue_ui.inc:141 - #: ../purchasing/includes/ui/po_ui.inc.orig:467 ++#: ../purchasing/includes/ui/po_ui.inc.orig:465 +#: ../sales/includes/ui/sales_credit_ui.inc:303 - #: ../sales/includes/ui/sales_order_ui.inc.orig:565 ++#: ../sales/includes/ui/sales_order_ui.inc:571 msgid "Add new item to document" msgstr "" -#: gl/includes/ui/gl_bank_ui.inc:309 ++#: ../gl/includes/ui/gl_bank_ui.inc:309 + msgid "Settled AR Amount:" + msgstr "" + -#: gl/includes/ui/gl_bank_ui.inc:309 ++#: ../gl/includes/ui/gl_bank_ui.inc:309 + msgid "Settled AP Amount:" + msgstr "" + -#: gl/includes/ui/gl_journal_ui.inc:38 +#: ../gl/includes/ui/gl_journal_ui.inc:38 msgid "Reverse Transaction:" msgstr "" @@@ -6110,10 -5082,8 +6018,8 @@@ msgstr " msgid "Dimensions configuration" msgstr "" -#: includes/access_levels.inc:72 inventory/manage/items.php:341 -#: reporting/reports_main.php:294 +#: ../includes/access_levels.inc:72 - #: ../inventory/manage/items.php:348 - #: ../inventory/manage/items.php.orig:341 - #: ../reporting/reports_main.php:223 ++#: ../inventory/manage/items.php.orig:353 msgid "Dimensions" msgstr "" @@@ -6605,52 -5562,42 +6511,52 @@@ msgid " "rate manually on Exchange Rates page." msgstr "" - #: ../includes/current_user.inc.orig:97 -#: includes/current_user.inc:91 ++#: ../includes/current_user.inc:101 msgid "" "Before software upgrade you have to include old $security_groups and " "$security_headings arrays from old config.php file to the new one." msgstr "" - #: ../includes/current_user.inc.orig:98 -#: includes/current_user.inc:92 includes/ui/ui_controls.inc:190 -#: includes/ui/ui_view.inc:903 ++#: ../includes/current_user.inc:102 +#: ../includes/ui/ui_controls.inc:197 - #: ../includes/ui/ui_view.inc:845 ++#: ../includes/ui/ui_view.inc.orig:845 msgid "Back" msgstr "" - #: ../includes/current_user.inc.orig:108 -#: includes/current_user.inc:102 ++#: ../includes/current_user.inc:112 msgid "System is available for site admin only until full database upgrade" msgstr "" - #: ../includes/current_user.inc.orig:471 -#: includes/current_user.inc:523 ++#: ../includes/current_user.inc:544 msgid "Requesting data..." msgstr "" -#: includes/errors.inc:125 +#: ../includes/data_checks.inc:508 +#, php-format +msgid "%s #%s is closed for further edition." +msgstr "" + +#: ../includes/data_checks.inc:534 +msgid "You have no edit access to transactions created by other users." +msgstr "" + - #: ../includes/errors.inc:123 ++#: ../includes/errors.inc:125 msgid "in file" msgstr "" - #: ../includes/errors.inc:123 -#: includes/errors.inc:125 ++#: ../includes/errors.inc:125 msgid "at line " msgstr "" - #: ../includes/errors.inc:177 -#: includes/errors.inc:179 ++#: ../includes/errors.inc:179 msgid "Debug mode database warning:" msgstr "" - #: ../includes/errors.inc:179 -#: includes/errors.inc:181 ++#: ../includes/errors.inc:181 msgid "DATABASE ERROR :" msgstr "" - #: ../includes/errors.inc:210 -#: includes/errors.inc:212 ++#: ../includes/errors.inc:212 msgid "" "The entered information is a duplicate. Please go back and enter different " "values." @@@ -6660,97 -5607,104 +6566,118 @@@ msgstr " msgid "This page is usable only with javascript enabled browsers." msgstr "" - #: ../includes/packages.inc:190 -#: includes/packages.inc:189 ++#: ../includes/packages.inc:189 #, php-format msgid "No key field '%s' in file '%s'" msgstr "" - #: ../includes/packages.inc:295 - #: ../includes/packages.inc:329 -#: includes/packages.inc:294 ++#: ../includes/packages.inc:294 + msgid "Cannot download repo index file." + msgstr "" + -#: includes/packages.inc:306 includes/packages.inc:343 ++#: ../includes/packages.inc:306 ++#: ../includes/packages.inc:343 #, php-format msgid "Cannot delete outdated '%s' file." msgstr "" - #: ../includes/packages.inc:299 -#: includes/packages.inc:310 ++#: ../includes/packages.inc:310 msgid "Release file in repository is invalid, or public key is outdated." msgstr "" - #: ../includes/packages.inc:316 -#: includes/packages.inc:327 ++#: ../includes/packages.inc:327 msgid "Repository version does not match application version." msgstr "" - #: ../includes/packages.inc:333 -#: includes/packages.inc:335 includes/packages.inc:377 ++#: ../includes/packages.inc:335 ++#: ../includes/packages.inc:377 + #, php-format + msgid "Cannot download '%s' file." + msgstr "" + -#: includes/packages.inc:347 ++#: ../includes/packages.inc:347 #, php-format msgid "" "Security alert: broken index file in repository '%s'. Please inform " "repository administrator about this issue." msgstr "" - #: ../includes/packages.inc:366 -#: includes/packages.inc:383 ++#: ../includes/packages.inc:383 #, php-format msgid "" "Security alert: broken package '%s' in repository. Please inform repository " "administrator about this issue." msgstr "" - #: ../includes/packages.inc:621 - #: ../includes/packages.inc:672 -#: includes/packages.inc:638 includes/packages.inc:699 ++#: ../includes/packages.inc:638 ++#: ../includes/packages.inc:699 #, php-format msgid "Package '%s' not found." msgstr "" - #: ../includes/session.inc:133 -#: includes/session.inc:136 ++#: ../includes/session.inc:136 ++#: ../includes/session.inc.orig:132 msgid "Incorrect Password" msgstr "" - #: ../includes/session.inc:134 -#: includes/session.inc:137 ++#: ../includes/session.inc:137 ++#: ../includes/session.inc.orig:133 msgid "The user and password combination is not valid for the system." msgstr "" - #: ../includes/session.inc:136 -#: includes/session.inc:139 ++#: ../includes/session.inc:139 ++#: ../includes/session.inc.orig:135 msgid "" "If you are not an authorized user, please contact your system administrator " "to obtain an account to enable you to use the system." msgstr "" - #: ../includes/session.inc:137 -#: includes/session.inc:140 ++#: ../includes/session.inc:140 ++#: ../includes/session.inc.orig:136 msgid "Try again" msgstr "" - #: ../includes/session.inc:185 -#: includes/session.inc:180 ++#: ../includes/session.inc:180 ++#: ../includes/session.inc.orig:176 #, php-format msgid "" "Brute force attack on account '%s' detected. Access for non-logged users " "temporarily blocked." msgstr "" - #: ../includes/session.inc:216 -#: includes/session.inc:211 ++#: ../includes/session.inc:211 ++#: ../includes/session.inc.orig:207 msgid "Security settings have not been defined for your user account." msgstr "" - #: ../includes/session.inc:217 -#: includes/session.inc:212 ++#: ../includes/session.inc:212 ++#: ../includes/session.inc.orig:208 msgid "Please contact your system administrator." msgstr "" - #: ../includes/session.inc:218 -#: includes/session.inc:213 ++#: ../includes/session.inc:213 ++#: ../includes/session.inc.orig:209 msgid "" "Please remove $security_groups and $security_headings arrays from config.php " "file!" msgstr "" - #: ../includes/session.inc:220 -#: includes/session.inc:215 ++#: ../includes/session.inc:215 ++#: ../includes/session.inc.orig:211 msgid "" "Access to application has been blocked until database upgrade is completed " "by system administrator." msgstr "" - #: ../includes/session.inc:234 -#: includes/session.inc:229 ++#: ../includes/session.inc:229 ++#: ../includes/session.inc.orig:225 msgid "" "The security settings on your account do not permit you to access this " "function" msgstr "" - #: ../includes/session.inc:243 -#: includes/session.inc:238 ++#: ../includes/session.inc:238 ++#: ../includes/session.inc.orig:234 msgid "" "System is blocked after source upgrade until database is updated on System/" "Software Upgrade page" @@@ -6795,10 -5746,8 +6722,9 @@@ msgstr " msgid "Inventory Adjustment" msgstr "" -#: includes/sysnames.inc:32 purchasing/includes/ui/po_ui.inc:320 -#: purchasing/view/view_po.php:30 +#: ../includes/sysnames.inc:32 - #: ../purchasing/includes/ui/po_ui.inc:330 +#: ../purchasing/includes/ui/po_ui.inc.orig:330 +#: ../purchasing/view/view_po.php:30 msgid "Purchase Order" msgstr "" @@@ -6806,8 -5755,7 +6732,9 @@@ msgid "Supplier Invoice" msgstr "" -#: includes/sysnames.inc:34 purchasing/supplier_credit.php:28 +#: ../includes/sysnames.inc:34 +#: ../purchasing/supplier_credit.php:58 ++#: ../purchasing/supplier_credit.php:62 msgid "Supplier Credit Note" msgstr "" @@@ -6833,14 -5779,12 +6760,14 @@@ msgstr " msgid "Work Order Production" msgstr "" -#: includes/sysnames.inc:40 sales/inquiry/sales_orders_view.php:139 -#: sales/inquiry/sales_orders_view.php:161 +#: ../includes/sysnames.inc:40 - #: ../sales/inquiry/sales_orders_view.php:151 - #: ../sales/inquiry/sales_orders_view.php:173 ++#: ../sales/inquiry/sales_orders_view.php.orig:151 ++#: ../sales/inquiry/sales_orders_view.php.orig:173 msgid "Sales Order" msgstr "" -#: includes/sysnames.inc:41 sales/sales_order_entry.php:637 +#: ../includes/sysnames.inc:41 - #: ../sales/sales_order_entry.php:645 ++#: ../sales/sales_order_entry.php:653 msgid "Sales Quotation" msgstr "" @@@ -6905,9 -5848,7 +6832,9 @@@ msgstr " msgid "SP" msgstr "" -#: includes/sysnames.inc:61 reporting/rep204.php:84 reporting/rep305.php:101 +#: ../includes/sysnames.inc:61 - #: ../reporting/rep204.php:82 - #: ../reporting/rep305.php:98 ++#: ../reporting/rep204.php:84 ++#: ../reporting/rep305.php:101 msgid "GRN" msgstr "" @@@ -6969,69 -5908,47 +6896,69 @@@ msgstr " msgid "Cash" msgstr "" -#: includes/sysnames.inc:96 reporting/rep101.php:127 reporting/rep102.php:125 -#: reporting/rep102.php:132 reporting/rep105.php:109 reporting/rep106.php:83 -#: reporting/rep114.php:95 reporting/rep304.php:114 reporting/rep304.php:124 -#: reporting/reports_main.php:32 reporting/reports_main.php:36 -#: reporting/reports_main.php:45 reporting/reports_main.php:102 -#: reporting/reports_main.php:121 reporting/reports_main.php:237 -#: sales/create_recurrent_invoices.php:134 -#: sales/customer_credit_invoice.php:235 sales/customer_delivery.php:338 -#: sales/customer_invoice.php:380 -#: sales/allocations/customer_allocation_main.php:97 -#: sales/allocations/customer_allocation_main.php:105 -#: sales/manage/recurrent_invoices.php:102 sales/view/view_credit.php:47 -#: sales/inquiry/customer_allocation_inquiry.php:149 -#: sales/inquiry/customer_allocation_inquiry.php:159 -#: sales/inquiry/customer_inquiry.php:230 -#: sales/inquiry/customer_inquiry.php:244 -#: sales/inquiry/sales_deliveries_view.php:180 -#: sales/inquiry/sales_orders_view.php:264 -#: sales/inquiry/sales_orders_view.php:278 +#: ../includes/sysnames.inc:96 +#: ../includes/sysnames.inc:195 - #: ../reporting/rep101.php:137 - #: ../reporting/rep102.php:123 - #: ../reporting/rep102.php:130 - #: ../reporting/rep105.php:107 - #: ../reporting/rep106.php:81 - #: ../reporting/rep114.php:93 - #: ../reporting/rep304.php:112 - #: ../reporting/rep304.php:122 ++#: ../reporting/rep101.php:127 ++#: ../reporting/rep102.php:125 ++#: ../reporting/rep102.php:132 ++#: ../reporting/rep105.php:109 ++#: ../reporting/rep106.php:83 ++#: ../reporting/rep114.php:95 ++#: ../reporting/rep304.php:114 ++#: ../reporting/rep304.php:124 +#: ../reporting/reports_main.php:32 +#: ../reporting/reports_main.php:36 - #: ../reporting/reports_main.php:43 - #: ../reporting/reports_main.php:108 - #: ../reporting/reports_main.php:203 - #: ../sales/create_recurrent_invoices.php:132 ++#: ../reporting/reports_main.php:45 ++#: ../reporting/reports_main.php:102 ++#: ../reporting/reports_main.php:121 ++#: ../sales/create_recurrent_invoices.php:134 +#: ../sales/customer_credit_invoice.php:235 - #: ../sales/customer_delivery.php.orig:351 ++#: ../sales/customer_delivery.php:352 +#: ../sales/customer_invoice.php:446 +#: ../sales/allocations/customer_allocation_main.php:97 +#: ../sales/allocations/customer_allocation_main.php:105 +#: ../sales/manage/recurrent_invoices.php:102 +#: ../sales/view/view_credit.php:47 - #: ../sales/inquiry/customer_allocation_inquiry.php:150 - #: ../sales/inquiry/customer_allocation_inquiry.php:160 - #: ../sales/inquiry/customer_inquiry.php:206 - #: ../sales/inquiry/customer_inquiry.php:220 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:150 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:160 ++#: ../sales/inquiry/customer_inquiry.php.orig:206 ++#: ../sales/inquiry/customer_inquiry.php.orig:220 +#: ../sales/inquiry/sales_deliveries_view.php:180 - #: ../sales/inquiry/sales_orders_view.php:286 - #: ../sales/inquiry/sales_orders_view.php:300 ++#: ../sales/inquiry/sales_orders_view.php.orig:286 ++#: ../sales/inquiry/sales_orders_view.php.orig:300 msgid "Customer" msgstr "" -#: includes/sysnames.inc:97 includes/sysnames.inc:172 -#: inventory/purchasing_data.php:147 purchasing/includes/ui/grn_ui.inc:20 -#: purchasing/includes/ui/grn_ui.inc:52 purchasing/includes/ui/po_ui.inc:313 -#: purchasing/view/view_supp_credit.php:42 -#: purchasing/view/view_supp_invoice.php:45 -#: purchasing/inquiry/po_search_completed.php:123 -#: purchasing/inquiry/po_search.php:132 -#: purchasing/inquiry/supplier_allocation_inquiry.php:129 -#: purchasing/inquiry/supplier_allocation_inquiry.php:142 -#: purchasing/inquiry/supplier_inquiry.php:171 -#: purchasing/inquiry/supplier_inquiry.php:185 -#: purchasing/allocations/supplier_allocation_main.php:98 -#: purchasing/allocations/supplier_allocation_main.php:106 -#: reporting/rep201.php:119 reporting/rep202.php:130 reporting/rep202.php:137 -#: reporting/rep203.php:100 reporting/rep204.php:90 reporting/rep306.php:141 -#: reporting/rep306.php:151 reporting/reports_main.php:149 -#: reporting/reports_main.php:153 reporting/reports_main.php:162 -#: reporting/reports_main.php:173 reporting/reports_main.php:180 -#: reporting/reports_main.php:252 +#: ../includes/sysnames.inc:97 +#: ../includes/sysnames.inc:173 +#: ../includes/sysnames.inc:196 - #: ../inventory/purchasing_data.php:129 ++#: ../inventory/purchasing_data.php:147 +#: ../purchasing/includes/ui/grn_ui.inc:20 - #: ../purchasing/includes/ui/po_ui.inc:323 ++#: ../purchasing/includes/ui/grn_ui.inc:52 +#: ../purchasing/includes/ui/po_ui.inc.orig:323 +#: ../purchasing/view/view_supp_credit.php:42 +#: ../purchasing/view/view_supp_invoice.php:46 +#: ../purchasing/inquiry/po_search_completed.php:122 +#: ../purchasing/inquiry/po_search_completed.php.orig:121 +#: ../purchasing/inquiry/po_search.php:132 - #: ../purchasing/inquiry/supplier_allocation_inquiry.php:128 - #: ../purchasing/inquiry/supplier_allocation_inquiry.php:141 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:128 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:141 +#: ../purchasing/inquiry/supplier_inquiry.php:176 +#: ../purchasing/inquiry/supplier_inquiry.php:191 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:173 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:188 +#: ../purchasing/allocations/supplier_allocation_main.php:98 +#: ../purchasing/allocations/supplier_allocation_main.php:106 - #: ../reporting/rep201.php:125 - #: ../reporting/rep202.php:128 - #: ../reporting/rep202.php:135 - #: ../reporting/rep203.php:98 - #: ../reporting/rep204.php:88 - #: ../reporting/reports_main.php:132 - #: ../reporting/reports_main.php:136 - #: ../reporting/reports_main.php:143 ++#: ../reporting/rep201.php:119 ++#: ../reporting/rep202.php:130 ++#: ../reporting/rep202.php:137 ++#: ../reporting/rep203.php:100 ++#: ../reporting/rep204.php:90 ++#: ../reporting/rep306.php:141 ++#: ../reporting/rep306.php:151 ++#: ../reporting/reports_main.php:149 +#: ../reporting/reports_main.php:153 - #: ../reporting/reports_main.php:159 ++#: ../reporting/reports_main.php:162 ++#: ../reporting/reports_main.php:173 ++#: ../reporting/reports_main.php:180 msgid "Supplier" msgstr "" @@@ -7169,19 -6081,56 +7096,69 @@@ msgstr " msgid "Day In Following Month" msgstr "" -#: includes/sysnames.inc:187 +#: ../includes/sysnames.inc:187 +msgid "Sum per line taxes" +msgstr "" + +#: ../includes/sysnames.inc:188 +msgid "Taxes from totals" +msgstr "" + ++#: ../includes/sysnames.inc:200 + msgid "Jan" + msgstr "" + -#: includes/sysnames.inc:187 ++#: ../includes/sysnames.inc:200 + msgid "Feb" + msgstr "" + -#: includes/sysnames.inc:187 ++#: ../includes/sysnames.inc:200 + msgid "Mar" + msgstr "" + -#: includes/sysnames.inc:187 ++#: ../includes/sysnames.inc:200 + msgid "Apr" + msgstr "" + -#: includes/sysnames.inc:187 includes/ui/ui_view.inc:900 ++#: ../includes/sysnames.inc:200 ++#: ../includes/ui/ui_view.inc.orig:842 + msgid "May" + msgstr "" + -#: includes/sysnames.inc:187 ++#: ../includes/sysnames.inc:200 + msgid "Jun" + msgstr "" + -#: includes/sysnames.inc:187 ++#: ../includes/sysnames.inc:200 + msgid "Jul" + msgstr "" + -#: includes/sysnames.inc:187 ++#: ../includes/sysnames.inc:200 + msgid "Aug" + msgstr "" + -#: includes/sysnames.inc:187 ++#: ../includes/sysnames.inc:200 + msgid "Sep" + msgstr "" + -#: includes/sysnames.inc:187 ++#: ../includes/sysnames.inc:200 + msgid "Oct" + msgstr "" + -#: includes/sysnames.inc:187 ++#: ../includes/sysnames.inc:200 + msgid "Nov" + msgstr "" + -#: includes/sysnames.inc:187 ++#: ../includes/sysnames.inc:200 + msgid "Dec" + msgstr "" + -#: includes/system_tests.inc:15 includes/ui/ui_view.inc:210 -#: reporting/rep705.php:254 reporting/rep705.php:265 reporting/rep705.php:274 +#: ../includes/system_tests.inc:15 +#: ../includes/ui/ui_view.inc:210 - #: ../reporting/rep705.php:250 - #: ../reporting/rep705.php:261 - #: ../reporting/rep705.php:270 ++#: ../includes/ui/ui_view.inc.orig:210 ++#: ../reporting/rep705.php:254 ++#: ../reporting/rep705.php:265 ++#: ../reporting/rep705.php:274 msgid "Info" msgstr "" @@@ -7402,68 -6345,42 +7379,39 @@@ msgstr " msgid "Test type" msgstr "" -#: includes/system_tests.inc:420 includes/ui/view_package.php:47 -#: reporting/rep204.php:85 reporting/rep301.php:105 reporting/rep308.php:150 +#: ../includes/system_tests.inc:420 - #: ../includes/ui/view_package.php:37 - #: ../reporting/rep204.php:83 - #: ../reporting/rep301.php:103 ++#: ../includes/ui/view_package.php:47 ++#: ../reporting/rep204.php:85 ++#: ../reporting/rep301.php:105 ++#: ../reporting/rep308.php:150 msgid "Value" msgstr "" -#: includes/system_tests.inc:420 reporting/reports_main.php:40 -#: reporting/reports_main.php:51 reporting/reports_main.php:60 -#: reporting/reports_main.php:67 reporting/reports_main.php:76 -#: reporting/reports_main.php:85 reporting/reports_main.php:92 -#: reporting/reports_main.php:101 reporting/reports_main.php:111 -#: reporting/reports_main.php:118 reporting/reports_main.php:125 -#: reporting/reports_main.php:133 reporting/reports_main.php:140 -#: reporting/reports_main.php:146 reporting/reports_main.php:157 -#: reporting/reports_main.php:168 reporting/reports_main.php:176 -#: reporting/reports_main.php:181 reporting/reports_main.php:188 -#: reporting/reports_main.php:196 reporting/reports_main.php:203 -#: reporting/reports_main.php:212 reporting/reports_main.php:218 -#: reporting/reports_main.php:229 reporting/reports_main.php:238 -#: reporting/reports_main.php:244 reporting/reports_main.php:254 -#: reporting/reports_main.php:262 reporting/reports_main.php:270 -#: reporting/reports_main.php:277 reporting/reports_main.php:285 -#: reporting/reports_main.php:292 reporting/reports_main.php:301 -#: reporting/reports_main.php:314 reporting/reports_main.php:321 -#: reporting/reports_main.php:328 reporting/reports_main.php:343 -#: reporting/reports_main.php:351 reporting/reports_main.php:362 -#: reporting/reports_main.php:374 reporting/reports_main.php:384 -#: reporting/reports_main.php:396 reporting/reports_main.php:403 -#: reporting/reports_main.php:413 reporting/reports_main.php:424 -#: reporting/reports_main.php:433 reporting/reports_main.php:444 -#: reporting/reports_main.php:450 reporting/reports_main.php:459 -#: reporting/reports_main.php:469 reporting/reports_main.php:477 -#: reporting/reports_main.php:485 reporting/reports_main.php:493 -#: reporting/includes/excel_report.inc:295 -#: reporting/includes/excel_report.inc:428 -#: reporting/includes/pdf_report.inc:346 reporting/includes/pdf_report.inc:619 -#: sales/view/view_sales_order.php:85 +#: ../includes/system_tests.inc:420 - #: ../reporting/reports_main.php:39 - #: ../reporting/reports_main.php:49 - #: ../reporting/reports_main.php:57 - #: ../reporting/reports_main.php:63 - #: ../reporting/reports_main.php:71 - #: ../reporting/reports_main.php:79 ++#: ../reporting/reports_main.php:40 ++#: ../reporting/reports_main.php:51 ++#: ../reporting/reports_main.php:60 ++#: ../reporting/reports_main.php:67 ++#: ../reporting/reports_main.php:76 +#: ../reporting/reports_main.php:85 - #: ../reporting/reports_main.php:93 - #: ../reporting/reports_main.php:100 - #: ../reporting/reports_main.php:106 - #: ../reporting/reports_main.php:112 - #: ../reporting/reports_main.php:119 ++#: ../reporting/reports_main.php:92 ++#: ../reporting/reports_main.php:101 ++#: ../reporting/reports_main.php:111 ++#: ../reporting/reports_main.php:118 +#: ../reporting/reports_main.php:125 - #: ../reporting/reports_main.php:130 - #: ../reporting/reports_main.php:139 - #: ../reporting/reports_main.php:149 - #: ../reporting/reports_main.php:156 - #: ../reporting/reports_main.php:160 - #: ../reporting/reports_main.php:167 - #: ../reporting/reports_main.php:173 - #: ../reporting/reports_main.php:182 - #: ../reporting/reports_main.php:187 - #: ../reporting/reports_main.php:196 - #: ../reporting/reports_main.php:204 - #: ../reporting/reports_main.php:209 - #: ../reporting/reports_main.php:216 - #: ../reporting/reports_main.php:222 - #: ../reporting/reports_main.php:230 - #: ../reporting/reports_main.php:241 - #: ../reporting/reports_main.php:247 - #: ../reporting/reports_main.php:253 - #: ../reporting/reports_main.php:267 - #: ../reporting/reports_main.php:274 - #: ../reporting/reports_main.php:284 - #: ../reporting/reports_main.php:295 - #: ../reporting/reports_main.php:304 - #: ../reporting/reports_main.php:315 - #: ../reporting/reports_main.php:321 - #: ../reporting/reports_main.php:330 - #: ../reporting/reports_main.php:340 - #: ../reporting/reports_main.php:348 - #: ../reporting/reports_main.php:358 - #: ../reporting/reports_main.php:363 - #: ../reporting/reports_main.php:371 - #: ../reporting/reports_main.php:380 - #: ../reporting/reports_main.php:387 - #: ../reporting/reports_main.php:394 - #: ../reporting/reports_main.php:401 ++#: ../reporting/reports_main.php:133 ++#: ../reporting/reports_main.php:140 ++#: ../reporting/reports_main.php:146 ++#: ../reporting/reports_main.php:157 ++#: ../reporting/reports_main.php:168 ++#: ../reporting/reports_main.php:176 ++#: ../reporting/reports_main.php:181 ++#: ../reporting/reports_main.php:188 +#: ../reporting/includes/excel_report.inc:295 +#: ../reporting/includes/excel_report.inc:428 +#: ../reporting/includes/pdf_report.inc:346 +#: ../reporting/includes/pdf_report.inc:619 +#: ../sales/view/view_sales_order.php:98 - #: ../sales/view/view_sales_order.php.orig:85 msgid "Comments" msgstr "" @@@ -7477,84 -6394,64 +7425,88 @@@ msgid " "trail record." msgstr "" - #: ../includes/db/inventory_db.inc:252 -#: includes/db/inventory_db.inc:253 -#: inventory/includes/db/items_trans_db.inc:60 ++#: ../includes/db/inventory_db.inc:253 ++#: ../inventory/includes/db/items_trans_db.inc:66 + #, php-format + msgid "Cost was %s changed to %s x quantity on hand for item '%s'" + msgstr "" + -#: includes/db/inventory_db.inc:294 ++#: ../includes/db/inventory_db.inc:294 ++#: ../includes/db/inventory_db.inc.orig:292 + msgid "Zero/negative inventory handling" + msgstr "" + -#: includes/ui/allocation_cart.inc:263 -#: purchasing/allocations/supplier_allocation_main.php:94 -#: sales/allocations/customer_allocation_main.php:93 ++#: ../includes/db/inventory_db.inc.orig:252 +msgid "Cost was " +msgstr "" + - #: ../includes/db/inventory_db.inc:252 ++#: ../includes/db/inventory_db.inc.orig:252 +msgid " changed to " +msgstr "" + - #: ../includes/db/inventory_db.inc:252 ++#: ../includes/db/inventory_db.inc.orig:252 +msgid " for item " +msgstr "" + - #: ../includes/db/inventory_db.inc:292 - msgid "Zero/negative inventory handling" - msgstr "" - - #: ../includes/ui/allocation_cart.inc:264 ++#: ../includes/ui/allocation_cart.inc.orig:264 +#: ../purchasing/allocations/supplier_allocation_main.php:94 +#: ../sales/allocations/customer_allocation_main.php:93 msgid "Transaction Type" msgstr "" - #: ../includes/ui/allocation_cart.inc:264 - #: ../reporting/rep704.php:79 - #: ../reporting/rep704.php:82 - #: ../reporting/rep704.php:85 - #: ../reporting/rep709.php:109 -#: includes/ui/allocation_cart.inc:263 reporting/rep704.php:83 -#: reporting/rep704.php:86 reporting/rep704.php:89 reporting/rep709.php:111 -#: sales/view/view_credit.php:68 sales/view/view_sales_order.php:96 -#: sales/view/view_sales_order.php:129 sales/view/view_sales_order.php:161 -#: sales/inquiry/sales_orders_view.php:226 -#: sales/inquiry/sales_orders_view.php:263 -#: sales/inquiry/sales_orders_view.php:277 ++#: ../includes/ui/allocation_cart.inc.orig:264 ++#: ../reporting/rep704.php:83 ++#: ../reporting/rep704.php:86 ++#: ../reporting/rep704.php:89 ++#: ../reporting/rep709.php:111 +#: ../sales/view/view_credit.php:68 +#: ../sales/view/view_sales_order.php:109 +#: ../sales/view/view_sales_order.php:142 +#: ../sales/view/view_sales_order.php:179 - #: ../sales/view/view_sales_order.php.orig:96 - #: ../sales/view/view_sales_order.php.orig:129 - #: ../sales/view/view_sales_order.php.orig:161 - #: ../sales/inquiry/sales_orders_view.php:248 - #: ../sales/inquiry/sales_orders_view.php:285 - #: ../sales/inquiry/sales_orders_view.php:299 ++#: ../sales/inquiry/sales_orders_view.php.orig:248 ++#: ../sales/inquiry/sales_orders_view.php.orig:285 ++#: ../sales/inquiry/sales_orders_view.php.orig:299 msgid "Ref" msgstr "" - #: ../includes/ui/allocation_cart.inc:265 -#: includes/ui/allocation_cart.inc:264 ++#: ../includes/ui/allocation_cart.inc.orig:265 msgid "Other Allocations" msgstr "" - #: ../includes/ui/allocation_cart.inc:265 - #: ../includes/ui/ui_view.inc:489 -#: includes/ui/allocation_cart.inc:264 includes/ui/ui_view.inc:548 -#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186 ++#: ../includes/ui/allocation_cart.inc.orig:265 ++#: ../includes/ui/ui_view.inc.orig:489 +#: ../reporting/includes/doctext.inc:167 +#: ../reporting/includes/doctext.inc:208 msgid "This Allocation" msgstr "" - #: ../includes/ui/allocation_cart.inc:265 - #: ../includes/ui/allocation_cart.inc:314 - #: ../includes/ui/ui_view.inc:489 -#: includes/ui/allocation_cart.inc:264 includes/ui/allocation_cart.inc:311 -#: includes/ui/ui_view.inc:548 -#: purchasing/allocations/supplier_allocation_main.php:101 -#: reporting/rep112.php:156 reporting/rep210.php:163 -#: reporting/includes/doctext.inc:145 reporting/includes/doctext.inc:186 -#: sales/allocations/customer_allocation_main.php:100 ++#: ../includes/ui/allocation_cart.inc.orig:265 ++#: ../includes/ui/allocation_cart.inc.orig:314 ++#: ../includes/ui/ui_view.inc.orig:489 +#: ../purchasing/allocations/supplier_allocation_main.php:101 - #: ../reporting/rep112.php:141 - #: ../reporting/rep210.php:154 ++#: ../reporting/rep112.php:145 ++#: ../reporting/rep210.php:152 +#: ../reporting/includes/doctext.inc:167 +#: ../reporting/includes/doctext.inc:208 +#: ../sales/allocations/customer_allocation_main.php:100 msgid "Left to Allocate" msgstr "" - #: ../includes/ui/allocation_cart.inc:297 - #: ../reporting/rep112.php:138 - #: ../reporting/rep210.php:151 -#: includes/ui/allocation_cart.inc:294 reporting/rep112.php:153 -#: reporting/rep210.php:160 ++#: ../includes/ui/allocation_cart.inc.orig:297 ++#: ../reporting/rep112.php:142 ++#: ../reporting/rep210.php:149 msgid "Total Allocated" msgstr "" - #: ../includes/ui/allocation_cart.inc:334 -#: includes/ui/allocation_cart.inc:331 ++#: ../includes/ui/allocation_cart.inc.orig:334 msgid "The entry for one or more amounts is invalid or negative." msgstr "" - #: ../includes/ui/allocation_cart.inc:343 -#: includes/ui/allocation_cart.inc:340 ++#: ../includes/ui/allocation_cart.inc.orig:343 msgid "At least one transaction is overallocated." msgstr "" - #: ../includes/ui/allocation_cart.inc:361 -#: includes/ui/allocation_cart.inc:358 ++#: ../includes/ui/allocation_cart.inc.orig:361 msgid "" "These allocations cannot be processed because the amount allocated is more " "than the total amount left to allocate." @@@ -7568,10 -6465,9 +7520,11 @@@ msgstr " msgid "Sec Phone" msgstr "" -#: includes/ui/contacts_view.inc:41 reporting/rep103.php:266 -#: reporting/rep205.php:184 reporting/includes/header2.inc:104 -#: sales/manage/sales_people.php:99 +#: ../includes/ui/contacts_view.inc:41 - #: ../reporting/rep103.php:223 ++#: ../reporting/rep103.php:266 ++#: ../reporting/rep205.php:184 +#: ../reporting/includes/header2.inc:104 +#: ../sales/manage/sales_people.php:99 msgid "Fax" msgstr "" @@@ -7595,27 -6491,18 +7548,27 @@@ msgstr " msgid "Contact active for:" msgstr "" -#: includes/ui/contacts_view.inc:102 sales/manage/customers.php:252 +#: ../includes/ui/contacts_view.inc:102 - #: ../sales/manage/customers.php:252 ++#: ../sales/manage/customers.php:255 +#: ../sales/manage/sav.customers.php:252 msgid "Phone:" msgstr "" -#: includes/ui/contacts_view.inc:105 inventory/manage/locations.php:207 -#: purchasing/manage/suppliers.php:160 sales/manage/customer_branches.php:263 -#: sales/manage/customers.php:255 sales/manage/sales_people.php:158 +#: ../includes/ui/contacts_view.inc:105 +#: ../inventory/manage/locations.php:207 +#: ../purchasing/manage/suppliers.php:139 - #: ../purchasing/manage/suppliers.php.orig:117 ++#: ../purchasing/manage/suppliers.php.orig:139 +#: ../sales/manage/customer_branches.php:265 - #: ../sales/manage/customers.php:255 ++#: ../sales/manage/customers.php:258 +#: ../sales/manage/sales_people.php:158 +#: ../sales/manage/sav.customers.php:255 msgid "E-mail:" msgstr "" -#: includes/ui/contacts_view.inc:110 purchasing/manage/suppliers.php:161 -#: sales/manage/customer_branches.php:264 +#: ../includes/ui/contacts_view.inc:110 +#: ../purchasing/manage/suppliers.php:140 - #: ../purchasing/manage/suppliers.php.orig:118 ++#: ../purchasing/manage/suppliers.php.orig:140 +#: ../sales/manage/customer_branches.php:266 msgid "Document Language:" msgstr "" @@@ -7628,20 -6514,19 +7581,20 @@@ msgstr " msgid "Notes:" msgstr "" - #: ../includes/ui/contacts_view.inc:132 -#: includes/ui/contacts_view.inc:132 ++#: ../includes/ui/contacts_view.inc:131 msgid "The contact name cannot be empty." msgstr "" - #: ../includes/ui/contacts_view.inc:137 -#: includes/ui/contacts_view.inc:137 ++#: ../includes/ui/contacts_view.inc:136 msgid "Contact reference cannot be empty." msgstr "" - #: ../includes/ui/contacts_view.inc:142 -#: includes/ui/contacts_view.inc:142 ++#: ../includes/ui/contacts_view.inc:141 msgid "You have to select at least one category." msgstr "" -#: includes/ui/db_pager_view.inc:166 includes/ui/ui_input.inc:903 +#: ../includes/ui/db_pager_view.inc:166 - #: ../includes/ui/ui_input.inc:903 ++#: ../includes/ui/ui_input.inc:904 msgid "Show also Inactive" msgstr "" @@@ -7670,8 -6555,7 +7623,9 @@@ msgstr " msgid "No records" msgstr "" -#: includes/ui/simple_crud_class.inc:227 includes/ui/ui_input.inc:207 +#: ../includes/ui/simple_crud_class.inc:227 +#: ../includes/ui/ui_input.inc:208 ++#: ../taxes/sav.tax_types.php:255 msgid "Submit changes" msgstr "" @@@ -7722,30 -6603,24 +7676,30 @@@ msgstr " msgid "Close" msgstr "" - #: ../includes/ui/ui_controls.inc:457 -#: includes/ui/ui_controls.inc:452 sales/manage/customers.php:23 ++#: ../includes/ui/ui_controls.inc:459 +#: ../sales/manage/customers.php:23 +#: ../sales/manage/sav.customers.php:23 msgid "Customers" msgstr "" - #: ../includes/ui/ui_controls.inc:459 -#: includes/ui/ui_controls.inc:454 ++#: ../includes/ui/ui_controls.inc:461 msgid "Branches" msgstr "" - #: ../includes/ui/ui_controls.inc:461 -#: includes/ui/ui_controls.inc:456 purchasing/manage/suppliers.php:22 ++#: ../includes/ui/ui_controls.inc:463 +#: ../purchasing/manage/suppliers.php:22 - #: ../purchasing/manage/suppliers.php.orig:23 ++#: ../purchasing/manage/suppliers.php.orig:22 msgid "Suppliers" msgstr "" - #: ../includes/ui/ui_controls.inc:463 - #: ../inventory/transfers.php:230 -#: includes/ui/ui_controls.inc:458 inventory/transfers.php:228 -#: inventory/manage/items.php:21 reporting/reports_main.php:253 ++#: ../includes/ui/ui_controls.inc:465 ++#: ../inventory/transfers.php:228 +#: ../inventory/manage/items.php:22 - #: ../inventory/manage/items.php.orig:21 ++#: ../inventory/manage/items.php.orig:22 msgid "Items" msgstr "" - #: ../includes/ui/ui_controls.inc:608 -#: includes/ui/ui_controls.inc:603 ++#: ../includes/ui/ui_controls.inc:610 msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?" msgstr "" @@@ -7754,23 -6628,18 +7708,25 @@@ msgid "Click Here to Pick up the date" msgstr "" - #: ../includes/ui/ui_input.inc:915 - #: ../includes/ui/ui_lists.inc:2156 - #: ../reporting/rep301.php:152 - #: ../reporting/rep302.php:166 - #: ../reporting/rep303.php:170 - #: ../reporting/rep304.php:166 -#: includes/ui/ui_input.inc:915 includes/ui/ui_lists.inc:2156 -#: reporting/rep301.php:155 reporting/rep302.php:170 reporting/rep303.php:184 -#: reporting/rep304.php:170 reporting/rep304.php:174 reporting/rep306.php:235 -#: reporting/rep306.php:242 sales/manage/customer_branches.php:302 ++#: ../includes/ui/ui_input.inc:916 ++#: ../includes/ui/ui_lists.inc:2160 ++#: ../reporting/rep301.php:155 ++#: ../reporting/rep302.php:170 ++#: ../reporting/rep303.php:184 +#: ../reporting/rep304.php:170 ++#: ../reporting/rep304.php:174 ++#: ../reporting/rep306.php:235 ++#: ../reporting/rep306.php:242 +#: ../sales/manage/customer_branches.php:304 msgid "Inactive" msgstr "" - #: ../includes/ui/ui_input.inc:925 - #: ../includes/ui/ui_input.inc:937 -#: includes/ui/ui_input.inc:925 includes/ui/ui_input.inc:937 ++#: ../includes/ui/ui_input.inc:926 ++#: ../includes/ui/ui_input.inc:938 msgid "Current Credit:" msgstr "" - #: ../includes/ui/ui_input.inc:971 -#: includes/ui/ui_input.inc:951 ++#: ../includes/ui/ui_input.inc:972 msgid "Bank Balance:" msgstr "" @@@ -7790,8 -6659,7 +7746,8 @@@ msgstr " msgid "Enter description fragment to search or * for all" msgstr "" -#: includes/ui/ui_lists.inc:453 includes/ui/ui_lists.inc:1391 +#: ../includes/ui/ui_lists.inc:453 - #: ../includes/ui/ui_lists.inc:1386 ++#: ../includes/ui/ui_lists.inc:1389 msgid "All Suppliers" msgstr "" @@@ -7832,114 -6699,100 +7788,111 @@@ msgstr " msgid "All Items" msgstr "" - #: ../includes/ui/ui_lists.inc:1293 -#: includes/ui/ui_lists.inc:1298 ++#: ../includes/ui/ui_lists.inc:1296 msgid "All Sales Types" msgstr "" - #: ../includes/ui/ui_lists.inc:1628 -#: includes/ui/ui_lists.inc:1629 ++#: ../includes/ui/ui_lists.inc:1633 msgid "Use Item Sales Accounts" msgstr "" - #: ../includes/ui/ui_lists.inc:1940 - #: ../includes/ui/ui_lists.inc:1957 - #: ../includes/ui/ui_lists.inc:1974 -#: includes/ui/ui_lists.inc:1940 includes/ui/ui_lists.inc:1957 -#: includes/ui/ui_lists.inc:1974 ++#: ../includes/ui/ui_lists.inc:1944 ++#: ../includes/ui/ui_lists.inc:1961 ++#: ../includes/ui/ui_lists.inc:1978 msgid "All Types" msgstr "" - #: ../includes/ui/ui_lists.inc:1941 -#: includes/ui/ui_lists.inc:1941 sales/view/view_sales_order.php:127 ++#: ../includes/ui/ui_lists.inc:1945 +#: ../sales/view/view_sales_order.php:140 - #: ../sales/view/view_sales_order.php.orig:127 msgid "Sales Invoices" msgstr "" - #: ../includes/ui/ui_lists.inc:1942 - #: ../includes/ui/ui_lists.inc:1959 - #: ../includes/ui/ui_lists.inc:1977 -#: includes/ui/ui_lists.inc:1942 includes/ui/ui_lists.inc:1959 -#: includes/ui/ui_lists.inc:1977 ++#: ../includes/ui/ui_lists.inc:1946 ++#: ../includes/ui/ui_lists.inc:1963 ++#: ../includes/ui/ui_lists.inc:1981 msgid "Overdue Invoices" msgstr "" - #: ../includes/ui/ui_lists.inc:1943 - #: ../includes/ui/ui_lists.inc:1960 - #: ../includes/ui/ui_lists.inc:1978 - #: ../includes/ui/ui_view.inc:551 - #: ../includes/ui/ui_view.inc:555 -#: includes/ui/ui_lists.inc:1943 includes/ui/ui_lists.inc:1960 -#: includes/ui/ui_lists.inc:1978 includes/ui/ui_view.inc:543 ++#: ../includes/ui/ui_lists.inc:1947 ++#: ../includes/ui/ui_lists.inc:1964 ++#: ../includes/ui/ui_lists.inc:1982 ++#: ../includes/ui/ui_view.inc.orig:551 ++#: ../includes/ui/ui_view.inc.orig:555 msgid "Payments" msgstr "" - #: ../includes/ui/ui_lists.inc:1944 - #: ../includes/ui/ui_lists.inc:1961 - #: ../includes/ui/ui_lists.inc:1979 -#: includes/ui/ui_lists.inc:1944 includes/ui/ui_lists.inc:1961 -#: includes/ui/ui_lists.inc:1979 sales/view/view_sales_order.php:158 ++#: ../includes/ui/ui_lists.inc:1948 ++#: ../includes/ui/ui_lists.inc:1965 ++#: ../includes/ui/ui_lists.inc:1983 +#: ../sales/view/view_sales_order.php:176 - #: ../sales/view/view_sales_order.php.orig:158 msgid "Credit Notes" msgstr "" - #: ../includes/ui/ui_lists.inc:1945 -#: includes/ui/ui_lists.inc:1945 sales/view/view_sales_order.php:93 ++#: ../includes/ui/ui_lists.inc:1949 +#: ../sales/view/view_sales_order.php:106 - #: ../sales/view/view_sales_order.php.orig:93 msgid "Delivery Notes" msgstr "" - #: ../includes/ui/ui_lists.inc:1958 - #: ../includes/ui/ui_lists.inc:1976 -#: includes/ui/ui_lists.inc:1958 includes/ui/ui_lists.inc:1976 ++#: ../includes/ui/ui_lists.inc:1962 ++#: ../includes/ui/ui_lists.inc:1980 msgid "Invoices" msgstr "" - #: ../includes/ui/ui_lists.inc:1962 - #: ../includes/ui/ui_lists.inc:1980 -#: includes/ui/ui_lists.inc:1962 includes/ui/ui_lists.inc:1980 ++#: ../includes/ui/ui_lists.inc:1966 ++#: ../includes/ui/ui_lists.inc:1984 msgid "Overdue Credit Notes" msgstr "" - #: ../includes/ui/ui_lists.inc:1975 -#: includes/ui/ui_lists.inc:1975 ++#: ../includes/ui/ui_lists.inc:1979 msgid "GRNs" msgstr "" - #: ../includes/ui/ui_lists.inc:1993 -#: includes/ui/ui_lists.inc:1993 ++#: ../includes/ui/ui_lists.inc:1997 msgid "Automatically put balance on back order" msgstr "" - #: ../includes/ui/ui_lists.inc:1994 -#: includes/ui/ui_lists.inc:1994 ++#: ../includes/ui/ui_lists.inc:1998 msgid "Cancel any quantites not delivered" msgstr "" - #: ../includes/ui/ui_lists.inc:2011 -#: includes/ui/ui_lists.inc:2011 ++#: ../includes/ui/ui_lists.inc:2015 msgid "Items Returned to Inventory Location" msgstr "" - #: ../includes/ui/ui_lists.inc:2012 -#: includes/ui/ui_lists.inc:2012 ++#: ../includes/ui/ui_lists.inc:2016 msgid "Items Written Off" msgstr "" - #: ../includes/ui/ui_lists.inc:2182 -#: includes/ui/ui_lists.inc:2182 ++#: ../includes/ui/ui_lists.inc:2186 msgid "New role" msgstr "" - #: ../includes/ui/ui_lists.inc:2240 -#: includes/ui/ui_lists.inc:2234 ++#: ../includes/ui/ui_lists.inc:2238 msgid "No tags defined." msgstr "" - #: ../includes/ui/ui_lists.inc:2240 -#: includes/ui/ui_lists.inc:2234 ++#: ../includes/ui/ui_lists.inc:2238 msgid "No active tags defined." msgstr "" - #: ../includes/ui/ui_lists.inc:2278 -#: includes/ui/ui_lists.inc:2272 ++#: ../includes/ui/ui_lists.inc:2276 #, php-format msgid "Activated for '%s'" msgstr "" - #: ../includes/ui/ui_lists.inc:2281 -#: includes/ui/ui_lists.inc:2275 ++#: ../includes/ui/ui_lists.inc:2279 msgid "Available and/or installed" msgstr "" - #: ../includes/ui/ui_lists.inc:2351 -#: includes/ui/ui_lists.inc:2345 ++#: ../includes/ui/ui_lists.inc:2349 msgid "Standard new company American COA (4 digit)" msgstr "" - #: ../includes/ui/ui_lists.inc:2353 -#: includes/ui/ui_lists.inc:2347 ++#: ../includes/ui/ui_lists.inc:2351 msgid "Standard American COA (4 digit) with demo data" msgstr "" - #: ../includes/ui/ui_lists.inc:2374 -#: includes/ui/ui_lists.inc:2368 ++#: ../includes/ui/ui_lists.inc:2372 msgid "No payment Link" msgstr "" @@@ -7947,205 -6800,191 +7900,212 @@@ msgid "in units of : " msgstr "" - #: ../includes/ui/ui_view.inc:306 -#: includes/ui/ui_view.inc:301 ++#: ../includes/ui/ui_view.inc:301 + #, php-format + msgid "" + "Cannot retrieve exchange rate for currency %s. Please adjust approximate " + "rate if needed." + msgstr "" + -#: includes/ui/ui_view.inc:342 ++#: ../includes/ui/ui_view.inc:342 ++#: ../includes/ui/ui_view.inc.orig:306 msgid "Date Voided:" msgstr "" - #: ../includes/ui/ui_view.inc:407 - #: ../reporting/rep107.php:242 - #: ../reporting/rep109.php:183 - #: ../reporting/rep110.php:186 - #: ../reporting/rep111.php:168 - #: ../reporting/rep113.php:172 - #: ../reporting/rep209.php:191 -#: includes/ui/ui_view.inc:443 reporting/rep107.php:175 -#: reporting/rep109.php:180 reporting/rep110.php:184 reporting/rep111.php:165 -#: reporting/rep113.php:169 reporting/rep209.php:183 ++#: ../includes/ui/ui_view.inc:443 ++#: ../includes/ui/ui_view.inc.orig:407 ++#: ../reporting/rep109.php:181 ++#: ../reporting/rep110.php:184 ++#: ../reporting/rep111.php:164 ++#: ../reporting/rep113.php:169 ++#: ../reporting/rep209.php:186 msgid "Total Tax Excluded" msgstr "" - #: ../includes/ui/ui_view.inc:413 - #: ../includes/ui/ui_view.inc:432 - #: ../includes/ui/ui_view.inc:451 - #: ../reporting/rep107.php:251 - #: ../reporting/rep109.php:192 - #: ../reporting/rep110.php:195 - #: ../reporting/rep111.php:177 - #: ../reporting/rep113.php:181 - #: ../reporting/rep209.php:200 -#: includes/ui/ui_view.inc:449 includes/ui/ui_view.inc:468 -#: includes/ui/ui_view.inc:492 includes/ui/ui_view.inc:509 -#: reporting/rep107.php:184 reporting/rep109.php:189 reporting/rep110.php:193 -#: reporting/rep111.php:174 reporting/rep113.php:178 reporting/rep209.php:192 ++#: ../includes/ui/ui_view.inc:449 ++#: ../includes/ui/ui_view.inc:468 ++#: ../includes/ui/ui_view.inc:492 ++#: ../includes/ui/ui_view.inc:509 ++#: ../includes/ui/ui_view.inc.orig:413 ++#: ../includes/ui/ui_view.inc.orig:432 ++#: ../includes/ui/ui_view.inc.orig:451 ++#: ../reporting/rep109.php:190 ++#: ../reporting/rep110.php:193 ++#: ../reporting/rep111.php:173 ++#: ../reporting/rep113.php:178 ++#: ../reporting/rep209.php:195 msgid "Included" msgstr "" - #: ../includes/ui/ui_view.inc:488 -#: includes/ui/ui_view.inc:543 -#: purchasing/inquiry/supplier_allocation_inquiry.php:100 -msgid "Allocations" -msgstr "" - -#: includes/ui/ui_view.inc:547 reporting/includes/doctext.inc:145 -#: reporting/includes/doctext.inc:186 ++#: ../includes/ui/ui_view.inc.orig:488 +#: ../reporting/includes/doctext.inc:167 +#: ../reporting/includes/doctext.inc:208 msgid "Total Amount" msgstr "" - #: ../includes/ui/ui_view.inc:512 -#: includes/ui/ui_view.inc:572 ++#: ../includes/ui/ui_view.inc.orig:512 msgid "Total Allocated:" msgstr "" - #: ../includes/ui/ui_view.inc:518 -#: includes/ui/ui_view.inc:576 ++#: ../includes/ui/ui_view.inc.orig:518 msgid "Left to Allocate:" msgstr "" - #: ../includes/ui/ui_view.inc:534 - #: ../includes/ui/ui_view.inc:538 - #: ../purchasing/inquiry/supplier_allocation_inquiry.php:99 -#: includes/ui/ui_view.inc:629 ++#: ../includes/ui/ui_view.inc.orig:534 ++#: ../includes/ui/ui_view.inc.orig:538 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:99 +msgid "Allocations" +msgstr "" + - #: ../includes/ui/ui_view.inc:551 - #: ../includes/ui/ui_view.inc:555 ++#: ../includes/ui/ui_view.inc.orig:551 ++#: ../includes/ui/ui_view.inc.orig:555 +msgid "Pre-Payments" +msgstr "" + - #: ../includes/ui/ui_view.inc:571 ++#: ../includes/ui/ui_view.inc.orig:571 msgid "No Quick Entries are defined." msgstr "" - #: ../includes/ui/ui_view.inc:599 -#: includes/ui/ui_view.inc:657 ++#: ../includes/ui/ui_view.inc.orig:599 msgid "No Quick Entry lines are defined." msgstr "" - #: ../includes/ui/ui_view.inc:781 - #: ../purchasing/includes/ui/invoice_ui.inc:473 -#: includes/ui/ui_view.inc:839 purchasing/includes/ui/invoice_ui.inc:465 ++#: ../includes/ui/ui_view.inc.orig:781 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:473 msgid "and" msgstr "" - #: ../includes/ui/ui_view.inc:842 -#: includes/ui/ui_view.inc:900 ++#: ../includes/ui/ui_view.inc.orig:842 msgid "January" msgstr "" - #: ../includes/ui/ui_view.inc:842 -#: includes/ui/ui_view.inc:900 ++#: ../includes/ui/ui_view.inc.orig:842 msgid "February" msgstr "" - #: ../includes/ui/ui_view.inc:842 -#: includes/ui/ui_view.inc:900 ++#: ../includes/ui/ui_view.inc.orig:842 msgid "March" msgstr "" - #: ../includes/ui/ui_view.inc:842 -#: includes/ui/ui_view.inc:900 ++#: ../includes/ui/ui_view.inc.orig:842 msgid "April" msgstr "" - #: ../includes/ui/ui_view.inc:842 - msgid "May" - msgstr "" - - #: ../includes/ui/ui_view.inc:842 -#: includes/ui/ui_view.inc:900 ++#: ../includes/ui/ui_view.inc.orig:842 msgid "June" msgstr "" - #: ../includes/ui/ui_view.inc:842 -#: includes/ui/ui_view.inc:900 ++#: ../includes/ui/ui_view.inc.orig:842 msgid "July" msgstr "" - #: ../includes/ui/ui_view.inc:842 -#: includes/ui/ui_view.inc:900 ++#: ../includes/ui/ui_view.inc.orig:842 msgid "August" msgstr "" - #: ../includes/ui/ui_view.inc:842 -#: includes/ui/ui_view.inc:900 ++#: ../includes/ui/ui_view.inc.orig:842 msgid "September" msgstr "" - #: ../includes/ui/ui_view.inc:842 -#: includes/ui/ui_view.inc:900 ++#: ../includes/ui/ui_view.inc.orig:842 msgid "October" msgstr "" - #: ../includes/ui/ui_view.inc:842 -#: includes/ui/ui_view.inc:900 ++#: ../includes/ui/ui_view.inc.orig:842 msgid "November" msgstr "" - #: ../includes/ui/ui_view.inc:842 -#: includes/ui/ui_view.inc:900 ++#: ../includes/ui/ui_view.inc.orig:842 msgid "December" msgstr "" - #: ../includes/ui/ui_view.inc:843 -#: includes/ui/ui_view.inc:901 ++#: ../includes/ui/ui_view.inc.orig:843 msgid "Su" msgstr "" - #: ../includes/ui/ui_view.inc:843 -#: includes/ui/ui_view.inc:901 ++#: ../includes/ui/ui_view.inc.orig:843 msgid "Mo" msgstr "" - #: ../includes/ui/ui_view.inc:843 -#: includes/ui/ui_view.inc:901 ++#: ../includes/ui/ui_view.inc.orig:843 msgid "Tu" msgstr "" - #: ../includes/ui/ui_view.inc:843 -#: includes/ui/ui_view.inc:901 ++#: ../includes/ui/ui_view.inc.orig:843 msgid "We" msgstr "" - #: ../includes/ui/ui_view.inc:843 -#: includes/ui/ui_view.inc:901 ++#: ../includes/ui/ui_view.inc.orig:843 msgid "Th" msgstr "" - #: ../includes/ui/ui_view.inc:843 -#: includes/ui/ui_view.inc:901 ++#: ../includes/ui/ui_view.inc.orig:843 msgid "Fr" msgstr "" - #: ../includes/ui/ui_view.inc:843 -#: includes/ui/ui_view.inc:901 ++#: ../includes/ui/ui_view.inc.orig:843 msgid "Sa" msgstr "" - #: ../includes/ui/ui_view.inc:844 -#: includes/ui/ui_view.inc:902 ++#: ../includes/ui/ui_view.inc.orig:844 msgid "W" msgstr "" - #: ../includes/ui/view_package.php:7 -#: includes/ui/view_package.php:17 ++#: ../includes/ui/view_package.php:17 msgid "Package Details" msgstr "" - #: ../includes/ui/view_package.php:14 -#: includes/ui/view_package.php:24 ++#: ../includes/ui/view_package.php:24 msgid "" "The script must be called with a valid package id to review the info for." msgstr "" - #: ../includes/ui/view_package.php:19 -#: includes/ui/view_package.php:29 ++#: ../includes/ui/view_package.php:29 msgid "Available version" msgstr "" - #: ../includes/ui/view_package.php:20 -#: includes/ui/view_package.php:30 ++#: ../includes/ui/view_package.php:30 msgid "Package type" msgstr "" - #: ../includes/ui/view_package.php:21 -#: includes/ui/view_package.php:31 ++#: ../includes/ui/view_package.php:31 msgid "Package content" msgstr "" - #: ../includes/ui/view_package.php:23 -#: includes/ui/view_package.php:33 ++#: ../includes/ui/view_package.php:33 msgid "Author" msgstr "" - #: ../includes/ui/view_package.php:24 -#: includes/ui/view_package.php:34 ++#: ../includes/ui/view_package.php:34 msgid "Home page" msgstr "" - #: ../includes/ui/view_package.php:25 -#: includes/ui/view_package.php:35 ++#: ../includes/ui/view_package.php:35 msgid "Package maintainer" msgstr "" - #: ../includes/ui/view_package.php:26 -#: includes/ui/view_package.php:36 ++#: ../includes/ui/view_package.php:36 msgid "Installation path" msgstr "" - #: ../includes/ui/view_package.php:27 -#: includes/ui/view_package.php:37 ++#: ../includes/ui/view_package.php:37 msgid "Minimal software versions" msgstr "" - #: ../includes/ui/view_package.php:28 -#: includes/ui/view_package.php:38 ++#: ../includes/ui/view_package.php:38 msgid "Right to left" msgstr "" - #: ../includes/ui/view_package.php:29 -#: includes/ui/view_package.php:39 ++#: ../includes/ui/view_package.php:39 msgid "Charset encoding" msgstr "" - #: ../includes/ui/view_package.php:34 -#: includes/ui/view_package.php:44 ++#: ../includes/ui/view_package.php:44 #, php-format msgid "Content information for package '%s'" msgstr "" - #: ../includes/ui/view_package.php:37 -#: includes/ui/view_package.php:47 ++#: ../includes/ui/view_package.php:47 msgid "Property" msgstr "" @@@ -8182,412 -7020,287 +8142,337 @@@ msgstr " msgid "Enter &Another Adjustment" msgstr "" - #: ../inventory/adjustments.php:90 - #: ../inventory/transfers.php:87 - #: ../sales/sales_order_entry.php:369 -#: inventory/adjustments.php:88 inventory/transfers.php:85 -#: sales/sales_order_entry.php:360 ++#: ../inventory/adjustments.php:88 ++#: ../inventory/transfers.php:85 ++#: ../sales/sales_order_entry.php:370 msgid "You must enter at least one non empty item line." msgstr "" - #: ../inventory/adjustments.php:110 - #: ../inventory/transfers.php:105 -#: inventory/adjustments.php:108 ++#: ../inventory/adjustments.php:108 msgid "The entered date for the adjustment is invalid." msgstr "" - #: ../inventory/adjustments.php:124 -#: inventory/adjustments.php:122 ++#: ../inventory/adjustments.php:122 msgid "" "The adjustment cannot be processed because an adjustment item would cause a " "negative inventory balance :" msgstr "" - #: ../inventory/adjustments.php:154 -#: inventory/adjustments.php:152 manufacturing/work_order_issue.php:139 ++#: ../inventory/adjustments.php:152 +#: ../manufacturing/work_order_issue.php:141 msgid "The quantity entered is negative or invalid." msgstr "" - #: ../inventory/adjustments.php:161 -#: inventory/adjustments.php:159 manufacturing/work_order_issue.php:146 ++#: ../inventory/adjustments.php:159 +#: ../manufacturing/work_order_issue.php:148 msgid "The entered standard cost is negative or invalid." msgstr "" - #: ../inventory/adjustments.php:230 -#: inventory/adjustments.php:228 ++#: ../inventory/adjustments.php:228 msgid "Adjustment Items" msgstr "" - #: ../inventory/adjustments.php:236 -#: inventory/adjustments.php:234 ++#: ../inventory/adjustments.php:234 msgid "Process Adjustment" msgstr "" - #: ../inventory/cost_update.php:26 -#: inventory/cost_update.php:31 ++#: ../inventory/cost_update.php:31 msgid "Inventory Item Cost Update" msgstr "" - #: ../inventory/cost_update.php:30 -#: inventory/cost_update.php:36 ++#: ../inventory/cost_update.php:36 msgid "" "There are no costable inventory items defined in the system (Purchased or " "manufactured items)." msgstr "" - #: ../inventory/cost_update.php:51 -#: inventory/cost_update.php:57 ++#: ../inventory/cost_update.php:57 msgid "The entered cost is not numeric." msgstr "" - #: ../inventory/cost_update.php:57 -#: inventory/cost_update.php:63 ++#: ../inventory/cost_update.php:63 msgid "The new cost is the same as the old cost. Cost was not updated." msgstr "" - #: ../inventory/cost_update.php:67 -#: inventory/cost_update.php:73 ++#: ../inventory/cost_update.php:73 msgid "Cost has been updated." msgstr "" - #: ../inventory/cost_update.php:71 -#: inventory/cost_update.php:77 ++#: ../inventory/cost_update.php:77 msgid "View the GL Journal Entries for this Cost Update" msgstr "" - #: ../inventory/cost_update.php:85 - #: ../inventory/prices.php:56 - #: ../inventory/purchasing_data.php:101 - #: ../inventory/reorder_level.php:43 -#: inventory/cost_update.php:95 inventory/prices.php:61 -#: inventory/purchasing_data.php:117 inventory/reorder_level.php:48 -#: inventory/inquiry/stock_movements.php:53 -#: inventory/inquiry/stock_status.php:47 inventory/manage/item_codes.php:105 -#: manufacturing/work_order_entry.php:396 -#: manufacturing/work_order_entry.php:401 purchasing/inquiry/po_search.php:74 -#: sales/inquiry/sales_deliveries_view.php:114 -#: sales/inquiry/sales_orders_view.php:241 ++#: ../inventory/cost_update.php:95 ++#: ../inventory/prices.php:61 ++#: ../inventory/purchasing_data.php:117 ++#: ../inventory/reorder_level.php:48 +#: ../inventory/inquiry/stock_movements.php:49 - #: ../inventory/inquiry/stock_movements.php.orig:51 +#: ../inventory/inquiry/stock_status.php:41 +#: ../inventory/inquiry/stock_status.php.orig:47 +#: ../inventory/manage/item_codes.php:105 +#: ../manufacturing/work_order_entry.php:396 +#: ../manufacturing/work_order_entry.php:401 +#: ../purchasing/inquiry/po_search.php:74 +#: ../sales/inquiry/sales_deliveries_view.php:114 - #: ../sales/inquiry/sales_orders_view.php:263 ++#: ../sales/inquiry/sales_orders_view.php.orig:263 msgid "Item:" msgstr "" - #: ../inventory/cost_update.php:102 -#: inventory/cost_update.php:116 ++#: ../inventory/cost_update.php:116 msgid "Standard Material Cost Per Unit" msgstr "" - #: ../inventory/cost_update.php:105 -#: inventory/cost_update.php:125 ++#: ../inventory/cost_update.php:125 msgid "Standard Labour Cost Per Unit" msgstr "" - #: ../inventory/cost_update.php:106 -#: inventory/cost_update.php:126 ++#: ../inventory/cost_update.php:126 msgid "Standard Overhead Cost Per Unit" msgstr "" - #: ../inventory/prices.php:16 -#: inventory/prices.php:26 ++#: ../inventory/prices.php:26 msgid "Inventory Item Sales prices" msgstr "" - #: ../inventory/prices.php:27 -#: inventory/prices.php:30 inventory/inquiry/stock_movements.php:32 -#: inventory/inquiry/stock_status.php:37 inventory/manage/sales_kits.php:24 -#: manufacturing/inquiry/where_used_inquiry.php:21 -#: sales/credit_note_entry.php:49 ++#: ../inventory/prices.php:30 +#: ../inventory/inquiry/stock_movements.php:29 - #: ../inventory/inquiry/stock_movements.php.orig:31 +#: ../inventory/inquiry/stock_status.php:32 +#: ../inventory/inquiry/stock_status.php.orig:37 +#: ../inventory/manage/sales_kits.php:24 +#: ../manufacturing/inquiry/where_used_inquiry.php:21 +#: ../sales/credit_note_entry.php:49 msgid "There are no items defined in the system." msgstr "" - #: ../inventory/prices.php:29 -#: inventory/prices.php:32 ++#: ../inventory/prices.php:32 msgid "" "There are no sales types in the system. Please set up sales types befor " "entering pricing." msgstr "" - #: ../inventory/prices.php:70 -#: inventory/prices.php:77 ++#: ../inventory/prices.php:77 msgid "The price entered must be numeric." msgstr "" -#: inventory/prices.php:83 +#: ../inventory/prices.php:83 + msgid "" + "The sales pricing for this item, sales type and currency has already been " + "added." + msgstr "" + -#: inventory/prices.php:96 ++#: ../inventory/prices.php:96 msgid "This price has been updated." msgstr "" - #: ../inventory/prices.php:91 -#: inventory/prices.php:104 ++#: ../inventory/prices.php:104 msgid "The new price has been added." msgstr "" - #: ../inventory/prices.php:105 -#: inventory/prices.php:118 ++#: ../inventory/prices.php:118 msgid "The selected price has been deleted." msgstr "" - #: ../inventory/prices.php:133 - #: ../reporting/rep104.php:116 - #: ../sales/customer_delivery.php.orig:368 -#: inventory/prices.php:146 reporting/rep104.php:118 -#: sales/customer_delivery.php:355 sales/customer_invoice.php:402 -#: sales/view/view_credit.php:73 sales/view/view_dispatch.php:93 -#: sales/view/view_invoice.php:92 sales/includes/ui/sales_credit_ui.inc:102 ++#: ../inventory/prices.php:146 ++#: ../reporting/rep104.php:118 ++#: ../sales/customer_delivery.php:369 +#: ../sales/customer_invoice.php:468 +#: ../sales/view/view_credit.php:73 +#: ../sales/view/view_dispatch.php:93 +#: ../sales/view/view_invoice.php:93 +#: ../sales/includes/ui/sales_credit_ui.inc:102 msgid "Sales Type" msgstr "" - #: ../inventory/prices.php:133 - #: ../inventory/purchasing_data.php:129 - #: ../inventory/purchasing_data.php.orig:224 - #: ../purchasing/includes/ui/invoice_ui.inc:505 -#: inventory/prices.php:146 inventory/purchasing_data.php:147 -#: purchasing/includes/ui/invoice_ui.inc:497 -#: purchasing/po_receive_items.php:63 purchasing/view/view_grn.php:41 -#: purchasing/view/view_po.php:45 reporting/rep104.php:111 -#: reporting/includes/doctext.inc:30 reporting/includes/doctext.inc:170 -#: sales/customer_credit_invoice.php:281 sales/customer_delivery.php:433 -#: sales/customer_invoice.php:470 sales/view/view_credit.php:91 -#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114 -#: sales/view/view_sales_order.php:202 -#: sales/includes/ui/sales_credit_ui.inc:168 ++#: ../inventory/prices.php:146 ++#: ../inventory/purchasing_data.php:147 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:505 +#: ../purchasing/po_receive_items.php:63 +#: ../purchasing/view/view_grn.php:41 +#: ../purchasing/view/view_po.php:45 - #: ../reporting/rep104.php:109 ++#: ../reporting/rep104.php:111 +#: ../reporting/includes/doctext.inc:30 +#: ../reporting/includes/doctext.inc:192 +#: ../sales/customer_credit_invoice.php:281 - #: ../sales/customer_delivery.php.orig:446 ++#: ../sales/customer_delivery.php:447 +#: ../sales/customer_invoice.php:542 +#: ../sales/customer_invoice.php:545 +#: ../sales/view/view_credit.php:91 +#: ../sales/view/view_dispatch.php:113 +#: ../sales/view/view_invoice.php:116 +#: ../sales/view/view_sales_order.php:220 - #: ../sales/view/view_sales_order.php.orig:202 +#: ../sales/includes/ui/sales_credit_ui.inc:168 msgid "Price" msgstr "" - #: ../inventory/prices.php:155 -#: inventory/prices.php:168 ++#: ../inventory/prices.php:168 msgid "There are no prices set up for this part." msgstr "" - #: ../inventory/prices.php:174 - #: ../inventory/purchasing_data.php.orig:189 -#: inventory/prices.php:192 ++#: ../inventory/prices.php:192 msgid "Currency:" msgstr "" - #: ../inventory/prices.php:176 -#: inventory/prices.php:194 ++#: ../inventory/prices.php:194 msgid "Sales Type:" msgstr "" - #: ../inventory/prices.php:184 - #: ../inventory/purchasing_data.php:191 - #: ../inventory/purchasing_data.php.orig:193 -#: inventory/prices.php:202 inventory/purchasing_data.php:215 ++#: ../inventory/prices.php:202 ++#: ../inventory/purchasing_data.php:215 msgid "Price:" msgstr "" - #: ../inventory/prices.php:184 -#: inventory/prices.php:202 ++#: ../inventory/prices.php:202 msgid "per" msgstr "" - #: ../inventory/prices.php:188 -#: inventory/prices.php:206 ++#: ../inventory/prices.php:206 msgid "The price is calculated." msgstr "" - #: ../inventory/purchasing_data.php:16 - #: ../inventory/purchasing_data.php.orig:17 -#: inventory/purchasing_data.php:25 ++#: ../inventory/purchasing_data.php:25 msgid "Supplier Purchasing Data" msgstr "" - #: ../inventory/purchasing_data.php:23 - #: ../inventory/purchasing_data.php.orig:24 -#: inventory/purchasing_data.php:27 purchasing/po_entry_items.php:67 ++#: ../inventory/purchasing_data.php:27 +#: ../purchasing/po_entry_items.php:70 - #: ../purchasing/po_entry_items.php.orig:67 ++#: ../purchasing/po_entry_items.php.orig:70 msgid "There are no purchasable inventory items defined in the system." msgstr "" - #: ../inventory/purchasing_data.php:24 - #: ../inventory/purchasing_data.php.orig:25 -#: inventory/purchasing_data.php:28 purchasing/po_entry_items.php:65 -#: purchasing/supplier_credit.php:32 purchasing/supplier_invoice.php:32 -#: purchasing/supplier_payment.php:40 ++#: ../inventory/purchasing_data.php:28 +#: ../purchasing/po_entry_items.php:68 - #: ../purchasing/po_entry_items.php.orig:65 ++#: ../purchasing/po_entry_items.php.orig:68 +#: ../purchasing/supplier_credit.php:31 +#: ../purchasing/supplier_invoice.php:30 +#: ../purchasing/supplier_payment.php:40 ++#: ../purchasing/supplier_payment.php.orig:40 msgid "There are no suppliers defined in the system." msgstr "" - #: ../inventory/purchasing_data.php:38 - #: ../inventory/purchasing_data.php.orig:39 -#: inventory/purchasing_data.php:46 inventory/manage/item_codes.php:35 ++#: ../inventory/purchasing_data.php:46 +#: ../inventory/manage/item_codes.php:35 msgid "There is no item selected." msgstr "" - #: ../inventory/purchasing_data.php:44 - #: ../inventory/purchasing_data.php.orig:45 -#: inventory/purchasing_data.php:52 ++#: ../inventory/purchasing_data.php:52 msgid "The price entered was not numeric." msgstr "" - #: ../inventory/purchasing_data.php:50 - #: ../inventory/purchasing_data.php.orig:51 -#: inventory/purchasing_data.php:58 ++#: ../inventory/purchasing_data.php:58 msgid "" "The conversion factor entered was not numeric. The conversion factor is the " "number by which the price must be divided by to get the unit price in our " "unit of measure." msgstr "" - #: ../inventory/purchasing_data.php:60 - #: ../inventory/purchasing_data.php.orig:61 -#: inventory/purchasing_data.php:64 ++#: ../inventory/purchasing_data.php:64 + msgid "The purchasing data for this supplier has already been added." + msgstr "" + -#: inventory/purchasing_data.php:73 ++#: ../inventory/purchasing_data.php:73 msgid "This supplier purchasing data has been added." msgstr "" - #: ../inventory/purchasing_data.php:66 - #: ../inventory/purchasing_data.php.orig:67 -#: inventory/purchasing_data.php:79 ++#: ../inventory/purchasing_data.php:79 msgid "Supplier purchasing data has been updated." msgstr "" - #: ../inventory/purchasing_data.php:77 - #: ../inventory/purchasing_data.php.orig:88 -#: inventory/purchasing_data.php:90 ++#: ../inventory/purchasing_data.php:90 msgid "The purchasing data item has been sucessfully deleted." msgstr "" - #: ../inventory/purchasing_data.php:114 -#: inventory/purchasing_data.php:132 ++#: ../inventory/purchasing_data.php:132 msgid "Entered item is not defined. Please re-enter." msgstr "" - #: ../inventory/purchasing_data.php:123 -#: inventory/purchasing_data.php:141 ++#: ../inventory/purchasing_data.php:141 msgid "There is no purchasing data set up for the part selected" msgstr "" - #: ../inventory/purchasing_data.php:130 - #: ../inventory/purchasing_data.php.orig:222 -#: inventory/purchasing_data.php:148 ++#: ../inventory/purchasing_data.php:148 msgid "Supplier's Unit" msgstr "" - #: ../inventory/purchasing_data.php:130 - #: ../inventory/purchasing_data.php.orig:223 -#: inventory/purchasing_data.php:148 ++#: ../inventory/purchasing_data.php:148 msgid "Conversion Factor" msgstr "" - #: ../inventory/purchasing_data.php:130 -#: inventory/purchasing_data.php:148 ++#: ../inventory/purchasing_data.php:148 msgid "Supplier's Description" msgstr "" - #: ../inventory/purchasing_data.php:192 - #: ../inventory/purchasing_data.php.orig:194 -#: inventory/purchasing_data.php:216 ++#: ../inventory/purchasing_data.php:216 msgid "Suppliers Unit of Measure:" msgstr "" - #: ../inventory/purchasing_data.php:198 - #: ../inventory/purchasing_data.php.orig:200 -#: inventory/purchasing_data.php:222 ++#: ../inventory/purchasing_data.php:222 msgid "Conversion Factor (to our UOM):" msgstr "" - #: ../inventory/purchasing_data.php:200 - #: ../inventory/purchasing_data.php.orig:202 -#: inventory/purchasing_data.php:224 ++#: ../inventory/purchasing_data.php:224 msgid "Supplier's Code or Description:" msgstr "" - #: ../inventory/purchasing_data.php.orig:116 - msgid "Show all:" - msgstr "" - - #: ../inventory/purchasing_data.php.orig:185 - msgid "Stock item:" - msgstr "" - - #: ../inventory/purchasing_data.php.orig:219 - msgid "Supplier Code/Description" - msgstr "" - - #: ../inventory/purchasing_data.php.orig:220 - #: ../inventory/includes/item_adjustments_ui.inc:62 - #: ../inventory/includes/stock_transfers_ui.inc:60 - #: ../manufacturing/includes/work_order_issue_ui.inc:33 - #: ../purchasing/includes/ui/po_ui.inc:243 - #: ../purchasing/includes/ui/po_ui.inc.orig:243 - #: ../purchasing/po_receive_items.php:62 - #: ../purchasing/view/view_grn.php:40 - #: ../purchasing/view/view_po.php:45 - #: ../reporting/includes/doctext.inc:29 - #: ../reporting/includes/doctext.inc:191 - #: ../reporting/includes/doctext.inc:228 - #: ../sales/customer_credit_invoice.php:280 - #: ../sales/customer_delivery.php.orig:444 - #: ../sales/customer_invoice.php:541 - #: ../sales/customer_invoice.php:544 - #: ../sales/view/view_credit.php:90 - #: ../sales/view/view_dispatch.php:112 - #: ../sales/view/view_invoice.php:115 - #: ../sales/view/view_sales_order.php:219 - #: ../sales/view/view_sales_order.php.orig:201 - #: ../sales/includes/ui/sales_credit_ui.inc:167 - #: ../sales/includes/ui/sales_order_ui.inc.orig:140 - msgid "Item Code" - msgstr "" - - #: ../inventory/purchasing_data.php.orig:221 - #: ../inventory/includes/item_adjustments_ui.inc:62 - #: ../inventory/includes/stock_transfers_ui.inc:60 - #: ../manufacturing/includes/work_order_issue_ui.inc:33 - #: ../purchasing/includes/ui/po_ui.inc:243 - #: ../purchasing/includes/ui/po_ui.inc.orig:243 - #: ../purchasing/view/view_grn.php:40 - #: ../purchasing/view/view_po.php:45 - #: ../reporting/includes/doctext.inc:29 - #: ../reporting/includes/doctext.inc:191 - #: ../reporting/includes/doctext.inc:228 - #: ../sales/customer_credit_invoice.php:280 - #: ../sales/customer_delivery.php.orig:444 - #: ../sales/customer_invoice.php:541 - #: ../sales/customer_invoice.php:544 - #: ../sales/view/view_credit.php:90 - #: ../sales/view/view_dispatch.php:112 - #: ../sales/view/view_invoice.php:115 - #: ../sales/view/view_sales_order.php:219 - #: ../sales/view/view_sales_order.php.orig:201 - #: ../sales/includes/ui/sales_credit_ui.inc:167 - #: ../sales/includes/ui/sales_order_ui.inc.orig:140 - msgid "Item Description" - msgstr "" - - #: ../inventory/reorder_level.php:16 -#: inventory/reorder_level.php:25 ++#: ../inventory/reorder_level.php:25 msgid "Reorder Levels" msgstr "" - #: ../inventory/reorder_level.php:24 -#: inventory/reorder_level.php:27 inventory/transfers.php:32 ++#: ../inventory/reorder_level.php:27 +#: ../inventory/transfers.php:32 msgid "" "There are no inventory items defined in the system (Purchased or " "manufactured items)." msgstr "" - #: ../inventory/reorder_level.php:57 -#: inventory/reorder_level.php:65 inventory/inquiry/stock_movements.php:83 -#: inventory/inquiry/stock_status.php:72 inventory/inquiry/stock_status.php:76 -#: manufacturing/search_work_orders.php:162 -#: manufacturing/inquiry/where_used_inquiry.php:45 -#: manufacturing/manage/bom_edit.php:70 -#: purchasing/inquiry/po_search_completed.php:124 -#: purchasing/inquiry/po_search_completed.php:134 -#: purchasing/inquiry/po_search.php:133 purchasing/inquiry/po_search.php:144 -#: reporting/rep105.php:120 reporting/rep301.php:112 reporting/rep302.php:132 -#: reporting/rep303.php:134 reporting/rep304.php:123 reporting/rep306.php:150 -#: reporting/rep307.php:124 reporting/rep308.php:157 -#: reporting/reports_main.php:210 reporting/reports_main.php:217 -#: reporting/reports_main.php:223 reporting/reports_main.php:236 -#: reporting/reports_main.php:251 reporting/reports_main.php:261 -#: reporting/reports_main.php:269 sales/manage/sales_points.php:84 ++#: ../inventory/reorder_level.php:65 ++#: ../inventory/inquiry/stock_movements.php:79 +#: ../inventory/inquiry/stock_status.php:66 +#: ../inventory/inquiry/stock_status.php:70 +#: ../inventory/inquiry/stock_status.php.orig:72 +#: ../inventory/inquiry/stock_status.php.orig:76 +#: ../manufacturing/search_work_orders.php:162 +#: ../manufacturing/inquiry/where_used_inquiry.php:45 +#: ../manufacturing/manage/bom_edit.php:70 +#: ../purchasing/inquiry/po_search_completed.php:123 +#: ../purchasing/inquiry/po_search_completed.php:133 +#: ../purchasing/inquiry/po_search_completed.php.orig:122 +#: ../purchasing/inquiry/po_search_completed.php.orig:132 +#: ../purchasing/inquiry/po_search.php:133 +#: ../purchasing/inquiry/po_search.php:144 - #: ../reporting/rep105.php:118 - #: ../reporting/rep301.php:110 - #: ../reporting/rep302.php:130 - #: ../reporting/rep303.php:122 - #: ../reporting/rep304.php:121 - #: ../reporting/reports_main.php:180 - #: ../reporting/reports_main.php:186 - #: ../reporting/reports_main.php:191 - #: ../reporting/reports_main.php:202 ++#: ../reporting/rep105.php:120 ++#: ../reporting/rep301.php:112 ++#: ../reporting/rep302.php:132 ++#: ../reporting/rep303.php:134 ++#: ../reporting/rep304.php:123 ++#: ../reporting/rep306.php:150 ++#: ../reporting/rep307.php:124 ++#: ../reporting/rep308.php:157 +#: ../sales/manage/sales_points.php:84 msgid "Location" msgstr "" - #: ../inventory/reorder_level.php:57 - #: ../inventory/inquiry/stock_movements.php:78 - #: ../inventory/inquiry/stock_movements.php.orig:80 -#: inventory/reorder_level.php:65 inventory/inquiry/stock_movements.php:84 -#: inventory/inquiry/stock_status.php:76 purchasing/supplier_credit.php:203 -#: sales/sales_order_entry.php:515 sales/includes/ui/sales_order_ui.inc:181 ++#: ../inventory/reorder_level.php:65 ++#: ../inventory/inquiry/stock_movements.php:80 +#: ../inventory/inquiry/stock_status.php:70 +#: ../inventory/inquiry/stock_status.php.orig:76 - #: ../purchasing/supplier_credit.php:220 - #: ../sales/sales_order_entry.php:523 - #: ../sales/includes/ui/sales_order_ui.inc.orig:175 ++#: ../purchasing/supplier_credit.php:219 ++#: ../sales/sales_order_entry.php:531 ++#: ../sales/includes/ui/sales_order_ui.inc:182 msgid "Quantity On Hand" msgstr "" - #: ../inventory/reorder_level.php:57 -#: inventory/reorder_level.php:65 inventory/inquiry/stock_status.php:76 -#: sales/includes/db/sales_order_db.inc:110 -#: sales/includes/db/sales_order_db.inc:283 ++#: ../inventory/reorder_level.php:65 +#: ../inventory/inquiry/stock_status.php:70 +#: ../inventory/inquiry/stock_status.php.orig:76 +#: ../sales/includes/db/old.sales_order_db.inc:110 +#: ../sales/includes/db/old.sales_order_db.inc:263 +#: ../sales/includes/db/sales_order_db.inc:112 - #: ../sales/includes/db/sales_order_db.inc:275 +#: ../sales/includes/db/sales_order_db.inc.orig:112 +#: ../sales/includes/db/sales_order_db.inc.orig:275 msgid "Re-Order Level" msgstr "" - #: ../inventory/reorder_level.php:75 -#: inventory/reorder_level.php:89 ++#: ../inventory/reorder_level.php:89 msgid "Reorder levels has been updated." msgstr "" @@@ -8607,37 -7320,39 +8492,40 @@@ msgstr " msgid "Enter &Another Inventory Transfer" msgstr "" - #: ../inventory/transfers.php:117 -#: inventory/transfers.php:103 ++#: ../inventory/transfers.php:103 + msgid "The entered transfer date is invalid." + msgstr "" + -#: inventory/transfers.php:115 ++#: ../inventory/transfers.php:115 msgid "The locations to transfer from and to must be different." msgstr "" - #: ../inventory/transfers.php:127 -#: inventory/transfers.php:125 ++#: ../inventory/transfers.php:125 msgid "" "The quantity entered is greater than the available quantity for this item at " "the source location :" msgstr "" - #: ../inventory/transfers.php:160 -#: inventory/transfers.php:158 ++#: ../inventory/transfers.php:158 msgid "The quantity entered must be a positive number." msgstr "" - #: ../inventory/transfers.php:237 -#: inventory/transfers.php:235 ++#: ../inventory/transfers.php:235 msgid "Process Transfer" msgstr "" -#: inventory/includes/item_adjustments_ui.inc:20 -#: inventory/includes/stock_transfers_ui.inc:20 -#: manufacturing/includes/work_order_issue_ui.inc:20 -#: sales/includes/ui/sales_order_ui.inc:60 +#: ../inventory/includes/item_adjustments_ui.inc:20 +#: ../inventory/includes/stock_transfers_ui.inc:20 +#: ../manufacturing/includes/work_order_issue_ui.inc:20 +#: ../sales/includes/ui/sales_order_ui.inc:60 - #: ../sales/includes/ui/sales_order_ui.inc.orig:60 msgid "For Part :" msgstr "" -#: inventory/includes/item_adjustments_ui.inc:34 -#: manufacturing/work_order_entry.php:210 purchasing/inquiry/po_search.php:67 -#: sales/inquiry/sales_deliveries_view.php:107 -#: sales/inquiry/sales_orders_view.php:232 +#: ../inventory/includes/item_adjustments_ui.inc:34 +#: ../manufacturing/work_order_entry.php:210 +#: ../purchasing/inquiry/po_search.php:67 +#: ../sales/inquiry/sales_deliveries_view.php:107 - #: ../sales/inquiry/sales_orders_view.php:254 ++#: ../sales/inquiry/sales_orders_view.php.orig:254 msgid "Location:" msgstr "" @@@ -8653,73 -7368,83 +8541,113 @@@ msgstr " msgid "Negative Adjustment" msgstr "" -#: inventory/includes/item_adjustments_ui.inc:62 -#: inventory/includes/stock_transfers_ui.inc:60 -#: manufacturing/includes/work_order_issue_ui.inc:33 -#: purchasing/includes/ui/po_ui.inc:233 purchasing/po_receive_items.php:62 -#: purchasing/view/view_grn.php:40 purchasing/view/view_po.php:45 -#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:169 -#: reporting/includes/doctext.inc:206 sales/customer_credit_invoice.php:280 -#: sales/customer_delivery.php:431 sales/customer_invoice.php:469 -#: sales/view/view_credit.php:90 sales/view/view_dispatch.php:112 -#: sales/view/view_invoice.php:113 sales/view/view_sales_order.php:201 -#: sales/includes/ui/sales_credit_ui.inc:167 -#: sales/includes/ui/sales_order_ui.inc:144 ++#: ../inventory/includes/item_adjustments_ui.inc:62 ++#: ../inventory/includes/stock_transfers_ui.inc:60 ++#: ../manufacturing/includes/work_order_issue_ui.inc:33 ++#: ../purchasing/includes/ui/po_ui.inc.orig:243 ++#: ../purchasing/po_receive_items.php:62 ++#: ../purchasing/view/view_grn.php:40 ++#: ../purchasing/view/view_po.php:45 ++#: ../reporting/includes/doctext.inc:29 ++#: ../reporting/includes/doctext.inc:191 ++#: ../reporting/includes/doctext.inc:228 ++#: ../sales/customer_credit_invoice.php:280 ++#: ../sales/customer_delivery.php:445 ++#: ../sales/customer_invoice.php:541 ++#: ../sales/customer_invoice.php:544 ++#: ../sales/view/view_credit.php:90 ++#: ../sales/view/view_dispatch.php:112 ++#: ../sales/view/view_invoice.php:115 ++#: ../sales/view/view_sales_order.php:219 ++#: ../sales/includes/ui/sales_credit_ui.inc:167 ++#: ../sales/includes/ui/sales_order_ui.inc:145 + msgid "Item Code" + msgstr "" + -#: inventory/includes/item_adjustments_ui.inc:62 -#: inventory/includes/stock_transfers_ui.inc:60 -#: manufacturing/includes/work_order_issue_ui.inc:33 -#: purchasing/includes/ui/po_ui.inc:233 purchasing/view/view_grn.php:40 -#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:29 -#: reporting/includes/doctext.inc:169 reporting/includes/doctext.inc:206 -#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:431 -#: sales/customer_invoice.php:469 sales/view/view_credit.php:90 -#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113 -#: sales/view/view_sales_order.php:201 -#: sales/includes/ui/sales_credit_ui.inc:167 -#: sales/includes/ui/sales_order_ui.inc:144 ++#: ../inventory/includes/item_adjustments_ui.inc:62 ++#: ../inventory/includes/stock_transfers_ui.inc:60 ++#: ../manufacturing/includes/work_order_issue_ui.inc:33 ++#: ../purchasing/includes/ui/po_ui.inc.orig:243 ++#: ../purchasing/view/view_grn.php:40 ++#: ../purchasing/view/view_po.php:45 ++#: ../reporting/includes/doctext.inc:29 ++#: ../reporting/includes/doctext.inc:191 ++#: ../reporting/includes/doctext.inc:228 ++#: ../sales/customer_credit_invoice.php:280 ++#: ../sales/customer_delivery.php:445 ++#: ../sales/customer_invoice.php:541 ++#: ../sales/customer_invoice.php:544 ++#: ../sales/view/view_credit.php:90 ++#: ../sales/view/view_dispatch.php:112 ++#: ../sales/view/view_invoice.php:115 ++#: ../sales/view/view_sales_order.php:219 ++#: ../sales/includes/ui/sales_credit_ui.inc:167 ++#: ../sales/includes/ui/sales_order_ui.inc:145 + msgid "Item Description" + msgstr "" + -#: inventory/includes/item_adjustments_ui.inc:62 -#: inventory/includes/stock_transfers_ui.inc:60 -#: inventory/manage/item_codes.php:124 inventory/manage/sales_kits.php:40 -#: inventory/view/view_adjustment.php:56 inventory/view/view_transfer.php:56 -#: manufacturing/view/wo_issue_view.php:77 -#: manufacturing/manage/bom_edit.php:71 -#: manufacturing/includes/manufacturing_ui.inc:29 -#: manufacturing/includes/manufacturing_ui.inc:157 -#: manufacturing/includes/manufacturing_ui.inc:332 -#: manufacturing/includes/work_order_issue_ui.inc:33 -#: purchasing/includes/ui/invoice_ui.inc:497 -#: purchasing/includes/ui/po_ui.inc:233 purchasing/view/view_grn.php:40 -#: purchasing/view/view_po.php:45 reporting/rep301.php:105 -#: reporting/rep303.php:121 reporting/rep303.php:127 reporting/rep401.php:71 -#: reporting/includes/doctext.inc:29 reporting/includes/doctext.inc:170 -#: reporting/includes/doctext.inc:203 sales/view/view_credit.php:90 -#: sales/view/view_dispatch.php:112 sales/view/view_invoice.php:113 -#: sales/view/view_sales_order.php:201 -#: sales/includes/ui/sales_credit_ui.inc:167 -#: sales/includes/ui/sales_order_ui.inc:144 +#: ../inventory/includes/item_adjustments_ui.inc:62 +#: ../inventory/includes/stock_transfers_ui.inc:60 +#: ../inventory/manage/item_codes.php:124 +#: ../inventory/manage/sales_kits.php:40 +#: ../inventory/view/view_adjustment.php:56 +#: ../inventory/view/view_transfer.php:56 +#: ../manufacturing/view/wo_issue_view.php:77 +#: ../manufacturing/manage/bom_edit.php:71 +#: ../manufacturing/includes/manufacturing_ui.inc:29 +#: ../manufacturing/includes/manufacturing_ui.inc:157 +#: ../manufacturing/includes/manufacturing_ui.inc:332 +#: ../manufacturing/includes/work_order_issue_ui.inc:33 - #: ../purchasing/includes/ui/invoice_ui.inc:505 - #: ../purchasing/includes/ui/po_ui.inc:243 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:505 +#: ../purchasing/includes/ui/po_ui.inc.orig:243 +#: ../purchasing/view/view_grn.php:40 +#: ../purchasing/view/view_po.php:45 - #: ../reporting/rep301.php:103 - #: ../reporting/rep303.php:109 - #: ../reporting/rep303.php:115 - #: ../reporting/rep401.php:69 ++#: ../reporting/rep301.php:105 ++#: ../reporting/rep303.php:121 ++#: ../reporting/rep303.php:127 ++#: ../reporting/rep401.php:71 +#: ../reporting/includes/doctext.inc:29 +#: ../reporting/includes/doctext.inc:192 +#: ../reporting/includes/doctext.inc:225 +#: ../sales/customer_invoice.php:541 +#: ../sales/view/view_credit.php:90 +#: ../sales/view/view_dispatch.php:112 +#: ../sales/view/view_invoice.php:115 +#: ../sales/view/view_sales_order.php:219 - #: ../sales/view/view_sales_order.php.orig:201 +#: ../sales/includes/ui/sales_credit_ui.inc:167 - #: ../sales/includes/ui/sales_order_ui.inc.orig:140 ++#: ../sales/includes/ui/sales_order_ui.inc:145 msgid "Quantity" msgstr "" -#: inventory/includes/item_adjustments_ui.inc:63 -#: inventory/includes/stock_transfers_ui.inc:60 -#: inventory/manage/item_units.php:94 -#: manufacturing/includes/work_order_issue_ui.inc:34 -#: purchasing/includes/ui/po_ui.inc:234 purchasing/view/view_grn.php:41 -#: purchasing/view/view_po.php:45 reporting/includes/doctext.inc:30 -#: reporting/includes/doctext.inc:170 sales/view/view_credit.php:91 -#: sales/view/view_dispatch.php:113 sales/view/view_invoice.php:114 -#: sales/view/view_sales_order.php:201 -#: sales/includes/ui/sales_credit_ui.inc:167 -#: sales/includes/ui/sales_order_ui.inc:146 +#: ../inventory/includes/item_adjustments_ui.inc:63 +#: ../inventory/includes/stock_transfers_ui.inc:60 +#: ../inventory/manage/item_units.php:94 +#: ../manufacturing/includes/work_order_issue_ui.inc:34 - #: ../purchasing/includes/ui/po_ui.inc:244 +#: ../purchasing/includes/ui/po_ui.inc.orig:244 +#: ../purchasing/view/view_grn.php:41 +#: ../purchasing/view/view_po.php:45 +#: ../reporting/includes/doctext.inc:30 +#: ../reporting/includes/doctext.inc:192 +#: ../sales/view/view_credit.php:91 +#: ../sales/view/view_dispatch.php:113 +#: ../sales/view/view_invoice.php:116 +#: ../sales/view/view_sales_order.php:219 - #: ../sales/view/view_sales_order.php.orig:201 +#: ../sales/includes/ui/sales_credit_ui.inc:167 - #: ../sales/includes/ui/sales_order_ui.inc.orig:142 ++#: ../sales/includes/ui/sales_order_ui.inc:147 msgid "Unit" msgstr "" -#: inventory/includes/item_adjustments_ui.inc:63 -#: inventory/view/view_adjustment.php:57 -#: manufacturing/includes/manufacturing_ui.inc:29 -#: manufacturing/includes/work_order_issue_ui.inc:34 reporting/rep301.php:105 +#: ../inventory/includes/item_adjustments_ui.inc:63 +#: ../inventory/view/view_adjustment.php:57 +#: ../manufacturing/includes/manufacturing_ui.inc:29 +#: ../manufacturing/includes/work_order_issue_ui.inc:34 - #: ../reporting/rep301.php:103 ++#: ../reporting/rep301.php:105 msgid "Unit Cost" msgstr "" -#: inventory/includes/stock_transfers_ui.inc:35 -#: inventory/inquiry/stock_movements.php:60 -#: manufacturing/includes/work_order_issue_ui.inc:164 +#: ../inventory/includes/stock_transfers_ui.inc:35 +#: ../inventory/inquiry/stock_movements.php:56 - #: ../inventory/inquiry/stock_movements.php.orig:58 +#: ../manufacturing/includes/work_order_issue_ui.inc:164 msgid "From Location:" msgstr "" @@@ -8731,75 -7456,66 +8659,71 @@@ msgstr " msgid "Transfer Type:" msgstr "" - #: ../inventory/includes/db/items_db.inc:119 -#: inventory/includes/db/items_db.inc:119 ++#: ../inventory/includes/db/items_db.inc:121 msgid "" "Cannot delete this item because there are stock movements that refer to this " "item." msgstr "" - #: ../inventory/includes/db/items_db.inc:122 -#: inventory/includes/db/items_db.inc:122 ++#: ../inventory/includes/db/items_db.inc:124 msgid "" "Cannot delete this item record because there are bills of material that " "require this part as a component." msgstr "" - #: ../inventory/includes/db/items_db.inc:125 - #: ../inventory/includes/db/items_db.inc:128 -#: inventory/includes/db/items_db.inc:125 -#: inventory/includes/db/items_db.inc:128 ++#: ../inventory/includes/db/items_db.inc:127 ++#: ../inventory/includes/db/items_db.inc:130 msgid "" "Cannot delete this item because there are existing purchase order items for " "it." msgstr "" - #: ../inventory/includes/db/items_db.inc:146 -#: inventory/includes/db/items_db.inc:146 ++#: ../inventory/includes/db/items_db.inc:148 msgid "" "This item cannot be deleted because some code aliases \n" "\t\t\t\tor foreign codes was entered for it, or there are kits defined \n" "\t\t\t\tusing this item as component" msgstr "" -#: inventory/inquiry/stock_movements.php:28 +#: ../inventory/inquiry/stock_movements.php:26 - #: ../inventory/inquiry/stock_movements.php.orig:27 msgid "Inventory Item Movement" msgstr "" -#: inventory/inquiry/stock_movements.php:65 +#: ../inventory/inquiry/stock_movements.php:61 - #: ../inventory/inquiry/stock_movements.php.orig:63 msgid "Show Movements" msgstr "" -#: inventory/inquiry/stock_movements.php:65 -#: purchasing/includes/ui/invoice_ui.inc:466 -#: purchasing/inquiry/supplier_allocation_inquiry.php:57 -#: purchasing/inquiry/supplier_inquiry.php:58 -#: sales/inquiry/customer_allocation_inquiry.php:51 -#: sales/inquiry/customer_inquiry.php:58 +#: ../inventory/inquiry/stock_movements.php:61 - #: ../inventory/inquiry/stock_movements.php.orig:63 - #: ../purchasing/includes/ui/invoice_ui.inc:474 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:474 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:57 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:57 +#: ../purchasing/inquiry/supplier_inquiry.php:55 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:55 +#: ../sales/inquiry/customer_allocation_inquiry.php:51 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:51 +#: ../sales/inquiry/customer_inquiry.php:54 ++#: ../sales/inquiry/customer_inquiry.php.orig:54 msgid "Refresh Inquiry" msgstr "" - #: ../inventory/inquiry/stock_movements.php:77 - #: ../inventory/inquiry/stock_movements.php.orig:79 -#: inventory/inquiry/stock_movements.php:84 ++#: ../inventory/inquiry/stock_movements.php:80 msgid "Detail" msgstr "" - #: ../inventory/inquiry/stock_movements.php:78 - #: ../inventory/inquiry/stock_movements.php.orig:80 -#: inventory/inquiry/stock_movements.php:84 reporting/rep307.php:117 ++#: ../inventory/inquiry/stock_movements.php:80 ++#: ../reporting/rep307.php:117 msgid "Quantity In" msgstr "" - #: ../inventory/inquiry/stock_movements.php:78 - #: ../inventory/inquiry/stock_movements.php.orig:80 -#: inventory/inquiry/stock_movements.php:84 reporting/rep307.php:117 ++#: ../inventory/inquiry/stock_movements.php:80 ++#: ../reporting/rep307.php:117 msgid "Quantity Out" msgstr "" - #: ../inventory/inquiry/stock_movements.php:93 - #: ../inventory/inquiry/stock_movements.php.orig:95 -#: inventory/inquiry/stock_movements.php:101 ++#: ../inventory/inquiry/stock_movements.php:97 msgid "Quantity on hand before" msgstr "" - #: ../inventory/inquiry/stock_movements.php:181 - #: ../inventory/inquiry/stock_movements.php.orig:183 -#: inventory/inquiry/stock_movements.php:192 ++#: ../inventory/inquiry/stock_movements.php:188 msgid "Quantity on hand after" msgstr "" @@@ -8816,19 -7529,13 +8740,19 @@@ msgid " "on outstanding sales orders is shown." msgstr "" -#: inventory/inquiry/stock_status.php:72 inventory/inquiry/stock_status.php:77 -#: reporting/rep303.php:121 reporting/rep303.php:127 +#: ../inventory/inquiry/stock_status.php:66 +#: ../inventory/inquiry/stock_status.php:71 +#: ../inventory/inquiry/stock_status.php.orig:72 +#: ../inventory/inquiry/stock_status.php.orig:77 - #: ../reporting/rep303.php:109 - #: ../reporting/rep303.php:115 ++#: ../reporting/rep303.php:121 ++#: ../reporting/rep303.php:127 msgid "Demand" msgstr "" -#: inventory/inquiry/stock_status.php:77 reporting/rep303.php:121 -#: reporting/rep303.php:127 +#: ../inventory/inquiry/stock_status.php:71 +#: ../inventory/inquiry/stock_status.php.orig:77 - #: ../reporting/rep303.php:109 - #: ../reporting/rep303.php:115 ++#: ../reporting/rep303.php:121 ++#: ../reporting/rep303.php:127 msgid "On Order" msgstr "" @@@ -8862,18 -7569,12 +8786,18 @@@ msgstr " msgid "Tax type" msgstr "" -#: inventory/manage/item_categories.php:98 inventory/manage/item_codes.php:124 -#: inventory/manage/sales_kits.php:40 inventory/view/view_adjustment.php:57 -#: inventory/view/view_transfer.php:56 manufacturing/view/wo_issue_view.php:77 -#: manufacturing/manage/bom_edit.php:71 purchasing/po_receive_items.php:62 -#: sales/customer_credit_invoice.php:280 sales/customer_delivery.php:432 -#: sales/customer_invoice.php:469 +#: ../inventory/manage/item_categories.php:98 +#: ../inventory/manage/item_codes.php:124 +#: ../inventory/manage/sales_kits.php:40 +#: ../inventory/view/view_adjustment.php:57 +#: ../inventory/view/view_transfer.php:56 +#: ../manufacturing/view/wo_issue_view.php:77 +#: ../manufacturing/manage/bom_edit.php:71 +#: ../purchasing/po_receive_items.php:62 +#: ../sales/customer_credit_invoice.php:280 - #: ../sales/customer_delivery.php.orig:445 ++#: ../sales/customer_delivery.php:446 +#: ../sales/customer_invoice.php:541 +#: ../sales/customer_invoice.php:544 msgid "Units" msgstr "" @@@ -8897,44 -7598,35 +8821,45 @@@ msgstr " msgid "Assembly Account" msgstr "" - #: ../inventory/manage/item_categories.php:180 -#: inventory/manage/item_categories.php:180 ++#: ../inventory/manage/item_categories.php:182 msgid "Category Name:" msgstr "" - #: ../inventory/manage/item_categories.php:182 -#: inventory/manage/item_categories.php:182 ++#: ../inventory/manage/item_categories.php:184 msgid "Default values for new items" msgstr "" - #: ../inventory/manage/item_categories.php:184 - #: ../inventory/manage/items.php:333 - #: ../inventory/manage/items.php.orig:326 -#: inventory/manage/item_categories.php:184 inventory/manage/items.php:326 ++#: ../inventory/manage/item_categories.php:186 ++#: ../inventory/manage/items.php.orig:336 msgid "Item Tax Type:" msgstr "" - #: ../inventory/manage/item_categories.php:186 - #: ../inventory/manage/items.php:335 - #: ../inventory/manage/items.php.orig:328 -#: inventory/manage/item_categories.php:186 inventory/manage/items.php:328 ++#: ../inventory/manage/item_categories.php:188 ++#: ../inventory/manage/items.php.orig:338 msgid "Item Type:" msgstr "" - #: ../inventory/manage/item_categories.php:188 - #: ../inventory/manage/items.php:337 - #: ../inventory/manage/items.php.orig:330 -#: inventory/manage/item_categories.php:188 inventory/manage/items.php:330 ++#: ../inventory/manage/item_categories.php:190 ++#: ../inventory/manage/items.php.orig:340 msgid "Units of Measure:" msgstr "" - #: ../inventory/manage/item_categories.php:190 - #: ../inventory/manage/items.php:341 - #: ../inventory/manage/items.php.orig:334 -#: inventory/manage/item_categories.php:190 inventory/manage/items.php:334 ++#: ../inventory/manage/item_categories.php:192 ++#: ../inventory/manage/items.php.orig:344 msgid "Exclude from sales:" msgstr "" -#: inventory/manage/item_codes.php:16 ++#: ../inventory/manage/item_categories.php:194 ++#: ../inventory/manage/items.php.orig:346 ++msgid "Exclude from purchases:" ++msgstr "" ++ +#: ../inventory/manage/item_codes.php:16 msgid "Foreign Item Codes" msgstr "" -#: inventory/manage/item_codes.php:23 sales/sales_order_entry.php:682 +#: ../inventory/manage/item_codes.php:23 - #: ../sales/sales_order_entry.php:690 ++#: ../sales/sales_order_entry.php:698 msgid "There are no inventory items defined in the system." msgstr "" @@@ -8947,10 -7638,8 +8872,9 @@@ msgstr " msgid "Item code description cannot be empty." msgstr "" -#: inventory/manage/item_codes.php:55 inventory/manage/items.php:156 -#: inventory/manage/sales_kits.php:88 +#: ../inventory/manage/item_codes.php:55 - #: ../inventory/manage/items.php:163 - #: ../inventory/manage/items.php.orig:156 ++#: ../inventory/manage/items.php.orig:164 +#: ../inventory/manage/sales_kits.php:88 msgid "This item code is already assigned to stock item or sale kit." msgstr "" @@@ -8970,16 -7659,12 +8894,23 @@@ msgstr " msgid "EAN/UPC Code" msgstr "" -#: inventory/manage/item_codes.php:125 reporting/rep104.php:117 -#: reporting/rep105.php:119 reporting/rep301.php:105 reporting/rep301.php:111 -#: reporting/rep302.php:124 reporting/rep302.php:131 reporting/rep303.php:133 -#: reporting/rep304.php:114 reporting/rep304.php:122 reporting/rep306.php:141 -#: reporting/rep306.php:149 reporting/rep307.php:117 reporting/rep307.php:123 -#: reporting/rep308.php:149 reporting/rep308.php:156 reporting/rep309.php:104 +#: ../inventory/manage/item_codes.php:125 - #: ../reporting/rep104.php:115 - #: ../reporting/rep105.php:117 - #: ../reporting/rep301.php:103 - #: ../reporting/rep301.php:109 - #: ../reporting/rep302.php:122 - #: ../reporting/rep302.php:129 - #: ../reporting/rep303.php:121 - #: ../reporting/rep304.php:112 - #: ../reporting/rep304.php:120 ++#: ../reporting/rep104.php:117 ++#: ../reporting/rep105.php:119 ++#: ../reporting/rep301.php:105 ++#: ../reporting/rep301.php:111 ++#: ../reporting/rep302.php:124 ++#: ../reporting/rep302.php:131 ++#: ../reporting/rep303.php:133 ++#: ../reporting/rep304.php:114 ++#: ../reporting/rep304.php:122 ++#: ../reporting/rep306.php:141 ++#: ../reporting/rep306.php:149 ++#: ../reporting/rep307.php:117 ++#: ../reporting/rep307.php:123 ++#: ../reporting/rep308.php:149 ++#: ../reporting/rep308.php:156 ++#: ../reporting/rep309.php:104 msgid "Category" msgstr "" @@@ -8995,197 -7679,155 +8926,164 @@@ msgstr " msgid "Quantity:" msgstr "" -#: inventory/manage/item_codes.php:180 inventory/manage/items.php:301 -#: inventory/manage/movement_types.php:129 inventory/manage/sales_kits.php:206 -#: inventory/manage/sales_kits.php:232 -#: manufacturing/manage/work_centres.php:138 -#: sales/manage/credit_status.php:145 sales/manage/recurrent_invoices.php:165 -#: taxes/item_tax_types.php:173 taxes/tax_groups.php:167 -#: taxes/tax_types.php:158 +#: ../inventory/manage/item_codes.php:180 - #: ../inventory/manage/items.php:308 - #: ../inventory/manage/items.php.orig:301 ++#: ../inventory/manage/items.php.orig:310 +#: ../inventory/manage/movement_types.php:129 +#: ../inventory/manage/sales_kits.php:206 +#: ../inventory/manage/sales_kits.php:232 +#: ../manufacturing/manage/work_centres.php:138 +#: ../sales/manage/credit_status.php:145 +#: ../sales/manage/recurrent_invoices.php:165 +#: ../taxes/item_tax_types.php:173 ++#: ../taxes/sav.tax_types.php:241 +#: ../taxes/tax_groups.php:162 - #: ../taxes/tax_groups.php.orig:164 - #: ../taxes/tax_groups.php.sav:164 +#: ../taxes/tax_types.php:158 msgid "Description:" msgstr "" -#: inventory/manage/item_codes.php:181 inventory/manage/items.php:303 -#: inventory/manage/sales_kits.php:207 inventory/manage/sales_kits.php:233 +#: ../inventory/manage/item_codes.php:181 - #: ../inventory/manage/items.php:310 - #: ../inventory/manage/items.php.orig:303 ++#: ../inventory/manage/items.php.orig:312 +#: ../inventory/manage/sales_kits.php:207 +#: ../inventory/manage/sales_kits.php:233 msgid "Category:" msgstr "" - #: ../inventory/manage/items.php:82 - #: ../inventory/manage/items.php.orig:80 -#: inventory/manage/items.php:80 ++#: ../inventory/manage/items.php.orig:82 msgid "" "Only graphics files are supported - a file extension of .jpg, .png or .gif " "is expected" msgstr "" - #: ../inventory/manage/items.php:113 - #: ../inventory/manage/items.php.orig:106 -#: inventory/manage/items.php:106 ++#: ../inventory/manage/items.php.orig:113 msgid "" "There are no item categories defined in the system. At least one item " "category is required to add a item." msgstr "" - #: ../inventory/manage/items.php:115 - #: ../inventory/manage/items.php.orig:108 -#: inventory/manage/items.php:108 ++#: ../inventory/manage/items.php.orig:115 msgid "" "There are no item tax types defined in the system. At least one item tax " "type is required to add a item." msgstr "" - #: ../inventory/manage/items.php:142 - #: ../inventory/manage/items.php.orig:135 -#: inventory/manage/items.php:135 ++#: ../inventory/manage/items.php.orig:143 msgid "The item name must be entered." msgstr "" - #: ../inventory/manage/items.php:148 - #: ../inventory/manage/items.php.orig:141 -#: inventory/manage/items.php:141 ++#: ../inventory/manage/items.php.orig:149 msgid "The item code cannot be empty" msgstr "" - #: ../inventory/manage/items.php:156 - #: ../inventory/manage/items.php.orig:149 -#: inventory/manage/items.php:149 ++#: ../inventory/manage/items.php.orig:157 msgid "" "The item code cannot contain any of the following characters - & + OR a " "space OR quotes" msgstr "" - #: ../inventory/manage/items.php:192 - #: ../inventory/manage/items.php.orig:185 -#: inventory/manage/items.php:185 ++#: ../inventory/manage/items.php.orig:193 msgid "Item has been updated." msgstr "" - #: ../inventory/manage/items.php:205 - #: ../inventory/manage/items.php.orig:198 -#: inventory/manage/items.php:198 ++#: ../inventory/manage/items.php.orig:206 msgid "A new item has been added." msgstr "" - #: ../inventory/manage/items.php:248 - #: ../inventory/manage/items.php.orig:241 -#: inventory/manage/items.php:241 ++#: ../inventory/manage/items.php.orig:249 msgid "Selected item has been deleted." msgstr "" - #: ../inventory/manage/items.php:265 - #: ../inventory/manage/items.php.orig:258 -#: inventory/manage/items.php:258 inventory/view/view_adjustment.php:56 -#: inventory/view/view_transfer.php:39 inventory/view/view_transfer.php:56 -#: manufacturing/search_work_orders.php:163 -#: manufacturing/view/wo_issue_view.php:44 -#: manufacturing/view/wo_production_view.php:45 -#: purchasing/includes/ui/invoice_ui.inc:484 -#: purchasing/includes/ui/invoice_ui.inc:496 reporting/rep204.php:84 -#: reporting/rep306.php:152 ++#: ../inventory/manage/items.php.orig:266 +#: ../inventory/view/view_adjustment.php:56 +#: ../inventory/view/view_transfer.php:39 +#: ../inventory/view/view_transfer.php:56 +#: ../manufacturing/search_work_orders.php:163 +#: ../manufacturing/view/wo_issue_view.php:44 +#: ../manufacturing/view/wo_production_view.php:45 - #: ../purchasing/includes/ui/invoice_ui.inc:492 - #: ../purchasing/includes/ui/invoice_ui.inc:504 - #: ../reporting/rep204.php:82 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:492 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:504 ++#: ../reporting/rep204.php:84 ++#: ../reporting/rep306.php:152 msgid "Item" msgstr "" - #: ../inventory/manage/items.php:270 - #: ../inventory/manage/items.php:301 - #: ../inventory/manage/items.php.orig:263 - #: ../inventory/manage/items.php.orig:294 -#: inventory/manage/items.php:263 inventory/manage/items.php:294 ++#: ../inventory/manage/items.php.orig:271 ++#: ../inventory/manage/items.php.orig:303 msgid "Item Code:" msgstr "" - #: ../inventory/manage/items.php:339 - #: ../inventory/manage/items.php.orig:332 -#: inventory/manage/items.php:332 ++#: ../inventory/manage/items.php.orig:342 msgid "Editable description:" msgstr "" - #: ../inventory/manage/items.php:359 - #: ../inventory/manage/items.php.orig:352 -#: inventory/manage/items.php:352 sales/manage/customer_branches.php:248 ++#: ../inventory/manage/items.php.orig:364 +#: ../sales/manage/customer_branches.php:249 msgid "GL Accounts" msgstr "" - #: ../inventory/manage/items.php:382 - #: ../inventory/manage/items.php.orig:375 -#: inventory/manage/items.php:375 ++#: ../inventory/manage/items.php.orig:387 msgid "Other" msgstr "" - #: ../inventory/manage/items.php:385 - #: ../inventory/manage/items.php.orig:378 -#: inventory/manage/items.php:378 ++#: ../inventory/manage/items.php.orig:390 msgid "Image File (.jpg)" msgstr "" - #: ../inventory/manage/items.php:400 - #: ../inventory/manage/items.php.orig:393 -#: inventory/manage/items.php:393 ++#: ../inventory/manage/items.php.orig:405 msgid "No image" msgstr "" - #: ../inventory/manage/items.php:405 - #: ../inventory/manage/items.php.orig:398 -#: inventory/manage/items.php:398 ++#: ../inventory/manage/items.php.orig:410 msgid "Delete Image:" msgstr "" - #: ../inventory/manage/items.php:407 - #: ../inventory/manage/items.php.orig:400 -#: inventory/manage/items.php:400 ++#: ../inventory/manage/items.php.orig:412 msgid "Item status:" msgstr "" - #: ../inventory/manage/items.php:413 - #: ../inventory/manage/items.php.orig:406 -#: inventory/manage/items.php:406 ++#: ../inventory/manage/items.php.orig:418 msgid "Insert New Item" msgstr "" - #: ../inventory/manage/items.php:417 - #: ../inventory/manage/items.php.orig:410 -#: inventory/manage/items.php:410 ++#: ../inventory/manage/items.php.orig:422 msgid "Update Item" msgstr "" - #: ../inventory/manage/items.php:420 - #: ../inventory/manage/items.php.orig:413 -#: inventory/manage/items.php:413 ++#: ../inventory/manage/items.php.orig:425 msgid "Select this items and return to document entry." msgstr "" - #: ../inventory/manage/items.php:421 - #: ../inventory/manage/items.php.orig:414 -#: inventory/manage/items.php:414 ++#: ../inventory/manage/items.php.orig:426 msgid "Clone This Item" msgstr "" - #: ../inventory/manage/items.php:422 - #: ../inventory/manage/items.php.orig:415 -#: inventory/manage/items.php:415 ++#: ../inventory/manage/items.php.orig:427 msgid "Delete This Item" msgstr "" - #: ../inventory/manage/items.php:437 - #: ../inventory/manage/items.php.orig:430 -#: inventory/manage/items.php:430 ++#: ../inventory/manage/items.php.orig:442 msgid "Select an item:" msgstr "" - #: ../inventory/manage/items.php:438 - #: ../inventory/manage/items.php.orig:431 -#: inventory/manage/items.php:431 ++#: ../inventory/manage/items.php.orig:443 msgid "New item" msgstr "" - #: ../inventory/manage/items.php:461 - #: ../inventory/manage/items.php.orig:454 - #: ../purchasing/manage/suppliers.php:308 - #: ../purchasing/manage/suppliers.php.orig:311 -#: inventory/manage/items.php:454 purchasing/manage/suppliers.php:306 -#: sales/manage/customer_branches.php:322 sales/manage/customers.php:344 ++#: ../inventory/manage/items.php.orig:466 ++#: ../purchasing/manage/suppliers.php.orig:308 +#: ../sales/manage/customer_branches.php:324 - #: ../sales/manage/customers.php:344 ++#: ../sales/manage/customers.php:347 +#: ../sales/manage/sav.customers.php:342 msgid "&General settings" msgstr "" - #: ../inventory/manage/items.php:462 - #: ../inventory/manage/items.php.orig:455 - #: ../purchasing/manage/suppliers.php:310 - #: ../purchasing/manage/suppliers.php.orig:313 - #: ../sales/manage/customers.php:346 -#: inventory/manage/items.php:455 -msgid "S&ales Pricing" -msgstr "" - -#: inventory/manage/items.php:456 -msgid "&Purchasing Pricing" -msgstr "" - -#: inventory/manage/items.php:459 purchasing/manage/suppliers.php:308 -#: sales/manage/customers.php:346 ++#: ../inventory/manage/items.php.orig:467 ++#: ../purchasing/manage/suppliers.php.orig:310 ++#: ../sales/manage/customers.php:349 +#: ../sales/manage/sav.customers.php:344 msgid "&Transactions" msgstr "" - #: ../inventory/manage/items.php:463 - #: ../inventory/manage/items.php.orig:456 -#: inventory/manage/items.php:460 ++#: ../inventory/manage/items.php.orig:468 msgid "&Status" msgstr "" @@@ -9490,12 -8121,11 +9388,12 @@@ msgstr " msgid "for item:" msgstr "" -#: manufacturing/search_work_orders.php:78 -#: purchasing/inquiry/po_search_completed.php:77 -#: purchasing/inquiry/po_search.php:76 -#: sales/inquiry/sales_deliveries_view.php:116 -#: sales/inquiry/sales_orders_view.php:247 +#: ../manufacturing/search_work_orders.php:78 +#: ../purchasing/inquiry/po_search_completed.php:74 +#: ../purchasing/inquiry/po_search_completed.php.orig:75 +#: ../purchasing/inquiry/po_search.php:76 +#: ../sales/inquiry/sales_deliveries_view.php:116 - #: ../sales/inquiry/sales_orders_view.php:269 ++#: ../sales/inquiry/sales_orders_view.php.orig:269 msgid "Select documents" msgstr "" @@@ -9519,11 -8149,10 +9417,11 @@@ msgstr " msgid "Required" msgstr "" -#: manufacturing/search_work_orders.php:167 -#: manufacturing/includes/manufacturing_ui.inc:277 -#: manufacturing/includes/manufacturing_ui.inc:281 -#: reporting/includes/doctext.inc:205 sales/inquiry/sales_orders_view.php:268 +#: ../manufacturing/search_work_orders.php:167 +#: ../manufacturing/includes/manufacturing_ui.inc:277 +#: ../manufacturing/includes/manufacturing_ui.inc:281 +#: ../reporting/includes/doctext.inc:227 - #: ../sales/inquiry/sales_orders_view.php:290 ++#: ../sales/inquiry/sales_orders_view.php.orig:290 msgid "Required By" msgstr "" @@@ -9539,17 -8168,16 +9437,17 @@@ msgstr " msgid "The manufacturing process has been entered." msgstr "" -#: manufacturing/work_order_add_finished.php:46 -#: manufacturing/work_order_costs.php:45 manufacturing/work_order_entry.php:56 -#: manufacturing/work_order_issue.php:38 -#: manufacturing/work_order_release.php:75 +#: ../manufacturing/work_order_add_finished.php:46 +#: ../manufacturing/work_order_costs.php:45 +#: ../manufacturing/work_order_entry.php:56 +#: ../manufacturing/work_order_issue.php:40 - #: ../manufacturing/work_order_release.php:72 ++#: ../manufacturing/work_order_release.php:75 msgid "View this Work Order" msgstr "" -#: manufacturing/work_order_add_finished.php:48 -#: manufacturing/work_order_costs.php:47 manufacturing/work_order_entry.php:64 -#: manufacturing/work_order_issue.php:40 +#: ../manufacturing/work_order_add_finished.php:48 - #: ../manufacturing/work_order_entry.php:65 ++#: ../manufacturing/work_order_entry.php:64 +#: ../manufacturing/work_order_issue.php:42 msgid "View the GL Journal Entries for this Work Order" msgstr "" @@@ -9605,9 -8232,9 +9503,9 @@@ msgstr " msgid "Return Items to Work Order" msgstr "" -#: manufacturing/work_order_add_finished.php:214 -#: purchasing/allocations/supplier_allocate.php:64 -#: sales/allocations/customer_allocate.php:63 +#: ../manufacturing/work_order_add_finished.php:214 - #: ../purchasing/allocations/supplier_allocate.php:65 - #: ../sales/allocations/customer_allocate.php:64 ++#: ../purchasing/allocations/supplier_allocate.php:74 ++#: ../sales/allocations/customer_allocate.php:72 msgid "Process" msgstr "" @@@ -9660,15 -8287,15 +9558,15 @@@ msgstr " msgid "The work order been added." msgstr "" -#: manufacturing/work_order_entry.php:62 +#: ../manufacturing/work_order_entry.php:62 - msgid "Print this Work Order" + msgid "&Print This Work Order" msgstr "" - #: ../manufacturing/work_order_entry.php:64 - msgid "Email this Work Order" -#: manufacturing/work_order_entry.php:63 ++#: ../manufacturing/work_order_entry.php:63 + msgid "&Email This Work Order" msgstr "" -#: manufacturing/work_order_entry.php:80 +#: ../manufacturing/work_order_entry.php:80 msgid "The work order been updated." msgstr "" @@@ -9820,34 -8447,34 +9718,34 @@@ msgstr " msgid "This work order has already been released." msgstr "" - #: ../manufacturing/work_order_release.php:57 -#: manufacturing/work_order_release.php:60 ++#: ../manufacturing/work_order_release.php:60 msgid "" "This Work Order cannot be released. The selected item to manufacture does " "not have a bom." msgstr "" - #: ../manufacturing/work_order_release.php:70 -#: manufacturing/work_order_release.php:73 ++#: ../manufacturing/work_order_release.php:73 msgid "The work order has been released to manufacturing." msgstr "" - #: ../manufacturing/work_order_release.php:74 -#: manufacturing/work_order_release.php:77 ++#: ../manufacturing/work_order_release.php:77 msgid "Select another &work order" msgstr "" - #: ../manufacturing/work_order_release.php:95 -#: manufacturing/work_order_release.php:98 ++#: ../manufacturing/work_order_release.php:98 msgid "Work Order #:" msgstr "" - #: ../manufacturing/work_order_release.php:96 -#: manufacturing/work_order_release.php:99 ++#: ../manufacturing/work_order_release.php:99 msgid "Work Order Reference:" msgstr "" - #: ../manufacturing/work_order_release.php:98 -#: manufacturing/work_order_release.php:101 -#: manufacturing/includes/manufacturing_ui.inc:278 ++#: ../manufacturing/work_order_release.php:101 +#: ../manufacturing/includes/manufacturing_ui.inc:278 msgid "Released Date" msgstr "" - #: ../manufacturing/work_order_release.php:104 -#: manufacturing/work_order_release.php:107 ++#: ../manufacturing/work_order_release.php:107 msgid "Release Work Order" msgstr "" @@@ -9889,11 -8507,10 +9787,11 @@@ msgstr " msgid "There are no items for this issue." msgstr "" -#: manufacturing/view/wo_issue_view.php:77 -#: manufacturing/includes/manufacturing_ui.inc:28 -#: manufacturing/includes/manufacturing_ui.inc:83 reporting/rep401.php:71 -#: reporting/rep401.php:76 +#: ../manufacturing/view/wo_issue_view.php:77 +#: ../manufacturing/includes/manufacturing_ui.inc:28 +#: ../manufacturing/includes/manufacturing_ui.inc:83 - #: ../reporting/rep401.php:69 - #: ../reporting/rep401.php:74 ++#: ../reporting/rep401.php:71 ++#: ../reporting/rep401.php:76 msgid "Component" msgstr "" @@@ -9925,8 -8542,7 +9823,8 @@@ msgstr " msgid "BOM for item:" msgstr "" -#: manufacturing/view/work_order_view.php:56 reporting/rep409.php:88 +#: ../manufacturing/view/work_order_view.php:56 - #: ../reporting/rep409.php:91 ++#: ../reporting/rep409.php:88 msgid "Work Order Requirements" msgstr "" @@@ -9997,8 -8613,7 +9895,8 @@@ msgid " "work centre be defined." msgstr "" -#: manufacturing/manage/bom_edit.php:70 reporting/rep105.php:114 +#: ../manufacturing/manage/bom_edit.php:70 - #: ../reporting/rep105.php:112 ++#: ../reporting/rep105.php:114 msgid "Code" msgstr "" @@@ -10179,734 -8794,572 +10077,711 @@@ msgstr " msgid "Reversed the production " msgstr "" - #: ../manufacturing/includes/db/work_orders_db.inc:79 -#: manufacturing/includes/db/work_orders_db.inc:278 -#: purchasing/includes/db/po_db.inc:116 -#: sales/includes/db/cust_trans_db.inc:111 -#: sales/includes/db/sales_order_db.inc:267 ++#: ../manufacturing/includes/db/work_orders_db.inc.orig:79 +#: ../purchasing/includes/db/po_db.inc:123 - #: ../sales/includes/db/cust_trans_db.inc:114 ++#: ../sales/includes/db/cust_trans_db.inc:118 ++#: ../sales/includes/db/cust_trans_db.inc.orig:114 +#: ../sales/includes/db/old.sales_order_db.inc:249 - #: ../sales/includes/db/sales_order_db.inc:261 +#: ../sales/includes/db/sales_order_db.inc.orig:261 msgid "Updated." msgstr "" - #: ../manufacturing/includes/db/work_orders_db.inc:100 -#: manufacturing/includes/db/work_orders_db.inc:297 ++#: ../manufacturing/includes/db/work_orders_db.inc.orig:100 msgid "Canceled." msgstr "" - #: ../manufacturing/includes/db/work_orders_db.inc:176 -#: manufacturing/includes/db/work_orders_db.inc:373 ++#: ../manufacturing/includes/db/work_orders_db.inc.orig:176 msgid "Released." msgstr "" - #: ../manufacturing/includes/db/work_orders_quick_db.inc:89 -#: manufacturing/includes/db/work_orders_db.inc:445 -#: manufacturing/includes/db/work_orders_db.inc:461 -msgid "Voiding Work Order Trans # " -msgstr "" - -#: manufacturing/includes/db/work_orders_quick_db.inc:106 ++#: ../manufacturing/includes/db/work_orders_quick_db.inc.orig:89 msgid "Quick production." msgstr "" - #: ../manufacturing/includes/db/work_orders_quick_db.inc:169 -#: manufacturing/includes/db/work_orders_quick_db.inc:220 ++#: ../manufacturing/includes/db/work_orders_quick_db.inc.orig:169 msgid "Produced" msgstr "" - #: ../purchasing/includes/db/invoice_db.inc:298 -#: purchasing/includes/db/invoice_db.inc:311 ++#: ../purchasing/includes/db/invoice_db.inc.orig:298 msgid "Supplier invoice adjustment for zero inventory of " msgstr "" - #: ../purchasing/includes/db/invoice_db.inc:298 - #: ../reporting/rep106.php:81 -#: purchasing/includes/db/invoice_db.inc:311 reporting/rep106.php:83 -#: sales/inquiry/sales_deliveries_view.php:166 -#: sales/inquiry/sales_orders_view.php:147 ++#: ../purchasing/includes/db/invoice_db.inc.orig:298 ++#: ../reporting/rep106.php:83 +#: ../sales/inquiry/sales_deliveries_view.php:166 - #: ../sales/inquiry/sales_orders_view.php:159 ++#: ../sales/inquiry/sales_orders_view.php.orig:159 msgid "Invoice" msgstr "" - #: ../purchasing/includes/db/invoice_db.inc:716 - #: ../purchasing/includes/db/invoice_db.inc:718 -#: purchasing/includes/db/invoice_db.inc:659 -#: purchasing/includes/db/invoice_db.inc:661 ++#: ../purchasing/includes/db/invoice_db.inc.orig:716 ++#: ../purchasing/includes/db/invoice_db.inc.orig:718 msgid "GRN Removal" msgstr "" -#: purchasing/includes/ui/grn_ui.inc:23 purchasing/includes/ui/grn_ui.inc:55 -#: purchasing/includes/ui/po_ui.inc:316 sales/view/view_sales_order.php:74 +#: ../purchasing/includes/ui/grn_ui.inc:23 - #: ../purchasing/includes/ui/po_ui.inc:326 ++#: ../purchasing/includes/ui/grn_ui.inc:55 +#: ../purchasing/includes/ui/po_ui.inc.orig:326 +#: ../sales/view/view_sales_order.php:74 - #: ../sales/view/view_sales_order.php.orig:74 msgid "Order Currency" msgstr "" -#: purchasing/includes/ui/grn_ui.inc:25 purchasing/includes/ui/grn_ui.inc:57 +#: ../purchasing/includes/ui/grn_ui.inc:25 ++#: ../purchasing/includes/ui/grn_ui.inc:57 msgid "For Purchase Order" msgstr "" -#: purchasing/includes/ui/grn_ui.inc:28 purchasing/includes/ui/grn_ui.inc:59 -#: sales/view/view_sales_order.php:67 +#: ../purchasing/includes/ui/grn_ui.inc:28 ++#: ../purchasing/includes/ui/grn_ui.inc:59 +#: ../sales/view/view_sales_order.php:67 - #: ../sales/view/view_sales_order.php.orig:67 msgid "Ordered On" msgstr "" - #: ../purchasing/includes/ui/grn_ui.inc:40 - #: ../purchasing/includes/ui/grn_ui.inc:54 - #: ../purchasing/includes/ui/po_ui.inc:341 - #: ../purchasing/includes/ui/po_ui.inc:346 -#: purchasing/includes/ui/grn_ui.inc:33 purchasing/includes/ui/grn_ui.inc:69 -#: purchasing/includes/ui/po_ui.inc:331 purchasing/includes/ui/po_ui.inc:336 ++#: ../purchasing/includes/ui/grn_ui.inc:33 ++#: ../purchasing/includes/ui/grn_ui.inc:69 +#: ../purchasing/includes/ui/po_ui.inc.orig:341 +#: ../purchasing/includes/ui/po_ui.inc.orig:346 msgid "Deliver Into Location" msgstr "" - #: ../purchasing/includes/ui/grn_ui.inc:46 - msgid "Date Items Received" - msgstr "" - - #: ../purchasing/includes/ui/grn_ui.inc:49 - #: ../purchasing/includes/ui/grn_ui.inc:55 - #: ../purchasing/includes/ui/po_ui.inc:351 -#: purchasing/includes/ui/grn_ui.inc:34 purchasing/includes/ui/grn_ui.inc:79 -#: purchasing/includes/ui/po_ui.inc:341 -#: purchasing/view/view_supp_credit.php:44 -#: purchasing/view/view_supp_invoice.php:47 -#: purchasing/inquiry/po_search_completed.php:125 -#: purchasing/inquiry/po_search.php:134 -#: purchasing/inquiry/supplier_inquiry.php:172 -#: reporting/includes/doctext.inc:142 reporting/includes/doctext.inc:165 ++#: ../purchasing/includes/ui/grn_ui.inc:34 ++#: ../purchasing/includes/ui/grn_ui.inc:79 +#: ../purchasing/includes/ui/po_ui.inc.orig:351 +#: ../purchasing/view/view_supp_credit.php:44 +#: ../purchasing/view/view_supp_invoice.php:48 +#: ../purchasing/inquiry/po_search_completed.php:124 +#: ../purchasing/inquiry/po_search_completed.php.orig:123 +#: ../purchasing/inquiry/po_search.php:134 +#: ../purchasing/inquiry/supplier_inquiry.php:177 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:174 ++#: ../reporting/includes/doctext.inc:164 ++#: ../reporting/includes/doctext.inc:187 msgid "Supplier's Reference" msgstr "" - #: ../purchasing/includes/ui/grn_ui.inc:62 - #: ../purchasing/includes/ui/po_ui.inc:355 -#: purchasing/includes/ui/grn_ui.inc:38 purchasing/includes/ui/grn_ui.inc:81 -#: purchasing/includes/ui/po_ui.inc:345 sales/view/view_sales_order.php:79 ++#: ../purchasing/includes/ui/grn_ui.inc:38 ++#: ../purchasing/includes/ui/grn_ui.inc:81 +#: ../purchasing/includes/ui/po_ui.inc.orig:355 +#: ../sales/view/view_sales_order.php:92 - #: ../sales/view/view_sales_order.php.orig:79 msgid "Delivery Address" msgstr "" - #: ../purchasing/includes/ui/grn_ui.inc:65 - #: ../purchasing/includes/ui/po_ui.inc:367 -#: purchasing/includes/ui/grn_ui.inc:41 purchasing/includes/ui/grn_ui.inc:84 -#: purchasing/includes/ui/po_ui.inc:349 ++#: ../purchasing/includes/ui/grn_ui.inc:41 ++#: ../purchasing/includes/ui/grn_ui.inc:84 +#: ../purchasing/includes/ui/po_ui.inc.orig:367 msgid "Order Comments" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:108 -#: purchasing/includes/ui/grn_ui.inc:74 ++#: ../purchasing/includes/ui/grn_ui.inc:74 + msgid "Date Items Received" + msgstr "" + -#: purchasing/includes/ui/invoice_ui.inc:109 -#: purchasing/includes/ui/invoice_ui.inc:112 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:108 +msgid "Source Invoices:" +msgstr "" + - #: ../purchasing/includes/ui/invoice_ui.inc:110 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:110 msgid "Supplier's Ref.:" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:125 -#: purchasing/includes/ui/invoice_ui.inc:127 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:125 msgid "Terms:" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:137 -#: purchasing/includes/ui/invoice_ui.inc:139 -#: purchasing/manage/suppliers.php:98 purchasing/manage/suppliers.php:103 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:137 +#: ../purchasing/manage/suppliers.php:100 +#: ../purchasing/manage/suppliers.php:105 - #: ../purchasing/manage/suppliers.php.orig:101 - #: ../purchasing/manage/suppliers.php.orig:106 ++#: ../purchasing/manage/suppliers.php.orig:100 ++#: ../purchasing/manage/suppliers.php.orig:105 msgid "Supplier's Currency:" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:141 -#: purchasing/includes/ui/invoice_ui.inc:143 -#: purchasing/manage/suppliers.php:105 sales/manage/customer_branches.php:246 -#: sales/manage/customers.php:294 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:141 +#: ../purchasing/manage/suppliers.php:107 - #: ../purchasing/manage/suppliers.php.orig:108 ++#: ../purchasing/manage/suppliers.php.orig:107 +#: ../sales/manage/customer_branches.php:247 - #: ../sales/manage/customers.php:294 ++#: ../sales/manage/customers.php:297 +#: ../sales/manage/sav.customers.php:292 msgid "Tax Group:" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:159 -#: purchasing/includes/ui/invoice_ui.inc:158 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:159 msgid "Sub-total:" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:167 -#: purchasing/includes/ui/invoice_ui.inc:166 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:167 msgid "Invoice Total:" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:170 -#: purchasing/includes/ui/invoice_ui.inc:169 -#: sales/customer_credit_invoice.php:330 -#: sales/includes/ui/sales_credit_ui.inc:233 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:170 +#: ../sales/customer_credit_invoice.php:330 +#: ../sales/includes/ui/sales_credit_ui.inc:233 msgid "Credit Note Total" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:175 - #: ../purchasing/includes/ui/po_ui.inc.orig:487 - #: ../purchasing/po_entry_items.php.orig:554 -#: purchasing/includes/ui/invoice_ui.inc:200 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:175 ++#: ../purchasing/includes/ui/po_ui.inc.orig:485 ++#: ../purchasing/po_entry_items.php.orig:558 +msgid "Tax algorithm:" +msgstr "" + - #: ../purchasing/includes/ui/invoice_ui.inc:207 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:207 msgid "Add GL Line" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:208 -#: purchasing/includes/ui/invoice_ui.inc:201 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:208 msgid "Reset" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:209 - #: ../purchasing/po_receive_items.php:332 -#: purchasing/includes/ui/invoice_ui.inc:202 -#: purchasing/po_receive_items.php:335 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:209 ++#: ../purchasing/po_receive_items.php:333 msgid "Clear all GL entry fields" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:227 -#: purchasing/includes/ui/invoice_ui.inc:220 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:227 msgid "GL Items for this Invoice" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:229 -#: purchasing/includes/ui/invoice_ui.inc:222 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:229 msgid "GL Items for this Credit Note" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:239 -#: purchasing/includes/ui/invoice_ui.inc:232 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:239 msgid "Quick Entry:" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:412 -#: purchasing/includes/ui/invoice_ui.inc:405 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:412 msgid "Add to Invoice" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:414 -#: purchasing/includes/ui/invoice_ui.inc:407 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:414 msgid "Add to Credit Note" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:416 -#: purchasing/includes/ui/invoice_ui.inc:409 sales/customer_invoice.php:524 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:416 +#: ../sales/customer_invoice.php:603 msgid "Remove" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:416 - #: ../purchasing/includes/ui/invoice_ui.inc:451 -#: purchasing/includes/ui/invoice_ui.inc:409 -#: purchasing/includes/ui/invoice_ui.inc:444 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:416 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:451 msgid "" "WARNING! Be careful with removal. The operation is executed immediately and " "cannot be undone !!!" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:418 -#: purchasing/includes/ui/invoice_ui.inc:411 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:418 +#, php-format msgid "" -"You are about to remove all yet non-invoiced items from selected delivery " -"line. This operation also irreversibly changes related order line. Do you " -"want to continue ?" +"You are about to remove all yet non-invoiced items from delivery line #%d. " +"This operation also irreversibly changes related order line. Do you want to " +"continue ?" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:449 -#: purchasing/includes/ui/invoice_ui.inc:442 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:449 msgid "Items Received Yet to be Invoiced" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:454 -#: purchasing/includes/ui/invoice_ui.inc:447 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:454 msgid "Delivery Item Selected For Adding To A Supplier Credit Note" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:459 -#: purchasing/includes/ui/invoice_ui.inc:452 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:459 msgid "Received Items Charged on this Invoice" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:461 -#: purchasing/includes/ui/invoice_ui.inc:454 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:461 msgid "Received Items Credited on this Note" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:471 -#: purchasing/includes/ui/invoice_ui.inc:464 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:471 msgid "Received between" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:483 -#: purchasing/includes/ui/invoice_ui.inc:475 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:483 msgid "Add All Items" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:492 - #: ../purchasing/includes/ui/invoice_ui.inc:504 - #: ../sales/inquiry/sales_orders_view.php:167 -#: purchasing/includes/ui/invoice_ui.inc:484 -#: purchasing/includes/ui/invoice_ui.inc:496 reporting/rep308.php:149 -#: sales/inquiry/sales_orders_view.php:155 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:492 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:504 ++#: ../reporting/rep308.php:149 ++#: ../sales/inquiry/sales_orders_view.php.orig:167 msgid "Delivery" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:492 -#: purchasing/includes/ui/invoice_ui.inc:484 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:492 +msgid "Sequence #" +msgstr "" + - #: ../purchasing/includes/ui/invoice_ui.inc:492 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:492 msgid "P.O." msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:493 -#: purchasing/includes/ui/invoice_ui.inc:485 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:493 msgid "Received On" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:493 -#: purchasing/includes/ui/invoice_ui.inc:485 purchasing/view/view_po.php:46 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:493 +#: ../purchasing/view/view_po.php:46 msgid "Quantity Received" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:493 -#: purchasing/includes/ui/invoice_ui.inc:485 purchasing/view/view_grn.php:41 -#: purchasing/view/view_po.php:46 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:493 +#: ../purchasing/view/view_grn.php:41 +#: ../purchasing/view/view_po.php:46 msgid "Quantity Invoiced" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:494 -#: purchasing/includes/ui/invoice_ui.inc:486 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:494 msgid "Qty Yet To Invoice" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:494 - #: ../purchasing/includes/ui/po_ui.inc:245 -#: purchasing/includes/ui/invoice_ui.inc:486 -#: purchasing/includes/ui/po_ui.inc:235 -#: sales/includes/ui/sales_order_ui.inc:146 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:494 +#: ../purchasing/includes/ui/po_ui.inc.orig:245 - #: ../sales/includes/ui/sales_order_ui.inc.orig:142 ++#: ../sales/includes/ui/sales_order_ui.inc:147 msgid "Price after Tax" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:494 - #: ../purchasing/includes/ui/po_ui.inc:245 -#: purchasing/includes/ui/invoice_ui.inc:486 -#: purchasing/includes/ui/po_ui.inc:235 -#: sales/includes/ui/sales_order_ui.inc:146 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:494 +#: ../purchasing/includes/ui/po_ui.inc.orig:245 - #: ../sales/includes/ui/sales_order_ui.inc.orig:142 ++#: ../sales/includes/ui/sales_order_ui.inc:147 msgid "Price before Tax" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:500 -#: purchasing/includes/ui/invoice_ui.inc:492 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:500 msgid "Qty Yet To Credit" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:505 -#: purchasing/includes/ui/invoice_ui.inc:497 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:505 msgid "Line Value" msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:573 -#: purchasing/includes/ui/invoice_ui.inc:564 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:573 msgid "" "There are no outstanding items received from this supplier that have not " "been invoiced by them." msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:576 -#: purchasing/includes/ui/invoice_ui.inc:567 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:576 msgid "" "There are no received items for the selected supplier that have been " "invoiced." msgstr "" - #: ../purchasing/includes/ui/invoice_ui.inc:577 -#: purchasing/includes/ui/invoice_ui.inc:568 ++#: ../purchasing/includes/ui/invoice_ui.inc.orig:577 msgid "Credits can only be applied to invoiced items." msgstr "" - #: ../purchasing/includes/ui/po_ui.inc:156 -#: purchasing/includes/ui/po_ui.inc:154 sales/sales_order_entry.php:706 +#: ../purchasing/includes/ui/po_ui.inc.orig:156 +msgid "Supplier Currency:" +msgstr "" + - #: ../purchasing/includes/ui/po_ui.inc:185 +#: ../purchasing/includes/ui/po_ui.inc.orig:185 - #: ../sales/sales_order_entry.php:714 ++#: ../sales/sales_order_entry.php:722 msgid "Order Date:" msgstr "" - #: ../purchasing/includes/ui/po_ui.inc:186 -#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:693 +#: ../purchasing/includes/ui/po_ui.inc.orig:186 - #: ../sales/sales_order_entry.php:701 ++#: ../sales/sales_order_entry.php:709 msgid "Delivery Date:" msgstr "" - #: ../purchasing/includes/ui/po_ui.inc:186 -#: purchasing/includes/ui/po_ui.inc:155 sales/sales_order_entry.php:687 +#: ../purchasing/includes/ui/po_ui.inc.orig:186 - #: ../sales/sales_order_entry.php:695 ++#: ../sales/sales_order_entry.php:703 msgid "Invoice Date:" msgstr "" - #: ../purchasing/includes/ui/po_ui.inc:197 -#: purchasing/includes/ui/po_ui.inc:168 -msgid "Supplier Currency:" -msgstr "" - -#: purchasing/includes/ui/po_ui.inc:187 +#: ../purchasing/includes/ui/po_ui.inc.orig:197 msgid "Due Date:" msgstr "" - #: ../purchasing/includes/ui/po_ui.inc:199 -#: purchasing/includes/ui/po_ui.inc:189 +#: ../purchasing/includes/ui/po_ui.inc.orig:199 msgid "Supplier's Reference:" msgstr "" - #: ../purchasing/includes/ui/po_ui.inc:200 -#: purchasing/includes/ui/po_ui.inc:190 +#: ../purchasing/includes/ui/po_ui.inc.orig:200 msgid "Receive Into:" msgstr "" - #: ../purchasing/includes/ui/po_ui.inc:225 -#: purchasing/includes/ui/po_ui.inc:215 +#: ../purchasing/includes/ui/po_ui.inc.orig:225 msgid "" "The default stock location set up for this user is not a currently defined " "stock location. Your system administrator needs to amend your user record." msgstr "" - #: ../purchasing/includes/ui/po_ui.inc:229 -#: purchasing/includes/ui/po_ui.inc:219 +#: ../purchasing/includes/ui/po_ui.inc.orig:229 msgid "Deliver to:" msgstr "" - #: ../purchasing/includes/ui/po_ui.inc:238 -#: purchasing/includes/ui/po_ui.inc:228 +#: ../purchasing/includes/ui/po_ui.inc.orig:238 msgid "Order Items" msgstr "" - #: ../purchasing/includes/ui/po_ui.inc:244 -#: purchasing/includes/ui/po_ui.inc:234 purchasing/po_receive_items.php:62 +#: ../purchasing/includes/ui/po_ui.inc.orig:244 +#: ../purchasing/po_receive_items.php:62 msgid "Received" msgstr "" - #: ../purchasing/includes/ui/po_ui.inc:245 -#: purchasing/includes/ui/po_ui.inc:235 -#: sales/includes/ui/sales_order_ui.inc:616 +#: ../purchasing/includes/ui/po_ui.inc.orig:245 - #: ../sales/includes/ui/sales_order_ui.inc.orig:611 ++#: ../sales/includes/ui/sales_order_ui.inc:617 msgid "Required Delivery Date" msgstr "" - #: ../purchasing/includes/ui/po_ui.inc:245 -#: purchasing/includes/ui/po_ui.inc:235 purchasing/view/view_grn.php:41 -#: purchasing/view/view_po.php:46 +#: ../purchasing/includes/ui/po_ui.inc.orig:245 +#: ../purchasing/view/view_grn.php:41 +#: ../purchasing/view/view_po.php:46 msgid "Line Total" msgstr "" - #: ../purchasing/includes/ui/po_ui.inc:296 -#: purchasing/includes/ui/po_ui.inc:286 purchasing/po_receive_items.php:114 -#: reporting/rep107.php:150 reporting/rep109.php:149 reporting/rep110.php:159 -#: reporting/rep111.php:134 reporting/rep113.php:144 reporting/rep209.php:162 -#: sales/customer_credit_invoice.php:322 sales/customer_delivery.php:511 -#: sales/customer_invoice.php:565 sales/view/view_dispatch.php:146 -#: sales/view/view_invoice.php:148 sales/includes/ui/sales_credit_ui.inc:217 -#: sales/includes/ui/sales_order_ui.inc:235 +#: ../purchasing/includes/ui/po_ui.inc.orig:296 +#: ../purchasing/po_receive_items.php:114 - #: ../reporting/rep107.php:217 - #: ../reporting/rep109.php:152 - #: ../reporting/rep110.php:161 - #: ../reporting/rep111.php:137 - #: ../reporting/rep113.php:147 - #: ../reporting/rep209.php:167 ++#: ../reporting/rep109.php:150 ++#: ../reporting/rep110.php:159 ++#: ../reporting/rep111.php:133 ++#: ../reporting/rep113.php:144 ++#: ../reporting/rep209.php:162 +#: ../sales/customer_credit_invoice.php:322 - #: ../sales/customer_delivery.php.orig:514 ++#: ../sales/customer_delivery.php:525 +#: ../sales/customer_invoice.php:647 +#: ../sales/view/view_dispatch.php:146 +#: ../sales/view/view_invoice.php:150 +#: ../sales/includes/ui/sales_credit_ui.inc:217 - #: ../sales/includes/ui/sales_order_ui.inc.orig:229 ++#: ../sales/includes/ui/sales_order_ui.inc:236 msgid "Sub-total" msgstr "" - #: ../purchasing/includes/ui/po_ui.inc:305 -#: purchasing/includes/ui/po_ui.inc:295 purchasing/po_receive_items.php:122 -#: purchasing/view/view_grn.php:79 purchasing/view/view_po.php:93 -#: sales/customer_delivery.php:518 sales/view/view_sales_order.php:244 -#: sales/includes/ui/sales_order_ui.inc:242 +#: ../purchasing/includes/ui/po_ui.inc.orig:305 +#: ../purchasing/po_receive_items.php:122 +#: ../purchasing/view/view_grn.php:79 +#: ../purchasing/view/view_po.php:93 - #: ../sales/customer_delivery.php.orig:521 ++#: ../sales/customer_delivery.php:532 +#: ../sales/view/view_sales_order.php:262 - #: ../sales/view/view_sales_order.php.orig:244 - #: ../sales/includes/ui/sales_order_ui.inc.orig:236 ++#: ../sales/includes/ui/sales_order_ui.inc:243 msgid "Amount Total" msgstr "" - #: ../purchasing/includes/ui/po_ui.inc:306 -#: purchasing/includes/ui/po_ui.inc:296 -#: purchasing/allocations/supplier_allocate.php:63 -#: sales/allocations/customer_allocate.php:62 -#: sales/includes/ui/sales_order_ui.inc:243 +#: ../purchasing/includes/ui/po_ui.inc.orig:306 - #: ../purchasing/allocations/supplier_allocate.php:64 - #: ../sales/allocations/customer_allocate.php:63 - #: ../sales/includes/ui/sales_order_ui.inc.orig:237 ++#: ../purchasing/allocations/supplier_allocate.php:73 ++#: ../sales/allocations/customer_allocate.php:71 ++#: ../sales/includes/ui/sales_order_ui.inc:244 msgid "Refresh" msgstr "" - #: ../purchasing/includes/ui/po_ui.inc:361 -#: purchasing/po_entry_items.php:41 +#: ../purchasing/includes/ui/po_ui.inc.orig:361 +#: ../sales/view/view_sales_order.php:83 +msgid "Required Pre-Payment" +msgstr "" + - #: ../purchasing/includes/ui/po_ui.inc:362 +#: ../purchasing/includes/ui/po_ui.inc.orig:362 +msgid "Pre-Payments Allocated" +msgstr "" + - #: ../purchasing/includes/ui/po_ui.inc.orig:488 - #: ../purchasing/po_entry_items.php.orig:555 ++#: ../purchasing/includes/ui/po_ui.inc.orig:486 ++#: ../purchasing/po_entry_items.php.orig:559 +#: ../sales/customer_invoice.php:454 - #: ../sales/includes/ui/sales_order_ui.inc.orig:407 - #: ../sales/includes/ui/sales_order_ui.inc.orig:409 ++#: ../sales/includes/ui/sales_order_ui.inc:413 ++#: ../sales/includes/ui/sales_order_ui.inc:415 +msgid "Payment:" +msgstr "" + - #: ../purchasing/includes/ui/po_ui.inc.orig:488 - #: ../purchasing/po_entry_items.php.orig:555 ++#: ../purchasing/includes/ui/po_ui.inc.orig:486 ++#: ../purchasing/po_entry_items.php.orig:559 +msgid "Delayed" +msgstr "" + - #: ../purchasing/includes/ui/po_ui.inc.orig:490 - #: ../sales/includes/ui/sales_order_ui.inc.orig:622 - #: ../sales/includes/ui/sales_order_ui.inc.orig:624 ++#: ../purchasing/includes/ui/po_ui.inc.orig:488 ++#: ../sales/includes/ui/sales_order_ui.inc:628 ++#: ../sales/includes/ui/sales_order_ui.inc:630 +msgid "Pre-Payment Required:" +msgstr "" + +#: ../purchasing/po_entry_items.php:41 - #: ../purchasing/po_entry_items.php.orig:38 ++#: ../purchasing/po_entry_items.php.orig:41 msgid "Modify Purchase Order #" msgstr "" -#: purchasing/po_entry_items.php:46 +#: ../purchasing/po_entry_items.php:46 - #: ../purchasing/po_entry_items.php.orig:43 ++#: ../purchasing/po_entry_items.php.orig:46 msgid "Purchase Order Entry" msgstr "" -#: purchasing/po_entry_items.php:51 +#: ../purchasing/po_entry_items.php:51 - #: ../purchasing/po_entry_items.php.orig:48 ++#: ../purchasing/po_entry_items.php.orig:51 msgid "Direct GRN Entry" msgstr "" -#: purchasing/po_entry_items.php:56 +#: ../purchasing/po_entry_items.php:56 - #: ../purchasing/po_entry_items.php.orig:53 ++#: ../purchasing/po_entry_items.php.orig:56 msgid "Direct Purchase Invoice Entry" msgstr "" -#: purchasing/po_entry_items.php:77 +#: ../purchasing/po_entry_items.php:80 - #: ../purchasing/po_entry_items.php.orig:77 ++#: ../purchasing/po_entry_items.php.orig:80 msgid "Purchase Order has been entered" msgstr "" -#: purchasing/po_entry_items.php:79 +#: ../purchasing/po_entry_items.php:82 - #: ../purchasing/po_entry_items.php.orig:79 ++#: ../purchasing/po_entry_items.php.orig:82 msgid "Purchase Order has been updated" msgstr "" -#: purchasing/po_entry_items.php:80 +#: ../purchasing/po_entry_items.php:83 - #: ../purchasing/po_entry_items.php.orig:80 ++#: ../purchasing/po_entry_items.php.orig:83 msgid "&View this order" msgstr "" -#: purchasing/po_entry_items.php:82 sales/sales_order_entry.php:113 -#: sales/sales_order_entry.php:133 +#: ../purchasing/po_entry_items.php:85 - #: ../purchasing/po_entry_items.php.orig:82 ++#: ../purchasing/po_entry_items.php.orig:85 +#: ../sales/sales_order_entry.php:119 +#: ../sales/sales_order_entry.php:139 msgid "&Print This Order" msgstr "" -#: purchasing/po_entry_items.php:84 sales/sales_order_entry.php:114 -#: sales/sales_order_entry.php:134 +#: ../purchasing/po_entry_items.php:87 - #: ../purchasing/po_entry_items.php.orig:84 ++#: ../purchasing/po_entry_items.php.orig:87 +#: ../sales/sales_order_entry.php:120 +#: ../sales/sales_order_entry.php:140 msgid "&Email This Order" msgstr "" -#: purchasing/po_entry_items.php:86 +#: ../purchasing/po_entry_items.php:89 - #: ../purchasing/po_entry_items.php.orig:86 ++#: ../purchasing/po_entry_items.php.orig:89 msgid "&Receive Items on this Purchase Order" msgstr "" -#: purchasing/po_entry_items.php:88 +#: ../purchasing/po_entry_items.php:91 - #: ../purchasing/po_entry_items.php.orig:88 ++#: ../purchasing/po_entry_items.php.orig:91 msgid "Enter &Another Purchase Order" msgstr "" -#: purchasing/po_entry_items.php:90 +#: ../purchasing/po_entry_items.php:93 - #: ../purchasing/po_entry_items.php.orig:90 ++#: ../purchasing/po_entry_items.php.orig:93 msgid "Select An &Outstanding Purchase Order" msgstr "" -#: purchasing/po_entry_items.php:99 +#: ../purchasing/po_entry_items.php:102 - #: ../purchasing/po_entry_items.php.orig:99 ++#: ../purchasing/po_entry_items.php.orig:102 msgid "Direct GRN has been entered" msgstr "" -#: purchasing/po_entry_items.php:101 +#: ../purchasing/po_entry_items.php:104 - #: ../purchasing/po_entry_items.php.orig:101 ++#: ../purchasing/po_entry_items.php.orig:104 msgid "&View this GRN" msgstr "" -#: purchasing/po_entry_items.php:105 purchasing/po_receive_items.php:40 +#: ../purchasing/po_entry_items.php:108 - #: ../purchasing/po_entry_items.php.orig:105 ++#: ../purchasing/po_entry_items.php.orig:108 +#: ../purchasing/po_receive_items.php:40 msgid "View the GL Journal Entries for this Delivery" msgstr "" -#: purchasing/po_entry_items.php:110 purchasing/po_receive_items.php:42 +#: ../purchasing/po_entry_items.php:113 - #: ../purchasing/po_entry_items.php.orig:110 ++#: ../purchasing/po_entry_items.php.orig:113 +#: ../purchasing/po_receive_items.php:42 msgid "Entry purchase &invoice for this receival" msgstr "" -#: purchasing/po_entry_items.php:115 +#: ../purchasing/po_entry_items.php:118 - #: ../purchasing/po_entry_items.php.orig:115 ++#: ../purchasing/po_entry_items.php.orig:118 msgid "Enter &Another GRN" msgstr "" -#: purchasing/po_entry_items.php:124 +#: ../purchasing/po_entry_items.php:127 - #: ../purchasing/po_entry_items.php.orig:124 ++#: ../purchasing/po_entry_items.php.orig:127 msgid "Direct Purchase Invoice has been entered" msgstr "" -#: purchasing/po_entry_items.php:126 +#: ../purchasing/po_entry_items.php:129 - #: ../purchasing/po_entry_items.php.orig:126 ++#: ../purchasing/po_entry_items.php.orig:129 msgid "&View this Invoice" msgstr "" -#: purchasing/po_entry_items.php:131 purchasing/supplier_invoice.php:46 +#: ../purchasing/po_entry_items.php:134 - #: ../purchasing/po_entry_items.php.orig:131 ++#: ../purchasing/po_entry_items.php.orig:134 +#: ../purchasing/supplier_invoice.php:69 msgid "View the GL Journal Entries for this Invoice" msgstr "" -#: purchasing/po_entry_items.php:133 purchasing/supplier_invoice.php:48 +#: ../purchasing/po_entry_items.php:136 - #: ../purchasing/po_entry_items.php.orig:133 ++#: ../purchasing/po_entry_items.php.orig:136 +#: ../purchasing/supplier_invoice.php:71 msgid "Entry supplier &payment for this invoice" msgstr "" -#: purchasing/po_entry_items.php:139 +#: ../purchasing/po_entry_items.php:142 - #: ../purchasing/po_entry_items.php.orig:139 ++#: ../purchasing/po_entry_items.php.orig:142 msgid "Enter &Another Direct Invoice" msgstr "" -#: purchasing/po_entry_items.php:171 +#: ../purchasing/po_entry_items.php:174 - #: ../purchasing/po_entry_items.php.orig:171 ++#: ../purchasing/po_entry_items.php.orig:174 msgid "" "This item cannot be deleted because some of it has already been received." msgstr "" -#: purchasing/po_entry_items.php:186 +#: ../purchasing/po_entry_items.php:189 - #: ../purchasing/po_entry_items.php.orig:186 ++#: ../purchasing/po_entry_items.php.orig:189 msgid "" "This order cannot be cancelled because some of it has already been received." msgstr "" -#: purchasing/po_entry_items.php:187 +#: ../purchasing/po_entry_items.php:190 - #: ../purchasing/po_entry_items.php.orig:187 ++#: ../purchasing/po_entry_items.php.orig:190 msgid "" "The line item quantities may be modified to quantities more than already " "received. prices cannot be altered for lines that have already been received " "and quantities cannot be reduced below the quantity already received." msgstr "" -#: purchasing/po_entry_items.php:202 +#: ../purchasing/po_entry_items.php:205 - #: ../purchasing/po_entry_items.php.orig:202 ++#: ../purchasing/po_entry_items.php.orig:205 msgid "This purchase order has been cancelled." msgstr "" -#: purchasing/po_entry_items.php:204 +#: ../purchasing/po_entry_items.php:207 - #: ../purchasing/po_entry_items.php.orig:204 ++#: ../purchasing/po_entry_items.php.orig:207 msgid "Enter a new purchase order" msgstr "" -#: purchasing/po_entry_items.php:216 sales/sales_order_entry.php:487 +#: ../purchasing/po_entry_items.php:219 - #: ../purchasing/po_entry_items.php.orig:216 - #: ../sales/sales_order_entry.php:495 ++#: ../purchasing/po_entry_items.php.orig:219 ++#: ../sales/sales_order_entry.php:503 msgid "Item description cannot be empty." msgstr "" -#: purchasing/po_entry_items.php:226 +#: ../purchasing/po_entry_items.php:229 - #: ../purchasing/po_entry_items.php.orig:226 ++#: ../purchasing/po_entry_items.php.orig:229 msgid "The quantity of the order item must be numeric and not less than " msgstr "" -#: purchasing/po_entry_items.php:233 +#: ../purchasing/po_entry_items.php:236 - #: ../purchasing/po_entry_items.php.orig:233 ++#: ../purchasing/po_entry_items.php.orig:236 msgid "The price entered must be numeric and not less than zero." msgstr "" -#: purchasing/po_entry_items.php:257 +#: ../purchasing/po_entry_items.php:260 - #: ../purchasing/po_entry_items.php.orig:257 ++#: ../purchasing/po_entry_items.php.orig:260 msgid "" "You are attempting to make the quantity ordered a quantity less than has " "already been invoiced or received. This is prohibited." msgstr "" -#: purchasing/po_entry_items.php:258 +#: ../purchasing/po_entry_items.php:261 - #: ../purchasing/po_entry_items.php.orig:258 ++#: ../purchasing/po_entry_items.php.orig:261 msgid "" "The quantity received can only be modified by entering a negative receipt " "and the quantity invoiced can only be reduced by entering a credit note " "against this item." msgstr "" -#: purchasing/po_entry_items.php:286 +#: ../purchasing/po_entry_items.php:289 - #: ../purchasing/po_entry_items.php.orig:286 ++#: ../purchasing/po_entry_items.php.orig:289 msgid "The selected item is already on this order." msgstr "" -#: purchasing/po_entry_items.php:313 +#: ../purchasing/po_entry_items.php:316 - #: ../purchasing/po_entry_items.php.orig:313 ++#: ../purchasing/po_entry_items.php.orig:316 msgid "" "The selected item does not exist or it is a kit part and therefore cannot be " "purchased." msgstr "" -#: purchasing/po_entry_items.php:329 purchasing/supplier_invoice.php:343 -#: purchasing/supplier_payment.php:114 +#: ../purchasing/po_entry_items.php:332 - #: ../purchasing/po_entry_items.php.orig:329 - #: ../purchasing/supplier_invoice.php:382 - #: ../purchasing/supplier_payment.php:113 ++#: ../purchasing/po_entry_items.php.orig:332 ++#: ../purchasing/supplier_invoice.php:384 ++#: ../purchasing/supplier_payment.php:123 ++#: ../purchasing/supplier_payment.php.orig:113 msgid "There is no supplier selected." msgstr "" -#: purchasing/po_entry_items.php:336 +#: ../purchasing/po_entry_items.php:339 - #: ../purchasing/po_entry_items.php.orig:336 ++#: ../purchasing/po_entry_items.php.orig:339 msgid "The entered order date is invalid." msgstr "" -#: purchasing/po_entry_items.php:343 purchasing/po_receive_items.php:181 -#: sales/sales_order_entry.php:355 -msgid "The entered date is not in fiscal year" -msgstr "" - -#: purchasing/po_entry_items.php:350 +#: ../purchasing/po_entry_items.php:352 - #: ../purchasing/po_entry_items.php.orig:349 ++#: ../purchasing/po_entry_items.php.orig:352 msgid "The entered due date is invalid." msgstr "" -#: purchasing/po_entry_items.php:359 +#: ../purchasing/po_entry_items.php:361 - #: ../purchasing/po_entry_items.php.orig:358 ++#: ../purchasing/po_entry_items.php.orig:361 msgid "There is no reference entered for this purchase order." msgstr "" -#: purchasing/po_entry_items.php:374 purchasing/supplier_invoice.php:161 +#: ../purchasing/po_entry_items.php:376 - #: ../purchasing/po_entry_items.php.orig:373 ++#: ../purchasing/po_entry_items.php.orig:376 +#: ../purchasing/supplier_invoice.php:186 msgid "You must enter a supplier's invoice reference." msgstr "" -#: purchasing/po_entry_items.php:381 purchasing/supplier_invoice.php:187 +#: ../purchasing/po_entry_items.php:383 - #: ../purchasing/po_entry_items.php.orig:380 ++#: ../purchasing/po_entry_items.php.orig:383 +#: ../purchasing/supplier_invoice.php:212 msgid "" "This invoice number has already been entered. It cannot be entered again." msgstr "" -#: purchasing/po_entry_items.php:387 +#: ../purchasing/po_entry_items.php:389 - #: ../purchasing/po_entry_items.php.orig:386 ++#: ../purchasing/po_entry_items.php.orig:389 msgid "There is no delivery address specified." msgstr "" -#: purchasing/po_entry_items.php:393 +#: ../purchasing/po_entry_items.php:395 - #: ../purchasing/po_entry_items.php.orig:392 ++#: ../purchasing/po_entry_items.php.orig:395 msgid "There is no location specified to move any items into." msgstr "" -#: purchasing/po_entry_items.php:401 +#: ../purchasing/po_entry_items.php:403 - #: ../purchasing/po_entry_items.php.orig:399 ++#: ../purchasing/po_entry_items.php.orig:403 msgid "" "The order cannot be placed because there are no lines entered on this order." msgstr "" -#: purchasing/po_entry_items.php:534 sales/sales_order_entry.php:710 +#: ../purchasing/po_entry_items.php:408 - #: ../purchasing/po_entry_items.php.orig:404 ++#: ../purchasing/po_entry_items.php.orig:408 +msgid "Required prepayment is greater than total invoice value." +msgstr "" + - #: ../purchasing/po_entry_items.php.orig:492 ++#: ../purchasing/po_entry_items.php.orig:496 +msgid "Payment for:" +msgstr "" + - #: ../purchasing/po_entry_items.php.orig:563 - #: ../sales/sales_order_entry.php:718 ++#: ../purchasing/po_entry_items.php.orig:567 ++#: ../sales/sales_order_entry.php:726 msgid "Place Order" msgstr "" - #: ../purchasing/po_entry_items.php.orig:564 -#: purchasing/po_entry_items.php:535 ++#: ../purchasing/po_entry_items.php.orig:568 msgid "Update Order" msgstr "" - #: ../purchasing/po_entry_items.php.orig:565 - #: ../sales/sales_order_entry.php:717 -#: purchasing/po_entry_items.php:536 sales/sales_order_entry.php:709 ++#: ../purchasing/po_entry_items.php.orig:569 ++#: ../sales/sales_order_entry.php:725 msgid "Cancel Order" msgstr "" - #: ../purchasing/po_entry_items.php.orig:567 -#: purchasing/po_entry_items.php:538 ++#: ../purchasing/po_entry_items.php.orig:571 msgid "Process GRN" msgstr "" - #: ../purchasing/po_entry_items.php.orig:568 -#: purchasing/po_entry_items.php:539 ++#: ../purchasing/po_entry_items.php.orig:572 msgid "Update GRN" msgstr "" - #: ../purchasing/po_entry_items.php.orig:569 -#: purchasing/po_entry_items.php:540 ++#: ../purchasing/po_entry_items.php.orig:573 msgid "Cancel GRN" msgstr "" - #: ../purchasing/po_entry_items.php.orig:572 -#: purchasing/po_entry_items.php:543 sales/customer_invoice.php:584 ++#: ../purchasing/po_entry_items.php.orig:576 +#: ../sales/customer_invoice.php:686 msgid "Process Invoice" msgstr "" - #: ../purchasing/po_entry_items.php.orig:573 -#: purchasing/po_entry_items.php:544 ++#: ../purchasing/po_entry_items.php.orig:577 msgid "Update Invoice" msgstr "" - #: ../purchasing/po_entry_items.php.orig:574 - #: ../sales/sales_order_entry.php:698 -#: purchasing/po_entry_items.php:545 sales/sales_order_entry.php:690 ++#: ../purchasing/po_entry_items.php.orig:578 ++#: ../sales/sales_order_entry.php:706 msgid "Cancel Invoice" msgstr "" @@@ -10932,23 -9385,18 +10807,23 @@@ msgid " "select a purchase order first." msgstr "" -#: purchasing/po_receive_items.php:62 reporting/rep105.php:114 -#: sales/customer_delivery.php:432 +#: ../purchasing/po_receive_items.php:62 - #: ../reporting/rep105.php:112 - #: ../sales/customer_delivery.php.orig:445 ++#: ../reporting/rep105.php:114 ++#: ../sales/customer_delivery.php:446 msgid "Ordered" msgstr "" -#: purchasing/po_receive_items.php:63 reporting/rep101.php:119 -#: reporting/rep105.php:115 reporting/rep105.php:166 reporting/rep201.php:111 -#: reporting/includes/doctext.inc:225 +#: ../purchasing/po_receive_items.php:63 - #: ../reporting/rep101.php:131 - #: ../reporting/rep105.php:113 - #: ../reporting/rep105.php:162 - #: ../reporting/rep201.php:119 ++#: ../reporting/rep101.php:119 ++#: ../reporting/rep105.php:115 ++#: ../reporting/rep105.php:166 ++#: ../reporting/rep201.php:111 +#: ../reporting/includes/doctext.inc:247 msgid "Outstanding" msgstr "" -#: purchasing/po_receive_items.php:63 sales/customer_delivery.php:433 +#: ../purchasing/po_receive_items.php:63 - #: ../sales/customer_delivery.php.orig:446 ++#: ../sales/customer_delivery.php:447 msgid "This Delivery" msgstr "" @@@ -10986,98 -9433,90 +10861,93 @@@ msgstr " msgid "Re-Read the updated purchase order for receiving goods against" msgstr "" - #: ../purchasing/po_receive_items.php:327 -#: purchasing/po_receive_items.php:330 ++#: ../purchasing/po_receive_items.php:328 msgid "Items to Receive" msgstr "" - #: ../purchasing/po_receive_items.php:332 -#: purchasing/po_receive_items.php:335 ++#: ../purchasing/po_receive_items.php:333 msgid "Process Receive Items" msgstr "" - #: ../purchasing/supplier_credit.php:63 - #, php-format - msgid "Modifying Supplier Credit # %d" - msgstr "" - - #: ../purchasing/supplier_credit.php:78 -#: purchasing/supplier_credit.php:43 ++#: ../purchasing/supplier_credit.php:77 msgid "Supplier credit note has been processed." msgstr "" - #: ../purchasing/supplier_credit.php:79 -#: purchasing/supplier_credit.php:44 ++#: ../purchasing/supplier_credit.php:78 msgid "View this Credit Note" msgstr "" - #: ../purchasing/supplier_credit.php:81 -#: purchasing/supplier_credit.php:46 ++#: ../purchasing/supplier_credit.php:80 msgid "View the GL Journal Entries for this Credit Note" msgstr "" - #: ../purchasing/supplier_credit.php:83 -#: purchasing/supplier_credit.php:48 ++#: ../purchasing/supplier_credit.php:82 msgid "Enter Another Credit Note" msgstr "" - #: ../purchasing/supplier_credit.php:119 -#: purchasing/supplier_credit.php:102 purchasing/supplier_invoice.php:102 ++#: ../purchasing/supplier_credit.php:118 +#: ../purchasing/supplier_invoice.php:127 msgid "" "The account code entered is not a valid code, this line cannot be added to " "the transaction." msgstr "" - #: ../purchasing/supplier_credit.php:129 -#: purchasing/supplier_credit.php:112 purchasing/supplier_invoice.php:112 ++#: ../purchasing/supplier_credit.php:128 +#: ../purchasing/supplier_invoice.php:137 msgid "" "The amount entered is not numeric. This line cannot be added to the " "transaction." msgstr "" - #: ../purchasing/supplier_credit.php:159 -#: purchasing/supplier_credit.php:142 ++#: ../purchasing/supplier_credit.php:158 msgid "" "The credit note cannot be processed because the there are no items or values " "on the invoice. Credit notes are expected to have a charge." msgstr "" - #: ../purchasing/supplier_credit.php:166 -#: purchasing/supplier_credit.php:149 ++#: ../purchasing/supplier_credit.php:165 msgid "You must enter an credit note reference." msgstr "" - #: ../purchasing/supplier_credit.php:180 -#: purchasing/supplier_credit.php:163 ++#: ../purchasing/supplier_credit.php:179 msgid "You must enter a supplier's credit note reference." msgstr "" - #: ../purchasing/supplier_credit.php:187 -#: purchasing/supplier_credit.php:170 ++#: ../purchasing/supplier_credit.php:186 msgid "" "The credit note as entered cannot be processed because the date entered is " "not valid." msgstr "" - #: ../purchasing/supplier_credit.php:199 -#: purchasing/supplier_credit.php:182 purchasing/supplier_invoice.php:180 ++#: ../purchasing/supplier_credit.php:198 +#: ../purchasing/supplier_invoice.php:205 msgid "" "The invoice as entered cannot be processed because the due date is in an " "incorrect format." msgstr "" - #: ../purchasing/supplier_credit.php:206 -#: purchasing/supplier_credit.php:189 ++#: ../purchasing/supplier_credit.php:205 msgid "" "The credit note total as entered is less than the sum of the the general " "ledger entires (if any) and the charges for goods received. There must be a " "mistake somewhere, the credit note as entered will not be processed." msgstr "" - #: ../purchasing/supplier_credit.php:218 -#: purchasing/supplier_credit.php:201 ++#: ../purchasing/supplier_credit.php:217 msgid "" "The return cannot be processed because there is an insufficient quantity for " "item:" msgstr "" - #: ../purchasing/supplier_credit.php:262 -#: purchasing/supplier_credit.php:244 ++#: ../purchasing/supplier_credit.php:260 msgid "The quantity to credit must be numeric and greater than zero." msgstr "" - #: ../purchasing/supplier_credit.php:269 -#: purchasing/supplier_credit.php:251 ++#: ../purchasing/supplier_credit.php:267 msgid "The price is either not numeric or negative." msgstr "" - #: ../purchasing/supplier_credit.php:371 -#: purchasing/supplier_credit.php:353 ++#: ../purchasing/supplier_credit.php:369 msgid "Enter Credit Note" msgstr "" @@@ -11146,85 -9579,89 +11016,122 @@@ msgid " "necessary." msgstr "" - #: ../purchasing/supplier_invoice.php:364 -#: purchasing/supplier_invoice.php:325 ++#: ../purchasing/supplier_invoice.php:366 #, php-format msgid "All yet non-invoiced items on delivery line # %d has been removed." msgstr "" - #: ../purchasing/supplier_invoice.php:406 -#: purchasing/supplier_invoice.php:367 ++#: ../purchasing/supplier_invoice.php:408 msgid "Enter Invoice" msgstr "" -#: purchasing/supplier_payment.php:31 +#: ../purchasing/supplier_payment.php:31 ++#: ../purchasing/supplier_payment.php.orig:31 msgid "Supplier Payment Entry" msgstr "" - #: ../purchasing/supplier_payment.php:85 -#: purchasing/supplier_payment.php:85 ++#: ../purchasing/supplier_payment.php:92 ++#: ../purchasing/supplier_payment.php.orig:85 msgid "Invalid purchase invoice number." msgstr "" - #: ../purchasing/supplier_payment.php:91 -#: purchasing/supplier_payment.php:91 ++#: ../purchasing/supplier_payment.php:98 ++#: ../purchasing/supplier_payment.php.orig:91 msgid "Payment has been sucessfully entered" msgstr "" - #: ../purchasing/supplier_payment.php:93 -#: purchasing/supplier_payment.php:93 ++#: ../purchasing/supplier_payment.php:100 ++#: ../purchasing/supplier_payment.php.orig:93 msgid "&Print This Remittance" msgstr "" - #: ../purchasing/supplier_payment.php:94 -#: purchasing/supplier_payment.php:94 ++#: ../purchasing/supplier_payment.php:101 ++#: ../purchasing/supplier_payment.php.orig:94 msgid "&Email This Remittance" msgstr "" - #: ../purchasing/supplier_payment.php:96 -#: purchasing/supplier_payment.php:96 ++#: ../purchasing/supplier_payment.php:103 ++msgid "View this Payment" ++msgstr "" ++ ++#: ../purchasing/supplier_payment.php:104 ++#: ../purchasing/supplier_payment.php.orig:96 msgid "View the GL &Journal Entries for this Payment" msgstr "" - #: ../purchasing/supplier_payment.php:100 -#: purchasing/supplier_payment.php:98 -msgid "Select Another &Supplier Transaction for Payment" ++#: ../purchasing/supplier_payment.php:106 ++#: ../purchasing/supplier_payment.php.orig:100 +msgid "Enter another supplier &payment" msgstr "" - #: ../purchasing/supplier_payment.php:147 - #: ../sales/customer_payments.php:192 - msgid "The exchange rate must be numeric and greater than zero." -#: purchasing/supplier_payment.php:101 -msgid "Enter Another Supplier &Payment" ++#: ../purchasing/supplier_payment.php:107 ++#: ../sales/customer_payments.php:106 ++msgid "Enter Other &Payment" + msgstr "" + -#: purchasing/supplier_payment.php:160 ++#: ../purchasing/supplier_payment.php:108 ++msgid "Enter &Customer Payment" ++msgstr "" ++ ++#: ../purchasing/supplier_payment.php:109 ++#: ../sales/customer_payments.php:104 ++msgid "Enter Other &Deposit" ++msgstr "" ++ ++#: ../purchasing/supplier_payment.php:110 ++#: ../sales/customer_payments.php:107 ++msgid "Bank Account &Transfer" +msgstr "" + - #: ../purchasing/supplier_payment.php:159 ++#: ../purchasing/supplier_payment.php:162 ++#: ../purchasing/supplier_payment.php.orig:159 msgid "The entered discount is invalid or less than zero." msgstr "" - #: ../purchasing/supplier_payment.php:167 -#: purchasing/supplier_payment.php:168 ++#: ../purchasing/supplier_payment.php:170 ++#: ../purchasing/supplier_payment.php.orig:167 msgid "" "The total of the amount and the discount is zero or negative. Please enter " "positive values." msgstr "" - #: ../purchasing/supplier_payment.php:270 -#: purchasing/supplier_payment.php:175 ++#: ../purchasing/supplier_payment.php:177 + msgid "The entered bank amount is zero or negative." + msgstr "" + -#: purchasing/supplier_payment.php:284 ++#: ../purchasing/supplier_payment.php:274 ++#: ../purchasing/supplier_payment.php.orig:270 msgid "Payment To:" msgstr "" - #: ../purchasing/supplier_payment.php:283 -#: purchasing/supplier_payment.php:294 -msgid "From Bank Account:" ++#: ../purchasing/supplier_payment.php.orig:147 ++#: ../sales/customer_payments.php.orig:192 ++msgid "The exchange rate must be numeric and greater than zero." + msgstr "" + -#: purchasing/supplier_payment.php:302 -#: purchasing/view/view_supp_payment.php:55 -msgid "Date Paid" ++#: ../purchasing/supplier_payment.php.orig:283 +msgid "From Bank Account:" msgstr "" - #: ../purchasing/supplier_payment.php:291 -#: purchasing/supplier_payment.php:319 -#, php-format -msgid "Accounts Payable settled in %s:" ++#: ../purchasing/supplier_payment.php.orig:291 +#: ../purchasing/view/view_supp_payment.php:55 +msgid "Date Paid" msgstr "" - #: ../purchasing/supplier_payment.php:314 - #: ../sales/customer_payments.php:409 -#: purchasing/supplier_payment.php:324 sales/customer_payments.php:402 -#: sales/customer_payments.php.sav:409 ++#: ../purchasing/supplier_payment.php.orig:314 ++#: ../sales/customer_payments.php.orig:409 msgid "Amount of Discount:" msgstr "" - #: ../purchasing/supplier_payment.php:315 -#: purchasing/supplier_payment.php:325 ++#: ../purchasing/supplier_payment.php.orig:315 msgid "Amount of Payment:" msgstr "" - #: ../purchasing/supplier_payment.php:321 -#: purchasing/supplier_payment.php:329 ++#: ../purchasing/supplier_payment.php.orig:321 +msgid "The amount and discount are in the bank account's currency." +msgstr "" + - #: ../purchasing/supplier_payment.php:324 ++#: ../purchasing/supplier_payment.php.orig:324 msgid "Enter Payment" msgstr "" @@@ -11237,10 -9674,8 +11144,9 @@@ msgid " "This page must be called with a Purchase Order Delivery number to review." msgstr "" -#: purchasing/view/view_grn.php:37 purchasing/view/view_po.php:41 -#: sales/view/view_sales_order.php:198 +#: ../purchasing/view/view_grn.php:37 +#: ../purchasing/view/view_po.php:41 +#: ../sales/view/view_sales_order.php:216 - #: ../sales/view/view_sales_order.php.orig:198 msgid "Line Details" msgstr "" @@@ -11252,13 -9685,10 +11158,12 @@@ msgid "Delivery Date" msgstr "" -#: purchasing/view/view_grn.php:70 purchasing/view/view_po.php:84 -#: purchasing/view/view_supp_credit.php:60 -#: purchasing/view/view_supp_invoice.php:65 sales/view/view_credit.php:136 -#: sales/view/view_sales_order.php:234 +#: ../purchasing/view/view_grn.php:70 +#: ../purchasing/view/view_po.php:84 +#: ../purchasing/view/view_supp_credit.php:60 +#: ../purchasing/view/view_supp_invoice.php:66 +#: ../sales/view/view_credit.php:136 +#: ../sales/view/view_sales_order.php:252 - #: ../sales/view/view_sales_order.php.orig:234 msgid "Sub Total" msgstr "" @@@ -11278,21 -9708,18 +11183,19 @@@ msgstr " msgid "Requested By" msgstr "" -#: purchasing/view/view_po.php:100 -#: purchasing/inquiry/supplier_allocation_inquiry.php:148 -#: purchasing/inquiry/supplier_inquiry.php:193 -#: sales/inquiry/customer_allocation_inquiry.php:164 -#: sales/inquiry/customer_inquiry.php:251 -#: sales/inquiry/sales_deliveries_view.php:206 -#: sales/inquiry/sales_orders_view.php:318 +#: ../purchasing/view/view_po.php:100 - #: ../purchasing/inquiry/supplier_allocation_inquiry.php:147 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:147 +#: ../purchasing/inquiry/supplier_inquiry.php:197 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:196 - #: ../sales/inquiry/customer_allocation_inquiry.php:165 - #: ../sales/inquiry/customer_inquiry.php:227 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:165 ++#: ../sales/inquiry/customer_inquiry.php.orig:227 +#: ../sales/inquiry/sales_deliveries_view.php:206 - #: ../sales/inquiry/sales_orders_view.php:344 ++#: ../sales/inquiry/sales_orders_view.php.orig:344 msgid "Marked items are overdue." msgstr "" -#: purchasing/view/view_po.php:113 sales/view/view_invoice.php:97 -#: sales/view/view_sales_order.php:51 +#: ../purchasing/view/view_po.php:113 +#: ../sales/view/view_invoice.php:98 +#: ../sales/view/view_sales_order.php:51 - #: ../sales/view/view_sales_order.php.orig:51 msgid "Deliveries" msgstr "" @@@ -11300,9 -9727,7 +11203,8 @@@ msgid "Delivered On" msgstr "" -#: purchasing/view/view_po.php:138 sales/view/view_sales_order.php:53 +#: ../purchasing/view/view_po.php:138 +#: ../sales/view/view_sales_order.php:53 - #: ../sales/view/view_sales_order.php.orig:53 msgid "Invoices/Credits" msgstr "" @@@ -11339,10 -9761,8 +11241,8 @@@ msgstr " msgid "SUPPLIER INVOICE" msgstr "" -#: purchasing/view/view_supp_invoice.php:72 reporting/rep107.php:198 -#: sales/view/view_invoice.php:164 +#: ../purchasing/view/view_supp_invoice.php:73 - #: ../reporting/rep107.php:266 - #: ../reporting/rep107.php:272 +#: ../sales/view/view_invoice.php:166 msgid "TOTAL INVOICE" msgstr "" @@@ -11363,18 -9782,13 +11263,18 @@@ msgstr " msgid "To Supplier" msgstr "" -#: purchasing/view/view_supp_payment.php:59 +#: ../purchasing/view/view_supp_payment.php:59 - #: ../sales/view/view_receipt.php:43 msgid "Payment Currency" msgstr "" -#: purchasing/view/view_supp_payment.php:62 sales/customer_delivery.php:433 -#: sales/customer_invoice.php:470 sales/view/view_receipt.php:45 -#: sales/view/view_sales_order.php:202 +#: ../purchasing/view/view_supp_payment.php:62 - #: ../sales/customer_delivery.php.orig:446 ++#: ../reporting/rep112.php:150 ++#: ../reporting/rep210.php:159 ++#: ../sales/customer_delivery.php:447 +#: ../sales/customer_invoice.php:542 +#: ../sales/customer_invoice.php:545 +#: ../sales/view/view_receipt.php:45 +#: ../sales/view/view_sales_order.php:220 - #: ../sales/view/view_sales_order.php.orig:202 msgid "Discount" msgstr "" @@@ -11382,229 -9796,170 +11282,224 @@@ msgid "Supplier's Currency" msgstr "" -#: purchasing/manage/suppliers.php:27 sales/manage/customer_branches.php:33 +#: ../purchasing/manage/suppliers.php:27 - #: ../purchasing/manage/suppliers.php.orig:28 ++#: ../purchasing/manage/suppliers.php.orig:27 +#: ../sales/manage/customer_branches.php:33 msgid "" "There are no tax groups defined in the system. At least one tax group is " "required before proceeding." msgstr "" -#: purchasing/manage/suppliers.php:89 +#: ../purchasing/manage/suppliers.php:91 - #: ../purchasing/manage/suppliers.php.orig:92 ++#: ../purchasing/manage/suppliers.php.orig:91 msgid "Basic Data" msgstr "" -#: purchasing/manage/suppliers.php:91 +#: ../purchasing/manage/suppliers.php:93 - #: ../purchasing/manage/suppliers.php.orig:94 ++#: ../purchasing/manage/suppliers.php.orig:93 msgid "Supplier Name:" msgstr "" -#: purchasing/manage/suppliers.php:92 +#: ../purchasing/manage/suppliers.php:94 - #: ../purchasing/manage/suppliers.php.orig:95 ++#: ../purchasing/manage/suppliers.php.orig:94 msgid "Supplier Short Name:" msgstr "" -#: purchasing/manage/suppliers.php:95 +#: ../purchasing/manage/suppliers.php:97 - #: ../purchasing/manage/suppliers.php.orig:98 ++#: ../purchasing/manage/suppliers.php.orig:97 msgid "Website:" msgstr "" -#: purchasing/manage/suppliers.php:106 +#: ../purchasing/manage/suppliers.php:108 - #: ../purchasing/manage/suppliers.php.orig:109 ++#: ../purchasing/manage/suppliers.php.orig:108 msgid "Our Customer No:" msgstr "" -#: purchasing/manage/suppliers.php:108 +#: ../purchasing/manage/suppliers.php:110 - #: ../purchasing/manage/suppliers.php.orig:120 ++#: ../purchasing/manage/suppliers.php.orig:110 msgid "Purchasing" msgstr "" -#: purchasing/manage/suppliers.php:109 +#: ../purchasing/manage/suppliers.php:111 - #: ../purchasing/manage/suppliers.php.orig:121 ++#: ../purchasing/manage/suppliers.php.orig:111 msgid "Bank Name/Account:" msgstr "" -#: purchasing/manage/suppliers.php:110 sales/manage/customers.php:264 +#: ../purchasing/manage/suppliers.php:112 - #: ../purchasing/manage/suppliers.php.orig:122 - #: ../sales/manage/customers.php:264 ++#: ../purchasing/manage/suppliers.php.orig:112 ++#: ../sales/manage/customers.php:267 +#: ../sales/manage/sav.customers.php:263 msgid "Credit Limit:" msgstr "" -#: purchasing/manage/suppliers.php:111 sales/manage/customers.php:266 +#: ../purchasing/manage/suppliers.php:113 - #: ../purchasing/manage/suppliers.php.orig:123 - #: ../sales/manage/customers.php:266 ++#: ../purchasing/manage/suppliers.php.orig:113 ++#: ../sales/manage/customers.php:269 +#: ../sales/manage/sav.customers.php:265 msgid "Payment Terms:" msgstr "" -#: purchasing/manage/suppliers.php:117 purchasing/manage/suppliers.php:120 +#: ../purchasing/manage/suppliers.php:119 +#: ../purchasing/manage/suppliers.php:122 - #: ../purchasing/manage/suppliers.php.orig:129 - #: ../purchasing/manage/suppliers.php.orig:132 ++#: ../purchasing/manage/suppliers.php.orig:119 ++#: ../purchasing/manage/suppliers.php.orig:122 msgid "Prices contain tax included:" msgstr "" -#: purchasing/manage/suppliers.php:122 reporting/rep704.php:96 -#: reporting/rep704.php:106 reporting/rep704.php:114 +#: ../purchasing/manage/suppliers.php:124 - #: ../purchasing/manage/suppliers.php.orig:134 ++#: ../purchasing/manage/suppliers.php.orig:124 +msgid "Tax Calculation Algorithm:" +msgstr "" + +#: ../purchasing/manage/suppliers.php:128 - #: ../purchasing/manage/suppliers.php.orig:138 - #: ../reporting/rep704.php:92 - #: ../reporting/rep704.php:102 - #: ../reporting/rep704.php:110 ++#: ../purchasing/manage/suppliers.php.orig:128 ++#: ../reporting/rep704.php:96 ++#: ../reporting/rep704.php:106 ++#: ../reporting/rep704.php:114 msgid "Accounts" msgstr "" -#: purchasing/manage/suppliers.php:123 +#: ../purchasing/manage/suppliers.php:129 - #: ../purchasing/manage/suppliers.php.orig:139 ++#: ../purchasing/manage/suppliers.php.orig:129 msgid "Accounts Payable Account:" msgstr "" -#: purchasing/manage/suppliers.php:124 +#: ../purchasing/manage/suppliers.php:130 - #: ../purchasing/manage/suppliers.php.orig:140 ++#: ../purchasing/manage/suppliers.php.orig:130 msgid "Purchase Account:" msgstr "" -#: purchasing/manage/suppliers.php:125 +#: ../purchasing/manage/suppliers.php:131 - #: ../purchasing/manage/suppliers.php.orig:141 ++#: ../purchasing/manage/suppliers.php.orig:131 msgid "Use Item Inventory/COGS Account" msgstr "" -#: purchasing/manage/suppliers.php:128 purchasing/manage/suppliers.php:157 +#: ../purchasing/manage/suppliers.php:134 +#: ../purchasing/manage/suppliers.php:137 - #: ../purchasing/manage/suppliers.php.orig:112 ++#: ../purchasing/manage/suppliers.php.orig:134 ++#: ../purchasing/manage/suppliers.php.orig:137 msgid "Contact Data" msgstr "" -#: purchasing/manage/suppliers.php:148 sales/manage/customer_branches.php:266 +#: ../purchasing/manage/suppliers.php:140 - #: ../purchasing/manage/suppliers.php.orig:118 ++#: ../purchasing/manage/suppliers.php.orig:140 +msgid "System default" +msgstr "" + +#: ../purchasing/manage/suppliers.php:157 - #: ../purchasing/manage/suppliers.php.orig:159 ++#: ../purchasing/manage/suppliers.php.orig:157 +#: ../sales/manage/customer_branches.php:268 msgid "Addresses" msgstr "" -#: purchasing/manage/suppliers.php:149 reporting/rep205.php:102 -#: sales/manage/customer_branches.php:267 +#: ../purchasing/manage/suppliers.php:158 - #: ../purchasing/manage/suppliers.php.orig:160 ++#: ../purchasing/manage/suppliers.php.orig:158 ++#: ../reporting/rep205.php:102 +#: ../sales/manage/customer_branches.php:269 msgid "Mailing Address:" msgstr "" -#: purchasing/manage/suppliers.php:150 +#: ../purchasing/manage/suppliers.php:159 - #: ../purchasing/manage/suppliers.php.orig:161 ++#: ../purchasing/manage/suppliers.php.orig:159 msgid "Physical Address:" msgstr "" -#: purchasing/manage/suppliers.php:152 +#: ../purchasing/manage/suppliers.php:161 - #: ../purchasing/manage/suppliers.php.orig:163 ++#: ../purchasing/manage/suppliers.php.orig:161 msgid "General" msgstr "" -#: purchasing/manage/suppliers.php:153 sales/manage/customer_branches.php:269 -#: sales/manage/customers.php:287 +#: ../purchasing/manage/suppliers.php:162 - #: ../purchasing/manage/suppliers.php.orig:164 ++#: ../purchasing/manage/suppliers.php.orig:162 +#: ../sales/manage/customer_branches.php:271 - #: ../sales/manage/customers.php:287 ++#: ../sales/manage/customers.php:290 +#: ../sales/manage/sav.customers.php:286 msgid "General Notes:" msgstr "" -#: purchasing/manage/suppliers.php:155 +#: ../purchasing/manage/suppliers.php:164 - #: ../purchasing/manage/suppliers.php.orig:166 ++#: ../purchasing/manage/suppliers.php.orig:164 msgid "Supplier status:" msgstr "" -#: purchasing/manage/suppliers.php:161 -msgid "System default" -msgstr "" - -#: purchasing/manage/suppliers.php:168 +#: ../purchasing/manage/suppliers.php:170 - #: ../purchasing/manage/suppliers.php.orig:173 ++#: ../purchasing/manage/suppliers.php.orig:170 msgid "Update Supplier" msgstr "" -#: purchasing/manage/suppliers.php:169 +#: ../purchasing/manage/suppliers.php:171 - #: ../purchasing/manage/suppliers.php.orig:174 ++#: ../purchasing/manage/suppliers.php.orig:171 msgid "Update supplier data" msgstr "" -#: purchasing/manage/suppliers.php:170 +#: ../purchasing/manage/suppliers.php:172 - #: ../purchasing/manage/suppliers.php.orig:175 ++#: ../purchasing/manage/suppliers.php.orig:172 msgid "Select this supplier and return to document entry." msgstr "" -#: purchasing/manage/suppliers.php:171 +#: ../purchasing/manage/suppliers.php:173 - #: ../purchasing/manage/suppliers.php.orig:176 ++#: ../purchasing/manage/suppliers.php.orig:173 msgid "Delete Supplier" msgstr "" -#: purchasing/manage/suppliers.php:172 +#: ../purchasing/manage/suppliers.php:174 - #: ../purchasing/manage/suppliers.php.orig:177 ++#: ../purchasing/manage/suppliers.php.orig:174 msgid "Delete supplier data if have been never used" msgstr "" -#: purchasing/manage/suppliers.php:176 +#: ../purchasing/manage/suppliers.php:178 - #: ../purchasing/manage/suppliers.php.orig:181 ++#: ../purchasing/manage/suppliers.php.orig:178 msgid "Add New Supplier Details" msgstr "" -#: purchasing/manage/suppliers.php:195 +#: ../purchasing/manage/suppliers.php:197 - #: ../purchasing/manage/suppliers.php.orig:200 ++#: ../purchasing/manage/suppliers.php.orig:197 msgid "The supplier name must be entered." msgstr "" -#: purchasing/manage/suppliers.php:202 +#: ../purchasing/manage/suppliers.php:204 - #: ../purchasing/manage/suppliers.php.orig:207 ++#: ../purchasing/manage/suppliers.php.orig:204 msgid "The supplier short name must be entered." msgstr "" - #: ../purchasing/manage/suppliers.php:224 - #: ../purchasing/manage/suppliers.php.orig:227 -#: purchasing/manage/suppliers.php:222 ++#: ../purchasing/manage/suppliers.php.orig:224 msgid "Supplier has been updated." msgstr "" - #: ../purchasing/manage/suppliers.php:242 - #: ../purchasing/manage/suppliers.php.orig:245 -#: purchasing/manage/suppliers.php:240 ++#: ../purchasing/manage/suppliers.php.orig:242 msgid "A new supplier has been added." msgstr "" - #: ../purchasing/manage/suppliers.php:260 - #: ../purchasing/manage/suppliers.php.orig:263 -#: purchasing/manage/suppliers.php:258 ++#: ../purchasing/manage/suppliers.php.orig:260 msgid "" "Cannot delete this supplier because there are transactions that refer to " "this supplier." msgstr "" - #: ../purchasing/manage/suppliers.php:268 - #: ../purchasing/manage/suppliers.php.orig:271 -#: purchasing/manage/suppliers.php:266 ++#: ../purchasing/manage/suppliers.php.orig:268 msgid "" "Cannot delete the supplier record because purchase orders have been created " "against this supplier." msgstr "" - #: ../purchasing/manage/suppliers.php:289 - #: ../purchasing/manage/suppliers.php.orig:292 -#: purchasing/manage/suppliers.php:287 -#: purchasing/inquiry/supplier_allocation_inquiry.php:48 ++#: ../purchasing/manage/suppliers.php.orig:289 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:48 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:48 msgid "Select a supplier: " msgstr "" - #: ../purchasing/manage/suppliers.php:290 - #: ../purchasing/manage/suppliers.php.orig:293 -#: purchasing/manage/suppliers.php:288 ++#: ../purchasing/manage/suppliers.php.orig:290 msgid "New supplier" msgstr "" - #: ../purchasing/manage/suppliers.php:309 - #: ../purchasing/manage/suppliers.php.orig:312 -#: purchasing/manage/suppliers.php:307 sales/manage/customer_branches.php:323 -#: sales/manage/customers.php:345 ++#: ../purchasing/manage/suppliers.php.orig:309 +#: ../sales/manage/customer_branches.php:325 - #: ../sales/manage/customers.php:345 ++#: ../sales/manage/customers.php:348 +#: ../sales/manage/sav.customers.php:343 msgid "&Contacts" msgstr "" - #: ../purchasing/manage/suppliers.php:311 - #: ../purchasing/manage/suppliers.php.orig:314 -#: purchasing/manage/suppliers.php:309 ++#: ../purchasing/manage/suppliers.php.orig:311 msgid "Purchase &Orders" msgstr "" @@@ -11613,11 -9967,10 +11508,11 @@@ msgid "Search Purchase Orders" msgstr "" -#: purchasing/inquiry/po_search_completed.php:63 -#: purchasing/inquiry/po_search.php:62 -#: sales/inquiry/sales_deliveries_view.php:103 -#: sales/inquiry/sales_orders_view.php:225 +#: ../purchasing/inquiry/po_search_completed.php:60 +#: ../purchasing/inquiry/po_search_completed.php.orig:61 +#: ../purchasing/inquiry/po_search.php:62 +#: ../sales/inquiry/sales_deliveries_view.php:103 - #: ../sales/inquiry/sales_orders_view.php:247 ++#: ../sales/inquiry/sales_orders_view.php.orig:247 msgid "#:" msgstr "" @@@ -11626,17 -9978,15 +11521,18 @@@ msgid "into location:" msgstr "" -#: purchasing/inquiry/po_search_completed.php:126 -#: purchasing/inquiry/po_search.php:135 reporting/includes/doctext.inc:166 -#: sales/inquiry/sales_orders_view.php:267 +#: ../purchasing/inquiry/po_search_completed.php:125 +#: ../purchasing/inquiry/po_search_completed.php.orig:124 +#: ../purchasing/inquiry/po_search.php:135 - #: ../sales/inquiry/sales_orders_view.php:289 ++#: ../reporting/includes/doctext.inc:188 ++#: ../sales/inquiry/sales_orders_view.php.orig:289 msgid "Order Date" msgstr "" -#: purchasing/inquiry/po_search_completed.php:128 -#: purchasing/inquiry/po_search.php:137 -#: sales/inquiry/sales_orders_view.php:270 +#: ../purchasing/inquiry/po_search_completed.php:127 +#: ../purchasing/inquiry/po_search_completed.php.orig:126 +#: ../purchasing/inquiry/po_search.php:137 - #: ../sales/inquiry/sales_orders_view.php:292 ++#: ../sales/inquiry/sales_orders_view.php.orig:292 msgid "Order Total" msgstr "" @@@ -11652,109 -10002,81 +11548,109 @@@ msgstr " msgid "Marked orders have overdue items." msgstr "" -#: purchasing/inquiry/supplier_allocation_inquiry.php:23 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:23 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:23 msgid "Supplier Allocation Inquiry" msgstr "" -#: purchasing/inquiry/supplier_allocation_inquiry.php:55 -#: sales/inquiry/customer_allocation_inquiry.php:49 +#: ../purchasing/inquiry/supplier_allocation_inquiry.php:55 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:55 +#: ../sales/inquiry/customer_allocation_inquiry.php:49 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:49 msgid "show settled:" msgstr "" - #: ../purchasing/inquiry/supplier_allocation_inquiry.php:129 -#: purchasing/inquiry/supplier_allocation_inquiry.php:103 -msgid "Pay" -msgstr "" - -#: purchasing/inquiry/supplier_allocation_inquiry.php:130 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:129 msgid "Supp Reference" msgstr "" - #: ../purchasing/inquiry/supplier_allocation_inquiry.php:135 - #: ../reporting/rep101.php:131 - #: ../reporting/rep201.php:119 -#: purchasing/inquiry/supplier_allocation_inquiry.php:136 -#: reporting/rep101.php:119 reporting/rep201.php:111 -#: reporting/includes/doctext.inc:225 -#: sales/inquiry/customer_allocation_inquiry.php:153 ++#: ../purchasing/inquiry/supplier_allocation_inquiry.php.orig:135 ++#: ../reporting/rep101.php:119 ++#: ../reporting/rep201.php:111 +#: ../reporting/includes/doctext.inc:247 - #: ../sales/inquiry/customer_allocation_inquiry.php:154 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:154 msgid "Allocated" msgstr "" -#: purchasing/inquiry/supplier_inquiry.php:27 +#: ../purchasing/inquiry/supplier_inquiry.php:25 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:25 msgid "Supplier Inquiry" msgstr "" -#: purchasing/inquiry/supplier_inquiry.php:51 +#: ../purchasing/inquiry/supplier_inquiry.php:48 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:48 msgid "Select a supplier:" msgstr "" -#: purchasing/inquiry/supplier_inquiry.php:70 -#: purchasing/inquiry/supplier_inquiry.php:71 -#: purchasing/inquiry/supplier_inquiry.php:72 reporting/rep102.php:120 -#: reporting/rep102.php:121 reporting/rep102.php:122 reporting/rep102.php:244 -#: reporting/rep108.php:151 reporting/rep108.php:152 reporting/rep108.php:153 -#: reporting/rep202.php:124 reporting/rep202.php:125 reporting/rep202.php:126 -#: reporting/rep202.php:158 reporting/rep202.php:159 reporting/rep202.php:160 -#: reporting/rep202.php:252 sales/create_recurrent_invoices.php:134 -#: sales/manage/recurrent_invoices.php:102 -#: sales/inquiry/customer_inquiry.php:75 sales/inquiry/customer_inquiry.php:76 -#: sales/inquiry/customer_inquiry.php:77 +#: ../purchasing/inquiry/supplier_inquiry.php:67 +#: ../purchasing/inquiry/supplier_inquiry.php:68 +#: ../purchasing/inquiry/supplier_inquiry.php:69 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:67 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:68 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:69 - #: ../reporting/rep102.php:118 - #: ../reporting/rep102.php:119 +#: ../reporting/rep102.php:120 - #: ../reporting/rep102.php:240 - #: ../reporting/rep108.php:150 ++#: ../reporting/rep102.php:121 ++#: ../reporting/rep102.php:122 ++#: ../reporting/rep102.php:244 +#: ../reporting/rep108.php:151 +#: ../reporting/rep108.php:152 - #: ../reporting/rep202.php:122 - #: ../reporting/rep202.php:123 ++#: ../reporting/rep108.php:153 +#: ../reporting/rep202.php:124 - #: ../reporting/rep202.php:154 - #: ../reporting/rep202.php:155 - #: ../reporting/rep202.php:156 - #: ../reporting/rep202.php:248 - #: ../sales/create_recurrent_invoices.php:132 ++#: ../reporting/rep202.php:125 ++#: ../reporting/rep202.php:126 ++#: ../reporting/rep202.php:158 ++#: ../reporting/rep202.php:159 ++#: ../reporting/rep202.php:160 ++#: ../reporting/rep202.php:252 ++#: ../sales/create_recurrent_invoices.php:134 +#: ../sales/manage/recurrent_invoices.php:102 +#: ../sales/inquiry/customer_inquiry.php:71 +#: ../sales/inquiry/customer_inquiry.php:72 +#: ../sales/inquiry/customer_inquiry.php:73 ++#: ../sales/inquiry/customer_inquiry.php.orig:71 ++#: ../sales/inquiry/customer_inquiry.php.orig:72 ++#: ../sales/inquiry/customer_inquiry.php.orig:73 msgid "Days" msgstr "" -#: purchasing/inquiry/supplier_inquiry.php:72 reporting/rep102.php:122 -#: reporting/rep108.php:153 reporting/rep202.php:126 reporting/rep202.php:160 -#: sales/inquiry/customer_inquiry.php:77 +#: ../purchasing/inquiry/supplier_inquiry.php:69 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:69 - #: ../reporting/rep102.php:120 - #: ../reporting/rep108.php:152 - #: ../reporting/rep202.php:124 - #: ../reporting/rep202.php:156 ++#: ../reporting/rep102.php:122 ++#: ../reporting/rep108.php:153 ++#: ../reporting/rep202.php:126 ++#: ../reporting/rep202.php:160 +#: ../sales/inquiry/customer_inquiry.php:73 ++#: ../sales/inquiry/customer_inquiry.php.orig:73 msgid "Over" msgstr "" -#: purchasing/inquiry/supplier_inquiry.php:76 -#: sales/inquiry/customer_inquiry.php:80 +#: ../purchasing/inquiry/supplier_inquiry.php:73 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:73 +#: ../sales/inquiry/customer_inquiry.php:76 ++#: ../sales/inquiry/customer_inquiry.php.orig:76 msgid "Terms" msgstr "" -#: purchasing/inquiry/supplier_inquiry.php:76 reporting/rep102.php:125 -#: reporting/rep102.php:242 reporting/rep108.php:155 reporting/rep202.php:130 -#: reporting/rep202.php:250 sales/inquiry/customer_inquiry.php:80 +#: ../purchasing/inquiry/supplier_inquiry.php:73 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:73 - #: ../reporting/rep102.php:123 - #: ../reporting/rep102.php:238 - #: ../reporting/rep108.php:154 - #: ../reporting/rep202.php:128 - #: ../reporting/rep202.php:246 ++#: ../reporting/rep102.php:125 ++#: ../reporting/rep102.php:242 ++#: ../reporting/rep108.php:155 ++#: ../reporting/rep202.php:130 ++#: ../reporting/rep202.php:250 +#: ../sales/inquiry/customer_inquiry.php:76 ++#: ../sales/inquiry/customer_inquiry.php.orig:76 msgid "Current" msgstr "" -#: purchasing/inquiry/supplier_inquiry.php:77 reporting/rep102.php:126 -#: reporting/rep108.php:155 reporting/rep202.php:131 -#: sales/inquiry/customer_inquiry.php:81 +#: ../purchasing/inquiry/supplier_inquiry.php:74 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:74 - #: ../reporting/rep102.php:124 - #: ../reporting/rep108.php:154 - #: ../reporting/rep202.php:129 ++#: ../reporting/rep102.php:126 ++#: ../reporting/rep108.php:155 ++#: ../reporting/rep202.php:131 +#: ../sales/inquiry/customer_inquiry.php:77 ++#: ../sales/inquiry/customer_inquiry.php.orig:77 msgid "Total Balance" msgstr "" -#: purchasing/inquiry/supplier_inquiry.php:133 -#: sales/inquiry/customer_inquiry.php:164 +#: ../purchasing/inquiry/supplier_inquiry.php:133 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:130 +#: ../sales/inquiry/customer_inquiry.php:162 ++#: ../sales/inquiry/customer_inquiry.php.orig:162 msgid "Credit This" msgstr "" -#: purchasing/inquiry/supplier_inquiry.php:155 +#: ../purchasing/inquiry/supplier_inquiry.php:155 - #: ../purchasing/inquiry/supplier_inquiry.php.orig:152 msgid "Print Remittance" msgstr "" @@@ -11762,41 -10084,41 +11658,46 @@@ msgid "Allocate Supplier Payment or Credit Note" msgstr "" - #: ../purchasing/allocations/supplier_allocate.php:50 -#: purchasing/allocations/supplier_allocate.php:49 ++#: ../purchasing/allocations/supplier_allocate.php:52 msgid "Allocation of" msgstr "" - #: ../purchasing/allocations/supplier_allocate.php:55 - #: ../sales/allocations/customer_allocate.php:54 -#: purchasing/allocations/supplier_allocate.php:54 -#: sales/allocations/customer_allocate.php:53 ++#: ../purchasing/allocations/supplier_allocate.php:58 ++#: ../sales/allocations/customer_allocate.php:55 msgid "Total:" msgstr "" - #: ../purchasing/allocations/supplier_allocate.php:64 - #: ../sales/allocations/customer_allocate.php:63 -#: purchasing/allocations/supplier_allocate.php:63 -#: sales/allocations/customer_allocate.php:62 ++#: ../purchasing/allocations/supplier_allocate.php:62 ++#: ../sales/allocations/customer_allocate.php:59 ++msgid "Total in clearing currency:" ++msgstr "" ++ ++#: ../purchasing/allocations/supplier_allocate.php:73 ++#: ../sales/allocations/customer_allocate.php:71 msgid "Start again allocation of selected amount" msgstr "" - #: ../purchasing/allocations/supplier_allocate.php:65 - #: ../sales/allocations/customer_allocate.php:64 -#: purchasing/allocations/supplier_allocate.php:64 -#: sales/allocations/customer_allocate.php:63 ++#: ../purchasing/allocations/supplier_allocate.php:74 ++#: ../sales/allocations/customer_allocate.php:72 msgid "Process allocations" msgstr "" - #: ../purchasing/allocations/supplier_allocate.php:66 - #: ../purchasing/allocations/supplier_allocate.php:72 - #: ../sales/allocations/customer_allocate.php:65 - #: ../sales/allocations/customer_allocate.php:71 -#: purchasing/allocations/supplier_allocate.php:65 -#: purchasing/allocations/supplier_allocate.php:71 -#: sales/allocations/customer_allocate.php:64 -#: sales/allocations/customer_allocate.php:70 ++#: ../purchasing/allocations/supplier_allocate.php:75 ++#: ../purchasing/allocations/supplier_allocate.php:81 ++#: ../sales/allocations/customer_allocate.php:73 ++#: ../sales/allocations/customer_allocate.php:79 msgid "Back to Allocations" msgstr "" - #: ../purchasing/allocations/supplier_allocate.php:67 - #: ../purchasing/allocations/supplier_allocate.php:73 - #: ../sales/allocations/customer_allocate.php:65 - #: ../sales/allocations/customer_allocate.php:72 -#: purchasing/allocations/supplier_allocate.php:66 -#: purchasing/allocations/supplier_allocate.php:72 -#: sales/allocations/customer_allocate.php:64 -#: sales/allocations/customer_allocate.php:71 ++#: ../purchasing/allocations/supplier_allocate.php:76 ++#: ../purchasing/allocations/supplier_allocate.php:82 ++#: ../sales/allocations/customer_allocate.php:73 ++#: ../sales/allocations/customer_allocate.php:80 msgid "Abandon allocations and return to selection of allocatable amounts" msgstr "" - #: ../purchasing/allocations/supplier_allocate.php:71 - #: ../sales/allocations/customer_allocate.php:69 -#: purchasing/allocations/supplier_allocate.php:70 -#: sales/allocations/customer_allocate.php:68 ++#: ../purchasing/allocations/supplier_allocate.php:80 ++#: ../sales/allocations/customer_allocate.php:77 msgid "There are no unsettled transactions to allocate." msgstr "" @@@ -11823,814 -10145,729 +11724,870 @@@ msgstr " msgid "Marked items are settled." msgstr "" - #: ../reporting/rep101.php:120 - #: ../reporting/rep102.php:106 - #: ../reporting/rep114.php:103 - #: ../reporting/rep202.php:110 - #: ../reporting/rep203.php:81 -#: reporting/rep101.php:108 reporting/rep102.php:108 reporting/rep114.php:108 -#: reporting/rep202.php:112 reporting/rep203.php:83 ++#: ../reporting/rep101.php:108 ++#: ../reporting/rep102.php:108 ++#: ../reporting/rep114.php:108 ++#: ../reporting/rep202.php:112 ++#: ../reporting/rep203.php:83 msgid "Balances in Home Currency" msgstr "" - #: ../reporting/rep101.php:130 - #: ../reporting/rep201.php:118 - #: ../reporting/rep203.php:91 - #: ../reporting/rep709.php:109 -#: reporting/rep101.php:118 reporting/rep201.php:110 reporting/rep203.php:93 -#: reporting/rep709.php:111 reporting/includes/doctext.inc:145 -#: reporting/includes/doctext.inc:186 reporting/includes/doctext.inc:224 ++#: ../reporting/rep101.php:118 ++#: ../reporting/rep201.php:110 ++#: ../reporting/rep203.php:93 ++#: ../reporting/rep709.php:111 +#: ../reporting/includes/doctext.inc:167 +#: ../reporting/includes/doctext.inc:208 +#: ../reporting/includes/doctext.inc:246 msgid "Trans Type" msgstr "" - #: ../reporting/rep101.php:130 - #: ../reporting/rep201.php:118 -#: reporting/rep101.php:118 reporting/rep201.php:110 -#: reporting/includes/doctext.inc:224 ++#: ../reporting/rep101.php:118 ++#: ../reporting/rep201.php:110 +#: ../reporting/includes/doctext.inc:246 msgid "Charges" msgstr "" - #: ../reporting/rep101.php:130 - #: ../reporting/rep201.php:119 -#: reporting/rep101.php:118 reporting/rep201.php:111 -#: reporting/includes/doctext.inc:225 ++#: ../reporting/rep101.php:118 ++#: ../reporting/rep201.php:111 +#: ../reporting/includes/doctext.inc:247 msgid "Credits" msgstr "" - #: ../reporting/rep101.php:139 - #: ../reporting/rep102.php:134 - #: ../reporting/rep201.php:127 - #: ../reporting/rep202.php:139 - #: ../reporting/rep203.php:100 - #: ../reporting/rep303.php:124 - #: ../reporting/reports_main.php:38 - #: ../reporting/reports_main.php:47 - #: ../reporting/reports_main.php:138 - #: ../reporting/reports_main.php:147 - #: ../reporting/reports_main.php:155 - #: ../reporting/reports_main.php:195 -#: reporting/rep101.php:129 reporting/rep102.php:136 reporting/rep201.php:121 -#: reporting/rep202.php:141 reporting/rep203.php:102 reporting/rep303.php:136 -#: reporting/reports_main.php:39 reporting/reports_main.php:49 -#: reporting/reports_main.php:156 reporting/reports_main.php:166 -#: reporting/reports_main.php:175 reporting/reports_main.php:227 ++#: ../reporting/rep101.php:129 ++#: ../reporting/rep102.php:136 ++#: ../reporting/rep201.php:121 ++#: ../reporting/rep202.php:141 ++#: ../reporting/rep203.php:102 ++#: ../reporting/rep303.php:136 ++#: ../reporting/reports_main.php:39 ++#: ../reporting/reports_main.php:49 ++#: ../reporting/reports_main.php:156 ++#: ../reporting/reports_main.php:166 ++#: ../reporting/reports_main.php:175 msgid "Suppress Zeros" msgstr "" - #: ../reporting/rep101.php:141 -#: reporting/rep101.php:131 ++#: ../reporting/rep101.php:131 msgid "Customer Balances" msgstr "" - #: ../reporting/rep101.php:244 - #: ../reporting/rep102.php:224 - #: ../reporting/rep106.php:167 - #: ../reporting/rep201.php:231 - #: ../reporting/rep202.php:231 - #: ../reporting/rep203.php:177 - #: ../reporting/rep204.php:144 - #: ../reporting/rep301.php:176 - #: ../reporting/rep304.php:191 - #: ../reporting/rep305.php:183 -#: reporting/rep101.php:241 reporting/rep102.php:228 reporting/rep106.php:171 -#: reporting/rep201.php:233 reporting/rep202.php:235 reporting/rep203.php:181 -#: reporting/rep204.php:148 reporting/rep301.php:179 reporting/rep304.php:195 -#: reporting/rep305.php:188 reporting/rep306.php:293 reporting/rep309.php:158 ++#: ../reporting/rep101.php:241 ++#: ../reporting/rep102.php:228 ++#: ../reporting/rep106.php:171 ++#: ../reporting/rep201.php:233 ++#: ../reporting/rep202.php:235 ++#: ../reporting/rep203.php:181 ++#: ../reporting/rep204.php:148 ++#: ../reporting/rep301.php:179 ++#: ../reporting/rep304.php:195 ++#: ../reporting/rep305.php:188 ++#: ../reporting/rep306.php:293 ++#: ../reporting/rep309.php:158 msgid "Grand Total" msgstr "" - #: ../reporting/rep102.php:100 - #: ../reporting/rep106.php:91 - #: ../reporting/rep202.php:104 - #: ../reporting/rep709.php:93 - #: ../reporting/reports_main.php:46 - #: ../reporting/reports_main.php:84 - #: ../reporting/reports_main.php:146 - #: ../reporting/reports_main.php:181 - #: ../reporting/reports_main.php:393 - msgid "Summary Only" - msgstr "" - -#: reporting/rep102.php:102 reporting/rep106.php:93 reporting/rep202.php:106 -#: reporting/rep709.php:95 reporting/reports_main.php:48 -#: reporting/reports_main.php:91 reporting/reports_main.php:165 -#: reporting/reports_main.php:211 reporting/reports_main.php:484 +#: ../reporting/rep102.php:102 ++#: ../reporting/rep106.php:93 +#: ../reporting/rep202.php:106 +#: ../reporting/rep709.php:95 ++#: ../reporting/reports_main.php:48 ++#: ../reporting/reports_main.php:91 ++#: ../reporting/reports_main.php:165 + msgid "Summary Only" + msgstr "" + -#: reporting/rep102.php:104 reporting/rep202.php:108 reporting/rep709.php:97 ++#: ../reporting/rep102.php:104 ++#: ../reporting/rep202.php:108 ++#: ../reporting/rep709.php:97 msgid "Detailed Report" msgstr "" - #: ../reporting/rep102.php:129 - #: ../reporting/rep202.php:134 - #: ../reporting/rep203.php:97 - #: ../reporting/rep301.php:108 -#: reporting/rep102.php:131 reporting/rep202.php:136 reporting/rep203.php:99 -#: reporting/rep301.php:110 reporting/reports_main.php:35 -#: reporting/reports_main.php:44 reporting/reports_main.php:65 -#: reporting/reports_main.php:81 reporting/reports_main.php:90 -#: reporting/reports_main.php:152 reporting/reports_main.php:161 -#: reporting/reports_main.php:172 reporting/reports_main.php:208 -#: reporting/reports_main.php:234 reporting/reports_main.php:243 -#: reporting/reports_main.php:249 reporting/reports_main.php:259 -#: reporting/reports_main.php:267 reporting/reports_main.php:275 -#: reporting/reports_main.php:312 reporting/reports_main.php:326 -#: reporting/reports_main.php:338 reporting/reports_main.php:356 -#: reporting/reports_main.php:367 reporting/reports_main.php:379 -#: reporting/reports_main.php:392 reporting/reports_main.php:408 -#: reporting/reports_main.php:418 reporting/reports_main.php:429 -#: reporting/reports_main.php:441 reporting/reports_main.php:455 -#: reporting/reports_main.php:464 reporting/reports_main.php:474 -#: reporting/reports_main.php:483 reporting/reports_main.php:490 ++#: ../reporting/rep102.php:131 ++#: ../reporting/rep202.php:136 ++#: ../reporting/rep203.php:99 ++#: ../reporting/rep301.php:110 +#: ../reporting/reports_main.php:35 - #: ../reporting/reports_main.php:42 - #: ../reporting/reports_main.php:61 - #: ../reporting/reports_main.php:75 - #: ../reporting/reports_main.php:83 - #: ../reporting/reports_main.php:135 - #: ../reporting/reports_main.php:142 ++#: ../reporting/reports_main.php:44 ++#: ../reporting/reports_main.php:65 ++#: ../reporting/reports_main.php:81 ++#: ../reporting/reports_main.php:90 +#: ../reporting/reports_main.php:152 - #: ../reporting/reports_main.php:178 - #: ../reporting/reports_main.php:200 - #: ../reporting/reports_main.php:208 - #: ../reporting/reports_main.php:240 - #: ../reporting/reports_main.php:251 - #: ../reporting/reports_main.php:262 - #: ../reporting/reports_main.php:278 - #: ../reporting/reports_main.php:288 - #: ../reporting/reports_main.php:299 - #: ../reporting/reports_main.php:311 - #: ../reporting/reports_main.php:325 - #: ../reporting/reports_main.php:334 - #: ../reporting/reports_main.php:344 - #: ../reporting/reports_main.php:355 - #: ../reporting/reports_main.php:367 - #: ../reporting/reports_main.php:375 - #: ../reporting/reports_main.php:384 - #: ../reporting/reports_main.php:392 - #: ../reporting/reports_main.php:398 ++#: ../reporting/reports_main.php:161 ++#: ../reporting/reports_main.php:172 msgid "End Date" msgstr "" - #: ../reporting/rep102.php:133 - #: ../reporting/rep202.php:138 - #: ../reporting/reports_main.php:45 - #: ../reporting/reports_main.php:110 - #: ../reporting/reports_main.php:145 -#: reporting/rep102.php:135 reporting/rep202.php:140 -#: reporting/reports_main.php:47 reporting/reports_main.php:123 -#: reporting/reports_main.php:164 ++#: ../reporting/rep102.php:135 ++#: ../reporting/rep202.php:140 ++#: ../reporting/reports_main.php:47 ++#: ../reporting/reports_main.php:123 ++#: ../reporting/reports_main.php:164 msgid "Show Also Allocated" msgstr "" - #: ../reporting/rep102.php:138 -#: reporting/rep102.php:140 ++#: ../reporting/rep102.php:140 msgid "Aged Customer Analysis" msgstr "" - #: ../reporting/rep103.php:115 -#: reporting/rep103.php:134 ++#: ../reporting/rep103.php:134 msgid "All Areas" msgstr "" - #: ../reporting/rep103.php:119 -#: reporting/rep103.php:138 ++#: ../reporting/rep103.php:138 msgid "All Sales Folk" msgstr "" - #: ../reporting/rep103.php:123 -#: reporting/rep103.php:142 reporting/rep205.php:89 ++#: ../reporting/rep103.php:142 ++#: ../reporting/rep205.php:89 msgid "Greater than " msgstr "" - #: ../reporting/rep103.php:127 -#: reporting/rep103.php:146 reporting/rep205.php:93 ++#: ../reporting/rep103.php:146 ++#: ../reporting/rep205.php:93 msgid "Less than " msgstr "" - #: ../reporting/rep103.php:136 -#: reporting/rep103.php:155 ++#: ../reporting/rep103.php:155 msgid "Customer Postal Address" msgstr "" - #: ../reporting/rep103.php:136 -#: reporting/rep103.php:155 ++#: ../reporting/rep103.php:155 msgid "Price/Turnover" msgstr "" - #: ../reporting/rep103.php:136 -#: reporting/rep103.php:155 ++#: ../reporting/rep103.php:155 msgid "Branch Contact Information" msgstr "" - #: ../reporting/rep103.php:137 -#: reporting/rep103.php:156 ++#: ../reporting/rep103.php:156 msgid "Branch Delivery Address" msgstr "" - #: ../reporting/rep103.php:142 - #: ../reporting/reports_main.php:52 -#: reporting/rep103.php:161 reporting/rep205.php:108 -#: reporting/reports_main.php:55 reporting/reports_main.php:185 ++#: ../reporting/rep103.php:161 ++#: ../reporting/rep205.php:108 ++#: ../reporting/reports_main.php:55 ++#: ../reporting/reports_main.php:185 msgid "Activity Since" msgstr "" - #: ../reporting/rep103.php:143 - #: ../reporting/reports_main.php:53 -#: reporting/rep103.php:162 reporting/reports_main.php:56 -#: sales/manage/sales_areas.php:16 ++#: ../reporting/rep103.php:162 ++#: ../reporting/reports_main.php:56 +#: ../sales/manage/sales_areas.php:16 msgid "Sales Areas" msgstr "" - #: ../reporting/rep103.php:144 - #: ../reporting/reports_main.php:54 -#: reporting/rep103.php:163 reporting/reports_main.php:57 ++#: ../reporting/rep103.php:163 ++#: ../reporting/reports_main.php:57 msgid "Sales Folk" msgstr "" - #: ../reporting/rep103.php:145 -#: reporting/rep103.php:164 reporting/rep205.php:109 ++#: ../reporting/rep103.php:164 ++#: ../reporting/rep205.php:109 msgid "Activity" msgstr "" - #: ../reporting/rep103.php:147 -#: reporting/rep103.php:166 ++#: ../reporting/rep103.php:166 msgid "Customer Details Listing" msgstr "" - #: ../reporting/rep103.php:175 -#: reporting/rep103.php:197 ++#: ../reporting/rep103.php:197 msgid "Customers in" msgstr "" - #: ../reporting/rep103.php:196 -#: reporting/rep103.php:218 ++#: ../reporting/rep103.php:218 msgid "Price List" msgstr "" - #: ../reporting/rep103.php:207 -#: reporting/rep103.php:246 reporting/rep205.php:164 ++#: ../reporting/rep103.php:246 ++#: ../reporting/rep205.php:164 + msgid "Ph" + msgstr "" + -#: reporting/rep103.php:261 reporting/rep205.php:179 ++#: ../reporting/rep103.php:261 ++#: ../reporting/rep205.php:179 + msgid "Gereral Notes:" + msgstr "" + -#: reporting/rep103.php:270 reporting/rep205.php:102 reporting/rep205.php:188 ++#: ../reporting/rep103.php:270 ++#: ../reporting/rep205.php:102 ++#: ../reporting/rep205.php:188 msgid "Turnover" msgstr "" - #: ../reporting/rep103.php:216 - msgid "Ph" -#: reporting/rep103.php:277 reporting/rep106.php:88 reporting/rep205.php:195 -#: reporting/includes/header2.inc:110 sales/manage/sales_people.php:99 ++#: ../reporting/rep103.php:277 ++#: ../reporting/rep106.php:88 ++#: ../reporting/rep205.php:195 ++#: ../reporting/includes/header2.inc:110 ++#: ../sales/manage/sales_people.php:99 + msgid "Email" msgstr "" - #: ../reporting/rep104.php:109 -#: reporting/rep104.php:111 ++#: ../reporting/rep104.php:111 msgid "Category/Items" msgstr "" - #: ../reporting/rep104.php:109 - #: ../reporting/rep301.php:103 - #: ../reporting/rep303.php:109 - #: ../reporting/rep303.php:115 -#: reporting/rep104.php:111 reporting/rep301.php:105 reporting/rep303.php:121 -#: reporting/rep303.php:127 reporting/rep307.php:117 reporting/rep308.php:149 ++#: ../reporting/rep104.php:111 ++#: ../reporting/rep301.php:105 ++#: ../reporting/rep303.php:121 ++#: ../reporting/rep303.php:127 ++#: ../reporting/rep307.php:117 ++#: ../reporting/rep308.php:149 msgid "UOM" msgstr "" - #: ../reporting/rep104.php:109 -#: reporting/rep104.php:111 ++#: ../reporting/rep104.php:111 msgid "GP %" msgstr "" - #: ../reporting/rep104.php:117 - #: ../reporting/reports_main.php:70 -#: reporting/rep104.php:119 reporting/reports_main.php:75 ++#: ../reporting/rep104.php:119 ++#: ../reporting/reports_main.php:75 msgid "Show GP %" msgstr "" - #: ../reporting/rep104.php:124 -#: reporting/rep104.php:126 ++#: ../reporting/rep104.php:126 msgid "Price Listing" msgstr "" - #: ../reporting/rep104.php:191 -#: reporting/rep104.php:195 ++#: ../reporting/rep104.php:195 msgid "Sales Kits" msgstr "" - #: ../reporting/rep105.php:101 -#: reporting/rep105.php:103 ++#: ../reporting/rep105.php:103 msgid "All Orders" msgstr "" - #: ../reporting/rep105.php:103 - #: ../reporting/reports_main.php:78 -#: reporting/rep105.php:105 reporting/reports_main.php:84 ++#: ../reporting/rep105.php:105 ++#: ../reporting/reports_main.php:84 msgid "Back Orders Only" msgstr "" - #: ../reporting/rep105.php:107 - #: ../reporting/rep204.php:82 - #: ../sales/inquiry/customer_allocation_inquiry.php:147 - #: ../sales/inquiry/customer_inquiry.php:202 -#: reporting/rep105.php:109 reporting/rep204.php:84 -#: sales/inquiry/customer_allocation_inquiry.php:146 -#: sales/inquiry/customer_inquiry.php:226 ++#: ../reporting/rep105.php:109 ++#: ../reporting/rep204.php:84 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:147 ++#: ../sales/inquiry/customer_inquiry.php.orig:202 msgid "Order" msgstr "" - #: ../reporting/rep105.php:107 - #: ../reporting/rep106.php:81 - #: ../reporting/rep112.php:164 - #: ../sales/create_recurrent_invoices.php:132 -#: reporting/rep105.php:109 reporting/rep106.php:83 reporting/rep112.php:179 -#: sales/create_recurrent_invoices.php:134 -#: sales/customer_credit_invoice.php:236 sales/customer_delivery.php:339 -#: sales/customer_invoice.php:381 sales/manage/customers.php:251 -#: sales/manage/customers.php:290 sales/manage/recurrent_invoices.php:102 -#: sales/view/view_credit.php:58 sales/inquiry/customer_inquiry.php:231 -#: sales/inquiry/sales_deliveries_view.php:182 -#: sales/inquiry/sales_orders_view.php:265 -#: sales/inquiry/sales_orders_view.php:279 ++#: ../reporting/rep105.php:109 ++#: ../reporting/rep106.php:83 ++#: ../reporting/rep112.php:175 ++#: ../sales/create_recurrent_invoices.php:134 +#: ../sales/customer_credit_invoice.php:236 - #: ../sales/customer_delivery.php.orig:352 ++#: ../sales/customer_delivery.php:353 +#: ../sales/customer_invoice.php:447 - #: ../sales/manage/customers.php:251 - #: ../sales/manage/customers.php:290 ++#: ../sales/manage/customers.php:254 ++#: ../sales/manage/customers.php:293 +#: ../sales/manage/recurrent_invoices.php:102 +#: ../sales/manage/sav.customers.php:251 +#: ../sales/manage/sav.customers.php:289 +#: ../sales/view/view_credit.php:58 - #: ../sales/inquiry/customer_inquiry.php:207 ++#: ../sales/inquiry/customer_inquiry.php.orig:207 +#: ../sales/inquiry/sales_deliveries_view.php:182 - #: ../sales/inquiry/sales_orders_view.php:287 - #: ../sales/inquiry/sales_orders_view.php:301 ++#: ../sales/inquiry/sales_orders_view.php.orig:287 ++#: ../sales/inquiry/sales_orders_view.php.orig:301 msgid "Branch" msgstr "" - #: ../reporting/rep105.php:107 - #: ../reporting/rep106.php:81 -#: reporting/rep105.php:109 reporting/rep106.php:83 ++#: ../reporting/rep105.php:109 ++#: ../reporting/rep106.php:83 msgid "Customer Ref" msgstr "" - #: ../reporting/rep105.php:108 -#: reporting/rep105.php:110 ++#: ../reporting/rep105.php:110 msgid "Ord Date" msgstr "" - #: ../reporting/rep105.php:108 -#: reporting/rep105.php:110 ++#: ../reporting/rep105.php:110 msgid "Del Date" msgstr "" - #: ../reporting/rep105.php:108 - #: ../reporting/rep401.php:69 -#: reporting/rep105.php:110 reporting/rep401.php:71 ++#: ../reporting/rep105.php:110 ++#: ../reporting/rep401.php:71 msgid "Loc" msgstr "" - #: ../reporting/rep105.php:112 - #: ../sales/customer_delivery.php.orig:445 -#: reporting/rep105.php:114 sales/customer_delivery.php:432 -#: sales/customer_invoice.php:469 -msgid "Invoiced" ++#: ../reporting/rep105.php:114 ++#: ../sales/customer_delivery.php:446 +#: ../sales/customer_invoice.php:544 - msgid "Invoiced" ++#: ../sales/includes/ui/sales_order_ui.inc:146 ++msgid "Delivered" msgstr "" - #: ../reporting/rep105.php:119 -#: reporting/rep105.php:121 ++#: ../reporting/rep105.php:121 msgid "Selection" msgstr "" - #: ../reporting/rep105.php:124 -#: reporting/rep105.php:125 ++#: ../reporting/rep105.php:125 msgid "Order Status Listing" msgstr "" - #: ../reporting/rep106.php:82 -#: reporting/rep106.php:84 ++#: ../reporting/rep106.php:84 msgid "Inv Date" msgstr "" - #: ../reporting/rep106.php:82 - #: ../reporting/rep106.php:86 - #: ../reporting/rep106.php:87 -#: reporting/rep106.php:84 reporting/rep106.php:88 reporting/rep106.php:89 -#: sales/manage/sales_people.php:99 sales/manage/sales_people.php:159 -#: sales/manage/sales_people.php:161 ++#: ../reporting/rep106.php:84 ++#: ../reporting/rep106.php:88 ++#: ../reporting/rep106.php:89 +#: ../sales/manage/sales_people.php:99 +#: ../sales/manage/sales_people.php:159 +#: ../sales/manage/sales_people.php:161 msgid "Provision" msgstr "" - #: ../reporting/rep106.php:86 -#: reporting/rep106.php:88 ++#: ../reporting/rep106.php:88 msgid "Salesman" msgstr "" - #: ../reporting/rep106.php:86 - #: ../reporting/includes/header2.inc:110 - #: ../sales/manage/sales_people.php:99 - msgid "Email" - msgstr "" - - #: ../reporting/rep106.php:87 -#: reporting/rep106.php:89 sales/manage/sales_people.php:99 ++#: ../reporting/rep106.php:89 +#: ../sales/manage/sales_people.php:99 msgid "Break Pt." msgstr "" - #: ../reporting/rep106.php:96 -#: reporting/rep106.php:97 ++#: ../reporting/rep106.php:97 msgid "Salesman Listing" msgstr "" - #: ../reporting/rep107.php:85 - #: ../reporting/rep107.php:105 - #: ../reporting/includes/doctext.inc:118 -#: reporting/rep107.php:68 reporting/rep107.php:89 -#: reporting/includes/doctext.inc:105 --msgid "INVOICE" -msgstr "" - -#: reporting/rep107.php:153 reporting/rep109.php:152 reporting/rep110.php:162 -#: reporting/rep111.php:137 reporting/rep113.php:147 -#: sales/view/view_credit.php:138 sales/view/view_dispatch.php:155 -#: sales/view/view_invoice.php:157 sales/view/view_sales_order.php:227 -#: sales/includes/ui/sales_credit_ui.inc:222 -msgid "Shipping" -msgstr "" - -#: reporting/rep108.php:85 reporting/rep108.php:110 -#: reporting/includes/doctext.inc:216 ++#: ../reporting/rep108.php:85 ++#: ../reporting/rep108.php:110 ++#: ../reporting/includes/doctext.inc:238 + msgid "STATEMENT" msgstr "" - #: ../reporting/rep107.php:186 - msgid "Prepayments invoiced to this order up to day:" -#: reporting/rep108.php:127 ++#: ../reporting/rep108.php:127 + msgid "Outstanding Transactions" msgstr "" - #: ../reporting/rep107.php:193 - msgid "Invoice reference" -#: reporting/rep108.php:170 ++#: ../reporting/rep108.php:170 + msgid "Statement" msgstr "" - #: ../reporting/rep107.php:210 - msgid "Total payments:" - msgstr "" - - #: ../reporting/rep107.php:220 - #: ../reporting/rep109.php:155 - #: ../reporting/rep110.php:164 - #: ../reporting/rep111.php:140 - #: ../reporting/rep113.php:150 - #: ../sales/view/view_credit.php:138 - #: ../sales/view/view_dispatch.php:155 - #: ../sales/view/view_invoice.php:159 - #: ../sales/view/view_sales_order.php:245 - #: ../sales/view/view_sales_order.php.orig:227 - #: ../sales/includes/ui/sales_credit_ui.inc:222 - msgid "Shipping" - msgstr "" - - #: ../reporting/rep107.php:266 - #: ../reporting/rep109.php:207 - #: ../reporting/rep111.php:192 - msgid "TOTAL ORDER VAT INCL." - msgstr "" - - #: ../reporting/rep107.php:272 - msgid "THIS INVOICE" - msgstr "" - - #: ../reporting/rep108.php:84 - #: ../reporting/rep108.php:115 - #: ../reporting/includes/doctext.inc:238 - msgid "STATEMENT" - msgstr "" - - #: ../reporting/rep108.php:126 - msgid "Outstanding Transactions" - msgstr "" - - #: ../reporting/rep108.php:169 - msgid "Statement" - msgstr "" - - #: ../reporting/rep108.php:169 - msgid "as of" -#: reporting/rep108.php:170 ++#: ../reporting/rep108.php:170 + msgid "as of" msgstr "" -#: reporting/rep109.php:65 reporting/rep109.php:88 reporting/rep109.php:93 -#: reporting/includes/doctext.inc:53 +#: ../reporting/rep109.php:66 ++#: ../reporting/rep109.php:89 +#: ../reporting/rep109.php:94 - #: ../reporting/rep109.php:100 +#: ../reporting/includes/doctext.inc:65 msgid "SALES ORDER" msgstr "" -#: reporting/rep109.php:67 reporting/rep109.php:83 reporting/rep109.php:93 -#: reporting/includes/doctext.inc:53 +#: ../reporting/rep109.php:68 - #: ../reporting/rep109.php:89 - #: ../reporting/rep109.php:100 ++#: ../reporting/rep109.php:84 ++#: ../reporting/rep109.php:94 +#: ../reporting/includes/doctext.inc:65 msgid "QUOTE" msgstr "" - #: ../reporting/rep109.php:161 - #: ../reporting/rep111.php:146 -#: reporting/rep109.php:158 reporting/rep111.php:143 ++#: ../reporting/rep109.php:153 ++#: ../reporting/rep110.php:162 ++#: ../reporting/rep111.php:136 ++#: ../reporting/rep113.php:147 ++#: ../sales/view/view_credit.php:138 ++#: ../sales/view/view_dispatch.php:155 ++#: ../sales/view/view_invoice.php:159 ++#: ../sales/view/view_sales_order.php:245 ++#: ../sales/includes/ui/sales_credit_ui.inc:222 ++msgid "Shipping" ++msgstr "" ++ ++#: ../reporting/rep109.php:159 ++#: ../reporting/rep111.php:142 msgid "TOTAL ORDER EX VAT" msgstr "" - #: ../reporting/rep110.php:68 - msgid "DELIVERY" -#: reporting/rep109.php:204 reporting/rep111.php:189 ++#: ../reporting/rep109.php:205 ++#: ../reporting/rep111.php:188 + msgid "TOTAL ORDER VAT INCL." msgstr "" -#: reporting/rep110.php:70 +#: ../reporting/rep110.php:70 - #: ../reporting/rep110.php:97 + msgid "DELIVERY" + msgstr "" + -#: reporting/rep110.php:72 reporting/rep110.php:93 -#: reporting/includes/doctext.inc:70 ++#: ../reporting/rep110.php:72 ++#: ../reporting/rep110.php:93 +#: ../reporting/includes/doctext.inc:82 msgid "PACKING SLIP" msgstr "" - #: ../reporting/rep110.php:92 - #: ../reporting/rep110.php:103 -#: reporting/rep110.php:88 reporting/includes/doctext.inc:70 ++#: ../reporting/rep110.php:88 +#: ../reporting/includes/doctext.inc:82 msgid "DELIVERY NOTE" msgstr "" - #: ../reporting/rep110.php:208 -#: reporting/rep110.php:206 ++#: ../reporting/rep110.php:206 msgid "TOTAL DELIVERY INCL. VAT" msgstr "" - #: ../reporting/rep111.php:61 - #: ../reporting/rep111.php:86 -#: reporting/rep111.php:60 reporting/includes/doctext.inc:38 ++#: ../reporting/rep111.php:60 +#: ../reporting/includes/doctext.inc:50 msgid "SALES QUOTATION" msgstr "" - #: ../reporting/rep112.php:80 - #: ../reporting/rep112.php:101 -#: reporting/rep112.php:94 reporting/includes/doctext.inc:176 ++#: ../reporting/rep112.php:83 +#: ../reporting/includes/doctext.inc:198 msgid "RECEIPT" msgstr "" - #: ../reporting/rep112.php:110 - #: ../reporting/rep210.php:124 -#: reporting/rep112.php:125 reporting/rep210.php:133 ++#: ../reporting/rep112.php:114 ++#: ../reporting/rep210.php:122 msgid "As advance / full / part / payment towards:" msgstr "" - #: ../reporting/rep112.php:145 -#: reporting/rep112.php:160 ++#: ../reporting/rep112.php:155 msgid "TOTAL RECEIPT" msgstr "" - #: ../reporting/rep112.php:155 -#: reporting/rep112.php:170 ++#: ../reporting/rep112.php:166 msgid "Received / Sign" msgstr "" - #: ../reporting/rep112.php:157 -#: reporting/rep112.php:172 ++#: ../reporting/rep112.php:168 msgid "By Cash / Cheque* / Draft No." msgstr "" - #: ../reporting/rep112.php:159 -#: reporting/rep112.php:174 ++#: ../reporting/rep112.php:170 msgid "Dated" msgstr "" - #: ../reporting/rep112.php:162 -#: reporting/rep112.php:177 ++#: ../reporting/rep112.php:173 msgid "Drawn on Bank" msgstr "" - #: ../reporting/rep113.php:66 - #: ../reporting/rep113.php:91 - #: ../reporting/rep113.php:96 -#: reporting/rep113.php:67 reporting/rep113.php:86 -#: reporting/includes/doctext.inc:91 ++#: ../reporting/rep113.php:67 ++#: ../reporting/rep113.php:86 +#: ../reporting/includes/doctext.inc:103 msgid "CREDIT NOTE" msgstr "" - #: ../reporting/rep113.php:194 -#: reporting/rep113.php:191 sales/view/view_credit.php:143 ++#: ../reporting/rep113.php:191 +#: ../sales/view/view_credit.php:143 msgid "TOTAL CREDIT" msgstr "" - #: ../reporting/rep114.php:85 -#: reporting/rep114.php:87 ++#: ../reporting/rep114.php:87 msgid "Sales Summary Report" msgstr "" - #: ../reporting/rep114.php:89 - #: ../reporting/reports_main.php:62 -#: reporting/rep114.php:91 reporting/reports_main.php:66 ++#: ../reporting/rep114.php:91 ++#: ../reporting/reports_main.php:66 msgid "Tax Id Only" msgstr "" - #: ../reporting/rep114.php:93 -#: reporting/rep114.php:95 ++#: ../reporting/rep114.php:95 msgid "Tax Id" msgstr "" - #: ../reporting/rep114.php:93 -#: reporting/rep114.php:95 ++#: ../reporting/rep114.php:95 msgid "Total ex. Tax" msgstr "" - #: ../reporting/rep114.php:93 - #: ../reporting/rep709.php:110 -#: reporting/rep114.php:95 reporting/rep709.php:112 taxes/tax_groups.php:177 ++#: ../reporting/rep114.php:95 ++#: ../reporting/rep709.php:112 +#: ../taxes/tax_groups.php:171 - #: ../taxes/tax_groups.php.orig:173 - #: ../taxes/tax_groups.php.sav:173 msgid "Tax" msgstr "" - #: ../reporting/rep201.php:108 -#: reporting/rep201.php:100 ++#: ../reporting/rep201.php:100 msgid "Balances in Home currency" msgstr "" - #: ../reporting/rep201.php:129 -#: reporting/rep201.php:123 ++#: ../reporting/rep201.php:123 msgid "Supplier Balances" msgstr "" - #: ../reporting/rep202.php:142 -#: reporting/rep202.php:144 ++#: ../reporting/rep202.php:144 msgid "currency" msgstr "" - #: ../reporting/rep202.php:143 -#: reporting/rep202.php:145 ++#: ../reporting/rep202.php:145 msgid "Aged Supplier Analysis" msgstr "" - #: ../reporting/rep203.php:102 -#: reporting/rep203.php:104 ++#: ../reporting/rep203.php:104 msgid "Payment Report" msgstr "" - #: ../reporting/rep204.php:82 -#: reporting/rep204.php:84 ++#: ../reporting/rep204.php:84 msgid "Qty Recd" msgstr "" - #: ../reporting/rep204.php:82 -#: reporting/rep204.php:84 ++#: ../reporting/rep204.php:84 msgid "qty Inv" msgstr "" - #: ../reporting/rep204.php:83 -#: reporting/rep204.php:85 ++#: ../reporting/rep204.php:85 msgid "Act Price" msgstr "" - #: ../reporting/rep204.php:90 -#: reporting/rep204.php:92 ++#: ../reporting/rep204.php:92 msgid "Outstanding GRNs Report" msgstr "" - #: ../reporting/rep209.php:88 - #: ../reporting/rep209.php:107 - #: ../reporting/rep209.php:112 -#: reporting/rep205.php:102 ++#: ../reporting/rep205.php:102 + msgid "Contact Information" + msgstr "" + -#: reporting/rep205.php:103 ++#: ../reporting/rep205.php:103 + msgid "Physical Address" + msgstr "" + -#: reporting/rep205.php:111 ++#: ../reporting/rep205.php:111 + msgid "Supplier Details Listing" + msgstr "" + -#: reporting/rep205.php:139 ++#: ../reporting/rep205.php:139 + msgid "Tax_Id" + msgstr "" + -#: reporting/rep209.php:87 reporting/rep209.php:100 -#: reporting/includes/doctext.inc:149 ++#: ../reporting/rep209.php:87 ++#: ../reporting/rep209.php:100 +#: ../reporting/includes/doctext.inc:171 msgid "PURCHASE ORDER" msgstr "" - #: ../reporting/rep209.php:214 -#: reporting/rep209.php:206 ++#: ../reporting/rep209.php:209 msgid "TOTAL PO" msgstr "" - #: ../reporting/rep210.php:82 - #: ../reporting/rep210.php:110 - #: ../reporting/rep210.php:115 -#: reporting/rep210.php:95 reporting/rep210.php:117 -#: reporting/includes/doctext.inc:129 ++#: ../reporting/rep210.php:84 ++#: ../reporting/rep210.php:106 +#: ../reporting/includes/doctext.inc:151 msgid "REMITTANCE" msgstr "" - #: ../reporting/rep210.php:159 -#: reporting/rep210.php:168 ++#: ../reporting/rep210.php:165 msgid "TOTAL REMITTANCE" msgstr "" - #: ../reporting/rep301.php:112 -#: reporting/rep301.php:114 ++#: ../reporting/rep301.php:114 msgid "Inventory Valuation Report" msgstr "" - #: ../reporting/rep302.php:123 -#: reporting/rep302.php:125 ++#: ../reporting/rep302.php:125 msgid "QOH" msgstr "" - #: ../reporting/rep302.php:123 -#: reporting/rep302.php:125 ++#: ../reporting/rep302.php:125 msgid "Cust Ord" msgstr "" - #: ../reporting/rep302.php:123 -#: reporting/rep302.php:125 ++#: ../reporting/rep302.php:125 msgid "Supp Ord" msgstr "" - #: ../reporting/rep302.php:123 -#: reporting/rep302.php:125 ++#: ../reporting/rep302.php:125 msgid "Sugg Ord" msgstr "" - #: ../reporting/rep302.php:132 -#: reporting/rep302.php:134 ++#: ../reporting/rep302.php:134 msgid "Inventory Planning Report" msgstr "" - #: ../reporting/rep303.php:97 -#: reporting/rep303.php:109 ++#: ../reporting/rep303.php:109 msgid "Shortage" msgstr "" - #: ../reporting/rep303.php:109 - #: ../reporting/rep303.php:115 - #: ../reporting/rep305.php:98 -#: reporting/rep303.php:121 reporting/rep303.php:127 reporting/rep305.php:101 ++#: ../reporting/rep303.php:121 ++#: ../reporting/rep303.php:127 ++#: ../reporting/rep305.php:101 msgid "Stock ID" msgstr "" - #: ../reporting/rep303.php:109 -#: reporting/rep303.php:121 ++#: ../reporting/rep303.php:121 msgid "Check" msgstr "" - #: ../reporting/rep303.php:123 -#: reporting/rep303.php:135 ++#: ../reporting/rep303.php:135 msgid "Only Shortage" msgstr "" - #: ../reporting/rep303.php:131 -#: reporting/rep303.php:143 ++#: ../reporting/rep303.php:143 msgid "Stock Check Sheets" msgstr "" - #: ../reporting/rep304.php:112 - #: ../reporting/rep305.php:98 -#: reporting/rep304.php:114 reporting/rep305.php:101 reporting/rep306.php:141 -#: reporting/rep309.php:98 ++#: ../reporting/rep304.php:114 ++#: ../reporting/rep305.php:101 ++#: ../reporting/rep306.php:141 ++#: ../reporting/rep309.php:98 msgid "Qty" msgstr "" - #: ../reporting/rep304.php:112 -#: reporting/rep304.php:114 reporting/rep309.php:98 -#: sales/manage/customer_branches.php:240 sales/manage/customers.php:260 ++#: ../reporting/rep304.php:114 ++#: ../reporting/rep309.php:98 +#: ../sales/manage/customer_branches.php:241 - #: ../sales/manage/customers.php:260 ++#: ../sales/manage/customers.php:263 +#: ../sales/manage/sav.customers.php:259 msgid "Sales" msgstr "" - #: ../reporting/rep304.php:112 -#: reporting/rep304.php:114 ++#: ../reporting/rep304.php:114 msgid "Cost" msgstr "" - #: ../reporting/rep304.php:112 -#: reporting/rep304.php:114 ++#: ../reporting/rep304.php:114 msgid "Contribution" msgstr "" - #: ../reporting/rep304.php:124 -#: reporting/rep304.php:126 ++#: ../reporting/rep304.php:126 msgid "Inventory Sales Report" msgstr "" - #: ../reporting/rep305.php:98 -#: reporting/rep305.php:101 ++#: ../reporting/rep305.php:101 msgid "PO No" msgstr "" - #: ../reporting/rep305.php:98 -#: reporting/rep305.php:101 ++#: ../reporting/rep305.php:101 msgid "Inv" msgstr "" - #: ../reporting/rep305.php:98 -#: reporting/rep305.php:101 ++#: ../reporting/rep305.php:101 msgid "Inv Price" msgstr "" - #: ../reporting/rep305.php:98 -#: reporting/rep305.php:101 ++#: ../reporting/rep305.php:101 msgid "PO Price" msgstr "" - #: ../reporting/rep305.php:105 -#: reporting/rep305.php:108 ++#: ../reporting/rep305.php:108 msgid "GRN Valuation Report" msgstr "" - #: ../reporting/rep401.php:69 -#: reporting/rep306.php:141 reporting/rep309.php:98 ++#: ../reporting/rep306.php:141 ++#: ../reporting/rep309.php:98 + msgid "Unit Price" + msgstr "" + -#: reporting/rep306.php:154 ++#: ../reporting/rep306.php:154 + msgid "Inventory Purchasing Report" + msgstr "" + -#: reporting/rep307.php:117 ++#: ../reporting/rep307.php:117 + msgid "Opening" + msgstr "" + -#: reporting/rep307.php:126 ++#: ../reporting/rep307.php:126 + msgid "Inventory Movements" + msgstr "" + -#: reporting/rep308.php:149 ++#: ../reporting/rep308.php:149 + msgid "OpeningStock" + msgstr "" + -#: reporting/rep308.php:149 ++#: ../reporting/rep308.php:149 + msgid "StockIn" + msgstr "" + -#: reporting/rep308.php:149 ++#: ../reporting/rep308.php:149 + msgid "ClosingStock" + msgstr "" + -#: reporting/rep308.php:150 ++#: ../reporting/rep308.php:150 + msgid "QTY" + msgstr "" + -#: reporting/rep308.php:150 reporting/rep709.php:112 -#: taxes/item_tax_types.php:185 ++#: ../reporting/rep308.php:150 ++#: ../reporting/rep709.php:112 ++#: ../taxes/item_tax_types.php:185 + msgid "Rate" + msgstr "" + -#: reporting/rep308.php:159 ++#: ../reporting/rep308.php:159 + msgid "Costed Inventory Movements" + msgstr "" + -#: reporting/rep309.php:98 ++#: ../reporting/rep309.php:98 + msgid "Item/Category" + msgstr "" + -#: reporting/rep309.php:98 ++#: ../reporting/rep309.php:98 + msgid "Remark" + msgstr "" + -#: reporting/rep309.php:106 ++#: ../reporting/rep309.php:106 + msgid "Item Sales Summary Report" + msgstr "" + -#: reporting/rep309.php:147 ++#: ../reporting/rep309.php:147 + msgid "Gift" + msgstr "" + -#: reporting/rep401.php:71 ++#: ../reporting/rep401.php:71 msgid "Wrk Ctr" msgstr "" - #: ../reporting/rep401.php:76 -#: reporting/rep401.php:78 ++#: ../reporting/rep401.php:78 msgid "Bill of Material Listing" msgstr "" - #: ../reporting/rep409.php:58 - #: ../reporting/rep409.php:77 - #: ../reporting/rep409.php:82 -#: reporting/rep409.php:60 reporting/rep409.php:73 -#: reporting/includes/doctext.inc:192 ++#: ../reporting/rep409.php:60 ++#: ../reporting/rep409.php:73 +#: ../reporting/includes/doctext.inc:214 msgid "WORK ORDER" msgstr "" - #: ../reporting/rep409.php:132 -#: reporting/rep409.php:129 ++#: ../reporting/rep409.php:129 msgid "Insufficient stock" msgstr "" - #: ../reporting/rep501.php:85 -#: reporting/rep501.php:87 ++#: ../reporting/rep501.php:87 msgid "YTD" msgstr "" - #: ../reporting/rep501.php:92 -#: reporting/rep501.php:94 ++#: ../reporting/rep501.php:94 msgid "Dimension Summary" msgstr "" - #: ../reporting/rep601.php:83 -#: reporting/rep601.php:86 reporting/includes/doctext.inc:247 ++#: ../reporting/rep601.php:86 +#: ../reporting/rep602.php:87 +#: ../reporting/includes/doctext.inc:260 msgid "Bank Account" msgstr "" - #: ../reporting/rep601.php:144 -#: reporting/rep601.php:151 ++#: ../reporting/rep601.php:151 +#: ../reporting/rep602.php:151 msgid "Total Debit / Credit" msgstr "" - #: ../reporting/rep601.php:161 -#: reporting/rep601.php:168 ++#: ../reporting/rep601.php:168 +#: ../reporting/rep602.php:167 msgid "Net Change" msgstr "" -#: reporting/rep702.php:53 +#: ../reporting/rep602.php:73 +msgid "Bank Statement w/Reconcile" +msgstr "" + +#: ../reporting/rep602.php:81 +msgid "Reco Date" +msgstr "" + +#: ../reporting/rep602.php:81 +msgid "Narration" +msgstr "" + +#: ../reporting/rep602.php:195 +msgid "Bank Balance" +msgstr "" + - #: ../reporting/rep702.php:51 ++#: ../reporting/rep702.php:53 msgid "Type/Account" msgstr "" - #: ../reporting/rep702.php:51 -#: reporting/rep702.php:53 ++#: ../reporting/rep702.php:53 msgid "Date/Dim." msgstr "" - #: ../reporting/rep702.php:52 -#: reporting/rep702.php:54 ++#: ../reporting/rep702.php:54 msgid "Person/Item/Memo" msgstr "" - #: ../reporting/rep702.php:62 -#: reporting/rep702.php:64 ++#: ../reporting/rep702.php:64 msgid "List of Journal Entries" msgstr "" - #: ../reporting/rep704.php:67 -#: reporting/rep704.php:71 ++#: ../reporting/rep704.php:71 msgid "GL Account Transactions" msgstr "" - #: ../reporting/rep705.php:243 - #: ../reporting/rep705.php:256 - #: ../reporting/rep705.php:267 - #: ../reporting/reports_main.php:270 - #: ../reporting/reports_main.php:318 - #: ../reporting/reports_main.php:361 -#: reporting/rep705.php:247 reporting/rep705.php:260 reporting/rep705.php:271 -#: reporting/reports_main.php:347 reporting/reports_main.php:400 -#: reporting/reports_main.php:448 ++#: ../reporting/rep705.php:247 ++#: ../reporting/rep705.php:260 ++#: ../reporting/rep705.php:271 msgid "Year" msgstr "" - #: ../reporting/rep705.php:249 - #: ../reporting/rep705.php:260 - #: ../reporting/rep705.php:269 - #: ../reporting/rep706.php:194 - #: ../reporting/rep706.php:202 - #: ../reporting/rep706.php:208 - #: ../reporting/rep707.php:218 - #: ../reporting/rep707.php:226 - #: ../reporting/rep707.php:232 -#: reporting/rep705.php:253 reporting/rep705.php:264 reporting/rep705.php:273 -#: reporting/rep706.php:198 reporting/rep706.php:206 reporting/rep706.php:212 -#: reporting/rep707.php:222 reporting/rep707.php:230 reporting/rep707.php:236 ++#: ../reporting/rep705.php:253 ++#: ../reporting/rep705.php:264 ++#: ../reporting/rep705.php:273 ++#: ../reporting/rep706.php:198 ++#: ../reporting/rep706.php:206 ++#: ../reporting/rep706.php:212 ++#: ../reporting/rep707.php:222 ++#: ../reporting/rep707.php:230 ++#: ../reporting/rep707.php:236 msgid "Tags" msgstr "" - #: ../reporting/rep705.php:250 - #: ../reporting/rep705.php:261 - #: ../reporting/rep705.php:270 -#: reporting/rep705.php:254 reporting/rep705.php:265 reporting/rep705.php:274 ++#: ../reporting/rep705.php:254 ++#: ../reporting/rep705.php:265 ++#: ../reporting/rep705.php:274 msgid "Amounts in thousands" msgstr "" - #: ../reporting/rep705.php:274 -#: reporting/rep705.php:278 ++#: ../reporting/rep705.php:278 msgid "Annual Expense Breakdown" msgstr "" - #: ../reporting/rep706.php:182 -#: reporting/rep706.php:186 ++#: ../reporting/rep706.php:186 msgid "Close Balance" msgstr "" - #: ../reporting/rep707.php:254 -#: reporting/rep707.php:258 ++#: ../reporting/rep706.php:308 ++#: ../reporting/rep707.php:326 ++#: ../reporting/rep708.php:51 ++#: ../reporting/rep708.php:126 ++#: ../sales/create_recurrent_invoices.php:134 ++#: ../sales/manage/recurrent_invoices.php:102 ++msgid "Group" ++msgstr "" ++ ++#: ../reporting/rep707.php:258 msgid "Profit and Loss Statement" msgstr "" - #: ../reporting/rep709.php:91 -#: reporting/rep709.php:93 ++#: ../reporting/rep708.php:185 ++msgid "Brought Forward" ++msgstr "" ++ ++#: ../reporting/rep708.php:185 ++msgid "This Period" ++msgstr "" ++ ++#: ../reporting/rep708.php:283 ++msgid "" ++"The Opening Balance is not in balance, probably due to a non closed Previous " ++"Fiscalyear." ++msgstr "" ++ ++#: ../reporting/rep709.php:93 msgid "Tax Report" msgstr "" - #: ../reporting/rep709.php:109 -#: reporting/rep709.php:111 ++#: ../reporting/rep709.php:111 msgid "Branch Name" msgstr "" - #: ../reporting/rep709.php:110 -#: reporting/rep709.php:112 ++#: ../reporting/rep709.php:112 msgid "Net" msgstr "" - #: ../reporting/rep709.php:110 - #: ../taxes/item_tax_types.php:185 - msgid "Rate" - msgstr "" - - #: ../reporting/rep709.php:176 -#: reporting/rep709.php:183 ++#: ../reporting/rep709.php:183 msgid "Tax Rate" msgstr "" - #: ../reporting/rep709.php:176 -#: reporting/rep709.php:183 ++#: ../reporting/rep709.php:183 msgid "Net Tax" msgstr "" - #: ../reporting/rep710.php:75 -#: reporting/rep710.php:77 ++#: ../reporting/rep710.php:77 msgid "Time" msgstr "" - #: ../reporting/rep710.php:75 -#: reporting/rep710.php:77 ++#: ../reporting/rep710.php:77 msgid "Trans Date" msgstr "" - #: ../reporting/rep710.php:76 -#: reporting/rep710.php:78 ++#: ../reporting/rep710.php:78 msgid "Action" msgstr "" - #: ../reporting/rep710.php:87 - #: ../reporting/reports_main.php:396 -#: reporting/rep710.php:89 reporting/reports_main.php:488 ++#: ../reporting/rep710.php:89 msgid "Audit Trail" msgstr "" - #: ../reporting/rep710.php:107 -#: reporting/rep710.php:111 ++#: ../reporting/rep710.php:111 msgid "Changed" msgstr "" @@@ -12642,360 -10879,369 +12599,203 @@@ msgstr " msgid "Customer &Balances" msgstr "" -#: reporting/reports_main.php:37 reporting/reports_main.php:154 -#: reporting/reports_main.php:300 +#: ../reporting/reports_main.php:37 - #: ../reporting/reports_main.php:44 - #: ../reporting/reports_main.php:66 - #: ../reporting/reports_main.php:90 - #: ../reporting/reports_main.php:97 - #: ../reporting/reports_main.php:109 - #: ../reporting/reports_main.php:116 - #: ../reporting/reports_main.php:123 - #: ../reporting/reports_main.php:129 - #: ../reporting/reports_main.php:137 - #: ../reporting/reports_main.php:144 +#: ../reporting/reports_main.php:154 - #: ../reporting/reports_main.php:165 - #: ../reporting/reports_main.php:171 + msgid "Show Balance" + msgstr "" + -#: reporting/reports_main.php:38 reporting/reports_main.php:46 -#: reporting/reports_main.php:71 reporting/reports_main.php:98 -#: reporting/reports_main.php:108 reporting/reports_main.php:122 -#: reporting/reports_main.php:130 reporting/reports_main.php:138 -#: reporting/reports_main.php:145 reporting/reports_main.php:155 -#: reporting/reports_main.php:163 reporting/reports_main.php:174 -#: reporting/reports_main.php:194 reporting/reports_main.php:201 ++#: ../reporting/reports_main.php:38 ++#: ../reporting/reports_main.php:46 ++#: ../reporting/reports_main.php:71 ++#: ../reporting/reports_main.php:98 ++#: ../reporting/reports_main.php:108 ++#: ../reporting/reports_main.php:122 ++#: ../reporting/reports_main.php:130 ++#: ../reporting/reports_main.php:138 ++#: ../reporting/reports_main.php:145 ++#: ../reporting/reports_main.php:155 ++#: ../reporting/reports_main.php:163 ++#: ../reporting/reports_main.php:174 ++#: ../reporting/reports_main.php:194 msgid "Currency Filter" msgstr "" - #: ../reporting/reports_main.php:40 - #: ../reporting/reports_main.php:50 - #: ../reporting/reports_main.php:58 - #: ../reporting/reports_main.php:64 - #: ../reporting/reports_main.php:72 - #: ../reporting/reports_main.php:80 -#: reporting/reports_main.php:41 reporting/reports_main.php:52 -#: reporting/reports_main.php:61 reporting/reports_main.php:68 -#: reporting/reports_main.php:77 reporting/reports_main.php:86 -#: reporting/reports_main.php:93 reporting/reports_main.php:103 -#: reporting/reports_main.php:112 reporting/reports_main.php:119 -#: reporting/reports_main.php:126 reporting/reports_main.php:134 -#: reporting/reports_main.php:141 reporting/reports_main.php:147 -#: reporting/reports_main.php:158 reporting/reports_main.php:169 -#: reporting/reports_main.php:177 reporting/reports_main.php:182 -#: reporting/reports_main.php:189 reporting/reports_main.php:197 -#: reporting/reports_main.php:204 reporting/reports_main.php:213 -#: reporting/reports_main.php:219 reporting/reports_main.php:230 -#: reporting/reports_main.php:239 reporting/reports_main.php:245 -#: reporting/reports_main.php:255 reporting/reports_main.php:263 -#: reporting/reports_main.php:271 reporting/reports_main.php:278 -#: reporting/reports_main.php:286 reporting/reports_main.php:293 -#: reporting/reports_main.php:302 reporting/reports_main.php:315 -#: reporting/reports_main.php:322 reporting/reports_main.php:329 -#: reporting/reports_main.php:344 reporting/reports_main.php:352 -#: reporting/reports_main.php:363 reporting/reports_main.php:375 -#: reporting/reports_main.php:385 reporting/reports_main.php:397 -#: reporting/reports_main.php:404 reporting/reports_main.php:414 -#: reporting/reports_main.php:425 reporting/reports_main.php:434 -#: reporting/reports_main.php:445 reporting/reports_main.php:451 -#: reporting/reports_main.php:460 reporting/reports_main.php:470 -#: reporting/reports_main.php:478 reporting/reports_main.php:486 -#: reporting/reports_main.php:494 ++#: ../reporting/reports_main.php:41 ++#: ../reporting/reports_main.php:52 ++#: ../reporting/reports_main.php:61 ++#: ../reporting/reports_main.php:68 ++#: ../reporting/reports_main.php:77 +#: ../reporting/reports_main.php:86 - #: ../reporting/reports_main.php:140 - #: ../reporting/reports_main.php:150 - #: ../reporting/reports_main.php:157 - #: ../reporting/reports_main.php:161 ++#: ../reporting/reports_main.php:93 ++#: ../reporting/reports_main.php:103 ++#: ../reporting/reports_main.php:112 ++#: ../reporting/reports_main.php:119 ++#: ../reporting/reports_main.php:126 ++#: ../reporting/reports_main.php:134 ++#: ../reporting/reports_main.php:141 ++#: ../reporting/reports_main.php:147 ++#: ../reporting/reports_main.php:158 ++#: ../reporting/reports_main.php:169 ++#: ../reporting/reports_main.php:177 ++#: ../reporting/reports_main.php:182 ++#: ../reporting/reports_main.php:189 + msgid "Orientation" + msgstr "" + -#: reporting/reports_main.php:42 reporting/reports_main.php:53 -#: reporting/reports_main.php:62 reporting/reports_main.php:69 -#: reporting/reports_main.php:78 reporting/reports_main.php:87 -#: reporting/reports_main.php:94 reporting/reports_main.php:159 -#: reporting/reports_main.php:170 reporting/reports_main.php:178 -#: reporting/reports_main.php:183 reporting/reports_main.php:190 -#: reporting/reports_main.php:214 reporting/reports_main.php:220 -#: reporting/reports_main.php:231 reporting/reports_main.php:240 -#: reporting/reports_main.php:246 reporting/reports_main.php:256 -#: reporting/reports_main.php:264 reporting/reports_main.php:272 -#: reporting/reports_main.php:279 reporting/reports_main.php:287 -#: reporting/reports_main.php:303 reporting/reports_main.php:316 -#: reporting/reports_main.php:323 reporting/reports_main.php:330 -#: reporting/reports_main.php:345 reporting/reports_main.php:353 -#: reporting/reports_main.php:364 reporting/reports_main.php:376 -#: reporting/reports_main.php:386 reporting/reports_main.php:398 -#: reporting/reports_main.php:405 reporting/reports_main.php:415 -#: reporting/reports_main.php:426 reporting/reports_main.php:435 -#: reporting/reports_main.php:446 reporting/reports_main.php:452 -#: reporting/reports_main.php:461 reporting/reports_main.php:471 -#: reporting/reports_main.php:479 reporting/reports_main.php:487 -#: reporting/reports_main.php:495 ++#: ../reporting/reports_main.php:42 ++#: ../reporting/reports_main.php:53 ++#: ../reporting/reports_main.php:62 ++#: ../reporting/reports_main.php:69 ++#: ../reporting/reports_main.php:78 ++#: ../reporting/reports_main.php:87 ++#: ../reporting/reports_main.php:94 ++#: ../reporting/reports_main.php:159 ++#: ../reporting/reports_main.php:170 ++#: ../reporting/reports_main.php:178 +#: ../reporting/reports_main.php:183 - #: ../reporting/reports_main.php:188 - #: ../reporting/reports_main.php:197 - #: ../reporting/reports_main.php:205 - #: ../reporting/reports_main.php:210 - #: ../reporting/reports_main.php:217 - #: ../reporting/reports_main.php:231 - #: ../reporting/reports_main.php:242 - #: ../reporting/reports_main.php:248 - #: ../reporting/reports_main.php:254 - #: ../reporting/reports_main.php:268 - #: ../reporting/reports_main.php:275 - #: ../reporting/reports_main.php:285 - #: ../reporting/reports_main.php:296 - #: ../reporting/reports_main.php:305 - #: ../reporting/reports_main.php:316 - #: ../reporting/reports_main.php:322 - #: ../reporting/reports_main.php:331 - #: ../reporting/reports_main.php:341 - #: ../reporting/reports_main.php:349 - #: ../reporting/reports_main.php:359 - #: ../reporting/reports_main.php:364 - #: ../reporting/reports_main.php:372 - #: ../reporting/reports_main.php:381 - #: ../reporting/reports_main.php:388 - #: ../reporting/reports_main.php:395 - #: ../reporting/reports_main.php:402 ++#: ../reporting/reports_main.php:190 msgid "Destination" msgstr "" - #: ../reporting/reports_main.php:41 -#: reporting/reports_main.php:43 ++#: ../reporting/reports_main.php:43 msgid "&Aged Customer Analysis" msgstr "" - #: ../reporting/reports_main.php:48 - #: ../reporting/reports_main.php:148 - #: ../reporting/reports_main.php:283 - #: ../reporting/reports_main.php:294 - #: ../reporting/reports_main.php:329 - #: ../reporting/reports_main.php:339 - #: ../reporting/reports_main.php:370 - #: ../reporting/reports_main.php:379 -#: reporting/reports_main.php:50 reporting/reports_main.php:167 -#: reporting/reports_main.php:361 reporting/reports_main.php:373 -#: reporting/reports_main.php:412 reporting/reports_main.php:423 -#: reporting/reports_main.php:458 reporting/reports_main.php:468 ++#: ../reporting/reports_main.php:50 ++#: ../reporting/reports_main.php:167 msgid "Graphics" msgstr "" - #: ../reporting/reports_main.php:51 -#: reporting/reports_main.php:54 ++#: ../reporting/reports_main.php:54 msgid "Customer &Detail Listing" msgstr "" - #: ../reporting/reports_main.php:55 -#: reporting/reports_main.php:58 reporting/reports_main.php:186 ++#: ../reporting/reports_main.php:58 ++#: ../reporting/reports_main.php:186 msgid "Activity Greater Than" msgstr "" - #: ../reporting/reports_main.php:56 -#: reporting/reports_main.php:59 reporting/reports_main.php:187 ++#: ../reporting/reports_main.php:59 ++#: ../reporting/reports_main.php:187 msgid "Activity Less Than" msgstr "" - #: ../reporting/reports_main.php:59 -#: reporting/reports_main.php:63 ++#: ../reporting/reports_main.php:63 msgid "Sales &Summary Report" msgstr "" - #: ../reporting/reports_main.php:65 -#: reporting/reports_main.php:70 ++#: ../reporting/reports_main.php:70 msgid "&Price Listing" msgstr "" - #: ../reporting/reports_main.php:67 - #: ../reporting/reports_main.php:76 - #: ../reporting/reports_main.php:179 - #: ../reporting/reports_main.php:185 - #: ../reporting/reports_main.php:190 - #: ../reporting/reports_main.php:201 -#: reporting/reports_main.php:72 reporting/reports_main.php:82 -#: reporting/reports_main.php:209 reporting/reports_main.php:216 -#: reporting/reports_main.php:222 reporting/reports_main.php:235 -#: reporting/reports_main.php:250 reporting/reports_main.php:260 -#: reporting/reports_main.php:268 reporting/reports_main.php:276 ++#: ../reporting/reports_main.php:72 ++#: ../reporting/reports_main.php:82 msgid "Inventory Category" msgstr "" - #: ../reporting/reports_main.php:68 -#: reporting/reports_main.php:73 sales/manage/sales_types.php:16 ++#: ../reporting/reports_main.php:73 +#: ../sales/manage/sales_types.php:16 msgid "Sales Types" msgstr "" - #: ../reporting/reports_main.php:69 - #: ../reporting/reports_main.php:192 -#: reporting/reports_main.php:74 reporting/reports_main.php:224 ++#: ../reporting/reports_main.php:74 msgid "Show Pictures" msgstr "" - #: ../reporting/reports_main.php:73 -#: reporting/reports_main.php:79 ++#: ../reporting/reports_main.php:79 msgid "&Order Status Listing" msgstr "" - #: ../reporting/reports_main.php:77 -#: reporting/reports_main.php:83 ++#: ../reporting/reports_main.php:83 msgid "Stock Location" msgstr "" - #: ../reporting/reports_main.php:81 -#: reporting/reports_main.php:88 ++#: ../reporting/reports_main.php:88 msgid "&Salesman Listing" msgstr "" - #: ../reporting/reports_main.php:87 -#: reporting/reports_main.php:95 ++#: ../reporting/reports_main.php:95 msgid "Print &Invoices" msgstr "" - #: ../reporting/reports_main.php:91 - #: ../reporting/reports_main.php:98 - #: ../reporting/reports_main.php:104 -#: reporting/reports_main.php:99 reporting/reports_main.php:109 -#: reporting/reports_main.php:116 ++#: ../reporting/reports_main.php:99 ++#: ../reporting/reports_main.php:109 ++#: ../reporting/reports_main.php:116 msgid "email Customers" msgstr "" - #: ../reporting/reports_main.php:92 - #: ../reporting/reports_main.php:99 -#: reporting/reports_main.php:100 reporting/reports_main.php:110 ++#: ../reporting/reports_main.php:100 ++#: ../reporting/reports_main.php:110 msgid "Payment Link" msgstr "" - #: ../reporting/reports_main.php:94 -#: reporting/reports_main.php:105 ++#: ../reporting/reports_main.php:105 msgid "Print &Credit Notes" msgstr "" - #: ../reporting/reports_main.php:101 -#: reporting/reports_main.php:113 ++#: ../reporting/reports_main.php:113 msgid "Print &Deliveries" msgstr "" - #: ../reporting/reports_main.php:105 -#: reporting/reports_main.php:117 ++#: ../reporting/reports_main.php:117 msgid "Print as Packing Slip" msgstr "" - #: ../reporting/reports_main.php:107 -#: reporting/reports_main.php:120 ++#: ../reporting/reports_main.php:120 msgid "Print &Statements" msgstr "" - #: ../reporting/reports_main.php:111 - #: ../reporting/reports_main.php:117 -#: reporting/reports_main.php:124 reporting/reports_main.php:131 -#: reporting/reports_main.php:139 reporting/reports_main.php:195 -#: reporting/reports_main.php:202 +#: ../reporting/reports_main.php:124 - #: ../reporting/reports_main.php:166 - #: ../reporting/reports_main.php:172 ++#: ../reporting/reports_main.php:131 ++#: ../reporting/reports_main.php:139 ++#: ../reporting/reports_main.php:195 msgid "Email Customers" msgstr "" - #: ../reporting/reports_main.php:113 -#: reporting/reports_main.php:127 ++#: ../reporting/reports_main.php:127 msgid "&Print Sales Orders" msgstr "" - #: ../reporting/reports_main.php:118 -#: reporting/reports_main.php:132 ++#: ../reporting/reports_main.php:132 msgid "Print as Quote" msgstr "" - #: ../reporting/reports_main.php:120 -#: reporting/reports_main.php:135 ++#: ../reporting/reports_main.php:135 msgid "&Print Sales Quotations" msgstr "" - #: ../reporting/reports_main.php:126 - msgid "Print Receipts" - msgstr "" - - #: ../reporting/reports_main.php:133 - msgid "Supplier &Balances" - msgstr "" - - #: ../reporting/reports_main.php:141 - msgid "&Aged Supplier Analyses" - msgstr "" - - #: ../reporting/reports_main.php:151 - msgid "&Payment Report" - msgstr "" - - #: ../reporting/reports_main.php:158 - msgid "Outstanding &GRNs Report" - msgstr "" - - #: ../reporting/reports_main.php:162 - msgid "Print Purchase &Orders" - msgstr "" - - #: ../reporting/reports_main.php:168 - msgid "Print Remi&ttances" - msgstr "" - - #: ../reporting/reports_main.php:177 - msgid "Inventory &Valuation Report" - msgstr "" - - #: ../reporting/reports_main.php:184 - msgid "Inventory &Planning Report" - msgstr "" - - #: ../reporting/reports_main.php:189 - msgid "Stock &Check Sheets" - msgstr "" - - #: ../reporting/reports_main.php:193 - msgid "Inventory Column" - msgstr "" - - #: ../reporting/reports_main.php:194 - msgid "Show Shortage" - msgstr "" - - #: ../reporting/reports_main.php:198 - msgid "Inventory &Sales Report" - msgstr "" - - #: ../reporting/reports_main.php:206 - msgid "&GRN Valuation Report" - msgstr "" - - #: ../reporting/reports_main.php:212 - msgid "Manufacturing" - msgstr "" - - #: ../reporting/reports_main.php:213 - msgid "&Bill of Material Listing" - msgstr "" - - #: ../reporting/reports_main.php:214 - msgid "From product" - msgstr "" - - #: ../reporting/reports_main.php:215 - msgid "To product" - msgstr "" - - #: ../reporting/reports_main.php:218 - msgid "Print &Work Orders" - msgstr "" - - #: ../reporting/reports_main.php:221 - msgid "Email Locations" - msgstr "" - - #: ../reporting/reports_main.php:226 - msgid "Dimension &Summary" - msgstr "" - - #: ../reporting/reports_main.php:227 - msgid "From Dimension" - msgstr "" - - #: ../reporting/reports_main.php:228 - msgid "To Dimension" - msgstr "" - - #: ../reporting/reports_main.php:229 - msgid "Show Balance" - msgstr "" - - #: ../reporting/reports_main.php:236 - msgid "Banking" - msgstr "" - - #: ../reporting/reports_main.php:237 - msgid "Bank &Statement" - msgstr "" - - #: ../reporting/reports_main.php:244 - msgid "General Ledger" - msgstr "" - - #: ../reporting/reports_main.php:245 - msgid "Chart of &Accounts" - msgstr "" - - #: ../reporting/reports_main.php:246 - msgid "Show Balances" - msgstr "" - - #: ../reporting/reports_main.php:249 - msgid "List of &Journal Entries" - msgstr "" - - #: ../reporting/reports_main.php:260 - #: ../reporting/reports_main.php:309 - #: ../reporting/reports_main.php:353 - msgid "GL Account &Transactions" - msgstr "" - - #: ../reporting/reports_main.php:263 - #: ../reporting/reports_main.php:312 - #: ../reporting/reports_main.php:356 - msgid "From Account" - msgstr "" - - #: ../reporting/reports_main.php:264 - #: ../reporting/reports_main.php:313 - #: ../reporting/reports_main.php:357 - msgid "To Account" -#: reporting/reports_main.php:142 ++#: ../reporting/reports_main.php:142 + msgid "Print Receipts" msgstr "" - #: ../reporting/reports_main.php:269 - #: ../reporting/reports_main.php:317 - #: ../reporting/reports_main.php:360 - msgid "Annual &Expense Breakdown" -#: reporting/reports_main.php:150 ++#: ../reporting/reports_main.php:150 + msgid "Supplier &Balances" msgstr "" - #: ../reporting/reports_main.php:276 - #: ../reporting/reports_main.php:323 - #: ../reporting/reports_main.php:365 - msgid "&Balance Sheet" -#: reporting/reports_main.php:160 ++#: ../reporting/reports_main.php:160 + msgid "&Aged Supplier Analyses" msgstr "" - #: ../reporting/reports_main.php:282 - #: ../reporting/reports_main.php:293 - #: ../reporting/reports_main.php:328 - #: ../reporting/reports_main.php:338 - #: ../reporting/reports_main.php:369 - #: ../reporting/reports_main.php:378 - msgid "Decimal values" -#: reporting/reports_main.php:171 ++#: ../reporting/reports_main.php:171 + msgid "&Payment Report" msgstr "" - #: ../reporting/reports_main.php:286 - #: ../reporting/reports_main.php:332 - #: ../reporting/reports_main.php:373 - msgid "&Profit and Loss Statement" -#: reporting/reports_main.php:179 ++#: ../reporting/reports_main.php:179 + msgid "Outstanding &GRNs Report" msgstr "" - #: ../reporting/reports_main.php:300 - #: ../reporting/reports_main.php:345 - #: ../reporting/reports_main.php:385 - msgid "Zero values" -#: reporting/reports_main.php:184 ++#: ../reporting/reports_main.php:184 + msgid "Supplier &Detail Listing" msgstr "" - #: ../reporting/reports_main.php:390 - msgid "Ta&x Report" -#: reporting/reports_main.php:191 ++#: ../reporting/reports_main.php:191 + msgid "Print Purchase &Orders" msgstr "" -#: reporting/reports_main.php:198 -msgid "Print Remittances" -msgstr "" - -#: reporting/reports_main.php:207 -msgid "Inventory &Valuation Report" -msgstr "" - -#: reporting/reports_main.php:215 -msgid "Inventory &Planning Report" -msgstr "" - -#: reporting/reports_main.php:221 -msgid "Stock &Check Sheets" -msgstr "" - -#: reporting/reports_main.php:225 -msgid "Inventory Column" -msgstr "" - -#: reporting/reports_main.php:226 -msgid "Show Shortage" -msgstr "" - -#: reporting/reports_main.php:228 -msgid "Item Like" -msgstr "" - -#: reporting/reports_main.php:232 -msgid "Inventory &Sales Report" -msgstr "" - -#: reporting/reports_main.php:241 -msgid "&GRN Valuation Report" -msgstr "" - -#: reporting/reports_main.php:247 -msgid "Inventory P&urchasing Report" -msgstr "" - -#: reporting/reports_main.php:257 -msgid "Inventory &Movement Report" -msgstr "" - -#: reporting/reports_main.php:265 -msgid "C&osted Inventory Movement Report" -msgstr "" - -#: reporting/reports_main.php:273 -msgid "Item &Sales Summary Report" -msgstr "" - -#: reporting/reports_main.php:281 -msgid "Manufacturing" -msgstr "" - -#: reporting/reports_main.php:282 -msgid "&Bill of Material Listing" -msgstr "" - -#: reporting/reports_main.php:283 -msgid "From product" -msgstr "" - -#: reporting/reports_main.php:284 -msgid "To product" -msgstr "" - -#: reporting/reports_main.php:288 -msgid "Print &Work Orders" -msgstr "" - -#: reporting/reports_main.php:291 -msgid "Email Locations" -msgstr "" - -#: reporting/reports_main.php:297 -msgid "Dimension &Summary" -msgstr "" - -#: reporting/reports_main.php:298 -msgid "From Dimension" -msgstr "" - -#: reporting/reports_main.php:299 -msgid "To Dimension" -msgstr "" - -#: reporting/reports_main.php:308 -msgid "Banking" -msgstr "" - -#: reporting/reports_main.php:309 -msgid "Bank &Statement" -msgstr "" - -#: reporting/reports_main.php:313 reporting/reports_main.php:380 -#: reporting/reports_main.php:430 reporting/reports_main.php:475 -msgid "Zero values" -msgstr "" - -#: reporting/reports_main.php:318 -msgid "General Ledger" -msgstr "" - -#: reporting/reports_main.php:319 -msgid "Chart of &Accounts" -msgstr "" - -#: reporting/reports_main.php:320 -msgid "Show Balances" -msgstr "" - -#: reporting/reports_main.php:324 -msgid "List of &Journal Entries" -msgstr "" - -#: reporting/reports_main.php:336 reporting/reports_main.php:390 -#: reporting/reports_main.php:439 -msgid "GL Account &Transactions" -msgstr "" - -#: reporting/reports_main.php:339 reporting/reports_main.php:393 -#: reporting/reports_main.php:442 -msgid "From Account" -msgstr "" - -#: reporting/reports_main.php:340 reporting/reports_main.php:394 -#: reporting/reports_main.php:443 -msgid "To Account" -msgstr "" - -#: reporting/reports_main.php:346 reporting/reports_main.php:399 -#: reporting/reports_main.php:447 -msgid "Annual &Expense Breakdown" -msgstr "" - -#: reporting/reports_main.php:354 reporting/reports_main.php:406 -#: reporting/reports_main.php:453 -msgid "&Balance Sheet" -msgstr "" - -#: reporting/reports_main.php:360 reporting/reports_main.php:372 -#: reporting/reports_main.php:411 reporting/reports_main.php:422 -#: reporting/reports_main.php:457 reporting/reports_main.php:467 -msgid "Decimal values" -msgstr "" - -#: reporting/reports_main.php:365 reporting/reports_main.php:416 -#: reporting/reports_main.php:462 -msgid "&Profit and Loss Statement" -msgstr "" - -#: reporting/reports_main.php:481 -msgid "Ta&x Report" -msgstr "" - -#: reporting/includes/doctext.inc:18 reporting/includes/doctext.inc:134 -#: sales/view/view_dispatch.php:51 sales/view/view_invoice.php:51 +#: ../reporting/includes/doctext.inc:18 +#: ../reporting/includes/doctext.inc:156 +#: ../sales/view/view_dispatch.php:51 +#: ../sales/view/view_invoice.php:53 msgid "Charge To" msgstr "" @@@ -13004,13 -11249,10 +12804,13 @@@ msgid "Delivered To" msgstr "" -#: reporting/includes/doctext.inc:30 sales/customer_credit_invoice.php:281 -#: sales/view/view_credit.php:91 sales/view/view_dispatch.php:113 -#: sales/view/view_invoice.php:114 sales/includes/ui/sales_credit_ui.inc:168 -#: sales/includes/ui/sales_order_ui.inc:146 +#: ../reporting/includes/doctext.inc:30 +#: ../sales/customer_credit_invoice.php:281 +#: ../sales/view/view_credit.php:91 +#: ../sales/view/view_dispatch.php:113 +#: ../sales/view/view_invoice.php:116 +#: ../sales/includes/ui/sales_credit_ui.inc:168 - #: ../sales/includes/ui/sales_order_ui.inc.orig:142 ++#: ../sales/includes/ui/sales_order_ui.inc:147 msgid "Discount %" msgstr "" @@@ -13022,26 -11264,18 +12822,26 @@@ msgstr " msgid "Quotation No." msgstr "" -#: reporting/includes/doctext.inc:44 reporting/includes/doctext.inc:61 -#: reporting/includes/doctext.inc:82 reporting/includes/doctext.inc:96 -#: reporting/includes/doctext.inc:118 reporting/includes/doctext.inc:139 -#: reporting/includes/doctext.inc:162 reporting/includes/doctext.inc:180 -#: reporting/includes/doctext.inc:218 +#: ../reporting/includes/doctext.inc:56 +#: ../reporting/includes/doctext.inc:73 +#: ../reporting/includes/doctext.inc:94 +#: ../reporting/includes/doctext.inc:108 +#: ../reporting/includes/doctext.inc:131 +#: ../reporting/includes/doctext.inc:161 +#: ../reporting/includes/doctext.inc:184 +#: ../reporting/includes/doctext.inc:202 +#: ../reporting/includes/doctext.inc:240 - msgid "Customers Reference" + msgid "Customer's Reference" msgstr "" -#: reporting/includes/doctext.inc:45 reporting/includes/doctext.inc:62 -#: reporting/includes/doctext.inc:83 reporting/includes/doctext.inc:97 -#: reporting/includes/doctext.inc:119 reporting/includes/doctext.inc:163 -#: reporting/includes/doctext.inc:219 sales/manage/customer_branches.php:296 +#: ../reporting/includes/doctext.inc:57 +#: ../reporting/includes/doctext.inc:74 +#: ../reporting/includes/doctext.inc:95 +#: ../reporting/includes/doctext.inc:109 +#: ../reporting/includes/doctext.inc:132 +#: ../reporting/includes/doctext.inc:185 +#: ../reporting/includes/doctext.inc:241 +#: ../sales/manage/customer_branches.php:298 msgid "Sales Person" msgstr "" @@@ -13061,11 -11291,9 +12861,10 @@@ msgstr " msgid "Our Quotation No" msgstr "" -#: reporting/includes/doctext.inc:48 sales/view/view_sales_order.php:69 -#: sales/inquiry/sales_orders_view.php:282 -#: sales/includes/ui/sales_order_ui.inc:611 +#: ../reporting/includes/doctext.inc:60 +#: ../sales/view/view_sales_order.php:69 - #: ../sales/view/view_sales_order.php.orig:69 - #: ../sales/inquiry/sales_orders_view.php:304 - #: ../sales/includes/ui/sales_order_ui.inc.orig:606 ++#: ../sales/inquiry/sales_orders_view.php.orig:304 ++#: ../sales/includes/ui/sales_order_ui.inc:612 msgid "Valid until" msgstr "" @@@ -13077,16 -11301,10 +12876,14 @@@ msgstr " msgid "Order No." msgstr "" -#: reporting/includes/doctext.inc:64 reporting/includes/doctext.inc:85 -#: reporting/includes/doctext.inc:99 reporting/includes/doctext.inc:183 -#: reporting/includes/doctext.inc:221 sales/view/view_dispatch.php:87 -#: sales/view/view_invoice.php:86 +#: ../reporting/includes/doctext.inc:76 +#: ../reporting/includes/doctext.inc:97 +#: ../reporting/includes/doctext.inc:111 +#: ../reporting/includes/doctext.inc:138 - #: ../reporting/includes/doctext.inc:164 - #: ../reporting/includes/doctext.inc:187 +#: ../reporting/includes/doctext.inc:205 +#: ../reporting/includes/doctext.inc:243 +#: ../sales/view/view_dispatch.php:87 +#: ../sales/view/view_invoice.php:87 msgid "Our Order No" msgstr "" @@@ -13106,15 -11324,7 +12903,19 @@@ msgstr " msgid "Please quote Credit no. when paying. All amounts stated in" msgstr "" -#: reporting/includes/doctext.inc:106 +#: ../reporting/includes/doctext.inc:117 +msgid "PREPAYMENT INVOICE" +msgstr "" + +#: ../reporting/includes/doctext.inc:118 +msgid "FINAL INVOICE" +msgstr "" + ++#: ../reporting/includes/doctext.inc:118 ++msgid "INVOICE" ++msgstr "" ++ +#: ../reporting/includes/doctext.inc:119 msgid "Invoice No." msgstr "" @@@ -13163,8 -11364,7 +12964,8 @@@ msgstr " msgid "DueDate" msgstr "" -#: reporting/includes/doctext.inc:259 reporting/includes/pdf_report.inc:1020 +#: ../reporting/includes/doctext.inc:272 - #: ../reporting/includes/pdf_report.inc:1014 ++#: ../reporting/includes/pdf_report.inc:1020 msgid "You can pay through" msgstr "" @@@ -13221,40 -11418,38 +13022,38 @@@ msgstr " msgid "Report Period" msgstr "" - #: ../reporting/includes/pdf_report.inc:981 - msgid "You have no email contact defined for this type of document" -#: reporting/includes/pdf_report.inc:987 -#: reporting/includes/pdf_report.inc:1035 ++#: ../reporting/includes/pdf_report.inc:987 ++#: ../reporting/includes/pdf_report.inc:1035 + #, php-format + msgid "You have no email contact defined for this type of document for '%s'." msgstr "" - #: ../reporting/includes/pdf_report.inc:1000 -#: reporting/includes/pdf_report.inc:1006 ++#: ../reporting/includes/pdf_report.inc:1006 msgid "Dear" msgstr "" - #: ../reporting/includes/pdf_report.inc:1001 -#: reporting/includes/pdf_report.inc:1007 ++#: ../reporting/includes/pdf_report.inc:1007 msgid "Attached you will find " msgstr "" - #: ../reporting/includes/pdf_report.inc:1017 -#: reporting/includes/pdf_report.inc:1023 ++#: ../reporting/includes/pdf_report.inc:1023 msgid "Kindest regards" msgstr "" - #: ../reporting/includes/pdf_report.inc:1029 - msgid "There is no contact email set for this document type." - msgstr "" - - #: ../reporting/includes/pdf_report.inc:1032 -#: reporting/includes/pdf_report.inc:1038 ++#: ../reporting/includes/pdf_report.inc:1038 msgid "Sending document by email failed" msgstr "" - #: ../reporting/includes/pdf_report.inc:1032 - #: ../reporting/includes/pdf_report.inc:1035 -#: reporting/includes/pdf_report.inc:1038 -#: reporting/includes/pdf_report.inc:1041 ++#: ../reporting/includes/pdf_report.inc:1038 ++#: ../reporting/includes/pdf_report.inc:1041 msgid "Email:" msgstr "" - #: ../reporting/includes/pdf_report.inc:1035 -#: reporting/includes/pdf_report.inc:1041 ++#: ../reporting/includes/pdf_report.inc:1041 msgid "has been sent by email to destination." msgstr "" - #: ../reporting/includes/pdf_report.inc:1065 -#: reporting/includes/pdf_report.inc:1071 ++#: ../reporting/includes/pdf_report.inc:1071 msgid "Report has been sent to network printer " msgstr "" @@@ -13310,70 -11505,78 +13109,78 @@@ msgstr " msgid "PDF/Printer" msgstr "" - #: ../reporting/includes/reports_classes.inc:242 -#: reporting/includes/reports_classes.inc:238 ++#: ../reporting/includes/reports_classes.inc:238 + msgid "Portrait" + msgstr "" + -#: reporting/includes/reports_classes.inc:238 ++#: ../reporting/includes/reports_classes.inc:238 + msgid "Landscape" + msgstr "" + -#: reporting/includes/reports_classes.inc:249 ++#: ../reporting/includes/reports_classes.inc:249 msgid "No Graphics" msgstr "" - #: ../reporting/includes/reports_classes.inc:242 -#: reporting/includes/reports_classes.inc:249 ++#: ../reporting/includes/reports_classes.inc:249 msgid "Vertical bars" msgstr "" - #: ../reporting/includes/reports_classes.inc:242 -#: reporting/includes/reports_classes.inc:249 ++#: ../reporting/includes/reports_classes.inc:249 msgid "Horizontal bars" msgstr "" - #: ../reporting/includes/reports_classes.inc:243 -#: reporting/includes/reports_classes.inc:250 ++#: ../reporting/includes/reports_classes.inc:250 msgid "Dots" msgstr "" - #: ../reporting/includes/reports_classes.inc:243 -#: reporting/includes/reports_classes.inc:250 ++#: ../reporting/includes/reports_classes.inc:250 msgid "Lines" msgstr "" - #: ../reporting/includes/reports_classes.inc:243 -#: reporting/includes/reports_classes.inc:250 ++#: ../reporting/includes/reports_classes.inc:250 msgid "Pie" msgstr "" - #: ../reporting/includes/reports_classes.inc:243 -#: reporting/includes/reports_classes.inc:250 ++#: ../reporting/includes/reports_classes.inc:250 msgid "Donut" msgstr "" - #: ../reporting/includes/reports_classes.inc:247 - #: ../reporting/includes/reports_classes.inc:250 -#: reporting/includes/reports_classes.inc:254 -#: reporting/includes/reports_classes.inc:257 ++#: ../reporting/includes/reports_classes.inc:254 ++#: ../reporting/includes/reports_classes.inc:257 msgid "No Type Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:260 -#: reporting/includes/reports_classes.inc:267 ++#: ../reporting/includes/reports_classes.inc:267 msgid "No Account Group Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:275 - #: ../reporting/includes/reports_classes.inc:281 - #: ../reporting/includes/reports_classes.inc:287 -#: reporting/includes/reports_classes.inc:282 -#: reporting/includes/reports_classes.inc:288 -#: reporting/includes/reports_classes.inc:294 ++#: ../reporting/includes/reports_classes.inc:282 ++#: ../reporting/includes/reports_classes.inc:288 ++#: ../reporting/includes/reports_classes.inc:294 msgid "No Dimension Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:293 -#: reporting/includes/reports_classes.inc:300 ++#: ../reporting/includes/reports_classes.inc:300 msgid "No Customer Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:301 -#: reporting/includes/reports_classes.inc:308 ++#: ../reporting/includes/reports_classes.inc:308 msgid "No Supplier Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:383 -#: reporting/includes/reports_classes.inc:393 ++#: ../reporting/includes/reports_classes.inc:393 msgid "No Location Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:386 -#: reporting/includes/reports_classes.inc:396 ++#: ../reporting/includes/reports_classes.inc:396 msgid "No Category Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:395 -#: reporting/includes/reports_classes.inc:405 ++#: ../reporting/includes/reports_classes.inc:405 msgid "No Sales Folk Filter" msgstr "" - #: ../reporting/includes/reports_classes.inc:402 -#: reporting/includes/reports_classes.inc:412 ++#: ../reporting/includes/reports_classes.inc:412 msgid "No Users Filter" msgstr "" @@@ -13381,60 -11584,60 +13188,60 @@@ msgid "Create and Print Recurrent Invoices" msgstr "" - #: ../sales/create_recurrent_invoices.php:42 -#: sales/create_recurrent_invoices.php:44 ++#: ../sales/create_recurrent_invoices.php:44 #, php-format msgid "Recurrent Invoice covers period %s - %s." msgstr "" - #: ../sales/create_recurrent_invoices.php:108 -#: sales/create_recurrent_invoices.php:110 ++#: ../sales/create_recurrent_invoices.php:110 #, php-format msgid "%s recurrent invoice(s) created, # %s - # %s." msgstr "" - #: ../sales/create_recurrent_invoices.php:113 -#: sales/create_recurrent_invoices.php:115 ++#: ../sales/create_recurrent_invoices.php:115 #, php-format msgid "&Print Recurrent Invoices # %s - # %s" msgstr "" - #: ../sales/create_recurrent_invoices.php:115 -#: sales/create_recurrent_invoices.php:117 ++#: ../sales/create_recurrent_invoices.php:117 #, php-format msgid "&Email Recurrent Invoices # %s - # %s" msgstr "" - #: ../sales/create_recurrent_invoices.php:127 -#: sales/create_recurrent_invoices.php:129 ++#: ../sales/create_recurrent_invoices.php:129 msgid "Invoice date:" msgstr "" - #: ../sales/create_recurrent_invoices.php:132 -#: sales/create_recurrent_invoices.php:134 -#: sales/manage/recurrent_invoices.php:102 ++#: ../sales/create_recurrent_invoices.php:134 +#: ../sales/manage/recurrent_invoices.php:102 msgid "Template No" msgstr "" - #: ../sales/create_recurrent_invoices.php:132 -#: sales/create_recurrent_invoices.php:134 -#: sales/manage/recurrent_invoices.php:102 ++#: ../sales/create_recurrent_invoices.php:134 +#: ../sales/manage/recurrent_invoices.php:102 msgid "Begin" msgstr "" - #: ../sales/create_recurrent_invoices.php:132 -#: sales/create_recurrent_invoices.php:134 -#: sales/manage/recurrent_invoices.php:102 ++#: ../sales/create_recurrent_invoices.php:134 +#: ../sales/manage/recurrent_invoices.php:102 msgid "End" msgstr "" - #: ../sales/create_recurrent_invoices.php:132 -#: sales/create_recurrent_invoices.php:134 -#: sales/manage/recurrent_invoices.php:102 -#: sales/manage/recurrent_invoices.php:185 ++#: ../sales/create_recurrent_invoices.php:134 +#: ../sales/manage/recurrent_invoices.php:102 +#: ../sales/manage/recurrent_invoices.php:185 msgid "Last Created" msgstr "" - #: ../sales/create_recurrent_invoices.php:173 -#: sales/create_recurrent_invoices.php:175 ++#: ../sales/create_recurrent_invoices.php:175 msgid "Create Invoices" msgstr "" - #: ../sales/create_recurrent_invoices.php:181 -#: sales/create_recurrent_invoices.php:183 ++#: ../sales/create_recurrent_invoices.php:183 msgid "Marked items are due." msgstr "" - #: ../sales/create_recurrent_invoices.php:183 -#: sales/create_recurrent_invoices.php:185 ++#: ../sales/create_recurrent_invoices.php:185 msgid "No recurrent invoices are due." msgstr "" @@@ -13443,8 -11646,7 +13250,8 @@@ msgid "Modifying Customer Credit Note #%d" msgstr "" -#: sales/credit_note_entry.php:51 sales/sales_order_entry.php:684 +#: ../sales/credit_note_entry.php:51 - #: ../sales/sales_order_entry.php:692 ++#: ../sales/sales_order_entry.php:700 msgid "" "There are no customers, or there are no customers with branches. Please " "define customers and customer branches." @@@ -13601,253 -11797,201 +13408,226 @@@ msgstr " msgid "Update credit value for quantities entered" msgstr "" -#: sales/customer_delivery.php:37 +#: ../sales/customer_delivery.php:37 - #: ../sales/customer_delivery.php.orig:37 #, php-format msgid "Modifying Delivery Note # %d." msgstr "" -#: sales/customer_delivery.php:41 +#: ../sales/customer_delivery.php:41 - #: ../sales/customer_delivery.php.orig:41 msgid "Deliver Items for a Sales Order" msgstr "" -#: sales/customer_delivery.php:50 sales/sales_order_entry.php:183 +#: ../sales/customer_delivery.php:50 - #: ../sales/customer_delivery.php.orig:50 +#: ../sales/sales_order_entry.php:189 #, php-format msgid "Delivery # %d has been entered." msgstr "" -#: sales/customer_delivery.php:52 sales/sales_order_entry.php:185 +#: ../sales/customer_delivery.php:52 - #: ../sales/customer_delivery.php.orig:52 +#: ../sales/sales_order_entry.php:191 msgid "&View This Delivery" msgstr "" -#: sales/customer_delivery.php:54 sales/customer_delivery.php:75 -#: sales/sales_order_entry.php:187 +#: ../sales/customer_delivery.php:54 +#: ../sales/customer_delivery.php:76 - #: ../sales/customer_delivery.php.orig:54 - #: ../sales/customer_delivery.php.orig:76 +#: ../sales/sales_order_entry.php:193 msgid "&Print Delivery Note" msgstr "" -#: sales/customer_delivery.php:55 sales/customer_delivery.php:76 -#: sales/sales_order_entry.php:188 +#: ../sales/customer_delivery.php:55 +#: ../sales/customer_delivery.php:77 - #: ../sales/customer_delivery.php.orig:55 - #: ../sales/customer_delivery.php.orig:77 +#: ../sales/sales_order_entry.php:194 msgid "&Email Delivery Note" msgstr "" -#: sales/customer_delivery.php:56 sales/customer_delivery.php:77 -#: sales/sales_order_entry.php:189 +#: ../sales/customer_delivery.php:56 +#: ../sales/customer_delivery.php:78 - #: ../sales/customer_delivery.php.orig:56 - #: ../sales/customer_delivery.php.orig:78 +#: ../sales/sales_order_entry.php:195 msgid "P&rint as Packing Slip" msgstr "" -#: sales/customer_delivery.php:57 sales/customer_delivery.php:78 -#: sales/sales_order_entry.php:190 +#: ../sales/customer_delivery.php:57 +#: ../sales/customer_delivery.php:79 - #: ../sales/customer_delivery.php.orig:57 - #: ../sales/customer_delivery.php.orig:79 +#: ../sales/sales_order_entry.php:196 msgid "E&mail as Packing Slip" msgstr "" -#: sales/customer_delivery.php:59 sales/sales_order_entry.php:193 +#: ../sales/customer_delivery.php:59 - #: ../sales/customer_delivery.php.orig:59 +#: ../sales/sales_order_entry.php:199 msgid "View the GL Journal Entries for this Dispatch" msgstr "" -#: sales/customer_delivery.php:61 +#: ../sales/customer_delivery.php:62 - #: ../sales/customer_delivery.php.orig:62 msgid "Invoice This Delivery" msgstr "" -#: sales/customer_delivery.php:63 +#: ../sales/customer_delivery.php:64 - #: ../sales/customer_delivery.php.orig:64 msgid "Select Another Order For Dispatch" msgstr "" -#: sales/customer_delivery.php:71 +#: ../sales/customer_delivery.php:72 - #: ../sales/customer_delivery.php.orig:72 #, php-format msgid "Delivery Note # %d has been updated." msgstr "" -#: sales/customer_delivery.php:73 +#: ../sales/customer_delivery.php:74 - #: ../sales/customer_delivery.php.orig:74 msgid "View this delivery" msgstr "" -#: sales/customer_delivery.php:80 +#: ../sales/customer_delivery.php:82 - #: ../sales/customer_delivery.php.orig:82 msgid "Confirm Delivery and Invoice" msgstr "" -#: sales/customer_delivery.php:82 +#: ../sales/customer_delivery.php:84 - #: ../sales/customer_delivery.php.orig:84 msgid "Select A Different Delivery" msgstr "" -#: sales/customer_delivery.php:94 -msgid "Select a different sales order to delivery" +#: ../sales/customer_delivery.php:94 - #: ../sales/customer_delivery.php.orig:94 +#: ../sales/customer_invoice.php:152 +msgid "" +"You have to set Deferred Income Account in GL Setup to entry prepayment " +"invoices." msgstr "" -#: sales/customer_delivery.php:95 +#: ../sales/customer_delivery.php:97 - #: ../sales/customer_delivery.php.orig:97 msgid "This order has no items. There is nothing to delivery." msgstr "" -#: sales/customer_delivery.php:110 +#: ../sales/customer_delivery.php:100 +#: ../sales/customer_delivery.php:105 - #: ../sales/customer_delivery.php.orig:100 - #: ../sales/customer_delivery.php.orig:105 +msgid "Select a different sales order to delivery" +msgstr "" + +#: ../sales/customer_delivery.php:103 - #: ../sales/customer_delivery.php.orig:103 +msgid "" +"This prepayment order is not yet ready for delivery due to insufficient " +"amount received." +msgstr "" + +#: ../sales/customer_delivery.php:122 - #: ../sales/customer_delivery.php.orig:122 msgid "Select a different delivery" msgstr "" -#: sales/customer_delivery.php:111 +#: ../sales/customer_delivery.php:123 - #: ../sales/customer_delivery.php.orig:123 msgid "This delivery has all items invoiced. There is nothing to modify." msgstr "" -#: sales/customer_delivery.php:121 +#: ../sales/customer_delivery.php:133 - #: ../sales/customer_delivery.php.orig:133 msgid "" "This page can only be opened if an order or delivery note has been selected. " "Please select it first." msgstr "" -#: sales/customer_delivery.php:123 +#: ../sales/customer_delivery.php:135 - #: ../sales/customer_delivery.php.orig:135 msgid "Select a Sales Order to Delivery" msgstr "" -#: sales/customer_delivery.php:132 +#: ../sales/customer_delivery.php:144 - #: ../sales/customer_delivery.php.orig:144 msgid "" "Selected quantity cannot be less than quantity invoiced nor more than " "quantity\tnot dispatched on sales order." msgstr "" -#: sales/customer_delivery.php:135 +#: ../sales/customer_delivery.php:147 - #: ../sales/customer_delivery.php.orig:147 msgid "Freight cost cannot be less than zero" msgstr "" -#: sales/customer_delivery.php:147 +#: ../sales/customer_delivery.php:159 - #: ../sales/customer_delivery.php.orig:159 msgid "The entered date of delivery is invalid." msgstr "" -#: sales/customer_delivery.php:153 -msgid "The entered date of delivery is not in fiscal year." -msgstr "" - -#: sales/customer_delivery.php:159 +#: ../sales/customer_delivery.php:171 - #: ../sales/customer_delivery.php.orig:171 msgid "The entered dead-line for invoice is invalid." msgstr "" -#: sales/customer_delivery.php:176 sales/customer_invoice.php:291 +#: ../sales/customer_delivery.php:188 - #: ../sales/customer_delivery.php.orig:194 +#: ../sales/customer_invoice.php:345 msgid "The entered shipping value is not numeric." msgstr "" -#: sales/customer_delivery.php:182 +#: ../sales/customer_delivery.php:194 - #: ../sales/customer_delivery.php.orig:200 msgid "There are no item quantities on this delivery note." msgstr "" -#: sales/customer_delivery.php:285 sales/sales_order_entry.php:513 -#: sales/includes/ui/sales_order_ui.inc:250 +#: ../sales/customer_delivery.php:297 - #: ../sales/customer_delivery.php.orig:303 - #: ../sales/sales_order_entry.php:521 - #: ../sales/includes/ui/sales_order_ui.inc.orig:244 ++#: ../sales/sales_order_entry.php:529 ++#: ../sales/includes/ui/sales_order_ui.inc:251 msgid "" "The delivery cannot be processed because there is an insufficient quantity " "for item:" msgstr "" - #: ../sales/customer_delivery.php.orig:366 -#: sales/customer_delivery.php:353 ++#: ../sales/customer_delivery.php:367 msgid "For Sales Order" msgstr "" - #: ../sales/customer_delivery.php.orig:375 -#: sales/customer_delivery.php:362 ++#: ../sales/customer_delivery.php:376 msgid "Delivery From" msgstr "" - #: ../sales/customer_delivery.php.orig:424 -#: sales/customer_delivery.php:411 ++#: ../sales/customer_delivery.php:425 msgid "Invoice Dead-line" msgstr "" - #: ../sales/customer_delivery.php.orig:434 -#: sales/customer_delivery.php:421 sales/customer_invoice.php:459 -#: sales/includes/ui/sales_order_ui.inc:84 -#: sales/includes/ui/sales_order_ui.inc:374 ++#: ../sales/customer_delivery.php:435 +#: ../sales/customer_invoice.php:530 +#: ../sales/includes/ui/sales_order_ui.inc:84 - #: ../sales/includes/ui/sales_order_ui.inc.orig:82 - #: ../sales/includes/ui/sales_order_ui.inc.orig:368 ++#: ../sales/includes/ui/sales_order_ui.inc:375 msgid "" "The selected customer account is currently on hold. Please contact the " "credit control personnel to discuss." msgstr "" - #: ../sales/customer_delivery.php.orig:439 -#: sales/customer_delivery.php:426 ++#: ../sales/customer_delivery.php:440 msgid "Delivery Items" msgstr "" - #: ../sales/customer_delivery.php.orig:445 -#: sales/customer_delivery.php:432 ++#: ../sales/customer_delivery.php:446 msgid "Max. delivery" msgstr "" - #: ../sales/customer_delivery.php.orig:445 -#: sales/customer_delivery.php:432 sales/customer_invoice.php:469 -#: sales/includes/ui/sales_order_ui.inc:145 -msgid "Delivered" ++#: ../sales/customer_delivery.php:446 +#: ../sales/customer_invoice.php:544 - #: ../sales/includes/ui/sales_order_ui.inc.orig:141 - msgid "Delivered" ++msgid "Invoiced" msgstr "" - #: ../sales/customer_delivery.php.orig:506 -#: sales/customer_delivery.php:503 sales/customer_invoice.php:554 ++#: ../sales/customer_delivery.php:517 +#: ../sales/customer_invoice.php:633 msgid "Shipping Cost" msgstr "" - #: ../sales/customer_delivery.php.orig:526 - #: ../sales/includes/ui/sales_order_ui.inc.orig:242 -#: sales/customer_delivery.php:523 sales/includes/ui/sales_order_ui.inc:248 ++#: ../sales/customer_delivery.php:537 ++#: ../sales/includes/ui/sales_order_ui.inc:249 msgid "" "Marked items have insufficient quantities in stock as on day of delivery." msgstr "" - #: ../sales/customer_delivery.php.orig:530 -#: sales/customer_delivery.php:527 ++#: ../sales/customer_delivery.php:541 msgid "Action For Balance" msgstr "" - #: ../sales/customer_delivery.php.orig:537 -#: sales/customer_delivery.php:534 sales/customer_delivery.php:536 -#: sales/customer_delivery.php:539 sales/customer_invoice.php:583 ++#: ../sales/customer_delivery.php:548 ++#: ../sales/customer_delivery.php:550 ++#: ../sales/customer_delivery.php:553 +#: ../sales/customer_invoice.php:685 msgid "Refresh document page" msgstr "" - #: ../sales/customer_delivery.php.orig:538 -#: sales/customer_delivery.php:536 ++#: ../sales/customer_delivery.php:550 + msgid "Reset quantity" + msgstr "" + -#: sales/customer_delivery.php:539 ++#: ../sales/customer_delivery.php:553 + msgid "Clear quantity" + msgstr "" + -#: sales/customer_delivery.php:541 ++#: ../sales/customer_delivery.php:555 msgid "Process Dispatch" msgstr "" - #: ../sales/customer_delivery.php.orig:539 -#: sales/customer_delivery.php:542 sales/customer_invoice.php:585 -#: sales/sales_order_entry.php:732 ++#: ../sales/customer_delivery.php:556 +#: ../sales/customer_invoice.php:687 - #: ../sales/sales_order_entry.php:739 ++#: ../sales/sales_order_entry.php:747 msgid "Check entered data and save document" msgstr "" @@@ -13966,12 -12102,12 +13746,12 @@@ msgstr " msgid "Payment terms:" msgstr "" -#: sales/customer_invoice.php:388 sales/includes/ui/sales_order_ui.inc:410 -#: sales/includes/ui/sales_order_ui.inc:414 -msgid "Payment:" +#: ../sales/customer_invoice.php:536 - #: ../sales/sales_order_entry.php:715 ++#: ../sales/sales_order_entry.php:723 +msgid "Sales Order Items" msgstr "" -#: sales/customer_invoice.php:465 +#: ../sales/customer_invoice.php:536 msgid "Invoice Items" msgstr "" @@@ -13987,116 -12123,117 +13767,155 @@@ msgstr " msgid "Invoice Total" msgstr "" -#: sales/customer_payments.php:33 sales/customer_payments.php.sav:33 +#: ../sales/customer_invoice.php:663 +msgid "Sales order:" +msgstr "" + +#: ../sales/customer_invoice.php:675 +msgid "Payments received:" +msgstr "" + +#: ../sales/customer_invoice.php:676 +msgid "Invoiced here:" +msgstr "" + +#: ../sales/customer_invoice.php:677 +msgid "Left to be invoiced:" +msgstr "" + - #: ../sales/customer_payments.php:33 ++#: ../sales/customer_payments.php:32 ++#: ../sales/customer_payments.php.orig:33 msgid "Customer Payment Entry" msgstr "" - #: ../sales/customer_payments.php:37 -#: sales/customer_payments.php:37 sales/customer_payments.php.sav:37 ++#: ../sales/customer_payments.php:36 ++#: ../sales/customer_payments.php.orig:37 msgid "There are no customers defined in the system." msgstr "" - #: ../sales/customer_payments.php:68 -#: sales/customer_payments.php:68 sales/customer_payments.php.sav:68 ++#: ../sales/customer_payments.php:70 ++#: ../sales/customer_payments.php.orig:68 msgid "Invalid sales invoice number." msgstr "" - #: ../sales/customer_payments.php:92 -#: sales/customer_payments.php:94 sales/customer_payments.php.sav:94 ++#: ../sales/customer_payments.php:97 ++#: ../sales/customer_payments.php.orig:92 msgid "The customer payment has been successfully entered." msgstr "" - #: ../sales/customer_payments.php:94 - #: ../sales/customer_payments.php:109 -#: sales/customer_payments.php:96 sales/customer_payments.php:113 -#: sales/customer_payments.php.sav:96 sales/customer_payments.php.sav:113 ++#: ../sales/customer_payments.php:99 ++#: ../sales/customer_payments.php:118 ++#: ../sales/customer_payments.php.orig:94 ++#: ../sales/customer_payments.php.orig:109 msgid "&Print This Receipt" msgstr "" - #: ../sales/customer_payments.php:96 - #: ../sales/customer_payments.php:111 -#: sales/customer_payments.php:98 sales/customer_payments.php:115 -#: sales/customer_payments.php.sav:98 sales/customer_payments.php.sav:115 --msgid "&View the GL Journal Entries for this Customer Payment" ++#: ../sales/customer_payments.php:101 ++msgid "&View this Customer Payment" msgstr "" - #: ../sales/customer_payments.php:100 - #: ../sales/customer_payments.php:115 -#: sales/customer_payments.php:102 sales/customer_payments.php.sav:102 -msgid "Select Another &Customer Transaction for Payment" ++#: ../sales/customer_payments.php:103 ++#: ../sales/customer_payments.php:126 ++#: ../sales/customer_payments.php.orig:100 ++#: ../sales/customer_payments.php.orig:115 +msgid "Enter Another &Customer Payment" msgstr "" - #: ../sales/customer_payments.php:107 -#: sales/customer_payments.php:104 sales/customer_payments.php:121 -#: sales/customer_payments.php.sav:104 sales/customer_payments.php.sav:121 -msgid "Enter Another &Customer Payment" ++#: ../sales/customer_payments.php:105 ++msgid "Enter Payment to &Supplier" + msgstr "" + -#: sales/customer_payments.php:111 sales/customer_payments.php.sav:111 ++#: ../sales/customer_payments.php:109 ++#: ../sales/customer_payments.php:120 ++#: ../sales/customer_payments.php.orig:96 ++#: ../sales/customer_payments.php.orig:111 ++msgid "&View the GL Journal Entries for this Customer Payment" ++msgstr "" ++ ++#: ../sales/customer_payments.php:116 ++#: ../sales/customer_payments.php.orig:107 msgid "The customer payment has been successfully updated." msgstr "" - #: ../sales/customer_payments.php:128 - #: ../sales/sales_order_entry.php:346 -#: sales/customer_payments.php:119 sales/customer_payments.php.sav:119 ++#: ../sales/customer_payments.php:124 + msgid "Select Another Customer Payment for &Edition" + msgstr "" + -#: sales/customer_payments.php:134 sales/customer_payments.php.sav:134 -#: sales/sales_order_entry.php:337 ++#: ../sales/customer_payments.php:139 ++#: ../sales/customer_payments.php.orig:128 ++#: ../sales/sales_order_entry.php:347 msgid "There is no customer selected." msgstr "" - #: ../sales/customer_payments.php:135 - #: ../sales/sales_order_entry.php:353 -#: sales/customer_payments.php:141 sales/customer_payments.php.sav:141 -#: sales/sales_order_entry.php:344 ++#: ../sales/customer_payments.php:146 ++#: ../sales/customer_payments.php.orig:135 ++#: ../sales/sales_order_entry.php:354 msgid "This customer has no branch defined." msgstr "" - #: ../sales/customer_payments.php:141 -#: sales/customer_payments.php:147 sales/customer_payments.php.sav:147 ++#: ../sales/customer_payments.php:152 ++#: ../sales/customer_payments.php.orig:141 msgid "The entered date is invalid. Please enter a valid date for the payment." msgstr "" - #: ../sales/customer_payments.php:171 - #: ../sales/customer_payments.php:177 -#: sales/customer_payments.php:177 sales/customer_payments.php:183 -#: sales/customer_payments.php.sav:177 sales/customer_payments.php.sav:183 ++#: ../sales/customer_payments.php:182 ++#: ../sales/customer_payments.php:188 ++#: ../sales/customer_payments.php.orig:171 ++#: ../sales/customer_payments.php.orig:177 msgid "The entered amount is invalid or negative and cannot be processed." msgstr "" - #: ../sales/customer_payments.php:203 -#: sales/customer_payments.php:209 sales/customer_payments.php.sav:209 ++#: ../sales/customer_payments.php:214 ++#: ../sales/customer_payments.php.orig:203 msgid "The entered discount is not a valid number." msgstr "" - #: ../sales/customer_payments.php:210 -#: sales/customer_payments.php:216 sales/customer_payments.php.sav:216 ++#: ../sales/customer_payments.php:221 + msgid "" + "The balance of the amount and discount is zero or negative. Please enter " + "valid amounts." + msgstr "" + -#: sales/customer_payments.php:223 sales/customer_payments.php.sav:223 ++#: ../sales/customer_payments.php:228 + msgid "The entered payment amount is zero or negative." + msgstr "" + -#: sales/customer_payments.php:338 sales/customer_payments.php.sav:345 -msgid "Into Bank Account:" ++#: ../sales/customer_payments.php.orig:210 +msgid "" +"The balance of the amount and discout is zero or negative. Please enter " +"valid amounts." msgstr "" - #: ../sales/customer_payments.php:338 - #: ../sales/customer_payments.php:340 -#: sales/customer_payments.php:341 sales/customer_payments.php:343 -#: sales/customer_payments.php.sav:348 sales/customer_payments.php.sav:350 ++#: ../sales/customer_payments.php.orig:338 ++#: ../sales/customer_payments.php.orig:340 msgid "From Customer:" msgstr "" - #: ../sales/customer_payments.php:381 -#: sales/customer_payments.php:368 sales/customer_payments.php.sav:375 -msgid "Date of Deposit:" -msgstr "" - -#: sales/customer_payments.php:384 sales/customer_payments.php.sav:391 -msgid "Payment Amount:" ++#: ../sales/customer_payments.php.orig:381 +msgid "Into Bank Account:" msgstr "" - #: ../sales/customer_payments.php:386 -#: sales/customer_payments.php:393 sales/customer_payments.php.sav:400 -#, php-format -msgid "Accounts Receivable settled in %s:" ++#: ../sales/customer_payments.php.orig:386 +msgid "Date of Deposit:" msgstr "" - #: ../sales/customer_payments.php:408 -#: sales/customer_payments.php:400 sales/customer_payments.php.sav:407 ++#: ../sales/customer_payments.php.orig:408 msgid "Customer prompt payment discount :" msgstr "" - #: ../sales/customer_payments.php:417 -#: sales/customer_payments.php:410 sales/customer_payments.php.sav:419 -msgid "Add Payment" ++#: ../sales/customer_payments.php.orig:417 +msgid "Amount and discount are in customer's currency." msgstr "" - #: ../sales/customer_payments.php:422 -#: sales/customer_payments.php:412 sales/customer_payments.php.sav:417 ++#: ../sales/customer_payments.php.orig:422 msgid "Update Payment" msgstr "" - #: ../sales/customer_payments.php:424 -#: sales/sales_order_entry.php:64 ++#: ../sales/customer_payments.php.orig:424 +msgid "Add Payment" +msgstr "" + +#: ../sales/sales_order_entry.php:64 msgid "Direct Sales Delivery" msgstr "" @@@ -14232,178 -12364,192 +14051,192 @@@ msgstr " msgid "Enter a &New Direct Invoice" msgstr "" - #: ../sales/sales_order_entry.php:376 -#: sales/sales_order_entry.php:366 ++#: ../sales/sales_order_entry.php:377 +msgid "Pre-payment required have to be positive and less than total amount." +msgstr "" + - #: ../sales/sales_order_entry.php:381 ++#: ../sales/sales_order_entry.php:382 msgid "" "You must enter the person or company to whom delivery should be made to." msgstr "" - #: ../sales/sales_order_entry.php:388 -#: sales/sales_order_entry.php:373 ++#: ../sales/sales_order_entry.php:389 msgid "" "You should enter the street address in the box provided. Orders cannot be " "accepted without a valid street address." msgstr "" - #: ../sales/sales_order_entry.php:397 -#: sales/sales_order_entry.php:382 ++#: ../sales/sales_order_entry.php:398 msgid "The shipping cost entered is expected to be numeric." msgstr "" - #: ../sales/sales_order_entry.php:403 -#: sales/sales_order_entry.php:388 ++#: ../sales/sales_order_entry.php:404 msgid "The Valid date is invalid." msgstr "" - #: ../sales/sales_order_entry.php:405 -#: sales/sales_order_entry.php:390 ++#: ../sales/sales_order_entry.php:406 msgid "The delivery date is invalid." msgstr "" - #: ../sales/sales_order_entry.php:412 -#: sales/sales_order_entry.php:397 ++#: ../sales/sales_order_entry.php:413 msgid "The requested valid date is before the date of the quotation." msgstr "" - #: ../sales/sales_order_entry.php:414 -#: sales/sales_order_entry.php:399 ++#: ../sales/sales_order_entry.php:415 msgid "The requested delivery date is before the date of the order." msgstr "" - #: ../sales/sales_order_entry.php:423 -#: sales/sales_order_entry.php:408 ++#: ../sales/sales_order_entry.php:424 msgid "You need to define a cash account for your Sales Point." msgstr "" - #: ../sales/sales_order_entry.php:500 -#: sales/sales_order_entry.php:446 ++#: ../sales/sales_order_entry.php:462 + msgid "" + "The reference number field has been increased. Please save the document " + "again." + msgstr "" + -#: sales/sales_order_entry.php:492 ++#: ../sales/sales_order_entry.php:508 msgid "" "The item could not be updated because you are attempting to set the quantity " "ordered to less than 0, or the discount percent to more than 100." msgstr "" - #: ../sales/sales_order_entry.php:504 -#: sales/sales_order_entry.php:496 ++#: ../sales/sales_order_entry.php:512 msgid "Price for inventory item must be entered and can not be less than 0" msgstr "" - #: ../sales/sales_order_entry.php:511 -#: sales/sales_order_entry.php:503 ++#: ../sales/sales_order_entry.php:519 msgid "" "You attempting to make the quantity ordered a quantity less than has already " "been delivered. The quantity delivered cannot be modified retrospectively." msgstr "" - #: ../sales/sales_order_entry.php:542 -#: sales/sales_order_entry.php:534 ++#: ../sales/sales_order_entry.php:550 #, php-format msgid "Price %s is below Standard Cost %s" msgstr "" - #: ../sales/sales_order_entry.php:567 -#: sales/sales_order_entry.php:559 ++#: ../sales/sales_order_entry.php:575 msgid "" "This item cannot be deleted because some of it has already been delivered." msgstr "" - #: ../sales/sales_order_entry.php:596 -#: sales/sales_order_entry.php:588 ++#: ../sales/sales_order_entry.php:604 msgid "Direct delivery entry has been cancelled as requested." msgstr "" - #: ../sales/sales_order_entry.php:597 -#: sales/sales_order_entry.php:589 ++#: ../sales/sales_order_entry.php:605 msgid "Enter a New Sales Delivery" msgstr "" - #: ../sales/sales_order_entry.php:600 -#: sales/sales_order_entry.php:591 ++#: ../sales/sales_order_entry.php:607 msgid "Direct invoice entry has been cancelled as requested." msgstr "" - #: ../sales/sales_order_entry.php:601 -#: sales/sales_order_entry.php:592 ++#: ../sales/sales_order_entry.php:608 msgid "Enter a New Sales Invoice" msgstr "" - #: ../sales/sales_order_entry.php:606 - msgid "" - "This order cannot be cancelled because some of it has already been invoiced " - "or dispatched. However, the line item quantities may be modified." - msgstr "" - - #: ../sales/sales_order_entry.php:611 -#: sales/sales_order_entry.php:596 ++#: ../sales/sales_order_entry.php:612 msgid "This sales quotation has been cancelled as requested." msgstr "" - #: ../sales/sales_order_entry.php:612 -#: sales/sales_order_entry.php:597 ++#: ../sales/sales_order_entry.php:613 msgid "Enter a New Sales Quotation" msgstr "" - #: ../sales/sales_order_entry.php:616 -#: sales/sales_order_entry.php:604 ++#: ../sales/sales_order_entry.php:620 + msgid "Undelivered part of order has been cancelled as requested." + msgstr "" + -#: sales/sales_order_entry.php:605 ++#: ../sales/sales_order_entry.php:621 + msgid "Select Another Sales Order for Edition" + msgstr "" + -#: sales/sales_order_entry.php:609 ++#: ../sales/sales_order_entry.php:625 msgid "This sales order has been cancelled as requested." msgstr "" - #: ../sales/sales_order_entry.php:617 -#: sales/sales_order_entry.php:610 ++#: ../sales/sales_order_entry.php:626 msgid "Enter a New Sales Order" msgstr "" - #: ../sales/sales_order_entry.php:696 -#: sales/sales_order_entry.php:688 ++#: ../sales/sales_order_entry.php:704 msgid "Sales Invoice Items" msgstr "" - #: ../sales/sales_order_entry.php:697 -#: sales/sales_order_entry.php:689 ++#: ../sales/sales_order_entry.php:705 msgid "Enter Delivery Details and Confirm Invoice" msgstr "" - #: ../sales/sales_order_entry.php:699 -#: sales/sales_order_entry.php:691 ++#: ../sales/sales_order_entry.php:707 msgid "Place Invoice" msgstr "" - #: ../sales/sales_order_entry.php:702 -#: sales/sales_order_entry.php:694 ++#: ../sales/sales_order_entry.php:710 msgid "Delivery Note Items" msgstr "" - #: ../sales/sales_order_entry.php:703 -#: sales/sales_order_entry.php:695 ++#: ../sales/sales_order_entry.php:711 msgid "Enter Delivery Details and Confirm Dispatch" msgstr "" - #: ../sales/sales_order_entry.php:704 -#: sales/sales_order_entry.php:696 ++#: ../sales/sales_order_entry.php:712 msgid "Cancel Delivery" msgstr "" - #: ../sales/sales_order_entry.php:705 -#: sales/sales_order_entry.php:697 ++#: ../sales/sales_order_entry.php:713 msgid "Place Delivery" msgstr "" - #: ../sales/sales_order_entry.php:707 -#: sales/sales_order_entry.php:699 ++#: ../sales/sales_order_entry.php:715 msgid "Quotation Date:" msgstr "" - #: ../sales/sales_order_entry.php:708 -#: sales/sales_order_entry.php:700 ++#: ../sales/sales_order_entry.php:716 msgid "Sales Quotation Items" msgstr "" - #: ../sales/sales_order_entry.php:709 -#: sales/sales_order_entry.php:701 ++#: ../sales/sales_order_entry.php:717 msgid "Enter Delivery Details and Confirm Quotation" msgstr "" - #: ../sales/sales_order_entry.php:710 -#: sales/sales_order_entry.php:702 ++#: ../sales/sales_order_entry.php:718 msgid "Cancel Quotation" msgstr "" - #: ../sales/sales_order_entry.php:711 -#: sales/sales_order_entry.php:703 ++#: ../sales/sales_order_entry.php:719 msgid "Place Quotation" msgstr "" - #: ../sales/sales_order_entry.php:712 -#: sales/sales_order_entry.php:704 ++#: ../sales/sales_order_entry.php:720 msgid "Commit Quotations Changes" msgstr "" - #: ../sales/sales_order_entry.php:716 -#: sales/sales_order_entry.php:707 -msgid "Sales Order Items" -msgstr "" - -#: sales/sales_order_entry.php:708 ++#: ../sales/sales_order_entry.php:724 msgid "Enter Delivery Details and Confirm Order" msgstr "" - #: ../sales/sales_order_entry.php:719 -#: sales/sales_order_entry.php:711 ++#: ../sales/sales_order_entry.php:727 msgid "Commit Order Changes" msgstr "" - #: ../sales/sales_order_entry.php:740 -#: sales/sales_order_entry.php:733 ++#: ../sales/sales_order_entry.php:748 msgid "You are about to void this Document.\\nDo you want to continue?" msgstr "" - #: ../sales/sales_order_entry.php:743 -#: sales/sales_order_entry.php:736 ++#: ../sales/sales_order_entry.php:751 + msgid "" + "You are about to cancel undelivered part of this order.\\nDo you want to " + "continue?" + msgstr "" + -#: sales/sales_order_entry.php:738 ++#: ../sales/sales_order_entry.php:753 msgid "Validate changes and update document" msgstr "" - #: ../sales/sales_order_entry.php:747 -#: sales/sales_order_entry.php:742 ++#: ../sales/sales_order_entry.php:757 msgid "" "Cancels document entry or removes sales order when editing an old document" msgstr "" @@@ -14412,7 -12558,7 +14245,7 @@@ msgid "Allocate Customer Payment or Credit Note" msgstr "" - #: ../sales/allocations/customer_allocate.php:48 -#: sales/allocations/customer_allocate.php:47 ++#: ../sales/allocations/customer_allocate.php:50 #, php-format msgid "Allocation of %s # %d" msgstr "" @@@ -14421,13 -12567,11 +14254,15 @@@ msgid "Customer Allocations" msgstr "" -#: sales/allocations/customer_allocation_main.php:32 -#: sales/manage/customer_branches.php:280 sales/manage/customers.php:324 -#: sales/inquiry/customer_allocation_inquiry.php:42 -#: sales/inquiry/customer_inquiry.php:48 -#: sales/inquiry/sales_orders_view.php:243 +#: ../sales/allocations/customer_allocation_main.php:32 +#: ../sales/manage/customer_branches.php:282 - #: ../sales/manage/customers.php:324 ++#: ../sales/manage/customers.php:327 +#: ../sales/manage/sav.customers.php:322 +#: ../sales/inquiry/customer_allocation_inquiry.php:42 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:42 +#: ../sales/inquiry/customer_inquiry.php:44 - #: ../sales/inquiry/sales_orders_view.php:265 ++#: ../sales/inquiry/customer_inquiry.php.orig:44 ++#: ../sales/inquiry/sales_orders_view.php.orig:265 msgid "Select a customer: " msgstr "" @@@ -14549,15 -12693,11 +14384,15 @@@ msgstr " msgid "Branch Short Name:" msgstr "" -#: sales/manage/customer_branches.php:241 sales/manage/customers.php:256 +#: ../sales/manage/customer_branches.php:242 - #: ../sales/manage/customers.php:256 ++#: ../sales/manage/customers.php:259 +#: ../sales/manage/sav.customers.php:290 msgid "Sales Person:" msgstr "" -#: sales/manage/customer_branches.php:242 sales/manage/customers.php:293 +#: ../sales/manage/customer_branches.php:243 - #: ../sales/manage/customers.php:293 ++#: ../sales/manage/customers.php:296 +#: ../sales/manage/sav.customers.php:291 msgid "Sales Area:" msgstr "" @@@ -14566,13 -12706,11 +14401,13 @@@ msgid "Sales Group:" msgstr "" -#: sales/manage/customer_branches.php:244 sales/manage/customers.php:291 +#: ../sales/manage/customer_branches.php:245 - #: ../sales/manage/customers.php:291 ++#: ../sales/manage/customers.php:294 msgid "Default Inventory Location:" msgstr "" -#: sales/manage/customer_branches.php:245 sales/manage/customers.php:292 +#: ../sales/manage/customer_branches.php:246 - #: ../sales/manage/customers.php:292 ++#: ../sales/manage/customers.php:295 msgid "Default Shipping Company:" msgstr "" @@@ -14613,8 -12751,8 +14448,8 @@@ msgstr " msgid "Tax Group" msgstr "" -#: sales/manage/customer_branches.php:319 -#: sales/includes/ui/sales_order_ui.inc:305 +#: ../sales/manage/customer_branches.php:321 - #: ../sales/includes/ui/sales_order_ui.inc.orig:299 ++#: ../sales/includes/ui/sales_order_ui.inc:306 msgid "" "The selected customer does not have any branches. Please create at least one " "branch." @@@ -14654,150 -12786,121 +14489,150 @@@ msgstr " msgid "Customer has been updated." msgstr "" - #: ../sales/manage/customers.php:127 -#: sales/manage/customers.php:127 ++#: ../sales/manage/customers.php:130 +#: ../sales/manage/sav.customers.php:127 msgid "A new customer has been added." msgstr "" - #: ../sales/manage/customers.php:130 -#: sales/manage/customers.php:130 ++#: ../sales/manage/customers.php:133 +#: ../sales/manage/sav.customers.php:130 msgid "" "A default Branch has been automatically created, please check default Branch " "values by using link below." msgstr "" - #: ../sales/manage/customers.php:153 -#: sales/manage/customers.php:153 ++#: ../sales/manage/customers.php:156 +#: ../sales/manage/sav.customers.php:153 msgid "" "This customer cannot be deleted because there are transactions that refer to " "it." msgstr "" - #: ../sales/manage/customers.php:160 -#: sales/manage/customers.php:160 ++#: ../sales/manage/customers.php:163 +#: ../sales/manage/sav.customers.php:160 msgid "" "Cannot delete the customer record because orders have been created against " "it." msgstr "" - #: ../sales/manage/customers.php:167 -#: sales/manage/customers.php:167 ++#: ../sales/manage/customers.php:170 +#: ../sales/manage/sav.customers.php:167 msgid "" "Cannot delete this customer because there are branch records set up against " "it." msgstr "" - #: ../sales/manage/customers.php:178 -#: sales/manage/customers.php:178 ++#: ../sales/manage/customers.php:181 +#: ../sales/manage/sav.customers.php:178 msgid "Selected customer has been deleted." msgstr "" - #: ../sales/manage/customers.php:227 -#: sales/manage/customers.php:227 ++#: ../sales/manage/customers.php:230 +#: ../sales/manage/sav.customers.php:227 msgid "Name and Address" msgstr "" - #: ../sales/manage/customers.php:229 -#: sales/manage/customers.php:229 ++#: ../sales/manage/customers.php:232 +#: ../sales/manage/sav.customers.php:229 msgid "Customer Name:" msgstr "" - #: ../sales/manage/customers.php:230 -#: sales/manage/customers.php:230 ++#: ../sales/manage/customers.php:233 +#: ../sales/manage/sav.customers.php:230 msgid "Customer Short Name:" msgstr "" - #: ../sales/manage/customers.php:238 - #: ../sales/manage/customers.php:242 -#: sales/manage/customers.php:238 sales/manage/customers.php:242 ++#: ../sales/manage/customers.php:241 ++#: ../sales/manage/customers.php:245 +#: ../sales/manage/sav.customers.php:238 +#: ../sales/manage/sav.customers.php:242 msgid "Customer's Currency:" msgstr "" - #: ../sales/manage/customers.php:245 -#: sales/manage/customers.php:245 ++#: ../sales/manage/customers.php:248 +#: ../sales/manage/sav.customers.php:245 msgid "Sales Type/Price List:" msgstr "" - #: ../sales/manage/customers.php:248 -#: sales/manage/customers.php:248 ++#: ../sales/manage/customers.php:251 +#: ../sales/manage/sav.customers.php:248 msgid "Customer status:" msgstr "" - #: ../sales/manage/customers.php:262 -#: sales/manage/customers.php:262 ++#: ../sales/manage/customers.php:265 +#: ../sales/manage/sav.customers.php:261 msgid "Discount Percent:" msgstr "" - #: ../sales/manage/customers.php:263 -#: sales/manage/customers.php:263 ++#: ../sales/manage/customers.php:266 +#: ../sales/manage/sav.customers.php:262 msgid "Prompt Payment Discount Percent:" msgstr "" - #: ../sales/manage/customers.php:267 -#: sales/manage/customers.php:267 ++#: ../sales/manage/customers.php:270 +#: ../sales/manage/sav.customers.php:266 msgid "Credit Status:" msgstr "" - #: ../sales/manage/customers.php:280 -#: sales/manage/customers.php:280 ++#: ../sales/manage/customers.php:283 +#: ../sales/manage/sav.customers.php:279 msgid "Customer branches" msgstr "" - #: ../sales/manage/customers.php:282 -#: sales/manage/customers.php:282 ++#: ../sales/manage/customers.php:285 +#: ../sales/manage/sav.customers.php:281 msgid "Select or &Add" msgstr "" - #: ../sales/manage/customers.php:282 -#: sales/manage/customers.php:282 ++#: ../sales/manage/customers.php:285 +#: ../sales/manage/sav.customers.php:281 msgid "&Add or Edit " msgstr "" - #: ../sales/manage/customers.php:301 -#: sales/manage/customers.php:301 ++#: ../sales/manage/customers.php:304 +#: ../sales/manage/sav.customers.php:299 msgid "Add New Customer" msgstr "" - #: ../sales/manage/customers.php:305 -#: sales/manage/customers.php:305 ++#: ../sales/manage/customers.php:308 +#: ../sales/manage/sav.customers.php:303 msgid "Update Customer" msgstr "" - #: ../sales/manage/customers.php:306 -#: sales/manage/customers.php:306 ++#: ../sales/manage/customers.php:309 +#: ../sales/manage/sav.customers.php:304 msgid "Update customer data" msgstr "" - #: ../sales/manage/customers.php:307 -#: sales/manage/customers.php:307 ++#: ../sales/manage/customers.php:310 +#: ../sales/manage/sav.customers.php:305 msgid "Select this customer and return to document entry." msgstr "" - #: ../sales/manage/customers.php:308 -#: sales/manage/customers.php:308 ++#: ../sales/manage/customers.php:311 +#: ../sales/manage/sav.customers.php:306 msgid "Delete Customer" msgstr "" - #: ../sales/manage/customers.php:309 -#: sales/manage/customers.php:309 ++#: ../sales/manage/customers.php:312 +#: ../sales/manage/sav.customers.php:307 msgid "Delete customer data if have been never used" msgstr "" - #: ../sales/manage/customers.php:316 -#: sales/manage/customers.php:316 ++#: ../sales/manage/customers.php:319 +#: ../sales/manage/sav.customers.php:314 msgid "" "There are no sales types defined. Please define at least one sales type " "before adding a customer." msgstr "" - #: ../sales/manage/customers.php:325 -#: sales/manage/customers.php:325 ++#: ../sales/manage/customers.php:328 +#: ../sales/manage/sav.customers.php:323 msgid "New customer" msgstr "" - #: ../sales/manage/customers.php:347 -#: sales/manage/customers.php:347 ++#: ../sales/manage/customers.php:350 +#: ../sales/manage/sav.customers.php:345 msgid "Sales &Orders" msgstr "" @@@ -14805,13 -12908,11 +14640,11 @@@ msgid "Recurrent Invoices" msgstr "" -#: sales/manage/recurrent_invoices.php:36 +#: ../sales/manage/recurrent_invoices.php:36 - #: ../sales/manage/sales_areas.php:30 - #: ../sales/manage/sales_groups.php:30 - msgid "The area description cannot be empty." + msgid "The invoice description cannot be empty." msgstr "" -#: sales/manage/recurrent_invoices.php:63 +#: ../sales/manage/recurrent_invoices.php:63 msgid "Selected recurrent invoice has been updated" msgstr "" @@@ -14843,7 -12944,11 +14676,11 @@@ msgstr " msgid "End:" msgstr "" -#: sales/manage/sales_areas.php:30 ++#: ../sales/manage/sales_areas.php:30 + msgid "The area description cannot be empty." + msgstr "" + -#: sales/manage/sales_areas.php:39 +#: ../sales/manage/sales_areas.php:39 msgid "Selected sales area has been updated" msgstr "" @@@ -14873,7 -12978,11 +14710,11 @@@ msgstr " msgid "Sales Groups" msgstr "" -#: sales/manage/sales_groups.php:30 ++#: ../sales/manage/sales_groups.php:30 + msgid "The sales group description cannot be empty." + msgstr "" + -#: sales/manage/sales_groups.php:39 +#: ../sales/manage/sales_groups.php:39 msgid "Selected sales group has been updated" msgstr "" @@@ -15106,10 -13213,8 +14947,9 @@@ msgstr " msgid "Charge Branch" msgstr "" -#: sales/view/view_dispatch.php:91 sales/view/view_invoice.php:90 -#: sales/view/view_sales_order.php:63 +#: ../sales/view/view_dispatch.php:91 +#: ../sales/view/view_invoice.php:91 +#: ../sales/view/view_sales_order.php:63 - #: ../sales/view/view_sales_order.php.orig:63 msgid "Customer Order Ref." msgstr "" @@@ -15165,114 -13260,102 +15005,114 @@@ msgstr " msgid "From Customer" msgstr "" - #: ../sales/view/view_receipt.php:39 -#: sales/view/view_receipt.php:40 ++#: ../sales/view/view_receipt.php:40 + msgid "Date of Deposit" + msgstr "" + -#: sales/view/view_receipt.php:43 ++#: ../sales/view/view_receipt.php:43 + msgid "Customer Currency" + msgstr "" + -#: sales/view/view_receipt.php:48 ++#: ../sales/view/view_receipt.php:48 msgid "Into Bank Account" msgstr "" - #: ../sales/view/view_receipt.php:40 - msgid "Date of Deposit" -#: sales/view/view_receipt.php:49 ++#: ../sales/view/view_receipt.php:49 + msgid "Bank Amount" msgstr "" -#: sales/view/view_receipt.php:56 +#: ../sales/view/view_receipt.php:56 msgid "This customer payment has been voided." msgstr "" -#: sales/view/view_sales_order.php:28 +#: ../sales/view/view_sales_order.php:28 - #: ../sales/view/view_sales_order.php.orig:28 msgid "View Sales Quotation" msgstr "" -#: sales/view/view_sales_order.php:29 +#: ../sales/view/view_sales_order.php:29 - #: ../sales/view/view_sales_order.php.orig:29 #, php-format msgid "Sales Quotation #%d" msgstr "" -#: sales/view/view_sales_order.php:33 +#: ../sales/view/view_sales_order.php:33 - #: ../sales/view/view_sales_order.php.orig:33 msgid "View Sales Order" msgstr "" -#: sales/view/view_sales_order.php:34 +#: ../sales/view/view_sales_order.php:34 - #: ../sales/view/view_sales_order.php.orig:34 #, php-format msgid "Sales Order #%d" msgstr "" -#: sales/view/view_sales_order.php:49 +#: ../sales/view/view_sales_order.php:49 - #: ../sales/view/view_sales_order.php.orig:49 msgid "Order Information" msgstr "" -#: sales/view/view_sales_order.php:60 +#: ../sales/view/view_sales_order.php:60 - #: ../sales/view/view_sales_order.php.orig:60 msgid "Customer Name" msgstr "" -#: sales/view/view_sales_order.php:64 +#: ../sales/view/view_sales_order.php:64 - #: ../sales/view/view_sales_order.php.orig:64 msgid "Deliver To Branch" msgstr "" -#: sales/view/view_sales_order.php:71 +#: ../sales/view/view_sales_order.php:71 - #: ../sales/view/view_sales_order.php.orig:71 msgid "Requested Delivery" msgstr "" -#: sales/view/view_sales_order.php:75 +#: ../sales/view/view_sales_order.php:75 - #: ../sales/view/view_sales_order.php.orig:75 msgid "Deliver From Location" msgstr "" -#: sales/view/view_sales_order.php:82 +#: ../sales/view/view_sales_order.php:86 +msgid "Non-Invoiced Prepayments" +msgstr "" + +#: ../sales/view/view_sales_order.php:87 +msgid "All Payments Allocated" +msgstr "" + +#: ../sales/view/view_sales_order.php:95 - #: ../sales/view/view_sales_order.php.orig:82 msgid "Telephone" msgstr "" -#: sales/view/view_sales_order.php:197 +#: ../sales/view/view_sales_order.php:215 - #: ../sales/view/view_sales_order.php.orig:197 msgid "This Sales Order is used as a Template." msgstr "" -#: sales/view/view_sales_order.php:202 +#: ../sales/view/view_sales_order.php:220 - #: ../sales/view/view_sales_order.php.orig:202 msgid "Quantity Delivered" msgstr "" -#: sales/inquiry/customer_allocation_inquiry.php:25 +#: ../sales/inquiry/customer_allocation_inquiry.php:25 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:25 msgid "Customer Allocation Inquiry" msgstr "" -#: sales/inquiry/customer_allocation_inquiry.php:96 +#: ../sales/inquiry/customer_allocation_inquiry.php:96 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:96 msgid "Allocation" msgstr "" - #: ../sales/inquiry/customer_allocation_inquiry.php:116 -#: sales/inquiry/customer_allocation_inquiry.php:116 ++#: ../sales/inquiry/customer_allocation_inquiry.php.orig:116 msgid "Payment" msgstr "" -#: sales/inquiry/customer_inquiry.php:28 +#: ../sales/inquiry/customer_inquiry.php:26 ++#: ../sales/inquiry/customer_inquiry.php.orig:26 msgid "Customer Transactions" msgstr "" -#: sales/inquiry/customer_inquiry.php:72 +#: ../sales/inquiry/customer_inquiry.php:68 ++#: ../sales/inquiry/customer_inquiry.php.orig:68 msgid "CUSTOMER ACCOUNT IS ON HOLD" msgstr "" - #: ../sales/inquiry/customer_inquiry.php:181 -#: sales/inquiry/customer_inquiry.php:205 ++#: ../sales/inquiry/customer_inquiry.php.orig:181 msgid "Print Receipt" msgstr "" - #: ../sales/inquiry/customer_inquiry.php:211 - #: ../sales/inquiry/customer_inquiry.php:224 -#: sales/inquiry/customer_inquiry.php:235 -#: sales/inquiry/customer_inquiry.php:248 ++#: ../sales/inquiry/customer_inquiry.php.orig:211 ++#: ../sales/inquiry/customer_inquiry.php.orig:224 msgid "RB" msgstr "" @@@ -15315,77 -13398,65 +15155,83 @@@ msgstr " msgid "Batch Invoicing" msgstr "" -#: sales/inquiry/sales_orders_view.php:40 +#: ../sales/inquiry/sales_orders_view.php:44 ++#: ../sales/inquiry/sales_orders_view.php.orig:44 msgid "Search Outstanding Sales Orders" msgstr "" -#: sales/inquiry/sales_orders_view.php:45 +#: ../sales/inquiry/sales_orders_view.php:49 ++#: ../sales/inquiry/sales_orders_view.php.orig:49 msgid "Search Template for Invoicing" msgstr "" -#: sales/inquiry/sales_orders_view.php:50 +#: ../sales/inquiry/sales_orders_view.php:54 ++#: ../sales/inquiry/sales_orders_view.php.orig:54 msgid "Select Template for Delivery" msgstr "" -#: sales/inquiry/sales_orders_view.php:55 +#: ../sales/inquiry/sales_orders_view.php:59 ++#: ../sales/inquiry/sales_orders_view.php.orig:59 +msgid "Invoicing Prepayment Orders" +msgstr "" + +#: ../sales/inquiry/sales_orders_view.php:64 ++#: ../sales/inquiry/sales_orders_view.php.orig:64 msgid "Search All Sales Orders" msgstr "" -#: sales/inquiry/sales_orders_view.php:61 +#: ../sales/inquiry/sales_orders_view.php:70 ++#: ../sales/inquiry/sales_orders_view.php.orig:70 msgid "Search All Sales Quotations" msgstr "" - #: ../sales/inquiry/sales_orders_view.php:148 -#: sales/inquiry/sales_orders_view.php:136 ++#: ../sales/inquiry/sales_orders_view.php.orig:148 msgid "Dispatch" msgstr "" - #: ../sales/inquiry/sales_orders_view.php:191 -#: sales/inquiry/sales_orders_view.php:178 ++#: ../sales/inquiry/sales_orders_view.php.orig:191 msgid "Set this order as a template for direct deliveries/invoices" msgstr "" - #: ../sales/inquiry/sales_orders_view.php:200 -#: sales/inquiry/sales_orders_view.php:245 ++#: ../sales/inquiry/sales_orders_view.php.orig:200 +msgid "Prepayment Invoice" +msgstr "" + - #: ../sales/inquiry/sales_orders_view.php:200 ++#: ../sales/inquiry/sales_orders_view.php.orig:200 +msgid "Final Invoice" +msgstr "" + - #: ../sales/inquiry/sales_orders_view.php:267 ++#: ../sales/inquiry/sales_orders_view.php.orig:267 msgid "Show All:" msgstr "" - #: ../sales/inquiry/sales_orders_view.php:284 -#: sales/inquiry/sales_orders_view.php:262 ++#: ../sales/inquiry/sales_orders_view.php.orig:284 msgid "Order #" msgstr "" - #: ../sales/inquiry/sales_orders_view.php:288 - #: ../sales/inquiry/sales_orders_view.php:302 -#: sales/inquiry/sales_orders_view.php:266 -#: sales/inquiry/sales_orders_view.php:280 ++#: ../sales/inquiry/sales_orders_view.php.orig:288 ++#: ../sales/inquiry/sales_orders_view.php.orig:302 msgid "Cust Order Ref" msgstr "" - #: ../sales/inquiry/sales_orders_view.php:291 - #: ../sales/inquiry/sales_orders_view.php:305 -#: sales/inquiry/sales_orders_view.php:269 -#: sales/inquiry/sales_orders_view.php:283 ++#: ../sales/inquiry/sales_orders_view.php.orig:291 ++#: ../sales/inquiry/sales_orders_view.php.orig:305 msgid "Delivery To" msgstr "" - #: ../sales/inquiry/sales_orders_view.php:298 -#: sales/inquiry/sales_orders_view.php:276 ++#: ../sales/inquiry/sales_orders_view.php.orig:298 msgid "Quote #" msgstr "" - #: ../sales/inquiry/sales_orders_view.php:303 -#: sales/inquiry/sales_orders_view.php:281 ++#: ../sales/inquiry/sales_orders_view.php.orig:303 msgid "Quote Date" msgstr "" - #: ../sales/inquiry/sales_orders_view.php:306 -#: sales/inquiry/sales_orders_view.php:284 ++#: ../sales/inquiry/sales_orders_view.php.orig:306 msgid "Quote Total" msgstr "" - #: ../sales/inquiry/sales_orders_view.php:337 -#: sales/inquiry/sales_orders_view.php:311 ++#: ../sales/inquiry/sales_orders_view.php.orig:337 msgid "Tmpl" msgstr "" @@@ -15395,7 -13470,7 +15241,7 @@@ msgid " "browser tab. You cannot edit more than one sales document at once." msgstr "" - #: ../sales/includes/db/custalloc_db.inc:351 -#: sales/includes/db/custalloc_db.inc:292 ++#: ../sales/includes/db/custalloc_db.inc.orig:351 msgid "" "Unsuspected overallocation happened due to sparse credit notes exists for " "this invoice.\n" @@@ -15403,30 -13478,22 +15249,27 @@@ "charges." msgstr "" -#: sales/includes/db/sales_invoice_db.inc:176 -msgid "Cash invoice" -msgstr "" - -#: sales/includes/db/sales_order_db.inc:107 -#: sales/includes/db/sales_order_db.inc:279 +#: ../sales/includes/db/old.sales_order_db.inc:107 +#: ../sales/includes/db/old.sales_order_db.inc:259 +#: ../sales/includes/db/sales_order_db.inc:109 - #: ../sales/includes/db/sales_order_db.inc:271 +#: ../sales/includes/db/sales_order_db.inc.orig:109 +#: ../sales/includes/db/sales_order_db.inc.orig:271 msgid "Stocks below Re-Order Level at " msgstr "" -#: sales/includes/db/sales_order_db.inc:110 -#: sales/includes/db/sales_order_db.inc:284 +#: ../sales/includes/db/old.sales_order_db.inc:110 +#: ../sales/includes/db/old.sales_order_db.inc:264 +#: ../sales/includes/db/sales_order_db.inc:112 - #: ../sales/includes/db/sales_order_db.inc:276 +#: ../sales/includes/db/sales_order_db.inc.orig:112 +#: ../sales/includes/db/sales_order_db.inc.orig:276 msgid "Below" msgstr "" -#: sales/includes/db/sales_order_db.inc:111 -#: sales/includes/db/sales_order_db.inc:285 +#: ../sales/includes/db/old.sales_order_db.inc:111 +#: ../sales/includes/db/old.sales_order_db.inc:265 +#: ../sales/includes/db/sales_order_db.inc:113 - #: ../sales/includes/db/sales_order_db.inc:277 +#: ../sales/includes/db/sales_order_db.inc.orig:113 +#: ../sales/includes/db/sales_order_db.inc.orig:277 msgid "Please reorder" msgstr "" @@@ -15436,129 -13501,123 +15279,128 @@@ msgid "Deleted." msgstr "" -#: sales/includes/ui/sales_credit_ui.inc:94 -#: sales/includes/ui/sales_order_ui.inc:384 ++#: ../sales/includes/db/sales_invoice_db.inc:198 +#: ../sales/includes/db/sales_invoice_db.inc.orig:196 +msgid "Cash invoice" +msgstr "" + +#: ../sales/includes/ui/sales_credit_ui.inc:94 - #: ../sales/includes/ui/sales_order_ui.inc.orig:379 ++#: ../sales/includes/ui/sales_order_ui.inc:385 msgid "Customer Currency:" msgstr "" -#: sales/includes/ui/sales_credit_ui.inc:112 -#: sales/includes/ui/sales_order_ui.inc:644 +#: ../sales/includes/ui/sales_credit_ui.inc:112 - #: ../sales/includes/ui/sales_order_ui.inc.orig:647 ++#: ../sales/includes/ui/sales_order_ui.inc:653 msgid "Shipping Company:" msgstr "" -#: sales/includes/ui/sales_credit_ui.inc:114 -#: sales/includes/ui/sales_order_ui.inc:391 +#: ../sales/includes/ui/sales_credit_ui.inc:114 - #: ../sales/includes/ui/sales_order_ui.inc.orig:386 ++#: ../sales/includes/ui/sales_order_ui.inc:392 msgid "Customer Discount:" msgstr "" -#: sales/includes/ui/sales_order_ui.inc:61 +#: ../sales/includes/ui/sales_order_ui.inc:61 - #: ../sales/includes/ui/sales_order_ui.inc.orig:61 msgid "This item is already on this document. You have been warned." msgstr "" -#: sales/includes/ui/sales_order_ui.inc:106 +#: ../sales/includes/ui/sales_order_ui.inc:106 - #: ../sales/includes/ui/sales_order_ui.inc.orig:104 msgid "" "The selected customer and branch are not valid, or the customer does not " "have any branches." msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:224 -#: sales/includes/ui/sales_order_ui.inc:230 ++#: ../sales/includes/ui/sales_order_ui.inc:231 msgid "Shipping Charge" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:297 -#: sales/includes/ui/sales_order_ui.inc:303 ++#: ../sales/includes/ui/sales_order_ui.inc:304 msgid "No customer found for entered text." msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:323 -#: sales/includes/ui/sales_order_ui.inc:329 ++#: ../sales/includes/ui/sales_order_ui.inc:330 #, php-format msgid "Customer's payment terms '%s' cannot be selected on this POS" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:373 -#: sales/includes/ui/sales_order_ui.inc:378 ++#: ../sales/includes/ui/sales_order_ui.inc:379 msgid "Reference number unique for this document type" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:413 - #: ../sales/includes/ui/sales_order_ui.inc.orig:415 -#: sales/includes/ui/sales_order_ui.inc:418 -#: sales/includes/ui/sales_order_ui.inc:420 ++#: ../sales/includes/ui/sales_order_ui.inc:419 ++#: ../sales/includes/ui/sales_order_ui.inc:421 msgid "Price List:" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:432 -#: sales/includes/ui/sales_order_ui.inc:437 ++#: ../sales/includes/ui/sales_order_ui.inc:438 msgid "Date of order receive" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:582 -#: sales/includes/ui/sales_order_ui.inc:587 ++#: ../sales/includes/ui/sales_order_ui.inc:588 msgid "Cash payment" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:585 - #: ../sales/includes/ui/sales_order_ui.inc.orig:617 -#: sales/includes/ui/sales_order_ui.inc:590 -#: sales/includes/ui/sales_order_ui.inc:622 ++#: ../sales/includes/ui/sales_order_ui.inc:591 ++#: ../sales/includes/ui/sales_order_ui.inc:623 msgid "Deliver from Location:" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:588 -#: sales/includes/ui/sales_order_ui.inc:593 ++#: ../sales/includes/ui/sales_order_ui.inc:594 msgid "Cash account:" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:595 -#: sales/includes/ui/sales_order_ui.inc:600 ++#: ../sales/includes/ui/sales_order_ui.inc:601 msgid "Delivery Details" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:600 -#: sales/includes/ui/sales_order_ui.inc:605 ++#: ../sales/includes/ui/sales_order_ui.inc:606 msgid "Invoice Delivery Details" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:601 -#: sales/includes/ui/sales_order_ui.inc:606 ++#: ../sales/includes/ui/sales_order_ui.inc:607 msgid "Invoice before" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:605 -#: sales/includes/ui/sales_order_ui.inc:610 ++#: ../sales/includes/ui/sales_order_ui.inc:611 msgid "Quotation Delivery Details" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:610 -#: sales/includes/ui/sales_order_ui.inc:615 ++#: ../sales/includes/ui/sales_order_ui.inc:616 msgid "Order Delivery Details" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:631 -#: sales/includes/ui/sales_order_ui.inc:628 ++#: ../sales/includes/ui/sales_order_ui.inc:637 msgid "Enter requested day of delivery" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:632 -#: sales/includes/ui/sales_order_ui.inc:629 ++#: ../sales/includes/ui/sales_order_ui.inc:638 msgid "Enter Valid until Date" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:633 -#: sales/includes/ui/sales_order_ui.inc:630 ++#: ../sales/includes/ui/sales_order_ui.inc:639 msgid "Deliver To:" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:634 -#: sales/includes/ui/sales_order_ui.inc:631 ++#: ../sales/includes/ui/sales_order_ui.inc:640 msgid "Additional identifier for delivery e.g. name of receiving person" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:637 -#: sales/includes/ui/sales_order_ui.inc:634 ++#: ../sales/includes/ui/sales_order_ui.inc:643 msgid "Delivery address. Default is address of customer branch" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:641 -#: sales/includes/ui/sales_order_ui.inc:638 ++#: ../sales/includes/ui/sales_order_ui.inc:647 msgid "Contact Phone Number:" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:642 -#: sales/includes/ui/sales_order_ui.inc:639 ++#: ../sales/includes/ui/sales_order_ui.inc:648 msgid "Phone number of ordering person. Defaults to branch phone number" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:643 -#: sales/includes/ui/sales_order_ui.inc:640 ++#: ../sales/includes/ui/sales_order_ui.inc:649 msgid "Customer Reference:" msgstr "" - #: ../sales/includes/ui/sales_order_ui.inc.orig:644 -#: sales/includes/ui/sales_order_ui.inc:641 ++#: ../sales/includes/ui/sales_order_ui.inc:650 msgid "Customer reference number for this order (if any)" msgstr "" @@@ -15614,143 -13673,126 +15456,175 @@@ msgstr " msgid "Is exempt" msgstr "" - #: ../taxes/tax_groups.php:17 - #: ../taxes/tax_groups.php.orig:17 - #: ../taxes/tax_groups.php.sav:17 -#: taxes/tax_groups.php:17 --msgid "Tax Groups" - msgstr "" - - #: ../taxes/tax_groups.php:27 - #: ../taxes/tax_groups.php.orig:27 - #: ../taxes/tax_groups.php.sav:27 - msgid "" - "There are no tax types defined. Define tax types before defining tax groups." - msgstr "" - - #: ../taxes/tax_groups.php:40 - #: ../taxes/tax_groups.php.orig:40 - #: ../taxes/tax_groups.php.sav:40 - msgid "The tax group name cannot be empty." - msgstr "" - - #: ../taxes/tax_groups.php:60 - #: ../taxes/tax_groups.php.orig:62 - #: ../taxes/tax_groups.php.sav:62 - msgid "Selected tax group has been updated" - msgstr "" - - #: ../taxes/tax_groups.php:65 - #: ../taxes/tax_groups.php.orig:67 - #: ../taxes/tax_groups.php.sav:67 - msgid "New tax group has been added" - msgstr "" - - #: ../taxes/tax_groups.php:80 - #: ../taxes/tax_groups.php.orig:82 - #: ../taxes/tax_groups.php.sav:82 - msgid "" - "Cannot delete this tax group because customer branches been created " - "referring to it." - msgstr "" - - #: ../taxes/tax_groups.php:86 - #: ../taxes/tax_groups.php.orig:88 - #: ../taxes/tax_groups.php.sav:88 - msgid "" - "Cannot delete this tax group because suppliers been created referring to it." - msgstr "" - - #: ../taxes/tax_groups.php:103 - #: ../taxes/tax_groups.php.orig:105 - #: ../taxes/tax_groups.php.sav:105 - msgid "Selected tax group has been deleted" - msgstr "" - - #: ../taxes/tax_groups.php:166 - #: ../taxes/tax_groups.php.orig:168 - #: ../taxes/tax_groups.php.sav:168 - msgid "Select the taxes that are included in this group." - msgstr "" - - #: ../taxes/tax_groups.php:171 - #: ../taxes/tax_groups.php.orig:173 - #: ../taxes/tax_groups.php.sav:173 - msgid "Shipping Tax" - msgstr "" - ++#: ../taxes/sav.tax_types.php:21 +#: ../taxes/tax_types.php:16 +msgid "Tax Types" msgstr "" -#: taxes/tax_groups.php:27 -msgid "" -"There are no tax types defined. Define tax types before defining tax groups." ++#: ../taxes/sav.tax_types.php:60 +#: ../taxes/tax_types.php:30 +msgid "The tax type name cannot be empty." msgstr "" -#: taxes/tax_groups.php:40 -msgid "The tax group name cannot be empty." ++#: ../taxes/sav.tax_types.php:66 +#: ../taxes/tax_types.php:36 +msgid "The default tax rate must be numeric and not less than zero." msgstr "" -#: taxes/tax_groups.php:61 -msgid "Selected tax group has been updated" ++#: ../taxes/sav.tax_types.php:72 +#: ../taxes/tax_types.php:42 +msgid "Selected GL Accounts cannot be used by another tax type." msgstr "" -#: taxes/tax_groups.php:66 -msgid "New tax group has been added" ++#: ../taxes/sav.tax_types.php:86 +#: ../taxes/tax_types.php:56 +msgid "New tax type has been added" +msgstr "" + ++#: ../taxes/sav.tax_types.php:97 +#: ../taxes/tax_types.php:67 +msgid "Selected tax type has been updated" msgstr "" -#: taxes/tax_groups.php:81 ++#: ../taxes/sav.tax_types.php:107 +#: ../taxes/tax_types.php:77 msgid "" -"Cannot delete this tax group because customer branches been created " -"referring to it." +"Cannot delete this tax type because tax groups been created referring to it." +msgstr "" + ++#: ../taxes/sav.tax_types.php:141 +#: ../taxes/tax_types.php:94 +msgid "Selected tax type has been deleted" msgstr "" -#: taxes/tax_groups.php:87 ++#: ../taxes/sav.tax_types.php:164 + msgid "" -"Cannot delete this tax group because suppliers been created referring to it." ++"Start new tax regulations span below, then select new span and edit tax " ++"rates as needed." + msgstr "" + -#: taxes/tax_groups.php:104 -msgid "Selected tax group has been deleted" ++#: ../taxes/sav.tax_types.php:167 ++msgid "Tax span begin:" + msgstr "" + -#: taxes/tax_groups.php:124 -msgid "Shipping Tax" ++#: ../taxes/sav.tax_types.php:168 ++msgid "Tax span end:" + msgstr "" + -#: taxes/tax_groups.php:168 -msgid "Tax applied to Shipping:" ++#: ../taxes/sav.tax_types.php:172 ++msgid "Add new span" + msgstr "" + -#: taxes/tax_groups.php:172 -msgid "Select the taxes that are included in this group." ++#: ../taxes/sav.tax_types.php:182 ++msgid "Tax regulations span:" + msgstr "" + -#: taxes/tax_types.php:16 -msgid "Tax Types" ++#: ../taxes/sav.tax_types.php:183 ++msgid "Add new tax sub-period" + msgstr "" + -#: taxes/tax_types.php:30 -msgid "The tax type name cannot be empty." ++#: ../taxes/sav.tax_types.php:187 +#: ../taxes/tax_types.php:112 +msgid "" +"To avoid problems with manual journal entry all tax types should have unique " +"Sales/Purchasing GL accounts." msgstr "" - #: ../taxes/tax_types.php:115 - msgid "Default Rate (%)" -#: taxes/tax_types.php:36 -msgid "The default tax rate must be numeric and not less than zero." ++#: ../taxes/sav.tax_types.php:190 ++msgid "Rate (%)" msgstr "" -#: taxes/tax_types.php:42 -msgid "Selected GL Accounts cannot be used by another tax type." ++#: ../taxes/sav.tax_types.php:190 +#: ../taxes/tax_types.php:116 +msgid "Sales GL Account" msgstr "" -#: taxes/tax_types.php:56 -msgid "New tax type has been added" ++#: ../taxes/sav.tax_types.php:190 +#: ../taxes/tax_types.php:116 +msgid "Purchasing GL Account" msgstr "" -#: taxes/tax_types.php:67 -msgid "Selected tax type has been updated" ++#: ../taxes/sav.tax_types.php:205 ++msgid "Exempt" + msgstr "" + -#: taxes/tax_types.php:77 -msgid "" -"Cannot delete this tax type because tax groups been created referring to it." ++#: ../taxes/sav.tax_types.php:242 +#: ../taxes/tax_types.php:159 +msgid "Default Rate:" msgstr "" -#: taxes/tax_types.php:94 -msgid "Selected tax type has been deleted" ++#: ../taxes/sav.tax_types.php:244 +#: ../taxes/tax_types.php:161 +msgid "Sales GL Account:" +msgstr "" + ++#: ../taxes/sav.tax_types.php:245 +#: ../taxes/tax_types.php:162 +msgid "Purchasing GL Account:" +msgstr "" + ++#: ../taxes/sav.tax_types.php:262 ++msgid "Edit selected span" + msgstr "" + -#: taxes/tax_types.php:112 ++#: ../taxes/tax_groups.php:17 ++msgid "Tax Groups" ++msgstr "" ++ ++#: ../taxes/tax_groups.php:27 + msgid "" -"To avoid problems with manual journal entry all tax types should have unique " -"Sales/Purchasing GL accounts." ++"There are no tax types defined. Define tax types before defining tax groups." + msgstr "" + -#: taxes/tax_types.php:115 -msgid "Default Rate (%)" ++#: ../taxes/tax_groups.php:40 ++msgid "The tax group name cannot be empty." + msgstr "" + -#: taxes/tax_types.php:116 -msgid "Sales GL Account" ++#: ../taxes/tax_groups.php:60 ++msgid "Selected tax group has been updated" + msgstr "" + -#: taxes/tax_types.php:116 -msgid "Purchasing GL Account" ++#: ../taxes/tax_groups.php:65 ++msgid "New tax group has been added" + msgstr "" + -#: taxes/tax_types.php:159 -msgid "Default Rate:" ++#: ../taxes/tax_groups.php:80 ++msgid "" ++"Cannot delete this tax group because customer branches been created " ++"referring to it." + msgstr "" + -#: taxes/tax_types.php:161 -msgid "Sales GL Account:" ++#: ../taxes/tax_groups.php:86 ++msgid "" ++"Cannot delete this tax group because suppliers been created referring to it." + msgstr "" + -#: taxes/tax_types.php:162 -msgid "Purchasing GL Account:" ++#: ../taxes/tax_groups.php:103 ++msgid "Selected tax group has been deleted" ++msgstr "" ++ ++#: ../taxes/tax_groups.php:166 ++msgid "Select the taxes that are included in this group." ++msgstr "" ++ ++#: ../taxes/tax_groups.php:171 ++msgid "Shipping Tax" + msgstr "" + -#: themes/default/renderer.php:28 ++#: ../taxes/tax_types.php:115 ++msgid "Default Rate (%)" ++msgstr "" ++ +#: ../themes/default/renderer.php:28 msgid "Main Menu" msgstr "" - #: ../themes/default/renderer.php:54 - #: ../themes/default/renderer.php:80 -#: themes/default/renderer.php:71 themes/default/renderer.php:81 ++#: ../themes/default/renderer.php:71 ++#: ../themes/default/renderer.php:81 msgid "Help" msgstr "" - #: ../themes/default/renderer.php:75 -#: themes/default/renderer.php:76 ++#: ../themes/default/renderer.php:76 msgid "Preferences" msgstr "" diff --cc manufacturing/includes/db/work_orders_db.inc index eb310568,a79c2574..24bf6e94 --- a/manufacturing/includes/db/work_orders_db.inc +++ b/manufacturing/includes/db/work_orders_db.inc @@@ -248,14 -436,18 +248,14 @@@ function void_work_order($woid $qty = 0; while ($row = db_fetch($result)) { - void_work_order_produce($row['id']); - - //Post voided entry if not prevoided explicitly - $void_entry = get_voided_entry(ST_MANURECEIVE, $row['id']); - if ($void_entry) - continue; - $memo_ = _("Voiding Work Order Trans # ").$woid; - add_audit_trail(ST_MANURECEIVE, $row['id'], today(), _("Voided.")."\n".$memo_); - add_voided_entry(ST_MANURECEIVE, $row['id'], today(), $memo_); - } + $qty += $row['quantity']; + // clear the production record + $sql = "UPDATE ".TB_PREF."wo_manufacture SET quantity=0 WHERE id=".$$row['id']; + db_query($sql, "Cannot void a wo production"); - + - $result = get_work_order_issues($woid); + void_stock_move(ST_MANURECEIVE, $row['id']); // and void the stock moves; + } + $result = get_additional_issues($woid); // check the issued quantities $cost = 0; $issue_no = 0; while ($row = db_fetch($result)) diff --cc manufacturing/includes/db/work_orders_quick_db.inc index bcf9688f,43e0d5bb..2d1bd933 --- a/manufacturing/includes/db/work_orders_quick_db.inc +++ b/manufacturing/includes/db/work_orders_quick_db.inc @@@ -66,12 -66,29 +66,27 @@@ function add_work_order_quick($wo_ref, db_query($sql, "The work order requirements could not be added"); // insert a -ve stock move for each item - // Chaitanya: Updated to record price and cost as std_cost for work order issued item + $UnitCost = get_standard_cost($bom_item["component"]); add_stock_move(ST_WORKORDER, $bom_item["component"], $woid, - $bom_item["loc_code"], $date_, $wo_ref, -$item_quantity, 0); + $bom_item["loc_code"], $date_, $wo_ref, -$item_quantity, $UnitCost, 0, 1, $UnitCost); } + + // ------------------------------------------------------------------------- + //Negative Stock Handling + $qoh = get_qoh_on_date($stock_id); + $cost_adjust = false; + if ($qoh < 0) + { + if ($qoh + $units_reqd >= 0) + $cost_adjust = true; + } + - // ------------------------------------------------------------------------- - + + //Negative Stock Handling First; Prior to add_stock_move + if ($cost_adjust) + adjust_deliveries($stock_id, get_standard_cost($stock_id), $date_); - - // ------------------------------------------------------------------------- + + // ------------------------------------------------------------------------- // insert a +ve stock move for the item being manufactured add_stock_move(ST_WORKORDER, $stock_id, $woid, $loc_code, $date_, diff --cc purchasing/includes/db/invoice_db.inc index c86cac72,83e9f7f8..80169267 --- a/purchasing/includes/db/invoice_db.inc +++ b/purchasing/includes/db/invoice_db.inc @@@ -123,36 -117,33 +123,41 @@@ function add_supp_invoice(&$supp_trans { global $Refs; + //$company_currency = get_company_currency(); + $trans_no = $supp_trans->trans_no; + $trans_type = $supp_trans->trans_type; + /*Start an sql transaction */ begin_transaction(); - hook_db_prewrite($supp_trans, $supp_trans->trans_type); + hook_db_prewrite($supp_trans, $trans_type); $tax_total = 0; $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id); + if ($trans_no) { + $allocs = get_payments_for($trans_no, $trans_type); // save allocations + void_transaction($trans_type, $trans_no, Today(), _("Document reentered.")); + $Refs->restore_last($trans_type, $trans_no); + } else + $allocs = get_po_prepayments($supp_trans); + $supplier = get_supplier($supp_trans->supplier_id); + + add_new_exchange_rate($supplier['curr_code'], $supp_trans->tran_date, $supp_trans->ex_rate); + foreach ($taxes as $n => $taxitem) { $taxes[$n]['Value'] = round2($taxitem['Value'], user_price_dec()); $tax_total += $taxes[$n]['Value']; } - $invoice_items_total = $supp_trans->get_items_total(); // get total with/without tax dep. on tax_included - // $invoice_items_total = $supp_trans->get_total_taxfree($supp_trans->tax_group_id); + $invoice_items_total = $supp_trans->get_items_total(); - if($supp_trans->tax_included==0) { - $item_added_tax = $tax_total; - } else { - $item_added_tax = 0; + $item_added_tax = 0; + if (!$supp_trans->tax_included) + { + $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id); + foreach ($taxes as $n => $taxitem) + $item_added_tax += isset($taxitem['Override']) ? $taxitem['Override'] : round2($taxitem['Value'], user_price_dec()); } - $trans_type = $supp_trans->trans_type; - if ($trans_type == ST_SUPPCREDIT) { // let's negate everything because it's a credit note @@@ -168,16 -159,42 +173,46 @@@ /*First insert the invoice into the supp_trans table*/ $invoice_id = write_supp_trans($trans_type, 0, $supp_trans->supplier_id, $date_, $supp_trans->due_date, $supp_trans->reference, $supp_trans->supp_reference, - $invoice_items_total, $item_added_tax, $supp_trans->ov_discount, "", 0, $supp_trans->tax_included); + $invoice_items_total, $item_added_tax, $supp_trans->ov_discount, "", 0, $supp_trans->tax_included, + $supp_trans->tax_algorithm); + + + $supp_trans->trans_no = $invoice_id; $total = 0; - /* Now the control account */ - $supplier_accounts = get_supplier_accounts($supp_trans->supplier_id); - $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $supplier_accounts["payable_account"], 0, 0, + + /* Now the TAX account */ + $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id, 0, false); + $net_diff = 0; + + foreach ($taxes as $taxitem) + { + if ($taxitem['Net'] != 0) + { + if (isset($taxitem['Override'])) { + if ($supp_trans->tax_included) { // if tax included, fix net amount to preserve overall line price + $net_diff += $taxitem['Override'] - $taxitem['Value']; + $taxitem['Net'] += $taxitem['Override'] - $taxitem['Value']; + } + $taxitem['Value'] = $taxitem['Override']; + } + add_trans_tax_details($trans_type, $invoice_id, + $taxitem['tax_type_id'], $taxitem['rate'], $supp_trans->tax_included, $taxitem['Value'], + $taxitem['Net'], $ex_rate, $date_, $supp_trans->supp_reference); + + if ($trans_type == ST_SUPPCREDIT) + $taxitem['Value'] = -$taxitem['Value']; + $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, + $taxitem['purchasing_gl_code'], 0, 0, $taxitem['Value'], + $supp_trans->supplier_id, + "A general ledger transaction for the tax amount could not be added"); + } + } + if ($trans_type == ST_SUPPCREDIT) + $net_diff = -$net_diff; + + /* Now the AP account */ + $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $supplier["payable_account"], 0, 0, -($invoice_items_total + $item_added_tax + $supp_trans->ov_discount), $supp_trans->supplier_id, "The general ledger transaction for the control total could not be added"); @@@ -254,37 -273,32 +291,32 @@@ $old_date = sql2date($old[1]); if (!is_inventory_item($entered_grn->item_code)) $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $iv_act, - $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], - $entered_grn->this_quantity_inv * $line_taxfree, $supp_trans->supplier_id); + $dim, $dim2, $taxfree_line, $supp_trans->supplier_id); else { + $ex_rate = get_exchange_rate_from_home_currency($supplier['curr_code'], $old_date); + $old_value = get_tax_free_price_for_item($entered_grn->item_code, $entered_grn->this_quantity_inv * $old_price, + $supp_trans->tax_group_id, $supp_trans->tax_included); + $currency = get_supplier_currency($supp_trans->supplier_id); - $ex_rate = get_exchange_rate_from_home_currency($currency, $old_date); + $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $iv_act, - $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], - $entered_grn->this_quantity_inv * $old_price, $supp_trans->supplier_id, "", $ex_rate); - $dim, $dim2, $old_value, $supp_trans->supplier_id, "", $ex_rate); - $diff = get_diff_in_home_currency($supp_trans->supplier_id, $old_date, $date_, $old_value, - $taxfree_line); ++ $dim1, $dim2, $entered_grn->this_quantity_inv * $old_price, $supp_trans->supplier_id, "", $ex_rate); + $diff = get_diff_in_home_currency($supp_trans->supplier_id, $old_date, $date_, $old_price, + $line_taxfree); - // always return due to change in currency. - /*$mat_cost = update_average_material_cost(null, $entered_grn->item_code, - $diff, $entered_grn->this_quantity_inv, $old_date, true); */ $mat_cost = update_average_material_cost(null, $entered_grn->item_code, - $diff, $entered_grn->this_quantity_inv, null, true); - + $diff/$entered_grn->this_quantity_inv, $entered_grn->this_quantity_inv, null, true); + //Add GL transaction for GRN Provision in case of difference - if (($diff * $entered_grn->this_quantity_inv) != 0 ) + if ($diff != 0) { - $diff_amt = $diff * $entered_grn->this_quantity_inv; - $total += add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["inventory_account"], - $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], 'GRN Provision', - $diff_amt, null, null, null, + $total += add_gl_trans($trans_type, $invoice_id, $date_, $stock_gl_code["inventory_account"], + $dim, $dim2, 'GRN Provision', $diff, null, null, null, "The general ledger transaction could not be added for the GRN of the inventory item"); - //Chaitanya //If QOH is 0 or negative then update_average_material_cost will be skipped //Thus difference in PO and Supp Invoice should be handled separately - $qoh = get_qoh_on_date($entered_grn->item_code); if ($qoh <= 0) { @@@ -416,16 -352,13 +370,13 @@@ /*Now insert the allocation record if > 0 */ if ($allocate_amount != 0) { - update_supp_trans_allocation(ST_SUPPINVOICE, $supp_trans->src_docs, $allocate_amount); - update_supp_trans_allocation(ST_SUPPCREDIT, $invoice_id, $allocate_amount); // *** - update_supp_trans_allocation(ST_SUPPINVOICE, $invoice_no, $allocate_amount); - update_supp_trans_allocation(ST_SUPPCREDIT, $invoice_id, $allocate_amount); - add_supp_allocation($allocate_amount, ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $invoice_no, ++ update_supp_trans_allocation(ST_SUPPINVOICE, $supp_trans->src_docs); ++ update_supp_trans_allocation(ST_SUPPCREDIT, $invoice_id); + add_supp_allocation($allocate_amount, ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $supp_trans->src_docs, $date_); - // Exchange Variations Joe Hunt 2008-09-20 //////////////////////////////////////// - exchange_variation(ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $invoice_no, $date_, + exchange_variation(ST_SUPPCREDIT, $invoice_id, ST_SUPPINVOICE, $supp_trans->src_docs, $date_, $allocate_amount, PT_SUPPLIER); - - /////////////////////////////////////////////////////////////////////////// } } } diff --cc purchasing/includes/po_class.inc index 4eb5c0b7,f9f75aac..be484631 --- a/purchasing/includes/po_class.inc +++ b/purchasing/includes/po_class.inc @@@ -32,16 -32,12 +32,18 @@@ class purch_orde var $tax_group_id; var $tax_group_array = null; // saves db queries var $tax_included; // type of prices + var $tax_algorithm; + var $stored_algorithm; // copy to find the change after invoice in processed var $terms; - + var $ex_rate; + var $reference; + var $tax_overrides = array(); // array of taxes manually inserted during sales invoice entry (direct invoice) + var $prep_amount = 0; // prepayment required + var $alloc; // sum of payments allocated + var $prepayments = array(); + function purch_order() { /*Constructor function initialises a new purchase order object */ diff --cc purchasing/includes/supp_trans_class.inc index 8178d30d,c85f8ae7..547d833e --- a/purchasing/includes/supp_trans_class.inc +++ b/purchasing/includes/supp_trans_class.inc @@@ -42,11 -41,9 +43,12 @@@ class supp_tran var $ov_gst; var $gl_codes_counter=0; var $credit = 0; + var $tax_algorithm; + var $stored_algorithm; + var $currency; + var $tax_overrides = array(); // array of taxes manually inserted during sales invoice entry - function supp_trans($trans_type) + function supp_trans($trans_type, $trans_no=0) { $this->trans_type = $trans_type; /*Constructor function initialises a new Supplier Transaction object */ @@@ -76,7 -58,7 +78,10 @@@ $this->grn_items[$grn_item_id] = new grn_item($grn_item_id, $po_detail_item, $item_code, $item_description, $qty_recd, $prev_quantity_inv, $this_quantity_inv, $order_price, $chg_price, $std_cost_unit, $gl_code, $this->tax_included); ++ + $this->src_docs = find_src_invoices($this); ++ + unset($this->tax_overrides); // cancel tax overrides after cart change return 1; } @@@ -135,10 -119,8 +142,8 @@@ if ($tax_group_id == null) $tax_group_id = $this->tax_group_id; $taxes = get_tax_for_items($items, $prices, $shipping_cost, $tax_group_id, - $this->tax_included); + $this->tax_included, null, $this->tax_algorithm); - ///////////////// Joe Hunt 2009.08.18 - if ($gl_codes) { foreach ($this->gl_codes as $gl_code) @@@ -171,15 -158,13 +181,15 @@@ user_price_dec()); foreach ($this->gl_codes as $gl_line) - { //////// 2009-08-18 Joe Hunt + { if (!is_tax_account($gl_line->gl_code)) $total += $gl_line->amount; - } + } return $total; } - + // + // Returns transaction total + // function get_items_total() { $total = 0; diff --cc purchasing/includes/ui/invoice_ui.inc index 062ff8f4,ff9c8468..983e507c --- a/purchasing/includes/ui/invoice_ui.inc +++ b/purchasing/includes/ui/invoice_ui.inc @@@ -19,7 -19,10 +19,12 @@@ function copy_from_trans(&$supp_trans $_POST['supp_reference'] = $supp_trans->supp_reference; $_POST['reference'] = $supp_trans->reference; $_POST['supplier_id'] = $supp_trans->supplier_id; + $_POST['tax_algorithm'] = $supp_trans->tax_algorithm; ++ + $_POST['_ex_rate'] = $supp_trans->ex_rate; + if (isset($supp_trans->tax_overrides)) + foreach($supp_trans->tax_overrides as $id => $value) + $_POST['mantax'][$id] = price_format($value); } //-------------------------------------------------------------------------------------------------- @@@ -31,10 -34,17 +36,20 @@@ function copy_to_trans(&$supp_trans $supp_trans->due_date = $_POST['due_date']; $supp_trans->supp_reference = $_POST['supp_reference']; $supp_trans->reference = $_POST['reference']; + if (isset($_POST['tax_algorithm'])) + $supp_trans->tax_algorithm = $_POST['tax_algorithm']; + + $supp_trans->ex_rate = input_num('_ex_rate', null); + $supp_trans->ov_amount = $supp_trans->ov_discount = 0; /* for starters */ + if (isset($_POST['mantax'])) { + foreach($_POST['mantax'] as $id => $tax) { + $supp_trans->tax_overrides[$id] = user_numeric($_POST['mantax'][$id]); + } + } + else + unset($supp_trans->tax_overrides); + if (count($supp_trans->grn_items) > 0) { foreach ( $supp_trans->grn_items as $grn) diff --cc purchasing/includes/ui/po_ui.inc index 8adca98b,728d2e7c..f13a197b --- a/purchasing/includes/ui/po_ui.inc +++ b/purchasing/includes/ui/po_ui.inc @@@ -26,8 -26,9 +26,11 @@@ function copy_from_cart( $_POST['Comments'] = $cart->Comments; $_POST['StkLocation'] = $cart->Location; $_POST['delivery_address'] = $cart->delivery_address; + $_POST['tax_algorithm'] = $cart->tax_algorithm; + $_POST['prep_amount'] = price_format($cart->prep_amount); + $_POST['_ex_rate'] = $cart->ex_rate; + foreach($cart->tax_overrides as $id => $value) + $_POST['mantax'][$id] = price_format($value); } function copy_to_cart() @@@ -43,9 -44,12 +46,15 @@@ $cart->Comments = $_POST['Comments']; $cart->Location = $_POST['StkLocation']; $cart->delivery_address = $_POST['delivery_address']; + if (isset($_POST['tax_algorithm'])) + $cart->tax_algorithm = $_POST['tax_algorithm']; + $cart->prep_amount = input_num('prep_amount', 0); + $cart->ex_rate = input_num('_ex_rate', null); + + if (isset($_POST['mantax'])) { + foreach($_POST['mantax'] as $id => $tax) { + $cart->tax_overrides[$id] = user_numeric($_POST['mantax'][$id]); } + } } // ------------------------------------------------------------------------------ diff --cc purchasing/inquiry/supplier_inquiry.php index d1e2ee82,1e106d0e..94ab5275 --- a/purchasing/inquiry/supplier_inquiry.php +++ b/purchasing/inquiry/supplier_inquiry.php @@@ -160,14 -160,9 +160,14 @@@ function check_overdue($row return $row['OverDue'] == 1 && (abs($row["TotalAmount"]) - $row["Allocated"] != 0); } + +function edit_link($row) +{ + return edit_trans_link($row['type'], $row['trans_no']); +} //------------------------------------------------------------------------------------------------ - $sql = get_sql_for_supplier_inquiry(); + $sql = get_sql_for_supplier_inquiry($_POST['filterType'], $_POST['TransAfterDate'], $_POST['TransToDate'], $_POST['supplier_id']); $cols = array( _("Type") => array('fun'=>'systype_name', 'ord'=>''), diff --cc purchasing/manage/suppliers.php index 287849ff,35ba173d..bc8f3f28 --- a/purchasing/manage/suppliers.php +++ b/purchasing/manage/suppliers.php @@@ -216,7 -214,7 +216,7 @@@ if (isset($_POST['submit']) $_POST['website'], $_POST['supp_account_no'], $_POST['bank_account'], input_num('credit_limit', 0), $_POST['dimension_id'], $_POST['dimension2_id'], $_POST['curr_code'], $_POST['payment_terms'], $_POST['payable_account'], $_POST['purchase_account'], $_POST['payment_discount_account'], - $_POST['notes'], $_POST['tax_group_id'], @$_POST['tax_included'], get_post('tax_algorithm')); - $_POST['notes'], $_POST['tax_group_id'], get_post('tax_included', 0)); ++ $_POST['notes'], $_POST['tax_group_id'], get_post('tax_included', 0), get_post('tax_algorithm')); update_record_status($_POST['supplier_id'], $_POST['inactive'], 'suppliers', 'supplier_id'); diff --cc purchasing/po_entry_items.php index 961bb5b3,ec03796d..0dfa4ebb --- a/purchasing/po_entry_items.php +++ b/purchasing/po_entry_items.php @@@ -465,43 -456,30 +466,46 @@@ function handle_commit_order( $inv->reference = $ref; $inv->supp_reference = $cart->supp_ref; $inv->tax_included = $cart->tax_included; + $inv->tax_algorithm = $cart->tax_algorithm; + $inv->stored_algorithm = $cart->stored_algorithm; $supp = get_supplier($cart->supplier_id); $inv->tax_group_id = $supp['tax_group_id']; - $total = 0; - + $inv->ov_amount = $inv->ov_gst = $inv->ov_discount = 0; + $total = 0; foreach($cart->line_items as $key => $line) { $inv->add_grn_to_trans($line->grn_item_id, $line->po_detail_rec, $line->stock_id, $line->item_description, $line->receive_qty, 0, $line->receive_qty, $line->price, $line->price, true, get_standard_cost($line->stock_id), ''); - $inv->ov_amount += round2(($line->receive_qty * $line->price), user_price_dec()); + $total += round2(($line->receive_qty * $line->price), user_price_dec()); } + $inv->tax_overrides = $cart->tax_overrides; if (!$inv->tax_included) { - $taxes = $inv->get_taxes($inv->tax_group_id, 0, false); + $taxes = $inv->get_taxes($inv->tax_group_id, 0, false, $inv->tax_algorithm); foreach( $taxes as $taxitem) { - $total += $taxitem['Value']; + $total += isset($taxitem['Override']) ? $taxitem['Override'] : $taxitem['Value']; } } + $inv->ex_rate = $cart->ex_rate; $inv_no = add_supp_invoice($inv); - commit_transaction(); // save PO+GRN+PI - // FIXME payment for cash terms. (Needs cash account selection) + // presume supplier data need correction + if ($inv->stored_algorithm != $inv->tax_algorithm) + update_supp_tax_algorithm($inv->supplier_id, $inv->tax_algorithm); + + if (get_post('cash_account')) { + + $pmt_no = add_supp_payment($inv->supplier_id, $inv->tran_date, get_post('cash_account'), + $total, 0, $Refs->get_next(ST_SUPPAYMENT), + _('Payment for:').$inv->supp_reference .' ('.$type_shortcuts[ST_SUPPINVOICE].$inv_no.')'); + add_supp_allocation($total, ST_SUPPAYMENT, $pmt_no, ST_SUPPINVOICE, $inv_no, $inv->tran_date); - update_supp_trans_allocation(ST_SUPPINVOICE, $inv_no, $total); - update_supp_trans_allocation(ST_SUPPAYMENT, $pmt_no, $total); ++ update_supp_trans_allocation(ST_SUPPINVOICE, $inv_no); ++ update_supp_trans_allocation(ST_SUPPAYMENT, $pmt_no); + + } + + commit_transaction(); // save PO+GRN+PI(+SP) + unset($_SESSION['PO']); meta_forward($_SERVER['PHP_SELF'], "AddedPI=$inv_no"); } diff --cc purchasing/supplier_invoice.php index d62f5e53,5c5c91ac..1a0ac95c --- a/purchasing/supplier_invoice.php +++ b/purchasing/supplier_invoice.php @@@ -310,8 -271,9 +310,9 @@@ function commit_item_data($n $_SESSION['supp_trans']->add_grn_to_trans($n, $_POST['po_detail_item'.$n], $_POST['item_code'.$n], $_POST['item_description'.$n], $_POST['qty_recd'.$n], $_POST['prev_quantity_inv'.$n], input_num('this_quantity_inv'.$n), - $_POST['order_price'.$n], input_num('ChgPrice'.$n), + $_POST['order_price'.$n], input_num('ChgPrice'.$n), $complete, $_POST['std_cost_unit'.$n], ""); + unset($_POST['mantax']); } } diff --cc reporting/includes/doctext.inc index 21b3a847,bf45b1ce..06bb7b1f --- a/reporting/includes/doctext.inc +++ b/reporting/includes/doctext.inc @@@ -283,3 -270,6 +283,5 @@@ foreach(explode("\n", $this->company['legal_text']) as $line) $Footer[] = $line; } + + $this->formData['recipient_name'] = $Addr1['name']; -?> diff --cc reporting/rep107.php index 9220166b,b0f6be77..5a5a6105 --- a/reporting/rep107.php +++ b/reporting/rep107.php @@@ -82,12 -65,11 +85,12 @@@ function print_invoices( $cur = get_company_Pref('curr_default'); if ($email == 0) - $rep = new FrontReport(_('INVOICE'), "InvoiceBulk", user_pagesize()); + $rep = new FrontReport(_('INVOICE'), "InvoiceBulk", user_pagesize(), 9, $orientation); - if ($orientation == 'L') - recalculate_cols($cols); - for ($i = $from; $i <= $to; $i++) + + $range = get_invoice_range($from, $to); + while($row = db_fetch($range)) { + $i = $row['trans_no']; if (!exists_customer_trans(ST_SALESINVOICE, $i)) continue; $sign = 1; diff --cc reporting/rep109.php index 43ec09f5,3251efcf..718f6f9d --- a/reporting/rep109.php +++ b/reporting/rep109.php @@@ -61,16 -61,13 +61,14 @@@ function print_sales_orders( if ($email == 0) { + if ($print_as_quote == 0) - $rep = new FrontReport(_("SALES ORDER"), "SalesOrderBulk", user_pagesize()); + $rep = new FrontReport(_("SALES ORDER"), "SalesOrderBulk", user_pagesize(), 9, $orientation); else - $rep = new FrontReport(_("QUOTE"), "QuoteBulk", user_pagesize()); - $rep->SetHeaderType('Header2'); - $rep->currency = $cur; - $rep->Font(); - $rep->Info($params, $cols, null, $aligns); + $rep = new FrontReport(_("QUOTE"), "QuoteBulk", user_pagesize(), 9, $orientation); } + if ($orientation == 'L') + recalculate_cols($cols); for ($i = $from; $i <= $to; $i++) { diff --cc reporting/reports_main.php index 45dc419a,0c8a9cbf..109d9bc7 --- a/reporting/reports_main.php +++ b/reporting/reports_main.php @@@ -164,18 -193,19 +193,19 @@@ $reports->addReport(RC_SUPPLIER, 209, _ _('To') => 'PO', _('Currency Filter') => 'CURRENCY', _('Email Customers') => 'YES_NO', - _('Comments') => 'TEXTBOX')); + _('Comments') => 'TEXTBOX', + _('Orientation') => 'ORIENTATION')); -$reports->addReport(RC_SUPPLIER, 210, _('Print Remittances'), +$reports->addReport(RC_SUPPLIER, 210, _('Print Remi&ttances'), array( _('From') => 'REMITTANCE', _('To') => 'REMITTANCE', _('Currency Filter') => 'CURRENCY', _('Email Customers') => 'YES_NO', - _('Comments') => 'TEXTBOX')); + _('Comments') => 'TEXTBOX', + _('Orientation') => 'ORIENTATION')); $reports->addReportClass(_('Inventory'), RC_INVENTORY); - $reports->addReport(RC_INVENTORY, 301, _('Inventory &Valuation Report'), - array( _('End Date') => 'DATE', + array( _('End Date') => 'DATE', _('Inventory Category') => 'CATEGORIES', _('Location') => 'LOCATIONS', _('Summary Only') => 'YES_NO', diff --cc sales/customer_delivery.php index fba45c7b,ef5aa72c..4363493b --- a/sales/customer_delivery.php +++ b/sales/customer_delivery.php @@@ -326,18 -314,16 +326,18 @@@ if (isset($_POST['process_delivery']) & } else { + $is_prepaid = $dn->is_prepaid() ? "&prepaid=Yes" : ''; + processing_end(); if ($newdelivery) { - meta_forward($_SERVER['PHP_SELF'], "AddedID=$delivery_no"); + meta_forward($_SERVER['PHP_SELF'], "AddedID=$delivery_no$is_prepaid"); } else { - meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$delivery_no"); + meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$delivery_no$is_prepaid"); } - } + } } - if (isset($_POST['Update']) || isset($_POST['_Location_update'])) { + if (isset($_POST['Update']) || isset($_POST['_Location_update']) || isset($_POST['qty'])) { $Ajax->activate('Items'); } //------------------------------------------------------------------------------ diff --cc sales/customer_payments.php index e1b672c9,bf15289a..3521f30b --- a/sales/customer_payments.php +++ b/sales/customer_payments.php @@@ -235,21 -247,9 +247,6 @@@ if (isset($_POST['_customer_id_button'] // unset($_POST['branch_id']); $Ajax->activate('BranchID'); } - if (isset($_POST['_DateBanked_changed'])) { - $Ajax->activate('_ex_rate'); - } - - //Chaitanya : 13-OCT-2011 - To support Edit feature - if (isset($_POST['ref']) && $_SESSION['alloc']->trans_no == 0) // added by Joe to fix the browser back button - { - $tno = get_customer_trans_from_ref(ST_CUSTPAYMENT, $_POST['ref']); - if ($tno != false) - { - display_error( _("The entered reference is already in use.")); - display_footer_exit(); - } - } - $new = $_SESSION['alloc']->trans_no == 0; -//if (isset($_POST['_DateBanked_changed'])) { -// $Ajax->activate('_ex_rate'); -//} //---------------------------------------------------------------------------------------------- diff --cc sales/includes/cart_class.inc index 3adf6c93,64a237f3..60491f56 --- a/sales/includes/cart_class.inc +++ b/sales/includes/cart_class.inc @@@ -73,13 -71,8 +73,14 @@@ class car var $payment; var $payment_terms; // cached payment terms var $credit; - + // prepayment mode: + var $prepaid; // true for documents issued in prepayment mode + var $prep_amount; // prepayment required for SO, invoiced amount for prepaiament invoice + var $sum_paid; // sum of all allocated prepayments both to order and related invoices + var $alloc; // sum of payments allocated to this document + var $prepayments = array(); // allocation records for this document + var $ex_rate; + //------------------------------------------------------------------------- // // $trans_no==0 => open new/direct document @@@ -98,10 -90,31 +99,31 @@@ $this->dimension_id = 0; $this->dimension2_id = 0; $this->pos = get_sales_point(user_pos()); - $this->read($type, $trans_no, $prep_child); + $this->read($type, $trans_no, $prepare_child); $this->cart_id = uniqid(''); } - + + /* + Optional sorting items by stock_id. + */ + function _cmp_lines($a, $b) + { + return strcmp($a->stock_id, $b->stock_id); + } + + /* + Returns items array optionally sorted by item code. + */ + function get_items() + { + global $sort_sales_items; + + $items = $this->line_items; + if (@$sort_sales_items) + uasort($items, array($this, '_cmp_lines')); + + return $items; + } // // Prepare cart to new child document entry, just after initial parent doc read. // diff --cc sales/includes/db/cust_trans_db.inc index 1458b822,efb6b25f..eb65752f --- a/sales/includes/db/cust_trans_db.inc +++ b/sales/includes/db/cust_trans_db.inc @@@ -104,9 -103,7 +104,9 @@@ function write_customer_trans($trans_ty ov_freight=".db_escape($Freight).", ov_freight_tax=$FreightTax, rate=$rate, ship_via=".db_escape($ship_via).", alloc=$AllocAmt, dimension_id=".db_escape($dimension_id).", dimension2_id=".db_escape($dimension2_id).", - payment_terms=".db_escape($payment_terms).", - payment_terms=".db_escape($payment_terms, true)." ++ payment_terms=".db_escape($payment_terms, true).", + tax_included=".db_escape($tax_included)." + prep_amount =".db_escape($prep_amount)." WHERE trans_no=".db_escape($trans_no)." AND type=".db_escape($trans_type); } db_query($sql, "The debtor transaction record could not be inserted"); @@@ -125,10 -122,10 +125,11 @@@ function get_customer_trans($trans_id, ."ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total," ."cust.name AS DebtorName, cust.address, " ."cust.curr_code, " - ."cust.tax_id, " + ."cust.tax_id, - trans.prep_amount>0 as prepaid"; ++ trans.prep_amount>0 as prepaid," + ."com.memo_"; - if ($trans_type == ST_CUSTPAYMENT) { + if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) { // it's a payment so also get the bank account // Chaitanya : Added bank_act to support Customer Payment Edit $sql .= ",bank_act,".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name, diff --cc sales/includes/db/custalloc_db.inc index f2896620,b7c46073..477002a0 --- a/sales/includes/db/custalloc_db.inc +++ b/sales/includes/db/custalloc_db.inc @@@ -33,26 -33,21 +33,27 @@@ function delete_cust_allocation($trans_ } //---------------------------------------------------------------------------------------- + // Update debtor trans alloc field according to current status of cust_allocations + // + function update_debtor_trans_allocation($trans_type, $trans_no) + { + $sql = "UPDATE `".TB_PREF."debtor_trans` trans, + (SELECT sum(amt) amt from ".TB_PREF."cust_allocations + WHERE (trans_type_to=".db_escape($trans_type)." AND trans_no_to=".db_escape($trans_no).") + OR (trans_type_from=".db_escape($trans_type)." AND trans_no_from=".db_escape($trans_no).")) allocated + SET + trans.alloc=IFNULL(allocated.amt,0) + WHERE trans.type=".db_escape($trans_type)." AND trans_no=".db_escape($trans_no); + + db_query($sql, "The debtor transaction record could not be modified for the allocation against it"); + } +function get_cust_allocation($trans_id) +{ + $sql = "SELECT * FROM ".TB_PREF."cust_allocations WHERE id = ".db_escape($trans_id); + return db_fetch(db_query($sql), "Cannot retrieve customer allocation $trans_id"); +} + - //---------------------------------------------------------------------------------------- - - function update_debtor_trans_allocation($trans_type, $trans_no, $alloc) - { - if ($trans_type == ST_SALESORDER) - $sql = "UPDATE ".TB_PREF."sales_orders SET alloc = alloc + $alloc - WHERE trans_type=".db_escape($trans_type)." AND order_no = ".db_escape($trans_no); - else - $sql = "UPDATE ".TB_PREF."debtor_trans SET alloc = alloc + $alloc - WHERE type=".db_escape($trans_type)." AND trans_no = ".db_escape($trans_no); - db_query($sql, "The debtor transaction record could not be modified for the allocation against it"); - } - //------------------------------------------------------------------------------------------------------------- function void_cust_allocations($type, $type_no, $date="") @@@ -102,20 -102,20 +103,20 @@@ function get_allocatable_from_cust_sql( trans.due_date, debtor.address, trans.version, - round(abs(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc),6) <= 0 AS settled - trans.debtor_no "; - - if ($extra_fields) - $sql .= ", $extra_fields "; -- - $sql .= " FROM ".TB_PREF."debtor_trans as trans, " - .TB_PREF."debtors_master as debtor"; - if ($extra_tables) - $sql .= ",$extra_tables "; ++ round(abs(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc),6) <= 0 AS settled, ++ trans.debtor_no + FROM " + .TB_PREF."debtor_trans as trans, " + .TB_PREF."debtors_master as debtor" + ." WHERE trans.debtor_no=debtor.debtor_no + AND (((type=".ST_CUSTPAYMENT." OR type=".ST_BANKDEPOSIT.") AND (trans.ov_amount > 0))" + ." OR (type=".ST_CUSTCREDIT." AND (ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount)>0))"; - $sql .= " WHERE trans.debtor_no=debtor.debtor_no"; + if (!$settled) + $sql .= " AND (round(abs(ov_amount+ov_gst+ov_freight+ov_freight_tax-ov_discount-alloc),6) > 0)"; - if ($extra_conditions) - $sql .= " AND $extra_conditions "; + if ($customer_id != null) + $sql .= " AND trans.debtor_no = ".db_escape($customer_id); return $sql; } @@@ -305,12 -254,13 +306,13 @@@ function get_sql_for_customer_allocatio } - if (!check_value('showSettled')) + if (!$settled) { - $sql .= " AND (round(abs(trans.ov_amount + trans.ov_gst + " + $sql .= " AND (round(IF(trans.prep_amount,trans.prep_amount, abs(trans.ov_amount + trans.ov_gst + " ."trans.ov_freight + trans.ov_freight_tax + " - ."trans.ov_discount) - trans.alloc,6) != 0) "; + ."trans.ov_discount)) - trans.alloc,6) != 0) "; } + return $sql; } @@@ -332,16 -282,16 +334,14 @@@ function credit_sales_invoice_allocate( while(($free < $amount) && ($alloc = db_fetch($result))) { $unalloc = min($alloc['amt'], $amount-$free); -- update_debtor_trans_allocation($alloc['trans_type_to'], $alloc['trans_no_to'], -- -$unalloc); -- update_debtor_trans_allocation($alloc['trans_type_from'], $alloc['trans_no_from'], -- -$unalloc); delete_cust_allocation($alloc['id']); if ($unalloc < $alloc['amt']) add_cust_allocation($alloc['amt']-$unalloc, $alloc['trans_type_from'], $alloc['trans_no_from'], ST_SALESINVOICE, $invoice_no); ++ update_debtor_trans_allocation($alloc['trans_type_to'], $alloc['trans_no_to']); ++ update_debtor_trans_allocation($alloc['trans_type_from'], $alloc['trans_no_from']); $free += $unalloc; } } @@@ -352,8 -302,8 +352,8 @@@ Check all credit notes allocated to this invoice for summarized freight charges.")); return false; } -- update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no, $amount); -- update_debtor_trans_allocation(ST_CUSTCREDIT, $credit_no, $amount); ++ update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no); ++ update_debtor_trans_allocation(ST_CUSTCREDIT, $credit_no); add_cust_allocation($amount, ST_CUSTCREDIT, $credit_no, ST_SALESINVOICE, $invoice_no); exchange_variation(ST_CUSTCREDIT, $credit_no, ST_SALESINVOICE, $invoice_no, $date, diff --cc sales/includes/db/payment_db.inc index baabf0fe,81ea49ce..4aa4d4e1 --- a/sales/includes/db/payment_db.inc +++ b/sales/includes/db/payment_db.inc @@@ -72,13 -90,19 +90,19 @@@ function write_customer_payment($trans_ if ($charge != 0) { /* Now Debit bank charge account with charges */ - $charge_act = get_company_pref('bank_charge_act'); + $charge_act = get_bank_charge_account($bank_account); - $total += add_gl_trans_customer(ST_CUSTPAYMENT, $payment_no, $date_, - $charge_act, 0, 0, $charge, $customer_id, - "Cannot insert a GL transaction for the payment bank charge debit", $rate); + $total += add_gl_trans(ST_CUSTPAYMENT, $payment_no, $date_, $charge_act, 0, 0, '', + $charge, $bank['bank_curr_code'], PT_CUSTOMER, $customer_id); + } + + + /*Post a balance post if $total != 0 due to variance in AR and bank posted values*/ + if ($total != 0) + { + $variance_act = get_company_pref('exchange_diff_act'); + add_gl_trans(ST_CUSTPAYMENT, $payment_no, $date_, $variance_act, 0, 0, '', + -$total, null, PT_CUSTOMER, $customer_id); } - /*Post a balance post if $total != 0 */ - add_gl_balance(ST_CUSTPAYMENT, $payment_no, $date_, -$total, PT_CUSTOMER, $customer_id); /*now enter the bank_trans entry */ add_bank_trans(ST_CUSTPAYMENT, $payment_no, $bank_account, $ref, diff --cc sales/includes/db/sales_invoice_db.inc index 2032bcf0,cd80b2cf..d37463c4 --- a/sales/includes/db/sales_invoice_db.inc +++ b/sales/includes/db/sales_invoice_db.inc @@@ -196,22 -176,11 +198,22 @@@ function write_sales_invoice(&$invoice _('Cash invoice').' '.$invoice_no); add_cust_allocation($amount, ST_CUSTPAYMENT, $pmtno, ST_SALESINVOICE, $invoice_no); -- update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no, $amount); -- update_debtor_trans_allocation(ST_CUSTPAYMENT, $pmtno, $amount); ++ update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no); ++ update_debtor_trans_allocation(ST_CUSTPAYMENT, $pmtno); } } +//_vd($allocs); + reallocate_payments($invoice_no, ST_SALESINVOICE, $date_, $to_allocate, $allocs); +//_vd(get_payments_for($sales_order, ST_SALESORDER)); +//_vd(get_payments_for($invoice_no, ST_SALESINVOICE)); +//_vd(get_gl(ST_SALESINVOICE, $invoice_no)); +//_vd(get_customer_trans($invoice_no, ST_SALESINVOICE)); +//_vd(get_sales_order_header($sales_order, ST_SALESORDER)); hook_db_postwrite($invoice, ST_SALESINVOICE); +//$result = get_trans_tax_details(ST_SALESINVOICE, $invoice_no); +//while($row=db_fetch($result)) +// _vd($row); +//exit; commit_transaction(); return $invoice_no; @@@ -228,33 -197,22 +230,33 @@@ function void_sales_invoice($type, $typ void_gl_trans($type, $type_no, true); // reverse all the changes in parent document(s) - - $parents = get_sales_parent_numbers($type, $type_no); - - if ($parents !== 0) { - if ($type == ST_SALESINVOICE && count($parents) == 1 && get_reference(ST_CUSTDELIVERY, $parents[0]) == "auto") + $factor = get_cust_prepayment_invoice_factor($type_no); + if ($factor != 0) + { + $lines = get_customer_trans_details($type, $type_no); + while($line = db_fetch($lines)) { - void_sales_delivery(ST_CUSTDELIVERY, $parents[0], false); - $date_ = Today(); - add_audit_trail(ST_CUSTDELIVERY, $parents[0], $date_, _("Voided.")); - add_voided_entry(ST_CUSTDELIVERY, $parents[0], $date_, ""); + update_prepaid_so_line($line['src_id'], -$factor*$line['quantity']); } - else - { - $srcdetails = get_sales_parent_lines($type, $type_no); - while ($row = db_fetch($srcdetails)) { - update_parent_line($type, $row['id'], -$row['quantity']); + } + else + { + $deliveries = get_sales_parent_numbers($type, $type_no); + + if ($deliveries !== 0) { - if (count($deliveries) == 1 && get_reference(ST_CUSTDELIVERY, $deliveries[0]) == "auto") ++ if ($type == ST_SALESINVOICE && count($deliveries) == 1 && get_reference(ST_CUSTDELIVERY, $deliveries[0]) == "auto") + { + void_sales_delivery(ST_CUSTDELIVERY, $deliveries[0], false); + $date_ = Today(); + add_audit_trail(ST_CUSTDELIVERY, $deliveries[0], $date_, _("Voided.")); + add_voided_entry(ST_CUSTDELIVERY, $deliveries[0], $date_, ""); + } + else + { + $srcdetails = get_sales_parent_lines($type, $type_no); - while ($row = db_fetch($srcdetails)) { ++ while ($row = db_fetch($srcdetails)) { + update_parent_line($type, $row['id'], -$row['quantity']); + } } } } diff --cc sales/includes/db/sales_order_db.inc index 9b8bcfd2,a0cf3880..b3cd6553 --- a/sales/includes/db/sales_order_db.inc +++ b/sales/includes/db/sales_order_db.inc @@@ -167,8 -165,8 +167,11 @@@ function update_sales_order($order $total = $order->get_trans_total(); begin_transaction(); + hook_db_prewrite($order, $order->trans_type); + + if ($order->trans_type == ST_SALESORDER) + $allocs = get_payments_for($order_no, ST_SALESORDER); ++ $sql = "UPDATE ".TB_PREF."sales_orders SET type =".db_escape($order->so_type)." , debtor_no = " . db_escape($order->customer_id) . ", branch_code = " . db_escape($order->Branch) . ", @@@ -229,37 -237,37 +243,39 @@@ } } } - if($line->id) { - $sql = "UPDATE ".TB_PREF."sales_order_details - SET description = ".db_escape($line->item_description) . ", - unit_price = ".db_escape($line->price) . ", - quantity = ".db_escape($line->quantity) . ", - discount_percent = ".db_escape($line->discount_percent) . " - WHERE id = {$line->id}"; - } - else { - $sql = "INSERT INTO ".TB_PREF."sales_order_details - (id, order_no, trans_type, stk_code, description, unit_price, quantity, - discount_percent, qty_sent) - VALUES ("; - $sql .= db_escape($line->id ? $line->id : 0) . "," - .$order_no . ",".$order->trans_type."," - .db_escape($line->stock_id) . "," - .db_escape($line->item_description) . ", " - .db_escape($line->price) . ", " - .db_escape($line->quantity) . ", " - .db_escape($line->discount_percent) . ", " - .db_escape($line->qty_done) ." )"; - } - - db_query($sql, "Old order Cannot be Inserted"); - + if (!$line->id) //new line + $sql = "INSERT INTO ".TB_PREF."sales_order_details + (order_no, trans_type, stk_code, description, unit_price, quantity, + discount_percent, qty_sent) + VALUES (".$order_no . ",".$order->trans_type."," + .db_escape($line->stock_id) . "," + .db_escape($line->item_description) . ", " + .db_escape($line->price) . ", " + .db_escape($line->quantity) . ", " + .db_escape($line->discount_percent) . ", " + .db_escape($line->qty_done) ." )"; + else + $sql = "UPDATE ".TB_PREF."sales_order_details + SET id=".db_escape($line->id).", + order_no=$order_no, + trans_type=".$order->trans_type.", + stk_code=".db_escape($line->stock_id).", + description=".db_escape($line->item_description).", + unit_price=".db_escape($line->price).", + quantity=".db_escape($line->quantity).", + discount_percent=".db_escape($line->discount_percent).", + qty_sent=".db_escape($line->qty_done)." + WHERE id = ".db_escape($line->id); + + db_query($sql, "Old order Cannot be updated"); } /* inserted line items into sales order details */ + if ($order->trans_type == ST_SALESORDER) + reallocate_payments($order_no, ST_SALESORDER, $ord_date, $total, $allocs); add_audit_trail($order->trans_type, $order_no, $order->document_date, _("Updated.")); $Refs->save($order->trans_type, $order_no, $order->reference); + + hook_db_postwrite($order, $order->trans_type); commit_transaction(); if ($loc_notification == 1 && count($st_ids) > 0) { @@@ -626,36 -596,4 +643,36 @@@ function get_sql_for_sales_orders_view( sorder.deliver_to"; return $sql; } -?> ++ +//-------------------------------------------------------------------------------------------------- +function update_prepaid_so_line($line_id, $qty_invoiced) +{ + $sql = "UPDATE ".TB_PREF."sales_order_details + SET invoiced = invoiced + ".(float)$qty_invoiced." + WHERE id=".db_escape($line_id); + + db_query($sql, "The document detail record could not be updated with invoiced qty"); + return true; +} +/* + Returns array of all issued invoices to sales order $order_no, optinally up to trans_no==$up_to +*/ +function get_sales_order_invoices($order_no) +{ + $sql = "SELECT trans_no, dt.type as type, tran_date, reference, prep_amount + FROM ".TB_PREF."debtor_trans dt + LEFT JOIN ".TB_PREF."voided v ON v.type=dt.type AND v.id=dt.trans_no + WHERE ISNULL(v.id) AND dt.type=".ST_SALESINVOICE." AND dt.order_=".db_escape($order_no) + ." ORDER BY dt.tran_date, dt.reference, dt.trans_no"; + + return db_query($sql, "cannot retrieve sales invoices for sales order"); +} + +function is_sales_order_started($order_no) +{ + $sql = "SELECT count(*) FROM ".TB_PREF."sales_order_details WHERE order_no=".db_escape($order_no)." AND trans_type=".ST_SALESORDER + ." AND (invoiced!=0 OR qty_sent!=0)"; + + $result = db_fetch(db_query($sql, "cannot retrieve sales invoices for sales order")); + return $result[0]; +} - ?> diff --cc sales/inquiry/sales_orders_view.php index 78b4a40f,522cfd80..b96b99dd --- a/sales/inquiry/sales_orders_view.php +++ b/sales/inquiry/sales_orders_view.php @@@ -127,9 -121,7 +127,9 @@@ function prt_link($row function edit_link($row) { - if (@$_GET['popup']) + global $page_nested; - ++ + if ($page_nested) return ''; global $trans_type; $modify = ($trans_type == ST_SALESORDER ? "ModifyOrderNumber" : "ModifyQuotationNumber"); @@@ -248,10 -226,10 +248,10 @@@ ref_cells(_("#:"), 'OrderNumber', '',nu ref_cells(_("Ref"), 'OrderReference', '',null, '', true); if ($show_dates) { - date_cells(_("from:"), 'OrdersAfterDate', '', null, -30); + date_cells(_("from:"), 'OrdersAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); date_cells(_("to:"), 'OrdersToDate', '', null, 1); } - locations_list_cells(_("Location:"), 'StockLocation', null, true); + locations_list_cells(_("Location:"), 'StockLocation', null, true, true); if($show_dates) { end_row(); @@@ -260,9 -238,9 +260,10 @@@ start_table(TABLESTYLE_NOBORDER); start_row(); } - stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true); + stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true, true); ++ if (!@$_GET['popup']) - customer_list_cells(_("Select a customer: "), 'customer_id', null, true); + customer_list_cells(_("Select a customer: "), 'customer_id', null, true, true); if ($trans_type == ST_SALESQUOTE) check_cells(_("Show All:"), 'show_all'); @@@ -348,6 -322,9 +349,5 @@@ $table->width = "80%" display_db_pager($table); submit_center('Update', _("Update"), true, '', null); -if (!@$_GET['popup']) -{ - end_form(); - end_page(); -} -?> +end_form(); +end_page(); - ?> diff --cc sales/view/view_sales_order.php index 260a82ab,6790f20d..a31f4399 --- a/sales/view/view_sales_order.php +++ b/sales/view/view_sales_order.php @@@ -93,9 -80,9 +93,9 @@@ label_row(_("Delivery Address"), nl2br( "class='tableheader2'", "colspan=3"); label_row(_("Reference"), $_SESSION['View']->reference, "class='tableheader2'", "colspan=3"); label_row(_("Telephone"), $_SESSION['View']->phone, "class='tableheader2'", "colspan=3"); -label_row(_("E-mail"), "email . "'>" . $_SESSION['View']->email . "", +;label_row(_("E-mail"), "email . "'>" . $_SESSION['View']->email . "", "class='tableheader2'", "colspan=3"); - label_row(_("Comments"), $_SESSION['View']->Comments, "class='tableheader2'", "colspan=3"); + label_row(_("Comments"), nl2br($_SESSION['View']->Comments), "class='tableheader2'", "colspan=3"); end_table(); if ($_GET['trans_type'] != ST_SALESQUOTE) diff --cc sql/en_US-demo.sql index 556796fd,9f0d6339..96e54af6 --- a/sql/en_US-demo.sql +++ b/sql/en_US-demo.sql @@@ -2081,8 -2069,7 +2083,9 @@@ INSERT INTO `0_sys_prefs` VALUES('defau INSERT INTO `0_sys_prefs` VALUES('version_id', 'system', 'varchar', 11, '2.3rc'); INSERT INTO `0_sys_prefs` VALUES('auto_curr_reval', 'setup.company', 'smallint', 6, '1'); INSERT INTO `0_sys_prefs` VALUES('grn_clearing_act', 'glsetup.purchase', 'varchar', 15, '1550'); + INSERT INTO `0_sys_prefs` VALUES('bcc_email', 'setup.company', 'varchar', 100, ''); +INSERT INTO `0_sys_prefs` VALUES('deferred_income_act', 'glsetup.sales', 'varchar', '15', ''); +INSERT INTO `0_sys_prefs` VALUES('gl_closing_date','setup.closing_date', 'date', 8, ''); -- -------------------------------------------------------- diff --cc sql/en_US-new.sql index 0a04e735,c5115a40..4627e40b --- a/sql/en_US-new.sql +++ b/sql/en_US-new.sql @@@ -1840,8 -1828,7 +1842,9 @@@ INSERT INTO `0_sys_prefs` VALUES('defau INSERT INTO `0_sys_prefs` VALUES('version_id', 'system', 'varchar', 11, '2.3rc'); INSERT INTO `0_sys_prefs` VALUES('auto_curr_reval', 'setup.company', 'smallint', 6, '1'); INSERT INTO `0_sys_prefs` VALUES('grn_clearing_act', 'glsetup.purchase', 'varchar', 15, '1550'); + INSERT INTO `0_sys_prefs` VALUES('bcc_email', 'setup.company', 'varchar', 100, ''); +INSERT INTO `0_sys_prefs` VALUES('deferred_income_act', 'glsetup.sales', 'varchar', '15', ''); +INSERT INTO `0_sys_prefs` VALUES('gl_closing_date','setup.closing_date', 'date', 8, ''); -- --------------------------------------------------------