Merge lp://qastaging/~openerp-dev/openobject-server/trunk-res-country-state-cleaning-mme into lp://qastaging/openobject-server
Proposed by
Thibault Delavallée (OpenERP)
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~openerp-dev/openobject-server/trunk-res-country-state-cleaning-mme |
Merge into: | lp://qastaging/openobject-server |
Diff against target: |
584 lines (+29/-139) 21 files modified
doc/03_module_dev_02.rst (+0/-1) doc/03_module_dev_03.rst (+1/-1) doc/form-view-guidelines.rst (+1/-1) openerp/addons/base/__openerp__.py (+0/-1) openerp/addons/base/report/corporate_defaults.xml (+1/-1) 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/-15) openerp/addons/base/res/res_company_view.xml (+1/-1) openerp/addons/base/res/res_country.py (+0/-16) openerp/addons/base/res/res_country_view.xml (+0/-42) openerp/addons/base/res/res_partner.py (+7/-15) 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 (+2/-2) 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 (+0/-4) openerp/addons/base/tests/test_mail_examples.py (+1/-1) openerp/addons/base/tests/test_search.py (+5/-6) openerp/osv/expression.py (+0/-10) |
To merge this branch: | bzr merge lp://qastaging/~openerp-dev/openobject-server/trunk-res-country-state-cleaning-mme |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Core Team | Pending | ||
Review via email:
|
Description of the change
[Fix] remove res.country.state model and replace all many2one state by a char field
To post a comment you must log in.
Unmerged revisions
- 5092. By Mehul Mehta(OpenERP)
-
[IMP] improvement in code
- 5091. By Mehul Mehta(OpenERP)
-
[MERGE] Merged lp:openobject-server
- 5090. By Mehul Mehta(OpenERP)
-
[Fix] remove res.country.state model and replace all many2one state by a char field