[MERGE] forward port of branch 8.0 up to 0ec3c75

MANIFEST.in

@@ -23,4 +23,5 @@ recursive-include openerp *.woff
 recursive-include openerp *.xsl
 recursive-include openerp *.xml
 recursive-include openerp *.yml
-recursive-exclude * *.py[co]
+recursive-exclude * *.py[co]
+recursive-exclude * *.hg*

addons/account/edi/invoice_action_data.xml

@@ -52,7 +52,7 @@
     <br/>
     <p>It is also possible to directly pay with Paypal:</p>
         <a style="margin-left: 120px;" href="${object.paypal_url}">
-            <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+            <img class="oe_edi_paypal_button" src="/account/static/src/img/btn_paynowcc_lg.gif"/>
         </a>
     % endif
     

addons/account/report/report_vat.py

@@ -31,6 +31,15 @@ class tax_report(report_sxw.rml_parse, common_report_header):
     def set_context(self, objects, data, ids, report_type=None):
         new_ids = ids
         res = {}
+        if not data:
+            company_id = self.pool['res.users'].browse(self.cr, self.uid, self.uid).company_id.id
+            data = {
+                'form': {
+                    'based_on': 'invoices',
+                    'company_id': company_id,
+                    'display_detail': False,
+                }
+            }
         self.period_ids = []
         period_obj = self.pool.get('account.period')
         self.display_detail = data['form']['display_detail']

addons/event_sale/event_demo.xml

@@ -160,7 +160,7 @@
                 <small class="col-xs-3" style="float: left; padding-right: 0px; padding-left: 0px;">sponsored by</small>
                 <div class="col-xs-2" style="padding-right: 0px; padding-left: 0px;">
                 <span>
-                    <img class="img img-responsive" src="https://www.odoo.com/openerp_website/static/src/img/logo_white.png"/>
+                    <img class="img img-responsive" src="/base/static/img/logo_white.png"/>
                 </span>
                 </div>
             </div>

addons/mrp/static/description/index.html

@@ -98,7 +98,7 @@ meets your delivery schedule dates.
 
 <section class="oe_container oe_centeralign oe_padded oe_mb32">
     <div class='oe_cover'>
-        <img src="http://www.openerp.com/ebooks/manufacturing.png">
+        <img src="/mrp/static/description/ebook-manufacturing.png">
     </div>
     <a href="http://www.openerp.com/ebooks/manufacturing" target="_blank" class="oe_button oe_big">Download our free E-book</a>
 </section>

addons/point_of_sale/static/description/index.html

@@ -88,7 +88,7 @@
 
 <section class="oe_container oe_centeralign oe_padded oe_mb32">
     <div class='oe_cover'>
-        <img src="http://www.openerp.com/ebooks/manufacturing.png">
+        <img src="/point_of_sale/static/description/ebook-manufacturing.png">
     </div>
     <a href="http://www.openerp.com/ebooks/manufacturing" target="_blank" class="oe_button oe_big">Download our free E-book</a>
 </section>

addons/portal_sale/portal_sale_data.xml

@@ -54,7 +54,7 @@
     <br/>
     <p>It is also possible to directly pay with Paypal:</p>
         <a style="margin-left: 120px;" href="${object.paypal_url}">
-            <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+            <img class="oe_edi_paypal_button" src="/sale/static/img/btn_paynowcc_lg.gif"/>
         </a>
     % endif
 
@@ -141,7 +141,7 @@
     <br/>
     <p>It is also possible to directly pay with Paypal:</p>
         <a style="margin-left: 120px;" href="${object.paypal_url}">
-            <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+            <img class="oe_edi_paypal_button" src="/sale/static/img/btn_paynowcc_lg.gif"/>
         </a>
     % endif
     

addons/product_email_template/data/product_demo.xml

@@ -34,7 +34,7 @@
         <table>
             <tr>
                 <td>
-                    <img src="https://www.openerp.com/saas_master/static/site_new/img/layout/online_training.png"/>
+                    <img src="/product_email_template/static/img/online_training.png"/>
                 </td>
                 <td style="height: auto;margin-top:10px;margin-bottom:10px;font-size:18px;color: #646464;">
                     <strong>There are three components to the training</strong>

addons/purchase/static/description/index.html

@@ -57,7 +57,7 @@ Launch purchase tenders, integrate supplier's answers in the process and compare
 
 <section class="oe_container oe_centeralign oe_padded oe_mb32">
     <div class='oe_cover'>
-        <img src="http://www.openerp.com/ebooks/logistic.png">
+        <img src="/purchase/static/description/ebook-logistic.png">
     </div>
     <a href="http://www.openerp.com/ebooks/logistic" target="_blank" class="oe_button oe_big">Download our free E-book</a>
 </section>

addons/sale/edi/sale_order_action_data.xml

@@ -58,7 +58,7 @@
     <br/>
     <p>It is also possible to directly pay with Paypal:</p>
         <a style="margin-left: 120px;" href="${object.paypal_url}">
-            <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+            <img class="oe_edi_paypal_button" src="/sale/static/img/btn_paynowcc_lg.gif"/>
         </a>
     % endif
 

addons/sale/static/description/index.html

@@ -68,7 +68,7 @@ Spend the extra time focusing on selling, not recording data.
 
 <section class="oe_container oe_centeralign oe_padded oe_mb32">
     <div class='oe_cover'>
-        <img src="http://www.openerp.com/ebooks/marketing.png">
+        <img src="/sale/static/description/ebook-marketing.png">
     </div>
     <a href="http://www.openerp.com/ebooks/marketing" target="_blank" class="oe_button oe_big">Download our free E-book</a>
 </section>

addons/web/doc/_themes/flask_small/layout.html

@@ -15,7 +15,7 @@
 {% block relbar2 %}
   {% if theme_github_fork %}
     <a href="http://github.com/{{ theme_github_fork }}"><img style="position: fixed; top: 0; right: 0; border: 0;"
-    src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
+    src="static/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
   {% endif %}
 {% endblock %}
 {% block sidebar1 %}{% endblock %}

addons/web/static/lib/qweb/qweb-test.js.html

@@ -1,9 +1,9 @@
 <!doctype html>
 <html>
 <head>
-    <script src="http://code.jquery.com/jquery-2.1.1.min.js"></script>
-    <link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.15.0.css" type="text/css" media="screen"/>
-    <script type="text/javascript" src="http://code.jquery.com/qunit/qunit-1.15.0.js"></script>
+    <script src="/web/static/lib/jquery/jquery.js"></script>
+    <link rel="stylesheet" href="/web/static/lib/qunit/qunit.css" type="text/css" media="screen"/>
+    <script type="text/javascript" src="/web/static/lib/qunit/qunit.js"></script>
 
     <script type="text/javascript" src="qweb2.js"></script>
 

addons/web/static/src/js/chrome.js

