diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml
index ca8d5079a3a..7c3d2a88037 100644
--- a/addons/account/configurable_account_chart.xml
+++ b/addons/account/configurable_account_chart.xml
@@ -47,7 +47,6 @@
             <field eval="0" name="parent_id"/>
             <field name="type">view</field>
             <field name="user_type" ref="data_account_type_view"/>
-            <field name="complete_tax_set" eval="False"/>
         </record>
 
            <!-- Balance Sheet -->
@@ -383,6 +382,7 @@
             <field name="property_account_income_opening" ref="conf_o_income"/>
             <field name="property_account_expense_opening" ref="conf_o_expense"/>
             <field name="property_reserve_and_surplus_account" ref="conf_a_reserve_and_surplus"/>
+            <field name="complete_tax_set" eval="False"/>
         </record>
 
          <!-- VAT Codes -->
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index 5e6ac6ead8b..3c859c288a8 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -24,9 +24,10 @@
                             <field name="product_uom" />
                             <field name="tracking" invisible="1"/>
                             <field name="prodlot_id" domain="[('product_id', '=', product_id)]" invisible="context.get('hide_tracking',False)" attrs="{'required':[('tracking','=',True)]}"/>
+                            <!-- Removed as this feature is not logic: price must be updated upon reception of invoice -->
                             <field name="update_cost" invisible="1"/>
-                            <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
-                            <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                            <field name="cost"  invisible="1"/>
+                            <field name="currency"  invisible="1"/>
                         </tree>
                     </field>
                     <separator string="" colspan="4" />
@@ -50,9 +51,10 @@
                     <field name="product_uom" />
                     <field name="tracking" invisible="1"/>
                     <field name="prodlot_id" domain="[('product_id', '=', product_id)]" attrs="{'required':[('tracking','=',True)]}" groups="base.group_extended" />
+                    <!-- Removed as this feature is not logic: price must be updated upon reception of invoice -->
                     <field name="update_cost" invisible="1"/>
-                    <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
-                    <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                    <field name="cost" invisible="1"/>
+                    <field name="currency" invisible="1"/>
                 </tree>
             </field>
         </record>