Merge remote-tracking branch 'origin/develop' into develop

dev/odoo-server-dev-br.conf

@@ -8,7 +8,7 @@ db_port = 5432
 db_user = False
 db_password = False
 
-addons_path = ext/odoo/addons,ext/custom-addons
+addons_path = ext/odoo/addons,ext/custom-addons,ext/3rd-party-addons
 ; For enterprise use the addons path bellow
 ; addons_path = ext/enterprise-addons,ext/odoo/addons,ext/3rd-party-addons,ext/custom-addons,dmi/run1
 timezone = Europe/Vienna

ext/custom-addons/dp_custom/__manifest__.py

@@ -30,7 +30,9 @@
     'website': 'http://www.datenpol.at/',
     'depends': [
         'base',
-        'partner_second_lastname'
+        'partner_second_lastname',
+        'account',
+        'sale_stock'
     ],
     'data': [
         'data/dp_custom_data.xml',

ext/custom-addons/dp_custom/data/glaser_company_data.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo noupdate="0">
+<odoo noupdate="1">
     <record id="glaser_and_co_company" model="res.company">
         <field name="name">Glaser &amp; Co.</field>
         <field name="street">Neugasse 36</field>

ext/custom-addons/dp_custom/data/tz_austria_company_data.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo noupdate="0">
+<odoo noupdate="1">
     <record id="tz_admin_user" model="res.users">
         <field name="lastname">TZ Tischlerzentrum ADMIN</field>
         <field name="login">tz-admin</field>

setup/lib/config_at.py

@@ -192,8 +192,8 @@ class Config():
             'sale_management',
             'l10n_at',
             'dp_custom',
-            'dp_custom_reports_sale',
-            'dp_custom_reports_account',
+            'dp_reports_sale',
+            'dp_reports_account',
             # 'dp_reports_purchase',
             # 'dp_reports_stock',
             'account_cancel',