git.inspyration.org Git - odoo/odoo.git/commit

author	Olivier Dony <odo@openerp.com>
	Mon, 26 Nov 2012 18:15:27 +0000 (19:15 +0100)
committer	Olivier Dony <odo@openerp.com>
	Mon, 26 Nov 2012 18:15:27 +0000 (19:15 +0100)
commit	7f5ad724296868a31d6dc249a2f7fe48ffa58815
tree	ac8a5c61006c66c3d7d0e0ebc558d40c2afe0e0a	tree \| snapshot
parent	c78d16d49efb64f7ecbc67b4df252a81e31795ed	commit \| diff
parent	c5824190e212fc5aeadebe2b82b89c39ff047b12	commit \| diff

[MERGE] Forward-port 6.1 bugfixes up to rev. 4307

rev.4307 = rev-id launchpad_translations_on_behalf_of_openerp-20121125065030-g5if5pybr61la4yj

bzr revid: odo@openerp.com-20121126160320-t2suuik6lhk6wl0x
bzr revid: odo@openerp.com-20121126161836-mv8yymzgbnmif4ve
bzr revid: odo@openerp.com-20121126162023-ejvsapwouyudw6c6
bzr revid: odo@openerp.com-20121126181527-d4yx15372bis77qj

12 files changed:

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

openerp/addons/base/ir/ir_attachment.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_model.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_users.py	diff1 \|	diff2 \|	blob \| history
openerp/loglevels.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/fields.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history
openerp/report/interface.py	diff1 \|	diff2 \|	blob \| history
openerp/report/render/rml2pdf/trml2pdf.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/config.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/mail.py	diff1 \|	\|	blob \| history
openerp/tools/translate.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/yaml_import.py	diff1 \|	diff2 \|	blob \| history