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

..

i18n

Set as uninstallable and moved to __unported__ all modules.

2014-07-02 12:46:57 +02:00

report

Merge remote-tracking branch 'upstream/7.0' into 8.0-port-base-import

2014-08-06 10:28:57 +02:00

security

Set as uninstallable and moved to __unported__ all modules.

2014-07-02 12:46:57 +02:00

test

Set as uninstallable and moved to __unported__ all modules.

2014-07-02 12:46:57 +02:00

__init__.py

Merge remote-tracking branch 'upstream/7.0' into 8.0-port-base-import

2014-08-06 10:28:57 +02:00

__openerp__.py

Merge remote-tracking branch 'upstream/7.0' into 8.0-port-base-import

2014-08-06 10:28:57 +02:00

account_view.xml

Set as uninstallable and moved to __unported__ all modules.

2014-07-02 12:46:57 +02:00

account.py

Merge remote-tracking branch 'upstream/7.0' into 8.0-port-base-import

2014-08-06 10:28:57 +02:00

report.xml

Set as uninstallable and moved to __unported__ all modules.

2014-07-02 12:46:57 +02:00

statement_view.xml

Merge remote-tracking branch 'upstream/7.0' into 8.0-port-base-import

2014-08-06 10:28:57 +02:00

statement.py

Merge remote-tracking branch 'upstream/7.0' into 8.0-port-base-import

2014-08-06 10:28:57 +02:00

voucher.py

Merge remote-tracking branch 'upstream/7.0' into 8.0-port-base-import

2014-08-06 10:28:57 +02:00