diff --git a/addons/account/account.py b/addons/account/account.py
index d262a5e273c..3959799f1bb 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1001,8 +1001,7 @@ class account_period(osv.osv):
     def find(self, cr, uid, dt=None, context=None):
         if context is None: context = {}
         if not dt:
-            dt = fields.date.context_today(self,cr,uid,context=context)
-#CHECKME: shouldn't we check the state of the period?
+            dt = fields.date.context_today(self, cr, uid, context=context)
         args = [('date_start', '<=' ,dt), ('date_stop', '>=', dt)]
         if context.get('company_id', False):
             args.append(('company_id', '=', context['company_id']))
@@ -1010,7 +1009,7 @@ class account_period(osv.osv):
             company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
             args.append(('company_id', '=', company_id))
         result = []
-        if context.get('account_period_prefer_normal'):
+        if context.get('account_period_prefer_normal', True):
             # look for non-special periods first, and fallback to all if no result is found
             result = self.search(cr, uid, args + [('special', '=', False)], context=context)
         if not result:
@@ -1214,7 +1213,7 @@ class account_move(osv.osv):
         return res
 
     def _get_period(self, cr, uid, context=None):
-        ctx = dict(context or {}, account_period_prefer_normal=True)
+        ctx = dict(context or {})
         period_ids = self.pool.get('account.period').find(cr, uid, context=ctx)
         return period_ids[0]
 
@@ -1786,7 +1785,7 @@ class account_tax_code(osv.osv):
         if context.get('period_id', False):
             period_id = context['period_id']
         else:
-            period_id = self.pool.get('account.period').find(cr, uid)
+            period_id = self.pool.get('account.period').find(cr, uid, context=context)
             if not period_id:
                 return dict.fromkeys(ids, 0.0)
             period_id = period_id[0]
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 56e061a707b..023765d73f0 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -61,7 +61,7 @@ class account_bank_statement(osv.osv):
         return res
 
     def _get_period(self, cr, uid, context=None):
-        periods = self.pool.get('account.period').find(cr, uid,context=context)
+        periods = self.pool.get('account.period').find(cr, uid, context=context)
         if periods:
             return periods[0]
         return False
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index e0a64a002a8..b22afa3f931 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -985,8 +985,7 @@ class account_invoice(osv.osv):
                 'narration':inv.comment
             }
             period_id = inv.period_id and inv.period_id.id or False
-            ctx.update(company_id=inv.company_id.id,
-                       account_period_prefer_normal=True)
+            ctx.update(company_id=inv.company_id.id)
             if not period_id:
                 period_ids = period_obj.find(cr, uid, inv.date_invoice, context=ctx)
                 period_id = period_ids and period_ids[0] or False
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index c2f21c0d8bc..379fc72a953 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -622,8 +622,6 @@
         </record>
         <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
 
-        <act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
-
         <act_window
            id="act_account_journal_2_account_invoice_opened"
            name="Unpaid Invoices"
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index b0b7815ad3c..91be300f180 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -559,10 +559,11 @@ class account_move_line(osv.osv):
     ]
 
     def _auto_init(self, cr, context=None):
-        super(account_move_line, self)._auto_init(cr, context=context)
+        res = super(account_move_line, self)._auto_init(cr, context=context)
         cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'account_move_line_journal_id_period_id_index\'')
         if not cr.fetchone():
             cr.execute('CREATE INDEX account_move_line_journal_id_period_id_index ON account_move_line (journal_id, period_id)')
+        return res
 
     def _check_no_view(self, cr, uid, ids, context=None):
         lines = self.browse(cr, uid, ids, context=context)
@@ -985,8 +986,7 @@ class account_move_line(osv.osv):
         if context is None:
             context = {}
         period_pool = self.pool.get('account.period')
