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

[Mehul Mehta(OpenERP)]

Hello,

  I have clean res.country.state.

    - remove res.country.state reference in all modules
    - replace all many2one state_ids field by a char field
    - Added jquery.auto-complete.js in website/static/lib/autocomplete
    - Use state char input field instead of select box in website_sale
    - Use country char input field insted of select box with loose auto completion in website_sale

Thanks,
Mehul Mehta(mme)

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

9195. By Xavier (Open ERP) on 2014-03-10

[FIX] don't fail installation entirely if pyPdf isn't available

should print an error message though

9196. By Fabien Meghazi (OpenERP) on 2014-03-10

[FIX] Properly redirect in case of invalid url slugs

Use werkzeug's api instead of doing hackish url replacement

9197. By Christophe Simonis (OpenERP) on 2014-03-11

[MERGE] forward port of branch saas-3 up to revid 9298 <email address hidden>

9198. By sle-openerp on 2014-03-11

[MERGE][FIX] Download of a report was broken because of a slash at the end of the route used by 'get_file'

9199. By jke-openerp on 2014-03-12

[FIX] Uncomment tests which fail

9200. By Christophe Matthieu (OpenERP) on 2014-03-12

[IMP] website_crm: contact form improvement
get argument are processed and set into input fields + hidden fields
save some datas from http headers
controller should save all the submitted vars

9201. By Xavier (Open ERP) on 2014-03-12

[FIX] sprurious widgetification and editability of icon elements

* tighten widget match: don't match elements with .fa which are also "view
  section" roots (~ editing hosts) as the classes themselves out not be
  editable and the result will thus be odd
* correspondingly, only associate the icon "change" button to instances of the
  ``icons`` widget, other elements bearing ``.fa`` are not editable and should
  be excluded.

9202. By Fabien Meghazi (OpenERP) on 2014-03-12

[FIX] website#ir.http: do not postprocess arguments on non `website_enabled` endpoints

9203. By Antony Lesuisse (OpenERP) on 2014-03-12

[MERGE] db dump/restore new zip based file format

9204. By Launchpad Translations on behalf of openerp on 2014-03-13

Launchpad automatic translations update.

9205. By Xavier (Open ERP) on 2014-03-13

[IMP] don't allow HTML formatting in non-HTML fields

9206. By Xavier (Open ERP) on 2014-03-13

[IMP] context-sensitivity of toolbar commands (kinda, attempted)

9207. By Xavier (Open ERP) on 2014-03-13

[FIX] CSS of link style pane

9208. By jke-openerp on 2014-03-13

[IMP] Calendar - Add redirect to calendar module after the install of it

9209. By Christophe Matthieu (OpenERP) on 2014-03-13

[IMP] website snippet: remove data-snippet-id and use only jquery selectors. Snippets became only dom item and options is transversal. Create dynamic snippet

9210. By Christophe Matthieu (OpenERP) on 2014-03-13

[FIX] website_sale,website_event: can't create product and event. Why: controller and route are strict mode, remove / at the end of the route

9211. By jke-openerp on 2014-03-13

[FIX] Revert commit 9208 - Calendar is a module auto install. So we dont need to redirect

9212. By Fabien (Open ERP) on 2014-03-13

[IMP] Subscribe data

9213. By Launchpad Translations on behalf of openerp on 2014-03-14

Launchpad automatic translations update.

9214. By Christophe Matthieu (OpenERP) on 2014-03-14

[MERGE] website: add optional 'action' in managment edit button to laod one specific backend view

9215. By Christophe Matthieu (OpenERP) on 2014-03-14

[FIX] website: can't see edit button because css with overflow hidden for all tag. Aplly css only on carousel, paralax and blockquote

9216. By Launchpad Translations on behalf of openerp on 2014-03-15

Launchpad automatic translations update.

9217. By Launchpad Translations on behalf of openerp on 2014-03-16

Launchpad automatic translations update.

9218. By Fabien (Open ERP) on 2014-03-16

[MERGE] Mailing List Archives for Website

9219. By Antony Lesuisse (OpenERP) on 2014-03-16

[FIX] website tests crawler, admin password != super admin password

9220. By Antony Lesuisse (OpenERP) on 2014-03-16

[FIX] website test, remove useless test, waitfor banner fix

9221. By Antony Lesuisse (OpenERP) on 2014-03-16

[FIX] website tour, prepare for manual injection
- reorder website.js in a choerent way
- remove injectable website.tour.test.js

We will do injection manually using website.inject_tour, in the mean time only
non injection test are supported, fully disable test needing inject, until fme
merge its fix.

9222. By Antony Lesuisse (OpenERP) on 2014-03-16

[FIX] website_mail_group remove demo from manifest

9223. By Antony Lesuisse (OpenERP) on 2014-03-16

[FIX] website_sale disabling tests while i rewrite Tour

9224. By Launchpad Translations on behalf of openerp on 2014-03-17

Launchpad automatic translations update.

9225. By Christophe Matthieu (OpenERP) on 2014-03-17

[FIX] website tour: create a stub for bootstrap tour in automatic/test mode (need for full test and hide real bug for tour test)

9226. By Xavier (Open ERP) on 2014-03-17

[ADD] support for presized fields in website/image

also add presized field to attachments (automatically computed from datas)

9227. By Christophe Matthieu (OpenERP) on 2014-03-17

[FIX] website: typo: message let the user think that he can change the mobile view while he cannot

9228. By Christophe Matthieu (OpenERP) on 2014-03-17

[FIX] website: readability block with container css

9229. By Xavier (Open ERP) on 2014-03-17

[FIX] inject WORD JOINER inside p so they don't seemingly disappear after saving

9230. By Christophe Matthieu (OpenERP) on 2014-03-17

[FIX] website tour: typo for banner (from usertest feedback)

9231. By Xavier (Open ERP) on 2014-03-17

[FIX] reduce span of paragraph spacer thing to not break layout

9232. By Christophe Matthieu (OpenERP) on 2014-03-17

[FIX] website: The user does not see the content menu because of the tutorial is hover

9233. By Christophe Matthieu (OpenERP) on 2014-03-17

[FIX] website_sale: display empty message for public user and allow admin to edit 'no product found' message

9234. By Christophe Matthieu (OpenERP) on 2014-03-17

[IMP] website snippet: add onblur, onfocus, onremove, onclone method on snippet options. Change data-class into data-value for designer comprehention; fix slider unique id

9235. By Xavier (Open ERP) on 2014-03-17

[FIX] website: set inherit_branding in test contexts to trigger generation of relevant edition attributes

9236. By Christophe Matthieu (OpenERP) on 2014-03-18

[IMP] website: snippet editor: change size automatic button into a cross between resize handler

9237. By Christophe Simonis (OpenERP) on 2014-03-18

[MERGE] forward port of branch saas-3 up to revid 9328 <email address hidden>

9238. By Launchpad Translations on behalf of openerp on 2014-03-19