@@ -1310,7 +1310,7 @@ instance.web.WebClient = instance.web.Client.extend({
         $("body").css("background-image", "url(" + instance.session.origin + "/web/static/src/img/back-enable.jpg" + ")");
         if ($.blockUI) {
             var imgkit = Math.floor(Math.random() * 2 + 1);
-            $.blockUI.defaults.message = '<img src="http://www.amigrave.com/loading-kitten/' + imgkit + '.gif" class="loading-kitten">';
+            $.blockUI.defaults.message = '<img src="/web/static/src/img/k-waiting' + imgkit + '.gif" class="loading-kitten">';
         }
     },
     /**

addons/website_blog/data/website_blog_demo.xml

@@ -23,7 +23,6 @@
             <field name="background_image">/website_blog/static/src/img/post1.jpg</field>
             <field name="content"><![CDATA[
         <section class="mt16 mb16 readable">
-            <iframe width="361" height="200" src="http://www.youtube.com/embed/EkbBFmIWoTE" frameborder="0" allowfullscreen></iframe>
             <p>
                 Emails are broken.
             </p><p>

addons/website_quote/data/website_quotation_data.xml

@@ -48,7 +48,7 @@
     <br/>
     <p>It is also possible to directly pay with Paypal:</p>
         <a style="margin-left: 120px;" href="${object.paypal_url}">
-            <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+            <img class="oe_edi_paypal_button" src="/sale/static/img/btn_paynowcc_lg.gif"/>
         </a>
     % endif
 
@@ -214,7 +214,7 @@
     <br/>
     <p>It is also possible to directly pay with Paypal:</p>
         <a style="margin-left: 120px;" href="${object.paypal_url}">
-            <img class="oe_edi_paypal_button" src="https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif"/>
+            <img class="oe_edi_paypal_button" src="/sale/static/img/btn_paynowcc_lg.gif"/>
         </a>
     % endif
 

addons/website_quote/data/website_quotation_demo.xml

@@ -275,7 +275,7 @@
                             <h2>Structure of the Training</h2>
                         </div>
                         <div class="col-md-5 col-md-offset-1 mt16 mb16">
-                            <img class="img img-responsive" src="https://www.odoo.com/saas_master/static/site_new/img/layout/online_training.png"/>
+                            <img class="img img-responsive" src="/website_quote/static/src/img/online_training.png"/>
                         </div>
                         <div class="col-md-6 mt32">
                             <h4><strong>There are three components to the training</strong></h4>

debian/control

@@ -2,13 +2,14 @@ Source: odoo
 Section: net
 Priority: optional
 Maintainer: Odoo S.A. <info@odoo.com>
+Uploaders: Aaron Bohy <aab@odoo.com>, Simon Lejeune <sle@odoo.com>
 Build-Depends: debhelper (>= 9.0), python, rsync
+X-Python-Version: 2.7
 Standards-Version: 3.9.5.0
 Homepage: http://www.odoo.com/
 Vcs-Git: https://github.com/odoo/odoo
 
 Package: odoo
-Section: net
 Architecture: all
 Depends:
  ${misc:Depends},

debian/copyright

@@ -1,10 +1,8 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Contact: Odoo <info@odoo.com>
-Upstream-Homepage: http://www.odoo.com/
-Maintainer-Contact: Debian Odoo Maintainers <gnunet@lists.debian-maintainers.org>
-Maintainer-Homepage: http://www.odoo.com/
 
 Files: *
-Copyright: (C) 2004-2014 OpenERP SA. (www.openerp.com)
+Copyright: (C) 2004-2015 Odoo SA. (www.odoo.com)
 License: AGPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as published by

debian/init

@@ -1,18 +1,20 @@
 #!/bin/bash
 ### BEGIN INIT INFO
-# Provides:          openerp-server
+# Provides:          odoo.py
 # Required-Start:    $remote_fs $syslog
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: Start openerp daemon at boot time
+# Short-Description: Start odoo daemon at boot time
 # Description:       Enable service provided by daemon.
 # X-Interactive:     true
 ### END INIT INFO
 ## more info: http://wiki.debian.org/LSBInitScripts
 
+. /lib/lsb/init-functions
+
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
-DAEMON=/usr/bin/openerp-server
+DAEMON=/usr/bin/odoo.py
 NAME=odoo
 DESC=odoo
 CONFIG=/etc/odoo/openerp-server.conf

openerp/addons/base/res/res_currency_data.xml

@@ -133,7 +133,7 @@
         <record forcecreate="0" id="rateIDR1" model="res.currency.rate">
             <field name="rate">14352.00</field>
             <field name="currency_id" ref="IDR"/>
-            <field name="name">2010-01-01</field>
+            <field name="name">2009-01-01</field>
         </record>
         <record forcecreate="0" id="rateIDR" model="res.currency.rate">
             <field name="rate">11796.39</field>
@@ -2086,17 +2086,5 @@
             <field name="currency_id" ref="GTQ"/>
             <field name="name">2010-01-01</field>
         </record>
-
-        <record id="base.XOF" model="res.currency">
-            <field name="name">XOF</field>
-            <field name="symbol">CFA</field>
-            <field name="rounding">1</field>
-            <field name="accuracy">4</field>
-        </record>
-        <record id="base.rateXOF" model="res.currency.rate">
-            <field name="rate">655.957</field>
-            <field name="currency_id" ref="base.XOF"/>
-            <field name="name">2010-01-01</field>
-        </record>
     </data>
 </openerp>

openerp/report/render/rml2pdf/trml2pdf.py

@@ -780,15 +780,10 @@ class _rml_flowable(object):
             style = self.styles.para_style_get(node)
             if extra_style:
                 style.__dict__.update(extra_style)
-            result = []
-            tag_text = ''
-            plain_text = ''
-            for i in self._textual(node).split('\n'):
-                instance = platypus.Paragraph(i, style, **(utils.attr_get(node, [], {'bulletText':'str'})))
-                plain_text += instance.getPlainText().strip()
-                tag_text += instance.text.strip()
-                result.append(instance)
-            if LooseVersion(reportlab.Version) > LooseVersion('3.0') and not plain_text and tag_text:
+            text_node = self._textual(node).strip().replace('\n\n', '\n').replace('\n', '<br/>')
+            instance = platypus.Paragraph(text_node, style, **(utils.attr_get(node, [], {'bulletText':'str'})))
+            result = [instance]
+            if LooseVersion(reportlab.Version) > LooseVersion('3.0') and not instance.getPlainText().strip() and instance.text.strip():
                 result.append(platypus.Paragraph('&nbsp;<br/>', style, **(utils.attr_get(node, [], {'bulletText': 'str'}))))
             return result
         elif node.tag=='barCode':

setup/package.py

@@ -50,6 +50,9 @@ PUBLISH_DIRS = {
     'tarball': 'src',
     'windows': 'exe',
 }
+ADDONS_NOT_TO_PUBLISH = [
+    'web_analytics'
+]
 
 def mkdir(d):
     if not os.path.isdir(d):
@@ -238,11 +241,14 @@ class KVMWinTestExe(KVM):
 #----------------------------------------------------------
 # Stage: building
 #----------------------------------------------------------
-def _prepare_build_dir(o):
+def _prepare_build_dir(o, win32=False):
     cmd = ['rsync', '-a', '--exclude', '.git', '--exclude', '*.pyc', '--exclude', '*.pyo']
+    if not win32:
+        cmd += ['--exclude', 'setup/win32']
     system(cmd + ['%s/' % o.odoo_dir, o.build_dir])
     for i in glob(join(o.build_dir, 'addons/*')):
-        shutil.move(i, join(o.build_dir, 'openerp/addons'))
+        if i.split(os.path.sep)[-1] not in ADDONS_NOT_TO_PUBLISH:
+            shutil.move(i, join(o.build_dir, 'openerp/addons'))
 
 def build_tgz(o):
     system(['python2', 'setup.py', 'sdist', '--quiet', '--formats=gztar,zip'], o.build_dir)
@@ -454,6 +460,7 @@ def main():
             except Exception, e:
                 print("Won't publish the rpm release.\n Exception: %s" % str(e))
         if not o.no_windows:
+            _prepare_build_dir(o, win32=True)
             build_exe(o)
             try:
                 if not o.no_testing: