git.inspyration.org Git - odoo/odoo.git/commit - openerp/addons/base/res/res_partner.py

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 22a8e52 e383386)

author	Christophe Simonis <chs@openerp.com>
	Wed, 12 Jun 2013 15:28:26 +0000 (17:28 +0200)
committer	Christophe Simonis <chs@openerp.com>
	Wed, 12 Jun 2013 15:28:26 +0000 (17:28 +0200)
commit	6f170ec732067654d660f2e732ef148f6e0b9a06
tree	4aeacf9577d553d2220a13cf0a5fd30fb082b8e0	tree \| snapshot
parent	22a8e5266e289af50df2aaa51b73c59e3aea97b4	commit \| diff
parent	e383386a79a2c574da8ab8b3d32a43b050fcdc78	commit \| diff

[MERGE] forward port of branch 7.0 up to revid 5006 chs@openerp.com-20130612151912-m19okjsdkjo12qnt

bzr revid: chs@openerp.com-20130612152826-j9sj42ten9mic8s0

12 files changed:

openerp/addons/base/ir/ir_actions.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_mail_server.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_model.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_values.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/workflow/workflow.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/module/wizard/base_module_upgrade.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_partner_view.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_users.py	diff1 \|	diff2 \|	blob \| history
openerp/service/__init__.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/misc.py	diff1 \|	diff2 \|	blob \| history

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