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

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cf4cbd5 ada9724)

author	Christophe Simonis <chs@odoo.com>
	Thu, 28 Aug 2014 14:21:27 +0000 (16:21 +0200)
committer	Christophe Simonis <chs@odoo.com>
	Thu, 28 Aug 2014 14:21:27 +0000 (16:21 +0200)
commit	7e117b18a01d55c85856050eba7f1983bc2c34e9
tree	dc825a5401dfe9482c6a72b37419986d9b4c01f4	tree \| snapshot
parent	cf4cbd5d3b240756fece7d4f65038ff531f7c730	commit \| diff
parent	ada9724655b85587cd1b992a6c636800beadd56b	commit \| diff

[MERGE] forward port of branch saas-3 up to ada9724

12 files changed:

addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/base_gengo/res_company.py	diff1 \|	diff2 \|	blob \| history
addons/board/static/src/js/dashboard.js	diff1 \|	diff2 \|	blob \| history
addons/email_template/wizard/mail_compose_message.py	diff1 \|	diff2 \|	blob \| history
addons/email_template/wizard/mail_compose_message_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_alias.py	diff1 \|	diff2 \|	blob \| history
addons/point_of_sale/point_of_sale.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/chrome.js	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/security/ir.model.access.csv	diff1 \|	diff2 \|	blob \| history
openerp/report/report_sxw.py	diff1 \|	diff2 \|	blob \| history

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