Merge lp:~mileo/ocb-addons/rs-ocb-70-bug-1201472 into lp:~ocb/ocb-addons/rs-ocb-70

Status: Needs review
Proposed branch: lp:~mileo/ocb-addons/rs-ocb-70-bug-1201472
Merge into: lp:~ocb/ocb-addons/rs-ocb-70
Diff against target: 41 lines (+8/-8)
1 file modified
l10n_br/account_view.xml (+8/-8)
To merge this branch: bzr merge lp:~mileo/ocb-addons/rs-ocb-70-bug-1201472
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) Abstain
Raphaël Valyi - http://www.akretion.com Pending
Review via email: mp+208720@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :

The patch for trunk uses group_no_one (Technical features), which seems correct to me: https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-1201472-cod/+merge/194657

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

sorry, reviewed the wrong branch

review: Abstain

Unmerged revisions

9967. By Luis Felipe Miléo - http://www.kmee.com.br

[FIX] Fields amount_mva, base_reduction and tax_discount are not displayed

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_br/account_view.xml'
2--- l10n_br/account_view.xml 2012-10-23 16:05:04 +0000
3+++ l10n_br/account_view.xml 2014-02-28 02:57:57 +0000
4@@ -34,14 +34,14 @@
5 <field name="inherit_id" ref="account.view_account_tax_template_form"/>
6 <field name="arch" type="xml">
7 <field position="after" name="price_include">
8- <field groups="base.group_extended" name="tax_discount"/>
9+ <field name="tax_discount"/>
10 </field>
11 <field name="tax_code_id" position="replace" >
12 <field name="tax_code_id" on_change="onchange_tax_code_id(tax_code_id)" />
13 </field>
14- <field position="after" name="amount">
15- <field groups="base.group_extended" name="base_reduction"/>
16- <field groups="base.group_extended" name="amount_mva"/>
17+ <field position="after" name="tax_discount">
18+ <field name="base_reduction"/>
19+ <field name="amount_mva"/>
20 </field>
21 </field>
22 </record>
23@@ -52,14 +52,14 @@
24 <field name="inherit_id" ref="account.view_tax_form"/>
25 <field name="arch" type="xml">
26 <field position="after" name="price_include">
27- <field groups="base.group_extended" name="tax_discount"/>
28+ <field name="tax_discount"/>
29 </field>
30 <field name="tax_code_id" position="replace" >
31 <field name="tax_code_id" on_change="onchange_tax_code_id(tax_code_id)" />
32 </field>
33- <field position="after" name="amount">
34- <field groups="base.group_extended" name="base_reduction"/>
35- <field groups="base.group_extended" name="amount_mva"/>
36+ <field position="after" name="tax_discount">
37+ <field name="base_reduction"/>
38+ <field name="amount_mva"/>
39 </field>
40 </field>
41 </record>

Subscribers

People subscribed via source and target branches