[MERGE] forward port of branch 7.0 up to 3a0af6a
authorDenis Ledoux <dle@odoo.com>
Wed, 22 Oct 2014 17:26:27 +0000 (19:26 +0200)
committerDenis Ledoux <dle@odoo.com>
Wed, 22 Oct 2014 17:26:27 +0000 (19:26 +0200)
commit0e4216361bf13cc0feb6f8d8200af80f343d066d
tree2b762d96ae9949b7897948b9e69f522b02ac29fa
parentadd28795fb7c02815212b605216d0932075fa6d4
parent3a0af6af7b5a67dfb1ed196bd3e5da41c1dfa57a
[MERGE] forward port of branch 7.0 up to 3a0af6a
addons/product/product.py
addons/product/product_view.xml
openerp/addons/base/test/base_test.yml
openerp/osv/orm.py
openerp/report/render/rml2pdf/trml2pdf.py