[MERGE] Forward-port 9.0 up to 422f3b5

.mailmap

@@ -416,6 +416,7 @@ Jay Vora <[email protected]> jvo(OpenERP) <>
 Jay Vora <[email protected]> [email protected] <>
 Jay Vora (Serpent CS) <[email protected]>
 Jay Vora (Serpent CS) <[email protected]> <[email protected]>
+Jay Vora (Serpent CS) <[email protected]> <[email protected]>
 Jaydeep Barot <[email protected]>
 Jaydeep Barot <[email protected]> <[email protected]>
 Jaydeep Barot <[email protected]> <[email protected]>
@@ -724,6 +725,7 @@ Quentin De Paoli <[email protected]> <[email protected]>
 Quentin De Paoli <[email protected]> <[email protected]>
 Quentin De Paoli <[email protected]> <[email protected]>
 Quentin De Paoli <[email protected]> <[email protected]>
+Quentin De Paoli <[email protected]> OpenERP <openerp@ubuntu>
 Quentin De Paoli <[email protected]> Quentin <qdp@jade>
 Quentin De Paoli <[email protected]> Quentin De Paoli <>
 Quentin De Paoli <[email protected]> Quentin De Paoli <qdp@cyan>
@@ -823,8 +825,10 @@ Rolv Råen <[email protected]>
 Rolv Råen <[email protected]> [email protected] <>
 Ronak Baxi <[email protected]>
 Ronak Baxi <[email protected]> Ronak Baxi <[email protected]>
-Ronald Portier <[email protected]>
-Ronald Portier <[email protected]> Ronald Portier (Therp) <>
+Ronald Portier <[email protected]>
+Ronald Portier <[email protected]> Ronald Portier (Therp) <>
+Ronald Portier <[email protected]> Ronald Portier (Therp) <>
+Ronald Portier <[email protected]> <[email protected]>
 Rucha Patel <[email protected]>
 Rucha Patel <[email protected]> <[email protected]>
 Rucha Patel <[email protected]> <[email protected]>

.tx/config

@@ -362,11 +362,6 @@ file_filter = addons/l10n_br/i18n/<lang>.po
 source_file = addons/l10n_br/i18n/l10n_br.pot
 source_lang = en
 
-[odoo-9.l10n_ca]
-file_filter = addons/l10n_ca/i18n/<lang>.po
-source_file = addons/l10n_ca/i18n/l10n_ca.pot
-source_lang = en
-
 [odoo-9.l10n_ch]
 file_filter = addons/l10n_ch/i18n/<lang>.po
 source_file = addons/l10n_ch/i18n/l10n_ch.pot
@@ -377,11 +372,6 @@ file_filter = addons/l10n_cl/i18n/<lang>.po
 source_file = addons/l10n_cl/i18n/l10n_cl.pot
 source_lang = en
 
-[odoo-9.l10n_cn]
-file_filter = addons/l10n_cn/i18n/<lang>.po
-source_file = addons/l10n_cn/i18n/l10n_cn.pot
-source_lang = en
-
 [odoo-9.l10n_co]
 file_filter = addons/l10n_co/i18n/<lang>.po
 source_file = addons/l10n_co/i18n/l10n_co.pot
@@ -397,36 +387,16 @@ file_filter = addons/l10n_de/i18n/<lang>.po
 source_file = addons/l10n_de/i18n/l10n_de.pot
 source_lang = en
 
-[odoo-9.l10n_de_skr03]
-file_filter = addons/l10n_de_skr03/i18n/<lang>.po
-source_file = addons/l10n_de_skr03/i18n/l10n_de_skr03.pot
-source_lang = en
-
-[odoo-9.l10n_de_skr04]
-file_filter = addons/l10n_de_skr04/i18n/<lang>.po
-source_file = addons/l10n_de_skr04/i18n/l10n_de_skr04.pot
-source_lang = en
-
 [odoo-9.l10n_do]
 file_filter = addons/l10n_do/i18n/<lang>.po
 source_file = addons/l10n_do/i18n/l10n_do.pot
 source_lang = en
 
-[odoo-9.l10n_ec]
-file_filter = addons/l10n_ec/i18n/<lang>.po
-source_file = addons/l10n_ec/i18n/l10n_ec.pot
-source_lang = en
-
 [odoo-9.l10n_es]
 file_filter = addons/l10n_es/i18n/<lang>.po
 source_file = addons/l10n_es/i18n/l10n_es.pot
 source_lang = en
 
-[odoo-9.l10n_et]
-file_filter = addons/l10n_et/i18n/<lang>.po
-source_file = addons/l10n_et/i18n/l10n_et.pot
-source_lang = en
-
 [odoo-9.l10n_eu_service]
 file_filter = addons/l10n_eu_service/i18n/<lang>.po
 source_file = addons/l10n_eu_service/i18n/l10n_eu_service.pot
