Merge lp:~ruchir.shukla/banking-addons/banking-addons-fix-1266890 into lp:banking-addons

Proposed by Ruchir Shukla(BizzAppDev)
Status: Merged
Merged at revision: 228
Proposed branch: lp:~ruchir.shukla/banking-addons/banking-addons-fix-1266890
Merge into: lp:banking-addons
Diff against target: 43 lines (+8/-4)
1 file modified
account_banking/account_banking_view.xml (+8/-4)
To merge this branch: bzr merge lp:~ruchir.shukla/banking-addons/banking-addons-fix-1266890
Reviewer Review Type Date Requested Status
Stefan Rijnhart (Opener) Approve
Holger Brunn (Therp) code review Approve
Review via email: mp+203237@code.launchpad.net

Description of the change

Fix bug

To post a comment you must log in.
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Thanks! I'm thinking that the account should be readonly if there is any match type at all, not just move or payment. Do you agree?

review: Needs Information
220. By Ruchir Shukla(BizzAppDev)

fix the condition

Revision history for this message
Ruchir Shukla(BizzAppDev) (ruchir.shukla) wrote :

Hello Stefan !
Thank you for review and raise that point. I have make changes for any match type it will be readonly.

221. By Ruchir Shukla(BizzAppDev)

fix condition

Revision history for this message
Holger Brunn (Therp) (hbrunn) :
review: Approve (code review)
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Thanks for the change!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account_banking/account_banking_view.xml'
--- account_banking/account_banking_view.xml 2013-10-31 07:33:46 +0000
+++ account_banking/account_banking_view.xml 2014-01-27 08:49:39 +0000
@@ -95,7 +95,7 @@
95 action="action_account_banking_journals"95 action="action_account_banking_journals"
96 sequence="20"96 sequence="20"
97 />97 />
98 98
99 <!-- Create new view on imported statement files -->99 <!-- Create new view on imported statement files -->
100 <record model="ir.ui.view" id="view_account_banking_imported_file_form">100 <record model="ir.ui.view" id="view_account_banking_imported_file_form">
101 <field name="name">account.banking.imported.file.form</field>101 <field name="name">account.banking.imported.file.form</field>
@@ -221,7 +221,7 @@
221 </xpath>221 </xpath>
222222
223 <!-- Add invisible field for identification of import file223 <!-- Add invisible field for identification of import file
224 on bank statements 224 on bank statements
225 -->225 -->
226 <field name="balance_end_real" position="after">226 <field name="balance_end_real" position="after">
227 <field name="banking_id" invisible="True"/>227 <field name="banking_id" invisible="True"/>
@@ -248,7 +248,10 @@
248 position="after">248 position="after">
249 <field name="partner_bank_id"/>249 <field name="partner_bank_id"/>
250 </xpath>250 </xpath>
251251 <xpath expr="//field[@name='line_ids']/tree//field[@name='account_id']"
252 position="attributes">
253 <attribute name="attrs">{'readonly': ['|', ('state', '!=', 'draft'), ('match_type', '!=', '')]}</attribute>
254 </xpath>
252 <xpath expr="//field[@name='line_ids']/tree/field[@name='amount']"255 <xpath expr="//field[@name='line_ids']/tree/field[@name='amount']"
253 position="after">256 position="after">
254 <field name="match_type"/>257 <field name="match_type"/>
@@ -336,7 +339,8 @@
336 <field name="partner_bank_id"/>339 <field name="partner_bank_id"/>
337 <field name="type" on_change="onchange_type(partner_id, type)"/>340 <field name="type" on_change="onchange_type(partner_id, type)"/>
338 <!-- TODO note the references to parent from the statement form view -->341 <!-- TODO note the references to parent from the statement form view -->
339 <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>342 <field domain="[('journal_id','=',parent.journal_id)]"
343 attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('match_type', '!=', '')]}" name="account_id"/>
340 <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>344 <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
341 <field name="amount"/>345 <field name="amount"/>
342 <field name="match_type"/>346 <field name="match_type"/>

Subscribers

People subscribed via source and target branches

to status/vote changes: