← Back to branch summary

~openerp-dev/openobject-server/trunk-improve-demo-rpa

~openerp-dev/openobject-server/trunk-improve-demo-rpa

Viewing all changes in revision 4262.

Committer: Rucha (Open ERP)
Date: 2012-08-06 05:07:06 UTC
mfrom: (4199.2.98 trunk)
Revision ID: rpa@tinyerp.com-20120806050706-lpi4v51rwoqoxuxd

[MERGE]: Merge with latest trunk-server

files modified:
openerp/addons/base/i18n/ja.po

openerp/addons/base/ir/ir.xml

openerp/addons/base/ir/ir_actions.py

openerp/addons/base/ir/ir_config_parameter_view.xml

openerp/addons/base/module/module_view.xml

openerp/addons/base/res/res_config.xml

openerp/addons/base/res/res_partner_view.xml

openerp/addons/base/security/ir.model.access.csv

openerp/osv/fields.py

openerp/osv/orm.py

openerp/tools/convert.py

Show diffs side-by-side

added added

removed removed

openerp/addons/base/i18n/ja.po

openerp/addons/base/ir/ir.xml

openerp/addons/base/ir/ir_actions.py

openerp/addons/base/ir/ir_config_parameter_view.xml

openerp/addons/base/module/module_view.xml

openerp/addons/base/res/res_config.xml

openerp/addons/base/res/res_partner_view.xml

openerp/addons/base/security/ir.model.access.csv

openerp/osv/fields.py

openerp/osv/orm.py

openerp/tools/convert.py

Older »