Fixed amibiguity in few text messages to make translations easier, updated gettext...
authorJanusz Dobrowolski <janusz@frontaccounting.eu>
Wed, 6 May 2015 21:05:20 +0000 (23:05 +0200)
committerJanusz Dobrowolski <janusz@frontaccounting.eu>
Wed, 6 May 2015 21:05:20 +0000 (23:05 +0200)
applications/suppliers.php
install/lang/new_language_template/LC_MESSAGES/empty.po
install/lang/pl_PL/LC_MESSAGES/pl_PL.mo
install/lang/pl_PL/LC_MESSAGES/pl_PL.po
inventory/manage/items.php
inventory/view/view_adjustment.php
inventory/view/view_transfer.php
lang/new_language_template/LC_MESSAGES/empty.po

index 3778c846324bd7e16f1183b2c17bd910968c12b9..56b702194f060110f9d3edcc02b040ba0ab217bf 100644 (file)
@@ -22,7 +22,7 @@ class suppliers_app extends application
                        "purchasing/inquiry/po_search.php?", 'SA_GRN', MENU_TRANSACTION);
                $this->add_lapp_function(0, _("Direct &GRN"),
                        "purchasing/po_entry_items.php?NewGRN=Yes", 'SA_GRN', MENU_TRANSACTION);
-               $this->add_lapp_function(0, _("Direct &Invoice"),
+               $this->add_lapp_function(0, _("Direct Supplier &Invoice"),
                        "purchasing/po_entry_items.php?NewInvoice=Yes", 'SA_SUPPLIERINVOICE', MENU_TRANSACTION);
 
                $this->add_rapp_function(0, _("&Payments to Suppliers"),
index d35d3c27aab6e7a955d5c183c401c9636c811ed5..42bf5c032d98de03e0f82848c94ac627a2e598a1 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-27 18:01+0100\n"
+"POT-Creation-Date: 2015-05-06 14:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,518 +17,533 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:20
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:41
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:20
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:41
 msgid "FrontAccouting ERP Installation Wizard"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:42
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:42
 #, php-format
 msgid "Step %d: %s"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:49
 msgid "Chart of accounts"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:49
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:76
 msgid "Encoding"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:49
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:76
 msgid "Description"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:49
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:76
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:398
 msgid "Install"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:66
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:94
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:66
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:94
 msgid "Installed"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:76
 msgid "Language"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:124
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:124
 msgid ""
 "Cannot connect to database. User or password is invalid or you have no "
 "permittions to create database."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:160
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:164
 msgid "Cannot save system configuration file 'config.php'."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:167
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:171
 msgid "Cannot open 'config_db.php' configuration file."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:170
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:174
 msgid "Cannot write to the 'config_db.php' configuration file."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:173
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:177
 msgid ""
 "Configuration file 'config_db.php' is not writable. Change its permissions "
 "so it is, then re-run installation step."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:211
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:216
 msgid "Host name cannot be empty."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:215
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:220
 msgid "Database user name cannot be empty."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:219
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:224
 msgid "Database name cannot be empty."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:272
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:278
 msgid "Company name cannot be empty."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:276
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:282
 msgid "Company admin name cannot be empty."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:280
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:286
 msgid "Company admin password cannot be empty."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:284
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:290
 msgid "Company admin passwords differ."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:316
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:323
 msgid "System Diagnostics"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:318
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:325
 msgid "Select install wizard language:"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:324
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:331
 msgid ""
 "All application preliminary requirements seems to be correct. Please press "
 "Continue button below."
 msgstr ""
 
-#: /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
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:332
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:360
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:367
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:374
 msgid "Continue >>"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:327
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:334
 msgid ""
 "Application cannot be installed. Please fix problems listed below in red, "
 "and press Refresh button."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:328
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:335
 msgid "Refresh"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:338
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:345
 msgid "Database Server Settings"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:340
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:347
 msgid "Server Host:"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:341
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:348
+msgid "Database Name:"
+msgstr ""
+
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:349
 msgid "Database User:"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:342
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:350
 msgid "Database Password:"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:343
-msgid "Database Name:"
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:351
+msgid "Database Collation:"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:344
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:352
 msgid "Use '0_' Table Prefix:"
 msgstr ""
 
-#: /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
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:352
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:38
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:113
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:126
 msgid "Yes"
 msgstr ""
 
-#: /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
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:352
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:38
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:113
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:126
 msgid "No"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:345
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:353
 msgid "Install Additional Language Packs from FA Repository:"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:346
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:354
 msgid "Install Additional COAs from FA Repository:"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:348
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:356
 msgid ""
-"Use table prefix if you share selected database for more than one FA company."
+"Select collation you want to use. If you are unsure or you will use various "
+"languages, select unicode collation."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:349
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:357
+msgid ""
+"Use table prefix if you share selected database for more than one FA company "
+"using the same collation."
+msgstr ""
+
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:358
 msgid ""
 "Do not select additional langs nor COAs if you have no working internet "
 "connection right now. You can install them later."
 msgstr ""
 
-#: /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
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:359
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:366
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:373
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:397
 msgid "<< Back"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:355
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:364
 msgid "User Interface Languages Selection"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:362
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:371
 msgid "Charts of Accounts Selection"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:379
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:388
 msgid "Company Settings"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:381
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:390
 msgid "Company Name:"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:382
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:391
 msgid "Admin Login:"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:383
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:392
 msgid "Admin Password:"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:384
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:393
 msgid "Reenter Password:"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:385
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:394
 msgid "Select Chart of Accounts:"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:386
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:395
 msgid "Select Default Language:"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:393
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:398
+msgid "Start installation process"
+msgstr ""
+
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:402
 msgid "FrontAccounting ERP has been installed successsfully."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:394
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:403
 msgid "Please do not forget to remove install wizard folder."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:397
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:406
 msgid "Click here to start."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:15
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:15
 msgid "Info"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:16
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:16
 msgid "Optional"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:17
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:17
 msgid "Recommended"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:18
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:18
 msgid "Required "
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:24
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:24
 msgid "MySQL version"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:28
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:28
 msgid "Upgrade MySQL server to version at least 4.1"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:35
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:35
 msgid "PHP MySQL extension"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:40
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:40
 msgid "Your PHP has to have MySQL extension enabled."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:46
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:46
 msgid "PHP version"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:50
-msgid "Upgrade PHP to version at least 4.3.3"
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:50
+msgid "Upgrade PHP to version at least 5.0.0"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:57
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:57
 msgid "Server system"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:67
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:67
 msgid "Session save path"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:79
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:79
 msgid "Removed install wizard folder"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:82
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:82
 msgid "Not removed"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:83
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:83
 msgid "Remove or rename install wizard folder for security reasons."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:90
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:90
 msgid "Browser type"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:94
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:94
 msgid "Any browser is supported"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:101
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:101
 msgid "Http server type"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:105
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:105
 msgid "Any server is supported"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:112
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:112
 msgid "Native gettext"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:116
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:116
 msgid "In case of no gettext support, php emulation is used"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:124
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:124
 msgid "Debugging mode"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:128
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:128
 msgid "To switch debugging on set $go_debug>0 in config.php file"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:137
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:138
 msgid "Error logging"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:145
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:146
 msgid "Disabled"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:148
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:149
 msgid "To switch error logging set $error_logging in config.php file"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:151
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:152
 msgid "Log file is not writeable"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:161
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:162
 msgid "Current database version"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:165
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:166
 msgid "Database structure seems to be not upgraded to current version"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:180
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:181
 msgid "Company subdirectories consistency"
 msgstr ""
 
-#: /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
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:194
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:201
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:209
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:226
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:341
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:350
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:359
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:367
 #, php-format
 msgid "'%s' is not writeable"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:221
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:222
 msgid "Temporary directory"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:233
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:234
 msgid "Language configuration consistency"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:242
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:243
 msgid "Languages folder should be writeable."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:251
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:252
 msgid "Languages configuration file should be writeable."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:270
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:271
 #, php-format
 msgid "Missing %s translation file."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:275
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:276
 #, php-format
 msgid "Missing system locale: %s"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:288
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:289
 msgid "Main config file"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:295
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:317
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:296
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:318
 #, php-format
 msgid "Can't write '%s' file. Check FA directory write permissions."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:296
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:318
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:297
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:319
 #, php-format
 msgid "'%s' file exists."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:300
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:301
 #, php-format
 msgid "'%s' file should be read-only"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:309
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:310
 msgid "Database auth file"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:322
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:323
 #, php-format
 msgid ""
 "'%s' file should be read-only if you do not plan to add or change companies"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:333
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:334
 msgid "Extensions system"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:371
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:372
 msgid "Extensions configuration files and directories should be writeable"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:384
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:385
 #, php-format
 msgid "Non-standard theme directory '%s' is not writable"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:394
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:395
 msgid ""
 "OpenSSL PHP extension have to be enabled to use extension repository system."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:397
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:398
 msgid ""
 "OpenSSL have to be available on your server to use extension repository "
 "system."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:421
 msgid "Test"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:421
 msgid "Test type"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:421
 msgid "Value"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:421
 msgid "Comments"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:444
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:445
 msgid "Ok"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:189
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:189
 #, php-format
 msgid "No key field '%s' in file '%s'"
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:294
+#: /home/janusz/FA/fa_unstable-git/_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
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:306
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:343
 #, php-format
 msgid "Cannot delete outdated '%s' file."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:310
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:310
 msgid "Release file in repository is invalid, or public key is outdated."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:327
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:327
 msgid "Repository version does not match application version."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:335
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:377
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:335
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:377
 #, php-format
 msgid "Cannot download '%s' file."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:347
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:347
 #, php-format
 msgid ""
 "Security alert: broken index file in repository '%s'. Please inform "
 "repository administrator about this issue."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:383
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:383
 #, php-format
 msgid ""
 "Security alert: broken package '%s' in repository. Please inform repository "
 "administrator about this issue."
 msgstr ""
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:638
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:699
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:641
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:702
 #, php-format
 msgid "Package '%s' not found."
 msgstr ""
index 37a630a0c0886a3de0b1959fb07b1272db1cecc2..079b0bb38453ae9c897fdbd770f0bc3b82a42859 100644 (file)
Binary files a/install/lang/pl_PL/LC_MESSAGES/pl_PL.mo and b/install/lang/pl_PL/LC_MESSAGES/pl_PL.mo differ
index b7f573c6e9ee52cd6411795e251f68f0afb4efb0..6471f8ddee90ed3d388a15f96fa721211c3542d7 100644 (file)
@@ -7,72 +7,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-27 18:01+0100\n"
+"POT-Creation-Date: 2015-05-06 14:45+0200\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Janusz Dobrowolski <janusz@iron.from.pl>\n"
+"Last-Translator: Janusz Dobrowolski <janusz@frontaccounting.eu>\n"
 "Language-Team: \n"
-"Language: \n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:20
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:41
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:20
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:41
 msgid "FrontAccouting ERP Installation Wizard"
 msgstr "Instalator FrontAccounting ERP"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:42
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:42
 #, php-format
 msgid "Step %d: %s"
 msgstr "Krok %d: %s"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:49
 msgid "Chart of accounts"
 msgstr "Plan kont"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:49
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:76
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:49
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:76
 msgid "Description"
 msgstr "Opis"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:49
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:49
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:76
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:398
 msgid "Install"
 msgstr "Zainstaluj"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:66
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:94
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:66
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:94
 msgid "Installed"
 msgstr "Zainstalowany"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:76
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:76
 msgid "Language"
 msgstr "Jêzyk"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:124
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:124
 msgid ""
 "Cannot connect to database. User or password is invalid or you have no "
 "permittions to create database."
 msgstr ""
+"Nie mo¿na siê po³±czyæ z baz± danych. Podany u¿ytkownik lub has³o s± "
+"nieprawid³owe lub u¿ytkownik nie posiada uprawnieñ do tworzenia baz danych."
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:160
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:164
 msgid "Cannot save system configuration file 'config.php'."
 msgstr "Nie mo¿na zapisaæ pliku konfiguracyjnego 'config.php'."
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:167
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:171
 msgid "Cannot open 'config_db.php' configuration file."
 msgstr "Nie mo¿na utworzyæ pliku konfiguracji 'config_db.php'."
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:170
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:174
 msgid "Cannot write to the 'config_db.php' configuration file."
 msgstr "Nie mo¿na zapisaæ pliku konfiguracji  'config_db.php'."
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:173
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:177
 msgid ""
 "Configuration file 'config_db.php' is not writable. Change its permissions "
 "so it is, then re-run installation step."
@@ -80,43 +84,43 @@ 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:211
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:216
 msgid "Host name cannot be empty."
 msgstr "Adres serwera nie mo¿e byæ pusty."
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:215
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:220
 msgid "Database user name cannot be empty."
 msgstr "Nazwa u¿ytkownika nie mo¿e by pusta."
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:219
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:224
 msgid "Database name cannot be empty."
 msgstr "Nazwa bazy danych nie mo¿e byæ pusta."
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:272
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:278
 msgid "Company name cannot be empty."
 msgstr "Nazwa firmy nie mo¿e by pusta."
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:276
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:282
 msgid "Company admin name cannot be empty."
 msgstr "Nazwa administratora nie mo¿e byæ pusta."
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:280
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:286
 msgid "Company admin password cannot be empty."
 msgstr "Has³o administratora nie mo¿e by puste."
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:284
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:290
 msgid "Company admin passwords differ."
 msgstr "Wprowadzone has³a ró¿ni± siê."
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:316
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:323
 msgid "System Diagnostics"
 msgstr "Diagnostyka Systemu"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:318
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:325
 msgid "Select install wizard language:"
 msgstr "Wybierz jêzyk u¿ywany przy instalacji:"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:324
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:331
 msgid ""
 "All application preliminary requirements seems to be correct. Please press "
 "Continue button below."
@@ -124,15 +128,14 @@ msgstr ""
 "Wszystkie wymagania systemu wydaj± siê byæ spe³nione. Kliknij klawisz "
 "poni¿ej aby rozpocz±æ instalacjê."
 
-#: /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
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:332
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:360
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:367
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:374
 msgid "Continue >>"
 msgstr "Kontynuuj >>"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:327
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:334
 msgid ""
 "Application cannot be installed. Please fix problems listed below in red, "
 "and press Refresh button."
@@ -140,62 +143,78 @@ msgstr ""
 "Aplikacja nie mo¿e byæ zainstalowana. Usuñ wskazane problemy i kliknij "
 "klawisz 'Od¶wie¿'."
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:328
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:335
 msgid "Refresh"
 msgstr "Od¶wierz"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:338
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:345
 msgid "Database Server Settings"
 msgstr "Ustawienia Serwera Bazy Danych"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:340
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:347
 msgid "Server Host:"
 msgstr "Adres Serwera:"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:341
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:348
+msgid "Database Name:"
+msgstr "Nazwa Bazy Danych:"
+
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:349
 msgid "Database User:"
 msgstr "Nazwa U¿ytkownika:"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:342
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:350
 msgid "Database Password:"
 msgstr "Has³o:"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:343
-msgid "Database Name:"
-msgstr "Nazwa Bazy Danych:"
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:351
+msgid "Database Collation:"
+msgstr "Porz±dkowanie alfabetyczne danych:"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:344
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:352
 msgid "Use '0_' Table Prefix:"
 msgstr "Prefiks '0_' dla Nazw Tablic:"
 
-#: /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
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:352
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:38
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:113
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:126
 msgid "Yes"
 msgstr "Tak"
 
-#: /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
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:352
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:38
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:113
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:126
 msgid "No"
 msgstr "Nie"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:345
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:353
 msgid "Install Additional Language Packs from FA Repository:"
 msgstr "Instalacja Dodatkowych Jêzyków z Repozytorium FA:"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:346
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:354
 msgid "Install Additional COAs from FA Repository:"
 msgstr "Instalacja Dodatkowych Planów Kont z Repozytorium FA:"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:348
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:356
 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."
+"Select collation you want to use. If you are unsure or you will use various "
+"languages, select unicode collation."
+msgstr ""
+"Wybierz porz±dkowanie alfabetyczne bazy danych. Je¶li nie jeste¶ pewien "
+"jakiego porz±dkowania chcesz u¿ywaæ, lub zamierzasz u¿ywaæ danych w wiêcej "
+"ni¿ jednym jêzyku, wybierz porz±dkowanie Unicode."
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:349
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:357
+msgid ""
+"Use table prefix if you share selected database for more than one FA company "
+"using the same collation."
+msgstr ""
+"U¿yj prefiksu dla tabel je¶li ta sama baza danych bêdzie u¿ywana dla kilku "
+"firm z tym samym porz±dkowaniem alfabetycznym."
+
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:358
 msgid ""
 "Do not select additional langs nor COAs if you have no working internet "
 "connection right now. You can install them later."
@@ -203,246 +222,250 @@ 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: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
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:359
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:366
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:373
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:397
 msgid "<< Back"
 msgstr "<< Wróæ"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:355
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:364
 msgid "User Interface Languages Selection"
 msgstr "Wybór Jêzyków Interfejsu U¿ytkownika"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:362
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:371
 msgid "Charts of Accounts Selection"
 msgstr "Wybór Planów Kont"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:379
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:388
 msgid "Company Settings"
 msgstr "Ustawienia Firmy"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:381
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:390
 msgid "Company Name:"
 msgstr "Nazwa Firmy:"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:382
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:391
 msgid "Admin Login:"
 msgstr "Login Administratora:"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:383
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:392
 msgid "Admin Password:"
 msgstr "Has³o Administratora:"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:384
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:393
 msgid "Reenter Password:"
 msgstr "Powtórz Has³o:"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:385
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:394
 msgid "Select Chart of Accounts:"
 msgstr "Wybierz Planów Kont:"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:386
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:395
 msgid "Select Default Language:"
 msgstr "Wybierz Jêzyk Domy¶lny:"
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:393
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:398
+msgid "Start installation process"
+msgstr "Rozpocznij instalacjê"
+
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:402
 msgid "FrontAccounting ERP has been installed successsfully."
 msgstr "Aplikacja FrontAccounting ERP zosta³a zainstalowana pomy¶lnie."
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:394
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:403
 msgid "Please do not forget to remove install wizard folder."
 msgstr "Nie zapomnij usun±æ folderu instalatora."
 
-#: /home/janusz/FA/fa_unstable/devel/../install/index.php:397
+#: /home/janusz/FA/fa_unstable-git/_devel/../install/index.php:406
 msgid "Click here to start."
 msgstr "Kliknij tutaj, aby rozpocz±æ pracê."
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:15
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:15
 msgid "Info"
 msgstr "Informacja"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:16
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:16
 msgid "Optional"
 msgstr "Opcjonalne"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:17
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:17
 msgid "Recommended"
 msgstr "Zalecane"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:18
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:18
 msgid "Required "
 msgstr "Wymagane"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:24
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:24
 msgid "MySQL version"
 msgstr "Wersja MySQL"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:28
+#: /home/janusz/FA/fa_unstable-git/_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"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:35
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:35
 msgid "PHP MySQL extension"
 msgstr "Rozszerzenie PHP MySQL"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:40
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:40
 msgid "Your PHP has to have MySQL extension enabled."
 msgstr "PHP musi mieæ w³±czone rozszerzenie MySQL."
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:46
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:46
 msgid "PHP version"
 msgstr "Wersja PHP"
 
-#: /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"
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:50
+msgid "Upgrade PHP to version at least 5.0.0"
+msgstr "Zainstaluj PHP w wersji co najmniej 5.0.0"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:57
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:57
 msgid "Server system"
 msgstr "System serwera"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:67
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:67
 msgid "Session save path"
 msgstr "Katalog zapisu pliku sesji"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:79
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:79
 msgid "Removed install wizard folder"
 msgstr "Folder instalatora usuniêty"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:82
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:82
 msgid "Not removed"
 msgstr "Nie usuniêty"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:83
+#: /home/janusz/FA/fa_unstable-git/_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."
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:90
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:90
 msgid "Browser type"
 msgstr "Typ przegl±darki"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:94
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:94
 msgid "Any browser is supported"
 msgstr "Mo¿e byæ u¿yty dowolny typ przegl±darki"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:101
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:101
 msgid "Http server type"
 msgstr "Serwer http"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:105
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:105
 msgid "Any server is supported"
 msgstr "Dowolny"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:112
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:112
 msgid "Native gettext"
 msgstr "Biblioteka Gettext "
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:116
+#: /home/janusz/FA/fa_unstable-git/_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."
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:124
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:124
 msgid "Debugging mode"
 msgstr "Tryb debug"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:128
+#: /home/janusz/FA/fa_unstable-git/_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"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:137
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:138
 msgid "Error logging"
 msgstr "Logowanie b³êdów"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:145
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:146
 msgid "Disabled"
 msgstr "Wy³±czony"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:148
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:149
 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"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:151
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:152
 msgid "Log file is not writeable"
 msgstr "Logfile jest niezapisywalny"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:161
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:162
 msgid "Current database version"
 msgstr "Aktualna wersja bazy danych"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:165
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:166
 msgid "Database structure seems to be not upgraded to current version"
 msgstr "Struktura bazy danych nie jest zaktualizowana do bie¿±cej wersji"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:180
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:181
 msgid "Company subdirectories consistency"
 msgstr "Prawid³owa struktura folderów firmowych"
 
-#: /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
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:194
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:201
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:209
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:226
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:341
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:350
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:359
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:367
 #, php-format
 msgid "'%s' is not writeable"
 msgstr "'%s' jest niezapisywalny"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:221
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:222
 msgid "Temporary directory"
 msgstr "Katalog plików tymczasowych"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:233
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:234
 msgid "Language configuration consistency"
 msgstr "Konfiguracja jêzykowa"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:242
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:243
 msgid "Languages folder should be writeable."
 msgstr "Folder jêzyków musi byæ zapisywalny"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:251
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:252
 msgid "Languages configuration file should be writeable."
 msgstr "Pliki konfiguracyjny jêzyków musi byæ zapisywalny."
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:270
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:271
 #, php-format
 msgid "Missing %s translation file."
 msgstr "Brak pliku t³umaczeñ %s"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:275
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:276
 #, php-format
 msgid "Missing system locale: %s"
 msgstr "Lokalizacja '%s' nie jest zainstalowana w systemie"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:288
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:289
 msgid "Main config file"
 msgstr "G³ówny plik konfiguracyjny "
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:295
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:317
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:296
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:318
 #, 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."
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:296
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:318
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:297
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:319
 #, php-format
 msgid "'%s' file exists."
 msgstr "Plik '%s' istnieje."
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:300
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:301
 #, php-format
 msgid "'%s' file should be read-only"
 msgstr "Plik '%s powinien byæ zabezpieczony przed zapisem"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:309
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:310
 msgid "Database auth file"
 msgstr "Pik configuracyjny bazy danych"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:322
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:323
 #, php-format
 msgid ""
 "'%s' file should be read-only if you do not plan to add or change companies"
@@ -450,25 +473,25 @@ msgstr ""
 "Plik '%s' powinien byæ zabezpieczony przed zapisem je¶li nie planujesz "
 "dodawania ani zmiany firm"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:333
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:334
 msgid "Extensions system"
 msgstr "System rozszerzeñ"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:371
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:372
 msgid "Extensions configuration files and directories should be writeable"
 msgstr "Pliki konfiguracyjne i foldery rozszerzeñ powinny byæ zapisywalne"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:384
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:385
 #, php-format
 msgid "Non-standard theme directory '%s' is not writable"
 msgstr "Niestandardowy folder tematu '%s' jest zazpieczony przed zapisem"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:394
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:395
 msgid ""
 "OpenSSL PHP extension have to be enabled to use extension repository system."
 msgstr "System pakietów wymaga zaisnatlowanego rozszerzenia PHP OpenSSL."
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:397
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:398
 msgid ""
 "OpenSSL have to be available on your server to use extension repository "
 "system."
@@ -476,57 +499,57 @@ 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:420
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:421
 msgid "Test"
 msgstr "Test"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:421
 msgid "Test type"
 msgstr "Typ testu"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:421
 msgid "Value"
 msgstr "Warto¶æ"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:420
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:421
 msgid "Comments"
 msgstr "Komentarz"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/system_tests.inc:444
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/system_tests.inc:445
 msgid "Ok"
 msgstr "Ok"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:189
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:189
 #, php-format
 msgid "No key field '%s' in file '%s'"
-msgstr ""
+msgstr "Brak pola kluczowego '%s' w  pliku '%s"
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:294
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:294
 msgid "Cannot download repo index file."
-msgstr ""
+msgstr "Nie mo¿na wczytaæ pliku indeksu repozytorium."
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:306
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:343
-#, fuzzy, php-format
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:306
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:343
+#, php-format
 msgid "Cannot delete outdated '%s' file."
-msgstr "Nie mo¿na usun±æ pliku."
+msgstr "Nie mo¿na usun±æ zbêdnego pliku '%s'."
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:310
+#: /home/janusz/FA/fa_unstable-git/_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."
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:327
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:327
 msgid "Repository version does not match application version."
 msgstr "Wersja repozytorium nie zgadza siê z wersj± aplikacji."
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:335
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:377
-#, fuzzy, php-format
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:335
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:377
+#, php-format
 msgid "Cannot download '%s' file."
-msgstr "Nie mo¿na usun±æ pliku."
+msgstr "Nie mo¿na odczytaæ pliku '%s'."
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:347
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:347
 #, php-format
 msgid ""
 "Security alert: broken index file in repository '%s'. Please inform "
@@ -535,7 +558,7 @@ msgstr ""
 "Alarm bezpieczeñstwa: uszkodzony plik indeksu repozytorium '%s'. Poinformuj "
 "administratora repozytorium o tym problemie."
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:383
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:383
 #, php-format
 msgid ""
 "Security alert: broken package '%s' in repository. Please inform repository "
@@ -544,8 +567,11 @@ msgstr ""
 "Alarm bezpieczeñstwa: uszkodzony plik '%s' w repozytorium. Poinformuj "
 "administratora repozytorium o tym problemie."
 
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:638
-#: /home/janusz/FA/fa_unstable/devel/../includes/packages.inc:699
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:641
+#: /home/janusz/FA/fa_unstable-git/_devel/../includes/packages.inc:702
 #, php-format
 msgid "Package '%s' not found."
 msgstr "Pakiet '%s' nie zosta³ znaleziony."
+
+#~ msgid "Upgrade PHP to version at least 4.3.3"
+#~ msgstr "Zainstaluj PHP w wersji co najmniej 4.3.3"
index e3d710ee054db4c40dae837b02b5082556f2cc9f..449eae17b9fa74e949d37af419043dfadba77074 100644 (file)
@@ -271,7 +271,7 @@ function item_settings(&$stock_id, $new_item)
 
        table_section(1);
 
-       table_section_title(_("Item"));
+       table_section_title(_("General Settings"));
 
        //------------------------------------------------------------------------------------
        if ($new_item) 
index bfa71de99b1e2f3e6f1110c2c477eab3a2ef8f27..ca3a7edc73a03a28eefd4e8e4d6365d99acc69a6 100644 (file)
@@ -51,7 +51,7 @@ while ($adjustment = db_fetch($adjustment_items))
                echo "<br>";
                start_table(TABLESTYLE, "width='90%'");
 
-       $th = array(_("Item"), _("Description"), _("Quantity"),
+       $th = array(_("Item Code"), _("Description"), _("Quantity"),
                _("Units"), _("Unit Cost"));
        table_header($th);
        }
index ec35033328ec8d13587b8dc6d4ce1bcb71e29eb2..cb27e24f1f66de575723427adb63222c8e496433 100644 (file)
@@ -47,7 +47,7 @@ end_table(2);
 
 start_table(TABLESTYLE, "width='90%'");
 
-$th = array(_("Item"), _("Description"), _("Quantity"), _("Units"));
+$th = array(_("Item Code"), _("Description"), _("Quantity"), _("Units"));
 table_header($th);
 $transfer_items = get_stock_moves(ST_LOCTRANSFER, $trans_no);
 $k = 0;
index 79b341939561e4c63b8e00ac45434efa0bcd663b..cd1f854f7bfacbc006c8ed30d679994503ff2c9c 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-25 10:46+0100\n"
+"POT-Creation-Date: 2015-05-06 22:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,7 +24,8 @@ msgstr ""
 
 #: ../frontaccounting.php:75
 #: ../access/logout.php:21
-#: ../themes/default/renderer.php:68
+#: ../themes/default/renderer.php:70
+#: ../themes/default/renderer.php:82
 msgid "Logout"
 msgstr ""
 
@@ -59,30 +60,30 @@ msgid "Authorization timeout"
 msgstr ""
 
 #: ../access/login.php:53
-#: ../access/login.php:91
+#: ../access/login.php:90
 msgid "Login"
 msgstr ""
 
-#: ../access/login.php:91
+#: ../access/login.php:90
 #: ../access/password_reset.php:61
 msgid "Version"
 msgstr ""
 
-#: ../access/login.php:94
+#: ../access/login.php:93
 msgid "User name"
 msgstr ""
 
-#: ../access/login.php:98
+#: ../access/login.php:97
 #: ../admin/users.php:200
 msgid "Password:"
 msgstr ""
 
-#: ../access/login.php:107
-#: ../access/login.php:114
+#: ../access/login.php:106
+#: ../access/login.php:113
 #: ../access/password_reset.php:69
 #: ../access/password_reset.php:76
-#: ../admin/create_coy.php:257
-#: ../admin/create_coy.php:340
+#: ../admin/create_coy.php:240
+#: ../admin/create_coy.php:316
 #: ../admin/inst_upgrade.php:63
 #: ../includes/sysnames.inc:194
 msgid "Company"
@@ -95,6 +96,7 @@ msgstr ""
 #: ../access/login.php:156
 #: ../access/password_reset.php:107
 #: ../admin/display_prefs.php:123
+#: ../themes/default/renderer.php:131
 msgid "Theme:"
 msgstr ""
 
@@ -113,7 +115,7 @@ msgstr ""
 
 #: ../access/password_reset.php:63
 #: ../reporting/rep103.php:276
-#: ../reporting/rep106.php:95
+#: ../reporting/rep106.php:94
 #: ../reporting/rep205.php:195
 #: ../reporting/includes/header2.inc:113
 #: ../sales/manage/sales_people.php:99
@@ -129,40 +131,55 @@ msgid "Attach Documents"
 msgstr ""
 
 #: ../admin/attachments.php:86
+#: ../admin/db/voiding_db.inc:28
+#: ../admin/db/voiding_db.inc:38
+#: ../admin/db/voiding_db.inc:51
+#: ../admin/db/voiding_db.inc:63
+#: ../admin/db/voiding_db.inc:69
+#: ../admin/db/voiding_db.inc:84
+#: ../admin/db/voiding_db.inc:91
+#: ../admin/db/voiding_db.inc:97
+#: ../admin/db/voiding_db.inc:103
 msgid "Selected transaction does not exists."
 msgstr ""
 
 #: ../admin/attachments.php:88
+#: ../admin/attachments.php:93
 msgid "Select attachment file."
 msgstr ""
 
-#: ../admin/attachments.php:128
-msgid "Attachment has been inserted."
+#: ../admin/attachments.php:91
+#: ../admin/company_preferences.php:42
+#: ../inventory/manage/items.php:69
+msgid "The file size is over the maximum allowed."
 msgstr ""
 
 #: ../admin/attachments.php:134
+msgid "Attachment has been inserted."
+msgstr ""
+
+#: ../admin/attachments.php:140
 msgid "Attachment has been updated."
 msgstr ""
 
-#: ../admin/attachments.php:149
+#: ../admin/attachments.php:155
 msgid "Attachment has been deleted."
 msgstr ""
 
-#: ../admin/attachments.php:167
+#: ../admin/attachments.php:173
 #: ../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:200
-#: ../manufacturing/work_order_costs.php:136
-#: ../manufacturing/work_order_entry.php:378
-#: ../manufacturing/work_order_entry.php:386
-#: ../manufacturing/includes/work_order_issue_ui.inc:168
+#: ../manufacturing/work_order_add_finished.php:192
+#: ../manufacturing/work_order_costs.php:135
+#: ../manufacturing/work_order_entry.php:369
+#: ../manufacturing/work_order_entry.php:377
+#: ../manufacturing/includes/work_order_issue_ui.inc:172
 #: ../sales/inquiry/customer_allocation_inquiry.php:47
 msgid "Type:"
 msgstr ""
 
-#: ../admin/attachments.php:183
-#: ../admin/create_coy.php:281
+#: ../admin/attachments.php:189
+#: ../admin/create_coy.php:261
 #: ../admin/crm_categories.php:106
 #: ../admin/fiscalyears.php:164
 #: ../admin/inst_lang.php:100
@@ -177,27 +194,28 @@ msgstr ""
 #: ../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/manage/gl_quick_entries.php:201
+#: ../gl/manage/gl_quick_entries.php:303
 #: ../gl/includes/ui/gl_bank_ui.inc:186
-#: ../gl/includes/ui/gl_journal_ui.inc:132
+#: ../gl/includes/ui/gl_journal_ui.inc:150
+#: ../includes/ui/class.crud_view.inc:281
 #: ../includes/ui/contacts_view.inc:64
 #: ../includes/ui/simple_crud_class.inc:52
-#: ../includes/ui/ui_view.inc:1468
+#: ../includes/ui/ui_view.inc:1504
 #: ../inventory/prices.php:159
-#: ../inventory/purchasing_data.php:165
-#: ../inventory/includes/item_adjustments_ui.inc:91
-#: ../inventory/includes/stock_transfers_ui.inc:83
+#: ../inventory/purchasing_data.php:164
+#: ../inventory/includes/item_adjustments_ui.inc:83
+#: ../inventory/includes/stock_transfers_ui.inc:80
 #: ../inventory/manage/item_categories.php:121
-#: ../inventory/manage/item_codes.php:140
+#: ../inventory/manage/item_codes.php:139
 #: ../inventory/manage/item_units.php:110
 #: ../inventory/manage/locations.php:161
-#: ../inventory/manage/movement_types.php:106
-#: ../inventory/manage/sales_kits.php:55
-#: ../manufacturing/manage/bom_edit.php:86
+#: ../inventory/manage/sales_kits.php:53
+#: ../manufacturing/manage/bom_edit.php:84
 #: ../manufacturing/manage/work_centres.php:114
 #: ../manufacturing/includes/work_order_issue_ui.inc:63
-#: ../purchasing/includes/ui/po_ui.inc:248
+#: ../purchasing/includes/ui/invoice_ui.inc:560
+#: ../purchasing/includes/ui/po_ui.inc:244
 #: ../sales/manage/credit_status.php:119
 #: ../sales/manage/customer_branches.php:154
 #: ../sales/manage/recurrent_invoices.php:136
@@ -206,31 +224,31 @@ msgstr ""
 #: ../sales/manage/sales_people.php:119
 #: ../sales/manage/sales_points.php:99
 #: ../sales/manage/sales_types.php:121
-#: ../sales/includes/ui/sales_credit_ui.inc:197
-#: ../sales/includes/ui/sales_order_ui.inc:198
+#: ../sales/includes/ui/sales_credit_ui.inc:198
+#: ../sales/includes/ui/sales_order_ui.inc:197
 #: ../taxes/item_tax_types.php:139
 #: ../taxes/tax_groups.php:137
 #: ../taxes/tax_types.php:132
 msgid "Edit"
 msgstr ""
 
-#: ../admin/attachments.php:188
-#: ../gl/inquiry/journal_inquiry.php:107
+#: ../admin/attachments.php:194
+#: ../gl/inquiry/journal_inquiry.php:116
 msgid "View"
 msgstr ""
 
-#: ../admin/attachments.php:193
+#: ../admin/attachments.php:199
 msgid "Download"
 msgstr ""
 
-#: ../admin/attachments.php:198
-#: ../admin/create_coy.php:282
+#: ../admin/attachments.php:204
+#: ../admin/create_coy.php:264
 #: ../admin/crm_categories.php:110
 #: ../admin/fiscalyears.php:166
-#: ../admin/inst_chart.php:80
+#: ../admin/inst_chart.php:84
 #: ../admin/inst_lang.php:109
-#: ../admin/inst_module.php:143
-#: ../admin/inst_theme.php:83
+#: ../admin/inst_module.php:142
+#: ../admin/inst_theme.php:87
 #: ../admin/payment_terms.php:143
 #: ../admin/printers.php:97
 #: ../admin/shipping_companies.php:107
@@ -242,27 +260,28 @@ msgstr ""
 #: ../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/manage/gl_quick_entries.php:202
+#: ../gl/manage/gl_quick_entries.php:304
 #: ../gl/includes/ui/gl_bank_ui.inc:188
-#: ../gl/includes/ui/gl_journal_ui.inc:134
+#: ../gl/includes/ui/gl_journal_ui.inc:152
+#: ../includes/ui/class.crud_view.inc:285
 #: ../includes/ui/contacts_view.inc:67
 #: ../includes/ui/simple_crud_class.inc:54
-#: ../includes/ui/ui_input.inc:287
+#: ../includes/ui/ui_input.inc:304
 #: ../inventory/prices.php:160
-#: ../inventory/purchasing_data.php:166
-#: ../inventory/includes/item_adjustments_ui.inc:93
-#: ../inventory/includes/stock_transfers_ui.inc:85
+#: ../inventory/purchasing_data.php:165
+#: ../inventory/includes/item_adjustments_ui.inc:85
+#: ../inventory/includes/stock_transfers_ui.inc:82
 #: ../inventory/manage/item_categories.php:122
-#: ../inventory/manage/item_codes.php:141
+#: ../inventory/manage/item_codes.php:140
 #: ../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
+#: ../inventory/manage/sales_kits.php:54
+#: ../manufacturing/manage/bom_edit.php:85
 #: ../manufacturing/manage/work_centres.php:115
 #: ../manufacturing/includes/work_order_issue_ui.inc:65
-#: ../purchasing/includes/ui/po_ui.inc:250
+#: ../purchasing/includes/ui/invoice_ui.inc:323
+#: ../purchasing/includes/ui/po_ui.inc:246
 #: ../sales/manage/credit_status.php:120
 #: ../sales/manage/customer_branches.php:158
 #: ../sales/manage/recurrent_invoices.php:137
@@ -271,15 +290,15 @@ msgstr ""
 #: ../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:200
+#: ../sales/includes/ui/sales_credit_ui.inc:200
+#: ../sales/includes/ui/sales_order_ui.inc:199
 #: ../taxes/item_tax_types.php:140
 #: ../taxes/tax_groups.php:138
 #: ../taxes/tax_types.php:133
 msgid "Delete"
 msgstr ""
 
-#: ../admin/attachments.php:205
+#: ../admin/attachments.php:211
 #: ../admin/view_print_transaction.php:126
 #: ../admin/void_transaction.php:181
 #: ../dimensions/inquiry/search_dimensions.php:128
@@ -287,10 +306,10 @@ msgstr ""
 #: ../gl/bank_account_reconcile.php:232
 #: ../gl/inquiry/bank_inquiry.php:71
 #: ../gl/inquiry/gl_account_inquiry.php:126
-#: ../gl/inquiry/journal_inquiry.php:99
-#: ../gl/inquiry/journal_inquiry.php:112
-#: ../includes/ui/allocation_cart.inc:290
-#: ../inventory/inquiry/stock_movements.php:78
+#: ../gl/inquiry/journal_inquiry.php:106
+#: ../gl/inquiry/journal_inquiry.php:121
+#: ../includes/ui/allocation_cart.inc:291
+#: ../inventory/inquiry/stock_movements.php:79
 #: ../manufacturing/search_work_orders.php:165
 #: ../manufacturing/includes/manufacturing_ui.inc:157
 #: ../manufacturing/includes/manufacturing_ui.inc:200
@@ -300,12 +319,12 @@ msgstr ""
 #: ../manufacturing/includes/manufacturing_ui.inc:331
 #: ../purchasing/view/view_po.php:115
 #: ../purchasing/view/view_po.php:140
-#: ../purchasing/inquiry/po_search_completed.php:122
+#: ../purchasing/inquiry/po_search_completed.php:110
 #: ../purchasing/inquiry/po_search.php:117
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:128
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:137
 #: ../purchasing/inquiry/supplier_inquiry.php:174
 #: ../purchasing/allocations/supplier_allocation_main.php:95
-#: ../reporting/rep101.php:118
+#: ../reporting/rep101.php:133
 #: ../reporting/rep201.php:110
 #: ../reporting/rep203.php:93
 #: ../reporting/rep306.php:141
@@ -322,41 +341,43 @@ msgstr ""
 #: ../sales/view/view_sales_order.php:109
 #: ../sales/view/view_sales_order.php:142
 #: ../sales/view/view_sales_order.php:179
-#: ../sales/inquiry/customer_allocation_inquiry.php:145
+#: ../sales/inquiry/customer_allocation_inquiry.php:147
+#: ../sales/inquiry/customer_inquiry.php:203
 msgid "#"
 msgstr ""
 
-#: ../admin/attachments.php:206
-#: ../admin/attachments.php:250
+#: ../admin/attachments.php:212
+#: ../admin/attachments.php:256
 #: ../admin/crm_categories.php:88
 #: ../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
-#: ../inventory/manage/item_codes.php:125
+#: ../gl/manage/gl_quick_entries.php:190
+#: ../gl/manage/gl_quick_entries.php:230
+#: ../inventory/manage/item_codes.php:124
 #: ../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
+#: ../inventory/manage/sales_kits.php:38
+#: ../inventory/view/view_adjustment.php:54
+#: ../inventory/view/view_transfer.php:50
+#: ../manufacturing/manage/bom_edit.php:68
 #: ../manufacturing/includes/manufacturing_ui.inc:28
+#: ../purchasing/includes/ui/invoice_ui.inc:510
+#: ../purchasing/includes/ui/invoice_ui.inc:522
 #: ../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/rep304.php:126
 #: ../reporting/rep305.php:101
 #: ../reporting/rep306.php:141
 #: ../reporting/rep307.php:117
-#: ../reporting/rep308.php:230
+#: ../reporting/rep308.php:242
 #: ../reporting/rep309.php:98
 #: ../reporting/rep401.php:71
-#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/create_recurrent_invoices.php:136
 #: ../sales/manage/credit_status.php:97
 #: ../sales/manage/recurrent_invoices.php:108
 #: ../sales/inquiry/sales_orders_view.php:281
@@ -366,30 +387,30 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ../admin/attachments.php:207
+#: ../admin/attachments.php:213
 #: ../admin/backups.php:67
 #: ../admin/backups.php:152
 msgid "Filename"
 msgstr ""
 
-#: ../admin/attachments.php:208
+#: ../admin/attachments.php:214
 msgid "Size"
 msgstr ""
 
-#: ../admin/attachments.php:209
+#: ../admin/attachments.php:215
 msgid "Filetype"
 msgstr ""
 
-#: ../admin/attachments.php:210
+#: ../admin/attachments.php:216
 msgid "Date Uploaded"
 msgstr ""
 
-#: ../admin/attachments.php:244
-#: ../admin/attachments.php:249
+#: ../admin/attachments.php:250
+#: ../admin/attachments.php:255
 msgid "Transaction #"
 msgstr ""
 
-#: ../admin/attachments.php:251
+#: ../admin/attachments.php:257
 msgid "Attached File"
 msgstr ""
 
@@ -398,7 +419,7 @@ msgstr ""
 #: ../admin/backups.php:118
 #: ../admin/backups.php:145
 #: ../admin/backups.php:158
-#: ../admin/backups.php:176
+#: ../admin/backups.php:178
 msgid "Select backup file first."
 msgstr ""
 
@@ -427,7 +448,7 @@ msgid "Database backup failed."
 msgstr ""
 
 #: ../admin/backups.php:102
-#: ../admin/create_coy.php:269
+#: ../admin/create_coy.php:260
 #: ../admin/fiscalyears.php:155
 #: ../admin/inst_lang.php:85
 #: ../admin/inst_lang.php:97
@@ -435,17 +456,18 @@ msgstr ""
 #: ../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
+#: ../gl/manage/gl_quick_entries.php:237
 #: ../includes/system_tests.inc:38
 #: ../includes/system_tests.inc:113
 #: ../includes/system_tests.inc:126
-#: ../includes/ui/ui_lists.inc:1670
-#: ../purchasing/manage/suppliers.php:123
-#: ../reporting/rep101.php:114
-#: ../reporting/rep102.php:114
-#: ../reporting/rep102.php:116
+#: ../includes/ui/class.reflines_crud.inc:56
+#: ../includes/ui/ui_lists.inc:1647
+#: ../purchasing/manage/suppliers.php:121
+#: ../reporting/rep101.php:129
+#: ../reporting/rep102.php:119
+#: ../reporting/rep102.php:121
 #: ../reporting/rep104.php:105
-#: ../reporting/rep106.php:82
+#: ../reporting/rep106.php:81
 #: ../reporting/rep114.php:74
 #: ../reporting/rep201.php:106
 #: ../reporting/rep202.php:118
@@ -453,6 +475,7 @@ msgstr ""
 #: ../reporting/rep203.php:89
 #: ../reporting/rep303.php:113
 #: ../reporting/rep303.php:117
+#: ../reporting/rep304.php:122
 #: ../reporting/rep402.php:99
 #: ../reporting/rep402.php:134
 #: ../reporting/rep501.php:113
@@ -479,69 +502,84 @@ msgstr ""
 msgid "You can only upload *.sql backup files"
 msgstr ""
 
-#: ../admin/backups.php:171
+#: ../admin/backups.php:170
+msgid "Filename contains forbidden chars. Please rename file and try again."
+msgstr ""
+
+#: ../admin/backups.php:173
 msgid "File uploaded to backup directory"
 msgstr ""
 
-#: ../admin/backups.php:174
+#: ../admin/backups.php:176
 msgid "File was not uploaded into the system."
 msgstr ""
 
-#: ../admin/backups.php:183
+#: ../admin/backups.php:185
 msgid "Create backup"
 msgstr ""
 
-#: ../admin/backups.php:184
+#: ../admin/backups.php:186
+#: ../sales/includes/ui/sales_order_ui.inc:582
+#: ../sales/includes/ui/sales_order_ui.inc:638
 msgid "Comments:"
 msgstr ""
 
-#: ../admin/backups.php:185
+#: ../admin/backups.php:187
 msgid "Compression:"
 msgstr ""
 
-#: ../admin/backups.php:187
+#: ../admin/backups.php:189
 msgid "Create Backup"
 msgstr ""
 
-#: ../admin/backups.php:189
+#: ../admin/backups.php:191
 msgid "Backup scripts maintenance"
 msgstr ""
 
-#: ../admin/backups.php:195
+#: ../admin/backups.php:197
 msgid "View Backup"
 msgstr ""
 
-#: ../admin/backups.php:196
+#: ../admin/backups.php:198
 msgid "Download Backup"
 msgstr ""
 
-#: ../admin/backups.php:197
+#: ../admin/backups.php:199
 msgid "Restore Backup"
 msgstr ""
 
-#: ../admin/backups.php:198
+#: ../admin/backups.php:200
 msgid ""
 "You are about to restore database from backup file.\n"
 "Do you want to continue?"
 msgstr ""
 
-#: ../admin/backups.php:200
+#: ../admin/backups.php:202
 msgid "Delete Backup"
 msgstr ""
 
-#: ../admin/backups.php:202
+#: ../admin/backups.php:204
 #, php-format
 msgid ""
 "You are about to remove selected backup file.\n"
 "Do you want to continue ?"
 msgstr ""
 
-#: ../admin/backups.php:208
+#: ../admin/backups.php:210
+msgid "Update security settings"
+msgstr ""
+
+#: ../admin/backups.php:211
+msgid "Protect security settings"
+msgstr ""
+
+#: ../admin/backups.php:215
 msgid "Upload file"
 msgstr ""
 
 #: ../admin/change_current_user_password.php:16
 #: ../admin/change_current_user_password.php:99
+#: ../themes/default/renderer.php:76
 msgid "Change password"
 msgstr ""
 
@@ -605,224 +643,231 @@ msgstr ""
 msgid "The company name must be entered."
 msgstr ""
 
-#: ../admin/company_preferences.php:52
+#: ../admin/company_preferences.php:46
+msgid "Error uploading logo file."
+msgstr ""
+
+#: ../admin/company_preferences.php:60
 msgid ""
 "Only jpg and png files are supported - a file extension of .jpg or .png is "
 "expected"
 msgstr ""
 
-#: ../admin/company_preferences.php:57
-#: ../inventory/manage/items.php:86
+#: ../admin/company_preferences.php:65
+#: ../inventory/manage/items.php:95
 msgid ""
 "The file size is over the maximum allowed. The maximum size allowed in KB is"
 msgstr ""
 
-#: ../admin/company_preferences.php:62
-#: ../inventory/manage/items.php:76
-#: ../inventory/manage/items.php:91
+#: ../admin/company_preferences.php:70
+#: ../inventory/manage/items.php:85
+#: ../inventory/manage/items.php:100
 msgid "Only graphics files can be uploaded"
 msgstr ""
 
-#: ../admin/company_preferences.php:70
-#: ../admin/company_preferences.php:91
-#: ../inventory/manage/items.php:99
+#: ../admin/company_preferences.php:78
+#: ../admin/company_preferences.php:99
+#: ../inventory/manage/items.php:108
 msgid "The existing image could not be removed"
 msgstr ""
 
-#: ../admin/company_preferences.php:80
+#: ../admin/company_preferences.php:88
 msgid "Error uploading logo file"
 msgstr ""
 
-#: ../admin/company_preferences.php:114
+#: ../admin/company_preferences.php:122
 msgid "Company setup has been updated."
 msgstr ""
 
-#: ../admin/company_preferences.php:173
+#: ../admin/company_preferences.php:167
 msgid "Name (to appear on reports):"
 msgstr ""
 
-#: ../admin/company_preferences.php:174
+#: ../admin/company_preferences.php:168
 #: ../admin/shipping_companies.php:142
 #: ../includes/ui/contacts_view.inc:109
 #: ../inventory/manage/locations.php:202
 #: ../sales/manage/customers.php:234
+#: ../sales/includes/ui/sales_order_ui.inc:629
 msgid "Address:"
 msgstr ""
 
-#: ../admin/company_preferences.php:175
+#: ../admin/company_preferences.php:169
 msgid "Domicile:"
 msgstr ""
 
-#: ../admin/company_preferences.php:177
+#: ../admin/company_preferences.php:171
 #: ../admin/shipping_companies.php:138
-#: ../purchasing/manage/suppliers.php:137
+#: ../purchasing/manage/suppliers.php:134
 #: ../sales/manage/customer_branches.php:249
 msgid "Phone Number:"
 msgstr ""
 
-#: ../admin/company_preferences.php:178
+#: ../admin/company_preferences.php:172
 #: ../includes/ui/contacts_view.inc:104
-#: ../purchasing/manage/suppliers.php:140
+#: ../purchasing/manage/suppliers.php:137
 #: ../sales/manage/customer_branches.php:251
 #: ../sales/manage/customers.php:258
 msgid "Fax Number:"
 msgstr ""
 
-#: ../admin/company_preferences.php:179
+#: ../admin/company_preferences.php:173
 #: ../admin/users.php:211
 msgid "Email Address:"
 msgstr ""
 
-#: ../admin/company_preferences.php:181
+#: ../admin/company_preferences.php:175
 msgid "BCC Address for all outgoing mails:"
 msgstr ""
 
-#: ../admin/company_preferences.php:183
+#: ../admin/company_preferences.php:177
 msgid "Official Company Number:"
 msgstr ""
 
-#: ../admin/company_preferences.php:184
-#: ../purchasing/manage/suppliers.php:96
+#: ../admin/company_preferences.php:178
+#: ../purchasing/manage/suppliers.php:94
 #: ../sales/manage/customers.php:236
 msgid "GSTNo:"
 msgstr ""
 
-#: ../admin/company_preferences.php:186
+#: ../admin/company_preferences.php:180
 #: ../gl/gl_budget.php:63
 msgid "Fiscal Year:"
 msgstr ""
 
-#: ../admin/company_preferences.php:187
+#: ../admin/company_preferences.php:181
 msgid "Tax Periods:"
 msgstr ""
 
-#: ../admin/company_preferences.php:187
+#: ../admin/company_preferences.php:181
 msgid "Months."
 msgstr ""
 
-#: ../admin/company_preferences.php:188
+#: ../admin/company_preferences.php:182
 msgid "Tax Last Period:"
 msgstr ""
 
-#: ../admin/company_preferences.php:188
+#: ../admin/company_preferences.php:182
 msgid "Months back."
 msgstr ""
 
-#: ../admin/company_preferences.php:189
+#: ../admin/company_preferences.php:183
 msgid "Put alternative Tax Include on Docs"
 msgstr ""
 
-#: ../admin/company_preferences.php:190
+#: ../admin/company_preferences.php:184
 msgid "Suppress Tax Rates on Docs"
 msgstr ""
 
-#: ../admin/company_preferences.php:194
+#: ../admin/company_preferences.php:188
 msgid "Company Logo:"
 msgstr ""
 
-#: ../admin/company_preferences.php:195
+#: ../admin/company_preferences.php:189
 msgid "New Company Logo (.jpg)"
 msgstr ""
 
-#: ../admin/company_preferences.php:196
+#: ../admin/company_preferences.php:190
 msgid "Delete Company Logo:"
 msgstr ""
 
-#: ../admin/company_preferences.php:198
+#: ../admin/company_preferences.php:192
 msgid "Use Dimensions:"
 msgstr ""
 
-#: ../admin/company_preferences.php:199
+#: ../admin/company_preferences.php:193
 msgid "Base for auto price calculations:"
 msgstr ""
 
-#: ../admin/company_preferences.php:200
+#: ../admin/company_preferences.php:194
 msgid "No base price list"
 msgstr ""
 
-#: ../admin/company_preferences.php:201
+#: ../admin/company_preferences.php:195
 msgid "Add Price from Std Cost:"
 msgstr ""
 
-#: ../admin/company_preferences.php:203
+#: ../admin/company_preferences.php:197
 msgid "Round to nearest:"
 msgstr ""
 
-#: ../admin/company_preferences.php:206
+#: ../admin/company_preferences.php:200
 msgid "Search Item List"
 msgstr ""
 
-#: ../admin/company_preferences.php:207
+#: ../admin/company_preferences.php:201
 msgid "Search Customer List"
 msgstr ""
 
-#: ../admin/company_preferences.php:208
+#: ../admin/company_preferences.php:202
 msgid "Search Supplier List"
 msgstr ""
 
-#: ../admin/company_preferences.php:210
+#: ../admin/company_preferences.php:204
 msgid "Home Currency:"
 msgstr ""
 
-#: ../admin/company_preferences.php:211
+#: ../admin/company_preferences.php:205
 msgid "Automatic Revaluation Currency Accounts"
 msgstr ""
 
-#: ../admin/company_preferences.php:212
+#: ../admin/company_preferences.php:206
 msgid "Time Zone on Reports"
 msgstr ""
 
-#: ../admin/company_preferences.php:213
+#: ../admin/company_preferences.php:207
 msgid "Login Timeout:"
 msgstr ""
 
-#: ../admin/company_preferences.php:213
+#: ../admin/company_preferences.php:207
 msgid "seconds"
 msgstr ""
 
-#: ../admin/company_preferences.php:214
+#: ../admin/company_preferences.php:208
 msgid "Version Id"
 msgstr ""
 
-#: ../admin/company_preferences.php:219
+#: ../admin/company_preferences.php:213
 #: ../admin/display_prefs.php:160
-#: ../admin/forms_setup.php:61
-#: ../admin/gl_setup.php:309
-#: ../admin/inst_chart.php:74
+#: ../admin/gl_setup.php:260
+#: ../admin/inst_chart.php:78
 #: ../admin/inst_lang.php:103
-#: ../admin/inst_module.php:137
-#: ../admin/inst_module.php:155
-#: ../admin/inst_module.php:198
-#: ../admin/inst_theme.php:77
-#: ../dimensions/dimension_entry.php:293
-#: ../gl/gl_bank.php:417
+#: ../admin/inst_module.php:136
+#: ../admin/inst_module.php:154
+#: ../admin/inst_module.php:197
+#: ../admin/inst_theme.php:81
+#: ../dimensions/dimension_entry.php:283
+#: ../gl/gl_bank.php:410
 #: ../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:256
+#: ../gl/includes/ui/gl_journal_ui.inc:267
+#: ../includes/ui/class.crud_view.inc:289
 #: ../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:209
-#: ../includes/ui/ui_input.inc:907
-#: ../inventory/adjustments.php:234
-#: ../inventory/cost_update.php:134
+#: ../includes/ui/ui_input.inc:226
+#: ../includes/ui/ui_input.inc:981
+#: ../inventory/adjustments.php:218
+#: ../inventory/cost_update.php:133
 #: ../inventory/reorder_level.php:112
-#: ../inventory/transfers.php:230
-#: ../inventory/includes/item_adjustments_ui.inc:163
-#: ../inventory/includes/stock_transfers_ui.inc:143
-#: ../inventory/manage/sales_kits.php:208
-#: ../manufacturing/work_order_entry.php:457
+#: ../inventory/transfers.php:216
+#: ../inventory/includes/item_adjustments_ui.inc:155
+#: ../inventory/includes/stock_transfers_ui.inc:140
+#: ../inventory/manage/sales_kits.php:205
+#: ../manufacturing/work_order_entry.php:448
 #: ../manufacturing/includes/work_order_issue_ui.inc:138
-#: ../purchasing/includes/ui/po_ui.inc:281
-#: ../purchasing/includes/ui/po_ui.inc:432
-#: ../purchasing/po_receive_items.php:332
+#: ../purchasing/includes/ui/po_ui.inc:278
+#: ../purchasing/includes/ui/po_ui.inc:429
+#: ../purchasing/po_receive_items.php:325
 #: ../sales/credit_note_entry.php:284
-#: ../sales/customer_credit_invoice.php:381
-#: ../sales/customer_delivery.php:528
+#: ../sales/customer_credit_invoice.php:383
+#: ../sales/customer_delivery.php:530
+#: ../sales/customer_invoice.php:692
 #: ../sales/inquiry/sales_orders_view.php:313
-#: ../sales/includes/ui/sales_credit_ui.inc:293
-#: ../sales/includes/ui/sales_order_ui.inc:233
+#: ../sales/includes/ui/sales_credit_ui.inc:294
+#: ../sales/includes/ui/sales_order_ui.inc:232
+#: ../sales/includes/ui/sales_order_ui.inc:548
 msgid "Update"
 msgstr ""
 
@@ -830,133 +875,134 @@ msgstr ""
 msgid "Create/Update Company"
 msgstr ""
 
-#: ../admin/create_coy.php:46
-#: ../admin/create_coy.php:52
+#: ../admin/create_coy.php:37
+#: ../admin/create_coy.php:43
 msgid "Database settings are not specified."
 msgstr ""
 
-#: ../admin/create_coy.php:62
+#: ../admin/create_coy.php:53
 msgid "This database settings are already used by another company."
 msgstr ""
 
-#: ../admin/create_coy.php:67
+#: ../admin/create_coy.php:58
 msgid ""
 "You cannot have table set without prefix together with prefixed sets in the "
 "same database."
 msgstr ""
 
-#: ../admin/create_coy.php:127
+#: ../admin/create_coy.php:117
 msgid "Error creating Database: "
 msgstr ""
 
-#: ../admin/create_coy.php:127
+#: ../admin/create_coy.php:117
 msgid ", Please create it manually"
 msgstr ""
 
-#: ../admin/create_coy.php:133
+#: ../admin/create_coy.php:123
 msgid "Cannot create new company due to bugs in sql file."
 msgstr ""
 
-#: ../admin/create_coy.php:152
-#: ../admin/create_coy.php:219
+#: ../admin/create_coy.php:141
+#: ../admin/create_coy.php:209
 msgid "Cannot open the configuration file - "
 msgstr ""
 
-#: ../admin/create_coy.php:154
-#: ../admin/create_coy.php:221
+#: ../admin/create_coy.php:143
+#: ../admin/create_coy.php:211
 msgid "Cannot write to the configuration file - "
 msgstr ""
 
-#: ../admin/create_coy.php:156
-#: ../admin/create_coy.php:191
-#: ../admin/create_coy.php:223
+#: ../admin/create_coy.php:145
+#: ../admin/create_coy.php:181
+#: ../admin/create_coy.php:213
 msgid "The configuration file "
 msgstr ""
 
-#: ../admin/create_coy.php:156
-#: ../admin/create_coy.php:191
-#: ../admin/create_coy.php:223
+#: ../admin/create_coy.php:145
+#: ../admin/create_coy.php:181
+#: ../admin/create_coy.php:213
 #: ../admin/db/maintenance_db.inc:250
 msgid ""
 " is not writable. Change its permissions so it is, then re-run the operation."
 msgstr ""
 
-#: ../admin/create_coy.php:168
+#: ../admin/create_coy.php:157
 msgid "New company has been created."
 msgstr ""
 
-#: ../admin/create_coy.php:168
+#: ../admin/create_coy.php:157
 msgid "Company has been updated."
 msgstr ""
 
-#: ../admin/create_coy.php:184
+#: ../admin/create_coy.php:174
 msgid ""
 "Broken company subdirectories system. You have to remove this company "
 "manually."
 msgstr ""
 
-#: ../admin/create_coy.php:200
+#: ../admin/create_coy.php:190
 msgid "Cannot rename subdirectory to temporary name."
 msgstr ""
 
-#: ../admin/create_coy.php:206
+#: ../admin/create_coy.php:196
 msgid "Cannot rename company subdirectory"
 msgstr ""
 
-#: ../admin/create_coy.php:212
+#: ../admin/create_coy.php:202
 msgid "Error removing Database: "
 msgstr ""
 
-#: ../admin/create_coy.php:212
+#: ../admin/create_coy.php:202
 msgid ", please remove it manually"
 msgstr ""
 
-#: ../admin/create_coy.php:232
+#: ../admin/create_coy.php:222
 msgid "Cannot remove temporary renamed company data directory "
 msgstr ""
 
-#: ../admin/create_coy.php:235
+#: ../admin/create_coy.php:225
 msgid "Selected company has been deleted"
 msgstr ""
 
-#: ../admin/create_coy.php:250
-msgid "Are you sure you want to delete company no. "
-msgstr ""
-
-#: ../admin/create_coy.php:257
+#: ../admin/create_coy.php:240
 msgid "Database Host"
 msgstr ""
 
-#: ../admin/create_coy.php:257
-#: ../admin/create_coy.php:345
-#: ../admin/create_coy.php:351
+#: ../admin/create_coy.php:240
+#: ../admin/create_coy.php:321
+#: ../admin/create_coy.php:331
 msgid "Database User"
 msgstr ""
 
-#: ../admin/create_coy.php:258
-#: ../admin/create_coy.php:347
-#: ../admin/create_coy.php:352
+#: ../admin/create_coy.php:241
+#: ../admin/create_coy.php:323
+#: ../admin/create_coy.php:332
 msgid "Database Name"
 msgstr ""
 
-#: ../admin/create_coy.php:258
-#: ../admin/create_coy.php:348
-#: ../admin/create_coy.php:353
+#: ../admin/create_coy.php:241
+#: ../admin/create_coy.php:325
+#: ../admin/create_coy.php:333
 msgid "Table Pref"
 msgstr ""
 
-#: ../admin/create_coy.php:258
-#: ../admin/create_coy.php:355
+#: ../admin/create_coy.php:241
+msgid "Charset"
+msgstr ""
+
+#: ../admin/create_coy.php:241
 #: ../admin/inst_lang.php:36
 #: ../admin/print_profiles.php:162
+#: ../includes/ui/class.reflines_crud.inc:38
 #: ../purchasing/includes/ui/invoice_ui.inc:132
 #: ../purchasing/includes/ui/invoice_ui.inc:135
-#: ../purchasing/includes/ui/po_ui.inc:176
-#: ../purchasing/includes/ui/po_ui.inc:178
+#: ../purchasing/includes/ui/po_ui.inc:172
+#: ../purchasing/includes/ui/po_ui.inc:174
 msgid "Default"
 msgstr ""
 
-#: ../admin/create_coy.php:267
+#: ../admin/create_coy.php:260
+#: ../admin/create_coy.php:337
 #: ../admin/fiscalyears.php:159
 #: ../admin/inst_lang.php:85
 #: ../admin/inst_lang.php:97
@@ -964,17 +1010,19 @@ msgstr ""
 #: ../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
+#: ../gl/manage/gl_quick_entries.php:237
 #: ../includes/system_tests.inc:38
 #: ../includes/system_tests.inc:113
 #: ../includes/system_tests.inc:126
-#: ../includes/ui/ui_lists.inc:1671
-#: ../purchasing/manage/suppliers.php:123
-#: ../reporting/rep101.php:113
-#: ../reporting/rep102.php:113
-#: ../reporting/rep102.php:115
+#: ../includes/ui/class.reflines_crud.inc:56
+#: ../includes/ui/class.reflines_crud.inc:100
+#: ../includes/ui/ui_lists.inc:1648
+#: ../purchasing/manage/suppliers.php:121
+#: ../reporting/rep101.php:128
+#: ../reporting/rep102.php:118
+#: ../reporting/rep102.php:120
 #: ../reporting/rep104.php:107
-#: ../reporting/rep106.php:84
+#: ../reporting/rep106.php:83
 #: ../reporting/rep114.php:76
 #: ../reporting/rep201.php:105
 #: ../reporting/rep202.php:117
@@ -982,6 +1030,7 @@ msgstr ""
 #: ../reporting/rep203.php:88
 #: ../reporting/rep303.php:108
 #: ../reporting/rep303.php:116
+#: ../reporting/rep304.php:121
 #: ../reporting/rep402.php:99
 #: ../reporting/rep501.php:111
 #: ../sales/manage/sales_points.php:94
@@ -991,54 +1040,63 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: ../admin/create_coy.php:296
+#: ../admin/create_coy.php:266
+#, php-format
+msgid ""
+"You are about to remove company \\'%s\\'.\n"
+"Do you want to continue ?"
+msgstr ""
+
+#: ../admin/create_coy.php:274
 msgid "The marked company is the current company which cannot be deleted."
 msgstr ""
 
-#: ../admin/create_coy.php:297
+#: ../admin/create_coy.php:275
 msgid ""
 "If no Admin Password is entered, the new Admin Password will be "
 "'<b>password</b>' by default "
 msgstr ""
 
-#: ../admin/create_coy.php:344
-#: ../admin/create_coy.php:350
+#: ../admin/create_coy.php:320
+#: ../admin/create_coy.php:330
 #: ../admin/printers.php:84
 msgid "Host"
 msgstr ""
 
-#: ../admin/create_coy.php:346
+#: ../admin/create_coy.php:322
 msgid "Database Password"
 msgstr ""
 
-#: ../admin/create_coy.php:348
-#: ../admin/inst_chart.php:68
-#: ../admin/inst_chart.php:70
+#: ../admin/create_coy.php:324
+msgid "Database Collation:"
+msgstr ""
+
+#: ../admin/create_coy.php:325
+#: ../admin/inst_chart.php:72
+#: ../admin/inst_chart.php:74
 #: ../admin/inst_lang.php:87
 #: ../admin/inst_lang.php:90
-#: ../admin/inst_module.php:126
-#: ../admin/inst_theme.php:72
-#: ../admin/inst_theme.php:74
+#: ../admin/inst_module.php:125
+#: ../admin/inst_theme.php:76
+#: ../admin/inst_theme.php:78
 #: ../gl/manage/gl_account_types.php:190
-#: ../includes/ui/allocation_cart.inc:316
+#: ../includes/db/audit_trail_db.inc:127
+#: ../includes/ui/allocation_cart.inc:317
 msgid "None"
 msgstr ""
 
-#: ../admin/create_coy.php:359
-msgid "Database Script"
-msgstr ""
-
-#: ../admin/create_coy.php:360
-msgid "New script Admin Password"
+#: ../admin/create_coy.php:326
+#: ../admin/create_coy.php:335
+#: ../admin/create_coy.php:337
+msgid "Default Company"
 msgstr ""
 
-#: ../admin/create_coy.php:364
-#: ../gl/gl_budget.php:136
-msgid "Save"
+#: ../admin/create_coy.php:327
+msgid "Database Script"
 msgstr ""
 
-#: ../admin/create_coy.php:386
-msgid "Create a new company"
+#: ../admin/create_coy.php:328
+msgid "New script Admin Password"
 msgstr ""
 
 #: ../admin/crm_categories.php:17
@@ -1337,7 +1395,7 @@ msgstr ""
 #: ../dimensions/inquiry/search_dimensions.php:134
 #: ../dimensions/inquiry/search_dimensions.php:140
 #: ../includes/ui/ui_lists.inc:671
-#: ../includes/ui/ui_view.inc:1467
+#: ../includes/ui/ui_view.inc:1503
 #: ../manufacturing/search_work_orders.php:114
 #: ../reporting/rep402.php:103
 #: ../reporting/rep501.php:87
@@ -1373,20 +1431,8 @@ msgstr ""
 msgid "Is Closed:"
 msgstr ""
 
-#: ../admin/forms_setup.php:16
-msgid "Forms Setup"
-msgstr ""
-
-#: ../admin/forms_setup.php:36
-msgid "Forms settings have been updated."
-msgstr ""
-
-#: ../admin/forms_setup.php:46
-msgid "Form"
-msgstr ""
-
-#: ../admin/forms_setup.php:46
-msgid "Next Reference"
+#: ../admin/forms_setup.php:20
+msgid "Transaction References"
 msgstr ""
 
 #: ../admin/gl_setup.php:16
@@ -1410,7 +1456,7 @@ msgid "Before GRN Clearing Account can be changed all GRNs have to be invoiced"
 msgstr ""
 
 #: ../admin/gl_setup.php:62
-#: ../admin/db/fiscalyears_db.inc:139
+#: ../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 "
@@ -1421,86 +1467,86 @@ msgstr ""
 msgid "The general GL setup has been updated."
 msgstr ""
 
-#: ../admin/gl_setup.php:197
+#: ../admin/gl_setup.php:148
 msgid "General GL"
 msgstr ""
 
-#: ../admin/gl_setup.php:199
+#: ../admin/gl_setup.php:150
 msgid "Past Due Days Interval:"
 msgstr ""
 
-#: ../admin/gl_setup.php:199
-#: ../admin/gl_setup.php:245
-#: ../admin/gl_setup.php:247
-#: ../admin/gl_setup.php:255
-#: ../admin/gl_setup.php:273
-#: ../admin/gl_setup.php:303
+#: ../admin/gl_setup.php:150
+#: ../admin/gl_setup.php:196
+#: ../admin/gl_setup.php:198
+#: ../admin/gl_setup.php:206
+#: ../admin/gl_setup.php:224
+#: ../admin/gl_setup.php:254
 #: ../admin/payment_terms.php:140
 msgid "days"
 msgstr ""
 
-#: ../admin/gl_setup.php:201
+#: ../admin/gl_setup.php:152
 msgid "Accounts Type:"
 msgstr ""
 
-#: ../admin/gl_setup.php:203
+#: ../admin/gl_setup.php:154
 msgid "Retained Earnings:"
 msgstr ""
 
-#: ../admin/gl_setup.php:205
+#: ../admin/gl_setup.php:156
 msgid "Profit/Loss Year:"
 msgstr ""
 
-#: ../admin/gl_setup.php:207
+#: ../admin/gl_setup.php:158
 msgid "Exchange Variances Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:209
+#: ../admin/gl_setup.php:160
 #: ../gl/manage/bank_accounts.php:193
 msgid "Bank Charges Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:211
+#: ../admin/gl_setup.php:162
 msgid "Tax Algorithm:"
 msgstr ""
 
-#: ../admin/gl_setup.php:215
+#: ../admin/gl_setup.php:166
 msgid "Customers and Sales"
 msgstr ""
 
-#: ../admin/gl_setup.php:217
+#: ../admin/gl_setup.php:168
 msgid "Default Credit Limit:"
 msgstr ""
 
-#: ../admin/gl_setup.php:219
+#: ../admin/gl_setup.php:170
 msgid "Invoice Identification:"
 msgstr ""
 
-#: ../admin/gl_setup.php:219
+#: ../admin/gl_setup.php:170
 #: ../gl/manage/bank_accounts.php:110
 #: ../includes/ui/ui_view.inc:548
 msgid "Number"
 msgstr ""
 
-#: ../admin/gl_setup.php:219
+#: ../admin/gl_setup.php:170
 #: ../admin/view_print_transaction.php:127
 #: ../admin/void_transaction.php:182
 #: ../dimensions/inquiry/search_dimensions.php:129
 #: ../dimensions/view/view_dimension.php:55
 #: ../gl/bank_account_reconcile.php:233
 #: ../gl/inquiry/bank_inquiry.php:71
-#: ../gl/inquiry/journal_inquiry.php:103
+#: ../gl/inquiry/journal_inquiry.php:112
 #: ../gl/view/bank_transfer_view.php:86
 #: ../gl/view/gl_deposit_view.php:80
 #: ../gl/view/gl_payment_view.php:78
-#: ../gl/view/gl_trans_view.php:35
+#: ../gl/view/gl_trans_view.php:38
 #: ../includes/ui/contacts_view.inc:41
-#: ../inventory/inquiry/stock_movements.php:78
-#: ../inventory/view/view_adjustment.php:44
-#: ../inventory/view/view_transfer.php:44
+#: ../inventory/inquiry/stock_movements.php:79
+#: ../inventory/view/view_adjustment.php:43
+#: ../inventory/view/view_transfer.php:36
 #: ../manufacturing/search_work_orders.php:166
-#: ../manufacturing/view/wo_issue_view.php:43
-#: ../manufacturing/view/wo_production_view.php:44
+#: ../manufacturing/view/wo_issue_view.php:42
+#: ../manufacturing/view/wo_production_view.php:43
 #: ../manufacturing/includes/manufacturing_ui.inc:157
 #: ../manufacturing/includes/manufacturing_ui.inc:200
 #: ../manufacturing/includes/manufacturing_ui.inc:276
@@ -1508,14 +1554,14 @@ msgstr ""
 #: ../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:296
+#: ../purchasing/includes/ui/po_ui.inc:293
 #: ../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:123
+#: ../purchasing/inquiry/po_search_completed.php:111
 #: ../purchasing/inquiry/po_search.php:118
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:129
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:138
 #: ../purchasing/inquiry/supplier_inquiry.php:175
 #: ../purchasing/allocations/supplier_allocation_main.php:96
 #: ../reporting/rep501.php:87
@@ -1523,192 +1569,193 @@ msgstr ""
 #: ../reporting/rep602.php:80
 #: ../reporting/rep702.php:53
 #: ../reporting/includes/doctext.inc:220
-#: ../sales/customer_credit_invoice.php:245
-#: ../sales/customer_credit_invoice.php:247
-#: ../sales/customer_delivery.php:337
-#: ../sales/customer_delivery.php:339
-#: ../sales/customer_invoice.php:464
-#: ../sales/customer_invoice.php:466
+#: ../sales/customer_credit_invoice.php:244
+#: ../sales/customer_credit_invoice.php:249
+#: ../sales/customer_delivery.php:336
+#: ../sales/customer_delivery.php:341
+#: ../sales/customer_invoice.php:463
+#: ../sales/customer_invoice.php:468
 #: ../sales/allocations/customer_allocation_main.php:95
 #: ../sales/view/view_dispatch.php:85
 #: ../sales/view/view_invoice.php:85
 #: ../sales/view/view_receipt.php:39
 #: ../sales/view/view_sales_order.php:94
-#: ../sales/inquiry/customer_allocation_inquiry.php:146
+#: ../sales/inquiry/customer_allocation_inquiry.php:148
+#: ../sales/inquiry/customer_inquiry.php:205
 #: ../sales/inquiry/sales_deliveries_view.php:173
-#: ../sales/includes/ui/sales_credit_ui.inc:85
-#: ../sales/includes/ui/sales_credit_ui.inc:87
-#: ../sales/includes/ui/sales_order_ui.inc:365
+#: ../sales/includes/ui/sales_credit_ui.inc:86
+#: ../sales/includes/ui/sales_credit_ui.inc:88
+#: ../sales/includes/ui/sales_order_ui.inc:364
 msgid "Reference"
 msgstr ""
 
-#: ../admin/gl_setup.php:221
+#: ../admin/gl_setup.php:172
 msgid "Accumulate batch shipping:"
 msgstr ""
 
-#: ../admin/gl_setup.php:223
+#: ../admin/gl_setup.php:174
 msgid "Print Item Image on Quote:"
 msgstr ""
 
-#: ../admin/gl_setup.php:225
+#: ../admin/gl_setup.php:176
 msgid "Legal Text on Invoice:"
 msgstr ""
 
-#: ../admin/gl_setup.php:227
+#: ../admin/gl_setup.php:178
 msgid "Shipping Charged Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:229
+#: ../admin/gl_setup.php:180
 msgid "Deferred Income Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:230
+#: ../admin/gl_setup.php:181
 msgid "Not used"
 msgstr ""
 
-#: ../admin/gl_setup.php:234
+#: ../admin/gl_setup.php:185
 msgid "Customers and Sales Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:236
+#: ../admin/gl_setup.php:187
 msgid "Receivable Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:238
-#: ../admin/gl_setup.php:289
+#: ../admin/gl_setup.php:189
+#: ../admin/gl_setup.php:240
 #: ../inventory/manage/item_categories.php:196
-#: ../inventory/manage/items.php:365
+#: ../inventory/manage/items.php:374
 #: ../sales/manage/customer_branches.php:238
 msgid "Sales Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:241
+#: ../admin/gl_setup.php:192
 #: ../sales/manage/customer_branches.php:239
 msgid "Sales Discount Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:243
+#: ../admin/gl_setup.php:194
 #: ../sales/manage/customer_branches.php:241
 msgid "Prompt Payment Discount Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:245
+#: ../admin/gl_setup.php:196
 msgid "Quote Valid Days:"
 msgstr ""
 
-#: ../admin/gl_setup.php:247
+#: ../admin/gl_setup.php:198
 msgid "Delivery Required By:"
 msgstr ""
 
-#: ../admin/gl_setup.php:253
+#: ../admin/gl_setup.php:204
 msgid "Dimension Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:255
+#: ../admin/gl_setup.php:206
 msgid "Dimension Required By After:"
 msgstr ""
 
-#: ../admin/gl_setup.php:259
+#: ../admin/gl_setup.php:210
 msgid "Suppliers and Purchasing"
 msgstr ""
 
-#: ../admin/gl_setup.php:261
+#: ../admin/gl_setup.php:212
 msgid "Delivery Over-Receive Allowance:"
 msgstr ""
 
-#: ../admin/gl_setup.php:263
+#: ../admin/gl_setup.php:214
 msgid "Invoice Over-Charge Allowance:"
 msgstr ""
 
-#: ../admin/gl_setup.php:265
+#: ../admin/gl_setup.php:216
 msgid "Suppliers and Purchasing Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:267
+#: ../admin/gl_setup.php:218
 msgid "Payable Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:269
-#: ../purchasing/manage/suppliers.php:133
+#: ../admin/gl_setup.php:220
+#: ../purchasing/manage/suppliers.php:130
 msgid "Purchase Discount Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:271
+#: ../admin/gl_setup.php:222
 msgid "GRN Clearing Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:271
+#: ../admin/gl_setup.php:222
 msgid "No postings on GRN"
 msgstr ""
 
-#: ../admin/gl_setup.php:273
+#: ../admin/gl_setup.php:224
 msgid "Receival Required By:"
 msgstr ""
 
-#: ../admin/gl_setup.php:275
+#: ../admin/gl_setup.php:226
 msgid "Show PO item codes:"
 msgstr ""
 
-#: ../admin/gl_setup.php:277
+#: ../admin/gl_setup.php:228
 #: ../reporting/reports_main.php:206
 msgid "Inventory"
 msgstr ""
 
-#: ../admin/gl_setup.php:279
+#: ../admin/gl_setup.php:230
 msgid "Allow Negative Inventory:"
 msgstr ""
 
-#: ../admin/gl_setup.php:280
+#: ../admin/gl_setup.php:231
 msgid "Warning:  This may cause a delay in GL postings"
 msgstr ""
 
-#: ../admin/gl_setup.php:282
+#: ../admin/gl_setup.php:233
 msgid "No zero-amounts (Service):"
 msgstr ""
 
-#: ../admin/gl_setup.php:284
+#: ../admin/gl_setup.php:235
 msgid "Location Notifications:"
 msgstr ""
 
-#: ../admin/gl_setup.php:286
+#: ../admin/gl_setup.php:237
 msgid "Allow Negative Prices:"
 msgstr ""
 
-#: ../admin/gl_setup.php:288
+#: ../admin/gl_setup.php:239
 msgid "Items Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:291
+#: ../admin/gl_setup.php:242
 #: ../inventory/manage/item_categories.php:206
-#: ../inventory/manage/items.php:369
+#: ../inventory/manage/items.php:378
 msgid "Inventory Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:293
+#: ../admin/gl_setup.php:244
 #: ../inventory/manage/item_categories.php:200
 #: ../inventory/manage/item_categories.php:208
-#: ../inventory/manage/items.php:370
-#: ../inventory/manage/items.php:375
+#: ../inventory/manage/items.php:379
+#: ../inventory/manage/items.php:384
 msgid "C.O.G.S. Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:295
+#: ../admin/gl_setup.php:246
 #: ../inventory/manage/item_categories.php:209
-#: ../inventory/manage/items.php:371
+#: ../inventory/manage/items.php:380
 msgid "Inventory Adjustments Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:297
+#: ../admin/gl_setup.php:248
 #: ../inventory/manage/item_categories.php:213
-#: ../inventory/manage/items.php:382
+#: ../inventory/manage/items.php:391
 msgid "Item Assembly Costs Account:"
 msgstr ""
 
-#: ../admin/gl_setup.php:301
+#: ../admin/gl_setup.php:252
 msgid "Manufacturing Defaults"
 msgstr ""
 
-#: ../admin/gl_setup.php:303
+#: ../admin/gl_setup.php:254
 msgid "Work Order Required By After:"
 msgstr ""
 
@@ -1720,18 +1767,22 @@ msgstr ""
 msgid "Selected chart has been successfully deleted"
 msgstr ""
 
-#: ../admin/inst_chart.php:50
+#: ../admin/inst_chart.php:52
+msgid "No optional chart of accounts is currently available."
+msgstr ""
+
+#: ../admin/inst_chart.php:55
 msgid "Chart"
 msgstr ""
 
-#: ../admin/inst_chart.php:50
+#: ../admin/inst_chart.php:55
 #: ../admin/inst_lang.php:36
 #: ../admin/inst_module.php:105
 #: ../admin/inst_theme.php:55
 msgid "Installed"
 msgstr ""
 
-#: ../admin/inst_chart.php:50
+#: ../admin/inst_chart.php:55
 #: ../admin/inst_lang.php:36
 #: ../admin/inst_module.php:105
 #: ../admin/inst_theme.php:55
@@ -1740,39 +1791,39 @@ msgstr ""
 msgid "Available"
 msgstr ""
 
-#: ../admin/inst_chart.php:50
+#: ../admin/inst_chart.php:55
 #: ../admin/inst_lang.php:35
 #: ../admin/inst_lang.php:220
 msgid "Encoding"
 msgstr ""
 
-#: ../admin/inst_chart.php:69
-#: ../admin/inst_chart.php:71
+#: ../admin/inst_chart.php:73
+#: ../admin/inst_chart.php:75
 #: ../admin/inst_lang.php:88
+#: ../admin/inst_module.php:126
 #: ../admin/inst_module.php:127
-#: ../admin/inst_module.php:128
-#: ../admin/inst_theme.php:73
+#: ../admin/inst_theme.php:77
 #: ../includes/sysnames.inc:193
 msgid "Unknown"
 msgstr ""
 
-#: ../admin/inst_chart.php:74
+#: ../admin/inst_chart.php:78
 #: ../admin/inst_lang.php:103
-#: ../admin/inst_module.php:132
-#: ../admin/inst_module.php:137
-#: ../admin/inst_theme.php:77
+#: ../admin/inst_module.php:131
+#: ../admin/inst_module.php:136
+#: ../admin/inst_theme.php:81
 msgid "Install"
 msgstr ""
 
-#: ../admin/inst_chart.php:75
-#: ../admin/inst_module.php:138
-#: ../admin/inst_theme.php:78
+#: ../admin/inst_chart.php:79
+#: ../admin/inst_module.php:137
+#: ../admin/inst_theme.php:82
 msgid "Upload and install latest extension package"
 msgstr ""
 
-#: ../admin/inst_chart.php:82
-#: ../admin/inst_module.php:145
-#: ../admin/inst_theme.php:85
+#: ../admin/inst_chart.php:86
+#: ../admin/inst_module.php:144
+#: ../admin/inst_theme.php:89
 #, php-format
 msgid ""
 "You are about to remove package \\'%s\\'.\n"
@@ -1786,11 +1837,15 @@ msgstr ""
 #: ../admin/inst_lang.php:35
 #: ../admin/printers.php:84
 #: ../admin/shipping_companies.php:91
-#: ../dimensions/dimension_entry.php:271
+#: ../dimensions/dimension_entry.php:261
 #: ../dimensions/inquiry/search_dimensions.php:130
 #: ../dimensions/view/view_dimension.php:55
+#: ../gl/gl_journal.php:546
 #: ../inventory/manage/item_categories.php:98
 #: ../manufacturing/manage/work_centres.php:101
+#: ../purchasing/includes/ui/invoice_ui.inc:284
+#: ../purchasing/includes/ui/invoice_ui.inc:286
+#: ../purchasing/includes/ui/invoice_ui.inc:288
 #: ../reporting/rep501.php:87
 #: ../reporting/rep709.php:116
 #: ../reporting/rep709.php:117
@@ -1880,44 +1935,60 @@ msgid "Selected extension has been successfully deleted"
 msgstr ""
 
 #: ../admin/inst_module.php:104
-#: ../admin/inst_module.php:168
+#: ../admin/inst_module.php:167
 msgid "Extension"
 msgstr ""
 
 #: ../admin/inst_module.php:104
-#: ../admin/inst_module.php:168
+#: ../admin/inst_module.php:167
 msgid "Modules provided"
 msgstr ""
 
 #: ../admin/inst_module.php:104
-#: ../admin/inst_module.php:168
+#: ../admin/inst_module.php:167
 msgid "Options provided"
 msgstr ""
 
-#: ../admin/inst_module.php:132
+#: ../admin/inst_module.php:131
 msgid "Install third-party extension."
 msgstr ""
 
-#: ../admin/inst_module.php:168
+#: ../admin/inst_module.php:167
 #: ../includes/ui/ui_lists.inc:671
-#: ../includes/ui/ui_lists.inc:2148
+#: ../includes/ui/ui_lists.inc:2125
 #: ../reporting/includes/excel_report.inc:232
 #: ../reporting/includes/pdf_report.inc:265
 msgid "Active"
 msgstr ""
 
-#: ../admin/inst_module.php:231
+#: ../admin/inst_module.php:216
+#, php-format
+msgid ""
+"Package '%s' is incompatible with current application version and cannot be "
+"activated.\n"
+msgstr ""
+
+#: ../admin/inst_module.php:217
+#, php-format
+msgid "Check Install/Activate page for newer package version."
+msgstr ""
+
+#: ../admin/inst_module.php:236
 msgid "Status change for some extensions failed."
 msgstr ""
 
-#: ../admin/inst_module.php:234
+#: ../admin/inst_module.php:239
 msgid "Current active extensions set has been saved."
 msgstr ""
 
-#: ../admin/inst_module.php:256
+#: ../admin/inst_module.php:261
 msgid "Extensions:"
 msgstr ""
 
+#: ../admin/inst_module.php:269
+msgid "No optional extension module is currently available."
+msgstr ""
+
 #: ../admin/inst_theme.php:20
 msgid "Install Themes"
 msgstr ""
@@ -1930,6 +2001,10 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
+#: ../admin/inst_theme.php:60
+msgid "No optional theme is currently available."
+msgstr ""
+
 #: ../admin/inst_upgrade.php:19
 msgid "Software Upgrade"
 msgstr ""
@@ -2032,31 +2107,31 @@ msgid "Selected payment terms have been deleted"
 msgstr ""
 
 #: ../admin/payment_terms.php:127
-#: ../dimensions/dimension_entry.php:275
+#: ../dimensions/dimension_entry.php:265
 #: ../dimensions/inquiry/search_dimensions.php:75
 #: ../dimensions/inquiry/search_dimensions.php:131
 #: ../dimensions/view/view_dimension.php:55
 #: ../gl/bank_account_reconcile.php:231
 #: ../gl/inquiry/bank_inquiry.php:71
 #: ../gl/inquiry/gl_account_inquiry.php:126
-#: ../gl/inquiry/journal_inquiry.php:101
+#: ../gl/inquiry/journal_inquiry.php:108
 #: ../gl/inquiry/tax_inquiry.php:82
 #: ../gl/manage/bank_accounts.php:109
-#: ../gl/manage/gl_quick_entries.php:186
+#: ../gl/manage/gl_quick_entries.php:190
 #: ../gl/view/accrual_trans.php:52
 #: ../gl/includes/ui/gl_bank_ui.inc:93
 #: ../includes/ui/ui_view.inc:548
-#: ../inventory/inquiry/stock_movements.php:78
+#: ../inventory/inquiry/stock_movements.php:79
 #: ../inventory/manage/item_categories.php:98
 #: ../manufacturing/search_work_orders.php:167
-#: ../manufacturing/view/wo_costs_view.php:46
+#: ../manufacturing/view/wo_costs_view.php:45
 #: ../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:127
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:136
 #: ../purchasing/inquiry/supplier_inquiry.php:173
-#: ../reporting/rep102.php:134
+#: ../reporting/rep102.php:139
 #: ../reporting/rep202.php:139
 #: ../reporting/rep402.php:103
 #: ../reporting/rep501.php:87
@@ -2069,12 +2144,13 @@ msgstr ""
 #: ../reporting/rep709.php:112
 #: ../reporting/rep710.php:78
 #: ../reporting/rep710.php:86
-#: ../reporting/reports_main.php:340
-#: ../reporting/reports_main.php:504
+#: ../reporting/reports_main.php:341
+#: ../reporting/reports_main.php:505
 #: ../reporting/includes/doctext.inc:161
 #: ../reporting/includes/doctext.inc:202
 #: ../reporting/includes/doctext.inc:221
-#: ../sales/inquiry/customer_allocation_inquiry.php:144
+#: ../sales/inquiry/customer_allocation_inquiry.php:146
+#: ../sales/inquiry/customer_inquiry.php:202
 msgid "Type"
 msgstr ""
 
@@ -2271,8 +2347,8 @@ msgstr ""
 
 #: ../admin/security_roles.php:180
 #: ../gl/manage/gl_accounts.php:198
-#: ../inventory/manage/items.php:444
-#: ../purchasing/manage/suppliers.php:295
+#: ../inventory/manage/items.php:453
+#: ../purchasing/manage/suppliers.php:292
 #: ../sales/manage/customers.php:331
 msgid "Show inactive:"
 msgstr ""
@@ -2318,29 +2394,31 @@ msgstr ""
 #: ../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:258
+#: ../gl/includes/ui/gl_journal_ui.inc:269
+#: ../includes/ui/class.crud_view.inc:292
 #: ../includes/ui/simple_crud_class.inc:58
 #: ../includes/ui/simple_crud_class.inc:231
-#: ../includes/ui/ui_controls.inc:597
-#: ../includes/ui/ui_input.inc:212
-#: ../inventory/includes/item_adjustments_ui.inc:165
-#: ../inventory/includes/stock_transfers_ui.inc:145
-#: ../inventory/manage/items.php:427
+#: ../includes/ui/ui_controls.inc:637
+#: ../includes/ui/ui_input.inc:229
+#: ../inventory/includes/item_adjustments_ui.inc:157
+#: ../inventory/includes/stock_transfers_ui.inc:142
+#: ../inventory/manage/items.php:436
 #: ../manufacturing/includes/work_order_issue_ui.inc:140
-#: ../purchasing/includes/ui/po_ui.inc:434
-#: ../sales/includes/ui/sales_credit_ui.inc:295
+#: ../purchasing/includes/ui/po_ui.inc:431
+#: ../sales/includes/ui/sales_credit_ui.inc:296
+#: ../sales/includes/ui/sales_order_ui.inc:550
 msgid "Cancel"
 msgstr ""
 
 #: ../admin/security_roles.php:249
-#: ../inventory/manage/items.php:427
+#: ../inventory/manage/items.php:436
 msgid "Cancel Edition"
 msgstr ""
 
 #: ../admin/shipping_companies.php:15
-#: ../sales/customer_credit_invoice.php:254
-#: ../sales/customer_delivery.php:357
-#: ../sales/customer_invoice.php:492
+#: ../sales/customer_credit_invoice.php:256
+#: ../sales/customer_delivery.php:359
+#: ../sales/customer_invoice.php:494
 #: ../sales/view/view_credit.php:74
 #: ../sales/view/view_dispatch.php:92
 #: ../sales/view/view_invoice.php:92
@@ -2396,13 +2474,13 @@ 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:307
+#: ../inventory/manage/items.php:316
 #: ../manufacturing/manage/work_centres.php:137
 msgid "Name:"
 msgstr ""
 
 #: ../admin/shipping_companies.php:136
-#: ../purchasing/manage/suppliers.php:136
+#: ../purchasing/manage/suppliers.php:133
 #: ../sales/manage/customer_branches.php:248
 msgid "Contact Person:"
 msgstr ""
@@ -2410,7 +2488,7 @@ msgstr ""
 #: ../admin/shipping_companies.php:140
 #: ../includes/ui/contacts_view.inc:103
 #: ../inventory/manage/locations.php:205
-#: ../purchasing/manage/suppliers.php:138
+#: ../purchasing/manage/suppliers.php:135
 #: ../sales/manage/customer_branches.php:250
 #: ../sales/manage/customers.php:257
 msgid "Secondary Phone Number:"
@@ -2425,15 +2503,15 @@ msgid "Unspecified tag type"
 msgstr ""
 
 #: ../admin/tags.php:40
-#: ../reporting/reports_main.php:363
-#: ../reporting/reports_main.php:372
-#: ../reporting/reports_main.php:384
-#: ../reporting/reports_main.php:415
-#: ../reporting/reports_main.php:423
-#: ../reporting/reports_main.php:434
-#: ../reporting/reports_main.php:462
-#: ../reporting/reports_main.php:469
-#: ../reporting/reports_main.php:479
+#: ../reporting/reports_main.php:364
+#: ../reporting/reports_main.php:373
+#: ../reporting/reports_main.php:385
+#: ../reporting/reports_main.php:416
+#: ../reporting/reports_main.php:424
+#: ../reporting/reports_main.php:435
+#: ../reporting/reports_main.php:463
+#: ../reporting/reports_main.php:470
+#: ../reporting/reports_main.php:480
 msgid "Account Tags"
 msgstr ""
 
@@ -2515,7 +2593,7 @@ msgstr ""
 #: ../admin/users.php:123
 #: ../includes/ui/contacts_view.inc:41
 #: ../inventory/manage/locations.php:146
-#: ../reporting/rep106.php:95
+#: ../reporting/rep106.php:94
 #: ../reporting/includes/header2.inc:101
 #: ../sales/manage/sales_people.php:99
 msgid "Phone"
@@ -2566,9 +2644,10 @@ msgstr ""
 #: ../admin/view_print_transaction.php:43
 #: ../admin/view_print_transaction.php:45
 #: ../admin/view_print_transaction.php:129
-#: ../includes/ui/ui_controls.inc:196
-#: ../purchasing/inquiry/po_search_completed.php:113
+#: ../includes/ui/ui_controls.inc:214
+#: ../purchasing/inquiry/po_search_completed.php:43
 #: ../purchasing/inquiry/po_search.php:94
+#: ../sales/inquiry/customer_inquiry.php:186
 #: ../sales/inquiry/sales_deliveries_view.php:148
 #: ../sales/inquiry/sales_orders_view.php:102
 msgid "Print"
@@ -2591,13 +2670,15 @@ msgstr ""
 #: ../admin/view_print_transaction.php:83
 #: ../admin/void_transaction.php:170
 #: ../dimensions/inquiry/search_dimensions.php:88
-#: ../gl/inquiry/journal_inquiry.php:53
+#: ../gl/inquiry/journal_inquiry.php:58
 #: ../manufacturing/search_work_orders.php:84
-#: ../purchasing/inquiry/po_search_completed.php:78
+#: ../purchasing/includes/ui/invoice_ui.inc:492
+#: ../purchasing/inquiry/po_search_completed.php:99
 #: ../purchasing/inquiry/po_search.php:78
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
 #: ../purchasing/inquiry/supplier_inquiry.php:55
 #: ../sales/inquiry/customer_allocation_inquiry.php:51
+#: ../sales/inquiry/customer_inquiry.php:54
 #: ../sales/inquiry/sales_deliveries_view.php:116
 #: ../sales/inquiry/sales_orders_view.php:232
 msgid "Search"
@@ -2619,40 +2700,39 @@ msgstr ""
 #: ../admin/void_transaction.php:183
 #: ../dimensions/inquiry/search_dimensions.php:132
 #: ../dimensions/view/view_dimension.php:55
-#: ../gl/accruals.php:94
-#: ../gl/accruals.php:199
+#: ../gl/accruals.php:104
+#: ../gl/accruals.php:211
 #: ../gl/bank_account_reconcile.php:234
 #: ../gl/inquiry/bank_inquiry.php:71
 #: ../gl/inquiry/gl_account_inquiry.php:126
-#: ../gl/inquiry/journal_inquiry.php:100
+#: ../gl/inquiry/journal_inquiry.php:107
 #: ../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:290
+#: ../includes/ui/allocation_cart.inc:291
 #: ../includes/ui/ui_view.inc:548
-#: ../inventory/inquiry/stock_movements.php:80
-#: ../inventory/view/view_adjustment.php:45
-#: ../inventory/view/view_transfer.php:47
+#: ../inventory/inquiry/stock_movements.php:84
+#: ../inventory/view/view_adjustment.php:44
+#: ../inventory/view/view_transfer.php:37
 #: ../manufacturing/search_work_orders.php:172
-#: ../manufacturing/work_order_entry.php:418
-#: ../manufacturing/work_order_entry.php:424
-#: ../manufacturing/view/wo_costs_view.php:46
-#: ../manufacturing/view/wo_production_view.php:45
+#: ../manufacturing/work_order_entry.php:409
+#: ../manufacturing/work_order_entry.php:415
+#: ../manufacturing/view/wo_costs_view.php:45
+#: ../manufacturing/view/wo_production_view.php:44
 #: ../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:139
-#: ../purchasing/includes/ui/po_ui.inc:310
+#: ../purchasing/includes/ui/invoice_ui.inc:120
+#: ../purchasing/includes/ui/po_ui.inc:307
 #: ../purchasing/view/view_po.php:140
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:132
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:141
 #: ../purchasing/inquiry/supplier_inquiry.php:178
 #: ../purchasing/allocations/supplier_allocation_main.php:97
-#: ../reporting/rep101.php:118
+#: ../reporting/rep101.php:133
 #: ../reporting/rep107.php:205
 #: ../reporting/rep201.php:110
 #: ../reporting/rep306.php:141
@@ -2669,14 +2749,15 @@ msgstr ""
 #: ../reporting/includes/doctext.inc:207
 #: ../reporting/includes/doctext.inc:245
 #: ../reporting/includes/header2.inc:138
-#: ../sales/customer_delivery.php:367
-#: ../sales/customer_invoice.php:507
+#: ../sales/customer_delivery.php:369
+#: ../sales/customer_invoice.php:509
 #: ../sales/allocations/customer_allocation_main.php:96
 #: ../sales/view/view_credit.php:69
 #: ../sales/view/view_sales_order.php:109
 #: ../sales/view/view_sales_order.php:142
 #: ../sales/view/view_sales_order.php:179
-#: ../sales/inquiry/customer_allocation_inquiry.php:148
+#: ../sales/inquiry/customer_allocation_inquiry.php:150
+#: ../sales/inquiry/customer_inquiry.php:206
 msgid "Date"
 msgstr ""
 
@@ -2692,13 +2773,15 @@ msgstr ""
 
 #: ../admin/void_transaction.php:126
 #: ../admin/void_transaction.php:185
-#: ../includes/ui/ui_input.inc:139
-#: ../includes/ui/ui_input.inc:283
+#: ../includes/ui/ui_input.inc:152
+#: ../includes/ui/ui_input.inc:300
 #: ../includes/ui/ui_lists.inc:20
 msgid "Select"
 msgstr ""
 
 #: ../admin/void_transaction.php:157
+#: ../includes/ui/class.reflines_crud.inc:89
+#: ../includes/ui/class.reflines_crud.inc:92
 msgid "Transaction Type:"
 msgstr ""
 
@@ -2711,19 +2794,22 @@ msgid "Voiding Date:"
 msgstr ""
 
 #: ../admin/void_transaction.php:208
-#: ../dimensions/dimension_entry.php:283
-#: ../gl/bank_transfer.php:137
-#: ../gl/inquiry/journal_inquiry.php:56
-#: ../gl/manage/revaluate_currencies.php:106
+#: ../dimensions/dimension_entry.php:273
+#: ../gl/bank_transfer.php:138
+#: ../gl/inquiry/journal_inquiry.php:53
+#: ../gl/manage/revaluate_currencies.php:98
+#: ../includes/ui/class.reflines_crud.inc:104
 #: ../includes/ui/ui_view.inc:344
-#: ../manufacturing/work_order_add_finished.php:207
-#: ../manufacturing/work_order_costs.php:146
-#: ../manufacturing/work_order_entry.php:449
-#: ../manufacturing/work_order_release.php:103
-#: ../purchasing/includes/ui/po_ui.inc:467
-#: ../purchasing/po_entry_items.php:485
-#: ../purchasing/supplier_payment.php:325
-#: ../sales/customer_payments.php:403
+#: ../manufacturing/work_order_add_finished.php:197
+#: ../manufacturing/work_order_costs.php:145
+#: ../manufacturing/work_order_entry.php:440
+#: ../manufacturing/work_order_release.php:102
+#: ../purchasing/includes/ui/invoice_ui.inc:199
+#: ../purchasing/includes/ui/po_ui.inc:458
+#: ../purchasing/po_entry_items.php:477
+#: ../purchasing/supplier_payment.php:319
+#: ../sales/customer_invoice.php:688
+#: ../sales/customer_payments.php:386
 msgid "Memo:"
 msgstr ""
 
@@ -2733,7 +2819,6 @@ msgid "Void Transaction"
 msgstr ""
 
 #: ../admin/void_transaction.php:218
-#: ../admin/void_transaction.php:297
 msgid "The entered transaction does not exist or cannot be voided."
 msgstr ""
 
@@ -2744,7 +2829,7 @@ msgid ""
 msgstr ""
 
 #: ../admin/void_transaction.php:228
-#: ../includes/ui/ui_controls.inc:596
+#: ../includes/ui/ui_controls.inc:636
 msgid "Proceed"
 msgstr ""
 
@@ -2753,17 +2838,20 @@ 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:159
-#: ../gl/gl_journal.php:162
+#: ../gl/accruals.php:42
+#: ../gl/bank_transfer.php:160
+#: ../gl/gl_journal.php:217
+#: ../gl/gl_journal.php:229
+#: ../gl/gl_journal.php:235
+#: ../gl/gl_journal.php:256
 #: ../gl/manage/close_period.php:34
 #: ../gl/manage/exchange_rates.php:33
 #: ../gl/manage/revaluate_currencies.php:53
-#: ../manufacturing/work_order_add_finished.php:98
-#: ../manufacturing/work_order_costs.php:80
+#: ../manufacturing/work_order_add_finished.php:89
+#: ../manufacturing/work_order_costs.php:79
 #: ../purchasing/po_receive_items.php:174
 #: ../purchasing/supplier_payment.php:185
-#: ../sales/customer_credit_invoice.php:91
+#: ../sales/customer_credit_invoice.php:90
 #: ../sales/sales_order_entry.php:363
 #: ../sales/manage/recurrent_invoices.php:47
 #: ../sales/manage/recurrent_invoices.php:52
@@ -2791,19 +2879,20 @@ msgstr ""
 msgid "Attached File:"
 msgstr ""
 
-#: ../admin/db/fiscalyears_db.inc:134
+#: ../admin/db/fiscalyears_db.inc:136
 msgid ""
 "The Retained Earnings Account or the Profit and Loss Year Account has not "
 "been set in System and General GL Setup"
 msgstr ""
 
-#: ../admin/db/fiscalyears_db.inc:164
 #: ../admin/db/fiscalyears_db.inc:166
+#: ../admin/db/fiscalyears_db.inc:167
+#: ../admin/db/fiscalyears_db.inc:168
 msgid "Closing Year"
 msgstr ""
 
-#: ../admin/db/fiscalyears_db.inc:217
-#: ../reporting/rep101.php:173
+#: ../admin/db/fiscalyears_db.inc:219
+#: ../reporting/rep101.php:188
 #: ../reporting/rep201.php:165
 #: ../reporting/rep706.php:185
 msgid "Open Balance"
@@ -2840,27 +2929,60 @@ msgstr ""
 msgid "The language files folder "
 msgstr ""
 
-#: ../admin/db/maintenance_db.inc:392
+#: ../admin/db/maintenance_db.inc:399
 msgid ""
 "This is new format backup file which cannot be restored on database not "
 "migrated to utf8."
 msgstr ""
 
-#: ../admin/db/maintenance_db.inc:476
+#: ../admin/db/maintenance_db.inc:483
 #, php-format
 msgid "SQL script execution failed in line %d: %s"
 msgstr ""
 
-#: ../admin/db/users_db.inc:221
+#: ../admin/db/users_db.inc:224
 msgid "user online"
 msgstr ""
 
-#: ../admin/db/users_db.inc:221
+#: ../admin/db/users_db.inc:224
 msgid "users online"
 msgstr ""
 
-#: ../admin/db/voiding_db.inc:114
-#: ../sales/includes/db/sales_invoice_db.inc:252
+#: ../admin/db/voiding_db.inc:23
+msgid "This transaction was already voided before."
+msgstr ""
+
+#: ../admin/db/voiding_db.inc:35
+#: ../admin/db/voiding_db.inc:44
+msgid ""
+"This transaction cannot be voided because the operation would decrease "
+"account balance below allowed limit in some point of account history."
+msgstr ""
+
+#: ../admin/db/voiding_db.inc:47
+msgid "This invoice cannot be voided because it was already credited."
+msgstr ""
+
+#: ../admin/db/voiding_db.inc:56
+msgid "This delivery cannot be voided because it was already invoiced."
+msgstr ""
+
+#: ../admin/db/voiding_db.inc:74
+#: ../admin/db/voiding_db.inc:109
+#: ../admin/db/voiding_db.inc:112
+msgid "This transaction type cannot be voided."
+msgstr ""
+
+#: ../admin/db/voiding_db.inc:79
+msgid "This GRN cannot be voided because it was already invoiced."
+msgstr ""
+
+#: ../admin/db/voiding_db.inc:86
+msgid "Error encountered when voiding transaction."
+msgstr ""
+
+#: ../admin/db/voiding_db.inc:117
+#: ../sales/includes/db/sales_invoice_db.inc:254
 msgid "Voided."
 msgstr ""
 
@@ -2890,7 +3012,6 @@ msgid "Direct &Delivery"
 msgstr ""
 
 #: ../applications/customers.php:25
-#: ../applications/suppliers.php:25
 msgid "Direct &Invoice"
 msgstr ""
 
@@ -3074,9 +3195,9 @@ msgid "Ta&x Inquiry"
 msgstr ""
 
 #: ../applications/generalledger.php:44
-#: ../reporting/reports_main.php:390
-#: ../reporting/reports_main.php:440
-#: ../reporting/reports_main.php:485
+#: ../reporting/reports_main.php:391
+#: ../reporting/reports_main.php:441
+#: ../reporting/reports_main.php:486
 msgid "Trial &Balance"
 msgstr ""
 
@@ -3181,32 +3302,28 @@ msgid "Inventory &Locations"
 msgstr ""
 
 #: ../applications/inventory.php:43
-msgid "Inventory &Movement Types"
-msgstr ""
-
-#: ../applications/inventory.php:45
 msgid "&Units of Measure"
 msgstr ""
 
-#: ../applications/inventory.php:47
-#: ../inventory/manage/items.php:469
+#: ../applications/inventory.php:45
+#: ../inventory/manage/items.php:478
 msgid "&Reorder Levels"
 msgstr ""
 
-#: ../applications/inventory.php:50
+#: ../applications/inventory.php:48
 msgid "Pricing and Costs"
 msgstr ""
 
-#: ../applications/inventory.php:51
+#: ../applications/inventory.php:49
 msgid "Sales &Pricing"
 msgstr ""
 
-#: ../applications/inventory.php:53
+#: ../applications/inventory.php:51
 msgid "Purchasing &Pricing"
 msgstr ""
 
-#: ../applications/inventory.php:55
-#: ../inventory/manage/items.php:468
+#: ../applications/inventory.php:53
+#: ../inventory/manage/items.php:477
 msgid "Standard &Costs"
 msgstr ""
 
@@ -3269,7 +3386,7 @@ msgid "&Display Setup"
 msgstr ""
 
 #: ../applications/setup.php:27
-msgid "&Forms Setup"
+msgid "Transaction &References"
 msgstr ""
 
 #: ../applications/setup.php:29
@@ -3376,6 +3493,10 @@ msgstr ""
 msgid "Direct &GRN"
 msgstr ""
 
+#: ../applications/suppliers.php:25
+msgid "Direct Supplier &Invoice"
+msgstr ""
+
 #: ../applications/suppliers.php:28
 msgid "&Payments to Suppliers"
 msgstr ""
@@ -3412,171 +3533,145 @@ msgstr ""
 msgid "&Suppliers"
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:27
+#: ../dimensions/dimension_entry.php:26
 msgid "Dimension Entry"
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:47
+#: ../dimensions/dimension_entry.php:46
 msgid "The dimension has been entered."
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:58
+#: ../dimensions/dimension_entry.php:57
 msgid "The dimension has been updated."
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:68
+#: ../dimensions/dimension_entry.php:67
 msgid "The dimension has been deleted."
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:78
+#: ../dimensions/dimension_entry.php:77
 msgid "The dimension has been closed. There can be no more changes to it."
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:88
+#: ../dimensions/dimension_entry.php:87
 msgid "The dimension has been re-opened. "
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:98
+#: ../dimensions/dimension_entry.php:97
 msgid "Enter a &new dimension"
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:100
+#: ../dimensions/dimension_entry.php:99
 msgid "&Select an existing dimension"
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:116
-msgid "The dimension reference must be entered."
-msgstr ""
-
-#: ../dimensions/dimension_entry.php:123
-#: ../gl/bank_transfer.php:243
-#: ../gl/gl_bank.php:257
-#: ../gl/gl_journal.php:182
-#: ../gl/manage/revaluate_currencies.php:72
-#: ../inventory/adjustments.php:101
-#: ../inventory/transfers.php:96
-#: ../manufacturing/work_order_add_finished.php:84
-#: ../manufacturing/work_order_entry.php:139
-#: ../manufacturing/work_order_issue.php:97
-#: ../purchasing/po_entry_items.php:365
-#: ../purchasing/po_receive_items.php:193
-#: ../purchasing/supplier_credit.php:182
-#: ../purchasing/supplier_invoice.php:190
-#: ../purchasing/supplier_payment.php:214
-#: ../sales/create_recurrent_invoices.php:57
-#: ../sales/credit_note_entry.php:181
-#: ../sales/customer_credit_invoice.php:205
-#: ../sales/customer_delivery.php:299
-#: ../sales/customer_invoice.php:383
-#: ../sales/customer_payments.php:170
-#: ../sales/customer_payments.php:177
-#: ../sales/sales_order_entry.php:464
-msgid "The entered reference is already in use."
-msgstr ""
-
-#: ../dimensions/dimension_entry.php:131
+#: ../dimensions/dimension_entry.php:121
 msgid "The dimension name must be entered."
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:138
-#: ../manufacturing/work_order_entry.php:154
-#: ../manufacturing/work_order_entry.php:232
+#: ../dimensions/dimension_entry.php:128
+#: ../manufacturing/work_order_entry.php:145
+#: ../manufacturing/work_order_entry.php:223
 #: ../purchasing/po_entry_items.php:238
 msgid "The date entered is in an invalid format."
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:145
+#: ../dimensions/dimension_entry.php:135
 msgid "The required by date entered is in an invalid format."
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:190
+#: ../dimensions/dimension_entry.php:180
 msgid "This dimension cannot be deleted because it has already been processed."
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:234
+#: ../dimensions/dimension_entry.php:224
 msgid "The dimension sent is not valid."
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:261
-#: ../dimensions/dimension_entry.php:268
+#: ../dimensions/dimension_entry.php:251
+#: ../dimensions/dimension_entry.php:258
 msgid "Dimension Reference:"
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:277
+#: ../dimensions/dimension_entry.php:267
 #: ../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:318
-#: ../reporting/reports_main.php:326
-#: ../reporting/reports_main.php:338
-#: ../reporting/reports_main.php:350
-#: ../reporting/reports_main.php:368
-#: ../reporting/reports_main.php:379
-#: ../reporting/reports_main.php:391
-#: ../reporting/reports_main.php:404
-#: ../reporting/reports_main.php:420
-#: ../reporting/reports_main.php:430
-#: ../reporting/reports_main.php:441
-#: ../reporting/reports_main.php:453
-#: ../reporting/reports_main.php:467
-#: ../reporting/reports_main.php:476
-#: ../reporting/reports_main.php:486
-#: ../reporting/reports_main.php:495
-#: ../reporting/reports_main.php:502
+#: ../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:319
+#: ../reporting/reports_main.php:327
+#: ../reporting/reports_main.php:339
+#: ../reporting/reports_main.php:351
+#: ../reporting/reports_main.php:369
+#: ../reporting/reports_main.php:380
+#: ../reporting/reports_main.php:392
+#: ../reporting/reports_main.php:405
+#: ../reporting/reports_main.php:421
+#: ../reporting/reports_main.php:431
+#: ../reporting/reports_main.php:442
+#: ../reporting/reports_main.php:454
+#: ../reporting/reports_main.php:468
+#: ../reporting/reports_main.php:477
+#: ../reporting/reports_main.php:487
+#: ../reporting/reports_main.php:496
+#: ../reporting/reports_main.php:503
 msgid "Start Date"
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:279
-#: ../manufacturing/work_order_entry.php:419
+#: ../dimensions/dimension_entry.php:269
+#: ../manufacturing/work_order_entry.php:410
 msgid "Date Required By"
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:281
+#: ../dimensions/dimension_entry.php:271
 msgid "Tags:"
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:288
+#: ../dimensions/dimension_entry.php:278
 msgid "This Dimension is closed."
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:293
+#: ../dimensions/dimension_entry.php:283
 msgid "Save changes to dimension"
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:295
+#: ../dimensions/dimension_entry.php:285
 msgid "Re-open This Dimension"
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:295
+#: ../dimensions/dimension_entry.php:285
 msgid "Mark this dimension as re-opened"
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:297
+#: ../dimensions/dimension_entry.php:287
 msgid "Close This Dimension"
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:297
+#: ../dimensions/dimension_entry.php:287
 msgid "Mark this dimension as closed"
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:298
+#: ../dimensions/dimension_entry.php:288
 msgid "Delete This Dimension"
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:298
+#: ../dimensions/dimension_entry.php:288
 msgid "Delete unused dimension"
 msgstr ""
 
-#: ../dimensions/dimension_entry.php:302
+#: ../dimensions/dimension_entry.php:292
+#: ../includes/ui/class.crud_view.inc:296
 #: ../includes/ui/simple_crud_class.inc:225
+#: ../purchasing/includes/ui/invoice_ui.inc:225
+#: ../purchasing/includes/ui/invoice_ui.inc:430
+#: ../purchasing/includes/ui/invoice_ui.inc:432
 msgid "Add"
 msgstr ""
 
@@ -3589,12 +3684,15 @@ msgid "Balance for this Dimension"
 msgstr ""
 
 #: ../dimensions/includes/dimensions_ui.inc:31
-#: ../gl/accruals.php:94
+#: ../gl/accruals.php:104
 #: ../gl/inquiry/gl_account_inquiry.php:129
 #: ../gl/inquiry/gl_trial_balance.php:184
-#: ../gl/manage/gl_quick_entries.php:241
-#: ../gl/manage/gl_quick_entries.php:333
+#: ../gl/manage/gl_quick_entries.php:248
+#: ../gl/manage/gl_quick_entries.php:342
 #: ../includes/sysnames.inc:165
+#: ../purchasing/includes/ui/invoice_ui.inc:284
+#: ../purchasing/includes/ui/invoice_ui.inc:286
+#: ../purchasing/includes/ui/invoice_ui.inc:288
 #: ../reporting/rep701.php:111
 #: ../reporting/rep705.php:238
 #: ../reporting/rep706.php:185
@@ -3604,7 +3702,7 @@ msgid "Account"
 msgstr ""
 
 #: ../dimensions/includes/dimensions_ui.inc:31
-#: ../gl/accruals.php:102
+#: ../gl/accruals.php:112
 #: ../gl/bank_account_reconcile.php:235
 #: ../gl/inquiry/bank_inquiry.php:72
 #: ../gl/inquiry/gl_account_inquiry.php:141
@@ -3613,13 +3711,13 @@ msgstr ""
 #: ../gl/inquiry/gl_trial_balance.php:192
 #: ../gl/inquiry/gl_trial_balance.php:194
 #: ../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:85
-#: ../gl/includes/ui/gl_journal_ui.inc:88
-#: ../gl/includes/ui/gl_journal_ui.inc:91
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:135
+#: ../gl/view/gl_trans_view.php:96
+#: ../gl/view/gl_trans_view.php:99
+#: ../gl/view/gl_trans_view.php:102
+#: ../gl/includes/ui/gl_journal_ui.inc:103
+#: ../gl/includes/ui/gl_journal_ui.inc:106
+#: ../gl/includes/ui/gl_journal_ui.inc:109
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:144
 #: ../purchasing/inquiry/supplier_inquiry.php:181
 #: ../reporting/rep601.php:80
 #: ../reporting/rep602.php:81
@@ -3629,12 +3727,13 @@ msgstr ""
 #: ../reporting/rep704.php:90
 #: ../reporting/rep708.php:192
 #: ../reporting/rep708.php:193
-#: ../sales/inquiry/customer_allocation_inquiry.php:152
+#: ../sales/inquiry/customer_allocation_inquiry.php:154
+#: ../sales/inquiry/customer_inquiry.php:211
 msgid "Debit"
 msgstr ""
 
 #: ../dimensions/includes/dimensions_ui.inc:31
-#: ../gl/accruals.php:102
+#: ../gl/accruals.php:112
 #: ../gl/bank_account_reconcile.php:236
 #: ../gl/inquiry/bank_inquiry.php:72
 #: ../gl/inquiry/gl_account_inquiry.php:141
@@ -3643,14 +3742,14 @@ msgstr ""
 #: ../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:69
-#: ../gl/view/gl_trans_view.php:72
-#: ../gl/view/gl_trans_view.php:75
-#: ../gl/includes/ui/gl_journal_ui.inc:85
-#: ../gl/includes/ui/gl_journal_ui.inc:88
-#: ../gl/includes/ui/gl_journal_ui.inc:91
+#: ../gl/view/gl_trans_view.php:96
+#: ../gl/view/gl_trans_view.php:99
+#: ../gl/view/gl_trans_view.php:102
+#: ../gl/includes/ui/gl_journal_ui.inc:103
+#: ../gl/includes/ui/gl_journal_ui.inc:106
+#: ../gl/includes/ui/gl_journal_ui.inc:109
 #: ../includes/sysnames.inc:85
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:136
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:145
 #: ../purchasing/inquiry/supplier_inquiry.php:182
 #: ../reporting/rep601.php:80
 #: ../reporting/rep602.php:81
@@ -3660,7 +3759,8 @@ msgstr ""
 #: ../reporting/rep704.php:90
 #: ../reporting/rep708.php:192
 #: ../reporting/rep708.php:193
-#: ../sales/inquiry/customer_allocation_inquiry.php:153
+#: ../sales/inquiry/customer_allocation_inquiry.php:155
+#: ../sales/inquiry/customer_inquiry.php:212
 msgid "Credit"
 msgstr ""
 
@@ -3669,8 +3769,8 @@ msgstr ""
 #: ../gl/inquiry/bank_inquiry.php:72
 #: ../gl/inquiry/gl_account_inquiry.php:141
 #: ../gl/inquiry/gl_trial_balance.php:188
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:138
-#: ../reporting/rep101.php:122
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:147
+#: ../reporting/rep101.php:137
 #: ../reporting/rep201.php:114
 #: ../reporting/rep203.php:94
 #: ../reporting/rep204.php:84
@@ -3682,7 +3782,7 @@ msgstr ""
 #: ../reporting/rep704.php:87
 #: ../reporting/rep704.php:90
 #: ../reporting/rep708.php:185
-#: ../sales/inquiry/customer_allocation_inquiry.php:155
+#: ../sales/inquiry/customer_allocation_inquiry.php:157
 msgid "Balance"
 msgstr ""
 
@@ -3697,31 +3797,31 @@ msgstr ""
 #: ../dimensions/inquiry/search_dimensions.php:73
 #: ../gl/bank_transfer.php:118
 #: ../gl/inquiry/journal_inquiry.php:45
-#: ../gl/manage/revaluate_currencies.php:105
+#: ../gl/manage/revaluate_currencies.php:97
 #: ../gl/includes/ui/gl_bank_ui.inc:26
-#: ../gl/includes/ui/gl_journal_ui.inc:31
+#: ../gl/includes/ui/gl_journal_ui.inc:51
 #: ../includes/ui/contacts_view.inc:94
-#: ../inventory/includes/item_adjustments_ui.inc:35
-#: ../inventory/includes/stock_transfers_ui.inc:40
+#: ../inventory/includes/item_adjustments_ui.inc:39
+#: ../inventory/includes/stock_transfers_ui.inc:42
 #: ../manufacturing/search_work_orders.php:68
-#: ../manufacturing/work_order_add_finished.php:195
-#: ../manufacturing/work_order_costs.php:134
-#: ../manufacturing/work_order_entry.php:377
-#: ../manufacturing/work_order_entry.php:384
-#: ../manufacturing/includes/work_order_issue_ui.inc:163
-#: ../purchasing/includes/ui/invoice_ui.inc:123
-#: ../purchasing/includes/ui/po_ui.inc:160
-#: ../purchasing/includes/ui/po_ui.inc:165
-#: ../purchasing/supplier_payment.php:298
-#: ../sales/customer_payments.php:372
+#: ../manufacturing/work_order_add_finished.php:186
+#: ../manufacturing/work_order_costs.php:133
+#: ../manufacturing/work_order_entry.php:368
+#: ../manufacturing/work_order_entry.php:375
+#: ../manufacturing/includes/work_order_issue_ui.inc:167
+#: ../purchasing/includes/ui/invoice_ui.inc:122
+#: ../purchasing/includes/ui/po_ui.inc:156
+#: ../purchasing/includes/ui/po_ui.inc:161
+#: ../purchasing/supplier_payment.php:290
+#: ../sales/customer_payments.php:355
 msgid "Reference:"
 msgstr ""
 
 #: ../dimensions/inquiry/search_dimensions.php:75
-#: ../includes/ui/allocation_cart.inc:314
-#: ../includes/ui/ui_lists.inc:1918
-#: ../reporting/rep101.php:100
-#: ../reporting/rep102.php:96
+#: ../includes/ui/allocation_cart.inc:315
+#: ../includes/ui/ui_lists.inc:1895
+#: ../reporting/rep101.php:115
+#: ../reporting/rep102.php:101
 #: ../reporting/rep104.php:97
 #: ../reporting/rep104.php:101
 #: ../reporting/rep105.php:95
@@ -3732,21 +3832,21 @@ msgstr ""
 #: ../reporting/rep204.php:77
 #: ../reporting/rep301.php:156
 #: ../reporting/rep301.php:163
-#: ../reporting/rep302.php:105
-#: ../reporting/rep302.php:112
+#: ../reporting/rep302.php:104
+#: ../reporting/rep302.php:111
 #: ../reporting/rep303.php:96
 #: ../reporting/rep303.php:103
-#: ../reporting/rep304.php:98
-#: ../reporting/rep304.php:103
 #: ../reporting/rep304.php:108
+#: ../reporting/rep304.php:113
+#: ../reporting/rep304.php:118
 #: ../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:219
-#: ../reporting/rep308.php:224
+#: ../reporting/rep308.php:231
+#: ../reporting/rep308.php:236
 #: ../reporting/rep309.php:92
 #: ../reporting/rep402.php:87
 #: ../reporting/rep402.php:95
@@ -3763,9 +3863,10 @@ msgstr ""
 #: ../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:59
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:50
 #: ../purchasing/inquiry/supplier_inquiry.php:50
+#: ../sales/inquiry/customer_inquiry.php:46
 msgid "From:"
 msgstr ""
 
@@ -3774,9 +3875,10 @@ msgstr ""
 #: ../gl/inquiry/gl_trial_balance.php:55
 #: ../gl/inquiry/journal_inquiry.php:49
 #: ../gl/inquiry/profit_loss.php:169
-#: ../inventory/inquiry/stock_movements.php:59
+#: ../inventory/inquiry/stock_movements.php:60
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:51
 #: ../purchasing/inquiry/supplier_inquiry.php:51
+#: ../sales/inquiry/customer_inquiry.php:47
 msgid "To:"
 msgstr ""
 
@@ -3792,13 +3894,13 @@ msgstr ""
 
 #: ../dimensions/inquiry/search_dimensions.php:133
 #: ../dimensions/view/view_dimension.php:55
-#: ../includes/ui/allocation_cart.inc:290
-#: ../purchasing/includes/ui/invoice_ui.inc:148
+#: ../includes/ui/allocation_cart.inc:291
+#: ../purchasing/includes/ui/invoice_ui.inc:147
 #: ../purchasing/view/view_supp_credit.php:48
 #: ../purchasing/view/view_supp_invoice.php:52
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:133
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:142
 #: ../purchasing/inquiry/supplier_inquiry.php:179
-#: ../reporting/rep101.php:118
+#: ../reporting/rep101.php:133
 #: ../reporting/rep201.php:110
 #: ../reporting/rep203.php:93
 #: ../reporting/rep501.php:87
@@ -3808,10 +3910,12 @@ msgstr ""
 #: ../reporting/includes/doctext.inc:166
 #: ../reporting/includes/doctext.inc:205
 #: ../reporting/includes/doctext.inc:207
-#: ../sales/customer_invoice.php:514
+#: ../sales/customer_invoice.php:516
 #: ../sales/view/view_dispatch.php:97
 #: ../sales/view/view_invoice.php:96
-#: ../sales/inquiry/customer_allocation_inquiry.php:149
+#: ../sales/inquiry/customer_allocation_inquiry.php:151
+#: ../sales/inquiry/customer_inquiry.php:207
+#: ../sales/includes/ui/sales_order_ui.inc:589
 msgid "Due Date"
 msgstr ""
 
@@ -3834,7 +3938,7 @@ msgstr ""
 #: ../dimensions/view/view_dimension.php:85
 #: ../gl/inquiry/gl_account_inquiry.php:71
 #: ../gl/inquiry/tax_inquiry.php:61
-#: ../purchasing/inquiry/po_search_completed.php:63
+#: ../purchasing/inquiry/po_search_completed.php:82
 #: ../purchasing/inquiry/po_search.php:64
 #: ../sales/inquiry/customer_allocation_inquiry.php:44
 #: ../sales/inquiry/sales_deliveries_view.php:102
@@ -3845,7 +3949,7 @@ msgstr ""
 #: ../dimensions/view/view_dimension.php:86
 #: ../gl/inquiry/gl_account_inquiry.php:72
 #: ../gl/inquiry/tax_inquiry.php:62
-#: ../purchasing/inquiry/po_search_completed.php:64
+#: ../purchasing/inquiry/po_search_completed.php:83
 #: ../purchasing/inquiry/po_search.php:65
 #: ../sales/inquiry/customer_allocation_inquiry.php:45
 #: ../sales/inquiry/sales_deliveries_view.php:103
@@ -3863,61 +3967,62 @@ msgstr ""
 msgid "Show"
 msgstr ""
 
-#: ../gl/accruals.php:20
+#: ../gl/accruals.php:30
 #: ../includes/access_levels.inc:245
 msgid "Revenue / Cost Accruals"
 msgstr ""
 
-#: ../gl/accruals.php:38
-#: ../gl/bank_transfer.php:165
-#: ../gl/gl_bank.php:269
-#: ../gl/gl_journal.php:168
+#: ../gl/accruals.php:48
+#: ../gl/bank_transfer.php:166
+#: ../gl/gl_bank.php:262
+#: ../gl/gl_journal.php:223
+#: ../gl/gl_journal.php:262
 #: ../gl/manage/revaluate_currencies.php:59
-#: ../inventory/adjustments.php:114
-#: ../inventory/transfers.php:108
-#: ../manufacturing/work_order_add_finished.php:104
-#: ../manufacturing/work_order_costs.php:86
-#: ../manufacturing/work_order_entry.php:160
+#: ../inventory/adjustments.php:105
+#: ../inventory/transfers.php:99
+#: ../manufacturing/work_order_add_finished.php:95
+#: ../manufacturing/work_order_costs.php:85
+#: ../manufacturing/work_order_entry.php:151
 #: ../manufacturing/work_order_issue.php:84
 #: ../purchasing/po_entry_items.php:342
 #: ../purchasing/po_receive_items.php:179
-#: ../purchasing/supplier_credit.php:202
-#: ../purchasing/supplier_invoice.php:210
+#: ../purchasing/supplier_credit.php:187
+#: ../purchasing/supplier_invoice.php:195
 #: ../purchasing/supplier_payment.php:191
-#: ../sales/create_recurrent_invoices.php:121
+#: ../sales/create_recurrent_invoices.php:123
 #: ../sales/credit_note_entry.php:157
-#: ../sales/customer_credit_invoice.php:95
-#: ../sales/customer_delivery.php:165
-#: ../sales/customer_invoice.php:322
+#: ../sales/customer_credit_invoice.php:94
+#: ../sales/customer_delivery.php:164
+#: ../sales/customer_invoice.php:321
 #: ../sales/customer_payments.php:157
 #: ../sales/sales_order_entry.php:368
 msgid ""
 "The entered date is out of fiscal year or is closed for further data entry."
 msgstr ""
 
-#: ../gl/accruals.php:44
+#: ../gl/accruals.php:54
 msgid "The amount can not be 0."
 msgstr ""
 
-#: ../gl/accruals.php:50
+#: ../gl/accruals.php:60
 msgid "The periods must be greater than 0."
 msgstr ""
 
-#: ../gl/accruals.php:71
+#: ../gl/accruals.php:81
 msgid ""
 "Some of the period dates are outside the fiscal year or are closed for "
 "further data entry. Create a new fiscal year first!"
 msgstr ""
 
-#: ../gl/accruals.php:86
+#: ../gl/accruals.php:96
 #, php-format
 msgid "Accruals for %s"
 msgstr ""
 
-#: ../gl/accruals.php:96
-#: ../gl/accruals.php:98
-#: ../gl/accruals.php:207
-#: ../gl/accruals.php:209
+#: ../gl/accruals.php:106
+#: ../gl/accruals.php:108
+#: ../gl/accruals.php:219
+#: ../gl/accruals.php:221
 #: ../gl/gl_budget.php:71
 #: ../gl/gl_budget.php:72
 #: ../gl/gl_budget.php:76
@@ -3931,35 +4036,37 @@ msgstr ""
 #: ../gl/inquiry/gl_trial_balance.php:59
 #: ../gl/inquiry/profit_loss.php:177
 #: ../gl/inquiry/profit_loss.php:179
-#: ../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/manage/gl_quick_entries.php:268
+#: ../gl/manage/gl_quick_entries.php:270
+#: ../gl/manage/gl_quick_entries.php:353
+#: ../gl/manage/gl_quick_entries.php:355
 #: ../gl/view/accrual_trans.php:54
 #: ../gl/view/accrual_trans.php:56
 #: ../gl/view/gl_deposit_view.php:104
 #: ../gl/view/gl_deposit_view.php:107
 #: ../gl/view/gl_payment_view.php:103
 #: ../gl/view/gl_payment_view.php:106
-#: ../gl/view/gl_trans_view.php:68
-#: ../gl/view/gl_trans_view.php:71
+#: ../gl/view/gl_trans_view.php:95
+#: ../gl/view/gl_trans_view.php:98
 #: ../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:84
-#: ../gl/includes/ui/gl_journal_ui.inc:85
-#: ../gl/includes/ui/gl_journal_ui.inc:87
+#: ../gl/includes/ui/gl_journal_ui.inc:102
+#: ../gl/includes/ui/gl_journal_ui.inc:103
+#: ../gl/includes/ui/gl_journal_ui.inc:105
 #: ../includes/sysnames.inc:43
 #: ../includes/sysnames.inc:166
 #: ../inventory/manage/item_categories.php:220
 #: ../inventory/manage/item_categories.php:222
-#: ../inventory/manage/items.php:354
-#: ../inventory/manage/items.php:356
+#: ../inventory/manage/items.php:363
+#: ../inventory/manage/items.php:365
 #: ../purchasing/includes/ui/invoice_ui.inc:132
-#: ../purchasing/includes/ui/po_ui.inc:176
+#: ../purchasing/includes/ui/invoice_ui.inc:284
+#: ../purchasing/includes/ui/invoice_ui.inc:286
+#: ../purchasing/includes/ui/po_ui.inc:172
+#: ../purchasing/manage/suppliers.php:146
+#: ../purchasing/manage/suppliers.php:147
 #: ../purchasing/manage/suppliers.php:149
-#: ../purchasing/manage/suppliers.php:150
-#: ../purchasing/manage/suppliers.php:152
 #: ../reporting/rep103.php:242
 #: ../reporting/rep103.php:254
 #: ../reporting/rep205.php:161
@@ -3982,38 +4089,43 @@ msgstr ""
 #: ../reporting/rep708.php:201
 #: ../reporting/rep708.php:203
 #: ../reporting/rep708.php:210
-#: ../reporting/reports_main.php:354
 #: ../reporting/reports_main.php:355
-#: ../reporting/reports_main.php:361
+#: ../reporting/reports_main.php:356
 #: ../reporting/reports_main.php:362
-#: ../reporting/reports_main.php:370
+#: ../reporting/reports_main.php:363
 #: ../reporting/reports_main.php:371
-#: ../reporting/reports_main.php:382
+#: ../reporting/reports_main.php:372
 #: ../reporting/reports_main.php:383
-#: ../reporting/reports_main.php:395
+#: ../reporting/reports_main.php:384
 #: ../reporting/reports_main.php:396
-#: ../reporting/reports_main.php:408
-#: ../reporting/reports_main.php:414
-#: ../reporting/reports_main.php:422
-#: ../reporting/reports_main.php:433
-#: ../reporting/reports_main.php:445
-#: ../sales/customer_delivery.php:384
-#: ../sales/customer_delivery.php:392
-#: ../sales/customer_invoice.php:479
-#: ../sales/customer_invoice.php:522
+#: ../reporting/reports_main.php:397
+#: ../reporting/reports_main.php:409
+#: ../reporting/reports_main.php:415
+#: ../reporting/reports_main.php:423
+#: ../reporting/reports_main.php:434
+#: ../reporting/reports_main.php:446
+#: ../sales/customer_delivery.php:386
+#: ../sales/customer_delivery.php:394
+#: ../sales/customer_invoice.php:481
+#: ../sales/customer_invoice.php:524
 #: ../sales/manage/customers.php:275
 #: ../sales/manage/customers.php:277
-#: ../sales/includes/ui/sales_credit_ui.inc:132
-#: ../sales/includes/ui/sales_credit_ui.inc:137
+#: ../sales/includes/ui/sales_credit_ui.inc:133
+#: ../sales/includes/ui/sales_credit_ui.inc:138
+#: ../sales/includes/ui/sales_order_ui.inc:444
+#: ../sales/includes/ui/sales_order_ui.inc:449
 msgid "Dimension"
 msgstr ""
 
-#: ../gl/accruals.php:102
-#: ../gl/accruals.php:217
+#: ../gl/accruals.php:112
+#: ../gl/accruals.php:229
 #: ../gl/inquiry/bank_inquiry.php:72
 #: ../gl/inquiry/gl_account_inquiry.php:141
 #: ../gl/inquiry/gl_account_inquiry.php:143
-#: ../gl/inquiry/journal_inquiry.php:105
+#: ../gl/inquiry/journal_inquiry.php:114
+#: ../gl/manage/gl_quick_entries.php:268
+#: ../gl/manage/gl_quick_entries.php:270
+#: ../gl/manage/gl_quick_entries.php:272
 #: ../gl/view/accrual_trans.php:60
 #: ../gl/view/gl_deposit_view.php:105
 #: ../gl/view/gl_deposit_view.php:108
@@ -4021,76 +4133,80 @@ msgstr ""
 #: ../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/view/gl_trans_view.php:96
+#: ../gl/view/gl_trans_view.php:99
+#: ../gl/view/gl_trans_view.php:102
 #: ../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:85
-#: ../gl/includes/ui/gl_journal_ui.inc:88
-#: ../gl/includes/ui/gl_journal_ui.inc:91
-#: ../gl/includes/ui/gl_journal_ui.inc:275
-#: ../inventory/includes/item_adjustments_ui.inc:187
-#: ../inventory/includes/stock_transfers_ui.inc:167
-#: ../manufacturing/view/wo_costs_view.php:46
-#: ../manufacturing/includes/work_order_issue_ui.inc:176
-#: ../sales/customer_credit_invoice.php:364
-#: ../sales/customer_delivery.php:524
-#: ../sales/includes/ui/sales_credit_ui.inc:339
+#: ../gl/includes/ui/gl_journal_ui.inc:103
+#: ../gl/includes/ui/gl_journal_ui.inc:106
+#: ../gl/includes/ui/gl_journal_ui.inc:109
+#: ../gl/includes/ui/gl_journal_ui.inc:286
+#: ../includes/ui/class.reflines_crud.inc:38
+#: ../inventory/includes/item_adjustments_ui.inc:179
+#: ../inventory/includes/stock_transfers_ui.inc:164
+#: ../manufacturing/view/wo_costs_view.php:45
+#: ../manufacturing/includes/work_order_issue_ui.inc:177
+#: ../purchasing/includes/ui/invoice_ui.inc:284
+#: ../purchasing/includes/ui/invoice_ui.inc:286
+#: ../purchasing/includes/ui/invoice_ui.inc:288
+#: ../sales/customer_credit_invoice.php:366
+#: ../sales/customer_delivery.php:526
+#: ../sales/includes/ui/sales_credit_ui.inc:340
 msgid "Memo"
 msgstr ""
 
-#: ../gl/accruals.php:166
+#: ../gl/accruals.php:178
 msgid "Revenue / Cost Accruals have been processed."
 msgstr ""
 
-#: ../gl/accruals.php:172
+#: ../gl/accruals.php:184
 msgid "Showing GL Transactions."
 msgstr ""
 
-#: ../gl/accruals.php:184
+#: ../gl/accruals.php:196
 msgid "Weekly"
 msgstr ""
 
-#: ../gl/accruals.php:185
+#: ../gl/accruals.php:197
 msgid "Bi-weekly"
 msgstr ""
 
-#: ../gl/accruals.php:186
-#: ../gl/manage/gl_quick_entries.php:240
-#: ../gl/includes/ui/gl_journal_ui.inc:55
-#: ../sales/create_recurrent_invoices.php:134
+#: ../gl/accruals.php:198
+#: ../gl/manage/gl_quick_entries.php:247
+#: ../gl/includes/ui/gl_journal_ui.inc:69
+#: ../sales/create_recurrent_invoices.php:136
 #: ../sales/manage/recurrent_invoices.php:108
 msgid "Monthly"
 msgstr ""
 
-#: ../gl/accruals.php:187
+#: ../gl/accruals.php:199
 msgid "Quarterly"
 msgstr ""
 
-#: ../gl/accruals.php:199
+#: ../gl/accruals.php:211
 msgid "First date of Accruals"
 msgstr ""
 
-#: ../gl/accruals.php:201
+#: ../gl/accruals.php:213
 msgid "Accrued Balance Account"
 msgstr ""
 
-#: ../gl/accruals.php:204
+#: ../gl/accruals.php:216
 msgid "Revenue / Cost Account"
 msgstr ""
 
-#: ../gl/accruals.php:212
+#: ../gl/accruals.php:224
 #: ../gl/gl_budget.php:91
 #: ../gl/gl_budget.php:93
-#: ../gl/inquiry/journal_inquiry.php:104
+#: ../gl/inquiry/journal_inquiry.php:113
 #: ../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/manage/gl_quick_entries.php:268
+#: ../gl/manage/gl_quick_entries.php:270
+#: ../gl/manage/gl_quick_entries.php:272
+#: ../gl/manage/gl_quick_entries.php:348
 #: ../gl/view/bank_transfer_view.php:70
 #: ../gl/view/bank_transfer_view.php:80
 #: ../gl/view/gl_deposit_view.php:67
@@ -4105,13 +4221,16 @@ msgstr ""
 #: ../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:290
+#: ../includes/ui/allocation_cart.inc:291
 #: ../includes/ui/ui_lists.inc:1179
-#: ../manufacturing/view/wo_costs_view.php:46
+#: ../manufacturing/view/wo_costs_view.php:45
 #: ../manufacturing/includes/manufacturing_ui.inc:236
+#: ../purchasing/includes/ui/invoice_ui.inc:284
+#: ../purchasing/includes/ui/invoice_ui.inc:286
+#: ../purchasing/includes/ui/invoice_ui.inc:288
 #: ../purchasing/view/view_supp_payment.php:60
 #: ../purchasing/view/view_supp_payment.php:72
-#: ../reporting/rep102.php:244
+#: ../reporting/rep102.php:251
 #: ../reporting/rep107.php:207
 #: ../reporting/rep107.php:268
 #: ../reporting/rep109.php:196
@@ -4127,27 +4246,27 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
-#: ../gl/accruals.php:212
+#: ../gl/accruals.php:224
 msgid "Search Amount"
 msgstr ""
 
-#: ../gl/accruals.php:214
+#: ../gl/accruals.php:226
 msgid "Frequency"
 msgstr ""
 
-#: ../gl/accruals.php:216
+#: ../gl/accruals.php:228
 msgid "Periods"
 msgstr ""
 
-#: ../gl/accruals.php:220
+#: ../gl/accruals.php:232
 msgid "Show GL Rows"
 msgstr ""
 
-#: ../gl/accruals.php:221
+#: ../gl/accruals.php:233
 msgid "Process Accruals"
 msgstr ""
 
-#: ../gl/accruals.php:222
+#: ../gl/accruals.php:234
 msgid "Are you sure you want to post accruals?"
 msgstr ""
 
@@ -4183,6 +4302,7 @@ msgid "Bank Statement:"
 msgstr ""
 
 #: ../gl/bank_account_reconcile.php:167
+#: ../includes/ui/class.crud_view.inc:300
 msgid "New"
 msgstr ""
 
@@ -4266,104 +4386,84 @@ msgstr ""
 msgid "Transfer Date:"
 msgstr ""
 
-#: ../gl/bank_transfer.php:126
-#: ../gl/bank_transfer.php:133
-#: ../sales/customer_payments.php:401
+#: ../gl/bank_transfer.php:127
+#: ../gl/bank_transfer.php:134
+#: ../sales/customer_payments.php:384
 msgid "Amount:"
 msgstr ""
 
-#: ../gl/bank_transfer.php:127
-#: ../gl/bank_transfer.php:134
-#: ../purchasing/supplier_payment.php:313
-#: ../sales/customer_payments.php:387
+#: ../gl/bank_transfer.php:128
+#: ../gl/bank_transfer.php:135
+#: ../purchasing/supplier_payment.php:307
+#: ../sales/customer_payments.php:370
 msgid "Bank Charge:"
 msgstr ""
 
-#: ../gl/bank_transfer.php:129
+#: ../gl/bank_transfer.php:130
 msgid "Incoming Amount:"
 msgstr ""
 
-#: ../gl/bank_transfer.php:143
+#: ../gl/bank_transfer.php:144
 msgid "Modify Transfer"
 msgstr ""
 
-#: ../gl/bank_transfer.php:145
+#: ../gl/bank_transfer.php:146
 msgid "Enter Transfer"
 msgstr ""
 
-#: ../gl/bank_transfer.php:172
-#: ../gl/bank_transfer.php:226
-#: ../gl/bank_transfer.php:257
+#: ../gl/bank_transfer.php:173
+#: ../gl/bank_transfer.php:227
+#: ../gl/bank_transfer.php:251
 #: ../purchasing/supplier_payment.php:135
 #: ../purchasing/supplier_payment.php:141
 msgid "The entered amount is invalid or less than zero."
 msgstr ""
 
-#: ../gl/bank_transfer.php:177
+#: ../gl/bank_transfer.php:178
 #: ../gl/gl_bank.php:227
 msgid "The total bank amount cannot be 0."
 msgstr ""
 
-#: ../gl/bank_transfer.php:193
+#: ../gl/bank_transfer.php:194
 #, php-format
 msgid ""
 "This bank transfer change would result in exceeding authorized overdraft "
 "limit (%s) of the account '%s'"
 msgstr ""
 
-#: ../gl/bank_transfer.php:198
+#: ../gl/bank_transfer.php:199
 #, php-format
 msgid ""
 "This bank transfer change would result in exceeding authorized overdraft "
 "limit on '%s' for transaction: %s #%s on %s."
 msgstr ""
 
-#: ../gl/bank_transfer.php:210
+#: ../gl/bank_transfer.php:211
 #, php-format
 msgid ""
 "This bank transfer would result in exceeding authorized overdraft limit of "
 "the account (%s)"
 msgstr ""
 
-#: ../gl/bank_transfer.php:215
+#: ../gl/bank_transfer.php:216
 #, php-format
 msgid ""
 "This bank transfer would result in exceeding authorized overdraft limit for "
 "transaction: %s #%s on %s."
 msgstr ""
 
-#: ../gl/bank_transfer.php:231
+#: ../gl/bank_transfer.php:232
 #: ../purchasing/supplier_payment.php:149
-#: ../sales/customer_payments.php:196
+#: ../sales/customer_payments.php:181
 msgid ""
 "The Bank Charge Account has not been set in System and General GL Setup."
 msgstr ""
 
-#: ../gl/bank_transfer.php:237
-#: ../gl/gl_bank.php:251
-#: ../gl/gl_journal.php:174
-#: ../gl/manage/revaluate_currencies.php:65
-#: ../inventory/adjustments.php:94
-#: ../inventory/transfers.php:90
-#: ../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:207
-#: ../sales/credit_note_entry.php:147
-#: ../sales/customer_credit_invoice.php:102
-#: ../sales/customer_delivery.php:178
-#: ../sales/customer_invoice.php:336
-#: ../sales/customer_payments.php:163
-#: ../sales/sales_order_entry.php:435
-msgid "You must enter a reference."
-msgstr ""
-
-#: ../gl/bank_transfer.php:250
+#: ../gl/bank_transfer.php:244
 msgid "The source and destination bank accouts cannot be the same."
 msgstr ""
 
-#: ../gl/bank_transfer.php:262
+#: ../gl/bank_transfer.php:256
 msgid "The incomming bank amount cannot be 0."
 msgstr ""
 
@@ -4405,15 +4505,15 @@ msgstr ""
 
 #: ../gl/gl_bank.php:85
 #: ../gl/gl_journal.php:64
-#: ../inventory/adjustments.php:50
-#: ../manufacturing/work_order_entry.php:68
+#: ../inventory/adjustments.php:48
+#: ../manufacturing/work_order_entry.php:67
 #: ../purchasing/po_entry_items.php:115
 #: ../purchasing/po_entry_items.php:136
 #: ../purchasing/supplier_credit.php:83
 #: ../purchasing/supplier_invoice.php:76
 #: ../sales/credit_note_entry.php:77
-#: ../sales/customer_credit_invoice.php:62
-#: ../sales/customer_invoice.php:73
+#: ../sales/customer_credit_invoice.php:61
+#: ../sales/customer_invoice.php:72
 #: ../sales/sales_order_entry.php:240
 msgid "Add an Attachment"
 msgstr ""
@@ -4474,44 +4574,44 @@ msgid ""
 "for transaction: %s #%s on %s."
 msgstr ""
 
-#: ../gl/gl_bank.php:263
+#: ../gl/gl_bank.php:256
 msgid "The entered date for the payment is invalid."
 msgstr ""
 
-#: ../gl/gl_bank.php:275
+#: ../gl/gl_bank.php:268
 msgid "You have to select customer and customer branch."
 msgstr ""
 
-#: ../gl/gl_bank.php:279
+#: ../gl/gl_bank.php:272
 msgid "You have to select supplier."
 msgstr ""
 
-#: ../gl/gl_bank.php:287
+#: ../gl/gl_bank.php:280
 msgid "Settled amount have to be positive number."
 msgstr ""
 
-#: ../gl/gl_bank.php:333
+#: ../gl/gl_bank.php:326
 msgid "The amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: ../gl/gl_bank.php:339
+#: ../gl/gl_bank.php:332
 #: ../gl/manage/exchange_rates.php:39
 msgid "The exchange rate cannot be zero or a negative number."
 msgstr ""
 
-#: ../gl/gl_bank.php:411
+#: ../gl/gl_bank.php:404
 msgid "Payment Items"
 msgstr ""
 
-#: ../gl/gl_bank.php:411
+#: ../gl/gl_bank.php:404
 msgid "Deposit Items"
 msgstr ""
 
-#: ../gl/gl_bank.php:419
+#: ../gl/gl_bank.php:412
 msgid "Process Payment"
 msgstr ""
 
-#: ../gl/gl_bank.php:419
+#: ../gl/gl_bank.php:412
 msgid "Process Deposit"
 msgstr ""
 
@@ -4548,17 +4648,17 @@ msgstr ""
 #: ../gl/gl_budget.php:91
 #: ../gl/gl_budget.php:93
 #: ../gl/inquiry/profit_loss.php:235
-#: ../gl/manage/gl_quick_entries.php:240
-#: ../reporting/rep101.php:126
+#: ../gl/manage/gl_quick_entries.php:247
+#: ../reporting/rep101.php:141
 #: ../reporting/rep105.php:118
-#: ../reporting/rep106.php:99
+#: ../reporting/rep106.php:98
 #: ../reporting/rep114.php:90
 #: ../reporting/rep201.php:118
-#: ../reporting/rep304.php:121
+#: ../reporting/rep304.php:133
 #: ../reporting/rep305.php:106
 #: ../reporting/rep306.php:148
 #: ../reporting/rep307.php:122
-#: ../reporting/rep308.php:236
+#: ../reporting/rep308.php:248
 #: ../reporting/rep309.php:103
 #: ../reporting/rep601.php:85
 #: ../reporting/rep602.php:86
@@ -4600,19 +4700,22 @@ msgstr ""
 #: ../gl/inquiry/profit_loss.php:287
 #: ../gl/view/gl_deposit_view.php:137
 #: ../gl/view/gl_payment_view.php:136
-#: ../gl/view/gl_trans_view.php:115
+#: ../gl/view/gl_trans_view.php:144
 #: ../gl/includes/ui/gl_bank_ui.inc:202
-#: ../gl/includes/ui/gl_journal_ui.inc:151
-#: ../inventory/includes/item_adjustments_ui.inc:63
-#: ../inventory/includes/item_adjustments_ui.inc:106
+#: ../gl/includes/ui/gl_journal_ui.inc:169
+#: ../inventory/includes/item_adjustments_ui.inc:55
+#: ../inventory/includes/item_adjustments_ui.inc:98
 #: ../manufacturing/includes/manufacturing_ui.inc:178
+#: ../purchasing/includes/ui/invoice_ui.inc:348
+#: ../purchasing/includes/ui/invoice_ui.inc:513
+#: ../purchasing/includes/ui/invoice_ui.inc:584
 #: ../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:91
-#: ../reporting/rep106.php:126
-#: ../reporting/rep106.php:169
+#: ../reporting/rep101.php:249
+#: ../reporting/rep106.php:90
+#: ../reporting/rep106.php:125
+#: ../reporting/rep106.php:172
 #: ../reporting/rep114.php:161
 #: ../reporting/rep201.php:224
 #: ../reporting/rep203.php:94
@@ -4621,8 +4724,8 @@ msgstr ""
 #: ../reporting/rep204.php:141
 #: ../reporting/rep301.php:197
 #: ../reporting/rep301.php:245
-#: ../reporting/rep304.php:146
-#: ../reporting/rep304.php:188
+#: ../reporting/rep304.php:159
+#: ../reporting/rep304.php:204
 #: ../reporting/rep305.php:101
 #: ../reporting/rep305.php:127
 #: ../reporting/rep305.php:183
@@ -4633,7 +4736,7 @@ msgstr ""
 #: ../reporting/rep306.php:261
 #: ../reporting/rep306.php:276
 #: ../reporting/rep306.php:287
-#: ../reporting/rep308.php:311
+#: ../reporting/rep308.php:323
 #: ../reporting/rep309.php:126
 #: ../reporting/rep309.php:153
 #: ../reporting/rep702.php:142
@@ -4647,8 +4750,10 @@ msgstr ""
 #: ../reporting/rep708.php:253
 #: ../reporting/includes/doctext.inc:32
 #: ../reporting/includes/doctext.inc:191
-#: ../sales/customer_credit_invoice.php:281
-#: ../sales/customer_delivery.php:422
+#: ../sales/customer_credit_invoice.php:283
+#: ../sales/customer_delivery.php:424
+#: ../sales/customer_invoice.php:549
+#: ../sales/customer_invoice.php:552
 #: ../sales/allocations/customer_allocation_main.php:99
 #: ../sales/view/view_credit.php:91
 #: ../sales/view/view_dispatch.php:113
@@ -4657,17 +4762,21 @@ msgstr ""
 #: ../sales/view/view_sales_order.php:142
 #: ../sales/view/view_sales_order.php:179
 #: ../sales/view/view_sales_order.php:220
-#: ../sales/includes/ui/sales_credit_ui.inc:168
-#: ../sales/includes/ui/sales_order_ui.inc:149
+#: ../sales/includes/ui/sales_credit_ui.inc:169
+#: ../sales/includes/ui/sales_order_ui.inc:148
 msgid "Total"
 msgstr ""
 
-#: ../gl/gl_journal.php:33
+#: ../gl/gl_budget.php:136
+msgid "Save"
+msgstr ""
+
+#: ../gl/gl_journal.php:32
 #, php-format
 msgid "Modifying Journal Transaction # %d."
 msgstr ""
 
-#: ../gl/gl_journal.php:37
+#: ../gl/gl_journal.php:36
 #: ../includes/sysnames.inc:22
 #: ../includes/sysnames.inc:150
 msgid "Journal Entry"
@@ -4703,55 +4812,116 @@ msgstr ""
 msgid "Entry &New Journal Entry"
 msgstr ""
 
-#: ../gl/gl_journal.php:149
+#: ../gl/gl_journal.php:204
 msgid "You must enter at least one journal line."
 msgstr ""
 
-#: ../gl/gl_journal.php:155
+#: ../gl/gl_journal.php:210
 msgid ""
 "The journal must balance (debits equal to credits) before it can be "
 "processed."
 msgstr ""
 
-#: ../gl/gl_journal.php:217
-#: ../gl/gl_journal.php:224
+#: ../gl/gl_journal.php:247
+msgid "The exchange rate must be numeric and greater than zero."
+msgstr ""
+
+#: ../gl/gl_journal.php:273
+msgid ""
+"Check tax register records before processing transaction or switch off "
+"'Include in tax register' option."
+msgstr ""
+
+#: ../gl/gl_journal.php:287
+msgid ""
+"Cannot determine tax register to be used. You have to make at least one "
+"posting either to tax or customer/supplier account to use tax register."
+msgstr ""
+
+#: ../gl/gl_journal.php:347
+#: ../gl/manage/gl_quick_entries.php:121
+msgid "You must select GL account."
+msgstr ""
+
+#: ../gl/gl_journal.php:353
+msgid "You must select subledger account."
+msgstr ""
+
+#: ../gl/gl_journal.php:361
+#: ../gl/gl_journal.php:368
 msgid "Dimension is closed."
 msgstr ""
 
-#: ../gl/gl_journal.php:231
+#: ../gl/gl_journal.php:375
 msgid "You must enter either a debit amount or a credit amount."
 msgstr ""
 
-#: ../gl/gl_journal.php:238
+#: ../gl/gl_journal.php:382
 msgid "The debit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: ../gl/gl_journal.php:243
+#: ../gl/gl_journal.php:387
 msgid "The credit amount entered is not a valid number or is less than zero."
 msgstr ""
 
-#: ../gl/gl_journal.php:249
-#: ../includes/ui/ui_view.inc:734
+#: ../gl/gl_journal.php:393
+#: ../includes/ui/ui_view.inc:651
 #: ../purchasing/supplier_credit.php:144
 #: ../purchasing/supplier_invoice.php:154
 msgid "Cannot post to GL account used by more than one tax type."
 msgstr ""
 
-#: ../gl/gl_journal.php:256
+#: ../gl/gl_journal.php:400
 msgid ""
 "You cannot make a journal entry for a bank account. Please use one of the "
 "banking functions for bank transactions."
 msgstr ""
 
-#: ../gl/gl_journal.php:335
+#: ../gl/gl_journal.php:520
+msgid "&GL postings"
+msgstr ""
+
+#: ../gl/gl_journal.php:521
+msgid "&Tax register"
+msgstr ""
+
+#: ../gl/gl_journal.php:530
 msgid "Rows"
 msgstr ""
 
-#: ../gl/gl_journal.php:341
+#: ../gl/gl_journal.php:539
+msgid "Tax register record"
+msgstr ""
+
+#: ../gl/gl_journal.php:541
+msgid "VAT date:"
+msgstr ""
+
+#: ../gl/gl_journal.php:542
+msgid "Tax group:"
+msgstr ""
+
+#: ../gl/gl_journal.php:546
+#: ../gl/inquiry/tax_inquiry.php:106
+#: ../reporting/rep709.php:188
+msgid "Input Tax"
+msgstr ""
+
+#: ../gl/gl_journal.php:546
+#: ../gl/inquiry/tax_inquiry.php:100
+#: ../reporting/rep709.php:188
+msgid "Output Tax"
+msgstr ""
+
+#: ../gl/gl_journal.php:546
+msgid "Net amount"
+msgstr ""
+
+#: ../gl/gl_journal.php:561
 msgid "Process Journal Entry"
 msgstr ""
 
-#: ../gl/gl_journal.php:342
+#: ../gl/gl_journal.php:562
 msgid "Process journal entry only if debits equal to credits"
 msgstr ""
 
@@ -4843,9 +5013,9 @@ msgid "No zero values"
 msgstr ""
 
 #: ../gl/inquiry/gl_trial_balance.php:61
-#: ../reporting/reports_main.php:394
-#: ../reporting/reports_main.php:444
-#: ../reporting/reports_main.php:489
+#: ../reporting/reports_main.php:395
+#: ../reporting/reports_main.php:445
+#: ../reporting/reports_main.php:490
 msgid "Only balances"
 msgstr ""
 
@@ -4855,7 +5025,7 @@ msgstr ""
 #: ../reporting/rep707.php:325
 #: ../reporting/rep708.php:51
 #: ../reporting/rep708.php:126
-#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/create_recurrent_invoices.php:136
 #: ../sales/manage/recurrent_invoices.php:108
 msgid "Group"
 msgstr ""
@@ -4866,9 +5036,9 @@ msgstr ""
 
 #: ../gl/inquiry/gl_trial_balance.php:185
 #: ../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
+#: ../gl/view/gl_trans_view.php:95
+#: ../gl/view/gl_trans_view.php:98
+#: ../gl/view/gl_trans_view.php:101
 #: ../reporting/rep701.php:111
 #: ../reporting/rep702.php:53
 #: ../reporting/rep705.php:238
@@ -4908,22 +5078,51 @@ msgstr ""
 msgid "Enter reference fragment or leave empty"
 msgstr ""
 
-#: ../gl/inquiry/journal_inquiry.php:51
-msgid "Show closed:"
+#: ../gl/inquiry/journal_inquiry.php:53
+msgid "Enter memo fragment or leave empty"
+msgstr ""
+
+#: ../gl/inquiry/journal_inquiry.php:54
+msgid "User:"
 msgstr ""
 
 #: ../gl/inquiry/journal_inquiry.php:56
-msgid "Enter memo fragment or leave empty"
+msgid "Dimension:"
+msgstr ""
+
+#: ../gl/inquiry/journal_inquiry.php:57
+msgid "Show closed:"
 msgstr ""
 
-#: ../gl/inquiry/journal_inquiry.php:102
+#: ../gl/inquiry/journal_inquiry.php:109
 msgid "Trans #"
 msgstr ""
 
-#: ../gl/inquiry/journal_inquiry.php:106
+#: ../gl/inquiry/journal_inquiry.php:110
+#: ../gl/view/gl_trans_view.php:44
+#: ../gl/includes/ui/gl_journal_ui.inc:113
+msgid "Counterparty"
+msgstr ""
+
+#: ../gl/inquiry/journal_inquiry.php:111
+#: ../gl/inquiry/journal_inquiry.php:126
+#: ../purchasing/includes/ui/grn_ui.inc:34
+#: ../purchasing/includes/ui/grn_ui.inc:79
+#: ../purchasing/includes/ui/po_ui.inc:323
+#: ../purchasing/view/view_supp_credit.php:44
+#: ../purchasing/view/view_supp_invoice.php:48
+#: ../purchasing/inquiry/po_search_completed.php:114
+#: ../purchasing/inquiry/po_search.php:121
+#: ../purchasing/inquiry/supplier_inquiry.php:177
+#: ../reporting/includes/doctext.inc:163
+#: ../reporting/includes/doctext.inc:186
+msgid "Supplier's Reference"
+msgstr ""
+
+#: ../gl/inquiry/journal_inquiry.php:115
 #: ../reporting/rep710.php:77
 #: ../reporting/rep710.php:87
-#: ../reporting/reports_main.php:505
+#: ../reporting/reports_main.php:506
 msgid "User"
 msgstr ""
 
@@ -4950,9 +5149,9 @@ msgid "Budget"
 msgstr ""
 
 #: ../gl/inquiry/profit_loss.php:172
-#: ../reporting/reports_main.php:381
-#: ../reporting/reports_main.php:432
-#: ../reporting/reports_main.php:478
+#: ../reporting/reports_main.php:382
+#: ../reporting/reports_main.php:433
+#: ../reporting/reports_main.php:479
 msgid "Compare to"
 msgstr ""
 
@@ -4983,20 +5182,10 @@ msgstr ""
 msgid "Charged on sales"
 msgstr ""
 
-#: ../gl/inquiry/tax_inquiry.php:100
-#: ../reporting/rep709.php:188
-msgid "Output Tax"
-msgstr ""
-
 #: ../gl/inquiry/tax_inquiry.php:106
 msgid "Paid on purchases"
 msgstr ""
 
-#: ../gl/inquiry/tax_inquiry.php:106
-#: ../reporting/rep709.php:188
-msgid "Input Tax"
-msgstr ""
-
 #: ../gl/inquiry/tax_inquiry.php:112
 msgid "Net payable or collectible"
 msgstr ""
@@ -5007,8 +5196,8 @@ msgid "Total payable or refund"
 msgstr ""
 
 #: ../gl/manage/bank_accounts.php:16
-#: ../reporting/reports_main.php:317
-#: ../reporting/reports_main.php:325
+#: ../reporting/reports_main.php:318
+#: ../reporting/reports_main.php:326
 msgid "Bank Accounts"
 msgstr ""
 
@@ -5052,37 +5241,40 @@ msgstr ""
 #: ../gl/view/gl_deposit_view.php:66
 #: ../gl/view/gl_payment_view.php:64
 #: ../inventory/prices.php:147
-#: ../inventory/purchasing_data.php:148
+#: ../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:128
+#: ../purchasing/inquiry/po_search_completed.php:116
 #: ../purchasing/inquiry/po_search.php:123
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:134
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:144
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:143
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:153
 #: ../purchasing/inquiry/supplier_inquiry.php:73
 #: ../purchasing/inquiry/supplier_inquiry.php:180
 #: ../purchasing/inquiry/supplier_inquiry.php:192
 #: ../purchasing/allocations/supplier_allocation_main.php:99
 #: ../purchasing/allocations/supplier_allocation_main.php:107
-#: ../reporting/rep101.php:128
-#: ../reporting/rep102.php:133
-#: ../reporting/rep102.php:139
+#: ../reporting/rep101.php:143
+#: ../reporting/rep102.php:138
+#: ../reporting/rep102.php:144
 #: ../reporting/rep103.php:231
 #: ../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:329
-#: ../sales/customer_invoice.php:474
+#: ../sales/customer_credit_invoice.php:236
+#: ../sales/customer_delivery.php:328
+#: ../sales/customer_invoice.php:476
 #: ../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:153
+#: ../sales/inquiry/customer_allocation_inquiry.php:163
+#: ../sales/inquiry/customer_inquiry.php:76
+#: ../sales/inquiry/customer_inquiry.php:210
+#: ../sales/inquiry/customer_inquiry.php:223
 #: ../sales/inquiry/sales_deliveries_view.php:178
 #: ../sales/inquiry/sales_orders_view.php:258
 #: ../sales/inquiry/sales_orders_view.php:272
@@ -5594,8 +5786,10 @@ msgid "Quick Entries"
 msgstr ""
 
 #: ../gl/manage/gl_quick_entries.php:58
+#: ../includes/ui/class.crud_view.inc:296
+#: ../includes/ui/class.crud_view.inc:300
 #: ../includes/ui/simple_crud_class.inc:221
-#: ../includes/ui/ui_input.inc:207
+#: ../includes/ui/ui_input.inc:224
 msgid "Add new"
 msgstr ""
 
@@ -5619,80 +5813,91 @@ msgstr ""
 msgid "New quick entry has been added"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:124
+#: ../gl/manage/gl_quick_entries.php:128
 msgid "Selected quick entry line has been updated"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:130
+#: ../gl/manage/gl_quick_entries.php:134
 msgid "New quick entry line has been added"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:142
+#: ../gl/manage/gl_quick_entries.php:146
 msgid "Selected quick entry has been deleted"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:147
+#: ../gl/manage/gl_quick_entries.php:151
 msgid "The Quick Entry has Quick Entry Lines. Cannot be deleted."
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:163
+#: ../gl/manage/gl_quick_entries.php:167
 msgid "Selected quick entry line has been deleted"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:171
+#: ../gl/manage/gl_quick_entries.php:175
 msgid "Base Amount"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:226
+#: ../gl/manage/gl_quick_entries.php:190
+#: ../gl/manage/gl_quick_entries.php:231
+msgid "Usage"
+msgstr ""
+
+#: ../gl/manage/gl_quick_entries.php:233
 msgid "Entry Type"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:230
+#: ../gl/manage/gl_quick_entries.php:237
 msgid "Balance Based"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:240
-#: ../gl/includes/ui/gl_journal_ui.inc:55
+#: ../gl/manage/gl_quick_entries.php:247
+#: ../gl/includes/ui/gl_journal_ui.inc:69
 msgid "Yearly"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:245
+#: ../gl/manage/gl_quick_entries.php:252
 msgid "Base Amount Description"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:246
+#: ../gl/manage/gl_quick_entries.php:253
 msgid "Default Base Amount"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:255
+#: ../gl/manage/gl_quick_entries.php:262
 msgid "Quick Entry Lines"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:261
-#: ../gl/manage/gl_quick_entries.php:263
-#: ../gl/manage/gl_quick_entries.php:265
+#: ../gl/manage/gl_quick_entries.php:268
+#: ../gl/manage/gl_quick_entries.php:270
+#: ../gl/manage/gl_quick_entries.php:272
 msgid "Post"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:261
-#: ../gl/manage/gl_quick_entries.php:263
-#: ../gl/manage/gl_quick_entries.php:265
+#: ../gl/manage/gl_quick_entries.php:268
+#: ../gl/manage/gl_quick_entries.php:270
+#: ../gl/manage/gl_quick_entries.php:272
 msgid "Account/Tax Type"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:320
+#: ../gl/manage/gl_quick_entries.php:329
 msgid "Posted"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:329
-#: ../sales/customer_delivery.php:422
+#: ../gl/manage/gl_quick_entries.php:338
+#: ../sales/customer_delivery.php:424
+#: ../sales/customer_invoice.php:549
+#: ../sales/customer_invoice.php:552
 msgid "Tax Type"
 msgstr ""
 
-#: ../gl/manage/gl_quick_entries.php:337
+#: ../gl/manage/gl_quick_entries.php:346
 msgid "Part"
 msgstr ""
 
+#: ../gl/manage/gl_quick_entries.php:350
+msgid "Line memo"
+msgstr ""
+
 #: ../gl/manage/revaluate_currencies.php:23
 msgid "Revaluation of Currency Accounts"
 msgstr ""
@@ -5706,11 +5911,11 @@ msgstr ""
 msgid "%d Journal Entries for AR/AP accounts have been added"
 msgstr ""
 
-#: ../gl/manage/revaluate_currencies.php:104
+#: ../gl/manage/revaluate_currencies.php:96
 msgid "Date for Revaluation:"
 msgstr ""
 
-#: ../gl/manage/revaluate_currencies.php:109
+#: ../gl/manage/revaluate_currencies.php:101
 msgid "Revaluate Currencies"
 msgstr ""
 
@@ -5745,7 +5950,7 @@ msgid "Transfer Type"
 msgstr ""
 
 #: ../gl/view/bank_transfer_view.php:92
-#: ../inventory/view/view_transfer.php:76
+#: ../inventory/view/view_transfer.php:70
 msgid "This transfer has been voided."
 msgstr ""
 
@@ -5758,7 +5963,7 @@ msgid "GL Deposit"
 msgstr ""
 
 #: ../gl/view/gl_deposit_view.php:71
-#: ../gl/includes/db/gl_db_banking.inc:212
+#: ../gl/includes/db/gl_db_banking.inc:233
 #: ../reporting/reports_main.php:96
 #: ../reporting/reports_main.php:106
 #: ../reporting/reports_main.php:114
@@ -5767,7 +5972,7 @@ msgstr ""
 #: ../reporting/reports_main.php:143
 #: ../reporting/reports_main.php:192
 #: ../reporting/reports_main.php:199
-#: ../reporting/reports_main.php:296
+#: ../reporting/reports_main.php:297
 msgid "From"
 msgstr ""
 
@@ -5808,15 +6013,15 @@ msgstr ""
 #: ../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/view/gl_trans_view.php:95
+#: ../gl/view/gl_trans_view.php:98
+#: ../gl/view/gl_trans_view.php:101
 #: ../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:84
-#: ../gl/includes/ui/gl_journal_ui.inc:87
-#: ../gl/includes/ui/gl_journal_ui.inc:90
+#: ../gl/includes/ui/gl_journal_ui.inc:102
+#: ../gl/includes/ui/gl_journal_ui.inc:105
+#: ../gl/includes/ui/gl_journal_ui.inc:108
 #: ../reporting/rep701.php:111
 msgid "Account Code"
 msgstr ""
@@ -5830,9 +6035,9 @@ msgstr ""
 #: ../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:84
-#: ../gl/includes/ui/gl_journal_ui.inc:87
-#: ../gl/includes/ui/gl_journal_ui.inc:90
+#: ../gl/includes/ui/gl_journal_ui.inc:102
+#: ../gl/includes/ui/gl_journal_ui.inc:105
+#: ../gl/includes/ui/gl_journal_ui.inc:108
 msgid "Account Description"
 msgstr ""
 
@@ -5869,36 +6074,69 @@ msgid "Items for this Payment"
 msgstr ""
 
 #: ../gl/view/gl_trans_view.php:16
-#: ../gl/view/gl_trans_view.php:35
+#: ../gl/view/gl_trans_view.php:38
 msgid "General Ledger Transaction Details"
 msgstr ""
 
 #: ../gl/view/gl_trans_view.php:39
-#: ../gl/includes/ui/gl_journal_ui.inc:95
-msgid "Counterparty"
+msgid "Transaction Date"
+msgstr ""
+
+#: ../gl/view/gl_trans_view.php:39
+msgid "Journal #"
+msgstr ""
+
+#: ../gl/view/gl_trans_view.php:42
+msgid "Document Date"
+msgstr ""
+
+#: ../gl/view/gl_trans_view.php:42
+msgid "Event Date"
+msgstr ""
+
+#: ../gl/view/gl_trans_view.php:48
+msgid "Supplier Reference"
 msgstr ""
 
-#: ../gl/view/gl_trans_view.php:59
+#: ../gl/view/gl_trans_view.php:70
+msgid "Entered By"
+msgstr ""
+
+#: ../gl/view/gl_trans_view.php:75
+msgid "Exchange rate"
+msgstr ""
+
+#: ../gl/view/gl_trans_view.php:76
+msgid "Source document"
+msgstr ""
+
+#: ../gl/view/gl_trans_view.php:86
 msgid "No general ledger transactions have been created for"
 msgstr ""
 
-#: ../gl/view/gl_trans_view.php:59
+#: ../gl/view/gl_trans_view.php:86
 msgid "number"
 msgstr ""
 
-#: ../gl/view/gl_trans_view.php:129
+#: ../gl/view/gl_trans_view.php:95
+#: ../gl/view/gl_trans_view.php:98
+#: ../gl/view/gl_trans_view.php:101
+msgid "Journal Date"
+msgstr ""
+
+#: ../gl/view/gl_trans_view.php:158
 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:60
-#: ../gl/includes/db/gl_db_banking.inc:63
-#: ../gl/includes/db/gl_db_banking.inc:255
+#: ../gl/includes/db/gl_db_banking.inc:54
+#: ../gl/includes/db/gl_db_banking.inc:61
+#: ../gl/includes/db/gl_db_banking.inc:83
+#: ../gl/includes/db/gl_db_banking.inc:86
+#: ../gl/includes/db/gl_db_banking.inc:276
 msgid "Exchange Variance"
 msgstr ""
 
-#: ../gl/includes/db/gl_db_banking.inc:212
+#: ../gl/includes/db/gl_db_banking.inc:233
 #: ../reporting/reports_main.php:97
 #: ../reporting/reports_main.php:107
 #: ../reporting/reports_main.php:115
@@ -5907,29 +6145,30 @@ msgstr ""
 #: ../reporting/reports_main.php:144
 #: ../reporting/reports_main.php:193
 #: ../reporting/reports_main.php:200
-#: ../reporting/reports_main.php:297
+#: ../reporting/reports_main.php:298
 msgid "To"
 msgstr ""
 
-#: ../gl/includes/db/gl_db_banking.inc:518
-#: ../purchasing/includes/db/invoice_db.inc:138
+#: ../gl/includes/db/gl_db_banking.inc:543
+#: ../gl/includes/db/gl_journal.inc:114
+#: ../purchasing/includes/db/invoice_db.inc:137
 msgid "Document reentered."
 msgstr ""
 
 #: ../gl/includes/db/gl_db_trans.inc:96
+#: ../includes/ui/items_cart.inc:357
 #, php-format
 msgid "Rounding error %s encountered for trans_type:%s,trans_no:%s"
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:24
-#: ../gl/includes/ui/gl_journal_ui.inc:28
-#: ../inventory/includes/item_adjustments_ui.inc:39
-#: ../inventory/includes/stock_transfers_ui.inc:42
-#: ../manufacturing/work_order_add_finished.php:205
-#: ../manufacturing/work_order_costs.php:133
+#: ../inventory/includes/item_adjustments_ui.inc:35
+#: ../inventory/includes/stock_transfers_ui.inc:40
+#: ../manufacturing/work_order_add_finished.php:187
+#: ../manufacturing/work_order_costs.php:132
 #: ../purchasing/allocations/supplier_allocate.php:56
 #: ../sales/allocations/customer_allocate.php:54
-#: ../sales/includes/ui/sales_credit_ui.inc:121
+#: ../sales/includes/ui/sales_credit_ui.inc:122
 msgid "Date:"
 msgstr ""
 
@@ -5942,40 +6181,41 @@ msgid "To the Order of:"
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:64
-#: ../inventory/purchasing_data.php:208
-#: ../inventory/purchasing_data.php:212
-#: ../purchasing/includes/ui/invoice_ui.inc:99
-#: ../purchasing/includes/ui/invoice_ui.inc:107
-#: ../purchasing/includes/ui/invoice_ui.inc:109
-#: ../purchasing/includes/ui/po_ui.inc:110
-#: ../purchasing/includes/ui/po_ui.inc:115
+#: ../inventory/purchasing_data.php:207
+#: ../inventory/purchasing_data.php:211
+#: ../purchasing/includes/ui/invoice_ui.inc:96
+#: ../purchasing/includes/ui/invoice_ui.inc:104
+#: ../purchasing/includes/ui/invoice_ui.inc:106
+#: ../purchasing/includes/ui/po_ui.inc:108
+#: ../purchasing/includes/ui/po_ui.inc:113
 msgid "Supplier:"
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:67
 #: ../sales/manage/recurrent_invoices.php:175
 #: ../sales/includes/ui/sales_credit_ui.inc:29
-#: ../sales/includes/ui/sales_order_ui.inc:271
+#: ../sales/includes/ui/sales_order_ui.inc:270
 msgid "Customer:"
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:71
-#: ../sales/customer_payments.php:349
+#: ../sales/customer_payments.php:332
 #: ../sales/manage/recurrent_invoices.php:178
 #: ../sales/includes/ui/sales_credit_ui.inc:37
-#: ../sales/includes/ui/sales_order_ui.inc:278
+#: ../sales/includes/ui/sales_order_ui.inc:277
 msgid "Branch:"
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:85
 #: ../gl/includes/ui/gl_bank_ui.inc:88
-#: ../sales/customer_payments.php:365
+#: ../sales/customer_payments.php:348
 msgid "This customer account is on hold."
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:101
-#: ../gl/includes/ui/gl_journal_ui.inc:56
-#: ../gl/includes/ui/gl_journal_ui.inc:60
+#: ../gl/includes/ui/gl_journal_ui.inc:70
+#: ../gl/includes/ui/gl_journal_ui.inc:76
+#: ../purchasing/includes/ui/invoice_ui.inc:270
 msgid "Go"
 msgstr ""
 
@@ -5984,65 +6224,74 @@ msgid "Into:"
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:187
+#: ../includes/ui/class.crud_view.inc:281
 #: ../includes/ui/simple_crud_class.inc:52
-#: ../inventory/includes/item_adjustments_ui.inc:92
-#: ../inventory/includes/stock_transfers_ui.inc:84
+#: ../inventory/includes/item_adjustments_ui.inc:84
+#: ../inventory/includes/stock_transfers_ui.inc:81
 #: ../manufacturing/includes/work_order_issue_ui.inc:64
-#: ../purchasing/includes/ui/po_ui.inc:249
-#: ../sales/includes/ui/sales_credit_ui.inc:198
-#: ../sales/includes/ui/sales_order_ui.inc:199
+#: ../purchasing/includes/ui/invoice_ui.inc:560
+#: ../purchasing/includes/ui/po_ui.inc:245
+#: ../sales/includes/ui/sales_credit_ui.inc:199
+#: ../sales/includes/ui/sales_order_ui.inc:198
 msgid "Edit document line"
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:189
+#: ../includes/ui/class.crud_view.inc:285
 #: ../includes/ui/simple_crud_class.inc:54
-#: ../inventory/includes/item_adjustments_ui.inc:94
-#: ../inventory/includes/stock_transfers_ui.inc:86
+#: ../inventory/includes/item_adjustments_ui.inc:86
+#: ../inventory/includes/stock_transfers_ui.inc:83
 #: ../manufacturing/includes/work_order_issue_ui.inc:66
-#: ../purchasing/includes/ui/po_ui.inc:251
-#: ../sales/includes/ui/sales_credit_ui.inc:200
-#: ../sales/includes/ui/sales_order_ui.inc:201
+#: ../purchasing/includes/ui/invoice_ui.inc:324
+#: ../purchasing/includes/ui/po_ui.inc:247
+#: ../sales/includes/ui/sales_credit_ui.inc:201
+#: ../sales/includes/ui/sales_order_ui.inc:200
 msgid "Remove line from document"
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:278
-#: ../gl/includes/ui/gl_journal_ui.inc:257
+#: ../gl/includes/ui/gl_journal_ui.inc:268
 #: ../includes/ui/simple_crud_class.inc:56
-#: ../inventory/includes/item_adjustments_ui.inc:164
-#: ../inventory/includes/stock_transfers_ui.inc:144
+#: ../inventory/includes/item_adjustments_ui.inc:156
+#: ../inventory/includes/stock_transfers_ui.inc:141
 #: ../manufacturing/includes/work_order_issue_ui.inc:139
-#: ../purchasing/includes/ui/po_ui.inc:433
-#: ../sales/includes/ui/sales_credit_ui.inc:294
+#: ../purchasing/includes/ui/po_ui.inc:430
+#: ../sales/includes/ui/sales_credit_ui.inc:295
+#: ../sales/includes/ui/sales_order_ui.inc:549
 msgid "Confirm changes"
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:280
-#: ../gl/includes/ui/gl_journal_ui.inc:259
+#: ../gl/includes/ui/gl_journal_ui.inc:270
+#: ../includes/ui/class.crud_view.inc:292
 #: ../includes/ui/simple_crud_class.inc:58
-#: ../inventory/includes/item_adjustments_ui.inc:166
-#: ../inventory/includes/stock_transfers_ui.inc:146
+#: ../inventory/includes/item_adjustments_ui.inc:158
+#: ../inventory/includes/stock_transfers_ui.inc:143
 #: ../manufacturing/includes/work_order_issue_ui.inc:141
-#: ../purchasing/includes/ui/po_ui.inc:435
-#: ../sales/includes/ui/sales_credit_ui.inc:296
+#: ../purchasing/includes/ui/po_ui.inc:432
+#: ../sales/includes/ui/sales_credit_ui.inc:297
+#: ../sales/includes/ui/sales_order_ui.inc:551
 msgid "Cancel changes"
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:285
-#: ../gl/includes/ui/gl_journal_ui.inc:263
-#: ../inventory/includes/item_adjustments_ui.inc:172
-#: ../inventory/includes/stock_transfers_ui.inc:152
+#: ../gl/includes/ui/gl_journal_ui.inc:274
+#: ../inventory/includes/item_adjustments_ui.inc:164
+#: ../inventory/includes/stock_transfers_ui.inc:149
 #: ../manufacturing/includes/work_order_issue_ui.inc:147
-#: ../purchasing/includes/ui/po_ui.inc:441
-#: ../sales/includes/ui/sales_credit_ui.inc:302
+#: ../purchasing/includes/ui/po_ui.inc:438
+#: ../sales/includes/ui/sales_credit_ui.inc:303
+#: ../sales/includes/ui/sales_order_ui.inc:557
 msgid "Add Item"
 msgstr ""
 
 #: ../gl/includes/ui/gl_bank_ui.inc:286
-#: ../inventory/includes/item_adjustments_ui.inc:173
-#: ../inventory/includes/stock_transfers_ui.inc:153
+#: ../inventory/includes/item_adjustments_ui.inc:165
+#: ../inventory/includes/stock_transfers_ui.inc:150
 #: ../manufacturing/includes/work_order_issue_ui.inc:148
-#: ../purchasing/includes/ui/po_ui.inc:442
-#: ../sales/includes/ui/sales_credit_ui.inc:303
+#: ../purchasing/includes/ui/po_ui.inc:439
+#: ../sales/includes/ui/sales_credit_ui.inc:304
+#: ../sales/includes/ui/sales_order_ui.inc:558
 msgid "Add new item to document"
 msgstr ""
 
@@ -6054,33 +6303,58 @@ msgstr ""
 msgid "Settled AP Amount:"
 msgstr ""
 
-#: ../gl/includes/ui/gl_journal_ui.inc:36
-msgid "Reverse Transaction:"
+#: ../gl/includes/ui/gl_journal_ui.inc:26
+msgid "Journal Date:"
+msgstr ""
+
+#: ../gl/includes/ui/gl_journal_ui.inc:33
+#: ../inventory/prices.php:192
+msgid "Currency:"
+msgstr ""
+
+#: ../gl/includes/ui/gl_journal_ui.inc:43
+msgid "Document Date:"
 msgstr ""
 
 #: ../gl/includes/ui/gl_journal_ui.inc:44
+msgid "Event Date:"
+msgstr ""
+
+#: ../gl/includes/ui/gl_journal_ui.inc:45
+msgid "Source ref:"
+msgstr ""
+
+#: ../gl/includes/ui/gl_journal_ui.inc:57
 #: ../includes/sysnames.inc:98
 msgid "Quick Entry"
 msgstr ""
 
-#: ../gl/includes/ui/gl_journal_ui.inc:55
+#: ../gl/includes/ui/gl_journal_ui.inc:69
 msgid "balance from account"
 msgstr ""
 
-#: ../gl/includes/ui/gl_journal_ui.inc:133
+#: ../gl/includes/ui/gl_journal_ui.inc:74
+msgid "Additional info:"
+msgstr ""
+
+#: ../gl/includes/ui/gl_journal_ui.inc:81
+msgid "Include in tax register:"
+msgstr ""
+
+#: ../gl/includes/ui/gl_journal_ui.inc:151
 msgid "Edit journal line"
 msgstr ""
 
-#: ../gl/includes/ui/gl_journal_ui.inc:135
+#: ../gl/includes/ui/gl_journal_ui.inc:153
 msgid "Remove line from journal"
 msgstr ""
 
-#: ../gl/includes/ui/gl_journal_ui.inc:198
-#: ../gl/includes/ui/gl_journal_ui.inc:230
+#: ../gl/includes/ui/gl_journal_ui.inc:216
+#: ../gl/includes/ui/gl_journal_ui.inc:234
 msgid "[Select account]"
 msgstr ""
 
-#: ../gl/includes/ui/gl_journal_ui.inc:264
+#: ../gl/includes/ui/gl_journal_ui.inc:275
 msgid "Add new line to journal"
 msgstr ""
 
@@ -6149,8 +6423,8 @@ msgid "Dimensions configuration"
 msgstr ""
 
 #: ../includes/access_levels.inc:72
-#: ../inventory/manage/items.php:352
-#: ../reporting/reports_main.php:301
+#: ../inventory/manage/items.php:361
+#: ../reporting/reports_main.php:302
 msgid "Dimensions"
 msgstr ""
 
@@ -6649,8 +6923,8 @@ msgid ""
 msgstr ""
 
 #: ../includes/current_user.inc:102
-#: ../includes/ui/ui_controls.inc:198
-#: ../includes/ui/ui_view.inc:906
+#: ../includes/ui/ui_controls.inc:216
+#: ../includes/ui/ui_view.inc:942
 msgid "Back"
 msgstr ""
 
@@ -6658,23 +6932,37 @@ msgstr ""
 msgid "System is available for site admin only until full database upgrade"
 msgstr ""
 
-#: ../includes/current_user.inc:164
+#: ../includes/current_user.inc:162
 msgid "New password for"
 msgstr ""
 
-#: ../includes/current_user.inc:618
+#: ../includes/current_user.inc:616
 msgid "Requesting data..."
 msgstr ""
 
-#: ../includes/data_checks.inc:508
+#: ../includes/data_checks.inc:492
 #, php-format
 msgid "%s #%s is closed for further edition."
 msgstr ""
 
-#: ../includes/data_checks.inc:534
+#: ../includes/data_checks.inc:518
 msgid "You have no edit access to transactions created by other users."
 msgstr ""
 
+#: ../includes/data_checks.inc:533
+msgid "The entered reference is invalid."
+msgstr ""
+
+#: ../includes/data_checks.inc:537
+#: ../sales/create_recurrent_invoices.php:59
+#: ../sales/credit_note_entry.php:181
+#: ../sales/customer_credit_invoice.php:204
+#: ../sales/customer_delivery.php:298
+#: ../sales/customer_invoice.php:382
+#: ../sales/sales_order_entry.php:464
+msgid "The entered reference is already in use."
+msgstr ""
+
 #: ../includes/errors.inc:124
 msgid "in file"
 msgstr ""
@@ -6744,12 +7032,25 @@ msgid ""
 "administrator about this issue."
 msgstr ""
 
-#: ../includes/packages.inc:638
-#: ../includes/packages.inc:699
+#: ../includes/packages.inc:641
+#: ../includes/packages.inc:702
 #, php-format
 msgid "Package '%s' not found."
 msgstr ""
 
+#: ../includes/references.inc:102
+msgid "Invalid refline template."
+msgstr ""
+
+#: ../includes/references.inc:112
+#, php-format
+msgid "Missing refline context data: '%s'"
+msgstr ""
+
+#: ../includes/references.inc:154
+msgid "Missing numeric placeholder in refline definition."
+msgstr ""
+
 #: ../includes/session.inc:136
 msgid "Incorrect Password"
 msgstr ""
@@ -6759,7 +7060,6 @@ msgid "The user and password combination is not valid for the system."
 msgstr ""
 
 #: ../includes/session.inc:139
-#: ../includes/session.inc:154
 msgid ""
 "If you are not an authorized user, please contact your system administrator "
 "to obtain an account to enable you to use the system."
@@ -6775,7 +7075,14 @@ msgid "Incorrect Email"
 msgstr ""
 
 #: ../includes/session.inc:152
-msgid "The email address does not exist in the system."
+msgid ""
+"The email address does not exist in the system, or is used by more than one "
+"user."
+msgstr ""
+
+#: ../includes/session.inc:154
+msgid ""
+"Plase try again or contact your system administrator to obtain new password."
 msgstr ""
 
 #: ../includes/session.inc:166
@@ -6869,7 +7176,7 @@ msgid "Inventory Adjustment"
 msgstr ""
 
 #: ../includes/sysnames.inc:32
-#: ../purchasing/includes/ui/po_ui.inc:305
+#: ../purchasing/includes/ui/po_ui.inc:302
 #: ../purchasing/view/view_po.php:30
 msgid "Purchase Order"
 msgstr ""
@@ -6950,6 +7257,7 @@ msgid "CP"
 msgstr ""
 
 #: ../includes/sysnames.inc:54
+#: ../sales/customer_invoice.php:555
 msgid "DN"
 msgstr ""
 
@@ -7020,7 +7328,7 @@ msgid "Chequing Account"
 msgstr ""
 
 #: ../includes/sysnames.inc:78
-#: ../manufacturing/work_order_costs.php:145
+#: ../manufacturing/work_order_costs.php:144
 msgid "Credit Account"
 msgstr ""
 
@@ -7043,30 +7351,32 @@ msgstr ""
 
 #: ../includes/sysnames.inc:96
 #: ../includes/sysnames.inc:195
-#: ../reporting/rep101.php:127
-#: ../reporting/rep102.php:125
-#: ../reporting/rep102.php:132
+#: ../reporting/rep101.php:142
+#: ../reporting/rep102.php:130
+#: ../reporting/rep102.php:137
 #: ../reporting/rep105.php:109
-#: ../reporting/rep106.php:90
+#: ../reporting/rep106.php:89
 #: ../reporting/rep114.php:95
-#: ../reporting/rep304.php:114
-#: ../reporting/rep304.php:124
+#: ../reporting/rep304.php:126
+#: ../reporting/rep304.php:136
 #: ../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:327
-#: ../sales/customer_invoice.php:450
+#: ../sales/create_recurrent_invoices.php:136
+#: ../sales/customer_credit_invoice.php:234
+#: ../sales/customer_delivery.php:326
+#: ../sales/customer_invoice.php:449
 #: ../sales/allocations/customer_allocation_main.php:97
 #: ../sales/allocations/customer_allocation_main.php:105
 #: ../sales/manage/recurrent_invoices.php:108
 #: ../sales/view/view_credit.php:47
-#: ../sales/inquiry/customer_allocation_inquiry.php:150
-#: ../sales/inquiry/customer_allocation_inquiry.php:160
+#: ../sales/inquiry/customer_allocation_inquiry.php:152
+#: ../sales/inquiry/customer_allocation_inquiry.php:162
+#: ../sales/inquiry/customer_inquiry.php:208
+#: ../sales/inquiry/customer_inquiry.php:222
 #: ../sales/inquiry/sales_deliveries_view.php:169
 #: ../sales/inquiry/sales_orders_view.php:250
 #: ../sales/inquiry/sales_orders_view.php:264
@@ -7076,16 +7386,16 @@ msgstr ""
 #: ../includes/sysnames.inc:97
 #: ../includes/sysnames.inc:173
 #: ../includes/sysnames.inc:196
-#: ../inventory/purchasing_data.php:148
+#: ../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:298
+#: ../purchasing/includes/ui/po_ui.inc:295
 #: ../purchasing/view/view_supp_credit.php:42
 #: ../purchasing/view/view_supp_invoice.php:46
-#: ../purchasing/inquiry/po_search_completed.php:124
+#: ../purchasing/inquiry/po_search_completed.php:112
 #: ../purchasing/inquiry/po_search.php:119
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:130
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:143
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:139
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:152
 #: ../purchasing/inquiry/supplier_inquiry.php:176
 #: ../purchasing/inquiry/supplier_inquiry.php:191
 #: ../purchasing/allocations/supplier_allocation_main.php:98
@@ -7102,7 +7412,7 @@ msgstr ""
 #: ../reporting/reports_main.php:162
 #: ../reporting/reports_main.php:173
 #: ../reporting/reports_main.php:180
-#: ../reporting/reports_main.php:252
+#: ../reporting/reports_main.php:253
 msgid "Supplier"
 msgstr ""
 
@@ -7266,7 +7576,7 @@ msgid "Apr"
 msgstr ""
 
 #: ../includes/sysnames.inc:200
-#: ../includes/ui/ui_view.inc:903
+#: ../includes/ui/ui_view.inc:939
 msgid "May"
 msgstr ""
 
@@ -7298,6 +7608,82 @@ msgstr ""
 msgid "Dec"
 msgstr ""
 
+#: ../includes/sysnames.inc:206
+msgid "Unicode (multilanguage)"
+msgstr ""
+
+#: ../includes/sysnames.inc:207
+msgid "Icelandic"
+msgstr ""
+
+#: ../includes/sysnames.inc:208
+msgid "Latvian"
+msgstr ""
+
+#: ../includes/sysnames.inc:209
+msgid "Romanian"
+msgstr ""
+
+#: ../includes/sysnames.inc:210
+msgid "Slovenian"
+msgstr ""
+
+#: ../includes/sysnames.inc:211
+msgid "Polish"
+msgstr ""
+
+#: ../includes/sysnames.inc:212
+msgid "Estonian"
+msgstr ""
+
+#: ../includes/sysnames.inc:213
+msgid "Spanish"
+msgstr ""
+
+#: ../includes/sysnames.inc:214
+msgid "Swedish"
+msgstr ""
+
+#: ../includes/sysnames.inc:215
+msgid "Turkish"
+msgstr ""
+
+#: ../includes/sysnames.inc:216
+msgid "Czech"
+msgstr ""
+
+#: ../includes/sysnames.inc:217
+msgid "Danish"
+msgstr ""
+
+#: ../includes/sysnames.inc:218
+msgid "Lithuanian"
+msgstr ""
+
+#: ../includes/sysnames.inc:219
+msgid "Slovak"
+msgstr ""
+
+#: ../includes/sysnames.inc:220
+msgid "Spanish (alternative)"
+msgstr ""
+
+#: ../includes/sysnames.inc:221
+msgid "Persian"
+msgstr ""
+
+#: ../includes/sysnames.inc:222
+msgid "Hungarian"
+msgstr ""
+
+#: ../includes/sysnames.inc:223
+msgid "French"
+msgstr ""
+
+#: ../includes/sysnames.inc:224
+msgid "Italian"
+msgstr ""
+
 #: ../includes/system_tests.inc:15
 #: ../includes/ui/ui_view.inc:210
 #: ../reporting/rep705.php:254
@@ -7339,7 +7725,7 @@ msgid "PHP version"
 msgstr ""
 
 #: ../includes/system_tests.inc:50
-msgid "Upgrade PHP to version at least 4.3.3"
+msgid "Upgrade PHP to version at least 5.0.0"
 msgstr ""
 
 #: ../includes/system_tests.inc:57
@@ -7526,7 +7912,7 @@ msgstr ""
 #: ../includes/system_tests.inc:421
 #: ../reporting/rep204.php:85
 #: ../reporting/rep301.php:169
-#: ../reporting/rep308.php:231
+#: ../reporting/rep308.php:243
 msgid "Value"
 msgstr ""
 
@@ -7555,37 +7941,37 @@ msgstr ""
 #: ../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:299
-#: ../reporting/reports_main.php:308
-#: ../reporting/reports_main.php:321
-#: ../reporting/reports_main.php:328
-#: ../reporting/reports_main.php:334
-#: ../reporting/reports_main.php:341
-#: ../reporting/reports_main.php:356
-#: ../reporting/reports_main.php:364
-#: ../reporting/reports_main.php:375
-#: ../reporting/reports_main.php:387
-#: ../reporting/reports_main.php:397
-#: ../reporting/reports_main.php:409
-#: ../reporting/reports_main.php:416
-#: ../reporting/reports_main.php:426
-#: ../reporting/reports_main.php:437
-#: ../reporting/reports_main.php:446
-#: ../reporting/reports_main.php:457
-#: ../reporting/reports_main.php:463
-#: ../reporting/reports_main.php:472
-#: ../reporting/reports_main.php:482
-#: ../reporting/reports_main.php:490
-#: ../reporting/reports_main.php:498
-#: ../reporting/reports_main.php:506
+#: ../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:300
+#: ../reporting/reports_main.php:309
+#: ../reporting/reports_main.php:322
+#: ../reporting/reports_main.php:329
+#: ../reporting/reports_main.php:335
+#: ../reporting/reports_main.php:342
+#: ../reporting/reports_main.php:357
+#: ../reporting/reports_main.php:365
+#: ../reporting/reports_main.php:376
+#: ../reporting/reports_main.php:388
+#: ../reporting/reports_main.php:398
+#: ../reporting/reports_main.php:410
+#: ../reporting/reports_main.php:417
+#: ../reporting/reports_main.php:427
+#: ../reporting/reports_main.php:438
+#: ../reporting/reports_main.php:447
+#: ../reporting/reports_main.php:458
+#: ../reporting/reports_main.php:464
+#: ../reporting/reports_main.php:473
+#: ../reporting/reports_main.php:483
+#: ../reporting/reports_main.php:491
+#: ../reporting/reports_main.php:499
+#: ../reporting/reports_main.php:507
 #: ../reporting/includes/excel_report.inc:295
 #: ../reporting/includes/excel_report.inc:428
 #: ../reporting/includes/pdf_report.inc:347
@@ -7604,87 +7990,240 @@ msgid ""
 "trail record."
 msgstr ""
 
-#: ../includes/db/inventory_db.inc:284
-#: ../inventory/includes/db/items_trans_db.inc:60
+#: ../includes/db/class.data_set.inc:77
+msgid "Invalid validator string"
+msgstr ""
+
+#: ../includes/db/class.data_set.inc:113
 #, php-format
-msgid "Cost was %s changed to %s x quantity on hand for item '%s'"
+msgid "Input parameter '%s' have to be set."
 msgstr ""
 
-#: ../includes/db/inventory_db.inc:325
-msgid "Zero/negative inventory handling"
+#: ../includes/db/class.data_set.inc:121
+#, php-format
+msgid "Parameter '%s' cannot be empty."
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:288
+#: ../includes/db/class.data_set.inc:128
 #, php-format
-msgid "Allocated amounts in %s:"
+msgid "Parameter '%s' contains invalid characters."
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:290
-#: ../purchasing/allocations/supplier_allocation_main.php:94
-#: ../sales/allocations/customer_allocation_main.php:93
-msgid "Transaction Type"
+#: ../includes/db/class.data_set.inc:134
+#, php-format
+msgid "Parameter '%s' has invalid value."
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:290
-msgid "Supplier Ref"
+#: ../includes/db/class.data_set.inc:277
+#, php-format
+msgid "Invalid key passed reading '%s'"
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:290
-#: ../reporting/rep704.php:83
-#: ../reporting/rep704.php:86
-#: ../reporting/rep704.php:89
-#: ../reporting/rep709.php:116
-#: ../sales/view/view_credit.php:68
-#: ../sales/view/view_sales_order.php:109
-#: ../sales/view/view_sales_order.php:142
-#: ../sales/view/view_sales_order.php:179
-#: ../sales/inquiry/sales_orders_view.php:210
-#: ../sales/inquiry/sales_orders_view.php:249
-#: ../sales/inquiry/sales_orders_view.php:263
-msgid "Ref"
+#: ../includes/db/class.data_set.inc:329
+msgid "Empty update data for table "
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:291
-msgid "Other Allocations"
+#: ../includes/db/class.data_set.inc:339
+#: ../includes/db/class.data_set.inc:368
+#, php-format
+msgid "Invalid key for update '%s'"
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:291
-#: ../includes/ui/allocation_cart.inc:344
-#: ../includes/ui/ui_view.inc:549
-#: ../purchasing/allocations/supplier_allocation_main.php:101
-#: ../reporting/includes/doctext.inc:166
-#: ../reporting/includes/doctext.inc:207
-#: ../sales/allocations/customer_allocation_main.php:100
-msgid "Left to Allocate"
+#: ../includes/db/class.data_set.inc:376
+msgid "Cannot update record in "
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:291
-#: ../includes/ui/ui_view.inc:549
-#: ../reporting/includes/doctext.inc:166
-#: ../reporting/includes/doctext.inc:207
-msgid "This Allocation"
+#: ../includes/db/class.data_set.inc:395
+msgid "Empty data set for insertion into "
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:324
-msgid "Total Allocated"
+#: ../includes/db/class.data_set.inc:401
+msgid "Cannot insert record into "
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:366
-msgid "The entry for one or more amounts is invalid or negative."
+#: ../includes/db/class.data_set.inc:482
+msgid "Empty update data for array "
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:377
-msgid "At least one transaction is overallocated."
+#: ../includes/db/class.data_set.inc:510
+msgid "Empty data for array "
 msgstr ""
 
-#: ../includes/ui/allocation_cart.inc:396
+#: ../includes/db/class.reflines_db.inc:22
 msgid ""
-"These allocations cannot be processed because the amount allocated is more "
-"than the total amount left to allocate."
+"This prefix conflicts with another one already defined. Prefix have to be "
+"unambigous."
 msgstr ""
 
-#: ../includes/ui/contacts_view.inc:41
-msgid "Assignment"
+#: ../includes/db/class.reflines_db.inc:23
+msgid "Invalid template format."
+msgstr ""
+
+#: ../includes/db/class.reflines_db.inc:24
+msgid "Transaction type cannot be empty."
+msgstr ""
+
+#: ../includes/db/class.reflines_db.inc:25
+msgid "Next reference cannot be empty."
+msgstr ""
+
+#: ../includes/db/class.reflines_db.inc:50
+msgid "You cannot use placeholders in refline prefix."
+msgstr ""
+
+#: ../includes/db/class.reflines_db.inc:53
+msgid "Curly brackets does not balance."
+msgstr ""
+
+#: ../includes/db/class.reflines_db.inc:67
+#, php-format
+msgid ""
+"Invalid placeholder '%s'. Placeholders allowed for this transaction type "
+"are: %s."
+msgstr ""
+
+#: ../includes/db/class.reflines_db.inc:73
+msgid ""
+"Missing numeric placeholder. If you want to use template based references, "
+"you have to define numeric placeholder too."
+msgstr ""
+
+#: ../includes/db/class.reflines_db.inc:99
+msgid ""
+"Reference line which is default for any transaction type cannot be deleted."
+msgstr ""
+
+#: ../includes/db/class.reflines_db.inc:102
+msgid "Reference line cannot be deleted because it is already in use."
+msgstr ""
+
+#: ../includes/db/inventory_db.inc:290
+msgid "Cost was "
+msgstr ""
+
+#: ../includes/db/inventory_db.inc:290
+msgid " changed to "
+msgstr ""
+
+#: ../includes/db/inventory_db.inc:290
+msgid " for item "
+msgstr ""
+
+#: ../includes/db/inventory_db.inc:333
+msgid "Zero/negative inventory handling"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:289
+#, php-format
+msgid "Allocated amounts in %s:"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:291
+#: ../purchasing/allocations/supplier_allocation_main.php:94
+#: ../sales/allocations/customer_allocation_main.php:93
+msgid "Transaction Type"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:291
+msgid "Supplier Ref"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:291
+#: ../reporting/rep704.php:83
+#: ../reporting/rep704.php:86
+#: ../reporting/rep704.php:89
+#: ../reporting/rep709.php:116
+#: ../sales/view/view_credit.php:68
+#: ../sales/view/view_sales_order.php:109
+#: ../sales/view/view_sales_order.php:142
+#: ../sales/view/view_sales_order.php:179
+#: ../sales/inquiry/sales_orders_view.php:210
+#: ../sales/inquiry/sales_orders_view.php:249
+#: ../sales/inquiry/sales_orders_view.php:263
+msgid "Ref"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:292
+msgid "Other Allocations"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:292
+#: ../includes/ui/allocation_cart.inc:346
+#: ../includes/ui/ui_view.inc:549
+#: ../purchasing/allocations/supplier_allocation_main.php:101
+#: ../reporting/rep112.php:148
+#: ../reporting/rep210.php:155
+#: ../reporting/includes/doctext.inc:166
+#: ../reporting/includes/doctext.inc:207
+#: ../sales/allocations/customer_allocation_main.php:100
+msgid "Left to Allocate"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:292
+#: ../includes/ui/ui_view.inc:549
+#: ../reporting/includes/doctext.inc:166
+#: ../reporting/includes/doctext.inc:207
+msgid "This Allocation"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:325
+#: ../reporting/rep112.php:145
+#: ../reporting/rep210.php:152
+msgid "Total Allocated"
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:367
+msgid "The entry for one or more amounts is invalid or negative."
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:378
+msgid "At least one transaction is overallocated."
+msgstr ""
+
+#: ../includes/ui/allocation_cart.inc:398
+msgid ""
+"These allocations cannot be processed because the amount allocated is more "
+"than the total amount left to allocate."
+msgstr ""
+
+#: ../includes/ui/class.crud_view.inc:289
+#: ../includes/ui/simple_crud_class.inc:227
+#: ../includes/ui/ui_input.inc:226
+msgid "Submit changes"
+msgstr ""
+
+#: ../includes/ui/class.crud_view.inc:304
+#: ../includes/ui/simple_crud_class.inc:229
+#: ../includes/ui/ui_input.inc:227
+msgid "Clone"
+msgstr ""
+
+#: ../includes/ui/class.reflines_crud.inc:37
+msgid "Transaction type"
+msgstr ""
+
+#: ../includes/ui/class.reflines_crud.inc:37
+msgid "Prefix"
+msgstr ""
+
+#: ../includes/ui/class.reflines_crud.inc:38
+msgid "Pattern"
+msgstr ""
+
+#: ../includes/ui/class.reflines_crud.inc:97
+msgid "Reference Pattern:"
+msgstr ""
+
+#: ../includes/ui/class.reflines_crud.inc:100
+msgid "Default for This Type:"
+msgstr ""
+
+#: ../includes/ui/class.reflines_crud.inc:102
+msgid "Set as Default for This Type:"
+msgstr ""
+
+#: ../includes/ui/contacts_view.inc:41
+msgid "Assignment"
 msgstr ""
 
 #: ../includes/ui/contacts_view.inc:41
@@ -7726,7 +8265,7 @@ msgstr ""
 
 #: ../includes/ui/contacts_view.inc:105
 #: ../inventory/manage/locations.php:207
-#: ../purchasing/manage/suppliers.php:141
+#: ../purchasing/manage/suppliers.php:138
 #: ../sales/manage/customer_branches.php:252
 #: ../sales/manage/customers.php:259
 #: ../sales/manage/sales_people.php:158
@@ -7734,7 +8273,7 @@ msgid "E-mail:"
 msgstr ""
 
 #: ../includes/ui/contacts_view.inc:110
-#: ../purchasing/manage/suppliers.php:142
+#: ../purchasing/manage/suppliers.php:139
 #: ../sales/manage/customer_branches.php:253
 msgid "Document Language:"
 msgstr ""
@@ -7761,7 +8300,7 @@ msgid "You have to select at least one category."
 msgstr ""
 
 #: ../includes/ui/db_pager_view.inc:166
-#: ../includes/ui/ui_input.inc:905
+#: ../includes/ui/ui_input.inc:979
 msgid "Show also Inactive"
 msgstr ""
 
@@ -7790,105 +8329,99 @@ msgstr ""
 msgid "No records"
 msgstr ""
 
-#: ../includes/ui/simple_crud_class.inc:227
-#: ../includes/ui/ui_input.inc:209
-msgid "Submit changes"
-msgstr ""
-
-#: ../includes/ui/simple_crud_class.inc:229
-#: ../includes/ui/ui_input.inc:210
-msgid "Clone"
+#: ../includes/ui/items_cart.inc:391
+msgid "Exchange rate roundings"
 msgstr ""
 
 #: ../includes/ui/simple_crud_class.inc:229
-#: ../includes/ui/ui_input.inc:211
+#: ../includes/ui/ui_input.inc:228
 msgid "Edit new record with current data"
 msgstr ""
 
 #: ../includes/ui/simple_crud_class.inc:231
-#: ../includes/ui/ui_input.inc:212
+#: ../includes/ui/ui_input.inc:229
 msgid "Cancel edition"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:80
+#: ../includes/ui/ui_controls.inc:93
 msgid "Request from outside of this page is forbidden."
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:81
+#: ../includes/ui/ui_controls.inc:94
 msgid "CSRF attack detected from: "
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:147
+#: ../includes/ui/ui_controls.inc:165
 msgid "You should automatically be forwarded."
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:148
+#: ../includes/ui/ui_controls.inc:166
 msgid "If this does not happen"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:148
+#: ../includes/ui/ui_controls.inc:166
 msgid "click here"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:148
+#: ../includes/ui/ui_controls.inc:166
 msgid "to continue"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:198
+#: ../includes/ui/ui_controls.inc:216
 msgid "Close"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:460
+#: ../includes/ui/ui_controls.inc:500
 #: ../sales/manage/customers.php:23
 msgid "Customers"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:462
+#: ../includes/ui/ui_controls.inc:502
 msgid "Branches"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:464
+#: ../includes/ui/ui_controls.inc:504
 #: ../purchasing/manage/suppliers.php:22
 msgid "Suppliers"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:466
-#: ../inventory/transfers.php:224
+#: ../includes/ui/ui_controls.inc:506
+#: ../inventory/transfers.php:210
 #: ../inventory/manage/items.php:22
 #: ../reporting/rep402.php:108
-#: ../reporting/reports_main.php:253
-#: ../reporting/reports_main.php:289
+#: ../reporting/reports_main.php:254
+#: ../reporting/reports_main.php:290
 msgid "Items"
 msgstr ""
 
-#: ../includes/ui/ui_controls.inc:611
+#: ../includes/ui/ui_controls.inc:666
 msgid "Entered data has not been saved yet.\\nDo you want to abandon changes?"
 msgstr ""
 
-#: ../includes/ui/ui_input.inc:633
+#: ../includes/ui/ui_input.inc:656
 #: ../reporting/includes/reports_classes.inc:222
 msgid "Click Here to Pick up the date"
 msgstr ""
 
-#: ../includes/ui/ui_input.inc:917
-#: ../includes/ui/ui_lists.inc:2148
+#: ../includes/ui/ui_input.inc:991
+#: ../includes/ui/ui_lists.inc:2125
 #: ../reporting/rep301.php:229
-#: ../reporting/rep302.php:170
+#: ../reporting/rep302.php:169
 #: ../reporting/rep303.php:184
-#: ../reporting/rep304.php:170
-#: ../reporting/rep304.php:174
+#: ../reporting/rep304.php:183
+#: ../reporting/rep304.php:187
 #: ../reporting/rep306.php:235
 #: ../reporting/rep306.php:242
 #: ../sales/manage/customer_branches.php:288
 msgid "Inactive"
 msgstr ""
 
-#: ../includes/ui/ui_input.inc:927
-#: ../includes/ui/ui_input.inc:939
+#: ../includes/ui/ui_input.inc:1001
+#: ../includes/ui/ui_input.inc:1013
 msgid "Current Credit:"
 msgstr ""
 
-#: ../includes/ui/ui_input.inc:953
+#: ../includes/ui/ui_input.inc:1027
 msgid "Bank Balance:"
 msgstr ""
 
@@ -7909,7 +8442,7 @@ msgid "Enter description fragment to search or * for all"
 msgstr ""
 
 #: ../includes/ui/ui_lists.inc:451
-#: ../includes/ui/ui_lists.inc:1382
+#: ../includes/ui/ui_lists.inc:1359
 msgid "All Suppliers"
 msgstr ""
 
@@ -7954,122 +8487,126 @@ msgstr ""
 msgid "All Sales Types"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1624
+#: ../includes/ui/ui_lists.inc:1601
 msgid "Use Item Sales Accounts"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1934
-#: ../includes/ui/ui_lists.inc:1950
-#: ../includes/ui/ui_lists.inc:1966
+#: ../includes/ui/ui_lists.inc:1911
+#: ../includes/ui/ui_lists.inc:1927
+#: ../includes/ui/ui_lists.inc:1943
 msgid "All Types"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1935
+#: ../includes/ui/ui_lists.inc:1912
 #: ../sales/view/view_sales_order.php:140
 msgid "Sales Invoices"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1936
-#: ../includes/ui/ui_lists.inc:1952
-#: ../includes/ui/ui_lists.inc:1969
+#: ../includes/ui/ui_lists.inc:1913
+#: ../includes/ui/ui_lists.inc:1929
+#: ../includes/ui/ui_lists.inc:1946
 msgid "Overdue Invoices"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1937
-#: ../includes/ui/ui_lists.inc:1953
-#: ../includes/ui/ui_lists.inc:1970
+#: ../includes/ui/ui_lists.inc:1914
+#: ../includes/ui/ui_lists.inc:1930
+#: ../includes/ui/ui_lists.inc:1947
 #: ../includes/ui/ui_view.inc:611
 #: ../includes/ui/ui_view.inc:615
 msgid "Payments"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1938
-#: ../includes/ui/ui_lists.inc:1954
-#: ../includes/ui/ui_lists.inc:1971
+#: ../includes/ui/ui_lists.inc:1915
+#: ../includes/ui/ui_lists.inc:1931
+#: ../includes/ui/ui_lists.inc:1948
 #: ../sales/view/view_sales_order.php:176
 msgid "Credit Notes"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1939
+#: ../includes/ui/ui_lists.inc:1916
 #: ../sales/view/view_sales_order.php:106
 msgid "Delivery Notes"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1951
-#: ../includes/ui/ui_lists.inc:1968
+#: ../includes/ui/ui_lists.inc:1928
+#: ../includes/ui/ui_lists.inc:1945
 msgid "Invoices"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1955
-#: ../includes/ui/ui_lists.inc:1972
+#: ../includes/ui/ui_lists.inc:1932
+#: ../includes/ui/ui_lists.inc:1949
 msgid "Overdue Credit Notes"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1967
+#: ../includes/ui/ui_lists.inc:1944
 msgid "GRNs"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1985
+#: ../includes/ui/ui_lists.inc:1962
 msgid "Automatically put balance on back order"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:1986
+#: ../includes/ui/ui_lists.inc:1963
 msgid "Cancel any quantites not delivered"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2003
+#: ../includes/ui/ui_lists.inc:1980
 msgid "Items Returned to Inventory Location"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2004
+#: ../includes/ui/ui_lists.inc:1981
 msgid "Items Written Off"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2173
+#: ../includes/ui/ui_lists.inc:2150
 msgid "New role"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2225
+#: ../includes/ui/ui_lists.inc:2202
 msgid "No tags defined."
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2225
+#: ../includes/ui/ui_lists.inc:2202
 msgid "No active tags defined."
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2263
+#: ../includes/ui/ui_lists.inc:2240
 #, php-format
 msgid "Activated for '%s'"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2266
+#: ../includes/ui/ui_lists.inc:2243
 msgid "Available and/or installed"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2336
+#: ../includes/ui/ui_lists.inc:2313
 msgid "Standard new company American COA (4 digit)"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2338
+#: ../includes/ui/ui_lists.inc:2315
 msgid "Standard American COA (4 digit) with demo data"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2359
+#: ../includes/ui/ui_lists.inc:2336
 msgid "No payment Link"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2445
+#: ../includes/ui/ui_lists.inc:2456
 msgid "Numeric"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2445
+#: ../includes/ui/ui_lists.inc:2456
 msgid "Alpha Numeric"
 msgstr ""
 
-#: ../includes/ui/ui_lists.inc:2445
+#: ../includes/ui/ui_lists.inc:2456
 msgid "ALPHA NUMERIC"
 msgstr ""
 
+#: ../includes/ui/ui_lists.inc:2472
+msgid "All users"
+msgstr ""
+
 #: ../includes/ui/ui_msgs.inc:68
 msgid "in units of : "
 msgstr ""
@@ -8124,7 +8661,7 @@ msgstr ""
 
 #: ../includes/ui/ui_view.inc:594
 #: ../includes/ui/ui_view.inc:598
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:100
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:99
 msgid "Allocations"
 msgstr ""
 
@@ -8137,87 +8674,88 @@ msgstr ""
 msgid "No Quick Entries are defined."
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:659
+#: ../includes/ui/ui_view.inc:646
 msgid "No Quick Entry lines are defined."
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:841
+#: ../includes/ui/ui_view.inc:877
+#: ../purchasing/includes/ui/invoice_ui.inc:491
 msgid "and"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:903
+#: ../includes/ui/ui_view.inc:939
 msgid "January"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:903
+#: ../includes/ui/ui_view.inc:939
 msgid "February"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:903
+#: ../includes/ui/ui_view.inc:939
 msgid "March"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:903
+#: ../includes/ui/ui_view.inc:939
 msgid "April"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:903
+#: ../includes/ui/ui_view.inc:939
 msgid "June"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:903
+#: ../includes/ui/ui_view.inc:939
 msgid "July"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:903
+#: ../includes/ui/ui_view.inc:939
 msgid "August"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:903
+#: ../includes/ui/ui_view.inc:939
 msgid "September"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:903
+#: ../includes/ui/ui_view.inc:939
 msgid "October"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:903
+#: ../includes/ui/ui_view.inc:939
 msgid "November"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:903
+#: ../includes/ui/ui_view.inc:939
 msgid "December"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:904
+#: ../includes/ui/ui_view.inc:940
 msgid "Su"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:904
+#: ../includes/ui/ui_view.inc:940
 msgid "Mo"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:904
+#: ../includes/ui/ui_view.inc:940
 msgid "Tu"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:904
+#: ../includes/ui/ui_view.inc:940
 msgid "We"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:904
+#: ../includes/ui/ui_view.inc:940
 msgid "Th"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:904
+#: ../includes/ui/ui_view.inc:940
 msgid "Fr"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:904
+#: ../includes/ui/ui_view.inc:940
 msgid "Sa"
 msgstr ""
 
-#: ../includes/ui/ui_view.inc:905
+#: ../includes/ui/ui_view.inc:941
 msgid "W"
 msgstr ""
 
@@ -8231,113 +8769,105 @@ msgid ""
 "(Purchased or Manufactured)."
 msgstr ""
 
-#: ../inventory/adjustments.php:34
-#: ../inventory/transfers.php:34
-msgid ""
-"There are no inventory movement types defined in the system. Please define "
-"at least one inventory adjustment type."
-msgstr ""
-
-#: ../inventory/adjustments.php:43
+#: ../inventory/adjustments.php:41
 msgid "Items adjustment has been processed"
 msgstr ""
 
-#: ../inventory/adjustments.php:44
+#: ../inventory/adjustments.php:42
 msgid "&View this adjustment"
 msgstr ""
 
-#: ../inventory/adjustments.php:46
+#: ../inventory/adjustments.php:44
 msgid "View the GL &Postings for this Adjustment"
 msgstr ""
 
-#: ../inventory/adjustments.php:48
+#: ../inventory/adjustments.php:46
 msgid "Enter &Another Adjustment"
 msgstr ""
 
-#: ../inventory/adjustments.php:88
-#: ../inventory/transfers.php:84
+#: ../inventory/adjustments.php:86
+#: ../inventory/transfers.php:82
 #: ../sales/sales_order_entry.php:373
 msgid "You must enter at least one non empty item line."
 msgstr ""
 
-#: ../inventory/adjustments.php:108
+#: ../inventory/adjustments.php:99
 msgid "The entered date for the adjustment is invalid."
 msgstr ""
 
-#: ../inventory/adjustments.php:124
+#: ../inventory/adjustments.php:115
 msgid ""
 "The adjustment cannot be processed because it would cause negative inventory "
 "balance for marked items as of document date or later."
 msgstr ""
 
-#: ../inventory/adjustments.php:153
-#: ../manufacturing/work_order_issue.php:139
-msgid "The quantity entered is negative or invalid."
+#: ../inventory/adjustments.php:143
+msgid "The quantity entered is invalid."
 msgstr ""
 
-#: ../inventory/adjustments.php:160
-#: ../manufacturing/work_order_issue.php:146
+#: ../inventory/adjustments.php:150
+#: ../manufacturing/work_order_issue.php:138
 msgid "The entered standard cost is negative or invalid."
 msgstr ""
 
-#: ../inventory/adjustments.php:229
+#: ../inventory/adjustments.php:213
 msgid "Adjustment Items"
 msgstr ""
 
-#: ../inventory/adjustments.php:235
+#: ../inventory/adjustments.php:219
 msgid "Process Adjustment"
 msgstr ""
 
-#: ../inventory/cost_update.php:29
+#: ../inventory/cost_update.php:28
 msgid "Inventory Item Cost Update"
 msgstr ""
 
-#: ../inventory/cost_update.php:33
+#: ../inventory/cost_update.php:32
 msgid ""
 "There are no costable inventory items defined in the system (Purchased or "
 "manufactured items)."
 msgstr ""
 
-#: ../inventory/cost_update.php:54
+#: ../inventory/cost_update.php:53
 msgid "The entered cost is not numeric."
 msgstr ""
 
-#: ../inventory/cost_update.php:60
+#: ../inventory/cost_update.php:59
 msgid "The new cost is the same as the old cost. Cost was not updated."
 msgstr ""
 
-#: ../inventory/cost_update.php:70
+#: ../inventory/cost_update.php:69
 msgid "Cost has been updated."
 msgstr ""
 
-#: ../inventory/cost_update.php:74
+#: ../inventory/cost_update.php:73
 msgid "View the GL Journal Entries for this Cost Update"
 msgstr ""
 
-#: ../inventory/cost_update.php:94
+#: ../inventory/cost_update.php:93
 #: ../inventory/prices.php:62
-#: ../inventory/purchasing_data.php:118
+#: ../inventory/purchasing_data.php:117
 #: ../inventory/reorder_level.php:50
-#: ../inventory/inquiry/stock_movements.php:49
+#: ../inventory/inquiry/stock_movements.php:50
 #: ../inventory/inquiry/stock_status.php:41
-#: ../inventory/manage/item_codes.php:105
-#: ../manufacturing/work_order_entry.php:395
-#: ../manufacturing/work_order_entry.php:400
+#: ../inventory/manage/item_codes.php:104
+#: ../manufacturing/work_order_entry.php:386
+#: ../manufacturing/work_order_entry.php:391
 #: ../purchasing/inquiry/po_search.php:74
 #: ../sales/inquiry/sales_deliveries_view.php:112
 #: ../sales/inquiry/sales_orders_view.php:225
 msgid "Item:"
 msgstr ""
 
-#: ../inventory/cost_update.php:115
+#: ../inventory/cost_update.php:114
 msgid "Standard Material Cost Per Unit"
 msgstr ""
 
-#: ../inventory/cost_update.php:123
+#: ../inventory/cost_update.php:122
 msgid "Standard Labour Cost Per Unit"
 msgstr ""
 
-#: ../inventory/cost_update.php:124
+#: ../inventory/cost_update.php:123
 msgid "Standard Overhead Cost Per Unit"
 msgstr ""
 
@@ -8348,7 +8878,7 @@ msgstr ""
 #: ../inventory/prices.php:29
 #: ../inventory/inquiry/stock_movements.php:29
 #: ../inventory/inquiry/stock_status.php:32
-#: ../inventory/manage/sales_kits.php:24
+#: ../inventory/manage/sales_kits.php:22
 #: ../manufacturing/inquiry/where_used_inquiry.php:21
 #: ../sales/credit_note_entry.php:49
 msgid "There are no items defined in the system."
@@ -8384,30 +8914,33 @@ msgstr ""
 
 #: ../inventory/prices.php:147
 #: ../reporting/rep104.php:118
-#: ../sales/customer_delivery.php:344
-#: ../sales/customer_invoice.php:472
+#: ../sales/customer_delivery.php:346
+#: ../sales/customer_invoice.php:474
 #: ../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
+#: ../sales/includes/ui/sales_credit_ui.inc:103
 msgid "Sales Type"
 msgstr ""
 
 #: ../inventory/prices.php:147
-#: ../inventory/purchasing_data.php:148
+#: ../inventory/purchasing_data.php:147
+#: ../purchasing/includes/ui/invoice_ui.inc:523
 #: ../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:32
 #: ../reporting/includes/doctext.inc:191
-#: ../sales/customer_credit_invoice.php:281
-#: ../sales/customer_delivery.php:422
+#: ../sales/customer_credit_invoice.php:283
+#: ../sales/customer_delivery.php:424
+#: ../sales/customer_invoice.php:549
+#: ../sales/customer_invoice.php:552
 #: ../sales/view/view_credit.php:91
 #: ../sales/view/view_dispatch.php:113
 #: ../sales/view/view_invoice.php:116
 #: ../sales/view/view_sales_order.php:220
-#: ../sales/includes/ui/sales_credit_ui.inc:168
+#: ../sales/includes/ui/sales_credit_ui.inc:169
 msgid "Price"
 msgstr ""
 
@@ -8415,16 +8948,12 @@ msgstr ""
 msgid "There are no prices set up for this part."
 msgstr ""
 
-#: ../inventory/prices.php:192
-msgid "Currency:"
-msgstr ""
-
 #: ../inventory/prices.php:194
 msgid "Sales Type:"
 msgstr ""
 
 #: ../inventory/prices.php:202
-#: ../inventory/purchasing_data.php:215
+#: ../inventory/purchasing_data.php:214
 msgid "Price:"
 msgstr ""
 
@@ -8436,16 +8965,16 @@ msgstr ""
 msgid "The price is calculated."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:24
+#: ../inventory/purchasing_data.php:23
 msgid "Supplier Purchasing Data"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:26
+#: ../inventory/purchasing_data.php:25
 #: ../purchasing/po_entry_items.php:70
 msgid "There are no purchasable inventory items defined in the system."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:27
+#: ../inventory/purchasing_data.php:26
 #: ../purchasing/po_entry_items.php:68
 #: ../purchasing/supplier_credit.php:31
 #: ../purchasing/supplier_invoice.php:30
@@ -8453,67 +8982,67 @@ msgstr ""
 msgid "There are no suppliers defined in the system."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:45
-#: ../inventory/manage/item_codes.php:35
+#: ../inventory/purchasing_data.php:44
+#: ../inventory/manage/item_codes.php:34
 msgid "There is no item selected."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:51
+#: ../inventory/purchasing_data.php:50
 msgid "The price entered was not numeric."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:57
+#: ../inventory/purchasing_data.php:56
 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:63
+#: ../inventory/purchasing_data.php:62
 msgid "The purchasing data for this supplier has already been added."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:72
+#: ../inventory/purchasing_data.php:71
 msgid "This supplier purchasing data has been added."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:78
+#: ../inventory/purchasing_data.php:77
 msgid "Supplier purchasing data has been updated."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:89
+#: ../inventory/purchasing_data.php:88
 msgid "The purchasing data item has been sucessfully deleted."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:133
+#: ../inventory/purchasing_data.php:132
 msgid "Entered item is not defined. Please re-enter."
 msgstr ""
 
-#: ../inventory/purchasing_data.php:142
+#: ../inventory/purchasing_data.php:141
 msgid "There is no purchasing data set up for the part selected"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:149
+#: ../inventory/purchasing_data.php:148
 msgid "Supplier's Unit"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:149
+#: ../inventory/purchasing_data.php:148
 msgid "Conversion Factor"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:149
+#: ../inventory/purchasing_data.php:148
 msgid "Supplier's Description"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:216
+#: ../inventory/purchasing_data.php:215
 msgid "Suppliers Unit of Measure:"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:222
+#: ../inventory/purchasing_data.php:221
 msgid "Conversion Factor (to our UOM):"
 msgstr ""
 
-#: ../inventory/purchasing_data.php:224
+#: ../inventory/purchasing_data.php:223
 msgid "Supplier's Code or Description:"
 msgstr ""
 
@@ -8529,47 +9058,47 @@ msgid ""
 msgstr ""
 
 #: ../inventory/reorder_level.php:67
-#: ../inventory/inquiry/stock_movements.php:79
+#: ../inventory/inquiry/stock_movements.php:82
 #: ../inventory/inquiry/stock_status.php:66
 #: ../inventory/inquiry/stock_status.php:70
 #: ../manufacturing/search_work_orders.php:168
 #: ../manufacturing/inquiry/where_used_inquiry.php:45
-#: ../manufacturing/manage/bom_edit.php:70
-#: ../purchasing/inquiry/po_search_completed.php:125
-#: ../purchasing/inquiry/po_search_completed.php:135
+#: ../manufacturing/manage/bom_edit.php:68
+#: ../purchasing/inquiry/po_search_completed.php:113
+#: ../purchasing/inquiry/po_search_completed.php:123
 #: ../purchasing/inquiry/po_search.php:120
 #: ../purchasing/inquiry/po_search.php:131
 #: ../reporting/rep105.php:120
 #: ../reporting/rep301.php:176
-#: ../reporting/rep302.php:132
+#: ../reporting/rep302.php:131
 #: ../reporting/rep303.php:134
-#: ../reporting/rep304.php:123
+#: ../reporting/rep304.php:135
 #: ../reporting/rep306.php:150
 #: ../reporting/rep307.php:124
-#: ../reporting/rep308.php:238
+#: ../reporting/rep308.php:250
 #: ../reporting/rep402.php:103
 #: ../reporting/rep402.php:109
 #: ../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
-#: ../reporting/reports_main.php:290
+#: ../reporting/reports_main.php:252
+#: ../reporting/reports_main.php:262
+#: ../reporting/reports_main.php:270
+#: ../reporting/reports_main.php:291
 #: ../sales/manage/sales_points.php:84
 msgid "Location"
 msgstr ""
 
 #: ../inventory/reorder_level.php:67
-#: ../inventory/inquiry/stock_movements.php:80
+#: ../inventory/inquiry/stock_movements.php:84
 #: ../inventory/inquiry/stock_status.php:70
-#: ../purchasing/supplier_credit.php:222
+#: ../purchasing/supplier_credit.php:207
 msgid "Quantity On Hand"
 msgstr ""
 
 #: ../inventory/reorder_level.php:67
-#: ../inventory/includes/inventory_db.inc:72
+#: ../inventory/includes/inventory_db.inc:99
 #: ../inventory/inquiry/stock_status.php:70
 msgid "Re-Order Level"
 msgstr ""
@@ -8582,133 +9111,128 @@ msgstr ""
 msgid "Inventory Location Transfers"
 msgstr ""
 
-#: ../inventory/transfers.php:43
+#: ../inventory/transfers.php:41
 msgid "Inventory transfer has been processed"
 msgstr ""
 
-#: ../inventory/transfers.php:44
+#: ../inventory/transfers.php:42
 msgid "&View this transfer"
 msgstr ""
 
-#: ../inventory/transfers.php:46
+#: ../inventory/transfers.php:44
 msgid "Enter &Another Inventory Transfer"
 msgstr ""
 
-#: ../inventory/transfers.php:102
+#: ../inventory/transfers.php:93
 msgid "The entered transfer date is invalid."
 msgstr ""
 
-#: ../inventory/transfers.php:114
+#: ../inventory/transfers.php:105
 msgid "The locations to transfer from and to must be different."
 msgstr ""
 
-#: ../inventory/transfers.php:124
+#: ../inventory/transfers.php:115
 msgid ""
 "The transfer cannot be processed because it would cause negative inventory "
 "balance in source location for marked items as of document date or later."
 msgstr ""
 
-#: ../inventory/transfers.php:154
+#: ../inventory/transfers.php:145
 msgid "The quantity entered must be a positive number."
 msgstr ""
 
-#: ../inventory/transfers.php:231
+#: ../inventory/transfers.php:217
 msgid "Process Transfer"
 msgstr ""
 
-#: ../inventory/includes/inventory_db.inc:69
+#: ../inventory/includes/inventory_db.inc:96
 msgid "Stocks below Re-Order Level at "
 msgstr ""
 
-#: ../inventory/includes/inventory_db.inc:72
+#: ../inventory/includes/inventory_db.inc:99
 msgid "Below"
 msgstr ""
 
-#: ../inventory/includes/inventory_db.inc:73
+#: ../inventory/includes/inventory_db.inc:100
 msgid "Please reorder"
 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
+#: ../sales/includes/ui/sales_order_ui.inc:59
 msgid "For Part :"
 msgstr ""
 
 #: ../inventory/includes/item_adjustments_ui.inc:34
-#: ../manufacturing/work_order_entry.php:209
+#: ../manufacturing/work_order_entry.php:200
 #: ../purchasing/inquiry/po_search.php:67
 #: ../sales/inquiry/sales_deliveries_view.php:105
 #: ../sales/inquiry/sales_orders_view.php:216
 msgid "Location:"
 msgstr ""
 
-#: ../inventory/includes/item_adjustments_ui.inc:43
-msgid "Detail:"
-msgstr ""
-
-#: ../inventory/includes/item_adjustments_ui.inc:48
-msgid "Positive Adjustment"
-msgstr ""
-
-#: ../inventory/includes/item_adjustments_ui.inc:48
-msgid "Negative Adjustment"
-msgstr ""
-
-#: ../inventory/includes/item_adjustments_ui.inc:62
-#: ../inventory/includes/stock_transfers_ui.inc:60
+#: ../inventory/includes/item_adjustments_ui.inc:54
+#: ../inventory/includes/stock_transfers_ui.inc:57
+#: ../inventory/view/view_adjustment.php:54
+#: ../inventory/view/view_transfer.php:50
 #: ../manufacturing/includes/work_order_issue_ui.inc:33
-#: ../purchasing/includes/ui/po_ui.inc:218
+#: ../purchasing/includes/ui/po_ui.inc:214
 #: ../purchasing/po_receive_items.php:62
 #: ../purchasing/view/view_grn.php:40
 #: ../purchasing/view/view_po.php:45
 #: ../reporting/includes/doctext.inc:31
 #: ../reporting/includes/doctext.inc:190
 #: ../reporting/includes/doctext.inc:227
-#: ../sales/customer_credit_invoice.php:280
-#: ../sales/customer_delivery.php:420
+#: ../sales/customer_credit_invoice.php:282
+#: ../sales/customer_delivery.php:422
+#: ../sales/customer_invoice.php:548
+#: ../sales/customer_invoice.php:551
 #: ../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:147
+#: ../sales/includes/ui/sales_credit_ui.inc:168
+#: ../sales/includes/ui/sales_order_ui.inc:146
 msgid "Item Code"
 msgstr ""
 
-#: ../inventory/includes/item_adjustments_ui.inc:62
-#: ../inventory/includes/stock_transfers_ui.inc:60
+#: ../inventory/includes/item_adjustments_ui.inc:54
+#: ../inventory/includes/stock_transfers_ui.inc:57
 #: ../manufacturing/includes/work_order_issue_ui.inc:33
-#: ../purchasing/includes/ui/po_ui.inc:218
+#: ../purchasing/includes/ui/po_ui.inc:214
 #: ../purchasing/view/view_grn.php:40
 #: ../purchasing/view/view_po.php:45
 #: ../reporting/includes/doctext.inc:31
 #: ../reporting/includes/doctext.inc:190
 #: ../reporting/includes/doctext.inc:227
-#: ../sales/customer_credit_invoice.php:280
-#: ../sales/customer_delivery.php:420
+#: ../sales/customer_credit_invoice.php:282
+#: ../sales/customer_delivery.php:422
+#: ../sales/customer_invoice.php:548
+#: ../sales/customer_invoice.php:551
 #: ../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:147
+#: ../sales/includes/ui/sales_credit_ui.inc:168
+#: ../sales/includes/ui/sales_order_ui.inc:146
 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
+#: ../inventory/includes/item_adjustments_ui.inc:54
+#: ../inventory/includes/stock_transfers_ui.inc:57
+#: ../inventory/manage/item_codes.php:123
+#: ../inventory/manage/sales_kits.php:38
+#: ../inventory/view/view_adjustment.php:54
+#: ../inventory/view/view_transfer.php:50
+#: ../manufacturing/view/wo_issue_view.php:76
+#: ../manufacturing/manage/bom_edit.php:69
 #: ../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/po_ui.inc:218
+#: ../purchasing/includes/ui/invoice_ui.inc:523
+#: ../purchasing/includes/ui/po_ui.inc:214
 #: ../purchasing/view/view_grn.php:40
 #: ../purchasing/view/view_po.php:45
 #: ../reporting/rep301.php:169
@@ -8718,20 +9242,21 @@ msgstr ""
 #: ../reporting/includes/doctext.inc:31
 #: ../reporting/includes/doctext.inc:191
 #: ../reporting/includes/doctext.inc:224
+#: ../sales/customer_invoice.php:548
 #: ../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:147
+#: ../sales/includes/ui/sales_credit_ui.inc:168
+#: ../sales/includes/ui/sales_order_ui.inc:146
 msgid "Quantity"
 msgstr ""
 
-#: ../inventory/includes/item_adjustments_ui.inc:63
-#: ../inventory/includes/stock_transfers_ui.inc:60
+#: ../inventory/includes/item_adjustments_ui.inc:55
+#: ../inventory/includes/stock_transfers_ui.inc:57
 #: ../inventory/manage/item_units.php:94
 #: ../manufacturing/includes/work_order_issue_ui.inc:34
-#: ../purchasing/includes/ui/po_ui.inc:219
+#: ../purchasing/includes/ui/po_ui.inc:215
 #: ../purchasing/view/view_grn.php:41
 #: ../purchasing/view/view_po.php:45
 #: ../reporting/includes/doctext.inc:32
@@ -8740,27 +9265,27 @@ msgstr ""
 #: ../sales/view/view_dispatch.php:113
 #: ../sales/view/view_invoice.php:116
 #: ../sales/view/view_sales_order.php:219
-#: ../sales/includes/ui/sales_credit_ui.inc:167
-#: ../sales/includes/ui/sales_order_ui.inc:149
+#: ../sales/includes/ui/sales_credit_ui.inc:168
+#: ../sales/includes/ui/sales_order_ui.inc:148
 msgid "Unit"
 msgstr ""
 
-#: ../inventory/includes/item_adjustments_ui.inc:63
-#: ../inventory/view/view_adjustment.php:57
+#: ../inventory/includes/item_adjustments_ui.inc:55
+#: ../inventory/view/view_adjustment.php:55
 #: ../manufacturing/includes/manufacturing_ui.inc:29
 #: ../manufacturing/includes/work_order_issue_ui.inc:34
 #: ../reporting/rep301.php:169
 msgid "Unit Cost"
 msgstr ""
 
-#: ../inventory/includes/item_adjustments_ui.inc:110
+#: ../inventory/includes/item_adjustments_ui.inc:102
 msgid ""
 "Marked items have insufficient quantities in stock as on day of adjustment."
 msgstr ""
 
 #: ../inventory/includes/stock_transfers_ui.inc:35
-#: ../inventory/inquiry/stock_movements.php:56
-#: ../manufacturing/includes/work_order_issue_ui.inc:171
+#: ../inventory/inquiry/stock_movements.php:57
+#: ../manufacturing/includes/work_order_issue_ui.inc:164
 msgid "From Location:"
 msgstr ""
 
@@ -8768,11 +9293,7 @@ msgstr ""
 msgid "To Location:"
 msgstr ""
 
-#: ../inventory/includes/stock_transfers_ui.inc:46
-msgid "Transfer Type:"
-msgstr ""
-
-#: ../inventory/includes/stock_transfers_ui.inc:100
+#: ../inventory/includes/stock_transfers_ui.inc:97
 msgid ""
 "Marked items have insufficient quantities in stock as on day of transfer."
 msgstr ""
@@ -8803,40 +9324,47 @@ msgid ""
 "\t\t\t\tusing this item as component"
 msgstr ""
 
+#: ../inventory/includes/db/items_trans_db.inc:66
+#, php-format
+msgid "Cost was %s changed to %s x quantity on hand of %s"
+msgstr ""
+
 #: ../inventory/inquiry/stock_movements.php:26
 msgid "Inventory Item Movement"
 msgstr ""
 
-#: ../inventory/inquiry/stock_movements.php:61
+#: ../inventory/inquiry/stock_movements.php:62
 msgid "Show Movements"
 msgstr ""
 
-#: ../inventory/inquiry/stock_movements.php:61
+#: ../inventory/inquiry/stock_movements.php:62
+#: ../purchasing/includes/ui/invoice_ui.inc:492
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:57
 #: ../purchasing/inquiry/supplier_inquiry.php:55
 #: ../sales/inquiry/customer_allocation_inquiry.php:51
+#: ../sales/inquiry/customer_inquiry.php:54
 msgid "Refresh Inquiry"
 msgstr ""
 
-#: ../inventory/inquiry/stock_movements.php:80
+#: ../inventory/inquiry/stock_movements.php:84
 msgid "Detail"
 msgstr ""
 
-#: ../inventory/inquiry/stock_movements.php:80
+#: ../inventory/inquiry/stock_movements.php:84
 #: ../reporting/rep307.php:117
 msgid "Quantity In"
 msgstr ""
 
-#: ../inventory/inquiry/stock_movements.php:80
+#: ../inventory/inquiry/stock_movements.php:84
 #: ../reporting/rep307.php:117
 msgid "Quantity Out"
 msgstr ""
 
-#: ../inventory/inquiry/stock_movements.php:97
+#: ../inventory/inquiry/stock_movements.php:100
 msgid "Quantity on hand before"
 msgstr ""
 
-#: ../inventory/inquiry/stock_movements.php:188
+#: ../inventory/inquiry/stock_movements.php:162
 msgid "Quantity on hand after"
 msgstr ""
 
@@ -8894,15 +9422,17 @@ 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
+#: ../inventory/manage/item_codes.php:123
+#: ../inventory/manage/sales_kits.php:38
+#: ../inventory/view/view_adjustment.php:55
+#: ../inventory/view/view_transfer.php:50
+#: ../manufacturing/view/wo_issue_view.php:76
+#: ../manufacturing/manage/bom_edit.php:69
 #: ../purchasing/po_receive_items.php:62
-#: ../sales/customer_credit_invoice.php:280
-#: ../sales/customer_delivery.php:421
+#: ../sales/customer_credit_invoice.php:282
+#: ../sales/customer_delivery.php:423
+#: ../sales/customer_invoice.php:548
+#: ../sales/customer_invoice.php:551
 msgid "Units"
 msgstr ""
 
@@ -8935,27 +9465,27 @@ msgid "Default values for new items"
 msgstr ""
 
 #: ../inventory/manage/item_categories.php:186
-#: ../inventory/manage/items.php:335
+#: ../inventory/manage/items.php:344
 msgid "Item Tax Type:"
 msgstr ""
 
 #: ../inventory/manage/item_categories.php:188
-#: ../inventory/manage/items.php:337
+#: ../inventory/manage/items.php:346
 msgid "Item Type:"
 msgstr ""
 
 #: ../inventory/manage/item_categories.php:190
-#: ../inventory/manage/items.php:339
+#: ../inventory/manage/items.php:348
 msgid "Units of Measure:"
 msgstr ""
 
 #: ../inventory/manage/item_categories.php:192
-#: ../inventory/manage/items.php:343
+#: ../inventory/manage/items.php:352
 msgid "Exclude from sales:"
 msgstr ""
 
 #: ../inventory/manage/item_categories.php:194
-#: ../inventory/manage/items.php:345
+#: ../inventory/manage/items.php:354
 msgid "Exclude from purchases:"
 msgstr ""
 
@@ -8963,79 +9493,78 @@ msgstr ""
 msgid "Foreign Item Codes"
 msgstr ""
 
-#: ../inventory/manage/item_codes.php:23
+#: ../inventory/manage/item_codes.php:22
 #: ../sales/sales_order_entry.php:692
 msgid "There are no inventory items defined in the system."
 msgstr ""
 
-#: ../inventory/manage/item_codes.php:41
-msgid "The price entered was not positive number."
+#: ../inventory/manage/item_codes.php:40
+msgid "The quantity entered was not positive number."
 msgstr ""
 
-#: ../inventory/manage/item_codes.php:47
-#: ../inventory/manage/sales_kits.php:78
+#: ../inventory/manage/item_codes.php:46
+#: ../inventory/manage/sales_kits.php:76
 msgid "Item code description cannot be empty."
 msgstr ""
 
-#: ../inventory/manage/item_codes.php:55
-#: ../inventory/manage/items.php:163
-#: ../inventory/manage/sales_kits.php:88
+#: ../inventory/manage/item_codes.php:54
+#: ../inventory/manage/items.php:172
+#: ../inventory/manage/sales_kits.php:86
 msgid "This item code is already assigned to stock item or sale kit."
 msgstr ""
 
-#: ../inventory/manage/item_codes.php:67
+#: ../inventory/manage/item_codes.php:66
 msgid "New item code has been added."
 msgstr ""
 
-#: ../inventory/manage/item_codes.php:73
+#: ../inventory/manage/item_codes.php:72
 msgid "Item code has been updated."
 msgstr ""
 
-#: ../inventory/manage/item_codes.php:85
+#: ../inventory/manage/item_codes.php:84
 msgid "Item code has been sucessfully deleted."
 msgstr ""
 
-#: ../inventory/manage/item_codes.php:124
+#: ../inventory/manage/item_codes.php:123
 msgid "EAN/UPC Code"
 msgstr ""
 
-#: ../inventory/manage/item_codes.php:125
+#: ../inventory/manage/item_codes.php:124
 #: ../reporting/rep104.php:117
 #: ../reporting/rep105.php:119
 #: ../reporting/rep301.php:169
 #: ../reporting/rep301.php:175
-#: ../reporting/rep302.php:124
-#: ../reporting/rep302.php:131
+#: ../reporting/rep302.php:123
+#: ../reporting/rep302.php:130
 #: ../reporting/rep303.php:133
-#: ../reporting/rep304.php:114
-#: ../reporting/rep304.php:122
+#: ../reporting/rep304.php:126
+#: ../reporting/rep304.php:134
 #: ../reporting/rep306.php:141
 #: ../reporting/rep306.php:149
 #: ../reporting/rep307.php:117
 #: ../reporting/rep307.php:123
-#: ../reporting/rep308.php:230
-#: ../reporting/rep308.php:237
+#: ../reporting/rep308.php:242
+#: ../reporting/rep308.php:249
 #: ../reporting/rep309.php:104
 msgid "Category"
 msgstr ""
 
-#: ../inventory/manage/item_codes.php:178
+#: ../inventory/manage/item_codes.php:177
 msgid "UPC/EAN code:"
 msgstr ""
 
-#: ../inventory/manage/item_codes.php:179
-#: ../inventory/manage/sales_kits.php:245
-#: ../manufacturing/work_order_add_finished.php:203
-#: ../manufacturing/work_order_entry.php:423
-#: ../manufacturing/manage/bom_edit.php:228
+#: ../inventory/manage/item_codes.php:178
+#: ../inventory/manage/sales_kits.php:242
+#: ../manufacturing/work_order_add_finished.php:195
+#: ../manufacturing/work_order_entry.php:414
+#: ../manufacturing/manage/bom_edit.php:226
 msgid "Quantity:"
 msgstr ""
 
-#: ../inventory/manage/item_codes.php:180
-#: ../inventory/manage/items.php:309
-#: ../inventory/manage/movement_types.php:129
-#: ../inventory/manage/sales_kits.php:206
-#: ../inventory/manage/sales_kits.php:232
+#: ../inventory/manage/item_codes.php:179
+#: ../inventory/manage/items.php:318
+#: ../inventory/manage/sales_kits.php:203
+#: ../inventory/manage/sales_kits.php:229
 #: ../manufacturing/manage/work_centres.php:138
 #: ../sales/manage/credit_status.php:145
 #: ../sales/manage/recurrent_invoices.php:171
@@ -9045,154 +9574,149 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: ../inventory/manage/item_codes.php:181
-#: ../inventory/manage/items.php:311
-#: ../inventory/manage/sales_kits.php:207
-#: ../inventory/manage/sales_kits.php:233
+#: ../inventory/manage/item_codes.php:180
+#: ../inventory/manage/items.php:320
+#: ../inventory/manage/sales_kits.php:204
+#: ../inventory/manage/sales_kits.php:230
 msgid "Category:"
 msgstr ""
 
-#: ../inventory/manage/items.php:81
+#: ../inventory/manage/items.php:73
+msgid "Error uploading file."
+msgstr ""
+
+#: ../inventory/manage/items.php:90
 msgid ""
 "Only graphics files are supported - a file extension of .jpg, .png or .gif "
 "is expected"
 msgstr ""
 
-#: ../inventory/manage/items.php:112
+#: ../inventory/manage/items.php:121
 msgid ""
 "There are no item categories defined in the system. At least one item "
 "category is required to add a item."
 msgstr ""
 
-#: ../inventory/manage/items.php:114
+#: ../inventory/manage/items.php:123
 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:151
 msgid "The item name must be entered."
 msgstr ""
 
-#: ../inventory/manage/items.php:148
+#: ../inventory/manage/items.php:157
 msgid "The item code cannot be empty"
 msgstr ""
 
-#: ../inventory/manage/items.php:156
+#: ../inventory/manage/items.php:165
 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:201
 msgid "Item has been updated."
 msgstr ""
 
-#: ../inventory/manage/items.php:205
+#: ../inventory/manage/items.php:214
 msgid "A new item has been added."
 msgstr ""
 
-#: ../inventory/manage/items.php:248
+#: ../inventory/manage/items.php:257
 msgid "Selected item has been deleted."
 msgstr ""
 
-#: ../inventory/manage/items.php:265
-#: ../inventory/view/view_adjustment.php:56
-#: ../inventory/view/view_transfer.php:39
-#: ../inventory/view/view_transfer.php:56
-#: ../manufacturing/search_work_orders.php:169
-#: ../manufacturing/view/wo_issue_view.php:44
-#: ../manufacturing/view/wo_production_view.php:45
-#: ../reporting/rep204.php:84
-#: ../reporting/rep306.php:152
-#: ../reporting/rep402.php:103
-msgid "Item"
+#: ../inventory/manage/items.php:274
+msgid "General Settings"
 msgstr ""
 
-#: ../inventory/manage/items.php:270
-#: ../inventory/manage/items.php:302
+#: ../inventory/manage/items.php:279
+#: ../inventory/manage/items.php:311
 msgid "Item Code:"
 msgstr ""
 
-#: ../inventory/manage/items.php:341
+#: ../inventory/manage/items.php:350
 msgid "Editable description:"
 msgstr ""
 
-#: ../inventory/manage/items.php:363
+#: ../inventory/manage/items.php:372
 #: ../sales/manage/customer_branches.php:236
 msgid "GL Accounts"
 msgstr ""
 
-#: ../inventory/manage/items.php:386
+#: ../inventory/manage/items.php:395
 msgid "Other"
 msgstr ""
 
-#: ../inventory/manage/items.php:389
+#: ../inventory/manage/items.php:398
 msgid "Image File (.jpg)"
 msgstr ""
 
-#: ../inventory/manage/items.php:404
+#: ../inventory/manage/items.php:413
 msgid "No image"
 msgstr ""
 
-#: ../inventory/manage/items.php:409
+#: ../inventory/manage/items.php:418
 msgid "Delete Image:"
 msgstr ""
 
-#: ../inventory/manage/items.php:411
+#: ../inventory/manage/items.php:420
 msgid "Item status:"
 msgstr ""
 
-#: ../inventory/manage/items.php:417
+#: ../inventory/manage/items.php:426
 msgid "Insert New Item"
 msgstr ""
 
-#: ../inventory/manage/items.php:421
+#: ../inventory/manage/items.php:430
 msgid "Update Item"
 msgstr ""
 
-#: ../inventory/manage/items.php:424
+#: ../inventory/manage/items.php:433
 msgid "Select this items and return to document entry."
 msgstr ""
 
-#: ../inventory/manage/items.php:425
+#: ../inventory/manage/items.php:434
 msgid "Clone This Item"
 msgstr ""
 
-#: ../inventory/manage/items.php:426
+#: ../inventory/manage/items.php:435
 msgid "Delete This Item"
 msgstr ""
 
-#: ../inventory/manage/items.php:441
+#: ../inventory/manage/items.php:450
 msgid "Select an item:"
 msgstr ""
 
-#: ../inventory/manage/items.php:442
+#: ../inventory/manage/items.php:451
 msgid "New item"
 msgstr ""
 
-#: ../inventory/manage/items.php:465
-#: ../purchasing/manage/suppliers.php:312
+#: ../inventory/manage/items.php:474
+#: ../purchasing/manage/suppliers.php:309
 #: ../sales/manage/customer_branches.php:306
 #: ../sales/manage/customers.php:350
 msgid "&General settings"
 msgstr ""
 
-#: ../inventory/manage/items.php:466
+#: ../inventory/manage/items.php:475
 msgid "S&ales Pricing"
 msgstr ""
 
-#: ../inventory/manage/items.php:467
+#: ../inventory/manage/items.php:476
 msgid "&Purchasing Pricing"
 msgstr ""
 
-#: ../inventory/manage/items.php:470
-#: ../purchasing/manage/suppliers.php:314
+#: ../inventory/manage/items.php:479
+#: ../purchasing/manage/suppliers.php:311
 #: ../sales/manage/customers.php:352
 msgid "&Transactions"
 msgstr ""
 
-#: ../inventory/manage/items.php:471
+#: ../inventory/manage/items.php:480
 msgid "&Status"
 msgstr ""
 
@@ -9334,115 +9858,89 @@ msgstr ""
 msgid "Facsimile No:"
 msgstr ""
 
-#: ../inventory/manage/movement_types.php:16
-msgid "Inventory Movement Types"
-msgstr ""
-
-#: ../inventory/manage/movement_types.php:34
-msgid "The inventory movement type name cannot be empty."
-msgstr ""
-
-#: ../inventory/manage/movement_types.php:43
-msgid "Selected movement type has been updated"
-msgstr ""
-
-#: ../inventory/manage/movement_types.php:48
-msgid "New movement type has been added"
-msgstr ""
-
-#: ../inventory/manage/movement_types.php:61
-msgid ""
-"Cannot delete this inventory movement type because item transactions have "
-"been created referring to it."
-msgstr ""
-
-#: ../inventory/manage/movement_types.php:76
-msgid "Selected movement type has been deleted"
-msgstr ""
-
 #: ../inventory/manage/sales_kits.php:16
 msgid "Sales Kits & Alias Codes"
 msgstr ""
 
-#: ../inventory/manage/sales_kits.php:40
+#: ../inventory/manage/sales_kits.php:38
 msgid "Stock Item"
 msgstr ""
 
-#: ../inventory/manage/sales_kits.php:54
+#: ../inventory/manage/sales_kits.php:52
 msgid "kit"
 msgstr ""
 
-#: ../inventory/manage/sales_kits.php:72
-#: ../manufacturing/manage/bom_edit.php:101
+#: ../inventory/manage/sales_kits.php:70
+#: ../manufacturing/manage/bom_edit.php:99
 msgid "The quantity entered must be numeric and greater than zero."
 msgstr ""
 
-#: ../inventory/manage/sales_kits.php:93
+#: ../inventory/manage/sales_kits.php:91
 msgid "Kit/alias code cannot be empty."
 msgstr ""
 
-#: ../inventory/manage/sales_kits.php:101
+#: ../inventory/manage/sales_kits.php:99
 msgid ""
 "The selected component contains directly or on any lower level the kit under "
 "edition. Recursive kits are not allowed."
 msgstr ""
 
-#: ../inventory/manage/sales_kits.php:108
+#: ../inventory/manage/sales_kits.php:106
 msgid ""
 "The selected component is already in this kit. You can modify it's quantity "
 "but it cannot appear more than once in the same kit."
 msgstr ""
 
-#: ../inventory/manage/sales_kits.php:116
+#: ../inventory/manage/sales_kits.php:113
 msgid "New alias code has been created."
 msgstr ""
 
-#: ../inventory/manage/sales_kits.php:119
+#: ../inventory/manage/sales_kits.php:116
 msgid "New component has been added to selected kit."
 msgstr ""
 
-#: ../inventory/manage/sales_kits.php:129
+#: ../inventory/manage/sales_kits.php:126
 msgid "Component of selected kit has been updated."
 msgstr ""
 
-#: ../inventory/manage/sales_kits.php:139
+#: ../inventory/manage/sales_kits.php:136
 msgid "Kit common properties has been updated"
 msgstr ""
 
-#: ../inventory/manage/sales_kits.php:157
+#: ../inventory/manage/sales_kits.php:154
 msgid ""
 "This item cannot be deleted because it is the last item in the kit used by "
 "following kits"
 msgstr ""
 
-#: ../inventory/manage/sales_kits.php:168
-#: ../manufacturing/manage/bom_edit.php:153
+#: ../inventory/manage/sales_kits.php:165
+#: ../manufacturing/manage/bom_edit.php:151
 msgid "The component item has been deleted from this bom"
 msgstr ""
 
-#: ../inventory/manage/sales_kits.php:183
+#: ../inventory/manage/sales_kits.php:180
 msgid "Select a sale kit:"
 msgstr ""
 
-#: ../inventory/manage/sales_kits.php:184
+#: ../inventory/manage/sales_kits.php:181
 msgid "New kit"
 msgstr ""
 
-#: ../inventory/manage/sales_kits.php:199
+#: ../inventory/manage/sales_kits.php:196
 msgid "Alias/kit code:"
 msgstr ""
 
-#: ../inventory/manage/sales_kits.php:208
+#: ../inventory/manage/sales_kits.php:205
 msgid "Update kit/alias name"
 msgstr ""
 
-#: ../inventory/manage/sales_kits.php:223
-#: ../manufacturing/manage/bom_edit.php:204
-#: ../manufacturing/manage/bom_edit.php:211
+#: ../inventory/manage/sales_kits.php:220
+#: ../manufacturing/manage/bom_edit.php:202
+#: ../manufacturing/manage/bom_edit.php:209
 msgid "Component:"
 msgstr ""
 
-#: ../inventory/manage/sales_kits.php:237
+#: ../inventory/manage/sales_kits.php:234
 msgid "kits"
 msgstr ""
 
@@ -9450,16 +9948,11 @@ msgstr ""
 msgid "View Inventory Adjustment"
 msgstr ""
 
-#: ../inventory/view/view_adjustment.php:43
+#: ../inventory/view/view_adjustment.php:42
 msgid "At Location"
 msgstr ""
 
-#: ../inventory/view/view_adjustment.php:46
-#: ../inventory/view/view_transfer.php:46
-msgid "Adjustment Type"
-msgstr ""
-
-#: ../inventory/view/view_adjustment.php:73
+#: ../inventory/view/view_adjustment.php:71
 msgid "This adjustment has been voided."
 msgstr ""
 
@@ -9468,7 +9961,7 @@ msgid "View Inventory Transfer"
 msgstr ""
 
 #: ../inventory/view/view_transfer.php:40
-#: ../manufacturing/view/wo_issue_view.php:44
+#: ../manufacturing/view/wo_issue_view.php:43
 #: ../manufacturing/includes/manufacturing_ui.inc:29
 #: ../manufacturing/includes/manufacturing_ui.inc:83
 #: ../reporting/includes/doctext.inc:228
@@ -9488,7 +9981,7 @@ msgid "Search Work Orders"
 msgstr ""
 
 #: ../manufacturing/search_work_orders.php:67
-#: ../purchasing/inquiry/po_search_completed.php:61
+#: ../purchasing/inquiry/po_search_completed.php:80
 #: ../purchasing/inquiry/po_search.php:62
 #: ../sales/inquiry/sales_deliveries_view.php:101
 #: ../sales/inquiry/sales_orders_view.php:209
@@ -9500,12 +9993,12 @@ msgid "at Location:"
 msgstr ""
 
 #: ../manufacturing/search_work_orders.php:82
-#: ../purchasing/inquiry/po_search_completed.php:73
+#: ../purchasing/inquiry/po_search_completed.php:92
 msgid "for item:"
 msgstr ""
 
 #: ../manufacturing/search_work_orders.php:84
-#: ../purchasing/inquiry/po_search_completed.php:78
+#: ../purchasing/inquiry/po_search_completed.php:99
 #: ../purchasing/inquiry/po_search.php:78
 #: ../sales/inquiry/sales_deliveries_view.php:116
 #: ../sales/inquiry/sales_orders_view.php:232
@@ -9528,6 +10021,17 @@ msgstr ""
 msgid "Costs"
 msgstr ""
 
+#: ../manufacturing/search_work_orders.php:169
+#: ../manufacturing/view/wo_issue_view.php:43
+#: ../manufacturing/view/wo_production_view.php:44
+#: ../purchasing/includes/ui/invoice_ui.inc:510
+#: ../purchasing/includes/ui/invoice_ui.inc:522
+#: ../reporting/rep204.php:84
+#: ../reporting/rep306.php:152
+#: ../reporting/rep402.php:103
+msgid "Item"
+msgstr ""
+
 #: ../manufacturing/search_work_orders.php:170
 #: ../reporting/rep402.php:103
 msgid "Required"
@@ -9546,244 +10050,244 @@ msgstr ""
 msgid "Marked orders are overdue."
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:29
+#: ../manufacturing/work_order_add_finished.php:28
 msgid "Produce or Unassemble Finished Items From Work Order"
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:44
+#: ../manufacturing/work_order_add_finished.php:43
 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_add_finished.php:45
+#: ../manufacturing/work_order_costs.php:44
+#: ../manufacturing/work_order_entry.php:55
 #: ../manufacturing/work_order_issue.php:40
-#: ../manufacturing/work_order_release.php:75
+#: ../manufacturing/work_order_release.php:74
 msgid "View this Work Order"
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:48
-#: ../manufacturing/work_order_entry.php:64
+#: ../manufacturing/work_order_add_finished.php:47
+#: ../manufacturing/work_order_entry.php:63
 #: ../manufacturing/work_order_issue.php:42
 msgid "View the GL Journal Entries for this Work Order"
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:50
-#: ../manufacturing/work_order_entry.php:67
+#: ../manufacturing/work_order_add_finished.php:49
+#: ../manufacturing/work_order_entry.php:66
 msgid "Print the GL Journal Entries for this Work Order"
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:52
-#: ../manufacturing/work_order_costs.php:49
+#: ../manufacturing/work_order_add_finished.php:51
+#: ../manufacturing/work_order_costs.php:48
 #: ../manufacturing/work_order_issue.php:44
 msgid "Select another &Work Order to Process"
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:65
-#: ../manufacturing/work_order_costs.php:62
-#: ../manufacturing/work_order_entry.php:340
+#: ../manufacturing/work_order_add_finished.php:64
+#: ../manufacturing/work_order_costs.php:61
+#: ../manufacturing/work_order_entry.php:331
 #: ../manufacturing/includes/db/work_order_issues_db.inc:30
 #: ../manufacturing/includes/db/work_order_produce_items_db.inc:27
 msgid "The order number sent is not valid."
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:91
+#: ../manufacturing/work_order_add_finished.php:82
 msgid "The quantity entered is not a valid number or less then zero."
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:110
+#: ../manufacturing/work_order_add_finished.php:101
 msgid ""
 "The production date cannot be before the release date of the work order."
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:117
+#: ../manufacturing/work_order_add_finished.php:108
 msgid ""
 "The production exceeds the quantity needed. Please change the Work Order."
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:126
+#: ../manufacturing/work_order_add_finished.php:117
 msgid ""
 "The unassembling cannot be processed because there is insufficient stock."
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:144
+#: ../manufacturing/work_order_add_finished.php:135
 msgid ""
 "The production cannot be processed because a required item would cause a "
 "negative inventory balance :"
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:201
+#: ../manufacturing/work_order_add_finished.php:193
 msgid "Produce Finished Items"
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:201
+#: ../manufacturing/work_order_add_finished.php:193
 msgid "Return Items to Work Order"
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:211
+#: ../manufacturing/work_order_add_finished.php:201
 #: ../purchasing/allocations/supplier_allocate.php:75
 #: ../sales/allocations/customer_allocate.php:73
 msgid "Process"
 msgstr ""
 
-#: ../manufacturing/work_order_add_finished.php:212
+#: ../manufacturing/work_order_add_finished.php:202
 msgid "Process And Close Order"
 msgstr ""
 
-#: ../manufacturing/work_order_costs.php:29
+#: ../manufacturing/work_order_costs.php:28
 msgid "Work Order Additional Costs"
 msgstr ""
 
-#: ../manufacturing/work_order_costs.php:43
+#: ../manufacturing/work_order_costs.php:42
 msgid "The additional cost has been entered."
 msgstr ""
 
-#: ../manufacturing/work_order_costs.php:47
+#: ../manufacturing/work_order_costs.php:46
 msgid "Enter another additional cost."
 msgstr ""
 
-#: ../manufacturing/work_order_costs.php:73
+#: ../manufacturing/work_order_costs.php:72
 msgid "The amount entered is not a valid number or less then zero."
 msgstr ""
 
-#: ../manufacturing/work_order_costs.php:92
+#: ../manufacturing/work_order_costs.php:91
 msgid ""
 "The additional cost date cannot be before the release date of the work order."
 msgstr ""
 
-#: ../manufacturing/work_order_costs.php:143
+#: ../manufacturing/work_order_costs.php:142
 msgid "Additional Costs:"
 msgstr ""
 
-#: ../manufacturing/work_order_costs.php:144
+#: ../manufacturing/work_order_costs.php:143
 msgid "Debit Account"
 msgstr ""
 
-#: ../manufacturing/work_order_costs.php:151
+#: ../manufacturing/work_order_costs.php:150
 msgid "Process Additional Cost"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:29
+#: ../manufacturing/work_order_entry.php:28
 msgid "Work Order Entry"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:32
+#: ../manufacturing/work_order_entry.php:31
 msgid "There are no manufacturable items defined in the system."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:54
+#: ../manufacturing/work_order_entry.php:53
 msgid "The work order been added."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:62
+#: ../manufacturing/work_order_entry.php:61
 msgid "&Print This Work Order"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:63
+#: ../manufacturing/work_order_entry.php:62
 msgid "&Email This Work Order"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:80
+#: ../manufacturing/work_order_entry.php:79
 msgid "The work order been updated."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:90
+#: ../manufacturing/work_order_entry.php:89
 msgid "Work order has been deleted."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:100
+#: ../manufacturing/work_order_entry.php:99
 msgid ""
 "This work order has been closed. There can be no more issues against it."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:110
+#: ../manufacturing/work_order_entry.php:109
 msgid "Enter a new work order"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:111
+#: ../manufacturing/work_order_entry.php:110
 msgid "Select an existing work order"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:147
+#: ../manufacturing/work_order_entry.php:138
 msgid "The quantity entered is invalid or less than zero."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:169
+#: ../manufacturing/work_order_entry.php:160
 msgid "The selected item to manufacture does not have a bom."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:178
+#: ../manufacturing/work_order_entry.php:169
 msgid "The labour cost entered is invalid or less than zero."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:186
+#: ../manufacturing/work_order_entry.php:177
 msgid "The cost entered is invalid or less than zero."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:208
+#: ../manufacturing/work_order_entry.php:199
 msgid ""
 "The work order cannot be processed because there is an insufficient quantity "
 "for component:"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:221
+#: ../manufacturing/work_order_entry.php:212
 msgid ""
 "The selected item cannot be unassembled because there is insufficient stock."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:247
+#: ../manufacturing/work_order_entry.php:238
 msgid ""
 "The quantity cannot be changed to be less than the quantity already "
 "manufactured for this order."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:297
+#: ../manufacturing/work_order_entry.php:288
 msgid ""
 "This work order cannot be deleted because it has already been processed."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:348
+#: ../manufacturing/work_order_entry.php:339
 msgid "This work order is closed and cannot be edited."
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:396
-#: ../manufacturing/work_order_entry.php:404
+#: ../manufacturing/work_order_entry.php:387
+#: ../manufacturing/work_order_entry.php:395
 msgid "Destination Location:"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:415
+#: ../manufacturing/work_order_entry.php:406
 msgid "Quantity Required:"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:417
+#: ../manufacturing/work_order_entry.php:408
 msgid "Quantity Manufactured:"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:435
+#: ../manufacturing/work_order_entry.php:426
 msgid "Credit Labour Account"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:442
+#: ../manufacturing/work_order_entry.php:433
 msgid "Credit Overhead Account"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:447
+#: ../manufacturing/work_order_entry.php:438
 msgid "Released On:"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:457
+#: ../manufacturing/work_order_entry.php:448
 msgid "Save changes to work order"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:460
+#: ../manufacturing/work_order_entry.php:451
 msgid "Close This Work Order"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:462
+#: ../manufacturing/work_order_entry.php:453
 msgid "Delete This Work Order"
 msgstr ""
 
-#: ../manufacturing/work_order_entry.php:468
+#: ../manufacturing/work_order_entry.php:459
 msgid "Add Workorder"
 msgstr ""
 
@@ -9799,70 +10303,74 @@ msgstr ""
 msgid "The entered date for the issue is invalid."
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php:105
+#: ../manufacturing/work_order_issue.php:97
 msgid ""
 "The issue cannot be processed because it would cause negative inventory "
 "balance for marked items as of document date or later."
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php:122
+#: ../manufacturing/work_order_issue.php:114
 msgid ""
 "The process cannot be completed because there is an insufficient total "
 "quantity for a component."
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php:123
+#: ../manufacturing/work_order_issue.php:115
 msgid "Component is :"
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php:124
+#: ../manufacturing/work_order_issue.php:116
 msgid "From location :"
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php:217
+#: ../manufacturing/work_order_issue.php:131
+msgid "The quantity entered is negative or invalid."
+msgstr ""
+
+#: ../manufacturing/work_order_issue.php:209
 msgid "Items to Issue"
 msgstr ""
 
-#: ../manufacturing/work_order_issue.php:223
+#: ../manufacturing/work_order_issue.php:215
 msgid "Process Issue"
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:27
+#: ../manufacturing/work_order_release.php:26
 msgid "Work Order Release to Manufacturing"
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:49
+#: ../manufacturing/work_order_release.php:48
 msgid "This work order has already been released."
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:60
+#: ../manufacturing/work_order_release.php:59
 msgid ""
 "This Work Order cannot be released. The selected item to manufacture does "
 "not have a bom."
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:73
+#: ../manufacturing/work_order_release.php:72
 msgid "The work order has been released to manufacturing."
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:77
+#: ../manufacturing/work_order_release.php:76
 msgid "Select another &work order"
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:98
+#: ../manufacturing/work_order_release.php:97
 msgid "Work Order #:"
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:99
+#: ../manufacturing/work_order_release.php:98
 msgid "Work Order Reference:"
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:101
+#: ../manufacturing/work_order_release.php:100
 #: ../manufacturing/includes/manufacturing_ui.inc:278
 msgid "Released Date"
 msgstr ""
 
-#: ../manufacturing/work_order_release.php:107
+#: ../manufacturing/work_order_release.php:106
 msgid "Release Work Order"
 msgstr ""
 
@@ -9870,7 +10378,7 @@ msgstr ""
 msgid "View Work Order Costs"
 msgstr ""
 
-#: ../manufacturing/view/wo_costs_view.php:62
+#: ../manufacturing/view/wo_costs_view.php:61
 #, php-format
 msgid "Production Costs for Work Order # %d"
 msgstr ""
@@ -9879,32 +10387,32 @@ msgstr ""
 msgid "View Work Order Issue"
 msgstr ""
 
-#: ../manufacturing/view/wo_issue_view.php:43
+#: ../manufacturing/view/wo_issue_view.php:42
 msgid "Issue #"
 msgstr ""
 
-#: ../manufacturing/view/wo_issue_view.php:43
-#: ../manufacturing/view/wo_production_view.php:44
+#: ../manufacturing/view/wo_issue_view.php:42
+#: ../manufacturing/view/wo_production_view.php:43
 msgid "For Work Order #"
 msgstr ""
 
-#: ../manufacturing/view/wo_issue_view.php:44
+#: ../manufacturing/view/wo_issue_view.php:43
 msgid "To Work Centre"
 msgstr ""
 
-#: ../manufacturing/view/wo_issue_view.php:44
+#: ../manufacturing/view/wo_issue_view.php:43
 msgid "Date of Issue"
 msgstr ""
 
-#: ../manufacturing/view/wo_issue_view.php:61
+#: ../manufacturing/view/wo_issue_view.php:60
 msgid "This issue has been voided."
 msgstr ""
 
-#: ../manufacturing/view/wo_issue_view.php:72
+#: ../manufacturing/view/wo_issue_view.php:71
 msgid "There are no items for this issue."
 msgstr ""
 
-#: ../manufacturing/view/wo_issue_view.php:77
+#: ../manufacturing/view/wo_issue_view.php:76
 #: ../manufacturing/includes/manufacturing_ui.inc:28
 #: ../manufacturing/includes/manufacturing_ui.inc:83
 #: ../reporting/rep401.php:71
@@ -9912,7 +10420,7 @@ msgstr ""
 msgid "Component"
 msgstr ""
 
-#: ../manufacturing/view/wo_issue_view.php:114
+#: ../manufacturing/view/wo_issue_view.php:113
 msgid "Items for this Issue"
 msgstr ""
 
@@ -9920,59 +10428,59 @@ msgstr ""
 msgid "View Work Order Production"
 msgstr ""
 
-#: ../manufacturing/view/wo_production_view.php:44
+#: ../manufacturing/view/wo_production_view.php:43
 msgid "Production #"
 msgstr ""
 
-#: ../manufacturing/view/wo_production_view.php:45
+#: ../manufacturing/view/wo_production_view.php:44
 msgid "Quantity Manufactured"
 msgstr ""
 
-#: ../manufacturing/view/wo_production_view.php:61
+#: ../manufacturing/view/wo_production_view.php:60
 msgid "This production has been voided."
 msgstr ""
 
-#: ../manufacturing/view/work_order_view.php:26
+#: ../manufacturing/view/work_order_view.php:25
 msgid "View Work Order"
 msgstr ""
 
-#: ../manufacturing/view/work_order_view.php:51
+#: ../manufacturing/view/work_order_view.php:50
 msgid "BOM for item:"
 msgstr ""
 
-#: ../manufacturing/view/work_order_view.php:56
+#: ../manufacturing/view/work_order_view.php:55
 #: ../reporting/rep409.php:87
 msgid "Work Order Requirements"
 msgstr ""
 
-#: ../manufacturing/view/work_order_view.php:61
+#: ../manufacturing/view/work_order_view.php:60
 msgid "Issues"
 msgstr ""
 
-#: ../manufacturing/view/work_order_view.php:64
+#: ../manufacturing/view/work_order_view.php:63
 msgid "Productions"
 msgstr ""
 
-#: ../manufacturing/view/work_order_view.php:67
-#: ../manufacturing/view/work_order_view.php:74
+#: ../manufacturing/view/work_order_view.php:66
+#: ../manufacturing/view/work_order_view.php:73
 msgid "Additional Costs"
 msgstr ""
 
-#: ../manufacturing/view/work_order_view.php:82
+#: ../manufacturing/view/work_order_view.php:81
 msgid "This work order has been voided."
 msgstr ""
 
-#: ../manufacturing/inquiry/bom_cost_inquiry.php:24
-#: ../manufacturing/manage/bom_edit.php:24
+#: ../manufacturing/inquiry/bom_cost_inquiry.php:23
+#: ../manufacturing/manage/bom_edit.php:22
 msgid "There are no manufactured or kit items defined in the system."
 msgstr ""
 
-#: ../manufacturing/inquiry/bom_cost_inquiry.php:35
-#: ../manufacturing/manage/bom_edit.php:170
+#: ../manufacturing/inquiry/bom_cost_inquiry.php:34
+#: ../manufacturing/manage/bom_edit.php:168
 msgid "Select a manufacturable item:"
 msgstr ""
 
-#: ../manufacturing/inquiry/bom_cost_inquiry.php:38
+#: ../manufacturing/inquiry/bom_cost_inquiry.php:37
 msgid "All Costs Are In:"
 msgstr ""
 
@@ -9989,7 +10497,7 @@ msgid "Parent Item"
 msgstr ""
 
 #: ../manufacturing/inquiry/where_used_inquiry.php:44
-#: ../manufacturing/manage/bom_edit.php:71
+#: ../manufacturing/manage/bom_edit.php:69
 #: ../manufacturing/includes/manufacturing_ui.inc:28
 #: ../manufacturing/includes/manufacturing_ui.inc:83
 #: ../reporting/includes/doctext.inc:228
@@ -10006,43 +10514,43 @@ msgstr ""
 msgid "Bill Of Materials"
 msgstr ""
 
-#: ../manufacturing/manage/bom_edit.php:26
+#: ../manufacturing/manage/bom_edit.php:24
 msgid ""
 "There are no work centres defined in the system. BOMs require at least one "
 "work centre be defined."
 msgstr ""
 
-#: ../manufacturing/manage/bom_edit.php:70
+#: ../manufacturing/manage/bom_edit.php:68
 #: ../reporting/rep105.php:114
 msgid "Code"
 msgstr ""
 
-#: ../manufacturing/manage/bom_edit.php:110
+#: ../manufacturing/manage/bom_edit.php:108
 msgid "Selected component has been updated"
 msgstr ""
 
-#: ../manufacturing/manage/bom_edit.php:130
+#: ../manufacturing/manage/bom_edit.php:128
 msgid ""
 "A new component part has been added to the bill of material for this item."
 msgstr ""
 
-#: ../manufacturing/manage/bom_edit.php:136
+#: ../manufacturing/manage/bom_edit.php:134
 msgid ""
 "The selected component is already on this bom. You can modify it's quantity "
 "but it cannot appear more than once on the same bom."
 msgstr ""
 
-#: ../manufacturing/manage/bom_edit.php:142
+#: ../manufacturing/manage/bom_edit.php:140
 msgid ""
 "The selected component is a parent of the current item. Recursive BOMs are "
 "not allowed."
 msgstr ""
 
-#: ../manufacturing/manage/bom_edit.php:224
+#: ../manufacturing/manage/bom_edit.php:222
 msgid "Location to Draw From:"
 msgstr ""
 
-#: ../manufacturing/manage/bom_edit.php:225
+#: ../manufacturing/manage/bom_edit.php:223
 msgid "Work Centre Added:"
 msgstr ""
 
@@ -10158,20 +10666,20 @@ msgstr ""
 msgid "Marked items have insufficient quantities in stock as on day of issue."
 msgstr ""
 
-#: ../manufacturing/includes/work_order_issue_ui.inc:169
-msgid "Return Items to Location"
+#: ../manufacturing/includes/work_order_issue_ui.inc:163
+msgid "Issue Date:"
 msgstr ""
 
-#: ../manufacturing/includes/work_order_issue_ui.inc:169
-msgid "Issue Items to Work order"
+#: ../manufacturing/includes/work_order_issue_ui.inc:165
+msgid "To Work Centre:"
 msgstr ""
 
-#: ../manufacturing/includes/work_order_issue_ui.inc:172
-msgid "To Work Centre:"
+#: ../manufacturing/includes/work_order_issue_ui.inc:173
+msgid "Return Items to Location"
 msgstr ""
 
-#: ../manufacturing/includes/work_order_issue_ui.inc:174
-msgid "Issue Date:"
+#: ../manufacturing/includes/work_order_issue_ui.inc:173
+msgid "Issue Items to Work order"
 msgstr ""
 
 #: ../manufacturing/includes/db/work_order_issues_db.inc:81
@@ -10200,8 +10708,8 @@ msgstr ""
 
 #: ../manufacturing/includes/db/work_orders_db.inc:79
 #: ../purchasing/includes/db/po_db.inc:161
-#: ../sales/includes/db/cust_trans_db.inc:114
-#: ../sales/includes/db/sales_order_db.inc:213
+#: ../sales/includes/db/cust_trans_db.inc:115
+#: ../sales/includes/db/sales_order_db.inc:211
 msgid "Updated."
 msgstr ""
 
@@ -10221,29 +10729,29 @@ msgstr ""
 msgid "Produced"
 msgstr ""
 
-#: ../purchasing/includes/purchasing_db.inc:221
+#: ../purchasing/includes/purchasing_db.inc:215
 msgid "Payment for:"
 msgstr ""
 
-#: ../purchasing/includes/db/invoice_db.inc:338
+#: ../purchasing/includes/db/invoice_db.inc:337
 msgid "Supplier invoice adjustment for zero inventory of "
 msgstr ""
 
-#: ../purchasing/includes/db/invoice_db.inc:338
-#: ../reporting/rep106.php:90
+#: ../purchasing/includes/db/invoice_db.inc:337
+#: ../reporting/rep106.php:89
 #: ../sales/inquiry/sales_deliveries_view.php:154
 #: ../sales/inquiry/sales_orders_view.php:131
 msgid "Invoice"
 msgstr ""
 
-#: ../purchasing/includes/db/invoice_db.inc:690
-#: ../purchasing/includes/db/invoice_db.inc:692
+#: ../purchasing/includes/db/invoice_db.inc:689
+#: ../purchasing/includes/db/invoice_db.inc:691
 msgid "GRN Removal"
 msgstr ""
 
 #: ../purchasing/includes/ui/grn_ui.inc:23
 #: ../purchasing/includes/ui/grn_ui.inc:55
-#: ../purchasing/includes/ui/po_ui.inc:301
+#: ../purchasing/includes/ui/po_ui.inc:298
 #: ../sales/view/view_sales_order.php:74
 msgid "Order Currency"
 msgstr ""
@@ -10261,34 +10769,21 @@ msgstr ""
 
 #: ../purchasing/includes/ui/grn_ui.inc:33
 #: ../purchasing/includes/ui/grn_ui.inc:69
-#: ../purchasing/includes/ui/po_ui.inc:316
-#: ../purchasing/includes/ui/po_ui.inc:321
+#: ../purchasing/includes/ui/po_ui.inc:313
+#: ../purchasing/includes/ui/po_ui.inc:318
 msgid "Deliver Into Location"
 msgstr ""
 
-#: ../purchasing/includes/ui/grn_ui.inc:34
-#: ../purchasing/includes/ui/grn_ui.inc:79
-#: ../purchasing/includes/ui/po_ui.inc:326
-#: ../purchasing/view/view_supp_credit.php:44
-#: ../purchasing/view/view_supp_invoice.php:48
-#: ../purchasing/inquiry/po_search_completed.php:126
-#: ../purchasing/inquiry/po_search.php:121
-#: ../purchasing/inquiry/supplier_inquiry.php:177
-#: ../reporting/includes/doctext.inc:163
-#: ../reporting/includes/doctext.inc:186
-msgid "Supplier's Reference"
-msgstr ""
-
 #: ../purchasing/includes/ui/grn_ui.inc:38
 #: ../purchasing/includes/ui/grn_ui.inc:81
-#: ../purchasing/includes/ui/po_ui.inc:330
+#: ../purchasing/includes/ui/po_ui.inc:327
 #: ../sales/view/view_sales_order.php:92
 msgid "Delivery Address"
 msgstr ""
 
 #: ../purchasing/includes/ui/grn_ui.inc:41
 #: ../purchasing/includes/ui/grn_ui.inc:84
-#: ../purchasing/includes/ui/po_ui.inc:342
+#: ../purchasing/includes/ui/po_ui.inc:339
 msgid "Order Comments"
 msgstr ""
 
@@ -10305,98 +10800,246 @@ msgid "Supplier's Ref.:"
 msgstr ""
 
 #: ../purchasing/includes/ui/invoice_ui.inc:135
-#: ../purchasing/includes/ui/po_ui.inc:178
+#: ../purchasing/includes/ui/po_ui.inc:174
 msgid "Dimension 2"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:150
+#: ../purchasing/includes/ui/invoice_ui.inc:149
 msgid "Terms:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:162
-#: ../purchasing/manage/suppliers.php:101
-#: ../purchasing/manage/suppliers.php:106
+#: ../purchasing/includes/ui/invoice_ui.inc:161
+#: ../purchasing/manage/suppliers.php:99
+#: ../purchasing/manage/suppliers.php:104
 msgid "Supplier's Currency:"
 msgstr ""
 
-#: ../purchasing/includes/ui/invoice_ui.inc:166
-#: ../purchasing/manage/suppliers.php:108
+#: ../purchasing/includes/ui/invoice_ui.inc:165
+#: ../purchasing/manage/suppliers.php:106
 #: ../sales/manage/customer_branches.php:234
 #: ../sales/manage/customers.php:299
 msgid "Tax Group:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:139
+#: ../purchasing/includes/ui/invoice_ui.inc:183
+msgid "Sub-total:"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:191
+msgid "Invoice Total:"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:194
+#: ../sales/customer_credit_invoice.php:332
+#: ../sales/includes/ui/sales_credit_ui.inc:234
+msgid "Credit Note Total"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:226
+msgid "Add GL Line"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:227
+msgid "Reset"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:228
+#: ../purchasing/po_receive_items.php:326
+msgid "Clear all GL entry fields"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:246
+msgid "GL Items for this Invoice"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:248
+msgid "GL Items for this Credit Note"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:258
+msgid "Quick Entry:"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:430
+msgid "Add to Invoice"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:432
+msgid "Add to Credit Note"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:434
+#: ../sales/customer_invoice.php:611
+msgid "Remove"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:434
+#: ../purchasing/includes/ui/invoice_ui.inc:469
+msgid ""
+"WARNING! Be careful with removal. The operation is executed immediately and "
+"cannot be undone !!!"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:436
+#, php-format
+msgid ""
+"You are about to remove all yet non-invoiced items from delivery line #%d. "
+"This operation also irreversibly changes related order line. Do you want to "
+"continue ?"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:467
+msgid "Items Received Yet to be Invoiced"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:472
+msgid "Delivery Item Selected For Adding To A Supplier Credit Note"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:477
+msgid "Received Items Charged on this Invoice"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:479
+msgid "Received Items Credited on this Note"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:489
+msgid "Received between"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:501
+msgid "Add All Items"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:510
+#: ../purchasing/includes/ui/invoice_ui.inc:522
+#: ../reporting/rep308.php:242
+#: ../sales/inquiry/sales_orders_view.php:139
+msgid "Delivery"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:510
+msgid "P.O."
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:511
+msgid "Received On"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:511
+#: ../purchasing/view/view_po.php:46
+msgid "Quantity Received"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:511
+#: ../purchasing/view/view_grn.php:41
+#: ../purchasing/view/view_po.php:46
+msgid "Quantity Invoiced"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:512
+msgid "Qty Yet To Invoice"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:512
+#: ../purchasing/includes/ui/po_ui.inc:216
+#: ../sales/includes/ui/sales_order_ui.inc:148
+msgid "Price after Tax"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:512
+#: ../purchasing/includes/ui/po_ui.inc:216
+#: ../sales/includes/ui/sales_order_ui.inc:148
+msgid "Price before Tax"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:518
+msgid "Qty Yet To Credit"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:523
+msgid "Line Value"
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:591
+msgid ""
+"There are no outstanding items received from this supplier that have not "
+"been invoiced by them."
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:594
+msgid ""
+"There are no received items for the selected supplier that have been "
+"invoiced."
+msgstr ""
+
+#: ../purchasing/includes/ui/invoice_ui.inc:595
+msgid "Credits can only be applied to invoiced items."
+msgstr ""
+
+#: ../purchasing/includes/ui/po_ui.inc:135
 #: ../sales/sales_order_entry.php:716
 msgid "Order Date:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:140
+#: ../purchasing/includes/ui/po_ui.inc:136
 #: ../sales/sales_order_entry.php:703
 msgid "Delivery Date:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:140
+#: ../purchasing/includes/ui/po_ui.inc:136
 #: ../sales/sales_order_entry.php:697
 msgid "Invoice Date:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:153
+#: ../purchasing/includes/ui/po_ui.inc:149
 msgid "Supplier Currency:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:171
+#: ../purchasing/includes/ui/po_ui.inc:167
 msgid "Due Date:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:173
+#: ../purchasing/includes/ui/po_ui.inc:169
 msgid "Supplier's Reference:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:179
+#: ../purchasing/includes/ui/po_ui.inc:175
 msgid "Receive Into:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:200
+#: ../purchasing/includes/ui/po_ui.inc:196
 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:204
+#: ../purchasing/includes/ui/po_ui.inc:200
 msgid "Deliver to:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:213
+#: ../purchasing/includes/ui/po_ui.inc:209
 msgid "Order Items"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:219
+#: ../purchasing/includes/ui/po_ui.inc:215
 #: ../purchasing/po_receive_items.php:62
 msgid "Received"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:220
+#: ../purchasing/includes/ui/po_ui.inc:216
+#: ../sales/includes/ui/sales_order_ui.inc:604
 msgid "Required Delivery Date"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:220
-#: ../sales/includes/ui/sales_order_ui.inc:149
-msgid "Price after Tax"
-msgstr ""
-
-#: ../purchasing/includes/ui/po_ui.inc:220
-#: ../sales/includes/ui/sales_order_ui.inc:149
-msgid "Price before Tax"
-msgstr ""
-
-#: ../purchasing/includes/ui/po_ui.inc:220
+#: ../purchasing/includes/ui/po_ui.inc:216
 #: ../purchasing/view/view_grn.php:41
 #: ../purchasing/view/view_po.php:46
 msgid "Line Total"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:271
+#: ../purchasing/includes/ui/po_ui.inc:267
 #: ../purchasing/po_receive_items.php:114
 #: ../reporting/rep107.php:234
 #: ../reporting/rep109.php:156
@@ -10404,58 +11047,58 @@ msgstr ""
 #: ../reporting/rep111.php:154
 #: ../reporting/rep113.php:147
 #: ../reporting/rep209.php:165
-#: ../sales/customer_credit_invoice.php:322
-#: ../sales/customer_delivery.php:506
+#: ../sales/customer_credit_invoice.php:324
+#: ../sales/customer_delivery.php:508
+#: ../sales/customer_invoice.php:655
 #: ../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:225
+#: ../sales/includes/ui/sales_credit_ui.inc:218
+#: ../sales/includes/ui/sales_order_ui.inc:224
 msgid "Sub-total"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:280
+#: ../purchasing/includes/ui/po_ui.inc:276
 #: ../purchasing/po_receive_items.php:122
 #: ../purchasing/view/view_grn.php:79
 #: ../purchasing/view/view_po.php:93
-#: ../sales/customer_delivery.php:513
+#: ../sales/customer_delivery.php:515
 #: ../sales/view/view_sales_order.php:262
-#: ../sales/includes/ui/sales_order_ui.inc:232
+#: ../sales/includes/ui/sales_order_ui.inc:231
 msgid "Amount Total"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:281
+#: ../purchasing/includes/ui/po_ui.inc:278
 #: ../purchasing/allocations/supplier_allocate.php:74
 #: ../sales/allocations/customer_allocate.php:72
-#: ../sales/includes/ui/sales_order_ui.inc:233
+#: ../sales/includes/ui/sales_order_ui.inc:232
 msgid "Refresh"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:336
+#: ../purchasing/includes/ui/po_ui.inc:333
 #: ../sales/view/view_sales_order.php:83
 msgid "Required Pre-Payment"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:337
+#: ../purchasing/includes/ui/po_ui.inc:334
 msgid "Pre-Payments Allocated"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:462
-#: ../purchasing/po_entry_items.php:481
-msgid "Tax algorithm:"
-msgstr ""
-
-#: ../purchasing/includes/ui/po_ui.inc:463
-#: ../purchasing/po_entry_items.php:482
-#: ../sales/customer_invoice.php:458
+#: ../purchasing/includes/ui/po_ui.inc:454
+#: ../purchasing/po_entry_items.php:474
+#: ../sales/customer_invoice.php:457
+#: ../sales/includes/ui/sales_order_ui.inc:399
+#: ../sales/includes/ui/sales_order_ui.inc:401
 msgid "Payment:"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:463
-#: ../purchasing/po_entry_items.php:482
+#: ../purchasing/includes/ui/po_ui.inc:454
+#: ../purchasing/po_entry_items.php:474
 msgid "Delayed"
 msgstr ""
 
-#: ../purchasing/includes/ui/po_ui.inc:465
+#: ../purchasing/includes/ui/po_ui.inc:456
+#: ../sales/includes/ui/sales_order_ui.inc:615
+#: ../sales/includes/ui/sales_order_ui.inc:617
 msgid "Pre-Payment Required:"
 msgstr ""
 
@@ -10612,7 +11255,7 @@ msgid ""
 msgstr ""
 
 #: ../purchasing/po_entry_items.php:329
-#: ../purchasing/supplier_invoice.php:393
+#: ../purchasing/supplier_invoice.php:374
 #: ../purchasing/supplier_payment.php:123
 msgid "There is no supplier selected."
 msgstr ""
@@ -10625,73 +11268,69 @@ msgstr ""
 msgid "The entered due date is invalid."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:358
-msgid "There is no reference entered for this purchase order."
-msgstr ""
-
-#: ../purchasing/po_entry_items.php:373
-#: ../purchasing/supplier_invoice.php:197
+#: ../purchasing/po_entry_items.php:365
 msgid "You must enter a supplier's invoice reference."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:380
-#: ../purchasing/supplier_invoice.php:223
+#: ../purchasing/po_entry_items.php:372
+#: ../purchasing/supplier_invoice.php:208
 msgid ""
 "This invoice number has already been entered. It cannot be entered again."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:386
+#: ../purchasing/po_entry_items.php:378
 msgid "There is no delivery address specified."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:392
+#: ../purchasing/po_entry_items.php:384
 msgid "There is no location specified to move any items into."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:400
+#: ../purchasing/po_entry_items.php:392
 msgid ""
 "The order cannot be placed because there are no lines entered on this order."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:405
+#: ../purchasing/po_entry_items.php:397
 msgid "Required prepayment is greater than total invoice value."
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:490
+#: ../purchasing/po_entry_items.php:482
 #: ../sales/sales_order_entry.php:720
 msgid "Place Order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:491
+#: ../purchasing/po_entry_items.php:483
 msgid "Update Order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:492
+#: ../purchasing/po_entry_items.php:484
 #: ../sales/sales_order_entry.php:719
 msgid "Cancel Order"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:494
+#: ../purchasing/po_entry_items.php:486
 msgid "Process GRN"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:495
+#: ../purchasing/po_entry_items.php:487
 msgid "Update GRN"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:496
+#: ../purchasing/po_entry_items.php:488
 msgid "Cancel GRN"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:499
+#: ../purchasing/po_entry_items.php:491
+#: ../sales/customer_invoice.php:694
 msgid "Process Invoice"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:500
+#: ../purchasing/po_entry_items.php:492
 msgid "Update Invoice"
 msgstr ""
 
-#: ../purchasing/po_entry_items.php:501
+#: ../purchasing/po_entry_items.php:493
 #: ../sales/sales_order_entry.php:700
 msgid "Cancel Invoice"
 msgstr ""
@@ -10720,12 +11359,12 @@ msgstr ""
 
 #: ../purchasing/po_receive_items.php:62
 #: ../reporting/rep105.php:114
-#: ../sales/customer_delivery.php:421
+#: ../sales/customer_delivery.php:423
 msgid "Ordered"
 msgstr ""
 
 #: ../purchasing/po_receive_items.php:63
-#: ../reporting/rep101.php:119
+#: ../reporting/rep101.php:134
 #: ../reporting/rep105.php:115
 #: ../reporting/rep105.php:166
 #: ../reporting/rep201.php:111
@@ -10734,29 +11373,29 @@ msgid "Outstanding"
 msgstr ""
 
 #: ../purchasing/po_receive_items.php:63
-#: ../sales/customer_delivery.php:422
+#: ../sales/customer_delivery.php:424
 msgid "This Delivery"
 msgstr ""
 
 #: ../purchasing/po_receive_items.php:168
-#: ../purchasing/po_receive_items.php:222
+#: ../purchasing/po_receive_items.php:214
 msgid ""
 "There is nothing to process. Please enter valid quantities greater than zero."
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:227
+#: ../purchasing/po_receive_items.php:219
 msgid ""
 "Entered quantities cannot be greater than the quantity entered on the "
 "purchase order including the allowed over-receive percentage"
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:229
+#: ../purchasing/po_receive_items.php:221
 msgid ""
 "Modify the ordered items on the purchase order if you wish to increase the "
 "quantities."
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:247
+#: ../purchasing/po_receive_items.php:239
 msgid ""
 "This order has been changed or invoiced since this delivery was started to "
 "be actioned. Processing halted. To enter a delivery against this purchase "
@@ -10764,24 +11403,20 @@ msgid ""
 "by the other user."
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:250
+#: ../purchasing/po_receive_items.php:242
 msgid "Select a different purchase order for receiving goods against"
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:253
+#: ../purchasing/po_receive_items.php:245
 msgid "Re-Read the updated purchase order for receiving goods against"
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:328
+#: ../purchasing/po_receive_items.php:321
 msgid "Items to Receive"
 msgstr ""
 
-#: ../purchasing/po_receive_items.php:333
-msgid "Process Receive Items"
-msgstr ""
-
-#: ../purchasing/po_receive_items.php:333
-msgid "Clear all GL entry fields"
+#: ../purchasing/po_receive_items.php:326
+msgid "Process Receive Items"
 msgstr ""
 
 #: ../purchasing/supplier_credit.php:77
@@ -10820,42 +11455,34 @@ msgid ""
 "on the invoice.  Credit notes are expected to have a charge."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:175
-msgid "You must enter an credit note reference."
-msgstr ""
-
-#: ../purchasing/supplier_credit.php:189
-msgid "You must enter a supplier's credit note reference."
-msgstr ""
-
-#: ../purchasing/supplier_credit.php:196
+#: ../purchasing/supplier_credit.php:181
 msgid ""
 "The credit note as entered cannot be processed because the date entered is "
 "not valid."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:208
-#: ../purchasing/supplier_invoice.php:216
+#: ../purchasing/supplier_credit.php:193
+#: ../purchasing/supplier_invoice.php:201
 msgid ""
 "The invoice as entered cannot be processed because the due date is in an "
 "incorrect format."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:220
+#: ../purchasing/supplier_credit.php:205
 msgid ""
 "The return cannot be processed because there is an insufficient quantity for "
 "item:"
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:263
+#: ../purchasing/supplier_credit.php:248
 msgid "The quantity to credit must be numeric and greater than zero."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:270
+#: ../purchasing/supplier_credit.php:255
 msgid "The price is either not numeric or negative."
 msgstr ""
 
-#: ../purchasing/supplier_credit.php:372
+#: ../purchasing/supplier_credit.php:357
 msgid "Enter Credit Note"
 msgstr ""
 
@@ -10890,37 +11517,33 @@ msgid ""
 "the invoice.  Invoices are expected to have a charge."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:183
-msgid "You must enter an invoice reference."
-msgstr ""
-
-#: ../purchasing/supplier_invoice.php:204
+#: ../purchasing/supplier_invoice.php:189
 msgid ""
 "The invoice as entered cannot be processed because the invoice date is in an "
 "incorrect format."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:264
+#: ../purchasing/supplier_invoice.php:245
 msgid "The quantity to invoice must be numeric and greater than zero."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:271
+#: ../purchasing/supplier_invoice.php:252
 msgid "The price is not numeric."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:284
+#: ../purchasing/supplier_invoice.php:265
 msgid ""
 "The price being invoiced is more than the purchase order price by more than "
 "the allowed over-charge percentage. The system is set up to prohibit this. "
 "See the system administrator to modify the set up parameters if necessary."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:285
-#: ../purchasing/supplier_invoice.php:298
+#: ../purchasing/supplier_invoice.php:266
+#: ../purchasing/supplier_invoice.php:279
 msgid "The over-charge percentage allowance is :"
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:297
+#: ../purchasing/supplier_invoice.php:278
 msgid ""
 "The quantity being invoiced is more than the outstanding quantity by more "
 "than the allowed over-charge percentage. The system is set up to prohibit "
@@ -10928,12 +11551,12 @@ msgid ""
 "necessary."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:375
+#: ../purchasing/supplier_invoice.php:356
 #, php-format
 msgid "All yet non-invoiced items on delivery line # %d has been removed."
 msgstr ""
 
-#: ../purchasing/supplier_invoice.php:417
+#: ../purchasing/supplier_invoice.php:398
 msgid "Enter Invoice"
 msgstr ""
 
@@ -11002,33 +11625,33 @@ msgstr ""
 msgid "The entered bank amount is zero or negative."
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:275
+#: ../purchasing/supplier_payment.php:267
 msgid "Payment To:"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:290
+#: ../purchasing/supplier_payment.php:282
 msgid "From Bank Account:"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:296
+#: ../purchasing/supplier_payment.php:288
 #: ../purchasing/view/view_supp_payment.php:55
 msgid "Date Paid"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:310
+#: ../purchasing/supplier_payment.php:304
 msgid "Bank Amount:"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:323
-#: ../sales/customer_payments.php:399
+#: ../purchasing/supplier_payment.php:317
+#: ../sales/customer_payments.php:382
 msgid "Amount of Discount:"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:324
+#: ../purchasing/supplier_payment.php:318
 msgid "Amount of Payment:"
 msgstr ""
 
-#: ../purchasing/supplier_payment.php:328
+#: ../purchasing/supplier_payment.php:322
 msgid "Enter Payment"
 msgstr ""
 
@@ -11055,11 +11678,6 @@ msgstr ""
 msgid "Delivery Date"
 msgstr ""
 
-#: ../purchasing/view/view_grn.php:41
-#: ../purchasing/view/view_po.php:46
-msgid "Quantity Invoiced"
-msgstr ""
-
 #: ../purchasing/view/view_grn.php:70
 #: ../purchasing/view/view_po.php:84
 #: ../purchasing/view/view_supp_credit.php:60
@@ -11085,14 +11703,11 @@ msgstr ""
 msgid "Requested By"
 msgstr ""
 
-#: ../purchasing/view/view_po.php:46
-msgid "Quantity Received"
-msgstr ""
-
 #: ../purchasing/view/view_po.php:100
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:149
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:158
 #: ../purchasing/inquiry/supplier_inquiry.php:197
-#: ../sales/inquiry/customer_allocation_inquiry.php:165
+#: ../sales/inquiry/customer_allocation_inquiry.php:167
+#: ../sales/inquiry/customer_inquiry.php:229
 #: ../sales/inquiry/sales_deliveries_view.php:195
 #: ../sales/inquiry/sales_orders_view.php:308
 msgid "Marked items are overdue."
@@ -11124,7 +11739,7 @@ msgstr ""
 #: ../purchasing/view/view_supp_credit.php:47
 #: ../purchasing/view/view_supp_invoice.php:51
 #: ../reporting/includes/doctext.inc:140
-#: ../sales/customer_credit_invoice.php:268
+#: ../sales/customer_credit_invoice.php:270
 #: ../sales/view/view_invoice.php:100
 msgid "Invoice Date"
 msgstr ""
@@ -11175,7 +11790,11 @@ msgid "Payment Currency"
 msgstr ""
 
 #: ../purchasing/view/view_supp_payment.php:62
-#: ../sales/customer_delivery.php:422
+#: ../reporting/rep112.php:153
+#: ../reporting/rep210.php:162
+#: ../sales/customer_delivery.php:424
+#: ../sales/customer_invoice.php:549
+#: ../sales/customer_invoice.php:552
 #: ../sales/view/view_receipt.php:45
 #: ../sales/view/view_sales_order.php:220
 msgid "Discount"
@@ -11192,180 +11811,177 @@ msgid ""
 "required before proceeding."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:91
+#: ../purchasing/manage/suppliers.php:89
 msgid "Basic Data"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:93
+#: ../purchasing/manage/suppliers.php:91
 msgid "Supplier Name:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:94
+#: ../purchasing/manage/suppliers.php:92
 msgid "Supplier Short Name:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:97
+#: ../purchasing/manage/suppliers.php:95
 msgid "Website:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:109
+#: ../purchasing/manage/suppliers.php:107
 msgid "Our Customer No:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:111
+#: ../purchasing/manage/suppliers.php:109
 msgid "Purchasing"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:112
+#: ../purchasing/manage/suppliers.php:110
 msgid "Bank Name/Account:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:113
+#: ../purchasing/manage/suppliers.php:111
 #: ../sales/manage/customers.php:269
 msgid "Credit Limit:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:114
+#: ../purchasing/manage/suppliers.php:112
 #: ../sales/manage/customers.php:271
 msgid "Payment Terms:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:120
-#: ../purchasing/manage/suppliers.php:123
+#: ../purchasing/manage/suppliers.php:118
+#: ../purchasing/manage/suppliers.php:121
 msgid "Prices contain tax included:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:125
-msgid "Tax Calculation Algorithm:"
-msgstr ""
-
-#: ../purchasing/manage/suppliers.php:129
+#: ../purchasing/manage/suppliers.php:126
 #: ../reporting/rep704.php:96
 #: ../reporting/rep704.php:106
 #: ../reporting/rep704.php:114
 msgid "Accounts"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:130
+#: ../purchasing/manage/suppliers.php:127
 msgid "Accounts Payable Account:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:131
+#: ../purchasing/manage/suppliers.php:128
 msgid "Purchase Account:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:132
+#: ../purchasing/manage/suppliers.php:129
 msgid "Use Item Inventory/COGS Account"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:135
-#: ../purchasing/manage/suppliers.php:139
+#: ../purchasing/manage/suppliers.php:132
+#: ../purchasing/manage/suppliers.php:136
 msgid "Contact Data"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:142
+#: ../purchasing/manage/suppliers.php:139
 msgid "System default"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:161
+#: ../purchasing/manage/suppliers.php:158
 #: ../sales/manage/customer_branches.php:255
 msgid "Addresses"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:162
+#: ../purchasing/manage/suppliers.php:159
 #: ../reporting/rep205.php:102
 #: ../sales/manage/customer_branches.php:256
 msgid "Mailing Address:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:163
+#: ../purchasing/manage/suppliers.php:160
 msgid "Physical Address:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:165
+#: ../purchasing/manage/suppliers.php:162
 msgid "General"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:166
+#: ../purchasing/manage/suppliers.php:163
+#: ../reporting/rep205.php:179
 #: ../sales/manage/customer_branches.php:258
 #: ../sales/manage/customers.php:292
 msgid "General Notes:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:168
+#: ../purchasing/manage/suppliers.php:165
 msgid "Supplier status:"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:174
+#: ../purchasing/manage/suppliers.php:171
 msgid "Update Supplier"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:175
+#: ../purchasing/manage/suppliers.php:172
 msgid "Update supplier data"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:176
+#: ../purchasing/manage/suppliers.php:173
 msgid "Select this supplier and return to document entry."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:177
+#: ../purchasing/manage/suppliers.php:174
 msgid "Delete Supplier"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:178
+#: ../purchasing/manage/suppliers.php:175
 msgid "Delete supplier data if have been never used"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:182
+#: ../purchasing/manage/suppliers.php:179
 msgid "Add New Supplier Details"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:201
+#: ../purchasing/manage/suppliers.php:198
 msgid "The supplier name must be entered."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:208
+#: ../purchasing/manage/suppliers.php:205
 msgid "The supplier short name must be entered."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:228
+#: ../purchasing/manage/suppliers.php:225
 msgid "Supplier has been updated."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:246
+#: ../purchasing/manage/suppliers.php:243
 msgid "A new supplier has been added."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:264
+#: ../purchasing/manage/suppliers.php:261
 msgid ""
 "Cannot delete this supplier because there are transactions that refer to "
 "this supplier."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:272
+#: ../purchasing/manage/suppliers.php:269
 msgid ""
 "Cannot delete the supplier record because purchase orders have been created "
 "against this supplier."
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:293
-#: ../purchasing/inquiry/po_search_completed.php:76
+#: ../purchasing/manage/suppliers.php:290
+#: ../purchasing/inquiry/po_search_completed.php:95
 #: ../purchasing/inquiry/po_search.php:76
 #: ../purchasing/inquiry/supplier_allocation_inquiry.php:48
 msgid "Select a supplier: "
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:294
+#: ../purchasing/manage/suppliers.php:291
 msgid "New supplier"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:313
+#: ../purchasing/manage/suppliers.php:310
 #: ../sales/manage/customer_branches.php:307
 #: ../sales/manage/customers.php:351
 msgid "&Contacts"
 msgstr ""
 
-#: ../purchasing/manage/suppliers.php:315
+#: ../purchasing/manage/suppliers.php:312
 msgid "Purchase &Orders"
 msgstr ""
 
@@ -11373,18 +11989,22 @@ msgstr ""
 msgid "Search Purchase Orders"
 msgstr ""
 
-#: ../purchasing/inquiry/po_search_completed.php:66
+#: ../purchasing/inquiry/po_search_completed.php:85
 msgid "into location:"
 msgstr ""
 
-#: ../purchasing/inquiry/po_search_completed.php:127
+#: ../purchasing/inquiry/po_search_completed.php:97
+msgid "Also closed:"
+msgstr ""
+
+#: ../purchasing/inquiry/po_search_completed.php:115
 #: ../purchasing/inquiry/po_search.php:122
 #: ../reporting/includes/doctext.inc:187
 #: ../sales/inquiry/sales_orders_view.php:253
 msgid "Order Date"
 msgstr ""
 
-#: ../purchasing/inquiry/po_search_completed.php:129
+#: ../purchasing/inquiry/po_search_completed.php:117
 #: ../purchasing/inquiry/po_search.php:124
 #: ../sales/inquiry/sales_orders_view.php:256
 msgid "Order Total"
@@ -11411,19 +12031,20 @@ msgstr ""
 msgid "show settled:"
 msgstr ""
 
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:103
-msgid "Pay"
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:108
+#: ../sales/inquiry/customer_allocation_inquiry.php:118
+msgid "Payment"
 msgstr ""
 
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:131
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:140
 msgid "Supp Reference"
 msgstr ""
 
-#: ../purchasing/inquiry/supplier_allocation_inquiry.php:137
-#: ../reporting/rep101.php:119
+#: ../purchasing/inquiry/supplier_allocation_inquiry.php:146
+#: ../reporting/rep101.php:134
 #: ../reporting/rep201.php:111
 #: ../reporting/includes/doctext.inc:246
-#: ../sales/inquiry/customer_allocation_inquiry.php:154
+#: ../sales/inquiry/customer_allocation_inquiry.php:156
 msgid "Allocated"
 msgstr ""
 
@@ -11438,10 +12059,10 @@ msgstr ""
 #: ../purchasing/inquiry/supplier_inquiry.php:67
 #: ../purchasing/inquiry/supplier_inquiry.php:68
 #: ../purchasing/inquiry/supplier_inquiry.php:69
-#: ../reporting/rep102.php:120
-#: ../reporting/rep102.php:121
-#: ../reporting/rep102.php:122
-#: ../reporting/rep102.php:243
+#: ../reporting/rep102.php:125
+#: ../reporting/rep102.php:126
+#: ../reporting/rep102.php:127
+#: ../reporting/rep102.php:250
 #: ../reporting/rep108.php:154
 #: ../reporting/rep108.php:155
 #: ../reporting/rep108.php:156
@@ -11452,40 +12073,48 @@ msgstr ""
 #: ../reporting/rep202.php:159
 #: ../reporting/rep202.php:160
 #: ../reporting/rep202.php:251
-#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/create_recurrent_invoices.php:136
 #: ../sales/manage/recurrent_invoices.php:108
+#: ../sales/inquiry/customer_inquiry.php:71
+#: ../sales/inquiry/customer_inquiry.php:72
+#: ../sales/inquiry/customer_inquiry.php:73
 msgid "Days"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_inquiry.php:69
-#: ../reporting/rep102.php:122
+#: ../reporting/rep102.php:127
 #: ../reporting/rep108.php:156
 #: ../reporting/rep202.php:126
 #: ../reporting/rep202.php:160
+#: ../sales/inquiry/customer_inquiry.php:73
 msgid "Over"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_inquiry.php:73
+#: ../sales/inquiry/customer_inquiry.php:76
 msgid "Terms"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_inquiry.php:73
-#: ../reporting/rep102.php:125
-#: ../reporting/rep102.php:241
+#: ../reporting/rep102.php:130
+#: ../reporting/rep102.php:248
 #: ../reporting/rep108.php:158
 #: ../reporting/rep202.php:130
 #: ../reporting/rep202.php:249
+#: ../sales/inquiry/customer_inquiry.php:76
 msgid "Current"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_inquiry.php:74
-#: ../reporting/rep102.php:126
+#: ../reporting/rep102.php:131
 #: ../reporting/rep108.php:158
 #: ../reporting/rep202.php:131
+#: ../sales/inquiry/customer_inquiry.php:77
 msgid "Total Balance"
 msgstr ""
 
 #: ../purchasing/inquiry/supplier_inquiry.php:133
+#: ../sales/inquiry/customer_inquiry.php:163
 msgid "Credit This"
 msgstr ""
 
@@ -11563,15 +12192,15 @@ msgstr ""
 msgid "Marked items are settled."
 msgstr ""
 
-#: ../reporting/rep101.php:108
-#: ../reporting/rep102.php:108
+#: ../reporting/rep101.php:123
+#: ../reporting/rep102.php:113
 #: ../reporting/rep114.php:108
 #: ../reporting/rep202.php:112
 #: ../reporting/rep203.php:83
 msgid "Balances in Home Currency"
 msgstr ""
 
-#: ../reporting/rep101.php:118
+#: ../reporting/rep101.php:133
 #: ../reporting/rep201.php:110
 #: ../reporting/rep203.php:93
 #: ../reporting/rep709.php:116
@@ -11581,20 +12210,20 @@ msgstr ""
 msgid "Trans Type"
 msgstr ""
 
-#: ../reporting/rep101.php:118
+#: ../reporting/rep101.php:133
 #: ../reporting/rep201.php:110
 #: ../reporting/includes/doctext.inc:245
 msgid "Charges"
 msgstr ""
 
-#: ../reporting/rep101.php:118
+#: ../reporting/rep101.php:133
 #: ../reporting/rep201.php:111
 #: ../reporting/includes/doctext.inc:246
 msgid "Credits"
 msgstr ""
 
-#: ../reporting/rep101.php:129
-#: ../reporting/rep102.php:136
+#: ../reporting/rep101.php:144
+#: ../reporting/rep102.php:141
 #: ../reporting/rep201.php:121
 #: ../reporting/rep202.php:141
 #: ../reporting/rep203.php:102
@@ -11608,44 +12237,44 @@ msgstr ""
 msgid "Suppress Zeros"
 msgstr ""
 
-#: ../reporting/rep101.php:131
+#: ../reporting/rep101.php:146
 msgid "Customer Balances"
 msgstr ""
 
-#: ../reporting/rep101.php:241
-#: ../reporting/rep102.php:228
-#: ../reporting/rep106.php:178
+#: ../reporting/rep101.php:256
+#: ../reporting/rep102.php:235
+#: ../reporting/rep106.php:181
 #: ../reporting/rep201.php:234
 #: ../reporting/rep202.php:235
 #: ../reporting/rep203.php:181
 #: ../reporting/rep204.php:148
 #: ../reporting/rep301.php:254
-#: ../reporting/rep304.php:195
+#: ../reporting/rep304.php:211
 #: ../reporting/rep305.php:188
 #: ../reporting/rep306.php:293
 #: ../reporting/rep309.php:158
 msgid "Grand Total"
 msgstr ""
 
-#: ../reporting/rep102.php:102
-#: ../reporting/rep106.php:100
+#: ../reporting/rep102.php:107
+#: ../reporting/rep106.php:99
 #: ../reporting/rep202.php:106
 #: ../reporting/rep709.php:100
 #: ../reporting/reports_main.php:48
 #: ../reporting/reports_main.php:91
 #: ../reporting/reports_main.php:165
 #: ../reporting/reports_main.php:211
-#: ../reporting/reports_main.php:497
+#: ../reporting/reports_main.php:498
 msgid "Summary Only"
 msgstr ""
 
-#: ../reporting/rep102.php:104
+#: ../reporting/rep102.php:109
 #: ../reporting/rep202.php:108
 #: ../reporting/rep709.php:102
 msgid "Detailed Report"
 msgstr ""
 
-#: ../reporting/rep102.php:131
+#: ../reporting/rep102.php:136
 #: ../reporting/rep202.php:136
 #: ../reporting/rep203.php:99
 #: ../reporting/rep301.php:174
@@ -11659,32 +12288,32 @@ msgstr ""
 #: ../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:319
-#: ../reporting/reports_main.php:327
-#: ../reporting/reports_main.php:339
-#: ../reporting/reports_main.php:351
-#: ../reporting/reports_main.php:369
-#: ../reporting/reports_main.php:380
-#: ../reporting/reports_main.php:392
-#: ../reporting/reports_main.php:405
-#: ../reporting/reports_main.php:421
-#: ../reporting/reports_main.php:431
-#: ../reporting/reports_main.php:442
-#: ../reporting/reports_main.php:454
-#: ../reporting/reports_main.php:468
-#: ../reporting/reports_main.php:477
-#: ../reporting/reports_main.php:487
-#: ../reporting/reports_main.php:496
-#: ../reporting/reports_main.php:503
+#: ../reporting/reports_main.php:244
+#: ../reporting/reports_main.php:250
+#: ../reporting/reports_main.php:260
+#: ../reporting/reports_main.php:268
+#: ../reporting/reports_main.php:276
+#: ../reporting/reports_main.php:320
+#: ../reporting/reports_main.php:328
+#: ../reporting/reports_main.php:340
+#: ../reporting/reports_main.php:352
+#: ../reporting/reports_main.php:370
+#: ../reporting/reports_main.php:381
+#: ../reporting/reports_main.php:393
+#: ../reporting/reports_main.php:406
+#: ../reporting/reports_main.php:422
+#: ../reporting/reports_main.php:432
+#: ../reporting/reports_main.php:443
+#: ../reporting/reports_main.php:455
+#: ../reporting/reports_main.php:469
+#: ../reporting/reports_main.php:478
+#: ../reporting/reports_main.php:488
+#: ../reporting/reports_main.php:497
+#: ../reporting/reports_main.php:504
 msgid "End Date"
 msgstr ""
 
-#: ../reporting/rep102.php:135
+#: ../reporting/rep102.php:140
 #: ../reporting/rep202.php:140
 #: ../reporting/reports_main.php:47
 #: ../reporting/reports_main.php:123
@@ -11692,7 +12321,7 @@ msgstr ""
 msgid "Show Also Allocated"
 msgstr ""
 
-#: ../reporting/rep102.php:140
+#: ../reporting/rep102.php:145
 msgid "Aged Customer Analysis"
 msgstr ""
 
@@ -11771,7 +12400,6 @@ msgid "Ph"
 msgstr ""
 
 #: ../reporting/rep103.php:260
-#: ../reporting/rep205.php:179
 msgid "Gereral Notes:"
 msgstr ""
 
@@ -11790,7 +12418,7 @@ msgstr ""
 #: ../reporting/rep303.php:121
 #: ../reporting/rep303.php:127
 #: ../reporting/rep307.php:117
-#: ../reporting/rep308.php:230
+#: ../reporting/rep308.php:242
 msgid "UOM"
 msgstr ""
 
@@ -11822,20 +12450,23 @@ msgstr ""
 
 #: ../reporting/rep105.php:109
 #: ../reporting/rep204.php:84
-#: ../sales/inquiry/customer_allocation_inquiry.php:147
+#: ../sales/inquiry/customer_allocation_inquiry.php:149
+#: ../sales/inquiry/customer_inquiry.php:204
 msgid "Order"
 msgstr ""
 
 #: ../reporting/rep105.php:109
-#: ../reporting/rep106.php:90
-#: ../sales/create_recurrent_invoices.php:134
-#: ../sales/customer_credit_invoice.php:236
-#: ../sales/customer_delivery.php:328
-#: ../sales/customer_invoice.php:451
+#: ../reporting/rep106.php:89
+#: ../reporting/rep112.php:178
+#: ../sales/create_recurrent_invoices.php:136
+#: ../sales/customer_credit_invoice.php:235
+#: ../sales/customer_delivery.php:327
+#: ../sales/customer_invoice.php:450
 #: ../sales/manage/customers.php:255
 #: ../sales/manage/customers.php:295
 #: ../sales/manage/recurrent_invoices.php:108
 #: ../sales/view/view_credit.php:58
+#: ../sales/inquiry/customer_inquiry.php:209
 #: ../sales/inquiry/sales_deliveries_view.php:171
 #: ../sales/inquiry/sales_orders_view.php:251
 #: ../sales/inquiry/sales_orders_view.php:265
@@ -11843,7 +12474,7 @@ msgid "Branch"
 msgstr ""
 
 #: ../reporting/rep105.php:109
-#: ../reporting/rep106.php:90
+#: ../reporting/rep106.php:89
 msgid "Customer Ref"
 msgstr ""
 
@@ -11861,8 +12492,9 @@ msgid "Loc"
 msgstr ""
 
 #: ../reporting/rep105.php:114
-#: ../sales/customer_delivery.php:421
-#: ../sales/includes/ui/sales_order_ui.inc:148
+#: ../sales/customer_delivery.php:423
+#: ../sales/customer_invoice.php:551
+#: ../sales/includes/ui/sales_order_ui.inc:147
 msgid "Delivered"
 msgstr ""
 
@@ -11874,29 +12506,29 @@ msgstr ""
 msgid "Order Status Listing"
 msgstr ""
 
-#: ../reporting/rep106.php:91
+#: ../reporting/rep106.php:90
 msgid "Inv Date"
 msgstr ""
 
-#: ../reporting/rep106.php:91
+#: ../reporting/rep106.php:90
+#: ../reporting/rep106.php:94
 #: ../reporting/rep106.php:95
-#: ../reporting/rep106.php:96
 #: ../sales/manage/sales_people.php:99
 #: ../sales/manage/sales_people.php:159
 #: ../sales/manage/sales_people.php:161
 msgid "Provision"
 msgstr ""
 
-#: ../reporting/rep106.php:95
+#: ../reporting/rep106.php:94
 msgid "Salesman"
 msgstr ""
 
-#: ../reporting/rep106.php:96
+#: ../reporting/rep106.php:95
 #: ../sales/manage/sales_people.php:99
 msgid "Break Pt."
 msgstr ""
 
-#: ../reporting/rep106.php:104
+#: ../reporting/rep106.php:103
 msgid "Salesman Listing"
 msgstr ""
 
@@ -11927,7 +12559,7 @@ msgstr ""
 #: ../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
+#: ../sales/includes/ui/sales_credit_ui.inc:223
 msgid "Shipping"
 msgstr ""
 
@@ -12007,6 +12639,31 @@ msgstr ""
 msgid "RECEIPT"
 msgstr ""
 
+#: ../reporting/rep112.php:117
+#: ../reporting/rep210.php:125
+msgid "As advance / full / part / payment towards:"
+msgstr ""
+
+#: ../reporting/rep112.php:158
+msgid "TOTAL RECEIPT"
+msgstr ""
+
+#: ../reporting/rep112.php:169
+msgid "Received / Sign"
+msgstr ""
+
+#: ../reporting/rep112.php:171
+msgid "By Cash / Cheque* / Draft No."
+msgstr ""
+
+#: ../reporting/rep112.php:173
+msgid "Dated"
+msgstr ""
+
+#: ../reporting/rep112.php:176
+msgid "Drawn on Bank"
+msgstr ""
+
 #: ../reporting/rep113.php:67
 #: ../reporting/rep113.php:89
 #: ../reporting/includes/doctext.inc:102
@@ -12104,31 +12761,36 @@ msgid "TOTAL PO"
 msgstr ""
 
 #: ../reporting/rep210.php:84
+#: ../reporting/rep210.php:109
 #: ../reporting/includes/doctext.inc:150
 msgid "REMITTANCE"
 msgstr ""
 
+#: ../reporting/rep210.php:168
+msgid "TOTAL REMITTANCE"
+msgstr ""
+
 #: ../reporting/rep301.php:178
 msgid "Inventory Valuation Report"
 msgstr ""
 
-#: ../reporting/rep302.php:125
+#: ../reporting/rep302.php:124
 msgid "QOH"
 msgstr ""
 
-#: ../reporting/rep302.php:125
+#: ../reporting/rep302.php:124
 msgid "Cust Ord"
 msgstr ""
 
-#: ../reporting/rep302.php:125
+#: ../reporting/rep302.php:124
 msgid "Supp Ord"
 msgstr ""
 
-#: ../reporting/rep302.php:125
+#: ../reporting/rep302.php:124
 msgid "Sugg Ord"
 msgstr ""
 
-#: ../reporting/rep302.php:134
+#: ../reporting/rep302.php:133
 msgid "Inventory Planning Report"
 msgstr ""
 
@@ -12154,29 +12816,34 @@ msgstr ""
 msgid "Stock Check Sheets"
 msgstr ""
 
-#: ../reporting/rep304.php:114
+#: ../reporting/rep304.php:126
 #: ../reporting/rep305.php:101
 #: ../reporting/rep306.php:141
 #: ../reporting/rep309.php:98
 msgid "Qty"
 msgstr ""
 
-#: ../reporting/rep304.php:114
+#: ../reporting/rep304.php:126
 #: ../reporting/rep309.php:98
 #: ../sales/manage/customer_branches.php:228
 #: ../sales/manage/customers.php:265
 msgid "Sales"
 msgstr ""
 
-#: ../reporting/rep304.php:114
+#: ../reporting/rep304.php:126
 msgid "Cost"
 msgstr ""
 
-#: ../reporting/rep304.php:114
+#: ../reporting/rep304.php:126
 msgid "Contribution"
 msgstr ""
 
-#: ../reporting/rep304.php:126
+#: ../reporting/rep304.php:137
+#: ../reporting/reports_main.php:238
+msgid "Show Service Items"
+msgstr ""
+
+#: ../reporting/rep304.php:139
 msgid "Inventory Sales Report"
 msgstr ""
 
@@ -12217,34 +12884,29 @@ msgstr ""
 msgid "Inventory Movements"
 msgstr ""
 
-#: ../reporting/rep308.php:230
+#: ../reporting/rep308.php:242
 msgid "OpeningStock"
 msgstr ""
 
-#: ../reporting/rep308.php:230
+#: ../reporting/rep308.php:242
 msgid "StockIn"
 msgstr ""
 
-#: ../reporting/rep308.php:230
-#: ../sales/inquiry/sales_orders_view.php:139
-msgid "Delivery"
-msgstr ""
-
-#: ../reporting/rep308.php:230
+#: ../reporting/rep308.php:242
 msgid "ClosingStock"
 msgstr ""
 
-#: ../reporting/rep308.php:231
+#: ../reporting/rep308.php:243
 msgid "QTY"
 msgstr ""
 
-#: ../reporting/rep308.php:231
+#: ../reporting/rep308.php:243
 #: ../reporting/rep709.php:117
 #: ../taxes/item_tax_types.php:185
 msgid "Rate"
 msgstr ""
 
-#: ../reporting/rep308.php:240
+#: ../reporting/rep308.php:252
 msgid "Costed Inventory Movements"
 msgstr ""
 
@@ -12286,10 +12948,6 @@ msgstr ""
 msgid "WORK ORDER"
 msgstr ""
 
-#: ../reporting/rep409.php:128
-msgid "Insufficient stock"
-msgstr ""
-
 #: ../reporting/rep501.php:87
 msgid "YTD"
 msgstr ""
@@ -12353,9 +13011,9 @@ msgstr ""
 #: ../reporting/rep705.php:247
 #: ../reporting/rep705.php:260
 #: ../reporting/rep705.php:271
-#: ../reporting/reports_main.php:360
-#: ../reporting/reports_main.php:413
-#: ../reporting/reports_main.php:461
+#: ../reporting/reports_main.php:361
+#: ../reporting/reports_main.php:414
+#: ../reporting/reports_main.php:462
 msgid "Year"
 msgstr ""
 
@@ -12422,7 +13080,7 @@ msgid "Action"
 msgstr ""
 
 #: ../reporting/rep710.php:89
-#: ../reporting/reports_main.php:501
+#: ../reporting/reports_main.php:502
 msgid "Audit Trail"
 msgstr ""
 
@@ -12440,7 +13098,7 @@ msgstr ""
 
 #: ../reporting/reports_main.php:37
 #: ../reporting/reports_main.php:154
-#: ../reporting/reports_main.php:307
+#: ../reporting/reports_main.php:308
 msgid "Show Balance"
 msgstr ""
 
@@ -12485,54 +13143,6 @@ msgstr ""
 #: ../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:300
-#: ../reporting/reports_main.php:309
-#: ../reporting/reports_main.php:322
-#: ../reporting/reports_main.php:335
-#: ../reporting/reports_main.php:342
-#: ../reporting/reports_main.php:357
-#: ../reporting/reports_main.php:365
-#: ../reporting/reports_main.php:376
-#: ../reporting/reports_main.php:388
-#: ../reporting/reports_main.php:398
-#: ../reporting/reports_main.php:410
-#: ../reporting/reports_main.php:417
-#: ../reporting/reports_main.php:427
-#: ../reporting/reports_main.php:438
-#: ../reporting/reports_main.php:447
-#: ../reporting/reports_main.php:458
-#: ../reporting/reports_main.php:464
-#: ../reporting/reports_main.php:473
-#: ../reporting/reports_main.php:483
-#: ../reporting/reports_main.php:491
-#: ../reporting/reports_main.php:499
-#: ../reporting/reports_main.php:507
-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
@@ -12541,9 +13151,9 @@ msgstr ""
 #: ../reporting/reports_main.php:279
 #: ../reporting/reports_main.php:287
 #: ../reporting/reports_main.php:294
+#: ../reporting/reports_main.php:301
 #: ../reporting/reports_main.php:310
 #: ../reporting/reports_main.php:323
-#: ../reporting/reports_main.php:329
 #: ../reporting/reports_main.php:336
 #: ../reporting/reports_main.php:343
 #: ../reporting/reports_main.php:358
@@ -12563,6 +13173,54 @@ msgstr ""
 #: ../reporting/reports_main.php:492
 #: ../reporting/reports_main.php:500
 #: ../reporting/reports_main.php:508
+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:241
+#: ../reporting/reports_main.php:247
+#: ../reporting/reports_main.php:257
+#: ../reporting/reports_main.php:265
+#: ../reporting/reports_main.php:273
+#: ../reporting/reports_main.php:280
+#: ../reporting/reports_main.php:288
+#: ../reporting/reports_main.php:295
+#: ../reporting/reports_main.php:311
+#: ../reporting/reports_main.php:324
+#: ../reporting/reports_main.php:330
+#: ../reporting/reports_main.php:337
+#: ../reporting/reports_main.php:344
+#: ../reporting/reports_main.php:359
+#: ../reporting/reports_main.php:367
+#: ../reporting/reports_main.php:378
+#: ../reporting/reports_main.php:390
+#: ../reporting/reports_main.php:400
+#: ../reporting/reports_main.php:412
+#: ../reporting/reports_main.php:419
+#: ../reporting/reports_main.php:429
+#: ../reporting/reports_main.php:440
+#: ../reporting/reports_main.php:449
+#: ../reporting/reports_main.php:460
+#: ../reporting/reports_main.php:466
+#: ../reporting/reports_main.php:475
+#: ../reporting/reports_main.php:485
+#: ../reporting/reports_main.php:493
+#: ../reporting/reports_main.php:501
+#: ../reporting/reports_main.php:509
 msgid "Destination"
 msgstr ""
 
@@ -12572,12 +13230,12 @@ msgstr ""
 
 #: ../reporting/reports_main.php:50
 #: ../reporting/reports_main.php:167
-#: ../reporting/reports_main.php:374
-#: ../reporting/reports_main.php:386
-#: ../reporting/reports_main.php:425
-#: ../reporting/reports_main.php:436
-#: ../reporting/reports_main.php:471
-#: ../reporting/reports_main.php:481
+#: ../reporting/reports_main.php:375
+#: ../reporting/reports_main.php:387
+#: ../reporting/reports_main.php:426
+#: ../reporting/reports_main.php:437
+#: ../reporting/reports_main.php:472
+#: ../reporting/reports_main.php:482
 msgid "Graphics"
 msgstr ""
 
@@ -12609,10 +13267,10 @@ msgstr ""
 #: ../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:251
+#: ../reporting/reports_main.php:261
+#: ../reporting/reports_main.php:269
+#: ../reporting/reports_main.php:277
 msgid "Inventory Category"
 msgstr ""
 
@@ -12752,151 +13410,151 @@ msgstr ""
 msgid "Inventory &Sales Report"
 msgstr ""
 
-#: ../reporting/reports_main.php:241
+#: ../reporting/reports_main.php:242
 msgid "&GRN Valuation Report"
 msgstr ""
 
-#: ../reporting/reports_main.php:247
+#: ../reporting/reports_main.php:248
 msgid "Inventory P&urchasing Report"
 msgstr ""
 
-#: ../reporting/reports_main.php:257
+#: ../reporting/reports_main.php:258
 msgid "Inventory &Movement Report"
 msgstr ""
 
-#: ../reporting/reports_main.php:265
+#: ../reporting/reports_main.php:266
 msgid "C&osted Inventory Movement Report"
 msgstr ""
 
-#: ../reporting/reports_main.php:273
+#: ../reporting/reports_main.php:274
 msgid "Item &Sales Summary Report"
 msgstr ""
 
-#: ../reporting/reports_main.php:281
+#: ../reporting/reports_main.php:282
 msgid "Manufacturing"
 msgstr ""
 
-#: ../reporting/reports_main.php:282
+#: ../reporting/reports_main.php:283
 msgid "&Bill of Material Listing"
 msgstr ""
 
-#: ../reporting/reports_main.php:283
+#: ../reporting/reports_main.php:284
 msgid "From product"
 msgstr ""
 
-#: ../reporting/reports_main.php:284
+#: ../reporting/reports_main.php:285
 msgid "To product"
 msgstr ""
 
-#: ../reporting/reports_main.php:288
+#: ../reporting/reports_main.php:289
 msgid "Work Order &Listing"
 msgstr ""
 
-#: ../reporting/reports_main.php:291
+#: ../reporting/reports_main.php:292
 msgid "Outstanding Only"
 msgstr ""
 
-#: ../reporting/reports_main.php:295
+#: ../reporting/reports_main.php:296
 msgid "Print &Work Orders"
 msgstr ""
 
-#: ../reporting/reports_main.php:298
+#: ../reporting/reports_main.php:299
 msgid "Email Locations"
 msgstr ""
 
-#: ../reporting/reports_main.php:304
+#: ../reporting/reports_main.php:305
 msgid "Dimension &Summary"
 msgstr ""
 
-#: ../reporting/reports_main.php:305
+#: ../reporting/reports_main.php:306
 msgid "From Dimension"
 msgstr ""
 
-#: ../reporting/reports_main.php:306
+#: ../reporting/reports_main.php:307
 msgid "To Dimension"
 msgstr ""
 
-#: ../reporting/reports_main.php:315
+#: ../reporting/reports_main.php:316
 msgid "Banking"
 msgstr ""
 
-#: ../reporting/reports_main.php:316
+#: ../reporting/reports_main.php:317
 msgid "Bank &Statement"
 msgstr ""
 
-#: ../reporting/reports_main.php:320
-#: ../reporting/reports_main.php:393
-#: ../reporting/reports_main.php:443
-#: ../reporting/reports_main.php:488
+#: ../reporting/reports_main.php:321
+#: ../reporting/reports_main.php:394
+#: ../reporting/reports_main.php:444
+#: ../reporting/reports_main.php:489
 msgid "Zero values"
 msgstr ""
 
-#: ../reporting/reports_main.php:324
+#: ../reporting/reports_main.php:325
 msgid "Bank Statement w/ &Reconcile"
 msgstr ""
 
-#: ../reporting/reports_main.php:331
+#: ../reporting/reports_main.php:332
 msgid "General Ledger"
 msgstr ""
 
-#: ../reporting/reports_main.php:332
+#: ../reporting/reports_main.php:333
 msgid "Chart of &Accounts"
 msgstr ""
 
-#: ../reporting/reports_main.php:333
+#: ../reporting/reports_main.php:334
 msgid "Show Balances"
 msgstr ""
 
-#: ../reporting/reports_main.php:337
+#: ../reporting/reports_main.php:338
 msgid "List of &Journal Entries"
 msgstr ""
 
-#: ../reporting/reports_main.php:349
-#: ../reporting/reports_main.php:403
-#: ../reporting/reports_main.php:452
+#: ../reporting/reports_main.php:350
+#: ../reporting/reports_main.php:404
+#: ../reporting/reports_main.php:453
 msgid "GL Account &Transactions"
 msgstr ""
 
-#: ../reporting/reports_main.php:352
-#: ../reporting/reports_main.php:406
-#: ../reporting/reports_main.php:455
-msgid "From Account"
-msgstr ""
-
 #: ../reporting/reports_main.php:353
 #: ../reporting/reports_main.php:407
 #: ../reporting/reports_main.php:456
+msgid "From Account"
+msgstr ""
+
+#: ../reporting/reports_main.php:354
+#: ../reporting/reports_main.php:408
+#: ../reporting/reports_main.php:457
 msgid "To Account"
 msgstr ""
 
-#: ../reporting/reports_main.php:359
-#: ../reporting/reports_main.php:412
-#: ../reporting/reports_main.php:460
+#: ../reporting/reports_main.php:360
+#: ../reporting/reports_main.php:413
+#: ../reporting/reports_main.php:461
 msgid "Annual &Expense Breakdown"
 msgstr ""
 
-#: ../reporting/reports_main.php:367
-#: ../reporting/reports_main.php:419
-#: ../reporting/reports_main.php:466
+#: ../reporting/reports_main.php:368
+#: ../reporting/reports_main.php:420
+#: ../reporting/reports_main.php:467
 msgid "&Balance Sheet"
 msgstr ""
 
-#: ../reporting/reports_main.php:373
-#: ../reporting/reports_main.php:385
-#: ../reporting/reports_main.php:424
-#: ../reporting/reports_main.php:435
-#: ../reporting/reports_main.php:470
-#: ../reporting/reports_main.php:480
+#: ../reporting/reports_main.php:374
+#: ../reporting/reports_main.php:386
+#: ../reporting/reports_main.php:425
+#: ../reporting/reports_main.php:436
+#: ../reporting/reports_main.php:471
+#: ../reporting/reports_main.php:481
 msgid "Decimal values"
 msgstr ""
 
-#: ../reporting/reports_main.php:378
-#: ../reporting/reports_main.php:429
-#: ../reporting/reports_main.php:475
+#: ../reporting/reports_main.php:379
+#: ../reporting/reports_main.php:430
+#: ../reporting/reports_main.php:476
 msgid "&Profit and Loss Statement"
 msgstr ""
 
-#: ../reporting/reports_main.php:494
+#: ../reporting/reports_main.php:495
 msgid "Ta&x Report"
 msgstr ""
 
@@ -12913,12 +13571,12 @@ msgid "Delivered To"
 msgstr ""
 
 #: ../reporting/includes/doctext.inc:32
-#: ../sales/customer_credit_invoice.php:281
+#: ../sales/customer_credit_invoice.php:283
 #: ../sales/view/view_credit.php:91
 #: ../sales/view/view_dispatch.php:113
 #: ../sales/view/view_invoice.php:116
-#: ../sales/includes/ui/sales_credit_ui.inc:168
-#: ../sales/includes/ui/sales_order_ui.inc:149
+#: ../sales/includes/ui/sales_credit_ui.inc:169
+#: ../sales/includes/ui/sales_order_ui.inc:148
 msgid "Discount %"
 msgstr ""
 
@@ -12972,6 +13630,7 @@ msgstr ""
 #: ../reporting/includes/doctext.inc:59
 #: ../sales/view/view_sales_order.php:69
 #: ../sales/inquiry/sales_orders_view.php:268
+#: ../sales/includes/ui/sales_order_ui.inc:599
 msgid "Valid until"
 msgstr ""
 
@@ -13279,60 +13938,60 @@ msgstr ""
 msgid "Create and Print Recurrent Invoices"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:44
+#: ../sales/create_recurrent_invoices.php:45
 #, php-format
 msgid "Recurrent Invoice covers period %s - %s."
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:110
+#: ../sales/create_recurrent_invoices.php:112
 #, php-format
 msgid "%s recurrent invoice(s) created, # %s - # %s."
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:115
+#: ../sales/create_recurrent_invoices.php:117
 #, php-format
 msgid "&Print Recurrent Invoices # %s - # %s"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:117
+#: ../sales/create_recurrent_invoices.php:119
 #, php-format
 msgid "&Email Recurrent Invoices # %s - # %s"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:129
+#: ../sales/create_recurrent_invoices.php:131
 msgid "Invoice date:"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/create_recurrent_invoices.php:136
 #: ../sales/manage/recurrent_invoices.php:108
 msgid "Template No"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/create_recurrent_invoices.php:136
 #: ../sales/manage/recurrent_invoices.php:108
 msgid "Begin"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/create_recurrent_invoices.php:136
 #: ../sales/manage/recurrent_invoices.php:108
 msgid "End"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:134
+#: ../sales/create_recurrent_invoices.php:136
 #: ../sales/manage/recurrent_invoices.php:108
 #: ../sales/manage/recurrent_invoices.php:191
 msgid "Last Created"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:175
+#: ../sales/create_recurrent_invoices.php:177
 msgid "Create Invoices"
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:183
+#: ../sales/create_recurrent_invoices.php:185
 msgid "Marked items are due."
 msgstr ""
 
-#: ../sales/create_recurrent_invoices.php:185
+#: ../sales/create_recurrent_invoices.php:187
 msgid "No recurrent invoices are due."
 msgstr ""
 
@@ -13366,8 +14025,8 @@ msgid "&Email This Credit Invoice"
 msgstr ""
 
 #: ../sales/credit_note_entry.php:73
-#: ../sales/customer_credit_invoice.php:60
-#: ../sales/customer_credit_invoice.php:77
+#: ../sales/customer_credit_invoice.php:59
+#: ../sales/customer_credit_invoice.php:76
 msgid "View the GL &Journal Entries for this Credit Note"
 msgstr ""
 
@@ -13375,6 +14034,14 @@ msgstr ""
 msgid "Enter Another &Credit Note"
 msgstr ""
 
+#: ../sales/credit_note_entry.php:147
+#: ../sales/customer_credit_invoice.php:101
+#: ../sales/customer_delivery.php:177
+#: ../sales/customer_invoice.php:335
+#: ../sales/sales_order_entry.php:435
+msgid "You must enter a reference."
+msgstr ""
+
 #: ../sales/credit_note_entry.php:153
 msgid "The entered date for the credit note is invalid."
 msgstr ""
@@ -13408,448 +14075,476 @@ msgid "Credit Note Items"
 msgstr ""
 
 #: ../sales/credit_note_entry.php:285
-#: ../sales/customer_credit_invoice.php:383
+#: ../sales/customer_credit_invoice.php:385
 msgid "Process Credit Note"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:38
+#: ../sales/customer_credit_invoice.php:37
 #, php-format
 msgid "Modifying Credit Invoice # %d."
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:42
+#: ../sales/customer_credit_invoice.php:41
 msgid "Credit all or part of an Invoice"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:53
+#: ../sales/customer_credit_invoice.php:52
 msgid "Credit Note has been processed"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:55
-#: ../sales/customer_credit_invoice.php:72
+#: ../sales/customer_credit_invoice.php:54
+#: ../sales/customer_credit_invoice.php:71
 msgid "&View This Credit Note"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:57
-#: ../sales/customer_credit_invoice.php:74
+#: ../sales/customer_credit_invoice.php:56
+#: ../sales/customer_credit_invoice.php:73
 msgid "&Print This Credit Note"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:58
-#: ../sales/customer_credit_invoice.php:75
+#: ../sales/customer_credit_invoice.php:57
+#: ../sales/customer_credit_invoice.php:74
 msgid "&Email This Credit Note"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:70
+#: ../sales/customer_credit_invoice.php:69
 msgid "Credit Note has been updated"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:109
+#: ../sales/customer_credit_invoice.php:108
 msgid "The entered shipping cost is invalid or less than zero."
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:114
-#: ../sales/customer_credit_invoice.php:136
+#: ../sales/customer_credit_invoice.php:113
+#: ../sales/customer_credit_invoice.php:135
 msgid ""
 "Selected quantity cannot be less than zero nor more than quantity not "
 "credited yet."
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:134
+#: ../sales/customer_credit_invoice.php:133
 msgid ""
 "This page can only be opened if an invoice has been selected for crediting."
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:249
+#: ../sales/customer_credit_invoice.php:251
 msgid "Crediting Invoice"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:270
+#: ../sales/customer_credit_invoice.php:272
 msgid "Credit Note Date"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:280
+#: ../sales/customer_credit_invoice.php:282
 msgid "Invoiced Quantity"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:281
+#: ../sales/customer_credit_invoice.php:283
 msgid "Credit Quantity"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:315
+#: ../sales/customer_credit_invoice.php:317
 msgid "Credit Shipping Cost"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:330
-#: ../sales/includes/ui/sales_credit_ui.inc:233
-msgid "Credit Note Total"
-msgstr ""
-
-#: ../sales/customer_credit_invoice.php:348
-#: ../sales/includes/ui/sales_credit_ui.inc:323
+#: ../sales/customer_credit_invoice.php:350
+#: ../sales/includes/ui/sales_credit_ui.inc:324
 msgid "Credit Note Type"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:356
-#: ../sales/includes/ui/sales_credit_ui.inc:331
+#: ../sales/customer_credit_invoice.php:358
+#: ../sales/includes/ui/sales_credit_ui.inc:332
 msgid "Items Returned to Location"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:361
-#: ../sales/includes/ui/sales_credit_ui.inc:336
+#: ../sales/customer_credit_invoice.php:363
+#: ../sales/includes/ui/sales_credit_ui.inc:337
 msgid "Write off the cost of the items to"
 msgstr ""
 
-#: ../sales/customer_credit_invoice.php:381
+#: ../sales/customer_credit_invoice.php:383
 msgid "Update credit value for quantities entered"
 msgstr ""
 
-#: ../sales/customer_delivery.php:37
+#: ../sales/customer_delivery.php:36
 #, php-format
 msgid "Modifying Delivery Note # %d."
 msgstr ""
 
-#: ../sales/customer_delivery.php:41
+#: ../sales/customer_delivery.php:40
 msgid "Deliver Items for a Sales Order"
 msgstr ""
 
-#: ../sales/customer_delivery.php:50
+#: ../sales/customer_delivery.php:49
 #: ../sales/sales_order_entry.php:189
 #, php-format
 msgid "Delivery # %d has been entered."
 msgstr ""
 
-#: ../sales/customer_delivery.php:52
+#: ../sales/customer_delivery.php:51
 #: ../sales/sales_order_entry.php:191
 msgid "&View This Delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:54
-#: ../sales/customer_delivery.php:76
+#: ../sales/customer_delivery.php:53
+#: ../sales/customer_delivery.php:75
 #: ../sales/sales_order_entry.php:193
 msgid "&Print Delivery Note"
 msgstr ""
 
-#: ../sales/customer_delivery.php:55
-#: ../sales/customer_delivery.php:77
+#: ../sales/customer_delivery.php:54
+#: ../sales/customer_delivery.php:76
 #: ../sales/sales_order_entry.php:194
 msgid "&Email Delivery Note"
 msgstr ""
 
-#: ../sales/customer_delivery.php:56
-#: ../sales/customer_delivery.php:78
+#: ../sales/customer_delivery.php:55
+#: ../sales/customer_delivery.php:77
 #: ../sales/sales_order_entry.php:195
 msgid "P&rint as Packing Slip"
 msgstr ""
 
-#: ../sales/customer_delivery.php:57
-#: ../sales/customer_delivery.php:79
+#: ../sales/customer_delivery.php:56
+#: ../sales/customer_delivery.php:78
 #: ../sales/sales_order_entry.php:196
 msgid "E&mail as Packing Slip"
 msgstr ""
 
-#: ../sales/customer_delivery.php:59
+#: ../sales/customer_delivery.php:58
 #: ../sales/sales_order_entry.php:199
 msgid "View the GL Journal Entries for this Dispatch"
 msgstr ""
 
-#: ../sales/customer_delivery.php:62
+#: ../sales/customer_delivery.php:61
 msgid "Invoice This Delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:64
+#: ../sales/customer_delivery.php:63
 msgid "Select Another Order For Dispatch"
 msgstr ""
 
-#: ../sales/customer_delivery.php:72
+#: ../sales/customer_delivery.php:71
 #, php-format
 msgid "Delivery Note # %d has been updated."
 msgstr ""
 
-#: ../sales/customer_delivery.php:74
+#: ../sales/customer_delivery.php:73
 msgid "View this delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:82
+#: ../sales/customer_delivery.php:81
 msgid "Confirm Delivery and Invoice"
 msgstr ""
 
-#: ../sales/customer_delivery.php:84
+#: ../sales/customer_delivery.php:83
 msgid "Select A Different Delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:94
-#: ../sales/customer_invoice.php:156
+#: ../sales/customer_delivery.php:93
+#: ../sales/customer_invoice.php:155
 msgid ""
 "You have to set Deferred Income Account in GL Setup to entry prepayment "
 "invoices."
 msgstr ""
 
-#: ../sales/customer_delivery.php:98
-#: ../sales/customer_delivery.php:103
+#: ../sales/customer_delivery.php:97
+#: ../sales/customer_delivery.php:102
 msgid "Select a different sales order to delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:99
+#: ../sales/customer_delivery.php:98
 msgid "This order has no items. There is nothing to delivery."
 msgstr ""
 
-#: ../sales/customer_delivery.php:105
+#: ../sales/customer_delivery.php:104
 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:121
 msgid "Select a different delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:123
+#: ../sales/customer_delivery.php:122
 msgid "This delivery has all items invoiced. There is nothing to modify."
 msgstr ""
 
-#: ../sales/customer_delivery.php:133
+#: ../sales/customer_delivery.php:132
 msgid ""
 "This page can only be opened if an order or delivery note has been selected. "
 "Please select it first."
 msgstr ""
 
-#: ../sales/customer_delivery.php:135
+#: ../sales/customer_delivery.php:134
 msgid "Select a Sales Order to Delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:144
+#: ../sales/customer_delivery.php:143
 msgid ""
 "Selected quantity cannot be less than quantity invoiced nor more than "
 "quantity\tnot dispatched on sales order."
 msgstr ""
 
-#: ../sales/customer_delivery.php:147
+#: ../sales/customer_delivery.php:146
 msgid "Freight cost cannot be less than zero"
 msgstr ""
 
-#: ../sales/customer_delivery.php:159
+#: ../sales/customer_delivery.php:158
 msgid "The entered date of delivery is invalid."
 msgstr ""
 
-#: ../sales/customer_delivery.php:171
+#: ../sales/customer_delivery.php:170
 msgid "The entered dead-line for invoice is invalid."
 msgstr ""
 
-#: ../sales/customer_delivery.php:188
-#: ../sales/customer_invoice.php:349
+#: ../sales/customer_delivery.php:187
+#: ../sales/customer_invoice.php:348
 msgid "The entered shipping value is not numeric."
 msgstr ""
 
-#: ../sales/customer_delivery.php:194
+#: ../sales/customer_delivery.php:193
 msgid "There are no item quantities on this delivery note."
 msgstr ""
 
-#: ../sales/customer_delivery.php:206
+#: ../sales/customer_delivery.php:205
+#: ../sales/sales_order_entry.php:379
 msgid ""
-"This document cannot be processed because there is insufficient quantity "
-"for: "
+"This document cannot be processed because there is insufficient quantity for "
+"items marked."
 msgstr ""
 
-#: ../sales/customer_delivery.php:342
+#: ../sales/customer_delivery.php:344
 msgid "For Sales Order"
 msgstr ""
 
-#: ../sales/customer_delivery.php:351
+#: ../sales/customer_delivery.php:353
 msgid "Delivery From"
 msgstr ""
 
-#: ../sales/customer_delivery.php:400
+#: ../sales/customer_delivery.php:402
 msgid "Invoice Dead-line"
 msgstr ""
 
-#: ../sales/customer_delivery.php:410
-#: ../sales/customer_invoice.php:534
-#: ../sales/includes/ui/sales_order_ui.inc:84
-#: ../sales/includes/ui/sales_order_ui.inc:361
+#: ../sales/customer_delivery.php:412
+#: ../sales/customer_invoice.php:536
+#: ../sales/includes/ui/sales_order_ui.inc:83
+#: ../sales/includes/ui/sales_order_ui.inc:360
 msgid ""
 "The selected customer account is currently on hold. Please contact the "
 "credit control personnel to discuss."
 msgstr ""
 
-#: ../sales/customer_delivery.php:415
+#: ../sales/customer_delivery.php:417
 msgid "Delivery Items"
 msgstr ""
 
-#: ../sales/customer_delivery.php:421
+#: ../sales/customer_delivery.php:423
 msgid "Max. delivery"
 msgstr ""
 
-#: ../sales/customer_delivery.php:421
+#: ../sales/customer_delivery.php:423
+#: ../sales/customer_invoice.php:551
 msgid "Invoiced"
 msgstr ""
 
-#: ../sales/customer_delivery.php:498
+#: ../sales/customer_delivery.php:500
+#: ../sales/customer_invoice.php:641
 msgid "Shipping Cost"
 msgstr ""
 
-#: ../sales/customer_delivery.php:518
-#: ../sales/includes/ui/sales_order_ui.inc:238
+#: ../sales/customer_delivery.php:520
+#: ../sales/includes/ui/sales_order_ui.inc:237
 msgid ""
 "Marked items have insufficient quantities in stock as on day of delivery."
 msgstr ""
 
-#: ../sales/customer_delivery.php:522
+#: ../sales/customer_delivery.php:524
 msgid "Action For Balance"
 msgstr ""
 
-#: ../sales/customer_delivery.php:529
 #: ../sales/customer_delivery.php:531
-#: ../sales/customer_delivery.php:534
+#: ../sales/customer_delivery.php:533
+#: ../sales/customer_delivery.php:536
+#: ../sales/customer_invoice.php:693
 msgid "Refresh document page"
 msgstr ""
 
-#: ../sales/customer_delivery.php:531
+#: ../sales/customer_delivery.php:533
 msgid "Reset quantity"
 msgstr ""
 
-#: ../sales/customer_delivery.php:534
+#: ../sales/customer_delivery.php:536
 msgid "Clear quantity"
 msgstr ""
 
-#: ../sales/customer_delivery.php:536
+#: ../sales/customer_delivery.php:538
 msgid "Process Dispatch"
 msgstr ""
 
-#: ../sales/customer_delivery.php:537
+#: ../sales/customer_delivery.php:539
+#: ../sales/customer_invoice.php:695
 #: ../sales/sales_order_entry.php:741
 msgid "Check entered data and save document"
 msgstr ""
 
-#: ../sales/customer_invoice.php:38
+#: ../sales/customer_invoice.php:37
 #, php-format
 msgid "Modifying Sales Invoice # %d."
 msgstr ""
 
-#: ../sales/customer_invoice.php:41
+#: ../sales/customer_invoice.php:40
 msgid "Issue an Invoice for Delivery Note"
 msgstr ""
 
-#: ../sales/customer_invoice.php:43
+#: ../sales/customer_invoice.php:42
 msgid "Issue Batch Invoice for Delivery Notes"
 msgstr ""
 
-#: ../sales/customer_invoice.php:45
+#: ../sales/customer_invoice.php:44
 msgid "Prepayment or Final Invoice Entry"
 msgstr ""
 
-#: ../sales/customer_invoice.php:58
+#: ../sales/customer_invoice.php:57
 msgid "Selected deliveries has been processed"
 msgstr ""
 
-#: ../sales/customer_invoice.php:60
-#: ../sales/customer_invoice.php:84
+#: ../sales/customer_invoice.php:59
+#: ../sales/customer_invoice.php:83
 #: ../sales/sales_order_entry.php:218
 msgid "&View This Invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:62
-#: ../sales/customer_invoice.php:86
+#: ../sales/customer_invoice.php:61
+#: ../sales/customer_invoice.php:85
 msgid "&Print This Invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:63
-#: ../sales/customer_invoice.php:87
+#: ../sales/customer_invoice.php:62
+#: ../sales/customer_invoice.php:86
 msgid "&Email This Invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:65
+#: ../sales/customer_invoice.php:64
 #: ../sales/sales_order_entry.php:228
 msgid "View the GL &Journal Entries for this Invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:67
+#: ../sales/customer_invoice.php:66
 msgid "Select Another &Delivery For Invoicing"
 msgstr ""
 
-#: ../sales/customer_invoice.php:70
+#: ../sales/customer_invoice.php:69
 #: ../sales/sales_order_entry.php:238
 msgid "Entry &customer payment for this invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:82
+#: ../sales/customer_invoice.php:81
 #, php-format
 msgid "Sales Invoice # %d has been updated."
 msgstr ""
 
-#: ../sales/customer_invoice.php:89
+#: ../sales/customer_invoice.php:88
 msgid "Select Another &Invoice to Modify"
 msgstr ""
 
-#: ../sales/customer_invoice.php:128
+#: ../sales/customer_invoice.php:127
 msgid "Select a different delivery to invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:129
+#: ../sales/customer_invoice.php:128
 msgid ""
 "There are no delivered items with a quantity left to invoice. There is "
 "nothing left to invoice."
 msgstr ""
 
-#: ../sales/customer_invoice.php:150
+#: ../sales/customer_invoice.php:149
 msgid ""
 "All quantities on this invoice has been credited. There is nothing to modify "
 "on this invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:164
+#: ../sales/customer_invoice.php:163
 msgid ""
 "Please select correct Sales Order Prepayment to be invoiced and try again."
 msgstr ""
 
-#: ../sales/customer_invoice.php:195
+#: ../sales/customer_invoice.php:194
 msgid ""
 "This page can only be opened after delivery selection. Please select "
 "delivery to invoicing first."
 msgstr ""
 
-#: ../sales/customer_invoice.php:197
+#: ../sales/customer_invoice.php:196
 msgid "Select Delivery to Invoice"
 msgstr ""
 
-#: ../sales/customer_invoice.php:202
-#: ../sales/customer_invoice.php:360
+#: ../sales/customer_invoice.php:201
+#: ../sales/customer_invoice.php:359
 msgid ""
 "Selected quantity cannot be less than quantity credited nor more than "
 "quantity not invoiced yet."
 msgstr ""
 
-#: ../sales/customer_invoice.php:316
+#: ../sales/customer_invoice.php:315
 msgid "The entered invoice date is invalid."
 msgstr ""
 
-#: ../sales/customer_invoice.php:329
+#: ../sales/customer_invoice.php:328
 msgid "The entered invoice due date is invalid."
 msgstr ""
 
-#: ../sales/customer_invoice.php:355
+#: ../sales/customer_invoice.php:354
 msgid "There are no item quantities on this invoice."
 msgstr ""
 
-#: ../sales/customer_invoice.php:365
+#: ../sales/customer_invoice.php:364
 msgid ""
 "There is no non-invoiced payments for this order. If you want to issue final "
 "invoice, select delayed or cash payment terms."
 msgstr ""
 
-#: ../sales/customer_invoice.php:455
+#: ../sales/customer_invoice.php:454
 msgid "Payment terms:"
 msgstr ""
 
-#: ../sales/customer_invoice.php:540
+#: ../sales/customer_invoice.php:542
 #: ../sales/sales_order_entry.php:717
 msgid "Sales Order Items"
 msgstr ""
 
-#: ../sales/customer_invoice.php:540
+#: ../sales/customer_invoice.php:542
 msgid "Invoice Items"
 msgstr ""
 
+#: ../sales/customer_invoice.php:552
+msgid "This Invoice"
+msgstr ""
+
+#: ../sales/customer_invoice.php:560
+msgid "Credited"
+msgstr ""
+
+#: ../sales/customer_invoice.php:662
+msgid "Invoice Total"
+msgstr ""
+
+#: ../sales/customer_invoice.php:671
+msgid "Sales order:"
+msgstr ""
+
+#: ../sales/customer_invoice.php:683
+msgid "Payments received:"
+msgstr ""
+
+#: ../sales/customer_invoice.php:684
+msgid "Invoiced here:"
+msgstr ""
+
+#: ../sales/customer_invoice.php:685
+msgid "Left to be invoiced:"
+msgstr ""
+
 #: ../sales/customer_payments.php:32
 msgid "Customer Payment Entry"
 msgstr ""
@@ -13911,51 +14606,51 @@ msgstr ""
 msgid "The entered date is invalid. Please enter a valid date for the payment."
 msgstr ""
 
-#: ../sales/customer_payments.php:183
-#: ../sales/customer_payments.php:189
+#: ../sales/customer_payments.php:168
+#: ../sales/customer_payments.php:174
 msgid "The entered amount is invalid or negative and cannot be processed."
 msgstr ""
 
-#: ../sales/customer_payments.php:215
+#: ../sales/customer_payments.php:200
 msgid "The entered discount is not a valid number."
 msgstr ""
 
-#: ../sales/customer_payments.php:222
+#: ../sales/customer_payments.php:207
 msgid ""
 "The balance of the amount and discount is zero or negative. Please enter "
 "valid amounts."
 msgstr ""
 
-#: ../sales/customer_payments.php:229
+#: ../sales/customer_payments.php:214
 msgid "The entered payment amount is zero or negative."
 msgstr ""
 
-#: ../sales/customer_payments.php:333
+#: ../sales/customer_payments.php:316
 msgid "Into Bank Account:"
 msgstr ""
 
-#: ../sales/customer_payments.php:336
-#: ../sales/customer_payments.php:338
+#: ../sales/customer_payments.php:319
+#: ../sales/customer_payments.php:321
 msgid "From Customer:"
 msgstr ""
 
-#: ../sales/customer_payments.php:370
+#: ../sales/customer_payments.php:353
 msgid "Date of Deposit:"
 msgstr ""
 
-#: ../sales/customer_payments.php:384
+#: ../sales/customer_payments.php:367
 msgid "Payment Amount:"
 msgstr ""
 
-#: ../sales/customer_payments.php:397
+#: ../sales/customer_payments.php:380
 msgid "Customer prompt payment discount :"
 msgstr ""
 
-#: ../sales/customer_payments.php:407
+#: ../sales/customer_payments.php:390
 msgid "Add Payment"
 msgstr ""
 
-#: ../sales/customer_payments.php:409
+#: ../sales/customer_payments.php:392
 msgid "Update Payment"
 msgstr ""
 
@@ -14095,12 +14790,6 @@ msgstr ""
 msgid "Enter a &New Direct Invoice"
 msgstr ""
 
-#: ../sales/sales_order_entry.php:379
-msgid ""
-"This document cannot be processed because there is insufficient quantity for "
-"items marked."
-msgstr ""
-
 #: ../sales/sales_order_entry.php:385
 msgid "Pre-payment required have to be positive and less than total amount."
 msgstr ""
@@ -14493,7 +15182,7 @@ msgid "Tax Group"
 msgstr ""
 
 #: ../sales/manage/customer_branches.php:303
-#: ../sales/includes/ui/sales_order_ui.inc:292
+#: ../sales/includes/ui/sales_order_ui.inc:291
 msgid ""
 "The selected customer does not have any branches. Please create at least one "
 "branch."
@@ -14802,7 +15491,7 @@ msgid "Fax number:"
 msgstr ""
 
 #: ../sales/manage/sales_people.php:160
-msgid "Break Pt.:"
+msgid "Turnover Break Pt Level:"
 msgstr ""
 
 #: ../sales/manage/sales_points.php:16
@@ -15105,14 +15794,23 @@ msgstr ""
 msgid "Allocation"
 msgstr ""
 
-#: ../sales/inquiry/customer_allocation_inquiry.php:116
-msgid "Payment"
-msgstr ""
-
 #: ../sales/inquiry/customer_inquiry.php:26
 msgid "Customer Transactions"
 msgstr ""
 
+#: ../sales/inquiry/customer_inquiry.php:68
+msgid "CUSTOMER ACCOUNT IS ON HOLD"
+msgstr ""
+
+#: ../sales/inquiry/customer_inquiry.php:182
+msgid "Print Receipt"
+msgstr ""
+
+#: ../sales/inquiry/customer_inquiry.php:213
+#: ../sales/inquiry/customer_inquiry.php:226
+msgid "RB"
+msgstr ""
+
 #: ../sales/inquiry/sales_deliveries_view.php:29
 msgid "Search Not Invoiced Deliveries"
 msgstr ""
@@ -15226,7 +15924,7 @@ msgstr ""
 msgid "Tmpl"
 msgstr ""
 
-#: ../sales/includes/cart_class.inc:396
+#: ../sales/includes/cart_class.inc:398
 msgid "You have to enter valid stock code or nonempty description"
 msgstr ""
 
@@ -15236,7 +15934,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:381
 msgid ""
 "Unsuspected overallocation happened due to sparse credit notes exists for "
 "this invoice.\n"
@@ -15244,55 +15942,142 @@ msgid ""
 "charges."
 msgstr ""
 
-#: ../sales/includes/db/sales_invoice_db.inc:199
+#: ../sales/includes/db/sales_credit_db.inc:189
+msgid "Return"
+msgstr ""
+
+#: ../sales/includes/db/sales_credit_db.inc:191
+msgid "Ex Inv:"
+msgstr ""
+
+#: ../sales/includes/db/sales_invoice_db.inc:201
 msgid "Cash invoice"
 msgstr ""
 
-#: ../sales/includes/db/sales_order_db.inc:103
+#: ../sales/includes/db/sales_order_db.inc:101
 msgid "Deleted."
 msgstr ""
 
-#: ../sales/includes/ui/sales_credit_ui.inc:94
-#: ../sales/includes/ui/sales_order_ui.inc:371
+#: ../sales/includes/ui/sales_credit_ui.inc:95
+#: ../sales/includes/ui/sales_order_ui.inc:370
 msgid "Customer Currency:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_credit_ui.inc:112
+#: ../sales/includes/ui/sales_credit_ui.inc:113
+#: ../sales/includes/ui/sales_order_ui.inc:640
 msgid "Shipping Company:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_credit_ui.inc:114
-#: ../sales/includes/ui/sales_order_ui.inc:378
+#: ../sales/includes/ui/sales_credit_ui.inc:115
+#: ../sales/includes/ui/sales_order_ui.inc:377
 msgid "Customer Discount:"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:61
+#: ../sales/includes/ui/sales_order_ui.inc:60
 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:105
 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:220
+#: ../sales/includes/ui/sales_order_ui.inc:219
 msgid "Shipping Charge"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:290
+#: ../sales/includes/ui/sales_order_ui.inc:289
 msgid "No customer found for entered text."
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:316
+#: ../sales/includes/ui/sales_order_ui.inc:315
 #, php-format
 msgid "Customer's payment terms '%s' cannot be selected on this POS"
 msgstr ""
 
-#: ../sales/includes/ui/sales_order_ui.inc:365
+#: ../sales/includes/ui/sales_order_ui.inc:364
 msgid "Reference number unique for this document type"
 msgstr ""
 
+#: ../sales/includes/ui/sales_order_ui.inc:406
+#: ../sales/includes/ui/sales_order_ui.inc:408
+msgid "Price List:"
+msgstr ""
+
+#: ../sales/includes/ui/sales_order_ui.inc:425
+msgid "Date of order receive"
+msgstr ""
+
+#: ../sales/includes/ui/sales_order_ui.inc:575
+msgid "Cash payment"
+msgstr ""
+
+#: ../sales/includes/ui/sales_order_ui.inc:578
+#: ../sales/includes/ui/sales_order_ui.inc:610
+msgid "Deliver from Location:"
+msgstr ""
+
+#: ../sales/includes/ui/sales_order_ui.inc:581
+msgid "Cash account:"
+msgstr ""
+
+#: ../sales/includes/ui/sales_order_ui.inc:588
+msgid "Delivery Details"
+msgstr ""
+
+#: ../sales/includes/ui/sales_order_ui.inc:593
+msgid "Invoice Delivery Details"
+msgstr ""
+
+#: ../sales/includes/ui/sales_order_ui.inc:594
+msgid "Invoice before"
+msgstr ""
+
+#: ../sales/includes/ui/sales_order_ui.inc:598
+msgid "Quotation Delivery Details"
+msgstr ""
+
+#: ../sales/includes/ui/sales_order_ui.inc:603
+msgid "Order Delivery Details"
+msgstr ""
+
+#: ../sales/includes/ui/sales_order_ui.inc:624
+msgid "Enter requested day of delivery"
+msgstr ""
+
+#: ../sales/includes/ui/sales_order_ui.inc:625
+msgid "Enter Valid until Date"
+msgstr ""
+
+#: ../sales/includes/ui/sales_order_ui.inc:626
+msgid "Deliver To:"
+msgstr ""
+
+#: ../sales/includes/ui/sales_order_ui.inc:627
+msgid "Additional identifier for delivery e.g. name of receiving person"
+msgstr ""
+
+#: ../sales/includes/ui/sales_order_ui.inc:630
+msgid "Delivery address. Default is address of customer branch"
+msgstr ""
+
+#: ../sales/includes/ui/sales_order_ui.inc:634
+msgid "Contact Phone Number:"
+msgstr ""
+
+#: ../sales/includes/ui/sales_order_ui.inc:635
+msgid "Phone number of ordering person. Defaults to branch phone number"
+msgstr ""
+
+#: ../sales/includes/ui/sales_order_ui.inc:636
+msgid "Customer Reference:"
+msgstr ""
+
+#: ../sales/includes/ui/sales_order_ui.inc:637
+msgid "Customer reference number for this order (if any)"
+msgstr ""
+
 #: ../taxes/item_tax_types.php:17
 msgid "Item Tax Types"
 msgstr ""
@@ -15456,10 +16241,15 @@ msgstr ""
 msgid "Main Menu"
 msgstr ""
 
-#: ../themes/default/renderer.php:69
+#: ../themes/default/renderer.php:71
+#: ../themes/default/renderer.php:80
 msgid "Help"
 msgstr ""
 
+#: ../themes/default/renderer.php:75
+msgid "Preferences"
+msgstr ""
+
 #: ../sql/alter2.1.php:19
 msgid "Upgrade from version 2.0 to 2.1"
 msgstr ""
@@ -15510,30 +16300,30 @@ msgstr ""
 msgid "Upgrade from version 2.2 to 2.3"
 msgstr ""
 
-#: ../sql/alter2.4.php:56
+#: ../sql/alter2.4.php:22
 msgid "Upgrade from version 2.3 to 2.4"
 msgstr ""
 
-#: ../sql/alter2.4.php:64
+#: ../sql/alter2.4.php:30
 msgid "Set optimal parameters and start upgrade:"
 msgstr ""
 
-#: ../sql/alter2.4.php:67
+#: ../sql/alter2.4.php:33
 msgid "Text collation optimization:"
 msgstr ""
 
-#: ../sql/alter2.4.php:133
+#: ../sql/alter2.4.php:99
 #, php-format
 msgid ""
 "Cannot update work orders costs:\n"
 "%s"
 msgstr ""
 
-#: ../sql/alter2.4.php:223
+#: ../sql/alter2.4.php:189
 msgid "Convertion to utf8 done."
 msgstr ""
 
-#: ../sql/alter2.4.php:260
+#: ../sql/alter2.4.php:228
 #, php-format
 msgid "Cannot drop column in %s table: %s"
 msgstr ""