[MERGE] forward port branch saas-18 up to d15a31ae6d9

7 files changed, 46 insertions, 6 deletions

diff --git a/odoo/__init__.py b/odoo/__init__.py
index 3c3b14fdadc..2814706b57a 100644
--- a/odoo/__init__.py
+++ b/odoo/__init__.py
@@ -4,6 +4,12 @@
 """ OpenERP core library."""
 
 #----------------------------------------------------------
+# odoo must be a namespace package for odoo.addons to become one too
+# https://packaging.python.org/guides/packaging-namespace-packages/
+#----------------------------------------------------------
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
+
+#----------------------------------------------------------
 # Running mode flags (gevent, prefork)
 #----------------------------------------------------------
 # Is the server running with gevent.
diff --git a/odoo/addons/__init__.py b/odoo/addons/__init__.py
index d3a3e7e9ba2..c0058937588 100644
--- a/odoo/addons/__init__.py
+++ b/odoo/addons/__init__.py
@@ -14,4 +14,7 @@ This module also conveniently reexports some symbols from odoo.modules.
 Importing them from here is deprecated.
 
 """
-__import__('pkg_resources').declare_namespace(__name__)
+# make odoo.addons a namespace package, while keeping this __init__.py
+# present, for python 2 compatibility
+# https://packaging.python.org/guides/packaging-namespace-packages/
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/odoo/addons/base/res/res_country.py b/odoo/addons/base/res/res_country.py
index 36e539f8e23..a3984155b4e 100644
--- a/odoo/addons/base/res/res_country.py
+++ b/odoo/addons/base/res/res_country.py
@@ -64,6 +64,7 @@ class Country(models.Model):
             ('after', 'After Address'),
         ], string="Customer Name Position", default="before",
         help="Determines where the customer/company name should be placed, i.e. after or before the address.")
+    vat_label = fields.Char(string='Vat Label', translate=True, help="Use this field if you want to change vat label.")
 
     _sql_constraints = [
         ('name_uniq', 'unique (name)',
diff --git a/odoo/addons/base/res/res_country_data.xml b/odoo/addons/base/res/res_country_data.xml
index 95b83a5fa52..ff2a5c71242 100644
--- a/odoo/addons/base/res/res_country_data.xml
+++ b/odoo/addons/base/res/res_country_data.xml
@@ -84,6 +84,7 @@
             <field file="base/static/img/country_flags/at.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="43" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="au" model="res.country">
             <field name="name">Australia</field>
@@ -142,6 +143,7 @@
             <field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="EUR" />
             <field eval="32" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="bf" model="res.country">
             <field name="name">Burkina Faso</field>
@@ -156,6 +158,7 @@
             <field file="base/static/img/country_flags/bg.png" name="image" type="base64" />
             <field name="currency_id" ref="BGN" />
             <field eval="359" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="bh" model="res.country">
             <field name="name">Bahrain</field>
@@ -391,6 +394,7 @@
             <field file="base/static/img/country_flags/cy.png" name="image" type="base64" />
             <field name="currency_id" ref="CYP" />
             <field eval="357" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="cz" model="res.country">
             <field name="name">Czech Republic</field>
@@ -398,6 +402,7 @@
             <field file="base/static/img/country_flags/cz.png" name="image" type="base64" />
             <field name="currency_id" ref="CZK" />
             <field eval="420" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="de" model="res.country">
             <field name="name">Germany</field>
@@ -406,6 +411,7 @@
             <field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="EUR" />
             <field eval="49" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="dj" model="res.country">
             <field name="name">Djibouti</field>
@@ -420,6 +426,7 @@
             <field file="base/static/img/country_flags/dk.png" name="image" type="base64" />
             <field name="currency_id" ref="DKK" />
             <field eval="45" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="dm" model="res.country">
             <field name="name">Dominica</field>
@@ -455,6 +462,7 @@
             <field file="base/static/img/country_flags/ee.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="372" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="eg" model="res.country">
             <field name="name">Egypt</field>
@@ -483,6 +491,7 @@
             <field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="EUR" />
             <field eval="34" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="et" model="res.country">
             <field name="name">Ethiopia</field>
@@ -498,6 +507,7 @@
             <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
             <field name="currency_id" ref="EUR" />
             <field eval="358" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="fj" model="res.country">
             <field name="name">Fiji</field>
@@ -534,6 +544,7 @@
             <field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="EUR" />
             <field eval="33" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="ga" model="res.country">
             <field name="name">Gabon</field>
@@ -623,6 +634,7 @@
             <field file="base/static/img/country_flags/gr.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="30" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="gs" model="res.country">
             <field name="name">South Georgia and the South Sandwich Islands</field>
@@ -685,6 +697,7 @@
             <field file="base/static/img/country_flags/hr.png" name="image" type="base64" />
             <field name="currency_id" ref="HRK" />
             <field eval="385" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="ht" model="res.country">
             <field name="name">Haiti</field>
@@ -699,6 +712,7 @@
             <field file="base/static/img/country_flags/hu.png" name="image" type="base64" />
             <field name="currency_id" ref="HUF" />
             <field eval="36" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="id" model="res.country">
             <field name="name">Indonesia</field>
@@ -713,6 +727,7 @@
             <field file="base/static/img/country_flags/ie.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="353" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="il" model="res.country">
             <field name="name">Israel</field>
@@ -732,9 +747,10 @@
             <field name="name">India</field>
             <field name="code">in</field>
             <field file="base/static/img/country_flags/in.png" name="image" type="base64" />
-            <field eval="'%(street)s\n%(street2)s\n%(city)s %(zip)s\n%(state_name)s\n%(country_name)s'" name="address_format" />
+            <field eval="'%(street)s\n%(street2)s\n%(city)s %(zip)s\n%(state_name)s %(state_code)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="INR" />
             <field eval="91" name="phone_code" />
+            <field name="vat_label">GSTIN</field>
         </record>
         <record id="io" model="res.country">
             <field name="name">British Indian Ocean Territory</field>
@@ -770,6 +786,7 @@
             <field file="base/static/img/country_flags/it.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="39" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="je" model="res.country">
             <field name="name">Jersey</field>
@@ -934,6 +951,7 @@
             <field file="base/static/img/country_flags/lt.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR"/>
             <field eval="370" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="lu" model="res.country">
             <field name="name">Luxembourg</field>
@@ -941,6 +959,7 @@
             <field file="base/static/img/country_flags/lu.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="352" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="lv" model="res.country">
             <field name="name">Latvia</field>
@@ -948,6 +967,7 @@
             <field file="base/static/img/country_flags/lv.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR"/>
             <field eval="371" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="ly" model="res.country">
             <field name="name">Libya</field>
@@ -1073,6 +1093,7 @@
             <field file="base/static/img/country_flags/mt.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="356" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="mu" model="res.country">
             <field name="name">Mauritius</field>
@@ -1165,6 +1186,7 @@
             <field eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" name="address_format" />
             <field name="currency_id" ref="EUR" />
             <field eval="31" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="no" model="res.country">
             <field name="name">Norway</field>
@@ -1257,6 +1279,7 @@
             <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
             <field name="currency_id" ref="PLN" />
             <field eval="48" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="pm" model="res.country">
             <field name="name">Saint Pierre and Miquelon</field>
@@ -1291,6 +1314,7 @@
             <field file="base/static/img/country_flags/pt.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="351" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="pw" model="res.country">
             <field name="name">Palau</field>
@@ -1325,6 +1349,7 @@
             <field file="base/static/img/country_flags/ro.png" name="image" type="base64" />
             <field name="currency_id" ref="RON" />
             <field eval="40" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="rs" model="res.country">
             <field name="name">Serbia</field>
@@ -1381,6 +1406,7 @@
             <field file="base/static/img/country_flags/se.png" name="image" type="base64" />
             <field name="currency_id" ref="SEK" />
             <field eval="46" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="sg" model="res.country">
             <field name="name">Singapore</field>
@@ -1402,6 +1428,7 @@
             <field file="base/static/img/country_flags/si.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
             <field eval="386" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="sj" model="res.country">
             <field name="name">Svalbard and Jan Mayen</field>
@@ -1415,6 +1442,7 @@
             <field file="base/static/img/country_flags/sk.png" name="image" type="base64" />
             <field name="currency_id" ref="SKK" />
             <field eval="421" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="sl" model="res.country">
             <field name="name">Sierra Leone</field>
@@ -1626,6 +1654,7 @@
             <field file="base/static/img/country_flags/gb.png" name="image" type="base64" />
             <field name="currency_id" ref="GBP" />
             <field eval="0" name="phone_code" />
+            <field name="vat_label">VAT</field>
         </record>
         <record id="um" model="res.country">
             <field name="name">USA Minor Outlying Islands</field>
diff --git a/odoo/addons/base/res/res_country_view.xml b/odoo/addons/base/res/res_country_view.xml
index 5b883b993e3..aede3731c9d 100644
--- a/odoo/addons/base/res/res_country_view.xml
+++ b/odoo/addons/base/res/res_country_view.xml
@@ -31,6 +31,7 @@
                         </group>
                         <group>
                             <field name="phone_code"/>
+                            <field name="vat_label"/>
                         </group>
                         <group string="Advanced Address Formatting" groups="base.group_no_one" col="4" colspan="4">
                             <field name="address_view_id"/>
diff --git a/odoo/api.py b/odoo/api.py
index 506c344da30..143f51bc31c 100644
--- a/odoo/api.py
+++ b/odoo/api.py
@@ -692,9 +692,9 @@ def call_kw(model, name, args, kwargs):
 class Environment(Mapping):
     """ An environment wraps data for ORM records:
 