Launchpad automatic translations update.

9239. By Thibault Delavallée (OpenERP) on 2014-03-19

[FIX] [IMP] website_mail: improved and fixed the 'subscribe button'.
This button is used to perform a 'message_subscribe' or 'message_unsubscribe' on some
documents. It is notably used to add a 'Subscribe' button in some pages that subscribe
the user to a mailing list (aka mail.group).
This branch fixes some subscribe/unsubscribe issues, better manages the public user,
use the session to remember whether a public user has subscribe to a mailing list,
and uses already-existing code to manage partners.

9240. By Thibault Delavallée (OpenERP) on 2014-03-19

[MERGE] [FIX] Merged branch holding some fixes for the newly
(badly ?) introduced module website_mail_group: subscribe / unsubscribe now working,
pager now working. Some redesign will probably land in trunk if we have time
as the current layout is not very efficient.

9241. By Antony Lesuisse (OpenERP) on 2014-03-20

[FIX] account invoice analysis exclude proforma from invoiced

9242. By Denis Ledoux (OpenERP) on 2014-03-20

[ADD] crm: mass convert lead to opp, add force assignation checkbox, to force the salesman/salesteam on converted/merged lead/opps or leave the existing salesman/salesteam

9243. By Denis Ledoux (OpenERP) on 2014-03-20

[FIX] crm: round robin tests on salesman assignation set force assignation true

9244. By Christophe Simonis (OpenERP) on 2014-03-24

[MERGE] forward port of branch saas-3 up to revid 9345 <email address hidden>

9245. By Christophe Matthieu (OpenERP) on 2014-03-24

[IMP] website: Building block / Snippet Editor
Add documentation and clean framework
The building blocks appear in the edit bar website. These prebuilt html block allowing the designer to easily generate content on a page (drag and drop).
Options allow snippets to add customizations party html code according to their selector (jQuery) and javascript object.

9246. By Denis Ledoux (OpenERP) on 2014-03-24

[REF] *: share field is now a computed field, if the user is in the employee group or not

9247. By Christophe Matthieu (OpenERP) on 2014-03-24

[FIX] website: snippet editor: forward port of branch saas-3

9248. By Denis Ledoux (OpenERP) on 2014-03-24

