[MERGE]: merging from the development branch 2
[odoo/odoo.git] / addons / product_margin /
drwxr-xr-x   ..
-rw-r--r-- 1092 __init__.py
-rw-r--r-- 1634 __openerp__.py
drwxr-xr-x - i18n
-rw-r--r-- 8178 product_margin.py
-rw-r--r-- 4070 product_margin_view.xml
drwxr-xr-x - wizard