lp:~openerp-dev/openobject-server/niv-dev-server

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openobject-server at revision 3081

OpenERP Core Team: Pending requested 2010-11-23

Diff: 1327 lines (+649/-457)

20 files modified

.bzrignore (+3/-0)
bin/addons/base/__init__.py (+1/-1)
bin/addons/base/__openerp__.py (+2/-1)
bin/addons/base/ir/__init__.py (+1/-0)
bin/addons/base/ir/ir_config_parameter.py (+101/-0)
bin/addons/base/ir/ir_cron.py (+2/-1)
bin/addons/base/maintenance/__init__.py (+0/-25)
bin/addons/base/maintenance/maintenance.py (+0/-206)
bin/addons/base/maintenance/maintenance_security.xml (+0/-6)
bin/addons/base/maintenance/maintenance_view.xml (+0/-131)
bin/addons/base/publisher_warranty/__init__.py (+25/-0)
bin/addons/base/publisher_warranty/publisher_warranty.py (+320/-0)
bin/addons/base/publisher_warranty/publisher_warranty_data.xml (+20/-0)
bin/addons/base/publisher_warranty/publisher_warranty_view.xml (+146/-0)
bin/addons/base/res/res_log.py (+6/-7)
bin/addons/base/res/res_log_view.xml (+2/-0)
bin/addons/base/security/ir.model.access.csv (+3/-2)
bin/netsvc.py (+1/-0)
bin/tools/config.py (+16/-8)
bin/tools/maintenance.py (+0/-69)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3130. By Nicolas Vanhoren (OpenERP) on 2010-12-20

[FIX] Fixed problem with pings and openerp.com web server.

3129. By Launchpad Translations on behalf of openerp on 2010-12-20

Launchpad automatic translations update.

3128. By Launchpad Translations on behalf of openerp on 2010-12-19

Launchpad automatic translations update.

3127. By Launchpad Translations on behalf of openerp on 2010-12-18

Launchpad automatic translations update.

3126. By Olivier Dony (Odoo) on 2010-12-17

[FIX] fields_view_get: ignore non-element nodes during view inheritance resolution

3125. By Olivier Laurent (Open ERP) on 2010-12-17

[FIX] addons/__init__.py: wrong number of arguments for format string

3124. By Launchpad Translations on behalf of openerp on 2010-12-17

Launchpad automatic translations update.

3123. By Olivier Dony (Odoo) on 2010-12-16

[FIX] safe_eval: support for allowing auto-loading of python submodules, such as _strptime

3122. By Olivier Dony (Odoo) on 2010-12-16

[IMP] orm.read_group: raise if called with group_by being a non-database-stored field

3121. By Olivier Dony (Odoo) on 2010-12-16

[FIX] res_config: made strings in compatibility install wizard translatable