diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..3f5a729dff38399f2202020f87b701b6d4fd2ea2 --- /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 72f60099abbfeaf61e7693057242b9bfebccc15a..e44d420b71e22789301467728158e86eee09e620 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 c8f84eb0c7f3b38c559b01c1fa18866cc256eeff..f44cf85e4116a38b8e452a6c9a1855a0bbaae863 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 7298eae2f6442e0142a24c88160380062393ba2a..c7a67453f63d76030a763ab0ae5c0faf73fbd1fb 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 6b2703da270d19d3efab0844ce28b283dd47feb9..ddd60e57502353636fa5ec8f5127b58844bf19ce 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 1b4cecf148c494b93fa3d7357e3c956c42b3127f..65a65b7f4fe770a5d9079ac41872600b46a82f21 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 b7d06afaab6d43cba7b2dcaf3fe8096881ac33fa..6fc4b9b303a18e882ed4761e2997ba5733af1310 100644 --- a/appstore/site_project/views/dtcloud_project_setting.xml +++ b/appstore/site_project/views/dtcloud_project_setting.xml @@ -58,7 +58,7 @@