From 981864329dd4d27030d3a6aa9cfe98b1c3ec18c2 Mon Sep 17 00:00:00 2001 From: Martin Glueck Date: Wed, 29 Nov 2017 11:02:44 +0100 Subject: [PATCH] Server config for TZDEV added, line and product categories added --- dev/odoo-server-dev-tzdev.conf | 26 +++++++++++++++++++ ext/custom-addons/dp_dmi/product.category.csv | 6 ++++- ext/custom-addons/dp_dmi/res.line.csv | 8 +++++- setup/lib/environments.py | 18 ++++++++----- 4 files changed, 50 insertions(+), 8 deletions(-) create mode 100644 dev/odoo-server-dev-tzdev.conf diff --git a/dev/odoo-server-dev-tzdev.conf b/dev/odoo-server-dev-tzdev.conf new file mode 100644 index 00000000..a8d67f3f --- /dev/null +++ b/dev/odoo-server-dev-tzdev.conf @@ -0,0 +1,26 @@ +[options] + +xmlrpc_port = 8080 +; This is the password that allows database operations: +; admin_passwd = admin +db_host = 10.1.2.195 +db_port = 5432 +db_user = tzaustria +db_password = TzaAdm0! + +addons_path = ext/odoo/addons,ext/3rd-party-addons,ext/custom-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 + +#dbfilter_test = ['.*',] +show_debug = 1 + +workers = 0 +server_wide_modules = web,base_sparse_field,queue_job + +portal_url = https://erp.tzaustria.info +portal_secret = secret + +[queue_job] +channels = root:4 diff --git a/ext/custom-addons/dp_dmi/product.category.csv b/ext/custom-addons/dp_dmi/product.category.csv index a3c0a98e..6a146fd5 100644 --- a/ext/custom-addons/dp_dmi/product.category.csv +++ b/ext/custom-addons/dp_dmi/product.category.csv @@ -1,2 +1,6 @@ "id","name","code" -"dp_dmi.unique_category_id","Holz","45A3" +"mc_material","Material","__material" +"mc_edge","Edge","__edge" +"mc_surface","Surface","__surface" +"mc_connector","Connector","__connector" +"mc_work","Worktime","__work" diff --git a/ext/custom-addons/dp_dmi/res.line.csv b/ext/custom-addons/dp_dmi/res.line.csv index 7f428d84..07ec605c 100644 --- a/ext/custom-addons/dp_dmi/res.line.csv +++ b/ext/custom-addons/dp_dmi/res.line.csv @@ -1,2 +1,8 @@ "id","name","description" -"dp_dmi.unique_line_id","1234","Produktionslinie 1" +"l0001","0001","TZ Austria" +"l0001I","0001","TZ Austria (internal)" +"l0002","0002","TZ Bandung" +"l0002I","0002I","TZ Bandung (internal)" +"l0003","0003","TZ Malaysia" +"l0003I","0003I","TZ Malaysia (internal)" + diff --git a/setup/lib/environments.py b/setup/lib/environments.py index 2c831f95..0106e8ae 100644 --- a/setup/lib/environments.py +++ b/setup/lib/environments.py @@ -28,14 +28,20 @@ Port: %s ENVIRONMENTS = { # Local environments are listed with passwords - 'br': Environment('http://localhost', '8080', 'tz-austria_1', 'tz-admin', 'x', 'admin', config=ConfigTZA()), - 'br-glaser': Environment('http://localhost', '8080', 'tz-austria_1', 'glaser-admin', 'x', 'admin', config=ConfigGlaser()), + 'tzdev' : Environment('http://10.1.2.195', "8080", "tz-austria_1", "admin", "x", "admin", config = ConfigTZA()), + 'tzdev-tz' : Environment('http://10.1.2.195', "8080", "tz-austria_1", "tz-admin", "x", "admin", config = ConfigTZA()), + 'tzdev-glaser': Environment("http://10.1.2.195", "8080", "tz-austria_1", "glaser-admin", "x", "admin", config = ConfigGlaser()), + + 'oa' : Environment('http://localhost', "8080", "tz-austria_1", "admin", "x", "admin", config = ConfigTZA()), + 'oa-glaser' : Environment('http://localhost', "8080'" "tz-austria_1", "admin", "x", "admin", config = ConfigGlaser()), - 'aa': Environment('http://localhost', '8080', 'tz-austria_1', 'admin', 'x', 'admin', config=ConfigTZA()), - 'aa-tz': Environment('http://localhost', '8080', 'tz-austria_1', 'tz-admin', 'x', 'admin', config=ConfigTZA()), - 'aa-glaser': Environment('http://localhost', '8080', 'tz-austria_1', 'glaser-admin', 'x', 'admin', config=ConfigGlaser()), - 'oa': Environment('http://localhost', '8080', 'tz-austria_1', 'admin', 'x', 'admin'), + 'br' : Environment('http://localhost', '8080', 'tz-austria_1', 'tz-admin', 'x', 'admin', config = ConfigTZA()), + 'br-glaser' : Environment('http://localhost', '8080', 'tz-austria_1', 'glaser-admin', 'x', 'admin', config = ConfigGlaser()), + 'aa' : Environment('http://localhost', '8080', 'tz-austria_1', 'admin', 'x', 'admin', config = ConfigTZA()), + 'aa-tz' : Environment('http://localhost', '8080', 'tz-austria_1', 'tz-admin', 'x', 'admin', config = ConfigTZA()), + 'aa-glaser' : Environment('http://localhost', '8080', 'tz-austria_1', 'glaser-admin', 'x', 'admin', config = ConfigGlaser()), + # Remote environments are always listed without passwords! # Do not store them here, you have to type them anyway! 'test': Environment('https://tz-austria.datenpol.at', '443', 'tz-austria_1', 'admin'),