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

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp://qastaging/openobject-server

OpenERP Core Team: Pending requested 2014-02-25

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

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

[IMP] improvement in code

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

[MERGE] Merged lp:openobject-server

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

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

5089. By Xavier (Open ERP) on 2014-02-19

[FIX] actually retry select on EINTR

Turns out select has its own select.error which does *not* subclass
EnvironmentError (or OSError or IOError) and does *not* have a .errno
attribute. So use the correct exception, might just work better than using
a completely different one with no relation.

5088. By Xavier (Open ERP) on 2014-02-19

[FIX] correctly display JS stack frames in phantomjs runner

altered reporting to handle and deserialize JSON if JSON-deserializable. Can't
just send multiple lines as driver currently does not handle multiple lines of
message... Yeah turns out having a JSON-based protocol between phantomjs and
the python runner allowed multiple lines in messages, who'd have thought eh?

5087. By Xavier (Open ERP) on 2014-02-19

[IMP] style

use break instead of return so cleanup can eventually be put after loop if necessary (?)

5086. By Xavier (Open ERP) on 2014-02-19

[FIX] possibility of select being interrupted, just restart the call

uses EnvironmentError because not sure if socket.error or os.error

5085. By Xavier (Open ERP) on 2014-02-18

[IMP] phantomjs runner

* use Skip exception to skip tests in case phantomjs binary not found
* remove spurious logging, move some to debug when debatable
* use testing assertions for correct reporting
* allow failure message
* use mutable buffer to accumulate stdout data

5084. By Xavier (Open ERP) on 2014-02-18

[IMP] slightly improve error message at the end of a module's failed tests

5083. By Xavier (Open ERP) on 2014-02-18

[FIX] run_unit_tests lying about its return value: it only ever returns a bool, never None