Merge remote-tracking branch 'origin/8.0-account_advanced_reconcile' … · OCA/account-reconcile@ff4f902 · GitHub

Commit

Merge remote-tracking branch 'origin/8.0-account_advanced_reconcile' …

Browse files

…into 8.0-account_advanced_reconcile

# Conflicts:
#	account_advanced_reconcile/README.rst
#	account_advanced_reconcile/__openerp__.py
#	account_statement_operation_rule/model/account_statement_line.py

Loading branch information

JordiBForgeFlow committed Sep 17, 2016

2 parents 1c65144 + 79d54e1 commit ff4f902