From 679d278d253e314e94da6e33c96a4f149f12fb6b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 23 Apr 2014 12:07:49 +0200
Subject: [PATCH 1/4] [FIX] /web/login restore request.uid in case of
 authentication failure

bzr revid: fme@openerp.com-20140423100749-t4y4oi01tszn3z5a
---
 addons/web/controllers/main.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index f2101b27fd3..c98bce82259 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -682,9 +682,11 @@ class Home(http.Controller):
             redirect = '/web?' + request.httprequest.query_string
         values['redirect'] = redirect
         if request.httprequest.method == 'POST':
+            old_uid = request.uid
             uid = request.session.authenticate(request.session.db, request.params['login'], request.params['password'])
             if uid is not False:
                 return http.redirect_with_hash(redirect)
+            request.uid = old_uid
             values['error'] = "Wrong login/password"
         return render_bootstrap_template('web.login', values)
 

From 1b594f5cce8e99a6a120a326783df70ea2252a96 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 23 Apr 2014 15:15:48 +0200
Subject: [PATCH 2/4] [FIX]while everything is not adaptative, leave overflow-y
 on modal body

bzr revid: csn@openerp.com-20140423131548-7hyo9eei2d2z99zc
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 85f3d3cf63b..3a2f22e78a1 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -40,7 +40,7 @@
                     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
                     <h3 class="modal-title"><t t-raw="title"/></h3>
                 </div>
-                <div class="modal-body">
+                <div class="modal-body" style="overflow-y: auto;">
                 </div>
             </div>
         </div>

From 9ed196bc8104ff0cf3f188ebcfcfcd08d26758bc Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 23 Apr 2014 15:21:00 +0200
Subject: [PATCH 3/4] [FIX] report: set a default paperformat for companies,
 based on rml paperformat

bzr revid: chs@openerp.com-20140423132100-t6lmyd8qymoo4wqq
---
 addons/report/data/report_paperformat.xml  |  6 +-----
 addons/report/models/report_paperformat.py | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/addons/report/data/report_paperformat.xml b/addons/report/data/report_paperformat.xml
index 6b37c07d3b0..275d65edd13 100644
--- a/addons/report/data/report_paperformat.xml
+++ b/addons/report/data/report_paperformat.xml
@@ -32,9 +32,5 @@
             <field name="header_spacing">35</field>
             <field name="dpi">90</field>
         </record>
-
-        <record id="base.main_company" model="res.company">
-            <field name="paperformat_id" ref="paperformat_euro"></field>
-        </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/report/models/report_paperformat.py b/addons/report/models/report_paperformat.py
index 6b84f3d3363..41a5e0a9950 100644
--- a/addons/report/models/report_paperformat.py
+++ b/addons/report/models/report_paperformat.py
@@ -19,6 +19,9 @@
 #
 ##############################################################################
 
+from functools import partial
+
+from openerp import SUPERUSER_ID
 from openerp.osv import osv, fields
 
 
@@ -114,6 +117,24 @@ class res_company(osv.Model):
 
     _columns = {'paperformat_id': fields.many2one('report.paperformat', 'Paper format')}
 
+    def init(self, cr):
+        # set a default paperformat based on rml one.
+        ref = partial(self.pool['ir.model.data'].xmlid_to_res_id, cr, SUPERUSER_ID)
+
+        ids = self.search(cr, SUPERUSER_ID, [('paperformat_id', '=', False)])
+        for company in self.browse(cr, SUPERUSER_ID, ids):
+            paperformat_id = {
+                'a4': ref('report.paperformat_euro'),
+                'us_letter': ref('report.paperformat_us'),
+            }.get(company.rml_paper_format) or ref('report.paperformat_euro')
+
+            if paperformat_id:
+                company.write({'paperformat_id': paperformat_id})
+
+        sup = super(res_company, self)
+        if hasattr(sup, 'init'):
+            sup.init(cr)
+
 
 class ir_actions_report(osv.Model):
     _inherit = 'ir.actions.report.xml'

From 11680fd1f707ea6d263bf2224494b39099fb7ad1 Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Wed, 23 Apr 2014 15:39:17 +0200
Subject: [PATCH 4/4] [IMP] Usability of event and event_sale

bzr revid: rim@openerp.com-20140423133917-zpulvflwflgz12sw
---
 addons/event/event.py                 |  1 +
 addons/event/event_view.xml           |  2 ++
 addons/event_sale/event_sale_view.xml | 11 +++++++++++
 3 files changed, 14 insertions(+)

diff --git a/addons/event/event.py b/addons/event/event.py
index 321dc63f489..94aab1e5e26 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -317,6 +317,7 @@ class event_registration(osv.osv):
     def confirm_registration(self, cr, uid, ids, context=None):
         for reg in self.browse(cr, uid, ids, context=context or {}):
             self.pool.get('event.event').message_post(cr, uid, [reg.event_id.id], body=_('New registration confirmed: %s.') % (reg.name or '', ),subtype="event.mt_event_registration", context=context)
+            self.message_post(cr, uid, reg.id, body=_('Event Registration confirmed.'), context=context)
         return self.write(cr, uid, ids, {'state': 'open'}, context=context)
 
     def registration_open(self, cr, uid, ids, context=None):
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 212831c7940..2cdb74bea5b 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -434,6 +434,8 @@
                         <filter string="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Event" name="group_event" domain="[]" context="{'group_by':'event_id'}"/>
                         <filter string="Status" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Registration Day" domain="[]" context="{'group_by': 'create_date:day'}"/>
+                        <filter string="Registration Month" domain="[]" context="{'group_by': 'create_date:month'}"/>
                    </group>
                 </search>
             </field>
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 1f42108c993..93f9bd8ffb4 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -39,6 +39,17 @@
             </field>
         </record>
 
+        <record model="ir.ui.view" id="view_event_registration_ticket_form">
+            <field name="name">event.registration.ticket.form</field>
+            <field name="model">event.registration</field>
+            <field name="inherit_id" ref="event.view_event_registration_form" />
+            <field name="arch" type="xml">
+                <field name="user_id" position="after">
+                    <field name="event_ticket_id" domain="[('event_id', '=', event_id)]"/>
+                </field>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="event_sale_product_template_form">
              <field name="model">product.template</field>
              <field name="inherit_id" ref="product.product_template_form_view" />