[MERGE] forward porting fixes from saas-3
[odoo/odoo.git] / addons / product_manufacturer /
drwxr-xr-x   ..
-rw-r--r-- 1051 __init__.py
-rw-r--r-- 1774 __openerp__.py
drwxr-xr-x - i18n
-rw-r--r-- 1835 product_manufacturer.py
-rw-r--r-- 2257 product_manufacturer_view.xml
drwxr-xr-x - security