Financial controlling and costing

Merge lp:~camptocamp/margin-analysis/7.0-wrong-view-inheritance into lp:~margin-analysis-core-editors/margin-analysis/7.0

  1. 7.0-wrong-view-inheritance
  2. Merge into 7.0
Proposed by Guewen Baconnier @ Camptocamp
Status: Merged
Merged at revision: 55
Proposed branch: lp:~camptocamp/margin-analysis/7.0-wrong-view-inheritance
Merge into: lp:~margin-analysis-core-editors/margin-analysis/7.0
Diff against target: 15 lines (+2/-2)
1 file modified
product_stock_cost_field_report/product_stock_view.xml (+2/-2)
To merge this branch: bzr merge lp:~camptocamp/margin-analysis/7.0-wrong-view-inheritance
Reviewer Review Type Date Requested Status
Yannick Vaucher @ Camptocamp code review, no tests Approve
Omar (Pexego) code review Approve
Pedro Manuel Baeza code review Approve
Review via email: mp+198774@code.launchpad.net

Description of the change

product_stock_cost_field_report cannot be installed when 'stock' is not installed due to a wrong inheritance

To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

LGTM

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

LGTM

review: Approve (code review)
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

LGTM

review: Approve (code review, no tests)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'product_stock_cost_field_report/product_stock_view.xml'
2--- product_stock_cost_field_report/product_stock_view.xml 2013-12-12 10:02:14 +0000
3+++ product_stock_cost_field_report/product_stock_view.xml 2013-12-16 09:43:26 +0000
4@@ -17,9 +17,9 @@
5 <record id="view_product_standard_price_form" model="ir.ui.view">
6 <field name="name">product.product.standard.price.form.inherit</field>
7 <field name="model">product.product</field>
8- <field name="inherit_id" ref="product.product_normal_form_view"/>
9+ <field name="inherit_id" ref="stock.view_product_standard_price_form"/>
10 <field name="arch" type="xml">
11- <label string="Cost Price" for="standard_price" align="1.0" groups="base.group_user" position="before">
12+ <label for="standard_price" position="before">
13 <label for="cost_price" align="1.0" groups="base.group_user"/>
14 <div groups="base.group_user">
15 <field name="cost_price" nolabel="1"/>

Subscribers

People subscribed via source and target branches