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

[MERGE] forward port of branch 7.0 up to e2dd18f

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

addons/account/account_invoice.py	diff1 \|	diff2 \|	blob \| history
addons/marketing_campaign/__openerp__.py	diff1 \|	diff2 \|	blob \| history
addons/mrp/mrp.py	diff1 \|	diff2 \|	blob \| history
addons/product/product.py	diff1 \|	diff2 \|	blob \| history
addons/product/product_view.xml	diff1 \|	diff2 \|	blob \| history
addons/project_timesheet/project_timesheet.py	diff1 \|	diff2 \|	blob \| history