-        ctx = dict(context, account_period_prefer_normal=True)
-        pids = period_pool.find(cr, user, date, context=ctx)
+        pids = period_pool.find(cr, user, date, context=context)
         if pids:
             res.update({
                 'period_id':pids[0]
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index b8dcefdd3a4..34440298bfd 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1194,7 +1194,12 @@
             sequence="1"
             groups="group_account_user"
         />
-
+        <record id="action_account_moves_all_tree" model="ir.actions.act_window">
+            <field name="name">Journal Items</field>
+            <field name="res_model">account.move.line</field>
+            <field name="context">{'search_default_partner_id': [active_id], 'default_partner_id': active_id}</field>
+            <field name="view_id" ref="view_move_line_tree"/>
+        </record>
         <record id="view_move_line_tree_reconcile" model="ir.ui.view">
             <field name="model">account.move.line</field>
             <field eval="24" name="priority"/>
@@ -1771,23 +1776,6 @@
             </field>
         </record>
 
-        <!-- res.partner links -->
-        <act_window
-            context="{'search_default_unreconciled':True, 'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
-            domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]"
-            id="act_account_partner_account_move_all"
-            name="Receivables &amp; Payables"
-            res_model="account.move.line"
-            src_model="res.partner"/>
-
-        <act_window 
-            context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
-            id="act_account_partner_account_move"
-            name="Journal Items"
-            res_model="account.move.line"
-            src_model="res.partner"
-            groups="account.group_account_user"/>
-
         <!-- Account Templates -->
         <menuitem
             id="account_template_folder"
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index a3244945957..139807ab49b 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-16 04:37+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-04-17 05:15+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 "Language: nl\n"
 
 #. module: account
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 4e2c2b2e024..537371d0f64 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -23,10 +23,16 @@ import datetime
 from dateutil.relativedelta import relativedelta
 import logging
 from operator import itemgetter
-from os.path import join as opj
 import time
+import urllib2
+import urlparse
 
-from openerp import tools
+try:
+    import simplejson as json
+except ImportError:
+    import json     # noqa
+
+from openerp.release import serie
 from openerp.tools.translate import _
 from openerp.osv import fields, osv
 
@@ -38,13 +44,28 @@ class account_installer(osv.osv_memory):
 
     def _get_charts(self, cr, uid, context=None):
         modules = self.pool.get('ir.module.module')
+
+        # try get the list on apps server
+        try:
+            apps_server = self.pool.get('ir.config_parameter').get_param(cr, uid, 'apps.server', 'https://apps.openerp.com')
+
+            up = urlparse.urlparse(apps_server)
+            url = '{0.scheme}://{0.netloc}/apps/charts?serie={1}'.format(up, serie)
+
+            j = urllib2.urlopen(url, timeout=3).read()
+            apps_charts = json.loads(j)
+
+            charts = dict(apps_charts)
+        except Exception:
+            charts = dict()
+
         # Looking for the module with the 'Account Charts' category
         category_name, category_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'module_category_localization_account_charts')
         ids = modules.search(cr, uid, [('category_id', '=', category_id)], context=context)
-        charts = list(
-            sorted(((m.name, m.shortdesc)
-                    for m in modules.browse(cr, uid, ids, context=context)),
-                   key=itemgetter(1)))
+        if ids:
+            charts.update((m.name, m.shortdesc) for m in modules.browse(cr, uid, ids, context=context))
+
+        charts = sorted(charts.items(), key=itemgetter(1))
         charts.insert(0, ('configurable', _('Custom')))
         return charts
 
@@ -57,9 +78,9 @@ class account_installer(osv.osv_memory):
                  "country."),
         'date_start': fields.date('Start Date', required=True),
         'date_stop': fields.date('End Date', required=True),
-        'period': fields.selection([('month', 'Monthly'), ('3months','3 Monthly')], 'Periods', required=True),
+        'period': fields.selection([('month', 'Monthly'), ('3months', '3 Monthly')], 'Periods', required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True),
-        'has_default_company' : fields.boolean('Has Default Company', readonly=True),
+        'has_default_company': fields.boolean('Has Default Company', readonly=True),
     }
 
     def _default_company(self, cr, uid, context=None):
@@ -78,30 +99,29 @@ class account_installer(osv.osv_memory):
         'has_default_company': _default_has_default_company,
         'charts': 'configurable'
     }
