lp://qastaging/~openerp-dev/openobject-server/trunk-add-x2many-widget-sgo

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 2013-11-25

Diff: 29 lines (+3/-3)

2 files modified

openerp/addons/base/ir/ir_actions.xml (+2/-2)
openerp/addons/base/res/res_company_view.xml (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

4997. By Sanjay Gohel (Open ERP) on 2013-12-04

[MERGE]sync with trunk

4996. By Sanjay Gohel (Open ERP) on 2013-12-02

[MERGE]sync with trunk

4995. By Sanjay Gohel (Open ERP) on 2013-11-26

[MERGE]with trunk

4994. By Sanjay Gohel (Open ERP) on 2013-11-19

[MERGE]sync with trunk

4993. By Sanjay Gohel (Open ERP) on 2013-11-14

[IMP]add class oe_link on ir_actio_nserver or in res_Company

4992. By Launchpad Translations on behalf of openerp on 2013-11-12

Launchpad automatic translations update.

4991. By Antony Lesuisse (OpenERP) on 2013-11-10

[IMP] http move db dispatching to AbstractModel ir.http

Allow module to override the http dispatching process:
- The default implementation uses werkzeug.routing but any other method could
  be used, it'a also possible to pre/postprocess (i.e. url aliases)
- Authentication (auth param on route) is plugggable by defining now
  _auth_method_<methodname>
- Error handler are overridable, any module can define a new exception and
  handle it by orverriding the _handle_<error_code> method.
- Add model converters for routes, to directly get the browse record example
  @route(['/job/detail/<model("hr.job"):job>'], type='http', auth="user")

This is done by splitting dispatching, when the db is unknown low level http.py
dispatching is used, it's only used by a few controller in base and web. When
the db is known, ir_http is used because it's a regular Model it is fully
overridable by openerp modules.

4990. By Stephane Wirtel (OpenERP) on 2013-11-07

[FIX] test_mail: Rewrite the XSS test

4989. By Quentin (OpenERP) <email address hidden> on 2013-11-04

[IMP] base, currency: second attempt to include this patch (previously added in revision 4982 then reverted in revision 4984 because of a bug in the server that was making an infinite loop -which has been fixed in previous revision-). Updated the type of name field of res.currency.rate in <datetime> instead of <date> for those who need to update the rate of currencies several times per day

4988. By Quentin (OpenERP) <email address hidden> on 2013-11-04

[FIX] expression.py: when searching on a datetime field with an argument formated as a date, conversion should happen _also_ for the '=' operator. This omission was causing an infinite loop beacuse we were pushing the exact same leaf on the stack without any modification