audrius/account-reconcile
1
0
Fork 1
mirror of https://github.com/OCA/account-reconcile.git synced 2025-01-20 12:27:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '7.0' into 8.0

Browse Source 
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
parent 313ed7f1e2 cb29f7c2d8
commit f1322826e9
68 changed files with 1174 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
__unported__/account_statement_completion_label/statement.py
View File

@@ -92,7 +92,7 @@ class AccountStatementCompletionRule(orm.Model):
ON
st_l.statement_id = s.id
WHERE
st_l.name ~* l.label
(st_l.name ~* l.label OR st_l.ref ~* l.label)
AND
l.profile_id = s.profile_id
AND
@@ -125,8 +125,8 @@ class AccountStatementLabel(orm.Model):
'label': fields.char('Bank Statement Label', size=100),
'account_id': fields.many2one('account.account', 'Account',
required=True,
help='Account corresponding to the label '
'for a given partner'),
help='Account corresponding to the '
'label for a given partner'),
'company_id': fields.related('account_id', 'company_id',
type='many2one',
relation='res.company',