diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 42f3effd6f9..06e59232ac9 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -114,7 +114,7 @@ class account_invoice(osv.osv):
                             #we check if the invoice is partially reconciled and if there are other invoices
                             #involved in this partial reconciliation (and we sum these invoices)
                             for line in aml.reconcile_partial_id.line_partial_ids:
-                                if line.invoice:
+                                if line.invoice and invoice.type == line.invoice.type:
                                     nb_inv_in_partial_rec += 1
                                     #store the max invoice id as for this invoice we will make a balance instead of a simple division
                                     max_invoice_id = max(max_invoice_id, line.invoice.id)
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 3cf10f477e2..940ac543cc8 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -168,7 +168,7 @@
                               on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
                               context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
                               domain="[('supplier', '=', True)]"/>
-                            <field name="fiscal_position" widget="selection"/>
+                            <field name="fiscal_position" options="{'no_create': True}"/>
                             <field name="origin"/>
                             <field name="supplier_invoice_number"/>
                             <label for="reference_type"/>
@@ -183,7 +183,7 @@
                             <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
                                 name="account_id" groups="account.group_account_user"/>
                             <field name="journal_id" groups="account.group_account_user"
-                                on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
+                                on_change="onchange_journal_id(journal_id, context)" options="{'no_create': True}"/>
                             <field name="currency_id" groups="base.group_multi_currency"/>
                             <field name="check_total" groups="account.group_supplier_inv_check_total"/>
                         </group>
@@ -253,7 +253,7 @@
                                     <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
                                     <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice']}"/>
                                     <field name="name" invisible="1"/>
-                                    <field name="payment_term" widget="selection"/>
+                                    <field name="payment_term" options="{'no_create': True}"/>
                                 </group>
                                 <group>
                                     <field name="move_id" groups="account.group_account_user"/>
@@ -324,12 +324,12 @@
                                 context="{'search_default_customer':1, 'show_address': 1}"
                                 options='{"always_reload": True}'
                                 domain="[('customer', '=', True)]"/>
-                            <field name="fiscal_position" widget="selection" />
+                            <field name="fiscal_position" options="{'no_create': True}" />
                         </group>
                         <group>
                             <field name="date_invoice"/>
                             <field name="journal_id" groups="account.group_account_user"
-                                on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
+                                on_change="onchange_journal_id(journal_id, context)" options="{'no_create': True}"/>
                             <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]"
                                 name="account_id" groups="account.group_account_user"/>
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 790f34a4f7f..8f4d66e65ec 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1453,7 +1453,7 @@
         <act_window
             id="act_account_move_to_account_move_line_open"
             name="Journal Items"
-            context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
+            context="{'search_default_move_id': active_id, 'default_move_id': active_id}"
             res_model="account.move.line"
             src_model="account.move"/>
 
diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js
index 997b2b03bb6..0bbdb959d17 100644
--- a/addons/account/static/src/js/account_move_line_quickadd.js
+++ b/addons/account/static/src/js/account_move_line_quickadd.js
@@ -22,6 +22,7 @@ openerp.account.quickadd = function (instance) {
         start:function(){
             var tmp = this._super.apply(this, arguments);
             var self = this;
+            var defs = [];
             this.$el.parent().prepend(QWeb.render("AccountMoveLineQuickAdd", {widget: this}));
             
             this.$el.parent().find('.oe_account_select_journal').change(function() {
@@ -41,11 +42,17 @@ openerp.account.quickadd = function (instance) {
                 self.$el.parent().find('.oe_account_select_period').removeAttr('disabled');
             });
             var mod = new instance.web.Model("account.move.line", self.dataset.context, self.dataset.domain);
-            mod.call("default_get", [['journal_id','period_id'],self.dataset.context]).then(function(result) {
+            defs.push(mod.call("default_get", [['journal_id','period_id'],self.dataset.context]).then(function(result) {
                 self.current_period = result['period_id'];
                 self.current_journal = result['journal_id'];
-            });
-            return tmp;
+            }));
+            defs.push(mod.call("list_journals", []).then(function(result) {
+                self.journals = result;
+            }));
+            defs.push(mod.call("list_periods", []).then(function(result) {
+                self.periods = result;
+            }));
+            return $.when(tmp, defs);
         },
         do_search: function(domain, context, group_by) {
             var self = this;
@@ -53,34 +60,27 @@ openerp.account.quickadd = function (instance) {
             this.last_context = context;
             this.last_group_by = group_by;
             this.old_search = _.bind(this._super, this);
-            var mod = new instance.web.Model("account.move.line", context, domain);
-            return $.when(mod.call("list_journals", []).then(function(result) {
-                self.journals = result;
-            }),mod.call("list_periods", []).then(function(result) {
-                self.periods = result;
-            })).then(function () {
-                var o;
-                self.$el.parent().find('.oe_account_select_journal').children().remove().end();
-                self.$el.parent().find('.oe_account_select_journal').append(new Option('', ''));
-                for (var i = 0;i < self.journals.length;i++){
-                    o = new Option(self.journals[i][1], self.journals[i][0]);
-                    if (self.journals[i][0] === self.current_journal){
-                        self.current_journal_type = self.journals[i][2];
-                        self.current_journal_currency = self.journals[i][3];
-                        self.current_journal_analytic = self.journals[i][4];
-                        $(o).attr('selected',true);
-                    }
-                    self.$el.parent().find('.oe_account_select_journal').append(o);
+            var o;
+            self.$el.parent().find('.oe_account_select_journal').children().remove().end();
+            self.$el.parent().find('.oe_account_select_journal').append(new Option('', ''));
+            for (var i = 0;i < self.journals.length;i++){
+                o = new Option(self.journals[i][1], self.journals[i][0]);
+                if (self.journals[i][0] === self.current_journal){
+                    self.current_journal_type = self.journals[i][2];
+                    self.current_journal_currency = self.journals[i][3];
+                    self.current_journal_analytic = self.journals[i][4];
+                    $(o).attr('selected',true);
                 }
-                self.$el.parent().find('.oe_account_select_period').children().remove().end();
-                self.$el.parent().find('.oe_account_select_period').append(new Option('', ''));
-                for (var i = 0;i < self.periods.length;i++){
-                    o = new Option(self.periods[i][1], self.periods[i][0]);
-                    self.$el.parent().find('.oe_account_select_period').append(o);
-                }    
-                self.$el.parent().find('.oe_account_select_period').val(self.current_period).attr('selected',true);
-                return self.search_by_journal_period();
-            });
+                self.$el.parent().find('.oe_account_select_journal').append(o);
+            }
+            self.$el.parent().find('.oe_account_select_period').children().remove().end();
+            self.$el.parent().find('.oe_account_select_period').append(new Option('', ''));
+            for (var i = 0;i < self.periods.length;i++){
+                o = new Option(self.periods[i][1], self.periods[i][0]);
+                self.$el.parent().find('.oe_account_select_period').append(o);
+            }    
+            self.$el.parent().find('.oe_account_select_period').val(self.current_period).attr('selected',true);
+            return self.search_by_journal_period();
         },
         search_by_journal_period: function() {
             var self = this;
@@ -93,7 +93,9 @@ openerp.account.quickadd = function (instance) {
             self.last_context["journal_type"] = self.current_journal_type;
             self.last_context["currency"] = self.current_journal_currency;
             self.last_context["analytic_journal_id"] = self.current_journal_analytic;
-            return self.old_search(new instance.web.CompoundDomain(self.last_domain, domain), self.last_context, self.last_group_by);
+            var compound_domain = new instance.web.CompoundDomain(self.last_domain, domain);
+            self.dataset.domain = compound_domain.eval();
+            return self.old_search(compound_domain, self.last_context, self.last_group_by);
         },
     });
 };
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index a0d14e889cb..b73dad2d385 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -664,13 +664,20 @@ class account_analytic_account(osv.osv):
 
         partner_payment_term = contract.partner_id.property_payment_term and contract.partner_id.property_payment_term.id or False
 
+        currency_id = False
+        if contract.pricelist_id:
+            currency_id = contract.pricelist_id.currency_id.id
+        elif contract.partner_id.property_product_pricelist:
+            currency_id = contract.partner_id.property_product_pricelist.currency_id.id
+        elif contract.company_id:
+            currency_id = contract.company_id.currency_id.id
 
         inv_data = {
            'reference': contract.code or False,
            'account_id': contract.partner_id.property_account_receivable.id,
            'type': 'out_invoice',
            'partner_id': contract.partner_id.id,
-           'currency_id': contract.partner_id.property_product_pricelist.id or False,
+           'currency_id': currency_id,
            'journal_id': len(journal_ids) and journal_ids[0] or False,
            'date_invoice': contract.recurring_next_date,
            'origin': contract.name,
diff --git a/addons/account_followup/report/account_followup_print.rml b/addons/account_followup/report/account_followup_print.rml
index a363126635c..6eadaed8675 100644
--- a/addons/account_followup/report/account_followup_print.rml
+++ b/addons/account_followup/report/account_followup_print.rml
@@ -149,7 +149,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <pre style="terp_default_9_followup_id">[[ format(get_text(o,data['form']['followup_id'])) ]]</pre>
+    <para style="terp_default_9"><pre style="terp_default_9_followup_id">[[ format(get_text(o,data['form']['followup_id'])) ]]</pre></para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index c9516b6135f..5d0ed8297c2 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -911,9 +911,10 @@ class account_voucher(osv.osv):
         if context.get('payment_expected_currency') and currency_id != context.get('payment_expected_currency'):
             vals['value']['amount'] = 0
             amount = 0
-        res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context)
-        for key in res.keys():
-            vals[key].update(res[key])
+        if partner_id:
+            res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context)
+            for key in res.keys():
+                vals[key].update(res[key])
         return vals
 
     def button_proforma_voucher(self, cr, uid, ids, context=None):
@@ -965,7 +966,7 @@ class account_voucher(osv.osv):
         res = {}
         if not partner_id:
             return res
-        res = {'account_id':False}
+        res = {}
         partner_pool = self.pool.get('res.partner')
         journal_pool = self.pool.get('account.journal')
         if pay_now == 'pay_later':
@@ -977,7 +978,8 @@ class account_voucher(osv.osv):
                 account_id = partner.property_account_payable.id
             else:
                 account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
-            res['account_id'] = account_id
+            if account_id:
+                res['account_id'] = account_id
         return {'value':res}
 
     def _sel_context(self, cr, uid, voucher_id, context=None):
@@ -1366,6 +1368,7 @@ class account_voucher(osv.osv):
         move_pool = self.pool.get('account.move')
         move_line_pool = self.pool.get('account.move.line')
         for voucher in self.browse(cr, uid, ids, context=context):
+            local_context = dict(context, force_company=voucher.journal_id.company_id.id)
             if voucher.move_id:
                 continue
             company_currency = self._get_company_currency(cr, uid, voucher.id, context)
@@ -1380,7 +1383,7 @@ class account_voucher(osv.osv):
             # Get the name of the account_move just created
             name = move_pool.browse(cr, uid, move_id, context=context).name
             # Create the first line of the voucher
-            move_line_id = move_line_pool.create(cr, uid, self.first_move_line_get(cr,uid,voucher.id, move_id, company_currency, current_currency, context), context)
+            move_line_id = move_line_pool.create(cr, uid, self.first_move_line_get(cr,uid,voucher.id, move_id, company_currency, current_currency, local_context), local_context)
             move_line_brw = move_line_pool.browse(cr, uid, move_line_id, context=context)
             line_total = move_line_brw.debit - move_line_brw.credit
             rec_list_ids = []
@@ -1392,9 +1395,9 @@ class account_voucher(osv.osv):
             line_total, rec_list_ids = self.voucher_move_line_create(cr, uid, voucher.id, line_total, move_id, company_currency, current_currency, context)
 
             # Create the writeoff line if needed
-            ml_writeoff = self.writeoff_move_line_get(cr, uid, voucher.id, line_total, move_id, name, company_currency, current_currency, context)
+            ml_writeoff = self.writeoff_move_line_get(cr, uid, voucher.id, line_total, move_id, name, company_currency, current_currency, local_context)
             if ml_writeoff:
-                move_line_pool.create(cr, uid, ml_writeoff, context)
+                move_line_pool.create(cr, uid, ml_writeoff, local_context)
             # We post the voucher.
             self.write(cr, uid, [voucher.id], {
                 'move_id': move_id,
@@ -1605,7 +1608,11 @@ class account_bank_statement(osv.osv):
         bank_st_line_obj = self.pool.get('account.bank.statement.line')
         st_line = bank_st_line_obj.browse(cr, uid, st_line_id, context=context)
         if st_line.voucher_id:
-            voucher_obj.write(cr, uid, [st_line.voucher_id.id], {'number': next_number}, context=context)
+            voucher_obj.write(cr, uid, [st_line.voucher_id.id],
+                            {'number': next_number,
+                            'date': st_line.date,
+                            'period_id': st_line.statement_id.period_id.id},
+                            context=context)
             if st_line.voucher_id.state == 'cancel':
                 voucher_obj.action_cancel_draft(cr, uid, [st_line.voucher_id.id], context=context)
             voucher_obj.signal_proforma_voucher(cr, uid, [st_line.voucher_id.id])
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index e35061e1836..97f96f75901 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -73,8 +73,14 @@
                     <group>
                         <group>
                             <field name="type" invisible="True"/>
-                            <field name="partner_id" domain="[('customer','=',True)]" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": True}'/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            <field name="partner_id" domain="[('customer','=',True)]" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": True}'/>
+                            <field name="account_id"
+                                  domain="[('type','in', ['liquidity', 'receivable'])]"/>
+                            <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
+                            <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
+                            <field name="reference"
+                                 attrs="{'invisible':[('pay_now','!=','pay_now')]}"/>
                         </group>
                         <group>
                             <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)" groups="account.group_account_user"/>
@@ -112,15 +118,6 @@
 			                        </div>
                                     <field name="amount" class="oe_subtotal_footer_separator" nolabel="1"/>
                                 </group>                                    
-			                    <group>
-                                    <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
-                                    <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
-                                    <field name="account_id"
-                                         attrs="{'invisible':[('pay_now','!=','pay_now')]}"
-                                          domain="[('type','=','liquidity')]"/>
-                                    <field name="reference"
-                                         attrs="{'invisible':[('pay_now','!=','pay_now')]}"/>
-                                </group>
 			                </group>
                         </page>
                         <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
@@ -224,11 +221,11 @@
                     <h1><label for="number" string="Purchase Receipt"/> <field name="number" class="oe_inline" readonly="1"/></h1>
 
                     <field name="pay_now" invisible="1"/>
-                    <field name="account_id" domain="[('type','=','other')]"  invisible="True"/>
                     <field name="type" invisible="True"/>
                     <group>
                         <group>
                             <field name="partner_id" domain="[('supplier','=',True)]" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
+                            <field name="account_id" domain="[('type', 'in', ['liquidity', 'payable'])]"/>
                             <field name="name" colspan="2"/>
                             <field name="reference"/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py
index de5121a819b..059989801d1 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@ -94,7 +94,7 @@ class account_statement_from_invoice_lines(osv.osv_memory):
                             'account_id': result['value'].get('account_id', statement.journal_id.default_credit_account_id.id),
                             'company_id': statement.company_id.id,
                             'currency_id': statement.currency.id,
-                            'date': line.date,
+                            'date': statement.date,
                             'amount': sign*amount,
                             'payment_rate': result['value']['payment_rate'],
                             'payment_rate_currency_id': result['value']['payment_rate_currency_id'],
@@ -119,7 +119,7 @@ class account_statement_from_invoice_lines(osv.osv_memory):
                 'statement_id': statement_id,
                 'ref': line.ref,
                 'voucher_id': voucher_id,
-                'date': time.strftime('%Y-%m-%d'),
+                'date': statement.date,
             }, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 159baf3a9e7..ca4a15bca6e 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -268,10 +268,14 @@ def log_fct(cr, uid_orig, model, method, fct_src, *args, **kw):
             new_values = get_data(cr, uid_orig, pool, res_ids, model, method)
     elif method == 'read':
         res = fct_src(cr, uid_orig, model.model, method, *args, **kw)
+        if isinstance(res, dict):
+            records = [res]
+        else:
+            records = res
         # build the res_ids and the old_values dict. Here we don't use get_data() to
         # avoid performing an additional read()
         res_ids = []
-        for record in res:
+        for record in records:
             res_ids.append(record['id'])
             old_values[(model.id, record['id'])] = {'value': record, 'text': record}
         # log only the fields read
@@ -279,7 +283,9 @@ def log_fct(cr, uid_orig, model, method, fct_src, *args, **kw):
     elif method == 'unlink':
         res_ids = args[0]
         old_values = get_data(cr, uid_orig, pool, res_ids, model, method)
-        res = fct_src(cr, uid_orig, model.model, method, *args, **kw)
+        # process_data first as fct_src will unlink the record
+        self.process_data(cr, uid_orig, pool, res_ids, model, method, old_values, new_values, field_list)
+        return fct_src(cr, uid_orig, model.model, method, *args, **kw)
     else: # method is write, action or workflow action
         res_ids = []
         if args:
@@ -322,7 +328,7 @@ def get_data(cr, uid, pool, res_ids, model, method):
     data = {}
     resource_pool = pool[model.model]
     # read all the fields of the given resources in super admin mode
-    for resource in resource_pool.read(cr, SUPERUSER_ID, res_ids):
+    for resource in resource_pool.read(cr, SUPERUSER_ID, res_ids, resource_pool._all_columns):
         values = {}
         values_text = {}
         resource_id = resource['id']
@@ -456,7 +462,9 @@ def process_data(cr, uid, pool, res_ids, model, method, old_values=None, new_val
 
         # if at least one modification has been found
         for model_id, resource_id in lines:
-            name = pool[model.model].name_get(cr, uid, [resource_id])[0][1]
+            line_model = pool.get('ir.model').browse(cr, SUPERUSER_ID, model_id).model
+            name = pool.get(line_model).name_get(cr, uid, [resource_id])[0][1]
+
             vals = {
                 'method': method,
                 'object_id': model_id,
diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index e660fd8363b..b6481f0ca28 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -15,6 +15,7 @@ from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
 
+
 #----------------------------------------------------------
 # helpers
 #----------------------------------------------------------
@@ -25,16 +26,20 @@ def fragment_to_query_string(func):
             return """<html><head><script>
                 var l = window.location;
                 var q = l.hash.substring(1);
-                var r = '/' + l.search;
+                var r = l.pathname + l.search;
                 if(q.length !== 0) {
                     var s = l.search ? (l.search === '?' ? '' : '&') : '?';
                     r = l.pathname + l.search + s + q;
                 }
+                if (r == l.pathname) {
+                    r = '/';
+                }
                 window.location = r;
             </script></head><body></body></html>"""
         return func(self, *a, **kw)
     return wrapper
 
+
 #----------------------------------------------------------
 # Controller
 #----------------------------------------------------------
@@ -88,6 +93,7 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home):
 
         return response
 
+
 class OAuthController(http.Controller):
 
     @http.route('/auth_oauth/signin', type='http', auth='none')
diff --git a/addons/auth_oauth_signup/__openerp__.py b/addons/auth_oauth_signup/__openerp__.py
index 8fc93f6c920..d3660f7c052 100644
--- a/addons/auth_oauth_signup/__openerp__.py
+++ b/addons/auth_oauth_signup/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-2012 OpenERP SA (<http://openerp.com>).
+#    Copyright (C) 2010-2014 OpenERP SA (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -30,7 +30,9 @@ Allow users to sign up through OAuth2 Provider.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['auth_oauth', 'auth_signup'],
-    'data': [],
+    'data': [
+        'views/auth_oauth_signup.xml',
+    ],
     'js': [],
     'css': [],
     'qweb': [],
diff --git a/addons/auth_oauth_signup/views/auth_oauth_signup.xml b/addons/auth_oauth_signup/views/auth_oauth_signup.xml
new file mode 100644
index 00000000000..139f36a4c0f
--- /dev/null
+++ b/addons/auth_oauth_signup/views/auth_oauth_signup.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- vim:et:si:ts=2:sts=2:sw=2 -->
+<openerp>
+  <data>
+    <template id="auth_oauth_signup.signup" inherit_id="auth_signup.signup" name="OAuth Signup buttons">
+      <xpath expr="//button[@type='submit']" position="before">
+        <div class="pull-right">
+          <div t-foreach="providers or []" t-as="p">
+            <a t-att-href="p['auth_link']" class="btn btn-link">
+              <i t-att-class="p['css_class']"/>
+              <t t-esc="p['body']"/>
+            </a>
+          </div>
+        </div>
+      </xpath>
+    </template>
+  </data>
+</openerp>
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 2db1e3dff65..08b67108c3f 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -30,13 +30,19 @@ from openerp.tools import exception_to_unicode
 
 _logger = logging.getLogger(__name__)
 
-class Home(openerp.addons.web.controllers.main.Home):
+class AuthSignup(openerp.addons.web.controllers.main.Home):
 
     @http.route()
     def web_login(self, *args, **kw):
         mode = request.params.get('mode')
         qcontext = request.params.copy()
+        super_response = None
+        if request.httprequest.method != 'POST' or mode not in ('reset', 'signup'):
+            # Default behavior is to try to login,  which in reset or signup mode in a non-sense.
+            super_response = super(AuthSignup, self).web_login(*args, **kw)
         response = webmain.render_bootstrap_template(request.session.db, 'auth_signup.signup', qcontext, lazy=True)
+        if isinstance(super_response, LazyResponse):
+            response.params['values'].update(super_response.params['values'])
         token = qcontext.get('token', None)
         token_infos = None
         if token:
@@ -59,11 +65,10 @@ class Home(openerp.addons.web.controllers.main.Home):
         }
         qcontext.update(config)
 
-        if 'error' in qcontext or mode not in ('reset', 'signup') or (not token and not config[mode]):
-            response = super(Home, self).web_login(*args, **kw)
-            if isinstance(response, LazyResponse):
-                response.params['values'].update(config)
-            return response
+        if 'error' in request.params or mode not in ('reset', 'signup') or (not token and not config[mode]):
+            if isinstance(super_response, LazyResponse):
+                super_response.params['values'].update(config)
+            return super_response
 
         if request.httprequest.method == 'GET':
             if token_infos:
@@ -76,22 +81,28 @@ class Home(openerp.addons.web.controllers.main.Home):
                     res_users.reset_password(request.cr, openerp.SUPERUSER_ID, login)
                     qcontext['message'] = _("An email has been sent with credentials to reset your password")
                     response.params['template'] = 'web.login'
-                except Exception:
-                    qcontext['error'] = _("Could not reset your password")
+                except Exception, e:
+                    qcontext['error'] = exception_to_unicode(e) or _("Could not reset your password")
                     _logger.exception('error when resetting password')
             else:
                 values = dict((key, qcontext.get(key)) for key in ('login', 'name', 'password'))
                 try:
                     self._signup_with_values(token, values)
-                    request.cr.commit()
+                    redirect = request.params.get('redirect')
+                    if not redirect:
+                        redirect = '/web?' + request.httprequest.query_string
+                    return http.redirect_with_hash(redirect)
                 except SignupError, e:
                     qcontext['error'] = exception_to_unicode(e)
-                return super(Home, self).web_login(*args, **kw)
 
         return response
 
     def _signup_with_values(self, token, values):
-        request.registry['res.users'].signup(request.cr, openerp.SUPERUSER_ID, values, token)
+        db, login, password = request.registry['res.users'].signup(request.cr, openerp.SUPERUSER_ID, values, token)
+        request.cr.commit()     # as authenticate will use its own cursor we need to commit the current transaction
+        uid = request.session.authenticate(db, login, password)
+        if not uid:
+            raise SignupError(_('Authentification Failed.'))
 
 
 # vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 3af52017e05..e91af657cc2 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -25,7 +25,7 @@ from urlparse import urljoin
 
 from openerp.addons.base.ir.ir_mail_server import MailDeliveryException
 from openerp.osv import osv, fields
-from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT, ustr
 from ast import literal_eval
 from openerp.tools.translate import _
 
@@ -236,7 +236,12 @@ class res_users(osv.Model):
         # create a copy of the template user (attached to a specific partner_id if given)
         values['active'] = True
         context = dict(context or {}, no_reset_password=True)
-        return self.copy(cr, uid, template_user_id, values, context=context)
+        try:
+            with cr.savepoint():
+                return self.copy(cr, uid, template_user_id, values, context=context)
+        except Exception, e:
+            # copy may failed if asked login is not available.
+            raise SignupError(ustr(e))
 
     def reset_password(self, cr, uid, login, context=None):
         """ retrieve the user corresponding to login (login or email),
diff --git a/addons/auth_signup/views/auth_signup_login.xml b/addons/auth_signup/views/auth_signup_login.xml
index bdc093e3c27..c7db687d24f 100644
--- a/addons/auth_signup/views/auth_signup_login.xml
+++ b/addons/auth_signup/views/auth_signup_login.xml
@@ -5,8 +5,8 @@
     <data>
         <template id="auth_signup.login" inherit_id="web.login" name="Sign up - Reset Password">
             <xpath expr="//button[@type='submit']" position="before">
-                <a t-if="signup" t-attf-href="?mode=signup{{ '&amp;debug' if debug else '' }}" class="btn btn-link pull-right">Sign up</a>
-                <a t-if="reset" t-attf-href="?mode=reset{{ '&amp;debug' if debug else '' }}" class="btn btn-link pull-right">Reset Password</a>
+                <a t-if="signup" t-attf-href="?{{ keep_query('*', mode='signup') }}" class="btn btn-link pull-right">Sign up</a>
+                <a t-if="reset" t-attf-href="?{{ keep_query('*', mode='reset') }}" class="btn btn-link pull-right">Reset Password</a>
             </xpath>
         </template>
 
@@ -29,21 +29,21 @@
 
                 <t t-set="reset_without_token" t-value="mode == 'reset' and not token"/>
 
-                <form class="oe_signup_form" role="form" t-attf-action="/web/login{{ '?debug' if debug else '' }}" method="post">
+                <form class="oe_signup_form" role="form" method="post">
                     <t t-call="web.database_select"/>
 
+                    <div class="form-group field-login">
+                        <label for="login" class="control-label">Your Email</label>
+                        <input type="email" name="login" t-att-value="login" id="login" class="form-control" autofocus="autofocus"
+                            required="required" t-att-disabled="'disabled' if mode == 'reset' and token else None"/>
+                        <input type="hidden" name="login" t-att-value="login" t-if="mode == 'reset' and token"/>
+                    </div>
+
                     <div class="form-group field-name" t-if="not reset_without_token">
                         <label for="name" class="control-label">Your Name</label>
                         <input type="text" name="name" t-att-value="name" id="name" class="form-control" placeholder="e.g. John Doe"
-                            required="required" autofocus="autofocus" t-att-disabled="'disabled' if mode == 'reset' and token else None"/>
-                    </div>
-
-                    <div class="form-group field-login">
-                        <label for="login" class="control-label">Your Email</label>
-                        <input type="text" name="login" t-att-value="login" id="login" class="form-control"
-                            t-att-autofocus="'autofocus' if reset_without_token else None"
-                            required="required" t-att-disabled="'disabled' if mode == 'reset' and token else None"/>
-                        <input type="hidden" name="login" t-att-value="login" t-if="mode == 'reset' and token"/>
+                            required="required" t-att-disabled="'disabled' if mode == 'reset' and token else None"
+                            t-att-autofocus="'autofocus' if mode != 'reset' and login else None"/>
                     </div>
 
                     <div class="form-group field-password" t-if="not reset_without_token">
@@ -68,7 +68,7 @@
                     <input type="hidden" name="mode" t-att-value="mode"/>
                     <input type="hidden" name="token" t-att-value="token"/>
                     <div class="clearfix oe_login_buttons">
-                        <a href="/web/login" class="btn btn-link pull-right">Back to Login</a>
+                        <a t-attf-href="?{{ keep_query('*', mode='login') }}" class="btn btn-link pull-right">Back to Login</a>
                         <button type="submit" class="btn btn-primary pull-left">
                             <t t-if="mode == 'signup'">Sign up</t>
                             <t t-if="mode == 'reset'">Reset password</t>
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 58728a77aef..e48533ebeb4 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -275,6 +275,13 @@ class base_action_rule(osv.osv):
             if action.filter_id:
                 domain = eval(action.filter_id.domain)
                 ctx.update(eval(action.filter_id.context))
+                if 'lang' not in ctx:
+                    # Filters might be language-sensitive, attempt to reuse creator lang
+                    # as we are usually running this as super-user in background
+                    [filter_meta] = action.filter_id.perm_read()
+                    user_id = filter_meta['write_uid'] and filter_meta['write_uid'][0] or \
+                                    filter_meta['create_uid'][0]
+                    ctx['lang'] = self.pool['res.users'].browse(cr, uid, user_id).lang
             record_ids = model.search(cr, uid, domain, context=ctx)
 
             # determine when action should occur for the records
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 763d0784603..955591e8824 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -41,7 +41,9 @@ class base_config_settings(osv.osv_memory):
                                               help="""This installs the module google_docs."""),
         'module_google_calendar': fields.boolean('Allow the users to synchronize their calendar  with Google Calendar',
                                               help="""This installs the module google_calendar."""),
-        'font': fields.many2one('res.font', string="Report Font", help="Set the font into the report header, it will be used as default font in the RML reports of the user company"),
+        'font': fields.many2one('res.font', string="Report Font", domain=[('mode', 'in', ('Normal', 'Regular', 'all', 'Book'))],
+            help="Set the font into the report header, it will be used as default font in the RML reports of the user company"),
+
     }
     
     _defaults= {
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 73fc9f83830..66fdcf91633 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -99,7 +99,7 @@
                         <label for="font" />
                         <div>
                             <div>
-                                <field name="font" class="oe_inline"  domain="[('mode', 'in', ('normal', 'regular', 'all', 'book'))]" />
+                                <field name="font" class="oe_inline" />
                                 <button string="(reload fonts)" name="act_discover_fonts" type="object" class="oe_link"/>
                             </div>
                         </div>
diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/base_vat.py
index 52db18b7307..e9ecf70b39b 100644
--- a/addons/base_vat/base_vat.py
+++ b/addons/base_vat/base_vat.py
@@ -54,7 +54,7 @@ _ref_vat = {
     'gr': 'GR12345670',
     'hu': 'HU12345676',
     'hr': 'HR01234567896', # Croatia, contributed by Milan Tribuson 
-    'ie': 'IE1234567T',
+    'ie': 'IE1234567FA',
     'it': 'IT12345670017',
     'lt': 'LT123456715',
     'lu': 'LU12345613',
@@ -190,6 +190,34 @@ class res_partner(osv.osv):
             return check == int(num[8])
         return False
 
+    def _ie_check_char(self, vat):
+        vat = vat.zfill(8)
+        extra = 0
+        if vat[7] not in ' W':
+            if vat[7].isalpha():
+                extra = 9 * (ord(vat[7]) - 64)
+            else:
+                # invalid
+                return -1
+        checksum = extra + sum((8-i) * int(x) for i, x in enumerate(vat[:7]))
+        return 'WABCDEFGHIJKLMNOPQRSTUV'[checksum % 23]
+
+    def check_vat_ie(self, vat):
+        """ Temporary Ireland VAT validation to support the new format
+        introduced in January 2013 in Ireland, until upstream is fixed.
+        TODO: remove when fixed upstream"""
+        if len(vat) not in (8, 9) or not vat[2:7].isdigit():
+            return False
+        if len(vat) == 8:
+            # Normalize pre-2013 numbers: final space or 'W' not significant
+            vat += ' '
+        if vat[:7].isdigit():
+            return vat[7] == self._ie_check_char(vat[:7] + vat[8])
+        elif vat[1] in (string.ascii_uppercase + '+*'):
+            # Deprecated format
+            # See http://www.revenue.ie/en/online/third-party-reporting/reporting-payment-details/faqs.html#section3
+            return vat[7] == self._ie_check_char(vat[2:7] + vat[0] + vat[8])
+        return False
 
     # Mexican VAT verification, contributed by <moylop260@hotmail.com>
     # and Panos Christeas <p_christ@hol.gr>
diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py
index a8efc343420..c5f2a1e9af8 100644
--- a/addons/calendar/calendar.py
+++ b/addons/calendar/calendar.py
@@ -19,13 +19,13 @@
 #
 ##############################################################################
 
-import hashlib
 import pytz
 import re
 import time
 import openerp
 import openerp.service.report
 import uuid
+from werkzeug.exceptions import BadRequest
 from datetime import datetime, timedelta
 from dateutil import parser
 from dateutil import rrule
@@ -34,7 +34,6 @@ from openerp import tools, SUPERUSER_ID
 from openerp.osv import fields, osv
 from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
 from openerp.tools.translate import _
-from openerp import http
 from openerp.http import request
 from operator import itemgetter
 
@@ -62,6 +61,7 @@ def calendar_id2real_id(calendar_id=None, with_date=False):
             return int(real_id)
     return calendar_id and int(calendar_id) or calendar_id
 
+
 def get_real_ids(ids):
     if isinstance(ids, (str, int, long)):
         return calendar_id2real_id(ids)
@@ -75,6 +75,7 @@ class calendar_attendee(osv.Model):
     Calendar Attendee Information
     """
     _name = 'calendar.attendee'
+    _rec_name = 'cn'
     _description = 'Attendee information'
 
     def _compute_data(self, cr, uid, ids, name, arg, context=None):
@@ -333,22 +334,22 @@ class calendar_alarm_manager(osv.AbstractModel):
         res = {}
         base_request = """
                     SELECT
-                        crm.id,
-                        crm.date - interval '1' minute  * calcul_delta.max_delta AS first_alarm,
+                        cal.id,
+                        cal.date - interval '1' minute  * calcul_delta.max_delta AS first_alarm,
                         CASE
-                            WHEN crm.recurrency THEN crm.end_date - interval '1' minute  * calcul_delta.min_delta
-                            ELSE crm.date_deadline - interval '1' minute  * calcul_delta.min_delta
+                            WHEN cal.recurrency THEN cal.end_date - interval '1' minute  * calcul_delta.min_delta
+                            ELSE cal.date_deadline - interval '1' minute  * calcul_delta.min_delta
                         END as last_alarm,
-                        crm.date as first_event_date,
+                        cal.date as first_event_date,
                         CASE
-                            WHEN crm.recurrency THEN crm.end_date
-                            ELSE crm.date_deadline
+                            WHEN cal.recurrency THEN cal.end_date
+                            ELSE cal.date_deadline
                         END as last_event_date,
                         calcul_delta.min_delta,
                         calcul_delta.max_delta,
-                        crm.rrule AS rule
+                        cal.rrule AS rule
                     FROM
-                        calendar_event AS crm
+                        calendar_event AS cal
                         RIGHT JOIN
                             (
                                 SELECT
@@ -358,11 +359,11 @@ class calendar_alarm_manager(osv.AbstractModel):
                                         LEFT JOIN calendar_alarm AS alarm ON alarm.id = rel.calendar_alarm_id
                                 WHERE alarm.type in %s
                                 GROUP BY rel.calendar_event_id
-                            ) AS calcul_delta ON calcul_delta.calendar_event_id = crm.id
+                            ) AS calcul_delta ON calcul_delta.calendar_event_id = cal.id
              """
 
         filter_user = """
-                LEFT JOIN calendar_event_res_partner_rel AS part_rel ON part_rel.calendar_event_id = crm.id
+                RIGHT JOIN calendar_event_res_partner_rel AS part_rel ON part_rel.calendar_event_id = cal.id
                     AND part_rel.res_partner_id = %s
         """
 
@@ -383,21 +384,14 @@ class calendar_alarm_manager(osv.AbstractModel):
         #Add filter on hours
         tuple_params += (seconds, seconds,)
 
-        cr.execute("""
-            SELECT
-                *
-            FROM (
-                    """
-                + base_request
-                + """
-            ) AS ALL_EVENTS
-            WHERE
-                ALL_EVENTS.first_alarm < (now() at time zone 'utc' + interval '%s' second )
-                AND ALL_EVENTS.last_alarm > (now() at time zone 'utc' - interval '%s' second )
-           """, tuple_params)
+        cr.execute("""SELECT *
+                        FROM ( %s ) AS ALL_EVENTS
+                       WHERE ALL_EVENTS.first_alarm < (now() at time zone 'utc' + interval '%%s' second )
+                         AND ALL_EVENTS.last_alarm > (now() at time zone 'utc' - interval '%%s' second )
+                   """ % base_request, tuple_params)
 
         for event_id, first_alarm, last_alarm, first_meeting, last_meeting, min_duration, max_duration, rule in cr.fetchall():
-            res[event_id].update({
+            res[event_id] = {
                 'event_id': event_id,
                 'first_alarm': first_alarm,
                 'last_alarm': last_alarm,
@@ -406,7 +400,7 @@ class calendar_alarm_manager(osv.AbstractModel):
                 'min_duration': min_duration,
                 'max_duration': max_duration,
                 'rrule': rule
-            })
+            }
 
         return res
 
@@ -432,83 +426,86 @@ class calendar_alarm_manager(osv.AbstractModel):
                         res.append(alert)
         return res
 
-
-    def get_next_mail(self,cr,uid,context=None):
-        cron = self.pool.get('ir.cron').search(cr,uid,[('model','ilike',self._name)],context=context)
+    def get_next_mail(self, cr, uid, context=None):
+        cron = self.pool.get('ir.cron').search(cr, uid, [('model', 'ilike', self._name)], context=context)
         if cron and len(cron) == 1:
-            cron = self.pool.get('ir.cron').browse(cr,uid,cron[0],context=context)
+            cron = self.pool.get('ir.cron').browse(cr, uid, cron[0], context=context)
         else:
             raise ("Cron for " + self._name + " not identified :( !")
 
-        if cron.interval_type=="weeks":
+        if cron.interval_type == "weeks":
             cron_interval = cron.interval_number * 7 * 24 * 60 * 60
-        elif cron.interval_type=="days":
-            cron_interval = cron.interval_number * 24 * 60 * 60 
-        elif cron.interval_type=="hours":
+        elif cron.interval_type == "days":
+            cron_interval = cron.interval_number * 24 * 60 * 60
+        elif cron.interval_type == "hours":
             cron_interval = cron.interval_number * 60 * 60
-        elif cron.interval_type=="minutes":
+        elif cron.interval_type == "minutes":
             cron_interval = cron.interval_number * 60
-        elif cron.interval_type=="seconds":
-            cron_interval = cron.interval_number 
+        elif cron.interval_type == "seconds":
+            cron_interval = cron.interval_number
 
         if not cron_interval:
             raise ("Cron delay for " + self._name + " can not be calculated :( !")
 
-        all_events = self.get_next_potential_limit_alarm(cr,uid,cron_interval,notif=False,context=context)
+        all_events = self.get_next_potential_limit_alarm(cr, uid, cron_interval, notif=False, context=context)
 
-        for event in all_events: #.values()
-            max_delta = all_events[event]['max_duration'];
-            curEvent = self.pool.get('calendar.event').browse(cr,uid,event,context=context) 
+        for event in all_events:  # .values()
+            max_delta = all_events[event]['max_duration']
+            curEvent = self.pool.get('calendar.event').browse(cr, uid, event, context=context)
             if curEvent.recurrency:
                 bFound = False
                 LastFound = False
-                for one_date in self.pool.get('calendar.event').get_recurrent_date_by_event(cr,uid,curEvent, context=context) :
-                    in_date_format = datetime.strptime(one_date, '%Y-%m-%d %H:%M:%S');
-                    LastFound = self.do_check_alarm_for_one_date(cr,uid,in_date_format,curEvent,max_delta,cron_interval,notif=False,context=context)
+                for one_date in self.pool.get('calendar.event').get_recurrent_date_by_event(cr, uid, curEvent, context=context):
+                    in_date_format = datetime.strptime(one_date, '%Y-%m-%d %H:%M:%S')
+                    LastFound = self.do_check_alarm_for_one_date(cr, uid, in_date_format, curEvent, max_delta, cron_interval, notif=False, context=context)
                     if LastFound:
                         for alert in LastFound:
-                            self.do_mail_reminder(cr,uid,alert,context=context)
+                            self.do_mail_reminder(cr, uid, alert, context=context)
 
                         if not bFound:  # if it's the first alarm for this recurrent event
                             bFound = True
                     if bFound and not LastFound:  # if the precedent event had an alarm but not this one, we can stop the search for this event
                         break
             else:
-                in_date_format = datetime.strptime(curEvent.date, '%Y-%m-%d %H:%M:%S');
-                LastFound = self.do_check_alarm_for_one_date(cr,uid,in_date_format,curEvent,max_delta,cron_interval,notif=False,context=context)
+                in_date_format = datetime.strptime(curEvent.date, '%Y-%m-%d %H:%M:%S')
+                LastFound = self.do_check_alarm_for_one_date(cr, uid, in_date_format, curEvent, max_delta, cron_interval, notif=False, context=context)
                 if LastFound:
                     for alert in LastFound:
-                        self.do_mail_reminder(cr,uid,alert,context=context)
+                        self.do_mail_reminder(cr, uid, alert, context=context)
 
-    def get_next_notif(self,cr,uid,context=None):
+    def get_next_notif(self, cr, uid, context=None):
         ajax_check_every_seconds = 300
-        partner = self.pool.get('res.users').browse(cr,uid,uid,context=context).partner_id;
+        partner = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id
         all_notif = []
-        all_events = self.get_next_potential_limit_alarm(cr,uid,ajax_check_every_seconds,partner_id=partner.id,mail=False,context=context)
+
+        if not partner:
+            return []
+
+        all_events = self.get_next_potential_limit_alarm(cr, uid, ajax_check_every_seconds, partner_id=partner.id, mail=False, context=context)
 
         for event in all_events:  # .values()
-            max_delta = all_events[event]['max_duration'];
-            curEvent = self.pool.get('calendar.event').browse(cr,uid,event,context=context) 
+            max_delta = all_events[event]['max_duration']
+            curEvent = self.pool.get('calendar.event').browse(cr, uid, event, context=context)
             if curEvent.recurrency:
                 bFound = False
                 LastFound = False
-                for one_date in self.pool.get("calendar.event").get_recurrent_date_by_event(cr,uid,curEvent, context=context) :
-                    in_date_format = datetime.strptime(one_date, '%Y-%m-%d %H:%M:%S');
-                    LastFound = self.do_check_alarm_for_one_date(cr,uid,in_date_format,curEvent,max_delta,ajax_check_every_seconds,after=partner.cal_last_notif,mail=False,context=context)
+                for one_date in self.pool.get("calendar.event").get_recurrent_date_by_event(cr, uid, curEvent, context=context):
+                    in_date_format = datetime.strptime(one_date, '%Y-%m-%d %H:%M:%S')
+                    LastFound = self.do_check_alarm_for_one_date(cr, uid, in_date_format, curEvent, max_delta, ajax_check_every_seconds, after=partner.calendar_last_notif_ack, mail=False, context=context)
                     if LastFound:
                         for alert in LastFound:
-                            all_notif.append(self.do_notif_reminder(cr,uid,alert,context=context))
-                        if not bFound: #if it's the first alarm for this recurrent event
-                            bFound = True   
-                    if bFound and not LastFound: #if the precedent event had alarm but not this one, we can stop the search fot this event
+                            all_notif.append(self.do_notif_reminder(cr, uid, alert, context=context))
+                        if not bFound:  # if it's the first alarm for this recurrent event
+                            bFound = True
+                    if bFound and not LastFound:  # if the precedent event had alarm but not this one, we can stop the search fot this event
                         break
             else:
-                in_date_format = datetime.strptime(curEvent.date, '%Y-%m-%d %H:%M:%S');
-                LastFound = self.do_check_alarm_for_one_date(cr,uid,in_date_format,curEvent,max_delta,ajax_check_every_seconds,partner.cal_last_notif,mail=False,context=context)
+                in_date_format = datetime.strptime(curEvent.date, '%Y-%m-%d %H:%M:%S')
+                LastFound = self.do_check_alarm_for_one_date(cr, uid, in_date_format, curEvent, max_delta, ajax_check_every_seconds, partner.calendar_last_notif_ack, mail=False, context=context)
                 if LastFound:
                     for alert in LastFound:
-                        all_notif.append(self.do_notif_reminder(cr,uid,alert,context=context))
-        return  all_notif
+                        all_notif.append(self.do_notif_reminder(cr, uid, alert, context=context))
+        return all_notif
 
     def do_mail_reminder(self, cr, uid, alert, context=None):
         if context is None:
@@ -519,7 +516,7 @@ class calendar_alarm_manager(osv.AbstractModel):
         alarm = self.pool['calendar.alarm'].browse(cr, uid, alert['alarm_id'], context=context)
 
         if alarm.type == 'email':
-            res = self.pool['calendar.attendee']._send_mail_to_attendees(cr, uid, event.attendee_ids, template_xmlid='calendar_template_meeting_reminder', context=context)
+            res = self.pool['calendar.attendee']._send_mail_to_attendees(cr, uid, [att.id for att in event.attendee_ids], template_xmlid='calendar_template_meeting_reminder', context=context)
 
         return res
 
@@ -797,12 +794,12 @@ class calendar_event(osv.Model):
         'location': {
             'calendar.subtype_invitation': lambda self, cr, uid, obj, ctx=None: True,
         },
-       'date': {
+        'date': {
             'calendar.subtype_invitation': lambda self, cr, uid, obj, ctx=None: True,
         },
     }
     _columns = {
-         'id': fields.integer('ID', readonly=True),
+        'id': fields.integer('ID', readonly=True),
         'state': fields.selection([('draft', 'Unconfirmed'), ('open', 'Confirmed')], string='Status', readonly=True, track_visibility='onchange'),
         'name': fields.char('Meeting Subject', required=True, states={'done': [('readonly', True)]}),
         'is_attendee': fields.function(_compute, string='Attendee', type="boolean", multi='attendee'),
@@ -844,6 +841,7 @@ class calendar_event(osv.Model):
         'attendee_ids': fields.one2many('calendar.attendee', 'event_id', 'Attendees', ondelete='cascade'),
         'partner_ids': fields.many2many('res.partner', string='Attendees', states={'done': [('readonly', True)]}),
         'alarm_ids': fields.many2many('calendar.alarm', string='Reminders', ondelete="restrict"),
+
     }
     _defaults = {
         'end_type': 'count',
@@ -870,11 +868,9 @@ class calendar_event(osv.Model):
     ]
 
     def onchange_dates(self, cr, uid, ids, start_date, duration=False, end_date=False, allday=False, context=None):
+
         """Returns duration and/or end date based on values passed
         @param ids: List of calendar event's IDs.
-        @param start_date: Starting date
-        @param duration: Duration between start date and end date
-        @param end_date: Ending Datee
         """
         if context is None:
             context = {}
@@ -888,14 +884,14 @@ class calendar_event(osv.Model):
             value['duration'] = duration
 
         if allday:  # For all day event
-            start = datetime.strptime(start_date.split(' ')[0].split('T')[0], "%Y-%m-%d")
-            duration = 24.0
-            value['duration'] = duration
+            start = datetime.strptime(start_date, "%Y-%m-%d %H:%M:%S")
             user = self.pool['res.users'].browse(cr, uid, uid)
             tz = pytz.timezone(user.tz) if user.tz else pytz.utc
             start = pytz.utc.localize(start).astimezone(tz)     # convert start in user's timezone
             start = start.astimezone(pytz.utc)                  # convert start back to utc
-            value['date'] = start.strftime("%Y-%m-%d") + ' 00:00:00'
+
+            value['duration'] = 24.0
+            value['date'] = datetime.strftime(start, "%Y-%m-%d %H:%M:%S")
         else:
             start = datetime.strptime(start_date, "%Y-%m-%d %H:%M:%S")
 
@@ -979,7 +975,7 @@ class calendar_event(osv.Model):
             }
         return res
 
-    def get_search_fields(self,browse_event,order_fields,r_date=None): 
+    def get_search_fields(self, browse_event, order_fields, r_date=None):
         sort_fields = {}
         for ord in order_fields:
             if ord == 'id' and r_date:
@@ -989,17 +985,17 @@ class calendar_event(osv.Model):
                 'If we sort on FK, we obtain a browse_record, so we need to sort on name_get'
                 if type(browse_event[ord]) is openerp.osv.orm.browse_record:
                     name_get = browse_event[ord].name_get()
-                    if len(name_get) and len(name_get[0])>=2:
+                    if len(name_get) and len(name_get[0]) >= 2:
                         sort_fields[ord] = name_get[0][1]
 
         return sort_fields
 
     def get_recurrent_ids(self, cr, uid, event_id, domain, order=None, context=None):
 
-        """Gives virtual event ids for recurring events 
+        """Gives virtual event ids for recurring events
         This method gives ids of dates that comes between start date and end date of calendar views
- 
-        @param order: The fields (comma separated, format "FIELD {DESC|ASC}") on which the events should be sorted 
+
+        @param order: The fields (comma separated, format "FIELD {DESC|ASC}") on which the events should be sorted
         """
 
         if not context:
@@ -1024,7 +1020,7 @@ class calendar_event(osv.Model):
         for ev in self.browse(cr, uid, ids_to_browse, context=context):
             if not ev.recurrency or not ev.rrule:
                 result.append(ev.id)
-                result_data.append(self.get_search_fields(ev,order_fields))
+                result_data.append(self.get_search_fields(ev, order_fields))
                 continue
 
             rdates = self.get_recurrent_date_by_event(cr, uid, ev, context=context)
@@ -1070,7 +1066,7 @@ class calendar_event(osv.Model):
 
                 if [True for item in new_pile if not item]:
                     continue
-                result_data.append(self.get_search_fields(ev,order_fields,r_date=r_date))
+                result_data.append(self.get_search_fields(ev, order_fields, r_date=r_date))
 
         if order_fields:
             def comparer(left, right):
@@ -1081,7 +1077,7 @@ class calendar_event(osv.Model):
                 return 0
 
             sort_params = [key.split()[0] if key[-4:].lower() != 'desc' else '-%s' % key.split()[0] for key in (order or self._order).split(',')]
-            comparers = [ ((itemgetter(col[1:]), -1) if col[0] == '-' else (itemgetter(col), 1)) for col in sort_params]    
+            comparers = [((itemgetter(col[1:]), -1) if col[0] == '-' else (itemgetter(col), 1)) for col in sort_params]
             ids = [r['id'] for r in sorted(result_data, cmp=comparer)]
 
         if isinstance(event_id, (str, int, long)):
@@ -1089,7 +1085,6 @@ class calendar_event(osv.Model):
         else:
             return ids
 
-
     def compute_rule_string(self, data):
         """
         Compute rule string according to value type RECUR of iCalendar from the values given.
@@ -1123,7 +1118,7 @@ class calendar_event(osv.Model):
                 data['end_date_new'] = ''.join((re.compile('\d')).findall(data.get('end_date'))) + 'T235959Z'
 
             return (data.get('end_type') == 'count' and (';COUNT=' + str(data.get('count'))) or '') +\
-                             ((data.get('end_date_new') and data.get('end_type') == 'end_date' and (';UNTIL=' + data.get('end_date_new'))) or '')
+                ((data.get('end_date_new') and data.get('end_type') == 'end_date' and (';UNTIL=' + data.get('end_date_new'))) or '')
 
         freq = data.get('rrule_type', False)  # day/week/month/year
         res = ''
@@ -1219,12 +1214,12 @@ class calendar_event(osv.Model):
         res.update(self.check_partners_email(cr, uid, value[0][2], context=context))
         return res
 
-    def onchange_rec_day(self,cr,uid,id,date,mo,tu,we,th,fr,sa,su):
+    def onchange_rec_day(self, cr, uid, id, date, mo, tu, we, th, fr, sa, su):
         """ set the start date according to the first occurence of rrule"""
         rrule_obj = self._get_empty_rrule_data()
         rrule_obj.update({
-            'byday':True,
-            'rrule_type':'weekly',
+            'byday': True,
+            'rrule_type': 'weekly',
             'mo': mo,
             'tu': tu,
             'we': we,
@@ -1232,12 +1227,11 @@ class calendar_event(osv.Model):
             'fr': fr,
             'sa': sa,
             'su': su,
-            'interval':1
+            'interval': 1
         })
         str_rrule = self.compute_rule_string(rrule_obj)
-        first_occurence =  list(rrule.rrulestr(str_rrule + ";COUNT=1", dtstart=datetime.strptime(date, "%Y-%m-%d %H:%M:%S"), forceset=True))[0]
-        return {'value': { 'date' : first_occurence.strftime("%Y-%m-%d") + ' 00:00:00' } }
-
+        first_occurence = list(rrule.rrulestr(str_rrule + ";COUNT=1", dtstart=datetime.strptime(date, "%Y-%m-%d %H:%M:%S"), forceset=True))[0]
+        return {'value': {'date': first_occurence.strftime("%Y-%m-%d") + ' 00:00:00'}}
 
     def check_partners_email(self, cr, uid, partner_ids, context=None):
         """ Verify that selected partner_ids have an email_address defined.
@@ -1251,12 +1245,10 @@ class calendar_event(osv.Model):
         warning_msg = _('The following contacts have no email address :')
         for partner in partner_wo_email_lst:
             warning_msg += '\n- %s' % (partner.name)
-        return {'warning':
-                    {
-                        'title': _('Email addresses not found'),
-                        'message': warning_msg,
-                    }
-               }
+        return {'warning': {
+                'title': _('Email addresses not found'),
+                'message': warning_msg,
+                }}
 
     # ----------------------------------------
     # OpenChatter
@@ -1353,17 +1345,52 @@ class calendar_event(osv.Model):
         res = super(calendar_event, self).copy(cr, uid, calendar_id2real_id(id), default, context)
         return res
 
+    def _detach_one_event(self, cr, uid, id, values=dict(), context=None):
+        real_event_id = calendar_id2real_id(id)
+        data = self.read(cr, uid, id, ['date', 'date_deadline', 'rrule', 'duration'])
+
+        if data.get('rrule'):
+            data.update(
+                values,
+                recurrent_id=real_event_id,
+                recurrent_id_date=data.get('date'),
+                rrule_type=False,
+                rrule='',
+                recurrency=False,
+                end_date=datetime.strptime(values.get('date', False) or data.get('date'), "%Y-%m-%d %H:%M:%S") + timedelta(hours=values.get('duration', False) or data.get('duration'))
+            )
+
+            #do not copy the id
+            if data.get('id'):
+                del(data['id'])
+            new_id = self.copy(cr, uid, real_event_id, default=data, context=context)
+            return new_id
+
+    def open_after_detach_event(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+
+        new_id = self._detach_one_event(cr, uid, ids[0], context=context)
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': 'calendar.event',
+            'view_mode': 'form',
+            'res_id': new_id,
+            'target': 'current',
+            'flags': {'form': {'action_buttons': True, 'options': {'mode': 'edit'}}}
+        }
+
     def write(self, cr, uid, ids, values, context=None):
         def _only_changes_to_apply_on_real_ids(field_names):
             ''' return True if changes are only to be made on the real ids'''
             for field in field_names:
-                if field not in ['name', 'message_follower_ids','oe_update_date']:
-                    return False
-            return True
+                if field in ['date', 'active']:
+                    return True
+            return False
 
         context = context or {}
 
-        if isinstance(ids, (str,int, long)):
+        if isinstance(ids, (str, int, long)):
             if len(str(ids).split('-')) == 1:
                 ids = [int(ids)]
             else:
@@ -1383,30 +1410,13 @@ class calendar_event(osv.Model):
             # if we are setting the recurrency flag to False or if we are only changing fields that
             # should be only updated on the real ID and not on the virtual (like message_follower_ids):
             # then set real ids to be updated.
-            if not values.get('recurrency', True) or _only_changes_to_apply_on_real_ids(values.keys()):
+            if not values.get('recurrency', True) or not _only_changes_to_apply_on_real_ids(values.keys()):
                 ids.append(real_event_id)
                 continue
-
-            #if edit one instance of a reccurrent id
-            data = self.read(cr, uid, event_id, ['date', 'date_deadline', 'rrule', 'duration'])
-            if data.get('rrule'):
-                data.update(
-                    values,
-                    recurrent_id=real_event_id,
-                    recurrent_id_date=data.get('date'),
-                    rrule_type=False,
-                    rrule='',
-                    recurrency=False,
-                    end_date = datetime.strptime(values.get('date', False) or data.get('date'),"%Y-%m-%d %H:%M:%S")
-                                                + timedelta(hours=values.get('duration', False) or data.get('duration'))
-                )
-
-                #do not copy the id
-                if data.get('id'):
-                    del(data['id'])
-                new_id = self.copy(cr, uid, real_event_id, default=data, context=context)
-                context.update({'active_id': new_id, 'active_ids': [new_id]})
-                continue
+            else:
+                data = self.read(cr, uid, event_id, ['date', 'date_deadline', 'rrule', 'duration'])
+                if data.get('rrule'):
+                    new_id = self._detach_one_event(cr, uid, event_id, values, context=None)
 
         res = super(calendar_event, self).write(cr, uid, ids, values, context=context)
 
@@ -1473,7 +1483,6 @@ class calendar_event(osv.Model):
         if context is None:
             context = {}
         fields2 = fields and fields[:] or None
-
         EXTRAFIELDS = ('class', 'user_id', 'duration', 'date', 'rrule', 'vtimezone')
         for f in EXTRAFIELDS:
             if fields and (f not in fields):
@@ -1506,7 +1515,7 @@ class calendar_event(osv.Model):
                     continue
             if r['class'] == 'private':
                 for f in r.keys():
-                    if f not in ('id', 'date', 'date_deadline', 'duration', 'user_id', 'state', 'interval', 'count'):
+                    if f not in ('id', 'date', 'date_deadline', 'duration', 'user_id', 'state', 'interval', 'count', 'recurrent_id_date'):
                         if isinstance(r[f], list):
                             r[f] = []
                         else:
@@ -1518,6 +1527,7 @@ class calendar_event(osv.Model):
             for k in EXTRAFIELDS:
                 if (k in r) and (fields and (k not in fields)):
                     del r[k]
+
         if isinstance(ids, (str, int, long)):
             return result and result[0] or False
         return result
@@ -1564,7 +1574,7 @@ class mail_message(osv.Model):
 
     def _find_allowed_model_wise(self, cr, uid, doc_model, doc_dict, context=None):
         if doc_model == 'calendar.event':
-            order =  context.get('order', self._order)
+            order = context.get('order', self._order)
             for virtual_id in self.pool[doc_model].get_recurrent_ids(cr, uid, doc_dict.keys(), [], order=order, context=context):
                 doc_dict.setdefault(virtual_id, doc_dict[get_real_ids(virtual_id)])
         return super(mail_message, self)._find_allowed_model_wise(cr, uid, doc_model, doc_dict, context=context)
@@ -1596,26 +1606,27 @@ class ir_http(osv.AbstractModel):
 
     def _auth_method_calendar(self):
         token = request.params['token']
-        db =  request.params['db']
+        db = request.params['db']
 
         registry = openerp.modules.registry.RegistryManager.get(db)
         attendee_pool = registry.get('calendar.attendee')
         error_message = False
         with registry.cursor() as cr:
-            attendee_id = attendee_pool.search(cr, openerp.SUPERUSER_ID, [('access_token','=',token)])
+            attendee_id = attendee_pool.search(cr, openerp.SUPERUSER_ID, [('access_token', '=', token)])
             if not attendee_id:
                 error_message = """Invalid Invitation Token."""
             elif request.session.uid and request.session.login != 'anonymous':
                  # if valid session but user is not match
                 attendee = attendee_pool.browse(cr, openerp.SUPERUSER_ID, attendee_id[0])
                 user = registry.get('res.users').browse(cr, openerp.SUPERUSER_ID, request.session.uid)
-                if attendee.partner_id.id  != user.partner_id.id:
-                    error_message  = """Invitation cannot be forwarded via email. This event/meeting belongs to %s and you are logged in as %s. Please ask organizer to add you.""" % (attendee.email, user.email)
+                if attendee.partner_id.id != user.partner_id.id:
+                    error_message = """Invitation cannot be forwarded via email. This event/meeting belongs to %s and you are logged in as %s. Please ask organizer to add you.""" % (attendee.email, user.email)
 
         if error_message:
             raise BadRequest(error_message)
         return True
 
+
 class invite_wizard(osv.osv_memory):
     _inherit = 'mail.wizard.invite'
 
diff --git a/addons/calendar/calendar_data.xml b/addons/calendar/calendar_data.xml
index cf00059913d..94ee9616ce1 100644
--- a/addons/calendar/calendar_data.xml
+++ b/addons/calendar/calendar_data.xml
@@ -151,50 +151,58 @@
                                         </td>
                                         <td>
                                             <table cellspacing="0" cellpadding="0" border="0" style="margin-top: 15px; margin-left: 10px;font-size: 16px;">
-                                                % if object.event_id.location:
-                                                    <tr style=" height: 30px;">
+                                                    <tr>
                                                         <td style="vertical-align:top;">
-                                                            <div style="height: 25px; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                Where
-                                                            </div>
-                                                        </td>
-                                                        <td colspan="1" style="vertical-align:top;">
-                                                            <div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;   font-size: 14px" >
-                                                                : ${object.event_id.location}
-                                                                <span style= "color:#A9A9A9; ">(<a href="http://maps.google.com/maps?oi=map&q=${object.event_id.location}">View Map</a>)
-                                                                    </span>
-                                                            </div>
+                                                            % if object.event_id.location:
+                                                                <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    Where
+                                                                </div>
+                                                            % endif
                                                         </td>
+                                                        <td  style="vertical-align:top;">
+                                                            % if object.event_id.location:
+                                                                <div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;   font-size: 14px" >
+                                                                    : ${object.event_id.location}
+                                                                    <span style= "color:#A9A9A9; ">(<a href="http://maps.google.com/maps?oi=map&q=${object.event_id.location}">View Map</a>)
+                                                                        </span>
+                                                                </div>
+                                                            % endif
+                                                        </td>                                                        
                                                     </tr> 
-                                                % endif
-                                                % if object.event_id.description :
-                                                    <tr style=" height:auto;">
+                                                                                                
+                                                    <tr>
                                                         <td style="vertical-align:top;">
-                                                            <div style="height:auto; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                What
-                                                            </div>
+                                                            % if object.event_id.description :
+                                                                <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    What
+                                                                </div>
+                                                            % endif
                                                         </td>
-                                                        <td colspan="3" style="vertical-align:text-top;">
-                                                            <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                : ${object.event_id.description}
-                                                            </div>
+                                                        <td style="vertical-align:text-top;">
+                                                            % if object.event_id.description :
+                                                                <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    : ${object.event_id.description}
+                                                                </div>
+                                                            % endif
                                                         </td>
                                                     </tr>
-                                                % endif
-                                                % if not object.event_id.allday and object.event_id.duration:
-                                                    <tr style=" height:auto;">
+                                                                                                
+                                                    <tr>
                                                         <td style="vertical-align:top;">
-                                                            <div style="height:auto; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                Duration
-                                                            </div>
+                                                            % if not object.event_id.allday and object.event_id.duration:
+                                                                <div style="height:auto; width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    Duration
+                                                                </div>
+                                                            % endif
                                                         </td>
                                                         <td colspan="3" style="vertical-align:text-top;">
-                                                            <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
-                                                            </div>
+                                                            % if not object.event_id.allday and object.event_id.duration:
+                                                                <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
+                                                                </div>
+                                                            % endif
                                                         </td>
-                                                    </tr>
-                                                % endif  
+                                                    </tr>                                                
                                                 <tr style=" height: 30px;">
                                                     <td style="height: 25px;width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
                                                         <div>
@@ -219,9 +227,9 @@
                                 </table>
                             </div>
                             <div style="height: auto;width:450px; margin:0 auto;padding-top:20px;padding-bottom:40px;">
-                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#8A89BA;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="${ctx['base_url']}/calendar/meeting/accept?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">Accept</a>
-                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#808080;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="${ctx['base_url']}/calendar/meeting/decline?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">Decline</a>
-                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#D8D8D8;text-decoration: none;color:#FFFFFF;" href="${ctx['base_url']}/calendar/meeting/view?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">View</a>
+                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#8A89BA;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/accept?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">Accept</a>
+                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#808080;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/decline?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">Decline</a>
+                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#D8D8D8;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/view?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">View</a>
                             </div> 
                         </div>
                     </body>
@@ -261,11 +269,11 @@
                             <div style="height: 50px;text-align: left;font-size : 14px;border-collapse: separate;margin-top:10px">
                                 <strong style="margin-left:12px">Hello ${object.cn}</strong> ,<br/>
                                 <p style="margin-left:12px">The date of the meeting has been changed...<br/>
-                                The meeting created by ${object.event_id.user_id.partner_id.name} is now scheduled for : ${object.event_id.date}.</p>
+                                The meeting created by ${object.event_id.user_id.partner_id.name} is now scheduled for : ${object.event_id.display_time}.</p>
                             </div>
                             <div style="height: auto;margin-left:12px;margin-top:30px;">
                                 <table>
-                                    <tr>
+                                    <tr>                                        
                                         <td>
                                             <div style="border-top-left-radius:3px;border-top-right-radius:3px;font-size:12px;border-collapse:separate;text-align:center;font-weight:bold;color:#ffffff;width:130px;min-height: 18px;border-color:#ffffff;background:#8a89ba;padding-top: 4px;">${object.event_id.get_interval(object.event_id.date, 'dayname')}</div>
                                             <div style="font-size:48px;min-height:auto;font-weight:bold;text-align:center;color: #5F5F5F;background-color: #E1E2F8;width: 130px;">
@@ -276,50 +284,58 @@
                                         </td>
                                         <td>
                                             <table cellspacing="0" cellpadding="0" border="0" style="margin-top: 15px; margin-left: 10px;font-size: 16px;">
-                                                % if object.event_id.location:
-                                                    <tr style=" height: 30px;">
+                                                    <tr>
                                                         <td style="vertical-align:top;">
-                                                            <div style="height: 25px; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                Where
-                                                            </div>
-                                                        </td>
-                                                        <td colspan="1" style="vertical-align:top;">
-                                                            <div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;   font-size: 14px" >
-                                                                : ${object.event_id.location}
-                                                                <span style= "color:#A9A9A9; ">(<a href="http://maps.google.com/maps?oi=map&q=${object.event_id.location}">View Map</a>)
-                                                                    </span>
-                                                            </div>
+                                                            % if object.event_id.location:
+                                                                <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    Where
+                                                                </div>
+                                                            % endif
                                                         </td>
+                                                        <td  style="vertical-align:top;">
+                                                            % if object.event_id.location:
+                                                                <div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;   font-size: 14px" >
+                                                                    : ${object.event_id.location}
+                                                                    <span style= "color:#A9A9A9; ">(<a href="http://maps.google.com/maps?oi=map&q=${object.event_id.location}">View Map</a>)
+                                                                        </span>
+                                                                </div>
+                                                            % endif
+                                                        </td>                                                        
                                                     </tr> 
-                                                % endif
-                                                % if object.event_id.description :
-                                                    <tr style=" height:auto;">
+                                                                                                
+                                                    <tr>
                                                         <td style="vertical-align:top;">
-                                                            <div style="height:auto; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                What
-                                                            </div>
+                                                            % if object.event_id.description :
+                                                                <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    What
+                                                                </div>
+                                                            % endif
                                                         </td>
-                                                        <td colspan="3" style="vertical-align:text-top;">
-                                                            <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                : ${object.event_id.description}
-                                                            </div>
+                                                        <td style="vertical-align:text-top;">
+                                                            % if object.event_id.description :
+                                                                <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    : ${object.event_id.description}
+                                                                </div>
+                                                            % endif
                                                         </td>
                                                     </tr>
-                                                % endif
-                                                % if not object.event_id.allday and object.event_id.duration:
-                                                    <tr style=" height:auto;">
+                                                                                                
+                                                    <tr>
                                                         <td style="vertical-align:top;">
-                                                            <div style="height:auto; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                Duration
-                                                            </div>
+                                                            % if not object.event_id.allday and object.event_id.duration:
+                                                                <div style="height:auto; width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    Duration
+                                                                </div>
+                                                            % endif
                                                         </td>
                                                         <td colspan="3" style="vertical-align:text-top;">
-                                                            <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
-                                                            </div>
+                                                            % if not object.event_id.allday and object.event_id.duration:
+                                                                <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
+                                                                </div>
+                                                            % endif
                                                         </td>
-                                                    </tr>
-                                                % endif  
+                                                    </tr>                                                
                                                 <tr style=" height: 30px;">
                                                     <td style="height: 25px;width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
                                                         <div>
@@ -341,12 +357,12 @@
                                             </table>
                                         </td>
                                     </tr>
-                                </table>
+                                </table>                                      
                             </div>
                             <div style="height: auto;width:450px; margin:0 auto;padding-top:20px;padding-bottom:40px;">
-                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#8A89BA;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="${ctx['base_url']}/calendar/meeting/accept?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">Accept</a>
-                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#808080;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="${ctx['base_url']}/calendar/meeting/decline?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">Decline</a>
-                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#D8D8D8;text-decoration: none;color:#FFFFFF;" href="${ctx['base_url']}/calendar/meeting/view?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">View</a>
+                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#8A89BA;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/accept?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">Accept</a>
+                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#808080;margin : 0 15px 0 0;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/decline?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">Decline</a>
+                                    <a style="padding: 8px 30px 8px 30px;border-radius: 6px;border: 1px solid #CCCCCC;background:#D8D8D8;text-decoration: none;color:#FFFFFF;" href="/calendar/meeting/view?db=${ctx['dbname']}&token=${object.access_token}&action=${ctx['action_id']}&id=${object.event_id.id}">View</a>
                             </div>                             
                         </div>
                     </body>
@@ -400,50 +416,58 @@
                                         </td>
                                         <td>
                                             <table cellspacing="0" cellpadding="0" border="0" style="margin-top: 15px; margin-left: 10px;font-size: 16px;">
-                                                % if object.event_id.location:
-                                                    <tr style=" height: 30px;">
+                                                    <tr>
                                                         <td style="vertical-align:top;">
-                                                            <div style="height: 25px; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                Where
-                                                            </div>
-                                                        </td>
-                                                        <td colspan="1" style="vertical-align:top;">
-                                                            <div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;   font-size: 14px" >
-                                                                : ${object.event_id.location}
-                                                                <span style= "color:#A9A9A9; ">(<a href="http://maps.google.com/maps?oi=map&q=${object.event_id.location}">View Map</a>)
-                                                                    </span>
-                                                            </div>
+                                                            % if object.event_id.location:
+                                                                <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    Where
+                                                                </div>
+                                                            % endif
                                                         </td>
+                                                        <td  style="vertical-align:top;">
+                                                            % if object.event_id.location:
+                                                                <div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;   font-size: 14px" >
+                                                                    : ${object.event_id.location}
+                                                                    <span style= "color:#A9A9A9; ">(<a href="http://maps.google.com/maps?oi=map&q=${object.event_id.location}">View Map</a>)
+                                                                        </span>
+                                                                </div>
+                                                            % endif
+                                                        </td>                                                        
                                                     </tr> 
-                                                % endif
-                                                % if object.event_id.description :
-                                                    <tr style=" height:auto;">
+                                                                                                
+                                                    <tr>
                                                         <td style="vertical-align:top;">
-                                                            <div style="height:auto; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                What
-                                                            </div>
+                                                            % if object.event_id.description :
+                                                                <div style="width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    What
+                                                                </div>
+                                                            % endif
                                                         </td>
-                                                        <td colspan="3" style="vertical-align:text-top;">
-                                                            <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                : ${object.event_id.description}
-                                                            </div>
+                                                        <td style="vertical-align:text-top;">
+                                                            % if object.event_id.description :
+                                                                <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    : ${object.event_id.description}
+                                                                </div>
+                                                            % endif
                                                         </td>
                                                     </tr>
-                                                % endif
-                                                % if not object.event_id.allday and object.event_id.duration:
-                                                    <tr style=" height:auto;">
+                                                                                                
+                                                    <tr>
                                                         <td style="vertical-align:top;">
-                                                            <div style="height:auto; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                Duration
-                                                            </div>
+                                                            % if not object.event_id.allday and object.event_id.duration:
+                                                                <div style="height:auto; width: 120px; background : #CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    Duration
+                                                                </div>
+                                                            % endif
                                                         </td>
                                                         <td colspan="3" style="vertical-align:text-top;">
-                                                            <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
-                                                                : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
-                                                            </div>
+                                                            % if not object.event_id.allday and object.event_id.duration:
+                                                                <div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
+                                                                    : ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}
+                                                                </div>
+                                                            % endif
                                                         </td>
-                                                    </tr>
-                                                % endif  
+                                                    </tr>                                                
                                                 <tr style=" height: 30px;">
                                                     <td style="height: 25px;width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
                                                         <div>
diff --git a/addons/calendar/calendar_demo.xml b/addons/calendar/calendar_demo.xml
index 6880754cc56..4ac308a29c2 100644
--- a/addons/calendar/calendar_demo.xml
+++ b/addons/calendar/calendar_demo.xml
@@ -6,20 +6,7 @@
     -->
 
     <!--For Meetings -->
-        <record id="res_partner_another" model="res.partner">
-            <field name="name">Arshaw</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="customer" eval="False"/>
-            <field name="email">fullcalendar@example.com</field>
-        </record>
-        <record id="res_user_another" model="res.users">
-            <field name="name" >Second Demo User</field>
-            <field name="login" >Second Demo User</field>
-            <field name="partner_id" ref="res_partner_another"/>
-            <field name="company_id" ref="base.main_company" />
-        </record>    
-
-        <record id="cal_contact_1" model="calendar.contacts">
+         <record id="cal_contact_1" model="calendar.contacts">
             <field eval="1" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_1"/>            
@@ -33,7 +20,7 @@
         <record id="calendar_event_1" model="calendar.event">
             <field eval="1" name="active"/>
             <field name="user_id" ref="base.user_root"/>
-            <field name="partner_ids" eval="[(6,0,[ref('base.partner_root'),ref('base.res_partner_1'),ref('base.res_partner_6')])]"/>
+            <field name="partner_ids" eval="[(6,0,[ref('base.res_partner_6')])]"/>
             <field name="name">Follow-up for Project proposal</field>
             <field name="description">Meeting to discuss project plan and hash out the details of implementation.</field>
             <field eval="time.strftime('%Y-%m-03 10:20:00')" name="date"/>
@@ -105,8 +92,8 @@
 
         <record id="calendar_event_7" model="calendar.event">
             <field eval="1" name="active"/>
-            <field name="user_id" ref="res_user_another"/>            
-            <field name="partner_ids" eval="[(6,0,[ref('res_partner_another'),ref('base.res_partner_8')])]"/>
+            <field name="user_id" ref="base.user_demo"/>            
+            <field name="partner_ids" eval="[(6,0,[ref('base.res_partner_7')])]"/>
             <field name="name">Presentation of the new Calendar</field>
             <field name="categ_ids" eval="[(6,0,[ref('categ_meet1'), ref('categ_meet2')])]"/>
             <field eval="time.strftime('%Y-%m-16 6:00:00')" name="date"/>
@@ -114,18 +101,7 @@
             <field eval="8.5" name="duration"/>
             <field name="state">draft</field>
         </record>
-        
-        <record id="calendar_event_8" model="calendar.event">
-            <field eval="1" name="active"/>
-            <field name="user_id" ref="res_user_another"/>            
-            <field name="partner_ids" eval="[(6,0,[ref('res_partner_another'),ref('base.partner_root')])]"/>
-            <field name="name">Discuss about the module : Calendar </field>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet1'), ref('categ_meet2')])]"/>
-            <field eval="time.strftime('%Y-%m-16 6:00:00')" name="date"/>
-            <field eval="time.strftime('%Y-%m-16 18:30:00')" name="date_deadline"/>
-            <field eval="8.5" name="duration"/>
-            <field name="state">draft</field>
-        </record>
+
 
     </data>
 </openerp>
diff --git a/addons/calendar/calendar_view.xml b/addons/calendar/calendar_view.xml
index 01c4b596592..a69c2c4b711 100644
--- a/addons/calendar/calendar_view.xml
+++ b/addons/calendar/calendar_view.xml
@@ -51,21 +51,26 @@
                     </div>
                     <notebook>
                         <page string="Meeting Details">
+                            <group attrs="{'invisible': [('recurrency','==',False)]}" class="oe_edit_only ">
+                                <p class='alert alert-warning'> This event is linked to a recurrence...<br/>
+                                    <button type="object" name="open_after_detach_event"  string="Update only this instance"  help="Click here to update only this instance and not all recurrences. " class="oe_link"/>
+                                </p>
+                            </group>
                             <group>
                                 <group>
                                     <field name="date" string="Starting at" on_change="onchange_dates(date, duration, False, allday)"/>
                                     <label for="duration"/>
                                     <div>
                                         <field name="duration" widget="float_time"
-                                            on_change="onchange_dates(date,duration,False,allday)"
+                                            on_change="onchange_dates(date, duration, False, allday)"
                                             class="oe_inline" attrs="{'invisible': [('allday','=',True)]}"/>
                                         <label string="hours" attrs="{'invisible': [('allday','=',True)]}"/>
-                                        (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
+                                        (<field name="allday"  class="oe_inline"/>
                                         <label for="allday" string="All Day?"/>)
                                     </div>
                                     <field name="date_deadline" groups="base.group_no_one"
                                         attrs="{'invisible': ['|', ('allday','=',True), ('duration','&lt;', 24)]}"
-                                        on_change="onchange_dates(date,False,date_deadline)"/>
+                                        />
                                 </group>
                                 <group>
                                     <field name="categ_ids" widget="many2many_tags"/>
@@ -121,10 +126,10 @@
                                         </div>
                                     </group>
                                 </group>
-                                <group>                                    
+                                <group>
                                     <field name="class"/>
                                     <field name="show_as"/>
-                                    <field name="rrule" invisible="1" readonly="0" />
+                                    <field name="rrule" invisible="1" readonly="0" />                                    
                                     <field name="recurrent_id" invisible="1" />
                                 </group>
                             </group>
@@ -136,7 +141,7 @@
                                 <tree string="Invitation details" editable="top" create="false" delete="false">
                                     <field name="partner_id" />
                                     <field name="state" />
-                                    <field name="email" widget="email"/>                                   
+                                    <field name="email" widget="email"/>
                                      
                                     <button name="do_tentative" states="needsAction,declined,accepted" string="Uncertain" type="object" icon="terp-crm" />
                                     <button name="do_accept" string="Accept" states="needsAction,tentative,declined" type="object" icon="gtk-apply"/>
@@ -176,7 +181,7 @@
                         <field name="date" string="Start" />
                         <field name="duration" string="Duration" widget="float_time" attrs="{'invisible': [('allday','=',True)]}"/>
                         <field name="allday" class="oe_inline" attrs="{'invisible': [('allday','=',False)]}"/>
-                        <field name="partner_ids" widget="many2manyattendee" string="Attendees"/>                                                                        
+                        <field name="partner_ids" widget="many2manyattendee" string="Attendees"/>
                     </group>
                     <group>
                         <field name="categ_ids" widget="many2many_tags"/>
@@ -213,7 +218,7 @@
         <field name="name">Meetings Calendar</field>
         <field name="model">calendar.event</field>
         <field name="priority" eval="2"/>
-        <field name="arch" type="xml">                          
+        <field name="arch" type="xml">
             <calendar string="Meetings" date_start="date" date_stop="date_deadline" date_delay="duration" all_day="allday" 
                          display="[name]" color="color_partner_id" attendee="partner_ids" avatar_model="res.partner"
                          use_contacts="True" event_open_popup="%(calendar.view_calendar_event_form_popup)s">
@@ -248,14 +253,14 @@
                 <field name="user_id"/>
                 <field name="show_as"/>
                 <field name="class" string="Privacy"/>
-                <filter icon="terp-go-today" string="My Events" domain="[('user_id','=',uid)]" help="My Events"/>                
+                <filter icon="terp-go-today" string="My Events" domain="[('user_id','=',uid)]" help="My Events"/>
                 <filter string="My Meetings" help="My Meetings" name="mymeetings" context='{"mymeetings": 1}'/>
                 <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
-                <separator/>                
+                <separator/>
                 <group expand="0" string="Group By...">
                     <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                     <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'show_as'}"/>
-                    <filter string="Privacy" icon="terp-locked" domain="[]" context="{'group_by':'class'}"/>                    
+                    <filter string="Privacy" icon="terp-locked" domain="[]" context="{'group_by':'class'}"/>
                     <filter string="Event Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" help="Start Date of Event by Month"/>
                 </group>
             </search>
@@ -267,8 +272,7 @@
         <field name="res_model">calendar.event</field>
         <field name="view_mode">calendar,tree,form,gantt</field>
         <field name="view_id" ref="view_calendar_event_calendar"/>
-        <field name="search_view_id" ref="view_calendar_event_search"/>       
-        <field name="context">{"search_default_mymeetings": 1}</field>
+        <field name="search_view_id" ref="view_calendar_event_search"/>
         <field name="help" type="html">
           <p class="oe_view_nocontent_create">
             Click to schedule a new meeting.
@@ -313,7 +317,7 @@
         <field name="name">Meetings</field>
         <field name="res_model">calendar.event</field>
         <field name="view_mode">form,calendar,tree,gantt</field>
-        <field name="view_id" ref="view_calendar_event_form"/>        
+        <field name="view_id" ref="view_calendar_event_form"/>
     </record>
        
     
diff --git a/addons/calendar/contacts.py b/addons/calendar/contacts.py
index 2cd42b55d37..dc964554629 100644
--- a/addons/calendar/contacts.py
+++ b/addons/calendar/contacts.py
@@ -26,7 +26,7 @@ class calendar_contacts(osv.osv):
 
     _columns = {
         'user_id': fields.many2one('res.users','Me'),
-        'partner_id': fields.many2one('res.partner','Employee',required=True, domain=[('customer','=',True)]),
+        'partner_id': fields.many2one('res.partner','Employee',required=True, domain=[]),
         'active':fields.boolean('active'),        
      }
     _defaults = {
diff --git a/addons/calendar/contacts_view.xml b/addons/calendar/contacts_view.xml
index cf685f88d00..1d014fea1f6 100644
--- a/addons/calendar/contacts_view.xml
+++ b/addons/calendar/contacts_view.xml
@@ -16,6 +16,7 @@
             <field name="res_model">calendar.contacts</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
+            <field name="domain">[('user_id','=',uid)]</field>
             <field name="view_id" ref="view_calendar_contacts" />
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
diff --git a/addons/calendar/controllers/main.py b/addons/calendar/controllers/main.py
index 941c92dcc3d..98625be42da 100644
--- a/addons/calendar/controllers/main.py
+++ b/addons/calendar/controllers/main.py
@@ -1,21 +1,19 @@
 import simplejson
-import urllib
 import openerp
 import openerp.addons.web.http as http
 from openerp.addons.web.http import request
 import openerp.addons.web.controllers.main as webmain
 import json
-from openerp.addons.web.http import SessionExpiredException
-from werkzeug.exceptions import BadRequest
+
 
 class meeting_invitation(http.Controller):
 
     @http.route('/calendar/meeting/accept', type='http', auth="calendar")
-    def accept(self, db, token, action, id,**kwargs):
+    def accept(self, db, token, action, id, **kwargs):
         registry = openerp.modules.registry.RegistryManager.get(db)
         attendee_pool = registry.get('calendar.attendee')
         with registry.cursor() as cr:
-            attendee_id = attendee_pool.search(cr, openerp.SUPERUSER_ID, [('access_token','=',token),('state','!=', 'accepted')])
+            attendee_id = attendee_pool.search(cr, openerp.SUPERUSER_ID, [('access_token', '=', token), ('state', '!=', 'accepted')])
             if attendee_id:
                 attendee_pool.do_accept(cr, openerp.SUPERUSER_ID, attendee_id)
         return self.view(db, token, action, id, view='form')
@@ -25,7 +23,7 @@ class meeting_invitation(http.Controller):
         registry = openerp.modules.registry.RegistryManager.get(db)
         attendee_pool = registry.get('calendar.attendee')
         with registry.cursor() as cr:
-            attendee_id = attendee_pool.search(cr, openerp.SUPERUSER_ID, [('access_token','=',token),('state','!=', 'declined')])
+            attendee_id = attendee_pool.search(cr, openerp.SUPERUSER_ID, [('access_token', '=', token), ('state', '!=', 'declined')])
             if attendee_id:
                 attendee_pool.do_decline(cr, openerp.SUPERUSER_ID, attendee_id)
         return self.view(db, token, action, id, view='form')
@@ -36,13 +34,13 @@ class meeting_invitation(http.Controller):
         meeting_pool = registry.get('calendar.event')
         attendee_pool = registry.get('calendar.attendee')
         with registry.cursor() as cr:
-            attendee_data = meeting_pool.get_attendee(cr, openerp.SUPERUSER_ID, id);
-            attendee = attendee_pool.search_read(cr, openerp.SUPERUSER_ID, [('access_token','=',token)],[])
-        
+            attendee_data = meeting_pool.get_attendee(cr, openerp.SUPERUSER_ID, id)
+            attendee = attendee_pool.search_read(cr, openerp.SUPERUSER_ID, [('access_token', '=', token)], [])
+
         if attendee:
             attendee_data['current_attendee'] = attendee[0]
         js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in webmain.manifest_list('js', db=db))
-        css = "\n       ".join('<link rel="stylesheet" href="%s">' % i for i in webmain.manifest_list('css',db=db))
+        css = "\n       ".join('<link rel="stylesheet" href="%s">' % i for i in webmain.manifest_list('css', db=db))
 
         return webmain.html_template % {
             'js': js,
@@ -50,7 +48,7 @@ class meeting_invitation(http.Controller):
             'modules': simplejson.dumps(webmain.module_boot(db)),
             'init': "s.calendar.event('%s', '%s', '%s', '%s' , '%s');" % (db, action, id, 'form', json.dumps(attendee_data)),
         }
-    
+
     # Function used, in RPC to check every 5 minutes, if notification to do for an event or not
     @http.route('/calendar/notify', type='json', auth="none")
     def notify(self):
@@ -58,15 +56,14 @@ class meeting_invitation(http.Controller):
         uid = request.session.uid
         context = request.session.context
         with registry.cursor() as cr:
-            res = registry.get("calendar.alarm_manager").get_next_notif(cr,uid,context=context)
+            res = registry.get("calendar.alarm_manager").get_next_notif(cr, uid, context=context)
             return res
-                
+
     @http.route('/calendar/notify_ack', type='json', auth="none")
     def notify_ack(self, type=''):
         registry = openerp.modules.registry.RegistryManager.get(request.session.db)
         uid = request.session.uid
         context = request.session.context
         with registry.cursor() as cr:
-            res = registry.get("res.partner").calendar_last_notif(cr,uid,context=context)
+            res = registry.get("res.partner").calendar_last_notif_ack(cr, uid, context=context)
             return res
-
diff --git a/addons/calendar/static/src/js/base_calendar.js b/addons/calendar/static/src/js/base_calendar.js
index 0f5693eacbc..eed958e20d9 100644
--- a/addons/calendar/static/src/js/base_calendar.js
+++ b/addons/calendar/static/src/js/base_calendar.js
@@ -1,18 +1,21 @@
 openerp.calendar = function(instance) {
     var _t = instance.web._t;
     var QWeb = instance.web.qweb;
-    instance.calendar = {}
+
+    instance.calendar = {};
     
 
     instance.web.WebClient = instance.web.WebClient.extend({
+        
+
         get_notif_box: function(me) {
             return $(me).closest(".ui-notify-message-style");
         },
         get_next_notif: function() {
             var self= this;
             this.rpc("/calendar/notify")
-            .then( 
-                function(result) { 
+            .done(
+                function(result) {
                     _.each(result,  function(res) {
                         setTimeout(function() {
                             //If notification not already displayed, we add button and action on it
@@ -21,44 +24,56 @@ openerp.calendar = function(instance) {
                                 res.message += QWeb.render("notify_footer");
                                 a = self.do_notify(res.title,res.message,true);
                                 
-                                $(".link2event").on('click', function() { 
+                                $(".link2event").on('click', function() {
                                     self.rpc("/web/action/load", {
                                         action_id: "calendar.action_calendar_event_notify",
-                                    }).then( function(r) { 
+                                    }).then( function(r) {
                                         r.res_id = res.event_id;
-                                        return self.action_manager.do_action(r);                                         
-                                    });                                    
+                                        return self.action_manager.do_action(r);
+                                    });
                                 });
-                                a.element.find(".link2recall").on('click',function() { 
+                                a.element.find(".link2recall").on('click',function() {
                                     self.get_notif_box(this).find('.ui-notify-close').trigger("click");
-                                });                                
-                                a.element.find(".link2showed").on('click',function() { 
+                                });
+                                a.element.find(".link2showed").on('click',function() {
                                     self.get_notif_box(this).find('.ui-notify-close').trigger("click");
                                     self.rpc("/calendar/notify_ack");
                                 });
                             }
                             //If notification already displayed in the past, we remove the css attribute which hide this notification
                             else if (self.get_notif_box($.find(".eid_"+res.event_id)).attr("style") !== ""){
-                                self.get_notif_box($.find(".eid_"+res.event_id)).attr("style","");                                
+                                self.get_notif_box($.find(".eid_"+res.event_id)).attr("style","");
                             }
                         },res.timer * 1000);
                     });
                 }
-            );
+            )
+            .fail(function (err, ev) {
+                if (err.code === -32098) {
+                    // Prevent the CrashManager to display an error
+                    // in case of an xhr error not due to a server error
+                    ev.preventDefault();
+                }
+            });
         },
         check_notifications: function() {
             var self= this;
-            self.get_next_notif();                        
-            setInterval(function(){
+            self.get_next_notif();
+            self.intervalNotif = setInterval(function(){
                 self.get_next_notif();
-            }, 5 * 60  * 1000 );
+            }, 5 * 60 * 1000 );
         },
         
         //Override the show_application of addons/web/static/src/js/chrome.js       
         show_application: function() {
             this._super();
             this.check_notifications();
-        }
+        },
+        //Override addons/web/static/src/js/chrome.js       
+        on_logout: function() {
+            this._super();
+            clearInterval(self.intervalNotif);
+        },
     });
     
 
@@ -77,7 +92,6 @@ openerp.calendar = function(instance) {
             if(instance.session.session_is_valid(self.db) && instance.session.username != "anonymous") {
                 self.redirect_meeting_view(self.db,self.action,self.id,self.view);
             } else {
-                alert('in anonymous or null ');
                 self.open_invitation_form(self.attendee_data);
             }
         },
@@ -92,9 +106,8 @@ openerp.calendar = function(instance) {
             
             var reload_page = function(){
                 return location.replace(action_url);
-            }
+            };
             reload_page();
-
         },
     });
 
@@ -108,7 +121,7 @@ openerp.calendar = function(instance) {
             });
         },
         map_tag: function(value){
-            return _.map(value, function(el) {return {name: el[1], id:el[0], state: el[2]};})
+            return _.map(value, function(el) {return {name: el[1], id:el[0], state: el[2]};});
         },
         get_render_data: function(ids){
             var self = this;
@@ -121,7 +134,7 @@ openerp.calendar = function(instance) {
             if (! self.get("effective_readonly")) {
                 var tag_element = self.tags.tagElements();
                 _.each(data,function(value, key){
-                    $(tag_element[key]).find(".custom-edit").addClass(data[key][2])
+                    $(tag_element[key]).find(".custom-edit").addClass(data[key][2]);
                 });
             }
         }
@@ -134,7 +147,7 @@ openerp.calendar = function(instance) {
         instance.session.session_bind(instance.session.origin).done(function () {
             new instance.calendar.invitation(null,db,action,id,view,attendee_data).appendTo($("body").addClass('openerp'));
         });
-    }
+    };
     
     
     
diff --git a/addons/calendar/test/calendar_test.yml b/addons/calendar/test/calendar_test.yml
index 4888c94a0c5..1454a635a4f 100644
--- a/addons/calendar/test/calendar_test.yml
+++ b/addons/calendar/test/calendar_test.yml
@@ -33,12 +33,14 @@
     !python {model: calendar.event}: |
      ids = self.search(cr, uid, [('date', '>=', '2011-04-30 16:00:00'), ('date', '<=', '2011-05-31 00:00:00')], context={'virtual_id': True} )
      before = self.search(cr, uid, [('date', '>=', '2011-04-30 16:00:00'), ('date', '<=', '2011-05-31 00:00:00')], context={'virtual_id': False})
-     self.write(cr, uid,[ids[1]], {'name':'New Name','recurrency' : True}, context={'virtual_id': True})     
+     # We start by detach the event
+     newid = self._detach_one_event(cr, uid,ids[1])
+     self.write(cr, uid,[newid], {'name':'New Name','recurrency' : True}, context={'virtual_id': True})
      after = self.search(cr, uid, [('date', '>=', '2011-04-30 16:00:00'), ('date', '<=', '2011-05-31 00:00:00')], context={'virtual_id': False})
      assert len(after) == len(before)+1, 'Wrong number of events found, after to have moved a virtual event'
-     new_id = list(set(after)-set(before))[0]    
+     new_id = list(set(after)-set(before))[0]
      new_event = self.browse(cr,uid,new_id,context=context)
-     assert new_event.recurrent_id == before[0], 'Recurrent_id not correctly passed to the new event'          
+     assert new_event.recurrent_id == before[0], 'Recurrent_id not correctly passed to the new event'
 -
   Now I will make All day event and test it
 -
@@ -58,7 +60,6 @@
     duration: 1
     interval: days
     type: notification
-        
 -
   Now I will assign this reminder to all day event
 -
diff --git a/addons/calendar/test/test_calendar_recurrent_event_case2.yml b/addons/calendar/test/test_calendar_recurrent_event_case2.yml
index 6aedd3d966d..0d300cf7a2a 100644
--- a/addons/calendar/test/test_calendar_recurrent_event_case2.yml
+++ b/addons/calendar/test/test_calendar_recurrent_event_case2.yml
@@ -84,9 +84,12 @@
      idval = '%d-%s' % (ref('calendar_event_sprintreview0'), '20110425124700')
      self.write(cr, uid, [idval], {'description': 'Review code of the module: sync_google_calendar.'})
 -
-  I check whether the record is edited perfectly or not.
+  I check whether that all the records of this recurrence has been edited.
 -
   !python {model: calendar.event}: |
-     meeting_ids = self.search(cr, uid, [('recurrent_id', '=', ref('calendar_event_sprintreview0')), ('recurrent_id_date','=','2011-04-25 12:47:00')], context)
-     assert meeting_ids, 'Meeting is not edited !'
+     meeting_ids = self.search(cr, uid, [('recurrent_id', '=', ref('calendar_event_sprintreview0'))], context)
+     meetings = self.browse(cr, uid, meeting_ids, context)
+     for meeting in meetings:
+        assert meeting.description == 'Review code of the module: sync_google_calendar.', 'Description not changed for id: %s' %meeting.id
+        
 
diff --git a/addons/crm/calendar_event.py b/addons/crm/calendar_event.py
index df50d99b72b..d505be1b174 100644
--- a/addons/crm/calendar_event.py
+++ b/addons/crm/calendar_event.py
@@ -23,15 +23,13 @@ from openerp.osv import fields, osv
 import logging
 _logger = logging.getLogger(__name__)
 
-#
-# calendar.event is defined in module calendar
-#
+
 class calendar_event(osv.Model):
     """ Model for Calendar Event """
     _inherit = 'calendar.event'
     _columns = {
-        'phonecall_id': fields.many2one ('crm.phonecall', 'Phonecall'),
-        'opportunity_id': fields.many2one ('crm.lead', 'Opportunity', domain="[('type', '=', 'opportunity')]"),
+        'phonecall_id': fields.many2one('crm.phonecall', 'Phonecall'),
+        'opportunity_id': fields.many2one('crm.lead', 'Opportunity', domain="[('type', '=', 'opportunity')]"),
     }
 
     def create(self, cr, uid, vals, context=None):
@@ -48,31 +46,11 @@ class calendar_attendee(osv.osv):
     _inherit = 'calendar.attendee'
     _description = 'Calendar Attendee'
 
-    def _compute_data(self, cr, uid, ids, name, arg, context=None):
-       """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of compute data’s IDs
-        @param context: A standard dictionary for contextual values
-        """
-       name = name[0]
-       result = super(calendar_attendee, self)._compute_data(cr, uid, ids, name, arg, context=context)
-
-       for attdata in self.browse(cr, uid, ids, context=context):
-            id = attdata.id
-            result[id] = {}
-            if name == 'categ_id':
-                if attdata.ref and 'categ_id' in attdata.ref._columns:
-                    result[id][name] = (attdata.ref.categ_id.id, attdata.ref.categ_id.name,)
-                else:
-                    result[id][name] = False
-       return result
+    def _noop(self, cr, uid, ids, name, arg, context=None):
+        return dict.fromkeys(ids, False)
 
     _columns = {
-        'categ_id': fields.function(_compute_data, \
-                        string='Event Type', type="many2one", \
-                        relation="crm.case.categ", multi='categ_id'),
+        'categ_id': fields.function(_noop, string='Event Type', deprecated="Unused Field - TODO : Remove it in trunk", type="many2one", relation="crm.case.categ"),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index a98fcadb959..20e2a6e8aff 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -120,13 +120,14 @@ class crm_case_section(osv.osv):
         month_begin = date.today().replace(day=1)
         section_result = [{
                           'value': 0,
-                          'tooltip': (month_begin + relativedelta.relativedelta(months=-i)).strftime('%B'),
+                          'tooltip': (month_begin + relativedelta.relativedelta(months=-i)).strftime('%B %Y'),
                           } for i in range(self._period_number - 1, -1, -1)]
         group_obj = obj.read_group(cr, uid, domain, read_fields, groupby_field, context=context)
+        pattern = tools.DEFAULT_SERVER_DATE_FORMAT if obj.fields_get(cr, uid, groupby_field)[groupby_field]['type'] == 'date' else tools.DEFAULT_SERVER_DATETIME_FORMAT
         for group in group_obj:
-            group_begin_date = datetime.strptime(group['__domain'][0][2], tools.DEFAULT_SERVER_DATE_FORMAT)
+            group_begin_date = datetime.strptime(group['__domain'][0][2], pattern)
             month_delta = relativedelta.relativedelta(month_begin, group_begin_date)
-            section_result[self._period_number - (month_delta.months + 1)] = {'value': group.get(value_field, 0), 'tooltip': group_begin_date.strftime('%B')}
+            section_result[self._period_number - (month_delta.months + 1)] = {'value': group.get(value_field, 0), 'tooltip': group.get(groupby_field, 0)}
         return section_result
 
     def _get_opportunities_data(self, cr, uid, ids, field_name, arg, context=None):
@@ -139,13 +140,18 @@ class crm_case_section(osv.osv):
         month_begin = date.today().replace(day=1)
         date_begin = month_begin - relativedelta.relativedelta(months=self._period_number - 1)
         date_end = month_begin.replace(day=calendar.monthrange(month_begin.year, month_begin.month)[1])
-        date_domain = [('create_date', '>=', date_begin.strftime(tools.DEFAULT_SERVER_DATE_FORMAT)), ('create_date', '<=', date_end.strftime(tools.DEFAULT_SERVER_DATE_FORMAT))]
+        lead_pre_domain = [('create_date', '>=', date_begin.strftime(tools.DEFAULT_SERVER_DATE_FORMAT)), 
+                              ('create_date', '<=', date_end.strftime(tools.DEFAULT_SERVER_DATE_FORMAT)),
+                              ('type', '=', 'lead')]
+        opp_pre_domain = [('date_deadline', '>=', date_begin.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)), 
+                      ('date_deadline', '<=', date_end.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)),
+                      ('type', '=', 'opportunity')]
         for id in ids:
             res[id] = dict()
-            lead_domain = date_domain + [('type', '=', 'lead'), ('section_id', '=', id)]
+            lead_domain = lead_pre_domain + [('section_id', '=', id)]
+            opp_domain = opp_pre_domain + [('section_id', '=', id)]
             res[id]['monthly_open_leads'] = self.__get_bar_values(cr, uid, obj, lead_domain, ['create_date'], 'create_date_count', 'create_date', context=context)
-            opp_domain = date_domain + [('type', '=', 'opportunity'), ('section_id', '=', id)]
-            res[id]['monthly_planned_revenue'] = self.__get_bar_values(cr, uid, obj, opp_domain, ['planned_revenue', 'create_date'], 'planned_revenue', 'create_date', context=context)
+            res[id]['monthly_planned_revenue'] = self.__get_bar_values(cr, uid, obj, opp_domain, ['planned_revenue', 'date_deadline'], 'planned_revenue', 'date_deadline', context=context)
         return res
 
     _columns = {
diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index bc066db0a7a..9db6afa2d97 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -65,9 +65,9 @@
        <record id="action_report_crm_lead_salesteam" model="ir.actions.act_window">
            <field name="name">Leads Analysis</field>
            <field name="res_model">crm.lead.report</field>
-           <field name="view_type">form</field>
            <field name="context">{"search_default_month":1}</field>
-           <field name="view_mode">tree,graph</field>
+           <field name="view_mode">graph</field>
+           <field name="view_id" ref="crm.view_report_crm_lead_graph_two"/>
            <field name="domain">[('type','=', 'lead'),('section_id', '=', active_id)]</field>
            <field name="help">Leads Analysis allows you to check different CRM related information like the treatment delays or number of leads per state. You can sort out your leads analysis by different groups to get accurate grained analysis.</field>
        </record>
@@ -75,9 +75,8 @@
        <record id="action_report_crm_opportunity_salesteam" model="ir.actions.act_window">
             <field name="name">Opportunities Analysis</field>
             <field name="res_model">crm.lead.report</field>
-            <field name="view_type">form</field>
-            <field name="context">{"search_default_month":1}</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="crm.view_report_crm_opportunity_graph"/>
             <field name="domain">[('type','=', 'opportunity'), ('section_id', '=', active_id)]</field>
             <field name="help">Opportunities Analysis gives you an instant access to your opportunities with information such as the expected revenue, planned cost, missed deadlines or the number of interactions per opportunity. This report is mainly used by the sales manager in order to do the periodic review with the teams of the sales pipeline.</field>
         </record>
@@ -119,14 +118,14 @@
                                             <a name="%(crm_case_form_view_salesteams_lead)d" type="action">Leads</a>
                                             <a name="%(action_report_crm_lead_salesteam)d" type="action" class="oe_sparkline_bar_link">
                                                 <field name="monthly_open_leads" widget="sparkline_bar"
-                                                    options="{'height': '20px', 'barWidth': 4, 'barSpacing': 1, 'delayIn': '3000', 'tooltip_suffix': 'Leads'}">Open Leads per Month<br/>Click to see a detailed analysis of leads.</field>
+                                                    options="{'height': '20px', 'barWidth': 4, 'barSpacing': 1, 'delayIn': '3000', 'tooltip_suffix': ' Leads'}">Open Leads per Month<br/>Click to see a detailed analysis of leads.</field>
                                             </a>
                                         </div>
                                         <div class="oe_salesteams_opportunities">
                                             <a name="%(crm_case_form_view_salesteams_opportunity)d" type="action">Opportunities</a>
                                             <a name="%(action_report_crm_opportunity_salesteam)d" type="action">
                                                 <field name="monthly_planned_revenue" widget="sparkline_bar"
-                                                    options="{'height': '20px', 'barWidth': '4', 'barSpacing': '1', 'delayIn': '3000', 'tooltip_suffix': 'Opportunities'}">Planned Revenue per Month<br/>Click to see a detailed analysis of opportunities.</field>
+                                                    options="{'height': '20px', 'barWidth': '4', 'barSpacing': '1', 'delayIn': '3000', 'tooltip_suffix': ' (Planned Revenue)'}">Planned Revenue per Month<br/>Click to see a detailed analysis of opportunities.</field>
                                             </a>
                                         </div>
                                     </div>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index f0ea2623dac..adba78e6890 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -330,6 +330,7 @@ class crm_lead(format_address, osv.osv):
                 'phone': partner.phone,
                 'mobile': partner.mobile,
                 'fax': partner.fax,
+                'zip': partner.zip,
             }
         return {'value': values}
 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index c728404d9ce..e76a7a9124d 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -343,6 +343,7 @@
                             help="Leads that are assigned to any sales teams I am member of"/>
                     <filter string="Dead" name="dead"
                             domain="[('probability', '=', '0'), ('stage_id.fold', '=', True)]"/>
+                    <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator />
                     <filter string="Available for mass mailing"
                             name='not_opt_out' domain="[('opt_out', '=', False)]"
@@ -562,6 +563,7 @@
                     <filter string="My Team(s)"
                             domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
                             help="Opportunities that are assigned to any sales teams I am member of"/>
+                    <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <group expand="0" string="Group By..." colspan="16">
                         <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index a027a910520..9675913a0b5 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -171,6 +171,7 @@
                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
                <separator/>
                <filter string="Unassigned Phonecalls" icon="terp-personal-" domain="[('user_id','=',False)]" help="Unassigned Phonecalls"/>
+               <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                <separator/>
                <filter string="Phone Calls Assigned to Me or My Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('user_id', '=', uid)]"
                        help="Phone Calls Assigned to the current user or with a team having the current user as team leader"/>
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 871bef2099d..3a0786da5c7 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -89,10 +89,6 @@ class crm_lead_report(osv.osv):
                     id,
                     c.date_deadline,
 
-                    to_char(c.create_date, 'YYYY') as creation_year,
-                    to_char(c.create_date, 'MM') as creation_month,
-                    to_char(c.create_date, 'YYYY-MM-DD') as creation_day,
-
                     to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
                     to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
 
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index f25cfa1f4b1..c4cffdc012a 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -15,6 +15,17 @@
             </field>
         </record>
 
+        <record id="view_report_crm_lead_graph_two" model="ir.ui.view">
+            <field name="name">crm.lead.report.graph.two</field>
+            <field name="model">crm.lead.report</field>
+            <field name="arch" type="xml">
+                <graph string="Leads Analysis" type="pivot" stacked="True">
+                    <field name="create_date" type="row"/>
+                    <field name="user_id" type="col"/>
+                </graph>
+            </field>
+        </record>
+
         <record id="view_report_crm_opportunity_graph" model="ir.ui.view">
             <field name="name">crm.opportunity.report.graph</field>
             <field name="model">crm.lead.report</field>
@@ -23,7 +34,7 @@
                     <field name="date_deadline" type="row"/>
                     <field name="user_id" type="col"/>
                     <field name="stage_id" type="col"/>
-                    <field name="probable_revenue" type="measure"/>
+                    <field name="planned_revenue" type="measure"/>
                 </graph>
             </field>
         </record>
@@ -84,7 +95,7 @@
                         <filter string="Creation date (week)" icon="terp-go-year"
                             domain="[]" context="{'group_by':'create_date:week'}"/>
                         <filter string="Creation date (month)" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'create_date:month'}"/>
+                            domain="[]" context="{'group_by':'create_date:month'}" name="month"/>
                         <filter string="Creation date (year)" icon="terp-go-year"
                             domain="[]" context="{'group_by':'create_date:year'}"/>
                         <separator orientation="vertical" />
diff --git a/addons/crm/test/lead2opportunity_assign_salesmen.yml b/addons/crm/test/lead2opportunity_assign_salesmen.yml
index de88a96cb50..12d212ec5fd 100644
--- a/addons/crm/test/lead2opportunity_assign_salesmen.yml
+++ b/addons/crm/test/lead2opportunity_assign_salesmen.yml
@@ -65,7 +65,7 @@
   Salesman create a mass convert wizard and convert all the leads.
 -
   !python {model: crm.lead2opportunity.partner.mass}: |
-    context.update({'active_model': 'crm.lead', 'active_ids': [ref("test_crm_lead_01"), ref("test_crm_lead_02"), ref("test_crm_lead_03"), ref("test_crm_lead_04"), ref("test_crm_lead_05"), ref("test_crm_lead_06")], 'active_id': ref("test_crm_lead_01")})
+    context.update({'active_model': 'crm.lead', 'active_ids': [ref("test_crm_lead_01"), ref("test_crm_lead_02"), ref("test_crm_lead_03"), ref("test_crm_lead_04"), ref("test_crm_lead_05"), ref("test_crm_lead_06")], 'active_id': ref("test_crm_lead_01"), 'no_force_assignation': False})
     id = self.create(cr, uid, {'user_ids': [(6, 0, [ref('test_res_user_01'), ref('test_res_user_02'), ref('test_res_user_03'), ref('test_res_user_04')])], 'section_id': ref('crm.section_sales_department'), 'deduplicate': False}, context=context)
     self.mass_convert(cr, uid, [id], context=context)
 -
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index f779237ea71..33bdb46452d 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -46,12 +46,12 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         results = []
         if partner_id:
             # Search for opportunities that have the same partner and that arent done or cancelled
-            ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id), '|', ('probability', '=', False), ('probability', '<', '100')])
+            ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id), '|', ('stage_id.probability', '=', False), ('stage_id.probability', '<', '100')])
             for id in ids:
                 results.append(id)
         email = re.findall(r'([^ ,<@]+@[^> ,]+)', email or '')
         if email:
-            ids = lead_obj.search(cr, uid, [('email_from', '=ilike', email[0]), '|', ('probability', '=', False), ('probability', '<', '100')])
+            ids = lead_obj.search(cr, uid, [('email_from', '=ilike', email[0]), '|', ('stage_id.probability', '=', False), ('stage_id.probability', '<', '100')])
             for id in ids:
                 results.append(id)
         return list(set(results))
@@ -69,11 +69,10 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         if context.get('active_id'):
             tomerge = [int(context['active_id'])]
 
-            email = False
             partner_id = res.get('partner_id')
             lead = lead_obj.browse(cr, uid, int(context['active_id']), context=context)
+            email = lead.partner_id and lead.partner_id.email or lead.email_from
 
-            #TOFIX: use mail.mail_message.to_mail
             tomerge.extend(self._get_duplicated_leads(cr, uid, partner_id, email))
             tomerge = list(set(tomerge))
 
@@ -100,10 +99,8 @@ class crm_lead2opportunity_partner(osv.osv_memory):
             else:
                 user_in_section = False
             if not user_in_section:
-                section_id = False
-                section_ids = self.pool.get('crm.case.section').search(cr, uid, ['|', ('user_id', '=', user_id), ('member_ids', '=', user_id)], context=context)
-                if section_ids:
-                    section_id = section_ids[0]
+                result = self.pool['crm.lead'].on_change_user(cr, uid, ids, user_id, context=context)
+                section_id = result.get('value') and result['value'].get('section_id') and result['value']['section_id'] or False
         return {'value': {'section_id': section_id}}
 
     def view_init(self, cr, uid, fields, context=None):
@@ -126,14 +123,17 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         lead_ids = vals.get('lead_ids', [])
         team_id = vals.get('section_id', False)
         data = self.browse(cr, uid, ids, context=context)[0]
-        for lead_id in lead_ids:
-            partner_id = self._create_partner(cr, uid, lead_id, data.action, data.partner_id, context=context)
-            # FIXME: cannot pass user_ids as the salesman allocation only works in batch
-            res = lead.convert_opportunity(cr, uid, [lead_id], partner_id, [], team_id, context=context)
-        # FIXME: must perform salesman allocation in batch separately here
+        leads = lead.browse(cr, uid, lead_ids, context=context)
+        for lead_id in leads:
+            partner_id = self._create_partner(cr, uid, lead_id.id, data.action, lead_id.partner_id.id, context=context)
+            res = lead.convert_opportunity(cr, uid, [lead_id.id], partner_id, [], team_id, context=context)
         user_ids = vals.get('user_ids', False)
+        if context.get('no_force_assignation'):
+            leads_to_allocate = [lead_id.id for lead_id in leads if not lead_id.user_id]
+        else:
+            leads_to_allocate = lead_ids
         if user_ids:
-            lead.allocate_salesman(cr, uid, lead_ids, user_ids, team_id=team_id, context=context)
+            lead.allocate_salesman(cr, uid, leads_to_allocate, user_ids, team_id=team_id, context=context)
         return res
 
     def action_apply(self, cr, uid, ids, context=None):
@@ -144,15 +144,19 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         if context is None:
             context = {}
 
+        lead_obj = self.pool['crm.lead']
+
         w = self.browse(cr, uid, ids, context=context)[0]
         opp_ids = [o.id for o in w.opportunity_ids]
         if w.name == 'merge':
-            lead_id = self.pool.get('crm.lead').merge_opportunity(cr, uid, opp_ids, w.user_id.id, w.section_id.id, context=context)
+            lead_id = lead_obj.merge_opportunity(cr, uid, opp_ids, context=context)
             lead_ids = [lead_id]
-            lead = self.pool.get('crm.lead').read(cr, uid, lead_id, ['type'], context=context)
+            lead = lead_obj.read(cr, uid, lead_id, ['type', 'user_id'], context=context)
             if lead['type'] == "lead":
                 context.update({'active_ids': lead_ids})
                 self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids, 'user_ids': [w.user_id.id], 'section_id': w.section_id.id}, context=context)
+            elif not context.get('no_force_assignation') or not lead['user_id']:
+                lead_obj.write(cr, uid, lead_id, {'user_id': w.user_id.id, 'section_id': w.section_id.id}, context=context)
         else:
             lead_ids = context.get('active_ids', [])
             self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids, 'user_ids': [w.user_id.id], 'section_id': w.section_id.id}, context=context)
@@ -186,11 +190,13 @@ class crm_lead2opportunity_mass_convert(osv.osv_memory):
     _columns = {
         'user_ids':  fields.many2many('res.users', string='Salesmen'),
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'deduplicate': fields.boolean('Apply deduplication', help='Merge with existing leads/opportunities of each partner'),
+        'deduplicate': fields.boolean('Apply deduplication', help='Merge with existing leads/opportunities of each partner'),        
         'action': fields.selection([
                 ('each_exist_or_create', 'Use existing partner or create'),
                 ('nothing', 'Do not link to a customer')
             ], 'Related Customer', required=True),
+        # Uncomment me in trunk
+        # 'force_assignation': fields.boolean('Force assignation', help='If unchecked, this will leave the salesman of duplicated opportunities'),
     }
 
     _defaults = {
@@ -266,6 +272,10 @@ class crm_lead2opportunity_mass_convert(osv.osv_memory):
             active_ids = active_ids.difference(merged_lead_ids)
             active_ids = active_ids.union(remaining_lead_ids)
             ctx['active_ids'] = list(active_ids)
+        # Remove me in trunk
+        ctx['no_force_assignation'] = ctx.get('no_force_assignation', True) 
+        # Uncomment me in trunk
+        # ctx['no_force_assignation'] = not data.force_assignation
         return self.action_apply(cr, uid, ids, context=ctx)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 58fbe244ba4..0f8f676d92d 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -58,6 +58,8 @@
                     <group string="Assign opportunities to">
                         <field name="section_id" groups="base.group_multi_salesteams"/>
                         <field name="user_ids" widget="many2many_tags"/>
+                        <!-- Uncomment me in trunk -->
+                        <!-- <field name="force_assignation" /> -->
                     </group>
                     <label for="opportunity_ids" string="Leads with existing duplicates (for information)" help="Leads that you selected that have duplicates. If the list is empty, it means that no duplicates were found" attrs="{'invisible': [('deduplicate', '=', False)]}"/>
                     <group attrs="{'invisible': [('deduplicate', '=', False)]}">
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index d43993b8389..f88a6fe6f17 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Merge Leads/Opportunities" version="7.0">
                     <group string="Assign opportunities to">
-                        <field name="user_id" class="oe_inline" on_change="on_change_user(user_id, context)"/>
+                        <field name="user_id" class="oe_inline" on_change="on_change_user(user_id, section_id, context)"/>
                         <field name="section_id" class="oe_inline"/>
                     </group>
                     <group string="Select Leads/Opportunities">
diff --git a/addons/crm_partner_assign/crm_portal_view.xml b/addons/crm_partner_assign/crm_portal_view.xml
index 2b2b61c8425..dab831dcb4b 100644
--- a/addons/crm_partner_assign/crm_portal_view.xml
+++ b/addons/crm_partner_assign/crm_portal_view.xml
@@ -140,8 +140,8 @@
                       </group>
                       <group col="2">
                          <separator string="Categorization" colspan="2"/>
-                        <field name="type_id" widget="selection" readonly="1"/>
-                        <field name="channel_id" widget="selection" readonly="1"/>
+                        <field name="type_id" readonly="1"/>
+                        <field name="channel_id" readonly="1"/>
                       </group>
                     </group>
                     <separator string="Details" />
diff --git a/addons/crm_partner_assign/static/src/js/next.js b/addons/crm_partner_assign/static/src/js/next.js
index 73ef09edb2e..b3a4fff2732 100644
--- a/addons/crm_partner_assign/static/src/js/next.js
+++ b/addons/crm_partner_assign/static/src/js/next.js
@@ -1,18 +1,19 @@
 openerp.crm_partner_assign = function (instance) {
 	instance.crm_partner_assign = instance.crm_partner_assign || {};
 	instance.crm_partner_assign.next_or_list = function(parent) {
-		if (parent.inner_widget.active_view === "form"){
-			var form = parent.inner_widget.views.form.controller;
-			form.dataset.remove_ids([form.dataset.ids[form.dataset.index]]);
-			form.reload();
-			if (!form.dataset.ids.length){
-				parent.inner_widget.switch_mode('list');
-			}
-		}
-		else{
-			parent.inner_widget.views[parent.inner_widget.active_view].controller.reload();
-		}
-		parent.do_action({ type: 'ir.actions.act_window_close' });
+		var view = parent.inner_widget.active_view;
+		var controller = parent.inner_widget.views[view].controller;
+		if (view === "form"){
+			if (controller.dataset.size()) {
+	            controller.execute_pager_action('next');
+	        } else {
+	            controller.do_action('history_back');
+	        }
+    	}
+		controller.do_action({ type: 'ir.actions.act_window_close' });
+		if (view === "list"){
+    		controller.records.remove(controller.records.get(parent.dialog_widget.action.context.active_id));
+    	}
 	};
 	instance.web.client_actions.add("next_or_list", "instance.crm_partner_assign.next_or_list");
 }
\ No newline at end of file
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index fcfe869da90..afcda2b6efd 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -24,6 +24,8 @@ import base64
 import datetime
 import dateutil.relativedelta as relativedelta
 import logging
+import lxml
+import urlparse
 
 import openerp
 from openerp import SUPERUSER_ID
@@ -70,6 +72,7 @@ try:
 except ImportError:
     _logger.warning("jinja2 not available, templating features will not work!")
 
+
 class email_template(osv.osv):
     "Templates for sending email"
     _name = "email.template"
@@ -82,7 +85,48 @@ class email_template(osv.osv):
             res['model_id'] = self.pool['ir.model'].search(cr, uid, [('model', '=', res.pop('model'))], context=context)[0]
         return res
 
-    def render_template_batch(self, cr, uid, template, model, res_ids, context=None):
+    def _replace_local_links(self, cr, uid, html, context=None):
+        """ Post-processing of html content to replace local links to absolute
+        links, using web.base.url as base url. """
+        if not html:
+            return html
+
+        # form a tree
+        root = lxml.html.fromstring(html)
+        if not len(root) and root.text is None and root.tail is None:
+            html = '<div>%s</div>' % html
+            root = lxml.html.fromstring(html)
+
+        base_url = self.pool['ir.config_parameter'].get_param(cr, uid, 'web.base.url')
+        (base_scheme, base_netloc, bpath, bparams, bquery, bfragment) = urlparse.urlparse(base_url)
+
+        def _process_link(url):
+            new_url = url
+            (scheme, netloc, path, params, query, fragment) = urlparse.urlparse(url)
+            if not scheme and not netloc:
+                new_url = urlparse.urlunparse((base_scheme, base_netloc, path, params, query, fragment))
+            return new_url
+
+        # check all nodes, replace :
+        # - img src -> check URL
+        # - a href -> check URL
+        for node in root.iter():
+            if node.tag == 'a':
+                node.set('href', _process_link(node.get('href')))
+            elif node.tag == 'img' and not node.get('src', 'data').startswith('data'):
+                node.set('src', _process_link(node.get('src')))
+
+        html = lxml.html.tostring(root, pretty_print=False, method='html')
+        # this is ugly, but lxml/etree tostring want to put everything in a 'div' that breaks the editor -> remove that
+        if html.startswith('<div>') and html.endswith('</div>'):
+            html = html[5:-6]
+        return html
+
+    def render_post_process(self, cr, uid, html, context=None):
+        html = self._replace_local_links(cr, uid, html, context=context)
+        return html
+
+    def render_template_batch(self, cr, uid, template, model, res_ids, context=None, post_process=False):
         """Render the given template text, replace mako expressions ``${expr}``
            with the result of evaluating these expressions with
            an evaluation context containing:
@@ -125,6 +169,10 @@ class email_template(osv.osv):
             if render_result == u"False":
                 render_result = u""
             results[res_id] = render_result
+
+        if post_process:
+            for res_id, result in results.iteritems():
+                results[res_id] = self.render_post_process(cr, uid, result, context=context)
         return results
 
     def get_email_template_batch(self, cr, uid, template_id=False, res_ids=None, context=None):
@@ -183,7 +231,7 @@ class email_template(osv.osv):
         'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing Mail Server', readonly=False,
                                           help="Optional preferred server for outgoing mails. If not set, the highest "
                                                "priority one will be used."),
-        'body_html': fields.html('Body', translate=True, help="Rich-text/HTML version of the message (placeholders may be used here)"),
+        'body_html': fields.html('Body', translate=True, sanitize=False, help="Rich-text/HTML version of the message (placeholders may be used here)"),
         'report_name': fields.char('Report Filename', translate=True,
                                    help="Name to use for the generated report file (may contain placeholders)\n"
                                         "The extension can be omitted and will then come from the report type."),
@@ -356,17 +404,20 @@ class email_template(osv.osv):
         results = dict()
         for template, template_res_ids in templates_to_res_ids.iteritems():
             # generate fields value for all res_ids linked to the current template
-            for field in ['subject', 'body_html', 'email_from', 'email_to', 'partner_to', 'email_cc', 'reply_to']:
-                generated_field_values = self.render_template_batch(cr, uid, getattr(template, field), template.model, template_res_ids, context=context)
+            for field in fields:
+                generated_field_values = self.render_template_batch(
+                    cr, uid, getattr(template, field), template.model, template_res_ids,
+                    post_process=(field == 'body_html'),
+                    context=context)
                 for res_id, field_value in generated_field_values.iteritems():
                     results.setdefault(res_id, dict())[field] = field_value
             # update values for all res_ids
             for res_id in template_res_ids:
                 values = results[res_id]
-                if template.user_signature:
+                if 'body_html' in fields and template.user_signature:
                     signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
                     values['body_html'] = tools.append_content_to_html(values['body_html'], signature)
-                if values['body_html']:
+                if values.get('body_html'):
                     values['body'] = tools.html_sanitize(values['body_html'])
                 values.update(
                     mail_server_id=template.mail_server_id.id or False,
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 5429341e154..4f7828cb531 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -60,7 +60,7 @@
                                 <h3>Body</h3>
                                 <field name="body_html" width="250" height="450"
                                         placeholder="Rich-text/HTML content of the message (placeholders may be used here)"/>
-                                <field name="attachment_ids" nolabel="1" widget="many2many_binary"/>
+                                <field name="attachment_ids" widget="many2many_binary"/>
                             </page>
                             <page string="Advanced Settings">
                                 <group>
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index beede1122dc..71f99471afa 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -162,16 +162,18 @@ class mail_compose_message(osv.TransientModel):
             partner_ids += self.pool['res.partner'].exists(cr, SUPERUSER_ID, tpl_partner_ids, context=context)
         return partner_ids
 
-    def generate_email_for_composer_batch(self, cr, uid, template_id, res_ids, context=None):
+    def generate_email_for_composer_batch(self, cr, uid, template_id, res_ids, context=None, fields=None):
         """ Call email_template.generate_email(), get fields relevant for
             mail.compose.message, transform email_cc and email_to into partner_ids """
         # filter template values
-        fields = ['subject', 'body_html', 'email_from', 'email_to', 'partner_to', 'email_cc',  'reply_to', 'attachment_ids', 'attachments', 'mail_server_id']
+        if fields is None:
+            fields = ['subject', 'body_html', 'email_from', 'email_to', 'partner_to', 'email_cc',  'reply_to', 'attachment_ids', 'mail_server_id']
+        returned_fields = fields + ['attachments']
         values = dict.fromkeys(res_ids, False)
 
-        template_values = self.pool.get('email.template').generate_email_batch(cr, uid, template_id, res_ids, context=context)
+        template_values = self.pool.get('email.template').generate_email_batch(cr, uid, template_id, res_ids, fields=fields, context=context)
         for res_id in res_ids:
-            res_id_values = dict((field, template_values[res_id][field]) for field in fields if template_values[res_id].get(field))
+            res_id_values = dict((field, template_values[res_id][field]) for field in returned_fields if template_values[res_id].get(field))
             res_id_values['body'] = res_id_values.pop('body_html', '')
 
             # transform email_to, email_cc into partner_ids
@@ -189,7 +191,10 @@ class mail_compose_message(osv.TransientModel):
         """ Override to handle templates. """
         # generate template-based values
         if wizard.template_id:
-            template_values = self.generate_email_for_composer_batch(cr, uid, wizard.template_id.id, res_ids, context=context)
+            template_values = self.generate_email_for_composer_batch(
+                cr, uid, wizard.template_id.id, res_ids,
+                fields=['email_to', 'partner_to', 'email_cc', 'attachment_ids', 'mail_server_id'],
+                context=context)
         else:
             template_values = dict.fromkeys(res_ids, dict())
         # generate composer values
@@ -206,8 +211,8 @@ class mail_compose_message(osv.TransientModel):
             template_values[res_id].update(composer_values[res_id])
         return template_values
 
-    def render_template_batch(self, cr, uid, template, model, res_ids, context=None):
-        return self.pool.get('email.template').render_template_batch(cr, uid, template, model, res_ids, context=context)
+    def render_template_batch(self, cr, uid, template, model, res_ids, context=None, post_process=False):
+        return self.pool.get('email.template').render_template_batch(cr, uid, template, model, res_ids, context=context, post_process=post_process)
 
     # Compatibility methods
     def generate_email_for_composer(self, cr, uid, template_id, res_id, context=None):
diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index b7c57af2679..44145114fff 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -28,7 +28,8 @@
                         <div>Use template
                             <!--FIX: To avoid css issue of many2one field in footer temporary used oe_form (BUG:1152464)-->
                             <field name="template_id" nolabel="1" class='oe_inline'
-                                on_change="onchange_template_id(template_id, composition_mode, model, res_id, context)" domain="[('model_id.model','=',model)]"/>
+                                on_change="onchange_template_id(template_id, composition_mode, model, res_id, context)" domain="[('model_id.model','=',model)]"
+                                context="{'default_model': model, 'default_body_html': body, 'default_subject': subject}"/>
                         </div>
                         <button icon="/email_template/static/src/img/email_template_save.png"
                             type="object" name="save_as_template" string="Save as new template" class="oe_link"
diff --git a/addons/event/event.py b/addons/event/event.py
index 0b10b1e51ec..d13d455bc73 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -219,6 +219,7 @@ class event_event(osv.osv):
     ]
 
     def onchange_event_type(self, cr, uid, ids, type_event, context=None):
+        values = {}
         if type_event:
             type_info =  self.pool.get('event.type').browse(cr,uid,type_event,context)
             dic ={
@@ -228,7 +229,8 @@ class event_event(osv.osv):
               'seats_min': type_info.default_registration_min,
               'seats_max': type_info.default_registration_max,
             }
-            return {'value': dic}
+            values.update(dic)
+        return values
 
     def onchange_start_date(self, cr, uid, ids, date_begin=False, date_end=False, context=None):
         res = {'value':{}}
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index c6c2191c9c0..ed0124b5459 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -35,7 +35,6 @@
                     <group expand="1" string="Group By...">
                         <filter string="Participant / Contact" icon="terp-personal" context="{'group_by':'name_registration'}" help="Registration contact"/>
                         <filter string="Register" icon="terp-personal" context="{'group_by':'user_id_registration'}" help="Registration contact" groups="base.group_no_one"/>
-                        <filter string="Speaker" name="speaker" icon="terp-personal+" context="{'group_by': 'speaker_id'}" groups="base.group_no_one"/>
                         <filter string="Event Responsible" name="user_id" icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <filter string="Event" name="event" icon="terp-crm" context="{'group_by':'event_id', 'max_reg_event_visible':0}"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'event_type'}"/>
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index cce1f77856e..5f6379025ae 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -187,7 +187,7 @@ openerp_mailgate: "|/path/to/openerp-mailgate.py --host=localhost -u %(uid)d -p
         for server in self.browse(cr, uid, ids, context=context):
             _logger.info('start checking for new emails on %s server %s', server.type, server.name)
             context.update({'fetchmail_server_id': server.id, 'server_type': server.type})
-            count = 0
+            count, failed = 0, 0
             imap_server = False
             pop_server = False
             if server.type == 'imap':
@@ -196,20 +196,26 @@ openerp_mailgate: "|/path/to/openerp-mailgate.py --host=localhost -u %(uid)d -p
                     imap_server.select()
                     result, data = imap_server.search(None, '(UNSEEN)')
                     for num in data[0].split():
+                        res_id = None
                         result, data = imap_server.fetch(num, '(RFC822)')
-                        res_id = mail_thread.message_process(cr, uid, server.object_id.model, 
-                                                             data[0][1],
-                                                             save_original=server.original,
-                                                             strip_attachments=(not server.attach),
-                                                             context=context)
+                        imap_server.store(num, '-FLAGS', '\\Seen')
+                        try:
+                            res_id = mail_thread.message_process(cr, uid, server.object_id.model,
+                                                                 data[0][1],
+                                                                 save_original=server.original,
+                                                                 strip_attachments=(not server.attach),
+                                                                 context=context)
+                        except Exception:
+                            _logger.exception('Failed to process mail from %s server %s.', server.type, server.name)
+                            failed += 1
                         if res_id and server.action_id:
-                            action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id], 'active_model': context.get("thread_model", server.object_id.model)})
-                            imap_server.store(num, '+FLAGS', '\\Seen')
-                            cr.commit()
+                            action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids': [res_id], 'active_model': context.get("thread_model", server.object_id.model)})
+                        imap_server.store(num, '+FLAGS', '\\Seen')
+                        cr.commit()
                         count += 1
-                    _logger.info("fetched/processed %s email(s) on %s server %s", count, server.type, server.name)
+                    _logger.info("Fetched %d email(s) on %s server %s; %d succeeded, %d failed.", count, server.type, server.name, (count - failed), failed)
                 except Exception:
-                    _logger.exception("Failed to fetch mail from %s server %s.", server.type, server.name)
+                    _logger.exception("General failure when trying to fetch mail from %s server %s.", server.type, server.name)
                 finally:
                     if imap_server:
                         imap_server.close()
@@ -222,18 +228,23 @@ openerp_mailgate: "|/path/to/openerp-mailgate.py --host=localhost -u %(uid)d -p
                     for num in range(1, numMsgs + 1):
                         (header, msges, octets) = pop_server.retr(num)
                         msg = '\n'.join(msges)
-                        res_id = mail_thread.message_process(cr, uid, server.object_id.model,
-                                                             msg,
-                                                             save_original=server.original,
-                                                             strip_attachments=(not server.attach),
-                                                             context=context)
+                        res_id = None
+                        try:
+                            res_id = mail_thread.message_process(cr, uid, server.object_id.model,
+                                                                 msg,
+                                                                 save_original=server.original,
+                                                                 strip_attachments=(not server.attach),
+                                                                 context=context)
+                        except Exception:
+                            _logger.exception('Failed to process mail from %s server %s.', server.type, server.name)
+                            failed += 1
                         if res_id and server.action_id:
-                            action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id], 'active_model': context.get("thread_model", server.object_id.model)})
+                            action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids': [res_id], 'active_model': context.get("thread_model", server.object_id.model)})
                         pop_server.dele(num)
                         cr.commit()
-                    _logger.info("fetched/processed %s email(s) on %s server %s", numMsgs, server.type, server.name)
+                    _logger.info("Fetched %d email(s) on %s server %s; %d succeeded, %d failed.", numMsgs, server.type, server.name, (numMsgs - failed), failed)
                 except Exception:
-                    _logger.exception("Failed to fetch mail from %s server %s.", server.type, server.name)
+                    _logger.exception("General failure when trying to fetch mail from %s server %s.", server.type, server.name)
                 finally:
                     if pop_server:
                         pop_server.quit()
diff --git a/addons/gamification/html/index.html b/addons/gamification/html/index.html
deleted file mode 100644
index 890efa0d1ec..00000000000
--- a/addons/gamification/html/index.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <div class="oe_span12">
-        <h2 class="oe_slogan">Drive Engagement with Gamification</h2>
-        <h3 class="oe_slogan">Leverage natural desire for competition</h3>
-        <p class="oe_mt32">
-               Reinforce good habits and improve win rates with real-time recognition and rewards inspired by <a href="http://en.wikipedia.org/wiki/Gamification">game mechanics</a>. Align teams around clear business objectives with challenges, personal objectives and team leader boards.
-        </p>
-        <div class="oe_span4 oe_centered">
-            <h3>Leaderboards</h3>
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture" src="crm_game_01.png">
-            </div>
-            <p>
-               Promote leaders and competition amongst sales team with performance ratios.
-            </p>
-        </div>
-        <div class="oe_span4 oe_centered">
-            <h3>Personnal Objectives</h3>
-            <div class="oe_row_img">
-                <img class="oe_picture" src="crm_game_02.png">
-            </div>
-            <p>
-                Assign clear goals to users to align them with the company objectives.
-            </p>
-        </div>
-        <div class="oe_span4 oe_centered">
-            <h3>Visual Information</h3>
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture" src="crm_game_03.png">
-            </div>
-            <p>
-                See in an glance the progress of each user.
-            </p>
-        </div>
-    </div>
-</section>
-
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">Create custom Challenges</h2>
-        <div class="oe_span6">
-            <p class="oe_mt32">
-Use predefined goals to generate easily your own challenges. Assign it to a team or individual users. Receive feedback as often as needed: daily, weekly... Repeat it automatically to compare progresses through time.
-            </p>
-        </div>
-        <div class="oe_span6">
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture oe_screenshot" src="crm_sc_05.png">
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">Motivate with Badges</h2>
-        <div class="oe_span6">
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture" src="crm_linkedin.png">
-            </div>
-        </div>
-        <div class="oe_span6">
-            <p class="oe_mt32">
-Inspire achievement with recognition of coworker's good work by rewarding badges. These can be deserved manually or upon completion of challenges. Add fun to the competition with rare badges.
-            </p>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container oe_dark">
-    <div class="oe_row oe_spaced">
-        <h2 class="oe_slogan">Adapt to any module</h2>
-        <div class="oe_span6">
-            <p class="oe_mt32">
-Create goals linked to any module. The evaluation system is very flexible and can be used for many different tasks : sales evaluation, creation of events, project completion or even helping new users to complete their profile.
-            </p>
-        </div>
-        <div class="oe_span6">
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture oe_screenshot" src="crm_sc_02.png">
-            </div>
-        </div>
-    </div>
-</section>
diff --git a/addons/gamification/i18n/gamification.pot b/addons/gamification/i18n/gamification.pot
new file mode 100644
index 00000000000..03fcc645bec
--- /dev/null
+++ b/addons/gamification/i18n/gamification.pot
@@ -0,0 +1,1733 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* gamification
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.saas~3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-13 15:03+0000\n"
+"PO-Revision-Date: 2014-02-13 15:03+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Search Goals"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.goal.definition,name:gamification.definition_base_company_data
+msgid "Set your Company Data"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,report_message_frequency:0
+msgid "Never"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,computation_mode:0
+msgid "Defined how will be computed the goals. The result of the operation will be stored in the field 'Current'."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: view:gamification.goal:0
+#: field:gamification.goal.wizard,goal_id:0
+msgid "Goal"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,period:0
+msgid "Non recurring"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,next_report_date:0
+msgid "Next Report Date"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,monetary:0
+msgid "Monetary Value"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "My Goals"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,condition:0
+msgid "The lower the better"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user.wizard:0
+#: view:gamification.goal.wizard:0
+msgid "Grant Badge To"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,stat_count_distinct:0
+msgid "The number of time this badge has been received by unique users."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,unique_owner_ids:0
+msgid "The list of unique users having received this badge."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: view:gamification.goal:0
+#: view:gamification.goal.definition:0
+msgid "Group By..."
+msgstr ""
+
+#. module: gamification
+#: model:gamification.challenge,name:gamification.challenge_base_configure
+msgid "Setup your Company"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "/∞"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/wizard/grant_badge.py:44
+#, python-format
+msgid "You can not grant a badge to yourself"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,completeness:0
+msgid "Completeness"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,field_date_id:0
+msgid "Date Field"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,stat_my_this_month:0
+msgid "The number of time the current user has received this badge this month."
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge.line,condition:0
+msgid ">="
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,name:gamification.challenge_wizard
+msgid "Challenge Description"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_badge_user_wizard
+msgid "gamification.badge.user.wizard"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Reward"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,message_ids:0
+#: help:gamification.challenge,message_ids:0
+#: help:gamification.goal,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,category:0
+msgid "Define the visibility of the challenge through menus"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Refresh Challenge"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_challenge_line
+msgid "Gamification generic goal for challenge"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+msgid "e.g. result = pool.get('mail.followers').search(cr, uid, [('res_model', '=', 'mail.group'), ('partner_id', '=', object.user_id.partner_id.id)], count=True, context=context)"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,definition_monetary:0
+msgid "Monetary"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal,state:0
+msgid "In progress (to update)"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_goal_definition
+msgid "Gamification goal definition"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,remaining_sending:0
+msgid "If a maxium is set"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,invited_user_ids:0
+msgid "Suggest to users"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: model:ir.actions.act_window,name:gamification.goal_list_action
+#: model:ir.ui.menu,name:gamification.gamification_goal_menu
+msgid "Goals"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Badge Description"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "than the target."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Badges are granted when a challenge is finished. This is either at the end of a running period (eg: end of the month for a monthly challenge), at the end date of a challenge (if no periodicity is set) or when the challenge is manually closed."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,manager_id:0
+msgid "The user responsible for the challenge."
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/goal.py:385
+#, python-format
+msgid "Update %s"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,description:0
+msgid "Goal Description"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "this month"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,owner_ids:0
+msgid "Owners"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge.user,sender_id:0
+msgid "Sender"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,stat_my_this_month:0
+msgid "My Monthly Total"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,remind_update_delay:0
+msgid "Never reminded if no value or zero is specified."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: field:gamification.challenge.line,challenge_id:0
+#: field:gamification.goal,challenge_id:0
+msgid "Challenge"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,condition:0
+msgid "Goal Performance"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,message_ids:0
+#: field:gamification.challenge,message_ids:0
+#: field:gamification.goal,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "badges this month"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:517
+#: code:addons/gamification/models/goal.py:351
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,line_ids:0
+msgid "Lines"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user:0
+msgid "Granted by"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,stat_count_distinct:0
+msgid "Number of users"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,message_unread:0
+#: help:gamification.challenge,message_unread:0
+#: help:gamification.goal,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,name:gamification.action_new_simplified_res_users
+msgid "Create User"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,period:0
+#: selection:gamification.challenge,report_message_frequency:0
+msgid "Yearly"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.badge,rule_auth:0
+msgid "People having some badges"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "granted,"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,definition_full_suffix:0
+#: field:gamification.goal,definition_suffix:0
+#: field:gamification.goal.definition,suffix:0
+msgid "Suffix"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Reference"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,autojoin_group_id:0
+msgid "Auto-subscription Group"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "refresh"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Even if the challenge is failed, best challengers will be rewarded"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,reward_id:0
+msgid "For Every Succeding User"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,target_goal:0
+msgid "Target Value to Reach"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,start_date:0
+msgid "The day a new challenge will be automatically started. If no periodicity is set, will use this date as the goal start date."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Notification Messages"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,manager_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: gamification
+#. openerp-web
+#: code:addons/gamification/static/src/xml/gamification.xml:108
+#, python-format
+msgid "more details..."
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,name:gamification.badge_list_action
+#: model:ir.ui.menu,name:gamification.gamification_badge_menu
+msgid "Badges"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,rule_auth_badge_ids:0
+msgid "Only the people having these badges can give this badge"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,computation_mode:0
+msgid "Recorded manually"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Statistics"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "From"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Granting"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Grant"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+msgid "e.g. days"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,definition_id:0
+#: view:gamification.goal:0
+#: field:gamification.goal,definition_id:0
+#: field:gamification.goal.definition,name:0
+msgid "Goal Definition"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal,state:0
+msgid "Failed"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: field:gamification.challenge,state:0
+#: view:gamification.goal:0
+#: field:gamification.goal,state:0
+msgid "State"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,message_follower_ids:0
+#: field:gamification.challenge,message_follower_ids:0
+#: field:gamification.goal,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,reward_first_id:0
+msgid "For 1st user"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Can not grant"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,message_unread:0
+#: field:gamification.challenge,message_unread:0
+#: field:gamification.goal,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,display_mode:0
+msgid "Displayed as"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+#: field:gamification.badge,name:0
+#: field:gamification.badge.user,badge_id:0
+#: field:gamification.badge.user.wizard,badge_id:0
+msgid "Badge"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,suffix:0
+msgid "The unit of the target and current values"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: model:ir.actions.act_window,name:gamification.goals_from_challenge_act
+msgid "Related Goals"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Subscriptions"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user.wizard:0
+#: model:ir.actions.act_window,name:gamification.action_grant_wizard
+msgid "Grant Badge"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:683
+#, python-format
+msgid "<br/>Reward (badge %s) for every succeeding user was sent to %s."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,message_summary:0
+#: help:gamification.challenge,message_summary:0
+#: help:gamification.goal,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 ""
+
+#. module: gamification
+#: field:gamification.challenge,report_message_group_id:0
+msgid "Send a copy to"
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,help:gamification.challenge_list_action
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to create a challenge. \n"
+"                </p>\n"
+"                <p>\n"
+"                    Assign a list of goals to chosen users to evaluate them.\n"
+"                    The challenge can use a period (weekly, monthly...) for automatic creation of goals.\n"
+"                    The goals are created for the specified users or member of the group.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:695
+#, python-format
+msgid "Nobody reached the required conditions to receive special badges."
+msgstr ""
+
+#. module: gamification
+#. openerp-web
+#: code:addons/gamification/static/src/xml/gamification.xml:35
+#: code:addons/gamification/static/src/xml/gamification.xml:57
+#, python-format
+msgid "Target: <="
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Reminders for Manual Goals"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/goal.py:265
+#, python-format
+msgid "Invalid return content from the evaluation of %s"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+#: field:gamification.goal.definition,computation_mode:0
+msgid "Computation Mode"
+msgstr ""
+
+#. module: gamification
+#: model:email.template,body_html:gamification.simple_report_template
+msgid "<header><strong>${object.name}</strong>\n"
+"</header><p class=\"oe_grey\">The following message contains the current progress for the challenge ${object.name}</p>\n"
+"\n"
+"% if object.visibility_mode == 'personal':\n"
+"    <table width=\"100%\" border=\"1\"><tr><th>Goal</th>\n"
+"        <th>Target</th>\n"
+"        <th>Current</th>\n"
+"        <th>Completeness</th>\n"
+"    </tr>\n"
+"    % for line in ctx[\"challenge_lines\"]:\n"
+"        <tr if line>= 100:\n"
+"                style=\"font-weight:bold;\"\n"
+"            % endif\n"
+"            &gt;\n"
+"            <td>${line['name']}</td>\n"
+"            <td>${line['target']}\n"
+"            % if line['suffix']:\n"
+"                ${line['suffix']}\n"
+"            % endif\n"
+"            </td>\n"
+"            <td>${line['current']}\n"
+"            % if line['suffix']:\n"
+"                ${line['suffix']}\n"
+"            % endif\n"
+"            </td>\n"
+"            <td>${line['completeness']} %</td>\n"
+"        </tr>\n"
+"    % endfor\n"
+"    </table>\n"
+"% else:\n"
+"    % for line in ctx[\"challenge_lines\"]:\n"
+"        <table width=\"100%\" border=\"1\"><tr><th colspan=\"4\">${line['name']}</th>\n"
+"            </tr><tr><th>#</th>\n"
+"                <th>Person</th>\n"
+"                <th>Completeness</th>\n"
+"                <th>Current</th>\n"
+"            </tr>\n"
+"            % for goal in line['goals']:\n"
+"                <tr if goal.completeness>= 100:\n"
+"                        style=\"font-weight:bold;\"\n"
+"                    % endif\n"
+"                    &gt;\n"
+"                    <td>${goal['rank']}</td>\n"
+"                    <td>${goal['name']}</td>\n"
+"                    <td>${goal['completeness']}%</td>\n"
+"                    <td>${goal['current']}/${line['target']}\n"
+"                    % if line['suffix']:\n"
+"                        ${line['suffix']}\n"
+"                    % endif\n"
+"                    </td>\n"
+"                </tr>\n"
+"            % endfor\n"
+"        </table><br><br>\n"
+"\n"
+"    % endfor\n"
+"% endif\n"
+"            "
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,condition:0
+msgid "A goal is considered as completed when the current value is compared to the value to reach"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,remind_update_delay:0
+msgid "Non-updated manual goals will be reminded after"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,full_suffix:0
+msgid "The currency and suffix field"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,display_mode:0
+msgid "Exclusive (done or not-done)"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/badge.py:223
+#: code:addons/gamification/models/badge.py:225
+#: code:addons/gamification/models/badge.py:227
+#: code:addons/gamification/models/badge.py:229
+#: code:addons/gamification/wizard/grant_badge.py:44
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,last_update:0
+msgid "Last Update"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,report_message_frequency:0
+msgid "Report Frequency"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,field_id:0
+msgid "The field containing the value to evaluate"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,end_date:0
+msgid "The day a new challenge will be automatically closed. If no periodicity is set, will use this date as the goal end date."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge.user,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.badge,name:gamification.badge_idea
+msgid "Brilliant"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,visibility_mode:0
+msgid "Individual Goals"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Invited"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,report_message_frequency:0
+msgid "On change"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,period:0
+#: selection:gamification.challenge,report_message_frequency:0
+msgid "Daily"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: view:gamification.goal.definition:0
+msgid "Goal definitions"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Participating"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,rule_auth:0
+msgid "Who can grant this badge"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,last_report_date:0
+msgid "Last Report Date"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,computation_mode:0
+msgid "Automatic: execute a specific Python code"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_goal_wizard
+msgid "gamification.goal.wizard"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_badge_user
+msgid "Gamification user badge"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Describe the challenge: what is does, who it targets, why it matters..."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Goal List"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge.user,comment:0
+#: field:gamification.badge.user.wizard,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal,state:0
+msgid "In progress"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Search Challenges"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.badge,rule_auth:0
+msgid "No one, assigned through challenges"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,stat_my:0
+msgid "My Total"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "reply later"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,image:0
+msgid "Image"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Running Challenges"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,category:0
+msgid "Appears in"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Passed"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+msgid "Clickable Goals"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal,state:0
+msgid "Canceled"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge.user,badge_name:0
+msgid "Badge Name"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,definition_suffix:0
+msgid "Unit"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/badge.py:229
+#, python-format
+msgid "You have already sent this badge too many time this month."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,stat_my_monthly_sending:0
+msgid "My Monthly Sending Total"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Check Badge"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,period:0
+#: selection:gamification.challenge,report_message_frequency:0
+msgid "Weekly"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Assign Challenge To"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user.wizard:0
+#: view:gamification.challenge:0
+#: view:gamification.goal.wizard:0
+msgid "or"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge.line,sequence:0
+msgid "Sequence number for ordering"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Category"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,current:0
+msgid "Current Value"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,field_date_id:0
+msgid "The date to use for the time period evaluated"
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,help:gamification.goals_from_challenge_act
+msgid "<p>\n"
+"                There is no goals associated to this challenge matching your search.\n"
+"                Make sure that your challenge is active and assigned to at least one user.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,help:gamification.badge_list_action
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to create a badge. \n"
+"                </p>\n"
+"                <p>\n"
+"                    A badge is a symbolic token granted to a user as a sign of reward.\n"
+"                    It can be deserved automatically when some conditions are met or manually by users.\n"
+"                    Some badges are harder than others to get with specific conditions.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,rule_auth_badge_ids:0
+msgid "Required Badges"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Line List"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,rule_max:0
+msgid "Monthly Limited Sending"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:517
+#, python-format
+msgid "Retrieving progress for personal challenge without user information"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.goal.definition,name:gamification.definition_base_timezone
+msgid "Set your Timezone"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,goal_definition_ids:0
+msgid "The users that have succeeded theses goals will receive automatically the badge."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,image:0
+msgid "This field holds the image used for the badge, limited to 256x256"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.wizard:0
+msgid "Update"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,line_id:0
+msgid "Goal Line"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,rule_max_number:0
+msgid "Limitation Number"
+msgstr ""
+
+#. module: gamification
+#: model:ir.module.category,name:gamification.module_goal_category
+msgid "Gamification"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,state:0
+#: view:gamification.goal:0
+#: selection:gamification.goal,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Reject"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,model_id:0
+msgid "The model object for the field to evaluate"
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,help:gamification.goal_definition_list_action
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to create a goal definition. \n"
+"                </p>\n"
+"                <p>\n"
+"                    A goal definition is a technical model of goal defining a condition to reach.\n"
+"                    The dates, values to reach or users are defined in goal instance.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge.user,sender_id:0
+msgid "The user who has send the badge"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,stat_count:0
+msgid "The number of time this badge has been received."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+#: field:gamification.goal.definition,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_challenge
+msgid "Gamification challenge"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,rule_max:0
+msgid "Check to set a monthly limit per person of sending this badge"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_badge
+msgid "Gamification badge"
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,help:gamification.action_new_simplified_res_users
+msgid "Create and manage users that will connect to the system. Users can be deactivated should there be a period of time during which they will/should not connect to the system. You can assign them groups in order to give them specific access to the applications they need to use in the system."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Security rules to define who is allowed to manually grant badges. Not enforced for administrator."
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,display_mode:0
+msgid "Progressive (using numerical values)"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_goal
+msgid "Gamification goal instance"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:685
+#, python-format
+msgid "<br/>Nobody has succeeded to reach every goal, no badge is rewared for this challenge."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,message_is_follower:0
+#: field:gamification.challenge,message_is_follower:0
+#: field:gamification.goal,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,full_suffix:0
+msgid "Full Suffix"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Advanced Options"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,start_date:0
+#: field:gamification.goal,start_date:0
+msgid "Start Date"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,reward_second_id:0
+msgid "For 2nd user"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Data"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge.user,user_id:0
+#: field:gamification.badge.user.wizard,user_id:0
+#: view:gamification.goal:0
+#: field:gamification.goal,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,domain:0
+msgid "Filter Domain"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Schedule"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,computation_mode:0
+msgid "Automatic: number of records"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,rule_max_number:0
+msgid "The maximum number of time this badge can be sent per month per person."
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+msgid "Formating Options"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,compute_code:0
+msgid "Python code to be executed for each user. 'result' should contains the new current value. Evaluated user can be access through object.user_id."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,user_ids:0
+#: model:ir.model,name:gamification.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.badge,rule_auth:0
+msgid "A selected list of users"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: view:gamification.challenge.line:0
+msgid "Challenge Lines"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,rule_auth_user_ids:0
+msgid "Only these people can give this badge"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,active:0
+msgid "Active"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,action_id:0
+msgid "The action that will be called to update the goal value."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "You can still grant"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,computation_mode:0
+msgid "Computation mode"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,action_id:0
+msgid "Action"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.goal.definition,name:gamification.definition_base_invite
+msgid "Invite new Users"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,definition_description:0
+msgid "Definition Description"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.badge,name:gamification.badge_problem_solver
+msgid "Problem Solver"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Target: less than"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,stat_this_month:0
+msgid "The number of time this badge has been received this month."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal,last_update:0
+msgid "In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in challenge). Ignored in case of non-manual goal or goal not linked to a challenge."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Depending on the Display mode, reports will be individual or shared."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Start goal"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,period:0
+msgid "Periodicity"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge.user,create_uid:0
+msgid "Creator"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:692
+#, python-format
+msgid "<br/>Special rewards were sent to the top competing users. The ranking for this challenge is :"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,compute_code:0
+msgid "Python Code"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Rewards for challenges"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Send Report"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Period"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,name:0
+msgid "Challenge Name"
+msgstr ""
+
+#. module: gamification
+#: model:ir.ui.menu,name:gamification.gamification_menu
+msgid "Gamification Tools"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,goal_definition_ids:0
+msgid "Rewarded by"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,remaining_sending:0
+msgid "Remaining Sending Allowed"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,state:0
+msgid "Done"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,visibility_mode:0
+#: field:gamification.goal,definition_display:0
+msgid "Display Mode"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user.wizard:0
+#: view:gamification.goal.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "There is no reward upon completion of this challenge."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,monetary:0
+msgid "The target and current value are defined in the company currency."
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,condition:0
+msgid "The higher the better"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.goal.definition,name:gamification.definition_base_company_logo
+msgid "Set your Company Logo"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Goal Reached"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,stat_my:0
+msgid "The number of time the current user has received this badge."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,report_message_group_id:0
+msgid "Group that will receive a copy of the report in addition to the user"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,target_goal:0
+msgid "To Reach"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,res_id_field:0
+msgid "The field name on the user profile (res.users) containing the value for res_id for action."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal,remind_update_delay:0
+msgid "The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user.wizard:0
+msgid "Who would you like to reward?"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge.line,condition:0
+msgid "<="
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Configure Challenge"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,period:0
+#: selection:gamification.challenge,report_message_frequency:0
+msgid "Monthly"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,user_ids:0
+msgid "List of users participating to the challenge"
+msgstr ""
+
+#. module: gamification
+#: model:email.template,body_html:gamification.email_template_goal_reminder
+msgid "<header><strong>Reminder ${object.name}</strong>\n"
+"    </header><p>You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
+"\n"
+"    <p>If you have not changed your score yet, you can use the button \"The current value is up to date\" to indicate so.</p>"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+#: field:gamification.goal.wizard,current:0
+msgid "Current"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "To"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/badge.py:225
+#, python-format
+msgid "You are not in the user allowed list."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "í"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,challenge_ids:0
+msgid "Reward of Challenges"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,definition_condition:0
+msgid "Definition Condition"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,autojoin_group_id:0
+msgid "Group of users whose members will be automatically added to user_ids once the challenge is started"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+#: model:ir.actions.act_window,name:gamification.goal_definition_list_action
+#: model:ir.ui.menu,name:gamification.gamification_definition_menu
+msgid "Goal Definitions"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.badge,name:gamification.badge_hidden
+msgid "Hidden"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: view:gamification.goal:0
+msgid "days"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,report_template_id:0
+msgid "Report Template"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,rule_auth:0
+msgid "Allowance to Grant"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,computation_mode:0
+msgid "Automatic: sum on a field"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.challenge,name:gamification.challenge_base_discover
+msgid "Complete your Profile"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,description:0
+#: field:gamification.challenge,description:0
+msgid "Description"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/badge.py:223
+#, python-format
+msgid "This badge can not be sent by users."
+msgstr ""
+
+#. module: gamification
+#: model:email.template,body_html:gamification.email_template_badge_received
+msgid "<p>Congratulation, you have received the badge <strong>${object.badge_id.name}</strong> !\n"
+"            % if object.sender_id\n"
+"                This badge was granted by <strong>${object.sender_id.name}</strong>.\n"
+"            % endif\n"
+"        </p>\n"
+"\n"
+"        % if object.comment\n"
+"            <p><em>${object.comment}</em></p>\n"
+"        % endif\n"
+"        "
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,stat_this_month:0
+msgid "Monthly total"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,reward_third_id:0
+msgid "For 3rd user"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user.wizard:0
+msgid "Describe what they did and why it matters (will be public)"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/badge.py:227
+#, python-format
+msgid "You do not have the required badges."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "e.g. Monthly Sales Objectives"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,line_ids:0
+msgid "List of goals that will be set"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Badge List"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,visibility_mode:0
+msgid "Leader Board (Group Ranking)"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Reached when current value is"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/goal.py:351
+#, python-format
+msgid "Can not modify the configuration of a started goal"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,unique_owner_ids:0
+msgid "Unique Owners"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:665
+#, python-format
+msgid "The challenge %s is finished."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,end_date:0
+#: view:gamification.goal:0
+#: field:gamification.goal,end_date:0
+msgid "End Date"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,owner_ids:0
+msgid "The list of instances of this badge granted to users"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Goal Failed"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,res_id_field:0
+msgid "ID Field of user"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,name:0
+msgid "Name"
+msgstr ""
+
+#. module: gamification
+#. openerp-web
+#: code:addons/gamification/static/src/xml/gamification.xml:105
+#, python-format
+msgid "Invited Challenges"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Reset Completion"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,domain:0
+msgid "Domain for filtering records. The rule can contain reference to 'user' that is a browse record of the current user, e.g. [('user_id', '=', user.id)]."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,stat_my_monthly_sending:0
+msgid "The number of time the current user has sent this badge this month."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal,challenge_id:0
+msgid "Challenge that generated the goal, assign challenge to users to generate goals with a value in this field."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,rule_auth_user_ids:0
+msgid "Authorized Users"
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,help:gamification.goal_list_action
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to create a goal. \n"
+"                </p>\n"
+"                <p>\n"
+"                    A goal is defined by a user and a goal definition.\n"
+"                    Goals can be created automatically by using challenges.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,reward_failure:0
+msgid "Reward Bests if not Succeeded?"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,field_id:0
+msgid "Field to Sum"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,message_summary:0
+#: field:gamification.challenge,message_summary:0
+#: field:gamification.goal,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.badge,name:gamification.badge_good_job
+msgid "Good Job"
+msgstr ""
+
+#. module: gamification
+#. openerp-web
+#: code:addons/gamification/static/src/xml/gamification.xml:32
+#: code:addons/gamification/static/src/xml/gamification.xml:54
+#, python-format
+msgid "Target:"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.wizard:0
+msgid "Set the current value you have reached for this goal"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.badge,rule_auth:0
+msgid "Everyone"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+msgid "How to compute the goal?"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+msgid "Search Goal Definitions"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.goal.definition,name:gamification.definition_nbr_following
+msgid "Mail Group Following"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Accept"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Grant this Badge"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: model:ir.actions.act_window,name:gamification.challenge_list_action
+#: model:ir.ui.menu,name:gamification.gamification_challenge_menu
+msgid "Challenges"
+msgstr ""
+
+#. module: gamification
+#: model:res.groups,name:gamification.group_goal_manager
+msgid "Manager"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "HR Challenges"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,remind_update_delay:0
+msgid "Remind delay"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "No monthly sending limit"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal,state:0
+msgid "Reached"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user:0
+msgid "the"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,stat_count:0
+msgid "Total"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,period:0
+msgid "Period of automatic goal assigment. If none is selected, should be launched manually."
+msgstr ""
+
diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index ae27aa96719..06d0c44baac 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -387,6 +387,7 @@ class gamification_challenge(osv.Model):
                 end_date = challenge.end_date
 
             for line in challenge.line_ids:
+                # FIXME: allow to restrict to a subset of users
                 for user in challenge.user_ids:
 
                     goal_obj = self.pool.get('gamification.goal')
@@ -400,8 +401,9 @@ class gamification_challenge(osv.Model):
                         # resume canceled goals
                         domain.append(('state', '=', 'canceled'))
                         canceled_goal_ids = goal_obj.search(cr, uid, domain, context=context)
-                        goal_obj.write(cr, uid, canceled_goal_ids, {'state': 'inprogress'}, context=context)
-                        goal_obj.update(cr, uid, canceled_goal_ids, context=context)
+                        if canceled_goal_ids:
+                            goal_obj.write(cr, uid, canceled_goal_ids, {'state': 'inprogress'}, context=context)
+                            goal_obj.update(cr, uid, canceled_goal_ids, context=context)
 
                         # skip to next user
                         continue
@@ -431,7 +433,7 @@ class gamification_challenge(osv.Model):
     ##### JS utilities #####
 
     def _get_serialized_challenge_lines(self, cr, uid, challenge, user_id=False, restrict_goal_ids=False, restrict_top=False, context=None):
-        """Return a serialised version of the goals information
+        """Return a serialised version of the goals information if the user has not completed every goal
 
         :challenge: browse record of challenge to compute
         :user_id: res.users id of the user retrieving progress (False if no distinction, only for ranking challenges)
@@ -485,6 +487,7 @@ class gamification_challenge(osv.Model):
         (start_date, end_date) = start_end_date_for_period(challenge.period)
 
         res_lines = []
+        all_reached = True
         for line in challenge.line_ids:
             line_data = {
                 'name': line.definition_id.name,
@@ -516,13 +519,6 @@ class gamification_challenge(osv.Model):
                 domain.append(('user_id', '=', user_id))
                 sorting = goal_obj._order
                 limit = 1
-                # initialise in case search returns no results
-                line_data.update({
-                    'id': 0,
-                    'current': 0,
-                    'completeness': 0,
-                    'state': 'draft',
-                })
             else:
                 line_data.update({
                     'own_goal_id': False,
@@ -542,6 +538,8 @@ class gamification_challenge(osv.Model):
                         'completeness': goal.completeness,
                         'state': goal.state,
                     })
+                    if goal.state != 'reached':
+                        all_reached = False
                 else:
                     ranking += 1
                     if user_id and goal.user_id.id == user_id:
@@ -559,7 +557,12 @@ class gamification_challenge(osv.Model):
                         'completeness': goal.completeness,
                         'state': goal.state,
                     })
-            res_lines.append(line_data)
+                    if goal.state != 'reached':
+                        all_reached = False
+            if goal_ids:
+                res_lines.append(line_data)
+        if all_reached:
+            return []
         return res_lines
 
     ##### Reporting #####
@@ -624,22 +627,28 @@ class gamification_challenge(osv.Model):
         return self.write(cr, uid, challenge.id, {'last_report_date': fields.date.today()}, context=context)
 
     ##### Challenges #####
+    # TODO in trunk, remove unused parameter user_id
     def accept_challenge(self, cr, uid, challenge_ids, context=None, user_id=None):
         """The user accept the suggested challenge"""
-        user_id = user_id or uid
+        return self._accept_challenge(cr, uid, uid, challenge_ids, context=context)
+
+    def _accept_challenge(self, cr, uid, user_id, challenge_ids, context=None):
         user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
         message = "%s has joined the challenge" % user.name
-        self.message_post(cr, uid, challenge_ids, body=message, context=context)
+        self.message_post(cr, SUPERUSER_ID, challenge_ids, body=message, context=context)
         self.write(cr, SUPERUSER_ID, challenge_ids, {'invited_user_ids': [(3, user_id)], 'user_ids': [(4, user_id)]}, context=context)
-        return self.generate_goals_from_challenge(cr, uid, challenge_ids, context=context)
+        return self.generate_goals_from_challenge(cr, SUPERUSER_ID, challenge_ids, context=context)
 
+    # TODO in trunk, remove unused parameter user_id
     def discard_challenge(self, cr, uid, challenge_ids, context=None, user_id=None):
         """The user discard the suggested challenge"""
-        user_id = user_id or uid
+        return self._discard_challenge(cr, uid, uid, challenge_ids, context=context)
+
+    def _discard_challenge(self, cr, uid, user_id, challenge_ids, context=None):
         user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
         message = "%s has refused the challenge" % user.name
         self.message_post(cr, SUPERUSER_ID, challenge_ids, body=message, context=context)
-        return self.write(cr, uid, challenge_ids, {'invited_user_ids': (3, user_id)}, context=context)
+        return self.write(cr, SUPERUSER_ID, challenge_ids, {'invited_user_ids': (3, user_id)}, context=context)
 
     def reply_challenge_wizard(self, cr, uid, challenge_id, context=None):
         result = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'gamification', 'challenge_wizard')
diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index 8792e219d71..8e79c43c8a6 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -163,7 +163,8 @@ class gamification_goal(osv.Model):
             string="Challenge",
             type='many2one',
             relation='gamification.challenge',
-            store=True),
+            store=True, readonly=True,
+            help="Challenge that generated the goal, assign challenge to users to generate goals with a value in this field."),
         'start_date': fields.date('Start Date'),
         'end_date': fields.date('End Date'),  # no start and end = always active
         'target_goal': fields.float('To Reach',
diff --git a/addons/gamification/models/res_users.py b/addons/gamification/models/res_users.py
index 408ddddf082..85cc18636f0 100644
--- a/addons/gamification/models/res_users.py
+++ b/addons/gamification/models/res_users.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+from openerp import SUPERUSER_ID
 from openerp.osv import osv
 from challenge import MAX_VISIBILITY_RANKING
 
@@ -39,9 +40,10 @@ class res_users_gamification_group(osv.Model):
             user_group_ids += [id for command in vals['groups_id'] if command[0] == 6 for id in command[2]]
 
             challenge_obj = self.pool.get('gamification.challenge')
-            challenge_ids = challenge_obj.search(cr, uid, [('autojoin_group_id', 'in', user_group_ids)], context=context)
+            challenge_ids = challenge_obj.search(cr, SUPERUSER_ID, [('autojoin_group_id', 'in', user_group_ids)], context=context)
             if challenge_ids:
-                challenge_obj.write(cr, uid, challenge_ids, {'user_ids': [(4, user_id) for user_id in ids]}, context=context)
+                challenge_obj.write(cr, SUPERUSER_ID, challenge_ids, {'user_ids': [(4, user_id) for user_id in ids]}, context=context)
+                challenge_obj.generate_goals_from_challenge(cr, SUPERUSER_ID, challenge_ids, context=context)
         return write_res
 
     def create(self, cr, uid, vals, context=None):
@@ -53,9 +55,10 @@ class res_users_gamification_group(osv.Model):
             user_group_ids += [id for command in vals['groups_id'] if command[0] == 6 for id in command[2]]
 
             challenge_obj = self.pool.get('gamification.challenge')
-            challenge_ids = challenge_obj.search(cr, uid, [('autojoin_group_id', 'in', user_group_ids)], context=context)
+            challenge_ids = challenge_obj.search(cr, SUPERUSER_ID, [('autojoin_group_id', 'in', user_group_ids)], context=context)
             if challenge_ids:
-                challenge_obj.write(cr, uid, challenge_ids, {'user_ids': [(4, write_res)]}, context=context)
+                challenge_obj.write(cr, SUPERUSER_ID, challenge_ids, {'user_ids': [(4, write_res)]}, context=context)
+                challenge_obj.generate_goals_from_challenge(cr, SUPERUSER_ID, challenge_ids, context=context)
         return write_res
 
     # def get_goals_todo_info(self, cr, uid, context=None):
@@ -83,13 +86,15 @@ class res_users_gamification_group(osv.Model):
         challenge_ids = challenge_obj.search(cr, uid, [('user_ids', 'in', uid), ('state', '=', 'inprogress')], context=context)
         for challenge in challenge_obj.browse(cr, uid, challenge_ids, context=context):
             # serialize goals info to be able to use it in javascript
-            all_goals_info.append({
-                'id': challenge.id,
-                'name': challenge.name,
-                'visibility_mode': challenge.visibility_mode,
-                'currency': user.company_id.currency_id.id,
-                'lines': challenge_obj._get_serialized_challenge_lines(cr, uid, challenge, user_id, restrict_top=MAX_VISIBILITY_RANKING, context=context),
-            })
+            lines = challenge_obj._get_serialized_challenge_lines(cr, uid, challenge, user_id, restrict_top=MAX_VISIBILITY_RANKING, context=context)
+            if lines:
+                all_goals_info.append({
+                    'id': challenge.id,
+                    'name': challenge.name,
+                    'visibility_mode': challenge.visibility_mode,
+                    'currency': user.company_id.currency_id.id,
+                    'lines': lines,
+                })
 
         return all_goals_info
 
@@ -126,7 +131,8 @@ class res_groups_gamification_group(osv.Model):
             user_ids += [id for command in vals['users'] if command[0] == 6 for id in command[2]]
 
             challenge_obj = self.pool.get('gamification.challenge')
-            challenge_ids = challenge_obj.search(cr, uid, [('autojoin_group_id', 'in', ids)], context=context)
+            challenge_ids = challenge_obj.search(cr, SUPERUSER_ID, [('autojoin_group_id', 'in', ids)], context=context)
             if challenge_ids:
-                challenge_obj.write(cr, uid, challenge_ids, {'user_ids': [(4, user_id) for user_id in user_ids]}, context=context)
+                challenge_obj.write(cr, SUPERUSER_ID, challenge_ids, {'user_ids': [(4, user_id) for user_id in user_ids]}, context=context)
+                challenge_obj.generate_goals_from_challenge(cr, SUPERUSER_ID, challenge_ids, context=context)
         return write_res
diff --git a/addons/gamification/views/goal.xml b/addons/gamification/views/goal.xml
index a269f710c02..1c408e3ab11 100644
--- a/addons/gamification/views/goal.xml
+++ b/addons/gamification/views/goal.xml
@@ -55,7 +55,7 @@
                             <group string="Reference">
                                 <field name="definition_id" on_change="on_change_definition_id(definition_id)" attrs="{'readonly':[('state','!=','draft')]}"/>
                                 <field name="user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
-                                <field name="challenge_id" attrs="{'readonly':[('state','!=','draft')]}"/>
+                                <field name="challenge_id" />
                             </group>
                             <group string="Schedule">
                                 <field name="start_date" attrs="{'readonly':[('state','!=','draft')]}"/>
@@ -280,8 +280,8 @@
 
         <!-- menus in settings - technical feature required -->
         <menuitem id="gamification_menu" name="Gamification Tools" parent="base.menu_administration" groups="base.group_no_one" />
-            <menuitem id="gamification_goal_menu" parent="gamification_menu" action="goal_list_action" sequence="0"/>
-            <menuitem id="gamification_challenge_menu" parent="gamification_menu" action="challenge_list_action" sequence="10"/>
+            <menuitem id="gamification_challenge_menu" parent="gamification_menu" action="challenge_list_action" sequence="0"/>
+            <menuitem id="gamification_goal_menu" parent="gamification_menu" action="goal_list_action" sequence="10"/>
             <menuitem id="gamification_definition_menu" parent="gamification_menu" action="goal_definition_list_action" sequence="20"/>
             <menuitem id="gamification_badge_menu" parent="gamification_menu" action="badge_list_action" sequence="30"/>
 
diff --git a/addons/gamification_sale_crm/sale_crm_goals_demo.xml b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
index fd69c36162f..d8e26551c32 100644
--- a/addons/gamification_sale_crm/sale_crm_goals_demo.xml
+++ b/addons/gamification_sale_crm/sale_crm_goals_demo.xml
@@ -14,7 +14,7 @@
             <field name="user_id" eval="ref('base.user_demo')" />
             <field name="line_id" eval="ref('line_crm_sale1')" />
             <field name="start_date" eval="time.strftime('%Y-%m-01')" />
-            <field name="end_date" eval="time.strftime('%Y-%m-31')" />
+            <field name="end_date" eval="(DateTime.today().replace(day=1)+relativedelta(months=1, days=-1)).strftime('%Y-%m-%d')" />
             <field name="target_goal">2000</field>
             <field name="state">inprogress</field>
         </record>
diff --git a/addons/google_calendar/google_calendar.py b/addons/google_calendar/google_calendar.py
index a47fd4637ee..f36062b6be2 100644
--- a/addons/google_calendar/google_calendar.py
+++ b/addons/google_calendar/google_calendar.py
@@ -7,6 +7,7 @@
 #    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
@@ -20,22 +21,186 @@
 
 import operator
 import simplejson
-import re
 import urllib
-import warnings
 
 from openerp import tools
 from openerp import SUPERUSER_ID
-from openerp.tools.translate import _
 
-from openerp.addons.web.http import request
-import werkzeug.utils
-
-from datetime import datetime, timedelta, date
+from datetime import datetime, timedelta
 from dateutil import parser
 import pytz
 from openerp.osv import fields, osv
-from openerp.osv import osv
+
+import logging
+_logger = logging.getLogger(__name__)
+
+
+class Meta(type):
+    """ This Meta class allow to define class as a structure, and so instancied variable
+        in __init__ to avoid to have side effect alike 'static' variable """
+    def __new__(typ, name, parents, attrs):
+        methods = dict((k, v) for k, v in attrs.iteritems()
+                       if callable(v))
+        attrs = dict((k, v) for k, v in attrs.iteritems()
+                     if not callable(v))
+
+        def init(self, **kw):
+            for k, v in attrs.iteritems():
+                setattr(self, k, v)
+            for k, v in kw.iteritems():
+                assert k in attrs
+                setattr(self, k, v)
+
+        methods['__init__'] = init
+        methods['__getitem__'] = getattr
+        return type.__new__(typ, name, parents, methods)
+
+
+class Struct(object):
+    __metaclass__ = Meta
+
+
+class OpenerpEvent(Struct):
+        event = False
+        found = False
+        event_id = False
+        isRecurrence = False
+        isInstance = False
+        update = False
+        status = False
+        attendee_id = False
+        synchro = False
+
+
+class GmailEvent(Struct):
+    event = False
+    found = False
+    isRecurrence = False
+    isInstance = False
+    update = False
+    status = False
+
+
+class SyncEvent(object):
+    def __init__(self):
+        self.OE = OpenerpEvent()
+        self.GG = GmailEvent()
+        self.OP = None
+
+    def __getitem__(self, key):
+        return getattr(self, key)
+
+    def compute_OP(self):
+        #If event are already in Gmail and in OpenERP
+        if self.OE.found and self.GG.found:
+            #If the event has been deleted from one side, we delete on other side !
+            if self.OE.status != self.GG.status:
+                self.OP = Delete((self.OE.status and "OE") or (self.GG.status and "GG"),
+                                 'The event has been deleted from one side, we delete on other side !')
+            #If event is not deleted !
+            elif self.OE.status and self.GG.status:
+                if self.OE.update.split('.')[0] != self.GG.update.split('.')[0]:
+                    if self.OE.update < self.GG.update:
+                        tmpSrc = 'GG'
+                    elif self.OE.update > self.GG.update:
+                        tmpSrc = 'OE'
+                    assert tmpSrc in ['GG', 'OE']
+
+                    #if self.OP.action == None:
+                    if self[tmpSrc].isRecurrence:
+                        if self[tmpSrc].status:
+                            self.OP = Update(tmpSrc, 'Only need to update, because i\'m active')
+                        else:
+                            self.OP = Exclude(tmpSrc, 'Need to Exclude (Me = First event from recurrence) from recurrence')
+
+                    elif self[tmpSrc].isInstance:
+                        self.OP = Update(tmpSrc, 'Only need to update, because already an exclu')
+                    else:
+                        self.OP = Update(tmpSrc, 'Simply Update... I\'m a single event')
+                else:
+                    if not self.OE.synchro or self.OE.synchro.split('.')[0] < self.OE.update.split('.')[0]:
+                        self.OP = Update('OE', 'Event already updated by another user, but not synchro with my google calendar')
+                        #import ipdb; ipdb.set_trace();
+                    else:
+                        self.OP = NothingToDo("", 'Not update needed')
+            else:
+                self.OP = NothingToDo("", "Both are already deleted")
+
+        # New in openERP...  Create on create_events of synchronize function
+        elif self.OE.found and not self.GG.found:
+            #Has been deleted from gmail
+            if self.OE.status:
+                self.OP = Delete('OE', 'Removed from GOOGLE')
+            else:
+                self.OP = NothingToDo("", "Already Deleted in gmail and unlinked in OpenERP")
+        elif self.GG.found and not self.OE.found:
+            tmpSrc = 'GG'
+            if not self.GG.status and not self.GG.isInstance:
+                # don't need to make something... because event has been created and deleted before the synchronization
+                self.OP = NothingToDo("", 'Nothing to do... Create and Delete directly')
+            else:
+                if self.GG.isInstance:
+                    if self[tmpSrc].status:
+                        self.OP = Exclude(tmpSrc, 'Need to create the new exclu')
+                    else:
+                        self.OP = Exclude(tmpSrc, 'Need to copy and Exclude')
+                else:
+                    self.OP = Create(tmpSrc, 'New EVENT CREATE from GMAIL')
+
+    def __str__(self):
+        return self.__repr__()
+
+    def __repr__(self):
+        myPrint = "---- A SYNC EVENT ---"
+        myPrint += "\n    ID          OE: %s " % (self.OE.event and self.OE.event.id)
+        myPrint += "\n    ID          GG: %s " % (self.GG.event and self.GG.event.get('id', False))
+        myPrint += "\n    Name        OE: %s " % (self.OE.event and self.OE.event.name)
+        myPrint += "\n    Name        GG: %s " % (self.GG.event and self.GG.event.get('summary', False))
+        myPrint += "\n    Found       OE:%5s vs GG: %5s" % (self.OE.found, self.GG.found)
+        myPrint += "\n    Recurrence  OE:%5s vs GG: %5s" % (self.OE.isRecurrence, self.GG.isRecurrence)
+        myPrint += "\n    Instance    OE:%5s vs GG: %5s" % (self.OE.isInstance, self.GG.isInstance)
+        myPrint += "\n    Synchro     OE: %10s " % (self.OE.synchro)
+        myPrint += "\n    Update      OE: %10s " % (self.OE.update)
+        myPrint += "\n    Update      GG: %10s " % (self.GG.update)
+        myPrint += "\n    Status      OE:%5s vs GG: %5s" % (self.OE.status, self.GG.status)
+        if (self.OP is None):
+            myPrint += "\n    Action      %s" % "---!!!---NONE---!!!---"
+        else:
+            myPrint += "\n    Action      %s" % type(self.OP).__name__
+            myPrint += "\n    Source      %s" % (self.OP.src)
+            myPrint += "\n    comment     %s" % (self.OP.info)
+        return myPrint
+
+
+class SyncOperation(object):
+    def __init__(self, src, info, **kw):
+        self.src = src
+        self.info = info
+        for k, v in kw.items():
+            setattr(self, k, v)
+
+    def __str__(self):
+        return 'in__STR__'
+
+
+class Create(SyncOperation):
+    pass
+
+
+class Update(SyncOperation):
+    pass
+
+
+class Delete(SyncOperation):
+    pass
+
+
+class NothingToDo(SyncOperation):
+    pass
+
+
+class Exclude(SyncOperation):
+    pass
 
 
 class google_calendar(osv.AbstractModel):
@@ -44,76 +209,84 @@ class google_calendar(osv.AbstractModel):
 
     def generate_data(self, cr, uid, event, context=None):
         if event.allday:
-            start_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.date, tools.DEFAULT_SERVER_DATETIME_FORMAT) , context=context).isoformat('T').split('T')[0]
+            start_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.date, tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context).isoformat('T').split('T')[0]
             end_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.date, tools.DEFAULT_SERVER_DATETIME_FORMAT) + timedelta(hours=event.duration), context=context).isoformat('T').split('T')[0]
             type = 'date'
+            vstype = 'dateTime'
         else:
             start_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.date, tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context).isoformat('T')
             end_date = fields.datetime.context_timestamp(cr, uid, datetime.strptime(event.date_deadline, tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context).isoformat('T')
             type = 'dateTime'
+            vstype = 'date'
         attendee_list = []
 
         for attendee in event.attendee_ids:
             attendee_list.append({
-                'email':attendee.email or 'NoEmail@mail.com',
-                'displayName':attendee.partner_id.name,
-                'responseStatus':attendee.state or 'needsAction',
+                'email': attendee.email or 'NoEmail@mail.com',
+                'displayName': attendee.partner_id.name,
+                'responseStatus': attendee.state or 'needsAction',
             })
         data = {
             "summary": event.name or '',
             "description": event.description or '',
-            "start":{
-                 type:start_date,
-                 'timeZone':'UTC'
-             },
-            "end":{
-                 type:end_date,
-                 'timeZone':'UTC'
-             },
-            "attendees":attendee_list,
-            "location":event.location or '',
-            "visibility":event['class'] or 'public',
+            "start": {
+                type: start_date,
+                vstype: None,
+                'timeZone': 'UTC'
+            },
+            "end": {
+                type: end_date,
+                vstype: None,
+                'timeZone': 'UTC'
+            },
+            "attendees": attendee_list,
+            "location": event.location or '',
+            "visibility": event['class'] or 'public',
         }
         if event.recurrency and event.rrule:
-            data["recurrence"]=["RRULE:"+event.rrule]
+            data["recurrence"] = ["RRULE:" + event.rrule]
 
         if not event.active:
             data["state"] = "cancelled"
 
+        if not self.get_need_synchro_attendee(cr, uid, context=context):
+            data.pop("attendees")
+
         return data
 
-    def create_an_event(self, cr, uid,event, context=None):
-        gs_pool = self.pool.get('google.service')
+    def create_an_event(self, cr, uid, event, context=None):
+        gs_pool = self.pool['google.service']
 
-        data = self.generate_data(cr, uid,event, context=context)
+        data = self.generate_data(cr, uid, event, context=context)
 
-        url = "/calendar/v3/calendars/%s/events?fields=%s&access_token=%s" % ('primary',urllib.quote('id,updated'),self.get_token(cr,uid,context))
+        url = "/calendar/v3/calendars/%s/events?fields=%s&access_token=%s" % ('primary', urllib.quote('id,updated'), self.get_token(cr, uid, context))
         headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
         data_json = simplejson.dumps(data)
 
         return gs_pool._do_request(cr, uid, url, data_json, headers, type='POST', context=context)
 
-    def delete_an_event(self, cr, uid,event_id, context=None):
-        gs_pool = self.pool.get('google.service')
+    def delete_an_event(self, cr, uid, event_id, context=None):
+        gs_pool = self.pool['google.service']
 
         params = {
-                 'access_token' : self.get_token(cr,uid,context)
-                }
+            'access_token': self.get_token(cr, uid, context)
+        }
         headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
-        url = "/calendar/v3/calendars/%s/events/%s" % ('primary',event_id)
+        url = "/calendar/v3/calendars/%s/events/%s" % ('primary', event_id)
 
         return gs_pool._do_request(cr, uid, url, params, headers, type='DELETE', context=context)
 
-    def get_event_dict(self,cr,uid,token=False,nextPageToken=False,context=None):
+    def get_event_dict(self, cr, uid, token=False, nextPageToken=False, context=None):
         if not token:
-            token = self.get_token(cr,uid,context)
+            token = self.get_token(cr, uid, context)
 
-        gs_pool = self.pool.get('google.service')
+        gs_pool = self.pool['google.service']
 
         params = {
-                 'fields': 'items,nextPageToken',
-                 'access_token' : token,
-                 'maxResults':1000
+            'fields': 'items,nextPageToken',
+            'access_token': token,
+            'maxResults': 1000,
+            'timeMin': self.get_start_time_to_synchro(cr, uid, context=context).strftime("%Y-%m-%dT%H:%M:%S.%fz"),
         }
         headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
 
@@ -129,50 +302,50 @@ class google_calendar(osv.AbstractModel):
             google_events_dict[google_event['id']] = google_event
 
         if content.get('nextPageToken', False):
-            google_events_dict.update(self.get_event_dict(cr,uid,token,content['nextPageToken'],context=context))
-        return google_events_dict    
+            google_events_dict.update(self.get_event_dict(cr, uid, token, content['nextPageToken'], context=context))
+        return google_events_dict
 
     def update_to_google(self, cr, uid, oe_event, google_event, context):
         calendar_event = self.pool['calendar.event']
-        gs_pool = self.pool.get('google.service')
+        gs_pool = self.pool['google.service']
 
-        url = "/calendar/v3/calendars/%s/events/%s?fields=%s&access_token=%s" % ('primary', google_event['id'],'id,updated', self.get_token(cr,uid,context))
+        url = "/calendar/v3/calendars/%s/events/%s?fields=%s&access_token=%s" % ('primary', google_event['id'], 'id,updated', self.get_token(cr, uid, context))
         headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
-        data = self.generate_data(cr,uid ,oe_event, context)
+        data = self.generate_data(cr, uid, oe_event, context)
         data['sequence'] = google_event.get('sequence', 0)
         data_json = simplejson.dumps(data)
 
         content = gs_pool._do_request(cr, uid, url, data_json, headers, type='PATCH', context=context)
 
-        update_date = datetime.strptime(content['updated'],"%Y-%m-%dT%H:%M:%S.%fz")
-        calendar_event.write(cr, uid, [oe_event.id], {'oe_update_date':update_date})
+        update_date = datetime.strptime(content['updated'], "%Y-%m-%dT%H:%M:%S.%fz")
+        calendar_event.write(cr, uid, [oe_event.id], {'oe_update_date': update_date})
 
         if context['curr_attendee']:
-            self.pool.get('calendar.attendee').write(cr,uid,[context['curr_attendee']], {'oe_synchro_date':update_date},context)
+            self.pool['calendar.attendee'].write(cr, uid, [context['curr_attendee']], {'oe_synchro_date': update_date}, context)
 
-    def update_an_event(self, cr, uid,event, context=None):
-        gs_pool = self.pool.get('google.service')
+    def update_an_event(self, cr, uid, event, context=None):
+        gs_pool = self.pool['google.service']
 
-        data = self.generate_data(cr, uid,event, context=context)
+        data = self.generate_data(cr, uid, event, context=context)
 
         url = "/calendar/v3/calendars/%s/events/%s" % ('primary', event.google_internal_event_id)
         headers = {}
-        data['access_token'] = self.get_token(cr,uid,context)
+        data['access_token'] = self.get_token(cr, uid, context)
 
         response = gs_pool._do_request(cr, uid, url, data, headers, type='GET', context=context)
         #TO_CHECK : , if http fail, no event, do DELETE ?
         return response
 
-    def update_recurrent_event_exclu(self, cr, uid,instance_id,event_ori_google_id,event_new, context=None):
-        gs_pool = self.pool.get('google.service')
+    def update_recurrent_event_exclu(self, cr, uid, instance_id, event_ori_google_id, event_new, context=None):
+        gs_pool = self.pool['google.service']
 
-        data = self.generate_data(cr, uid,event_new, context=context)
+        data = self.generate_data(cr, uid, event_new, context=context)
 
         data['recurringEventId'] = event_ori_google_id
         data['originalStartTime'] = event_new.recurrent_id_date
 
-        url = "/calendar/v3/calendars/%s/events/%s?access_token=%s" % ('primary', instance_id,self.get_token(cr,uid,context))
-        headers = { 'Content-type': 'application/json'}
+        url = "/calendar/v3/calendars/%s/events/%s?access_token=%s" % ('primary', instance_id, self.get_token(cr, uid, context))
+        headers = {'Content-type': 'application/json'}
 
         data['sequence'] = self.get_sequence(cr, uid, instance_id, context)
 
@@ -181,39 +354,41 @@ class google_calendar(osv.AbstractModel):
 
     def update_from_google(self, cr, uid, event, single_event_dict, type, context):
         if context is None:
-            context= []
+            context = []
 
         calendar_event = self.pool['calendar.event']
         res_partner_obj = self.pool['res.partner']
         calendar_attendee_obj = self.pool['calendar.attendee']
-        user_obj = self.pool.get('res.users')
-        myPartnerID = user_obj.browse(cr,uid,uid,context).partner_id.id
+        user_obj = self.pool['res.users']
+        myPartnerID = user_obj.browse(cr, uid, uid, context).partner_id.id
         attendee_record = []
-        partner_record = [(4,myPartnerID)]
+        partner_record = [(4, myPartnerID)]
         result = {}
 
-        if single_event_dict.get('attendees',False):
+        if single_event_dict.get('attendees', False):
             for google_attendee in single_event_dict['attendees']:
                 if type == "write":
                     for oe_attendee in event['attendee_ids']:
                         if oe_attendee.email == google_attendee['email']:
-                            calendar_attendee_obj.write(cr, uid,[oe_attendee.id] ,{'state' : google_attendee['responseStatus']},context=context)
+                            calendar_attendee_obj.write(cr, uid, [oe_attendee.id], {'state': google_attendee['responseStatus']}, context=context)
                             google_attendee['found'] = True
                             continue
 
-                if google_attendee.get('found',False):
+                if google_attendee.get('found', False):
                     continue
-                attendee_id = res_partner_obj.search(cr, uid,[('email', '=', google_attendee['email'])], context=context)
-                if not attendee_id:
-                    attendee_id = [res_partner_obj.create(cr, uid,{'email': google_attendee['email'],'Customer': False, 'name': google_attendee.get("displayName",False) or google_attendee['email'] }, context=context)]
-                attendee = res_partner_obj.read(cr, uid, attendee_id[0], ['email'], context=context)
-                partner_record.append((4, attendee.get('id')))
-                attendee['partner_id'] = attendee.pop('id')
-                attendee['state'] = google_attendee['responseStatus']
-                attendee_record.append((0, 0, attendee))
+                if self.get_need_synchro_attendee(cr, uid, context=context):
+                    attendee_id = res_partner_obj.search(cr, uid, [('email', '=', google_attendee['email'])], context=context)
+                    if not attendee_id:
+                        attendee_id = [res_partner_obj.create(cr, uid, {'email': google_attendee['email'], 'customer': False, 'name': google_attendee.get("displayName", False) or google_attendee['email']}, context=context)]
+                    attendee = res_partner_obj.read(cr, uid, attendee_id[0], ['email'], context=context)
+                    partner_record.append((4, attendee.get('id')))
+                    attendee['partner_id'] = attendee.pop('id')
+                    attendee['state'] = google_attendee['responseStatus']
+                    attendee_record.append((0, 0, attendee))
+
         UTC = pytz.timezone('UTC')
-        if single_event_dict.get('start') and single_event_dict.get('end'): # If not cancelled   
-            if single_event_dict['start'].get('dateTime',False) and single_event_dict['end'].get('dateTime',False):
+        if single_event_dict.get('start') and single_event_dict.get('end'):  # If not cancelled
+            if single_event_dict['start'].get('dateTime', False) and single_event_dict['end'].get('dateTime', False):
                 date = parser.parse(single_event_dict['start']['dateTime'])
                 date_deadline = parser.parse(single_event_dict['end']['dateTime'])
                 delta = date_deadline.astimezone(UTC) - date.astimezone(UTC)
@@ -228,8 +403,8 @@ class google_calendar(osv.AbstractModel):
                 delta = (d_end - d_start)
                 allday = True
 
-            result['duration'] = (delta.seconds / 60) / 60.0 + delta.days *24
-            update_date = datetime.strptime(single_event_dict['updated'],"%Y-%m-%dT%H:%M:%S.%fz")
+            result['duration'] = (delta.seconds / 60) / 60.0 + delta.days * 24
+            update_date = datetime.strptime(single_event_dict['updated'], "%Y-%m-%dT%H:%M:%S.%fz")
             result.update({
                 'date': date,
                 'date_deadline': date_deadline,
@@ -239,17 +414,17 @@ class google_calendar(osv.AbstractModel):
             'attendee_ids': attendee_record,
             'partner_ids': list(set(partner_record)),
 
-            'name': single_event_dict.get('summary','Event'),
-            'description': single_event_dict.get('description',False),
-            'location':single_event_dict.get('location',False),
-            'class':single_event_dict.get('visibility','public'),
-            'oe_update_date':update_date, 
-#            'google_internal_event_id': single_event_dict.get('id',False),
+            'name': single_event_dict.get('summary', 'Event'),
+            'description': single_event_dict.get('description', False),
+            'location': single_event_dict.get('location', False),
+            'class': single_event_dict.get('visibility', 'public'),
+            'oe_update_date': update_date,
+            # 'google_internal_event_id': single_event_dict.get('id',False),
         })
 
-        if single_event_dict.get("recurrence",False):
+        if single_event_dict.get("recurrence", False):
             rrule = [rule for rule in single_event_dict["recurrence"] if rule.startswith("RRULE:")][0][6:]
-            result['rrule']=rrule
+            result['rrule'] = rrule
 
         if type == "write":
             res = calendar_event.write(cr, uid, event['id'], result, context=context)
@@ -261,106 +436,98 @@ class google_calendar(osv.AbstractModel):
             res = calendar_event.create(cr, uid, result, context=context)
 
         if context['curr_attendee']:
-            self.pool.get('calendar.attendee').write(cr,uid,[context['curr_attendee']], {'oe_synchro_date':update_date,'google_internal_event_id': single_event_dict.get('id',False)},context)
+            self.pool['calendar.attendee'].write(cr, uid, [context['curr_attendee']], {'oe_synchro_date': update_date, 'google_internal_event_id': single_event_dict.get('id', False)}, context)
         return res
 
     def synchronize_events(self, cr, uid, ids, context=None):
-        gc_obj = self.pool.get('google.calendar')
-
+        # Create all new events from OpenERP into Gmail, if that is not recurrent event
         self.create_new_events(cr, uid, context=context)
-
         self.bind_recurring_events_to_google(cr, uid, context)
-        cr.commit()
-
         res = self.update_events(cr, uid, context)
 
         return {
-                "status" :  res and "need_refresh" or "no_new_event_form_google",
-                "url" : ''
-                }
+            "status": res and "need_refresh" or "no_new_event_form_google",
+            "url": ''
+        }
 
-    def create_new_events(self, cr, uid, context):
-        gc_pool = self.pool.get('google.calendar')
-
-        calendar_event = self.pool['calendar.event']
+    def create_new_events(self, cr, uid, context=None):
+        ev_obj = self.pool['calendar.event']
         att_obj = self.pool['calendar.attendee']
         user_obj = self.pool['res.users']
-        myPartnerID = user_obj.browse(cr,uid,uid,context=context).partner_id.id
+        myPartnerID = user_obj.browse(cr, uid, uid, context=context).partner_id.id
 
         context_norecurrent = context.copy()
         context_norecurrent['virtual_id'] = False
 
-        my_att_ids = att_obj.search(cr, uid,[('partner_id', '=', myPartnerID),('google_internal_event_id', '=', False)], context=context_norecurrent)
-        for att in att_obj.browse(cr,uid,my_att_ids,context=context):
+        my_att_ids = att_obj.search(cr, uid, [('partner_id', '=', myPartnerID),
+                                    ('google_internal_event_id', '=', False),
+                                    '|',
+                                    ('event_id.date_deadline', '>', self.get_start_time_to_synchro(cr, uid, context).strftime("%Y-%m-%d %H:%M:%S")),
+                                    ('event_id.end_date', '>', self.get_start_time_to_synchro(cr, uid, context).strftime("%Y-%m-%d %H:%M:%S")),
+                                    ], context=context_norecurrent)
+
+        for att in att_obj.browse(cr, uid, my_att_ids, context=context):
             if not att.event_id.recurrent_id or att.event_id.recurrent_id == 0:
-                response = self.create_an_event(cr,uid,att.event_id,context=context)
-                update_date = datetime.strptime(response['updated'],"%Y-%m-%dT%H:%M:%S.%fz")
-                calendar_event.write(cr, uid, att.event_id.id, {'oe_update_date':update_date})
-                att_obj.write(cr, uid, [att.id], {'google_internal_event_id': response['id'], 'oe_synchro_date':update_date})
+                response = self.create_an_event(cr, uid, att.event_id, context=context)
+                update_date = datetime.strptime(response['updated'], "%Y-%m-%dT%H:%M:%S.%fz")
+                ev_obj.write(cr, uid, att.event_id.id, {'oe_update_date': update_date})
+                att_obj.write(cr, uid, [att.id], {'google_internal_event_id': response['id'], 'oe_synchro_date': update_date})
                 cr.commit()
-        return True
 
-    def get_empty_synchro_summarize(self) :
-        return {
-                #OPENERP
-                'OE_event' : False,
-                'OE_found' : False,
-                'OE_event_id' : False,
-                'OE_isRecurrence':False,
-                'OE_isInstance':False,
-                'OE_update':False,
-                'OE_status':False,
-                'OE_attendee_id': False,
-                'OE_synchro':False,
+    def bind_recurring_events_to_google(self, cr, uid, context):
+        ev_obj = self.pool['calendar.event']
+        att_obj = self.pool['calendar.attendee']
+        user_obj = self.pool['res.users']
+        myPartnerID = user_obj.browse(cr, uid, uid, context=context).partner_id.id
 
-                #GOOGLE
-                'GG_event' : False,
-                'GG_found' : False,
-                'GG_isRecurrence':False,
-                'GG_isInstance':False,
-                'GG_update':False,
-                'GG_status':False,
+        context_norecurrent = context.copy()
+        context_norecurrent['virtual_id'] = False
+        context_norecurrent['active_test'] = False
 
-                #TO_DO_IN_GOOGLE
-                'td_action':'',  #  create, update, delete, None
-                #If 'td_action' in (create , update), 
-                #    If td_source == OE
-                #            We create in google the event based on OpenERP
-                #    If td_source == GG
-                #            We create in OpenERP the event based on Gmail
-                #
-                #If 'td_action' in (delete),
-                #    If td_source == OE
-                #            We delete in OpenERP the event 
-                #    If td_source == GG
-                #            We delete in Gmail the event 
-                #    If td_source == ALL
-                #            We delete in openERP AND in Gmail the event 
-                'td_source': '', #  OE, GG, ALL
-                'td_comment':''
+        my_att_ids = att_obj.search(cr, uid, [('partner_id', '=', myPartnerID), ('google_internal_event_id', '=', False)], context=context_norecurrent)
 
-        }
+        for att in att_obj.browse(cr, uid, my_att_ids, context=context):
+            if att.event_id.recurrent_id and att.event_id.recurrent_id > 0:
+                new_google_internal_event_id = False
+                source_event_record = ev_obj.browse(cr, uid, att.event_id.recurrent_id, context)
+                source_attendee_record_id = att_obj.search(cr, uid, [('partner_id', '=', myPartnerID), ('event_id', '=', source_event_record.id)], context=context)
+                source_attendee_record = att_obj.browse(cr, uid, source_attendee_record_id, context)[0]
 
-    def update_events(self, cr, uid, context):
+                if att.event_id.recurrent_id_date and source_event_record.allday and source_attendee_record.google_internal_event_id:
+                    new_google_internal_event_id = source_attendee_record.google_internal_event_id + '_' + att.event_id.recurrent_id_date.split(' ')[0].replace('-', '')
+                elif att.event_id.recurrent_id_date and source_attendee_record.google_internal_event_id:
+                    new_google_internal_event_id = source_attendee_record.google_internal_event_id + '_' + att.event_id.recurrent_id_date.replace('-', '').replace(' ', 'T').replace(':', '') + 'Z'
+
+                if new_google_internal_event_id:
+                    #TODO WARNING, NEED TO CHECK THAT EVENT and ALL instance NOT DELETE IN GMAIL BEFORE !
+                    self.update_recurrent_event_exclu(cr, uid, new_google_internal_event_id, source_attendee_record.google_internal_event_id, att.event_id, context=context)
+                    att_obj.write(cr, uid, [att.id], {'google_internal_event_id': new_google_internal_event_id}, context=context)
+                    cr.commit()
+
+    def update_events(self, cr, uid, context=None):
         if context is None:
             context = {}
 
         calendar_event = self.pool['calendar.event']
         user_obj = self.pool['res.users']
         att_obj = self.pool['calendar.attendee']
-        myPartnerID = user_obj.browse(cr,uid,uid,context=context).partner_id.id
+        myPartnerID = user_obj.browse(cr, uid, uid, context=context).partner_id.id
 
         context_novirtual = context.copy()
         context_novirtual['virtual_id'] = False
         context_novirtual['active_test'] = False
 
-        all_event_from_google = self.get_event_dict(cr,uid,context=context)
-        all_new_event_from_google = all_event_from_google.copy()
+        all_event_from_google = self.get_event_dict(cr, uid, context=context)
 
         # Select all events from OpenERP which have been already synchronized in gmail
-        my_att_ids = att_obj.search(cr, uid,[('partner_id', '=', myPartnerID),('google_internal_event_id', '!=', False)], context=context_novirtual)
+        my_att_ids = att_obj.search(cr, uid, [('partner_id', '=', myPartnerID),
+                                    ('google_internal_event_id', '!=', False),
+                                    '|',
+                                    ('event_id.date_deadline', '>', self.get_start_time_to_synchro(cr, uid, context).strftime("%Y-%m-%d %H:%M:%S")),
+                                    ('event_id.end_date', '>', self.get_start_time_to_synchro(cr, uid, context).strftime("%Y-%m-%d %H:%M:%S")),
+                                    ], context=context_novirtual)
         event_to_synchronize = {}
-        for att in att_obj.browse(cr,uid,my_att_ids,context=context):
+        for att in att_obj.browse(cr, uid, my_att_ids, context=context):
             event = att.event_id
 
             base_event_id = att.google_internal_event_id.split('_')[0]
@@ -369,18 +536,19 @@ class google_calendar(osv.AbstractModel):
                 event_to_synchronize[base_event_id] = {}
 
             if att.google_internal_event_id not in event_to_synchronize[base_event_id]:
-                event_to_synchronize[base_event_id][att.google_internal_event_id] = self.get_empty_synchro_summarize()
+                event_to_synchronize[base_event_id][att.google_internal_event_id] = SyncEvent()
 
-            event_to_synchronize[base_event_id][att.google_internal_event_id]['OE_attendee_id'] = att.id
-            event_to_synchronize[base_event_id][att.google_internal_event_id]['OE_event'] = event
-            event_to_synchronize[base_event_id][att.google_internal_event_id]['OE_found'] = True
-            event_to_synchronize[base_event_id][att.google_internal_event_id]['OE_event_id'] = event.id
-            event_to_synchronize[base_event_id][att.google_internal_event_id]['OE_isRecurrence'] = event.recurrency
-            event_to_synchronize[base_event_id][att.google_internal_event_id]['OE_isInstance'] = bool(event.recurrent_id and event.recurrent_id > 0)
-            event_to_synchronize[base_event_id][att.google_internal_event_id]['OE_update'] = event.oe_update_date
-            event_to_synchronize[base_event_id][att.google_internal_event_id]['OE_status'] = event.active
-            event_to_synchronize[base_event_id][att.google_internal_event_id]['OE_synchro'] = att.oe_synchro_date
+            ev_to_sync = event_to_synchronize[base_event_id][att.google_internal_event_id]
 
+            ev_to_sync.OE.attendee_id = att.id
+            ev_to_sync.OE.event = event
+            ev_to_sync.OE.found = True
+            ev_to_sync.OE.event_id = event.id
+            ev_to_sync.OE.isRecurrence = event.recurrency
+            ev_to_sync.OE.isInstance = bool(event.recurrent_id and event.recurrent_id > 0)
+            ev_to_sync.OE.update = event.oe_update_date
+            ev_to_sync.OE.status = event.active
+            ev_to_sync.OE.synchro = att.oe_synchro_date
 
         for event in all_event_from_google.values():
             event_id = event.get('id')
@@ -390,284 +558,173 @@ class google_calendar(osv.AbstractModel):
                 event_to_synchronize[base_event_id] = {}
 
             if event_id not in event_to_synchronize[base_event_id]:
-                event_to_synchronize[base_event_id][event_id] = self.get_empty_synchro_summarize()
+                event_to_synchronize[base_event_id][event_id] = SyncEvent()
 
-            event_to_synchronize[base_event_id][event_id]['GG_event'] = event
-            event_to_synchronize[base_event_id][event_id]['GG_found'] = True
-            event_to_synchronize[base_event_id][event_id]['GG_isRecurrence'] = bool(event.get('recurrence',''))
-            event_to_synchronize[base_event_id][event_id]['GG_isInstance'] = bool(event.get('recurringEventId',0))  
-            event_to_synchronize[base_event_id][event_id]['GG_update'] = event.get('updated',None) # if deleted, no date without browse event
-            if event_to_synchronize[base_event_id][event_id]['GG_update']:
-                event_to_synchronize[base_event_id][event_id]['GG_update'] =event_to_synchronize[base_event_id][event_id]['GG_update'].replace('T',' ').replace('Z','')
-            event_to_synchronize[base_event_id][event_id]['GG_status'] = (event.get('status') != 'cancelled')
+            ev_to_sync = event_to_synchronize[base_event_id][event_id]
 
+            ev_to_sync.GG.event = event
+            ev_to_sync.GG.found = True
+            ev_to_sync.GG.isRecurrence = bool(event.get('recurrence', ''))
+            ev_to_sync.GG.isInstance = bool(event.get('recurringEventId', 0))
+            ev_to_sync.GG.update = event.get('updated', None)  # if deleted, no date without browse event
+            if ev_to_sync.GG.update:
+                ev_to_sync.GG.update = ev_to_sync.GG.update.replace('T', ' ').replace('Z', '')
+            ev_to_sync.GG.status = (event.get('status') != 'cancelled')
 
-        ######################  
+        ######################
         #   PRE-PROCESSING   #
         ######################
-
         for base_event in event_to_synchronize:
             for current_event in event_to_synchronize[base_event]:
-                event = event_to_synchronize[base_event][current_event]
-
-                #If event are already in Gmail and in OpenERP 
-                if event['OE_found'] and event['GG_found']:
-                    #If the event has been deleted from one side, we delete on other side !
-                    if event['OE_status'] != event['GG_status']:
-                        event['td_action'] = "DELETE"
-                        event['td_source'] = (event['OE_status'] and "OE") or (event['GG_status'] and "GG")
-                    #If event is not deleted !     
-                    elif event['OE_status'] and event['GG_status']:
-                        if event['OE_update'].split('.')[0] != event['GG_update'].split('.')[0]:
-                            if event['OE_update'] < event['GG_update']:
-                                event['td_source'] = 'GG'
-                            elif event['OE_update'] > event['GG_update']:
-                                event['td_source'] = 'OE'
-
-
-                            if event['td_action'] != "None":
-                                if event['%s_isRecurrence' % event['td_source']]:
-                                    if event['%s_status' % event['td_source']]:
-                                         event['td_action'] = "UPDATE"
-                                         event['td_comment'] = 'Only need to update, because i\'m active'
-                                    else:
-                                        event['td_action'] = "EXCLUDE"
-                                        event['td_comment'] = 'Need to Exclude (Me = First event from recurrence) from recurrence'
-
-                                elif event['%s_isInstance' % event['td_source']]:
-                                    event['td_action'] = "UPDATE"
-                                    event['td_comment'] = 'Only need to update, because already an exclu'
-                                else:
-                                    event['td_action'] = "UPDATE"
-                                    event['td_comment'] = 'Simply Update... I\'m a single event'
-
-                        else:
-                            if not event['OE_synchro'] or event['OE_synchro'].split('.')[0] < event['OE_update'].split('.')[0]:
-                                event['td_source'] = 'OE'
-                                event['td_action'] = "UPDATE"
-                                event['td_comment'] = 'Event already updated by another user, but not synchro with my google calendar'
-
-                            else:
-                                event['td_action'] = "None"
-                                event['td_comment'] = 'Not update needed'
-                    else:
-                        event['td_action'] = "None"
-                        event['td_comment'] = "Both are already deleted"  
-                # New in openERP...  Create on create_events of synchronize function
-                elif event['OE_found'] and not event['GG_found']:
-                    #Has been deleted from gmail
-                    if event['OE_status']:
-                        event['td_source'] = 'OE'
-                        event['td_action'] = 'DELETE'
-                        event['td_comment'] = 'Removed from GOOGLE ?'
-                    else:
-                        event['td_action'] = "None"  
-                        event['td_comment'] = "Already Deleted in gmail and unlinked in OpenERP"  
-                elif event['GG_found'] and not event['OE_found']:
-                    event['td_source'] = 'GG'
-                    if not event['GG_status'] and not event['GG_isInstance']:
-                            # don't need to make something... because event has been created and deleted before the synchronization
-                            event['td_action'] = 'None'
-                            event['td_comment'] = 'Nothing to do... Create and Delete directly'
-
-                    else:
-                          if event['GG_isInstance']:
-                               if event['%s_status' % event['td_source']]:
-                                    event['td_action'] = "EXCLUDE"     
-                                    event['td_comment'] = 'Need to create the new exclu'
-                               else:
-                                    event['td_action'] = "EXCLUDE"
-                                    event['td_comment'] = 'Need to copy and Exclude'    
-                          else:
-                              event['td_action'] = "CREATE"
-                              event['td_comment'] = 'New EVENT CREATE from GMAIL'
+                event_to_synchronize[base_event][current_event].compute_OP()
+            #print event_to_synchronize[base_event]
 
         ######################
         #      DO ACTION     #
-        ###################### 
+        ######################
         for base_event in event_to_synchronize:
-            event_to_synchronize[base_event] = sorted(event_to_synchronize[base_event].iteritems(),key=operator.itemgetter(0))
+            event_to_synchronize[base_event] = sorted(event_to_synchronize[base_event].iteritems(), key=operator.itemgetter(0))
             for current_event in event_to_synchronize[base_event]:
                 cr.commit()
-                event = current_event[1] 
-                #############
-                ### DEBUG ###   
-                ############# 
-#                 if event['td_action'] and event['td_action'] != 'None':               
-#                     print "  Real Event  %s (%s)" %  (current_event[0],event['OE_event_id'])
-#                     print "    Found       OE:%5s vs GG: %5s" % (event['OE_found'],event['GG_found'])
-#                     print "    Recurrence  OE:%5s vs GG: %5s" % (event['OE_isRecurrence'],event['GG_isRecurrence'])
-#                     print "    Instance    OE:%5s vs GG: %5s" % (event['OE_isInstance'],event['GG_isInstance'])
-#                     print "    Synchro     OE: %10s " % (event['OE_synchro']) 
-#                     print "    Update      OE: %10s " % (event['OE_update'])  
-#                     print "    Update      GG: %10s " % (event['GG_update'])
-#                     print "    Status      OE:%5s vs GG: %5s" % (event['OE_status'],event['GG_status'])
-#                     print "    Action      %s" % (event['td_action'])
-#                     print "    Source      %s" % (event['td_source'])
-#                     print "    comment     %s" % (event['td_comment'])
+                event = current_event[1]  # event is an Sync Event !
+                actToDo = event.OP
+                actSrc = event.OP.src
 
-                context['curr_attendee'] = event.get('OE_attendee_id',False)
+                context['curr_attendee'] = event.OE.attendee_id
 
-                actToDo = event['td_action']
-                actSrc = event['td_source']
-                if not actToDo:
-                    raise ("#!? WHAT I NEED TO DO ????")
-                else:
-                    if actToDo == 'None':
-                        continue
-                    elif actToDo == 'CREATE':
-                        context_tmp = context.copy()
-                        context_tmp['NewMeeting'] = True
-                        if actSrc == 'GG':
-                            res = self.update_from_google(cr, uid, False, event['GG_event'], "create", context=context_tmp)
-                            event['OE_event_id'] = res
-                            meeting = calendar_event.browse(cr,uid,res,context=context)
-                            attendee_record_id = att_obj.search(cr, uid, [('partner_id','=', myPartnerID), ('event_id','=',res)], context=context)
-                            self.pool.get('calendar.attendee').write(cr,uid,attendee_record_id, {'oe_synchro_date':meeting.oe_update_date,'google_internal_event_id': event['GG_event']['id']},context=context_tmp)
-                        elif  actSrc == 'OE':
-                            raise "Should be never here, creation for OE is done before update !"
-                        #TODO Add to batch
-                    elif actToDo == 'UPDATE':
-                        if actSrc == 'GG':
-                            self.update_from_google(cr, uid, event['OE_event'], event['GG_event'], 'write', context)
-                        elif  actSrc == 'OE':
-                            self.update_to_google(cr, uid, event['OE_event'], event['GG_event'], context)
-                    elif actToDo == 'EXCLUDE' :
-                        if actSrc == 'OE':
-                            self.delete_an_event(cr,uid,current_event[0],context=context)
-                        elif  actSrc == 'GG':
-                                new_google_event_id = event['GG_event']['id'].split('_')[1]
-                                if 'T' in new_google_event_id:
-                                    new_google_event_id = new_google_event_id.replace('T','')[:-1]
+                if isinstance(actToDo, NothingToDo):
+                    continue
+                elif isinstance(actToDo, Create):
+                    context_tmp = context.copy()
+                    context_tmp['NewMeeting'] = True
+                    if actSrc == 'GG':
+                        res = self.update_from_google(cr, uid, False, event.GG.event, "create", context=context_tmp)
+                        event.OE.event_id = res
+                        meeting = calendar_event.browse(cr, uid, res, context=context)
+                        attendee_record_id = att_obj.search(cr, uid, [('partner_id', '=', myPartnerID), ('event_id', '=', res)], context=context)
+                        self.pool['calendar.attendee'].write(cr, uid, attendee_record_id, {'oe_synchro_date': meeting.oe_update_date, 'google_internal_event_id': event.GG.event['id']}, context=context_tmp)
+                    elif actSrc == 'OE':
+                        raise "Should be never here, creation for OE is done before update !"
+                    #TODO Add to batch
+                elif isinstance(actToDo, Update):
+                    if actSrc == 'GG':
+                        self.update_from_google(cr, uid, event.OE.event, event.GG.event, 'write', context)
+                    elif actSrc == 'OE':
+                        self.update_to_google(cr, uid, event.OE.event, event.GG.event, context)
+                elif isinstance(actToDo, Exclude):
+                    if actSrc == 'OE':
+                        self.delete_an_event(cr, uid, current_event[0], context=context)
+                    elif actSrc == 'GG':
+                            new_google_event_id = event.GG.event['id'].split('_')[1]
+                            if 'T' in new_google_event_id:
+                                new_google_event_id = new_google_event_id.replace('T', '')[:-1]
+                            else:
+                                new_google_event_id = new_google_event_id + "000000"
+
+                                if event.GG.status:
+                                    parent_event = {}
+                                    parent_event['id'] = "%s-%s" % (event_to_synchronize[base_event][0][1].OE.event_id, new_google_event_id)
+                                    res = self.update_from_google(cr, uid, parent_event, event.GG.event, "copy", context)
                                 else:
-                                    new_google_event_id = new_google_event_id + "000000"
-    
-                                    if event['GG_status']:
-                                        parent_event = {}
-                                        parent_event['id'] = "%s-%s" % (event_to_synchronize[base_event][0][1].get('OE_event_id') ,  new_google_event_id)
-                                        res = self.update_from_google(cr, uid, parent_event, event['GG_event'], "copy", context)
-                                    else:
-                                        if event_to_synchronize[base_event][0][1].get('OE_event_id'):
-                                            parent_oe_id =  event_to_synchronize[base_event][0][1].get('OE_event_id')
-                                            calendar_event.unlink(cr,uid,"%s-%s" % (parent_oe_id,new_google_event_id),unlink_level=1,context=context)
+                                    if event_to_synchronize[base_event][0][1].OE.event_id:
+                                        parent_oe_id = event_to_synchronize[base_event][0][1].OE.event_id
+                                        calendar_event.unlink(cr, uid, "%s-%s" % (parent_oe_id, new_google_event_id), unlink_level=1, context=context)
 
-                    elif actToDo == 'DELETE':
-                        if actSrc == 'GG':
-                            self.delete_an_event(cr,uid,current_event[0],context=context)
-                        elif  actSrc == 'OE':
-                            calendar_event.unlink(cr,uid,event['OE_event_id'],unlink_level=0,context=context)
+                elif isinstance(actToDo, Delete):
+                    if actSrc == 'GG':
+                        self.delete_an_event(cr, uid, current_event[0], context=context)
+                    elif actSrc == 'OE':
+                        calendar_event.unlink(cr, uid, event.OE.event_id, unlink_level=0, context=context)
         return True
 
-    def bind_recurring_events_to_google(self, cr, uid,  context):
-        calendar_event = self.pool['calendar.event']
-        att_obj = self.pool.get('calendar.attendee')
-        user_obj = self.pool['res.users']
-        myPartnerID = user_obj.browse(cr,uid,uid,context=context).partner_id.id
-
-        context_norecurrent = context.copy()
-        context_norecurrent['virtual_id'] = False
-        context_norecurrent['active_test'] = False
-
-        my_att_ids = att_obj.search(cr, uid,[('partner_id', '=', myPartnerID),('google_internal_event_id', '=', False)], context=context_norecurrent)
-        for att in att_obj.browse(cr,uid,my_att_ids,context=context):
-            if att.event_id.recurrent_id and att.event_id.recurrent_id > 0:
-                new_google_internal_event_id = False
-                source_event_record = calendar_event.browse(cr, uid, att.event_id.recurrent_id, context)
-                source_attendee_record_id = att_obj.search(cr, uid, [('partner_id','=', myPartnerID), ('event_id','=',source_event_record.id)], context=context)
-                source_attendee_record = att_obj.browse(cr, uid, source_attendee_record_id, context)
-                if source_attendee_record:
-                    source_attendee_record = source_attendee_record[0]
-
-                if att.event_id.recurrent_id_date and source_event_record.allday and source_attendee_record.google_internal_event_id:
-                    new_google_internal_event_id = source_attendee_record.google_internal_event_id +'_'+ att.event_id.recurrent_id_date.split(' ')[0].replace('-','')
-                elif event.recurrent_id_date and source_attendee_record.google_internal_event_id:
-                    new_google_internal_event_id = source_attendee_record.google_internal_event_id +'_'+ att.event_id.recurrent_id_date.replace('-','').replace(' ','T').replace(':','') + 'Z'
-
-                if new_google_internal_event_id:
-                    #TODO WARNING, NEED TO CHECK THAT EVENT and ALL instance NOT DELETE IN GMAIL BEFORE !
-                    res = self.update_recurrent_event_exclu(cr,uid,new_google_internal_event_id,source_attendee_record.google_internal_event_id,att.event_id,context=context)
-                    att_obj.write(cr, uid, [att.event_id.id], {'google_internal_event_id': new_google_internal_event_id})
-
     def check_and_sync(self, cr, uid, oe_event, google_event, context):
-        if datetime.strptime(oe_event.oe_update_date,"%Y-%m-%d %H:%M:%S.%f") > datetime.strptime(google_event['updated'],"%Y-%m-%dT%H:%M:%S.%fz"):
+        if datetime.strptime(oe_event.oe_update_date, "%Y-%m-%d %H:%M:%S.%f") > datetime.strptime(google_event['updated'], "%Y-%m-%dT%H:%M:%S.%fz"):
             self.update_to_google(cr, uid, oe_event, google_event, context)
-        elif datetime.strptime(oe_event.oe_update_date,"%Y-%m-%d %H:%M:%S.%f") < datetime.strptime(google_event['updated'],"%Y-%m-%dT%H:%M:%S.%fz"):
+        elif datetime.strptime(oe_event.oe_update_date, "%Y-%m-%d %H:%M:%S.%f") < datetime.strptime(google_event['updated'], "%Y-%m-%dT%H:%M:%S.%fz"):
             self.update_from_google(cr, uid, oe_event, google_event, 'write', context)
 
-    def get_sequence(self,cr,uid,instance_id,context=None):
-        gs_pool = self.pool.get('google.service')
+    def get_sequence(self, cr, uid, instance_id, context=None):
+        gs_pool = self.pool['google.service']
 
         params = {
-                 'fields': 'sequence',
-                 'access_token' : self.get_token(cr,uid,context)
-                }
+            'fields': 'sequence',
+            'access_token': self.get_token(cr, uid, context)
+        }
 
         headers = {'Content-type': 'application/json'}
 
-        url = "/calendar/v3/calendars/%s/events/%s" % ('primary',instance_id) 
+        url = "/calendar/v3/calendars/%s/events/%s" % ('primary', instance_id)
 
         content = gs_pool._do_request(cr, uid, url, params, headers, type='GET', context=context)
-        return content.get('sequence',0)
-#################################        
+        return content.get('sequence', 0)
+#################################
 ##  MANAGE CONNEXION TO GMAIL  ##
 #################################
 
-    def get_token(self,cr,uid,context=None):
-        current_user = self.pool.get('res.users').browse(cr,uid,uid,context=context)
+    def get_token(self, cr, uid, context=None):
+        current_user = self.pool['res.users'].browse(cr, uid, uid, context=context)
 
         if datetime.strptime(current_user.google_calendar_token_validity.split('.')[0], "%Y-%m-%d %H:%M:%S") < (datetime.now() + timedelta(minutes=1)):
-            self.do_refresh_token(cr,uid,context=context)
+            self.do_refresh_token(cr, uid, context=context)
             current_user.refresh()
 
         return current_user.google_calendar_token
 
-    def do_refresh_token(self,cr,uid,context=None):
-        current_user = self.pool.get('res.users').browse(cr,uid,uid,context=context)
-        gs_pool = self.pool.get('google.service')
+    def do_refresh_token(self, cr, uid, context=None):
+        current_user = self.pool['res.users'].browse(cr, uid, uid, context=context)
+        gs_pool = self.pool['google.service']
 
-        refresh = current_user.google_calendar_rtoken
-        all_token = gs_pool._refresh_google_token_json(cr, uid, current_user.google_calendar_rtoken,self.STR_SERVICE,context=context)
+        all_token = gs_pool._refresh_google_token_json(cr, uid, current_user.google_calendar_rtoken, self.STR_SERVICE, context=context)
 
         vals = {}
         vals['google_%s_token_validity' % self.STR_SERVICE] = datetime.now() + timedelta(seconds=all_token.get('expires_in'))
         vals['google_%s_token' % self.STR_SERVICE] = all_token.get('access_token')
 
-        self.pool.get('res.users').write(cr,SUPERUSER_ID,uid,vals,context=context)
+        self.pool['res.users'].write(cr, SUPERUSER_ID, uid, vals, context=context)
 
-    def need_authorize(self,cr,uid,context=None):
-        current_user = self.pool.get('res.users').browse(cr,uid,uid,context=context)
-        return current_user.google_calendar_rtoken == False
+    def need_authorize(self, cr, uid, context=None):
+        current_user = self.pool['res.users'].browse(cr, uid, uid, context=context)
+        return current_user.google_calendar_rtoken is False
 
-    def get_calendar_scope(self,RO=False):
+    def get_calendar_scope(self, RO=False):
         readonly = RO and '.readonly' or ''
         return 'https://www.googleapis.com/auth/calendar%s' % (readonly)
 
-    def authorize_google_uri(self,cr,uid,from_url='http://www.openerp.com',context=None):
-        url = self.pool.get('google.service')._get_authorize_uri(cr,uid,from_url,self.STR_SERVICE,scope=self.get_calendar_scope(),context=context)
+    def authorize_google_uri(self, cr, uid, from_url='http://www.openerp.com', context=None):
+        url = self.pool['google.service']._get_authorize_uri(cr, uid, from_url, self.STR_SERVICE, scope=self.get_calendar_scope(), context=context)
         return url
 
-    def can_authorize_google(self,cr,uid,context=None):
+    def can_authorize_google(self, cr, uid, context=None):
         return self.pool['res.users'].has_group(cr, uid, 'base.group_erp_manager')
 
-    def set_all_tokens(self,cr,uid,authorization_code,context=None):
-        gs_pool = self.pool.get('google.service')
-        all_token = gs_pool._get_google_token_json(cr, uid, authorization_code,self.STR_SERVICE,context=context)
+    def set_all_tokens(self, cr, uid, authorization_code, context=None):
+        gs_pool = self.pool['google.service']
+        all_token = gs_pool._get_google_token_json(cr, uid, authorization_code, self.STR_SERVICE, context=context)
 
         vals = {}
         vals['google_%s_rtoken' % self.STR_SERVICE] = all_token.get('refresh_token')
         vals['google_%s_token_validity' % self.STR_SERVICE] = datetime.now() + timedelta(seconds=all_token.get('expires_in'))
         vals['google_%s_token' % self.STR_SERVICE] = all_token.get('access_token')
-        self.pool.get('res.users').write(cr,SUPERUSER_ID,uid,vals,context=context)
+        self.pool['res.users'].write(cr, SUPERUSER_ID, uid, vals, context=context)
+
+    def get_start_time_to_synchro(self, cr, uid, context=None):
+        # WILL BE AN IR CONFIG PARAMETER - beginning from SAAS4
+        number_of_week = 13
+        return datetime.now() - timedelta(weeks=number_of_week)
+
+    def get_need_synchro_attendee(self, cr, uid, context=None):
+        # WILL BE AN IR CONFIG PARAMETER - beginning from SAAS4
+        return True
 
 
-class res_users(osv.Model): 
+class res_users(osv.Model):
     _inherit = 'res.users'
 
     _columns = {
         'google_calendar_rtoken': fields.char('Refresh Token'),
-        'google_calendar_token': fields.char('User token'), 
+        'google_calendar_token': fields.char('User token'),
         'google_calendar_token_validity': fields.datetime('Token Validity'),
-     }
+    }
 
 
 class calendar_event(osv.Model):
@@ -675,7 +732,7 @@ class calendar_event(osv.Model):
 
     def write(self, cr, uid, ids, vals, context=None):
         if context is None:
-            context= {}
+            context = {}
         sync_fields = set(['name', 'description', 'date', 'date_closed', 'date_deadline', 'attendee_ids', 'location', 'class'])
         if (set(vals.keys()) & sync_fields) and 'oe_update_date' not in vals.keys() and 'NewMeeting' not in context:
             vals['oe_update_date'] = datetime.now()
@@ -705,20 +762,17 @@ class calendar_attendee(osv.Model):
         'google_internal_event_id': fields.char('Google Calendar Event Id', size=256),
         'oe_synchro_date': fields.datetime('OpenERP Synchro Date'),
     }
-
-    _sql_constraints = [('google_id_uniq','unique(google_internal_event_id,partner_id,event_id)', 'Google ID should be unique!')]
+    _sql_constraints = [('google_id_uniq', 'unique(google_internal_event_id,partner_id,event_id)', 'Google ID should be unique!')]
 
     def write(self, cr, uid, ids, vals, context=None):
         if context is None:
             context = {}
 
         for id in ids:
-            ref = vals.get('event_id',self.browse(cr,uid,id,context=context).event_id.id)
+            ref = vals.get('event_id', self.browse(cr, uid, id, context=context).event_id.id)
 
             # If attendees are updated, we need to specify that next synchro need an action
             # Except if it come from an update_from_google
             if not context.get('curr_attendee', False) and not context.get('NewMeeting', False):
-                self.pool.get('calendar.event').write(cr, uid, ref, {'oe_update_date':datetime.now()},context)
-
+                self.pool['calendar.event'].write(cr, uid, ref, {'oe_update_date': datetime.now()}, context)
         return super(calendar_attendee, self).write(cr, uid, ids, vals, context=context)
-
diff --git a/addons/hr_gamification/__openerp__.py b/addons/hr_gamification/__openerp__.py
index c75a4454437..14925421cb1 100644
--- a/addons/hr_gamification/__openerp__.py
+++ b/addons/hr_gamification/__openerp__.py
@@ -37,4 +37,5 @@ Badge received are displayed on the user profile.
         'views/gamification.xml',
     ],
     'js': ['static/src/js/gamification.js'],
+    'auto_install': True,
 }
diff --git a/addons/hr_gamification/views/gamification.xml b/addons/hr_gamification/views/gamification.xml
index e2d45948b95..60c758a717d 100644
--- a/addons/hr_gamification/views/gamification.xml
+++ b/addons/hr_gamification/views/gamification.xml
@@ -50,7 +50,7 @@
             <field name="view_type">form</field>
             <field name="name">Goals History</field>
             <field name="view_mode">tree,kanban</field>
-            <field name="context">{'search_default_group_by_user': True, 'search_default_group_by_type': True}</field>
+            <field name="context">{'search_default_group_by_user': True, 'search_default_group_by_definition': True}</field>
             <field name="domain">[('challenge_id.category', '=', 'hr')]</field>
             <field name="help" type="html">
                 <p class="oe_view_nocontent_create">
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index f7fa6a7e47d..932a290b4a1 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -370,7 +370,8 @@ class hr_holidays(osv.osv):
                     'date': record.date_from,
                     'end_date': record.date_to,
                     'date_deadline': record.date_to,
-                    'state': 'open',            # to block that meeting date in the calendar                    
+                    'state': 'open',            # to block that meeting date in the calendar
+                    'class': 'confidential'
                 }   
                 #Add the partner_id (if exist) as an attendee             
                 if record.user_id and record.user_id.partner_id:
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index d87cc6314e9..d4b84bab012 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -74,8 +74,8 @@
                                 <label for="number_of_days_temp" string="Duration"/>
                             <div>
                                 <group col="3" attrs="{'invisible': [('type', '=', 'add')]}">
-                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/><label string="-" class="oe_inline"/>
-                                    <field name="date_to" nolabel="1" on_change="onchange_date_to(date_to, date_from)" required="1" class="oe_inline"/>
+                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(date_to, date_from)" attrs="{'required':[('type', '=', 'remove')]}" class="oe_inline"/><label string="-" class="oe_inline"/>
+                                    <field name="date_to" nolabel="1" on_change="onchange_date_to(date_to, date_from)"  attrs="{'required':[('type', '=', 'remove')]}" class="oe_inline"/>
                                 </group>
                                 <div>
                                     <field name="number_of_days_temp" class="oe_inline"/> days
diff --git a/addons/hw_escpos/controllers/main.py b/addons/hw_escpos/controllers/main.py
index c668a1ffdd7..58c02ebf59f 100644
--- a/addons/hw_escpos/controllers/main.py
+++ b/addons/hw_escpos/controllers/main.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import commands
 import logging
 import simplejson
 import os
@@ -11,7 +12,7 @@ import math
 import md5
 import openerp.addons.hw_proxy.controllers.main as hw_proxy
 import subprocess
-from threading import Thread
+from threading import Thread, Lock
 from Queue import Queue, Empty
 
 try:
@@ -39,6 +40,7 @@ class EscposDriver(Thread):
     def __init__(self):
         Thread.__init__(self)
         self.queue = Queue()
+        self.lock  = Lock()
         self.status = {'status':'connecting', 'messages':[]}
 
     def connected_usb_devices(self):
@@ -47,6 +49,13 @@ class EscposDriver(Thread):
             if usb.core.find(idVendor=device['vendor'], idProduct=device['product']) != None:
                 connected.append(device)
         return connected
+
+    def lockedstart(self):
+        self.lock.acquire()
+        if not self.isAlive():
+            self.daemon = True
+            self.start()
+        self.lock.release()
     
     def get_escpos_printer(self):
         try:
@@ -65,7 +74,7 @@ class EscposDriver(Thread):
         self.push_task('status')
         return self.status
 
-    def open_cashbox(printer):
+    def open_cashbox(self,printer):
         printer.cashdraw(2)
         printer.cashdraw(5)
 
@@ -86,6 +95,9 @@ class EscposDriver(Thread):
             _logger.warning('ESC/POS Device Disconnected: '+message)
 
     def run(self):
+        if not escpos:
+            _logger.error('ESC/POS cannot initialize, please verify system dependencies.')
+            return
         self.queue = Queue()
         while True:
             try:
@@ -103,8 +115,10 @@ class EscposDriver(Thread):
                         self.print_receipt_body(printer,data)
                         printer.cut()
                 elif task == 'cashbox':
-                    if timestamp >= time.time() * 12:
+                    if timestamp >= time.time() - 12:
                         self.open_cashbox(printer)
+                elif task == 'printstatus':
+                    self.print_status(printer)
                 elif task == 'status':
                     pass
 
@@ -113,10 +127,31 @@ class EscposDriver(Thread):
                 _logger.error(e);
 
     def push_task(self,task, data = None):
-        if not self.isAlive():
-            self.start()
+        self.lockedstart()
         self.queue.put((time.time(),task,data))
 
+    def print_status(self,eprint):
+        localips = ['0.0.0.0','127.0.0.1','127.0.1.1']
+        ips =  [ c.split(':')[1].split(' ')[0] for c in commands.getoutput("/sbin/ifconfig").split('\n') if 'inet addr' in c ]
+        ips =  [ ip for ip in ips if ip not in localips ] 
+        eprint.text('\n\n')
+        eprint.set(align='center',type='b',height=2,width=2)
+        eprint.text('PosBox Status\n')
+        eprint.text('\n')
+        eprint.set(align='center')
+
+        if len(ips) == 0:
+            eprint.text('ERROR: Could not connect to LAN\n\nPlease check that the PosBox is correc-\ntly connected with a network cable,\n that the LAN is setup with DHCP, and\nthat network addresses are available')
+        elif len(ips) == 1:
+            eprint.text('IP Address\n'+ips[0]+'\n')
+        else:
+            eprint.text('IP Addresses\n')
+            for ip in ips:
+                eprint.text(ip+'\n')
+
+        eprint.text('\n\n')
+        eprint.cut()
+
     def print_receipt_body(self,eprint,receipt):
 
         def check(string):
@@ -134,7 +169,6 @@ class EscposDriver(Thread):
             else:
                 return str(amount)
 
-
         def printline(left, right='', width=40, ratio=0.5, indent=0):
             lwidth = int(width * ratio) 
             rwidth = width - lwidth 
@@ -157,6 +191,7 @@ class EscposDriver(Thread):
 
         # Receipt Header
         if receipt['company']['logo']:
+            eprint.set(align='center')
             eprint.print_base64_image(receipt['company']['logo'])
             eprint.text('\n')
         else:
@@ -245,6 +280,8 @@ class EscposDriver(Thread):
 driver = EscposDriver()
 
 hw_proxy.drivers['escpos'] = driver
+
+driver.push_task('printstatus')
         
 class EscposProxy(hw_proxy.Proxy):
     
diff --git a/addons/hw_scanner/controllers/main.py b/addons/hw_scanner/controllers/main.py
index 105856a3e28..8fbdae62db6 100644
--- a/addons/hw_scanner/controllers/main.py
+++ b/addons/hw_scanner/controllers/main.py
@@ -4,7 +4,7 @@ import os
 import time
 from os import listdir
 from os.path import join
-from threading import Thread
+from threading import Thread, Lock
 from select import select
 from Queue import Queue, Empty
 
@@ -26,6 +26,7 @@ except ImportError:
 class Scanner(Thread):
     def __init__(self):
         Thread.__init__(self)
+        self.lock = Lock()
         self.status = {'status':'connecting', 'messages':[]}
         self.input_dir = '/dev/input/by-id/'
         self.barcodes = Queue()
@@ -86,6 +87,12 @@ class Scanner(Thread):
             57:(" "," "),
         }
 
+    def lockedstart(self):
+        self.lock.acquire()
+        if not self.isAlive():
+            self.start()
+        self.lock.release()
+
     def set_status(self, status, message = None):
         if status == self.status['status']:
             if message != None and message != self.status['messages'][-1]:
@@ -102,8 +109,6 @@ class Scanner(Thread):
         elif status == 'disconnected' and message:
             _logger.warning('Disconnected Barcode Scanner: '+message)
 
-            
-
     def get_device(self):
         try:
             if not evdev:
@@ -135,6 +140,8 @@ class Scanner(Thread):
             busy reading another barcode
         """
 
+        self.lockedstart()
+
         while True:
             try:
                 timestamp, barcode = self.barcodes.get(True, 5)
@@ -144,8 +151,7 @@ class Scanner(Thread):
                 return ''
     
     def get_status(self):
-        if not s.isAlive():
-            s.start()
+        self.lockedstart()
         return self.status
 
     def run(self):
@@ -209,7 +215,6 @@ hw_proxy.drivers['scanner'] = s
 class ScannerDriver(hw_proxy.Proxy):
     @http.route('/hw_proxy/scanner', type='json', auth='none', cors='*')
     def scanner(self):
-        if not s.isAlive():
-            s.start()
         return s.get_barcode()
         
+        
diff --git a/addons/im/security/ir.model.access.csv b/addons/im/security/ir.model.access.csv
index 5137990498a..d35d694661a 100644
--- a/addons/im/security/ir.model.access.csv
+++ b/addons/im/security/ir.model.access.csv
@@ -1,4 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_im_message,im.message,model_im_message,,1,0,1,0
 access_im_user,im.user,model_im_user,,1,1,1,0
-access_im_session,im.session,model_im_session,,1,0,0,0
\ No newline at end of file
+access_im_session,im.session,model_im_session,,1,1,1,0
\ No newline at end of file
diff --git a/addons/mail/ir_attachment.py b/addons/mail/ir_attachment.py
index 99c5a9e054e..a5d8705c0fb 100644
--- a/addons/mail/ir_attachment.py
+++ b/addons/mail/ir_attachment.py
@@ -186,12 +186,11 @@ class IrAttachment(osv.Model):
     def get_attachment_type(self, cr, uid, ids, name, args, context=None):
         result = {}
         for attachment in self.browse(cr, uid, ids, context=context):
-            fileext = os.path.splitext(attachment.datas_fname)[1].lower()
-            if not fileext or not fileext[1:] in self._fileext_to_type:
-                return 'unknown'
-            result[attachment.id] = self._fileext_to_type[fileext[1:]]
+            fileext = os.path.splitext(attachment.datas_fname or '')[1].lower()[1:]
+            result[attachment.id] = self._fileext_to_type.get(fileext, 'unknown')
         return result
 
     _columns = {
-        'file_type': fields.function(get_attachment_type, type='char', string='File Type'),
+        'file_type_icon': fields.function(get_attachment_type, type='char', string='File Type Icon'),
+        'file_type': fields.related('file_type_icon', type='char'),     # FIXME remove in trunk
     }
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index a8726c16a0d..a33eaaea15d 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -160,8 +160,8 @@ class mail_mail(osv.Model):
                 fragment['message_id'] = mail.mail_message_id.id
             elif mail.model and mail.res_id:
                 fragment.update(model=mail.model, res_id=mail.res_id)
-            
-            url = urljoin(base_url, "?%s#%s" % (urlencode(query), urlencode(fragment)))
+
+            url = urljoin(base_url, "/web?%s#%s" % (urlencode(query), urlencode(fragment)))
             return _("""<span class='oe_mail_footer_access'><small>Access your messages and documents <a style='color:inherit' href="%s">in OpenERP</a></small></span>""") % url
         else:
             return None
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 40a51df91d2..4c05d7a6d1f 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -351,12 +351,12 @@ class mail_message(osv.Model):
         partner_tree = dict((partner[0], partner) for partner in partners)
 
         # 2. Attachments as SUPERUSER, because could receive msg and attachments for doc uid cannot see
-        attachments = ir_attachment_obj.read(cr, SUPERUSER_ID, list(attachment_ids), ['id', 'datas_fname', 'name', 'file_type'], context=context)
+        attachments = ir_attachment_obj.read(cr, SUPERUSER_ID, list(attachment_ids), ['id', 'datas_fname', 'name', 'file_type_icon'], context=context)
         attachments_tree = dict((attachment['id'], {
             'id': attachment['id'],
             'filename': attachment['datas_fname'],
             'name': attachment['name'],
-            'file_type': attachment['file_type'],
+            'file_type_icon': attachment['file_type_icon'],
         }) for attachment in attachments)
 
         # 3. Update message dictionaries
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index ee4dcac5414..33cc5481108 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -199,7 +199,7 @@ class mail_thread(osv.AbstractModel):
         ], context=context)
         for fol in fol_obj.browse(cr, uid, fol_ids, context=context):
             thread_subtype_dict = res[fol.res_id]['message_subtype_data']
-            for subtype in fol.subtype_ids:
+            for subtype in [st for st in fol.subtype_ids if st.name in thread_subtype_dict]:
                 thread_subtype_dict[subtype.name]['followed'] = True
             res[fol.res_id]['message_subtype_data'] = thread_subtype_dict
 
@@ -369,10 +369,11 @@ class mail_thread(osv.AbstractModel):
         track_ctx = dict(context)
         if 'lang' not in track_ctx:
             track_ctx['lang'] = self.pool.get('res.users').browse(cr, uid, uid, context=context).lang
-        tracked_fields = self._get_tracked_fields(cr, uid, values.keys(), context=track_ctx)
-        if tracked_fields:
-            initial_values = {thread_id: dict((item, False) for item in tracked_fields)}
-            self.message_track(cr, uid, [thread_id], tracked_fields, initial_values, context=track_ctx)
+        if not context.get('mail_notrack'):
+            tracked_fields = self._get_tracked_fields(cr, uid, values.keys(), context=track_ctx)
+            if tracked_fields:
+                initial_values = {thread_id: dict((item, False) for item in tracked_fields)}
+                self.message_track(cr, uid, [thread_id], tracked_fields, initial_values, context=track_ctx)
         return thread_id
 
     def write(self, cr, uid, ids, values, context=None):
@@ -393,7 +394,11 @@ class mail_thread(osv.AbstractModel):
         result = super(mail_thread, self).write(cr, uid, ids, values, context=context)
         self.message_auto_subscribe(cr, uid, ids, values.keys(), context=context, values=values)
 
-        # Perform the tracking
+        if not context.get('mail_notrack'):
+            # Perform the tracking
+            tracked_fields = self._get_tracked_fields(cr, uid, values.keys(), context=context)
+        else:
+            tracked_fields = None
         if tracked_fields:
             self.message_track(cr, uid, ids, tracked_fields, initial_values, context=track_ctx)
         return result
@@ -414,6 +419,9 @@ class mail_thread(osv.AbstractModel):
         return res
 
     def copy(self, cr, uid, id, default=None, context=None):
+        # avoid tracking multiple temporary changes during copy
+        context = dict(context or {}, mail_notrack=True)
+
         default = default or {}
         default['message_ids'] = []
         default['message_follower_ids'] = []
@@ -725,13 +733,15 @@ class mail_thread(osv.AbstractModel):
         # Private message: should not contain any thread_id
         if not model and thread_id:
             if assert_model:
-                assert thread_id == 0, 'Routing: posting a message without model should be with a null res_id (private message), received %s.' % thread_id
-            _warn('posting a message without model should be with a null res_id (private message), received %s, resetting thread_id' % thread_id)
+                if thread_id: 
+                    raise ValueError('Routing: posting a message without model should be with a null res_id (private message), received %s.' % thread_id)
+            _warn('posting a message without model should be with a null res_id (private message), received %s resetting thread_id' % thread_id)
             thread_id = 0
         # Private message: should have a parent_id (only answers)
         if not model and not message_dict.get('parent_id'):
             if assert_model:
-                assert message_dict.get('parent_id'), 'Routing: posting a message without model should be with a parent_id (private mesage).'
+                if not message_dict.get('parent_id'):
+                    raise ValueError('Routing: posting a message without model should be with a parent_id (private mesage).')
             _warn('posting a message without model should be with a parent_id (private mesage), skipping')
             return ()
 
@@ -760,7 +770,10 @@ class mail_thread(osv.AbstractModel):
         # New Document: check model accepts the mailgateway
         if not thread_id and model and not hasattr(model_pool, 'message_new'):
             if assert_model:
-                assert hasattr(model_pool, 'message_new'), 'Model %s does not accept document creation, crashing' % model
+                if not hasattr(model_pool, 'message_new'):
+                    raise ValueError(
+                        'Model %s does not accept document creation, crashing' % model
+                    )
             _warn('model %s does not accept document creation, skipping' % model)
             return ()
 
@@ -821,8 +834,11 @@ class mail_thread(osv.AbstractModel):
                to which this mail should be attached. Only used if the message
                does not reply to an existing thread and does not match any mail alias.
            :return: list of [model, thread_id, custom_values, user_id, alias]
+
+        :raises: ValueError, TypeError
         """
-        assert isinstance(message, Message), 'message must be an email.message.Message at this point'
+        if not isinstance(message, Message):
+            raise TypeError('message must be an email.message.Message at this point')
         mail_msg_obj = self.pool['mail.message']
         fallback_model = model
 
@@ -940,9 +956,11 @@ class mail_thread(osv.AbstractModel):
             return [route]
 
         # AssertionError if no routes found and if no bounce occured
-        assert False, \
-            "No possible route found for incoming message from %s to %s (Message-Id %s:)." \
-            "Create an appropriate mail.alias or force the destination model." % (email_from, email_to, message_id)
+        raise ValueError(
+                'No possible route found for incoming message from %s to %s (Message-Id %s:). '
+                'Create an appropriate mail.alias or force the destination model.' %
+                (email_from, email_to, message_id)
+            )
 
     def message_route_process(self, cr, uid, message, message_dict, routes, context=None):
         # postpone setting message_dict.partner_ids after message_post, to avoid double notifications
@@ -953,9 +971,11 @@ class mail_thread(osv.AbstractModel):
                 context.update({'thread_model': model})
             if model:
                 model_pool = self.pool[model]
-                assert thread_id and hasattr(model_pool, 'message_update') or hasattr(model_pool, 'message_new'), \
-                    "Undeliverable mail with Message-Id %s, model %s does not accept incoming emails" % \
-                    (message_dict['message_id'], model)
+                if not (thread_id and hasattr(model_pool, 'message_update') or hasattr(model_pool, 'message_new')):
+                    raise ValueError(
+                        "Undeliverable mail with Message-Id %s, model %s does not accept incoming emails" %
+                        (message_dict['message_id'], model)
+                    )
 
                 # disabled subscriptions during message_new/update to avoid having the system user running the
                 # email gateway become a follower of all inbound messages
@@ -965,7 +985,8 @@ class mail_thread(osv.AbstractModel):
                 else:
                     thread_id = model_pool.message_new(cr, user_id, message_dict, custom_values, context=nosub_ctx)
             else:
-                assert thread_id == 0, "Posting a message without model should be with a null res_id, to create a private message."
+                if thread_id:
+                    raise ValueError("Posting a message without model should be with a null res_id, to create a private message.")
                 model_pool = self.pool.get('mail.thread')
             if not hasattr(model_pool, 'message_post'):
                 context['thread_model'] = model
@@ -1549,18 +1570,23 @@ class mail_thread(osv.AbstractModel):
         """ Add partners to the records followers. """
         if context is None:
             context = {}
+        # not necessary for computation, but saves an access right check
+        if not partner_ids:
+            return True
 
         mail_followers_obj = self.pool.get('mail.followers')
         subtype_obj = self.pool.get('mail.message.subtype')
 
         user_pid = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         if set(partner_ids) == set([user_pid]):
-            if context.get('operation', '') != 'create':
-                try:
-                    self.check_access_rights(cr, uid, 'read')
+            try:
+                self.check_access_rights(cr, uid, 'read')
+                if context.get('operation', '') == 'create':
+                    self.check_access_rule(cr, uid, ids, 'create')
+                else:
                     self.check_access_rule(cr, uid, ids, 'read')
-                except (osv.except_osv, orm.except_orm):
-                    return False
+            except (osv.except_osv, orm.except_orm):
+                return False
         else:
             self.check_access_rights(cr, uid, 'write')
             self.check_access_rule(cr, uid, ids, 'write')
@@ -1605,6 +1631,9 @@ class mail_thread(osv.AbstractModel):
 
     def message_unsubscribe(self, cr, uid, ids, partner_ids, context=None):
         """ Remove partners from the records followers. """
+        # not necessary for computation, but saves an access right check
+        if not partner_ids:
+            return True
         user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
         if set(partner_ids) == set([user_pid]):
             self.check_access_rights(cr, uid, 'read')
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index bfae7571a9c..50e190c846d 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -115,6 +115,9 @@
 .openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body p {
     margin-bottom: 0px;
 }
+.openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body pre {
+    white-space: pre-wrap;
+}
 .openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body * {
     text-overflow:ellipsis;
     word-wrap: break-word;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 58d44bab50e..b8bf703f604 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -925,20 +925,12 @@ openerp.mail = function (session) {
         },
 
         on_record_clicked: function  (event) {
-            event.stopPropagation();
             var state = {
                 'model': this.model,
                 'id': this.res_id,
                 'title': this.record_name
             };
             session.webclient.action_manager.do_push_state(state);
-            this.do_action({
-                res_model: state.model,
-                res_id: state.id,
-                type: 'ir.actions.act_window',
-                views: [[false, 'form']]
-            });
-            return false;
         },
 
         /* Call the on_compose_message on the thread of this message. */
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 938d6a01f6d..c103e4d4ab2 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -197,6 +197,7 @@ openerp_mail_followers = function(session, mail) {
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
             this.$('.oe_follower_title').html(this._format_followers(this.followers.length));
+            self.message_is_follower = _.indexOf(this.followers.map(function (rec) { return rec[2]['is_uid']}), true) != -1;
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
@@ -207,9 +208,6 @@ openerp_mail_followers = function(session, mail) {
                     'is_editable': record[2]['is_editable'],
                     'avatar_url': mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record[0]),
                 }
-                if (partner.is_uid) {
-                    self.message_is_follower = partner.is_uid;
-                }
                 $(session.web.qweb.render('mail.followers.partner', {'record': partner, 'widget': self})).appendTo(node_user_list);
                 // On mouse-enter it will show the edit_subtype pencil.
                 if (partner.is_editable) {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 3a7a5469ee1..28cbbca1f2c 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -88,10 +88,10 @@
         -->
     <t t-name="mail.thread.message.attachments">
         <t t-foreach='widget.attachment_ids' t-as='attachment'>
-            <t t-if="attachment.file_type !== 'webimage'">
+            <t t-if="attachment.file_type_icon !== 'webimage'">
                 <div t-attf-class="oe_attachment #{attachment.upload ? 'oe_uploading' : ''}">
                     <a t-att-href='attachment.url' target="_blank">
-                        <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.file_type + '.png'"></img>
+                        <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.file_type_icon + '.png'"></img>
                         <div class='oe_name'><t t-raw='attachment.name' /></div>
                     </a>
                     <div class='oe_delete oe_e' title="Delete this attachment" t-att-data-id="attachment.id">[</div>
@@ -100,7 +100,7 @@
                     </div>
                 </div>
             </t>
-            <t t-if="attachment.file_type === 'webimage'">
+            <t t-if="attachment.file_type_icon === 'webimage'">
                 <div t-attf-class="oe_attachment oe_preview #{attachment.upload ? 'oe_uploading' : ''}">
                     <a t-att-href='attachment.url' target="_blank">
                         <img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img>
@@ -135,14 +135,14 @@
                 <t t-if="widget.is_private or (widget.user_pid != partner[0])">
                     <t t-if="!widget.is_private and inc==0"> and </t>
 	                <span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/>
-	                    <a t-if="widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a>
-	                    <t t-if="!widget.options.show_link" t-raw="partner[1]"/>
+                        <a t-if="widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-esc="partner[1]"/></a>
+                        <t t-if="!widget.options.show_link" t-esc="partner[1]"/>
 	                </span>
 	                <t t-set="inc" t-value="inc+1"/>
 	            </t>
             </t>
             <t t-if="widget.partner_ids.length > 3">
-                <span class="oe_more">, <a><t t-raw="widget.partner_ids.length - 3"/> others...</a></span>
+                <span class="oe_more">, <a><t t-esc="widget.partner_ids.length - 3"/> others...</a></span>
                 <a class="oe_more_hidden">&lt;&lt;&lt;</a>
             </t>
         </div>
@@ -150,8 +150,8 @@
             <t t-foreach='widget.recipients' t-as='recipient'>
                 <label t-attf-title="Add as recipient and follower (reason: #{recipient.reason})">
                     <input type="checkbox" t-att-checked="recipient.checked ? 'checked' : undefined" t-att-data="recipient.full_name"/>
-                    <t t-raw="recipient.name"/> 
-                    <t t-if="recipient.email_address">(<t t-raw="recipient.email_address"/>)</t>
+                    <t t-esc="recipient.name"/> 
+                    <t t-if="recipient.email_address">(<t t-esc="recipient.email_address"/>)</t>
                     <t t-if="!recipient.email_address">(no email address)</t>
                 </label>
             </t>
@@ -177,7 +177,7 @@
                 <td colspan="2">
                     <h2 class="oe_view_title">
                         <span class="oe_view_title_text">
-                            <t t-raw="widget.action.name"/>
+                            <t t-esc="widget.action.name"/>
                         </span>
                     </h2>
                     <t t-if="widget.action.params.header_description">
@@ -262,12 +262,13 @@
                 <!-- message itself -->
                 <div class="oe_msg_content">
                     <h1 t-if="(widget.show_record_name or widget.subject) and !widget.thread_level" class="oe_msg_title">
-                        <a t-if="widget.options.show_link and widget.show_record_name" class="oe_mail_action_model" t-attf-href="#model=#{widget.model}&amp;id=#{widget.res_id}">
-                            <t t-raw="widget.record_name"/>
+                        <a t-if="widget.options.show_link and widget.show_record_name" class="oe_mail_action_model"
+                            t-attf-href="#action=mail.action_mail_redirect&amp;model=#{widget.model}&amp;res_id=#{widget.res_id}">
+                            <t t-esc="widget.record_name"/>
                         </a>
-                        <span t-if="!widget.options.show_link and widget.show_record_name"><t t-raw="widget.record_name"/></span>
+                        <span t-if="!widget.options.show_link and widget.show_record_name"><t t-esc="widget.record_name"/></span>
                         <t t-if="widget.show_record_name and widget.subject">: </t>
-                        <t t-if="widget.subject" t-raw="widget.subject"/>
+                        <t t-if="widget.subject" t-esc="widget.subject"/>
                     </h1>
                     <div class="oe_msg_body">
                         <t t-if="widget.body_short">
@@ -283,8 +284,8 @@
                     <t t-if="widget.attachment_ids.length > 0">
                         <div class="oe_msg_attachment_list"></div>
                     </t>
-                    <a t-if="widget.author_id and widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[2]"/></a>
-                    <span t-if="widget.author_id and (!widget.options.show_link or !widget.author_id[0])"><t t-raw="widget.author_id[2]"/></span>
+                    <a t-if="widget.author_id and widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-esc="widget.author_id[2]"/></a>
+                    <span t-if="widget.author_id and (!widget.options.show_link or !widget.author_id[0])"><t t-esc="widget.author_id[2]"/></span>
                     <t t-if="widget.type == 'notification'">
                         updated document
                         <t t-if="widget.partner_ids.length > 0">
@@ -303,20 +304,20 @@
                     <t t-if="widget.type == 'notification' or ( (widget.type == 'email' or widget.type == 'comment') and (widget.subtype or widget.partner_ids.length > 0))"
                             t-foreach="widget.partner_ids.slice(0, 3)" t-as="partner">
                         <span t-attf-class="oe_partner_follower">
-                        <a t-if="widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a>
-                        <t t-if="!widget.options.show_link" t-raw="partner[1]"/>
+                        <a t-if="widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-esc="partner[1]"/></a>
+                        <t t-if="!widget.options.show_link" t-esc="partner[1]"/>
                         </span>
                         <t t-if="!partner_last">,</t>
                     </t>
                     <t t-if="widget.partner_ids.length > 3">
-                        <span t-att-title="widget.extra_partners_str">and <t t-raw="widget.extra_partners_nbr"/> more</span>
+                        <span t-att-title="widget.extra_partners_str">and <t t-esc="widget.extra_partners_nbr"/> more</span>
                     </t>
                     <t t-if="widget.type == 'notification' and widget.partner_ids.length > 0">
                         notified
                     </t>
                     <span class='oe_subtle'>•</span>
                     <span t-att-title="widget.date">
-                        <t t-if="widget.timerelative" t-raw="widget.timerelative"/>
+                        <t t-if="widget.timerelative" t-esc="widget.timerelative"/>
                         <t t-if="!widget.timerelative" t-raw="widget.display_date"/>
                     </span>
                     <span t-if="!widget.options.readonly" class='oe_subtle'>•</span>
@@ -333,7 +334,7 @@
                 <div class='oe_separator'></div>
                 <a t-if="widget.nb_messages &lt;= 0" class="oe_msg_fetch_more">show more message</a>
                 <a t-if="widget.nb_messages === 1" class="oe_msg_fetch_more">show one more message</a>
-                <a t-if="widget.nb_messages &gt; 1" class="oe_msg_fetch_more">show <t t-raw="widget.nb_messages" /> more messages</a>
+                <a t-if="widget.nb_messages &gt; 1" class="oe_msg_fetch_more">show <t t-esc="widget.nb_messages" /> more messages</a>
             </div>
         </div>
     </t>
@@ -353,7 +354,7 @@
     -->
     <span t-name="mail.thread.message.vote">
         <span class="oe_mail_vote_count" t-if='widget.vote_nb > 0'>
-            <t t-raw='widget.vote_nb' />
+            <t t-esc='widget.vote_nb' />
             <span class='oe_e'>8</span>
         </span>
         <a href='#' class="oe_msg_vote">
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index a936b8237d6..6e8682cb533 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -43,13 +43,13 @@
         <table class='oe_subtype'>
             <tr>
                 <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
-                <td><label t-att-for="'input_mail_followers_subtype_'+record.id"><t t-raw="record.name"/></label></td>
+                <td><label t-att-for="'input_mail_followers_subtype_'+record.id"><t t-esc="record.name"/></label></td>
             </tr>
         </table>
     </t>
 
     <t t-name="mail.followers.show_more">
-        <div class="oe_partner oe_show_more">And <t t-raw="number"/> more.</div>
+        <div class="oe_partner oe_show_more">And <t t-esc="number"/> more.</div>
     </t>
 
 </template>
diff --git a/addons/mail/tests/test_mail_gateway.py b/addons/mail/tests/test_mail_gateway.py
index c6fffbde9fe..cb735ec098e 100644
--- a/addons/mail/tests/test_mail_gateway.py
+++ b/addons/mail/tests/test_mail_gateway.py
@@ -394,7 +394,7 @@ class TestMailgateway(TestMail):
                          'message_process: after reply, group should have 2 followers')
 
         # Do: incoming email with ref holding model / res_id but that does not match any message in the thread: must raise since OpenERP saas-3
-        self.assertRaises(AssertionError,
+        self.assertRaises(ValueError,
                           format_and_process,
                           MAIL_TEMPLATE, email_from='other5@gmail.com',
                           to='noone@example.com', subject='spam',
@@ -490,14 +490,14 @@ class TestMailgateway(TestMail):
         # --------------------------------------------------
 
         # Do: incoming email with model that does not accepts incoming emails must raise
-        self.assertRaises(AssertionError,
+        self.assertRaises(ValueError,
                           format_and_process,
                           MAIL_TEMPLATE,
                           to='noone@example.com', subject='spam', extra='', model='res.country',
                           msg_id='<1198923581.41972151344608186760.JavaMail.new4@agrolait.com>')
 
         # Do: incoming email without model and without alias must raise
-        self.assertRaises(AssertionError,
+        self.assertRaises(ValueError,
                           format_and_process,
                           MAIL_TEMPLATE,
                           to='noone@example.com', subject='spam', extra='',
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 74aea3dfc01..e5ff2b51fcd 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -130,7 +130,7 @@ class mail_compose_message(osv.TransientModel):
             'wizard_id', 'attachment_id', 'Attachments'),
         'filter_id': fields.many2one('ir.filters', 'Filters'),
     }
-
+    #TODO change same_thread to False in trunk (Require view update)
     _defaults = {
         'composition_mode': 'comment',
         'body': lambda self, cr, uid, ctx={}: '',
@@ -268,6 +268,8 @@ class mail_compose_message(osv.TransientModel):
                         'mail.message', 0,
                         context=context)
                     mail_values['attachment_ids'] = m2m_attachment_ids
+                    if not mail_values.get('reply_to'):
+                        mail_values['reply_to'] = mail_values['email_from']
                     self.pool.get('mail.mail').create(cr, uid, mail_values, context=context)
                 else:
                     subtype = 'mail.mt_comment'
@@ -321,10 +323,10 @@ class mail_compose_message(osv.TransientModel):
                 if email_dict.get('email_from'):
                     mail_values['email_from'] = email_dict.pop('email_from')
                 # replies redirection: mass mailing only
-                if not wizard.same_thread:
-                    mail_values['reply_to'] = email_dict.pop('reply_to', None)
-                else:
+                if wizard.same_thread and wizard.post:
                     email_dict.pop('reply_to', None)
+                else:
+                    mail_values['reply_to'] = email_dict.pop('reply_to', None)
                 mail_values.update(email_dict)
             # mass mailing without post: mail_mail values
             if mass_mail_mode and not wizard.post:
@@ -350,10 +352,10 @@ class mail_compose_message(osv.TransientModel):
         :return dict results: for each res_id, the generated template values for
                               subject, body, email_from and reply_to
         """
-        subjects = self.render_template_batch(cr, uid, wizard.subject, wizard.model, res_ids, context)
-        bodies = self.render_template_batch(cr, uid, wizard.body, wizard.model, res_ids, context)
-        emails_from = self.render_template_batch(cr, uid, wizard.email_from, wizard.model, res_ids, context)
-        replies_to = self.render_template_batch(cr, uid, wizard.reply_to, wizard.model, res_ids, context)
+        subjects = self.render_template_batch(cr, uid, wizard.subject, wizard.model, res_ids, context=context)
+        bodies = self.render_template_batch(cr, uid, wizard.body, wizard.model, res_ids, context=context, post_process=True)
+        emails_from = self.render_template_batch(cr, uid, wizard.email_from, wizard.model, res_ids, context=context)
+        replies_to = self.render_template_batch(cr, uid, wizard.reply_to, wizard.model, res_ids, context=context)
 
         results = dict.fromkeys(res_ids, False)
         for res_id in res_ids:
@@ -365,7 +367,7 @@ class mail_compose_message(osv.TransientModel):
             }
         return results
 
-    def render_template_batch(self, cr, uid, template, model, res_ids, context=None):
+    def render_template_batch(self, cr, uid, template, model, res_ids, context=None, post_process=False):
         """ Render the given template text, replace mako-like expressions ``${expr}``
         with the result of evaluating these expressions with an evaluation context
         containing:
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 948d9b3832c..23931649402 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -47,10 +47,10 @@
                         <field name="notify"
                             attrs="{'invisible':['|', ('post', '!=', True), ('composition_mode', '!=', 'mass_mail')]}"/>
                         <field name="same_thread"
-                            attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
+                            attrs="{'invisible':['|', ('composition_mode', '!=', 'mass_mail'), ('post', '=', False)]}"/>
                         <field name="reply_to" placeholder="Email address te redirect replies..."
-                            attrs="{'invisible':['|', ('same_thread', '=', True), ('composition_mode', '!=', 'mass_mail')],
-                                    'required':[('same_thread', '!=', True)]}"/>
+                            attrs="{'invisible':['|', '&amp;', ('same_thread', '=', True), ('post', '=', True), ('composition_mode', '!=', 'mass_mail')],
+                                    'required':['&amp;', '|', ('post', '=', False), ('same_thread', '=', False), ('composition_mode', '=', 'mass_mail')]}"/>
                     </group>
                     <field name="body"/>
                     <field name="attachment_ids" widget="many2many_binary" string="Attach a file"/>
diff --git a/addons/mass_mailing/mail_thread.py b/addons/mass_mailing/mail_thread.py
index 0570596ba12..a4ff15a1a3f 100644
--- a/addons/mass_mailing/mail_thread.py
+++ b/addons/mass_mailing/mail_thread.py
@@ -48,6 +48,7 @@ class MailThread(osv.Model):
         if bounce_alias in email_to:
             bounce_match = tools.bounce_re.search(email_to)
             if bounce_match:
+                bounced_model, bounced_thread_id = None, False
                 bounced_mail_id = bounce_match.group(1)
                 stat_ids = self.pool['mail.mail.statistics'].set_bounced(cr, uid, mail_mail_ids=[bounced_mail_id], context=context)
                 for stat in self.pool['mail.mail.statistics'].browse(cr, uid, stat_ids, context=context):
@@ -55,7 +56,7 @@ class MailThread(osv.Model):
                     bounced_thread_id = stat.res_id
                 _logger.info('Routing mail from %s to %s with Message-Id %s: bounced mail from mail %s, model: %s, thread_id: %s',
                              email_from, email_to, message_id, bounced_mail_id, bounced_model, bounced_thread_id)
-                if bounced_model and bounced_model in self.pool and hasattr(self.pool[bounced_model], 'message_receive_bounce'):
+                if bounced_model and bounced_model in self.pool and hasattr(self.pool[bounced_model], 'message_receive_bounce') and bounced_thread_id:
                     self.pool[bounced_model].message_receive_bounce(cr, uid, [bounced_thread_id], mail_id=bounced_mail_id, context=context)
                 return False
 
diff --git a/addons/mass_mailing/mass_mailing.py b/addons/mass_mailing/mass_mailing.py
index 516e68db3d9..e7583d8e739 100644
--- a/addons/mass_mailing/mass_mailing.py
+++ b/addons/mass_mailing/mass_mailing.py
@@ -168,8 +168,10 @@ class MassMailing(osv.Model):
                            'tooltip': (date_begin + relativedelta.relativedelta(days=i)).strftime('%d %B %Y'),
                            } for i in range(0, self._period_number)]
         group_obj = obj.read_group(cr, uid, domain, read_fields, groupby_field, context=context)
+        field_col_info = obj._all_columns.get(groupby_field.split(':')[0])
+        pattern = tools.DEFAULT_SERVER_DATE_FORMAT if field_col_info.column._type == 'date' else tools.DEFAULT_SERVER_DATETIME_FORMAT
         for group in group_obj:
-            group_begin_date = datetime.strptime(group['__domain'][0][2], tools.DEFAULT_SERVER_DATE_FORMAT).date()
+            group_begin_date = datetime.strptime(group['__domain'][0][2], pattern).date()
             timedelta = relativedelta.relativedelta(group_begin_date, date_begin)
             section_result[timedelta.days] = {'value': group.get(value_field, 0), 'tooltip': group.get(groupby_field)}
         return section_result
diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index 5266147fef0..8b93e2a9bb6 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -111,9 +111,6 @@ class procurement_order(osv.osv):
             bom_result = production_obj.action_compute(cr, uid,
                     [produce_id], properties=[x.id for x in procurement.property_ids])
             production_obj.signal_button_confirm(cr, uid, [produce_id])
-            if res_id:
-                move_obj.write(cr, uid, [res_id],
-                        {'location_id': procurement.location_id.id})
         self.production_order_create_note(cr, uid, ids, context=context)
         return res
 
diff --git a/addons/pad/py_etherpad/__init__.py b/addons/pad/py_etherpad/__init__.py
index fce51d36890..0db607fe16f 100644
--- a/addons/pad/py_etherpad/__init__.py
+++ b/addons/pad/py_etherpad/__init__.py
@@ -1,7 +1,7 @@
 """Module to talk to EtherpadLite API."""
 
 import json
-import werkzeug.urls
+import urllib
 import urllib2
 
 
@@ -32,7 +32,7 @@ class EtherpadLiteClient:
 
         params = arguments or {}
         params.update({'apikey': self.apiKey})
-        data = werkzeug.url_encode(params, True)
+        data = urllib.urlencode(params, True)
 
         try:
             opener = urllib2.build_opener()
diff --git a/addons/pad/static/src/css/etherpad.css b/addons/pad/static/src/css/etherpad.css
index facf15b28de..d8281ef4d48 100644
--- a/addons/pad/static/src/css/etherpad.css
+++ b/addons/pad/static/src/css/etherpad.css
@@ -13,13 +13,12 @@
     border: solid 1px #ccc;
     border-radius:3px;
     text-align: center;
-    line-height: 22px;
+    line-height: 28px;
     overflow: hidden;
     -webkit-box-sizing: border-box;
     color: #666666;
-    padding-top:-3px;
-    padding-left:-1px;
     cursor: pointer;
+    font-size: 14px;
 }
 
 .oe_pad_switch:hover{
diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index ba5ee3a3037..2d7f2c2737f 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -13,6 +13,8 @@ openerp.pad = function(instance) {
             this.switch_configured();
             this.$('.oe_pad_switch').click(function() {
                 self.$el.toggleClass('oe_pad_fullscreen');
+                self.$el.find('.oe_pad_switch').toggleClass('fa-expand fa-compress');
+                self.view.$el.find('.oe_chatter').toggle();
             });
             this.render_value();
         },
diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml
index f915e867b35..5d2ab779ead 100644
--- a/addons/pad/static/src/xml/pad.xml
+++ b/addons/pad/static/src/xml/pad.xml
@@ -15,7 +15,7 @@
             </t>
             <t t-if="! widget.get('effective_readonly')">
                 <div class="oe_pad_switch_positioner oe_configured">
-                    <span class="oe_pad_switch oe_e">&amp;Ntilde;</span>
+                    <span class="fa fa-expand oe_pad_switch"></span>
                 </div>
                 <div class="oe_pad_content oe_editing oe_configured">
                 </div>
diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py
index 1a60bc13700..9ad77b3c4cf 100644
--- a/addons/payment/models/payment_acquirer.py
+++ b/addons/payment/models/payment_acquirer.py
@@ -275,9 +275,12 @@ class PaymentAcquirer(osv.Model):
                      </div>""" % (amount, payment_header)
         return result % html_block.decode("utf-8")
 
-    def render_payment_block(self, cr, uid, reference, amount, currency_id, tx_id=None, partner_id=False, partner_values=None, tx_values=None, context=None):
+    def render_payment_block(self, cr, uid, reference, amount, currency_id, tx_id=None, partner_id=False, partner_values=None, tx_values=None, company_id=None, context=None):
         html_forms = []
-        acquirer_ids = self.search(cr, uid, [('website_published', '=', True), ('validation', '=', 'automatic')], context=context)
+        domain = [('website_published', '=', True), ('validation', '=', 'automatic')]
+        if company_id:
+            domain.append(('company_id', '=', company_id))
+        acquirer_ids = self.search(cr, uid, domain, context=context)
         for acquirer_id in acquirer_ids:
             button = self.render(
                 cr, uid, acquirer_id,
diff --git a/addons/payment/models/res_config.py b/addons/payment/models/res_config.py
index a0e9b1f7a11..70668a296da 100644
--- a/addons/payment/models/res_config.py
+++ b/addons/payment/models/res_config.py
@@ -9,14 +9,11 @@ class AccountPaymentConfig(osv.TransientModel):
     _columns = {
         'module_payment_paypal': fields.boolean(
             'Manage Payments Using Paypal',
-            help='Blahblahblah\n'
-                 '-It installs the module payment_paypal.'),
+            help='-It installs the module payment_paypal.'),
         'module_payment_ogone': fields.boolean(
             'Manage Payments Using Ogone',
-            help='Blahblahblah\n'
-                 '-It installs the module payment_ogone.'),
+            help='-It installs the module payment_ogone.'),
         'module_payment_adyen': fields.boolean(
             'Manage Payments Using Adyen',
-            help='Blahblahblah\n'
-                 '-It installs the module payment_adyen.'),
+            help='-It installs the module payment_adyen.'),
     }
diff --git a/addons/payment_ogone/models/ogone.py b/addons/payment_ogone/models/ogone.py
index 4018d3ec437..2ae9722b655 100644
--- a/addons/payment_ogone/models/ogone.py
+++ b/addons/payment_ogone/models/ogone.py
@@ -30,10 +30,10 @@ class PaymentAcquirerOgone(osv.Model):
         @TDETODO: complete me
         """
         return {
-            'ogone_standard_order_url': 'https://secure.ogone.com/ncol/%s/orderstandard.asp' % env,
-            'ogone_direct_order_url': 'https://secure.ogone.com/ncol/%s/orderdirect.asp' % env,
-            'ogone_direct_query_url': 'https://secure.ogone.com/ncol/%s/querydirect.asp' % env,
-            'ogone_afu_agree_url': 'https://secure.ogone.com/ncol/%s/AFU_agree.asp' % env,
+            'ogone_standard_order_url': 'https://secure.ogone.com/ncol/%s/orderstandard_utf8.asp' % (env,),
+            'ogone_direct_order_url': 'https://secure.ogone.com/ncol/%s/orderdirect_utf8.asp' % (env,),
+            'ogone_direct_query_url': 'https://secure.ogone.com/ncol/%s/querydirect_utf8.asp' % (env,),
+            'ogone_afu_agree_url': 'https://secure.ogone.com/ncol/%s/AFU_agree.asp' % (env,),
         }
 
     _columns = {
diff --git a/addons/payment_paypal/models/paypal.py b/addons/payment_paypal/models/paypal.py
index 13945bab6e8..a5e31e9571c 100644
--- a/addons/payment_paypal/models/paypal.py
+++ b/addons/payment_paypal/models/paypal.py
@@ -70,6 +70,7 @@ class AcquirerPaypal(osv.Model):
                 else:
                     paypal_view = self.pool['ir.model.data'].get_object(cr, uid, 'payment_paypal', 'paypal_acquirer_button')
                     self.create(cr, uid, {
+                        'name': 'paypal',
                         'paypal_email_account': company_paypal_account,
                         'view_template_id': paypal_view.id,
                     }, context=context)
diff --git a/addons/payment_paypal/views/res_config_view.xml b/addons/payment_paypal/views/res_config_view.xml
index fbe23f71229..463ddb77c63 100644
--- a/addons/payment_paypal/views/res_config_view.xml
+++ b/addons/payment_paypal/views/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="account.view_account_config_settings"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='payment_acquirer']" version="7.0" position="inside">
-                    <button name='%(payment.acquirer_list)d' type="action"
+                    <button name='%(payment.action_payment_acquirer)d' type="action"
                         string="Configure payment acquiring methods" class="oe_link"/>
                 </xpath>
             </field>
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 30fcff2e5e6..68daefd6ed9 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -474,11 +474,12 @@ class pos_session(osv.osv):
         account_move_obj = self.pool.get('account.move')
         pos_order_obj = self.pool.get('pos.order')
         for session in self.browse(cr, uid, ids, context=context):
+            local_context = dict(context or {}, force_company=session.config_id.journal_id.company_id.id)
             order_ids = [order.id for order in session.order_ids if order.state == 'paid']
 
-            move_id = account_move_obj.create(cr, uid, {'ref' : session.name, 'journal_id' : session.config_id.journal_id.id, }, context=context)
+            move_id = account_move_obj.create(cr, uid, {'ref' : session.name, 'journal_id' : session.config_id.journal_id.id, }, context=local_context)
 
-            pos_order_obj._create_account_move_line(cr, uid, order_ids, session, move_id, context=context)
+            pos_order_obj._create_account_move_line(cr, uid, order_ids, session, move_id, context=local_context)
 
             for order in session.order_ids:
                 if order.state not in ('paid', 'invoiced'):
@@ -513,13 +514,18 @@ class pos_order(osv.osv):
     _order = "id desc"
 
     def create_from_ui(self, cr, uid, orders, context=None):
-        #_logger.info("orders: %r", orders)
+        
+        # Keep only new orders
+        submitted_references = [o['data']['name'] for o in orders]
+        existing_orders = self.search_read(cr, uid, domain=[('pos_reference', 'in', submitted_references)], fields=['pos_reference'], context=context)
+        existing_references = set([o['pos_reference'] for o in existing_orders])
+        orders_to_save = [o for o in orders if o['data']['name'] not in existing_references]
+
         order_ids = []
-        for tmp_order in orders:
+        for tmp_order in orders_to_save:
             to_invoice = tmp_order['to_invoice']
             order = tmp_order['data']
 
-
             order_id = self.create(cr, uid, {
                 'name': order['name'],
                 'user_id': order['user_id'] or False,
@@ -541,7 +547,6 @@ class pos_order(osv.osv):
             if order['amount_return']:
                 session = self.pool.get('pos.session').browse(cr, uid, order['pos_session_id'], context=context)
                 cash_journal = session.cash_journal_id
-                cash_statement = False
                 if not cash_journal:
                     cash_journal_ids = filter(lambda st: st.journal_id.type=='cash', session.statement_ids)
                     if not len(cash_journal_ids):
@@ -555,7 +560,11 @@ class pos_order(osv.osv):
                     'journal': cash_journal.id,
                 }, context=context)
             order_ids.append(order_id)
-            self.signal_paid(cr, uid, [order_id])
+
+            try:
+                self.signal_paid(cr, uid, [order_id])
+            except Exception as e:
+                _logger.error('Could not mark POS Order as Paid: %s', tools.ustr(e))
 
             if to_invoice:
                 self.action_invoice(cr, uid, [order_id], context)
@@ -948,22 +957,16 @@ class pos_order(osv.osv):
         # Tricky, via the workflow, we only have one id in the ids variable
         """Create a account move line of order grouped by products or not."""
         account_move_obj = self.pool.get('account.move')
-        account_move_line_obj = self.pool.get('account.move.line')
         account_period_obj = self.pool.get('account.period')
         account_tax_obj = self.pool.get('account.tax')
-        user_proxy = self.pool.get('res.users')
         property_obj = self.pool.get('ir.property')
         cur_obj = self.pool.get('res.currency')
 
-        period = account_period_obj.find(cr, uid, context=context)[0]
-
         #session_ids = set(order.session_id for order in self.browse(cr, uid, ids, context=context))
 
         if session and not all(session.id == order.session_id.id for order in self.browse(cr, uid, ids, context=context)):
             raise osv.except_osv(_('Error!'), _('Selected orders do not have the same session!'))
 
-        current_company = user_proxy.browse(cr, uid, uid, context=context).company_id
-
         grouped_data = {}
         have_to_group_by = session and session.config_id.group_by or False
 
@@ -983,7 +986,7 @@ class pos_order(osv.osv):
             if order.state != 'paid':
                 continue
 
-            user_company = user_proxy.browse(cr, order.user_id.id, order.user_id.id).company_id
+            current_company = order.sale_journal.company_id
 
             group_tax = {}
             account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
@@ -1004,6 +1007,7 @@ class pos_order(osv.osv):
                 # if have_to_group_by:
 
                 sale_journal_id = order.sale_journal.id
+                period = account_period_obj.find(cr, uid, context=dict(context or {}, company_id=current_company.id))[0]
 
                 # 'quantity': line.qty,
                 # 'product_id': line.product_id.id,
@@ -1013,7 +1017,7 @@ class pos_order(osv.osv):
                     'journal_id' : sale_journal_id,
                     'period_id' : period,
                     'move_id' : move_id,
-                    'company_id': user_company and user_company.id or False,
+                    'company_id': current_company.id,
                 })
 
                 if data_type == 'product':
@@ -1054,7 +1058,10 @@ class pos_order(osv.osv):
             cur = order.pricelist_id.currency_id
             for line in order.lines:
                 tax_amount = 0
-                taxes = [t for t in line.product_id.taxes_id]
+                taxes = []
+                for t in line.product_id.taxes_id:
+                    if t.company_id.id == current_company.id:
+                        taxes.append(t)
                 computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit * (100.0-line.discount) / 100.0, line.qty)['taxes']
 
                 for tax in computed_taxes:
diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index a4facaabcac..d6600926bd6 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -99,13 +99,10 @@ class pos_details_summary(report_sxw.rml_parse):
 
     def _get_tax_amount(self, objects):
         res = {}
-        list_ids = []
         for order in objects:
             for line in order.lines:
-                if len(line.product_id.taxes_id):
-                    tax = line.product_id.taxes_id[0]
-                    res[tax.name] = (line.price_unit * line.qty * (1-(line.discount or 0.0) / 100.0)) + (tax.id in list_ids and res[tax.name] or 0)
-                    list_ids.append(tax.id)
+                for tax in line.product_id.taxes_id:
+                    res[tax.name] = res.setdefault(tax.name, 0.0) + (line.price_subtotal_incl - line.price_subtotal)
         return res
 
     def _get_sales_total(self, objects):
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index b1c71db7d40..6564f821010 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -232,7 +232,7 @@
       <blockTable colWidths="255.0,255.0" style="Table11">
         <tr>
           <td>
-            <para style="P2">[[ t[0] ]]</para>
+            <para style="P2">[[ t[0].name ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9_Bold">[[ formatLang(t[1], currency_obj=company.currency_id) ]]</para>
diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js
index 8eb32d63873..5db91924bce 100644
--- a/addons/point_of_sale/static/src/js/devices.js
+++ b/addons/point_of_sale/static/src/js/devices.js
@@ -162,25 +162,37 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
         },
 
         // find a proxy and connects to it. for options see find_proxy
+        //   - force_ip : only try to connect to the specified ip. 
+        //   - port: what port to listen to (default 8069)
+        //   - progress(fac) : callback for search progress ( fac in [0,1] ) 
         autoconnect: function(options){
             var self = this;
             this.set_connection_status('connecting',{});
+            var found_url = new $.Deferred();
             var success = new $.Deferred();
-            this.find_proxy(options)
-                .then(function(proxies){
-                    if(proxies.length > 0){
-                        self.connect(proxies[0])
-                            .then(function(){
-                                success.resolve();
-                            },function(){
-                                self.set_connection_status('disconnected');
-                                success.reject();
-                            });
-                    }else{
-                        self.set_connection_status('disconnected');
-                        success.reject();
-                    }
+
+            if ( options.force_ip ){
+                // if the ip is forced by server config, bailout on fail
+                found_url = this.try_hard_to_connect(options.force_ip, options)
+            }else if( localStorage['hw_proxy_url'] ){
+                // try harder when we remember a good proxy url
+                found_url = this.try_hard_to_connect(localStorage['hw_proxy_url'], options)
+                    .then(null,function(){
+                        return self.find_proxy(options);
+                    });
+            }else{
+                // just find something quick
+                found_url = this.find_proxy(options);
+            }
+
+            success = found_url.then(function(url){
+                    return self.connect(url);
                 });
+
+            success.fail(function(){
+                self.set_connection_status('disconnected');
+            });
+
             return success;
         },
 
@@ -217,10 +229,50 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
             }
         },
 
-        // returns as a deferred a list of valid hosts urls that can be used as proxy.
+        // try several time to connect to a known proxy url
+        try_hard_to_connect: function(url,options){
+            options   = options || {};
+            var port  = ':' + (options.port || '8069');
+
+            this.set_connection_status('connecting');
+
+            if(url.indexOf('//') < 0){
+                url = 'http://'+url;
+            }
+
+            if(url.indexOf(':',5) < 0){
+                url = url+port;
+            }
+
+            // try real hard to connect to url, with a 1sec timeout and up to 'retries' retries
+            function try_real_hard_to_connect(url, retries, done){
+
+                done = done || new $.Deferred();
+
+                var c = $.ajax({
+                    url: url + '/hw_proxy/hello',
+                    method: 'GET',
+                    timeout: 1000,
+                })
+                .done(function(){
+                    done.resolve(url);
+                })
+                .fail(function(){
+                    if(retries > 0){
+                        try_real_hard_to_connect(url,retries-1,done);
+                    }else{
+                        done.reject();
+                    }
+                });
+                return done;
+            }
+
+            return try_real_hard_to_connect(url,3);
+        },
+
+        // returns as a deferred a valid host url that can be used as proxy.
         // options:
         //   - port: what port to listen to (default 8069)
-        //   - force_ip : limit the search to the specified ip
         //   - progress(fac) : callback for search progress ( fac in [0,1] ) 
         find_proxy: function(options){
             options = options || {};
@@ -228,36 +280,17 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
             var port  = ':' + (options.port || '8069');
             var urls  = [];
             var found = false;
-            var proxies = [];
-            var done  = new $.Deferred();
             var parallel = 8;
+            var done = new $.Deferred(); // will be resolved with the proxies valid urls
             var threads  = [];
             var progress = 0;
 
-            this.set_connection_status('connecting');
 
-            if(options.force_ip){
-                var url = options.force_ip;
-                if(url.indexOf('//') < 0){
-                    url = 'http://'+url;
-                }
-                if(url.indexOf(':',5) < 0){
-                    url = url+port;
-                }
-                urls.push(url);
-            }else{
-                if(localStorage['hw_proxy_url']){
-                    urls.push(localStorage['hw_proxy_url']);
-                }
-
-                urls.push('http://localhost'+port);
-
-                for(var i = 0; i < 256; i++){
-                    urls.push('http://192.168.0.'+i+port);
-                    urls.push('http://192.168.1.'+i+port);
-                    urls.push('http://192.168.2.'+i+port);
-                    urls.push('http://10.0.0.'+i+port);
-                }
+            urls.push('http://localhost'+port);
+            for(var i = 0; i < 256; i++){
+                urls.push('http://192.168.0.'+i+port);
+                urls.push('http://192.168.1.'+i+port);
+                urls.push('http://10.0.0.'+i+port);
             }
 
             var prog_inc = 1/urls.length; 
@@ -269,40 +302,39 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
                 }
             }
 
-            function thread(url,done){
-                if(!url){ 
+            function thread(done){
+                var url = urls.shift();
+
+                done = done || new $.Deferred();
+
+                if( !url || found || !self.searching_for_proxy ){ 
                     done.resolve();
+                    return done;
                 }
+
                 var c = $.ajax({
                         url: url + '/hw_proxy/hello',
                         method: 'GET',
-                        timeout: 300, 
+                        timeout: 400, 
                     }).done(function(){
                         found = true;
                         update_progress();
-                        proxies.push(url);
                         done.resolve(url);
                     })
                     .fail(function(){
                         update_progress();
-                        var next_url = urls.shift();
-                        if(found ||! self.searching_for_proxy || !next_url){
-                            done.resolve();
-                        }else{
-                            thread(next_url,done);
-                        }
+                        thread(done);
                     });
+
                 return done;
             }
 
             this.searching_for_proxy = true;
 
-            for(var i = 0; i < Math.min(parallel,urls.length); i++){
-                threads.push(thread(urls.shift(),new $.Deferred()));
+            for(var i = 0, len = Math.min(parallel,urls.length); i < len; i++){
+                threads.push(thread());
             }
             
-            var done = new $.Deferred();
-            
             $.when.apply($,threads).then(function(){
                 var urls = [];
                 for(var i = 0; i < arguments.length; i++){
@@ -310,7 +342,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
                         urls.push(arguments[i]);
                     }
                 }
-                done.resolve(urls);
+                done.resolve(urls[0]);
             });
 
             return done;
@@ -640,7 +672,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
         // returns true if the ean is a valid EAN codebar number by checking the control digit.
         // ean must be a string
         check_ean: function(ean){
-            return this.ean_checksum(ean) === Number(ean[ean.length-1]);
+            return /^\d+$/.test(ean) && this.ean_checksum(ean) === Number(ean[ean.length-1]);
         },
         // returns a valid zero padded ean13 from an ean prefix. the ean prefix must be a string.
         sanitize_ean:function(ean){
@@ -725,8 +757,13 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
         scan: function(code){
             if(code.length < 3){
                 return;
-            }else if(code.length === 13 && /^\d+$/.test(code)){
+            }else if(code.length === 13 && this.check_ean(code)){
                 var parse_result = this.parse_ean(code);
+            }else if(code.length === 12 && this.check_ean('0'+code)){
+                // many barcode scanners strip the leading zero of ean13 barcodes.
+                // This is because ean-13 are UCP-A with an additional zero at the beginning,
+                // so by stripping zeros you get retrocompatibility with UCP-A systems.
+                var parse_result = this.parse_ean('0'+code);
             }else if(this.pos.db.get_product_by_reference(code)){
                 var parse_result = {
                     encoding: 'reference',
@@ -735,12 +772,16 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
                     prefix: '',
                 };
             }else{
+                var parse_result = {
+                    encoding: 'error',
+                    type: 'error',
+                    code: code,
+                    prefix: '',
+                };
                 return;
             }
 
-            if (parse_result.type === 'error') {    //most likely a checksum error, raise warning
-                console.warn('WARNING: barcode checksum error:',parse_result);
-            }else if(parse_result.type in {'unit':'', 'weight':'', 'price':''}){    //ean is associated to a product
+            if(parse_result.type in {'unit':'', 'weight':'', 'price':''}){    //ean is associated to a product
                 if(this.action_callback['product']){
                     this.action_callback['product'](parse_result);
                 }
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 6b54c14113d..6c65b0bcfbf 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -421,62 +421,67 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
         // it is therefore important to only call this method from inside a mutex
         // this method returns a deferred indicating wether the sending was successful or not
         // there is a timeout parameter which is set to 2 seconds by default. 
-        _flush_order: function(order_id, options){
-            var self   = this;
-            options = options || {};
-            timeout = typeof options.timeout === 'number' ? options.timeout : 7500;
-
-            this.set('synch',{state:'connecting', pending: this.get('synch').pending});
-
-            var order  = this.db.get_order(order_id);
-            order.to_invoice = options.to_invoice || false;
-
-            if(!order){
-                // flushing a non existing order always fails
-                return (new $.Deferred()).reject();
-            }
-
-            // we try to send the order. shadow prevents a spinner if it takes too long. (unless we are sending an invoice,
-            // then we want to notify the user that we are waiting on something )
-            var rpc = (new instance.web.Model('pos.order')).call('create_from_ui',[[order]],undefined,{shadow: !options.to_invoice, timeout:timeout});
-
-            rpc.fail(function(unused,event){
-                // prevent an error popup creation by the rpc failure
-                // we want the failure to be silent as we send the orders in the background
-                event.preventDefault();
-                console.error('Failed to send order:',order);
-            });
-
-            rpc.done(function(){
-                self.db.remove_order(order_id);
-                var pending = self.db.get_orders().length;
-                self.set('synch',{state: pending ? 'connecting' : 'connected', pending:pending});
-            });
-
-            return rpc;
+        _flush_order: function( order_id, options) {
+            return this._flush_all_orders([this.db.get_order(order_id)], options);
         },
         
         // attempts to send all the locally stored orders. As with _flush_order, it should only be
         // called from within a mutex. 
         // this method returns a deferred that always succeeds when all orders have been tried to be sent,
         // even if none of them could actually be sent. 
-        _flush_all_orders: function(){
+        _flush_all_orders: function () {
             var self = this;
-            var orders = this.db.get_orders();
-            var tried_all = new $.Deferred();
+            self.set('synch', {
+                state: 'connecting',
+                pending: self.get('synch').pending
+            });
+            return self._save_to_server(self.db.get_orders()).done(function () {
+                var pending = self.db.get_orders().length;
+                self.set('synch', {
+                    state: pending ? 'connecting' : 'connected',
+                    pending: pending
+                });
+            });
+        },
 
-            function rec_flush(index){
-                if(index < orders.length){
-                    self._flush_order(orders[index].id).always(function(){ 
-                        rec_flush(index+1); 
-                    })
-                }else{
-                    tried_all.resolve();
-                }
+        // send an array of orders to the server
+        // available options:
+        // - timeout: timeout for the rpc call in ms
+        _save_to_server: function (orders, options) {
+            if (!orders || !orders.length) {
+                var result = $.Deferred();
+                result.resolve();
+                return result;
             }
-            rec_flush(0);
+                
+            options = options || {};
 
-            return tried_all;
+            var self = this;
+            var timeout = typeof options.timeout === 'number' ? options.timeout : 7500 * orders.length;
+
+            // we try to send the order. shadow prevents a spinner if it takes too long. (unless we are sending an invoice,
+            // then we want to notify the user that we are waiting on something )
+            var posOrderModel = new instance.web.Model('pos.order');
+            return posOrderModel.call('create_from_ui',
+                [_.map(orders, function (order) {
+                    order.to_invoice = options.to_invoice || false;
+                    return order;
+                })],
+                undefined,
+                {
+                    shadow: !options.to_invoice,
+                    timeout: timeout
+                }
+            ).then(function () {
+                _.each(orders, function (order) {
+                    self.db.remove_order(order.id);
+                });
+            }).fail(function (unused, event){
+                // prevent an error popup creation by the rpc failure
+                // we want the failure to be silent as we send the orders in the background
+                event.preventDefault();
+                console.error('Failed to send orders:', orders);
+            });
         },
 
         scan_product: function(parsed_code){
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 7860de8b328..cbd6779f33c 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -936,12 +936,6 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             
             document.body.addEventListener('keyup', this.hotkey_handler);
             
-            if(    this.pos.config.iface_cashdrawer 
-                && this.pos.get('selectedOrder').get('paymentLines').find( function(pl){ 
-                           return pl.cashregister.journal.type === 'cash'; 
-                   })){
-                    this.pos.proxy.open_cashbox();
-            }
 
 
             this.add_action_button({
@@ -1145,6 +1139,13 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                 return;
             }
 
+            if(    this.pos.config.iface_cashdrawer 
+                && this.pos.get('selectedOrder').get('paymentLines').find( function(pl){ 
+                           return pl.cashregister.journal.type === 'cash'; 
+                   })){
+                    this.pos.proxy.open_cashbox();
+            }
+
             if(options.invoice){
                 // deactivate the validation button while we try to send the order
                 this.pos_widget.action_bar.set_button_disabled('validation',true);
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index f2a254593d1..a2f0759d1a1 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -258,8 +258,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             var total     = order ? order.getTotalTaxIncluded() : 0;
             var taxes     = order ? total - order.getTotalTaxExcluded() : 0;
 
-            this.el.querySelector('.summary .total > .value').innerText = this.format_currency(total);
-            this.el.querySelector('.summary .total .subentry .value').innerText = this.format_currency(taxes);
+            this.el.querySelector('.summary .total > .value').textContent = this.format_currency(total);
+            this.el.querySelector('.summary .total .subentry .value').textContent = this.format_currency(taxes);
         },
     });
 
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 748fcbfee1b..d0cd945d4f4 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -635,9 +635,9 @@
             Shop: <t t-esc="widget.pos.shop.name"/><br />
             <br />
             <t t-if="widget.pos.config.receipt_header">
-                <pre>
+                <div style='text-align:center'>
                     <t t-esc="widget.pos.config.receipt_header" />
-                </pre>
+                </div>
                 <br />
             </t>
             <table>
@@ -711,9 +711,9 @@
             </table>
             <t t-if="widget.pos.config.receipt_footer">
                 <br />
-                <pre>
+                <div style='text-align:center'>
                     <t t-esc="widget.pos.config.receipt_footer" />
-                </pre>
+                </div>
             </t>
         </div>
     </t>
diff --git a/addons/portal/static/src/css/portal.css b/addons/portal/static/src/css/portal.css
index e32f3b0e639..5157b1a8027 100644
--- a/addons/portal/static/src/css/portal.css
+++ b/addons/portal/static/src/css/portal.css
@@ -6,12 +6,18 @@
 	z-index: 0;
 }
 
+
+.openerp .oe_form .oe_form_embedded_html.view_portal_payment_options {
+    overflow: visible;
+}
+
 .openerp .payment_acquirers {
-    margin: -40px 0 -32px -24px;
     position: relative;
     padding: 10px 15px;
     right: -125px; /* improved margin according bootstrap3 */
-     
+    width: 650px;
+    margin-left: 80px;
+
     background: #729FCF;
 	background-image: -webkit-gradient(linear, left top, left bottom, from(#729FCF), to(#3465A4));
 	background-image: -webkit-linear-gradient(top, #729FCF, #3465A4);
diff --git a/addons/portal_sale/portal_sale.py b/addons/portal_sale/portal_sale.py
index 85bd70a35d4..aef730ab0a2 100644
--- a/addons/portal_sale/portal_sale.py
+++ b/addons/portal_sale/portal_sale.py
@@ -39,7 +39,7 @@ class sale_order(osv.Model):
             if this.state not in ('draft', 'cancel') and not this.invoiced:
                 result[this.id] = payment_acquirer.render_payment_block(
                     cr, uid, this.name, this.amount_total, this.pricelist_id.currency_id.id,
-                    partner_id=this.partner_id.id, context=context)
+                    partner_id=this.partner_id.id, company_id=this.company_id.id, context=context)
         return result
 
     def action_quotation_send(self, cr, uid, ids, context=None):
@@ -90,7 +90,7 @@ class account_invoice(osv.Model):
             if this.type == 'out_invoice' and this.state not in ('draft', 'done') and not this.reconciled:
                 result[this.id] = payment_acquirer.render_payment_block(
                     cr, uid, this.number, this.residual, this.currency_id.id,
-                    partner_id=this.partner_id.id, context=context)
+                    partner_id=this.partner_id.id, company_id=this.company_id.id, context=context)
         return result
 
     def action_invoice_sent(self, cr, uid, ids, context=None):
diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml
index ac56cc9ddfc..772e01af100 100644
--- a/addons/portal_sale/portal_sale_view.xml
+++ b/addons/portal_sale/portal_sale_view.xml
@@ -9,7 +9,7 @@
                 <field name="inherit_id" ref="sale.view_order_form"/>
                 <field name="arch" type="xml">
                     <notebook version="7.0" position="before">
-                        <field name="portal_payment_options" groups="portal_sale.group_payment_options"/>
+                        <field name="portal_payment_options" groups="portal_sale.group_payment_options" class="view_portal_payment_options"/>
                     </notebook>
                 </field>
         </record>
@@ -19,7 +19,7 @@
                 <field name="inherit_id" ref="account.invoice_form"/>
                 <field name="arch" type="xml">
                     <notebook version="7.0" position="before">
-                        <field name="portal_payment_options" groups="portal_sale.group_payment_options"/>
+                        <field name="portal_payment_options" groups="portal_sale.group_payment_options" class="view_portal_payment_options"/>
                     </notebook>
                 </field>
         </record>
diff --git a/addons/portal_sale/res_config_view.xml b/addons/portal_sale/res_config_view.xml
index 15bca2ea6bd..e761d6fae3f 100644
--- a/addons/portal_sale/res_config_view.xml
+++ b/addons/portal_sale/res_config_view.xml
@@ -11,7 +11,7 @@
                         <div>
                             <field name="group_payment_options" class="oe_inline"/>
                             <label for="group_payment_options"/>
-                            <button name='%(payment.acquirer_list)d' type="action"
+                            <button name='%(payment.action_payment_acquirer)d' type="action"
                                     string="Configure payment acquiring methods" class="oe_link"/>
                         </div>
                     </xpath>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index e0f345943ac..faec656cf20 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -222,7 +222,7 @@
                                 <field name="product_id" on_change="onchange_product_id(product_id)"/>
                             </group>
                             <group>
-                                <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection" groups="stock.group_locations"/>
+                                <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" options="{'no_create': True}" groups="stock.group_locations"/>
                                 <field name="product_uom" groups="product.group_uom"/>
                                 <field name="location_id" groups="stock.group_locations"/>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 279f921f6c9..67ab3649b3b 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -180,7 +180,8 @@ class product_pricelist(osv.osv):
             if ((v.date_start is False) or (v.date_start <= date)) and ((v.date_end is False) or (v.date_end >= date)):
                 version = v
                 break
-
+        if not version:
+            raise osv.except_osv(_('Warning!'), _("At least one pricelist has no active version !\nPlease create or activate one."))
         categ_ids = {}
         for p in products:
             categ = p.categ_id
@@ -244,13 +245,15 @@ class product_pricelist(osv.osv):
                     for seller in product.seller_ids:
                         if (not partner) or (seller.name.id<>partner):
                             continue
-                        product_default_uom = product.uom_id.id
+                        qty_in_seller_uom = qty
+                        from_uom = context.get('uom') or product.uom_id.id
                         seller_uom = seller.product_uom and seller.product_uom.id or False
-                        if seller_uom and product_default_uom and product_default_uom != seller_uom:
+                        if seller_uom and from_uom and from_uom != seller_uom:
+                            qty_in_seller_uom = product_uom_obj._compute_qty(cr, uid, from_uom, qty, to_uom_id=seller_uom)
+                        else:
                             uom_price_already_computed = True
-                            qty = product_uom_obj._compute_qty(cr, uid, product_default_uom, qty, to_uom_id=seller_uom)
                         for line in seller.pricelist_ids:
-                            if line.min_quantity <= qty:
+                            if line.min_quantity <= qty_in_seller_uom:
                                 price = line.price
 
                 else:
@@ -277,7 +280,6 @@ class product_pricelist(osv.osv):
 
             if price:
                 if 'uom' in context and not uom_price_already_computed:
-                    product = products_dict[product.id]
                     uom = product.uos_id or product.uom_id
                     price = product_uom_obj._compute_price(cr, uid, uom.id, price, context['uom'])
 
diff --git a/addons/product/product.py b/addons/product/product.py
index 83e57e36489..3380db5a4aa 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -548,15 +548,10 @@ class product_product(osv.osv):
     _product_incoming_qty = _get_product_available_func(('confirmed','waiting','assigned'), ('in',))
 
     def _product_lst_price(self, cr, uid, ids, name, arg, context=None):
-        res = dict.fromkeys(ids, 0.0)
+        res = {}
         product_uom_obj = self.pool.get('product.uom')
-
-        # retrieve pricelist
-        pricelist = None
-        if context.get('pricelist'):
-            pricelist = self.pool['product.pricelist'].browse(cr, uid, context.get('pricelist'), context=context)
-            base_currency = self.pool['res.users'].browse(cr, uid, uid, context=context).company_id.currency_id
-
+        for id in ids:
+            res.setdefault(id, 0.0)
         for product in self.browse(cr, uid, ids, context=context):
             if 'uom' in context:
                 uom = product.uos_id or product.uom_id
@@ -564,11 +559,7 @@ class product_product(osv.osv):
                         uom.id, product.list_price, context['uom'])
             else:
                 res[product.id] = product.list_price
-            res[product.id] = (res[product.id] or 0.0) * (product.price_margin or 1.0) + product.price_extra
-            # update the result, according to the eventual pricelist currency
-            if pricelist and pricelist.currency_id:
-                res[product.id] = self.pool['res.currency'].compute(
-                    cr, uid, base_currency.id, pricelist.currency_id.id, res[product.id], round=False, context=context)
+            res[product.id] =  (res[product.id] or 0.0) * (product.price_margin or 1.0) + product.price_extra
         return res
 
     def _save_product_lst_price(self, cr, uid, product_id, field_name, field_value, arg, context=None):
diff --git a/addons/project/project.py b/addons/project/project.py
index f03a4242de3..e5dcf5de2cf 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -358,6 +358,11 @@ class project(osv.osv):
         default['state'] = 'open'
         default['line_ids'] = []
         default['tasks'] = []
+
+        # Don't prepare (expensive) data to copy children (analytic accounts),
+        # they are discarded in analytic.copy(), and handled in duplicate_template() 
+        default['child_ids'] = []
+
         proj = self.browse(cr, uid, id, context=context)
         if not default.get('name', False):
             default.update(name=_("%s (copy)") % (proj.name))
@@ -690,23 +695,13 @@ class task(osv.osv):
         return {'value': vals}
 
     def duplicate_task(self, cr, uid, map_ids, context=None):
-        for new in map_ids.values():
-            task = self.browse(cr, uid, new, context)
-            child_ids = [ ch.id for ch in task.child_ids]
-            if task.child_ids:
-                for child in task.child_ids:
-                    if child.id in map_ids.keys():
-                        child_ids.remove(child.id)
-                        child_ids.append(map_ids[child.id])
-
-            parent_ids = [ ch.id for ch in task.parent_ids]
-            if task.parent_ids:
-                for parent in task.parent_ids:
-                    if parent.id in map_ids.keys():
-                        parent_ids.remove(parent.id)
-                        parent_ids.append(map_ids[parent.id])
-            #FIXME why there is already the copy and the old one
-            self.write(cr, uid, new, {'parent_ids':[(6,0,set(parent_ids))], 'child_ids':[(6,0, set(child_ids))]})
+        mapper = lambda t: map_ids.get(t.id, t.id)
+        for task in self.browse(cr, uid, map_ids.values(), context):
+            new_child_ids = set(map(mapper, task.child_ids))
+            new_parent_ids = set(map(mapper, task.parent_ids))
+            if new_child_ids or new_parent_ids:
+                task.write({'parent_ids': [(6,0,list(new_parent_ids))],
+                            'child_ids':  [(6,0,list(new_child_ids))]})
 
     def copy_data(self, cr, uid, id, default=None, context=None):
         if default is None:
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index f787ed1544e..6f072f5abd1 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -48,8 +48,9 @@ class project_issue(osv.Model):
     _mail_post_access = 'read'
     _track = {
         'stage_id': {
-            'project_issue.mt_issue_new': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence == 1,
-            'project_issue.mt_issue_stage': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence != 1,
+            # this is only an heuristics; depending on your particular stage configuration it may not match all 'new' stages
+            'project_issue.mt_issue_new': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence <= 1,
+            'project_issue.mt_issue_stage': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence > 1,
         },
         'user_id': {
             'project_issue.mt_issue_assigned': lambda self, cr, uid, obj, ctx=None: obj.user_id and obj.user_id.id,
@@ -74,7 +75,7 @@ class project_issue(osv.Model):
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         project_id = self._get_default_project_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], project_id, [('sequence', '=', 1)], context=context)
+        return self.stage_find(cr, uid, [], project_id, [('fold', '=', False)], context=context)
 
     def _resolve_project_id_from_context(self, cr, uid, context=None):
         """ Returns ID of project based on the value of 'default_project_id'
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index e40d219ef10..209bad47495 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -176,7 +176,7 @@
                     <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
                     <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight" groups="purchase.group_purchase_manager"/>
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_highlight"/>
-                    <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
+                    <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','in', ['picking', 'manual']), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
                     <button name="action_cancel_draft" states="cancel,confirmed" string="Set to Draft" type="object" />
                     <button name="purchase_cancel" states="draft,confirmed,sent" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,sent,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue"}' readonly="1"/>
@@ -200,7 +200,7 @@
                         <group>
                             <field name="date_order"/>
                             <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="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" options="{'no_create': True}" groups="stock.group_locations"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                     </group>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 8848ba9df2b..a8851c654f8 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1014,8 +1014,8 @@ class account_invoice(osv.Model):
         sale_order_obj = self.pool.get('sale.order')
         res = super(account_invoice, self).confirm_paid(cr, uid, ids, context=context)
         so_ids = sale_order_obj.search(cr, uid, [('invoice_ids', 'in', ids)], context=context)
-        if so_ids:
-            sale_order_obj.message_post(cr, uid, so_ids, body=_("Invoice paid"), context=context)
+        for so_id in so_ids:
+            sale_order_obj.message_post(cr, uid, so_id, body=_("Invoice paid"), context=context)
         return res
 
     def unlink(self, cr, uid, ids, context=None):
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 176771bfd8d..7e6d84a890b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -77,9 +77,9 @@
                         <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" groups="base.group_user"/>
                         <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" groups="base.group_user"/>
                         <button name="action_quotation_send" string="Send by Email" type="object" states="draft" class="oe_highlight" groups="base.group_user"/>
-                        <button name="action_quotation_send" string="Send by Email" type="object" states="sent" groups="base.group_user"/>
+                        <button name="action_quotation_send" string="Send by Email" type="object" states="sent,progress,manual" groups="base.group_user"/>
                         <button name="print_quotation" string="Print" type="object" states="draft" class="oe_highlight" groups="base.group_user"/>
-                        <button name="print_quotation" string="Print" type="object" states="sent" groups="base.group_user"/>
+                        <button name="print_quotation" string="Print" type="object" states="sent,progress,manual" groups="base.group_user"/>
                         <button name="action_button_confirm" states="draft" string="Confirm Sale" type="object" groups="base.group_user"/>
                         <button name="action_button_confirm" states="sent" string="Confirm Sale" class="oe_highlight" type="object" groups="base.group_user"/>
                         <button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight"
@@ -90,7 +90,7 @@
                         <button name="cancel" states="draft,sent" string="Cancel Quotation" groups="base.group_user"/>
                         <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" groups="base.group_user"/>
                         <button name="invoice_cancel" states="invoice_except" string="Cancel Order" groups="base.group_user"/>
-                        <field name="state" widget="statusbar" statusbar_visible="draft,sent,invoiced,done" statusbar_colors='{"invoice_except":"red","waiting_date":"blue"}'/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,done" statusbar_colors='{"invoice_except":"red","waiting_date":"blue"}'/>
                 </header>
                 <sheet>
                     <h1>
@@ -205,8 +205,8 @@
                                     <field groups="base.group_no_one" name="origin"/>
                                 </group>
                                 <group name="sale_pay">
-                                    <field name="payment_term" widget="selection"/>
-                                    <field name="fiscal_position" widget="selection"/>
+                                    <field name="payment_term" options="{'no_create': True}"/>
+                                    <field name="fiscal_position" options="{'no_create': True}"/>
                                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                 </group>
                                 <group>
@@ -231,7 +231,7 @@
             <field name="name">sale.order.form.editable.list</field>
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
-            <field name="groups_id" eval="[(6, 0, [ref('product.group_uos'), ref('product.group_stock_packaging'), ref('sale.group_mrp_properties')])]"/>
+            <field name="groups_id" eval="[(4, ref('product.group_uos')), (4, ref('product.group_stock_packaging')), (4, ref('sale.group_mrp_properties'))]"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='order_line']/tree" position="attributes">
                     <attribute name="editable"/>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 8c3c98c3f97..10983fdf8b5 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -27,7 +27,7 @@
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="after">
-                    <field name="section_id" widget="selection" groups="base.group_multi_salesteams"/>
+                    <field name="section_id" options="{'no_create': True}" groups="base.group_multi_salesteams"/>
                     <field name="categ_ids" widget="many2many_tags"/>
                 </field>
             </field>
@@ -214,8 +214,7 @@
         <record id="action_order_report_quotation_salesteam" model="ir.actions.act_window">
             <field name="name">Quotations Analysis</field>
             <field name="res_model">sale.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">graph</field>
             <field name="domain">[('state','=','draft'),('section_id', '=', active_id)]</field>
             <field name="context">{'search_default_order_month':1}</field>
             <field name="help">This report performs analysis on your quotations. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.</field>
@@ -224,8 +223,7 @@
         <record id="action_order_report_so_salesteam" model="ir.actions.act_window">
             <field name="name">Sales Analysis</field>
             <field name="res_model">sale.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">graph</field>
             <field name="domain">[('state','not in',('draft','sent','cancel')),('section_id', '=', active_id)]</field>
             <field name="context">{'search_default_order_month':1}</field>
             <field name="help">This report performs analysis on your sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.</field>
@@ -234,8 +232,7 @@
         <record id="action_account_invoice_report_salesteam" model="ir.actions.act_window">
             <field name="name">Invoices Analysis</field>
             <field name="res_model">account.invoice.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
+            <field name="view_mode">graph</field>
             <field name="domain">[('section_id', '=', active_id),('state', 'not in', ['draft', 'cancel'])]</field>
             <field name="context">{'search_default_month':1}</field>
             <field name="help">From this report, you can have an overview of the amount invoiced to your customer. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index 81f16c5eb40..a926a16dc14 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -20,14 +20,14 @@
                     <xpath expr="//button[@name='action_cancel']" position="after">
                         <button name="ship_cancel" states="shipping_except" string="Cancel Order"/>
                     </xpath>
-                    <field name="state" position="replace">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
+                    <field name="state" position="attributes">
+                        <attribute name="statusbar_colors">{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}</attribute>
                     </field>
                     <field name="company_id" position="replace">
                         <field name="company_id" readonly="True"/>
                     </field>
                     <field name="fiscal_position" position="after">
-                         <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection" groups="stock.group_locations"/>
+                         <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" options="{'no_create': True}" groups="stock.group_locations"/>
                     </field>
                    <field name="product_id" position="replace">
                        <field name="product_id"
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 8161dc3ebaa..3eddf0a1c72 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -379,8 +379,6 @@ class product_product(osv.osv):
                  "In a context with a single Warehouse, this includes "
                  "goods stored in the Stock Location of this Warehouse, or any "
                  "of its children.\n"
-                 "stored in the Stock Location of the Warehouse of this Shop, "
-                 "or any of its children.\n"
                  "Otherwise, this includes goods stored in any Stock Location "
                  "with 'internal' type."),
         'incoming_qty': fields.function(_product_available, multi='qty_available',
@@ -392,9 +390,6 @@ class product_product(osv.osv):
                  "In a context with a single Warehouse, this includes "
                  "goods arriving to the Stock Location of this Warehouse, or "
                  "any of its children.\n"
-                 "In a context with a single Shop, this includes goods "
-                 "arriving to the Stock Location of the Warehouse of this "
-                 "Shop, or any of its children.\n"
                  "Otherwise, this includes goods arriving to any Stock "
                  "Location with 'internal' type."),
         'outgoing_qty': fields.function(_product_available, multi='qty_available',
@@ -406,9 +401,6 @@ class product_product(osv.osv):
                  "In a context with a single Warehouse, this includes "
                  "goods leaving the Stock Location of this Warehouse, or "
                  "any of its children.\n"
-                 "In a context with a single Shop, this includes goods "
-                 "leaving the Stock Location of the Warehouse of this "
-                 "Shop, or any of its children.\n"
                  "Otherwise, this includes goods leaving any Stock "
                  "Location with 'internal' type."),
         'track_production': fields.boolean('Track Manufacturing Lots', help="Forces to specify a Serial Number for all moves containing this product and generated by a Manufacturing Order"),
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 3d741ead4be..3f9abcfe659 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -106,15 +106,16 @@ class stock_fill_inventory(osv.osv_memory):
             datas = {}
             res[location] = {}
             move_ids = move_obj.search(cr, uid, ['|',('location_dest_id','=',location),('location_id','=',location),('state','=','done')], context=context)
-
+            local_context = dict(context)
+            local_context['raise-exception'] = False
             for move in move_obj.browse(cr, uid, move_ids, context=context):
                 lot_id = move.prodlot_id.id
                 prod_id = move.product_id.id
                 if move.location_dest_id.id != move.location_id.id:
                     if move.location_dest_id.id == location:
-                        qty = uom_obj._compute_qty(cr, uid, move.product_uom.id,move.product_qty, move.product_id.uom_id.id)
+                        qty = uom_obj._compute_qty_obj(cr, uid, move.product_uom,move.product_qty, move.product_id.uom_id, context=local_context)
                     else:
-                        qty = -uom_obj._compute_qty(cr, uid, move.product_uom.id,move.product_qty, move.product_id.uom_id.id)
+                        qty = -uom_obj._compute_qty_obj(cr, uid, move.product_uom,move.product_qty, move.product_id.uom_id, context=local_context)
 
 
                     if datas.get((prod_id, lot_id)):
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index b9fc68bb667..856ab6ecffc 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -95,8 +95,15 @@ class Website(openerp.addons.web.controllers.main.Home):
     # Edit
     #------------------------------------------------------
     @http.route('/website/add/<path:path>', type='http', auth="user", website=True)
-    def pagenew(self, path, noredirect=False):
+    def pagenew(self, path, noredirect=False, add_menu=None):
         xml_id = request.registry['website'].new_page(request.cr, request.uid, path, context=request.context)
+        if add_menu:
+            model, id  = request.registry["ir.model.data"].get_object_reference(request.cr, request.uid, 'website', 'main_menu')
+            request.registry['website.menu'].create(request.cr, request.uid, {
+                    'name': path,
+                    'url': "/page/" + xml_id,
+                    'parent_id': id,
+                }, context=request.context)
         url = "/page/" + xml_id
         if noredirect:
             return werkzeug.wrappers.Response(url, mimetype='text/plain')
@@ -179,6 +186,7 @@ class Website(openerp.addons.web.controllers.main.Home):
                     result.append({
                         'name': v.inherit_option_id.name,
                         'id': v.id,
+                        'xml_id': v.xml_id,
                         'inherit_id': v.inherit_id.id,
                         'header': True,
                         'active': False
@@ -187,6 +195,7 @@ class Website(openerp.addons.web.controllers.main.Home):
                 result.append({
                     'name': v.name,
                     'id': v.id,
+                    'xml_id': v.xml_id,
                     'inherit_id': v.inherit_id.id,
                     'header': False,
                     'active': (v.inherit_id.id == v.inherit_option_id.id) or (not optional and v.inherit_id.id)
@@ -239,27 +248,32 @@ class Website(openerp.addons.web.controllers.main.Home):
 
     @http.route('/website/attach', type='http', auth='user', methods=['POST'], website=True)
     def attach(self, func, upload):
-        req = request.httprequest
 
         url = message = None
         try:
-            attachment_id = request.registry['ir.attachment'].create(request.cr, request.uid, {
+            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")
+
+            Attachments = request.registry['ir.attachment']
+            attachment_id = Attachments.create(request.cr, request.uid, {
                 'name': upload.filename,
-                'datas': upload.read().encode('base64'),
+                'datas': image_data.encode('base64'),
                 'datas_fname': upload.filename,
                 'res_model': 'ir.ui.view',
             }, request.context)
 
-            url = website.urlplus('/website/image', {
-                'model': 'ir.attachment',
-                'id': attachment_id,
-                'field': 'datas',
-                'max_height': MAX_IMAGE_HEIGHT,
-                'max_width': MAX_IMAGE_WIDTH,
-            })
+            [attachment] = Attachments.read(
+                request.cr, request.uid, [attachment_id], ['website_url'],
+                context=request.context)
+            url = attachment['website_url']
         except Exception, e:
             logger.exception("Failed to upload image to attachment")
-            message = str(e)
+            message = unicode(e)
 
         return """<script type='text/javascript'>
             window.parent['%s'](%s, %s);
diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index 50f2d8e381e..4eff1b8a60d 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -59,7 +59,7 @@
         </record>
         <record id="action_website_tutorial" model="ir.actions.act_url">
             <field name="name">Website With Tutorial</field>
-            <field name="url">/?tutorial.banner=true</field>
+            <field name="url">/#tutorial.banner=true</field>
             <field name="target">self</field>
         </record>
         <record id="action_website_homepage" model="ir.actions.act_url">
diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index 6948f102fec..46b9efc15a8 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -167,5 +167,5 @@ class PageConverter(werkzeug.routing.PathConverter):
 
         for view in views:
             xid = xids[view['id']]
-            if xid and (not query or query in xid):
+            if xid and (not query or query.lower() in xid.lower()):
                 yield xid
diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py
index 95e2179c9ec..857b99d40d2 100644
--- a/addons/website/models/ir_ui_view.py
+++ b/addons/website/models/ir_ui_view.py
@@ -1,8 +1,13 @@
 # -*- coding: utf-8 -*-
 import copy
+import re
+import simplejson
+import werkzeug
 
 from lxml import etree, html
 
+from openerp.addons.website.models import website
+from openerp.http import request
 from openerp.osv import osv, fields
 
 class view(osv.osv):
@@ -117,6 +122,66 @@ class view(osv.osv):
 
         return arch
 
+    def render(self, cr, uid, id_or_xml_id, values=None, engine='ir.qweb', context=None):
+        if getattr(request, 'website_enabled', False):
+            engine='website.qweb'
+
+            if isinstance(id_or_xml_id, list):
+                id_or_xml_id = id_or_xml_id[0]
+            if isinstance(id_or_xml_id, (int, long)):
+                id_or_xml_id = self.get_view_xmlid(cr, uid, id_or_xml_id)
+
+            if not context:
+                context = {}
+
+            qcontext = dict(editable=False)
+            qcontext.update(
+                context.copy(),
+                website=request.website,
+                url_for=website.url_for,
+                slug=website.slug,
+                res_company=request.website.company_id,
+                user_id=self.pool.get("res.users").browse(cr, uid, uid),
+            )
+
+            # add some values
+            if values:
+                qcontext.update(values)
+
+            # in edit mode ir.ui.view will tag nodes
+            context['inherit_branding'] = qcontext.get('editable', False)
+
+            view_obj = request.website.get_template(id_or_xml_id)
+            if 'main_object' not in qcontext:
+                qcontext['main_object'] = view_obj
+
+            values = qcontext
+
+        return super(view, self).render(cr, uid, id_or_xml_id, values=values, engine=engine, context=context)
+
+    def _pretty_arch(self, arch):
+        # remove_blank_string does not seem to work on HTMLParser, and
+        # pretty-printing with lxml more or less requires stripping
+        # whitespace: http://lxml.de/FAQ.html#why-doesn-t-the-pretty-print-option-reformat-my-xml-output
+        # so serialize to XML, parse as XML (remove whitespace) then serialize
+        # as XML (pretty print)
+        arch_no_whitespace = etree.fromstring(
+            etree.tostring(arch, encoding='utf-8'),
+            parser=etree.XMLParser(encoding='utf-8', remove_blank_text=True))
+        arch_pretty_indent_2 = etree.tostring(
+            arch_no_whitespace, encoding='unicode', pretty_print=True)
+
+        # pretty_print uses a fixed indent level of 2, we want an indent of 4,
+        # double up leading spaces.
+        def repl(m):
+            indent = len(m.group(0)) / 2
+            return u' ' * 4 * indent
+        # FIXME: If py2.7 only, can use re.M in sub and don't have to do replacement line by line
+        return u'\n'.join(
+            re.sub(ur'^((?:  )+)', repl, line)
+            for line in arch_pretty_indent_2.split(u'\n')
+        )
+
     def save(self, cr, uid, res_id, value, xpath=None, context=None):
         """ Update a view section. The view section may embed fields to write
 
@@ -142,5 +207,5 @@ class view(osv.osv):
 
         arch = self.replace_arch_section(cr, uid, res_id, xpath, arch_section, context=context)
         self.write(cr, uid, res_id, {
-            'arch': etree.tostring(arch, encoding='utf-8').decode('utf-8')
+            'arch': self._pretty_arch(arch)
         }, context=context)
diff --git a/addons/website/models/res_config.py b/addons/website/models/res_config.py
index 9823d286f37..dd86f824602 100644
--- a/addons/website/models/res_config.py
+++ b/addons/website/models/res_config.py
@@ -3,7 +3,7 @@ from openerp.osv import fields, osv
 
 class website_config_settings(osv.osv_memory):
     _name = 'website.config.settings'
-    _inherit = 'base.config.settings'
+    _inherit = 'res.config.settings'
 
     _columns = {
         'website_id': fields.many2one('website', string="website", required=True),
@@ -29,6 +29,14 @@ class website_config_settings(osv.osv_memory):
                 values[fname] = v[0] if v and self._columns[fname]._type == 'many2one' else v
         return {'value' : values}
 
+    # FIXME in trunk for god sake. Change the fields above to fields.char instead of fields.related, 
+    # and create the function set_website who will set the value on the website_id
+    # create does not forward the values to the related many2one. Write does.
+    def create(self, cr, uid, vals, context=None):
+        config_id = super(website_config_settings, self).create(cr, uid, vals, context=context)
+        self.write(cr, uid, config_id, vals, context=context)
+        return config_id
+
     _defaults = {
         'website_id': lambda self,cr,uid,c: self.pool.get('website').search(cr, uid, [], context=c)[0],
     }
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index e3c683861f9..309522f7d34 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import fnmatch
 import inspect
 import itertools
 import logging
@@ -7,9 +6,9 @@ import math
 import re
 import urlparse
 
-import simplejson
 import werkzeug
 import werkzeug.exceptions
+import werkzeug.utils
 import werkzeug.wrappers
 # optional python-slugify import (https://github.com/un33k/python-slugify)
 try:
@@ -24,24 +23,19 @@ from openerp.addons.web.http import request, LazyResponse
 
 logger = logging.getLogger(__name__)
 
-def keep_query(*args, **kw):
-    if not args and not kw:
-        args = ('*',)
-    params = kw.copy()
-    query_params = frozenset(werkzeug.url_decode(request.httprequest.query_string).keys())
-    for keep_param in args:
-        for param in fnmatch.filter(query_params, keep_param):
-            if param not in params and param in request.params:
-                params[param] = request.params[param]
-    return werkzeug.urls.url_encode(params)
-
 def url_for(path_or_uri, lang=None):
+    if isinstance(path_or_uri, unicode):
+        path_or_uri = path_or_uri.encode('utf-8')
+    current_path = request.httprequest.path
+    if isinstance(current_path, unicode):
+        current_path = current_path.encode('utf-8')
     location = path_or_uri.strip()
     force_lang = lang is not None
     url = urlparse.urlparse(location)
 
     if request and not url.netloc and not url.scheme and (url.path or force_lang):
-        location = urlparse.urljoin(request.httprequest.path, location)
+        location = urlparse.urljoin(current_path, location)
+
         lang = lang or request.context.get('lang')
         langs = [lg[0] for lg in request.website.get_languages()]
 
@@ -59,7 +53,7 @@ def url_for(path_or_uri, lang=None):
                 ps.insert(1, lang)
             location = '/'.join(ps)
 
-    return location
+    return location.decode('utf-8')
 
 def is_multilang_url(path, langs=None):
     if not langs:
@@ -78,7 +72,11 @@ def is_multilang_url(path, langs=None):
 
 def slugify(s, max_length=None):
     if slugify_lib:
-        return slugify_lib.slugify(s, max_length)
+        # There are 2 different libraries only python-slugify is supported
+        try:
+            return slugify_lib.slugify(s, max_length=max_length)
+        except TypeError:
+            pass
     spaceless = re.sub(r'\s+', '-', s)
     specialless = re.sub(r'[^-_A-Za-z0-9]', '', spaceless)
     return specialless[:max_length]
@@ -178,10 +176,8 @@ class website(osv.osv):
         return '%s.%s' % (module, slugify(name, max_length=50))
 
     def page_exists(self, cr, uid, ids, name, module='website', context=None):
-        page = self.page_for_name(cr, uid, ids, name, module=module, context=context)
-
         try:
-           self.pool["ir.model.data"].get_object_reference(cr, uid, module, name)
+           return self.pool["ir.model.data"].get_object_reference(cr, uid, module, name)
         except:
             return False
 
@@ -215,7 +211,6 @@ class website(osv.osv):
 
         request.redirect = lambda url: werkzeug.utils.redirect(url_for(url))
         request.context.update(
-            is_master_lang=is_master_lang,
             editable=is_website_publisher,
             translatable=not is_master_lang,
         )
@@ -228,37 +223,8 @@ class website(osv.osv):
         return self.pool["ir.ui.view"].browse(cr, uid, view_id, context=context)
 
     def _render(self, cr, uid, ids, template, values=None, context=None):
-        user = self.pool.get("res.users")
-        if not context:
-            context = {}
-
-        # Take a context
-        qweb_values = context.copy()
-        # add some values
-        if values:
-            qweb_values.update(values)
-        # fill some defaults
-        qweb_values.update(
-            request=request,
-            json=simplejson,
-            website=request.website,
-            url_for=url_for,
-            keep_query=keep_query,
-            slug=slug,
-            res_company=request.website.company_id,
-            user_id=user.browse(cr, uid, uid),
-            quote_plus=werkzeug.url_quote_plus,
-        )
-        qweb_values.setdefault('editable', False)
-
-        # in edit mode ir.ui.view will tag nodes
-        context['inherit_branding'] = qweb_values['editable']
-
-        view = self.get_template(cr, uid, ids, template)
-
-        if 'main_object' not in qweb_values:
-            qweb_values['main_object'] = view
-        return view.render(qweb_values, engine='website.qweb', context=context)
+        # TODO: remove this. (just kept for backward api compatibility for saas-3)
+        return self.pool['ir.ui.view'].render(cr, uid, template, values=values, context=context)
 
     def render(self, cr, uid, ids, template, values=None, status_code=None, context=None):
         def callback(template, values, context):
@@ -281,7 +247,7 @@ class website(osv.osv):
             pmin = pmax - scope if pmax - scope > 0 else 1
 
         def get_url(page):
-            _url = "%spage/%s/" % (url, page)
+            _url = "%spage/%s/" % (url, page) if page > 1 else url
             if url_args:
                 _url = "%s?%s" % (_url, werkzeug.url_encode(url_args))
             return _url
@@ -381,6 +347,7 @@ class website(osv.osv):
         router = request.httprequest.app.get_db_router(request.db)
         # Force enumeration to be performed as public user
         uid = self.get_public_user(cr, uid, context=context)
+        url_list = []
         for rule in router.iter_rules():
             if not self.rule_is_enumerable(rule):
                 continue
@@ -402,7 +369,9 @@ class website(osv.osv):
             for values in generated:
                 domain_part, url = rule.build(values, append_unknown=False)
                 page = {'name': url, 'url': url}
-
+                if url in url_list:
+                    continue
+                url_list.append(url)
                 if not filtered and query_string and not self.page_matches(cr, uid, page, query_string, context=context):
                     continue
                 yield page
@@ -527,9 +496,14 @@ class website_menu(osv.osv):
         'parent_left': fields.integer('Parent Left', select=True),
         'parent_right': fields.integer('Parent Right', select=True),
     }
+
+    def __defaults_sequence(self, cr, uid, context):
+        menu = self.search_read(cr, uid, [(1,"=",1)], ["sequence"], limit=1, order="sequence DESC", context=context)
+        return menu and menu[0]["sequence"] or 0
+
     _defaults = {
         'url': '',
-        'sequence': 0,
+        'sequence': __defaults_sequence,
         'new_window': False,
     }
     _parent_store = True
@@ -593,13 +567,40 @@ class ir_attachment(osv.osv):
         'website_url': fields.function(_website_url_get, string="Attachment URL", type='char')
     }
 
+    def try_remove(self, cr, uid, ids, context=None):
+        """ Removes a web-based image attachment if it is used by no view
+        (template)
+
+        Returns a dict mapping attachments which would not be removed (if any)
+        mapped to the views preventing their removal
+        """
+        Views = self.pool['ir.ui.view']
+        attachments_to_remove = []
+        # views blocking removal of the attachment
+        removal_blocked_by = {}
+
+        for attachment in self.browse(cr, uid, ids, context=context):
+            # in-document URLs are html-escaped, a straight search will not
+            # find them
+            url = werkzeug.utils.escape(attachment.website_url)
+            ids = Views.search(cr, uid, [('arch', 'like', url)], context=context)
+
+            if ids:
+                removal_blocked_by[attachment.id] = Views.read(
+                    cr, uid, ids, ['name'], context=context)
+            else:
+                attachments_to_remove.append(attachment.id)
+        if attachments_to_remove:
+            self.unlink(cr, uid, attachments_to_remove, context=context)
+        return removal_blocked_by
+
 class res_partner(osv.osv):
     _inherit = "res.partner"
 
     def google_map_img(self, cr, uid, ids, zoom=8, width=298, height=298, context=None):
         partner = self.browse(cr, uid, ids[0], context=context)
         params = {
-            'center': '%s, %s %s, %s' % (partner.street, partner.city, partner.zip, partner.country_id and partner.country_id.name_get()[0][1] or ''),
+            'center': '%s, %s %s, %s' % (partner.street or '', partner.city or '', partner.zip or '', partner.country_id and partner.country_id.name_get()[0][1] or ''),
             'size': "%sx%s" % (height, width),
             'zoom': zoom,
             'sensor': 'false',
diff --git a/addons/website/static/lib/bootstrap/js/bootstrap.js b/addons/website/static/lib/bootstrap/js/bootstrap.js
index b22be6fce1d..2d31d0eb3c3 100644
--- a/addons/website/static/lib/bootstrap/js/bootstrap.js
+++ b/addons/website/static/lib/bootstrap/js/bootstrap.js
@@ -418,6 +418,17 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
           setTimeout(function () { that.$element.trigger('slid') }, 0)
         })
         .emulateTransitionEnd(600)
+    } else if(this.$element.hasClass('slide')) {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $active.animate({left: (direction == 'right' ? '100%' : '-100%')}, 600, function(){
+          $active.removeClass('active')
+          that.sliding = false
+          setTimeout(function() { that.$element.trigger('slid')}, 0)
+        })
+        $next.addClass(type).css({left: (direction == 'right' ? '-100%' : '100%')}).animate({left: 0}, 600, function() {
+          $next.removeClass(type).addClass('active')
+        })
     } else {
       this.$element.trigger(e)
       if (e.isDefaultPrevented()) return
diff --git a/addons/website/static/lib/jquery.placeholder/jquery.placeholder.js b/addons/website/static/lib/jquery.placeholder/jquery.placeholder.js
new file mode 100644
index 00000000000..4e296b7ac4e
--- /dev/null
+++ b/addons/website/static/lib/jquery.placeholder/jquery.placeholder.js
@@ -0,0 +1,185 @@
+/*! http://mths.be/placeholder v2.0.7 by @mathias */
+;(function(window, document, $) {
+
+	// Opera Mini v7 doesn’t support placeholder although its DOM seems to indicate so
+	var isOperaMini = Object.prototype.toString.call(window.operamini) == '[object OperaMini]';
+	var isInputSupported = 'placeholder' in document.createElement('input') && !isOperaMini;
+	var isTextareaSupported = 'placeholder' in document.createElement('textarea') && !isOperaMini;
+	var prototype = $.fn;
+	var valHooks = $.valHooks;
+	var propHooks = $.propHooks;
+	var hooks;
+	var placeholder;
+
+	if (isInputSupported && isTextareaSupported) {
+
+		placeholder = prototype.placeholder = function() {
+			return this;
+		};
+
+		placeholder.input = placeholder.textarea = true;
+
+	} else {
+
+		placeholder = prototype.placeholder = function() {
+			var $this = this;
+			$this
+				.filter((isInputSupported ? 'textarea' : ':input') + '[placeholder]')
+				.not('.placeholder')
+				.bind({
+					'focus.placeholder': clearPlaceholder,
+					'blur.placeholder': setPlaceholder
+				})
+				.data('placeholder-enabled', true)
+				.trigger('blur.placeholder');
+			return $this;
+		};
+
+		placeholder.input = isInputSupported;
+		placeholder.textarea = isTextareaSupported;
+
+		hooks = {
+			'get': function(element) {
+				var $element = $(element);
+
+				var $passwordInput = $element.data('placeholder-password');
+				if ($passwordInput) {
+					return $passwordInput[0].value;
+				}
+
+				return $element.data('placeholder-enabled') && $element.hasClass('placeholder') ? '' : element.value;
+			},
+			'set': function(element, value) {
+				var $element = $(element);
+
+				var $passwordInput = $element.data('placeholder-password');
+				if ($passwordInput) {
+					return $passwordInput[0].value = value;
+				}
+
+				if (!$element.data('placeholder-enabled')) {
+					return element.value = value;
+				}
+				if (value == '') {
+					element.value = value;
+					// Issue #56: Setting the placeholder causes problems if the element continues to have focus.
+					if (element != safeActiveElement()) {
+						// We can't use `triggerHandler` here because of dummy text/password inputs :(
+						setPlaceholder.call(element);
+					}
+				} else if ($element.hasClass('placeholder')) {
+					clearPlaceholder.call(element, true, value) || (element.value = value);
+				} else {
+					element.value = value;
+				}
+				// `set` can not return `undefined`; see http://jsapi.info/jquery/1.7.1/val#L2363
+				return $element;
+			}
+		};
+
+		if (!isInputSupported) {
+			valHooks.input = hooks;
+			propHooks.value = hooks;
+		}
+		if (!isTextareaSupported) {
+			valHooks.textarea = hooks;
+			propHooks.value = hooks;
+		}
+
+		$(function() {
+			// Look for forms
+			$(document).delegate('form', 'submit.placeholder', function() {
+				// Clear the placeholder values so they don't get submitted
+				var $inputs = $('.placeholder', this).each(clearPlaceholder);
+				setTimeout(function() {
+					$inputs.each(setPlaceholder);
+				}, 10);
+			});
+		});
+
+		// Clear placeholder values upon page reload
+		$(window).bind('beforeunload.placeholder', function() {
+			$('.placeholder').each(function() {
+				this.value = '';
+			});
+		});
+
+	}
+
+	function args(elem) {
+		// Return an object of element attributes
+		var newAttrs = {};
+		var rinlinejQuery = /^jQuery\d+$/;
+		$.each(elem.attributes, function(i, attr) {
+			if (attr.specified && !rinlinejQuery.test(attr.name)) {
+				newAttrs[attr.name] = attr.value;
+			}
+		});
+		return newAttrs;
+	}
+
+	function clearPlaceholder(event, value) {
+		var input = this;
+		var $input = $(input);
+		if (input.value == $input.attr('placeholder') && $input.hasClass('placeholder')) {
+			if ($input.data('placeholder-password')) {
+				$input = $input.hide().next().show().attr('id', $input.removeAttr('id').data('placeholder-id'));
+				// If `clearPlaceholder` was called from `$.valHooks.input.set`
+				if (event === true) {
+					return $input[0].value = value;
+				}
+				$input.focus();
+			} else {
+				input.value = '';
+				$input.removeClass('placeholder');
+				input == safeActiveElement() && input.select();
+			}
+		}
+	}
+
+	function setPlaceholder() {
+		var $replacement;
+		var input = this;
+		var $input = $(input);
+		var id = this.id;
+		if (input.value == '') {
+			if (input.type == 'password') {
+				if (!$input.data('placeholder-textinput')) {
+					try {
+						$replacement = $input.clone().attr({ 'type': 'text' });
+					} catch(e) {
+						$replacement = $('<input>').attr($.extend(args(this), { 'type': 'text' }));
+					}
+					$replacement
+						.removeAttr('name')
+						.data({
+							'placeholder-password': $input,
+							'placeholder-id': id
+						})
+						.bind('focus.placeholder', clearPlaceholder);
+					$input
+						.data({
+							'placeholder-textinput': $replacement,
+							'placeholder-id': id
+						})
+						.before($replacement);
+				}
+				$input = $input.removeAttr('id').hide().prev().attr('id', id).show();
+				// Note: `$input[0] != input` now!
+			}
+			$input.addClass('placeholder');
+			$input[0].value = $input.attr('placeholder');
+		} else {
+			$input.removeClass('placeholder');
+		}
+	}
+
+	function safeActiveElement() {
+		// Avoid IE9 `document.activeElement` of death
+		// https://github.com/mathiasbynens/jquery-placeholder/pull/99
+		try {
+			return document.activeElement;
+		} catch (err) {}
+	}
+
+}(this, document, jQuery));
\ No newline at end of file
diff --git a/addons/website/static/src/css/common.sass b/addons/website/static/src/css/common.sass
index 86e1f6655ef..4d5f0673e33 100644
--- a/addons/website/static/src/css/common.sass
+++ b/addons/website/static/src/css/common.sass
@@ -1,6 +1,7 @@
 @import "compass/css3"
 @import "compass/css3/user-interface"
 @import "compass/css3/transition"
+@import "compass/support"
 
 //smartphones, iPhone, portrait 480x320 phones
 $smart_phone: 320px
@@ -23,3 +24,46 @@ $desktop: 1025px
         @content
     ::selection
         @content
+
+// Lifted from compass-animation
+// LICENSED UNDER THE MIT LICENSE (MIT)
+//
+// Copyright (c) 2012 Eric Meyer
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+@mixin set-experimental-support($moz: false, $webkit: false, $ms: false, $o: false, $khtml: false)
+    $experimental-support-for-mozilla: $moz
+    $experimental-support-for-webkit: $webkit
+    $experimental-support-for-microsoft: $ms
+    $experimental-support-for-opera: $o
+    $experimental-support-for-khtml: $khtml
+
+@mixin with-only-support-for($moz: false, $webkit: false, $ms: false, $o: false, $khtml: false)
+    // Capture the current state
+    $original-moz: $experimental-support-for-mozilla
+    $original-webkit: $experimental-support-for-webkit
+    $original-o: $experimental-support-for-opera
+    $original-ms: $experimental-support-for-microsoft
+    $original-khtml: $experimental-support-for-khtml
+
+    @include set-experimental-support($moz, $webkit, $ms, $o, $khtml)
+    @content
+    @include set-experimental-support($original-moz, $original-webkit, $original-ms, $original-o, $original-khtml)
+
+@mixin keyframes($name)
+    @-moz-keyframes #{$name}
+        +with-only-support-for($moz: true)
+            @content
+    @-webkit-keyframes #{$name}
+        +with-only-support-for($webkit: true)
+            @content
+    @-o-keyframes #{$name}
+        +with-only-support-for($o: true)
+            @content
+    @keyframes #{$name}
+        +with-only-support-for
+            @content
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 1c54d6f47dd..da0fad43caf 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -26,6 +26,7 @@
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
   box-shadow: none;
+  -ms-filter: "alpha(opacity=50)";
 }
 
 /* ---- OpenERP Style ---- {{{ */
@@ -195,13 +196,19 @@ ul.oe_menu_editor .disclose {
   text-align: left;
 }
 
-.modal.nosave .modal-footer button.save {
-  display: none;
-}
-.modal.nosave .modal-footer button.wait {
+.modal.nosave .wait {
   display: inline-block !important;
   visibility: visible !important;
 }
+.modal.nosave .modal-body .filepicker, .modal.nosave .modal-body .image-preview {
+  display: none;
+}
+.modal.nosave .modal-body .wait {
+  width: 100%;
+}
+.modal.nosave .modal-footer .save {
+  display: none;
+}
 
 .modal .font-icons-icons {
   font-size: 2em;
@@ -244,6 +251,26 @@ ul.oe_menu_editor .disclose {
 .existing-attachments .pager .disabled {
   display: none;
 }
+.existing-attachments .existing-attachment-cell {
+  position: relative;
+}
+.existing-attachments .existing-attachment-cell .img {
+  border: 1px solid #848490;
+}
+.existing-attachments .existing-attachment-cell .existing-attachment-remove {
+  position: absolute;
+  top: 0;
+  left: 15px;
+  cursor: pointer;
+  background: white;
+  padding: 2px;
+  border: 1px solid #848490;
+  border-top: none;
+  border-left: none;
+  -moz-border-radius-bottomright: 8px;
+  -webkit-border-bottom-right-radius: 8px;
+  border-bottom-right-radius: 8px;
+}
 
 .cke_widget_wrapper {
   position: static !important;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 3abfa4cff05..4571dcd257e 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -23,6 +23,7 @@
     background: transparent
     border: none
     +box-shadow(none)
+    -ms-filter: "alpha(opacity=50)"
 
 // }}}
  
@@ -162,12 +163,17 @@ ul.oe_menu_editor
 .modal-footer
     text-align: left
 
-.modal.nosave .modal-footer
-    button.save
-        display: none
-    button.wait
+.modal.nosave
+    .wait
         display: inline-block !important
         visibility: visible !important
+    .modal-body
+        .filepicker, .image-preview
+            display: none
+        .wait
+            width: 100%
+    .modal-footer .save
+        display: none
 
 // fontawesome modal
 .modal
@@ -205,9 +211,27 @@ ul.oe_menu_editor
         .font-icons-selected
             background-color: #ddd
 
+$attachment-border-color: #848490
+.existing-attachments
+    .pager .disabled
+        display: none
 
-.existing-attachments .pager .disabled
-    display: none
+    .existing-attachment-cell
+        position: relative
+        .img
+            border: 1px solid $attachment-border-color
+        .existing-attachment-remove
+            position: absolute
+            top: 0
+            left: 15px // padding-left on col-*
+
+            cursor: pointer
+            background: white
+            padding: 2px
+            border: 1px solid $attachment-border-color
+            border-top: none
+            border-left: none
+            +border-bottom-right-radius(8px)
 
 // wrapper positioned relatively for drag&drop widget which is disabled below.
 // Breaks completely horribly crazy products listing page, so take it out.
diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css
index 00235b3f028..a19baa33fd6 100644
--- a/addons/website/static/src/css/snippets.css
+++ b/addons/website/static/src/css/snippets.css
@@ -80,10 +80,8 @@
   -moz-user-select: none;
   user-select: none;
   cursor: move;
-  pointer-events: none;
 }
 .oe_snippet .oe_snippet_thumbnail {
-  pointer-events: auto;
   text-align: center;
   height: 100%;
   background: transparent;
@@ -200,6 +198,7 @@
 
 .oe_overlay {
   display: none;
+  height: 0;
   position: absolute;
   background: transparent;
   -webkit-border-radius: 3px;
@@ -214,20 +213,12 @@
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
-  pointer-events: none;
 }
 .oe_overlay.oe_active {
   display: block;
-  border-style: dashed;
-  border-width: 1px;
-  -webkit-box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.3), 0px 0px 0px 1px rgba(255, 255, 255, 0.3) inset;
-  -moz-box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.3), 0px 0px 0px 1px rgba(255, 255, 255, 0.3) inset;
-  box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.3), 0px 0px 0px 1px rgba(255, 255, 255, 0.3) inset;
-  border-color: rgba(0, 0, 0, 0.5);
 }
 .oe_overlay .oe_handle {
   display: block !important;
-  pointer-events: auto;
   position: absolute;
   top: 50%;
   left: 50%;
@@ -238,7 +229,18 @@
   height: 16px;
   margin: -2px;
 }
+.oe_overlay .oe_handle > div {
+  z-index: 1;
+  position: absolute;
+  border-style: dashed;
+  border-width: 1px;
+  border-color: #666666;
+  -webkit-box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.5), 0px 0px 0px 1px rgba(255, 255, 255, 0.5) inset;
+  -moz-box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.5), 0px 0px 0px 1px rgba(255, 255, 255, 0.5) inset;
+  box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.5), 0px 0px 0px 1px rgba(255, 255, 255, 0.5) inset;
+}
 .oe_overlay .oe_handle.e:before, .oe_overlay .oe_handle.w:before, .oe_overlay .oe_handle.s:before, .oe_overlay .oe_handle.n:before, .oe_overlay .oe_handle.size .oe_handle_button {
+  z-index: 2;
   position: relative;
   top: 50%;
   left: 50%;
@@ -270,41 +272,70 @@
   -moz-box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
   box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
 }
+.oe_overlay .oe_handle.e, .oe_overlay .oe_handle.w {
+  top: 4px;
+  height: 100%;
+}
+.oe_overlay .oe_handle.e:before, .oe_overlay .oe_handle.w:before {
+  content: "\f0d9-\f0da";
+  line-height: 16px;
+}
+.oe_overlay .oe_handle.e > div, .oe_overlay .oe_handle.w > div {
+  width: 0;
+  height: 100%;
+  top: 2px;
+  left: 8px;
+}
 .oe_overlay .oe_handle.e {
   left: auto;
-  top: 2px;
-  height: 100%;
   right: -6px;
   cursor: w-resize;
 }
-.oe_overlay .oe_handle.e:before {
-  content: "\F061";
+.oe_overlay .oe_handle.w {
+  left: -6px;
+  cursor: e-resize;
+}
+.oe_overlay .oe_handle.s, .oe_overlay .oe_handle.n {
+  left: 2px;
+  width: 100%;
+}
+.oe_overlay .oe_handle.s:before, .oe_overlay .oe_handle.n:before {
+  content: "\f07d";
+  text-align: center;
+  padding: 1px;
+}
+.oe_overlay .oe_handle.s > div, .oe_overlay .oe_handle.n > div {
+  width: 100%;
+  height: 0;
+  top: 7px;
+  left: 1px;
 }
 .oe_overlay .oe_handle.s {
   top: auto;
-  left: 2px;
-  width: 100%;
-  bottom: -6px;
   cursor: n-resize;
 }
-.oe_overlay .oe_handle.s:before {
-  z-index: 0;
-  content: "\F063";
+.oe_overlay .oe_handle.n {
+  cursor: s-resize;
+}
+.oe_overlay .oe_handle.n > div {
+  top: 5px;
 }
 .oe_overlay .oe_handle.size {
+  z-index: 3;
   top: auto;
-  left: 2px;
-  width: 100%;
+  left: 50%;
   bottom: -6px;
 }
 .oe_overlay .oe_handle.size .oe_handle_button {
-  z-index: 1;
+  z-index: 3;
   content: "Resize";
   width: 64px;
   text-align: center;
   margin-left: -32px;
   margin-top: -10px;
   cursor: row-resize;
+  left: 0px;
+  top: 9px;
 }
 .oe_overlay .oe_handle.size .oe_handle_button:hover {
   background: rgba(30, 30, 30, 0.8);
@@ -313,43 +344,20 @@
   -moz-box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
   box-shadow: 0 0 5px 3px rgba(255, 255, 255, 0.7);
 }
-.oe_overlay .oe_handle.size div {
-  border-style: dashed;
-  border-width: 0 0 1px 0;
-  border-color: rgba(0, 0, 0, 0.5);
-  position: relative;
-  top: 8px;
-}
-.oe_overlay .oe_handle.w {
-  top: 2px;
-  height: 100%;
-  left: -6px;
-  cursor: e-resize;
-}
-.oe_overlay .oe_handle.w:before {
-  content: "\F060";
-}
-.oe_overlay .oe_handle.n {
-  left: 2px;
-  width: 100%;
-  top: -6px;
-  cursor: s-resize;
-}
-.oe_overlay .oe_handle.n:before {
-  content: "\F062";
-}
 .oe_overlay .icon.btn {
   display: inline-block;
 }
 .oe_overlay .oe_overlay_options {
   position: absolute;
-  width: 100%;
+  left: 50% !important;
   text-align: center;
   top: -11px;
   z-index: 1002;
 }
+.oe_overlay .oe_overlay_options > .btn-group {
+  left: -50%;
+}
 .oe_overlay .oe_overlay_options .btn, .oe_overlay .oe_overlay_options a {
-  pointer-events: auto;
   cursor: pointer;
 }
 .oe_overlay .oe_overlay_options .dropdown {
@@ -362,6 +370,36 @@
 .oe_overlay .oe_overlay_options .dropdown-menu select, .oe_overlay .oe_overlay_options .dropdown-menu input {
   display: block;
 }
+.oe_overlay.block-w-left .w:before {
+  content: "\F061" !important;
+}
+.oe_overlay.block-w-right .w:before {
+  content: "\F060" !important;
+}
+.oe_overlay.block-w-left.block-w-right .w {
+  display: none !important;
+}
+.oe_overlay.block-e-left .e:before {
+  content: "\F061" !important;
+}
+.oe_overlay.block-e-right .e:before {
+  content: "\F060" !important;
+}
+.oe_overlay.block-e-left.block-e-right .e {
+  display: none !important;
+}
+.oe_overlay.block-s-top .s:before {
+  content: "\F063" !important;
+}
+.oe_overlay.block-s-bottom .s:before {
+  content: "\f062" !important;
+}
+.oe_overlay.block-n-top .n:before {
+  content: "\F063" !important;
+}
+.oe_overlay.block-n-bottom .n:before {
+  content: "\f062" !important;
+}
 
 .s-resize-important, .s-resize-important * {
   cursor: s-resize !important;
@@ -478,7 +516,6 @@
   box-shadow: 0px 3px 17px rgba(99, 53, 150, 0.59);
 }
 .oe_snippet_editor .oe_snippet > * {
-  pointer-events: none;
   margin-top: 16px;
   line-height: 1em;
   zoom: 0.6;
diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass
index ed9c38731db..afdb261a2a5 100644
--- a/addons/website/static/src/css/snippets.sass
+++ b/addons/website/static/src/css/snippets.sass
@@ -64,9 +64,7 @@
     overflow: hidden
     +user-select(none)
     cursor: move
-    pointer-events: none
     .oe_snippet_thumbnail
-        pointer-events: auto
         text-align: center
         height: 100%
         background: transparent
@@ -147,24 +145,20 @@
 
 .resize_editor_busy
     background-color: rgba(0,0,0,0.3)
+
 .oe_overlay
     display: none
+    height: 0
     position: absolute
     background: transparent
     //@include background-image( repeating-linear-gradient(45deg, rgba(255,255,255,.02) ,rgba(255,255,255,.02) 35px, rgba(0,0,0,.02) 35px, rgba(0,0,0,.02) 75px))
     +border-radius(3px)
     @include transition(opacity 100ms linear)
     +box-sizing(border-box)
-    pointer-events: none
     &.oe_active
         display: block
-        border-style: dashed
-        border-width: 1px
-        +box-shadow(0px 0px 0px 1px rgba(255,255,255,0.3), 0px 0px 0px 1px rgba(255,255,255,0.3) inset)
-        border-color: rgba(0, 0, 0, 0.5)
     .oe_handle
         display: block !important
-        pointer-events: auto
         position: absolute
         top: 50%
         left: 50%
@@ -172,7 +166,15 @@
         width: 16px
         height: 16px
         margin: -2px
+        > div
+            z-index: 1
+            position: absolute
+            border-style: dashed
+            border-width: 1px
+            border-color: #666666
+            +box-shadow(0px 0px 0px 1px rgba(255,255,255,0.5), 0px 0px 0px 1px rgba(255,255,255,0.5) inset)
         &.e:before, &.w:before, &.s:before, &.n:before, &.size .oe_handle_button
+            z-index: 2
             position: relative
             top: 50%
             left: 50%
@@ -194,72 +196,75 @@
                 background: rgba(0, 0, 0, .5)
                 color: #fff
                 +box-shadow(0 0 5px 3px rgba(255,255,255,.7))
+        &.e, &.w
+            top: 4px
+            height: 100%
+            &:before
+                content: "\f0d9-\f0da"
+                line-height: 16px
+            > div
+                width: 0
+                height: 100%
+                top: 2px
+                left: 8px
         &.e
             left: auto
-            top: 2px
-            height: 100%
             right: -6px
             cursor: w-resize
+        &.w
+            left: -6px
+            cursor: e-resize
+        &.s, &.n
+            left: 2px
+            width: 100%
             &:before
-                content: "\F061"
+                content: "\f07d"
+                text-align: center
+                padding: 1px
+            > div
+                width: 100%
+                height: 0
+                top: 7px
+                left: 1px
         &.s
             top: auto
-            left: 2px
-            width: 100%
-            bottom: -6px
             cursor: n-resize
-            &:before
-                z-index: 0
-                content: "\F063"
+        &.n
+            cursor: s-resize
+            > div
+                top: 5px
         &.size
+            z-index: 3
             top: auto
-            left: 2px
-            width: 100%
+            left: 50%
             bottom: -6px
             .oe_handle_button
-                z-index: 1
+                z-index: 3
                 content: "Resize"
                 width: 64px
                 text-align: center
                 margin-left: -32px
                 margin-top: -10px
                 cursor: row-resize
+                left: 0px
+                top: 9px
                 &:hover
                     background: rgba(30, 30, 30, .8)
                     color: #fff
                     +box-shadow(0 0 5px 3px rgba(255,255,255,.7))
-            div
-                border-style: dashed
-                border-width: 0 0 1px 0
-                border-color: rgba(0, 0, 0, 0.5)
-                position: relative
-                top: 8px
-        &.w
-            top: 2px
-            height: 100%
-            left: -6px
-            cursor: e-resize
-            &:before
-                content: "\F060"
-        &.n
-            left: 2px
-            width: 100%
-            top: -6px
-            cursor: s-resize
-            &:before
-                content: "\F062"
 
     .icon.btn
         display: inline-block
 
     .oe_overlay_options
         position: absolute
-        width: 100%
+        left: 50% !important
         text-align: center
         top: -11px
         z-index: 1002
+        > .btn-group
+            left: -50%
         .btn, a
-            pointer-events: auto
             cursor: pointer
         .dropdown
             display: inline-block
@@ -269,6 +274,29 @@
         .dropdown-menu select,.dropdown-menu input
             display: block
 
+    &.block-w-left .w:before
+        content: "\F061" !important
+    &.block-w-right .w:before
+        content: "\F060" !important
+    &.block-w-left.block-w-right .w
+        display: none !important
+    &.block-e-left .e:before
+        content: "\F061" !important
+    &.block-e-right .e:before
+        content: "\F060" !important
+    &.block-e-left.block-e-right .e
+        display: none !important
+
+    &.block-s-top .s:before
+        content: "\F063" !important
+    &.block-s-bottom .s:before
+        content: "\f062" !important
+    &.block-n-top .n:before
+        content: "\F063" !important
+    &.block-n-bottom .n:before
+        content: "\f062" !important
+
+
 .s-resize-important, .s-resize-important *
     cursor: s-resize !important
 .n-resize-important, .n-resize-important *
@@ -367,7 +395,6 @@
             border: 2px solid rgb(151, 137, 255)
             box-shadow: 0px 3px 17px rgba(99, 53, 150, 0.59)
         & > *
-            pointer-events: none
             margin-top: 16px
             line-height: 1em
             zoom: 0.6
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 27c74508e7f..81b40ce7aca 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -282,12 +282,16 @@ ul.nav-stacked > li > a {
 }
 
 /* ---- SNIPPETS --- */
+.oe_img_bg {
+  background-size: 100%;
+}
+
 [data-snippet-id], .colmd, .hr, .blockquote {
   overflow: hidden;
 }
 
 @media (max-width: 400px) {
-  [data-snippet-id] {
+  [data-snippet-id]:not([data-snippet-id="carousel"]) {
     height: auto !important;
   }
 }
@@ -296,24 +300,27 @@ ul.nav-stacked > li > a {
 }
 .carousel-inner .item {
   height: 100%;
-  background-size: 100%;
+  background-size: cover;
 }
 
 .carousel .carousel-caption {
-  left: auto;
-  right: auto;
-  bottom: 10%;
+  position: absolute;
+  right: 50%;
+  left: 50%;
+  bottom: 20px;
+}
+.carousel .carousel-caption > div {
+  position: absolute;
   text-align: left;
   padding: 20px;
   background: rgba(0, 0, 0, 0.4);
+  bottom: 20px;
 }
 .carousel .carousel-caption h1, .carousel .carousel-caption h2, .carousel .carousel-caption h3 {
   margin-top: 10px;
   margin-bottom: 10px;
 }
 .carousel .carousel-image {
-  right: 50%;
-  left: 50%;
   top: 5%;
   bottom: 5%;
   position: absolute;
@@ -328,13 +335,35 @@ ul.nav-stacked > li > a {
   right: 10%;
   top: 10%;
   bottom: auto;
+}
+.carousel .item.text_only .carousel-caption > div {
   text-align: center;
   background: transparent;
+  bottom: auto;
+  width: 100%;
+}
+.carousel .item.text_image .carousel-caption {
+  left: 10%;
+}
+.carousel .item.text_image .carousel-caption > div {
+  right: 50%;
+  margin-right: -20%;
+  max-width: 550px;
+}
+.carousel .item.text_image .carousel-image {
+  right: 10%;
+  left: 50%;
 }
 .carousel .item.image_text .carousel-caption {
   right: 10%;
 }
+.carousel .item.image_text .carousel-caption > div {
+  left: 50%;
+  margin-left: -20%;
+  max-width: 550px;
+}
 .carousel .item.image_text .carousel-image {
+  right: 50%;
   left: 10%;
 }
 .carousel .carousel-control {
@@ -365,22 +394,15 @@ div.carousel[data-snippet-id="slider"] .carousel-indicators .active {
 }
 
 .parallax {
-  position: relative;
-  background-size: 100%;
-  display: table;
-  width: 100%;
-  min-height: 100px;
-}
-.parallax.oe_small {
-  min-height: 200px;
-}
-.parallax.oe_medium {
-  min-height: 300px;
-}
-.parallax.oe_big {
-  min-height: 450px;
+  background-size: cover;
 }
 .parallax > div {
+  position: relative;
+  display: table;
+  width: 100%;
+  min-height: 200px;
+}
+.parallax > div > div {
   display: table-cell;
   vertical-align: middle;
   padding: 32px 0;
@@ -446,10 +468,6 @@ div.carousel[data-snippet-id="slider"] .carousel-indicators .active {
 }
 
 /* Misc */
-.oe_img_bg {
-  background-size: 100%;
-}
-
 .texttop {
   vertical-align: top;
 }
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 2c5f691fae6..a9ae82cee3a 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -228,33 +228,40 @@ ul.nav-stacked > li > a
         a
             color: white
 
+
 /* ---- SNIPPETS --- */
+
+.oe_img_bg
+    background-size: 100%
+
 [data-snippet-id],.colmd,.hr,.blockquote
     overflow: hidden
 
 @media (max-width: 400px)
-    [data-snippet-id]
+    [data-snippet-id]:not([data-snippet-id="carousel"])
         height: auto !important
 
 .carousel-inner
     height: 100%
     .item
         height: 100%
-        background-size: 100%
+        background-size: cover
 .carousel
     .carousel-caption
-        left: auto
-        right: auto
-        bottom: 10%
-        text-align: left
-        padding: 20px
-        background: rgba(0, 0, 0, 0.4)
+        position: absolute
+        right: 50%
+        left: 50%
+        bottom: 20px
+        > div
+            position: absolute
+            text-align: left
+            padding: 20px
+            background: rgba(0, 0, 0, 0.4)
+            bottom: 20px
         h1, h2, h3
             margin-top: 10px
             margin-bottom: 10px
     .carousel-image
-        right: 50%
-        left: 50%
         top: 5%
         bottom: 5%
         position: absolute
@@ -268,12 +275,30 @@ ul.nav-stacked > li > a
             right: 10%
             top: 10%
             bottom: auto
-            text-align: center
-            background: transparent
+            > div
+                text-align: center
+                background: transparent
+                bottom: auto
+                width: 100%
+    .item.text_image
+        .carousel-caption
+            left: 10%
+            > div
+                right: 50%
+                margin-right: -20%
+                max-width: 550px
+        .carousel-image
+            right: 10%
+            left: 50%
     .item.image_text
         .carousel-caption
             right: 10%
+            > div
+                left: 50%
+                margin-left: -20%
+                max-width: 550px
         .carousel-image
+            right: 50%
             left: 10%
     .carousel-control
         cursor: pointer
@@ -299,21 +324,16 @@ div.carousel[data-snippet-id="slider"]
             background-color: grey
 
 .parallax
-    position: relative
-    background-size: 100%
-    display: table
-    width: 100%
-    min-height: 100px
-    &.oe_small
-        min-height: 200px
-    &.oe_medium
-        min-height: 300px
-    &.oe_big
-        min-height: 450px
+    background-size: cover
     > div
-        display: table-cell
-        vertical-align: middle
-        padding: 32px 0
+        position: relative
+        display: table
+        width: 100%
+        min-height: 200px
+        > div
+            display: table-cell
+            vertical-align: middle
+            padding: 32px 0
 
 /* Background */
 
@@ -362,9 +382,6 @@ div.carousel[data-snippet-id="slider"]
 
 /* Misc */
 
-.oe_img_bg
-    background-size: 100%
-
 .texttop
     vertical-align: top
 
diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index 514969fc4c2..a8af74bb52d 100644
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -39,14 +39,21 @@
             this.xml = text;
         },
         isWellFormed: function () {
+            var error;
             if (document.implementation.createDocument) {
-                var dom = new DOMParser().parseFromString(this.xml, "text/xml");
-                return dom.getElementsByTagName("parsererror").length === 0;
-            } else if (window.ActiveXObject) {
-                // TODO test in IE
+                // use try catch for ie
+                try {
+                    var dom = new DOMParser().parseFromString(this.xml, "text/xml");
+                    error = dom.getElementsByTagName("parsererror");
+                    return error.length === 0 || $(error).text();
+                } catch (e) {}
+            }
+            if (window.ActiveXObject) {
+                // IE
                 var msDom = new ActiveXObject("Microsoft.XMLDOM");
                 msDom.async = false;
-                return !msDom.loadXML(this.xml);
+                msDom.loadXML(this.xml);
+                return !msDom.parseError.errorCode || msDom.parseError.reason + "\nline " + msDom.parseError.line;
             }
             return true;
         },
@@ -256,28 +263,35 @@
             }), function (session) {
                 return session.isDirty;
             });
-            var requests = _.map(toSave, self.saveView);
+            this.clearError();
+            var requests = _.map(toSave, function (session) {
+                return self.saveView(session);
+            });
             $.when.apply($, requests).then(function () {
                 self.reloadPage.call(self);
-            }).fail(function (source, error) {
-                var message = _.isString(error) ? error
-                    : (error && error.data && error.data.arguments && error.data.arguments[0] === "Access Denied") ? "Access denied: please sign in"
-                    : (error && error.message) ? error.message
-                    : "Unexpected error";
-                self.displayError.call(self, message);
+            }).fail(function (source, session, error) {
+                self.displayError.call(self, source, session, error);
             });
         },
         saveView: function (session) {
+            var self = this;
             var xml = new website.ace.XmlDocument(session.text);
-            if (xml.isWellFormed()) {
-                return openerp.jsonRpc('/web/dataset/call', 'call', {
+            var isWellFormed = xml.isWellFormed();
+            var def = $.Deferred();
+            if (isWellFormed === true) {
+                openerp.jsonRpc('/web/dataset/call', 'call', {
                     model: 'ir.ui.view',
                     method: 'write',
                     args: [[session.id], { 'arch':  xml.xml }, website.get_context()],
+                }).then(function () {
+                    def.resolve();
+                }).fail(function (source, error) {
+                    def.reject("server", session, error);
                 });
             } else {
-                return $.Deferred().reject(null, "Malformed XML document");
+                def.reject(null, session, isWellFormed);
             }
+            return def;
         },
         updateHash: function () {
             window.location.hash = hash + "?view=" + this.selectedViewId();
@@ -286,9 +300,61 @@
             this.updateHash();
             window.location.reload();
         },
-        displayError: function (error) {
-            // TODO Improve feedback (e.g. update 'Save' button + tooltip)
-            alert(error);
+        clearError: function () {
+            this.$(".ace_layer.ace_text-layer .ace_line").css("background", "");
+        },
+        displayError: function (source, session, error) {
+            var self = this;
+            var line, test;
+            // format error message
+            var message = _.isString(error) ? error
+                : (error && error.data && error.data.arguments && error.data.arguments[0] === "Access Denied") ? "Access denied: please sign in"
+                : (error && error.data && error.data.message) ? error.data.message
+                : (error && error.message) ? error.message
+                : "Unexpected error";
+            if (source == "server") {
+                message = eval(message.replace(/^\(/g, '([')
+                    .replace(/\)$/g, '])')
+                    .replace(/u'/g, "'")
+                    .replace(/<([^>]+)>/g, '<b style="color:#661100;">&lt;\$1&gt;</b>'))[1];
+                line = -1;
+            } else {
+                line = message.match(/line ([0-9]+)/i);
+                line = line ? parseInt(line[1],10) : -1;
+                test = new RegExp("^\\s*"+line+"\\s*$");
+            }
+
+            function gotoline() {
+                self.aceEditor.gotoLine(line);
+                setTimeout(function () {
+                    var $lines = self.$(".ace_editor .ace_gutter .ace_gutter-cell");
+                    var index = $lines.filter(function () {
+                        return test.test($(this).text());
+                    }).index();
+                    if (index>0) {
+                        self.$(".ace_layer.ace_text-layer .ace_line:eq(" + index + ")").css("background", "#661100");
+                    }
+                },100);
+            }
+            function onchangeSession (e) {
+                self.aceEditor.off('changeSession', onchangeSession);
+                gotoline();
+            }
+
+            var $list = this.$("#ace-view-list");
+            if (+$list.val() == session.id) {
+                if (line>-1) gotoline();
+            } else {
+                if (line) self.aceEditor.on('changeSession', onchangeSession);
+                this.$("#ace-view-list").val(session.id).change();
+            }
+
+            var $dialog = $(openerp.qweb.render('website.error_dialog', {
+                title: session.text.match(/\s+name=['"]([^'"]+)['"]/i)[1],
+                message:"<b>Malformed XML document</b>:<br/>" + message
+            }));
+            $dialog.appendTo("body");
+            $dialog.modal('show');
         },
         open: function () {
             this.$el.removeClass('oe_ace_closed').addClass('oe_ace_open');
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index ab97ee2bcf9..f874a5ca5ae 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -10,6 +10,9 @@
 
         if (!is_smartphone) {
             website.ready().then(website.init_editor);
+        } else {
+            // remove padding of fake editor bar
+            document.body.style.padding = 0;
         }
 
         $(document).on('click', 'a.js_link2post', function (ev) {
@@ -17,6 +20,10 @@
             website.form(this.pathname, 'POST');
         });
 
+        $(document).on('click', '.cke_editable label', function (ev) {
+            ev.preventDefault();
+        });
+
         $(document).on('submit', '.cke_editable form', function (ev) {
             // Disable form submition in editable mode
             ev.preventDefault();
@@ -47,7 +54,7 @@
      * is editable but its attributes should not be considered editable
      */
     function is_editable_node(element) {
-        return !(element.data('oe-model') === 'ir.ui.view'
+        return (element.data('oe-model') !== 'ir.ui.view'
               || element.data('cke-realelement')
               || (is_editing_host(element) && element.getAttribute('attributeEditable') !== 'true')
               || element.isReadOnly());
@@ -63,8 +70,10 @@
     // only enable editors manually
     CKEDITOR.disableAutoInline = true;
     // EDIT ALL THE THINGS
-    CKEDITOR.dtd.$editable = $.extend(
-        {}, CKEDITOR.dtd.$block, CKEDITOR.dtd.$inline);
+    CKEDITOR.dtd.$editable = _.omit(
+        $.extend({}, CKEDITOR.dtd.$block, CKEDITOR.dtd.$inline),
+        // well maybe not *all* the things
+        'ul', 'ol', 'li', 'table', 'tr', 'th', 'td');
     // Disable removal of empty elements on CKEDITOR activation. Empty
     // elements are used for e.g. support of FontAwesome icons
     CKEDITOR.dtd.$removeEmpty = {};
@@ -374,8 +383,7 @@
                         });
                     },
                     upcast: function (el) {
-                        return el.attributes['class']
-                            && (/\bfa\b/.test(el.attributes['class']));
+                        return el.hasClass('fa');
                     }
                 });
             }
@@ -411,6 +419,7 @@
                 openerp.jsonRpc('/website/customize_template_get', 'call', { 'xml_id': view_name }).then(
                     function(result) {
                         _.each(result, function (item) {
+                            if (item.xml_id === "website.debugger" && !window.location.search.match(/[&?]debug(&|$)/)) return;
                             if (item.header) {
                                 menu.append('<li class="dropdown-header">' + item.name + '</li>');
                             } else {
@@ -437,6 +446,12 @@
             });
         },
         start: function() {
+            // remove placeholder editor bar
+            var fakebar = document.getElementById('website-top-navbar-placeholder');
+            if (fakebar) {
+                fakebar.parentNode.removeChild(fakebar);
+            }
+
             var self = this;
             this.saving_mutex = new openerp.Mutex();
 
@@ -628,7 +643,7 @@
                 image_dialog(editor, new CKEDITOR.dom.element(previous));
                 $image_button.hide();
                 previous = null;
-            });
+            }, 'btn-sm');
 
             // previous is the state of the button-trigger: it's the
             // currently-ish hovered element which can trigger a button showing.
@@ -640,6 +655,7 @@
                 if (previous && previous === this) { return; }
 
                 var selected = new CKEDITOR.dom.element(this);
+                // FIXME: fa nodes may not be editable widgets (?)
                 if (!is_editable_node(selected) && !selected.hasClass('fa')) {
                     return;
                 }
@@ -827,7 +843,6 @@
                     document.execCommand("enableInlineTableEditing", false, "false");
                 } catch (e) {}
 
-
                 // detect & setup any CKEDITOR widget within a newly dropped
                 // snippet. There does not seem to be a simple way to do it for
                 // HTML not inserted via ckeditor APIs:
@@ -984,6 +999,7 @@
         start: function () {
             var sup = this._super();
             this.$el.modal({backdrop: 'static'});
+            this.$('input:first').focus();
             return sup;
         },
         save: function () {
@@ -1023,10 +1039,13 @@
         },
         start: function () {
             var self = this;
+            var last;
             this.$('#link-page').select2({
                 minimumInputLength: 1,
                 placeholder: _t("New or existing page"),
                 query: function (q) {
+                    if (q.term == last) return;
+                    last = q.term;
                     $.when(
                         self.page_exists(q.term),
                         self.fetch_pages(q.term)
@@ -1073,7 +1092,7 @@
                 } else {
                     // Create the page, get the URL back
                     done = $.get(_.str.sprintf(
-                            '/pagenew/%s?noredirect=1', encodeURI(data.id)))
+                            '/website/add/%s?noredirect=1', encodeURI(data.id)))
                         .then(function (response) {
                             self.make_link(response, false, data.id);
                         });
@@ -1265,7 +1284,7 @@
         }),
 
         start: function () {
-            this.$('.modal-footer [disabled]').text("Uploading…");
+            this.$('button.wait').text("Uploading…");
             var $options = this.$('.image-style').children();
             this.image_styles = $options.map(function () { return this.value; }).get();
 
@@ -1298,13 +1317,16 @@
          * Sets the provided image url as the dialog's value-to-save and
          * refreshes the preview element to use it.
          */
-        set_image: function (url) {
+        set_image: function (url, error) {
+            this.$('input.url').val(
+                error ? '' : url);
             this.$('input.url').val(url);
             this.preview_image();
         },
 
         file_selection: function () {
             this.$el.addClass('nosave');
+            this.$('form').removeClass('has-error').find('.help-block').empty();
             this.$('button.filepicker').removeClass('btn-danger btn-success');
 
             var self = this;
@@ -1319,25 +1341,38 @@
         },
         file_selected: function(url, error) {
             var $button = this.$('button.filepicker');
-            if (error) {
+            if (!error) {
+                $button.addClass('btn-success');
+            } else {
+                url = null;
+                this.$('form').addClass('has-error')
+                    .find('.help-block').text(error);
                 $button.addClass('btn-danger');
-                return;
             }
-            $button.addClass('btn-success');
-            this.set_image(url);
+            this.set_image(url, error);
         },
         preview_image: function () {
-            this.$el.removeClass('nosave');
+            var loaded = function () {
+                this.$el.removeClass('nosave');
+            }.bind(this);
             var image = this.$('input.url').val();
-            if (!image) { return; }
+            if (!image) { loaded(); return; }
 
-            this.$('img.image-preview')
+            var $img = this.$('img.image-preview')
                 .attr('src', image)
                 .removeClass(this.image_styles.join(' '))
                 .addClass(this.$('select.image-style').val());
+
+            if ($img.prop('complete')) {
+                loaded();
+            } else {
+                $img.load(loaded)
+            }
         },
         browse_existing: function (e) {
             e.preventDefault();
+            this.$('form').removeClass('has-error').find('.help-block').empty();
+            this.$('button.filepicker').removeClass('btn-danger btn-success');
             new website.editor.ExistingImageDialog(this).appendTo(document.body);
         },
     });
@@ -1406,6 +1441,7 @@
                 this.page += $target.hasClass('previous') ? -1 : 1;
                 this.display_attachments();
             },
+            'click .existing-attachment-remove': 'try_remove',
         }),
         init: function (parent) {
             this.image = null;
@@ -1428,7 +1464,7 @@
                 kwargs: {
                     fields: ['name', 'website_url'],
                     domain: [['res_model', '=', 'ir.ui.view']],
-                    order: 'name',
+                    order: 'id desc',
                     context: website.get_context(),
                 }
             });
@@ -1438,6 +1474,7 @@
             this.display_attachments();
         },
         display_attachments: function () {
+            this.$('.help-block').empty();
             var per_screen = IMAGES_PER_ROW * IMAGES_ROWS;
 
             var from = this.page * per_screen;
@@ -1465,6 +1502,34 @@
             }
             this.close()
         },
+
+        try_remove: function (e) {
+            var $help_block = this.$('.help-block').empty();
+            var self = this;
+            var id = parseInt($(e.target).data('id'), 10);
+            var attachment = _.findWhere(this.records, {id: id});
+
+            return openerp.jsonRpc('/web/dataset/call_kw', 'call', {
+                model: 'ir.attachment',
+                method: 'try_remove',
+                args: [],
+                kwargs: {
+                    ids: [id],
+                    context: website.get_context()
+                }
+            }).then(function (prevented) {
+                if (_.isEmpty(prevented)) {
+                    self.records = _.without(self.records, attachment);
+                    self.display_attachments();
+                    return;
+                }
+                $help_block.replaceWith(openerp.qweb.render(
+                    'website.editor.dialog.image.existing.error', {
+                        views: prevented[id]
+                    }
+                ));
+            });
+        },
     });
 
     function get_selected_link(editor) {
@@ -1641,6 +1706,8 @@
                 }
                 switch(m.type) {
                 case 'attributes': // ignore .cke_focus being added or removed
+                    // ignore id modification
+                    if (m.attributeName === 'id') { return false; }
                     // if attribute is not a class, can't be .cke_focus change
                     if (m.attributeName !== 'class') { return true; }
 
@@ -1652,6 +1719,9 @@
                     // ignore mutation if the *only* change is .cke_focus
                     return change.length !== 1 || change[0] === 'cke_focus';
                 case 'childList':
+                    setTimeout(function () {
+                        fixup_browser_crap(m.addedNodes);
+                    }, 0);
                     // Remove ignorable nodes from addedNodes or removedNodes,
                     // if either set remains non-empty it's considered to be an
                     // impactful change. Otherwise it's ignored.
@@ -1689,4 +1759,69 @@
         }
         return output;
     }
+
+    var programmatic_styles = {
+        float: 1,
+        display: 1,
+        position: 1,
+        top: 1,
+        left: 1,
+        right: 1,
+        bottom: 1,
+    };
+    function fixup_browser_crap(nodes) {
+        if (!nodes || !nodes.length) { return; }
+        /**
+         * Checks that the node only has a @style, not e.g. @class or whatever
+         */
+        function has_only_style(node) {
+            for (var i = 0; i < node.attributes.length; i++) {
+                var attr = node.attributes[i];
+                if (attr.attributeName !== 'style') {
+                    return false;
+                }
+            }
+            return true;
+        }
+        function has_programmatic_style(node) {
+            for (var i = 0; i < node.style.length; i++) {
+              var style = node.style[i];
+              if (programmatic_styles[style]) {
+                  return true;
+              }
+            }
+            return false;
+        }
+
+        for (var i=0; i<nodes.length; ++i) {
+            var node = nodes[i];
+            if (node.nodeType !== document.ELEMENT_NODE) { continue; }
+
+            if (node.nodeName === 'SPAN'
+                    && has_only_style(node)
+                    && !has_programmatic_style(node)) {
+                // On backspace, webkit browsers create a <span> with a bunch of
+                // inline styles "remembering" where they come from. Refs:
+                //    http://www.neotericdesign.com/blog/2013/3/working-around-chrome-s-contenteditable-span-bug
+                //    https://code.google.com/p/chromium/issues/detail?id=226941
+                //    https://bugs.webkit.org/show_bug.cgi?id=114791
+                //    http://dev.ckeditor.com/ticket/9998
+                var child, parent = node.parentNode;
+                while (child = node.firstChild) {
+                    parent.insertBefore(child, node);
+                }
+                parent.removeChild(node);
+                // chances are we had e.g.
+                //  <p>foo</p>
+                //  <p>bar</p>
+                // merged the lines getting this in webkit
+                //  <p>foo<span>bar</span></p>
+                // after unwrapping the span, we have 2 text nodes
+                //  <p>[foo][bar]</p>
+                // where we probably want only one. Normalize will merge
+                // adjacent text nodes. However, does not merge text and cdata
+                parent.normalize();
+            }
+        }
+    }
 })();
diff --git a/addons/website/static/src/js/website.editor.newpage.js b/addons/website/static/src/js/website.editor.newpage.js
index 944a24b89d8..b475223ecd9 100644
--- a/addons/website/static/src/js/website.editor.newpage.js
+++ b/addons/website/static/src/js/website.editor.newpage.js
@@ -2,6 +2,7 @@
     "use strict";
 
     var website = openerp.website;
+    var _t = openerp._t;
     website.is_editable = true;
     website.is_editable_button = true;
     
@@ -12,15 +13,44 @@
             this.$(".oe_content_menu li.divider").removeClass("hidden");
             return res;
         },
+        edit: function () {
+            this.on('rte:ready', this, function () {
+                $('a:has(span[data-oe-model="website.menu"])').tooltip({
+                    title: _t('Save this page and use the top "Content" menu to edit the menu.'),
+                    placement: "bottom",
+                    trigger: "hover",
+                    show: 50,
+                    hide: 100,
+                    container: 'body'
+                });
+            });
+            return this._super();
+        },
         events: _.extend({}, website.EditorBar.prototype.events, {
             'click a[data-action=new_page]': function (ev) {
                 ev.preventDefault();
                 website.prompt({
-                    window_title: "New Page",
-                    input: "Page Title",
-                }).then(function (val) {
+                    id: "editor_new_page",
+                    window_title: _t("New Page"),
+                    input: _t("Page Title"),
+                    init: function () {
+                        var $group = this.$dialog.find("div.form-group");
+                        $group.removeClass("mb0");
+
+                        var $add = $(
+                            '<div class="form-group mb0">'+
+                                '<label class="col-sm-offset-3 col-sm-9 text-left">'+
+                                '    <input type="checkbox" checked="checked" required="required"/> '+
+                                '</label>'+
+                            '</div>');
+                        $add.find('label').append(_t("Add page in menu"));
+                        $group.after($add);
+                    }
+                }).then(function (val, field, $dialog) {
                     if (val) {
-                        document.location = '/website/add/' + encodeURI(val);
+                        var url = '/website/add/' + encodeURI(val);
+                        if ($dialog.find('input[type="checkbox"]').is(':checked')) url +="?add_menu=1";
+                        document.location = url;
                     }
                 });
             }
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 6fde9495d36..54ee4689814 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -69,6 +69,8 @@
         website.is_editable = website.is_editable || $('html').data('editable');
         website.is_editable_button= website.is_editable_button || $('html').data('editable');
         dom_ready.resolve();
+        // fix for ie
+        if($.fn.placeholder) $('input, textarea').placeholder();
     });
 
     website.init_kanban = function ($kanban) {
@@ -206,6 +208,7 @@
 
         var def = $.Deferred();
         var dialog = $(openerp.qweb.render('website.prompt', options)).appendTo("body");
+        options.$dialog = dialog;
         var field = dialog.find(options.field_type).first();
         field.val(options.default);
         field.fillWith = function (data) {
@@ -226,7 +229,7 @@
             dialog.modal('show');
             field.focus();
             dialog.on('click', '.btn-primary', function () {
-                def.resolve(field.val(), field);
+                def.resolve(field.val(), field, dialog);
                 dialog.remove();
             });
         });
@@ -247,13 +250,13 @@
 
     website.form = function (url, method, params) {
         var form = document.createElement('form');
-        form.action = url;
-        form.method = method;
+        form.setAttribute('action', url);
+        form.setAttribute('method', method);
         _.each(params, function (v, k) {
             var param = document.createElement('input');
-            param.type = 'hidden';
-            param.name = k;
-            param.value = v;
+            param.setAttribute('type', 'hidden');
+            param.setAttribute('name', k);
+            param.setAttribute('value', v);
             form.appendChild(param);
         });
         document.body.appendChild(form);
diff --git a/addons/website/static/src/js/website.mobile.js b/addons/website/static/src/js/website.mobile.js
index 4acf2d78db8..59c2328e09b 100644
--- a/addons/website/static/src/js/website.mobile.js
+++ b/addons/website/static/src/js/website.mobile.js
@@ -17,6 +17,9 @@
             'hidden.bs.modal': 'destroy'
         },
         start: function () {
+            if (!window.location.origin) { // fix for ie9
+                window.location.origin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: '') + '/';
+            }
             document.getElementById("mobile-viewport").src = window.location.origin + window.location.pathname + "#mobile-preview";
             this.$el.modal();
         },
diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index 60c5aea49e2..f1d19125a0c 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -2,7 +2,7 @@
     'use strict';
 
     var website = openerp.website;
-    website.snippet = {};
+    if (!website.snippet) website.snippet = {};
     website.snippet.readyAnimation = [];
 
     website.snippet.start_animation = function () {
@@ -64,6 +64,10 @@
         start: function () {
             this.$target.carousel({interval: 10000});
         },
+        stop: function () {
+            this.$target.carousel('pause');
+            this.$target.removeData("bs.carousel");
+        },
     });
 
     website.snippet.animationRegistry.parallax = website.snippet.Animation.extend({
@@ -105,7 +109,7 @@
                 var offset = 0;
                 var padding =  parseInt($(document.body).css("padding-top"));
                 if (speed < 1) {
-                    var inner_offset = self.$target.outerHeight() - this.height / this.width * document.body.clientWidth;
+                    var inner_offset = - self.$target.outerHeight() + this.height / this.width * document.body.clientWidth;
                     var outer_offset = self.$target.offset().top - (document.body.clientHeight - self.$target.outerHeight()) - padding;
                     offset = - outer_offset * speed + inner_offset;
                 } else {
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 8a3e7a4421d..36030e8235b 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -9,7 +9,7 @@
             var self = this;
             $("[data-oe-model]").on('click', function (event) {
                 var $this = $(event.srcElement);
-                var tag = $this[0].tagName.toLowerCase();
+                var tag = $this[0] && $this[0].tagName.toLowerCase();
                 if (!(tag === 'a' || tag === "button") && !$this.parents("a, button").length) {
                     self.$('[data-action="edit"]').parent().effect('bounce', {distance: 18, times: 5}, 250);
                 }
@@ -19,13 +19,23 @@
         edit: function () {
             var self = this;
             $("body").off('click');
+            website.snippet.stop_animation();
             window.snippets = this.snippets = new website.snippet.BuildingBlock(this);
             this.snippets.appendTo(this.$el);
-
             this.on('rte:ready', this, function () {
                 self.snippets.$button.removeClass("hidden");
-                website.snippet.stop_animation();
                 website.snippet.start_animation();
+                $(website.snippet.readyAnimation).each(function() {
+                    var animation = $(this).data("snippet-view");
+                    if (animation) {
+                        animation.$target.on('focus', '*', function(){
+                            animation.stop();
+                        });
+                        animation.$target.on('blur', '*', function(){
+                            animation.start();
+                        });
+                    }
+                });
             });
 
             return this._super.apply(this, arguments);
@@ -79,6 +89,7 @@
     // 'snippet-dropped' is triggered on '#oe_snippets' whith $target as attribute when a snippet is dropped
     // 'snippet-activated' is triggered on '#oe_snippets' (and on snippet) when a snippet is activated
 
+    if (!website.snippet) website.snippet = {};
     website.snippet.styles = {};
     website.snippet.selector = [];
     website.snippet.BuildingBlock = openerp.Widget.extend({
@@ -139,9 +150,6 @@
 
             this.$el.addClass("hidden");
 
-            this.$modal = $(openerp.qweb.render('website.snippets_modal'));
-            this.$modal.appendTo("body");
-
             $(document).on('click', '.dropdown-submenu a[tabindex]', function (e) {
                 e.preventDefault();
             });
@@ -192,13 +200,14 @@
             var mt = parseInt($target.css("margin-top") || 0);
             var mb = parseInt($target.css("margin-bottom") || 0);
             $el.css({
-                'position': 'absolute',
                 'width': $target.outerWidth(),
-                'height': $target.outerHeight() + mt + mb+1,
-                'top': pos.top - mt,
+                'top': pos.top - mt - 5,
                 'left': pos.left
             });
-            $el.find(".oe_handle.size").css("bottom", (mb-7)+'px');
+            $el.find(">.e,>.w").css({'height': $target.outerHeight() + mt + mb+1});
+            $el.find(">.s").css({'top': $target.outerHeight() + mt + mb});
+            $el.find(">.size").css({'top': $target.outerHeight() + mt});
+            $el.find(">.s,>.n").css({'width': $target.outerWidth()-2});
         },
         show: function () {
             this.$el.removeClass("hidden");
@@ -215,14 +224,8 @@
 
         bind_snippet_click_editor: function () {
             var self = this;
-            var snipped_event_flag = false;
             $("#wrapwrap").on('click', function (event) {
-                if (snipped_event_flag) {
-                    return;
-                }
-                snipped_event_flag = true;
-                setTimeout(function () {snipped_event_flag = false;}, 0);
-                var $target = $(event.srcElement);
+                var $target = $(event.srcElement || event.target);
                 if (!$target.attr("data-snippet-id")) {
                     $target = $target.parents("[data-snippet-id]:first");
                 }
@@ -375,7 +378,7 @@
                     });
                 },
                 stop: function(ev, ui){
-                    if (action === 'insert' && ! dropped && $('.oe_drop_zone') && ui.position.top > 50) {
+                    if (action === 'insert' && ! dropped && $('.oe_drop_zone') && ui.position.top > 3) {
                         var el = $('.oe_drop_zone').nearest({x: ui.position.left, y: ui.position.top}).first();
                         if (el.length) {
                             el.after($toInsert);
@@ -392,7 +395,7 @@
                             website.snippet.start_animation();
 
                             self.create_overlay($target);
-                            if ($snippet.data("snippet-editor")) {
+                            if ($target.data("snippet-editor")) {
                                 $target.data("snippet-editor").drop_and_build_snippet($target);
                             }
 
@@ -416,13 +419,28 @@
                         }
                         setTimeout(function () {
                             $("#oe_snippets").trigger('snippet-dropped', $target);
+
+                            // reset snippet for rte
+                            $target.removeData("snippet-editor");
+                            if ($target.data("overlay")) {
+                                $target.data("overlay").remove();
+                                $target.removeData("overlay");
+                            }
+                            $target.find("[data-snippet-id]").each(function () {
+                                var $snippet = $(this);
+                                $snippet.removeData("snippet-editor");
+                                if ($snippet.data("overlay")) {
+                                    $snippet.data("overlay").remove();
+                                    $snippet.removeData("overlay");
+                                }
+                            });
+                            // end
+
+                            self.create_overlay($target);
                             self.make_active($target);
                         },0);
                     } else {
                         $toInsert.remove();
-                        if (self.$modal.find('input:not(:checked)').length) {
-                            self.$modal.modal('toggle');
-                        }
                     }
                 },
             });
@@ -563,6 +581,20 @@
                 var $target = $(this);
                 if (!$target.data('overlay')) {
                     var $zone = $(openerp.qweb.render('website.snippet_overlay'));
+
+                    // fix for pointer-events: none with ie9
+                    if (document.body && document.body.addEventListener) {
+                        $zone.on("click mousedown mousedown", function passThrough(event) {
+                            event.preventDefault();
+                            $target.each(function() {
+                               // check if clicked point (taken from event) is inside element
+                                event.srcElement = this;
+                                $(this).trigger(event.type);
+                            });
+                            return false;
+                        });
+                    }
+
                     $zone.appendTo('#oe_manipulators');
                     $zone.data('target',$target);
                     $target.data('overlay',$zone);
@@ -775,6 +807,7 @@
             this.parent = parent;
             this.$target = $(dom);
             this.$overlay = this.$target.data('overlay');
+            this.$overlay.find('a[data-toggle="dropdown"]').dropdown();
             this.snippet_id = this.$target.data("snippet-id");
             this._readXMLData();
             this.load_style_options();
@@ -1107,6 +1140,38 @@
             return this.grid;
         },
 
+        onFocus : function () {
+            this._super();
+            this.change_cursor();
+        },
+
+        change_cursor : function () {
+            var _class = this.$target.attr("class") || "";
+
+            var col = _class.match(/col-md-([0-9-]+)/i);
+            col = col ? +col[1] : 0;
+
+            var offset = _class.match(/col-md-offset-([0-9-]+)/i);
+            offset = offset ? +offset[1] : 0;
+
+            var overlay_class = this.$overlay.attr("class").replace(/(^|\s+)block-[^\s]*/gi, '');
+            if (col+offset >= 12) overlay_class+= " block-e-right";
+            if (col === 1) overlay_class+= " block-w-right block-e-left";
+            if (offset === 0) overlay_class+= " block-w-left";
+
+            var mb = _class.match(/mb([0-9-]+)/i);
+            mb = mb ? +mb[1] : 0;
+            if (mb >= 128) overlay_class+= " block-s-bottom";
+            else if (!mb) overlay_class+= " block-s-top";
+
+            var mt = _class.match(/mt([0-9-]+)/i);
+            mt = mt ? +mt[1] : 0;
+            if (mt >= 128) overlay_class+= " block-n-top";
+            else if (!mt) overlay_class+= " block-n-bottom";
+
+            this.$overlay.attr("class", overlay_class);
+        },
+        
         /* on_resize
         *  called when the box is resizing and the class change, before the cover_target
         *  @compass: resize direction : 'n', 's', 'e', 'w'
@@ -1114,7 +1179,7 @@
         *  @current: curent increment in this.grid
         */
         on_resize: function (compass, beginClass, current) {
-
+            this.change_cursor();
         }
     });
 
@@ -1170,7 +1235,6 @@
         on_clone: function () {
             var $clone = this.$target.clone(false);
             var _class = $clone.attr("class").replace(/\s*(col-lg-offset-|col-md-offset-)([0-9-]+)/g, '');
-            _class += ' col-md-1';
             $clone.attr("class", _class);
             this.$target.after($clone);
             this.hide_remove_button();
@@ -1193,27 +1257,27 @@
             return false;
         },
         on_resize: function (compass, beginClass, current) {
-            if (compass !== 'w')
-                return;
+            if (compass === 'w') {
+                // don't change the right border position when we change the offset (replace col size)
+                var beginCol = Number(beginClass.match(/col-md-([0-9]+)|$/)[1] || 0);
+                var beginOffset = Number(beginClass.match(/col-md-offset-([0-9-]+)|$/)[1] || beginClass.match(/col-lg-offset-([0-9-]+)|$/)[1] || 0);
+                var offset = Number(this.grid.w[0][current].match(/col-md-offset-([0-9-]+)|$/)[1] || 0);
+                if (offset < 0) {
+                    offset = 0;
+                }
+                var colSize = beginCol - (offset - beginOffset);
+                if (colSize <= 0) {
+                    colSize = 1;
+                    offset = beginOffset + beginCol - 1;
+                }
+                this.$target.attr("class",this.$target.attr("class").replace(/\s*(col-lg-offset-|col-md-offset-|col-md-)([0-9-]+)/g, ''));
 
-            // don't change the right border position when we change the offset (replace col size)
-            var beginCol = Number(beginClass.match(/col-md-([0-9]+)|$/)[1] || 0);
-            var beginOffset = Number(beginClass.match(/col-md-offset-([0-9-]+)|$/)[1] || beginClass.match(/col-lg-offset-([0-9-]+)|$/)[1] || 0);
-            var offset = Number(this.grid.w[0][current].match(/col-md-offset-([0-9-]+)|$/)[1] || 0);
-            if (offset < 0) {
-                offset = 0;
-            }
-            var colSize = beginCol - (offset - beginOffset);
-            if (colSize <= 0) {
-                colSize = 1;
-                offset = beginOffset + beginCol - 1;
-            }
-            this.$target.attr("class",this.$target.attr("class").replace(/\s*(col-lg-offset-|col-md-offset-|col-md-)([0-9-]+)/g, ''));
-
-            this.$target.addClass('col-md-' + (colSize > 12 ? 12 : colSize));
-            if (offset > 0) {
-                this.$target.addClass('col-md-offset-' + offset);
+                this.$target.addClass('col-md-' + (colSize > 12 ? 12 : colSize));
+                if (offset > 0) {
+                    this.$target.addClass('col-md-offset-' + offset);
+                }
             }
+            this._super(compass, beginClass, current);
         },
     });
 
@@ -1235,8 +1299,6 @@
 
             this.$target.attr('contentEditable', 'false');
             this.$target.find('.oe_structure, .content>.row').attr('contentEditable', 'true');
-
-            this.$target.carousel('pause');
         },
         clean_for_save: function () {
             this._super();
@@ -1245,14 +1307,6 @@
                 this.$target.find(".item:first").addClass("active");
             }
         },
-        onFocus: function () {
-            this._super();
-            this.$target.carousel('pause');
-        },
-        onBlur: function () {
-            this._super();
-            this.$target.carousel('cycle');
-        },
         start : function () {
             var self = this;
             this._super();
@@ -1382,7 +1436,7 @@
             this.$target.find('.carousel-control').off('click').on('click', function () {
                 self.$target.carousel( $(this).data('slide')); });
 
-            this.$target.find('.carousel-image, .content').attr('contentEditable', 'true');
+            this.$target.find('.carousel-inner .content > div').attr('contentEditable', 'true');
             this.$target.find('.carousel-image').attr('attributeEditable', 'true');
             this._super();
         },
@@ -1405,7 +1459,10 @@
                 self.$target.data("snippet-view").set_values();
             });
             this.$target.attr('contentEditable', 'false');
-            this.$target.find('> div > .oe_structure').attr('contentEditable', 'true');
+
+            this.$target.find('> div > .oe_structure').attr('contentEditable', 'true'); // saas-3 retro-compatibility
+
+            this.$target.find('> div > div:not(.oe_structure) > .oe_structure').attr('contentEditable', 'true');
         },
         scroll: function () {
             var self = this;
diff --git a/addons/website/static/src/js/website.tests.js b/addons/website/static/src/js/website.tests.js
deleted file mode 100644
index 977dc8e1848..00000000000
--- a/addons/website/static/src/js/website.tests.js
+++ /dev/null
@@ -1,40 +0,0 @@
-var tests = {};
-var droptest = function () {
-  var errors = [];
-  for (var snippet_id in tests) {
-    if (!tests[snippet_id]['activated'] || !tests[snippet_id]['dropped']){
-      console.log("Can't dropped or activated snippet: " + snippet_id);
-    }
-  }
-  if (errors.length) {
-      console.log(tests);
-      throw new Error("Can't dropped or activated at least one snippet");
-  }
-  $("#oe_snippets").off('snippet-activated snippet-dropped');
-};
-var droptesttime = setTimeout(droptest,0);
-
-$("#oe_snippets").off('snippet-activated snippet-dropped')
-  .on('snippet-activated', function (event, dom) {
-    tests[$(dom).data('src-snippet-id')]['activated'] = true;
-    clearTimeout(droptesttime);
-    droptesttime = setTimeout(droptest,0);
-  })
-  .on('snippet-dropped', function (event, dom, src_snipped_id) {
-    tests[$(dom).data('src-snippet-id')]['dropped'] = true;
-    clearTimeout(droptesttime);
-    droptesttime = setTimeout(droptest,0);
-  });
-var $thumbnails = $('#oe_snippets div.oe_snippet[data-snippet-id] .oe_snippet_thumbnail');
-$thumbnails.each(function () {
-  var $thumbnail = $(this);
-  tests[$thumbnail.parent().data('snippet-id')] = {};
-  var position = $thumbnail.position();
-  $thumbnail.trigger( $.Event( "mousedown", { which: 1, pageX: position.left, pageY: position.top } ) );
-  $thumbnail.trigger( $.Event( "mousemove", { which: 1, pageX: position.left+100, pageY: position.top+100 } ) );
-  $first_drop = $(".oe_drop_zone").first();
-  position = $first_drop.position();
-  $first_drop.trigger( $.Event( "mouseup", { which: 1, pageX: position.left+20, pageY: position.top+20 } ) );
-  clearTimeout(droptesttime);
-  droptesttime = setTimeout(droptest,0);
-});
diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index 2c26ae34e98..c66eea1b314 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -2,113 +2,115 @@
     'use strict';
 
     var website = openerp.website;
+    var _t = openerp._t;
 
     website.EditorBar.include({
         start: function () {
-            this.registerTour(new website.BannerTour(this));
+            this.registerTour(new website.Tour.Banner(this));
             return this._super();
         },
     });
 
-    website.BannerTour = website.Tour.extend({
+    website.Tour.Banner = website.Tour.extend({
         id:   'banner',
         name: "Insert a banner",
-        path: '/page/website.homepage',
-        init: function (editor) {
+        path: '/',
+        init: function () {
             var self = this;
             self.steps = [
                 {
-                    title:    "Welcome to your website!",
-                    content:  "This tutorial will guide you to build your home page. We will start by adding a banner.",
-                    template: self.popover({ next: "Start Tutorial", end: "Skip It" }),
-                    backdrop: true,
+                    title:     _t("Welcome to your website!"),
+                    content:   _t("This tutorial will guide you to build your home page. We will start by adding a banner."),
+                    popover:   { next:  _t("Start Tutorial"), end:   _t("Skip It") },
                 },
                 {
                     waitNot:   '.popover.tour',
                     element:   'button[data-action=edit]',
                     placement: 'bottom',
-                    title:     "Edit this page",
-                    content:   "Every page of your website can be modified through the <i>Edit</i> button.",
-                    template:   self.popover({ fixed: true }),
+                    title:     _t("Edit this page"),
+                    content:   _t("Every page of your website can be modified through the <i>Edit</i> button."),
+                    popover:   { fixed: true },
                 },
                 {
                     element:   'button[data-action=snippet]',
                     placement: 'bottom',
-                    title:     "Insert building blocks",
-                    content:   "To add content in a page, you can insert building blocks.",
-                    template:   self.popover({ fixed: true }),
+                    title:     _t("Insert building blocks"),
+                    content:   _t("To add content in a page, you can insert building blocks."),
+                    popover:   { fixed: true },
                 },
                 {
                     snippet:   'carousel',
                     placement: 'bottom',
-                    title:     "Drag & Drop a Banner",
-                    content:   "Drag the Banner block and drop it in your page.",
-                    template:   self.popover({ fixed: true }),
+                    title:     _t("Drag & Drop a Banner"),
+                    content:   _t("Drag the Banner block and drop it in your page."),
+                    popover:   { fixed: true },
                 },
                 {
                     waitFor:   '.oe_overlay_options .oe_options:visible',
                     element:   '#wrap [data-snippet-id=carousel]:first .carousel-caption',
-                    sampleText: 'My Title',
                     placement: 'top',
-                    title:     "Customize banner's text",
-                    content:   "Click in the text and start editing it. Click continue once it's done.",
+                    title:     _t("Customize banner's text"),
+                    content:   _t("Click in the text and start editing it. Click continue once it's done."),
+                    popover:   { next: _t("Continue") },
                 },
                 {
-                    waitNot:   '#wrap [data-snippet-id=carousel]:first .carousel-caption:contains("Your Banner Title")',
                     element:   '.oe_overlay_options .oe_options',
                     placement: 'left',
-                    title:     "Customize the banner",
-                    content:   "Customize any block through this menu. Try to change the background of the banner.",
-                    template:  self.popover({ next: "Continue" }),
+                    title:     _t("Customize the banner"),
+                    content:   _t("Customize any block through this menu. Try to change the background of the banner."),
+                    popover:   { next: _t("Continue") },
                 },
                 {
                     waitNot:   '.popover.tour',
                     element:   'button[data-action=snippet]',
                     placement: 'bottom',
-                    title:     "Add Another Block",
-                    content:   "Let's add another building block to your page.",
-                    template:   self.popover({ fixed: true }),
+                    title:     _t("Add Another Block"),
+                    content:   _t("Let's add another building block to your page."),
+                    popover:   { fixed: true },
                 },
                 {
                     snippet:   'three-columns',
                     placement: 'bottom',
-                    title:     "Drag & Drop a Block",
-                    content:   "Drag the <em>'3 Columns'</em> block and drop it below the banner.",
-                    template:   self.popover({ fixed: true }),
+                    title:     _t("Drag & Drop This Block"),
+                    content:   _t("Drag the <em>'Three Columns'</em> block and drop it below the banner."),
+                    popover:   { fixed: true },
                 },
                 {
                     waitFor:   '.oe_overlay_options .oe_options:visible',
                     element:   'button[data-action=save]',
                     placement: 'right',
-                    title:     "Save your modifications",
-                    content:   "Publish your page by clicking on the <em>'Save'</em> button.",
-                    template:   self.popover({ fixed: true }),
+                    title:     _t("Save your modifications"),
+                    content:   _t("Publish your page by clicking on the <em>'Save'</em> button."),
+                    popover:   { fixed: true },
                 },
                 {
                     waitFor:   'button[data-action=edit]:visible',
-                    title:     "Congratulation!",
-                    content:   "Your homepage has been updated.",
-                    template:  self.popover({ next: "Continue" }),
+                    title:     _t("Congratulation!"),
+                    content:   _t("Your homepage has been updated."),
+                    popover:   { next: _t("Continue") },
                 },
                 {
                     waitNot:   '.popover.tour',
                     element:   'a[data-action=show-mobile-preview]',
                     placement: 'bottom',
-                    title:     "Test Your Mobile Version",
-                    content:   "Let's check how your homepage looks like on mobile devices.",
-                    template:   self.popover({ fixed: true }),
+                    title:     _t("Test Your Mobile Version"),
+                    content:   _t("Let's check how your homepage looks like on mobile devices."),
+                    popover:   { fixed: true },
                 },
                 {
-                    element:   'button[data-dismiss=modal]',
+                    element:   '.modal:has(#mobile-viewport) button[data-dismiss=modal]',
                     placement: 'right',
-                    title:     "Close Mobile Preview",
-                    content:   "Scroll in the mobile preview to test the rendering. Once it's ok, close this dialog.",
+                    title:     _t("Check Mobile Preview"),
+                    content:   _t("Scroll in the mobile preview to test the rendering. Once it's ok, close this dialog."),
+                    popover:   { next: _t("Continue") },
                 },
                 {
                     waitNot:   '.modal',
-                    title:     "Congrats",
-                    content:   "Congratulation. This tour is finished.",
-                    template:  self.popover({ fixed: true, next: "Close Tutorial" }),
+                    element:   '#content-menu-button',
+                    placement: 'bottom',
+                    title:     _t("Add new pages and menus"),
+                    content:   _t("The 'Content' menu allows you to add pages or add the top menu."),
+                    popover:   { next: _t("Close Tutorial") },
                 },
             ];
             return this._super();
diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 39eaa5b7279..6b0efe7ddb2 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -2,15 +2,14 @@
     'use strict';
 
 var website = openerp.website;
+
+if (typeof QWeb2 !== "undefined")
 website.add_template_file('/website/static/src/xml/website.tour.xml');
 
+if (website.EditorBar)
 website.EditorBar.include({
     tours: [],
     start: function () {
-        // $('.tour-backdrop').click(function (e) {
-        //     e.stopImmediatePropagation();
-        //     e.preventDefault();
-        // });
         var self = this;
         var menu = $('#help-menu');
         _.each(this.tours, function (tour) {
@@ -21,31 +20,11 @@ website.EditorBar.include({
             });
             menu.append($menuItem);
         });
-
-        this.waitRTEReady = false;
-        this.on('rte:called', this, function () {self.waitRTEReady = true; });
-        this.on('rte:ready', this,  function () {self.waitRTEReady = false;});
-
-        var res = this._super();
-        website.Tour.waitReady.call(this, this.testRunning);
-        return res;
+        return this._super();
     },
     registerTour: function (tour) {
         website.Tour.add(tour);
         this.tours.push(tour);
-    },
-    testRunning: function () {
-        if (this.waitRTEReady) {
-            this.on('rte:ready', this, function () {
-                website.Tour.each(function () {
-                    this.running();
-                });
-            });
-        } else {
-            website.Tour.each(function () {
-                this.running();
-            });
-        }
     }
 });
 
@@ -82,23 +61,12 @@ $.ajaxSetup({
     }
 });
 
-
 website.Tour = openerp.Class.extend({
     steps: [],
     defaultDelay: 50, //ms
+    defaultOverLaps: 5000, //ms
     localStorage: window.localStorage,
-    init: function (url) {
-        this.tour = new Tour({
-            name: this.id,
-            storage: this.tourStorage,
-            keyboard: false,
-            template: this.popover(),
-            onHide: function () {
-                window.scrollTo(0, 0);
-            }
-        });
-        this.registerSteps();
-    },
+    init: function () {},
 
     run: function (automatic) {
         this.reset();
@@ -111,13 +79,18 @@ website.Tour = openerp.Class.extend({
 
         if (automatic) {
             this.localStorage.setItem("tour-"+this.id+"-test-automatic", true);
+        } else {
+            this.localStorage.removeItem("tour-"+this.id+"-test-automatic");
         }
+        this.automatic = automatic;
 
-        // redirect to begin of the tour
         if (this.path) {
-            var path = this.path.split('?');
-            window.location.href = path[0] + "?tutorial."+this.id+"=true" + path.slice(1, path.length).join("?");
-            return;
+            // redirect to begin of the tour in function of the language
+            if (!this.testUrl(this.path+"(#.*)?$")) {
+                var path = this.path.split('#');
+                window.location.href = "/"+this.getLang()+path[0] + "#tutorial."+this.id+"=true&" + path.slice(1, path.length).join("#");
+                return;
+            }
         }
 
         var self = this;
@@ -125,12 +98,13 @@ website.Tour = openerp.Class.extend({
         website.Tour.waitReady.call(this, function () {self._running();});
     },
     running: function () {
-        if (+this.localStorage.getItem("tour-"+this.id+"-test") >= this.steps.length) {
+        var self = this;
+        if (+this.localStorage.getItem("tour-"+this.id+"-test") >= this.steps.length-1) {
             this.endTour();
             return;
         }
 
-        if (website.Tour.is_busy() || !this.testUrl()) return;
+        if (website.Tour.is_busy()) return;
 
         // launch tour with url
         this.checkRunningUrl();
@@ -138,22 +112,32 @@ website.Tour = openerp.Class.extend({
         // mark tour as busy (only one test running)
         if (this.localStorage.getItem("tour-"+this.id+"-test") != null) {
             website.Tour.busy = true;
+            this.automatic = !!this.localStorage.getItem("tour-"+this.id+"-test-automatic");
+        }
+
+        if (!this.testPathUrl()) {
+            if (this.automatic) {
+                this.timer = setTimeout(function () {
+                    self.reset();
+                    throw new Error("Wrong url for running " + self.id
+                        + '\ntestPath: ' + self.testPath
+                        + '\nhref: ' + window.location.href
+                        + "\nreferrer: " + document.referrer
+                    );
+                },this.defaultOverLaps);
+            }
+            return;
         }
 
         var self = this;
         website.Tour.waitReady.call(this, function () {self._running();});
     },
-
     _running: function () {
         var stepId = this.localStorage.getItem("tour-"+this.id+"-test");
-        var automatic = !!this.localStorage.getItem("tour-"+this.id+"-test-automatic");
-        
+
         if (stepId != null) {
-            if (!this.check(this.step(stepId))) {
-                var step = this.next(stepId);
-                stepId = step ? step.stepId : stepId;
-            }
-            this.nextStep(stepId,  automatic ? this.autoNextStep : null, automatic ? 5000 : null);
+            this.registerTour();
+            this.nextStep(stepId,  this.automatic ? this.autoNextStep : null, this.automatic ? this.defaultOverLaps : null);
         }
     },
 
@@ -174,30 +158,51 @@ website.Tour = openerp.Class.extend({
         $('.popover.tour').remove();
     },
 
-    testUrl: function () {
-        return !this.testPath || this.testPath.test(window.location.href);
+    getLang: function () {
+        return $("html").attr("lang").replace(/-/, '_');
+    },
+    testUrl: function (url) {
+        return new RegExp("(/"+this.getLang()+")?"+url, "i").test(window.location.href);
+    },
+    testPathUrl: function () {
+        if (!this.testPath || this.testUrl(this.testPath)) return true;
     },
     checkRunningUrl: function () {
-        if (window.location.search.indexOf("tutorial."+this.id+"=true") > -1) {
+        if (window.location.hash.indexOf("tutorial."+this.id+"=true") > -1) {
             this.localStorage.setItem("tour-"+this.id+"-test", 0);
-            window.location.href = window.location.href.replace(/tutorial.+=true&?/, '');
+            window.location.hash = window.location.hash.replace(/tutorial.+=true&?/, '');
         }
     },
 
+    registerTour: function () {
+        this.tour = new Tour({
+            name: this.id,
+            storage: this.tourStorage,
+            keyboard: false,
+            template: this.popover(),
+            onHide: function () {
+                window.scrollTo(0, 0);
+            }
+        });
+        this.registerSteps();
+    },
     registerSteps: function () {
         for (var index=0, len=this.steps.length; index<len; index++) {
             var step = this.steps[index];
             step.stepId = step.stepId || ""+index;
 
-            if (!step.waitNot && index > 0 && $(this.steps[index-1].template).has("button[data-role='next']").size()) {
-                step.waitNot = '.popover.tour';
+            if (!step.waitNot && index > 0 && this.steps[index-1] &&
+                this.steps[index-1].popover && this.steps[index-1].popover.next) {
+                step.waitNot = '.popover.tour:visible';
             }
             if (!step.waitFor && index > 0 && this.steps[index-1].snippet) {
                 step.waitFor = '.oe_overlay_options .oe_options:visible';
             }
 
-            step._title = step.title;
-            step.title = openerp.qweb.render('website.tour_popover_title', { title: step.title });
+            step._title = step._title || step.title;
+            step.title = this.popoverTitle({ title: step._title });
+            step.template = step.template || this.popover( step.popover );
+
             if (!step.element) step.orphan = true;
             if (step.snippet) {
                 step.element = '#oe_snippets div.oe_snippet[data-snippet-id="'+step.snippet+'"] .oe_snippet_thumbnail';
@@ -205,9 +210,10 @@ website.Tour = openerp.Class.extend({
 
         }
 
-        if ($(this.steps[index-1].template).has("button[data-role='next']").size()) {
+        if (this.steps[index-1] &&
+            this.steps[index-1].popover && this.steps[index-1].popover.next) {
             var step = {
-                stepId:    index,
+                stepId:    ""+index,
                 waitNot:   '.popover.tour:visible'
             };
             this.steps.push(step);
@@ -216,8 +222,21 @@ website.Tour = openerp.Class.extend({
         this.tour.addSteps(this.steps);
     },
 
+    popoverTitle: function (options) {
+        try {
+            return openerp.qweb.render('website.tour_popover_title', options);
+        } catch (e) {
+            if (!this.automatic) throw e;
+            return options.title;
+        }
+    },
     popover: function (options) {
-        return openerp.qweb.render('website.tour_popover', options);
+        try {
+            return openerp.qweb.render('website.tour_popover', options);
+        } catch (e) {
+            if (!this.automatic) throw e;
+            return "";
+        }
     },
 
     timer: null,
@@ -262,10 +281,23 @@ website.Tour = openerp.Class.extend({
                     self.nextStep(step.stepId, callback, overlaps);
                 }, self.defaultDelay);
             } else if (!overlaps || new Date().getTime() - time < overlaps) {
+                if (self.current.element) {
+                    var $popover = $(".popover.tour");
+                    if(!$(self.current.element).is(":visible")) {
+                        $popover.data("hide", true).fadeOut(300);
+                    } else if($popover.data("hide")) {
+                        $popover.data("hide", false).fadeIn(150);
+                    }
+                }
                 self.timer = setTimeout(checkNext, self.defaultDelay);
             } else {
                 self.reset();
-                throw new Error("Time overlaps to arrive to step " + step.stepId + ": '" + step._title + "'");
+                throw new Error("Time overlaps to arrive to step " + step.stepId + ": '" + step._title + "'"
+                    + '\nelement: ' + Boolean(!step.element || ($(step.element).size() && $(step.element).is(":visible") && !$(step.element).is(":hidden")))
+                    + '\nwaitNot: ' + Boolean(!step.waitNot || !$(step.waitNot).size())
+                    + '\nwaitFor: ' + Boolean(!step.waitFor || $(step.waitFor).size())
+                    + '\n\n' + $("body").html()
+                );
             }
         }
         checkNext();
@@ -288,7 +320,7 @@ website.Tour = openerp.Class.extend({
                 $(".popover.tour").remove();
                 // go to step in bootstrap tour
                 this.tour.goto(index);
-                if (step.callback) step.callback();
+                if (step.onload) step.onload();
                 next = steps.shift();
                 break;
             }
@@ -315,7 +347,11 @@ website.Tour = openerp.Class.extend({
         }
     },
     endTour: function () {
-        console.log('{ "event": "success" }');
+        if (parseInt(this.localStorage.getItem("tour-"+this.id+"-test"),10) >= this.steps.length-1) {
+            console.log('{ "event": "success" }');
+        } else {
+            console.log('{ "event": "canceled" }');
+        }
         this.reset();
     },
     autoNextStep: function () {
@@ -351,7 +387,10 @@ website.Tour = openerp.Class.extend({
             } else if (step.sampleText) {
             
                 $element.trigger($.Event("keydown", { srcElement: $element }));
-                if ($element.is("select") || $element.is("input") ) {
+                if ($element.is("input") ) {
+                    $element.val(step.sampleText);
+                } if ($element.is("select")) {
+                    $element.find("[value='"+step.sampleText+"'], option:contains('"+step.sampleText+"')").attr("selected", true);
                     $element.val(step.sampleText);
                 } else {
                     $element.html(step.sampleText);
@@ -397,7 +436,10 @@ website.Tour.busy = false;
 website.Tour.add = function (tour) {
     website.Tour.waitReady(function () {
         tour = tour.id ? tour : new tour();
-        website.Tour.tours[tour.id] = tour;
+        if (!website.Tour.tours[tour.id]) {
+            website.Tour.tours[tour.id] = tour;
+            tour.running();
+        }
     });
 };
 website.Tour.get = function (id) {
@@ -413,7 +455,7 @@ website.Tour.each = function (callback) {
 website.Tour.waitReady = function (callback) {
     var self = this;
     $(document).ready(function () {
-        if ($.ajaxBusy == null || $.ajaxBusy) {
+        if ($.ajaxBusy) {
             $(document).ajaxStop(function() {
                 setTimeout(function () {
                     callback.call(self);
@@ -428,18 +470,20 @@ website.Tour.waitReady = function (callback) {
     });
 };
 website.Tour.run_test = function (id) {
-    website.Tour.get(id).run(true);
+    website.Tour.waitReady(function () {
+        if (!website.Tour.is_busy()) {
+            website.Tour.tours[id].run(true);
+        }
+    });
 };
 website.Tour.is_busy = function () {
     for (var k in this.localStorage) {
         if (!k.indexOf("tour-")) {
-            return true;
+            return k;
         }
     }
     return website.Tour.busy;
 };
 
 
-
-
 }());
diff --git a/addons/website/static/src/js/website.tour.test.admin.js b/addons/website/static/src/js/website.tour.test.admin.js
new file mode 100644
index 00000000000..787f05beb23
--- /dev/null
+++ b/addons/website/static/src/js/website.tour.test.admin.js
@@ -0,0 +1,106 @@
+(function () {
+    'use strict';
+
+    var website = openerp.website;
+
+    website.Tour.LoginEdit = website.Tour.extend({
+        id: 'login_edit',
+        name: "Try to log as admin and check editor",
+        path: '/',
+        init: function () {
+            var self = this;
+            self.steps = [
+                {
+                    title:     "click login",
+                    element:   '#top_menu a[href*="/web/login"]',
+                },
+                {
+                    title:     "insert login",
+                    element:   '.oe_login_form input[name="login"]',
+                    sampleText: "admin",
+                },
+                {
+                    title:     "insert password",
+                    waitFor:   '.oe_login_form input[name="login"][value!=""]',
+                    element:   '.oe_login_form input[name="password"]',
+                    sampleText: "admin",
+                },
+                {
+                    title:     "select 2 Standard tickets",
+                    waitFor:   '.oe_login_form input[name="password"][value!=""]',
+                    element:   '.oe_login_form button',
+                },
+                {
+                    title:     "go back to website from backend",
+                    element:   'a[data-action-model="ir.actions.act_url"]:contains("Website")',
+                },
+                {
+                    title:     'try to edit',
+                    waitNot:   '#wrap .carousel',
+                    element:   'button[data-action=edit]:visible',
+                },
+                {
+                    title:     'check edit mode',
+                    waitFor:   'button[data-action=save]:visible',
+                },
+                {
+                    title:     'check branding',
+                    waitFor:   '#wrap[data-oe-model="ir.ui.view"]',
+                },
+                {
+                    title:     'check rte',
+                    waitFor:   '#oe_rte_toolbar',
+                },
+                {
+                    title:     'check insert block button',
+                    element:   '[data-action="snippet"]:visible',
+                },
+                {
+                    title:     'add snippets',
+                    snippet:   'carousel',
+                },
+                {
+                    title:     'try to save',
+                    waitFor:   '.oe_overlay_options .oe_options:visible',
+                    element:   'button[data-action=save]:visible',
+                },
+                {
+                    title:     'check saved',
+                    waitFor:   '#wrap div.carousel',
+                    element:   'button[data-action=edit]:visible',
+                },
+                {
+                    title:      'try to re-edit',
+                    waitFor:    'button[data-action=save]:visible',
+                    element:    '#wrap .carousel',
+                },
+                {
+                    title:      'remove snippet',
+                    element:    '.oe_snippet_remove',
+                },
+                {
+                    title:     'try to re-save',
+                    waitNot:   '#wrap .carousel',
+                    element:   'button[data-action=save]:visible',
+                },
+                {
+                    title:     "click admin",
+                    waitFor:   'button[data-action=edit]:visible',
+                    element:   'a:contains("Administrator")',
+                },
+                {
+                    title:     "click logout",
+                    element:   '#top_menu a[href*="/logout"]',
+                },
+                {
+                    title:     "check logout",
+                    waitFor:   '#top_menu a[href*="/web/login"]',
+                },
+            ];
+            return this._super();
+        },
+    });
+    // for test without editor bar
+    website.Tour.add(website.Tour.LoginEdit);
+
+}());
diff --git a/addons/website/static/src/js/website.tour.test.js b/addons/website/static/src/js/website.tour.test.js
new file mode 100644
index 00000000000..3e85ce20dae
--- /dev/null
+++ b/addons/website/static/src/js/website.tour.test.js
@@ -0,0 +1,34 @@
+(function () {
+
+function LoadScript(src) {
+    xmlHttp = new XMLHttpRequest();
+    xmlHttp.onreadystatechange = function() {
+        if(xmlHttp.readyState == 4) {
+            if (xmlHttp.status == 200 || xmlHttp.status == 304) {
+                new Function(xmlHttp.responseText)();
+            } else {
+                throw new Error("Can't load JavaScript.\nhref: " + window.location.href + "\nsrc: " + src);
+            }
+        }
+    };
+    xmlHttp.open("GET", src, false);
+    xmlHttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+    xmlHttp.send(null);
+}
+
+if (typeof jQuery === "undefined")
+    LoadScript("/web/static/lib/jquery/jquery.js");
+if (typeof _ === "undefined")
+    LoadScript("/web/static/lib/underscore/underscore.js");
+if (typeof openerp === "undefined") {
+    LoadScript("/web/static/lib/qweb/qweb2.js");
+    LoadScript("/web/static/src/js/openerpframework.js");
+}
+if (typeof openerp === "undefined" || !openerp.website || !openerp.website.add_template_file)
+    LoadScript("/website/static/src/js/website.js");
+if (typeof Tour === "undefined")
+    LoadScript("/website/static/lib/bootstrap-tour/bootstrap-tour.js");
+if (typeof openerp === "undefined" || !openerp.website.Tour)
+    LoadScript("/website/static/src/js/website.tour.js");
+
+})();
\ No newline at end of file
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 448c615bb07..1010ec05127 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -101,6 +101,7 @@
                         <button type="button" class="btn btn-primary btn-lg filepicker">
                             Upload an image from your computer
                         </button>
+                        <button type="button" class="btn btn-lg hidden wait" disabled="disabled"/>
                         <p class="text-muted mt16">— or —</p>
                     </div>
                     <div class="well">
@@ -110,11 +111,15 @@
                                placeholder="http://openerp.com"/>
                     </div>
                     <input type="hidden" name="func"/>
+                    <div class="help-block"/>
                 </form>
                 <div class="col-sm-4 image-preview-container">
                     <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAC0lEQVQIHWP4zwAAAgEBAMVfG14AAAAASUVORK5CYII%3D"
                          class="pull-right img-rounded image-preview"
                          width="100%"/>
+                    <img src="/web/static/src/img/throbber-large.gif"
+                         class="pull-right img-rounded wait hidden"
+                         width="100%"/>
                     <select class="form-control image-style">
                         <option value="">No styling</option>
                         <option value="img-rounded">Rounded corners</option>
@@ -135,8 +140,9 @@
                         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
                         <h3 class="modal-title">Select a Picture</h3>
                     </div>
-                    <div class="modal-body">
+                    <div class="modal-body has-error">
                         <div class="existing-attachments"/>
+                        <div class="help-block"/>
                     </div>
                     <div class="modal-footer">
                         <a href="#" data-dismiss="modal" aria-hidden="true">Discard</a>
@@ -152,12 +158,27 @@
                 <li class="next disabled"><a href="#">Next →</a></li>
             </ul>
             <div class="row mt16" t-foreach="rows" t-as="row">
-                <div class="col-sm-2" t-foreach="row" t-as="attachment">
+                <div class="col-sm-2 existing-attachment-cell"
+                     t-foreach="row" t-as="attachment">
+                    <i class="fa fa-times existing-attachment-remove" t-att-data-id="attachment.id"/>
                     <img t-att-src="attachment.website_url" t-att-alt="attachment.name" class="img img-responsive"/>
                 </div>
             </div>
         </div>
     </t>
+    <t t-name="website.editor.dialog.image.existing.error">
+        <div class="help-block">
+            <p>The image could not be deleted because it is used in the
+               following pages or views:</p>
+            <ul t-foreach="views" t-as="view">
+                <li>
+                    <a t-attf-href="/web#model=ir.ui.view&amp;id=#{view.id}">
+                        <t t-esc="view.name"/>
+                    </a> (id <t t-esc="view.id"/>)
+                </li>
+            </ul>
+        </div>
+    </t>
     <t t-name="website.editor.table.panel">
         <table class="editorbar-panel">
             <tr t-foreach="rows"><td t-foreach="cols">&#8203;</td></tr>
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index cf3996bdba4..ae109139e3c 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -15,43 +15,6 @@
             </div>
         </li>
     </t>
-    <t t-name="website.snippets_modal">
-        <div class="modal" id="oe_droperror" tabindex="-1" role="dialog">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal">&amp;times;</button>
-                        <h4 class="modal-title">
-                            Building Block Not Inserted
-                        </h4>
-                    </div>
-                    <div class="modal-body">
-                        <p>
-                            Please drop building blocks in a valid zone, like
-                            this one:
-                        </p>
-                        <div class="row">
-                            <div class="col-sm-4 col-sm-offset-4 oe_drop_zone_style text-center">
-                                <span class="mt16">drop in this zone</span>
-                            </div>
-                        </div>
-                        <div class="text-muted">
-                            <b>Tip:</b> when your cursor is in a valid zone,
-                            OpenERP shows you a preview of the building block
-                            in the page.  You must release the block when the
-                            preview is visible.
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-                        <div class="pull-left">
-                            <input type="checkbox" value="1"/> Never show this tip again
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </t>
 
     <t t-name="website.snippets">
         <div id='oe_snippets'></div>
@@ -83,11 +46,11 @@
     <div t-name="website.snippets.resize" data-snippet-id='resize'>
         <!-- custom data for the widget -->
         <div class='oe_handles'>
-            <div class='oe_handle n'></div>
-            <div class='oe_handle e'></div>
-            <div class='oe_handle w'></div>
-            <div class='oe_handle size'><div class="oe_handle_button size">Resize</div><div class="oe_border"/></div>
-            <div class='oe_handle s'></div>
+            <div class='oe_handle n'><div></div></div>
+            <div class='oe_handle e'><div></div></div>
+            <div class='oe_handle w'><div></div></div>
+            <div class='oe_handle size'><div class="oe_handle_button size">Resize</div></div>
+            <div class='oe_handle s'><div></div></div>
         </div>
         <div class='oe_snippet_thumbnail'>Margin resize</div>
     </div>
diff --git a/addons/website/static/src/xml/website.tour.xml b/addons/website/static/src/xml/website.tour.xml
index 1365ba08307..dcecef021bb 100644
--- a/addons/website/static/src/xml/website.tour.xml
+++ b/addons/website/static/src/xml/website.tour.xml
@@ -22,6 +22,6 @@
         </div>
     </t>
     <t t-name="website.tour_popover_title">
-        <t t-esc="title"/><button title="Close Tutorial" type="button" class="close" data-role="end">×</button>
+        <t t-esc="title"/><button title="End This Tutorial" type="button" class="close" data-role="end">×</button>
     </t>
 </templates>
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 5890350e2dc..4d9c9fcd73d 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -74,7 +74,7 @@
                     </div>
                     <div class="modal-body" t-if="message or backend_url">
                         <section>
-                            <t t-esc="message"/>
+                            <t t-raw="message"/>
                         </section>
                         <section class="mt32" t-if="backend_url">
                             <p>The web site has encountered an error.</p>
@@ -102,7 +102,7 @@
                         <h3 class="modal-title"><t t-esc="window_title"/></h3>
                     </div>
                     <div class="modal-body">
-                        <form class="form-horizontal" role="form">
+                        <form class="form-horizontal" role="form" t-att-id="id">
                         <div class="form-group mb0">
                             <label for="page-name" class="col-sm-3 control-label">
                                 <t t-esc="field_name"/>:
diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index 96484882577..19ba393cb4d 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -41,7 +41,7 @@ class WebsiteUiSuite(unittest.TestSuite):
     # timeout in seconds
     def __init__(self, testfile, options, timeout=60.0):
         self._testfile = testfile
-        self._timeout = timeout
+        self._timeout = timeout + 5.0
         self._options = options
         self._test = None
         self._ignore_filters = [
@@ -58,7 +58,6 @@ class WebsiteUiSuite(unittest.TestSuite):
         return iter([self])
 
     def run(self, result):
-        return
         # clean slate
         if sql_db._Pool is not None:
             sql_db._Pool.close_all(sql_db.dsn(tools.config['db_name']))
@@ -79,18 +78,21 @@ class WebsiteUiSuite(unittest.TestSuite):
             del result._exc_info_to_string
 
     def _run(self, result):
-        self._test = WebsiteUiTest(self._testfile)
+        self._test = WebsiteUiTest("%s (as %s)" %
+            (self._testfile, self._options.get('user') or "Anonymous" if 'user' in self._options else "admin" ))
         start_time = time.time()
         last_check_time = time.time()
 
         self._options['timeout'] = self._timeout
         self._options['port'] = tools.config.get('xmlrpc_port', 80)
         self._options['db'] = tools.config.get('db_name', '')
-        self._options['user'] = 'admin'
-        self._options['password'] = tools.config.get('admin_passwd', 'admin')
+        if 'user' not in self._options:
+            self._options['user'] = 'admin'
+            self._options['password'] = 'admin'
 
         phantom = subprocess.Popen([
             'phantomjs',
+            #'--debug=true',
             self._testfile,
             json.dumps(self._options)
         ], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
@@ -148,6 +150,7 @@ def full_path(pyfile, filename):
 
 def load_tests(loader, base, _):
     base.addTest(WebsiteUiSuite(full_path(__file__, 'dummy_test.js'), {}, 5.0))
+    #base.addTest(WebsiteUiSuite(full_path(__file__, 'login_test.js'), {'path': '/', 'user': None}, 60.0))
     base.addTest(WebsiteUiSuite(full_path(__file__, 'simple_dom_test.js'), {'redirect': '/page/website.homepage'}, 60.0))
     base.addTest(WebsiteUiSuite(full_path(__file__, 'homepage_test.js'), {'redirect': '/page/website.homepage'}, 60.0))
     return base
diff --git a/addons/website/tests/test_views.py b/addons/website/tests/test_views.py
index 8041a7e5f1c..1adb11712ec 100644
--- a/addons/website/tests/test_views.py
+++ b/addons/website/tests/test_views.py
@@ -13,8 +13,8 @@ class TestViewSaving(common.TransactionCase):
     def eq(self, a, b):
         self.assertEqual(a.tag, b.tag)
         self.assertEqual(a.attrib, b.attrib)
-        self.assertEqual(a.text, b.text)
-        self.assertEqual(a.tail, b.tail)
+        self.assertEqual((a.text or '').strip(), (b.text or '').strip())
+        self.assertEqual((a.tail or '').strip(), (b.tail or '').strip())
         for ca, cb in itertools.izip_longest(a, b):
             self.eq(ca, cb)
 
diff --git a/addons/website/tests/ui_suite/homepage_test.js b/addons/website/tests/ui_suite/homepage_test.js
index 2560e5af4d5..9c7375589a6 100644
--- a/addons/website/tests/ui_suite/homepage_test.js
+++ b/addons/website/tests/ui_suite/homepage_test.js
@@ -1,17 +1,3 @@
 var testRunner = require('./ui_test_runner.js');
 
-var waitFor = testRunner.waitFor;
-
-testRunner.run(function homepageTest (page, timeout) {
-    page.evaluate(function () { localStorage.clear(); });
-    waitFor(function clientReady () {
-        return page.evaluate(function () {
-            return window.$ && window.openerp && window.openerp.website
-                && window.openerp.website.Tour;
-        });
-    }, function executeTest () {
-        page.evaluate(function () {
-            window.openerp.website.Tour.run_test('banner');
-        });
-    }, timeout);
-});
+testRunner.run_test('banner');
\ No newline at end of file
diff --git a/addons/website/tests/ui_suite/login_test.js b/addons/website/tests/ui_suite/login_test.js
new file mode 100644
index 00000000000..3ac403e586d
--- /dev/null
+++ b/addons/website/tests/ui_suite/login_test.js
@@ -0,0 +1,7 @@
+var testRunner = require('./ui_test_runner.js');
+
+testRunner.run_test('login_edit', {
+        "inject": [
+            "./../../../website/static/src/js/website.tour.test.js",
+            "./../../../website/static/src/js/website.tour.test.admin.js"]
+    });
\ No newline at end of file
diff --git a/addons/website/tests/ui_suite/ui_test_runner.js b/addons/website/tests/ui_suite/ui_test_runner.js
index 507a8ca1e72..a8a9671c92f 100644
--- a/addons/website/tests/ui_suite/ui_test_runner.js
+++ b/addons/website/tests/ui_suite/ui_test_runner.js
@@ -19,10 +19,10 @@ function waitFor (ready, callback, timeout, timeoutMessageCallback) {
     }, 100);
 }
 
-function run (test) {
+function run (test, onload, inject) {
     var options = JSON.parse(phantom.args);
 
-    var timeout = options.timeout ? Math.round(parseFloat(options.timeout)*1000) : 60000;
+    var timeout = options.timeout ? Math.round(parseFloat(options.timeout)*1000-5000) : 60000;
 
     var scheme = options.scheme ? options.scheme+'://' : 'http://';
     var host = options.host ? options.host : 'localhost';
@@ -56,24 +56,52 @@ function run (test) {
     };
     page.onConsoleMessage = function(message) {
         console.log(message);
+        try {
+            var result = JSON.parse(message);
+            if (result.event === 'success') {
+                phantom.exit(0);
+            } else if (result.event === 'console') {
+                return;
+            } else {
+                phantom.exit(1);
+            }
+        } catch (exception) {
+            phantom.exit(1);
+        }
     };
 
     page.onCallback = function(data) {
         if (data.event && data.event === 'start') {
-            test(page, timeout);
+            if (test) test(page, timeout, options);
+        }
+    };
+    page.onLoadFinished = function(status) {
+        if (status === "success") {
+            if (inject) {
+                if (!inject instanceof Array) {
+                    inject = [inject];
+                }
+                for (var k in inject) {
+                    if(!page.injectJs(inject[k])) {
+                        console.log("Can't inject "+inject[k]);
+                        phantom.exit(1);
+                    }
+                }
+            }
+            if (onload) onload(page, timeout, options);
         }
     };
     
     var maxRetries = 10;
     var retryDelay = 1000; // ms
-    var tries = 0; 
+    var tries = 0;
     page.open(url, function openPage (status) {
         if (status !== 'success') {
             tries++;
             if (tries < maxRetries) {
-            	setTimeout(function () {
-            		page.open(url, openPage);
-            	}, retryDelay);
+                setTimeout(function () {
+                    page.open(url, openPage);
+                }, retryDelay);
             } else {
                 console.log('{ "event": "error", "message": "'+url+' failed to load '+tries+' times ('+status+')"}');
                 phantom.exit(1);
@@ -85,9 +113,45 @@ function run (test) {
         }
 
     });
+
+    setTimeout(function () {
+        page.evaluate(function (timeout) {
+            var message = ("Timeout after " +(timeout/1000)+ " s"
+                + "\nhref: " + window.location.href
+                + "\nreferrer: " + document.referrer
+                + "\n\n" + document.body.innerHTML).replace(/[^a-z0-9\s~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/gi, "*");
+            console.log(JSON.stringify({ "event": "error", "message": message}));
+            phantom.exit(1);
+        },timeout);
+    }, timeout);
+}
+
+function run_test (testname, options) {
+    options = options || {};
+    run(
+        function start (page, timeout) {
+            page.evaluate(function () { localStorage.clear(); });
+        },
+        function onload (page, timeout) {
+            waitFor(function clientReady () {
+                return page.evaluate(function () {
+                    return window.$
+                        && window.openerp
+                        && window.openerp.website
+                        && window.openerp.website.Tour;
+                });
+            }, function executeTest () {
+                page.evaluate(function (testname) {
+                    window.openerp.website.Tour.run_test(testname);
+                }, testname);
+            }, timeout);
+        },
+        options.inject || null
+    );
 }
 
 module.exports = {
     waitFor: waitFor,
-    run: run
+    run: run,
+    run_test: run_test
 }
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 2012340dea1..ff3d65dc459 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -34,11 +34,13 @@
                 <div class="item image_text active" style="background-image: url('/website/static/src/img/banner/color_splash.jpg')">
                     <div class="container">
                         <div class="carousel-caption content">
-                            <h2>Your Banner Title</h2>
-                            <h3>Click to customize this text</h3>
-                            <p>
-                                <a href="/page/website.contactus" class="btn btn-success btn-large">Contact us</a>
-                            </p>
+                            <div>
+                                <h2>Your Banner Title</h2>
+                                <h3>Click to customize this text</h3>
+                                <p>
+                                    <a href="/page/website.contactus" class="btn btn-success btn-large">Contact us</a>
+                                </p>
+                            </div>
                         </div>
                         <img class="carousel-image hidden-xs" src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image"/>
                     </div>
@@ -182,15 +184,6 @@
     </div>
 
 
-    <div data-snippet-id="hr" data-selector-children=".oe_structure, [data-oe-type=html]">
-        <div class="oe_snippet_thumbnail">
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_separator.png"/>
-            <span class="oe_snippet_thumbnail_title">Separator</span>        
-        </div>
-        <hr class="oe_snippet_body"/>
-    </div>
-
-
     <div data-snippet-id="big-picture" data-selector-children=".oe_structure, [data-oe-type=html]">
         <div class="oe_snippet_thumbnail">
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_big_picture.png"/>
@@ -372,6 +365,15 @@
         </div>
     </div>
 
+
+    <div data-snippet-id="hr" data-selector-children=".oe_structure, [data-oe-type=html]">
+        <div class="oe_snippet_thumbnail">
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_separator.png"/>
+            <span class="oe_snippet_thumbnail_title">Separator</span>        
+        </div>
+        <hr class="oe_snippet_body"/>
+    </div>
+
 </div>
 
 <div id="snippet_feature" class="tab-pane fade">
@@ -790,7 +792,7 @@
             </ul>
         </li>
         <section class="oe_snippet_body parallax"
-                style="height: 320px; background-image: url('/website/static/src/img/banner/mountains.jpg')"
+                style="background-image: url('/website/static/src/img/banner/mountains.jpg')"
                 data-scroll-background-ratio="0.3">
                 <div><div class="oe_structure"/></div>
         </section>
@@ -802,10 +804,9 @@
             <span class="oe_snippet_thumbnail_title">Parallax Slider</span>        
         </div>
         <section class="oe_snippet_body parallax" data-snippet-id="parallax"
-                 style="height: 320px; background-image: url('/website/static/src/img/parallax/quote.png')"
+                 style="background-image: url('/website/static/src/img/parallax/quote.png')"
                 data-scroll-background-ratio="0.3">
-            <div>
-                <div class="oe_structure">
+            <div><div><div class="oe_structure">
                     <div id="myQuoteCarousel" class="carousel quotecarousel slide mb0" data-snippet-id="slider">
                         <!-- Indicators -->
                         <ol class="carousel-indicators mb0">
@@ -852,8 +853,7 @@
                             </div>
                         </div>
                     </div>
-                </div>
-            </div>
+            </div></div></div>
         </section>
     </div>
 
@@ -903,7 +903,7 @@
     </div>
 
     <div data-snippet-style-id='background' data-selector="section, section[data-snippet-id='parallax'], div[data-snippet-id='carousel'], div[data-snippet-id='slider']">
-        <li class="dropdown-submenu">
+        <li class="dropdown-submenu" data-required="true">
             <a tabindex="-1" href="#">Background</a>
             <ul class="dropdown-menu">
                 <li class="dropdown-submenu">
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index c288dbacb93..a8ed626866d 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -69,7 +69,6 @@
             <script type="text/javascript" src="/web/static/lib/underscore/underscore.js"></script>
             <script type="text/javascript" src="/web/static/lib/underscore.string/lib/underscore.string.js"></script>
             <script type="text/javascript" src="/web/static/lib/jquery/jquery.js"></script>
-            <script type="text/javascript" src="/website/static/lib/bootstrap/js/bootstrap.js"></script>
             <script type="text/javascript">
                 // Bootstrap and jQuery UI conflicts
                 $.fn.bstooltip = $.fn.tooltip;
@@ -80,7 +79,9 @@
             <script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script>
 
             <script type="text/javascript" src="/website/static/src/js/website.js"></script>
+            
             <script t-if="not translatable" type="text/javascript" src="/website/static/src/js/website.snippets.animation.js"></script>
+            <script type="text/javascript" src="/website/static/lib/bootstrap/js/bootstrap.js"></script>
 
             <t t-raw="head or ''" name='layout_head'/>
         </head>
@@ -140,8 +141,8 @@
                                     <li><a href="/page/website.contactus">Contact us</a></li>
                                 </ul>
                                 <ul class="list-unstyled">
-                                    <li><i class="fa fa-phone"></i> <span t-field="res_company.phone"></span></li>
-                                    <li><i class="fa fa-envelope"></i>  <span t-field="res_company.email"></span></li>
+                                    <li t-ignore="true"><i class="fa fa-phone"></i> <span t-field="res_company.phone"></span></li>
+                                    <li t-ignore="true"><i class="fa fa-envelope"></i>  <span t-field="res_company.email"></span></li>
                                 </ul>
                                 <h2>
                                     <a t-att-href="website.social_facebook" t-if="website.social_facebook"><i class="fa fa-facebook-square"/></a>
@@ -221,7 +222,35 @@
 </template>
 
 <template id="editor_head" inherit_id="website.layout" name="Editor" groups="base.group_website_publisher">
-    <xpath expr='//t[@name="layout_head"]' position="before">
+    <xpath expr="//body" position="attributes">
+        <attribute name="style">padding-top: 51px;</attribute>
+    </xpath>
+    <xpath expr="//body" position="inside">
+        <div id="website-top-navbar-placeholder" class="navbar navbar-inverse navbar-fixed-top hidden-xs">
+            <div class="navbar-header">
+                <form class="navbar-form navbar-left">
+                    <button type="button" class="btn btn-primary">Edit</button>
+                </form>
+            </div>
+            <div class="collapse navbar-collapse navbar-edit-collapse">
+                <ul class="nav navbar-nav navbar-right">
+                    <li><a href="#" onclick="return false;"><i class="fa fa-mobile" title="Mobile preview"/></a></li>
+                    <li class="divider-vertical"/>
+                    <li><a href="#" onclick="return false;"><span title="Promote page on the web">Promote</span></a></li>
+                    <li class="dropdown">
+                        <a href="#" onclick="return false;">Content <span class="caret"/></a>
+                    </li>
+                    <li class="dropdown">
+                        <a href="#" onclick="return false;">Customize <span class="caret"/></a>
+                    </li>
+                    <li class="dropdown">
+                        <a href="#" onclick="return false;">Help <span class="caret"/></a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </xpath>
+    <xpath expr='//script[@src="/website/static/lib/bootstrap/js/bootstrap.js"]' position="before">
         <link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
         <link rel='stylesheet' href='/website/static/src/css/editor.css'/>
         <link rel='stylesheet' href='/website/static/lib/bootstrap-tour/bootstrap-tour.css'/>
@@ -233,16 +262,18 @@
 
         <script type="text/javascript" src="/web/static/lib/select2/select2.js"></script>
         <script type="text/javascript" src="/web/static/lib/ckeditor/ckeditor.js"></script>
-        <script type="text/javascript" src="/website/static/lib/bootstrap-tour/bootstrap-tour.js"></script>
         <script t-if="not translatable" type="text/javascript" src="/website/static/lib/ace/ace.js"></script>
         <script type="text/javascript" src="/website/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"></script>
         <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
+        <script type="text/javascript" src="/website/static/lib/bootstrap-tour/bootstrap-tour.js"></script>
         <!-- mutation observers shim backed by mutation events (8 < IE < 11, Safari < 6, FF < 14, Chrome < 17) -->
         <script type="text/javascript" src="/website/static/lib//jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js"></script>
         <script type="text/javascript" src="/website/static/lib/MutationObservers/test/sidetable.js"></script>
         <script type="text/javascript" src='/website/static/lib/nearest/jquery.nearest.js'></script>
         <script type="text/javascript" src="/website/static/lib/MutationObservers/MutationObserver.js"></script>
 
+        <script type="text/javascript" src="/website/static/lib/jquery.placeholder/jquery.placeholder.js"></script>
+
         <script type="text/javascript" src="/website/static/src/js/website.editor.js"></script>
         <script type="text/javascript" src="/website/static/src/js/website.editor.newpage.js" groups="base.group_website_designer"></script>
         <script type="text/javascript" src="/website/static/src/js/website.menu.js" groups="base.group_website_designer"></script>
@@ -256,6 +287,13 @@
     </xpath>
 </template>
 
+<template id="debugger" inherit_option_id="website.layout" name="Debugger &amp; Tests">
+    <xpath expr='//t[@name="layout_head"]' position="after">
+        <script type="text/javascript" src="/website/static/src/js/website.tour.test.js"></script>
+        <script type="text/javascript" src="/website/static/src/js/website.tour.test.admin.js"></script>
+    </xpath>
+</template>
+
 <template id="login_layout" inherit_id="web.login_layout" name="Website Login Layout">
     <xpath expr="t" position="replace">
         <t t-call="website.layout">
@@ -348,13 +386,13 @@
 <template id="pager" name="Pager">
     <ul t-if="pager['page_count'] > 1" t-attf-class="#{ classname or '' } pagination" t-att-style="style or ''">
         <li t-att-class=" 'disabled' if pager['page']['num'] == 1 else '' ">
-            <a t-att-href=" pager['page_previous']['url'] if pager['page']['num'] != 1 else '' ">Prev</a>
+            <a t-att-href=" pager['page_previous']['url'] if pager['page']['num'] != 1 else ''">Prev</a>
         </li>
         <t t-foreach="pager['pages']" t-as="page">
             <li t-att-class=" 'active' if page['num'] == pager['page']['num'] else '' "> <a t-att-href="page['url']" t-raw="page['num']"></a></li>
         </t>
         <li t-att-class=" 'disabled' if pager['page']['num'] == pager['page_count'] else '' ">
-            <a t-att-href=" pager['page_next']['url'] if pager['page']['num'] != pager['page_count'] else '' ">Next</a>
+            <a t-att-href="pager['page_next']['url'] if pager['page']['num'] != pager['page_count'] else ''">Next</a>
         </li>
     </ul>
 </template>
@@ -638,10 +676,9 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
 
 <template id="company_description" name="Company Description">
     <address>
-        <div t-field="res_company.name">Name</div>
-        <br />
-        <div><i class="fa fa-phone"/> <span t-field="res_company.phone"/></div>
-        <div><i class="fa fa-envelope"/> <span t-field="res_company.email"/></div>
+        <div t-field="res_company.partner_id" t-field-options='{
+                "widget": "contact",
+                "fields": ["name", "address", "phone", "mobile", "fax", "email"]}'/>
     </address>
      <a t-att-href="res_company.google_map_link()" target="_BLANK">
         <img class="thumbnail img-responsive" t-att-src="res_company.google_map_img()" />
@@ -668,7 +705,7 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
                 </div>
                 <div class="col-md-4 mb32">
                     <div groups="base.group_website_publisher" t-ignore="true" class="pull-right css_editable_mode_hidden" t-att-style="style or ''">
-                        <a class="btn btn-primary" t-att-href="'/web#return_label=Website&amp;model=%s&amp;id=%s' % (res_company._name, res_company.id)" title='Edit in backend'>Edit</a>
+                        <a class="btn btm-sm btn-default" t-att-href="'/web#return_label=Website&amp;model=%s&amp;id=%s' % (res_company._name, res_company.id)">Change address</a>
                     </div>
                     <t t-call="website.company_description"/>
                 </div>
diff --git a/addons/website_blog/data/website_blog_data.xml b/addons/website_blog/data/website_blog_data.xml
index 4eb70186d52..a5a3aa3d8c9 100644
--- a/addons/website_blog/data/website_blog_data.xml
+++ b/addons/website_blog/data/website_blog_data.xml
@@ -20,7 +20,7 @@
         <record id="action_open_website" model="ir.actions.act_url">
             <field name="name">Website Blogs</field>
             <field name="target">self</field>
-            <field name="url" eval="'/blog/'+str(ref('website_blog.blog_blog_1'))+'/?tutorial.blog=true'"/>
+            <field name="url" eval="'/blog/'+str(ref('website_blog.blog_blog_1'))+'/#tutorial.blog=true'"/>
         </record>
         <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_open_website"/>
diff --git a/addons/website_blog/static/description/index.html b/addons/website_blog/static/description/index.html
index 7ca5b48ae55..3f44eea9b4d 100644
--- a/addons/website_blog/static/description/index.html
+++ b/addons/website_blog/static/description/index.html
@@ -22,7 +22,7 @@
 				translated in mutiple languages in just a few clicks.
 			</p>
             <div class="oe_centeralign oe_websiteonly">
-                <a href="http://www.openerp.com/start?app=website_sale" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> online store</a>
+                <a href="http://www.openerp.com/start?app=website_blog" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> online store</a>
             </div>
         </div>
     </div>
diff --git a/addons/website_blog/static/src/css/website_blog.css b/addons/website_blog/static/src/css/website_blog.css
index 96045adb914..f7355ce783d 100644
--- a/addons/website_blog/static/src/css/website_blog.css
+++ b/addons/website_blog/static/src/css/website_blog.css
@@ -1,5 +1,4 @@
-@charset "utf-8";
-@import url(compass/css3.css);
+@charset "UTF-8";
 .css_website_mail .has-error {
   border-color: red;
 }
diff --git a/addons/website_blog/static/src/js/website.tour.blog.js b/addons/website_blog/static/src/js/website.tour.blog.js
index 1bd9f22fa31..e76e793dfda 100644
--- a/addons/website_blog/static/src/js/website.tour.blog.js
+++ b/addons/website_blog/static/src/js/website.tour.blog.js
@@ -2,114 +2,115 @@
     'use strict';
 
     var website = openerp.website;
+    var _t = openerp._t;
 
     website.EditorBar.include({
         start: function () {
-            this.registerTour(new website.BlogTour(this));
+            this.registerTour(new website.Tour.Blog(this));
             return this._super();
         },
     });
 
-    website.BlogTour = website.Tour.extend({
+    website.Tour.Blog = website.Tour.extend({
         id: 'blog',
         name: "Create a blog post",
-        testPath: /\/(blog|blogpost)\/[0-9]+\//,
-        init: function (editor) {
+        testPath: '/(blog|blogpost)',
+        init: function () {
             var self = this;
             self.steps = [
                 {
-                    title:     "New Blog Post",
-                    content:   "Let's go through the first steps to write beautiful blog posts.",
-                    template:  self.popover({ next: "Start Tutorial", end: "Skip" }),
+                    title:     _t("New Blog Post"),
+                    content:   _t("Let's go through the first steps to write beautiful blog posts."),
+                    popover:   { next: _t("Start Tutorial"), end: _t("Skip") },
                 },
                 {
                     element:   '#content-menu-button',
                     placement: 'left',
-                    title:     "Add Content",
-                    content:   "Create new pages, blogs, menu items and products through the <em>'Content'</em> menu.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("Add Content"),
+                    content:   _t("Use this <em>'Content'</em> menu to create a new blog post like any other document (page, menu, products, event, ...)."),
+                    popover:   { fixed: true },
                 },
                 {
                     element:   'a[data-action=new_blog_post]',
                     placement: 'left',
-                    title:     "New Blog Post",
-                    content:   "Select this menu item to create a new blog post.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("New Blog Post"),
+                    content:   _t("Select this menu item to create a new blog post."),
+                    popover:   { fixed: true },
                 },
                 {
-                    element:   '.modal button.btn-primary',
-                    placement: 'bottom',
-                    title:     "Create Blog Post",
-                    content:   "Click <em>Continue</em> to create the blog post.",
+                    element:   '.modal:has(#editor_new_blog) button.btn-primary',
+                    placement: 'right',
+                    title:     _t("Create Blog Post"),
+                    content:   _t("Click <em>Continue</em> to create the blog post."),
                 },
                 {
-                    waitNot:   '.modal',
-                    title:     "Blog Post Created",
-                    content:   "This is your new blog post. Let's edit it.",
-                    template:  self.popover({ next: "Continue" }),
+                    waitFor:   'body:has(button[data-action=save]:visible):has(.js_blog)',
+                    title:     _t("Blog Post Created"),
+                    content:   _t("This is your new blog post. Let's edit it."),
+                    popover:   { next: _t("Continue") },
                 },
                 {
                     element:   'h1[data-oe-expression="blog_post.name"]',
                     placement: 'bottom',
                     sampleText: 'New Blog',
-                    title:     "Set a Title",
-                    content:   "Click on this area and set a catchy title for your blog post.",
+                    title:     _t("Set a Title"),
+                    content:   _t("Click on this area and set a catchy title for your blog post."),
                 },
                 {
                     waitNot:   '#wrap h1[data-oe-model="blog.post"]:contains("Blog Post Title")',
                     element:   'button[data-action=snippet]',
-                    placement: 'bottom',
-                    title:     "Layout Your Blog Post",
-                    content:   "Use well designed building blocks to structure the content of your blog. Click 'Insert Blocks' to add new content.",
-                    template:  self.popover({ fixed: true }),
+                    placement: 'left',
+                    title:     _t("Layout Your Blog Post"),
+                    content:   _t("Use well designed building blocks to structure the content of your blog. Click 'Insert Blocks' to add new content."),
+                    popover:   { fixed: true },
                 },
                 {
                     snippet:   'image-text',
                     placement: 'bottom',
-                    title:     "Drag & Drop a Block",
-                    content:   "Drag the <em>'Image-Text'</em> block and drop it in your page.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("Drag & Drop a Block"),
+                    content:   _t("Drag this block and drop it in your page."),
+                    popover:   { fixed: true },
                 },
                 {
                     element:   'button[data-action=snippet]',
                     placement: 'bottom',
-                    title:     "Add Another Block",
-                    content:   "Let's add another block to your post.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("Add Another Block"),
+                    content:   _t("Let's add another block to your post."),
+                    popover:   { fixed: true },
                 },
                 {
                     snippet:   'text-block',
                     placement: 'bottom',
-                    title:     "Drag & Drop a block",
-                    content:   "Drag the <em>'Text Block'</em> block and drop it below the image block.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("Drag & Drop a block"),
+                    content:   _t("Drag this block and drop it below the image block."),
+                    popover:   { fixed: true },
                 },
                 {
                     element:   '.oe_active .oe_snippet_remove',
                     placement: 'top',
-                    title:     "Delete the Title",
-                    content:   "From this toolbar you can move, duplicate or delete the selected zone. Click on the garbage can image to delete the title.",
+                    title:     _t("Delete the block"),
+                    content:   _t("From this toolbar you can move, duplicate or delete the selected zone. Click on the garbage can image to delete the block. Or click on the Title and delete it."),
                 },
                 {
                     waitNot:   '.oe_active .oe_snippet_remove:visible',
                     element:   'button[data-action=save]',
                     placement: 'right',
-                    title:     "Save Your Blog",
-                    content:   "Click the <em>Save</em> button to record changes on the page.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("Save Your Blog"),
+                    content:   _t("Click the <em>Save</em> button to record changes on the page."),
+                    popover:   { fixed: true },
                 },
                 {
                     waitFor:   'button[data-action=edit]:visible',
                     element:   'button.btn-danger.js_publish_btn',
                     placement: 'top',
-                    title:     "Publish Your Post",
-                    content:   "Your blog post is not yet published. You can update this draft version and publish it once you are ready.",
+                    title:     _t("Publish Your Post"),
+                    content:   _t("Your blog post is not yet published. You can update this draft version and publish it once you are ready."),
                 },
                 {
                     waitFor:   '.js_publish_management button.js_publish_btn.btn-success:visible',
                     title:     "Thanks!",
-                    content:   "This tutorial is finished. To discover more features, improve the content of this page and try the <em>Promote</em> button in the top right menu.",
-                    template:  self.popover({ end: "Close Tutorial" }),
+                    content:   _t("This tutorial is finished. To discover more features, improve the content of this page and try the <em>Promote</em> button in the top right menu."),
+                    popover:   { next: _t("Close Tutorial") },
                 },
             ];
             return this._super();
diff --git a/addons/website_blog/static/src/js/website_blog.editor.js b/addons/website_blog/static/src/js/website_blog.editor.js
index 1626015ea1c..1c5deef56f7 100644
--- a/addons/website_blog/static/src/js/website_blog.editor.js
+++ b/addons/website_blog/static/src/js/website_blog.editor.js
@@ -2,6 +2,7 @@
     "use strict";
 
     var website = openerp.website;
+    var _t = openerp._t;
     website.add_template_file('/website_blog/static/src/xml/website_blog.xml');
 
     website.is_editable = true;
@@ -16,7 +17,8 @@
             'click a[data-action=new_blog_post]': function (ev) {
                 ev.preventDefault();
                 website.prompt({
-                    window_title: "New Blog Post",
+                    id: "editor_new_blog",
+                    window_title: _t("New Blog Post"),
                     select: "Select Blog",
                     init: function (field) {
                         return website.session.model('blog.blog')
diff --git a/addons/website_blog/tests/ui_suite/post_test.js b/addons/website_blog/tests/ui_suite/post_test.js
index f8d729bee0b..1152ab1da55 100644
--- a/addons/website_blog/tests/ui_suite/post_test.js
+++ b/addons/website_blog/tests/ui_suite/post_test.js
@@ -1,17 +1,3 @@
 var testRunner = require('../../../website/tests/ui_suite/ui_test_runner.js');
 
-var waitFor = testRunner.waitFor;
-
-testRunner.run(function blogTest (page, timeout) {
-    page.evaluate(function () { localStorage.clear(); });
-    waitFor(function clientReady () {
-        return page.evaluate(function () {
-            return window.$ && window.openerp && window.openerp.website
-                && window.openerp.website.Tour;
-        });
-    }, function executeTest () {
-        page.evaluate(function () {
-            window.openerp.website.Tour.run_test('blog');
-        });
-    }, timeout);
-});
\ No newline at end of file
+testRunner.run_test('blog');
\ No newline at end of file
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index e7e0b4ec9ff..2a6e1d134e3 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -203,7 +203,9 @@ class website_event(http.Controller):
     def add_event(self, event_name="New Event", **kwargs):
         return self._add_event(event_name, request.context, **kwargs)
 
-    def _add_event(self, event_name="New Event", context={}, **kwargs):
+    def _add_event(self, event_name=None, context={}, **kwargs):
+        if not event_name:
+            event_name = _("New Event")
         Event = request.registry.get('event.event')
         date_begin = datetime.today() + timedelta(days=(14))
         vals = {
diff --git a/addons/website_event/static/src/js/website.tour.event.js b/addons/website_event/static/src/js/website.tour.event.js
index c449c4209d1..a9e40a5f65b 100644
--- a/addons/website_event/static/src/js/website.tour.event.js
+++ b/addons/website_event/static/src/js/website.tour.event.js
@@ -2,6 +2,7 @@
     'use strict';
 
     var website = openerp.website;
+    var _t = openerp._t;
 
     website.EditorBar.include({
         start: function () {
@@ -13,98 +14,98 @@
     website.EventTour = website.Tour.extend({
         id: 'event',
         name: "Create an event",
-        testPath: /\/event\/[0-9]+\/register/,
+        testPath: '/event(/[0-9]+/register)?',
         init: function (editor) {
             var self = this;
             self.steps = [
                 {
-                    title:     "Create an Event",
-                    content:   "Let's go through the first steps to publish a new event.",
-                    template:  self.popover({ next: "Start Tutorial", end: "Skip It" }),
+                    title:     _t("Create an Event"),
+                    content:   _t("Let's go through the first steps to publish a new event."),
+                    popover:   { next: _t("Start Tutorial"), end: _t("Skip It") },
                 },
                 {
                     element:   '#content-menu-button',
                     placement: 'left',
-                    title:     "Add Content",
-                    content:   "The <em>Content</em> menu allows you to create new pages, events, menus, etc.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("Add Content"),
+                    content:   _t("The <em>Content</em> menu allows you to create new pages, events, menus, etc."),
+                    popover:   { fixed: true },
                 },
                 {
                     element:   'a[data-action=new_event]',
                     placement: 'left',
-                    title:     "New Event",
-                    content:   "Click here to create a new event.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("New Event"),
+                    content:   _t("Click here to create a new event."),
+                    popover:   { fixed: true },
                 },
                 {
-                    element:   '.modal:contains("New Event") input[type=text]',
+                    element:   '.modal #editor_new_event input[type=text]',
                     sampleText: 'Advanced Technical Training',
                     placement: 'right',
-                    title:     "Create an Event Name",
-                    content:   "Create a name for your new event and click <em>'Continue'</em>. e.g: Technical Training",
+                    title:     _t("Create an Event Name"),
+                    content:   _t("Create a name for your new event and click <em>'Continue'</em>. e.g: Technical Training"),
                 },
                 {
                     waitNot:   '.modal input[type=text]:not([value!=""])',
                     element:   '.modal button.btn-primary',
                     placement: 'right',
-                    title:     "Create Event",
-                    content:   "Click <em>Continue</em> to create the event.",
+                    title:     _t("Create Event"),
+                    content:   _t("Click <em>Continue</em> to create the event."),
                 },
                 {
-                    waitFor:   '#website-top-navbar button[data-action="save"]:visible',
-                    title:     "New Event Created",
-                    content:   "This is your new event page. We will edit the event presentation page.",
-                    template:  self.popover({ next: "Continue" }),
+                    waitFor:   'body:has(button[data-action=save]:visible):has(.js_event)',
+                    title:     _t("New Event Created"),
+                    content:   _t("This is your new event page. We will edit the event presentation page."),
+                    popover:   { next: _t("Continue") },
                 },
                 {
                     element:   'button[data-action=snippet]',
                     placement: 'bottom',
-                    title:     "Layout your event",
-                    content:   "Insert blocks to layout the body of your event.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("Layout your event"),
+                    content:   _t("Insert blocks to layout the body of your event."),
+                    popover:   { fixed: true },
                 },
                 {
                     snippet:   'image-text',
                     placement: 'bottom',
-                    title:     "Drag & Drop a block",
-                    content:   "Drag the 'Image-Text' block and drop it in your page.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("Drag & Drop a block"),
+                    content:   _t("Drag the 'Image-Text' block and drop it in your page."),
+                    popover:   { fixed: true },
                 },
                 {
                     
                     element:   'button[data-action=snippet]',
                     placement: 'bottom',
-                    title:     "Layout your event",
-                    content:   "Insert another block to your event.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("Layout your event"),
+                    content:   _t("Insert another block to your event."),
+                    popover:   { fixed: true },
                 },
                 {
                     snippet:   'text-block',
                     placement: 'bottom',
-                    title:     "Drag & Drop a block",
-                    content:   "Drag the 'Text Block' in your event page.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("Drag & Drop a block"),
+                    content:   _t("Drag the 'Text Block' in your event page."),
+                    popover:   { fixed: true },
                 },
                 {
                     element:   'button[data-action=save]',
                     placement: 'right',
-                    title:     "Save your modifications",
-                    content:   "Once you click on save, your event is updated.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("Save your modifications"),
+                    content:   _t("Once you click on save, your event is updated."),
+                    popover:   { fixed: true },
                 },
                 {
                     waitFor:   'button[data-action=edit]:visible',
                     element:   'button.btn-danger.js_publish_btn',
                     placement: 'top',
-                    title:     "Publish your event",
-                    content:   "Click to publish your event.",
+                    title:     _t("Publish your event"),
+                    content:   _t("Click to publish your event."),
                 },
                 {
                     waitFor:   '.js_publish_management button.js_publish_btn.btn-success:visible',
                     element:   '.js_publish_management button[data-toggle="dropdown"]',
                     placement: 'left',
-                    title:     "Customize your event",
-                    content:   "Click here to customize your event further.",
+                    title:     _t("Customize your event"),
+                    content:   _t("Click here to customize your event further."),
                 },
                 {
                     element:   '.js_publish_management ul>li>a:last:visible',
diff --git a/addons/website_event/static/src/js/website_event.editor.js b/addons/website_event/static/src/js/website_event.editor.js
index 056d6ed37e4..ac81be7ec36 100644
--- a/addons/website_event/static/src/js/website_event.editor.js
+++ b/addons/website_event/static/src/js/website_event.editor.js
@@ -2,6 +2,7 @@
     "use strict";
 
     var website = openerp.website;
+    var _t = openerp._t;
     website.add_template_file('/website_event/static/src/xml/website_event.xml');
 
     website.is_editable = true;
@@ -16,7 +17,8 @@
             'click a[data-action=new_event]': function (ev) {
                 ev.preventDefault();
                 website.prompt({
-                    window_title: "New Event",
+                    id: "editor_new_event",
+                    window_title: _t("New Event"),
                     input: "Event Name",
                 }).then(function (event_name) {
                     website.form('/event/add_event', 'POST', {
diff --git a/addons/website_event/tests/ui_suite/event_test.js b/addons/website_event/tests/ui_suite/event_test.js
index 12110e11546..946427b6b6d 100644
--- a/addons/website_event/tests/ui_suite/event_test.js
+++ b/addons/website_event/tests/ui_suite/event_test.js
@@ -1,17 +1,3 @@
 var testRunner = require('../../../website/tests/ui_suite/ui_test_runner.js');
 
-var waitFor = testRunner.waitFor;
-
-testRunner.run(function eventTest (page, timeout) {
-    page.evaluate(function () { localStorage.clear(); });
-    waitFor(function clientReady () {
-        return page.evaluate(function () {
-            return window.$ && window.openerp && window.openerp.website
-                && window.openerp.website.Tour;
-        });
-    }, function executeTest () {
-        page.evaluate(function () {
-            window.openerp.website.Tour.run_test('event');
-        });
-    }, timeout);
-});
+testRunner.run_test('event');
\ No newline at end of file
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 00469b7ce31..6c26ce3f026 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -66,7 +66,7 @@
                                     </t>
                                 </div>
                                 <div>
-                                    <i class="fa fa-clock-o"></i> <span t-field="event.date_begin"> </span> <i>to</i> <span t-field="event.date_end"> </span>
+                                    <i class="fa fa-clock-o"></i> <span t-field="event.date_begin" t-field-options='{"hide_seconds":"True"}'> </span> <i>to</i> <span t-field="event.date_end" t-field-options='{"hide_seconds":"True"}'> </span>
                                 </div>
                                 <div t-field="event.address_id" t-field-options='{
                                     "widget": "contact",
@@ -233,8 +233,8 @@
         <div class="container">
             <h1 class="text-center" t-field="event.name"></h1>
             <h4 class="text-center text-muted">
-                <i class="fa fa-clock-o"></i> <span t-field="event.date_begin"/> to
-                <span t-field="event.date_end"/>
+                <i class="fa fa-clock-o"></i> <span t-field="event.date_begin" t-field-options='{"hide_seconds":"True"}'/> to
+                <span t-field="event.date_end" t-field-options='{"hide_seconds":"True"}'/>
             </h4>
             <h4 class="text-center text-muted"
                 t-field="event.address_id" t-field-options='{
@@ -278,7 +278,7 @@
                         <t t-raw="comment.body"/>
                         <small class="pull-right muted text-right">
                             <div t-field="comment.author_id"/>
-                            <div t-field="comment.date"/>
+                            <div t-field="comment.date" t-field-options='{"hide_seconds":"True"}'/>
                         </small>
                     </div>
                 </li>
@@ -307,8 +307,8 @@
                     <h4>When</h4>
                 </div>
                 <div class="panel-body">
-                    <i class="fa fa-clock-o"></i> from <span t-field="event.date_begin"> </span><br/>
-                    <i class="fa fa-clock-o"></i> to <span t-field="event.date_end"> </span>
+                    <i class="fa fa-clock-o"></i> From <span t-field="event.date_begin" t-field-options='{"hide_seconds":"True"}'> </span><br/>
+                    <i class="fa fa-clock-o"></i> To <span t-field="event.date_end" t-field-options='{"hide_seconds":"True"}'> </span>
                 </div>
             </div>
 
diff --git a/addons/website_event_sale/static/src/js/website.tour.event_sale.js b/addons/website_event_sale/static/src/js/website.tour.event_sale.js
new file mode 100644
index 00000000000..7991831400c
--- /dev/null
+++ b/addons/website_event_sale/static/src/js/website.tour.event_sale.js
@@ -0,0 +1,80 @@
+(function () {
+    'use strict';
+
+    var website = openerp.website;
+
+    website.Tour.EventSaleTest = website.Tour.extend({
+        id: 'event_buy_tickets',
+        name: "Try to buy tickets for event",
+        path: '/event',
+        testPath: '/(event|shop)',
+        init: function () {
+            var self = this;
+            self.steps = [
+                {
+                    title:     "select event",
+                    element:   'a[href*="/event"]:contains("Open Days in Los Angeles")',
+                },
+                {
+                    title:     "go to register page",
+                    waitNot:   'a[href*="/event"]:contains("Functional Webinar")',
+                    onload:   function () {
+                        // use onload if website_event_track is installed
+                        if (!$('form:contains("Ticket Type")').size()) {
+                            window.location.href = $('a[href*="/event"][href*="/register"]').attr("href");
+                        }
+                    },
+                },
+                {
+                    title:     "select 2 Standard tickets",
+                    element:   'select[name="ticket-1"]',
+                    sampleText: '2',
+                },
+                {
+                    title:     "select 3 VIP tickets",
+                    waitFor:   'select[name="ticket-1"] option:contains(2):selected',
+                    element:   'select[name="ticket-2"]',
+                    sampleText: '3',
+                },
+                {
+                    title:     "Order Now",
+                    waitFor:   'select[name="ticket-2"] option:contains(3):selected',
+                    element:   'button.btn-primary:contains("Order Now")',
+                },
+                {
+                    title:     "Complete checkout",
+                    waitFor:   '#top_menu .my_cart_quantity:contains(5)',
+                    element:   'form[action="/shop/confirm_order/"] button',
+                    onload: function (tour) {
+                        if ($("input[name='name']").val() === "")
+                            $("input[name='name']").val("website_sale-test-shoptest");
+                        if ($("input[name='email']").val() === "")
+                            $("input[name='email']").val("website_event_sale_test_shoptest@websiteeventsaletest.optenerp.com");
+                        $("input[name='phone']").val("123");
+                        $("input[name='street']").val("123");
+                        $("input[name='city']").val("123");
+                        $("input[name='zip']").val("123");
+                        $("select[name='country_id']").val("21");
+                    },
+                },
+                {
+                    title:     "select payment",
+                    element:   '#payment_method label:has(img[title="transfer"]) input',
+                },
+                {
+                    title:     "Pay Now",
+                    waitFor:   '#payment_method label:has(input:checked):has(img[title="transfer"])',
+                    element:   '.oe_sale_acquirer_button button[name="submit"]:visible',
+                },
+                {
+                    title:     "finish",
+                    waitFor:   '.oe_website_sale:contains("Thank you for your order")',
+                }
+            ];
+            return this._super();
+        },
+    });
+    // for test without editor bar
+    website.Tour.add(website.Tour.EventSaleTest);
+
+}());
diff --git a/addons/website_event_sale/tests/__init__.py b/addons/website_event_sale/tests/__init__.py
new file mode 100644
index 00000000000..bf8ba6321ad
--- /dev/null
+++ b/addons/website_event_sale/tests/__init__.py
@@ -0,0 +1 @@
+import test_ui
diff --git a/addons/website_event_sale/tests/test_ui.py b/addons/website_event_sale/tests/test_ui.py
new file mode 100644
index 00000000000..1e5d727de92
--- /dev/null
+++ b/addons/website_event_sale/tests/test_ui.py
@@ -0,0 +1,10 @@
+import openerp.addons.website.tests.test_ui as test_ui
+
+def load_tests(loader, base, _):
+    base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_event_sale_test.js'),
+        {'redirect': '/page/website.homepage'}))
+    base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_event_sale_test.js'),
+        {'redirect': '/page/website.homepage', 'user': 'demo', 'password': 'demo'}))
+    base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_event_sale_test.js'),
+        {'path': '/', 'user': None}))
+    return base
\ No newline at end of file
diff --git a/addons/website_event_sale/tests/ui_suite/website_event_sale_test.js b/addons/website_event_sale/tests/ui_suite/website_event_sale_test.js
new file mode 100644
index 00000000000..6662c6a2a55
--- /dev/null
+++ b/addons/website_event_sale/tests/ui_suite/website_event_sale_test.js
@@ -0,0 +1,7 @@
+var testRunner = require('../../../website/tests/ui_suite/ui_test_runner.js');
+
+testRunner.run_test('event_buy_tickets', {
+        "inject": [
+            "./../../../website/static/src/js/website.tour.test.js",
+            "./../../../website_event_sale/static/src/js/website.tour.event_sale.js"]
+    });
\ No newline at end of file
diff --git a/addons/website_event_sale/views/website_event_sale.xml b/addons/website_event_sale/views/website_event_sale.xml
index aa56a5542ac..c3e08031ddb 100644
--- a/addons/website_event_sale/views/website_event_sale.xml
+++ b/addons/website_event_sale/views/website_event_sale.xml
@@ -2,6 +2,13 @@
 <openerp>
 <data>
 
+<template id="debugger" inherit_id="website.debugger" name="Event Debugger">
+    <xpath expr="//script[last()]" position="after">
+        <script type="text/javascript" src="/website_event_sale/static/src/js/website.tour.event_sale.js"></script>
+    </xpath>
+</template>
+
+
 <template id="index" inherit_id="website_event.index" name="Event's Ticket">
     <xpath expr="//li[@t-foreach='event_ids']/div/h4" position="before">
         <t t-if="event.state in ['draft', 'confirm'] and event.event_ticket_ids">
diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py
index e99318f1ced..cfba63cfc6b 100644
--- a/addons/website_event_track/models/event.py
+++ b/addons/website_event_track/models/event.py
@@ -59,6 +59,7 @@ class event_track_location(osv.osv):
 
 class event_track(osv.osv):
     _name = "event.track"
+    _description = 'Event Tracks'
     _order = 'priority, date'
     _inherit = ['mail.thread', 'ir.needaction_mixin', 'website.seo.metadata']
 
diff --git a/addons/website_event_track/security/event.xml b/addons/website_event_track/security/event.xml
index 56ca1ff5ec1..52f8e3c7286 100644
--- a/addons/website_event_track/security/event.xml
+++ b/addons/website_event_track/security/event.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <record id="event_track_public" model="ir.rule">
             <field name="name">event tracks: Public</field>
             <field name="model_id" ref="website_event_track.model_event_track"/>
             <field name="domain_force">[('website_published', '=', True)]</field>
-            <field name="groups" eval="[(4, ref('base.group_public')), (4, ref('base.group_portal')), (4, ref('base.group_user'))]"/>
+            <field name="groups" eval="[(4, ref('base.group_public')), (4, ref('base.group_portal'))]"/>
             <field name="perm_read" eval="True"/>
             <field name="perm_write" eval="False"/>
             <field name="perm_create" eval="False"/>
diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml
index 14ed725ba5b..65aa7610ec3 100644
--- a/addons/website_event_track/views/website_event.xml
+++ b/addons/website_event_track/views/website_event.xml
@@ -152,7 +152,7 @@
                                 <t t-esc="speaker.name"/>, 
                             </t>
                         </li>
-                        <li class="text-muted fa fa-calendar"> <span t-field="track.date"/></li>
+                        <li class="text-muted fa fa-calendar"> <span t-field="track.date" t-field-options='{"hide_seconds":"True"}'/></li>
                         <li class="text-muted fa fa-map-marker" t-if="track.location_id">
                             <span t-field="track.location_id"/>
                         </li>
@@ -197,7 +197,8 @@
             <h2 t-field="track.name" class="text-center"/>
             <h3 t-field="event.name" class="text-center text-muted"/>
             <ul t-if="track.tag_ids" class="text-center text-muted list-inline">
-                <li t-foreach="track.tag_ids" t-as="tag_id" class="fa fa-tags">
+                <li t-foreach="track.tag_ids" t-as="tag_id">
+                    <span class="fa fa-tags"></span>
                     <a t-attf-href="/event/#{ slug(event) }/track/tag/#{ slug(tag_id) }">
                         <span t-field="tag_id.name"/>
                     </a>
@@ -229,7 +230,7 @@
                         </div>
                         <div class="panel-body">
                             <b>Date</b><br/>
-                            <span t-field="track.date"/><br/>
+                            <span t-field="track.date" t-field-options='{"hide_seconds":"True"}'/><br/>
                             <b>Duration</b><br/>
                             <span t-field="track.duration"/> minutes<br/>
                             <b>Location</b><br/>
diff --git a/addons/website_hr_recruitment/controllers/main.py b/addons/website_hr_recruitment/controllers/main.py
index c50bc6a0428..8140a39dc9b 100644
--- a/addons/website_hr_recruitment/controllers/main.py
+++ b/addons/website_hr_recruitment/controllers/main.py
@@ -7,7 +7,6 @@ from openerp.tools.translate import _
 from openerp.addons.web.http import request
 
 class website_hr_recruitment(http.Controller):
-
     @http.route([
         '/jobs',
         '/jobs/department/<model("hr.department"):department>',
@@ -61,27 +60,48 @@ class website_hr_recruitment(http.Controller):
 
     @http.route(['/jobs/apply/<model("hr.job"):job>'], type='http', auth="public", website=True, multilang=True)
     def jobs_apply(self, job):
-        return request.website.render("website_hr_recruitment.apply", { 'job': job })
+        error = {}
+        default = {}
+        if 'website_hr_recruitment_error' in request.session:
+            error = request.session.pop('website_hr_recruitment_error')
+            default = request.session.pop('website_hr_recruitment_default')
+        return request.website.render("website_hr_recruitment.apply", { 'job': job, 'error': error, 'default': default})
 
     @http.route(['/jobs/thankyou'], methods=['POST'], type='http', auth="public", website=True, multilang=True)
     def jobs_thankyou(self, **post):
         cr, uid, context = request.cr, request.uid, request.context
         imd = request.registry['ir.model.data']
-        value = {
-            'name': _('Online Form'),
-            'user_id': False,
-            'source_id' : imd.xmlid_to_res_id(cr, SUPERUSER_ID, 'hr_recruitment.source_website_company'),
-        }
-        for f in ['phone', 'email_from', 'partner_name', 'description', 'department_id', 'job_id']:
-            value[f] = post.get(f)
 
-        job_id = request.registry['hr.applicant'].create(cr, SUPERUSER_ID, value, context=context)
+        error = {}
+        for field_name in ["partner_name", "phone", "email_from"]:
+            if not post.get(field_name):
+                error[field_name] = 'missing'
+        if error:
+            request.session['website_hr_recruitment_error'] = error
+            ufile = post.pop('ufile')
+            if ufile:
+                error['ufile'] = 'reset'
+            request.session['website_hr_recruitment_default'] = post
+            return request.redirect('/jobs/apply/%s' % post.get("job_id"))
+
+        value = {
+            'source_id' : imd.xmlid_to_res_id(cr, SUPERUSER_ID, 'hr_recruitment.source_website_company'),
+            'name': '%s\'s Application' % post.get('partner_name'), 
+        }
+        for f in ['email_from', 'partner_name', 'description']:
+            value[f] = post.get(f)
+        for f in ['department_id', 'job_id']:
+            value[f] = int(post.get(f) or 0)
+        # Retro-compatibility for saas-3. "phone" field should be replace by "partner_phone" in the template in trunk.
+        value['partner_phone'] = post.pop('phone', False)
+
+        applicant_id = request.registry['hr.applicant'].create(cr, SUPERUSER_ID, value, context=context)
         if post['ufile']:
             attachment_value = {
                 'name': post['ufile'].filename,
                 'res_name': value['partner_name'],
                 'res_model': 'hr.applicant',
-                'res_id': job_id,
+                'res_id': applicant_id,
                 'datas': base64.encodestring(post['ufile'].read()),
                 'datas_fname': post['ufile'].filename,
             }
diff --git a/addons/website_hr_recruitment/static/description/index.html b/addons/website_hr_recruitment/static/description/index.html
index 1a56da0e82c..7af603b64dc 100644
--- a/addons/website_hr_recruitment/static/description/index.html
+++ b/addons/website_hr_recruitment/static/description/index.html
@@ -51,14 +51,14 @@
 <section class="oe_container">
     <div class="oe_row">
         <h2 class="oe_slogan">Post Your Jobs on Best Job Boards</h2>
-        <h3 class="oe_slogan">LinkedIn, Monster, Kraigslist, Careerbuilder,...</h3>
+        <h3 class="oe_slogan">LinkedIn, Monster, Craigslist, Careerbuilder,...</h3>
         <div class="oe_span6">
             <img class="oe_picture oe_screenshot" src="jobs3.png">
         </div>
         <div class="oe_span6">
            <p class='oe_mt32'>
                 Connect automatically to most famous job board websites;
-                linkedIn, Monster, Kraigslist, ... Every job position has a new
+                linkedIn, Monster, Craigslist, ... Every job position has a new
                 email address automatically assigned to route applications
                 automatically to the right job position.
            </p><p>
diff --git a/addons/website_hr_recruitment/views/templates.xml b/addons/website_hr_recruitment/views/templates.xml
index 3e057d249f2..9dab6c6accc 100644
--- a/addons/website_hr_recruitment/views/templates.xml
+++ b/addons/website_hr_recruitment/views/templates.xml
@@ -161,34 +161,35 @@
                         <form class="form-horizontal mt32" action="/jobs/thankyou" method="post" enctype="multipart/form-data">
                             <input type="hidden" t-att-value="job and job.department_id.id or False" name="department_id"/>
                             <input type="hidden" t-att-value="job and job.id or False" name="job_id"/>
-                            <div class="form-group">
+                            <div t-attf-class="form-group #{error.get('partner_name') and 'has-error' or ''}">
                                 <label class="col-md-3 col-sm-4 control-label" for="partner_name">Your Name</label>
                                 <div class="col-md-7 col-sm-8">
-                                    <input type="text" class="form-control" name="partner_name" required="True" />
+                                    <input type="text" t-att-value="default.get('partner_name')" class="form-control" name="partner_name" required="True"/>
                                 </div>
                             </div>
-                            <div class="form-group">
+                            <div t-attf-class="form-group #{error.get('email_from') and 'has-error' or ''}">
                                 <label class="col-md-3 col-sm-4 control-label" for="email_from">Your Email</label>
                                 <div class="col-md-7 col-sm-8">
-                                    <input type="email" class="form-control" name="email_from" required="True" />
+                                    <input type="email" t-att-value="default.get('email_from')" class="form-control" name="email_from" required="True"/>
                                 </div>
                             </div>
-                            <div class="form-group">
+                            <div t-attf-class="form-group #{error.get('phone') and 'has-error' or ''}">
                                 <label class="col-md-3 col-sm-4 control-label" for="phone">Your Phone</label>
                                 <div class="col-md-7 col-sm-8">
-                                    <input type="text" class="form-control" name="phone" required="True" />
+                                    <input type="text" t-att-value="default.get('phone')" class="form-control" name="phone" required="True"/>
                                 </div>
                             </div>
                             <div class="form-group">
                                 <label class="col-md-3 col-sm-4 control-label" for="description">Short Introduction</label>
                                 <div class="col-md-7 col-sm-8">
-                                    <textarea  class="form-control" name="description" style="min-height: 120px"/>
+                                    <textarea  class="form-control" t-esc="default.get('description')" name="description" style="min-height: 120px"/>
                                 </div>
                             </div>
                             <div class="form-group">
                                 <label class="col-md-3 col-sm-4 control-label" for="ufile">Resume</label>
                                 <div class="col-md-7 col-sm-8">
                                     <input class="input-file" id="fileInput" type="file" name="ufile"/>
+                                    <span t-if="error.get('ufile')">Please send again your resume.</span>
                                 </div>
                             </div>
                             <div class="form-group">
diff --git a/addons/website_livechat/__openerp__.py b/addons/website_livechat/__openerp__.py
index 0ab7781b7ab..5220fc47bb6 100644
--- a/addons/website_livechat/__openerp__.py
+++ b/addons/website_livechat/__openerp__.py
@@ -12,10 +12,7 @@ OpenERP Website LiveChat
     'depends': ['website', 'im_livechat'],
     'installable': True,
     'data': [
-        'views/website_livechat.xml'
+        'views/website_livechat.xml',
+        'views/res_config.xml'
     ],
-    'demo': [ ],
-    'js': [],
-    'qweb': [],
-    'css': [],
 }
diff --git a/addons/website_livechat/models/website.py b/addons/website_livechat/models/website.py
index 7e86042a67a..3e3df1c5bdc 100644
--- a/addons/website_livechat/models/website.py
+++ b/addons/website_livechat/models/website.py
@@ -5,4 +5,11 @@ class website(osv.osv):
 
     _columns = {
         'channel_id': fields.many2one('im_livechat.channel', string="Channel"),
-    }
\ No newline at end of file
+    }
+
+class website_config_settings(osv.osv_memory):
+    _inherit = 'website.config.settings'
+
+    _columns = {
+        'channel_id': fields.related('website_id', 'channel_id', type='many2one', relation='im_livechat.channel', string='Live Chat Channel'),
+    }
diff --git a/addons/website_livechat/views/res_config.xml b/addons/website_livechat/views/res_config.xml
new file mode 100644
index 00000000000..ac69929ca63
--- /dev/null
+++ b/addons/website_livechat/views/res_config.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    <record id="view_website_config_settings" model="ir.ui.view">
+        <field name="name">Website livechat settings</field>
+        <field name="model">website.config.settings</field>
+        <field name="inherit_id" ref="website.view_website_config_settings"/>
+        <field name="arch" type="xml">
+            <xpath expr="//group[@string='Social Media']" position="inside">
+                <label for="channel_id"/>
+                <div name="channel_id">
+                    <div class="oe_inline">
+                        <field name="channel_id"/>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+    </data>
+</openerp>
diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml
index d4da07f2bf0..374e0d5dd16 100644
--- a/addons/website_livechat/views/website_livechat.xml
+++ b/addons/website_livechat/views/website_livechat.xml
@@ -2,22 +2,6 @@
 <openerp>
     <data>
 
-<record id="website_settings_livechat" model="ir.ui.view">
-    <field name="name">website.form</field>
-    <field name="model">website</field>
-    <field name="inherit_id" ref="website.view_website_form"/>
-    <field name="arch" type="xml">
-        <xpath expr="//div[@name='other']" position='before'>
-            <div name="livechat">
-                <separator string="LiveChat"/>
-                <group name="livechat">
-                    <field name="channel_id" widget="many2one"/>
-                </group>
-            </div>
-        </xpath>
-    </field>
-</record>
-
 <template id="header" inherit_id="website.layout" name="LiveChat Snippet">
     <xpath expr="//body" position="inside">
         <t t-if="website.channel_id">
diff --git a/addons/website_mail/controllers/email_designer.py b/addons/website_mail/controllers/email_designer.py
index 81bc703b702..3eb3c32ac96 100644
--- a/addons/website_mail/controllers/email_designer.py
+++ b/addons/website_mail/controllers/email_designer.py
@@ -7,7 +7,7 @@ from openerp.addons.web.http import request
 
 class WebsiteEmailDesigner(http.Controller):
 
-    @http.route('/website_mail/email_designer/<model("email.template"):template>/', type='http', auth="public", website=True, multilang=True)
+    @http.route('/website_mail/email_designer/<model("email.template"):template>/', type='http', auth="user", website=True, multilang=True)
     def index(self, template, **kw):
         values = {
             'template': template,
@@ -15,6 +15,6 @@ class WebsiteEmailDesigner(http.Controller):
         print template
         return request.website.render("website_mail.designer_index", values)
 
-    @http.route(['/website_mail/snippets'], type='json', auth="public", website=True)
+    @http.route(['/website_mail/snippets'], type='json', auth="user", website=True)
     def snippets(self):
         return request.website._render('website_mail.email_designer_snippets')
diff --git a/addons/website_mail/models/email_template.py b/addons/website_mail/models/email_template.py
index aed01c179f7..beb02739f29 100644
--- a/addons/website_mail/models/email_template.py
+++ b/addons/website_mail/models/email_template.py
@@ -19,9 +19,6 @@
 #
 ##############################################################################
 
-import lxml
-import urlparse
-
 from openerp.osv import osv, fields
 from openerp.tools.translate import _
 
@@ -39,52 +36,3 @@ class EmailTemplate(osv.Model):
             help='Link to the website',
         ),
     }
-
-    def _postprocess_html_replace_links(self, cr, uid, body_html, context=None):
-        """ Post-processing of body_html. Indeed the content generated by the
-        website builder contains references to local addresses, for example
-        for images. This method changes those addresses to absolute addresses. """
-        html = body_html
-        if not body_html:
-            return html
-
-        # form a tree
-        root = lxml.html.fromstring(html)
-        if not len(root) and root.text is None and root.tail is None:
-            html = '<div>%s</div>' % html
-            root = lxml.html.fromstring(html)
-
-        base_url = self.pool['ir.config_parameter'].get_param(cr, uid, 'web.base.url')
-        (base_scheme, base_netloc, bpath, bparams, bquery, bfragment) = urlparse.urlparse(base_url)
-
-        def _process_link(url):
-            new_url = url
-            (scheme, netloc, path, params, query, fragment) = urlparse.urlparse(url)
-            if not scheme and not netloc:
-                new_url = urlparse.urlunparse((base_scheme, base_netloc, path, params, query, fragment))
-            return new_url
-
-        # check all nodes, replace :
-        # - img src -> check URL
-        # - a href -> check URL
-        for node in root.iter():
-            if node.tag == 'a':
-                node.set('href', _process_link(node.get('href')))
-            elif node.tag == 'img' and not node.get('src', 'data').startswith('data'):
-                node.set('src', _process_link(node.get('src')))
-
-        html = lxml.html.tostring(root, pretty_print=False, method='html')
-        # this is ugly, but lxml/etree tostring want to put everything in a 'div' that breaks the editor -> remove that
-        if html.startswith('<div>') and html.endswith('</div>'):
-            html = html[5:-6]
-        return html
-
-    def create(self, cr, uid, values, context=None):
-        if 'body_html' in values:
-            values['body_html'] = self._postprocess_html_replace_links(cr, uid, values['body_html'], context=context)
-        return super(EmailTemplate, self).create(cr, uid, values, context=context)
-
-    def write(self, cr, uid, ids, values, context=None):
-        if 'body_html' in values:
-            values['body_html'] = self._postprocess_html_replace_links(cr, uid, values['body_html'], context=context)
-        return super(EmailTemplate, self).write(cr, uid, ids, values, context=context)
diff --git a/addons/website_mail/models/mail_message.py b/addons/website_mail/models/mail_message.py
index 308cf9da4b8..c708d9c3e33 100644
--- a/addons/website_mail/models/mail_message.py
+++ b/addons/website_mail/models/mail_message.py
@@ -28,13 +28,21 @@ class MailMessage(osv.Model):
 
     _columns = {
         'website_published': fields.boolean(
-            'Publish', help="Publish on the website as a blog"
+            'Published', help="Visible on the website as a comment"
         ),
     }
 
-    _defaults = {
-        'website_published': True,
-    }
+    def default_get(self, cr, uid, fields_list, context=None):
+        defaults = super(MailMessage, self).default_get(cr, uid, fields_list, context=context)
+
+        # Note: explicitly implemented in default_get() instead of _defaults,
+        # to avoid setting to True for all existing messages during upgrades.
+        # TODO: this default should probably be dynamic according to the model
+        # on which the messages are attached, thus moved to create().
+        if 'website_published' in fields_list:
+            defaults.setdefault('website_published', True)
+
+        return defaults
 
     def _search(self, cr, uid, args, offset=0, limit=None, order=None,
                 context=None, count=False, access_rights_uid=None):
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index b9119b486ff..ab2a921dd06 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -6,6 +6,8 @@ import werkzeug
 from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
+from openerp.tools.translate import _
+from openerp.addons.website.models.website import slug
 
 PPG = 20                        # Products Per Page
 PPR = 4                         # Products Per Row
@@ -142,8 +144,8 @@ class Ecommerce(http.Controller):
                 return key_val
         return False
 
-    @http.route(['/shop/filters/'], type='http', auth="public", website=True, multilang=True)
-    def filters(self, **post):
+    @http.route(['/shop/filters/'], type='http', auth="public", methods=['POST'], website=True, multilang=True)
+    def filters(self, category=None, **post):
         index = []
         filters = []
         for key, val in post.items():
@@ -168,25 +170,40 @@ class Ecommerce(http.Controller):
                     filters[index.index(cat_id)].append( cat[2] )
             post.pop(key)
 
-        return request.redirect("/shop/?filters=%s%s%s" % (
-                simplejson.dumps(filters),
-                post.get("search") and ("&search=%s" % post.get("search")) or "",
-                post.get("category") and ("&category=%s" % post.get("category")) or ""
-            ))
+        url = "/shop/"
+        if category:
+            category_obj = request.registry.get('product.public.category')
+            url = "%scategory/%s/" % (url, slug(category_obj.browse(request.cr, request.uid, int(category), context=request.context)))
+        if filters:
+            url = "%s?filters=%s" % (url, simplejson.dumps(filters))
+        if post.get("search"):
+            url = "%s%ssearch=%s" % (url, filters and "&" or "?", post.get("search"))
 
-    def attributes_to_ids(self, attributes):
-        obj = request.registry.get('product.attribute.line')
-        domain = []
+        return request.redirect(url)
+
+    def attributes_to_ids(self, cr, uid, attributes):
+        req = """
+                SELECT  product_tmpl_id as id, count(*) as nb_match
+                FROM    product_attribute_line
+                WHERE   1!=1
+            """
+        nb = 0
         for key_val in attributes:
-            domain.append(("attribute_id", "=", key_val[0]))
+            attribute_id = key_val[0]
             if isinstance(key_val[1], list):
-                domain.append(("value", ">=", key_val[1][0]))
-                domain.append(("value", "<=", key_val[1][1]))
+                req += " OR ( attribute_id = %s AND value >= %s AND value <= %s)" % \
+                        (attribute_id, key_val[1][0], key_val[1][1])
+                nb += 1
             else:
-                domain.append(("value_id", "in", key_val[1:]))
-        att_ids = obj.search(request.cr, request.uid, domain, context=request.context)
-        att = obj.read(request.cr, request.uid, att_ids, ["product_tmpl_id"], context=request.context)
-        return [r["product_tmpl_id"][0] for r in att]
+                for value_id in key_val[1:]:
+                    req += " OR ( attribute_id = %s AND value_id = %s)" % \
+                        (attribute_id, value_id)
+                    nb += 1
+
+        req += " GROUP BY product_tmpl_id"
+        cr.execute(req)
+        result = cr.fetchall()
+        return [id for id, nb_match in result if nb_match >= nb]
 
     @http.route(['/shop/pricelist'], type='http', auth="public", website=True, multilang=True)
     def shop_promo(self, promo=None, **post):
@@ -208,15 +225,24 @@ class Ecommerce(http.Controller):
                 ('name', 'ilike', search),
                 ('description', 'ilike', search)]
         if category:
-            domain.append(('product_variant_ids.public_categ_id', 'child_of', category.id))
+            domain.append(('product_variant_ids.public_categ_id', 'child_of', int(category)))
+            if isinstance(category, (int,str,unicode)):
+                category = request.registry.get('product.public.category').browse(cr, uid, int(category), context=context)
         if filters:
             filters = simplejson.loads(filters)
             if filters:
-                ids = self.attributes_to_ids(filters)
+                ids = self.attributes_to_ids(cr, uid, filters)
                 domain.append(('id', 'in', ids or [0]))
 
+        url = "/shop/"
         product_count = product_obj.search_count(cr, uid, domain, context=context)
-        pager = request.website.pager(url="/shop/", total=product_count, page=page, step=PPG, scope=7, url_args=post)
+        if search:
+            post["search"] = search
+        if filters:
+            post["filters"] = filters
+        if category:
+            url = "/shop/category/%s/" % slug(category)
+        pager = request.website.pager(url=url, total=product_count, page=page, step=PPG, scope=7, url_args=post)
 
         request.context['pricelist'] = self.get_pricelist()
 
@@ -243,11 +269,12 @@ class Ecommerce(http.Controller):
             'range': range,
             'search': {
                 'search': search,
-                'category': category and category.id,
+                'category': category and int(category),
                 'filters': filters,
             },
             'pager': pager,
             'styles': styles,
+            'category': category,
             'categories': categs,
             'Ecommerce': self,   # TODO fp: Should be removed
             'style_in_product': lambda style, product: style.id in [s.id for s in product.website_style_ids],
@@ -256,32 +283,26 @@ class Ecommerce(http.Controller):
 
     @http.route(['/shop/product/<model("product.template"):product>/'], type='http', auth="public", website=True, multilang=True)
     def product(self, product, search='', category='', filters='', **kwargs):
-        category_obj = request.registry.get('product.public.category')
-
-        category_ids = category_obj.search(request.cr, request.uid, [], context=request.context)
-        category_list = category_obj.name_get(request.cr, request.uid, category_ids, context=request.context)
-        category_list = sorted(category_list, key=lambda category: category[1])
-
         if category:
+            category_obj = request.registry.get('product.public.category')
             category = category_obj.browse(request.cr, request.uid, int(category), context=request.context)
 
         request.context['pricelist'] = self.get_pricelist()
 
         values = {
             'Ecommerce': self,
-            'category': category,
-            'category_list': category_list,
             'main_object': product,
             'product': product,
+            'category': category,
             'search': {
                 'search': search,
-                'category': category and str(category.id),
+                'category': category and int(category),
                 'filters': filters,
             }
         }
         return request.website.render("website_sale.product", values)
 
-    @http.route(['/shop/product/comment'], type='http', auth="public", methods=['POST'], website=True)
+    @http.route(['/shop/product/<int:product_template_id>/comment'], type='http', auth="public", methods=['POST'], website=True)
     def product_comment(self, product_template_id, **post):
         cr, uid, context = request.cr, request.uid, request.context
         if post.get('comment'):
@@ -294,7 +315,9 @@ class Ecommerce(http.Controller):
         return werkzeug.utils.redirect(request.httprequest.referrer + "#comments")
 
     @http.route(['/shop/add_product/'], type='http', auth="user", methods=['POST'], website=True, multilang=True)
-    def add_product(self, name="New Product", category=0, **post):
+    def add_product(self, name=None, category=0, **post):
+        if not name:
+            name = _("New Product")
         Product = request.registry.get('product.product')
         product_id = Product.create(request.cr, request.uid, {
             'name': name, 'public_categ_id': category
@@ -311,7 +334,7 @@ class Ecommerce(http.Controller):
         # must have a draft sale order with lines at this point, otherwise reset
         order = self.get_order()
         if order and order.state != 'draft':
-            request.registry['website'].sale_reset_order(cr, uid, context=context)
+            request.registry['website'].ecommerce_reset(cr, uid, context=context)
             return request.redirect('/shop/')
 
         self.get_pricelist()
@@ -409,12 +432,11 @@ class Ecommerce(http.Controller):
 
         partner = None
         public_id = request.registry['website'].get_public_user(cr, uid, context)
-        if not request.uid == public_id:
+        if request.uid != public_id:
             partner = orm_user.browse(cr, uid, uid, context).partner_id
         elif order.partner_id:
-            domain = [("active", "=", False), ("partner_id", "=", order.partner_id.id)]
-            user_ids = request.registry['res.users'].search(cr, SUPERUSER_ID, domain, context=context)
-            if not user_ids or public_id not in user_ids:
+            public_partner = orm_user.browse(cr, SUPERUSER_ID, public_id, context=context).partner_id.id
+            if public_partner != order.partner_id.id:
                 partner = orm_partner.browse(cr, SUPERUSER_ID, order.partner_id.id, context)
 
         if partner:
@@ -488,9 +510,8 @@ class Ecommerce(http.Controller):
         if request.uid != public_id:
             partner_id = orm_user.browse(cr, SUPERUSER_ID, uid, context=context).partner_id.id
         elif order.partner_id:
-            domain = [("active", "=", False), ("partner_id", "=", order.partner_id.id)]
-            user_ids = request.registry['res.users'].search(cr, SUPERUSER_ID, domain, context=context)
-            if not user_ids or public_id not in user_ids:
+            public_partner = orm_user.browse(cr, SUPERUSER_ID, public_id, context=context).partner_id.id
+            if public_partner != order.partner_id.id:
                 partner_id = order.partner_id.id
 
         if partner_id:
@@ -692,8 +713,8 @@ class Ecommerce(http.Controller):
          - UDPATE ME
         """
         cr, uid, context = request.cr, request.uid, request.context
-        email_act = None
         sale_order_obj = request.registry['sale.order']
+        email_act = None
 
         if transaction_id is None:
             tx = context.get('website_sale_transaction')
@@ -706,8 +727,10 @@ class Ecommerce(http.Controller):
             order = request.registry['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context)
             assert order.website_session_id == request.httprequest.session['website_session_id']
 
-        if not tx or not order:
+        if not order:
             return request.redirect('/shop/')
+        elif order.amount_total and not tx:
+            return request.redirect('/shop/mycart')
 
         if not order.amount_total or tx.state == 'done':
             # confirm the quotation
@@ -721,6 +744,16 @@ class Ecommerce(http.Controller):
             # cancel the quotation
             sale_order_obj.action_cancel(cr, SUPERUSER_ID, [order.id], context=request.context)
 
+        # send the email
+        if email_act and email_act.get('context'):
+            composer_values = {}
+            email_ctx = email_act['context']
+            public_id = request.registry['website'].get_public_user(cr, uid, context)
+            if uid == public_id:
+                composer_values['email_from'] = request.registry['res.users'].browse(cr, SUPERUSER_ID, public_id, context=context).company_id.email
+            composer_id = request.registry['mail.compose.message'].create(cr, SUPERUSER_ID, composer_values, context=email_ctx)
+            request.registry['mail.compose.message'].send_mail(cr, SUPERUSER_ID, [composer_id], context=email_ctx)
+
         # clean context and session, then redirect to the confirmation page
         request.registry['website'].ecommerce_reset(cr, uid, context=context)
 
diff --git a/addons/website_sale/data/website_sale_data.xml b/addons/website_sale/data/website_sale_data.xml
index 3658ea7bdc6..c2f9144d7e4 100644
--- a/addons/website_sale/data/website_sale_data.xml
+++ b/addons/website_sale/data/website_sale_data.xml
@@ -16,7 +16,7 @@
         <record id="action_open_website" model="ir.actions.act_url">
             <field name="name">Website Shop</field>
             <field name="target">self</field>
-            <field name="url">/shop?tutorial.shop=true</field>
+            <field name="url">/shop#tutorial.shop=true</field>
         </record>
         <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_open_website"/>
diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css
index d115ca37b90..2b23a4b4700 100644
--- a/addons/website_sale/static/src/css/website_sale.css
+++ b/addons/website_sale/static/src/css/website_sale.css
@@ -1,3 +1,4 @@
+@charset "utf-8";
 /* ---- Default Styles ---- */
 .oe_product {
   border: 1px solid rgba(100, 100, 100, 0.2);
@@ -52,7 +53,7 @@
   right: 0;
   bottom: 0;
   overflow: hidden;
-  padding: 0 15px;
+  padding: 0 15px 24px 0;
   max-height: 110px;
   min-height: 56px;
   border-top: 1px solid rgba(255, 255, 255, 0.2);
diff --git a/addons/website_sale/static/src/css/website_sale.sass b/addons/website_sale/static/src/css/website_sale.sass
index 9cf1f5dd012..55acac22ec1 100644
--- a/addons/website_sale/static/src/css/website_sale.sass
+++ b/addons/website_sale/static/src/css/website_sale.sass
@@ -47,7 +47,7 @@
         right: 0
         bottom: 0
         overflow: hidden
-        padding: 0 15px
+        padding: 0 15px 24px 0
         max-height: 110px
         min-height: 56px
         border-top: 1px solid rgba(255,255,255,0.2)
diff --git a/addons/website_sale/static/src/js/website.tour.sale.js b/addons/website_sale/static/src/js/website.tour.sale.js
new file mode 100644
index 00000000000..83696c4e3cb
--- /dev/null
+++ b/addons/website_sale/static/src/js/website.tour.sale.js
@@ -0,0 +1,95 @@
+(function () {
+    'use strict';
+
+    var website = openerp.website;
+
+    website.Tour.ShopTest = website.Tour.extend({
+        id: 'shop_buy_product',
+        name: "Try to buy products",
+        path: '/shop',
+        testPath: '/shop',
+        init: function () {
+            var self = this;
+            self.steps = [
+                {
+                    title:     "select ipod",
+                    element:   '.oe_product_cart a:contains("iPod")',
+                },
+                {
+                    title:     "select ipod 32Go",
+                    element:   'input[name="product_id"]:not([checked])',
+                },
+                {
+                    title:     "click on add to cart",
+                    waitFor:   'input[name="product_id"]:eq(1)[checked]',
+                    element:   'form[action="/shop/add_cart/"] button',
+                },
+                {
+                    title:     "add suggested",
+                    element:   'form[action="/shop/add_cart/"] button.btn-link:contains("Add to Cart")',
+                },
+                {
+                    title:     "add one more iPod",
+                    waitFor:   '.my_cart_quantity:contains(2)',
+                    element:   '#mycart_products tr:contains("iPod: 32 Gb") a.js_add_cart_json:eq(1)',
+                },
+                {
+                    title:     "remove Headphones",
+                    waitFor:   '#mycart_products tr:contains("iPod: 32 Gb") input.js_quantity[value=2]',
+                    element:   '#mycart_products tr:contains("Apple In-Ear Headphones") a.js_add_cart_json:first',
+                },
+                {
+                    title:     "set one iPod",
+                    waitNot:   '#mycart_products tr:contains("Apple In-Ear Headphones")',
+                    element:   '#mycart_products input.js_quantity',
+                    sampleText: '1',
+                },
+                {
+                    title:     "go to checkout",
+                    waitFor:   '#mycart_products input.js_quantity[value=1]',
+                    element:   'a[href="/shop/checkout/"]',
+                },
+                {
+                    title:     "test with input error",
+                    element:   'form[action="/shop/confirm_order/"] button',
+                    onload: function (tour) {
+                        $("input[name='phone']").val("");
+                    },
+                },
+                {
+                    title:     "test without input error",
+                    waitFor:   'form[action="/shop/confirm_order/"] .has-error',
+                    element:   'form[action="/shop/confirm_order/"] button',
+                    onload: function (tour) {
+                        if ($("input[name='name']").val() === "")
+                            $("input[name='name']").val("website_sale-test-shoptest");
+                        if ($("input[name='email']").val() === "")
+                            $("input[name='email']").val("website_sale_test_shoptest@websitesaletest.optenerp.com");
+                        $("input[name='phone']").val("123");
+                        $("input[name='street']").val("123");
+                        $("input[name='city']").val("123");
+                        $("input[name='zip']").val("123");
+                        $("select[name='country_id']").val("21");
+                    },
+                },
+                {
+                    title:     "select payment",
+                    element:   '#payment_method label:has(img[title="transfer"]) input',
+                },
+                {
+                    title:     "Pay Now",
+                    waitFor:   '#payment_method label:has(input:checked):has(img[title="transfer"])',
+                    element:   '.oe_sale_acquirer_button button[name="submit"]:visible',
+                },
+                {
+                    title:     "finish",
+                    waitFor:   '.oe_website_sale:contains("Thank you for your order")',
+                }
+            ];
+            return this._super();
+        },
+    });
+    // for test without editor bar
+    website.Tour.add(website.Tour.ShopTest);
+
+}());
diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website.tour.shop.js
index ebf5c9d00ec..24dd5fd2d66 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -2,238 +2,143 @@
     'use strict';
 
     var website = openerp.website;
+    var _t = openerp._t;
 
     website.EditorBar.include({
         start: function () {
-            this.registerTour(new website.EditorShopTour(this));
-            var res = this._super();
-            return res;
+            this.registerTour(new website.Tour.Shop(this));
+            return this._super();
         },
     });
 
-    website.EditorShopTour = website.Tour.extend({
+    website.Tour.Shop = website.Tour.extend({
         id: 'shop',
         name: "Create a product",
-        testPath: /\/shop\/.*/,
-        init: function (editor) {
+        testPath: '/shop',
+        init: function () {
             var self = this;
             self.steps = [
                 {
-                    title:     "Welcome to your shop",
-                    content:   "You successfully installed the e-commerce. This guide will help you to create your product and promote your sales.",
-                    template:  self.popover({ next: "Start Tutorial", end: "Skip It" }),
+                    title:     _t("Welcome to your shop"),
+                    content:   _t("You successfully installed the e-commerce. This guide will help you to create your product and promote your sales."),
+                    popover:   { next: _t("Start Tutorial"), end: _t("Skip It") },
                 },
                 {
                     element:   '#content-menu-button',
                     placement: 'left',
-                    title:     "Create your first product",
-                    content:   "Click here to add a new product.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("Create your first product"),
+                    content:   _t("Click here to add a new product."),
+                    popover:   { fixed: true },
                 },
                 {
                     element:   'a[data-action=new_product]',
                     placement: 'left',
-                    title:     "Create a new product",
-                    content:   "Select 'New Product' to create it and manage its properties to boost your sales.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("Create a new product"),
+                    content:   _t("Select 'New Product' to create it and manage its properties to boost your sales."),
+                    popover:   { fixed: true },
                 },
                 {
-                    element:   '.modal:contains("New Product") input[type=text]',
+                    element:   '.modal #editor_new_product input[type=text]',
                     sampleText: 'New Product',
                     placement: 'right',
-                    title:     "Choose name",
-                    content:   "Enter a name for your new product then click 'Continue'.",
+                    title:     _t("Choose name"),
+                    content:   _t("Enter a name for your new product then click 'Continue'."),
                 },
                 {
                     waitNot:   '.modal input[type=text]:not([value!=""])',
                     element:   '.modal button.btn-primary',
                     placement: 'right',
-                    title:     "Create Product",
-                    content:   "Click <em>Continue</em> to create the product.",
+                    title:     _t("Create Product"),
+                    content:   _t("Click <em>Continue</em> to create the product."),
                 },
                 {
-                    waitFor:   '#website-top-navbar button[data-action="save"]:visible',
-                    title:     "New product created",
-                    content:   "This page contains all the information related to the new product.",
-                    template:  self.popover({ next: "Continue" }),
+                    waitFor:   'body:has(button[data-action=save]:visible):has(.js_sale)',
+                    title:     _t("New product created"),
+                    content:   _t("This page contains all the information related to the new product."),
+                    popover:   { next: _t("Continue") },
                 },
                 {
                     element:   '.product_price .oe_currency_value',
                     sampleText: '20.50',
                     placement: 'left',
-                    title:     "Change the price",
-                    content:   "Edit the price of this product by clicking on the amount.",
+                    title:     _t("Change the price"),
+                    content:   _t("Edit the price of this product by clicking on the amount."),
                 },
                 {
                     waitNot:   '.product_price .oe_currency_value:containsExact(1.00)',
                     element:   '#wrap img.img:first',
                     placement: 'top',
-                    title:     "Update image",
-                    content:   "Click here to set an image describing your product.",
+                    title:     _t("Update image"),
+                    content:   _t("Click here to set an image describing your product."),
                 },
                 {
                     element:   'button.hover-edition-button:visible',
                     placement: 'top',
-                    title:     "Update image",
-                    content:   "Click here to set an image describing your product.",
+                    title:     _t("Update image"),
+                    content:   _t("Click here to set an image describing your product."),
                 },
                 {
                     wait:      500,
                     element:   '.well a.pull-right',
                     placement: 'bottom',
-                    title:     "Select an Image",
-                    content:   "Let's select an existing image.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("Select an Image"),
+                    content:   _t("Let's select an existing image."),
+                    popover:   { fixed: true },
                 },
                 {
                     element:   'img[alt=imac]',
                     placement: 'bottom',
-                    title:     "Select an Image",
-                    content:   "Let's select an imac image.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("Select an Image"),
+                    content:   _t("Let's select an imac image."),
+                    popover:   { fixed: true },
                 },
                 {
                     waitNot:   'img[alt=imac]',
                     element:   '.modal-content button.save',
                     placement: 'bottom',
-                    title:     "Select this Image",
-                    content:   "Click to add the image to the product decsription.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("Select this Image"),
+                    content:   _t("Click to add the image to the product decsription."),
+                    popover:   { fixed: true },
                 },
                 {
                     waitNot:   '.modal-content:visible',
                     element:   'button[data-action=snippet]',
                     placement: 'bottom',
-                    title:     "Describe the Product",
-                    content:   "Insert blocks like text-image, or gallery to fully describe the product.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("Describe the Product"),
+                    content:   _t("Insert blocks like text-image, or gallery to fully describe the product."),
+                    popover:   { fixed: true },
                 },
                 {
                     snippet:   'big-picture',
                     placement: 'bottom',
-                    title:     "Drag & Drop a block",
-                    content:   "Drag the 'Big Picture' block and drop it in your page.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("Drag & Drop a block"),
+                    content:   _t("Drag the 'Big Picture' block and drop it in your page."),
+                    popover:   { fixed: true },
                 },
                 {
                     element:   'button[data-action=save]',
                     placement: 'right',
-                    title:     "Save your modifications",
-                    content:   "Once you click on save, your product is updated.",
-                    template:  self.popover({ fixed: true }),
+                    title:     _t("Save your modifications"),
+                    content:   _t("Once you click on save, your product is updated."),
+                    popover:   { fixed: true },
 
                 },
                 {
                     waitFor:   '#website-top-navbar button[data-action="edit"]:visible',
                     element:   '.js_publish_management button.js_publish_btn.btn-danger',
                     placement: 'top',
-                    title:     "Publish your product",
-                    content:   "Click to publish your product so your customers can see it.",
+                    title:     _t("Publish your product"),
+                    content:   _t("Click to publish your product so your customers can see it."),
                 },
                 {
                     waitFor:   '.js_publish_management button.js_publish_btn.btn-success:visible',
-                    title:     "Congratulations",
-                    content:   "Congratulations! You just created and published your first product.",
-                    template:  self.popover({ next: "Close Tutorial" }),
+                    title:     _t("Congratulations"),
+                    content:   _t("Congratulations! You just created and published your first product."),
+                    popover:   { next: _t("Close Tutorial") },
                 },
             ];
             return this._super();
         }
     });
 
-    website.EditorShopTest = website.Tour.extend({
-        id: 'shop_buy_product',
-        name: "Try to buy products",
-        path: '/shop',
-        testPath: /\/shop/,
-        init: function (editor) {
-            var self = this;
-            self.steps = [
-                {
-                    title:     'begin-test',
-                    template:  self.popover({ next: "Start Test"}),
-                    backdrop:  true,
-                },
-                {
-                    title:     "select ipod",
-                    element:   '.oe_product_cart a:contains("iPod")',
-                },
-                {
-                    title:     "select ipod 32Go",
-                    element:   'input[name="product_id"]:not([checked])',
-                },
-                {
-                    title:     "click on add to cart",
-                    waitFor:   'input[name="product_id"]:eq(1)[checked]',
-                    element:   'form[action="/shop/add_cart/"] button',
-                },
-                {
-                    title:     "add suggested",
-                    element:   'form[action="/shop/add_cart/"] button.btn-link:contains("Add to Cart")',
-                },
-                {
-                    title:     "add one more iPod",
-                    waitFor:   '.my_cart_quantity:contains(2)',
-                    element:   '#mycart_products tr:contains("iPod: 32 Gb") a.js_add_cart_json:eq(1)',
-                },
-                {
-                    title:     "remove Headphones",
-                    waitFor:   '#mycart_products tr:contains("iPod: 32 Gb") input.js_quantity[value=2]',
-                    element:   '#mycart_products tr:contains("Apple In-Ear Headphones") a.js_add_cart_json:first',
-                },
-                {
-                    title:     "set one iPod",
-                    waitNot:   '#mycart_products tr:contains("Apple In-Ear Headphones")',
-                    element:   '#mycart_products input.js_quantity',
-                    sampleText: '1',
-                },
-                {
-                    title:     "go to checkout",
-                    waitFor:   '#mycart_products input.js_quantity[value=1]',
-                    element:   'a[href="/shop/checkout/"]',
-                },
-                {
-                    title:     "test with input error",
-                    element:   'form[action="/shop/confirm_order/"] button',
-                    callback: function (tour) {
-                        $("input[name='phone']").val("");
-                    },
-                },
-                {
-                    title:     "test without input error",
-                    waitFor:   'form[action="/shop/confirm_order/"] .has-error',
-                    element:   'form[action="/shop/confirm_order/"] button',
-                    callback: function (tour) {
-                        if ($("input[name='name']").val() === "")
-                            $("input[name='name']").val("website_sale-test-shoptest");
-                        if ($("input[name='email']").val() === "")
-                            $("input[name='email']").val("website_sale-test-shoptest@website_sale-test-shoptest.optenerp.com");
-                        $("input[name='phone']").val("123");
-                        $("input[name='street']").val("123");
-                        $("input[name='city']").val("123");
-                        $("input[name='zip']").val("123");
-                        $("select[name='country_id']").val("21");
-                    },
-                },
-                {
-                    title:     "select acquirer",
-                    element:   'input[name="acquirer"]',
-                },
-                {
-                    title:     "confirm",
-                    element:   'button:contains("Pay Now")',
-                },
-                {
-                    title:     "finish",
-                    waitFor:   '.oe_website_sale:contains("Thank you for your order")',
-                }
-            ];
-            return this._super();
-        },
-    });
-    // for test without editor bar
-    $(document).ready(function () {
-        website.Tour.add(website.EditorShopTest);
-    });
-
 }());
diff --git a/addons/website_sale/static/src/js/website_sale.editor.js b/addons/website_sale/static/src/js/website_sale.editor.js
index 1f41752dc7e..bb21c300fca 100644
--- a/addons/website_sale/static/src/js/website_sale.editor.js
+++ b/addons/website_sale/static/src/js/website_sale.editor.js
@@ -2,6 +2,7 @@
     "use strict";
 
     var website = openerp.website;
+    var _t = openerp._t;
     website.add_template_file('/website_sale/static/src/xml/website_sale.xml');
 
     website.is_editable = true;
@@ -16,7 +17,8 @@
             'click a[data-action=new_product]': function (ev) {
                 ev.preventDefault();
                 website.prompt({
-                    window_title: "New Product",
+                    id: "editor_new_product",
+                    window_title: _t("New Product"),
                     input: "Product Name",
                 }).then(function (name) {
                     website.form('/shop/add_product', 'POST', {
diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index eedbb5a046c..8298f6b22c0 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -26,11 +26,12 @@ $(document).ready(function () {
         if (isNaN(value)) value = 0;
         openerp.jsonRpc("/shop/set_cart_json/", 'call', {'order_line_id': $input.data('id'), 'set_number': value})
             .then(function (data) {
+                if (!data) {
+                    location.reload();
+                    return;
+                }
                 set_my_cart_quantity(data[1]);
                 $input.val(data[0]);
-                if (!data[0]) {
-                    location.reload();
-                }
             });
     });
 
@@ -110,6 +111,10 @@ $(document).ready(function () {
                 $min.val( ui.values[ 0 ] );
                 $max.val( ui.values[ 1 ] );
                 $form.submit();
+            },
+            slide: function( event, ui ) {
+                $min.val( ui.values[ 0 ] );
+                $max.val( ui.values[ 1 ] );
             }
         });
         $min.val( $slider.slider( "values", 0 ) );
diff --git a/addons/website_sale/tests/test_ui.py b/addons/website_sale/tests/test_ui.py
index 72b948830b1..394a9ca8e4f 100644
--- a/addons/website_sale/tests/test_ui.py
+++ b/addons/website_sale/tests/test_ui.py
@@ -1,8 +1,12 @@
 import openerp.addons.website.tests.test_ui as test_ui
 
 def load_tests(loader, base, _):
+    base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-add_product-test.js'),
+        {'redirect': '/page/website.homepage'}))
     base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test.js'),
-        { 'action': 'website.action_website_homepage' }))
-    base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test-2.js'),
-        { 'action': 'website.action_website_homepage' }))
+        {'redirect': '/page/website.homepage'}))
+    base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test.js'),
+        {'redirect': '/page/website.homepage', 'user': 'demo', 'password': 'demo'}))
+    base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test.js'),
+        {'path': '/', 'user': None}))
     return base
\ No newline at end of file
diff --git a/addons/website_sale/tests/ui_suite/website_sale-add_product-test.js b/addons/website_sale/tests/ui_suite/website_sale-add_product-test.js
new file mode 100644
index 00000000000..24befb7f15d
--- /dev/null
+++ b/addons/website_sale/tests/ui_suite/website_sale-add_product-test.js
@@ -0,0 +1,3 @@
+var testRunner = require('../../../website/tests/ui_suite/ui_test_runner.js');
+
+testRunner.run_test('shop');
\ No newline at end of file
diff --git a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test-2.js b/addons/website_sale/tests/ui_suite/website_sale-sale_process-test-2.js
deleted file mode 100644
index c55eec11617..00000000000
--- a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test-2.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var testRunner = require('../../../website/tests/ui_suite/ui_test_runner.js');
-
-var waitFor = testRunner.waitFor;
-
-testRunner.run(function websiteSaleTest (page, timeout) {
-    page.evaluate(function () { localStorage.clear(); });
-    waitFor(function clientReady () {
-        return page.evaluate(function () {
-            return window.$ && window.openerp && window.openerp.website
-                && window.openerp.website.Tour;
-        });
-    }, function executeTest () {
-        page.evaluate(function () {
-            window.openerp.website.Tour.run_test('shop');
-        });
-    }, timeout);
-});
diff --git a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js b/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js
index 5611d8400de..ca3943d5e85 100644
--- a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js
+++ b/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js
@@ -1,17 +1,7 @@
 var testRunner = require('../../../website/tests/ui_suite/ui_test_runner.js');
 
-var waitFor = testRunner.waitFor;
-
-testRunner.run(function websiteSaleTest (page, timeout) {
-    page.evaluate(function () { localStorage.clear(); });
-    waitFor(function clientReady () {
-        return page.evaluate(function () {
-            return window.$ && window.openerp && window.openerp.website
-                && window.openerp.website.Tour;
-        });
-    }, function executeTest () {
-        page.evaluate(function () {
-            window.openerp.website.Tour.run_test('shop_buy_product');
-        });
-    }, timeout);
-});
\ No newline at end of file
+testRunner.run_test('shop_buy_product', {
+        "inject": [
+            "./../../../website/static/src/js/website.tour.test.js",
+            "./../../../website_sale/static/src/js/website.tour.sale.js"]
+    });
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index d6c86c81e8b..f23686d089d 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -4,6 +4,12 @@
 
 <!-- Layout add nav and footer -->
 
+<template id="debugger" inherit_id="website.debugger" name="Event Debugger">
+    <xpath expr="//script[last()]" position="after">
+        <script type="text/javascript" src="/website_sale/static/src/js/website.tour.sale.js"></script>
+    </xpath>
+</template>
+
 <template id="editor_head" inherit_id="website.editor_head" name="Shop Editor" groups="base.group_sale_manager">
   <xpath expr="//script[@id='website_tour_js']" position="after">
       <script type="text/javascript" src="/website_sale/static/src/js/website_sale.editor.js"></script>
@@ -26,10 +32,10 @@
 <!-- List of categories -->
 
 <template id="categories_recursive" name="Category list">
-  <li t-att-class="category.id == search.get('category') and 'active' or ''">
-      <a t-attf-href="/shop/category/#{ slug(category) }/" t-field="category.name"></a>
-      <ul t-if="category.child_id" class="nav nav-pills nav-stacked nav-hierarchy">
-          <t t-foreach="category.child_id" t-as="category">
+  <li t-att-class="int(categ) == int(category or 0) and 'active' or ''">
+      <a t-attf-href="/shop/category/#{ slug(categ) }/" t-field="categ.name"></a>
+      <ul t-if="categ.child_id" class="nav nav-pills nav-stacked nav-hierarchy">
+          <t t-foreach="categ.child_id" t-as="categ">
               <t t-call="website_sale.categories_recursive"/>
           </t>
       </ul>
@@ -39,14 +45,15 @@
 <!-- Product list -->
 
 <template id="search" name="Search hidden fields">
-  <input type="hidden" name="category" t-att-value="search.get('category') or ''"/>
-  <input type="hidden" name="filters" t-att-value="search.get('filters') or ''"/>
-  <div class="input-group">
-    <input type="text" name="search" class="search-query form-control" placeholder="Search..." t-att-value="search.get('search') or ''"/>
-    <span class="input-group-btn">
-      <button class="btn btn-default" type="submit"><i class="fa fa-search"/></button>
-    </span>
-  </div>
+  <form t-attf-action="/shop/{{'category/%s/' % slug(category) if category else ''}}" method="get" t-att-class="search_class">
+    <input t-if="search.get('filters')" type="hidden" name="filters" t-att-value="search.get('filters')"/>
+    <div class="input-group">
+      <input type="text" name="search" class="search-query form-control" placeholder="Search..." t-att-value="search.get('search') or ''"/>
+      <span class="input-group-btn">
+        <button class="btn btn-default" type="submit"><i class="fa fa-search"/></button>
+      </span>
+    </div>
+  </form>
 </template>
 
 <template id="products_cart" name="Shopping cart">
@@ -54,15 +61,15 @@
     <div class="ribbon btn btn-danger">Sale</div>
   </div>
   <div class="oe_product_image">
-      <a t-attf-href="/shop/product/{{ slug(product) }}/?{{ keep_query('category', 'search', 'filters') }}">
+      <a t-attf-href="/shop/product/{{ slug(product) }}/?{{ keep_query('search', 'filters', category=(category and int(category)), page=(pager['page']['num'] if pager['page']['num']>1 else None)) }}">
           <span t-field="product.image" t-field-options='{"widget": "image"}'/>
       </a>
   </div>
   <section>
-      <h5><strong><a t-attf-href="/shop/product/{{ slug(product) }}/?{{ keep_query('category', 'search', 'filters') }}" t-field="product.name"/></strong></h5>
+      <h5><strong><a t-attf-href="/shop/product/{{ slug(product) }}/?{{ keep_query('search', 'filters', category=(category and int(category)), page=(pager['page']['num'] if pager['page']['num']>1 else None)) }}" t-field="product.name"/></strong></h5>
       <div class="product_price" t-if="product.product_variant_ids">
           <b>
-              <t t-if="abs(product.product_variant_ids[0].lst_price - product.product_variant_ids[0].price) &gt; 0.2">
+              <t t-if="product.product_variant_ids[0].lst_price != product.product_variant_ids[0].price">
                 <del class="text-danger"
                   t-field="product.product_variant_ids[0].lst_price" t-field-options='{
                        "widget": "monetary",
@@ -93,9 +100,8 @@
         <div class="container oe_website_sale">
           <div class="products_pager">
             <div class="row">
-              <form action="/shop/" method="get" class="pagination form-inline col-md-3">
-                  <t t-call="website_sale.search" />
-              </form>
+              <t t-set="search_class">pagination form-inline col-md-3</t>
+              <t t-call="website_sale.search"/>
               <t t-call="website.pager"/>
             </div>
           </div>
@@ -225,7 +231,7 @@
   <xpath expr="//div[@class='product_price']" position="inside">
       <form action="/shop/add_cart/" method="post" style="display: inline-block;">
           <input name="product_id" t-att-value="product.product_variant_ids[0].id" type="hidden"/>
-          <button type="submit" class="fa fa-shopping-cart"/>
+          <button type="submit" class="btn btn-default btn-xs fa fa-shopping-cart"/>
       </form>
   </xpath>
 </template>
@@ -272,15 +278,14 @@
           <div class="row">
             <div class="col-sm-4">
                 <ol class="breadcrumb">
-                    <li><a t-attf-href="/shop?{{ keep_query('search', 'filters') }}" onclick="history.go(-1); return false;">Products</a></li>
-                    <li t-if="search.get('category')"><a t-attf-href="/shop/?{{ keep_query('search', 'filters', 'category') }}" t-field="category.name"/></li>
+                    <li><a t-attf-href="/shop?{{ keep_query('search', 'filters', 'page') if not category else keep_query('search', 'filters') }}">Products</a></li>
+                    <li t-if="category"><a t-attf-href="/shop/category/{{ slug(category) }}/?{{ keep_query('search', 'filters', 'page') }}" t-field="category.name"/></li>
                     <li class="active"><span t-field="product.name"/></li>
                 </ol>
             </div>
             <div class="col-sm-3">
-              <form action="/shop/" method="get" class="pull-right">
-                  <t t-call="website_sale.search" />
-              </form>
+              <t t-set="search_class">pull-right</t>
+              <t t-call="website_sale.search"/>
             </div>
             <div class="col-sm-4" groups="base.group_sale_manager">
                 <t t-call="website.publish_management">
@@ -333,7 +338,7 @@
                     </div>
                     <a class="btn btn-danger btn-lg mt8 a-submit">Add to Cart</a>
                     <hr t-if="product.description_sale"/>
-                    <p t-field="product.description_sale" class="text-muted"/>
+                    <div><p t-field="product.description_sale" class="text-muted"/></div>
                     <hr/>
                     <p class="text-muted">
                         30-day money-back guarantee<br/>
@@ -414,11 +419,11 @@
                                 <div>
                                     <div class="oe_msg_attachment" t-foreach='message.attachment_ids' t-as='attachment'>
                                         <a t-att-href="'/mail/download_attachment?model=mail.message&amp;id='+str(message.id)+'&amp;method=download_attachment&amp;attachment_id='+str(attachment.id)" target="_blank">
-                                            <t t-if="attachment.file_type == 'webimage'">
+                                            <t t-if="attachment.file_type_icon == 'webimage'">
                                                 <img t-att-src="'/web/binary/image?model=ir.attachment&amp;field=datas&amp;id=' + str(attachment.id) + '&amp;resize=100,80'"
                                                     class='oe_attachment_embedded'></img>
                                             </t>
-                                            <t t-if="attachment.file_type != 'webimage'">
+                                            <t t-if="attachment.file_type_icon != 'webimage'">
                                                 <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.file_type + '.png'"
                                                     class='oe_attachment_webimage'></img>
                                             </t>
@@ -530,7 +535,7 @@
                   <a t-if="website_sale_order and website_sale_order.website_order_line" href="/shop/checkout/" class="btn btn-primary pull-right mb32">Process Checkout <span class="fa fa-long-arrow-right"/></a>
                   <div class="oe_structure"/>
               </div>
-              <div class="col-lg-3 col-lg-offset-1 col-sm-3 text-muted" id="right_column">
+              <div class="col-lg-3 col-lg-offset-1 col-sm-3 col-md-3 text-muted" id="right_column">
                   <h4>Policies</h4>
                   <ul class="list-unstyled mb32">
                       <li>&#9745; 30-days money-back guarantee</li>
@@ -563,8 +568,8 @@
 <template id="products_categories" inherit_option_id="website_sale.products" name="Product Categories">
   <xpath expr="//div[@id='products_grid_before']" position="inside">
       <ul class="nav nav-pills nav-stacked mt16">
-          <li t-att-class=" '' if search.get('category') else 'active' "><a href="/shop/">All Products</a></li>
-          <t t-foreach="categories" t-as="category">
+          <li t-att-class=" '' if category else 'active' "><a href="/shop/">All Products</a></li>
+          <t t-foreach="categories" t-as="categ">
               <t t-call="website_sale.categories_recursive"/>
           </t>
       </ul>
@@ -579,7 +584,7 @@
 
 <template id="products_attributes" inherit_id="website_sale.products" inherit_option_id="website_sale.products" name="Product attribute's Filters" groups="product.group_product_attributes">
   <xpath expr="//div[@id='products_grid_before']" position="inside">
-      <form t-attf-action="/shop/filters/?{{ keep_query('category', 'search') }}" class="attributes" method="post">
+      <form t-attf-action="/shop/filters/?{{ keep_query('search', category=(category and int(category))) }}" class="attributes" method="post">
           <ul class="nav nav-pills nav-stacked mt16">
               <t t-set="attribute_ids" t-value="Ecommerce.get_attribute_ids()"/>
               <t t-foreach="attribute_ids" t-as="attribute_id">
@@ -603,9 +608,9 @@
                       <t t-set="attribute" t-value="Ecommerce.has_search_filter(attribute_id.id)"/>
                       <div style="margin: 0 20px;" class="js_slider"
                         t-att-data-id="attribute_id.id"
-                        t-att-data-value-min="attribute and attribute[1][0] or attribute_id.float_min"
+                        t-att-data-value-min="attribute and attribute[1][0] or attribute_id.float_min or '0'"
                         t-att-data-value-max="attribute and attribute[1][1] or attribute_id.float_max"
-                        t-att-data-min="attribute_id.float_min"
+                        t-att-data-min="attribute_id.float_min or '0'"
                         t-att-data-max="attribute_id.float_max"></div>
                   </li>
                 </t>
@@ -779,7 +784,7 @@
                   <div class="form-group col-lg-6" groups="sale.group_delivery_invoice_address">
                       <label>
                           <input type="checkbox" name="shipping_different" t-att-checked="shipping"/>
-                          Ship to a different address
+                          <span>Ship to a different address</span>
                       </label>
                   </div>
               </div>
@@ -828,11 +833,11 @@
               </div>
               <button type="submit" class="btn btn-default btn-primary pull-right mb32">Confirm <span class="fa fa-long-arrow-right"/></button>
           </div>
-          <div class="col-lg-offset-1 col-lg-3 text-muted">
+          <div class="col-lg-offset-1 col-lg-3 col-md-3 text-muted">
               <h3 class="page-header mt16">Your Order <small><a href="/shop/mycart"><span class="fa fa-arrow-right"/> change</a></small></h3>
               <div class="row">
                   <div class="col-sm-6 text-right">Subtotal:</div>
-                  <div class="col-sm-6"><span t-esc="website_sale_order.amount_untaxed" t-field-options='{
+                  <div class="col-sm-6"><span t-field="website_sale_order.amount_untaxed" t-field-options='{
                       "widget": "monetary",
                       "display_currency": "website.pricelist_id.currency_id"
                   }'/></div>