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

Proposed by Mehul Mehta(OpenERP)
Status: Needs review
Proposed branch: lp://qastaging/~openerp-dev/openobject-server/trunk-res-state-cleaning-mme
Merge into: lp://qastaging/openobject-server
Diff against target: 959 lines (+56/-341)
20 files modified
openerp/addons/base/__openerp__.py (+0/-1)
openerp/addons/base/report/corporate_defaults.xml (+1/-1)
openerp/addons/base/res/res.country.state.csv (+0/-52)
openerp/addons/base/res/res_bank.py (+6/-8)
openerp/addons/base/res/res_bank_view.xml (+1/-1)
openerp/addons/base/res/res_company.py (+2/-7)
openerp/addons/base/res/res_company_view.xml (+1/-1)
openerp/addons/base/res/res_country.py (+1/-18)
openerp/addons/base/res/res_country_data.xml (+11/-11)
openerp/addons/base/res/res_country_view.xml (+0/-41)
openerp/addons/base/res/res_partner.py (+10/-16)
openerp/addons/base/res/res_partner_demo.xml (+0/-6)
openerp/addons/base/res/res_partner_report_address.xml (+1/-1)
openerp/addons/base/res/res_partner_view.xml (+6/-6)
openerp/addons/base/res/res_users.py (+0/-4)
openerp/addons/base/security/ir.model.access.csv (+0/-2)
openerp/addons/base/tests/test_expression.py (+7/-146)
openerp/addons/base/tests/test_mail_examples.py (+1/-1)
openerp/addons/base/tests/test_search.py (+7/-9)
openerp/osv/expression.py (+1/-9)
To merge this branch: bzr merge lp://qastaging/~openerp-dev/openobject-server/trunk-res-state-cleaning-mme
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+209912@code.qastaging.launchpad.net

Description of the change

Hello,

  I have clean res.country.state.

    - remove res.country.state model
    - replace all many2one state_ids field by a char field

Thanks,
Mehul Mehta(mme)

To post a comment you must log in.
5110. By Mehul Mehta(OpenERP)

[MERGE] Merged with lp:openobject-server

5111. By Mehul Mehta(OpenERP)

[IMP] improved a change as per regarding error

5112. By Mehul Mehta(OpenERP)

[MERGE] Merged with lp:openobject-server

5113. By Mehul Mehta(OpenERP)

[MERGE] Merged with lp:openobject-server

5114. By Mehul Mehta(OpenERP)

[MERGE] Merged with lp:openobject-server

5115. By Mehul Mehta(OpenERP)

[MERGE] Merged with lp:openobject-server

5116. By Mehul Mehta(OpenERP)

[IMP]improved a code for state field print issue in report

5117. By Mehul Mehta(OpenERP)

[IMP] improved address_format field in res_country_data file

5118. By Mehul Mehta(OpenERP)

[MERGE] Merged with lp:openobject-server

Revision history for this message
Ray Carnes (rcarnes) wrote :

Puerto Rico is missing from the list of 'states' (it is an unincorporated territory of the United States).

For completeness, the following list adds additional missing state equivalents:

id code name
base.state_us_52 AS American Samoa
base.state_us_53 FM Federated States of Micronesia
base.state_us_54 GU Guam
base.state_us_55 MH Marshall Islands
base.state_us_56 MP Northern Mariana Islands
base.state_us_57 PW Palau
base.state_us_58 PR Puerto Rico
base.state_us_59 VI Virgin Islands
base.state_us_60 AA Armed Forces - Americas
base.state_us_61 AE Armed Forces - Europe
base.state_us_62 AP Armed Forces - Pacific

5119. By Mehul Mehta(OpenERP)

[MERGE] Merged lp:openobject-server

5120. By Mehul Mehta(OpenERP)

[IMP] Improved minor changes in res_partner

5121. By Mehul Mehta(OpenERP)

[MERGE] Merged openobject-server

Unmerged revisions

5121. By Mehul Mehta(OpenERP)

[MERGE] Merged openobject-server

5120. By Mehul Mehta(OpenERP)

[IMP] Improved minor changes in res_partner

5119. By Mehul Mehta(OpenERP)

[MERGE] Merged lp:openobject-server

5118. By Mehul Mehta(OpenERP)

[MERGE] Merged with lp:openobject-server

5117. By Mehul Mehta(OpenERP)

[IMP] improved address_format field in res_country_data file

5116. By Mehul Mehta(OpenERP)

[IMP]improved a code for state field print issue in report

5115. By Mehul Mehta(OpenERP)

[MERGE] Merged with lp:openobject-server

5114. By Mehul Mehta(OpenERP)

[MERGE] Merged with lp:openobject-server

5113. By Mehul Mehta(OpenERP)

[MERGE] Merged with lp:openobject-server

5112. By Mehul Mehta(OpenERP)

[MERGE] Merged with lp:openobject-server

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.