6b1a804b29
Conflicts: addons/base_vat/base_vat.py openerp/tools/safe_eval.py |
||
---|---|---|
.. | ||
i18n | ||
__init__.py | ||
__openerp__.py | ||
purchase_analytic_plans.py | ||
purchase_analytic_plans_view.xml |
6b1a804b29
Conflicts: addons/base_vat/base_vat.py openerp/tools/safe_eval.py |
||
---|---|---|
.. | ||
i18n | ||
__init__.py | ||
__openerp__.py | ||
purchase_analytic_plans.py | ||
purchase_analytic_plans_view.xml |