-    
+
     def get_unconfigured_cmp(self, cr, uid, context=None):
         """ get the list of companies that have not been configured yet
         but don't care about the demo chart of accounts """
-        cmp_select = []
         company_ids = self.pool.get('res.company').search(cr, uid, [], context=context)
         cr.execute("SELECT company_id FROM account_account WHERE active = 't' AND account_account.parent_id IS NULL AND name != %s", ("Chart For Automated Tests",))
         configured_cmp = [r[0] for r in cr.fetchall()]
         return list(set(company_ids)-set(configured_cmp))
-    
+
     def check_unconfigured_cmp(self, cr, uid, context=None):
         """ check if there are still unconfigured companies """
         if not self.get_unconfigured_cmp(cr, uid, context=context):
             raise osv.except_osv(_('No unconfigured company !'), _("There is currently no company without chart of account. The wizard will therefore not be executed."))
-    
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        if context is None:context = {}
-        res = super(account_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        if context is None: context = {}
+        res = super(account_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
         cmp_select = []
         # display in the widget selection only the companies that haven't been configured yet
         unconfigured_cmp = self.get_unconfigured_cmp(cr, uid, context=context)
         for field in res['fields']:
             if field == 'company_id':
-                res['fields'][field]['domain'] = [('id','in',unconfigured_cmp)]
+                res['fields'][field]['domain'] = [('id', 'in', unconfigured_cmp)]
                 res['fields'][field]['selection'] = [('', '')]
                 if unconfigured_cmp:
                     cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
@@ -117,7 +137,7 @@ class account_installer(osv.osv_memory):
 
     def execute(self, cr, uid, ids, context=None):
         self.execute_simple(cr, uid, ids, context)
-        super(account_installer, self).execute(cr, uid, ids, context=context)
+        return super(account_installer, self).execute(cr, uid, ids, context=context)
 
     def execute_simple(self, cr, uid, ids, context=None):
         if context is None:
@@ -129,8 +149,8 @@ class account_installer(osv.osv_memory):
                 if not f_ids:
                     name = code = res['date_start'][:4]
                     if int(name) != int(res['date_stop'][:4]):
-                        name = res['date_start'][:4] +'-'+ res['date_stop'][:4]
-                        code = res['date_start'][2:4] +'-'+ res['date_stop'][2:4]
+                        name = res['date_start'][:4] + '-' + res['date_stop'][:4]
+                        code = res['date_start'][2:4] + '-' + res['date_stop'][2:4]
                     vals = {
                         'name': name,
                         'code': code,
@@ -150,7 +170,7 @@ class account_installer(osv.osv_memory):
         chart = self.read(cr, uid, ids, ['charts'],
                           context=context)[0]['charts']
         _logger.debug('Installing chart of accounts %s', chart)
-        return modules | set([chart])
+        return (modules | set([chart])) - set(['has_default_company', 'configurable'])
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 1267e20165b..76e94fdfef4 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -50,6 +50,29 @@
             </field>
         </record>
 
+        <record id="action_account_analytic_account_form" model="ir.actions.act_window">
+            <field name="context">{'search_default_partner_id': [active_id], 'default_partner_id': active_id}</field>
+            <field name="name">Contracts/Analytic Accounts</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <record model="ir.ui.view" id="partner_view_buttons">
+            <field name="name">partner.view.buttons</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="priority" eval="10"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button type="action" string="Invoices" 
+                        name="%(account.action_invoice_tree)d" 
+                        context="{'search_default_partner_id': active_id,'default_partner_id': active_id}" groups="account.group_account_invoice"/>
+                    <button type="action" string="Journal Items" name="%(account.action_account_moves_all_tree)d" groups="account.group_account_user"/>
+                    <button type="action" string="Contracts/Analytic Accounts" name="%(account.action_account_analytic_account_form)d" 
+                            groups="analytic.group_analytic_accounting"/>
+                </xpath>
+            </field>
+        </record>
+
         <record id="action_account_fiscal_position_form" model="ir.actions.act_window">
             <field name="name">Fiscal Positions</field>
             <field name="res_model">account.fiscal.position</field>
@@ -106,17 +129,5 @@
                 </page>
             </field>
         </record>
-
-        <!--  Partners info tab view-->
-
-        <act_window
-            id="action_analytic_open"
-            name="Contracts/Analytic Accounts"
-            res_model="account.analytic.account"
-            context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
-            src_model="res.partner"
-            view_type="form"
-            view_mode="tree,form"/>
-
     </data>
 </openerp>
diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py
index 907da56535a..6060d97c182 100644
--- a/addons/account/report/account_entries_report.py
+++ b/addons/account/report/account_entries_report.py
@@ -81,7 +81,7 @@ class account_entries_report(osv.osv):
         period_obj = self.pool.get('account.period')
         for arg in args:
             if arg[0] == 'period_id' and arg[2] == 'current_period':
-                current_period = period_obj.find(cr, uid)[0]
+                current_period = period_obj.find(cr, uid, context=context)[0]
                 args.append(['period_id','in',[current_period]])
                 break
             elif arg[0] == 'period_id' and arg[2] == 'current_year':
@@ -100,7 +100,7 @@ class account_entries_report(osv.osv):
         fiscalyear_obj = self.pool.get('account.fiscalyear')
         period_obj = self.pool.get('account.period')
         if context.get('period', False) == 'current_period':
-            current_period = period_obj.find(cr, uid)[0]
+            current_period = period_obj.find(cr, uid, context=context)[0]
             domain.append(['period_id','in',[current_period]])
         elif context.get('year', False) == 'current_year':
             current_year = fiscalyear_obj.find(cr, uid)
diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py
index aaf0ae4acf7..0d5a3525af4 100644
--- a/addons/account/wizard/account_reconcile.py
+++ b/addons/account/wizard/account_reconcile.py
@@ -148,7 +148,6 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
             context['analytic_id'] = data['analytic_id'][0]
         if context['date_p']:
             date = context['date_p']
-
         ids = period_obj.find(cr, uid, dt=date, context=context)
         if ids:
             period_id = ids[0]
diff --git a/addons/account/wizard/account_tax_chart.py b/addons/account/wizard/account_tax_chart.py
index 49492a04604..3283d2ba6d1 100644
--- a/addons/account/wizard/account_tax_chart.py
+++ b/addons/account/wizard/account_tax_chart.py
@@ -38,7 +38,7 @@ class account_tax_chart(osv.osv_memory):
 
     def _get_period(self, cr, uid, context=None):
         """Return default period value"""
-        period_ids = self.pool.get('account.period').find(cr, uid)
+        period_ids = self.pool.get('account.period').find(cr, uid, context=context)
         return period_ids and period_ids[0] or False
 
     def account_tax_chart_open_window(self, cr, uid, ids, context=None):
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 3a1bb083762..5c019155fdc 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -82,7 +82,7 @@ class account_asset_asset(osv.osv):
         return super(account_asset_asset, self).unlink(cr, uid, ids, context=context)
 
     def _get_period(self, cr, uid, context=None):
-        periods = self.pool.get('account.period').find(cr, uid)
+        periods = self.pool.get('account.period').find(cr, uid, context=context)
         if periods:
             return periods[0]
         else:
diff --git a/addons/account_asset/wizard/wizard_asset_compute.py b/addons/account_asset/wizard/wizard_asset_compute.py
index ee18a832e7b..f7cc6cf89c0 100755
--- a/addons/account_asset/wizard/wizard_asset_compute.py
+++ b/addons/account_asset/wizard/wizard_asset_compute.py
@@ -30,7 +30,7 @@ class asset_depreciation_confirmation_wizard(osv.osv_memory):
     }
    
     def _get_period(self, cr, uid, context=None):
-        periods = self.pool.get('account.period').find(cr, uid)
+        periods = self.pool.get('account.period').find(cr, uid, context=context)
         if periods:
             return periods[0]
         return False
diff --git a/addons/account_followup/i18n/nl_BE.po b/addons/account_followup/i18n/nl_BE.po
index 5125f27f2ff..64a73d776ef 100644
--- a/addons/account_followup/i18n/nl_BE.po
+++ b/addons/account_followup/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-16 04:37+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-04-17 05:15+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 "Language: nl\n"
 
 #. module: account_followup
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 15664696bd5..b176c3b8fd9 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -84,7 +84,7 @@ class account_voucher(osv.osv):
         if context is None: context = {}
         if context.get('period_id', False):
             return context.get('period_id')
-        periods = self.pool.get('account.period').find(cr, uid)
+        periods = self.pool.get('account.period').find(cr, uid, context=context)
         return periods and periods[0] or False
 
     def _make_journal_search(self, cr, uid, ttype, context=None):
diff --git a/addons/auth_signup/i18n/zh_CN.po b/addons/auth_signup/i18n/zh_CN.po
index 9beb3a044d3..aa8d9f952c1 100644
--- a/addons/auth_signup/i18n/zh_CN.po
+++ b/addons/auth_signup/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-16 04:37+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-04-17 05:15+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: auth_signup
 #: field:res.partner,signup_type:0
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index b5383e41775..f4a985280ac 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -200,6 +200,9 @@ class res_users(osv.Model):
                     'partner_id': partner.id,
                     'email': values.get('email') or values.get('login'),
                 })