[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9347 revid:<email address hidden>

9249. By sle-openerp on 2014-03-24

[MERGE][REF] Report module: Moved methods generating pdf/html from Controller to Model in order to be able to print without request (report controllers still exist but are now just interfaces to these methods) ; adapted account_vat report this way

9250. By Fabien Meghazi (OpenERP) on 2014-03-25

[FIX] Fix url slug check bug in multilang=True

9251. By Christophe Matthieu (OpenERP) on 2014-03-25

[FIX] website: fix and activate frontend test

9252. By Thibault Delavallée (OpenERP) on 2014-03-26

[MERGE] [CLEAN] website_mail: clean merging of trunk-archive (revid <email address hidden>) introducing Mailing List Archives. Featuring :
- uses already-existing template for subscription instead of copy-and-pasting the subscription button code;
- fixes several issues in the layout to ease the reading;
- fixes the broken pager;
- adds the Archives nav that was planned but not really usable

9253. By Antony Lesuisse (OpenERP) on 2014-03-26

[REM] move document_webdav to openerp-extra

9254. By Antony Lesuisse (OpenERP) on 2014-03-26

[REM] move document_ftp to openerp-extra

9255. By van der Essen Frédéric (OpenERP) on 2014-03-26

[MERGE] point_of_sale & posbox: new posbox homepage, posbox software upgrade system, printing xml based receipt

9256. By Launchpad Translations on behalf of openerp on 2014-03-27

Launchpad automatic translations update.

9257. By Christophe Matthieu (OpenERP) on 2014-03-27

[IMP] website_event: widget to promote Events with country flag

9258. By Christophe Matthieu (OpenERP) on 2014-03-27

[FIX] website_event: import GeoIP if GeoIP is not installed

9259. By Christophe Matthieu (OpenERP) on 2014-03-27

[FIX] website_event: return empty string in Local Events snippet if GeoIP is not installed

9260. By Fabien Meghazi (OpenERP) on 2014-03-27

[MERGE] remote module import

9261. By Launchpad Translations on behalf of openerp on 2014-03-28

Launchpad automatic translations update.

9262. By van der Essen Frédéric (OpenERP) on 2014-03-28

[MERGE] point_of_sale, hw_escpos: fixes from the pos-restaurant branch

9263. By van der Essen Frédéric (OpenERP) on 2014-03-28

[FIX] hw_posbox_upgrade: posbox restart was not working

9264. By Fabien (Open ERP) on 2014-03-29

[IMP] flat design, even for darken

9265. By Fabien (Open ERP) on 2014-03-29

[IMP] better button snippet

9266. By Fabien (Open ERP) on 2014-03-29

[IMP] bootstrap less sources

9267. By Fabien (Open ERP) on 2014-03-30

[IMP] removing glyphicons from bootstrap less

9268. By Fabien (Open ERP) on 2014-03-30

[REM] remove duplicate snippet: portfolio - image gallery

9269. By Fabien (Open ERP) on 2014-03-31

[REM] removed bootstrap sources

9270. By Christophe Matthieu (OpenERP) on 2014-03-31

[FIX] website: create new page redirect to error 404

9271. By Christophe Matthieu (OpenERP) on 2014-03-31

[FIX] website_blog: order of blog_post must be by create_date

9272. By Christophe Matthieu (OpenERP) on 2014-03-31

[FIX] website_blog: remove create_date from demo data

9273. By Launchpad Translations on behalf of openerp on 2014-04-01

Launchpad automatic translations update.

9274. By Quentin (OpenERP) <email address hidden> on 2014-04-01

[MERGE] website_gengo branch merged, offering the possiblity to translate the website using Gengo

9275. By Fabien Meghazi (OpenERP) on 2014-04-01

[ADD] website: template reset confirmation

9276. By Thibault Delavallée (OpenERP) on 2014-04-01

[MERGE] [IMP] website_blog: use a helper to generate the various URLs of blogs (using date, tags, blog, post, ...) + updated templates accordingly. This branch also fixes numerous bugs with URLs, notably Archives URLs that were completely buggy.

Also fixed strangely coded domain generation in blog route.

9277. By Denis Ledoux (OpenERP) on 2014-04-01

[FIX] account_analytic_analysis, analytic, hr_timesheet: do not override existing data of analytic account on template on_change

9278. By Denis Ledoux (OpenERP) on 2014-04-01

[FIX] project, project_issue: overwritten method on_change template, wrong signature, following commit 9277 revid:<email address hidden>

9279. By Fabien (Open ERP) on 2014-04-01

[IMP] kanban view for ir.attachments

9280. By Fabien (Open ERP) on 2014-04-01

[IMP] kanban of documents for recruitement attachments

9281. By Fabien (Open ERP) on 2014-04-03

[IMP] Tracks: alphabetic order

9282. By Martin Trigaux (OpenERP) on 2014-04-04

[MERGE] [IMP] event: store number of seat used to avoid unnecessary computations (performance improvement)

9283. By Thibault Delavallée (OpenERP) on 2014-04-04

[MERGE] [IMP] payment modules: added provider selection field that is different from the name. This allows to distinguish name and provider. Provider is a more technical field, used to call some specific methods (<provider>_method_name). The name field is used for display on the website.

Added name on payment.transaction views.

Added sale_order_id field on transaction form view; the field is already present and used but was not displayed.

Transfer is now called Wire Transfer.

Code and views udpated accordingly.

9284. By Launchpad Translations on behalf of openerp on 2014-04-05

Launchpad automatic translations update.

9285. By Fabien (Open ERP) on 2014-04-06

[IMP] button snippet

9286. By Quentin (OpenERP) <email address hidden> on 2014-04-03

[FIX] base_gengo: don't wait another cron job execution to ask translation for the next n words

9287. By Christophe Simonis (OpenERP) on 2014-04-07

[MERGE] forward port of branch saas-3 up to revid 9380 <email address hidden>

9288. By Quentin (OpenERP) <email address hidden> on 2014-04-07

[FIX] base_gengo: don't skipp terms in gengo communication because of their state may have changed in the meanwhile (so using offset+limit in a serach at each loop is not a good idea)

9289. By Launchpad Translations on behalf of openerp on 2014-04-08

Launchpad automatic translations update.

9290. By Géry Debongnie on 2014-04-08

[FIX] fixes an incorrect call to read_group (addon gamification)

9291. By sle-openerp on 2014-04-08

[MERGE][IMP] Account* reports converted to qweb; Added sale_layout module allowing to customize sale order and invoice; some refactoring on report module

9292. By Martin Trigaux (OpenERP) on 2014-04-04

[IMP] event: add trigger field for stored seats_* fields and remove print

9293. By Thibault Delavallée (OpenERP) on 2014-04-09

[MERGE] [IMP] mail: followers widget: Follow button + subtypes are now displayed
like a button + a dropdown selection for subtypes, reducing the place this widget
takes in the form view.

9294. By Thibault Delavallée (OpenERP) on 2014-04-09

[IMP] mail: jump to the Messaging menu after installation

9295. By Fabien (Open ERP) on 2014-04-09

[IMP] track translatable

9296. By Thibault Delavallée (OpenERP) on 2014-04-09

[MERGE] [IMP] website_blog: layout and usability improvements. This task proposes a better layout that eases the reading + smooth transitions between blogs based on suggestions dynamically chosen based on a ranking.

Featuring :
- blog: blog now have a subtitle field
- blog_post: blog post now have a subtitle field, removed shortened content + website_published_datetime (create_date and write_date are sufficient). Added tracking of visits + ranking computation, to select the next post the user will see. Added background-image, that is used to display a cover behind the post title and subtitle. Overall display improvement.
- added new feature that allows a user to tweet selected text on twitter from post.
- added new feature that allows a user to discuss on every paragraph (anonymous user have to give their name and email)
- better blog demo data

Misc:
- website: removed dead code about website_published_datetime that could have been generic but has never been used
- [FIX] website: fixed image controller, do not attempt to read website_published on models that do not have that field

9297. By Christophe Matthieu (OpenERP) on 2014-04-09

[TYPO] website: tour for banner

9298. By Christophe Matthieu (OpenERP) on 2014-04-09

[FIX] website: Default Url not correct for the button 'contact us' in the block features>Button

9299. By Christophe Matthieu (OpenERP) on 2014-04-09

[FIX] website: The separator block is not working (no drop zone)

9300. By Raphael Collet (OpenERP) on 2014-04-09

[MERGE] test_cursor: adapt code to small api changes in registry for handling http tests

9301. By Martin Trigaux (OpenERP) on 2014-04-09

[IMP] lunch: add security rules, it's rude to look at other people's food

9302. By Christophe Matthieu (OpenERP) on 2014-04-09

[IMP] website: create a media snippet editor who merge image dialog, font awesome, video youtube...

9303. By Fabien (Open ERP) on 2014-04-09

[IMP] Event Agenda: merge with cleaning

9304. By Fabien (Open ERP) on 2014-04-09

[IMP] track duration in hours

9305. By Fabien (Open ERP) on 2014-04-09

[IMP] Gengo translation cron every 6 hours

9306. By Fabien (Open ERP) on 2014-04-09

[IMP] Gengo Fixes

9307. By Fabien (Open ERP) on 2014-04-09

[IMP] grouping jobs together

9308. By Fabien (Open ERP) on 2014-04-09

[IMP] gengo fix in callback

9309. By Géry Debongnie on 2014-04-10

[MERGE] readgroup signature has changed, so addons inheriting and modifying read_group need to be changed to make sure they call their parent's read_group with the correct signature

9310. By Fabien (Open ERP) on 2014-04-10

[IMP] evnet

9311. By Christophe Simonis (OpenERP) on 2014-04-10

[MERGE] forward port of branch saas-3 up to revid 9394 <email address hidden>

9312. By Raphael Collet (OpenERP) on 2014-04-10

[FIX] event_sale: fix non-closing tags in xml file

9313. By Olivier Dony (Odoo) on 2014-04-10

[FIX] website: avoid discarding snippet animator after edit + properly restart animation while disabling clicks

9314. By Mahendra Barad(OpenERP) on 2014-04-10

[MERGE] [ADD] website_twitter: add twitter scroller snippet

9315. By Olivier Dony (Odoo) on 2014-04-11

[MERGE] sale_order_dates: several improvements to usability and planned date computing, courtesy of Lionel Sausin (Numerigraphe)

9316. By van der Essen Frédéric (OpenERP) on 2014-04-11

[MERGE] posbox : regression fix, made it easier to add support for new printers

9317. By Fabien (Open ERP) on 2014-04-11

[IMP] Larger texts

9318. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-11

[MERGE][IMP] Large refactoring of "survey" module
- surveys are now displayed through website
- new reporting tool
- model refactoring
- usability improvements
(affects also hr_evaluation and hr_recruitment, that use surveys)

9319. By Cedric Snauwaert (OpenERP) on 2014-04-11

[MERGE]change modal windows to only use bootstrap3

9320. By Thibault Delavallée (OpenERP) on 2014-04-11

[FIX] gamification: allow having False or 0 values as result of a computation.

9321. By Thibault Delavallée (OpenERP) on 2014-04-11

[FIX] mail: avoid crashing message_post if the subtype does not exists anymore.
Using xmlid_to_res_id, subtype_id will be False if not found.

9322. By Thibault Delavallée (OpenERP) on 2014-04-11

[FIX] mail: res_users post: fixed partner_ids computation, could receive
a list of ids, or a list of commands. Both cases should be taken into account.

9323. By Martin Trigaux (OpenERP) on 2014-04-11

[MERGE] gamification: add batch mode, improve some views, remove inprogess_update state and "realtime" (using cron) badge to recieve badges without needing to close the challenge

9324. By Thibault Delavallée (OpenERP) on 2014-04-11

[ADD] New module: website_forum, a clone of askbot / stackoverflow.

This module models a forum: questions, answers, voting and comment system, karma
management. There is a link with gamification, allowing to use badges and reward
users for their participation to the forum.

Badges are temporarily commented out to ease the module beta-testing without having
to wait for some gamification improvements.

This merge also contains some fixes in access rights for gamification.

9325. By Launchpad Translations on behalf of openerp on 2014-04-12

Launchpad automatic translations update.

9326. By Christophe Matthieu (OpenERP) on 2014-04-14

[FIX] website: media editor: when the user save the picture, the dialog box re-open automatically. Do not re-active snippet when we save a field image

9327. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-14

[MERGE][IMP] crm/sale_crm: Terminology
Replacement of the term "category" by "tag", for the sake of consistency

9328. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-14

[MERGE][IMP] invoice/sale: Terminology uniformisation

9329. By Fabien (Open ERP) on 2014-04-14

[IMP] Ticket types translateable

9330. By Fabien (Open ERP) on 2014-04-14

[IMP] translateable event description

9331. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-14

[MERGE][IMP] hr_timesheet: add a menu to configure Timesheet Accounts under HR/Configuration

9332. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-14

[MERGE][IMP] hr_timesheet: Quick create of contract (on timesheet) does not open contract edit window anymore

9333. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-14

[REF] hr_timesheet: unused piece of code

9334. By Fabien (Open ERP) on 2014-04-14

[REM] removing unused and non clean modules

9335. By jke-openerp on 2014-04-14

[FIX] wesbite: banner - remove css and use bootstrap for positionning. Now hidden-xs works, we don't lost 50% of width

9336. By jke-openerp on 2014-04-14

[FIX] Website_mail - Add selectors to allow drag and drop of snippet in email template

9337. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-14

[MERGE][FIX] Mobile preview of blogs

9338. By Raphael Collet (OpenERP) on 2014-04-14

[FIX] calendar: fix string quoting mess in email template

9339. By jke-openerp on 2014-04-15

[FIX] Website tour - Click inside the zone before to insert sampleText

9340. By jke-openerp on 2014-04-15

[FIX] Website banner tour - Fix test according to new banner structure

9341. By jke-openerp on 2014-04-15

[FIX] mail template view - Set body_html field as simple text area without cke by default. Else, the mako code are considered as mal formatted and moved.

9342. By Christophe Simonis (OpenERP) on 2014-04-15

[MERGE] forward port of branch saas-3 up to revid 9409 <email address hidden>

9343. By Martin Trigaux (OpenERP) on 2014-04-15

[IMP] gamification and website_forum improvements

gamification:
- fix batch mode when grouping by id
- fix subquery in batch mode when a ending date is set
- serialisation method can exclude categories of challenge
- view improvements

website_forum:
- enabling bages in batch mode
- fix karma computation when creating a new post
- changing previous vote affects the user karma
- do not display forum challenges on user home page

9344. By jke-openerp on 2014-04-16

[MERGE] Allow to use many2one for qweb template (work also with view_id)

9345. By Thibault Delavallée (OpenERP) on 2014-04-16

[MERGE] [REF] mass_mailing refactoring. Mass mailing is refactored to be easier to use, introducing an easy-to-use way of handling recipients, mailing lists and statistics. This branch comes with a web branch that introduce the char_domain widget, that is a widget on a char field holding a domain. It allows to select and count records without having to deal with the complexity of domains.

This branch comes with a cleaning of marketing modules :
- marketing now holds only the basic stuff for marketing related modules: mainly marketing settings + menu definition
- marketing_crm new module is a bridge between crm and marketing and holds the crm-related stuff previously present in marketing module.

This branch also holds some mail and template improvement in order to speedup the mass mailing process. The template edition in website_mail has also be improved. It is now a page that allows to edit email-like content (content with a subject, an email_from and a body), like templates, emails or mass mailing.

Misc :
- mail_compose_message: removed unnecessary fields coming from the template (partner_to, ...) because they are confusing -> composer should be easier to understand and use; also cleaned method generating the email values in the composer that was splitted in two methods
- fixed removed double body computation when using templates (one for template, then the wizard -> not necessary)
- mail_message: record_name is not a function field anymore, but a char field + a method in create, allowing to speedup mass mailing by avoiding browsing all records to get their name

9346. By Thibault Delavallée (OpenERP) on 2014-04-16

[IMP] payment: renamed env field to environment, to avoid conflicts
with the incoming new API.

9347. By Christophe Matthieu (OpenERP) on 2014-04-16

[IMP] website_crm: designer can add input type file in form view. All files create an ir.attachment linked with the created lead

9348. By sle-openerp on 2014-04-16

[MERGE] hr* reports converted to QWeb

9349. By sle-openerp on 2014-04-16

[FIX] website_report: added transfo.js

9350. By Denis Ledoux (OpenERP) on 2014-04-16

[ADD] *: replace overriden methods get_formview_action by get_formview_id

Methods to override to specify the view/action to launch for many2one links
get_formview_action use get_formview_id to find the view to open. Therefore, it is simplier to override get_formview_id to tell which view should be opened

9351. By Cedric Snauwaert (OpenERP) on 2014-04-16

[FIX]modal: missing new object instanciation in dashboard

9352. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-16

[MERGE][IMP] survey: basic usability for quiz mode

Users with Technical Featurs are now able to enable a "quiz mode" on surveys:
- questions with simple and multiple choice can be autocorrected
- an answer with positive mark is considered as correct
- users that finish a survey can see a detailed correction with correct answers and their scores
- other questions types can be manually rated by a human corrector

9353. By Christophe Simonis (OpenERP) on 2014-04-16

[MERGE] {gamification,gamification_sale_crm,website_forum}: Removing the field autojoin_group_id to replace the subscription by a domain

9354. By Christophe Simonis (OpenERP) on 2014-04-16

[FIX] hr*: must depend on "report" module

9355. By Thibault Delavallée (OpenERP) on 2014-04-17

[MERGE] [IMP] Hide the group 'Manage resources planning on gantt view' from project settings

9356. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-17

[MERGE][FIX] sale: disallow line creation on confirmed sales orders

[patch by Divyesh Makwana (OpenERP)]

9357. By Amit Vora(OpenERP) on 2014-04-17

[MERGE] [IMP] mail: Inbox usability improvements :
- notficiation_email_send field, renamed into notify_email, has now 2 values: always or never, in
order to ease the choice and simplify options.
- inbox: removed 'compose a new messages or write to my followers', because those 2 options are
already available. The first one is accessible using the top-right email icon, the second one
is accessible with the 'write to my followers' text box alread present in the inbox.

9358. By Darshan Kalola(OpenERP) on 2014-04-17

[MERGE] [IMP] project, hr_recruitment: fixed access rights on stages.
Projec/Recruitment Users can now just read columns; managers can edit and unlink them.
With the server and web branch, this allows to restrict the actions the user can perform
on columns according to its access rights.

9359. By Cedric Snauwaert (OpenERP) on 2014-04-17

[MERGE]tooltip: replace tipsy by bootstrap tooltip

9360. By Amit Vora(OpenERP) on 2014-04-17

[MERGE] [IMP] crm: improved call / meeting buttons and behavior on lead and partner form view.
- improved behavior of schedule a meeting, for both opportunities and partner, with correct
attendees and options;
- removed wizard to schedule a cal, jumping to the list view with correct default values
is sufficient;
- scheduled calls is now accessible using a group, accessible through sales configuration;

9361. By Kunal Chavda on 2014-04-17

[MERGE] [IMP] website: tour: nice smooth cool and sexy effect when closing
or ending the tour.

9362. By Fabien (Open ERP) on 2014-04-21

[MERGE] new module: website_forum_doc + small fixes (close) in forum

9363. By Fabien (Open ERP) on 2014-04-21

[IMP] improved form view for posts

9364. By Launchpad Translations on behalf of openerp on 2014-04-22

Launchpad automatic translations update.

9365. By Pooja Zankhariya (OpenERP) on 2014-04-22

[MERGE][IMP] mrp: correct colors for components of manufacturing orders (reflecting their states)

9366. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-22

[MERGE][IMP] Form views usability (account, delivery, hr_expense, hr_payroll, l10n_fr_rib, lunch, product, purchase_requisition, resource, stock)

9367. By Mansi Kariya(OpenERP) on 2014-04-22

[MERGE][IMP] account_followup: direct link to followups on the Accounting config page

9368. By Bharat Devnani (Open ERP) on 2014-04-22

[MERGE][IMP] More explicit error messages (in delivery, hr_timesheet_sheet, purchase, purchase_requisition, sale_stock, stock)

9369. By DJ Patel (OpenERP) on 2014-04-22

[MERGE] [IMP] Search views: consistency of some filters labels

9370. By Christophe Simonis (OpenERP) on 2014-04-22

[MERGE] forward port of branch saas-4 up to revid 9365 <email address hidden>

9371. By Christophe Simonis (OpenERP) on 2014-04-22

[FIX] website_forum: correct view xml (introduce by previous commit)

9372. By Christophe Matthieu (OpenERP) on 2014-04-23

[FIX] website: snippet editor: speed up save view (construct only option with clean_for_save method); fix carousel arrow

9373. By Géry Debongnie on 2014-04-23

[MERGE] remove double groupbys in columns in two reporting graph views (addons crm/hr_recruitment)

9374. By Thibault Delavallée (OpenERP) on 2014-04-23

[MERGE] [IMP] mail: slightly improved doc links in notification emails (shorter, clearer)

9375. By Christophe Matthieu (OpenERP) on 2014-04-23

[IMP] website_project: remove preprocess_request content; user can the add link with the menu editor

9376. By Launchpad Translations on behalf of openerp on 2014-04-24

Launchpad automatic translations update.

9377. By Jaydeep Barot(OpenERP) on 2014-04-24

[MERGE][IMP] account: allow sorting of journal items

9378. By Antony Lesuisse (OpenERP) on 2014-04-24

[REM] project_gtd deprecated by notes

9379. By Antony Lesuisse (OpenERP) on 2014-04-24

[REM] move auditrail to extra
It's deprecated by _track_fields, mail.message and base_action_rules

9380. By Antony Lesuisse (OpenERP) on 2014-04-24

[REM] move project_long_term to extra

9381. By Antony Lesuisse (OpenERP) on 2014-04-25

[REM] remove portal_project_long_term

9382. By Launchpad Translations on behalf of openerp on 2014-04-27

Launchpad automatic translations update.

9383. By Jaydeep Barot(OpenERP) on 2014-04-28

[MERGE][IMP] account (partner view): hide accounting settings to users that have no accounting access rights

9384. By van der Essen Frédéric (OpenERP) on 2014-04-28

[MERGE] hw_scale: a mettler toledo scale driver for the point of sale

9385. By Jaydeep Barot(OpenERP) on 2014-04-28

[MERGE][IMP]
stock: more explicit error message for product scraping
account/mail: typos

9386. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-28

[MERGE][IMP] account/account_voucher: new filters and usability minor fixes

9387. By Randhir Mayatra (OpenERP) on 2014-04-28

[MERGE][REM] List views removed in reporting menu (from membership and project_timesheet) as new graph view is now self-sufficient

9388. By Christophe Matthieu (OpenERP) on 2014-04-28

Tour Re-factoring.
Only one tour running; remove bootstrap tour; Simplify creation of tour; can choose test or tutorial mode with run method; can work without qweb and without EditorBar

9389. By Antony Lesuisse (OpenERP) on 2014-04-28

[FIX] base_import remove useless test

9390. By Randhir Mayatra (OpenERP) on 2014-04-29

[MERGE] [REM] Removal of every pre-made dashboard. Only "My Dashboard" has been kept.
Modules descriptions have been updated accordingly and some screenshots have been removed.
(affects: account, crm, event, fleet, hr, hr_evaluation, hr_expense, hr_holidays, hr_recruitment, hr_timesheet_sheet, mrp, procurement, project, purchase, sale, stock)

9391. By van der Essen Frédéric (OpenERP) on 2014-04-29

[MERGE] point_of_sale: make the kg unit precise up to grams, and use the unit's rounding factor on the scale screen

9392. By sle-openerp on 2014-04-29

[MERGE][IMP] hr_timesheet: remove unattainable reports; hr_attendance: replace reports by a graphview

9393. By Darshan Kalola(OpenERP) on 2014-04-29

[MERGE][REM] Removal of "process" module and its avatars in others modules

9394. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-29

[FIX][REM] hr_timesheet: removed reports mistakenly reintroduced

9395. By sle-openerp on 2014-04-29

[MERGE][IMP] Point of Sales: reports converted to QWeb (but removed useless ones); removed dead code in wizard folder; folder; Adapted /report/download route to serialize and return osv_exception in order to be handled in core.js get_file

9396. By sle-openerp on 2014-04-29

[MERGE][IMP] l10n_* reports converted to QWeb

9397. By Launchpad Translations on behalf of openerp on 2014-04-30

Launchpad automatic translations update.

9398. By Olivier Dony (Odoo) on 2014-04-30

[I18N] remove i18n files for deleted modules after disabled translation templates

9399. By Olivier Dony (Odoo) on 2014-04-30

[IMP] purchase: invoice creation more modular/extensible through the introduction of a _prepare_invoice method()

This is similar to what was previously done for Sales Orders.

9400. By Fabien Meghazi (OpenERP) on 2014-04-30

[MERGE] Web assets moved from manifests to ir.ui.view bundles

9401. By Fabien (Open ERP) on 2014-05-01

[IMP] website images: allow no max_width (default), faster loading if no resize

9402. By Antony Lesuisse (OpenERP) on 2014-05-01

[MERGE] saas-4 up to 9398 <email address hidden>

9403. By Antony Lesuisse (OpenERP) on 2014-05-01

[MERGE] saas-4 report_webkit missing dependency on report

9404. By Fabien (Open ERP) on 2014-05-01

[IMP] Lossless PNG compression. Reduced size by 3 with pngquant

9405. By Antony Lesuisse (OpenERP) on 2014-05-01

[FIX] website controller, correctly resolve last merge about images
fix fp commit to use debian compatible werkzeug api data instead of set_data

9406. By Antony Lesuisse (OpenERP) on 2014-05-01

[FIX] website_event missing javascript asset

9407. By Fabien Meghazi (OpenERP) on 2014-05-01

[FIX] edi, calendar webclient bootstrap

9408. By Géry Debongnie on 2014-05-02

[MERGE] converts buttons in form views into 'stat buttons'

This branch converts pretty much every buttons in 'stat buttons',
which means buttons that can display any kind of information. Right
now, it is mostly used to display a numerical information (such as a
number, for example 9 Calls). Also, look at the invoices button in
Customers form view for an example of a functional field, displaying
the total amount invoiced.

The stat buttons also supports sub widgets, for example a mini pie chart
or a mini bar chart. Examples of such sub widgets can be found in
marketing/mass mailings form views (not ready yet)

9409. By Fabien (Open ERP) on 2014-05-04

[IMP] Certification Template

9410. By Raphael Collet (OpenERP) on 2014-05-05

[FIX] event: move definition of fields track_ids and count_tracks to the right module

9411. By Fabien Meghazi (OpenERP) on 2014-05-05

[IMP] website: load website.xml templates only in editable mode

9412. By Fabien Meghazi (OpenERP) on 2014-05-05

[ADD] base_import_module test module, static asset in backend bundle

9413. By jke-openerp on 2014-05-05

[MERGE] Merge with trunk-cal-V8-jke. - Change field datetime into date or datetime according to that event type is in all day or not...

9414. By Fabien Meghazi (OpenERP) on 2014-05-05

[REM] preprocess_request from website

The method is still there with only a pass statement
Will completetly remove once chm merges his branch

9415. By Launchpad Translations on behalf of openerp on 2014-05-06

Launchpad automatic translations update.

9416. By Fabien Meghazi (OpenERP) on 2014-05-06

[FIX] jQuery.ui - boostrap conflict

9417. By Fabien Meghazi (OpenERP) on 2014-05-06

[REM] Removed addons.web#html_template usage

9418. By Launchpad Translations on behalf of openerp on 2014-05-07

Launchpad automatic translations update.

9419. By Xavier (Open ERP) on 2014-05-07

[IMP] mail: type fixes

* _get_tracked_fields should return a dict even when there's no tracked field
  (return an empty dict)

* in write, only call _get_tracked_fields once, initialize to None instead of
  a list (especially since it should be a dict in the first place)

9420. By Géry Debongnie on 2014-05-07

Large cleanups in addons

The code I merged in my branch stat buttons was sadly not up to our
standing... This branch improves the situation by removing harmful
try/excpet/pass statements, by using search_count when appropriate, by
removing unused one2many fields and by correcting some bugs

9421. By Antony Lesuisse (OpenERP) on 2014-05-07

[MERGE] trunk-websit-al-refactor by chm
- allow fiscal position change on sale orders
- public user on website
- simplify website_sale sale.order and shopping cart code
- remove preprocess_request

9422. By Fabien Meghazi (OpenERP) on 2014-05-07

[REM] QWeb does not self close empty divs anymore

See web Rev#4011

9423. By Christophe Simonis (OpenERP) on 2014-05-07

[MERGE] forward port of branch saas-4 up to revid 9410 <email address hidden>

9424. By Fabien Meghazi (OpenERP) on 2014-05-07

[REM] completetly removed website#preprocess_request()

9425. By Quentin (OpenERP) <email address hidden> on 2014-05-07

[REV] partial revert of revision 9408 <email address hidden> where we wrongly beleive than stock depends on crm_claim... :( That code will probably be back _in the right module_

9426. By Launchpad Translations on behalf of openerp on 2014-05-08

Launchpad automatic translations update.

9427. By Géry Debongnie on 2014-05-08

[MERGE] merge trunk-claimcount-fix-ged

Add the claim_count_out field to its correct place (in addon claim_from_delivery). The field was removed because it was incorrectly added to stock.py instead of the addon claim_from_delivery. (note: it was renamed from claim_count to claim_count_out)

9428. By Quentin (OpenERP) <email address hidden> on 2014-05-08

[MERGE] trunk-wms branch which include a lot of freaking features. Check the diff by yourself :-)

9429. By Mahendra Barad(OpenERP) on 2014-05-08

[MERGE] [IMP] crm, hr_recruitment, project, project_issue: use the newly-introduced widgets for the kanban state and the priority management.

This branch comes with a web branch holding those new widgets for form and kanban views.

9430. By Launchpad Translations on behalf of openerp on 2014-05-09

Launchpad automatic translations update.

9431. By Martin Trigaux (OpenERP) on 2014-05-09

[FIX] product: get_history_price recieves ids instead of a browse record for product template

9432. By Cedric Snauwaert (OpenERP) on 2014-05-09

[FIX]purchase_requisition: put js file in a bundle

9433. By Quentin (OpenERP) <email address hidden> on 2014-05-09

[FIX] claim_from_delivery: fixed error in delivery view

9434. By Amit Dodiya (OpenERP) on 2014-05-09

[Merge]: Merged with latest

9435. By Mehul Mehta(OpenERP) on 2014-05-13

[IMP] improved code as per change in website_sale module

9436. By Mehul Mehta(OpenERP) on 2014-05-15

[IMP] improved code for when click on change address while shipping_different wrong display

9437. By Mehul Mehta(OpenERP) on 2014-05-16

[IMP] improved code for redirecting display country issue when missing field in form

9438. By Mehul Mehta(OpenERP) on 2014-05-16

[IMP] remove unused code

9439. By Mehul Mehta(OpenERP) on 2014-05-19

[MERGE] Merged openobject-addons

9440. By Mehul Mehta(OpenERP) on 2014-05-19

[IMP] improved typo

Unmerged revisions

9440. By Mehul Mehta(OpenERP) on 2014-05-19

[IMP] improved typo

9439. By Mehul Mehta(OpenERP) on 2014-05-19

[MERGE] Merged openobject-addons

9438. By Mehul Mehta(OpenERP) on 2014-05-16

[IMP] remove unused code

9437. By Mehul Mehta(OpenERP) on 2014-05-16

[IMP] improved code for redirecting display country issue when missing field in form

9436. By Mehul Mehta(OpenERP) on 2014-05-15

[IMP] improved code for when click on change address while shipping_different wrong display

9435. By Mehul Mehta(OpenERP) on 2014-05-13

[IMP] improved code as per change in website_sale module

9434. By Amit Dodiya (OpenERP) on 2014-05-09

[Merge]: Merged with latest

=== 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-05-19 06:25:56 +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/>
+            ${('%s, ' % object.company_id.state) or ''} ${object.company_id.country_id.name or ''}<br/>
         % endif
         </span>
         % if object.company_id.phone:

=== modified file 'account_payment/views/report_paymentorder.xml'
--- account_payment/views/report_paymentorder.xml	2014-04-03 10:05:43 +0000
+++ account_payment/views/report_paymentorder.xml	2014-05-19 06:25:56 +0000
@@ -15,7 +15,7 @@
                             <span t-raw="'%s &lt;br&gt;' % o.mode.bank_id.bank.street2 if o.mode.bank_id.bank.street2 else ''"/>
                             <span t-raw="'%s &lt;br&gt;' % o.mode.bank_id.bank.zip if o.mode.bank_id.bank.zip else ''"/>
                             <span t-raw="'%s &lt;br&gt;' % o.mode.bank_id.bank.city if o.mode.bank_id.bank.city else ''"/>
-                            <span t-raw="'%s &lt;br&gt;' % o.mode.bank_id.bank.state.name if o.mode.bank_id.bank.state.name else ''"/>
+                            <span t-raw="'%s &lt;br&gt;' % o.mode.bank_id.bank.state if o.mode.bank_id.bank.state else ''"/>
                             <span t-raw="'%s &lt;br&gt;' % o.mode.bank_id.bank.country.name if o.mode.bank_id.bank.country.name else ''"/>
                         </div>
                     </div>

=== 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-05-19 06:25:56 +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_name,
                                                 country=partner.country_id.name))
             if result:
                 self.write(cr, uid, [partner.id], {

=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py	2014-05-12 11:41:49 +0000
+++ crm/crm_lead.py	2014-05-19 06:25:56 +0000
@@ -37,7 +37,7 @@
     'company_id',
     'country_id',
     'section_id',
-    'state_id',
+    'state',
     'stage_id',
     'type_id',
     'user_id',
@@ -287,7 +287,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', size=32),
         'country_id': fields.many2one('res.country', 'Country'),
         'phone': fields.char('Phone', size=64),
         'fax': fields.char('Fax', size=64),
@@ -337,7 +337,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_name,
                 'country_id': partner.country_id and partner.country_id.id or False,
                 'email_from': partner.email,
                 'phone': partner.phone,
@@ -734,7 +734,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_name': lead.state,
             'is_company': is_company,
             'type': 'contact'
         }
@@ -1057,10 +1057,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-05-12 11:41:49 +0000
+++ crm/crm_lead_view.xml	2014-05-19 06:25:56 +0000
@@ -118,14 +118,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}'/>
@@ -464,7 +464,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-05-19 06:25:56 +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-05-09 10:46:07 +0000
+++ crm_partner_assign/crm_portal_view.xml	2014-05-19 06:25:56 +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-05-01 15:56:33 +0000
+++ delivery/delivery.py	2014-05-19 06:25:56 +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', size=32),
         '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	2014-05-07 16:59:51 +0000
