Merge lp://qastaging/~savoirfairelinux-openerp/openerp-construction/7.0-fix-1193292 into lp://qastaging/openerp-construction

Status: Merged
Merged at revision: 12
Proposed branch: lp://qastaging/~savoirfairelinux-openerp/openerp-construction/7.0-fix-1193292
Merge into: lp://qastaging/openerp-construction
Diff against target: 330 lines (+58/-125)
7 files modified
sale_insulation/__openerp__.py (+2/-2)
sale_insulation/sale_insulation.py (+3/-10)
sale_insulation/sale_insulation_view.xml (+50/-106)
stock_picking_delivery_insulation/__openerp__.py (+1/-1)
stock_picking_delivery_insulation/stock_picking_delivery_insulation_view.xml (+0/-1)
stock_picking_delivery_users/__openerp__.py (+1/-1)
stock_picking_delivery_users/stock_picking_delivery_users_view.xml (+1/-4)
To merge this branch: bzr merge lp://qastaging/~savoirfairelinux-openerp/openerp-construction/7.0-fix-1193292
Reviewer Review Type Date Requested Status
Maxime Chambreuil (http://www.savoirfairelinux.com) Approve
Joao Alfredo Gama Batista code review. no test Approve
Review via email: mp+176074@code.qastaging.launchpad.net

Description of the change

[FIX] lp:1193292
[IMP] by Vishal Jadav <email address hidden>

To post a comment you must log in.
15. By Maxime Chambreuil (http://www.savoirfairelinux.com)

[FIX] Remaining conflict of the merge

Revision history for this message
Joao Alfredo Gama Batista (joao-gama) wrote :

lgtm.

review: Approve (code review. no test)
Revision history for this message
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) :
review: Approve

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.

Subscribers

People subscribed via source and target branches