diff --git a/addons/account/account.py b/addons/account/account.py
index 93d3dfb5d4a..fcb4c783e12 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -714,7 +714,7 @@ class account_journal(osv.osv):
     _name = "account.journal"
     _description = "Journal"
     _columns = {
-        'with_last_closing_balance' : fields.boolean('Opening With Last Closing Balance'),
+        'with_last_closing_balance': fields.boolean('Opening With Last Closing Balance', help="For cash or bank journal, this option should be unchecked when the starting balance should always set to 0 for new documents."),
         'name': fields.char('Journal Name', required=True),
         'code': fields.char('Code', size=5, required=True, help="The code will be displayed on reports."),
         'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Checks'), ('general', 'General'), ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True,
@@ -745,7 +745,7 @@ class account_journal(osv.osv):
 
     _defaults = {
         'cash_control' : False,
-        'with_last_closing_balance' : False,
+        'with_last_closing_balance' : True,
         'user_id': lambda self, cr, uid, context: uid,
         'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1d340001c55..934475c4e15 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -439,7 +439,7 @@
                                     <field name="internal_account_id" domain="[('type','!=','view')]"/>
                                 </group>
                                 <group string="Miscellaneous">
-                                    <field name="with_last_closing_balance"/>
+                                    <field name="with_last_closing_balance" attrs="{'invisible': [('type', 'not in', ['bank', 'cash'])]}"/>
                                     <field name="cash_control" attrs="{'invisible':[('type','not in', ('cash',))]}"/>
                                 </group>
                             </group>
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index e8ab40d9b3d..984937698ce 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -23,9 +23,6 @@
             <script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
             <script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script>
             <script type="text/javascript" src="/web/static/src/js/tour.js"></script>
-            <script type="text/javascript" charset="utf-8">
-                openerp._modules = <t t-raw="modules"/>;
-            </script>
 
             <link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css"/>
         </template>
@@ -85,6 +82,9 @@
             <script type="text/javascript" src="/web/static/lib/backbone/backbone.js"></script>
 
             <!-- Internals -->
+            <script type="text/javascript" charset="utf-8">
+                openerp._modules = <t t-raw="get_modules_order()"/>;
+            </script>
             <link rel="stylesheet" href="/web/static/src/css/base.css"/>
             <link rel="stylesheet" href="/web/static/src/css/data_export.css"/>
             <link rel="stylesheet" href="/base/static/src/css/modules.css"/>
diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py
index 900eb4e0fe3..43d10c58917 100644
--- a/addons/website_forum/models/forum.py
+++ b/addons/website_forum/models/forum.py
@@ -278,6 +278,7 @@ class Post(osv.Model):
         'closed_date': fields.datetime('Closed on', readonly=True),
         # karma
         'karma_ask': fields.function(_get_post_karma_rights, string='Karma to ask', type='integer', multi='_get_post_karma_rights'),
+        'karma_answer': fields.function(_get_post_karma_rights, string='Karma to answer', type='integer', multi='_get_post_karma_rights'),
         'karma_accept': fields.function(_get_post_karma_rights, string='Karma to accept this answer', type='integer', multi='_get_post_karma_rights'),
         'karma_edit': fields.function(_get_post_karma_rights, string='Karma to edit', type='integer', multi='_get_post_karma_rights'),
         'karma_close': fields.function(_get_post_karma_rights, string='Karma to close', type='integer', multi='_get_post_karma_rights'),
@@ -288,6 +289,7 @@ class Post(osv.Model):
         'karma_comment_convert': fields.function(_get_post_karma_rights, string='karma to convert as a comment', type='integer', multi='_get_post_karma_rights'),
         # access rights
         'can_ask': fields.function(_get_post_karma_rights, string='Can Ask', type='boolean', multi='_get_post_karma_rights'),
+        'can_answer': fields.function(_get_post_karma_rights, string='Can Answer', type='boolean', multi='_get_post_karma_rights'),
         'can_accept': fields.function(_get_post_karma_rights, string='Can Accept', type='boolean', multi='_get_post_karma_rights'),
         'can_edit': fields.function(_get_post_karma_rights, string='Can Edit', type='boolean', multi='_get_post_karma_rights'),
         'can_close': fields.function(_get_post_karma_rights, string='Can Close', type='boolean', multi='_get_post_karma_rights'),
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 73fcbef0fd6..15a1314eb9d 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -592,9 +592,12 @@
                                 </a>
                             </li>
                             <li>
-                                <a t-attf-class="fa fa-edit #{not answer.can_edit and 'karma_required text-muted' or ''}"
-                                    t-attf-data-karma="#{not answer.can_edit and answer.karma_edit or 0}"
-                                    t-attf-href="/forum/#{slug(forum)}/post/#{slug(answer)}/edit"> Edit</a>
+                                <t t-call="website_forum.link_button">
+                                    <t t-set="url" t-value="'/forum/' + slug(forum) + '/post/' + slug(answer) + '/edit'"/>
+                                    <t t-set="label" t-value="'Edit'"/>
+                                    <t t-set="classes" t-value="'fa fa-edit'"/>
+                                    <t t-set="karma" t-value="not answer.can_edit and answer.karma_edit or 0"/>
+                                </t>
                             </li>
                             <li>
                                 <t t-call="website_forum.link_button">
diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index 1ef5466a58f..02fa77f0e0d 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -986,10 +986,15 @@ class view(osv.osv):
         )
         qcontext.update(values)
 
-        # TODO: remove this as soon as the following branch is merged
-        #       lp:~openerp-dev/openerp-web/trunk-module-closure-style-msh
-        from openerp.addons.web.controllers.main import module_boot
-        qcontext['modules'] = simplejson.dumps(module_boot()) if request else None
+        # TODO: This helper can be used by any template that wants to embedd the backend.
+        #       It is currently necessary because the ir.ui.view bundle inheritance does not
+        #       match the module dependency graph.
+        def get_modules_order():
+            if request:
+                from openerp.addons.web.controllers.main import module_boot
+                return simplejson.dumps(module_boot())
+            return '[]'
+        qcontext['get_modules_order'] = get_modules_order
 
         def loader(name):
             return self.read_template(cr, uid, name, context=context)