+                if partner.company_id:
+                    values['company_id'] = partner.company_id.id
+                    values['company_ids'] = [(6,0,[partner.company_id.id])]
                 self._signup_create_user(cr, uid, values, context=context)
         else:
             # no token, sign up an external user
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index 657eae8fd63..99898f5a703 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -20,7 +20,7 @@
                     <xpath expr="//separator[@string='title']" position="after">
                         <group colspan="8" height="450" width="750">
                             <field name="name" invisible="1"/>
-                            <field name="plugin_file" filename="name"/>
+                            <field name="plugin_file" filename="name" widget="url"/>
                             <separator string="Installation and Configuration Steps" colspan="4"/>
                             <field name="description" nolabel="1" colspan="8"/>
                         </group>
diff --git a/addons/base_report_designer/installer.py b/addons/base_report_designer/installer.py
index a21b6655af7..7fddc27f037 100644
--- a/addons/base_report_designer/installer.py
+++ b/addons/base_report_designer/installer.py
@@ -23,7 +23,6 @@ from openerp.osv import fields
 from openerp.osv import osv
 import base64
 from openerp.tools.translate import _
-from openerp.modules.module import get_module_resource
 
 class base_report_designer_installer(osv.osv_memory):
     _name = 'base_report_designer.installer'
@@ -31,13 +30,13 @@ class base_report_designer_installer(osv.osv_memory):
 
     def default_get(self, cr, uid, fields, context=None):
         data = super(base_report_designer_installer, self).default_get(cr, uid, fields, context=context)
