From: Christophe Simonis <chs@odoo.com>
Date: Wed, 1 Oct 2014 17:18:14 +0000 (+0200)
Subject: [MERGE] forward port of branch 8.0 up to e883193
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=709c9868de7c4ac4985ed4e0055ae3e3e49742ad;p=odoo%2Fodoo.git

[MERGE] forward port of branch 8.0 up to e883193
---

709c9868de7c4ac4985ed4e0055ae3e3e49742ad
diff --cc README.md
index 96cf28b,05642de..a155586
--- a/README.md
+++ b/README.md
@@@ -33,11 -33,13 +33,13 @@@ Packages, tarballs and installer
          $ sudo apt-get update
          $ sudo apt-get install odoo
  
- * <a href="http://nightly.odoo.com/">Source tarballs</a>
+     If you plan to use Odoo with a local database, please make sure to install PostgreSQL *before* installing the Odoo Debian package.
  
- * <a href="http://nightly.odoo.com/">Windows installer</a>
 -* <a href="http://nightly.odoo.com/8.0/nightly/src/">Source tarballs</a>
++* <a href="http://nightly.odoo.com/master/nightly/src/">Source tarballs</a>
  
- * <a href="http://nightly.odoo.com/">RPM package</a>
 -* <a href="http://nightly.odoo.com/8.0/nightly/exe/">Windows installer</a>
++* <a href="http://nightly.odoo.com/master/nightly/exe/">Windows installer</a>
+ 
 -* <a href="http://nightly.odoo.com/8.0/nightly/rpm/">RPM package</a>
++* <a href="http://nightly.odoo.com/master/nightly/rpm/">RPM package</a>
  
  
  For Odoo employees