+++ delivery/delivery_view.xml	2014-05-19 06:25:56 +0000
@@ -68,7 +68,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"/>
@@ -143,7 +143,7 @@
                                 <field name="country_ids" nolabel="1"/>
                             </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-05-19 06:25:56 +0000
@@ -36,7 +36,7 @@
     'zip': True,
     'city': True,
     'country_id': True,
-    'state_id': True,
+    'state_name': 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-05-19 06:25:56 +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-05-19 06:25:56 +0000
@@ -2,45 +2,6 @@
     <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-05-19 06:25:56 +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-05-19 06:25:56 +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'],

=== 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-05-19 06:25:56 +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/>
+            ${('%s, ' % object.company_id.state) or ''} ${object.company_id.country_id.name or ''}<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/>
+            ${('%s, ' % object.company_id.state) or ''} ${object.company_id.country_id.name or ''}<br/>
         % endif
         </span>
         % if object.company_id.phone:

=== modified file 'purchase/edi/purchase_order_action_data.xml'
--- purchase/edi/purchase_order_action_data.xml	2014-03-02 17:06:46 +0000
+++ purchase/edi/purchase_order_action_data.xml	2014-05-19 06:25:56 +0000
@@ -145,7 +145,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/>
+            ${('%s, ' % object.company_id.state) or ''} ${object.company_id.country_id.name or ''}<br/>
         % endif
         </span>
         % if object.company_id.phone:

