Merge lp:~alhashash/ocb-addons/7.0-bug-1317455-check-show-amount-in-words into lp:ocb-addons

Proposed by Mohammad Alhashash
Status: Rejected
Rejected by: Holger Brunn (Therp)
Proposed branch: lp:~alhashash/ocb-addons/7.0-bug-1317455-check-show-amount-in-words
Merge into: lp:ocb-addons
Diff against target: 20 lines (+2/-2)
1 file modified
account_check_writing/account_voucher_view.xml (+2/-2)
To merge this branch: bzr merge lp:~alhashash/ocb-addons/7.0-bug-1317455-check-show-amount-in-words
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) Disapprove
Omar (Pexego) code review Approve
Pedro Manuel Baeza code review Approve
Review via email: mp+218930@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Thanks for the fix and for the detailed explanation of the bug.

Regards.

review: Approve (code review)
Revision history for this message
Omar (Pexego) (omar7r) wrote :

LGTM

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

Development for 7.0 has moved to github on https://github.com/OCA/ocb - please move your merge proposal there if it is still valid.

(I close and reject this in order to have a cleaner overview for 6.1 MPs which indeed have to be done on launchpad)

review: Disapprove

Unmerged revisions

10172. By Mohammad Alhashash

Fix bug lp:1317455 [7.0] [account_check_writing] Amount in words and print check button are not shown in "Write Checks" form

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_check_writing/account_voucher_view.xml'
2--- account_check_writing/account_voucher_view.xml 2014-03-10 08:54:20 +0000
3+++ account_check_writing/account_voucher_view.xml 2014-05-09 07:52:19 +0000
4@@ -12,14 +12,14 @@
5 <field name="amount" position="after">
6 <newline/>
7 <field name="allow_check" invisible="1"/>
8- <field name="amount_in_word" attrs="{'invisible':[('allow_check','!=',1)]}" nolabel="1" colspan="6"/>
9+ <field name="amount_in_word" attrs="{'invisible':[('allow_check','!=',True)]}" nolabel="1" colspan="6"/>
10 <newline/>
11 </field>
12 <field name="number" position="replace">
13 <field name="number" attrs="{'readonly':[('allow_check','!=',1)]}" />
14 </field>
15 <button name="proforma_voucher" position="after">
16- <button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}" class="oe_highlight"/>
17+ <button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',True),('state','!=','posted') ]}" class="oe_highlight"/>
18 </button>
19 </field>
20 </record>