diff --cc addons/analytic/models/analytic.py
index 4661a3f,0000000..6d01a68
mode 100644,000000..100644
--- a/addons/analytic/models/analytic.py
+++ b/addons/analytic/models/analytic.py
@@@ -1,377 -1,0 +1,378 @@@
 +# -*- coding: utf-8 -*-
 +##############################################################################
 +#
 +#    OpenERP, Open Source Management Solution
 +#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 +#
 +#    This program is free software: you can redistribute it and/or modify
 +#    it under the terms of the GNU Affero General Public License as
 +#    published by the Free Software Foundation, either version 3 of the
 +#    License, or (at your option) any later version.
 +#
 +#    This program is distributed in the hope that it will be useful,
 +#    but WITHOUT ANY WARRANTY; without even the implied warranty of
 +#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +#    GNU Affero General Public License for more details.
 +#
 +#    You should have received a copy of the GNU Affero General Public License
 +#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +#
 +##############################################################################
 +
 +import time
 +from datetime import datetime
 +
 +from openerp.osv import fields, osv
 +from openerp import tools
 +from openerp.tools.translate import _
 +import openerp.addons.decimal_precision as dp
 +
 +class account_analytic_account(osv.osv):
 +    _name = 'account.analytic.account'
 +    _inherit = ['mail.thread']
 +    _description = 'Analytic Account'
 +    _track = {
 +        'state': {
 +            'analytic.mt_account_pending': lambda self, cr, uid, obj, ctx=None: obj.state == 'pending',
 +            'analytic.mt_account_closed': lambda self, cr, uid, obj, ctx=None: obj.state == 'close',
 +            'analytic.mt_account_opened': lambda self, cr, uid, obj, ctx=None: obj.state == 'open',
 +        },
 +    }
 +
 +    def _compute_level_tree(self, cr, uid, ids, child_ids, res, field_names, context=None):
 +        currency_obj = self.pool.get('res.currency')
 +        recres = {}
 +        def recursive_computation(account):
 +            result2 = res[account.id].copy()
 +            for son in account.child_ids:
 +                result = recursive_computation(son)
 +                for field in field_names:
 +                    if (account.currency_id.id != son.currency_id.id) and (field!='quantity'):
 +                        result[field] = currency_obj.compute(cr, uid, son.currency_id.id, account.currency_id.id, result[field], context=context)
 +                    result2[field] += result[field]
 +            return result2
 +        for account in self.browse(cr, uid, ids, context=context):
 +            if account.id not in child_ids:
 +                continue
 +            recres[account.id] = recursive_computation(account)
 +        return recres
 +
 +    def _debit_credit_bal_qtty(self, cr, uid, ids, fields, arg, context=None):
 +        res = {}
 +        if context is None:
 +            context = {}
 +        child_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
 +        for i in child_ids:
 +            res[i] =  {}
 +            for n in fields:
 +                res[i][n] = 0.0
 +
 +        if not child_ids:
 +            return res
 +
 +        where_date = ''
 +        where_clause_args = [tuple(child_ids)]
 +        if context.get('from_date', False):
 +            where_date += " AND l.date >= %s"
 +            where_clause_args  += [context['from_date']]
 +        if context.get('to_date', False):
 +            where_date += " AND l.date <= %s"
 +            where_clause_args += [context['to_date']]
 +        cr.execute("""
 +              SELECT a.id,
 +                     sum(
 +                         CASE WHEN l.amount > 0
 +                         THEN l.amount
 +                         ELSE 0.0
 +                         END
 +                          ) as debit,
 +                     sum(
 +                         CASE WHEN l.amount < 0
 +                         THEN -l.amount
 +                         ELSE 0.0
 +                         END
 +                          ) as credit,
 +                     COALESCE(SUM(l.amount),0) AS balance,
 +                     COALESCE(SUM(l.unit_amount),0) AS quantity
 +              FROM account_analytic_account a
 +                  LEFT JOIN account_analytic_line l ON (a.id = l.account_id)
 +              WHERE a.id IN %s
 +              """ + where_date + """
 +              GROUP BY a.id""", where_clause_args)
 +        for row in cr.dictfetchall():
 +            res[row['id']] = {}
 +            for field in fields:
 +                res[row['id']][field] = row[field]
 +        return self._compute_level_tree(cr, uid, ids, child_ids, res, fields, context)
 +
 +    def name_get(self, cr, uid, ids, context=None):
 +        res = []
 +        if not ids:
 +            return res
 +        if isinstance(ids, (int, long)):
 +            ids = [ids]
 +        for id in ids:
 +            elmt = self.browse(cr, uid, id, context=context)
 +            res.append((id, self._get_one_full_name(elmt)))
 +        return res
 +
 +    def _get_full_name(self, cr, uid, ids, name=None, args=None, context=None):
 +        if context == None:
 +            context = {}
 +        res = {}
 +        for elmt in self.browse(cr, uid, ids, context=context):
 +            res[elmt.id] = self._get_one_full_name(elmt)
 +        return res
 +
 +    def _get_one_full_name(self, elmt, level=6):
 +        if level<=0:
 +            return '...'
 +        if elmt.parent_id and not elmt.type == 'template':
 +            parent_path = self._get_one_full_name(elmt.parent_id, level-1) + " / "
 +        else:
 +            parent_path = ''
 +        return parent_path + elmt.name
 +
 +    def _child_compute(self, cr, uid, ids, name, arg, context=None):
 +        result = {}
 +        if context is None:
 +            context = {}
 +
 +        for account in self.browse(cr, uid, ids, context=context):
 +            result[account.id] = map(lambda x: x.id, [child for child in account.child_ids if child.state != 'template'])
 +
 +        return result
 +
 +    def _get_analytic_account(self, cr, uid, ids, context=None):
 +        company_obj = self.pool.get('res.company')
 +        analytic_obj = self.pool.get('account.analytic.account')
 +        accounts = []
 +        for company in company_obj.browse(cr, uid, ids, context=context):
 +            accounts += analytic_obj.search(cr, uid, [('company_id', '=', company.id)])
 +        return accounts
 +
 +    def _set_company_currency(self, cr, uid, ids, name, value, arg, context=None):
 +        if isinstance(ids, (int, long)):
 +            ids=[ids]
 +        for account in self.browse(cr, uid, ids, context=context):
 +            if account.company_id:
 +                if account.company_id.currency_id.id != value:
 +                    raise osv.except_osv(_('Error!'), _("If you set a company, the currency selected has to be the same as it's currency. \nYou can remove the company belonging, and thus change the currency, only on analytic account of type 'view'. This can be really useful for consolidation purposes of several companies charts with different currencies, for example."))
 +        if value:
 +            cr.execute("""update account_analytic_account set currency_id=%s where id=%s""", (value, account.id))
 +            self.invalidate_cache(cr, uid, ['currency_id'], [account.id], context=context)
 +
 +    def _currency(self, cr, uid, ids, field_name, arg, context=None):
 +        result = {}
 +        for rec in self.browse(cr, uid, ids, context=context):
 +            if rec.company_id:
 +                result[rec.id] = rec.company_id.currency_id.id
 +            else:
 +                result[rec.id] = rec.currency_id.id
 +        return result
 +
 +    _columns = {
 +        'name': fields.char('Account/Contract Name', required=True, track_visibility='onchange'),
 +        'complete_name': fields.function(_get_full_name, type='char', string='Full Name'),
 +        'code': fields.char('Reference', select=True, track_visibility='onchange', copy=False),
 +        'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Contract')], 'Type of Account', required=True,
 +                                 help="If you select the View Type, it means you won\'t allow to create journal entries using that account.\n"\
 +                                  "The type 'Analytic account' stands for usual accounts that you only want to use in accounting.\n"\
 +                                  "If you select Contract or Project, it offers you the possibility to manage the validity and the invoicing options for this account.\n"\
 +                                  "The special type 'Template of Contract' allows you to define a template with default data that you can reuse easily."),
 +        'template_id': fields.many2one('account.analytic.account', 'Template of Contract'),
 +        'description': fields.text('Description'),
 +        'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2),
 +        'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts'),
 +        'child_complete_ids': fields.function(_child_compute, relation='account.analytic.account', string="Account Hierarchy", type='many2many'),
 +        'line_ids': fields.one2many('account.analytic.line', 'account_id', 'Analytic Entries'),
 +        'balance': fields.function(_debit_credit_bal_qtty, type='float', string='Balance', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
 +        'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
 +        'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
 +        'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
 +        'quantity_max': fields.float('Prepaid Service Units', help='Sets the higher limit of time to work on the contract, based on the timesheet. (for instance, number of hours in a limited support contract.)'),
 +        'partner_id': fields.many2one('res.partner', 'Customer'),
 +        'user_id': fields.many2one('res.users', 'Project Manager', track_visibility='onchange'),
 +        'manager_id': fields.many2one('res.users', 'Account Manager', track_visibility='onchange'),
 +        'date_start': fields.date('Start Date'),
 +        'date': fields.date('Expiration Date', select=True, track_visibility='onchange'),
 +        'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
 +        'state': fields.selection([('template', 'Template'),
 +                                   ('draft','New'),
 +                                   ('open','In Progress'),
 +                                   ('pending','To Renew'),
 +                                   ('close','Closed'),
 +                                   ('cancelled', 'Cancelled')],
 +                                  'Status', required=True,
 +                                  track_visibility='onchange', copy=False),
 +        'currency_id': fields.function(_currency, fnct_inv=_set_company_currency, #the currency_id field is readonly except if it's a view account and if there is no company
 +            store = {
 +                'res.company': (_get_analytic_account, ['currency_id'], 10),
 +            }, string='Currency', type='many2one', relation='res.currency'),
 +    }
 +
 +    def on_change_template(self, cr, uid, ids, template_id, date_start=False, context=None):
 +        if not template_id:
 +            return {}
 +        res = {'value':{}}
 +        template = self.browse(cr, uid, template_id, context=context)
 +        if template.date_start and template.date:
 +            from_dt = datetime.strptime(template.date_start, tools.DEFAULT_SERVER_DATE_FORMAT)
 +            to_dt = datetime.strptime(template.date, tools.DEFAULT_SERVER_DATE_FORMAT)
 +            timedelta = to_dt - from_dt
 +            res['value']['date'] = datetime.strftime(datetime.now() + timedelta, tools.DEFAULT_SERVER_DATE_FORMAT)
 +        if not date_start:
 +            res['value']['date_start'] = fields.date.today()
 +        res['value']['quantity_max'] = template.quantity_max
 +        res['value']['parent_id'] = template.parent_id and template.parent_id.id or False
 +        res['value']['description'] = template.description
 +        return res
 +
 +    def on_change_partner_id(self, cr, uid, ids,partner_id, name, context=None):
 +        res={}
 +        if partner_id:
 +            partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
 +            if partner.user_id:
 +                res['manager_id'] = partner.user_id.id
 +            if not name:
 +                res['name'] = _('Contract: ') + partner.name
 +        return {'value': res}
 +
 +    def _default_company(self, cr, uid, context=None):
 +        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
 +        if user.company_id:
 +            return user.company_id.id
 +        return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
 +
 +    def _get_default_currency(self, cr, uid, context=None):
 +        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
 +        return user.company_id.currency_id.id
 +
 +    _defaults = {
 +        'type': 'normal',
 +        'company_id': _default_company,
 +        'code' : lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'account.analytic.account'),
 +        'state': 'open',
 +        'user_id': lambda self, cr, uid, ctx: uid,
 +        'partner_id': lambda self, cr, uid, ctx: ctx.get('partner_id', False),
