Merge lp:~camptocamp/account-financial-report/7.0-export-add-statement into lp:~account-report-core-editor/account-financial-report/7.0

Proposed by Guewen Baconnier @ Camptocamp
Status: Needs review
Proposed branch: lp:~camptocamp/account-financial-report/7.0-export-add-statement
Merge into: lp:~account-report-core-editor/account-financial-report/7.0
Diff against target: 29 lines (+4/-1)
1 file modified
account_export_csv/wizard/account_export_csv.py (+4/-1)
To merge this branch: bzr merge lp:~camptocamp/account-financial-report/7.0-export-add-statement
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza Needs Resubmitting
Stéphane Bidoul (Acsone) (community) code review, no test Approve
Review via email: mp+226440@code.launchpad.net

Description of the change

Add name of the bank statement on export of account move lines

To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

LGTM. You can remove extra empty line on SQL sentence, though.

review: Approve (code review)
95. By Guewen Baconnier @ Camptocamp on 2014-07-11

remove empty line

Revision history for this message
Stéphane Bidoul (Acsone) (sbi) :
review: Approve (code review, no test)
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :
review: Needs Resubmitting

Unmerged revisions

95. By Guewen Baconnier @ Camptocamp on 2014-07-11

remove empty line

94. By Guewen Baconnier @ Camptocamp on 2014-07-11

Add name of the bank statement on export of account move lines

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_export_csv/wizard/account_export_csv.py'
2--- account_export_csv/wizard/account_export_csv.py 2013-09-13 11:25:19 +0000
3+++ account_export_csv/wizard/account_export_csv.py 2014-07-11 12:09:41 +0000
4@@ -282,6 +282,7 @@
5 _(u'TAX CODE CODE'),
6 _(u'TAX CODE NAME'),
7 _(u'TAX AMOUNT'),
8+ _(u'BANK STATEMENT'),
9 ]
10
11
12@@ -318,7 +319,8 @@
13 account_fiscalyear.name as fiscal_year,
14 account_tax_code.code AS aml_tax_code_code,
15 account_tax_code.name AS aml_tax_code_name,
16- account_move_line.tax_amount AS aml_tax_amount
17+ account_move_line.tax_amount AS aml_tax_amount,
18+ account_bank_statement.name AS bank_statement
19 FROM
20 public.account_move_line
21 JOIN account_account on (account_account.id=account_move_line.account_id)
22@@ -332,6 +334,7 @@
23 LEFT JOIN account_tax on (account_tax.id=account_move_line.account_tax_id)
24 LEFT JOIN account_tax_code on (account_tax_code.id=account_move_line.tax_code_id)
25 LEFT JOIN account_analytic_account on (account_analytic_account.id=account_move_line.analytic_account_id)
26+ LEFT JOIN account_bank_statement on (account_bank_statement.id=account_move_line.statement_id)
27 WHERE account_period.id IN %(period_ids)s
28 AND account_journal.id IN %(journal_ids)s
29 ORDER BY account_move_line.date

Subscribers

People subscribed via source and target branches

to status/vote changes: