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

author	Christophe Simonis <chs@odoo.com>
	Wed, 29 Oct 2014 18:33:02 +0000 (19:33 +0100)
committer	Christophe Simonis <chs@odoo.com>
	Wed, 29 Oct 2014 18:33:02 +0000 (19:33 +0100)
commit	8e637bac92f46d6ccb2d05c5df884d0ffb099951
tree	9420bec03e2b16b9e1f916a54c7850e49a2f5ed0	tree \| snapshot
parent	fe6eb853a56df42bc89e264ff252a6bf7c41ddd3	commit \| diff
parent	21b1203ee0f810cece33b1123998b1f0efe5b82c	commit \| diff

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

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

addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/account/report/account_partner_balance.py	diff1 \|	diff2 \|	blob \| history
addons/hr_timesheet_invoice/report/account_analytic_profit.py	diff1 \|	diff2 \|	blob \| history
addons/product/pricelist.py	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/product_visible_discount/product_visible_discount.py	diff1 \|	diff2 \|	blob \| history
addons/sale/wizard/sale_line_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/sale_margin/sale_margin.py	diff1 \|	diff2 \|	blob \| history
addons/web_calendar/static/src/js/web_calendar.js	diff1 \|	diff2 \|	blob \| history