++        'manager_id': lambda self, cr, uid, ctx: ctx.get('manager_id', False),
 +        'date_start': lambda *a: time.strftime('%Y-%m-%d'),
 +        'currency_id': _get_default_currency,
 +    }
 +
 +    def check_recursion(self, cr, uid, ids, context=None, parent=None):
 +        return super(account_analytic_account, self)._check_recursion(cr, uid, ids, context=context, parent=parent)
 +
 +    _order = 'code, name asc'
 +    _constraints = [
 +        (check_recursion, 'Error! You cannot create recursive analytic accounts.', ['parent_id']),
 +    ]
 +
 +    def name_create(self, cr, uid, name, context=None):
 +        raise osv.except_osv(_('Warning'), _("Quick account creation disallowed."))
 +
 +    def copy(self, cr, uid, id, default=None, context=None):
 +        if not default:
 +            default = {}
 +        analytic = self.browse(cr, uid, id, context=context)
 +        default['name'] = _("%s (copy)") % analytic['name']
 +        return super(account_analytic_account, self).copy(cr, uid, id, default, context=context)
 +
 +    def on_change_company(self, cr, uid, id, company_id):
 +        if not company_id:
 +            return {}
 +        currency = self.pool.get('res.company').read(cr, uid, [company_id], ['currency_id'])[0]['currency_id']
 +        return {'value': {'currency_id': currency}}
 +
 +    def on_change_parent(self, cr, uid, id, parent_id):
 +        if not parent_id:
 +            return {}
 +        parent = self.read(cr, uid, [parent_id], ['partner_id','code'])[0]
 +        if parent['partner_id']:
 +            partner = parent['partner_id'][0]
 +        else:
 +            partner = False
 +        res = {'value': {}}
 +        if partner:
 +            res['value']['partner_id'] = partner
 +        return res
 +
 +    def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
 +        if not args:
 +            args=[]
 +        if context is None:
 +            context={}
 +        if name:
 +            account_ids = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context)
 +            if not account_ids:
 +                dom = []
 +                for name2 in name.split('/'):
 +                    name = name2.strip()
 +                    account_ids = self.search(cr, uid, dom + [('name', operator, name)] + args, limit=limit, context=context)
 +                    if not account_ids: break
 +                    dom = [('parent_id','in',account_ids)]
 +        else:
 +            account_ids = self.search(cr, uid, args, limit=limit, context=context)
 +        return self.name_get(cr, uid, account_ids, context=context)
 +
 +class account_analytic_line(osv.osv):
 +    _name = 'account.analytic.line'
 +    _description = 'Analytic Line'
 +
 +    _columns = {
 +        'name': fields.char('Description', required=True),
 +        'date': fields.date('Date', required=True, select=True),
 +        'amount': fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price. Always expressed in the company main currency.', digits_compute=dp.get_precision('Account')),
 +        'unit_amount': fields.float('Quantity', help='Specifies the amount of quantity to count.'),
 +        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='restrict', select=True, domain=[('type','<>','view')]),
 +        'user_id': fields.many2one('res.users', 'User'),
 +        'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
 +        'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', select=True),
 +
 +    }
 +
 +    def _get_default_date(self, cr, uid, context=None):
 +        return fields.date.context_today(self, cr, uid, context=context)
 +
 +    def __get_default_date(self, cr, uid, context=None):
 +        return self._get_default_date(cr, uid, context=context)
 +
 +    _defaults = {
 +        'date': __get_default_date,
 +        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
 +        'amount': 0.00
 +    }
 +
 +    _order = 'date desc'
 +
 +    def _check_no_view(self, cr, uid, ids, context=None):
 +        analytic_lines = self.browse(cr, uid, ids, context=context)
 +        for line in analytic_lines:
 +            if line.account_id.type == 'view':
 +                return False
 +        return True
 +
 +    _constraints = [
 +        (_check_no_view, 'You cannot create analytic line on view account.', ['account_id']),
 +    ]
 +
 +
 +class account_analytic_journal(osv.osv):
 +    _name = 'account.analytic.journal'
 +    _description = 'Analytic Journal'
 +    _columns = {
 +        'name': fields.char('Journal Name', required=True),
 +        'code': fields.char('Journal Code', size=8),
 +        'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the analytic journal without removing it."),
 +        'type': fields.selection(
 +            [('sale', 'Sale'), ('purchase', 'Purchase'), ('cash', 'Cash'),
 +             ('general', 'General'), ('situation', 'Situation')],
 +            'Type', required=True, help="Gives the type of the analytic journal. When it needs for a document (eg: an invoice) to create analytic entries, Odoo will look for a matching journal of the same type."),
 +        'line_ids': fields.one2many('account.analytic.line', 'journal_id', 'Lines'),
 +        'company_id': fields.many2one('res.company', 'Company', required=True),
 +    }
 +    _defaults = {
 +        'active': True,
 +        'type': 'general',
 +        'company_id': lambda self, cr, uid, c=None: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
 +    }
diff --cc addons/mail/mail_mail.py
index c741953,f474a07..5de69fb
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@@ -276,6 -274,12 +276,15 @@@ class mail_mail(osv.Model)
                      except Exception:
                          pass
  
+                 # Writing on the mail object may fail (e.g. lock on user) which
+                 # would trigger a rollback *after* actually sending the email.
+                 # To avoid sending twice the same email, provoke the failure earlier
 -                mail.write({'state': 'exception'})
++                mail.write({
++                    'state': 'exception', 
++                    'failure_reason': _('Error without exception. Probably due do sending an email without computed recipients.'),
++                })
+                 mail_sent = False
+ 
                  # build an RFC2822 email.message.Message object and send it without queuing
                  res = None
                  for email in email_list:
@@@ -299,11 -303,8 +308,8 @@@
                                                      context=context)
  
                  if res:
--                    mail.write({'state': 'sent', 'message_id': res})
++                    mail.write({'state': 'sent', 'message_id': res, 'failure_reason': False})
                      mail_sent = True
-                 else:
-                     mail.write({'state': 'exception', 'failure_reason': _('Error without exception. Probably due do sending an email without computed recipients.')})
-                     mail_sent = False
  
                  # /!\ can't use mail.state here, as mail.refresh() will cause an error
                  # see revid:odo@openerp.com-20120622152536-42b2s28lvdv3odyr in 6.1
