mirror of
https://github.com/OCA/account-reconcile.git
synced 2025-01-20 12:27:39 +02:00
Conflicts: .travis.yml __unported__/account_advanced_reconcile/res_config.py __unported__/account_advanced_reconcile/res_config_view.xml __unported__/account_statement_base_completion/__openerp__.py __unported__/account_statement_base_completion/i18n/fr.po account_advanced_reconcile/res_config.py account_advanced_reconcile/res_config_view.xml account_easy_reconcile/res_config.py account_easy_reconcile/res_config_view.xml account_invoice_reference/__openerp__.py account_invoice_reference/account_move.py statement_voucher_killer/__openerp__.py statement_voucher_killer/voucher.py