Merge lp:~therp-nl/ocb-addons/6.1_lp1340105 into lp:ocb-addons/6.1

Proposed by Holger Brunn (Therp)
Status: Rejected
Rejected by: Holger Brunn (Therp)
Proposed branch: lp:~therp-nl/ocb-addons/6.1_lp1340105
Merge into: lp:ocb-addons/6.1
Diff against target: 23 lines (+2/-0)
2 files modified
account/wizard/account_report_aged_partner_balance.py (+1/-0)
account/wizard/account_report_partner_balance.py (+1/-0)
To merge this branch: bzr merge lp:~therp-nl/ocb-addons/6.1_lp1340105
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) Disapprove
Pedro Manuel Baeza code review Approve
Stefan Rijnhart (Opener) code review Approve
Review via email: mp+226263@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Thanks! Does not hurt, indeed.

review: Approve (code review)
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

LGTM

review: Approve (code review)
Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :
review: Disapprove

Unmerged revisions

6848. By Holger Brunn (Therp)

[FIX] set _rec_name to avoid errors while printing reports

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account/wizard/account_report_aged_partner_balance.py'
--- account/wizard/account_report_aged_partner_balance.py 2011-10-16 01:28:00 +0000
+++ account/wizard/account_report_aged_partner_balance.py 2014-07-10 09:40:29 +0000
@@ -29,6 +29,7 @@
29 _inherit = 'account.common.partner.report'29 _inherit = 'account.common.partner.report'
30 _name = 'account.aged.trial.balance'30 _name = 'account.aged.trial.balance'
31 _description = 'Account Aged Trial balance Report'31 _description = 'Account Aged Trial balance Report'
32 _rec_name = 'direction_selection'
3233
33 _columns = {34 _columns = {
34 'period_length':fields.integer('Period Length (days)', required=True),35 'period_length':fields.integer('Period Length (days)', required=True),
3536
=== modified file 'account/wizard/account_report_partner_balance.py'
--- account/wizard/account_report_partner_balance.py 2011-10-16 01:28:00 +0000
+++ account/wizard/account_report_partner_balance.py 2014-07-10 09:40:29 +0000
@@ -28,6 +28,7 @@
28 _inherit = 'account.common.partner.report'28 _inherit = 'account.common.partner.report'
29 _name = 'account.partner.balance'29 _name = 'account.partner.balance'
30 _description = 'Print Account Partner Balance'30 _description = 'Print Account Partner Balance'
31 _rec_name = 'display_partner'
31 _columns = {32 _columns = {
32 'display_partner': fields.selection([('non-zero_balance', 'With balance is not equal to 0'), ('all', 'All Partners')]33 'display_partner': fields.selection([('non-zero_balance', 'With balance is not equal to 0'), ('all', 'All Partners')]
33 ,'Display Partners'),34 ,'Display Partners'),

Subscribers

People subscribed via source and target branches