← Back to branch summary

~neobis/openerp-server/7.0

~neobis/openerp-server/7.0

Viewing all changes in revision 4924.

Committer: Elias Hermoso Illera
Date: 2014-05-16 11:50:40 UTC
mfrom: (4825.1.374 7.0-staging-xal)
Revision ID: elias@neobis.nl-20140516115040-szx3ommqm1bm41ww

[MRG] - Merged from OCB branch

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

openerp/addons/base/res/res_bank.py

openerp/addons/base/res/res_bank_view.xml

openerp/addons/base/res/res_lang.py

openerp/osv/fields.py

openerp/osv/orm.py

openerp/report/render/rml2pdf/trml2pdf.py

openerp/report/report_sxw.py

openerp/tests/addons/test_impex/tests/test_export.py

openerp/tools/config.py

Show diffs side-by-side

added added

removed removed

openerp/addons/base/ir/ir_model.py

openerp/addons/base/res/res_bank.py

openerp/addons/base/res/res_bank_view.xml

openerp/addons/base/res/res_lang.py

openerp/osv/fields.py

openerp/osv/orm.py

openerp/report/render/rml2pdf/trml2pdf.py

openerp/report/report_sxw.py

openerp/tests/addons/test_impex/tests/test_export.py

openerp/tools/config.py

Older »