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

author	Christophe Simonis <chs@openerp.com>
	Thu, 6 Feb 2014 11:02:20 +0000 (12:02 +0100)
committer	Christophe Simonis <chs@openerp.com>
	Thu, 6 Feb 2014 11:02:20 +0000 (12:02 +0100)
commit	a69f789b416ce09a01c00f576bf471223e744507
tree	23621509543ff497c730687d84cedd04bd9cfb63	tree \| snapshot
parent	a7c7e331315b849e7c024e255977ff5a9fdca2ac	commit \| diff
parent	c234d8547d6f159ef62dac6cbc5c8c3ad1e66979	commit \| diff

[MERGE] forward port of branch 7.0 up to revid 5224 chs@openerp.com-20140206105141-7e8bv8ordqqsswh7

bzr revid: dle@openerp.com-20140205105045-j95kduyjiq83e57z
bzr revid: dle@openerp.com-20140114173613-ruxye1m7fxtcjfim
bzr revid: dle@openerp.com-20140116161158-u95vcs3os4tk2zob
bzr revid: dle@openerp.com-20140121172737-gzawfi3ssg7xifef
bzr revid: chs@openerp.com-20140129094554-c3abc8x3qz9mpszr
bzr revid: chs@openerp.com-20140129140159-9vwkpr078shoonum
bzr revid: chs@openerp.com-20140206110220-myn57cryam1y4k9v

15 files changed:

addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/audittrail/audittrail.py	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/xml/mail.xml	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/xml/mail_followers.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_translation_view.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/tests/test_base.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/report/report_sxw.py	diff1 \|	diff2 \|	blob \| history
openerp/service/db.py	diff1 \|	\|	blob \| history
openerp/tests/test_mail.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/mail.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/translate.py	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/audittrail/audittrail.py	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/xml/mail.xml	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/xml/mail_followers.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_translation_view.xml	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/res/res_partner.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/tests/test_base.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/report/report_sxw.py	diff1 \|	diff2 \|	blob \| history
openerp/service/db.py	diff1 \|	\|	blob \| history
openerp/tests/test_mail.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/mail.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/translate.py	diff1 \|	diff2 \|	blob \| history