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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8179683 67d431b)

author	Christophe Simonis <chs@openerp.com>
	Fri, 23 Aug 2013 14:31:14 +0000 (16:31 +0200)
committer	Christophe Simonis <chs@openerp.com>
	Fri, 23 Aug 2013 14:31:14 +0000 (16:31 +0200)
commit	58868227f913b398d6299941e2c155f14c69cb3c
tree	610c55924fe510d1a8109a82b9c832451f6e4719	tree \| snapshot
parent	8179683143f880b10f40559a3da48afcfcfcd8ee	commit \| diff
parent	67d431bdb931d8dceb75bb89f59006832e96dc24	commit \| diff

[MERGE] forward port of branch 7.0 up to revid 9382 chs@openerp.com-20130823131214-ipouwtnz8r16mlvv

bzr revid: chs@openerp.com-20130823143114-83tdjhbsdes0kydr

14 files changed:

addons/account_voucher/account_voucher.py	diff1 \|	diff2 \|	blob \| history
addons/lunch/lunch.py	diff1 \|	diff2 \|	blob \| history
addons/lunch/lunch_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_message.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_thread.py	diff1 \|	diff2 \|	blob \| history
addons/mail/tests/test_mail_gateway.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp_view.xml	diff1 \|	diff2 \|	blob \| history
addons/mrp/res_config.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/project/project.py	diff1 \|	diff2 \|	blob \| history
addons/sale_stock/sale_stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock_view.xml	diff1 \|	diff2 \|	blob \| history
addons/stock/wizard/stock_fill_inventory.py	diff1 \|	diff2 \|	blob \| history

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