-        plugin_file = open(get_module_resource('base_report_designer','plugin', 'openerp_report_designer.zip'),'rb')
-        data['plugin_file'] = base64.encodestring(plugin_file.read())
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        data['plugin_file'] = base_url + '/base_report_designer/static/base-report-designer-plugin/openerp_report_designer.zip'
         return data
 
     _columns = {
         'name':fields.char('File name', size=34),
-        'plugin_file':fields.binary('OpenObject Report Designer Plug-in', readonly=True, help="OpenObject Report Designer plug-in file. Save as this file and install this plug-in in OpenOffice."),
+        'plugin_file':fields.char('OpenObject Report Designer Plug-in', size=256, readonly=True, help="OpenObject Report Designer plug-in file. Save as this file and install this plug-in in OpenOffice."),
         'description':fields.text('Description', readonly=True)
     }
 
diff --git a/addons/base_report_designer/plugin/openerp_report_designer.zip b/addons/base_report_designer/static/base-report-designer-plugin/openerp_report_designer.zip
similarity index 100%
rename from addons/base_report_designer/plugin/openerp_report_designer.zip
rename to addons/base_report_designer/static/base-report-designer-plugin/openerp_report_designer.zip
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 2361f12d61b..61e8c75cea8 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -1053,6 +1053,14 @@ class crm_lead(base_stage, format_address, osv.osv):
         message = _("%s a call for %s.%s") % (prefix, phonecall.date, suffix)
         return self.message_post(cr, uid, ids, body=message, context=context)
 
