[Web-erp-svn] SF.net SVN: web-erp:[5984] trunk

[<dai...@us...>]

Revision: 5984
          http://sourceforge.net/p/web-erp/reponame/5984
Author:   daintree
Date:     2013-05-24 23:08:09 +0000 (Fri, 24 May 2013)
Log Message:
-----------
CountriesArray.php with ISO 2 character code

Modified Paths:
--------------
    trunk/build/make_release.sh
    trunk/doc/Change.log
    trunk/includes/CountriesArray.php
    trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
    trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po

Modified: trunk/build/make_release.sh
===================================================================
--- trunk/build/make_release.sh	2013-05-24 22:47:01 UTC (rev 5983)
+++ trunk/build/make_release.sh	2013-05-24 23:08:09 UTC (rev 5984)
@@ -7,7 +7,7 @@
 
 cd $BASE_DIR;
 
-xgettext --no-wrap --language=PHP -o locale/en_GB.utf8/LC_MESSAGES/messages.pot *php includes/*.php includes/*.inc reportwriter/*.php reportwriter/*.inc reportwriter/forms/*.html reportwriter/admin/*.php reportwriter/admin/*.inc reportwriter/admin/forms/*.html api/*.php
+xgettext --no-wrap --from-code=utf-8 --language=PHP -o locale/en_GB.utf8/LC_MESSAGES/messages.pot *php includes/*.php includes/*.inc reportwriter/*.php reportwriter/*.inc reportwriter/forms/*.html reportwriter/admin/*.php reportwriter/admin/*.inc reportwriter/admin/forms/*.html api/*.php
 
 msgmerge -U --backup=off locale/ar_EG.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
 msgmerge -U --backup=off locale/cs_CZ.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2013-05-24 22:47:01 UTC (rev 5983)
+++ trunk/doc/Change.log	2013-05-24 23:08:09 UTC (rev 5984)
@@ -1,5 +1,6 @@
 OwebERP Change Log
 
+25/5/13 Phil: CountriesArray.php now uses the index as the ISO 2 character code for the country.
 25/5/13 Phil: Currencies.php now takes advantage of Rafael's new CurrenciesArray - to ensure correct ISO 3 letter abbreviation is selected - also allows for translation of currency names
 25/5/13 Rafael Chacón: New include/CurrenciesArray.php listing all ISO currencies and their code
 22/5/13 Rafael Chacón: include/PO_PDFOrderPageHeader.inc now allows different length labels for date and intiator without running into the field data - needed for translations of different lengths

Modified: trunk/includes/CountriesArray.php
===================================================================
--- trunk/includes/CountriesArray.php	2013-05-24 22:47:01 UTC (rev 5983)
+++ trunk/includes/CountriesArray.php	2013-05-24 23:08:09 UTC (rev 5984)
@@ -2,223 +2,214 @@
 $CountriesArray =  array();
 
 $CountriesArray[] = '';
-$CountriesArray[] = _('Andorra');
-$CountriesArray[] = _('United Arab Emirates');
-$CountriesArray[] = _('Afghanistan');
-$CountriesArray[] = _('Antigua and Barbuda');
-$CountriesArray[] = _('Anguilla');
-$CountriesArray[] = _('Albania');
-$CountriesArray[] = _('Armenia');
-$CountriesArray[] = _('Antilles, Netherlands');
-$CountriesArray[] = _('Angola');
-$CountriesArray[] = _('Argentina');
-$CountriesArray[] = _('American Samoa');
-$CountriesArray[] = _('Austria');
-$CountriesArray[] = _('Australia');
-$CountriesArray[] = _('Aruba');
-$CountriesArray[] = _('Azerbaijan');
-$CountriesArray[] = _('Bosnia and Herzegovina');
-$CountriesArray[] = _('Barbados');
-$CountriesArray[] = _('Bangladesh');
-$CountriesArray[] = _('Belgium');
-$CountriesArray[] = _('Burkina Faso');
-$CountriesArray[] = _('Bulgaria');
-$CountriesArray[] = _('Bahrain');
-$CountriesArray[] = _('Burundi');
-$CountriesArray[] = _('Benin');
-$CountriesArray[] = _('Bermuda');
-$CountriesArray[] = _('Brunei Darussalam');
-$CountriesArray[] = _('Bolivia');
-$CountriesArray[] = _('Brazil');
-$CountriesArray[] = _('Bahamas, The');
-$CountriesArray[] = _('Bhutan');
-$CountriesArray[] = _('Botswana');
-$CountriesArray[] = _('Belarus');
-$CountriesArray[] = _('Belize');
-$CountriesArray[] = _('Canada');
-$CountriesArray[] = _('Congo');
-$CountriesArray[] = _('Central African Republic');
-$CountriesArray[] = _('Congo');
-$CountriesArray[] = _('Switzerland');
-$CountriesArray[] = _('Cote D Ivoire');
-$CountriesArray[] = _('Cook Islands');
-$CountriesArray[] = _('Chile');
-$CountriesArray[] = _('Cameroon');
-$CountriesArray[] = _('China');
-$CountriesArray[] = _('Colombia');
-$CountriesArray[] = _('Costa Rica');
-$CountriesArray[] = _('Montenegro');
-$CountriesArray[] = _('Catalonia');
-$CountriesArray[] = _('Cuba');
-$CountriesArray[] = _('Cape Verde');
-$CountriesArray[] = _('Cyprus');
-$CountriesArray[] = _('Czech Republic');
-$CountriesArray[] = _('Germany');
-$CountriesArray[] = _('Djibouti');
-$CountriesArray[] = _('Denmark');
-$CountriesArray[] = _('Dominica');
-$CountriesArray[] = _('Dominican Republic');
-$CountriesArray[] = _('Algeria');
-$CountriesArray[] = _('Ecuador');
-$CountriesArray[] = _('Estonia');
-$CountriesArray[] = _('Egypt');
-$CountriesArray[] = _('Eritrea');
-$CountriesArray[] = _('Spain');
-$CountriesArray[] = _('Ethiopia');
-$CountriesArray[] = _('Euskadi');
-$CountriesArray[] = _('Finland');
-$CountriesArray[] = _('Fiji');
-$CountriesArray[] = _('Falkland Islands');
-$CountriesArray[] = _('Micronesia');
-$CountriesArray[] = _('Faroe Islands');
-$CountriesArray[] = _('France');
-$CountriesArray[] = _('Gabon');
-$CountriesArray[] = _('Grenada');
-$CountriesArray[] = _('Georgia');
-$CountriesArray[] = _('French Guiana');
-$CountriesArray[] = _('Guiana, French');
-$CountriesArray[] = _('Guernsey and Alderney');
-$CountriesArray[] = _('Ghana');
-$CountriesArray[] = _('Gibraltar');
-$CountriesArray[] = _('Greenland');
-$CountriesArray[] = _('Gambia, the');
-$CountriesArray[] = _('Guinea');
-$CountriesArray[] = _('Guadeloupe');
-$CountriesArray[] = _('Guinea, Equatorial');
-$CountriesArray[] = _('Equatorial Guinea');
-$CountriesArray[] = _('Greece');
-$CountriesArray[] = _('Guatemala');
-$CountriesArray[] = _('Guam');
-$CountriesArray[] = _('Guinea-Bissau');
-$CountriesArray[] = _('Guyana');
-$CountriesArray[] = _('Hong Kong, (China)');
-$CountriesArray[] = _('Honduras');
-$CountriesArray[] = _('Croatia');
-$CountriesArray[] = _('Haiti');
-$CountriesArray[] = _('Hungary');
-$CountriesArray[] = _('Indonesia');
-$CountriesArray[] = _('Ireland');
-$CountriesArray[] = _('Israel');
-$CountriesArray[] = _('India');
-$CountriesArray[] = _('Iraq');
-$CountriesArray[] = _('Iran, Islamic Republic of');
-$CountriesArray[] = _('Iceland');
-$CountriesArray[] = _('Italy');
-$CountriesArray[] = _('Jersey');
-$CountriesArray[] = _('Jamaica');
-$CountriesArray[] = _('Jordan');
-$CountriesArray[] = _('Japan');
-$CountriesArray[] = _('Kenya');
-$CountriesArray[] = _('Kyrgyzstan');
-$CountriesArray[] = _('Cambodia');
-$CountriesArray[] = _('Kiribati');
-$CountriesArray[] = _('Comoros');
-$CountriesArray[] = _('Saint Kitts and Nevis');
-$CountriesArray[] = _('Korea, (South) Rep. of');
-$CountriesArray[] = _('Kuwait');
-$CountriesArray[] = _('Kosovo');
-$CountriesArray[] = _('Cayman Islands');
-$CountriesArray[] = _('Kazakhstan');
-$CountriesArray[] = _('Lao People s Dem. Rep.');
-$CountriesArray[] = _('Lebanon');
-$CountriesArray[] = _('Saint Lucia');
-$CountriesArray[] = _('Liechtenstein');
-$CountriesArray[] = _('Sri Lanka (ex-Ceilan)');
-$CountriesArray[] = _('Lesotho');
-$CountriesArray[] = _('Lithuania');
-$CountriesArray[] = _('Luxembourg');
-$CountriesArray[] = _('Latvia');
-$CountriesArray[] = _('Libyan Arab Jamahiriya');
-$CountriesArray[] = _('Morocco');
-$CountriesArray[] = _('Monaco');
-$CountriesArray[] = _('Moldova, Republic of');
-$CountriesArray[] = _('Madagascar');
-$CountriesArray[] = _('Macedonia, TFYR');
-$CountriesArray[] = _('Mali');
-$CountriesArray[] = _('Myanmar (ex-Burma)');
-$CountriesArray[] = _('Mongolia');
-$CountriesArray[] = _('Macao, (China)');
-$CountriesArray[] = _('Northern Mariana Islands');
-$CountriesArray[] = _('Martinique');
-$CountriesArray[] = _('Mauritania');
-$CountriesArray[] = _('Malta');
-$CountriesArray[] = _('Mauritius');
-$CountriesArray[] = _('Maldives');
-$CountriesArray[] = _('Malawi');
-$CountriesArray[] = _('Mexico');
-$CountriesArray[] = _('Malaysia');
-$CountriesArray[] = _('Mozambique');
-$CountriesArray[] = _('Namibia');
-$CountriesArray[] = _('New Caledonia');
-$CountriesArray[] = _('Niger');
-$CountriesArray[] = _('Nigeria');
-$CountriesArray[] = _('Nicaragua');
-$CountriesArray[] = _('Netherlands');
-$CountriesArray[] = _('Norway');
-$CountriesArray[] = _('Nepal');
-$CountriesArray[] = _('New Zealand');
-$CountriesArray[] = _('Oman');
-$CountriesArray[] = _('Panama');
-$CountriesArray[] = _('Peru');
-$CountriesArray[] = _('French Polynesia');
-$CountriesArray[] = _('Papua New Guinea');
-$CountriesArray[] = _('Philippines');
-$CountriesArray[] = _('Pakistan');
-$CountriesArray[] = _('Poland');
-$CountriesArray[] = _('Palestinian Territory');
-$CountriesArray[] = _('Portugal');
-$CountriesArray[] = _('Paraguay');
-$CountriesArray[] = _('Qatar');
-$CountriesArray[] = _('Quebec');
-$CountriesArray[] = _('Reunion');
-$CountriesArray[] = _('Romania');
-$CountriesArray[] = _('Serbia');
-$CountriesArray[] = _('Russian Federation');
-$CountriesArray[] = _('Rwanda');
-$CountriesArray[] = _('Saudi Arabia');
-$CountriesArray[] = _('Solomon Islands');
-$CountriesArray[] = _('Seychelles');
-$CountriesArray[] = _('Sudan');
-$CountriesArray[] = _('Sweden');
-$CountriesArray[] = _('Singapore');
-$CountriesArray[] = _('Slovenia');
-$CountriesArray[] = _('Slovakia');
-$CountriesArray[] = _('San Marino');
-$CountriesArray[] = _('Senegal');
-$CountriesArray[] = _('Somalia');
-$CountriesArray[] = _('Suriname');
-$CountriesArray[] = _('Sao Tome and Principe');
-$CountriesArray[] = _('El Salvador');
-$CountriesArray[] = _('Syrian Arab Republic');
-$CountriesArray[] = _('Swaziland');
-$CountriesArray[] = _('Chad');
-$CountriesArray[] = _('Togo');
-$CountriesArray[] = _('Thailand');
-$CountriesArray[] = _('Tajikistan');
-$CountriesArray[] = _('Turkmenistan');
-$CountriesArray[] = _('Tunisia');
-$CountriesArray[] = _('Tonga');
-$CountriesArray[] = _('East Timor (Timor-Leste)');
-$CountriesArray[] = _('Turkey');
-$CountriesArray[] = _('Trinidad and Tobago');
-$CountriesArray[] = _('Taiwan');
-$CountriesArray[] = _('Tanzania, United Rep. of');
-$CountriesArray[] = _('Ukraine');
-$CountriesArray[] = _('Uganda');
-$CountriesArray[] = _('United Kingdom');
-$CountriesArray[] = _('United States');
-$CountriesArray[] = _('Uruguay');
-$CountriesArray[] = _('Uzbekistan');
-$CountriesArray[] = _('St. Vincent and the Grenadines');
-$CountriesArray[] = _('Venezuela');
-$CountriesArray[] = _('British Virgin Islands');
-$CountriesArray[] = _('Virgin Islands, U.S.');
-$CountriesArray[] = _('Viet Nam');
-$CountriesArray[] = _('Vanuatu');
-$CountriesArray[] = _('Samoa');
-$CountriesArray[] = _('Yemen');
-$CountriesArray[] = _('Zambia');
-$CountriesArray[] = _('Zimbabwe');
+$CountriesArray['AD'] = _('Andorra');
+$CountriesArray['AE'] = _('United Arab Emirates');
+$CountriesArray['AF'] = _('Afghanistan');
+$CountriesArray['AG'] = _('Antigua and Barbuda');
+$CountriesArray['AI'] = _('Anguilla');
+$CountriesArray['AL'] = _('Albania');
+$CountriesArray['AM'] = _('Armenia');
+$CountriesArray['AO'] = _('Angola');
+$CountriesArray['AG'] = _('Argentina');
+$CountriesArray['AS'] = _('American Samoa');
+$CountriesArray['AT'] = _('Austria');
+$CountriesArray['AU'] = _('Australia');
+$CountriesArray['AW'] = _('Aruba');
+$CountriesArray['AZ'] = _('Azerbaijan');
+$CountriesArray['BA'] = _('Bosnia and Herzegovina');
+$CountriesArray['BB'] = _('Barbados');
+$CountriesArray['BD'] = _('Bangladesh');
+$CountriesArray['BE'] = _('Belgium');
+$CountriesArray['BF'] = _('Burkina Faso');
+$CountriesArray['BU'] = _('Bulgaria');
+$CountriesArray['BH'] = _('Bahrain');
+$CountriesArray['BI'] = _('Burundi');
+$CountriesArray['BJ'] = _('Benin');
+$CountriesArray['BM'] = _('Bermuda');
+$CountriesArray['BN'] = _('Brunei Darussalam');
+$CountriesArray['BO'] = _('Bolivia');
+$CountriesArray['BR'] = _('Brazil');
+$CountriesArray['BS'] = _('Bahamas');
+$CountriesArray['BT'] = _('Bhutan');
+$CountriesArray['BW'] = _('Botswana');
+$CountriesArray['BY'] = _('Belarus');
+$CountriesArray['BZ'] = _('Belize');
+$CountriesArray['CA'] = _('Canada');
+$CountriesArray['CG'] = _('Congo');
+$CountriesArray['CF'] = _('Central African Republic');
+$CountriesArray['CH'] = _('Switzerland');
+$CountriesArray['CI'] = _('Cote D Ivoire');
+$CountriesArray['CK'] = _('Cook Islands');
+$CountriesArray['CL'] = _('Chile');
+$CountriesArray['CM'] = _('Cameroon');
+$CountriesArray['CN'] = _('China');
+$CountriesArray['CO'] = _('Colombia');
+$CountriesArray['CR'] = _('Costa Rica');
+$CountriesArray['ME'] = _('Montenegro');
+$CountriesArray['CT'] = _('Catalonia');
+$CountriesArray['CU'] = _('Cuba');
+$CountriesArray['CV'] = _('Cape Verde');
+$CountriesArray['CY'] = _('Cyprus');
+$CountriesArray['CZ'] = _('Czech Republic');
+$CountriesArray['DE'] = _('Germany');
+$CountriesArray['DJ'] = _('Djibouti');
+$CountriesArray['DE'] = _('Denmark');
+$CountriesArray['DM'] = _('Dominica');
+$CountriesArray['DO'] = _('Dominican Republic');
+$CountriesArray['DZ'] = _('Algeria');
+$CountriesArray['EC'] = _('Ecuador');
+$CountriesArray['EE'] = _('Estonia');
+$CountriesArray['EG'] = _('Egypt');
+$CountriesArray['ER'] = _('Eritrea');
+$CountriesArray['ES'] = _('Spain');
+$CountriesArray['ET'] = _('Ethiopia');
+$CountriesArray['FI'] = _('Finland');
+$CountriesArray['FJ'] = _('Fiji');
+$CountriesArray['FK'] = _('Falkland Islands');
+$CountriesArray['FM'] = _('Micronesia');
+$CountriesArray['FO'] = _('Faroe Islands');
+$CountriesArray['FR'] = _('France');
+$CountriesArray['GA'] = _('Gabon');
+$CountriesArray['GD'] = _('Grenada');
+$CountriesArray['GE'] = _('Georgia');
+$CountriesArray['GF'] = _('French Guiana');
+$CountriesArray['GG'] = _('Guernsey and Alderney');
+$CountriesArray['GH'] = _('Ghana');
+$CountriesArray['GI'] = _('Gibraltar');
+$CountriesArray['GL'] = _('Greenland');
+$CountriesArray['GM'] = _('Gambia');
+$CountriesArray['GN'] = _('Guinea');
+$CountriesArray['GP'] = _('Guadeloupe');
+$CountriesArray['GR'] = _('Greece');
+$CountriesArray['GT'] = _('Guatemala');
+$CountriesArray['GU'] = _('Guam');
+$CountriesArray['GW'] = _('Guinea-Bissau');
+$CountriesArray['GY'] = _('Guyana');
+$CountriesArray['HK'] = _('Hong Kong)');
+$CountriesArray['HN'] = _('Honduras');
+$CountriesArray['HR'] = _('Croatia');
+$CountriesArray['HT'] = _('Haiti');
+$CountriesArray['HU'] = _('Hungary');
+$CountriesArray['ID'] = _('Indonesia');
+$CountriesArray['IE'] = _('Ireland');
+$CountriesArray['IL'] = _('Israel');
+$CountriesArray['IN'] = _('India');
+$CountriesArray['IQ'] = _('Iraq');
+$CountriesArray['IR'] = _('Iran');
+$CountriesArray['IS'] = _('Iceland');
+$CountriesArray['IT'] = _('Italy');
+$CountriesArray['JE'] = _('Jersey');
+$CountriesArray['JM'] = _('Jamaica');
+$CountriesArray['JO'] = _('Jordan');
+$CountriesArray['JP'] = _('Japan');
+$CountriesArray['KE'] = _('Kenya');
+$CountriesArray['KG'] = _('Kyrgyzstan');
+$CountriesArray['KH'] = _('Cambodia');
+$CountriesArray['KI'] = _('Kiribati');
+$CountriesArray['KM'] = _('Comoros');
+$CountriesArray['KN'] = _('Saint Kitts and Nevis');
+$CountriesArray['KR'] = _('Korea (South)');
+$CountriesArray['KW'] = _('Kuwait');
+$CountriesArray['KY'] = _('Cayman Islands');
+$CountriesArray['KZ'] = _('Kazakhstan');
+$CountriesArray['LA'] = _('Lao People s Dem. Rep.');
+$CountriesArray['LB'] = _('Lebanon');
+$CountriesArray['LC'] = _('Saint Lucia');
+$CountriesArray['LI'] = _('Liechtenstein');
+$CountriesArray['LK'] = _('Sri Lanka');
+$CountriesArray['LS'] = _('Lesotho');
+$CountriesArray['LT'] = _('Lithuania');
+$CountriesArray['LU'] = _('Luxembourg');
+$CountriesArray['LV'] = _('Latvia');
+$CountriesArray['LY'] = _('Libyan Arab Jamahiriya');
+$CountriesArray['MA'] = _('Morocco');
+$CountriesArray['MC'] = _('Monaco');
+$CountriesArray['MD'] = _('Moldova, Republic of');
+$CountriesArray['MG'] = _('Madagascar');
+$CountriesArray['MK'] = _('Macedonia, TFYR');
+$CountriesArray['ML'] = _('Mali');
+$CountriesArray['MM'] = _('Myanmar');
+$CountriesArray['MN'] = _('Mongolia');
+$CountriesArray['MO'] = _('Macao, (China)');
+$CountriesArray['MP'] = _('Northern Mariana Islands');
+$CountriesArray['MQ'] = _('Martinique');
+$CountriesArray['MR'] = _('Mauritania');
+$CountriesArray['MT'] = _('Malta');
+$CountriesArray['MU'] = _('Mauritius');
+$CountriesArray['MV'] = _('Maldives');
+$CountriesArray['MW'] = _('Malawi');
+$CountriesArray['MX'] = _('Mexico');
+$CountriesArray['MY'] = _('Malaysia');
+$CountriesArray['MZ'] = _('Mozambique');
+$CountriesArray['NA'] = _('Namibia');
+$CountriesArray['NC'] = _('New Caledonia');
+$CountriesArray['NE'] = _('Niger');
+$CountriesArray['NG'] = _('Nigeria');
+$CountriesArray['NI'] = _('Nicaragua');
+$CountriesArray['NE'] = _('Netherlands');
+$CountriesArray['NO'] = _('Norway');
+$CountriesArray['NP'] = _('Nepal');
+$CountriesArray['NZ'] = _('New Zealand');
+$CountriesArray['OM'] = _('Oman');
+$CountriesArray['PA'] = _('Panama');
+$CountriesArray['PE'] = _('Peru');
+$CountriesArray['PF'] = _('French Polynesia');
+$CountriesArray['PG'] = _('Papua New Guinea');
+$CountriesArray['PH'] = _('Philippines');
+$CountriesArray['PK'] = _('Pakistan');
+$CountriesArray['PL'] = _('Poland');
+$CountriesArray['PS'] = _('Palestinian Territory');
+$CountriesArray['PT'] = _('Portugal');
+$CountriesArray['PY'] = _('Paraguay');
+$CountriesArray['QA'] = _('Qatar');
+$CountriesArray['RO'] = _('Romania');
+$CountriesArray['RS'] = _('Serbia');
+$CountriesArray['RU'] = _('Russian Federation');
+$CountriesArray['RW'] = _('Rwanda');
+$CountriesArray['SA'] = _('Saudi Arabia');
+$CountriesArray['SB'] = _('Solomon Islands');
+$CountriesArray['SC'] = _('Seychelles');
+$CountriesArray['SD'] = _('Sudan');
+$CountriesArray['SE'] = _('Sweden');
+$CountriesArray['SG'] = _('Singapore');
+$CountriesArray['SI'] = _('Slovenia');
+$CountriesArray['SK'] = _('Slovakia');
+$CountriesArray['SM'] = _('San Marino');
+$CountriesArray['SN'] = _('Senegal');
+$CountriesArray['SO'] = _('Somalia');
+$CountriesArray['SR'] = _('Suriname');
+$CountriesArray['ST'] = _('Sao Tome and Principe');
+$CountriesArray['SV'] = _('El Salvador');
+$CountriesArray['SY'] = _('Syrian Arab Republic');
+$CountriesArray['SZ'] = _('Swaziland');
+$CountriesArray['TD'] = _('Chad');
+$CountriesArray['TG'] = _('Togo');
+$CountriesArray['TH'] = _('Thailand');
+$CountriesArray['TJ'] = _('Tajikistan');
+$CountriesArray['TM'] = _('Turkmenistan');
+$CountriesArray['TN'] = _('Tunisia');
+$CountriesArray['TO'] = _('Tonga');
+$CountriesArray['TL'] = _('East Timor (Timor-Leste)');
+$CountriesArray['TR'] = _('Turkey');
+$CountriesArray['TT'] = _('Trinidad and Tobago');
+$CountriesArray['TW'] = _('Taiwan');
+$CountriesArray['TZ'] = _('Tanzania, United Rep. of');
+$CountriesArray['UA'] = _('Ukraine');
+$CountriesArray['UG'] = _('Uganda');
+$CountriesArray['GB'] = _('United Kingdom');
+$CountriesArray['US'] = _('United States');
+$CountriesArray['UY'] = _('Uruguay');
+$CountriesArray['UZ'] = _('Uzbekistan');
+$CountriesArray['VC'] = _('St. Vincent and the Grenadines');
+$CountriesArray['VE'] = _('Venezuela');
+$CountriesArray['VG'] = _('British Virgin Islands');
+$CountriesArray['VI'] = _('Virgin Islands, U.S.');
+$CountriesArray['VN'] = _('Viet Nam');
+$CountriesArray['VU'] = _('Vanuatu');
+$CountriesArray['WS'] = _('Samoa');
+$CountriesArray['YE'] = _('Yemen');
+$CountriesArray['ZM'] = _('Zambia');
+$CountriesArray['ZW'] = _('Zimbabwe');
 
 asort($CountriesArray);
-?>
+?>
\ No newline at end of file

Modified: trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
===================================================================
--- trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot	2013-05-24 22:47:01 UTC (rev 5983)
+++ trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot	2013-05-24 23:08:09 UTC (rev 5984)
@@ -8,15 +8,15 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-25 21:56+1300\n"
+"POT-Creation-Date: 2013-05-25 11:02+1200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: AccountGroups.php:7 includes/MainMenuLinksArray.php:356
+#: AccountGroups.php:7 includes/MainMenuLinksArray.php:358
 msgid "Account Groups"
 msgstr ""
 
@@ -139,12 +139,12 @@
 
 #: AccountGroups.php:212 AccountGroups.php:247 AccountSections.php:133
 #: Areas.php:115 Areas.php:124 BankAccounts.php:159 CreditStatus.php:125
-#: Currencies.php:167 Currencies.php:175 Currencies.php:183
+#: Currencies.php:155 Currencies.php:163 Currencies.php:171
 #: CustomerBranches.php:290 CustomerBranches.php:300 CustomerBranches.php:310
 #: CustomerBranches.php:320 Customers.php:294 Customers.php:303
 #: Customers.php:311 Customers.php:319 CustomerTypes.php:147
 #: CustomerTypes.php:157 Departments.php:141 Factors.php:134
-#: FixedAssetCategories.php:137 GLAccounts.php:83 GLAccounts.php:99
+#: FixedAssetCategories.php:137 GLAccounts.php:80 GLAccounts.php:96
 #: Locations.php:249 Locations.php:257 Locations.php:268 Locations.php:277
 #: Locations.php:286 Locations.php:295 Locations.php:304 Locations.php:313
 #: Locations.php:321 MRPDemandTypes.php:87 PaymentMethods.php:142
@@ -153,10 +153,11 @@
 #: SalesPeople.php:157 SalesPeople.php:163 SalesTypes.php:140
 #: SalesTypes.php:150 Shippers.php:81 Shippers.php:93 StockCategories.php:188
 #: Stocks.php:672 Stocks.php:681 Stocks.php:689 Stocks.php:697 Stocks.php:705
-#: Stocks.php:713 Suppliers.php:625 Suppliers.php:634 Suppliers.php:642
-#: SupplierTypes.php:145 TaxCategories.php:131 TaxGroups.php:132
-#: TaxGroups.php:140 TaxProvinces.php:129 UnitsOfMeasure.php:135
-#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:83
+#: Stocks.php:713 Stocks.php:721 Stocks.php:729 Suppliers.php:625
+#: Suppliers.php:634 Suppliers.php:642 SupplierTypes.php:145
+#: TaxCategories.php:131 TaxGroups.php:132 TaxGroups.php:140
+#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WorkCentres.php:89
+#: WorkCentres.php:95 WWW_Access.php:83
 msgid "There are"
 msgstr ""
 
@@ -208,18 +209,18 @@
 #: AddCustomerContacts.php:27 AddCustomerNotes.php:101
 #: AddCustomerTypeNotes.php:94 AgedDebtors.php:448 AgedSuppliers.php:276
 #: Areas.php:144 AuditTrail.php:11 BankReconciliation.php:17
-#: BOMExtendedQty.php:250 BOMIndented.php:246 BOMIndentedReverse.php:235
-#: BOMInquiry.php:187 BOMListing.php:109 BOMs.php:231 BOMs.php:858
+#: BOMExtendedQty.php:252 BOMIndented.php:246 BOMIndentedReverse.php:235
+#: BOMInquiry.php:187 BOMListing.php:109 BOMs.php:231 BOMs.php:860
 #: COGSGLPostings.php:19 CompanyPreferences.php:155 CounterReturns.php:1607
-#: CounterSales.php:2074 CounterSales.php:2199 Credit_Invoice.php:270
-#: CreditStatus.php:21 Currencies.php:29 CustEDISetup.php:17
+#: CounterSales.php:2085 CounterSales.php:2210 Credit_Invoice.php:270
+#: CreditStatus.php:21 Currencies.php:31 CustEDISetup.php:17
 #: DailyBankTransactions.php:15 DebtorsAtPeriodEnd.php:129
 #: DiscountCategories.php:12 DiscountCategories.php:136 DiscountMatrix.php:16
 #: EDIMessageFormat.php:105 FixedAssetLocations.php:13
 #: FixedAssetRegister.php:13 FixedAssetRegister.php:253
 #: FixedAssetTransfer.php:14 FormDesigner.php:129 GLBalanceSheet.php:382
 #: GLBudgets.php:32 GLJournalInquiry.php:11 GLJournal.php:250
-#: InternalStockRequest.php:299 InventoryPlanning.php:379
+#: InternalStockRequest.php:308 InventoryPlanning.php:379
 #: InventoryPlanningPrefSupplier.php:469 MRPReport.php:516 NoSalesItems.php:89
 #: PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
 #: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PDFPickingList.php:28
@@ -241,9 +242,9 @@
 #: StockSerialItemResearch.php:30 SupplierPriceList.php:15
 #: SupplierPriceList.php:217 SupplierPriceList.php:387
 #: SupplierPriceList.php:391 SupplierPriceList.php:442
-#: SupplierPriceList.php:492 Suppliers.php:305 SupplierTenderCreate.php:522
-#: SupplierTenderCreate.php:628 SupplierTenders.php:322
-#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TaxGroups.php:15
+#: SupplierPriceList.php:492 Suppliers.php:305 SupplierTenderCreate.php:546
+#: SupplierTenderCreate.php:652 SupplierTenders.php:323
+#: SupplierTenders.php:389 SupplierTransInquiry.php:10 TaxGroups.php:15
 #: TaxProvinces.php:11 TopItems.php:114 UnitsOfMeasure.php:10
 #: WhereUsedInquiry.php:18 WorkCentres.php:111 WorkCentres.php:162
 #: WorkOrderCosting.php:22 WorkOrderEntry.php:11 WorkOrderIssue.php:22
@@ -271,14 +272,15 @@
 msgstr ""
 
 #: AccountGroups.php:306 AccountGroups.php:309 AccountGroups.php:444
-#: AccountGroups.php:446 BOMs.php:124 BOMs.php:772 BOMs.php:774
+#: AccountGroups.php:446 BOMs.php:124 BOMs.php:774 BOMs.php:776
 #: CompanyPreferences.php:479 CompanyPreferences.php:481
 #: CompanyPreferences.php:494 CompanyPreferences.php:496
 #: CompanyPreferences.php:509 CompanyPreferences.php:511
-#: ContractCosting.php:198 CustomerBranches.php:414 Customers.php:601
+#: ContractCosting.php:198 Currencies.php:241 Currencies.php:407
+#: Currencies.php:409 CustomerBranches.php:414 Customers.php:601
 #: Customers.php:969 Customers.php:975 Customers.php:978
-#: DailyBankTransactions.php:145 DeliveryDetails.php:1116
-#: DeliveryDetails.php:1159 DeliveryDetails.php:1162 GLTransInquiry.php:69
+#: DailyBankTransactions.php:145 DeliveryDetails.php:1125
+#: DeliveryDetails.php:1168 DeliveryDetails.php:1171 GLTransInquiry.php:69
 #: Labels.php:591 Labels.php:593 Labels.php:618 Locations.php:617
 #: Locations.php:619 MRPCalendar.php:224 MRP.php:540 MRP.php:544 MRP.php:548
 #: MRP.php:552 PaymentMethods.php:204 PaymentMethods.php:205
@@ -287,7 +289,7 @@
 #: PcAuthorizeExpenses.php:246 PDFChequeListing.php:65
 #: PDFDeliveryDifferences.php:76 PDFDIFOT.php:76
 #: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:777 PO_PDFPurchOrder.php:394 PO_PDFPurchOrder.php:397
+#: PO_Header.php:777 PO_PDFPurchOrder.php:403 PO_PDFPurchOrder.php:406
 #: PurchData.php:291 PurchData.php:662 PurchData.php:665
 #: RecurringSalesOrders.php:493 RecurringSalesOrders.php:496
 #: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
@@ -295,15 +297,16 @@
 #: SalesAnalRepts.php:448 SalesAnalRepts.php:451 SalesAnalRepts.php:476
 #: SalesAnalRepts.php:479 SalesPeople.php:219 SalesPeople.php:356
 #: SalesPeople.php:358 SelectProduct.php:397 ShipmentCosting.php:667
-#: Stocks.php:1078 Stocks.php:1080 Stocks.php:1103 Stocks.php:1105
-#: SuppContractChgs.php:90 SystemParameters.php:408 SystemParameters.php:431
-#: SystemParameters.php:447 SystemParameters.php:519 SystemParameters.php:527
-#: SystemParameters.php:567 SystemParameters.php:647 SystemParameters.php:656
-#: SystemParameters.php:664 SystemParameters.php:682 SystemParameters.php:689
-#: SystemParameters.php:733 SystemParameters.php:829 SystemParameters.php:964
-#: SystemParameters.php:966 SystemParameters.php:976 SystemParameters.php:978
-#: SystemParameters.php:1032 SystemParameters.php:1044
-#: SystemParameters.php:1046 TaxGroups.php:311 TaxGroups.php:314
+#: Stocks.php:1096 Stocks.php:1098 Stocks.php:1121 Stocks.php:1123
+#: SuppContractChgs.php:90 SystemParameters.php:415 SystemParameters.php:438
+#: SystemParameters.php:454 SystemParameters.php:526 SystemParameters.php:534
+#: SystemParameters.php:574 SystemParameters.php:654 SystemParameters.php:663
+#: SystemParameters.php:671 SystemParameters.php:689 SystemParameters.php:696
+#: SystemParameters.php:740 SystemParameters.php:836 SystemParameters.php:971
+#: SystemParameters.php:973 SystemParameters.php:983 SystemParameters.php:985
+#: SystemParameters.php:1039 SystemParameters.php:1051
+#: SystemParameters.php:1053 SystemParameters.php:1091
+#: SystemParameters.php:1093 TaxGroups.php:311 TaxGroups.php:314
 #: TaxGroups.php:371 WWW_Users.php:493 WWW_Users.php:495 WWW_Users.php:666
 #: WWW_Users.php:668
 msgid "Yes"
@@ -311,14 +314,15 @@
 
 #: AccountGroups.php:312 AccountGroups.php:449 AccountGroups.php:451
 #: BankAccounts.php:210 BankAccounts.php:379 BankAccounts.php:381
-#: BankAccounts.php:385 BankAccounts.php:393 BOMs.php:126 BOMs.php:771
-#: BOMs.php:775 CompanyPreferences.php:478 CompanyPreferences.php:482
+#: BankAccounts.php:385 BankAccounts.php:393 BOMs.php:126 BOMs.php:773
+#: BOMs.php:777 CompanyPreferences.php:478 CompanyPreferences.php:482
 #: CompanyPreferences.php:493 CompanyPreferences.php:497
 #: CompanyPreferences.php:508 CompanyPreferences.php:512
-#: ContractCosting.php:196 CustomerBranches.php:414 Customers.php:600
+#: ContractCosting.php:196 Currencies.php:243 Currencies.php:412
+#: Currencies.php:414 CustomerBranches.php:414 Customers.php:600
 #: Customers.php:967 Customers.php:974 Customers.php:977
-#: DailyBankTransactions.php:147 DeliveryDetails.php:1117
-#: DeliveryDetails.php:1160 DeliveryDetails.php:1163 GLTransInquiry.php:90
+#: DailyBankTransactions.php:147 DeliveryDetails.php:1126
+#: DeliveryDetails.php:1169 DeliveryDetails.php:1172 GLTransInquiry.php:90
 #: Labels.php:590 Labels.php:594 Labels.php:619 Locations.php:622
 #: Locations.php:624 MRPCalendar.php:226 MRP.php:538 MRP.php:542 MRP.php:546
 #: MRP.php:550 NoSalesItems.php:184 PaymentMethods.php:204
@@ -327,7 +331,7 @@
 #: PaymentMethods.php:295 PcAuthorizeExpenses.php:244 PDFChequeListing.php:64
 #: PDFDeliveryDifferences.php:75 PDFDIFOT.php:75
 #: PO_AuthorisationLevels.php:136 PO_AuthorisationLevels.php:141
-#: PO_Header.php:776 PO_PDFPurchOrder.php:395 PO_PDFPurchOrder.php:398
+#: PO_Header.php:776 PO_PDFPurchOrder.php:404 PO_PDFPurchOrder.php:407
 #: PurchData.php:294 PurchData.php:663 PurchData.php:666
 #: RecurringSalesOrders.php:492 RecurringSalesOrders.php:495
 #: SalesAnalReptCols.php:282 SalesAnalReptCols.php:420
@@ -335,15 +339,16 @@
 #: SalesAnalRepts.php:447 SalesAnalRepts.php:450 SalesAnalRepts.php:475
 #: SalesAnalRepts.php:478 SalesPeople.php:221 SalesPeople.php:361
 #: SalesPeople.php:363 SelectProduct.php:399 ShipmentCosting.php:668
-#: Stocks.php:1073 Stocks.php:1075 Stocks.php:1098 Stocks.php:1100
-#: SuppContractChgs.php:92 SystemParameters.php:409 SystemParameters.php:432
-#: SystemParameters.php:448 SystemParameters.php:520 SystemParameters.php:528
-#: SystemParameters.php:568 SystemParameters.php:648 SystemParameters.php:657
-#: SystemParameters.php:665 SystemParameters.php:683 SystemParameters.php:690
-#: SystemParameters.php:734 SystemParameters.php:830 SystemParameters.php:963
-#: SystemParameters.php:967 SystemParameters.php:975 SystemParameters.php:979
-#: SystemParameters.php:1033 SystemParameters.php:1043
-#: SystemParameters.php:1047 TaxGroups.php:312 TaxGroups.php:315
+#: Stocks.php:1091 Stocks.php:1093 Stocks.php:1116 Stocks.php:1118
+#: SuppContractChgs.php:92 SystemParameters.php:416 SystemParameters.php:439
+#: SystemParameters.php:455 SystemParameters.php:527 SystemParameters.php:535
+#: SystemParameters.php:575 SystemParameters.php:655 SystemParameters.php:664
+#: SystemParameters.php:672 SystemParameters.php:690 SystemParameters.php:697
+#: SystemParameters.php:741 SystemParameters.php:837 SystemParameters.php:970
+#: SystemParameters.php:974 SystemParameters.php:982 SystemParameters.php:986
+#: SystemParameters.php:1040 SystemParameters.php:1050
+#: SystemParameters.php:1054 SystemParameters.php:1090
+#: SystemParameters.php:1094 TaxGroups.php:312 TaxGroups.php:315
 #: TaxGroups.php:373 WWW_Users.php:492 WWW_Users.php:496 WWW_Users.php:665
 #: WWW_Users.php:669 includes/PDFLowGPPageHeader.inc:44
 #: includes/PDFTaxPageHeader.inc:35
@@ -352,24 +357,24 @@
 
 #: AccountGroups.php:321 AccountSections.php:192 AddCustomerContacts.php:148
 #: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
-#: BankAccounts.php:223 BOMs.php:151 COGSGLPostings.php:109
-#: COGSGLPostings.php:207 CreditStatus.php:175 Currencies.php:276
+#: BankAccounts.php:223 BOMs.php:151 COGSGLPostings.php:112
+#: COGSGLPostings.php:216 CreditStatus.php:175 Currencies.php:273
 #: CustomerBranches.php:418 Customers.php:1052 Customers.php:1086
 #: CustomerTypes.php:206 Departments.php:186 EDIMessageFormat.php:150
 #: Factors.php:334 FixedAssetCategories.php:190 FixedAssetLocations.php:111
-#: FreightCosts.php:242 GeocodeSetup.php:173 GLAccounts.php:319 GLTags.php:96
-#: InternalStockRequest.php:281 Labels.php:323 Labels.php:348
-#: Locations.php:403 MRPDemands.php:309 MRPDemandTypes.php:120
-#: PaymentMethods.php:208 PaymentTerms.php:205 PcAssignCashToTab.php:276
-#: PcClaimExpensesFromTab.php:268 PcExpenses.php:226 PcTabs.php:236
-#: PcTypeTabs.php:177 PO_AuthorisationLevels.php:151 Prices_Customer.php:278
-#: Prices.php:250 PurchData.php:307 SalesCategories.php:256
-#: SalesGLPostings.php:134 SalesGLPostings.php:247 SalesPeople.php:232
-#: SalesTypes.php:206 SecurityTokens.php:130 SelectCustomer.php:621
-#: SelectCustomer.php:640 SelectCustomer.php:670 SelectCustomer.php:688
-#: SelectCustomer.php:712 SelectCustomer.php:729 SellThroughSupport.php:298
-#: Shippers.php:144 StockCategories.php:264 SupplierContacts.php:165
-#: SupplierTenderCreate.php:145 SupplierTypes.php:189
+#: FreightCosts.php:242 GeocodeSetup.php:173 GLAccounts.php:316 GLTags.php:96
+#: InternalStockRequest.php:290 Labels.php:323 Labels.php:348
+#: Locations.php:403 MailingGroupMaintenance.php:178 MRPDemands.php:309
+#: MRPDemandTypes.php:120 PaymentMethods.php:208 PaymentTerms.php:205
+#: PcAssignCashToTab.php:276 PcClaimExpensesFromTab.php:268 PcExpenses.php:226
+#: PcTabs.php:236 PcTypeTabs.php:177 PO_AuthorisationLevels.php:151
+#: Prices_Customer.php:278 Prices.php:250 PurchData.php:307
+#: SalesCategories.php:256 SalesGLPostings.php:137 SalesGLPostings.php:253
+#: SalesPeople.php:232 SalesTypes.php:206 SecurityTokens.php:130
+#: SelectCustomer.php:621 SelectCustomer.php:640 SelectCustomer.php:670
+#: SelectCustomer.php:688 SelectCustomer.php:712 SelectCustomer.php:729
+#: SellThroughSupport.php:298 Shippers.php:144 StockCategories.php:264
+#: SupplierContacts.php:165 SupplierTenderCreate.php:155 SupplierTypes.php:189
 #: SuppTransGLAnalysis.php:125 TaxAuthorities.php:174 TaxCategories.php:182
 #: TaxGroups.php:188 TaxProvinces.php:180 UnitsOfMeasure.php:185
 #: WorkCentres.php:141 WWW_Access.php:123 WWW_Users.php:332
@@ -384,32 +389,33 @@
 
 #: AccountGroups.php:322 AccountSections.php:196 AddCustomerContacts.php:149
 #: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
-#: BankAccounts.php:224 BOMs.php:153 COGSGLPostings.php:110
-#: COGSGLPostings.php:208 ContractBOM.php:272 ContractOtherReqts.php:124
+#: BankAccounts.php:224 BOMs.php:153 COGSGLPostings.php:113
+#: COGSGLPostings.php:217 ContractBOM.php:272 ContractOtherReqts.php:124
 #: CounterReturns.php:740 CounterSales.php:832 Credit_Invoice.php:408
-#: CreditStatus.php:176 Currencies.php:279 CustomerReceipt.php:936
+#: CreditStatus.php:176 Currencies.php:276 CustomerReceipt.php:938
 #: Customers.php:1087 CustomerTypes.php:207 Departments.php:187
 #: DiscountCategories.php:225 DiscountMatrix.php:183 EDIMessageFormat.php:151
 #: FixedAssetCategories.php:191 FreightCosts.php:243 GeocodeSetup.php:174
-#: GLAccounts.php:320 GLJournal.php:429 GLTags.php:97
-#: InternalStockCategoriesByRole.php:184 InternalStockRequest.php:282
+#: GLAccounts.php:317 GLJournal.php:429 GLTags.php:97
+#: InternalStockCategoriesByRole.php:184 InternalStockRequest.php:291
 #: Labels.php:324 Labels.php:349 Labels.php:597 Locations.php:404
-#: MRPDemands.php:310 MRPDemandTypes.php:121 PaymentMethods.php:209
-#: Payments.php:1095 PaymentTerms.php:206 PcAssignCashToTab.php:280
-#: PcClaimExpensesFromTab.php:269 PcExpenses.php:227 PcExpensesTypeTab.php:187
-#: PcTabs.php:237 PcTypeTabs.php:178 PO_AuthorisationLevels.php:153
-#: PO_Items.php:757 Prices_Customer.php:279 Prices.php:251 PurchData.php:309
-#: PurchData.php:716 SalesAnalReptCols.php:299 SalesAnalRepts.php:307
-#: SalesCategories.php:257 SalesGLPostings.php:135 SalesGLPostings.php:248
-#: SalesPeople.php:233 SalesTypes.php:207 SecurityTokens.php:131
-#: SelectCreditItems.php:779 SelectCustomer.php:622 SelectCustomer.php:641
-#: SelectCustomer.php:671 SelectCustomer.php:689 SelectCustomer.php:713
-#: SelectCustomer.php:730 SelectOrderItems.php:1445 SellThroughSupport.php:299
-#: Shipments.php:440 Shippers.php:145 SpecialOrder.php:667
-#: StockCategories.php:265 StockCategories.php:587 StockLocTransfer.php:332
-#: SuppContractChgs.php:99 SuppCreditGRNs.php:112 SuppFixedAssetChgs.php:90
-#: SuppInvGRNs.php:147 SupplierContacts.php:166 SupplierTenderCreate.php:401
-#: SupplierTenderCreate.php:429 SupplierTypes.php:191 SuppShiptChgs.php:90
+#: MailingGroupMaintenance.php:179 MRPDemands.php:310 MRPDemandTypes.php:121
+#: PaymentMethods.php:209 Payments.php:1095 PaymentTerms.php:206
+#: PcAssignCashToTab.php:280 PcClaimExpensesFromTab.php:269 PcExpenses.php:227
+#: PcExpensesTypeTab.php:187 PcTabs.php:237 PcTypeTabs.php:178
+#: PO_AuthorisationLevels.php:153 PO_Items.php:764 Prices_Customer.php:279
+#: Prices.php:251 PurchData.php:309 PurchData.php:716
+#: SalesAnalReptCols.php:299 SalesAnalRepts.php:307 SalesCategories.php:257
+#: SalesGLPostings.php:138 SalesGLPostings.php:254 SalesPeople.php:233
+#: SalesTypes.php:207 SecurityTokens.php:131 SelectCreditItems.php:779
+#: SelectCustomer.php:622 SelectCustomer.php:641 SelectCustomer.php:671
+#: SelectCustomer.php:689 SelectCustomer.php:713 SelectCustomer.php:730
+#: SelectOrderItems.php:1445 SellThroughSupport.php:299 Shipments.php:440
+#: Shippers.php:145 SpecialOrder.php:667 StockCategories.php:265
+#: StockCategories.php:587 StockLocTransfer.php:332 SuppContractChgs.php:99
+#: SuppCreditGRNs.php:112 SuppFixedAssetChgs.php:90 SuppInvGRNs.php:147
+#: SupplierContacts.php:166 SupplierTenderCreate.php:417
+#: SupplierTenderCreate.php:445 SupplierTypes.php:191 SuppShiptChgs.php:90
 #: SuppTransGLAnalysis.php:126 TaxAuthorities.php:175 TaxCategories.php:183
 #: TaxGroups.php:189 TaxProvinces.php:181 UnitsOfMeasure.php:186
 #: WorkCentres.php:142 WOSerialNos.php:323 WWW_Access.php:124
@@ -453,15 +459,15 @@
 
 #: AccountGroups.php:461 AccountSections.php:262 AddCustomerContacts.php:260
 #: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
-#: BankAccounts.php:399 BOMs.php:785 COGSGLPostings.php:356
-#: CreditStatus.php:259 Currencies.php:407 CustLoginSetup.php:273
+#: BankAccounts.php:399 BOMs.php:787 COGSGLPostings.php:365
+#: CreditStatus.php:259 Currencies.php:422 CustLoginSetup.php:273
 #: Departments.php:258 DiscountMatrix.php:142 EDIMessageFormat.php:248
 #: FixedAssetCategories.php:350 FixedAssetLocations.php:161
-#: FreightCosts.php:342 GeocodeSetup.php:271 GLAccounts.php:269 Labels.php:631
+#: FreightCosts.php:342 GeocodeSetup.php:271 GLAccounts.php:266 Labels.php:631
 #: Locations.php:635 MRPDemands.php:424 MRPDemandTypes.php:188
 #: OffersReceived.php:57 OffersReceived.php:146 PaymentMethods.php:300
 #: PaymentTerms.php:310 PO_AuthorisationLevels.php:262 Prices_Customer.php:361
-#: SalesAnalReptCols.php:552 SalesAnalRepts.php:519 SalesGLPostings.php:419
+#: SalesAnalReptCols.php:552 SalesAnalRepts.php:519 SalesGLPostings.php:425
 #: SalesPeople.php:370 Shippers.php:203 StockCategories.php:614
 #: SupplierContacts.php:284 SuppLoginSetup.php:295 TaxAuthorities.php:329
 #: TaxCategories.php:238 TaxProvinces.php:235 UnitsOfMeasure.php:241
@@ -469,7 +475,7 @@
 msgid "Enter Information"
 msgstr ""
 
-#: AccountSections.php:7 includes/MainMenuLinksArray.php:357
+#: AccountSections.php:7 includes/MainMenuLinksArray.php:359
 msgid "Account Sections"
 msgstr ""
 
@@ -561,10 +567,10 @@
 
 #: AddCustomerContacts.php:59 AddCustomerNotes.php:51
 #: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:69
-#: DeliveryDetails.php:781 DeliveryDetails.php:798 Factors.php:105
+#: DeliveryDetails.php:790 DeliveryDetails.php:807 Factors.php:105
 #: FixedAssetItems.php:250 MRPCalendar.php:176 PcAssignCashToTab.php:91
 #: PcClaimExpensesFromTab.php:82 PcExpenses.php:98 PcTabs.php:104
-#: PcTypeTabs.php:63 PO_Items.php:374 SalesAnalReptCols.php:129
+#: PcTypeTabs.php:63 PO_Items.php:379 SalesAnalReptCols.php:129
 #: SalesPeople.php:97 SalesTypes.php:66 Stocks.php:527 Suppliers.php:520
 #: SupplierTypes.php:67
 msgid "has been updated"
@@ -601,10 +607,10 @@
 #: CustomerBranches.php:377 CustomerBranches.php:797 CustomerInquiry.php:261
 #: Customers.php:1042 Customers.php:1050 EmailCustTrans.php:15
 #: EmailCustTrans.php:64 Factors.php:246 Factors.php:297 Locations.php:587
-#: OrderDetails.php:115 PDFRemittanceAdvice.php:251 PO_PDFPurchOrder.php:381
-#: PO_PDFPurchOrder.php:384 PrintCustTrans.php:717 PrintCustTrans.php:948
-#: PrintCustTrans.php:997 PrintCustTransPortrait.php:764
-#: PrintCustTransPortrait.php:1010 PrintCustTransPortrait.php:1066
+#: OrderDetails.php:115 PDFRemittanceAdvice.php:251 PO_PDFPurchOrder.php:390
+#: PO_PDFPurchOrder.php:393 PrintCustTrans.php:721 PrintCustTrans.php:952
+#: PrintCustTrans.php:1001 PrintCustTransPortrait.php:768
+#: PrintCustTransPortrait.php:1014 PrintCustTransPortrait.php:1070
 #: SelectCustomer.php:427 SelectCustomer.php:619 SelectSupplier.php:281
 #: SupplierContacts.php:156 SupplierContacts.php:277 UserSettings.php:186
 #: WWW_Users.php:288 includes/PDFPickingListHeader.inc:25
@@ -618,7 +624,7 @@
 #: Customers.php:1051 PcAssignCashToTab.php:241 PcAssignCashToTab.php:372
 #: PcAuthorizeExpenses.php:95 PcClaimExpensesFromTab.php:230
 #: PcClaimExpensesFromTab.php:389 PcReportTab.php:327 SelectCustomer.php:620
-#: SystemParameters.php:345 WOSerialNos.php:294 WOSerialNos.php:300
+#: SystemParameters.php:352 WOSerialNos.php:294 WOSerialNos.php:300
 msgid "Notes"
 msgstr ""
 
@@ -642,7 +648,7 @@
 #: AddCustomerContacts.php:232 Contracts.php:778 PDFRemittanceAdvice.php:247
 #: PO_Header.php:992 PO_Header.php:1072 SelectCreditItems.php:245
 #: SelectCustomer.php:425 SelectOrderItems.php:646
-#: SupplierTenderCreate.php:374 includes/PDFStatementPageHeader.inc:63
+#: SupplierTenderCreate.php:390 includes/PDFStatementPageHeader.inc:63
 #: includes/PDFTransPageHeader.inc:81
 #: includes/PDFTransPageHeaderPortrait.inc:105
 msgid "Phone"
@@ -690,7 +696,7 @@
 #: GLAccountReport.php:343 GLTransInquiry.php:42 MRPCalendar.php:219
 #: PaymentAllocations.php:66 PcAssignCashToTab.php:237
 #: PcAuthorizeExpenses.php:91 PDFRemittanceAdvice.php:308
-#: PrintCustTrans.php:825 PrintCustTransPortrait.php:878 ReverseGRN.php:392
+#: PrintCustTrans.php:829 PrintCustTransPortrait.php:882 ReverseGRN.php:392
 #: SelectCustomer.php:666 SelectCustomer.php:708 ShipmentCosting.php:538
 #: ShipmentCosting.php:615 Shipments.php:491 StockDispatch.php:277
 #: StockDispatch.php:288 StockDispatch.php:299 StockLocMovements.php:91
@@ -706,7 +712,7 @@
 msgstr ""
 
 #: AddCustomerNotes.php:118 AddCustomerTypeNotes.php:112 PcReportTab.php:172
-#: SelectCustomer.php:667 SelectCustomer.php:709 Stocks.php:1082
+#: SelectCustomer.php:667 SelectCustomer.php:709 Stocks.php:1100
 #: UpgradeDatabase.php:227 UpgradeDatabase.php:230 UpgradeDatabase.php:233
 #: UpgradeDatabase.php:236 UpgradeDatabase.php:239 UpgradeDatabase.php:242
 #: UpgradeDatabase.php:245 UpgradeDatabase.php:248 UpgradeDatabase.php:251
@@ -810,23 +816,25 @@
 #: BOMIndentedReverse.php:140 BOMListing.php:41 BOMListing.php:52
 #: DebtorsAtPeriodEnd.php:57 DebtorsAtPeriodEnd.php:69 GLBalanceSheet.php:105
 #: GLBalanceSheet.php:144 GLProfit_Loss.php:181 GLTagProfit_Loss.php:194
-#: GLTrialBalance.php:160 InternalStockRequest.php:308
+#: GLTrialBalance.php:160 InternalStockRequest.php:317
 #: InventoryPlanning.php:101 InventoryPlanning.php:176
 #: InventoryPlanning.php:211 InventoryPlanning.php:259
 #: InventoryPlanning.php:299 InventoryPlanningPrefSupplier.php:201
 #: InventoryPlanningPrefSupplier.php:269 InventoryPlanningPrefSupplier.php:303
 #: InventoryPlanningPrefSupplier.php:348 InventoryPlanningPrefSupplier.php:396
 #: InventoryQuantities.php:84 InventoryValuation.php:78
-#: MailInventoryValuation.php:114 MRPPlannedPurchaseOrders.php:114
-#: MRPPlannedWorkOrders.php:106 MRPReport.php:147 MRPReport.php:508
-#: MRPReschedules.php:45 MRPReschedules.php:57 MRPShortages.php:155
-#: MRPShortages.php:167 OutstandingGRNs.php:46 OutstandingGRNs.php:59
-#: PDFCustomerList.php:20 PDFCustomerList.php:232 PDFCustomerList.php:244
-#: PDFLowGP.php:20 PDFSellThroughSupportClaim.php:17
-#: PDFStockCheckComparison.php:33 PDFStockCheckComparison.php:59
-#: PDFStockCheckComparison.php:264 ReorderLevel.php:60 SelectAsset.php:39
-#: SelectProduct.php:43 StockCheck.php:65 StockCheck.php:139
-#: SupplierTenderCreate.php:635 SupplierTenders.php:397 SuppPriceList.php:138
+#: MailInventoryValuation.php:21 MailInventoryValuation.php:120
+#: MailSalesReport_csv.php:30 MailSalesReport.php:23
+#: MRPPlannedPurchaseOrders.php:114 MRPPlannedWorkOrders.php:106
+#: MRPReport.php:147 MRPReport.php:508 MRPReschedules.php:45
+#: MRPReschedules.php:57 MRPShortages.php:155 MRPShortages.php:167
+#: OutstandingGRNs.php:46 OutstandingGRNs.php:59 PDFCustomerList.php:20
+#: PDFCustomerList.php:232 PDFCustomerList.php:244 PDFLowGP.php:20
+#: PDFSellThroughSupportClaim.php:17 PDFStockCheckComparison.php:33
+#: PDFStockCheckComparison.php:59 PDFStockCheckComparison.php:264
+#: ReorderLevel.php:60 SelectAsset.php:39 SelectProduct.php:43
+#: StockCheck.php:65 StockCheck.php:139 SupplierTenderCreate.php:659
+#: SupplierTenders.php:398 SuppPriceList.php:138
 #: includes/PDFPaymentRun_PymtFooter.php:152
 msgid "Problem Report"
 msgstr ""
@@ -838,7 +846,7 @@
 
 #: AgedDebtors.php:267 AgedDebtors.php:366 AgedDebtors.php:431
 #: AgedSuppliers.php:111 AgedSuppliers.php:198 BOMExtendedQty.php:157
-#: BOMExtendedQty.php:238 BOMIndented.php:153 BOMIndented.php:234
+#: BOMExtendedQty.php:240 BOMIndented.php:153 BOMIndented.php:234
 #: BOMIndentedReverse.php:144 BOMIndentedReverse.php:221 BOMListing.php:44
 #: Credit_Invoice.php:195 DebtorsAtPeriodEnd.php:60 DebtorsAtPeriodEnd.php:72
 #: FTP_RadioBeacon.php:187 GetStockImage.php:150 GLBalanceSheet.php:109
@@ -852,8 +860,9 @@
 #: InventoryPlanningPrefSupplier.php:351 InventoryPlanningPrefSupplier.php:399
 #: InventoryPlanningPrefSupplier.php:455 InventoryQuantities.php:87
 #: InventoryQuantities.php:98 InventoryValuation.php:81
-#: InventoryValuation.php:92 MailInventoryValuation.php:117
-#: MailInventoryValuation.php:213 MRPPlannedPurchaseOrders.php:117
+#: InventoryValuation.php:92 MailInventoryValuation.php:123
+#: MailInventoryValuation.php:219 MailInventoryValuation.php:243
+#: MailInventoryValuation.php:251 MRPPlannedPurchaseOrders.php:117
 #: MRPPlannedPurchaseOrders.php:128 MRPPlannedWorkOrders.php:109
 #: MRPPlannedWorkOrders.php:120 MRPPlannedWorkOrders.php:311 MRPReport.php:39
 #: MRPReport.php:50 MRPReport.php:150 MRPReschedules.php:48
@@ -894,17 +903,17 @@
 msgstr ""
 
 #: AgedDebtors.php:365 AgedSuppliers.php:197 GLAccountCSV.php:174
-#: GLAccountInquiry.php:169 GLAccountReport.php:97 PO_Items.php:442
-#: PO_Items.php:570 PO_Items.php:595 SalesAnalReptCols.php:365
-#: SpecialOrder.php:449 StockLocTransferReceive.php:382
+#: GLAccountInquiry.php:169 GLAccountReport.php:97 PO_Items.php:448
+#: PO_Items.php:577 PO_Items.php:602 SalesAnalReptCols.php:365
+#: SpecialOrder.php:449 StockLocTransferReceive.php:390
 #: StockQuantityByDate.php:123 includes/SelectOrderItems_IntoCart.inc:55
 msgid "could not be retrieved because"
 msgstr ""
 
 #: AgedDebtors.php:368 AgedSuppliers.php:200 Areas.php:94
 #: ConfirmDispatch_Invoice.php:167 ConfirmDispatch_Invoice.php:988
-#: ConfirmDispatch_Invoice.php:1002 Contracts.php:585 CounterReturns.php:1012
-#: CounterReturns.php:1026 CounterSales.php:1413 CounterSales.php:1427
+#: ConfirmDispatch_Invoice.php:1002 Contracts.php:592 CounterReturns.php:1012
+#: CounterReturns.php:1026 CounterSales.php:1424 CounterSales.php:1438
 #: Credit_Invoice.php:729 Credit_Invoice.php:750 CustomerReceipt.php:556
 #: CustomerReceipt.php:695 CustomerReceipt.php:723 CustomerTransInquiry.php:97
 #: DeliveryDetails.php:398 GLProfit_Loss.php:601 GLTagProfit_Loss.php:515
@@ -913,7 +922,7 @@
 #: ReverseGRN.php:191 ReverseGRN.php:205 ReverseGRN.php:379
 #: SelectCreditItems.php:1441 SelectSalesOrder.php:208
 #: SelectSalesOrder.php:372 SellThroughSupport.php:81
-#: SellThroughSupport.php:97 SMTPServer.php:64 StockCheck.php:224
+#: SellThroughSupport.php:97 SMTPServer.php:62 StockCheck.php:224
 #: StockCostUpdate.php:78 StockCostUpdate.php:88 StockLocStatus.php:164
 #: StockMovements.php:91 StockQuantityByDate.php:97 StockReorderLevel.php:41
 #: StockStatus.php:310 StockTransfers.php:203 StockUsageGraph.php:53
@@ -990,16 +999,16 @@
 msgid "Detailed Report"
 msgstr ""
 
-#: AgedDebtors.php:515 AgedSuppliers.php:327 BOMExtendedQty.php:283
+#: AgedDebtors.php:515 AgedSuppliers.php:327 BOMExtendedQty.php:285
 #: BOMIndented.php:275 BOMIndentedReverse.php:254 BOMListing.php:130
 #: DebtorsAtPeriodEnd.php:168 InventoryPlanning.php:451
 #: InventoryPlanningPrefSupplier.php:519 InventoryQuantities.php:210
 #: InventoryValuation.php:269 MRPPlannedPurchaseOrders.php:282
 #: MRPPlannedWorkOrders.php:341 MRPReschedules.php:153 MRPShortages.php:303
 #: OutstandingGRNs.php:277 PDFCustomerList.php:421 PDFLowGP.php:146
-#: PDFPriceList.php:312 PDFRemittanceAdvice.php:175
-#: PDFStockCheckComparison.php:361 PrintCustTrans.php:541
-#: PrintCustTransPortrait.php:587 ReorderLevel.php:259 StockDispatch.php:446
+#: PDFPriceList.php:313 PDFRemittanceAdvice.php:175
+#: PDFStockCheckComparison.php:361 PrintCustTrans.php:545
+#: PrintCustTransPortrait.php:591 ReorderLevel.php:259 StockDispatch.php:446
 #: SupplierBalsAtPeriodEnd.php:160 SuppPriceList.php:263 Tax.php:352
 msgid "Print PDF"
 msgstr ""
@@ -1119,7 +1128,7 @@
 msgstr ""
 
 #: Areas.php:131 CustomerTypes.php:168 Factors.php:140
-#: FixedAssetCategories.php:142 GLAccounts.php:200
+#: FixedAssetCategories.php:142 GLAccounts.php:197
 #: InternalStockCategoriesByRole.php:102 Locations.php:349 MRPDemands.php:250
 #: PcAssignCashToTab.php:138 PcClaimExpensesFromTab.php:130 PcExpenses.php:169
 #: PcExpensesTypeTab.php:101 PcTabs.php:168 PcTypeTabs.php:140
@@ -1161,13 +1170,13 @@
 
 #: AuditTrail.php:48 PO_AuthorisationLevels.php:124
 #: PO_AuthorisationLevels.php:173 PO_AuthorisationLevels.php:176
-#: UserSettings.php:114
+#: UserSettings.php:114 includes/UserLogin.php:115
 msgid "User ID"
 msgstr ""
 
 #: AuditTrail.php:50 AuditTrail.php:63 ContractBOM.php:305
-#: CounterReturns.php:1615 CounterReturns.php:1618 CounterSales.php:2205
-#: CounterSales.php:2208 CustomerTransInquiry.php:36
+#: CounterReturns.php:1615 CounterReturns.php:1618 CounterSales.php:2216
+#: CounterSales.php:2219 CustomerTransInquiry.php:36
 #: DailyBankTransactions.php:72 DailySalesInquiry.php:46
 #: DailySalesInquiry.php:48 FixedAssetRegister.php:56
 #: FixedAssetRegister.php:65 InventoryQuantities.php:168
@@ -1175,7 +1184,7 @@
 #: MRPReport.php:524 MRPReport.php:526 MRPReschedules.php:145
 #: NoSalesItems.php:22 NoSalesItems.php:48 NoSalesItems.php:68
 #: NoSalesItems.php:70 PDFPeriodStockTransListing.php:60 PDFPriceList.php:198
-#: PO_Items.php:1090 POReport.php:1570 ReorderLevel.php:212
+#: PO_Items.php:1097 POReport.php:1570 ReorderLevel.php:212
 #: ReorderLevel.php:214 ReorderLevel.php:244 ReorderLevel.php:246
 #: SalesGraph.php:102 SalesGraph.php:104 SalesGraph.php:124 SalesGraph.php:126
 #: SalesGraph.php:148 SalesGraph.php:150 SalesGraph.php:184
@@ -1185,12 +1194,12 @@
 #: StockDispatch.php:395 StockLocStatus.php:71 StockLocStatus.php:73
 #: StockLocStatus.php:91 StockLocStatus.php:96 StockLocStatus.php:101
 #: StockLocStatus.php:106 StockQuantityByDate.php:25 SupplierPriceList.php:23
-#: SupplierPriceList.php:25 SupplierTenderCreate.php:647
-#: SupplierTenderCreate.php:649 SupplierTenders.php:409
-#: SupplierTenders.php:411 SupplierTransInquiry.php:31
-#: SystemParameters.php:995 SystemParameters.php:1001
-#: SystemParameters.php:1007 SystemParameters.php:1013
-#: SystemParameters.php:1019 TopItems.php:29 TopItems.php:45 TopItems.php:67
+#: SupplierPriceList.php:25 SupplierTenderCreate.php:671
+#: SupplierTenderCreate.php:673 SupplierTenders.php:410
+#: SupplierTenders.php:412 SupplierTransInquiry.php:31
+#: SystemParameters.php:1002 SystemParameters.php:1008
+#: SystemParameters.php:1014 SystemParameters.php:1020
+#: SystemParameters.php:1026 TopItems.php:29 TopItems.php:45 TopItems.php:67
 #: TopItems.php:69 WorkOrderEntry.php:604 WorkOrderEntry.php:607
 #: WorkOrderIssue.php:662 WorkOrderIssue.php:665
 msgid "All"
@@ -1204,7 +1213,7 @@
 msgid "Containing text"
 msgstr ""
 
-#: AuditTrail.php:82 InternalStockRequest.php:582 MRPReport.php:778
+#: AuditTrail.php:82 InternalStockRequest.php:591 MRPReport.php:778
 #: PO_SelectPurchOrder.php:431 SelectContract.php:184 SelectProduct.php:803
 msgid "View"
 msgstr ""
@@ -1244,7 +1253,7 @@
 msgstr ""
 
 #: AuditTrail.php:170 MaterialsNotUsed.php:38 PurchData.php:695
-#: SellThroughSupport.php:263 SystemParameters.php:344
+#: SellThroughSupport.php:263 SystemParameters.php:351
 #: includes/PDFOstdgGRNsPageHeader.inc:43
 msgid "Value"
 msgstr ""
@@ -1389,18 +1398,18 @@
 msgid "Bank Address"
 msgstr ""
 
-#: BankAccounts.php:196 CustomerAllocations.php:337 CustomerReceipt.php:803
-#: CustomerTransInquiry.php:114 OffersReceived.php:112 PcReportTab.php:267
-#: PcTabs.php:208 PcTabs.php:351 PO_AuthorisationLevels.php:126
-#: PO_AuthorisationLevels.php:210 PO_AuthorisationLevels.php:215
-#: PO_AuthoriseMyOrders.php:115 PO_Header.php:556
-#: PO_SelectOSPurchOrder.php:478 PO_SelectPurchOrder.php:433
+#: BankAccounts.php:196 Currencies.php:355 CustomerAllocations.php:337
+#: CustomerReceipt.php:803 CustomerTransInquiry.php:114 OffersReceived.php:112
+#: PcReportTab.php:267 PcTabs.php:208 PcTabs.php:351
+#: PO_AuthorisationLevels.php:126 PO_AuthorisationLevels.php:210
+#: PO_AuthorisationLevels.php:215 PO_AuthoriseMyOrders.php:115
+#: PO_Header.php:556 PO_SelectOSPurchOrder.php:478 PO_SelectPurchOrder.php:433
 #: PricesByCost.php:277 Prices.php:221 Prices.php:297 PurchData.php:271
 #: PurchData.php:466 PurchData.php:607 SelectSupplier.php:275
 #: SellThroughSupport.php:161 SupplierCredit.php:263 SupplierInvoice.php:606
-#: SupplierPriceList.php:450 SupplierTenderCreate.php:585
-#: SupplierTenders.php:126 SupplierTenders.php:538
-#: SupplierTransInquiry.php:111 SuppPriceList.php:303 Z_ImportPriceList.php:96
+#: SupplierPriceList.php:450 SupplierTenderCreate.php:609
+#: SupplierTenders.php:126 SupplierTenders.php:539
+#: SupplierTransInquiry.php:111 SuppPriceList.php:303
 #: includes/PDFBankingSummaryPageHeader.inc:42
 #: includes/PDFDebtorBalsPageHeader.inc:33
 #: includes/PDFSupplierBalsPageHeader.inc:36
@@ -1504,7 +1513,7 @@
 
 #: BankMatching.php:127 CounterSales.php:227 CreditItemsControlled.php:79
 #: FreightCosts.php:269 GoodsReceivedControlled.php:68 GoodsReceived.php:73
-#: InternalStockRequestFulfill.php:37 StockLocTransferReceive.php:436
+#: InternalStockRequestFulfill.php:37 StockLocTransferReceive.php:444
 #: SupplierAllocations.php:435 SuppShiptChgs.php:137
 msgid "from"
 msgstr ""
@@ -1513,17 +1522,17 @@
 #: CounterReturns.php:197 EmailCustTrans.php:64 FixedAssetRegister.php:79
 #: FTP_RadioBeacon.php:280 GLAccountCSV.php:177 GLAccountReport.php:106
 #: Payments.php:753 PcReportTab.php:101 PDFChequeListing.php:117
-#: PDFChequeListing.php:127 PDFChequeListing.php:201
+#: PDFChequeListing.php:127 PDFChequeListing.php:196
 #: PDFDeliveryDifferences.php:190 PDFDeliveryDifferences.php:203
-#: PDFDeliveryDifferences.php:299 PDFDIFOT.php:193 PDFDIFOT.php:206
-#: PDFDIFOT.php:310 PDFOrdersInvoiced.php:80 PDFOrdersInvoiced.php:277
+#: PDFDeliveryDifferences.php:297 PDFDIFOT.php:193 PDFDIFOT.php:206
+#: PDFDIFOT.php:299 PDFOrdersInvoiced.php:80 PDFOrdersInvoiced.php:277
 #: PDFOrderStatus.php:85 PDFOrderStatus.php:259 PDFRemittanceAdvice.php:48
-#: PO_PDFPurchOrder.php:339 PricesBasedOnMarkUp.php:215
+#: PO_PDFPurchOrder.php:348 PricesBasedOnMarkUp.php:215
 #: PricesBasedOnMarkUp.php:354 PrintCustStatements.php:46
 #: PrintCustTrans.php:63 PrintCustTrans.php:66 PrintCustTransPortrait.php:62
 #: PrintCustTransPortrait.php:65 SalesGraph.php:218 SalesGraph.php:247
 #: SalesGraph.php:251 StockLocTransferReceive.php:306
-#: StockLocTransferReceive.php:436 Stocks.php:281 Stocks.php:286
+#: StockLocTransferReceive.php:444 Stocks.php:281 Stocks.php:286
 #: StockStatus.php:351 StockStatus.php:392 StockTransfers.php:448
 #: includes/PDFAgedDebtorsPageHeader.inc:18
 #: includes/PDFAgedSuppliersPageHeader.inc:17
@@ -1757,10 +1766,10 @@
 #: BankReconciliation.php:214 BankReconciliation.php:291
 #: CustomerAllocations.php:333 CustomerAllocations.php:367
 #: CustomerInquiry.php:203 CustomerTransInquiry.php:105 CustWhereAlloc.php:109
-#: EmailCustTrans.php:15 GLAccountInquiry.php:180 PrintCustTrans.php:484
-#: PrintCustTrans.php:702 PrintCustTrans.php:935 PrintCustTrans.php:984
-#: PrintCustTransPortrait.php:514 PrintCustTransPortrait.php:746
-#: PrintCustTransPortrait.php:994 PrintCustTransPortrait.php:1049
+#: EmailCustTrans.php:15 GLAccountInquiry.php:180 PrintCustTrans.php:488
+#: PrintCustTrans.php:706 PrintCustTrans.php:939 PrintCustTrans.php:988
+#: PrintCustTransPortrait.php:518 PrintCustTransPortrait.php:750
+#: PrintCustTransPortrait.php:998 PrintCustTransPortrait.php:1053
 #: StockMovements.php:97 SupplierAllocations.php:455
 #: SupplierAllocations.php:568 SupplierAllocations.php:643
 #: SupplierTransInquiry.php:103 Z_CheckAllocs.php:63
@@ -1825,7 +1834,7 @@
 msgstr ""
 
 #: BankReconciliation.php:361 CounterReturns.php:740 CounterSales.php:832
-#: Customers.php:1115 SelectOrderItems.php:1456 Stocks.php:1271
+#: Customers.php:1115 SelectOrderItems.php:1456 Stocks.php:1289
 #: WorkOrderCosting.php:551 WorkOrderEntry.php:590
 msgid "Are You Sure?"
 msgstr ""
@@ -1843,7 +1852,7 @@
 msgstr ""
 
 #: BOMExtendedQty.php:12 BOMExtendedQty.php:13 BOMExtendedQty.php:154
-#: BOMExtendedQty.php:248
+#: BOMExtendedQty.php:250
 msgid "Quantity Extended BOM Listing"
 msgstr ""
 
@@ -1861,39 +1870,39 @@
 msgid "The Quantiy Extended BOM Listing could not be retrieved by the SQL because"
 msgstr ""
 
-#: BOMExtendedQty.php:235 BOMIndented.php:231
+#: BOMExtendedQty.php:237 BOMIndented.php:231
 msgid "Print Indented BOM Listing Error"
 msgstr ""
 
-#: BOMExtendedQty.php:237 BOMIndented.php:233
+#: BOMExtendedQty.php:239 BOMIndented.php:233
 msgid "There were no items for the selected assembly"
 msgstr ""
 
-#: BOMExtendedQty.php:257 BOMIndented.php:253 BOMIndentedReverse.php:241
+#: BOMExtendedQty.php:259 BOMIndented.php:253 BOMIndentedReverse.php:241
 msgid "Part"
 msgstr ""
 
-#: BOMExtendedQty.php:261 BOMExtendedQty.php:328 BOMExtendedQty.php:329
-#: BOMExtendedQty.php:330 BOMExtendedQty.php:331 BOMIndented.php:315
-#: BOMIndentedReverse.php:295 BOMInquiry.php:200 BOMs.php:556 BOMs.php:735
+#: BOMExtendedQty.php:263 BOMExtendedQty.php:330 BOMExtendedQty.php:331
+#: BOMExtendedQty.php:332 BOMExtendedQty.php:333 BOMIndented.php:315
+#: BOMIndentedReverse.php:295 BOMInquiry.php:200 BOMs.php:557 BOMs.php:737
 #: ContractBOM.php:243 ContractBOM.php:356 ContractCosting.php:81
 #: ContractCosting.php:87 ContractCosting.php:152 ContractOtherReqts.php:99
 #: Contracts.php:990 Contracts.php:1026 CounterReturns.php:669
 #: CounterReturns.php:1679 CounterReturns.php:1806 CounterSales.php:745
-#: CounterSales.php:2085 CounterSales.php:2272 CounterSales.php:2409
-#: Credit_Invoice.php:289 CustomerPurchases.php:73 DeliveryDetails.php:852
-#: DeliveryDetails.php:922 GoodsReceived.php:101 GoodsReceived.php:105
-#: GoodsReceived.php:108 InternalStockRequestFulfill.php:308
-#: InternalStockRequestFulfill.php:309 InternalStockRequest.php:622
+#: CounterSales.php:2096 CounterSales.php:2283 CounterSales.php:2420
+#: Credit_Invoice.php:289 CustomerPurchases.php:73 DeliveryDetails.php:861
+#: DeliveryDetails.php:931 GoodsReceived.php:101 GoodsReceived.php:105
+#: GoodsReceived.php:108 InternalStockRequestFulfill.php:318
+#: InternalStockRequestFulfill.php:319 InternalStockRequest.php:631
 #: InventoryPlanningPrefSupplier.php:78 InventoryQuantities.php:248
 #: MRPDemands.php:297 MRPDemands.php:395 MRPPlannedPurchaseOrders.php:328
 #: MRPPlannedWorkOrders.php:261 MRPPlannedWorkOrders.php:387 MRPReport.php:413
 #: MRPReport.php:419 MRPReschedules.php:195 OffersReceived.php:108
-#: OffersReceived.php:219 OffersReceived.php:264 OrderDetails.php:170
+#: OffersReceived.php:219 OffersReceived.php:279 OrderDetails.php:170
 #: PDFOrdersInvoiced.php:393 POReport.php:762 POReport.php:1449
-#: PrintCustTrans.php:865 PrintCustTrans.php:954 PrintCustTrans.php:1003
-#: PrintCustTransPortrait.php:920 PrintCustTransPortrait.php:1018
-#: PrintCustTransPortrait.php:1074 RecurringSalesOrders.php:331
+#: PrintCustTrans...
 
[truncated message content]