Commit Graph

4 Commits

Author SHA1 Message Date
Leonardo Pistone
f1322826e9 Merge branch '7.0' into 8.0
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
2015-01-13 14:47:22 +01:00
Alexandre Fayolle
5d5da9b065 fix unreachable code flagged by pylint 2014-09-26 08:15:13 +02:00
Laurent Mignon (aka lmi)
8496d8476a Merge remote-tracking branch 'upstream/7.0' into 8.0-port-base-import
Conflicts:
	.gitignore
	.travis.yml
	README.md
	__unported__/account_statement_base_completion/__openerp__.py
	__unported__/account_statement_commission/__openerp__.py
	__unported__/account_statement_transactionid_import/__openerp__.py
	__unported__/statement_voucher_killer/__openerp__.py
2014-08-06 10:28:57 +02:00
Pedro M. Baeza
e4a743bc7d Set as uninstallable and moved to __unported__ all modules. 2014-07-02 12:46:57 +02:00