git.inspyration.org Git - odoo/odoo.git/commit - addons/account/account_move

[MERGE] forward port of branch 7.0 up to b91a75f7eff85edd5d51a91d10d6e3be8a409030

Conflicts:
addons/base_vat/base_vat.py
openerp/tools/safe_eval.py

Unnamed repository; edit this file 'description' to name the repository.

addons/account/account_invoice_view.xml	diff1 \|	diff2 \|	blob \| history
addons/account/account_move_line.py	diff1 \|	diff2 \|	blob \| history
addons/base_vat/base_vat.py	diff1 \|	diff2 \|	blob \| history
addons/hr_holidays/hr_holidays.py	diff1 \|	diff2 \|	blob \| history
addons/purchase_analytic_plans/purchase_analytic_plans.py	diff1 \|	diff2 \|	blob \| history
addons/stock/stock.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_fields.py	diff1 \|	diff2 \|	blob \| history
openerp/addons/base/ir/ir_values.py	diff1 \|	diff2 \|	blob \| history
openerp/tools/safe_eval.py	diff1 \|	diff2 \|	blob \| history