[Merge] Mergie with trunk

bzr revid: jke@openerp.com-20131202144019-f6zu5ciyirorsjp6
2013-12-02 15:40:19 +01:00 · 2013-12-02 15:40:19 +01:00 · c66444b2b1
parent 27a42cc6eb 57ef91409a
commit c66444b2b1
45 changed files with 15392 additions and 94 deletions
--- a/addons/account/account.py
+++ b/addons/account/account.py
@ -3414,6 +3414,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
        all the provided information to create the accounts, the banks, the journals, the taxes, the tax codes, the
        accounting properties... accordingly for the chosen company.
        '''
+        if uid != SUPERUSER_ID and not self.pool['res.users'].has_group(cr, uid, 'base.group_erp_manager'):
+            raise openerp.exceptions.AccessError(_("Only administrators can change the settings"))
        obj_data = self.pool.get('ir.model.data')
        ir_values_obj = self.pool.get('ir.values')
        obj_wizard = self.browse(cr, uid, ids[0])
@ -3430,7 +3432,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                        self.pool[tmp2[0]].write(cr, uid, tmp2[1], {
                            'currency_id': obj_wizard.currency_id.id
                        })
-                except ValueError, e:
+                except ValueError:
                    pass

        # If the floats for sale/purchase rates have been filled, create templates from them
--- a/addons/account/i18n/am.po
+++ b/addons/account/i18n/am.po
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-08-21 06:06+0000\n"
-"Last-Translator: Boyce Huang <boyce.huang@cenoq.com>\n"
+"PO-Revision-Date: 2013-12-01 17:16+0000\n"
+"Last-Translator: Andy Cheng <andy@dobtor.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 05:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-12-02 05:23+0000\n"
+"X-Generator: Launchpad (build 16856)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -32,12 +32,12 @@ msgstr "在相同會計科目中，只能設定一次科目財務狀況。"
 msgid ""
 "Determine the display order in the report 'Accounting \\ Reporting \\ "
 "Generic Reporting \\ Taxes \\ Taxes Report'"
-msgstr "確定以下報表的顯示順序：」會計-報表-通用報表-稅-稅報表「"
+msgstr "確定以下報表的顯示順序：「會計 \\ 報表 \\ 通用報表 \\ 稅 \\ 稅報表」"

 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr "日記帳分錄調節"
+msgstr "帳簿分錄調節"

 #. module: account
 #: view:account.account:0
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@ -295,7 +295,7 @@
          </para>
        </td>
        <td>
-          <para style="terp_tblheader_Details"><b>Total:</b></para>
+          <para style="terp_default_9"><b>Total:</b></para>
        </td>
        <td>
          <para style="terp_default_Bold_Right_9"><b>[[ formatLang(o.amount_total, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]</b></para>
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@ -22,13 +22,12 @@
 import time
 import datetime
 from dateutil.relativedelta import relativedelta
-from operator import itemgetter
-from os.path import join as opj

+import openerp
+from openerp import SUPERUSER_ID
 from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DF
 from openerp.tools.translate import _
 from openerp.osv import fields, osv
-from openerp import tools

 class account_config_settings(osv.osv_memory):
    _name = 'account.config.settings'
@ -276,11 +275,13 @@ class account_config_settings(osv.osv_memory):

    def set_default_taxes(self, cr, uid, ids, context=None):
        """ set default sale and purchase taxes for products """
+        if uid != SUPERUSER_ID and not self.pool['res.users'].has_group(cr, uid, 'base.group_erp_manager'):
+            raise openerp.exceptions.AccessError(_("Only administrators can change the settings"))
        ir_values = self.pool.get('ir.values')
        config = self.browse(cr, uid, ids[0], context)
-        ir_values.set_default(cr, uid, 'product.product', 'taxes_id',
+        ir_values.set_default(cr, SUPERUSER_ID, 'product.product', 'taxes_id',
            config.default_sale_tax and [config.default_sale_tax.id] or False, company_id=config.company_id.id)
-        ir_values.set_default(cr, uid, 'product.product', 'supplier_taxes_id',
+        ir_values.set_default(cr, SUPERUSER_ID, 'product.product', 'supplier_taxes_id',
            config.default_purchase_tax and [config.default_purchase_tax.id] or False, company_id=config.company_id.id)

    def set_chart_of_accounts(self, cr, uid, ids, context=None):
--- a/addons/account_voucher/i18n/fi.po
+++ b/addons/account_voucher/i18n/fi.po
--- a/addons/auth_signup/auth_signup_data.xml
+++ b/addons/auth_signup/auth_signup_data.xml
@ -11,6 +11,8 @@
            <field name="active" eval="False"/>
            <!-- Avoid auto-including this user in any default group, just like a typical portal member -->
            <field name="groups_id" eval="[(5,)]"/>
+            <!-- no alias for portal users -->
+            <field name="alias_name" eval="False"/>
        </record>

        <record id="default_template_user_config" model="ir.config_parameter">
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@ -234,6 +234,8 @@ class res_users(osv.Model):

        # create a copy of the template user (attached to a specific partner_id if given)
        values['active'] = True
+        if 'alias_name' not in values:      # allow behavior change via inheritance (like using the name)
+            values['alias_name'] = False
        context = dict(context or {}, no_reset_password=True)
        return self.copy(cr, uid, template_user_id, values, context=context)

--- a/addons/base_import/static/src/css/import.css
+++ b/addons/base_import/static/src/css/import.css
@ -1,12 +1,14 @@
 .oe_import > p {
    margin-left: 8px;
    margin-right: 8px;
+    margin-top: 13px; /* Customize space according bootstrap3 */
    text-align: justify
 }

 .oe_import h2 {
    margin-top: 0;
    margin-bottom: 5px;
+    font-size: 1.5em; /* Customize according bootstrap3 */
 }

 .oe_padding {
@ -22,6 +24,14 @@
    border: solid 1px #dddddd;
    width: 600px;
 }
+/* Customize according bootstrap3 */
+.oe_import .oe_import_box label{
+    font-weight: normal;
+}
+.oe_import .oe_import_box .oe_import_file {
+    display: inline-block;
+}
+/* End of Customize */
 .oe_import .oe_import_toggle{
    margin-top: 8px;
 }
@ -40,7 +50,7 @@
 }

 .oe_import .oe_import_options p {
-    margin: 0;
+    margin: 0 0 -7px 0; /* Customize margin-bottom of <p> according bootstrap3 */
    padding: 0;
 }
 .oe_import .oe_import_options label {
@ -69,6 +79,14 @@
 .oe_import .oe_import_report_more {
    display: none;
 }
+/* Customize dd and label according bootstrap3 */ 
+.oe_import dd {
+    -webkit-margin-start: 40px;
+}
+.oe_import .oe_import_with_file label {
+    font-weight: normal;
+}
+/* End of customize */

 .oe_import.oe_import_preview .oe_import_grid {
    display: table;
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@ -373,7 +373,7 @@ openerp.base_import = function (instance) {
                    return $.when([{
                        type: 'error',
                        record: false,
-                        message: error.data.fault_code,
+                        message: error.data.arguments[1],
                    }]);
                }) ;
        },
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@ -99,6 +99,7 @@
                            help="Convert to Opportunity" class="oe_highlight"/>
                    <field name="stage_id" widget="statusbar" clickable="True"
                            domain="['&amp;', '|', ('case_default', '=', True), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"
+                            options="{'fold_field': 'fold'}"
                            on_change="onchange_stage_id(stage_id)"/>
                </header>
                <sheet>
@ -379,14 +380,11 @@
            <field name="arch" type="xml">
                <form string="Opportunities" version="7.0">
                    <header>
-                        <!-- :deprecated: this button will be removed from the view with OpenERP v8 -->
-                        <button name="case_mark_won" string="Mark Won" type="object" class="oe_highlight"
-                                invisible="True"/>
-                        <!-- :deprecated: this button will be removed from the view with OpenERP v8 -->
-                        <button name="case_mark_lost" string="Mark Lost" type="object" class="oe_highlight"
-                                invisible="True"/>
+                        <button name="case_mark_won" string="Mark Won" type="object" class="oe_highlight"/>
+                        <button name="case_mark_lost" string="Mark Lost" type="object" class="oe_highlight"/>
                        <field name="stage_id" widget="statusbar" clickable="True"
-                                domain="['&amp;', ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"/>
+                            options="{'fold_field': 'fold'}"
+                            domain="['&amp;', ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"/>
                    </header>
                    <sheet>
                        <div class="oe_right oe_button_box">
--- a/addons/crm/static/src/css/crm.css
+++ b/addons/crm/static/src/css/crm.css
@ -1,5 +1,8 @@
 .openerp .oe_kanban_view .oe_kanban_crm_salesteams {
-    width: 345px;
+    /* Customize width and height of kanban according bootstrap3 */
+    width: 357px;
+    min-height: 254px !important;
+    /* End of customize */
 }
 .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_avatars {
    text-align: right;
@ -21,7 +24,7 @@

 .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list {
    position: relative;
-    margin: 10px;
+    margin: 10px 0 10px 9px; /* Improved margin to set alignment of list items according bootstrap3 */
 }
 .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div {
    width: 160px;
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@ -38,6 +38,9 @@ class crm_lead2opportunity_partner(osv.osv_memory):
        'section_id': fields.many2one('crm.case.section', 'Sales Team', select=True),
    }

+    def onchange_action(self, cr, uid, ids, action, context=None):
+        return {'value': {'partner_id': False if action != 'exist' else self._find_matching_partner(cr, uid, context=context)}}
+
    def default_get(self, cr, uid, fields, context=None):
        """
        Default get for name, opportunity_ids.
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@ -31,7 +31,7 @@
                        </field>
                    </group>
                    <group name="action" attrs="{'invisible': [('name', '!=', 'convert')]}">
-                        <field name="action" class="oe_inline"/>
+                        <field name="action" on_change="onchange_action(action, context)" class="oe_inline"/>
                        <field name="partner_id"
                            attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"
                            class="oe_inline"/>
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@ -51,7 +51,9 @@
                <search string="Search">
                    <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" groups="base.group_multi_salesteams"/>
                    <separator/>
-                    <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
+                    <!-- A 'My Company' filter makes no sense regarding record rules, and is not possible to do (uid is not a company): remove me in 8.0 -->
+                    <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[]" help="My company"
+                        invisible="1"/>
                    <separator/>
                    <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                    <field name="company_id" groups="base.group_multi_company"/>
--- a/addons/document/document.py
+++ b/addons/document/document.py
@ -69,7 +69,11 @@ class document_file(osv.osv):

    def check(self, cr, uid, ids, mode, context=None, values=None):
        """Overwrite check to verify access on directory to validate specifications of doc/access_permissions.rst"""
+        if not isinstance(ids, list):
+            ids = [ids]
+
        super(document_file, self).check(cr, uid, ids, mode, context=context, values=values)
+        
        if ids:
            self.pool.get('ir.model.access').check(cr, uid, 'document.directory', mode)

--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@ -369,7 +369,7 @@ class email_template(osv.osv):
                    attachment_ids=[attach.id for attach in template.attachment_ids],
                )

-            # Add report in attachments
+            # Add report in attachments: generate once for all template_res_ids
            if template.report_template:
                for res_id in template_res_ids:
                    attachments = []
@ -387,8 +387,7 @@ class email_template(osv.osv):
                    if not report_name.endswith(ext):
                        report_name += ext
                    attachments.append((report_name, result))
-
-                    values['attachments'] = attachments
+                    results[res_id]['attachments'] = attachments

        return results

--- a/addons/google_drive/google_drive.py
+++ b/addons/google_drive/google_drive.py
@ -60,10 +60,9 @@ class config(osv.Model):
    def get_access_token(self, cr, uid, scope=None, context=None):
        ir_config = self.pool['ir.config_parameter']
        google_drive_refresh_token = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_refresh_token')
-        group_config = self.pool['ir.model.data'].get_object_reference(cr, uid, 'base', 'group_erp_manager')[1]
-        user = self.pool['res.users'].read(cr, uid, uid, "groups_id")
+        user_is_admin = self.pool['res.users'].has_group(cr, uid, 'base.group_erp_manager')
        if not google_drive_refresh_token:
-            if group_config in user['groups_id']:
+            if user_is_admin:
                raise self.pool.get('res.config.settings').get_config_warning(cr, _("You haven't configured 'Authorization Code' generated from google, Please generate and configure it in %(menu:base_setup.menu_general_configuration)s."), context=context)
            else:
                raise osv.except_osv(_('Error!'), _("Google Drive is not yet configured. Please contact your administrator."))
@ -81,7 +80,7 @@ class config(osv.Model):
            req = urllib2.Request('https://accounts.google.com/o/oauth2/token', data, headers)
            content = urllib2.urlopen(req).read()
        except urllib2.HTTPError:
-            if group_config in user['groups_id']:
+            if user_is_admin:
                raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong during the token generation. Please request again an authorization code in %(menu:base_setup.menu_general_configuration)s."), context=context)
            else:
                raise osv.except_osv(_('Error!'), _("Google Drive is not yet configured. Please contact your administrator."))
--- a/addons/google_spreadsheet/google_spreadsheet.py
+++ b/addons/google_spreadsheet/google_spreadsheet.py
@ -18,6 +18,7 @@
 #
 ##############################################################################

+import cgi
 import simplejson
 import logging
 from lxml import etree
@ -67,24 +68,24 @@ class config(osv.osv):
        request = '''<feed xmlns="http://www.w3.org/2005/Atom"
      xmlns:batch="http://schemas.google.com/gdata/batch"
      xmlns:gs="http://schemas.google.com/spreadsheets/2006">