=== 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-05-19 06:25:56 +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/>
+            ${('%s, ' % object.company_id.state) or ''} ${object.company_id.country_id.name or ''}<br/>
         % endif
         </span>
         % if object.company_id.phone:

=== modified file 'stock/stock_demo.xml'
--- stock/stock_demo.xml	2014-04-09 13:08:59 +0000
+++ stock/stock_demo.xml	2014-05-19 06:25:56 +0000
@@ -167,7 +167,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>

=== modified file 'website_event_sale/static/src/js/website.tour.event_sale.js'
--- website_event_sale/static/src/js/website.tour.event_sale.js	2014-04-14 08:48:33 +0000
+++ website_event_sale/static/src/js/website.tour.event_sale.js	2014-05-19 06:25:56 +0000
@@ -43,7 +43,7 @@
                     $("input[name='street']").val("123");
                     $("input[name='city']").val("123");
                     $("input[name='zip']").val("123");
-                    $("select[name='country_id']").val("21");
+                    $("input[name='country_id']").val("21");
                 },
             },
             {

=== 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-05-19 06:25:56 +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/>
+            ${('%s, ' % object.company_id.state) or ''} ${object.company_id.country_id.name or ''}<br/>
         % endif
         </span>
         % if object.company_id.phone:

=== modified file 'website_sale/controllers/main.py'
--- website_sale/controllers/main.py	2014-05-14 15:34:17 +0000
+++ website_sale/controllers/main.py	2014-05-19 06:25:56 +0000
@@ -6,6 +6,8 @@
 from openerp.addons.web.http import request
 from openerp.tools.translate import _
 from openerp.addons.website.models.website import slug
+from openerp.osv.orm import browse_record
+
 
 PPG = 20 # Products Per Page
 PPR = 4  # Products Per Row
@@ -263,27 +265,31 @@
         if tx and tx.state != 'draft':
             return request.redirect('/shop/payment/confirmation/%s' % order.id)
 
+    @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=context):
+            countries.update({country.id : country.name})
+        return countries
+    
     def checkout_values(self, data=None):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
         orm_partner = registry.get('res.partner')
         orm_user = registry.get('res.users')
