tzaustria
/
odoo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://gitlab.datenpol.at:122/odoo/tz-austria into develop

develop
Andreas Brückl 2017-12-20 15:10:20 +01:00
parent 723e7c4226 439f545c9c
commit 2162198b85
5 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ext/custom-addons/dp_custom/data/glaser_company_data.xml
View File

@ -37,6 +37,7 @@
(4,ref('base.group_system')), (4,ref('base.group_system')),
(4,ref('base.group_partner_manager')), (4,ref('base.group_partner_manager')),
(4,ref('account.group_account_user')), (4,ref('account.group_account_user')),
(4,ref('website.group_website_designer')),
(4,ref('queue_job.group_queue_job_manager'))]"/> (4,ref('queue_job.group_queue_job_manager'))]"/>
</record> </record>

1
ext/custom-addons/dp_custom/data/tz_austria_company_data.xml
View File

@ -13,6 +13,7 @@
(4,ref('base.group_system')), (4,ref('base.group_system')),
(4,ref('base.group_partner_manager')), (4,ref('base.group_partner_manager')),
(4,ref('account.group_account_user')), (4,ref('account.group_account_user')),
(4,ref('website.group_website_designer')),
(4,ref('queue_job.group_queue_job_manager'))]"/> (4,ref('queue_job.group_queue_job_manager'))]"/>
</record> </record>

1
setup/lib/config_glaser.py
View File

@ -23,7 +23,6 @@ class ConfigGlaser(Config):
'vat': 'ATU17860303', 'vat': 'ATU17860303',
'vat_check_vies': True, 'vat_check_vies': True,
'logo': '../ext/custom-addons/dp_custom/static/src/img/logo_glaser.png', 'logo': '../ext/custom-addons/dp_custom/static/src/img/logo_glaser.png',
'supplier': True,
#'favicon_backend': '../ext/custom-addons/dp_custom/static/src/img/favicon.ico', #'favicon_backend': '../ext/custom-addons/dp_custom/static/src/img/favicon.ico',
#'favicon_backend_mimetype': 'image/x-icon' #'favicon_backend_mimetype': 'image/x-icon'
} }

1
setup/lib/config_tza.py
View File

@ -23,7 +23,6 @@ class ConfigTZA(Config):
'vat': 'ATU 54619104', 'vat': 'ATU 54619104',
'vat_check_vies': True, 'vat_check_vies': True,
'logo': '../ext/custom-addons/dp_custom/static/src/img/logo.png', 'logo': '../ext/custom-addons/dp_custom/static/src/img/logo.png',
'customer': True,
#'favicon_backend': '../ext/custom-addons/dp_custom/static/src/img/favicon.ico', #'favicon_backend': '../ext/custom-addons/dp_custom/static/src/img/favicon.ico',
#'favicon_backend_mimetype': 'image/x-icon' #'favicon_backend_mimetype': 'image/x-icon'
} }

2
setup/lib/environments.py
View File

@ -34,7 +34,7 @@ ENVIRONMENTS = {
'oa' : Environment('http://localhost', "8080", "tz-austria_1", "admin", "x", "admin", config = ConfigTZA()), 'oa' : Environment('http://localhost', "8080", "tz-austria_1", "admin", "x", "admin", config = ConfigTZA()),
'oa-tz' : Environment('http://localhost', "8080", "tz-austria_1", "tz-admin", "x", "admin", config = ConfigTZA()), 'oa-tz' : Environment('http://localhost', "8080", "tz-austria_1", "tz-admin", "x", "admin", config = ConfigTZA()),
'oa-glaser' : Environment('http://localhost', "8080'" "tz-austria_1", "admin", "x", "admin", config = ConfigGlaser()), 'oa-glaser' : Environment('http://localhost', "8080", "tz-austria_1", "glaser-admin", "x", "admin", config = ConfigGlaser()),
'br' : Environment('http://localhost', '8080', 'tz-austria_1', 'admin', 'x', 'admin', config = ConfigTZA()), 'br' : Environment('http://localhost', '8080', 'tz-austria_1', 'admin', 'x', 'admin', config = ConfigTZA()),
'br-tz' : Environment('http://localhost', '8080', 'tz-austria_1', 'tz-admin', 'x', 'admin', config = ConfigTZA()), 'br-tz' : Environment('http://localhost', '8080', 'tz-austria_1', 'tz-admin', 'x', 'admin', config = ConfigTZA()),