Merge lp:~openerp-dev/openerp-web/7.0-opw-594838-pna into lp:openerp-web/7.0

Proposed by Pinakin Nayi (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/7.0-opw-594838-pna
Merge into: lp:openerp-web/7.0
Diff against target: 17 lines (+4/-1)
1 file modified
addons/web/static/src/js/views.js (+4/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-opw-594838-pna
Reviewer Review Type Date Requested Status
Csaba TOTH (community) duplicate Disapprove
Naresh(OpenERP) Pending
Review via email: mp+174106@code.launchpad.net

Description of the change

Hello Sir,

I fixed problem with context in views.

Steps to reproduce:
1. Open Sale Order list view.
2. Create a custom filter (Group the sale orders by Status and Order date). Set to be used by default
3. Create a Sale Order with this options set
  Shipping Policy - Deliver each product when available
  Create Invoice - On Delivery Order
4. Confirm sale order
5. Make a partial delivery
6. From Sale order list view open the created sale order
7. When opening delivery order from sale order error is thrown

Back ported from : https://code.launchpad.net/~openerp-dev/openerp-web/trunk-bug-1101840-bth/+merge/167912

Thanks,
pna

To post a comment you must log in.
Revision history for this message
Csaba TOTH (tsabi) wrote :
review: Disapprove (duplicate)

Unmerged revisions

3995. By Pinakin Nayi (OpenERP)

[FIX]views : If model and action_context's model are same then passed group by of action_context else []

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/js/views.js'
2--- addons/web/static/src/js/views.js 2013-06-21 12:44:49 +0000
3+++ addons/web/static/src/js/views.js 2013-07-11 05:20:38 +0000
4@@ -788,9 +788,12 @@
5 }).done(function (results) {
6 self.dataset._model = new instance.web.Model(
7 self.dataset.model, results.context, results.domain);
8+ var default_groupby = (self.dataset.model === action_context.active_model)
9+ ? action_context.group_by
10+ : [];
11 var groupby = results.group_by.length
12 ? results.group_by
13- : action_context.group_by;
14+ : default_groupby;
15 if (_.isString(groupby)) {
16 groupby = [groupby];
17 }