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

[MERGE] forward merge 7.0 until revision 4919.

bzr revid: vmt@openerp.com-20130404130704-24vsmczw34cssytd

27 files changed:

debian/control	diff1 \|	diff2 \|	blob \| history
openerp/__init__.py	diff1 \|	diff2 \|	blob \| history
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_model.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/module/module.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner_view.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_users.py	diff1 \|	diff2 \|	blob \| history
openerp/cli/server.py	diff1 \|	diff2 \|	blob \| history
openerp/modules/loading.py	diff1 \|	diff2 \|	blob \| history
openerp/modules/registry.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/expression.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history
openerp/service/cron.py	diff1 \|	diff2 \|	blob \| history
openerp/service/db.py	diff1 \|	\|	blob \| history
openerp/service/model.py	diff1 \|	\|	blob \| history
openerp/service/workers.py	diff1 \|	diff2 \|	blob \| history
openerp/service/wsgi_server.py	diff1 \|	diff2 \|	blob \| history
openerp/sql_db.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/image.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/mail.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/misc.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/translate.py	diff1 \|	diff2 \|	blob \| history
openerpcommand/cron.py	diff1 \|	\|	blob \| history
openerpcommand/web.py	diff1 \|	\|	blob \| history
setup.py	diff1 \|	diff2 \|	blob \| history

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

debian/control	diff1 \|	diff2 \|	blob \| history
openerp/__init__.py	diff1 \|	diff2 \|	blob \| history
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_model.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/module/module.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner_view.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_users.py	diff1 \|	diff2 \|	blob \| history
openerp/cli/server.py	diff1 \|	diff2 \|	blob \| history
openerp/modules/loading.py	diff1 \|	diff2 \|	blob \| history
openerp/modules/registry.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/expression.py	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history
openerp/service/cron.py	diff1 \|	diff2 \|	blob \| history
openerp/service/db.py	diff1 \|	\|	blob \| history
openerp/service/model.py	diff1 \|	\|	blob \| history
openerp/service/workers.py	diff1 \|	diff2 \|	blob \| history
openerp/service/wsgi_server.py	diff1 \|	diff2 \|	blob \| history
openerp/sql_db.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/image.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/mail.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/misc.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/translate.py	diff1 \|	diff2 \|	blob \| history
openerpcommand/cron.py	diff1 \|	\|	blob \| history
openerpcommand/web.py	diff1 \|	\|	blob \| history
setup.py	diff1 \|	diff2 \|	blob \| history