Merge lp:~pedro.baeza/account-financial-tools/7.0-account_invoice_currency-fix into lp:~account-core-editors/account-financial-tools/7.0

Proposed by Pedro Manuel Baeza
Status: Merged
Merged at revision: 186
Proposed branch: lp:~pedro.baeza/account-financial-tools/7.0-account_invoice_currency-fix
Merge into: lp:~account-core-editors/account-financial-tools/7.0
Diff against target: 48 lines (+8/-10)
1 file modified
account_invoice_currency/account_invoice_view.xml (+8/-10)
To merge this branch: bzr merge lp:~pedro.baeza/account-financial-tools/7.0-account_invoice_currency-fix
Reviewer Review Type Date Requested Status
Nicolas Bessi - Camptocamp (community) Approve
Ana Juaristi Olalde (community) code review Approve
Omar (Pexego) code review Approve
Yannick Vaucher @ Camptocamp code review, no test Approve
Review via email: mp+211845@code.launchpad.net

Description of the change

[FIX] account_invoice_currency: Fix indentation on XML file
[FIX] account_invoice_currency: Remove type attribute on XML views

This is for avoiding warnings on log.

To post a comment you must log in.
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

LGTM

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

LGTM

review: Approve (code review)
Revision history for this message
Ana Juaristi Olalde (ajuaristio) wrote :

LGTM

review: Approve (code review)
Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote :

LGTM

Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account_invoice_currency/account_invoice_view.xml'
--- account_invoice_currency/account_invoice_view.xml 2013-12-23 17:21:34 +0000
+++ account_invoice_currency/account_invoice_view.xml 2014-03-19 23:46:26 +0000
@@ -3,21 +3,20 @@
3 <data>3 <data>
44
5 <!-- ###############################################5 <!-- ###############################################
6 INVOICE INHERITANCE6 INVOICE INHERITANCE
7 ############################################### -->7 ############################################### -->
8 8
9 <!-- ## Suppliers ## -->9 <!-- ## Suppliers ## -->
10 <record id="invoice_supplier_company_currency_form" model="ir.ui.view">10 <record id="invoice_supplier_company_currency_form" model="ir.ui.view">
11 <field name="name">Account invoice supplier (form) - add company currency</field>11 <field name="name">Account invoice supplier (form) - add company currency</field>
12 <field name="model">account.invoice</field>12 <field name="model">account.invoice</field>
13 <field name="type">form</field>
14 <field name="inherit_id" ref="account.invoice_supplier_form"/>13 <field name="inherit_id" ref="account.invoice_supplier_form"/>
15 <field name="arch" type="xml">14 <field name="arch" type="xml">
16 <field name="period_id" position="after">15 <field name="period_id" position="after">
17 <group string="Amounts in company currency">16 <group string="Amounts in company currency">
18 <field name="cc_amount_untaxed"/>17 <field name="cc_amount_untaxed"/>
19 <field name="cc_amount_tax"/>18 <field name="cc_amount_tax"/>
20 <field name="cc_amount_total"/>19 <field name="cc_amount_total"/>
21 </group>20 </group>
22 </field>21 </field>
23 </field>22 </field>
@@ -27,14 +26,13 @@
27 <record id="invoice_company_currency_form" model="ir.ui.view">26 <record id="invoice_company_currency_form" model="ir.ui.view">
28 <field name="name">Account invoice (form) - add company currency</field>27 <field name="name">Account invoice (form) - add company currency</field>
29 <field name="model">account.invoice</field>28 <field name="model">account.invoice</field>
30 <field name="type">form</field>
31 <field name="inherit_id" ref="account.invoice_form"/>29 <field name="inherit_id" ref="account.invoice_form"/>
32 <field name="arch" type="xml">30 <field name="arch" type="xml">
33 <field name="move_id" position="after">31 <field name="move_id" position="after">
34 <group string="Amounts in company currency">32 <group string="Amounts in company currency">
35 <field name="cc_amount_untaxed"/>33 <field name="cc_amount_untaxed"/>
36 <field name="cc_amount_tax"/>34 <field name="cc_amount_tax"/>
37 <field name="cc_amount_total"/>35 <field name="cc_amount_total"/>
38 </group>36 </group>
39 </field>37 </field>
40 </field>38 </field>

Subscribers

People subscribed via source and target branches