Merge lp://staging/~therp-nl/openerp-web/7.0-lp1013636-x2m_honour_required_attribute into lp://staging/openerp-web/7.0

Proposed by Stefan Rijnhart (Opener)
Status: Needs review
Proposed branch: lp://staging/~therp-nl/openerp-web/7.0-lp1013636-x2m_honour_required_attribute
Merge into: lp://staging/openerp-web/7.0
Diff against target: 66 lines (+18/-2)
3 files modified
addons/web/static/src/css/base.css (+6/-0)
addons/web/static/src/css/base.sass (+9/-0)
addons/web/static/src/js/view_form.js (+3/-2)
To merge this branch: bzr merge lp://staging/~therp-nl/openerp-web/7.0-lp1013636-x2m_honour_required_attribute
Reviewer Review Type Date Requested Status
Alexandre Fayolle - camptocamp (community) code review, test Approve
OpenERP Core Team Pending
Review via email: mp+156310@code.staging.launchpad.net

Description of the change

This branch, from August 2012 was approved by Xavier in November 2012 (see [1]) but that MP was against trunk and has now conflicts. I am resubmitting against 7.0 here.

[1] https://code.launchpad.net/~therp-nl/openerp-web/7.0-lp1013636-x2m_honour_required_attribute/+merge/116238

To post a comment you must log in.
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

works fine (in OCB branch)

review: Approve (code review, test)

Unmerged revisions

2755. By Stefan Rijnhart (Opener)

[MRG] merged with lp:openerp-web/7.0 revno 3872

2754. By Stefan Rijnhart (Opener)

[MRG] merged with lp:openerpweb revno 2863 to resolve conflict in merge proposal

2753. By Stefan Rijnhart (Opener)

[FIX] Remove redundant check containing an invalid keyword
[FIX] Move css modifications to sass file

2752. By Stefan Rijnhart (Opener)

[ADD] Support for required *2many fields, including visual hints

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.