← Back to branch summary

~openerp-dev/openobject-server/trunk-imp-user-form-psa

~openerp-dev/openobject-server/trunk-imp-user-form-psa

Viewing all changes in revision 5183.

Committer: Gaurav Panchal (OpenERP)
Date: 2014-05-15 12:28:09 UTC
mfrom: (5158.2.60 forward-port)
Revision ID: gan@tinyerp.com-20140515122809-ed8ypuk2drskhi81

[MERGE] Merged lp:openobject-server

files modified:
openerp/addons/base/ir/ir_model.py

openerp/addons/base/ir/ir_ui_view.py

openerp/addons/base/res/res_partner_view.xml

openerp/addons/base/res/res_users.py

openerp/addons/base/security/base_security.xml

openerp/modules/module.py

openerp/tools/convert.py

openerp/tools/safe_eval.py

Show diffs side-by-side

added added

removed removed

openerp/addons/base/ir/ir_model.py

openerp/addons/base/ir/ir_ui_view.py

openerp/addons/base/res/res_partner_view.xml

openerp/addons/base/res/res_users.py

openerp/addons/base/security/base_security.xml

openerp/modules/module.py

openerp/tools/convert.py

openerp/tools/safe_eval.py

Older »