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

author	Cecile Tonglet <cto@openerp.com>
	Mon, 17 Dec 2012 14:47:53 +0000 (15:47 +0100)
committer	Cecile Tonglet <cto@openerp.com>
	Mon, 17 Dec 2012 14:47:53 +0000 (15:47 +0100)
commit	ad8b76de5374bceaf7f4f26af8448ebb8c7e443a
tree	dbab3fd3aecb4c5da014b196b9ef1215262353b2	tree \| snapshot
parent	5f0070dcb6d709c91d30008a79fc89074e0a3962	commit \| diff
parent	39fe69babe7e2f05330de6829a2843f91a04f440	commit \| diff

[MERGE] From trunk (second time)

bzr revid: cto@openerp.com-20121217144753-1rboqdw01h8yrehj

20 files changed:

openerp/addons/base/ir/ir_actions.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_cron.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_filters.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_mail_server.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_needaction.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_sequence.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_translation.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_ui_menu.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_ui_view.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_values.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/workflow/print_instance.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_config.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_currency.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_lang.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_request.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base_quality_interrogation.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/convert.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/misc.py	diff1 \|	diff2 \|	blob \| history
openerp/workflow/workitem.py	diff1 \|	diff2 \|	blob \| history

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

openerp/addons/base/ir/ir_actions.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_cron.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_filters.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_mail_server.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_needaction.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_sequence.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_translation.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_ui_menu.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_ui_view.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_values.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/workflow/print_instance.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_config.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_currency.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_lang.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_request.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base_quality_interrogation.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/convert.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/misc.py	diff1 \|	diff2 \|	blob \| history
openerp/workflow/workitem.py	diff1 \|	diff2 \|	blob \| history