Merge lp:~openerp-dev/openobject-addons/trunk-res-country-state-cleaning-mme into lp:openobject-addons

[Thibault Delavallée (OpenERP)]

[Fix] remove res.country.state model and replace all many2one state by a char field

[lp:~openerp-dev/openobject-addons/trunk-res-country-state-cleaning-mme]

9087. By Niko (OpenERP) on 2014-02-28

[IMP] Add some video to manisfest ( website, website_blog, website_event, website_ecommerce)

9170. By Mehul Mehta(OpenERP) on 2014-02-25

[IMP] improvement in code

9171. By Mehul Mehta(OpenERP) on 2014-02-26

[IMP] improvement in code

Unmerged revisions

9171. By Mehul Mehta(OpenERP) on 2014-02-26

[IMP] improvement in code

9170. By Mehul Mehta(OpenERP) on 2014-02-25

[IMP] improvement in code

9169. By Mehul Mehta(OpenERP) on 2014-02-25

[MERGE] Merged lp:openobject-addons

9168. By Mehul Mehta(OpenERP) on 2014-02-24

[ADD] autocomplete country selector in website_sale and replace all many2one state by a char field

=== modified file 'account/edi/invoice_action_data.xml'
--- account/edi/invoice_action_data.xml	2013-11-27 15:32:57 +0000
+++ account/edi/invoice_action_data.xml	2014-02-26 06:23:38 +0000
@@ -79,7 +79,7 @@
             ${object.company_id.zip} ${object.company_id.city}<br/>
         % endif
         % if object.company_id.country_id:
-            ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>
+            ${object.company_id.state}<br/>
         % endif
         </span>
         % if object.company_id.phone:

=== modified file 'account/i18n/account.pot'
--- account/i18n/account.pot	2013-10-27 12:31:04 +0000
+++ account/i18n/account.pot	2014-02-26 06:23:38 +0000
@@ -3262,7 +3262,7 @@
 "            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
 "        % endif\n"
 "        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>\n"
+"            ${object.company_id.state}<br/>\n"
 "        % endif\n"
 "        </span>\n"
 "        % if object.company_id.phone:\n"