-        orm_country = registry.get('res.country')
-        state_orm = registry.get('res.country.state')
-
-        country_ids = orm_country.search(cr, SUPERUSER_ID, [], context=context)
-        countries = orm_country.browse(cr, SUPERUSER_ID, country_ids, context)
-        states_ids = state_orm.search(cr, SUPERUSER_ID, [], context=context)
-        states = state_orm.browse(cr, SUPERUSER_ID, states_ids, context)
+        partner = orm_user.browse(cr, SUPERUSER_ID, request.uid, context=context).partner_id
+        shipping_ids = orm_partner.search(cr, SUPERUSER_ID, [("parent_id", "=", partner.id), ('type', "=", 'delivery')], limit=1, context=context)
 
         checkout = {}
         if not data:
             if request.uid != request.website.user_id.id:
-                partner = orm_user.browse(cr, SUPERUSER_ID, request.uid, context).partner_id
                 checkout.update( self.checkout_parse("billing", partner) )
 
-                shipping_ids = orm_partner.search(cr, SUPERUSER_ID, [("parent_id", "=", partner.id), ('type', "=", 'delivery')], limit=1, context=context)
                 if shipping_ids:
-                    shipping = orm_user.browse(cr, SUPERUSER_ID, request.uid, context)
+                    shipping = orm_partner.browse(cr, SUPERUSER_ID, shipping_ids[0], context=context)
+                    checkout.update({'shipping_ids': shipping_ids})
                     checkout.update( self.checkout_parse("shipping", shipping) )
                     checkout['shipping_different'] = True
             else:
@@ -296,12 +302,11 @@
         else:
             checkout = self.checkout_parse('billing', data)
             if data.get("shipping_different"):
+                checkout.update({'shipping_ids': shipping_ids})
                 checkout.update(self.checkout_parse('shipping', data))
                 checkout["shipping_different"] = True
 
         values = {
-            'countries': countries,
-            'states': states,
             'checkout': checkout,
             'shipping_different': checkout.get('shipping_different'),
             'error': {},
@@ -309,13 +314,16 @@
         return values
 
     mandatory_billing_fields = ["name", "phone", "email", "street", "city", "country_id", "zip"]
-    optional_billing_fields = ["street2", "state_id"]
+    optional_billing_fields = ["street2", "state_name"]
     mandatory_shipping_fields = ["name", "phone", "street", "city", "country_id", "zip"]
-    optional_shipping_fields = ["state_id"]
+    optional_shipping_fields = ["state_name"]
 
     def checkout_parse(self, address_type, data, remove_prefix=False):
         """ data is a dict OR a partner browse record
         """
+        cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
+        
+        orm_country = registry.get('res.country')
         # set mandatory and optional fields
         assert address_type in ('billing', 'shipping')
         if address_type == 'billing':
@@ -335,10 +343,20 @@
             if data.parent_id:
                 query[prefix + 'street2'] = data.parent_id.name
 
-        if query.get(prefix + 'state_id'):
-            query[prefix + 'state_id'] = int(query[prefix + 'state_id'])
+        if query.get(prefix + 'state_name'):
+            query[prefix + 'state_name'] = query[prefix + 'state_name']
+        
         if query.get(prefix + 'country_id'):
-            query[prefix + 'country_id'] = int(query[prefix + 'country_id'])
+            if query.get('shipping_country_id', False):
+                ctr_id = query['shipping_country_id']
+            else:
+                ctr_id = query.get('country_id', False)
+            if isinstance(ctr_id, browse_record):
+                query[prefix + 'country_id'] = query[prefix + 'country_id'].name
+            elif remove_prefix:
+                country_id = orm_country.search(cr, SUPERUSER_ID, [('name', '=', ctr_id)], context=context)
+                if country_id:
+                    data[prefix + 'country_id'] = country_id[0]
 
         if not remove_prefix:
             return query
@@ -395,7 +413,10 @@
             shipping_info = self.checkout_parse('shipping', checkout, True)
             shipping_info['type'] = 'delivery'
             shipping_info['parent_id'] = partner_id
-            shipping_id = orm_partner.create(cr, SUPERUSER_ID, shipping_info, context)
+            if checkout['shipping_ids']:
+                orm_partner.write(cr, SUPERUSER_ID, checkout['shipping_ids'], shipping_info, context=context)
+            else:
+                shipping_id = orm_partner.create(cr, SUPERUSER_ID, shipping_info, context=context)
 
         order_info = {
             'partner_id': partner_id,

=== modified file 'website_sale/static/src/js/website.tour.sale.js'
--- website_sale/static/src/js/website.tour.sale.js	2014-05-02 15:51:24 +0000
+++ website_sale/static/src/js/website.tour.sale.js	2014-05-19 06:25:56 +0000
@@ -68,7 +68,7 @@
                     $("input[name='street']").val("123");
                     $("input[name='city']").val("123");
                     $("input[name='zip']").val("123");
-                    $("select[name='country_id']").val("21");
+                    $("input[name='country_id']").val("21");
                 },
             },
             {

=== modified file 'website_sale/static/src/js/website_sale.js'
--- website_sale/static/src/js/website_sale.js	2014-05-02 14:01:52 +0000
+++ website_sale/static/src/js/website_sale.js	2014-05-19 06:25:56 +0000
@@ -7,6 +7,26 @@
         $(".oe_website_sale .js_shipping").toggle();
     });
 
