[MERGE] Merge from trunk-wms-loconopreport-jco
[odoo/odoo.git] / addons / product / test /
drwxr-xr-x   ..
-rw-r--r-- 2988 product_pricelist.yml
-rw-r--r-- 921 product_uom.yml