Merge lp:~openerp-dev/openerp-web/trunk-view_improvement-psi into lp:openerp-web

[Jitendra Prajapati(OpenERP)]

Hello,

 this merge proposal contains fixes for following issues:
  1. problem of cancel state is not appearing in state bar,need to reload.
  2. message alignment in setting > email > messages

Thanks

[lp:~openerp-dev/openerp-web/trunk-view_improvement-psi]

3875. By Pooja Zankhariya(OpenERP) on 2013-11-18

[MERGE]Merge with Trunk

3876. By Jitendra Prajapati(OpenERP) on 2013-11-19

[MERGE]with Trunk

3877. By Jitendra Prajapati(OpenERP) on 2013-11-22

[MERGE]with lp:openerp-web

3878. By Pooja Zankhariya(OpenERP) on 2013-11-25

[MERGE]Merge with Trunk

3879. By Pooja Zankhariya(OpenERP) on 2013-11-26

[MERGE]Merge with Trunk

3880. By Jitendra Prajapati(OpenERP) on 2013-12-02

[MERGE]with lp:openerp-web

3881. By Jitendra Prajapati(OpenERP) on 2013-12-12

[MERGE]with main

3882. By Jitendra Prajapati(OpenERP) on 2013-12-17

[MERGE]with lp:openerp-web

3883. By Pooja Zankhariya(OpenERP) on 2013-12-26

[MERGE]Merge with Trunk

3884. By Jitendra Prajapati(OpenERP) on 2014-01-20

[MERGE]with lp:openerp-web

3885. By Jitendra Prajapati(OpenERP) on 2014-01-20

[IMP]added the changes of the sass file

3886. By Jitendra Prajapati(OpenERP) on 2014-01-28

[MERGE]with main branch

3887. By Jitendra Prajapati(OpenERP) on 2014-02-04

[MERGE]with lp:openerp-web

3888. By Jitendra Prajapati(OpenERP) on 2014-02-10

[MERGE]with lp:openerp-web

3889. By Jitendra Prajapati(OpenERP) on 2014-03-19

[MERGE]with main branch

3890. By Jitendra Prajapati(OpenERP) on 2014-03-27

[MERGE]with main branch

3891. By Jitendra Prajapati(OpenERP) on 2014-04-03

[MERGE]with main branch

[Atul Patel(OpenERP) (atp-openerp)]

Hello,

css changes merged in trunk.
addons/web/static/src/js/view_form.js file changes not required.
so rejecting your branch.

Thanks for code

review: Disapprove

[lp:~openerp-dev/openerp-web/trunk-view_improvement-psi]

3892. By Jitendra Prajapati(OpenERP) on 2014-04-15

[MERGE]with main branch

3893. By Jitendra Prajapati(OpenERP) on 2014-04-24

[MERGE]with main branch

3894. By Jitendra Prajapati(OpenERP) on 2014-05-05

[MERGE]with main branch

Unmerged revisions

3894. By Jitendra Prajapati(OpenERP) on 2014-05-05

[MERGE]with main branch

3893. By Jitendra Prajapati(OpenERP) on 2014-04-24

[MERGE]with main branch

3892. By Jitendra Prajapati(OpenERP) on 2014-04-15

[MERGE]with main branch

3891. By Jitendra Prajapati(OpenERP) on 2014-04-03

[MERGE]with main branch

3890. By Jitendra Prajapati(OpenERP) on 2014-03-27

[MERGE]with main branch

3889. By Jitendra Prajapati(OpenERP) on 2014-03-19

[MERGE]with main branch

3888. By Jitendra Prajapati(OpenERP) on 2014-02-10

[MERGE]with lp:openerp-web

3887. By Jitendra Prajapati(OpenERP) on 2014-02-04

[MERGE]with lp:openerp-web

3886. By Jitendra Prajapati(OpenERP) on 2014-01-28

[MERGE]with main branch

3885. By Jitendra Prajapati(OpenERP) on 2014-01-20

[IMP]added the changes of the sass file

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2014-05-02 12:33:55 +0000
+++ addons/web/static/src/css/base.sass	2014-05-05 09:55:13 +0000
@@ -1805,7 +1805,7 @@
             position: relative
             width: 100%
             margin: auto
-            overflow: auto            
+            overflow: auto
             text-align: justify
         .oe_form_field_html .oe_input_icon
             float: right

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2014-05-02 12:33:55 +0000
+++ addons/web/static/src/js/view_form.js	2014-05-05 09:55:13 +0000
@@ -5775,6 +5775,7 @@
     },
     render_value: function() {
         var self = this;
+        this.get_selection();
         var content = QWeb.render("FieldStatus.content", {
             'widget': self, 
             'value_folded': _.find(self.selection.folded, function(i){return i[0] === self.get('value');})