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
This commit is contained in:
Leonardo Pistone
2015-01-13 14:47:22 +01:00
68 changed files with 1174 additions and 348 deletions

View File

@@ -63,7 +63,8 @@ class AccountBankStatement(orm.Model):
})
return res
def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id,
def create_move_from_st_line(self, cr, uid, st_line_id,
company_currency_id,
st_line_number, context=None):
if context is None:
context = {}