@@ -437,11 +407,6 @@ file_filter = addons/l10n_fr/i18n/<lang>.po
 source_file = addons/l10n_fr/i18n/l10n_fr.pot
 source_lang = en
 
-[odoo-9.l10n_generic_coa]
-file_filter = addons/l10n_generic_coa/i18n/<lang>.po
-source_file = addons/l10n_generic_coa/i18n/l10n_generic_coa.pot
-source_lang = en
-
 [odoo-9.l10n_gr]
 file_filter = addons/l10n_gr/i18n/<lang>.po
 source_file = addons/l10n_gr/i18n/l10n_gr.pot
@@ -462,11 +427,6 @@ file_filter = addons/l10n_hr/i18n/<lang>.po
 source_file = addons/l10n_hr/i18n/l10n_hr.pot
 source_lang = en
 
-[odoo-9.l10n_hu]
-file_filter = addons/l10n_hu/i18n/<lang>.po
-source_file = addons/l10n_hu/i18n/l10n_hu.pot
-source_lang = en
-
 [odoo-9.l10n_in]
 file_filter = addons/l10n_in/i18n/<lang>.po
 source_file = addons/l10n_in/i18n/l10n_in.pot
@@ -477,11 +437,6 @@ file_filter = addons/l10n_in_hr_payroll/i18n/<lang>.po
 source_file = addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
 source_lang = en
 
-[odoo-9.l10n_it]
-file_filter = addons/l10n_it/i18n/<lang>.po
-source_file = addons/l10n_it/i18n/l10n_it.pot
-source_lang = en
-
 [odoo-9.l10n_jp]
 file_filter = addons/l10n_jp/i18n/<lang>.po
 source_file = addons/l10n_jp/i18n/l10n_jp.pot
@@ -542,6 +497,11 @@ file_filter = addons/l10n_ro/i18n/<lang>.po
 source_file = addons/l10n_ro/i18n/l10n_ro.pot
 source_lang = en
 
+[odoo-9.l10n_sa]
+file_filter = addons/l10n_sa/i18n/<lang>.po
+source_file = addons/l10n_sa/i18n/l10n_sa.pot
+source_lang = en
+
 [odoo-9.l10n_sg]
 file_filter = addons/l10n_sg/i18n/<lang>.po
 source_file = addons/l10n_sg/i18n/l10n_sg.pot
@@ -717,6 +677,11 @@ file_filter = addons/portal_sale/i18n/<lang>.po
 source_file = addons/portal_sale/i18n/portal_sale.pot
 source_lang = en
 
+[odoo-9.pos_cache]
+file_filter = addons/pos_cache/i18n/<lang>.po
+source_file = addons/pos_cache/i18n/pos_cache.pot
+source_lang = en
+
 [odoo-9.pos_discount]
 file_filter = addons/pos_discount/i18n/<lang>.po
 source_file = addons/pos_discount/i18n/pos_discount.pot

addons/account/__init__.py

@@ -20,9 +20,15 @@ def _auto_install_l10n(cr, registry):
             module_list.append('l10n_' + country_code.lower())
         if country_code == 'US':
             module_list.append('account_plaid')
+            module_list.append('account_check_printing')
         if country_code in ['US', 'AU', 'NZ']:
             module_list.append('account_yodlee')
 
+        #european countries will be using SEPA
+        europe = registry['ir.model.data'].xmlid_to_object(cr, SUPERUSER_ID, 'base.europe', raise_if_not_found=False, context={})
+        if europe:
+            europe_country_codes = [x.code for x in europe.country_ids]
+            if country_code in europe_country_codes:
+                module_list.append('account_sepa')
         module_ids = registry['ir.module.module'].search(cr, SUPERUSER_ID, [('name', 'in', module_list), ('state', '=', 'uninstalled')])
         registry['ir.module.module'].button_install(cr, SUPERUSER_ID, module_ids, {})
-

addons/account/data/invoice_action_data.xml

@@ -52,18 +52,7 @@
     </div>
     <div style="width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;">
         <span style="color: #222; margin-bottom: 5px; display: block; ">
-        % if object.company_id.street:
-            ${object.company_id.street}<br/>
-        % endif
-        % if object.company_id.street2:
-            ${object.company_id.street2}<br/>
-        % endif
-        % if object.company_id.city or object.company_id.zip:
-            ${object.company_id.zip} ${object.company_id.city}<br/>
-        % endif
-        % if object.company_id.country_id:
-            ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>
-        % endif
+            ${object.company_id.partner_id.sudo().with_context(show_address=True, html_format=True).name_get()[0][1] | safe}
         </span>
         % if object.company_id.phone:
             <div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; ">