+    def log_meeting(self, cr, uid, ids, meeting_subject, meeting_date, duration, context=None):
+        if not duration:
+            duration = _('unknown')
+        else:
+            duration = str(duration)
+        message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (meeting_date, meeting_subject, duration)
+        return self.message_post(cr, uid, ids, body=message, context=context)
+
     def onchange_state(self, cr, uid, ids, state_id, context=None):
         if state_id:
             country_id=self.pool.get('res.country.state').browse(cr, uid, state_id, context).country_id.id
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 14b69ed0e11..c31907bebe2 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -34,6 +34,13 @@ class crm_meeting(osv.Model):
         'opportunity_id': fields.many2one ('crm.lead', 'Opportunity', domain="[('type', '=', 'opportunity')]"),
     }
 
+    def create(self, cr, uid, vals, context=None):
+        res = super(crm_meeting, self).create(cr, uid, vals, context=context)
+        obj = self.browse(cr, uid, res, context=context)
+        if obj.opportunity_id:
+            self.pool.get('crm.lead').log_meeting(cr, uid, [obj.opportunity_id.id], obj.name, obj.date, obj.duration, context=context)
+        return res
+
 
 class calendar_attendee(osv.osv):
     """ Calendar Attendee """
diff --git a/addons/crm_helpdesk/test/process/help-desk.yml b/addons/crm_helpdesk/test/process/help-desk.yml
index e2be4a64ca3..95536b1c8dd 100644
--- a/addons/crm_helpdesk/test/process/help-desk.yml
+++ b/addons/crm_helpdesk/test/process/help-desk.yml
@@ -4,8 +4,7 @@
   Mail script will be fetched him request from mail server. so I process that mail after read EML file 
 -
   !python {model: mail.thread}: |
-    from openerp import addons
-    request_file = open(addons.get_module_resource('crm_helpdesk','test', 'customer_question.eml'),'rb')
+    request_file = open(openerp.modules.module.get_module_resource('crm_helpdesk','test', 'customer_question.eml'),'rb')
     request_message = request_file.read()
     self.message_process(cr, uid, 'crm.helpdesk', request_message)
 -
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index c422a2d4948..73daa64f841 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -52,6 +52,9 @@ class hr_expense_expense(osv.osv):
             res[expense.id] = total
         return res
 
+    def _get_expense_from_line(self, cr, uid, ids, context=None):
+        return [line.expense_id.id for line in self.pool.get('hr.expense.line').browse(cr, uid, ids, context=context)]
+
     def _get_currency(self, cr, uid, context=None):
         user = self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0]
         if user.company_id:
@@ -84,7 +87,10 @@ class hr_expense_expense(osv.osv):
         'account_move_id': fields.many2one('account.move', 'Ledger Posting'),
         'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
         'note': fields.text('Note'),
-        'amount': fields.function(_amount, string='Total Amount', digits_compute=dp.get_precision('Account')),
+        'amount': fields.function(_amount, string='Total Amount', digits_compute=dp.get_precision('Account'), 
+            store={
+                'hr.expense.line': (_get_expense_from_line, ['unit_amount','unit_quantity'], 10)
+            }),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'department_id':fields.many2one('hr.department','Department', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True),
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index eab24b06717..7a98053a6e5 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -32,7 +32,7 @@
                     <field name="user_id" invisible="1"/>
                     <field name="name"/>
                     <field name="currency_id" groups="base.group_multi_currency"/>