-  <id>https://spreadsheets.google.com/feeds/cells/%s/od6/private/full</id>
+  <id>https://spreadsheets.google.com/feeds/cells/{key}/od6/private/full</id>
  <entry>
    <batch:id>A1</batch:id>
    <batch:operation type="update"/>
-    <id>https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/R1C1</id>
+    <id>https://spreadsheets.google.com/feeds/cells/{key}/od6/private/full/R1C1</id>
    <link rel="edit" type="application/atom+xml"
-      href="https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/R1C1"/>
-    <gs:cell row="1" col="1" inputValue="%s"/>
+      href="https://spreadsheets.google.com/feeds/cells/{key}/od6/private/full/R1C1"/>
+    <gs:cell row="1" col="1" inputValue="{formula}"/>
  </entry>
  <entry>
    <batch:id>A2</batch:id>
    <batch:operation type="update"/>
-    <id>https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/R60C15</id>
+    <id>https://spreadsheets.google.com/feeds/cells/{key}/od6/private/full/R60C15</id>
    <link rel="edit" type="application/atom+xml"
-      href="https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/R60C15"/>
-    <gs:cell row="60" col="15" inputValue="%s"/>
+      href="https://spreadsheets.google.com/feeds/cells/{key}/od6/private/full/R60C15"/>
+    <gs:cell row="60" col="15" inputValue="{config}"/>
  </entry>
