diff --git a/soong_workflow/views/menuitem.xml b/soong_workflow/views/menuitem.xml index df90f4484..f4b11c6ce 100644 --- a/soong_workflow/views/menuitem.xml +++ b/soong_workflow/views/menuitem.xml @@ -3,7 +3,7 @@ - - - - - + + + + + + + + + + + + + + - - - + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/yuthon_hr_employee_approval/views/yuthon_department_change_viwes.xml b/yuthon_hr_employee_approval/views/yuthon_department_change_viwes.xml index 9bbe8936b..74c1a6e53 100644 --- a/yuthon_hr_employee_approval/views/yuthon_department_change_viwes.xml +++ b/yuthon_hr_employee_approval/views/yuthon_department_change_viwes.xml @@ -58,8 +58,8 @@ - + diff --git a/yuthon_performance/views/performacne_menu.xml b/yuthon_performance/views/performacne_menu.xml index 356b6cdec..0b31212fd 100644 --- a/yuthon_performance/views/performacne_menu.xml +++ b/yuthon_performance/views/performacne_menu.xml @@ -4,70 +4,70 @@ - - - - - - - - - - + sequence="28"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - - - - + diff --git a/yuthon_purchase/__init__.py b/yuthon_purchase/__init__.py new file mode 100644 index 000000000..9a7e03ede --- /dev/null +++ b/yuthon_purchase/__init__.py @@ -0,0 +1 @@ +from . import models \ No newline at end of file diff --git a/yuthon_purchase/__manifest__.py b/yuthon_purchase/__manifest__.py new file mode 100644 index 000000000..49aaf4b1d --- /dev/null +++ b/yuthon_purchase/__manifest__.py @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +{ + 'name': "Yuthon PurchaseOrder", + 'summary': "", + 'description': """采购单 """, + 'category': 'zhou', + 'version': '0.1', + 'license': 'LGPL-3', + 'depends': ['base', 'soong_workflow', 'hr', 'product', 'documents', 'purchase'], + 'data': [ + 'security/ir.model.access.csv', + 'views/inherit_purchase_order_views.xml', + ], + 'installable': True, + 'application': True, + +} diff --git a/yuthon_purchase/models/__init__.py b/yuthon_purchase/models/__init__.py new file mode 100644 index 000000000..5799c1a8d --- /dev/null +++ b/yuthon_purchase/models/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import inherit_purchase_order diff --git a/yuthon_purchase/models/inherit_purchase_order.py b/yuthon_purchase/models/inherit_purchase_order.py new file mode 100644 index 000000000..d64fe631a --- /dev/null +++ b/yuthon_purchase/models/inherit_purchase_order.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models + + +class YuthonPurchaseOrder(models.Model): + _name = 'purchase.order' + _inherit = 'purchase.order' + + company_id = fields.Many2one('res.company', string="公司", default=lambda self: self.env.company) + user_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user) + department_id = fields.Many2one(related='user_id.employee_id.department_id', string="部门") + start_date = fields.Date(string="申请日期", default=fields.Date.today) + code = fields.Char(string="合同编号") + reason_text = fields.Html(string='申请事由') + document_ids = fields.Many2many('ir.attachment', string="附件") + service_content = fields.Text(string="服务内容") + service_start_date = fields.Date(string="服务开始时间") + service_end_date = fields.Date(string="服务结束时间") + type_of_procurement = fields.Selection([('service', '服务'), ('product', '低值易耗/固定资产')], string="采购类型") + purchase_order_models_ids = fields.One2many('purchase.order.pay.line', 'purchase_id', string="付款详情") + + +class PurchaseOrderPayLine(models.Model): + _name = "purchase.order.pay.line" + _description = "付款详情" + + purchase_id = fields.Many2one('purchase.order', string="关联采购单") + payment_stage = fields.Char(string="付款阶段") + amount = fields.Char(string="比例/金额") + payment_date = fields.Date(string="付款日期") + remake = fields.Char(string="条件") \ No newline at end of file diff --git a/yuthon_purchase/security/ir.model.access.csv b/yuthon_purchase/security/ir.model.access.csv new file mode 100644 index 000000000..209306e1a --- /dev/null +++ b/yuthon_purchase/security/ir.model.access.csv @@ -0,0 +1,2 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_purchase_order_pay_line, purchase_order_pay_line,model_purchase_order_pay_line,,1,1,1,1 \ No newline at end of file diff --git a/yuthon_purchase/views/inherit_purchase_order_views.xml b/yuthon_purchase/views/inherit_purchase_order_views.xml new file mode 100644 index 000000000..99d553f43 --- /dev/null +++ b/yuthon_purchase/views/inherit_purchase_order_views.xml @@ -0,0 +1,42 @@ + + + + purchase.order.form.inherit + purchase.order + + + + + + + + + + + + + + + + + 1 + + + 1 + + + + + + + + + + + + + + + + + diff --git a/yuthon_will_task/views/yuthon_task_menu.xml b/yuthon_will_task/views/yuthon_task_menu.xml index 732fa795d..833b9b319 100644 --- a/yuthon_will_task/views/yuthon_task_menu.xml +++ b/yuthon_will_task/views/yuthon_task_menu.xml @@ -1,7 +1,7 @@ diff --git a/yuthon_work_brand/__manifest__.py b/yuthon_work_brand/__manifest__.py index 2f36fc813..a4c15bcf1 100644 --- a/yuthon_work_brand/__manifest__.py +++ b/yuthon_work_brand/__manifest__.py @@ -6,7 +6,7 @@ 'hr', 'yuthon_holiday', 'hr_attendance', 'hr_holidays', 'hr_payroll', 'yuthon_hr_attendance', 'website', 'yuthon_hr_employee', - 'yuthon_salary', 'yuthon_sps_approval', 'yuthon_property', 'yuthon_property_approval', + 'yuthon_salary', 'yuthon_sps_approval', 'yuthon_property', 'yuthon_property_approval', 'yuthon_performance', 'resource', 'yuthon_hr_employee_approval', 'planning', 'yuthon_maintain', 'maintenance', ], 'data': [ diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml index f63f7e904..1949bae3f 100644 --- a/yuthon_work_brand/views/hr_menus.xml +++ b/yuthon_work_brand/views/hr_menus.xml @@ -5,6 +5,17 @@ name="人力资源" web_icon="yuthon_work_brand,static/description/hr.png" sequence="40"/> + + + + + + + - - + + - + + + + + + + + + + + + + + + + + + sequence="15"/> + + + + + + + + + + + + + + + + + + + + + + + + + sequence="20"/> - - - + sequence="80"/> + + + + + + + + + + + + + + + + + + sequence="29"/> + sequence="1"/> + + - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + sequence="45"/>