[MERGE] forward port branch 9.0 up to 19707615

addons/website_event_track/views/website_event_track_templates.xml

@@ -215,11 +215,11 @@
                                     <small>Proposed by <span t-field="track.partner_name"/></small>
                                 </div>
                                 <div class="col-md-12">
-                                    <p t-field="track.description"/>
+                                    <div t-field="track.description"/>
                                 </div>
                                 <div class="col-md-12">
                                     <h3>About The Author</h3>
-                                    <p t-field="track.partner_biography"/>
+                                    <div t-field="track.partner_biography"/>
                                 </div>
                             </div>
                         </div>

addons/website_slides/controllers/main.py

@@ -293,10 +293,8 @@ class WebsiteSlides(http.Controller):
 
     @http.route(['/slides/add_slide'], type='json', auth='user', methods=['POST'], website=True)
     def create_slide(self, *args, **post):
-        payload = request.httprequest.content_length
-        # payload is total request content size so it's not exact size of file.
-        # already add client validation this is for double check if client alter.
-        if (payload / 1024 / 1024 > 25):
+        file_size = len(post['datas']) * 3 / 4; # base64
+        if (file_size / 1024.0 / 1024.0) > 25:
             return {'error': _('File is too big. File size cannot exceed 25MB')}
 
         values = dict((fname, post[fname]) for fname in [

doc/cla/individual/YasserKadddour.md

+Algeria, 2017-09-22
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Yasser Kaddour  yasser.kaddour@gmail.com https://github.com/YasserKaddour

odoo/addons/base/res/res_currency_data.xml

@@ -786,7 +786,7 @@
 
         <record id="DZD" model="res.currency">
             <field name="name">DZD</field>
-            <field name="symbol">DZ</field>
+            <field name="symbol">DA</field>
             <field name="rounding">0.01</field>
             <field name="active" eval="False"/>
         </record>