diff --cc addons/mrp/mrp_view.xml
index 46fea66,c43df1f..b9e5aaf
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@@ -391,14 -376,13 +391,13 @@@
                                  <tree string="Components" editable="bottom">
                                      <field name="sequence" widget="handle"/>
                                      <field name="product_id" on_change="onchange_product_id(product_id, product_qty)"/>
 -                                    <field name="type"/>
 +                                    <field name="type" groups="mrp.group_route_line_type"/>
                                      <field name="product_qty"/>
+                                     <field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
 -                                    <field name="product_rounding"/>
 -                                    <field name="product_efficiency"/>
 +                                    <field name="product_rounding" groups="mrp.group_rounding_efficiency"/>
 +                                    <field name="product_efficiency" groups="mrp.group_rounding_efficiency"/>
-                                     <field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
                                      <field name="date_start"/>
                                      <field name="date_stop"/>
-                                     <field name="routing_id" groups="mrp.group_mrp_routings,mrp.group_route_line_type"/>
                                      <field name="attribute_value_ids" widget="many2many_tags"/>
                                  </tree>
                              </field>
diff --cc addons/sale/sale.py
index e00b71d,e50346e..7fed56a
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@@ -242,10 -241,11 +242,11 @@@ class sale_order(osv.osv)
          'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
          'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
          'company_id': fields.many2one('res.company', 'Company'),
 -        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
 +        'section_id': fields.many2one('crm.case.section', 'Sales Team', change_default=True),
          'procurement_group_id': fields.many2one('procurement.group', 'Procurement group', copy=False),
