From 3647a3f6bc3ced23b2efe3d67d3d2ae4e48bc6d2 Mon Sep 17 00:00:00 2001 From: ongood Date: Tue, 19 Oct 2021 20:47:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=99=BA=E6=85=A7=E5=B7=A5?= =?UTF-8?q?=E8=B5=84=E8=8F=9C=E5=8D=95=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 103 ++++++++++++++++++ appstore/site_project/__manifest__.py | 52 ++++----- .../views/dtcloud_corporation_setting.xml | 2 +- .../site_project/views/dtcloud_project.xml | 10 +- .../views/dtcloud_project_group.xml | 4 +- .../views/dtcloud_project_milepost.xml | 4 +- .../views/dtcloud_project_setting.xml | 36 +++--- .../views/dtcloud_project_task.xml | 4 +- .../site_project/views/dtcloud_worker.xml | 2 +- .../views/dtcloud_worker_attendance.xml | 2 +- .../views/dtcloud_worker_certificate.xml | 2 +- .../site_project/views/dtcloud_worker_day.xml | 2 +- .../site_project/views/dtcloud_worker_hot.xml | 2 +- appstore/site_project/views/hr_department.xml | 2 +- .../site_project/views/res_users_inherits.xml | 2 +- 15 files changed, 166 insertions(+), 63 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..3f5a729df --- /dev/null +++ b/.gitignore @@ -0,0 +1,103 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class +.DS_Store +# C extensions + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST +.vscode/* + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +.hypothesis/ +.pytest_cache/ + +# Translations +*.mo + + +# Django stuff: +*.log +local_settings.py +db.sqlite3 + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ diff --git a/appstore/site_project/__manifest__.py b/appstore/site_project/__manifest__.py index 72f60099a..e44d420b7 100644 --- a/appstore/site_project/__manifest__.py +++ b/appstore/site_project/__manifest__.py @@ -20,35 +20,35 @@ 'website': '', 'depends': ['base', 'Amos_City','dtcloud_api'], 'data': [ - # 'security/security.xml', - # 'security/ir.model.access.csv', - # 'data/custom_sequence.xml', - # 'data/custom_data.xml', - # 'data/source_data.xml', + 'security/security.xml', + 'security/ir.model.access.csv', + 'data/custom_sequence.xml', + 'data/custom_data.xml', + 'data/source_data.xml', 'views/main_menu.xml', - # 'views/res_company.xml', - # 'views/hr_department.xml', - # 'views/res_users.xml', - # 'views/dtcloud_project_setting.xml', - # 'views/dtcloud_project.xml', - # 'views/dtcloud_project_group.xml', - # 'views/dtcloud_worker.xml', - # 'views/dtcloud_worker_attendance.xml', - # 'views/dtcloud_worker_hot.xml', - # 'views/dtcloud_project_milepost.xml', - # 'views/dtcloud_project_task.xml', - # 'views/dtcloud_worker_day.xml', - # 'views/dtcloud_worker_certificate.xml', - # 'views/res_users_inherits.xml', - # - # 'wizard/dtcloud_project_import_wizard.xml', - # 'wizard/dtcloud_project_layer_wizard.xml', - # 'wizard/dtcloud_project_data_wizard.xml', - # 'wizard/dtcloud_worker_driver_wizard.xml', - # 'wizard/dtcloud_milepost_import_wizard.xml', - # 'wizard/dtcloud_change_company_wizard.xml', + 'views/res_company.xml', + 'views/hr_department.xml', + 'views/res_users.xml', + 'views/dtcloud_project_setting.xml', + 'views/dtcloud_project.xml', + 'views/dtcloud_project_group.xml', + 'views/dtcloud_worker.xml', + 'views/dtcloud_worker_attendance.xml', + 'views/dtcloud_worker_hot.xml', + 'views/dtcloud_project_milepost.xml', + 'views/dtcloud_project_task.xml', + 'views/dtcloud_worker_day.xml', + 'views/dtcloud_worker_certificate.xml', + 'views/res_users_inherits.xml', + + 'wizard/dtcloud_project_import_wizard.xml', + 'wizard/dtcloud_project_layer_wizard.xml', + 'wizard/dtcloud_project_data_wizard.xml', + 'wizard/dtcloud_worker_driver_wizard.xml', + 'wizard/dtcloud_milepost_import_wizard.xml', + 'wizard/dtcloud_change_company_wizard.xml', ], 'installable': True, 'application': True, diff --git a/appstore/site_project/views/dtcloud_corporation_setting.xml b/appstore/site_project/views/dtcloud_corporation_setting.xml index c8f84eb0c..f44cf85e4 100644 --- a/appstore/site_project/views/dtcloud_corporation_setting.xml +++ b/appstore/site_project/views/dtcloud_corporation_setting.xml @@ -109,7 +109,7 @@ action="action_dtcloud_corporation_setting" id="menu_dtcloud_corporation_setting_view" sequence="100" - parent="dtcloud_project.menu_dtcloud_project_main"/> + parent="site_project.menu_site_project_main"/> \ No newline at end of file diff --git a/appstore/site_project/views/dtcloud_project.xml b/appstore/site_project/views/dtcloud_project.xml index 7298eae2f..c7a67453f 100644 --- a/appstore/site_project/views/dtcloud_project.xml +++ b/appstore/site_project/views/dtcloud_project.xml @@ -363,10 +363,10 @@ + parent="site_project.menu_site_project_main"/> @@ -427,7 +427,7 @@ ir.actions.act_window dtcloud.project tree,form - {'form_view_ref': 'dtcloud_project.view_form_dtcloud_project2'} + {'form_view_ref': 'site_project.view_form_dtcloud_project2'}

创建单据. @@ -439,10 +439,10 @@ + parent="site_project.menu_site_project_main"/> dtcloud_project.device.form diff --git a/appstore/site_project/views/dtcloud_project_group.xml b/appstore/site_project/views/dtcloud_project_group.xml index 6b2703da2..ddd60e575 100644 --- a/appstore/site_project/views/dtcloud_project_group.xml +++ b/appstore/site_project/views/dtcloud_project_group.xml @@ -127,9 +127,9 @@ + parent="site_project.menu_site_project_main"/> \ No newline at end of file diff --git a/appstore/site_project/views/dtcloud_project_milepost.xml b/appstore/site_project/views/dtcloud_project_milepost.xml index 1b4cecf14..65a65b7f4 100644 --- a/appstore/site_project/views/dtcloud_project_milepost.xml +++ b/appstore/site_project/views/dtcloud_project_milepost.xml @@ -88,8 +88,8 @@ - + \ No newline at end of file diff --git a/appstore/site_project/views/dtcloud_project_setting.xml b/appstore/site_project/views/dtcloud_project_setting.xml index b7d06afaa..6fc4b9b30 100644 --- a/appstore/site_project/views/dtcloud_project_setting.xml +++ b/appstore/site_project/views/dtcloud_project_setting.xml @@ -58,7 +58,7 @@