=== modified file 'base_geolocalize/models/res_partner.py'
--- base_geolocalize/models/res_partner.py	2013-10-07 14:41:35 +0000
+++ base_geolocalize/models/res_partner.py	2014-02-26 06:23:38 +0000
@@ -77,7 +77,7 @@
             result = geo_find(geo_query_address(street=partner.street,
                                                 zip=partner.zip,
                                                 city=partner.city,
-                                                state=partner.state_id.name,
+                                                state=partner.state,
                                                 country=partner.country_id.name))
             if result:
                 self.write(cr, uid, [partner.id], {

=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py	2014-02-20 16:38:15 +0000
+++ crm/crm_lead.py	2014-02-26 06:23:38 +0000
@@ -37,7 +37,7 @@
     'company_id',
     'country_id',
     'section_id',
-    'state_id',
+    'state',
     'stage_id',
     'type_id',
     'user_id',
@@ -278,7 +278,7 @@
         'street2': fields.char('Street2', size=128),
         'zip': fields.char('Zip', change_default=True, size=24),
         'city': fields.char('City', size=128),
-        'state_id': fields.many2one("res.country.state", 'State'),
+        'state': fields.char('State'),
         'country_id': fields.many2one('res.country', 'Country'),
         'phone': fields.char('Phone', size=64),
         'fax': fields.char('Fax', size=64),
@@ -324,7 +324,7 @@
                 'street': partner.street,
                 'street2': partner.street2,
                 'city': partner.city,
-                'state_id': partner.state_id and partner.state_id.id or False,
+                'state': partner.state,
                 'country_id': partner.country_id and partner.country_id.id or False,
                 'email_from': partner.email,
                 'phone': partner.phone,
@@ -736,7 +736,7 @@
             'zip': lead.zip,
             'city': lead.city,
             'country_id': lead.country_id and lead.country_id.id or False,
-            'state_id': lead.state_id and lead.state_id.id or False,
+            'state': lead.state,
             'is_company': is_company,
             'type': 'contact'
         }
@@ -1060,10 +1060,4 @@
         message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (meeting_date, meeting_subject, duration)
         return self.message_post(cr, uid, ids, body=message, context=context)
 
-    def onchange_state(self, cr, uid, ids, state_id, context=None):
-        if state_id:
-            country_id=self.pool.get('res.country.state').browse(cr, uid, state_id, context).country_id.id
-            return {'value':{'country_id':country_id}}
-        return {}
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml	2014-02-12 18:08:45 +0000
+++ crm/crm_lead_view.xml	2014-02-26 06:23:38 +0000
@@ -119,14 +119,14 @@
                             <field name="partner_id" string="Customer"
                                 on_change="on_change_partner_id(partner_id)"
                                 options='{"create_name_field": "name"}'
-                                context="{'default_name': contact_name, 'default_street': street, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_function': function, 'default_phone': phone, 'default_mobile': mobile, 'default_fax': fax, 'default_email': email_from, 'default_user_id': user_id, 'default_section_id': section_id}"/>
+                                context="{'default_name': contact_name, 'default_street': street, 'default_city': city, 'default_state': state, 'default_zip': zip, 'default_country_id': country_id, 'default_function': function, 'default_phone': phone, 'default_mobile': mobile, 'default_fax': fax, 'default_email': email_from, 'default_user_id': user_id, 'default_section_id': section_id}"/>
                             <label for="street" string="Address"/>
                             <div>
                                 <field name="street" placeholder="Street..."/>
                                 <field name="street2"/>
                                 <div class="address_format">
                                     <field name="city" placeholder="City" style="width: 40%%"/>
-                                    <field name="state_id" on_change="onchange_state(state_id)" options='{"no_open": True}' placeholder="State" style="width: 24%%"/>
+                                    <field name="state" placeholder="State" style="width: 24%%"/>
                                     <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                 </div>
                                 <field name="country_id" placeholder="Country" options='{"no_open": True}'/>
@@ -458,7 +458,7 @@
                                         <field name="street2"/>
                                         <div class="address_format">
                                             <field name="city" placeholder="City" style="width: 40%%"/>
-                                            <field name="state_id" options='{"no_open": True}' on_change="onchange_state(state_id)" placeholder="State" style="width: 24%%"/>
+                                            <field name="state" placeholder="State" style="width: 24%%"/>
                                             <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                         </div>
                                         <field name="country_id" placeholder="Country" options='{"no_open": True}'/>

=== modified file 'crm_partner_assign/crm_partner_assign.py'
--- crm_partner_assign/crm_partner_assign.py	2013-12-02 15:09:25 +0000
+++ crm_partner_assign/crm_partner_assign.py	2014-02-26 06:23:38 +0000
@@ -148,7 +148,7 @@
                 result = geo_find(geo_query_address(street=lead.street,
                                                     zip=lead.zip,
                                                     city=lead.city,
-                                                    state=lead.state_id.name,
+                                                    state=lead.state,
                                                     country=lead.country_id.name))
                 if result:
                     self.write(cr, uid, [lead.id], {

=== modified file 'crm_partner_assign/crm_portal_view.xml'
--- crm_partner_assign/crm_portal_view.xml	2014-02-20 12:38:19 +0000
+++ crm_partner_assign/crm_portal_view.xml	2014-02-26 06:23:38 +0000
@@ -53,7 +53,7 @@
                       <field name="zip" readonly="1"/>
                       <field name="city" readonly="1"/>
                       <field name="country_id" readonly="1"/>
-                      <field name="state_id" readonly="1"/>
+                      <field name="state" readonly="1"/>
                     </group>
                     <label for="description" colspan="2"/>
                     <field name="description" nolabel="1" colspan="2"/>
@@ -126,7 +126,7 @@
                          <field name="zip" readonly="1"/>
                          <field name="city" readonly="1"/>
                          <field name="country_id" readonly="1"/>
-                         <field name="state_id" readonly="1"/>
+                         <field name="state" readonly="1"/>
                          <field name="phone" readonly="1"/>
                       </group>
                     </group>

=== modified file 'delivery/delivery.py'
--- delivery/delivery.py	2014-01-30 21:49:44 +0000
+++ delivery/delivery.py	2014-02-26 06:23:38 +0000
@@ -86,11 +86,8 @@
             for grid in carrier.grids_id:
                 get_id = lambda x: x.id
                 country_ids = map(get_id, grid.country_ids)
-                state_ids = map(get_id, grid.state_ids)
                 if country_ids and not contact.country_id.id in country_ids:
                     continue
-                if state_ids and not contact.state_id.id in state_ids:
-                    continue
                 if grid.zip_from and (contact.zip or '')< grid.zip_from:
                     continue
                 if grid.zip_to and (contact.zip or '')> grid.zip_to:
@@ -175,7 +172,7 @@
         'sequence': fields.integer('Sequence', size=64, required=True, help="Gives the sequence order when displaying a list of delivery grid."),
         'carrier_id': fields.many2one('delivery.carrier', 'Carrier', required=True, ondelete='cascade'),
         'country_ids': fields.many2many('res.country', 'delivery_grid_country_rel', 'grid_id', 'country_id', 'Countries'),
-        'state_ids': fields.many2many('res.country.state', 'delivery_grid_state_rel', 'grid_id', 'state_id', 'States'),
+        'state': fields.char('States'),
         'zip_from': fields.char('Start Zip', size=12),
         'zip_to': fields.char('To Zip', size=12),
         'line_ids': fields.one2many('delivery.grid.line', 'grid_id', 'Grid Line'),

=== modified file 'delivery/delivery_view.xml'
--- delivery/delivery_view.xml	2012-12-21 16:48:08 +0000
+++ delivery/delivery_view.xml	2014-02-26 06:23:38 +0000
@@ -70,7 +70,7 @@
                                     <group>
                                         <group>
                                             <field name="country_ids" widget="many2many_tags"/>
-                                            <field name="state_ids" widget="many2many_tags"/>
+                                            <field name="state"/>
                                         </group>
                                         <group>
                                             <label for="zip_from" string="Zip"/>
@@ -145,7 +145,7 @@
                                 <field name="country_ids"/>
                             </group>
                             <group string="States">
-                                <field colspan="2" name="state_ids" nolabel="1"/>
+                                <field colspan="2" name="state" nolabel="1"/>
                                 <field name="zip_from"/>
                                 <field name="zip_to"/>
                             </group>

=== modified file 'edi/models/res_partner.py'
--- edi/models/res_partner.py	2014-01-23 17:50:54 +0000
+++ edi/models/res_partner.py	2014-02-26 06:23:38 +0000
@@ -36,7 +36,7 @@
     'zip': True,
     'city': True,
     'country_id': True,
-    'state_id': True,
+    'state': True,
     'phone': True,
     'fax': True,
     'mobile': True,

=== modified file 'l10n_cn/__openerp__.py'
--- l10n_cn/__openerp__.py	2012-11-29 22:26:45 +0000
+++ l10n_cn/__openerp__.py	2014-02-26 06:23:38 +0000
@@ -35,7 +35,6 @@
     'data': [
         'account_chart.xml',
         'l10n_chart_cn_wizard.xml',
-        'base_data.xml',
     ],
     'license': 'GPL-3',
     'auto_install': False,

=== removed file 'l10n_cn/base_data.xml'
--- l10n_cn/base_data.xml	2012-11-29 22:26:45 +0000
+++ l10n_cn/base_data.xml	1970-01-01 00:00:00 +0000
@@ -1,162 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data noupdate="1">
-
-        <!-- 添加省份数据 -->
-        <record id="state_BJ" model="res.country.state">
-            <field name="name">北京市</field>
-            <field name="code">京</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_SH" model="res.country.state">
-            <field name="name">上海市</field>
-            <field name="code">沪</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_ZJ" model="res.country.state">
-            <field name="name">浙江省</field>
-            <field name="code">浙</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_TJ" model="res.country.state">
-            <field name="name">天津市</field>
-            <field name="code">津</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_AH" model="res.country.state">
-            <field name="name">安徽省</field>
-            <field name="code">皖</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_FJ" model="res.country.state">
-            <field name="name">福建省</field>
-            <field name="code">闽</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_CQ" model="res.country.state">
-            <field name="name">重庆市</field>
-            <field name="code">渝 </field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_JX" model="res.country.state">
-            <field name="name">江西省</field>
-            <field name="code">赣</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_SD" model="res.country.state">
-            <field name="name">山东省</field>
-            <field name="code">鲁</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_HeN" model="res.country.state">
-            <field name="name">河南省</field>
-            <field name="code">豫</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_NM" model="res.country.state">
-            <field name="name">内蒙古自治区</field>
-            <field name="code">蒙</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_HuB" model="res.country.state">
-            <field name="name">湖北省</field>
-            <field name="code">鄂</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_XJ" model="res.country.state">
-            <field name="name">新疆维吾尔自治区</field>
-            <field name="code">新</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_HuN" model="res.country.state">
-            <field name="name">湖南省</field>
-            <field name="code">湘</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_NX" model="res.country.state">
-            <field name="name">宁夏回族自治区</field>
-            <field name="code">宁</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_GD" model="res.country.state">
-            <field name="name">广东省</field>
-            <field name="code">粤</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_XZ" model="res.country.state">
-            <field name="name">西藏自治区</field>
-            <field name="code">藏</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_HaN" model="res.country.state">
-            <field name="name">海南省</field>
-            <field name="code">琼</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_GX" model="res.country.state">
-            <field name="name">广西壮族自治区</field>
-            <field name="code">桂</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_SC" model="res.country.state">
-            <field name="name">四川省</field>
-            <field name="code">蜀</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_HeB" model="res.country.state">
-            <field name="name">河北省</field>
-            <field name="code">冀</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_GZ" model="res.country.state">
-            <field name="name">贵州省</field>
-            <field name="code">黔</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_SX" model="res.country.state">
-            <field name="name">山西省</field>
-            <field name="code">晋</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_YN" model="res.country.state">
-            <field name="name">云南省</field>
-            <field name="code">滇</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_LN" model="res.country.state">
-            <field name="name">辽宁省</field>
-            <field name="code">辽</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_SX" model="res.country.state">
-            <field name="name">陕西省</field>
-            <field name="code">陕</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_JL" model="res.country.state">
-            <field name="name">吉林省</field>
-            <field name="code">吉</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_GS" model="res.country.state">
-            <field name="name">甘肃省</field>
-            <field name="code">甘</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_HL" model="res.country.state">
-            <field name="name">黑龙江省</field>
-            <field name="code">黑</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_QH" model="res.country.state">
-            <field name="name">青海省</field>
-            <field name="code">青</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_JS" model="res.country.state">
-            <field name="name">江苏省</field>
-            <field name="code">苏</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-    </data>
-</openerp>

=== modified file 'l10n_cr/l10n_cr_base_data.xml'
--- l10n_cr/l10n_cr_base_data.xml	2013-10-27 12:31:04 +0000
+++ l10n_cr/l10n_cr_base_data.xml	2014-02-26 06:23:38 +0000
@@ -1,46 +1,6 @@
 <openerp>
     <data>
 
-        <!--
-        Resource: res.country.state
-        Update states
-        -->
-        <record id="state_SJ" model="res.country.state">
-            <field name="code">SJ</field>
-            <field name="name">San Jos&#233;</field>
-            <field name="country_id" ref="base.cr"/>
-        </record>
-        <record id="state_A" model="res.country.state">
-            <field name="code">A</field>
-            <field name="name">Alajuela</field>
-            <field name="country_id" ref="base.cr"/>
-        </record>
-        <record id="state_H" model="res.country.state">
-            <field name="code">H</field>
-            <field name="name">Heredia</field>
-            <field name="country_id" ref="base.cr"/>
-        </record>
-        <record id="state_C" model="res.country.state">
-            <field name="code">C</field>
-            <field name="name">Cartago</field>
-            <field name="country_id" ref="base.cr"/>
-        </record>
-        <record id="state_P" model="res.country.state">
-            <field name="code">P</field>
-            <field name="name">Puntarenas</field>
-            <field name="country_id" ref="base.cr"/>
-        </record>
-        <record id="state_G" model="res.country.state">
-            <field name="code">G</field>
-            <field name="name">Guanacaste</field>
-            <field name="country_id" ref="base.cr"/>
-        </record>
-        <record id="state_L" model="res.country.state">
-            <field name="code">L</field>
-            <field name="name">Lim&#243;n</field>
-            <field name="country_id" ref="base.cr"/>
-        </record>
-        <!--
         Resource: res.partner.title
         Update partner titles
         -->

=== modified file 'l10n_et/__openerp__.py'
--- l10n_et/__openerp__.py	2013-10-27 12:31:04 +0000
+++ l10n_et/__openerp__.py	2014-02-26 06:23:38 +0000
@@ -45,7 +45,6 @@
         'data/account.tax.code.template.csv',
         'data/account.chart.template.csv',
         'data/account.tax.template.csv',
-        'data/res.country.state.csv',
     ],
     'data': [
         'l10n_et_wizard.xml',

=== removed file 'l10n_et/data/res.country.state.csv'
--- l10n_et/data/res.country.state.csv	2012-12-14 16:52:54 +0000
+++ l10n_et/data/res.country.state.csv	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-"id","country_id:id","code","name"
-"state_et_1","base.et","AA","Addis Ababa"
-"state_et_2","base.et","AF","Afar"
-"state_et_3","base.et","AM","Amhara"
-"state_et_4","base.et","BN","Benishangul-Gumuz"
-"state_et_5","base.et","DR","Dire Dawa"
-"state_et_6","base.et","GM","Gambella Peoples"
-"state_et_7","base.et","HR","Harrari Peoples"
-"state_et_8","base.et","OR","Oromia"
-"state_et_9","base.et","SM","Somalia"
-"state_et_10","base.et","SP","Southern Peoples, Nations, and Nationalities"
-"state_et_11","base.et","TG","Tigray"

=== modified file 'l10n_uk/__openerp__.py'
--- l10n_uk/__openerp__.py	2012-12-06 15:38:56 +0000
+++ l10n_uk/__openerp__.py	2014-02-26 06:23:38 +0000
@@ -39,7 +39,6 @@
         'data/account.tax.code.template.csv',
         'data/account.chart.template.csv',
         'data/account.tax.template.csv',
-        'data/res.country.state.csv',
         'l10n_uk_wizard.xml',
     ],
     'demo' : ['demo/demo.xml'],

=== removed file 'l10n_uk/data/res.country.state.csv'
--- l10n_uk/data/res.country.state.csv	2011-09-16 14:01:34 +0000
+++ l10n_uk/data/res.country.state.csv	1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-"id","country_id:id","code","name"
-"state_uk_1","base.uk","A1","Aberdeenshire"
-"state_uk_2","base.uk","A5","Angus"
-"state_uk_3","base.uk","A7","Argyll"
-"state_uk_4","base.uk","A9","Avon"
-"state_uk_5","base.uk","B1","Ayrshire"
-"state_uk_6","base.uk","B3","Banffshire"
-"state_uk_7","base.uk","B5","Bedfordshire"
-"state_uk_8","base.uk","B7","Berkshire"
-"state_uk_9","base.uk","B9","Berwickshire"
-"state_uk_10","base.uk","C1","Buckinghamshire"
-"state_uk_11","base.uk","C3","Caithness"
-"state_uk_12","base.uk","C5","Cambridgeshire"
-"state_uk_13","base.uk","C6","Channel Islands"
-"state_uk_14","base.uk","C7","Cheshire"
-"state_uk_15","base.uk","C9","Clackmannanshire"
-"state_uk_16","base.uk","D1","Cleveland"
-"state_uk_17","base.uk","D3","Clwyd"
-"state_uk_18","base.uk","D5","County Antrim"
-"state_uk_19","base.uk","D7","County Armagh"
-"state_uk_20","base.uk","D9","County Down"
-"state_uk_21","base.uk","E1","County Durham"
-"state_uk_22","base.uk","E3","County Fermanagh"
-"state_uk_23","base.uk","E5","County Londonderry"
-"state_uk_24","base.uk","E7","County Tyrone"
-"state_uk_25","base.uk","E9","Cornwall"
-"state_uk_26","base.uk","F1","Cumbria"
-"state_uk_27","base.uk","F3","Derbyshire"
-"state_uk_28","base.uk","F5","Devon"
-"state_uk_29","base.uk","F7","Dorset"
-"state_uk_30","base.uk","F9","Dumfriesshire"
-"state_uk_31","base.uk","G1","Dunbartonshire"
-"state_uk_32","base.uk","G3","Dyfed"
-"state_uk_33","base.uk","G5","East Lothian"
-"state_uk_34","base.uk","G7","East Sussex"
-"state_uk_35","base.uk","G9","Essex"
-"state_uk_36","base.uk","H1","Fife"
-"state_uk_37","base.uk","H3","Gloucestershire"
-"state_uk_38","base.uk","H7","Gwent"
-"state_uk_39","base.uk","H9","Gwynedd"
-"state_uk_40","base.uk","I1","Hampshire"
-"state_uk_41","base.uk","I3","Herefordshire"
-"state_uk_42","base.uk","I5","Hertfordshire"
-"state_uk_43","base.uk","I7","Inverness-Shire"
-"state_uk_44","base.uk","I9","Isle of Arran"
-"state_uk_45","base.uk","J1","Isle of Barra"
-"state_uk_46","base.uk","J3","Isle of Benbecula"
-"state_uk_47","base.uk","J5","Isle of Bute"
-"state_uk_48","base.uk","J7","Isle of Canna"
-"state_uk_49","base.uk","J9","Isle of Coll"
-"state_uk_50","base.uk","K1","Isle of Colonsay"
-"state_uk_51","base.uk","K3","Isle of Cumbrae"
-"state_uk_52","base.uk","K5","Isle of Eigg"
-"state_uk_53","base.uk","K7","Isle of Gigha"
-"state_uk_54","base.uk","K9","Isle of Harris"
-"state_uk_55","base.uk","L1","Isle of Iona"
-"state_uk_56","base.uk","L2","Isle of Islay"
-"state_uk_57","base.uk","L5","Isle of Jura"
-"state_uk_58","base.uk","L7","Isle of Lewis"
-"state_uk_59","base.uk","L9","Isle of Man"
-"state_uk_60","base.uk","M1","Isle of Mull"
-"state_uk_61","base.uk","M3","Isle of North Uist"
-"state_uk_62","base.uk","M7","Isle of Rhum"
-"state_uk_63","base.uk","M9","Isle of Scalpay"
-"state_uk_64","base.uk","N1","Shetland Islands"
-"state_uk_65","base.uk","N3","Isle of Skye"
-"state_uk_66","base.uk","N5","Isle of South Uist"
-"state_uk_67","base.uk","N7","Isle of Tiree"
-"state_uk_68","base.uk","N9","Isle of Wight"
-"state_uk_69","base.uk","O5","Kent"
-"state_uk_70","base.uk","O7","Kincardineshire"
-"state_uk_71","base.uk","O9","Kinross-Shire"
-"state_uk_72","base.uk","P1","Kirkcudbrightshire"
-"state_uk_73","base.uk","P5","Lancashire"
-"state_uk_74","base.uk","P7","Leicestershire"
-"state_uk_75","base.uk","P9","Lincolnshire"
-"state_uk_76","base.uk","Q3","Merseyside"
-"state_uk_77","base.uk","Q5","Mid Glamorgan"
-"state_uk_78","base.uk","Q9","Middlesex"
-"state_uk_79","base.uk","R1","Morayshire"
-"state_uk_80","base.uk","R3","Nairnshire"
-"state_uk_81","base.uk","R7","North Humberside"
-"state_uk_82","base.uk","R9","North Yorkshire"
-"state_uk_83","base.uk","S1","Northamptonshire"
-"state_uk_84","base.uk","S3","Northumberland"
-"state_uk_85","base.uk","S5","Nottinghamshire"
-"state_uk_86","base.uk","S7","Oxfordshire"
-"state_uk_87","base.uk","S9","Peeblesshire"
-"state_uk_88","base.uk","T1","Perthshire"
-"state_uk_89","base.uk","T3","Powys"
-"state_uk_90","base.uk","T5","Renfrewshire"
-"state_uk_91","base.uk","T7","Ross-Shire"
-"state_uk_92","base.uk","T9","Roxburghshire"
-"state_uk_93","base.uk","U3","Selkirkshire"
-"state_uk_94","base.uk","U5","Shropshire"
-"state_uk_95","base.uk","U7","Somerset"
-"state_uk_96","base.uk","U9","South Glamorgan"
-"state_uk_97","base.uk","V1","South Humberside"
-"state_uk_98","base.uk","V3","South Yorkshire"
-"state_uk_99","base.uk","V5","Staffordshire"
-"state_uk_100","base.uk","V7","Stirlingshire"
-"state_uk_101","base.uk","V9","Suffolk"
-"state_uk_102","base.uk","W1","Surrey"
-"state_uk_103","base.uk","W3","Sutherland"
-"state_uk_104","base.uk","W5","Tyne and Wear"
-"state_uk_105","base.uk","W7","Warwickshire"
-"state_uk_106","base.uk","W9","West Glamorgan"
-"state_uk_107","base.uk","X1","West Lothian"
-"state_uk_108","base.uk","X3","West Midlands"
-"state_uk_109","base.uk","X5","West Sussex"
-"state_uk_110","base.uk","X7","West Yorkshire"
-"state_uk_111","base.uk","X9","Wigtownshire"
-"state_uk_112","base.uk","Y1","Wiltshire"
-"state_uk_113","base.uk","Y3","Worcestershire"
-"state_uk_114","base.uk","M5","Orkney"
-"state_uk_115","base.uk","O1","Isles of Scilly"
-"state_uk_116","base.uk","P3","Lanarkshire"
-"state_uk_117","base.uk","Q1","London"
-"state_uk_118","base.uk","Q7","Midlothian"
-"state_uk_119","base.uk","R5","Norfolk"

=== modified file 'portal_sale/i18n/portal_sale.pot'
--- portal_sale/i18n/portal_sale.pot	2013-10-27 12:31:04 +0000
+++ portal_sale/i18n/portal_sale.pot	2014-02-26 06:23:38 +0000
@@ -125,7 +125,7 @@
 "            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
 "        % endif\n"
 "        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>\n"
+"            ${object.company_id.state}<br/>\n"
 "        % endif\n"
 "        </span>\n"
 "        % if object.company_id.phone:\n"
@@ -252,7 +252,7 @@
 "            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
 "        % endif\n"
 "        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>\n"
+"            ${object.company_id.state}<br/>\n"
 "        % endif\n"
 "        </span>\n"
 "        % if object.company_id.phone:\n"

=== modified file 'portal_sale/portal_sale_data.xml'
--- portal_sale/portal_sale_data.xml	2013-12-04 13:00:23 +0000
+++ portal_sale/portal_sale_data.xml	2014-02-26 06:23:38 +0000
@@ -75,7 +75,7 @@
             ${object.company_id.zip} ${object.company_id.city}<br/>
         % endif
         % if object.company_id.country_id:
-            ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>
+            ${object.company_id.state}<br/>
         % endif
         </span>
         % if object.company_id.phone:
@@ -162,7 +162,7 @@
             ${object.company_id.zip} ${object.company_id.city}<br/>
         % endif
         % if object.company_id.country_id:
-            ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>
+            ${object.company_id.state}<br/>
         % endif
         </span>
         % if object.company_id.phone:

=== modified file 'purchase/edi/purchase_order_action_data.xml'
--- purchase/edi/purchase_order_action_data.xml	2013-11-27 15:32:57 +0000
+++ purchase/edi/purchase_order_action_data.xml	2014-02-26 06:23:38 +0000
@@ -71,7 +71,7 @@
             ${object.company_id.zip} ${object.company_id.city}<br/>
         % endif
         % if object.company_id.country_id:
-            ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>
+            ${object.company_id.state}<br/>
         % endif
         </span>
         % if object.company_id.phone:

=== modified file 'purchase/i18n/purchase.pot'
--- purchase/i18n/purchase.pot	2013-10-27 12:31:04 +0000
+++ purchase/i18n/purchase.pot	2014-02-26 06:23:38 +0000
@@ -938,7 +938,7 @@
 "            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
 "        % endif\n"
 "        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>\n"
+"            ${object.company_id.state}<br/>\n"
 "        % endif\n"
 "        </span>\n"
 "        % if object.company_id.phone:\n"

=== modified file 'sale/edi/sale_order_action_data.xml'
--- sale/edi/sale_order_action_data.xml	2013-11-27 15:32:57 +0000
+++ sale/edi/sale_order_action_data.xml	2014-02-26 06:23:38 +0000
@@ -80,7 +80,7 @@
             ${object.company_id.zip} ${object.company_id.city}<br/>
         % endif
         % if object.company_id.country_id:
-            ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>
+            ${object.company_id.state}<br/>
         % endif
         </span>
         % if object.company_id.phone:

=== modified file 'sale/i18n/sale.pot'
--- sale/i18n/sale.pot	2013-10-27 12:31:04 +0000
+++ sale/i18n/sale.pot	2014-02-26 06:23:38 +0000
@@ -1604,7 +1604,7 @@
 "            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
 "        % endif\n"
 "        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>\n"
+"            ${object.company_id.state}<br/>\n"
 "        % endif\n"
 "        </span>\n"
 "        % if object.company_id.phone:\n"

=== modified file 'stock/stock_demo.xml'
--- stock/stock_demo.xml	2013-12-02 15:09:25 +0000
+++ stock/stock_demo.xml	2014-02-26 06:23:38 +0000
@@ -187,7 +187,6 @@
             <field eval="1" name="active"/>
             <field name="street">90 Streets Avenue</field>
             <field model="res.country" name="country_id" search="[('code','ilike','us')]"/>
-            <field model="res.country.state" name="state_id" search="[('code','ilike','il')]"/>
             <field name="zip">60610</field>
             <field name="city">Chicago</field>
             <field name="email">[e-mail]</field>

=== added directory 'website/static/lib/autocomplete'
=== added file 'website/static/lib/autocomplete/jquery.auto-complete.js'
--- website/static/lib/autocomplete/jquery.auto-complete.js	1970-01-01 00:00:00 +0000
+++ website/static/lib/autocomplete/jquery.auto-complete.js	2014-02-26 06:23:38 +0000
@@ -0,0 +1,1369 @@
+/*!
+ * Auto Complete 5.1
+ * April 13, 2010
+ * Corey Hart @ http://www.codenothing.com
+ */ 
+(function( $, window, undefined ) {
+
+	// Expose autoComplete to the jQuery chain
+	$.fn.autoComplete = function() {
+		// Force array of arguments
+		var args = Slice.call( arguments ),
+			self = this, 
+			first = args.shift(),
+			isMethod = typeof first === 'string',
+			handler, el;
+
+		// Deep namespacing is not supported in jQuery, a mistake I made in v4.1
+		if ( isMethod ) {
+			first = first.replace( rdot, '-' );
+		}
+		
+		// Allow for passing array of arguments, or multiple arguments
+		// Eg: .autoComplete('trigger', [arg1, arg2, arg3...]) or .autoComplete('trigger', arg1, arg2, arg3...)
+		// Mainly to allow for .autoComplete('trigger', arguments) to work
+		// Note*: Some triggers pass an array as the first param, so check against that first
+		args = ( AutoComplete.arrayMethods[ first ] === TRUE && $.isArray( args[0] ) && $.isArray( args[0][0] ) ) || 
+			( args.length === 1 && $.isArray( args[0] ) ) ? 
+				args[0] : args;
+
+		// Check method against handlers that need to use triggerHandler 
+		handler = isMethod && ( AutoComplete.handlerMethods[ first ] === -1 || args.length < ( AutoComplete.handlerMethods[ first ] || 0 ) ) ? 
+			'triggerHandler' : 'trigger';
+
+		return isMethod ?
+			self[ handler ]( 'autoComplete.' + first, args ) :
+
+			// Allow passing a jquery event special object {from $.Event()}
+			first && first.preventDefault !== undefined ? self.trigger( first, args ) :
+
+			// Initiate the autocomplete on each element (Only takes a single argument, the options object)
+			self.each(function(){
+				if ( $( el = this ).data( 'autoComplete' ) !== TRUE ) {
+					AutoCompleteFunction( el, first );
+				}
+			});
+	};
+
+	// bgiframe is needed to fix z-index problem for IE6 users.
+	$.fn.bgiframe = $.fn.bgiframe ? $.fn.bgiframe : $.fn.bgIframe ? $.fn.bgIframe : function() {
+		// For applications that don't have bgiframe plugin installed, create a useless 
+		// function that doesn't break the chain
+		return this;
+	};
+
+	// Allows for single event binding to document and forms associated with the autoComplete inputs
+	// by deferring the event to the input in focus
+	function setup( $input, inputIndex ) {
+		if ( setup.flag !== TRUE ) {
+			setup.flag = TRUE;
+			rootjQuery.bind( 'click.autoComplete', function( event ) {
+				AutoComplete.getFocus( TRUE ).trigger( 'autoComplete.document-click', [ event ] );
+			});
+		}
+
+		var $form = $input.closest( 'form' ), formList = $form.data( 'ac-inputs' ) || {}, $el;
+
+		formList[ inputIndex ] = TRUE;
+		$form.data( 'ac-inputs', formList );
+
+		if ( $form.data( 'autoComplete' ) !== TRUE ) {
+			$form.data( 'autoComplete', TRUE ).bind( 'submit.autoComplete', function( event ) {
+				return ( $el = AutoComplete.getFocus( TRUE ) ).length ?
+					$el.triggerHandler( 'autoComplete.form-submit', [ event, this ] ) :
+					TRUE;
+			});
+		}
+	}
+
+	// Removes the single events attached to the document and respective input form
+	function teardown( $input, inputIndex ) {
+		AutoComplete.remove( inputIndex );
+
+		if ( setup.flag === TRUE && AutoComplete.length === 0 ) {
+			setup.flag = FALSE;
+			rootjQuery.unbind( 'click.autoComplete' );
+		}
+
+		var $form = $input.closest( 'form' ), formList = $form.data( 'ac-inputs' ) || {}, i;
+
+		formList[ inputIndex ] = FALSE;
+		for ( i in formList ) {
+			if ( formList.hasOwnProperty( i ) && formList[ i ] === TRUE ) {
+				return;
+			}
+		}
+
+		$form.unbind( 'submit.autoComplete' );
+	}
+
+	// Default function for adding all supply items to the list
+	function allSupply( event, ui ) {
+		if ( ! $.isArray( ui.supply ) ) {
+			return [];
+		}
+
+		for ( var i = -1, l = ui.supply.length, ret = [], entry; ++i < l; ) {
+			entry = ui.supply[ i ];
+			entry = entry && entry.value ? entry : { value: entry };
+			ret.push( entry );
+		}
+
+		return ret;
+	}
+
+
+
+// Internals
+var
+	// Munging
+	TRUE = true,
+	FALSE = false,
+
+	// Copy of the slice prototype
+	Slice = Array.prototype.slice,
+
+	// Make a copy of the document element for caching
+	rootjQuery = $( window.document ),
+
+	// Also make a copy of an empty jQuery set for fast referencing
+	emptyjQuery = $( ),
+
+	// regex's
+	rdot = /\./,
+
+	// Opera and Firefox on Mac need to use the keypress event to track holding of
+	// a key down and not releasing
+	keypress = window.opera || ( /macintosh/i.test( window.navigator.userAgent ) && $.browser.mozilla ),
+
+	// Event flag that gets passed around
+	ExpandoFlag = 'autoComplete_' + $.expando,
+
+	// Make a local copy of the key codes used throughout the plugin
+	KEY = {
+		backspace: 8,
+		tab: 9,
+		enter: 13,
+		shift: 16,
+		space: 32,
+		pageup: 33,
+		pagedown: 34,
+		left: 37,
+		up: 38,
+		right: 39,
+		down: 40
+	},
+
+	// Attach global aspects to jQuery itself
+	AutoComplete = $.autoComplete = {
+		// Autocomplete Version
+		version: '5.1',
+
+		// Index Counter
+		counter: 0,
+
+		// Length of stack
+		length: 0,
+
+		// Storage of elements
+		stack: {},
+
+		// jQuery object versions of the storage elements
+		jqStack: {},
+
+		// Storage order of uid's
+		order: [],
+
+		// Global access to elements in use
+		hasFocus: FALSE,
+
+		// Expose the used keycodes
+		keys: KEY,
+
+		// Methods whose first argument may contain an array
+		arrayMethods: {
+			'button-supply': TRUE,
+			'direct-supply': TRUE
+		},
+
+		// Defines the maximum number of arguments that can be passed for using
+		// triggerHandler method instead of trigger. Passing -1 forces triggerHandler
+		// no matter the number of arguments
+		handlerMethods: {
+			'option': 2
+		},
+
+		// Events triggered whenever one of the autoComplete
+		// input's come into focus or blur out.
+		focus: undefined,
+		blur: undefined,
+
+		// Allow access to jquery cached object versions of the elements
+		getFocus: function( jqStack ) {
+			return ! AutoComplete.order[0] ? jqStack ? emptyjQuery : undefined :
+				jqStack ? AutoComplete.jqStack[ AutoComplete.order[0] ] :
+				AutoComplete.stack[ AutoComplete.order[0] ];
+		},
+
+		getPrevious: function( jqStack ) {
+			// Removing elements cause some indexs on the order stack
+			// to become undefined, so loop until one is found
+			for ( var i = 0, l = AutoComplete.order.length; ++i < l; ) {
+				if ( AutoComplete.order[i] ) {
+					return jqStack ?
+						AutoComplete.jqStack[ AutoComplete.order[i] ] :
+						AutoComplete.stack[ AutoComplete.order[i] ];
+				}
+			}
+
+			return jqStack ? emptyjQuery : undefined;
+		},
+
+		remove: function( n ) {
+			for ( var i = -1, l = AutoComplete.order.length; ++i < l; ) {
+				if ( AutoComplete.order[i] === n ) {
+					AutoComplete.order[i] = undefined;
+				}
+			}
+
+			AutoComplete.length--;
+			delete AutoComplete.stack[n];
+		},
+
+		// Returns full stack in jQuery form
+		getAll: function(){
+			for ( var i = -1, l = AutoComplete.counter, stack = []; ++i < l; ) {
+				if ( AutoComplete.stack[i] ) {
+					stack.push( AutoComplete.stack[i] );
+				}
+			}
+			return $( stack );
+		},
+
+		defaults: {
+			// To smooth upgrade process to 5.x, set backwardsCompatible to true
+			backwardsCompatible: FALSE,
+			// Server Script Path
+			ajax: 'ajax.php',
+			ajaxCache: $.ajaxSettings.cache,
+			// Data Configuration
+			dataSupply: [],
+			dataFn: undefined,
+			formatSupply: undefined,
+			// Drop List CSS
+			list: 'auto-complete-list',
+			rollover: 'auto-complete-list-rollover',
+			width: undefined, // Defined as inputs width when extended (can be overridden with this global/options/meta)
+			striped: undefined,
+			maxHeight: undefined,
+			bgiframe: undefined,
+			newList: FALSE,
+			// Post Data
+			postVar: 'value',
+			postData: {},
+			postFormat: undefined,
+			// Limitations
+			minChars: 1,
+			maxItems: -1,
+			maxRequests: 0,
+			maxRequestsDeep: FALSE,
+			requestType: 'POST',
+			// Input
+			inputControl: undefined,
+			autoFill: FALSE,
+			nonInput: [ KEY.shift, KEY.left, KEY.right ],
+			multiple: FALSE,
+			multipleSeparator: ' ',
+			// Events
+			onBlur: undefined,
+			onFocus: undefined,
+			onHide: undefined,
+			onLoad: undefined,
+			onMaxRequest: undefined,
+			onRollover: undefined,
+			onSelect: undefined,
+			onShow: undefined,
+			onListFormat: undefined,
+			onSubmit: undefined,
+			spinner: undefined,
+			preventEnterSubmit: TRUE,
+			delay: 0,
+			// Caching Options
+			useCache: TRUE,
+			cacheLimit: 50
+		}
+	},
+
+	// Autocomplete function
+	AutoCompleteFunction = function( self, options ) {
+		// Start with counters as they are used within declarations
+		AutoComplete.length++;
+		AutoComplete.counter++;
+
+		// Input specific vars
+		var $input = $( self ).attr( 'autocomplete', 'off' ),
+			// Data object stored on 'autoComplete' data namespace of input
+			ACData = {},
+			// Track every event triggered
+			LastEvent = {},
+			// String of current input value
+			inputval = '',
+			// Holds the current list
+			currentList = [],
+			// Place holder for all list elements
+			$elems = { length: 0 },
+			// Place holder for the list element in focus
+			$li,
+			// View and heights for scrolling
+			view, ulHeight, liHeight, liPerView,
+			// Hardcoded value for ul visiblity
+			ulOpen = FALSE,
+			// Timer for delay
+			timeid,
+			// Ajax requests holder
+			xhr,
+			// li element in focus, and its data
+			liFocus = -1, liData,
+			// Fast referencing for multiple selections
+			separator,
+			// Index of current input
+			inputIndex = AutoComplete.counter,
+			// Number of requests made
+			requests = 0,
+			// Internal Per Input Cache
+			cache = {
+				length: 0,
+				val: undefined,
+				list: {}
+			},
+
+			// Merge defaults with passed options and metadata options
+			settings = $.extend(
+				{ width: $input.outerWidth() },
+				AutoComplete.defaults, 
+				options||{},
+				$.metadata ? $input.metadata() : {}
+			),
+
+			// Create the drop list (Use an existing one if possible)
+			$ul = ! settings.newList && rootjQuery.find( 'ul.' + settings.list )[ 0 ] ?
+				rootjQuery.find( 'ul.' + settings.list ).eq( 0 ).bgiframe( settings.bgiframe ) :
+				$('<ul/>').appendTo('body').addClass( settings.list ).bgiframe( settings.bgiframe ).hide().data( 'ac-selfmade', TRUE );
+
+
+		// Start Binding
+		$input.data( 'autoComplete', ACData = {
+			index: inputIndex,
+			hasFocus: FALSE,
+			active: TRUE,
+			settings: settings,
+			initialSettings: $.extend( TRUE, {}, settings )
+		});
+
+		// IE catches the enter key only on keypress/keyup, so add a helper
+		// to track that event if needed
+		if ( $.browser.msie ) {
+			$input.bind( 'keypress.autoComplete', function( event ) {
+				if ( ! ACData.active ) {
+					return TRUE;
+				}
+
+				if ( event.keyCode === KEY.enter ) {
+					var enter = TRUE;
+
+					// See entertracking on main key(press/down) event for explanation
+					if ( $li && $li.hasClass( settings.rollover ) ) {
+						enter = settings.preventEnterSubmit && ulOpen ? FALSE : TRUE;
+						select( event );
+					}
+					else if ( ulOpen ) { 
+						$ul.hide( event );
+					}
+
+					return enter;
+				}
+			});
+		}
+
+
+		// Opera && firefox on Mac use keypress to track holding down of key, 
+		// while everybody else uses keydown for same functionality
+		$input.bind( keypress ? 'keypress.autoComplete' : 'keydown.autoComplete' , function( event ) {
+			// If autoComplete has been disabled, prevent input events
+			if ( ! ACData.active ) {
+				return TRUE;
+			}
+
+			// Track last event and store code for munging
+			var key = ( LastEvent = event ).keyCode, enter = FALSE;
+
+
+			// Tab Key
+			if ( key === KEY.tab && ulOpen ) {
+				select( event );
+			}
+			// Enter Key
+			else if ( key === KEY.enter ) {
+				// When tracking whether to submit the form or not, we have
+				// to ensure that the user is actually selecting an element from the drop
+				// down list. It no element is selected, then hide the list and track form
+				// submission. If an element is selected, then track for submission first, 
+				// then hide the list.
+				enter = TRUE;
+				if ( $li && $li.hasClass( settings.rollover ) ) {
+					enter = settings.preventEnterSubmit && ulOpen ? FALSE : TRUE;
+					select( event );
+				}
+				else if ( ulOpen ) { 
+					$ul.hide( event );
+				}
+			}
+			// Up Arrow
+			else if ( key === KEY.up && ulOpen ) {
+				if ( liFocus > 0 ) {
+					liFocus--;
+					up( event );
+				} else {
+					liFocus = -1;
+					$input.val( inputval );
+					$ul.hide( event );
+				}
+			}
+			// Down Arrow
+			else if ( key === KEY.down && ulOpen ) {
+				if ( liFocus < $elems.length - 1 ) {
+					liFocus++;
+					down( event );
+				}
+			}
+			// Page Up
+			else if ( key === KEY.pageup && ulOpen ) {
+				if ( liFocus > 0 ) {
+					liFocus -= liPerView;
+
+					if ( liFocus < 0 ) {
+						liFocus = 0;
+					}
+
+					up( event );
+				}
+			}
+			// Page Down
+			else if ( key === KEY.pagedown && ulOpen ) {
+				if ( liFocus < $elems.length - 1 ) {
+					liFocus += liPerView;
+
+					if ( liFocus > $elems.length - 1 ) {
+						liFocus = $elems.length - 1;
+					}
+
+					down( event );
+				}
+			}
+			// Check for non input values defined by user
+			else if ( settings.nonInput && $.inArray( key, settings.nonInput ) > -1 ) {
+				$ul.html('').hide( event );
+				enter = TRUE;
+			}
+			// Everything else is considered possible input, so
+			// return before keyup prevention flag is set
+			else {
+				return TRUE;
+			}
+
+			// Prevent autoComplete keyup event's from triggering by
+			// attaching a flag to the last event
+			LastEvent[ 'keydown_' + ExpandoFlag ] = TRUE;
+			return enter;
+		})
+		.bind({
+			'keyup.autoComplete': function( event ) {
+				// If autoComplete has been disabled or keyup prevention 
+				// flag has be set, prevent input events
+				if ( ! ACData.active || LastEvent[ 'keydown_' + ExpandoFlag ] ) {
+					return TRUE;
+				}
+
+				// If no special operations were run on keydown,
+				// allow for regular text searching
+				inputval = $input.val();
+				var key = ( LastEvent = event ).keyCode, val = separator ? inputval.split( separator ).pop() : inputval;
+
+				// Still check to make sure 'enter' wasn't pressed
+				if ( key != KEY.enter ) {
+
+					// Caching key value
+					cache.val = settings.inputControl === undefined ? val : 
+						settings.inputControl.apply( self, settings.backwardsCompatible ? 
+							[ val, key, $ul, event, settings, cache ] :
+							[ event, {
+								val: val,
+								key: key,
+								settings: settings,
+								cache: cache,
+								ul: $ul
+							}]
+						);
+
+					// Only send request if character length passes
+					if ( cache.val.length >= settings.minChars ) {
+						sendRequest( event, settings, cache, ( key === KEY.backspace || key === KEY.space ) );
+					}
+					// Remove list on backspace of small string
+					else if ( key == KEY.backspace ) {
+						$ul.html('').hide( event );
+					}
+				}
+			},
+
+			'blur.autoComplete': function( event ) {
+				// If autoComplete has been disabled or the drop list
+				// is still open, prevent input events
+				if ( ! ACData.active || ulOpen ) {
+					return TRUE;
+				}
+
+				// Only push undefined index onto order stack
+				// if not already there (in-case multiple blur events occur)
+				if ( AutoComplete.order[0] !== undefined ) {
+					AutoComplete.order.unshift( undefined );
+				}
+
+				// Expose focus
+				AutoComplete.hasFocus = FALSE;
+				ACData.hasFocus = FALSE;
+				liFocus = -1;
+				$ul.hide( LastEvent = event );
+
+				// Trigger both the global and element specific blur events
+				if ( AutoComplete.blur ) {
+					AutoComplete.blur.call( self, event, { settings: settings, cache: cache, ul: $ul } );
+				}
+
+				if ( settings.onBlur ) {
+					settings.onBlur.apply( self, settings.backwardsCompatible ?
+						[ inputval, $ul, event, settings, cache ] : [ event, {
+							val: inputval,
+							settings: settings,
+							cache: cache,
+							ul: $ul
+						}]
+					);
+				}
+			},
+
+			'focus.autoComplete': function( event, flag ) {
+				// Prevent inner focus events if caused by autoComplete inner functionality
+				// Also, because IE triggers focus AND closes the drop list before form submission,
+				// keep the select flag by not reseting the last event
+				if ( ! ACData.active || ( ACData.hasFocus && flag === ExpandoFlag ) || LastEvent[ 'enter_' + ExpandoFlag ] ) {
+					return TRUE;
+				}
+
+				if ( inputIndex !== $ul.data( 'ac-input-index' ) ) {
+					$ul.html('').hide( event );
+				}
+
+				// Overwrite undefined index pushed on by the blur event
+				if ( AutoComplete.order[0] === undefined ) {
+					if ( AutoComplete.order[1] === inputIndex ) {
+						AutoComplete.order.shift();
+					} else {
+						AutoComplete.order[0] = inputIndex;
+					}
+				}
+				else if ( AutoComplete.order[0] != inputIndex && AutoComplete.order[1] != inputIndex ) {
+					AutoComplete.order.unshift( inputIndex );
+				}
+
+				if ( AutoComplete.defaults.cacheLimit !== -1 && AutoComplete.order.length > AutoComplete.defaults.cacheLimit ) {
+					AutoComplete.order.pop();
+				}
+
+				// Expose focus
+				AutoComplete.hasFocus = TRUE;
+				ACData.hasFocus = TRUE;
+				LastEvent = event;
+
+				// Trigger both the global and element specific focus events
+				if ( AutoComplete.focus ) {
+					AutoComplete.focus.call( self, event, { settings: settings, cache: cache, ul: $ul } );
+				}
+
+				if ( settings.onFocus ) {
+					settings.onFocus.apply( self, 
+						settings.backwardsCompatible ? [ $ul, event, settings, cache ] : [ event, {
+							settings: settings,
+							cache: cache,
+							ul: $ul
+						}]
+					);
+				}
+			},
+
+			/**
+			 * Autocomplete Custom Methods (Extensions off autoComplete event)
+			 */ 
+			// Catches document click events from the global scope
+			'autoComplete.document-click': function( e, event ) {
+				if ( ACData.active && ulOpen &&
+					// Double check the event timestamps to ensure there isn't a delayed reaction from a button
+					( ! LastEvent || event.timeStamp - LastEvent.timeStamp > 200 ) && 
+					// Check the target after all other checks are passed (less processing)
+					$( event.target ).closest( 'ul' ).data( 'ac-input-index' ) !== inputIndex ) {
+						$ul.hide( LastEvent = event );
+						$input.blur();
+				}
+			},
+
+			// Catches form submission ( so only one event is attached to the form )
+			'autoComplete.form-submit': function( e, event, form ) {
+				if ( ! ACData.active ) {
+					return TRUE;
+				}
+
+				LastEvent = event;
+
+				// Because IE triggers focus AND closes the drop list before form submission,
+				// tracking enter is set on the keydown event
+				return settings.preventEnterSubmit && ( ulOpen || LastEvent[ 'enter_' + ExpandoFlag ] ) ? FALSE : 
+					settings.onSubmit === undefined ? TRUE : 
+					settings.onSubmit.call( self, event, { form: form, settings: settings, cache: cache, ul: $ul } );
+			},
+
+			// Catch mouseovers on the drop down element
+			'autoComplete.ul-mouseenter': function( e, event, li ) {
+				if ( $li ) {
+					$li.removeClass( settings.rollover );
+				}
+
+				$li = $( li ).addClass( settings.rollover );
+				liFocus = $elems.index( li );
+				liData = currentList[ liFocus ];
+				view = $ul.scrollTop() + ulHeight;
+				LastEvent = event;
+
+				if ( settings.onRollover ) {
+					settings.onRollover.apply( self, settings.backwardsCompatible ? 
+						[ liData, $li, $ul, event, settings, cache ] : 
+						[ event, {
+							data: liData,
+							li: $li,
+							settings: settings,
+							cache: cache,
+							ul: $ul
+						}]
+					);
+				}
+			},
+
+			// Catch click events on the drop down
+			'autoComplete.ul-click': function( e, event ) {
+				// Refocus the input box and pass flag to prevent inner focus events
+				$input.trigger( 'focus', [ ExpandoFlag ] );
+
+				// Check against separator for input value
+				$input.val( inputval === separator ? 
+					inputval.substr( 0, inputval.length - inputval.split( separator ).pop().length ) + liData.value + separator :
+					liData.value 
+				);
+
+				$ul.hide( LastEvent = event );
+				autoFill();
+
+				if ( settings.onSelect ) {
+					settings.onSelect.apply( self, settings.backwardsCompatible ? 
+						[ liData, $li, $ul, event, settings, cache ] :
+						[ event, {
+							data: liData,
+							li: $li,
+							settings: settings,
+							cache: cache,
+							ul: $ul
+						}]
+					);
+				}
+			},
+
+			// Allow for change of settings at any point
+			'autoComplete.settings': function( event, newSettings ) {
+				if ( ! ACData.active ) {
+					return TRUE;
+				}
+
+				var ret, $el;
+				LastEvent = event;
+
+				// Give access to current settings and cache
+				if ( $.isFunction( newSettings ) ) {
+					ret = newSettings.apply( self, settings.backwardsCompatible ? 
+						[ settings, cache, $ul, event ] : [ event, { settings: settings, cache: cache, ul: $ul } ]
+					);
+
+					// Allow for extending of settings/cache based off function return values
+					if ( $.isArray( ret ) && ret[0] !== undefined ) {
+						$.extend( TRUE, settings, ret[0] || settings );
+						$.extend( TRUE, cache, ret[1] || cache );
+					}
+				} else {
+					$.extend( TRUE, settings, newSettings || {} );
+				}
+
+				// Change the drop down if dev want's a differen't class attached
+				$ul = ! settings.newList && $ul.hasClass( settings.list ) ? $ul : 
+					! settings.newList && ( $el = rootjQuery.find( 'ul.' + settings.list ).eq( 0 ) ).length ? 
+						$el.bgiframe( settings.bgiframe ) :
+						$('<ul/>').appendTo('body').addClass( settings.list )
+							.bgiframe( settings.bgiframe ).hide().data( 'ac-selfmade', TRUE );
+
+				// Custom drop list modifications
+				newUl();
+
+				// Change case here so it doesn't have to be done on every request
+				settings.requestType = settings.requestType.toUpperCase();
+
+				// Local copy of the seperator for faster referencing
+				separator = settings.multiple ? settings.multipleSeparator : undefined;
+
+				// Just to be sure, reset the settings object into the data storage
+				ACData.settings = settings;
+			},
+
+			// Clears the Cache & requests (requests can be blocked from clearing)
+			'autoComplete.flush': function( event, cacheOnly ) {
+				if ( ! ACData.active ) {
+					return TRUE;
+				}
+				
+				if ( ! cacheOnly ) {
+					requests = 0;
+				}
+
+				cache = { length: 0, val: undefined, list: {} };
+				LastEvent = event;
+			},
+
+			// External button trigger for ajax requests
+			'autoComplete.button-ajax': function( event, postData, cacheName ) {
+				if ( ! ACData.active ) {
+					return TRUE;
+				}
+
+				if ( typeof postData === 'string' ) {
+					cacheName = postData;
+					postData = {};
+				}
+
+				// Save off the last event before triggering focus on the off-chance
+				// it is needed by a secondary focus event
+				LastEvent = event;
+
+				// Refocus the input box, but pass flag to prevent inner focus events
+				$input.trigger( 'focus', [ ExpandoFlag ] );
+
+				// If no cache name is given, supply a non-common word
+				cache.val = cacheName || 'button-ajax_' + ExpandoFlag;
+
+				return sendRequest(
+					event, 
+					$.extend( TRUE, {}, settings, { maxItems: -1, postData: postData || {} } ),
+					cache
+				);
+			},
+
+			// External button trigger for supplied data
+			'autoComplete.button-supply': function( event, data, cacheName ) {
+				if ( ! ACData.active ) {
+					return TRUE;
+				}
+
+				if ( typeof data === 'string' ) {
+					cacheName = data;
+					data = undefined;
+				}
+
+				// Again, save off event before triggering focus
+				LastEvent = event;
+
+				// Refocus the input box and pass flag to prevent inner focus events
+				$input.trigger( 'focus', [ ExpandoFlag ] );
+
+				// If no cache name is given, supply a non-common word
+				cache.val = cacheName || 'button-supply_' + ExpandoFlag;
+
+				// If no data is supplied, use data in settings
+				data = $.isArray( data ) ? data : settings.dataSupply;
+
+				return sendRequest(
+					event,
+					$.extend( TRUE, {}, settings, { maxItems: -1, dataSupply: data, formatSupply: allSupply } ),
+					cache
+				);
+			},
+
+			// Supply list directly into the result function
+			'autoComplete.direct-supply': function( event, data, cacheName ) {
+				if ( ! ACData.active ) {
+					return TRUE;
+				}
+
+				if ( typeof data === 'string' ) {
+					cacheName = data;
+					data = undefined;
+				}
+
+				// Again, save off event before triggering focus
+				LastEvent = event;
+
+				// Refocus the input box and pass flag to prevent inner focus events
+				$input.trigger( 'focus', [ ExpandoFlag ] );
+
+				// If no cache name is given, supply a non-common word
+				cache.val = cacheName || 'direct-supply_' + ExpandoFlag;
+
+				// If no data is supplied, use data in settings
+				data = $.isArray( data ) && data.length ? data : settings.dataSupply;
+
+				// Load the results directly into the results function bypassing request holdups
+				return loadResults(
+					event,
+					data,
+					$.extend( TRUE, {}, settings, { maxItems: -1, dataSupply: data, formatSupply: allSupply } ),
+					cache
+				);
+			},
+
+			// Triggering autocomplete programatically
+			'autoComplete.search': function( event, value ) {
+				if ( ! ACData.active ) {
+					return TRUE;
+				}
+
+				cache.val = value || '';
+				return sendRequest( LastEvent = event, settings, cache );
+			},
+
+			// Add jquery-ui like option access
+			'autoComplete.option': function( event, name, value ) {
+				if ( ! ACData.active ) {
+					return TRUE;
+				}
+
+				LastEvent = event;
+				switch ( Slice.call( arguments ).length ) {
+					case 3: 
+						settings[ name ] = value;
+						return value;
+					case 2:
+						return name === 'ul' ? $ul :
+							name === 'cache' ? cache :
+							name === 'xhr' ? xhr :
+							name === 'input' ? $input :
+							settings[ name ] || undefined;
+					default:
+						return settings;
+				}
+			},
+
+			// Add enabling event (only applicable after disable)
+			'autoComplete.enable': function( event ) {
+				ACData.active = TRUE;
+				LastEvent = event;
+			},
+
+			// Add disable event
+			'autoComplete.disable': function( event ) {
+				ACData.active = FALSE;
+				$ul.html('').hide( LastEvent = event );
+			},
+
+			// Add a destruction function
+			'autoComplete.destroy': function( event ) {
+				var list = $ul.html('').hide( LastEvent = event ).data( 'ac-inputs' ) || {}, i;
+
+				// Remove all autoComplete specific data and events
+				$input.removeData( 'autoComplete' ).unbind( '.autoComplete autoComplete' );
+
+				// Remove form/drop list/document event catchers if possible
+				teardown( $input, inputIndex );
+
+				// Remove input from the drop down element of inputs
+				list[ inputIndex ] = undefined;
+
+				// Go through the drop down element and see if any other inputs are attached to it
+				for ( i in list ) {
+					if ( list.hasOwnProperty( i ) && list[ i ] === TRUE ) {
+						return LastEvent;
+					}
+				}
+
+				// Remove the element from the DOM if self created
+				if ( $ul.data( 'ac-selfmade' ) === TRUE ) {
+					$ul.remove();
+				}
+				// Kill all data associated with autoComplete for a cleaned drop down element
+				else {
+					$ul.removeData( 'autoComplete' ).removeData( 'ac-input-index' ).removeData( 'ac-inputs' );
+				}
+			}
+		});
+
+		// Ajax/Cache Request
+		function sendRequest( event, settings, cache, backSpace, timeout ) {
+			// Merely setting max requests still allows usage of cache and supplied data,
+			// this 'Deep' option prevents those scenarios if needed
+			if ( settings.maxRequestsDeep === true && requests >= settings.maxRequests ) {
+				return FALSE;
+			}
+
+			if ( settings.spinner ) {
+				settings.spinner.call( self, event, { active: TRUE, settings: settings, cache: cache, ul: $ul } );
+			}
+
+			if ( timeid ) {
+				timeid = clearTimeout( timeid );
+			}
+
+			// Call send request again with timeout flag if on delay
+			if ( settings.delay > 0 && timeout === undefined ) {
+				timeid = window.setTimeout(function(){
+					sendRequest( event, settings, cache, backSpace, TRUE );
+				}, settings.delay );
+				return timeid;
+			}
+
+			// Abort previous request incase it's still running
+			if ( xhr ) {
+				xhr.abort();
+			}
+
+			// Load from cache if possible
+			if ( settings.useCache && $.isArray( cache.list[ cache.val ] ) ) {
+				return loadResults( event, cache.list[ cache.val ], settings, cache, backSpace );
+			}
+
+			// Use user supplied data when defined
+			if ( settings.dataSupply.length ) {
+				return userSuppliedData( event, settings, cache, backSpace );
+			}
+
+			// Check Max requests first before sending request
+			if ( settings.maxRequests && ++requests >= settings.maxRequests ) {
+				$ul.html('').hide( event );
+
+				if ( settings.spinner ) {
+					settings.spinner.call( self, event, { active: FALSE, settings: settings, cache: cache, ul: $ul } );
+				}
+
+				if ( settings.onMaxRequest && requests === settings.maxRequests ) {
+					return settings.onMaxRequest.apply( self, settings.backwardsCompatible ? 
+						[ cache.val, $ul, event, inputval, settings, cache ] : 
+						[ event, {
+							search: cache.val,
+							val: inputval,
+							settings: settings,
+							cache: cache,
+							ul: $ul
+						}]
+					);
+				}
+				
+				return FALSE;
+			}
+
+			settings.postData[ settings.postVar ] = cache.val;
+			xhr = $.ajax({
+				type: settings.requestType,
+				url: settings.ajax,
+				cache: settings.ajaxCache,
+				dataType: 'json',
+
+				// Send personalised data
+				data: settings.postFormat ?
+					settings.postFormat.call( self, event, {
+						data: settings.postData,
+						search: cache.val,
+						val: inputval,
+						settings: settings,
+						cache: cache,
+						ul: $ul
+					}) :
+					settings.postData,
+
+				success: function( list ) {
+					loadResults( event, list, settings, cache, backSpace );
+				},
+
+				error: function() {
+					$ul.html('').hide( event );
+					if ( settings.spinner ) {
+						settings.spinner.call( self, event, { active: FALSE, settings: settings, cache: cache, ul: $ul } );
+					}
+				}
+			});
+
+			return xhr;
+		}
+
+		// Parse User Supplied Data
+		function userSuppliedData( event, settings, cache, backSpace ) {
+			var list = [], args = [],
+				fn = $.isFunction( settings.dataFn ),
+				regex = fn ? undefined : new RegExp( '^'+cache.val, 'i' ),
+				items = 0, entry, i = -1, l = settings.dataSupply.length;
+
+			if ( settings.formatSupply ) {
+				list = settings.formatSupply.call( self, event, {
+					search: cache.val,
+					supply: settings.dataSupply,
+					settings: settings,
+					cache: cache,
+					ul: $ul
+				});
+			} else {
+				for ( ; ++i < l ; ) {
+					// Force object wrapper for entry
+					entry = settings.dataSupply[i];
+					entry = entry && typeof entry.value === 'string' ? entry : { value: entry };
+
+					// Setup arguments for dataFn in a backwards compatible way if needed
+					args = settings.backwardsCompatible ? 
+						[ cache.val, entry.value, list, i, settings.dataSupply, $ul, event, settings, cache ] :
+						[ event, {
+							search: cache.val,
+							entry: entry.value,
+							list: list,
+							i: i,
+							supply: settings.dataSupply,
+							settings: settings,
+							cache: cache,
+							ul: $ul
+						}];
+
+					// If user supplied function, use that, otherwise test with default regex
+					if ( ( fn && settings.dataFn.apply( self, args ) ) || ( ! fn && entry.value.match( regex ) ) ) {
+						// Reduce browser load by breaking on limit if it exists
+						if ( settings.maxItems > -1 && ++items > settings.maxItems ) {
+							break;
+						}
+						list.push( entry );
+					}
+				}
+			}
+
+			// Use normal load functionality
+			return loadResults( event, list, settings, cache, backSpace );
+		}
+
+		// Key element Selection
+		function select( event ) {
+			// Ensure the select function only gets fired when list of open
+			if ( ulOpen ) {
+				if ( settings.onSelect ) {
+					settings.onSelect.apply( self, settings.backwardsCompatible ? 
+						[ liData, $li, $ul, event, settings, cache ] :
+						[ event, {
+							data: liData,
+							li: $li,
+							settings: settings,
+							cache: cache,
+							ul: $ul
+						}]
+					);
+				}
+
+				autoFill();
+				inputval = $input.val();
+
+				// Because IE triggers focus AND closes the drop list before form submission
+				// attach a flag on 'enter' selection
+				if ( LastEvent.type === 'keydown' ) {
+					LastEvent[ 'enter_' + ExpandoFlag ] = TRUE;
+				}
+
+				$ul.hide( event );
+			}
+
+			$li = undefined;
+		}
+
+		// Key direction up
+		function up( event ) {
+			if ( $li ) {
+				$li.removeClass( settings.rollover );
+			}
+
+			$ul.show( event );
+			$li = $elems.eq( liFocus ).addClass( settings.rollover );
+			liData = currentList[ liFocus ];
+
+			if ( ! $li.length || ! liData ) {
+				return FALSE;
+			}
+
+			autoFill( liData.value );
+			if ( settings.onRollover ) {
+				settings.onRollover.apply( self, settings.backwardsCompatible ? 
+					[ liData, $li, $ul, event, settings, cache ] :
+					[ event, {
+						data: liData,
+						li: $li,
+						settings: settings,
+						cache: cache,
+						ul: $ul
+					}]
+				);
+			}
+
+			// Scrolling
+			var scroll = liFocus * liHeight;
+			if ( scroll < view - ulHeight ) {
+				view = scroll + ulHeight;
+				$ul.scrollTop( scroll );
+			}
+		}
+
+		// Key direction down
+		function down( event ) {
+			if ( $li ) {
+				$li.removeClass( settings.rollover );
+			}
+
+			$ul.show( event );
+			$li = $elems.eq( liFocus ).addClass( settings.rollover );
+			liData = currentList[ liFocus ];
+
+			if ( ! $li.length || ! liData ) {
+				return FALSE;
+			}
+
+			autoFill( liData.value );
+
+			// Scrolling
+			var scroll = ( liFocus + 1 ) * liHeight;
+			if ( scroll > view ) {
+				$ul.scrollTop( ( view = scroll ) - ulHeight );
+			}
+
+			if ( settings.onRollover ) {
+				settings.onRollover.apply( self, settings.backwardsCompatible ? 
+					[ liData, $li, $ul, event, settings, cache ] : [ event, {
+						data: liData,
+						li: $li,
+						settings: settings,
+						cache: cache,
+						ul: $ul
+					}]
+				);
+			}
+		}
+
+		// Attach new show/hide functionality to only the ul object (so not to infect all of jQuery),
+		// And also attach event handlers if not already done so
+		function newUl() {
+			var hide = $ul.hide, show = $ul.show, list = $ul.data( 'ac-inputs' ) || {};
+
+			if ( ! $ul[ ExpandoFlag ] ) {
+				$ul.hide = function( event, speed, callback ) {
+					if ( settings.onHide && ulOpen ) {
+						settings.onHide.call( self, event, { ul: $ul, settings: settings, cache: cache } );
+					}
+
+					ulOpen = FALSE;
+					return hide.call( $ul, speed, callback );
+				};
+
+				$ul.show = function( event, speed, callback ) {
+					if ( settings.onShow && ! ulOpen ) {
+						settings.onShow.call( self, event, { ul: $ul, settings: settings, cache: cache } );
+					}
+
+					ulOpen = TRUE;
+					return show.call( $ul, speed, callback );
+				};
+
+				// A flag must be attached to the $ul cached object
+				$ul[ ExpandoFlag ] = TRUE;
+			}
+
+			// Attach global handlers for event delegation (So there is no more loss time in unbinding and rebinding)
+			if ( $ul.data( 'autoComplete' ) !== TRUE ) {
+				$ul.data( 'autoComplete', TRUE )
+				.delegate( 'li', 'mouseenter.autoComplete', function( event ) {
+					AutoComplete.getFocus( TRUE ).trigger( 'autoComplete.ul-mouseenter', [ event, this ] );
+				})
+				.bind( 'click.autoComplete', function( event ) {
+					AutoComplete.getFocus( TRUE ).trigger( 'autoComplete.ul-click', [ event ] );
+					return FALSE;
+				});
+			}
+
+			list[ inputIndex ] = TRUE;
+			$ul.data( 'ac-inputs', list );
+		}
+
+		// Auto-fill the input
+		// Credit to Jörn Zaefferer @ http://bassistance.de/jquery-plugins/jquery-plugin-autocomplete/
+		// and http://www.pengoworks.com/workshop/jquery/autocomplete.htm for this functionality
+		function autoFill( val ) {
+			var start, end, range;
+
+			// Set starting and ending points based on values
+			if ( val === undefined || val === '' ) {
+				start = end = $input.val().length;
+			} else {
+				if ( separator ) {
+					val = inputval.substr( 0, inputval.length - inputval.split( separator ).pop().length ) + val + separator;
+				}
+
+				start = inputval.length;
+				end = val.length;
+				$input.val( val );
+			}
+
+			// Create selection if allowed
+			if ( ! settings.autoFill || start > end ) {
+				return FALSE;
+			}
+			else if ( self.createTextRange ) {
+				range = self.createTextRange();
+				if ( val === undefined ) {
+					range.move( 'character', start );
+					range.select();
+				} else {
+					range.collapse( TRUE );
+					range.moveStart( 'character', start );
+					range.moveEnd( 'character', end );
+					range.select();
+				}
+			}
+			else if ( self.setSelectionRange ) {
+				self.setSelectionRange( start, end );
+			}
+			else if ( self.selectionStart ) {
+				self.selectionStart = start;
+				self.selectionEnd = end;
+			}
+		}
+
+		// List Functionality
+		function loadResults( event, list, settings, cache, backSpace ) {
+			// Allow another level of result handling
+			currentList = settings.onLoad ?
+				settings.onLoad.call( self, event, { list: list, settings: settings, cache: cache, ul: $ul } ) : list;
+
+			// Tell spinner function to stop if set
+			if ( settings.spinner ) {
+				settings.spinner.call( self, event, { active: FALSE, settings: settings, cache: cache, ul: $ul } );
+			}
+
+			// Store results into the cache if allowed
+			if ( settings.useCache && ! $.isArray( cache.list[ cache.val ] ) ) {
+				cache.length++;
+				cache.list[ cache.val ] = list;
+
+				// Clear cache if necessary
+				if ( settings.cacheLimit !== -1 && cache.length > settings.cacheLimit ) {
+					cache.list = {};
+					cache.length = 0;
+				}
+			}
+
+			// Ensure there is a list
+			if ( ! currentList || currentList.length < 1 ) {
+				return $ul.html('').hide( event );
+			}
+
+			// Refocus list element
+			liFocus = -1;
+
+			// Initialize Vars together (save bytes)
+			var offset = $input.offset(), // Input position
+				container = [], // Container for list elements
+				items = 0, i = -1, striped = FALSE, length = currentList.length; // Loop Items
+
+			if ( settings.onListFormat ) {
+				settings.onListFormat.call( self, event, { list: currentList, settings: settings, cache: cache, ul: $ul } );
+			}
+			else {
+				// Push items onto container
+				for ( ; ++i < length; ) {
+					if ( currentList[i].value ) {
+						if ( settings.maxItems > -1 && ++items > settings.maxItems ) {
+							break;
+						}
+
+						container.push(
+							settings.striped && striped ? '<li class="' + settings.striped + '">' : '<li>',
+							currentList[i].display || currentList[i].value,
+							'</li>'
+						);
+
+						striped = ! striped;
+					}
+				}
+				$ul.html( container.join('') );
+			}
+
+			// Cache the list items
+			$elems = $ul.children( 'li' );
+
+			// Autofill input with first entry
+			if ( settings.autoFill && ! backSpace ) {
+				liFocus = 0;
+				liData = currentList[ 0 ];
+				autoFill( liData.value );
+				$li = $elems.eq( 0 ).addClass( settings.rollover );
+			}
+
+			// Align the drop down element
+			$ul.data( 'ac-input-index', inputIndex ).scrollTop( 0 ).css({
+				top: offset.top + $input.outerHeight(),
+				left: offset.left,
+				width: settings.width
+			})
+			// The drop list has to be shown before maxHeight can be configured
+			.show( event );
+
+			// Log li height for less computation
+			liHeight = $elems.eq( 0 ).outerHeight();
+
+			// If Max Height specified, control it
+			if ( settings.maxHeight ) {
+				$ul.css({
+					height: liHeight * $elems.length > settings.maxHeight ? settings.maxHeight : 'auto', 
+					overflow: 'auto'
+				});
+			}
+
+			// ulHeight gets manipulated, so assign to viewport seperately 
+			// so referencing conflicts don't override viewport
+			ulHeight = $ul.outerHeight();
+			view = ulHeight;
+
+			// Number of elements per viewport
+			liPerView = liHeight === 0 ? 0 : Math.floor( view / liHeight );
+
+			// Include amount of time it took to load the list
+			// and run modifications
+			LastEvent.timeStamp = ( new Date() ).getTime();
+		}
+
+		// Custom modifications to the drop down element
+		newUl();
+
+		// Do case change on initialization so it's not run on every request
+		settings.requestType = settings.requestType.toUpperCase();
+
+		// Local quick copy of the seperator (so we don't have to run this check every time)
+		separator = settings.multiple ? settings.multipleSeparator : undefined;
+
+		// Expose copies of both the input element and the cached jQuery version
+		AutoComplete.stack[ inputIndex ] = self;
+		AutoComplete.jqStack[ inputIndex ] = $input;
+
+		// Form and Document event attachment
+		setup( $input, inputIndex );
+	};
+
+})( jQuery, window || this );

=== modified file 'website/views/website_templates.xml'
--- website/views/website_templates.xml	2014-02-21 10:47:25 +0000
+++ website/views/website_templates.xml	2014-02-26 06:23:38 +0000
@@ -271,7 +271,9 @@
         <script type="text/javascript" src="/website/static/lib/MutationObservers/test/sidetable.js"></script>
         <script type="text/javascript" src='/website/static/lib/nearest/jquery.nearest.js'></script>
         <script type="text/javascript" src="/website/static/lib/MutationObservers/MutationObserver.js"></script>
-
+		<!-- Add Auto complete Library -->
+		<script type="text/javascript" src="/website/static/lib/autocomplete/jquery.auto-complete.js"></script>
+        
         <script type="text/javascript" src="/website/static/src/js/website.editor.js"></script>
         <script type="text/javascript" src="/website/static/src/js/website.editor.newpage.js" groups="base.group_website_designer"></script>
         <script type="text/javascript" src="/website/static/src/js/website.menu.js" groups="base.group_website_designer"></script>

=== modified file 'website_quote/data/website_quotation_data.xml'
--- website_quote/data/website_quotation_data.xml	2014-01-25 23:25:25 +0000
+++ website_quote/data/website_quotation_data.xml	2014-02-26 06:23:38 +0000
@@ -63,7 +63,7 @@
             ${object.company_id.zip} ${object.company_id.city}<br/>
         % endif
         % if object.company_id.country_id:
-            ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>
+            ${object.company_id.state}<br/>
         % endif
         </span>
         % if object.company_id.phone:

=== modified file 'website_sale/controllers/main.py'
--- website_sale/controllers/main.py	2014-02-25 09:05:06 +0000
+++ website_sale/controllers/main.py	2014-02-26 06:23:38 +0000
@@ -15,11 +15,11 @@
 
 class CheckoutInfo(object):
     mandatory_billing_fields = ["name", "phone", "email", "street", "city", "country_id", "zip"]
-    optional_billing_fields = ["company", "state_id"]
+    optional_billing_fields = ["company", "state"]
     string_billing_fields = ["name", "phone", "email", "street", "city", "zip"]
 
     mandatory_shipping_fields = ["shipping_name", "shipping_phone", "shipping_street", "shipping_city", "shipping_country_id", "shipping_zip"]
-    optional_shipping_field = ["shipping_state_id"]
+    optional_shipping_field = ["shipping_state"]
     string_shipping_fields = ["shipping_name", "shipping_phone", "shipping_street", "shipping_city", "shipping_zip"]
 
     def mandatory_fields(self):
@@ -41,7 +41,6 @@
         else:
             prefix = 'shipping_'
         result = dict((prefix + field_name, getattr(partner, field_name)) for field_name in self.string_billing_fields if getattr(partner, field_name))
-        result[prefix + 'state_id'] = partner.state_id and partner.state_id.id or ''
         result[prefix + 'country_id'] = partner.country_id and partner.country_id.id or ''
         result[prefix + 'company'] = partner.parent_id and partner.parent_id.name or ''
         return result
@@ -406,14 +405,10 @@
         orm_country = registry.get('res.country')
         country_ids = orm_country.search(cr, SUPERUSER_ID, [], context=context)
         countries = orm_country.browse(cr, SUPERUSER_ID, country_ids, context)
-        state_orm = registry.get('res.country.state')
-        states_ids = state_orm.search(cr, SUPERUSER_ID, [], context=context)
-        states = state_orm.browse(cr, SUPERUSER_ID, states_ids, context)
 
         info = CheckoutInfo()
         values = {
             'countries': countries,
-            'states': states,
             'checkout': info.empty(),
             'shipping': post.get("shipping_different"),
             'error': {},
@@ -441,6 +436,16 @@
 
         return request.website.render("website_sale.checkout", values)
 
+    @http.route('/shop/get_country', type='json', auth='user', website=True)
+    def get_country(self, **post):
+        cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
+        orm_country = registry.get('res.country')
+        country_ids = orm_country.search(cr, uid, [], context=context)
+        countries = {}
+        for country in orm_country.browse(cr, uid, country_ids, context):
+            countries.update({country.id : country.name})
+        return countries
+    
     @http.route(['/shop/confirm_order/'], type='http', auth="public", website=True, multilang=True)
     def confirm_order(self, **post):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
@@ -459,16 +464,11 @@
         orm_partner = registry.get('res.partner')
         orm_user = registry.get('res.users')
         orm_country = registry.get('res.country')
-        country_ids = orm_country.search(cr, SUPERUSER_ID, [], context=context)
-        countries = orm_country.browse(cr, SUPERUSER_ID, country_ids, context)
-        orm_state = registry.get('res.country.state')
-        states_ids = orm_state.search(cr, SUPERUSER_ID, [], context=context)
-        states = orm_state.browse(cr, SUPERUSER_ID, states_ids, context)
-
+        countries = orm_country.search(cr, SUPERUSER_ID, [('name','=',post['country_id'])], context=context)
+        post['country_id'] = countries[0]
+        
         info = CheckoutInfo()
         values = {
-            'countries': countries,
-            'states': states,
             'checkout': info.empty(),
             'shipping': post.get("shipping_different"),
             'error': {},
@@ -513,6 +513,7 @@
 
         shipping_id = None
         if post.get('shipping_different'):
+            shiping_id = orm_country.search(cr, SUPERUSER_ID, [('name','=',post['shipping_country_id'])], context=context)
             shipping_info = {
                 'phone': post['shipping_phone'],
                 'zip': post['shipping_zip'],
@@ -522,8 +523,7 @@
                 'email': post['email'],
                 'type': 'delivery',
                 'parent_id': partner_id,
-                'country_id': post['shipping_country_id'],
-                'state_id': post['shipping_state_id'],
+                'shipping_country_id': shiping_id[0],
             }
             domain = [(key, '_id' in key and '=' or 'ilike', '_id' in key and value and int(value) or value)
                       for key, value in shipping_info.items() if key in info.mandatory_billing_fields + ["type", "parent_id"]]
@@ -670,7 +670,7 @@
         if not tx_ids:
             if order.amount_total:
                 return {
-                    'state': 'error',
+                    'f': 'error',
                     'message': '<p>There seems to be an error with your request.</p>',
                 }
             else:

=== modified file 'website_sale/static/src/js/website_sale.js'
--- website_sale/static/src/js/website_sale.js	2014-02-06 14:07:46 +0000
+++ website_sale/static/src/js/website_sale.js	2014-02-26 06:23:38 +0000
@@ -6,7 +6,16 @@
     $shippingDifferent.change(function () {
         $(".oe_website_sale .js_shipping").toggle();
     });
-
+	
+	openerp.jsonRpc('/shop/get_country', 'call', {}).then(function (countries){
+		var st = new Array();
+		$.each(countries, function(s, t) {
+			st.push(t);
+		});
+	$('input[name=country_id]').autocomplete({source: st});
+	$('input[name=shipping_country_id]').autocomplete({source: st});
+	});
+		
     // change for css
     $(document).on('mouseup', '.js_publish', function (ev) {
         $(ev.currentTarget).parents(".thumbnail").toggleClass("disabled");

=== modified file 'website_sale/views/website_sale.xml'
--- website_sale/views/website_sale.xml	2014-02-20 16:38:15 +0000
+++ website_sale/views/website_sale.xml	2014-02-26 06:23:38 +0000
@@ -762,23 +762,13 @@
                       <label class="control-label" for="zip">Zip / Postal Code</label>
                       <input type="text" name="zip" class="form-control" t-att-value="checkout.get('zip')"/>
                   </div>
-                  <div t-attf-class="form-group #{error.get('state_id') and 'has-error' or ''} col-lg-6">
-                      <label class="control-label" for="state_id" style="font-weight: normal">State / Province</label>
-                      <select name="state_id" class="form-control">
-                          <option value="">select...</option>
-                          <t t-foreach="states or []" t-as="state">
-                              <option t-att-value="state.id" t-att-selected="state.id == checkout.get('state_id')"><t t-esc="state.name"/></option>
-                          </t>
-                      </select>
-                  </div>
+           		  <div t-attf-class="form-group #{error.get('state') and 'has-error' or ''} col-lg-6">
+           		      <label class="control-label" for="state"> State / Province...</label>                  
+                      <input type="" name="state" class="form-control" t-att-value="state" />
+                  </div>                                    	  
                   <div t-attf-class="form-group #{error.get('country_id') and 'has-error' or ''} col-lg-6">
-                      <label class="control-label" for="contact_name">Country</label>
-                      <select name="country_id" class="form-control">
-                          <option value="">Country...</option>
-                          <t t-foreach="countries or []" t-as="country">
-                              <option t-att-value="country.id" t-att-selected="country.id == checkout.get('country_id')"><t t-esc="country.name"/></option>
-                          </t>
-                      </select>
+                      <label class="control-label" for="country_id">Country</label>
+                      <input type="text" name="country_id" class="form-control" t-att-value="country_id" />
                   </div>
 
                   <div class="clearfix"/>
@@ -814,24 +804,14 @@
                       <label class="control-label" for="contact_name">Zip / Postal Code</label>
                       <input type="text" name="shipping_zip" class="form-control" t-att-value="checkout.get('shipping_zip', '')"/>
                   </div>
-                  <div t-attf-class="form-group #{error.get('shipping_state_id') and 'has-error' or ''} col-lg-6">
-                      <label class="control-label" for="contact_name" style="font-weight: normal">State / Province</label>
-                      <select name="shipping_state_id" class="form-control">
-                          <option value="">State / Province...</option>
-                          <t t-foreach="states or []" t-as="state">
-                              <option t-att-value="state.id" t-att-selected="state.id == checkout.get('shipping_state_id')"><t t-esc="state.name"/></option>
-                          </t>
-                      </select>
-                  </div>
+           		  <div t-attf-class="form-group #{error.get('shipping_state') and 'has-error' or ''} col-lg-6">
+           		      <label class="control-label" for="shipping_state"> State / Province...</label>                  
+                      <input type="" name="shipping_state" class="form-control" t-att-value="shipping_state" />
+                  </div>                                    	  
                   <div t-attf-class="form-group #{error.get('shipping_country_id') and 'has-error' or ''} col-lg-6">
-                      <label class="control-label" for="contact_name">Country</label>
-                      <select name="shipping_country_id" class="form-control">
-                          <option value="">Country...</option>
-                          <t t-foreach="countries or []" t-as="country">
-                              <option t-att-value="country.id" t-att-selected="country.id == checkout.get('shipping_country_id')"><t t-esc="country.name"/></option>
-                          </t>
-                      </select>
-                  </div>
+                      <label class="control-label" for="shipping_country_id">Country</label>
+                      <input type="text" name="shipping_country_id" class="form-control" t-att-value="shipping_country_id" />
+                  </div>                  
               </div>
               <button type="submit" class="btn btn-default btn-primary pull-right mb32">Confirm <span class="fa fa-long-arrow-right"/></button>
           </div>