+    $('.oe_website_sale input[name="country_id"]').focusin(function(){
+        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});
+        });
+    });
+    
+    $('.oe_website_sale input[name="shipping_country_id"]').focusin(function(){
+        openerp.jsonRpc('/shop/get_country', 'call', {}).then(function (countries){
+            var st = new Array();
+            $.each(countries, function(s, t) {
+                st.push(t);
+            });
+            $("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/templates.xml'
--- website_sale/views/templates.xml	2014-05-07 15:32:23 +0000
+++ website_sale/views/templates.xml	2014-05-19 06:25:56 +0000
@@ -727,23 +727,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 t-attf-class="form-group #{error.get('state_name') and 'has-error' or ''} col-lg-6">
+                      <label class="control-label" for="state_name"> State / Province...</label>
+                      <input type="text" name="state_name" class="form-control" t-att-value="checkout.get('state_name')" />
                   </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="checkout.get('country_id')" />
                   </div>
 
                   <div class="clearfix"/>
@@ -779,23 +769,13 @@
                       <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 t-attf-class="form-group #{error.get('shipping_state_name') and 'has-error' or ''} col-lg-6">
+                      <label class="control-label" for="shipping_state_name"> State / Province...</label>
+                      <input type="text" name="shipping_state_name" class="form-control" t-att-value="checkout.get('shipping_state_name', '')" />
                   </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>
+                      <label class="control-label" for="shipping_country_id">Country</label>
+                      <input type="text" name="shipping_country_id" class="form-control" t-att-value="checkout.get('shipping_country_id', '')" />
                   </div>
               </div>
               <a class="btn btn-default btn-primary pull-right mb32 a-submit">Confirm <span class="fa fa-long-arrow-right"/></a>