-</feed>''' % (spreadsheet_key, spreadsheet_key, spreadsheet_key, formula.replace('"', '&quot;'), spreadsheet_key, spreadsheet_key, config_formula.replace('"', '&quot;'))
+</feed>''' .format(key=spreadsheet_key, formula=cgi.escape(formula, quote=True), config=cgi.escape(config_formula, quote=True))

        try:
            req = urllib2.Request(
--- a/addons/hr_attendance/static/src/css/slider.css
+++ b/addons/hr_attendance/static/src/css/slider.css
@ -5,7 +5,7 @@
    display: inline-block;
 }
 .openerp .oe_attendance_signin {
-    float:left;
+    float: right;
    height: 32px;
    width: 32px;
    background: url(/hr_attendance/static/src/img/emp-out32.png);
--- a/addons/hr_timesheet_sheet/static/src/css/timesheet.css
+++ b/addons/hr_timesheet_sheet/static/src/css/timesheet.css
@ -19,7 +19,7 @@
  text-align: center;
  color: #006699;
  font-family: "Helvetica Neue", Arial, Verdana, "Nimbus Sans L", sans-serif;
-  font-size: 10px;
+  font-size: 11px;
  background: #eeeeee;
  min-width: 47px;
 }
--- a/addons/idea/static/src/css/idea_idea.css
+++ b/addons/idea/static/src/css/idea_idea.css
@ -1,5 +1,5 @@
 .openerp .oe_kanban_view .oe_kanban_idea_idea {
-    width: 200px;
+    width: 212px; /* Customize width according bootstrap3 */
 }

 .openerp .oe_kanban_view .oe_kanban_idea_idea .oe_avatars {
--- a/addons/im/static/src/js/im.js
+++ b/addons/im/static/src/js/im.js
@ -80,7 +80,7 @@
            });
        },
        calc_box: function() {
-            var $topbar = instance.client.$(".oe_topbar");
+            var $topbar = instance.client.$(".navbar"); // .oe_topbar is replaced with .navbar of bootstrap3
            var top = $topbar.offset().top + $topbar.height();
            top = Math.max(top - $(window).scrollTop(), 0);
            this.$el.css("top", top);
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@ -1096,7 +1096,7 @@ class mail_thread(osv.AbstractModel):
                encoding = part.get_content_charset()  # None if attachment
                # 1) Explicit Attachments -> attachments
                if filename or part.get('content-disposition', '').strip().startswith('attachment'):
-                    attachments.append((filename or 'attachment', part.get_payload(decode=True)))
+                    attachments.append((decode(filename) or 'attachment', part.get_payload(decode=True)))
                    continue
                # 2) text/plain -> <pre/>
                if part.get_content_type() == 'text/plain' and (not alternative or not body):
@ -1321,6 +1321,40 @@ class mail_thread(osv.AbstractModel):
                    mail_message_obj.write(cr, SUPERUSER_ID, message_ids, {'author_id': partner_info['partner_id']}, context=context)
        return result

+    def _message_preprocess_attachments(self, cr, uid, attachments, attachment_ids, attach_model, attach_res_id, context=None):
+        """ Preprocess attachments for mail_thread.message_post() or mail_mail.create().
+
+        :param list attachments: list of attachment tuples in the form ``(name,content)``,
+                                 where content is NOT base64 encoded
+        :param list attachment_ids: a list of attachment ids, not in tomany command form
+        :param str attach_model: the model of the attachments parent record
+        :param integer attach_res_id: the id of the attachments parent record
+        """
+        Attachment = self.pool['ir.attachment']
+        m2m_attachment_ids = []
+        if attachment_ids:
+            filtered_attachment_ids = Attachment.search(cr, SUPERUSER_ID, [
+                ('res_model', '=', 'mail.compose.message'),
+                ('create_uid', '=', uid),
+                ('id', 'in', attachment_ids)], context=context)
+            if filtered_attachment_ids:
+                Attachment.write(cr, SUPERUSER_ID, filtered_attachment_ids, {'res_model': attach_model, 'res_id': attach_res_id}, context=context)
+            m2m_attachment_ids += [(4, id) for id in attachment_ids]
+        # Handle attachments parameter, that is a dictionary of attachments
+        for name, content in attachments:
+            if isinstance(content, unicode):
+                content = content.encode('utf-8')
+            data_attach = {
+                'name': name,
+                'datas': base64.b64encode(str(content)),
+                'datas_fname': name,
+                'description': name,
+                'res_model': attach_model,
+                'res_id': attach_res_id,
+            }
+            m2m_attachment_ids.append((0, 0, data_attach))
+        return m2m_attachment_ids
+
    def message_post(self, cr, uid, thread_id, body='', subject=None, type='notification',
                     subtype=None, parent_id=False, attachments=None, context=None,
                     content_subtype='html', **kwargs):
@ -1399,28 +1433,7 @@ class mail_thread(osv.AbstractModel):

        # 3. Attachments
        #   - HACK TDE FIXME: Chatter: attachments linked to the document (not done JS-side), load the message
-        attachment_ids = kwargs.pop('attachment_ids', []) or []  # because we could receive None (some old code sends None)
-        if attachment_ids:
-            filtered_attachment_ids = ir_attachment.search(cr, SUPERUSER_ID, [
-                ('res_model', '=', 'mail.compose.message'),
-                ('create_uid', '=', uid),
-                ('id', 'in', attachment_ids)], context=context)
-            if filtered_attachment_ids:
-                ir_attachment.write(cr, SUPERUSER_ID, filtered_attachment_ids, {'res_model': model, 'res_id': thread_id}, context=context)
-        attachment_ids = [(4, id) for id in attachment_ids]
-        # Handle attachments parameter, that is a dictionary of attachments
-        for name, content in attachments:
-            if isinstance(content, unicode):
-                content = content.encode('utf-8')
-            data_attach = {
-                'name': name,
-                'datas': base64.b64encode(str(content)),
-                'datas_fname': name,
-                'description': name,
-                'res_model': model,
-                'res_id': thread_id,
-            }
-            attachment_ids.append((0, 0, data_attach))
+        attachment_ids = self._message_preprocess_attachments(cr, uid, attachments, kwargs.pop('attachment_ids', []), model, thread_id, context)

        # 4: mail.message.subtype
        subtype_id = False
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@ -94,9 +94,7 @@
 }
 .openerp .oe_mail .oe_msg .oe_msg_footer{
    margin-left: 4px;
-    padding-top: 3px;
    overflow: hidden;
-    margin-bottom: 4px;
    font-size: 11px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_content{
@ -478,7 +476,7 @@
 }
 .openerp .oe_mail .oe_msg_footer button.oe_attach{
    width: 24px;
-    overflow: hidden;
+    margin-bottom: 5px; /* improved margin of file attach button according bootstrap3 */
    filter:none;
 }
 .openerp .oe_mail .oe_msg_footer button.oe_attach .oe_e{
@ -634,7 +632,7 @@
    margin-bottom: 4px;
 }
 .openerp .oe_followers .oe_invite{
-    float: right;
+    padding-left: 5px;
 }
 .openerp .oe_followers .oe_partner {
    height: 32px;
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@ -19,7 +19,9 @@
 #
 ##############################################################################

+import base64
 import re
+
 from openerp import tools
 from openerp import SUPERUSER_ID
 from openerp.osv import osv
@ -260,6 +262,12 @@ class mail_compose_message(osv.TransientModel):

            for res_id, mail_values in all_mail_values.iteritems():
                if mass_mail_mode and not wizard.post:
+                    m2m_attachment_ids = self.pool['mail.thread']._message_preprocess_attachments(
+                        cr, uid, mail_values.pop('attachments', []),
+                        mail_values.pop('attachment_ids', []),
+                        'mail.message', 0,
+                        context=context)
+                    mail_values['attachment_ids'] = m2m_attachment_ids
                    self.pool.get('mail.mail').create(cr, uid, mail_values, context=context)
                else:
                    subtype = 'mail.mt_comment'
@ -298,7 +306,12 @@ class mail_compose_message(osv.TransientModel):
            if mass_mail_mode and wizard.model:
                email_dict = rendered_values[res_id]
                mail_values['partner_ids'] += email_dict.pop('partner_ids', [])
-                mail_values['attachments'] = email_dict.pop('attachments', [])
+                # process attachments: should not be encoded before being processed by message_post / mail_mail create
+                attachments = []
+                if email_dict.get('attachments'):
+                    for name, enc_cont in email_dict.pop('attachments'):
+                        attachments.append((name, base64.b64decode(enc_cont)))
+                mail_values['attachments'] = attachments
                attachment_ids = []
                for attach_id in mail_values.pop('attachment_ids'):
                    new_attach_id = self.pool.get('ir.attachment').copy(cr, uid, attach_id, {'res_model': self._name, 'res_id': wizard.id}, context=context)
--- a/addons/mass_mailing/static/src/css/mass_mailing.css
+++ b/addons/mass_mailing/static/src/css/mass_mailing.css
@ -1,13 +1,19 @@
 .openerp .oe_kanban_view .oe_kanban_mass_mailing.oe_kanban_mass_mailing_campaign {
-    width: 540px;
+    /* Customize to manage content */
+    width: 552px;
+    min-height: 278px !important;
+    /* End of customize */
 }

 .openerp .oe_kanban_view .oe_kanban_mass_mailing.oe_kanban_mass_mailing_segment {
-    width: 270px;
+    /* Customize to manage content */
+    width: 282px;
+    min-height: 246px !important;
+    /* End of customize */
 }

 .openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_mail_stats {
-    width: 120px;
+    width: 122px; /* Manage space in between stats */
    display: inline-block;
    margin: 2px 5px 0px 5px;
    text-align: center;
--- a/addons/note/note.py
+++ b/addons/note/note.py
@ -147,6 +147,7 @@ class note_note(osv.osv):
                    if result and result[0]['stage_id'][0] == current_stage_ids[0]:
                        dom_in = result[0]['__domain'].pop()
                        result[0]['__domain'] = domain + ['|', dom_in, dom_not_in]
+                        result[0]['stage_id_count'] += nb_notes_ws
                    else:
                        # add the first stage column
                        result = [{
--- a/addons/pad/static/src/css/etherpad.css
+++ b/addons/pad/static/src/css/etherpad.css
@ -92,6 +92,7 @@
    font-family: arial, sans-serif;
    font-size: 15px;
    line-height: 19px; 
+    word-wrap: break-word;
 }

 .openerp .oe_form_nomargin .etherpad_readonly{ 
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@ -126,6 +126,7 @@
    background: #393939;
    background: -moz-linear-gradient(#7b7979, #393939);
    background: -webkit-gradient(linear, left top, left bottom, from(#7b7979), to(#393939));
+    z-index: 2; /* Customize according bootstrap3 navbar */
 }

 /*  a) The left part of the top-bar */
@ -659,6 +660,7 @@
 .point-of-sale .screen header h2 {
    margin-top: 0px;
    padding-top: 7px;
+    font-size: 1.5em /* Customize font according bootstrap3 */
 }
 .point-of-sale .screen p{
    font-size: 18px;
--- a/addons/portal/static/src/css/portal.css
+++ b/addons/portal/static/src/css/portal.css
@ -10,7 +10,7 @@
    margin: -40px 0 -32px -24px;
    position: relative;
    padding: 10px 15px;
-    right: -153px;
+    right: -125px; /* improved margin according bootstrap3 */
     
    background: #729FCF;
 	background-image: -webkit-gradient(linear, left top, left bottom, from(#729FCF), to(#3465A4));
--- a/addons/portal_anonymous/i18n/fi.po
+++ b/addons/portal_anonymous/i18n/fi.po
@ -0,0 +1,25 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-01 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-02 05:23+0000\n"
+"X-Generator: Launchpad (build 16856)\n"
+
+#. module: portal_anonymous
+#. openerp-web
+#: code:addons/portal_anonymous/static/src/xml/portal_anonymous.xml:8
+#, python-format
+msgid "Login"
+msgstr "Kirjautuminen"
--- a/addons/portal_anonymous/static/src/js/portal_anonymous.js
+++ b/addons/portal_anonymous/static/src/js/portal_anonymous.js
@ -71,7 +71,7 @@ openerp.portal_anonymous = function(instance) {
            this.$el.find('a.login').click(function() {
                var p = self.getParent();
                var am = p.action_manager;
-                p.$el.find('.oe_leftbar, .oe_topbar').hide();
+                p.$el.find('.oe_leftbar, .navbar').hide(); // .oe_topbar is replaced with .navbar of bootstrap3 
                self.session.session_logout().done(function () {
                    am.do_action({
                        type:'ir.actions.client',
--- a/addons/portal_claim/i18n/fi.po
+++ b/addons/portal_claim/i18n/fi.po
@ -0,0 +1,36 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-01 22:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-02 05:23+0000\n"
+"X-Generator: Launchpad (build 16856)\n"
+
+#. module: portal_claim
+#: model:ir.actions.act_window,help:portal_claim.crm_case_categ_claim0
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a new claim. \n"
+"              </p><p>\n"
+"                You can track your claims from this menu and the action we\n"
+"                will take.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: portal_claim
+#: model:ir.actions.act_window,name:portal_claim.crm_case_categ_claim0
+#: model:ir.ui.menu,name:portal_claim.portal_after_sales_claims
+msgid "Claims"
+msgstr "Reklamaatiot"
--- a/addons/portal_crm/i18n/fi.po
+++ b/addons/portal_crm/i18n/fi.po
@ -0,0 +1,548 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-12-01 22:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-02 05:23+0000\n"
+"X-Generator: Launchpad (build 16856)\n"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Lead"
+msgstr "Liidi"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,title:0
+msgid "Title"
+msgstr "Titteli"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,probability:0
+msgid "Success Rate (%)"
+msgstr "Onnistumistodennäköisyys (%)"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact us"
+msgstr "Ota yhteyttä"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action:0
+msgid "Next Action Date"
+msgstr "Seuraava toimenpidepäivä"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,fax:0
+msgid "Fax"
+msgstr "Faksi"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,zip:0
+msgid "Zip"
+msgstr "Postinumero"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_unread:0
+msgid "Unread Messages"
+msgstr "Lukemattomia viestejä"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_id:0
+msgid "Company"
+msgstr "Yritys"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you for your interest, we'll respond to your request shortly."
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Highest"
+msgstr "Korkein"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,mobile:0
+msgid "Mobile"
+msgstr "Matkapuhelin"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,description:0
+msgid "Notes"
+msgstr "Muistiinpanot"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages"
+msgstr "Viestit"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,color:0
+msgid "Color Index"
+msgstr "Väri-indeksi"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_latitude:0
+msgid "Geo Latitude"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_name:0
+msgid "Customer Name"
+msgstr "Asiakkaan nimi"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Cancelled"
+msgstr "Peruttu"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Jos valittu, uudet viestit vaativat huomiosi."
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,channel_id:0
+msgid "Communication channel (mail, direct, phone, ...)"
+msgstr "Kommunikointikanava (sähköposti, suora, puhelin,...)"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type_id:0
+msgid "Campaign"
+msgstr "Kampanja"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref:0
+msgid "Reference"
+msgstr "Viite"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_next:0
+#: field:portal_crm.crm_contact_us,title_action:0
+msgid "Next Action"
+msgstr "Seuraava toimenpide"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+"Sisältää viestien yhteenvedon (viestien määrän,...). Tämä yhteenveto on "
+"valmiiksi  html-muodossa, jotta se voidaan viedä kanban näkymään."
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_id:0
+msgid "Partner"
+msgstr "Kumppani"
+
+#. module: portal_crm
+#: model:ir.actions.act_window,name:portal_crm.action_contact_us
+msgid "Contact Us"
+msgstr "Ota yhteyttä"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,name:0
+msgid "Subject"
+msgstr "Aihe"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,opt_out:0
+msgid "Opt-Out"
+msgstr "Jätä pois"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,priority:0
+msgid "Priority"
+msgstr "Tärkeys"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state_id:0
+msgid "State"
+msgstr "Valtio"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_follower_ids:0
+msgid "Followers"
+msgstr "Seuraajat"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_id:0
+msgid "Linked partner (optional). Usually created when converting the lead."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,payment_mode:0
+msgid "Payment Mode"
+msgstr "Maksutapa"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "New"
+msgstr "Uusi"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type:0
+msgid "Type"
+msgstr "Tyyppi"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_from:0
+msgid "Email"
+msgstr "Sähköposti"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,channel_id:0
+msgid "Channel"
+msgstr "Kanava"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Name"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Lowest"
+msgstr "Alin"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,create_date:0
+msgid "Creation Date"
+msgstr "Luontipäivä"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Close"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "Tyyppiä käytetään erottamaan liidit ja mahdollisuudet toisistaan"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,categ_ids:0
+msgid "Categories"
+msgstr "Kategoriat"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,stage_id:0
+msgid "Stage"
+msgstr "Vaihe"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_login:0
+msgid "User Login"
+msgstr "Käyttäjätunnus"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,opt_out:0
+msgid ""
+"If opt-out is checked, this contact has refused to receive emails or "
+"unsubscribed to a campaign."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,contact_name:0
+msgid "Contact Name"
+msgstr "Yhteystiedon nimi"
+
+#. module: portal_crm
+#: model:ir.ui.menu,name:portal_crm.portal_company_contact
+msgid "Contact"
+msgstr "Kontakti"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "Kumppanin yhteystieto, sähköposti"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_revenue:0
+msgid "Expected Revenue"
+msgstr "Odotetut tulot"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,task_ids:0
+msgid "Tasks"
+msgstr "Tehtävät"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact form"
+msgstr "Yhteydenottolomake"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_currency:0
+msgid "Currency"
+msgstr "Valuutta"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,write_date:0
+msgid "Update Date"
+msgstr "Päivityksen ajankohta"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_deadline:0
+msgid "Expected Closing"
+msgstr "Odotettu päätös"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref2:0
+msgid "Reference 2"
+msgstr "Viittaus 2"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_email:0
+msgid "User Email"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_open:0
+msgid "Opened"
+msgstr "Avattu"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "In Progress"
+msgstr "Kesken"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_name:0
+msgid ""
+"The name of the future partner company that will be created while converting "
+"the lead into opportunity"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_cost:0
+msgid "Planned Costs"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,date_deadline:0
+msgid "Estimate of the date on which the opportunity will be won."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_closed:0
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_assign:0
+msgid "Assignation Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state:0
+msgid "Status"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_cc:0
+msgid "Global CC"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street2:0
+msgid "Street2"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,id:0
+msgid "ID"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,active:0
+msgid "Active"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_id:0
+msgid "Salesperson"
+msgstr "Myyjä"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_ids:0
+msgid "Companies"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,section_id:0
+msgid ""
+"When sending mails, the default email address is taken from the sales team."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_name:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_longitude:0
+msgid "Geo Longitude"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,city:0
+msgid "City"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Submit"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,function:0
+msgid "Function"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,referred:0
+msgid "Referred By"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Opportunity"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,state:0
+msgid ""
+"The Status is set to 'Draft', when a case is created. If the case is in "
+"progress the Status is set to 'Open'. When the case is over, the Status is "
+"set to 'Done'. If the case needs to be reviewed then the Status is  set to "
+"'Pending'."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type_id:0
+msgid ""
+"From which campaign (seminar, marketing campaign, mass mailing, ...) did "
+"this contact come from?"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "High"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street:0
+msgid "Street"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.model,name:portal_crm.model_portal_crm_crm_contact_us
+msgid "Contact form for the portal"
+msgstr ""
--- a/addons/product/i18n/am.po
+++ b/addons/product/i18n/am.po
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@ -260,9 +260,7 @@
                                    </div>
                                    <div class="oe_kanban_project_list">
                                        <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action" style="margin-right: 10px">
-                                            <t t-raw="record.task_ids.raw_value.length"/>
-                                            <span t-if="record.task_ids.raw_value.length == 1">Task</span>
-                                            <span t-if="record.task_ids.raw_value.length > 1">Tasks</span>
+                                            <t t-raw="record.task_ids.raw_value.length"/> Tasks
                                        </a>
                                    </div>
                                    <div class="oe_kanban_project_list">
@ -370,7 +368,8 @@
            <field name="arch" type="xml">
                <form string="Project" version="7.0">
                    <header>
-                        <field name="stage_id" widget="statusbar" clickable="True"/>
+                        <field name="stage_id" widget="statusbar" clickable="True"
+                            options="{'fold_field': 'fold'}"/>
                    </header>
                    <sheet string="Task">
                    <h1>
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@ -48,7 +48,8 @@
            <field name="arch" type="xml">
                <form string="Issue" version="7.0">
                <header>
-                    <field name="stage_id" widget="statusbar" clickable="True"/>
+                    <field name="stage_id" widget="statusbar" clickable="True"
+                        options="{'fold_field': 'fold'}"/>
                </header>
                <sheet string="Issue">
                    <label for="name" class="oe_edit_only"/>
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@ -860,6 +860,14 @@ class purchase_order_line(osv.osv):
            res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
        return res

+    def _get_uom_id(self, cr, uid, context=None):
+        try:
+            proxy = self.pool.get('ir.model.data')
+            result = proxy.get_object_reference(cr, uid, 'product', 'product_uom_unit')
+            return result[1]
+        except Exception, ex:
+            return False
+
    _columns = {
        'name': fields.text('Description', required=True),
        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
@ -886,6 +894,7 @@ class purchase_order_line(osv.osv):

    }
    _defaults = {
+        'product_uom' : _get_uom_id,
        'product_qty': lambda *a: 1.0,
        'state': lambda *args: 'draft',
        'invoiced': lambda *a: 0,
@ -1289,8 +1298,8 @@ class account_invoice(osv.Model):
        else:
            user_id = uid
        po_ids = purchase_order_obj.search(cr, user_id, [('invoice_ids', 'in', ids)], context=context)
-        if po_ids:
-            purchase_order_obj.message_post(cr, user_id, po_ids, body=_("Invoice paid"), context=context)
+        for po_id in po_ids:
+            purchase_order_obj.message_post(cr, user_id, po_id, body=_("Invoice paid"), context=context)
        return res

 class account_invoice_line(osv.Model):
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@ -199,7 +199,7 @@
                        </group>
                        <group>
                            <field name="date_order"/>
-                            <field name="origin" attr="{'invisible': [('origin','=',False)]}"/>
+                            <field name="origin" attrs="{'invisible': [('origin','=',False)]}"/>
                            <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection" groups="stock.group_locations"/>
                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                        </group>
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@ -61,7 +61,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
            else:
                pay_term = False
            inv = {
-                'name': order.name,
+                'name': order.client_order_ref or '',
                'origin': order.name,
                'type': 'out_invoice',
                'reference': "P%dSO%d" % (order.partner_id.id, order.id),
--- a/addons/sale_stock/res_config.py
+++ b/addons/sale_stock/res_config.py
@ -19,6 +19,8 @@
 #
 ##############################################################################

+import openerp
+from openerp import SUPERUSER_ID
 from openerp.osv import fields, osv
 from openerp.tools.translate import _

@ -72,12 +74,13 @@ class sale_configuration(osv.osv_memory):
        }

    def set_sale_defaults(self, cr, uid, ids, context=None):
+        if uid != SUPERUSER_ID and not self.pool['res.users'].has_group(cr, uid, 'base.group_erp_manager'):
+            raise openerp.exceptions.AccessError(_("Only administrators can change the settings"))
        ir_values = self.pool.get('ir.values')
-        ir_model_data = self.pool.get('ir.model.data')
        wizard = self.browse(cr, uid, ids)[0]

        default_picking_policy = 'one' if wizard.default_picking_policy else 'direct'
-        ir_values.set_default(cr, uid, 'sale.order', 'picking_policy', default_picking_policy)
+        ir_values.set_default(cr, SUPERUSER_ID, 'sale.order', 'picking_policy', default_picking_policy)
        res = super(sale_configuration, self).set_sale_defaults(cr, uid, ids, context)
        return res
    
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@ -604,7 +604,7 @@ class sale_order_line(osv.osv):
        #check if product is available, and if not: raise an error
        uom2 = False
        if uom:
-            uom2 = product_uom_obj.browse(cr, uid, uom)
+            uom2 = product_uom_obj.browse(cr, uid, uom, context=context)
            if product_obj.uom_id.category_id.id != uom2.category_id.id:
                uom = False
        if not uom2:
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@ -1361,9 +1361,9 @@ class stock_picking(osv.osv):
                self.action_move(cr, uid, [new_picking], context=context)
                self.signal_button_done(cr, uid, [new_picking])
                workflow.trg_write(uid, 'stock.picking', pick.id, cr)
-                delivered_pack_id = new_picking
+                delivered_pack_id = pick.id
                back_order_name = self.browse(cr, uid, delivered_pack_id, context=context).name
-                self.message_post(cr, uid, ids, body=_("Back order <em>%s</em> has been <b>created</b>.") % (back_order_name), context=context)
+                self.message_post(cr, uid, new_picking, body=_("Back order <em>%s</em> has been <b>created</b>.") % (back_order_name), context=context)
            else:
                self.action_move(cr, uid, [pick.id], context=context)
                self.signal_button_done(cr, uid, [pick.id])
--- a/addons/survey/static/src/css/survey.css
+++ b/addons/survey/static/src/css/survey.css
@ -6,6 +6,8 @@
 }

 .openerp .oe_kanban_survey {
-    width: 200px;
-
+    /* Customize height and width according bootstrap3 */
+    width: 212px;
+    min-height: 86px !important;
+    /* End of customize */
 }