- 
+         'product_id': fields.related('order_line', 'product_id', type='many2one', relation='product.product', string='Product'),
      }
+ 
      _defaults = {
          'date_order': fields.datetime.now,
          'order_policy': 'manual',
diff --cc addons/website/controllers/main.py
index 5e3cc68,c808141..db6b405
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@@ -293,45 -315,43 +292,48 @@@ class Website(openerp.addons.web.contro
          return True
  
      @http.route('/website/attach', type='http', auth='user', methods=['POST'], website=True)
-     def attach(self, func, upload=None, url=None):
+     def attach(self, func, upload=None, url=None, disable_optimization=None):
 -        Attachments = request.registry['ir.attachment']
 -
 -        website_url = message = None
 -        if not upload:
 -            website_url = url
 -            name = url.split("/").pop()
 +        # the upload argument doesn't allow us to access the files if more than
 +        # one file is uploaded, as upload references the first file
 +        # therefore we have to recover the files from the request object
 +        Attachments = request.registry['ir.attachment']  # registry for the attachment table
 +
 +        uploads = []
 +        message = None
 +        if not upload: # no image provided, storing the link and the image name
 +            uploads.append({'website_url': url})
 +            name = url.split("/").pop()                       # recover filename
              attachment_id = Attachments.create(request.cr, request.uid, {
                  'name':name,
                  'type': 'url',
                  'url': url,
                  'res_model': 'ir.ui.view',
              }, request.context)
 -        else:
 +        else:                                                  # images provided
              try:
 -                image_data = upload.read()
 -                image = Image.open(cStringIO.StringIO(image_data))
 -                w, h = image.size
 -                if w*h > 42e6: # Nokia Lumia 1020 photo resolution
 -                    raise ValueError(
 -                        u"Image size excessive, uploaded images must be smaller "
 -                        u"than 42 million pixel")
 -
 +                for c_file in request.httprequest.files.getlist('upload'):
 +                    image_data = c_file.read()
 +                    image = Image.open(cStringIO.StringIO(image_data))
 +                    w, h = image.size
 +                    if w*h > 42e6: # Nokia Lumia 1020 photo resolution
 +                        raise ValueError(
 +                            u"Image size excessive, uploaded images must be smaller "
 +                            u"than 42 million pixel")
 +    
+                 if not disable_optimization and image.format in ('PNG', 'JPEG'):
+                     image_data = image_save_for_web(image)
+ 
 -                attachment_id = Attachments.create(request.cr, request.uid, {
 -                    'name': upload.filename,
 -                    'datas': image_data.encode('base64'),
 -                    'datas_fname': upload.filename,
 -                    'res_model': 'ir.ui.view',
 -                }, request.context)
 -
 -                [attachment] = Attachments.read(
 -                    request.cr, request.uid, [attachment_id], ['website_url'],
 -                    context=request.context)
 -                website_url = attachment['website_url']
 +                    attachment_id = Attachments.create(request.cr, request.uid, {
 +                        'name': c_file.filename,
 +                        'datas': image_data.encode('base64'),
 +                        'datas_fname': c_file.filename,
 +                        'res_model': 'ir.ui.view',
 +                    }, request.context)
 +    
 +                    [attachment] = Attachments.read(
 +                        request.cr, request.uid, [attachment_id], ['website_url'],
 +                        context=request.context)
 +                    uploads.append(attachment)
              except Exception, e:
                  logger.exception("Failed to upload image to attachment")
                  message = unicode(e)
@@@ -450,25 -416,14 +452,28 @@@
  
          The requested field is assumed to be base64-encoded image data in
          all cases.
 +
 +        xmlid can be used to load the image. But the field image must by base64-encoded
          """
 +        if xmlid and "." in xmlid:
 +            xmlid = xmlid.split(".", 1)
 +            try:
 +                model, id = request.registry['ir.model.data'].get_object_reference(request.cr, request.uid, xmlid[0], xmlid[1])
 +            except:
 +                raise werkzeug.exceptions.NotFound()
 +            if model == 'ir.attachment':
 +                field = "datas"
 +
 +        if not model or not id or not field:
 +            raise werkzeug.exceptions.NotFound()
 +
          try:
+             idsha = id.split('_')
+             id = idsha[0]
              response = werkzeug.wrappers.Response()
              return request.registry['website']._image(
-                 request.cr, request.uid, model, id, field, response, max_width, max_height)
+                 request.cr, request.uid, model, id, field, response, max_width, max_height,
+                 cache=STATIC_CACHE if len(idsha) > 1 else None)
          except Exception:
              logger.exception("Cannot render image field %r of record %s[%s] at size(%s,%s)",
                               field, model, id, max_width, max_height)
diff --cc addons/website/models/website.py
index a93f0ff,b9db8bb..dab91bd
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@@ -25,11 -25,9 +25,10 @@@ except ImportError
  
  import openerp
  from openerp.osv import orm, osv, fields
- from openerp.tools import html_escape as escape
- from openerp.tools import ustr as ustr
+ from openerp.tools import html_escape as escape, ustr, image_resize_and_sharpen, image_save_for_web
  from openerp.tools.safe_eval import safe_eval
  from openerp.addons.web.http import request
 +from werkzeug.exceptions import NotFound
  
  logger = logging.getLogger(__name__)
  
diff --cc addons/website/static/src/xml/website.editor.xml
index 607759c,13b80b1..c413c54
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@@ -203,8 -203,18 +203,18 @@@
                    class="form-inline">
                  <div class="well">
                      <div class="form-group pull-left">
 -                        <input type="file" name="upload" accept="image/*" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
 +                        <input type="file" name="upload" accept="image/*" multiple="multiple" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
-                         <button type="button" class="btn btn-primary filepicker">Upload an image from your computer</button>
+                         <input type="hidden" name="disable_optimization" value=""/>
+                         <div class="btn-group">
+                             <button type="button" class="btn btn-primary filepicker">Upload an image from your computer</button>
+                             <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+                                 <span class="caret"></span>
+                                 <span class="sr-only">Alternate Upload</span>
+                             </button>
+                             <ul class="dropdown-menu" role="menu">
+                                 <li><a href="#" class="js_disable_optimization">Upload image without optimization</a></li>
+                             </ul>
+                         </div>
                          <button type="button" class="btn hidden wait" disabled="disabled">Uploading...</button>
                      </div>
                      <div>
diff --cc addons/website_event_track/views/website_event.xml
index 8fdd5aa,fc9745e..e6ee8ac
--- a/addons/website_event_track/views/website_event.xml
+++ b/addons/website_event_track/views/website_event.xml
@@@ -2,8 -2,9 +2,9 @@@
  <openerp>
  <data>
  
 -<template id="assets_frontend" inherit_id="website.assets_frontend" name="Event track front end">
 +<template id="assets_frontend" inherit_id="website.assets_frontend" name="Website Event Track Assets">
      <xpath expr="." position="inside">
+         <link rel="stylesheet" href="/website_event_track/static/src/css/website_event_track.css"/>
          <script type="text/javascript" src="/website_event_track/static/src/js/website_event_track.js"></script>
      </xpath>
  </template>
diff --cc addons/website_quote/views/website_quotation.xml
index a6de5f6,7098289..41cf8ee
--- a/addons/website_quote/views/website_quotation.xml
+++ b/addons/website_quote/views/website_quotation.xml
@@@ -1,8 -1,17 +1,17 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <openerp>
  <data>
+ 
+   <template id="assets_frontend" inherit_id="website.assets_frontend" name="Website Quote frontend assets">
+     <xpath expr="." position="inside">
+       <script type="text/javascript" src="/website_quote/static/src/js/website_quotation.js"></script>
+       <script type="text/javascript" src="/website_quote/static/lib/jSignature/jSignature.min.js"></script>
+       <link rel='stylesheet' href='/website_quote/static/src/css/website_quotation.css'/>
+     </xpath>
+   </template>
+ 
    <template id="pricing" name="Price">
 -      <section data-snippet-id="title">
 +      <section>
            <h1 class="page-header">Pricing</h1>
        </section>
        <section id="quote">
diff --cc openerp/addons/base/ir/ir_qweb.py
index 2fab465,d27d15b..d1e6af8
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@@ -280,8 -273,11 +281,8 @@@ class QWeb(orm.AbstractModel)
                          t_render = attribute_name[2:]
                      template_attributes[attribute_name[2:]] = attribute_value
              else:
-                 generated_attributes += ' %s="%s"' % (attribute_name, escape(attribute_value))
+                 generated_attributes += self.render_attribute(element, attribute_name, attribute_value, qwebcontext)
  
 -        if 'debug' in template_attributes:
 -            debugger = template_attributes.get('debug', 'pdb')
 -            __import__(debugger).set_trace()  # pdb, ipdb, pudb, ...
          if t_render:
              result = self._render_tag[t_render](self, element, template_attributes, generated_attributes, qwebcontext)
          else:
@@@ -333,12 -329,9 +334,15 @@@
          else:
              return "<%s%s/>" % (name, generated_attributes)
  
+     def render_attribute(self, element, name, value, qwebcontext):
+         return ' %s="%s"' % (name, escape(value))
+ 
 +    def render_text(self, text, element, qwebcontext):
 +        return text.encode('utf-8')
 +
 +    def render_tail(self, tail, element, qwebcontext):
 +        return tail.encode('utf-8')
 +
      # Attributes
      def render_att_att(self, element, attribute_name, attribute_value, qwebcontext):
          if attribute_name.startswith("t-attf-"):
diff --cc openerp/addons/base/res/res_users.py
index c9cca14,06c62b5..faf5840
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@@ -163,7 -163,7 +163,7 @@@ class res_users(osv.osv)
  
      _columns = {
          'id': fields.integer('ID'),
-         'login_date': fields.datetime('Latest connection', select=1),
 -        'login_date': fields.date('Latest connection', select=1, copy=False),
++        'login_date': fields.datetime('Latest connection', select=1, copy=False),
          'partner_id': fields.many2one('res.partner', required=True,
              string='Related Partner', ondelete='restrict',
              help='Partner-related data of the user', auto_join=True),