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

author	Quentin (OpenERP) <qdp-launchpad@openerp.com>
	Thu, 4 Apr 2013 09:52:57 +0000 (11:52 +0200)
committer	Quentin (OpenERP) <qdp-launchpad@openerp.com>
	Thu, 4 Apr 2013 09:52:57 +0000 (11:52 +0200)
commit	3bb51ac696943a69fc5dc72e2577d64c242d8ca3
tree	e2fbe4a730175e6b0fcfd2a12b224ee385897e96	tree \| snapshot
parent	086b844df5304115982f60c1e5acc3742e0048e4	commit \| diff
parent	665cd6c6eabbfe4462aae83cc2749fd933bf8689	commit \| diff

[MERGE] forward port of bugfixes made in 7.0, up to revision 8969.

bzr revid: qdp-launchpad@openerp.com-20130404095257-oek77sijuxjyi0aj

25 files changed:

addons/account/account.py	diff1 \|	diff2 \|	blob \| history
addons/account/wizard/account_invoice_refund.py	diff1 \|	diff2 \|	blob \| history
addons/account_analytic_analysis/account_analytic_analysis.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead_data.xml	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead_view.xml	diff1 \|	diff2 \|	blob \| history
addons/crm/test/crm_lead_message.yml	\|	diff2 \|	blob \| history
addons/hr_expense/hr_expense.py	diff1 \|	diff2 \|	blob \| history
addons/hr_expense/hr_expense_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays.py	diff1 \|	diff2 \|	blob \| history
addons/lunch/lunch.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_mail.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_message.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_thread.py	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/css/mail.css	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/js/mail.js	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/xml/mail_followers.xml	diff1 \|	diff2 \|	blob \| history
addons/mail/wizard/mail_compose_message.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/stock.py	diff1 \|	diff2 \|	blob \| history
addons/portal_sale/portal_sale.py	diff1 \|	diff2 \|	blob \| history
addons/product/product_view.xml	diff1 \|	diff2 \|	blob \| history
addons/purchase/res_config.py	diff1 \|	diff2 \|	blob \| history
addons/sale/res_config.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/sale/wizard/sale_line_invoice.py	diff1 \|	diff2 \|	blob \| history

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

addons/account/account.py	diff1 \|	diff2 \|	blob \| history
addons/account/wizard/account_invoice_refund.py	diff1 \|	diff2 \|	blob \| history
addons/account_analytic_analysis/account_analytic_analysis.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead.py	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead_data.xml	diff1 \|	diff2 \|	blob \| history
addons/crm/crm_lead_view.xml	diff1 \|	diff2 \|	blob \| history
addons/crm/test/crm_lead_message.yml	\|	diff2 \|	blob \| history
addons/hr_expense/hr_expense.py	diff1 \|	diff2 \|	blob \| history
addons/hr_expense/hr_expense_view.xml	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays.py	diff1 \|	diff2 \|	blob \| history
addons/lunch/lunch.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_mail.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_message.py	diff1 \|	diff2 \|	blob \| history
addons/mail/mail_thread.py	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/css/mail.css	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/js/mail.js	diff1 \|	diff2 \|	blob \| history
addons/mail/static/src/xml/mail_followers.xml	diff1 \|	diff2 \|	blob \| history
addons/mail/wizard/mail_compose_message.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/stock.py	diff1 \|	diff2 \|	blob \| history
addons/portal_sale/portal_sale.py	diff1 \|	diff2 \|	blob \| history
addons/product/product_view.xml	diff1 \|	diff2 \|	blob \| history
addons/purchase/res_config.py	diff1 \|	diff2 \|	blob \| history
addons/sale/res_config.py	diff1 \|	diff2 \|	blob \| history
addons/sale/sale.py	diff1 \|	diff2 \|	blob \| history
addons/sale/wizard/sale_line_invoice.py	diff1 \|	diff2 \|	blob \| history