-                    <field name="amount"/>
+                    <field name="amount" sum="Total Expenses"/>
                     <field name="state"/>
                 </tree>
             </field>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index b0b60db6bd5..e41d80fb348 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -510,8 +510,9 @@ class hr_job(osv.osv):
 
     def _auto_init(self, cr, context=None):
         """Installation hook to create aliases for all jobs and avoid constraint errors."""
-        self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(hr_job,self)._auto_init,
+        res = self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(hr_job,self)._auto_init,
             self._columns['alias_id'], 'name', alias_prefix='job+', alias_defaults={'job_id': 'id'}, context=context)
+        return res
 
     def create(self, cr, uid, vals, context=None):
         mail_alias = self.pool.get('mail.alias')
diff --git a/addons/hr_recruitment/test/recruitment_process.yml b/addons/hr_recruitment/test/recruitment_process.yml
index f2d4e4736fa..335edc71892 100644
--- a/addons/hr_recruitment/test/recruitment_process.yml
+++ b/addons/hr_recruitment/test/recruitment_process.yml
@@ -4,8 +4,7 @@
   An applicant is interested in the job position. So he sends a resume by email.
 -
   !python {model: mail.thread}: |
-    from openerp import addons
-    request_file = open(addons.get_module_resource('hr_recruitment','test', 'resume.eml'),'rb')
+    request_file = open(openerp.modules.module.get_module_resource('hr_recruitment','test', 'resume.eml'),'rb')
     request_message = request_file.read()
     self.message_process(cr, uid, 'hr.applicant', request_message)
 -
diff --git a/addons/l10n_lu/wizard/print_vat.py b/addons/l10n_lu/wizard/print_vat.py
index 79213026496..bfa058720d3 100644
--- a/addons/l10n_lu/wizard/print_vat.py
+++ b/addons/l10n_lu/wizard/print_vat.py
@@ -9,10 +9,10 @@ from __future__ import with_statement
 import openerp
 from openerp.osv import fields, osv
 from openerp import tools
+from openerp.modules.module import get_module_resource
 from openerp.tools.translate import _
 from openerp.report.render import render
 from openerp.report.interface import report_int
-from openerp import addons
 import tempfile
 import os
 
@@ -53,7 +53,7 @@ class report_custom(report_int):
         try:
             tmp_file = tempfile.mkstemp(".pdf")[1]
             try:
-                tools.pdf_utils.fill_pdf(addons.get_module_resource('l10n_lu','wizard', '2008_DECL_F_M10.pdf'), tmp_file, result)
+                tools.pdf_utils.fill_pdf(get_module_resource('l10n_lu','wizard', '2008_DECL_F_M10.pdf'), tmp_file, result)
                 with open(tmp_file, "r") as ofile:
                     self.obj = external_pdf(ofile.read())
             finally:
diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index f806b325291..8730599ad72 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -160,7 +160,7 @@ class mail_alias(osv.Model):
         alias_id_column.required = False
 
         # call _auto_init
-        child_model_auto_init_fct(cr, context=context)
+        res = child_model_auto_init_fct(cr, context=context)
 
         registry = RegistryManager.get(cr.dbname)
         mail_alias = registry.get('mail.alias')
@@ -188,6 +188,8 @@ class mail_alias(osv.Model):
         # set back the unique alias_id constraint
         alias_id_column.required = True
 