-         - :attr:`cr`, the current database cursor;
-         - :attr:`uid`, the current user id;
-         - :attr:`context`, the current context dictionary.
+        - :attr:`cr`, the current database cursor;
+        - :attr:`uid`, the current user id;
+        - :attr:`context`, the current context dictionary.
 
         It provides access to the registry by implementing a mapping from model
         names to new api models. It also holds a cache for records, and a data
diff --git a/odoo/release.py b/odoo/release.py
index c563d9ff4cd..81059d81bf1 100644
--- a/odoo/release.py
+++ b/odoo/release.py
@@ -12,7 +12,7 @@ RELEASE_LEVELS_DISPLAY = {ALPHA: ALPHA,
 # properly comparable using normal operarors, for example:
 #  (6,1,0,'beta',0) < (6,1,0,'candidate',1) < (6,1,0,'candidate',2)
 #  (6,1,0,'candidate',2) < (6,1,0,'final',0) < (6,1,2,'final',0)
-version_info = (11, 0, 0, ALPHA, 1, '')
+version_info = (10, 'saas~18', 0, FINAL, 0, '')
 version = '.'.join(str(s) for s in version_info[:2]) + RELEASE_LEVELS_DISPLAY[version_info[3]] + str(version_info[4] or '') + version_info[5]
 series = serie = major_version = '.'.join(str(s) for s in version_info[:2])