+        return res
+
     def create_unique_alias(self, cr, uid, vals, model_name=None, context=None):
         """Creates an email.alias record according to the values provided in ``vals``,
         with 2 alterations: the ``alias_name`` value may be suffixed in order to
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index f7c91939b98..5545745b235 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -60,8 +60,9 @@ class res_users(osv.Model):
     def _auto_init(self, cr, context=None):
         """ Installation hook: aliases, partner following themselves """
         # create aliases for all users and avoid constraint errors
-        self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(res_users, self)._auto_init,
+        res = self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(res_users, self)._auto_init,
             self._columns['alias_id'], 'login', alias_force_key='id', context=context)
+        return res
 
     def create(self, cr, uid, data, context=None):
         # create default alias same as the login
diff --git a/addons/product/product.py b/addons/product/product.py
index fdcbee20cb4..518e455ddc1 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -518,6 +518,13 @@ class product_product(osv.osv):
     def _set_image(self, cr, uid, id, name, value, args, context=None):
         return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
 
+    def _get_name_template_ids(self, cr, uid, ids, context=None):
+        result = set()
+        template_ids = self.pool.get('product.product').search(cr, uid, [('product_tmpl_id', 'in', ids)])
+        for el in template_ids:
+            result.add(el)
+        return list(result)
+
     _defaults = {
         'active': lambda *a: 1,
         'price_extra': lambda *a: 0.0,
@@ -549,7 +556,11 @@ class product_product(osv.osv):
         'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Product Price')),
         'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Product Price')),
         'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'),
-        'name_template': fields.related('product_tmpl_id', 'name', string="Template Name", type='char', size=128, store=True, select=True),
+        'name_template': fields.related('product_tmpl_id', 'name', string="Template Name", type='char', size=128, store={
+            'product.template': (_get_name_template_ids, ['name'], 10),
+            'product.product': (lambda self, cr, uid, ids, c=None: ids, [], 10),
+
+            }, select=True),
         'color': fields.integer('Color Index'),
         # image: all image fields are base64 encoded and PIL-supported
         'image': fields.binary("Image",
diff --git a/addons/project_issue/test/subscribe_issue.yml b/addons/project_issue/test/subscribe_issue.yml
index 9f16dc80b97..af81ff4d295 100644
--- a/addons/project_issue/test/subscribe_issue.yml
+++ b/addons/project_issue/test/subscribe_issue.yml
@@ -2,8 +2,7 @@
   In Order to test process of  Issue in OpenERP, Custmer send the issue by email.
 -
   !python {model: mail.thread}: |
-    from openerp import addons
-    request_file = open(addons.get_module_resource('project_issue','test', 'issue.eml'),'rb')
+    request_file = open(openerp.modules.module.get_module_resource('project_issue','test', 'issue.eml'),'rb')
     request_message = request_file.read()
     self.message_process(cr, uid, 'project.issue', request_message)
 -
@@ -14,4 +13,4 @@
     assert issue_ids and len(issue_ids), "issue is not created after getting request"
     issue = self.browse(cr, uid, issue_ids[0], context=context)
     assert not issue.partner_id, "Customer should be a new"
-    assert issue.name == "Error in the account module", "Subject does not match"
\ No newline at end of file
+    assert issue.name == "Error in the account module", "Subject does not match"
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 056a06f0750..731e17426c1 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -335,7 +335,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="context">{}</field>
-            <field name="domain">[('state','in',('draft','sent','cancel'))]</field>
+            <field name="domain">[('state','in',('draft','sent','cancel', 'confirmed'))]</field>
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help" type="html">
diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py
index 01536f471fe..3d8e41c42ff 100644
--- a/addons/report_webkit/webkit_report.py
+++ b/addons/report_webkit/webkit_report.py
@@ -40,8 +40,8 @@ import logging
 
 from report_helper import WebKitHelper
 import openerp
+from openerp.modules.module import get_module_resource
 from openerp.report.report_sxw import *
-from openerp import addons
 from openerp import tools
 from openerp.tools.translate import _
 from openerp.osv.osv import except_osv
@@ -280,7 +280,7 @@ class WebKitParser(report_sxw):
         template =  False
 
         if report_xml.report_file :
-            path = addons.get_module_resource(*report_xml.report_file.split(os.path.sep))
+            path = get_module_resource(*report_xml.report_file.split(os.path.sep))
             if path and os.path.exists(path) :
                 template = file(path).read()
         if not template and report_xml.report_webkit_data :
@@ -296,7 +296,7 @@ class WebKitParser(report_sxw):
               )
         if not report_xml.header :
             header = ''
-            default_head = addons.get_module_resource('report_webkit', 'default_header.html')
+            default_head = get_module_resource('report_webkit', 'default_header.html')
             with open(default_head,'r') as f:
                 header = f.read()
         css = report_xml.webkit_header.css