diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py index 71d575a1b..1f30e5890 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard.py +++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py @@ -53,6 +53,7 @@ class SoongWorkflowCommentWizard(models.TransientModel): help='并:任何人均给意见,最后一个完成的人转交到下一节点.' '串:都会收到消息,但任意一个人转交后,即到下一节点,其他人将不再显示,相当于收回.') is_automatic = fields.Boolean('是否自动匹配') + is_this_company = fields.Boolean('本公司', default=True) employee_ids1 = fields.Many2many( 'hr.employee', 'employee_ids1_rel', diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml index e3bc792c4..0701daf16 100644 --- a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml +++ b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml @@ -58,8 +58,9 @@ + - + diff --git a/yuthon_partner/__init__.py b/yuthon_partner/__init__.py new file mode 100644 index 000000000..9a7e03ede --- /dev/null +++ b/yuthon_partner/__init__.py @@ -0,0 +1 @@ +from . import models \ No newline at end of file diff --git a/yuthon_partner/__manifest__.py b/yuthon_partner/__manifest__.py new file mode 100644 index 000000000..d525553f7 --- /dev/null +++ b/yuthon_partner/__manifest__.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- +{ + 'name': "yuthon_partner", + 'category': 'Tools', + 'version': '0.1', + 'license': 'LGPL-3', + 'depends': ['base', 'hr'], +'data': [ + 'security/ir.model.access.csv', + 'views/inherit_res_partner.xml', + ], + +} + diff --git a/yuthon_partner/models/__init__.py b/yuthon_partner/models/__init__.py new file mode 100644 index 000000000..9cc0d07d4 --- /dev/null +++ b/yuthon_partner/models/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import inherit_res_partner diff --git a/yuthon_partner/models/inherit_res_partner.py b/yuthon_partner/models/inherit_res_partner.py new file mode 100644 index 000000000..237526ec8 --- /dev/null +++ b/yuthon_partner/models/inherit_res_partner.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +from odoo import api, fields, models, modules + + +class InheritResPartner(models.Model): + _inherit = 'res.partner' + + is_employee = fields.Boolean(string='员工', default=False) + + def update_is_employee(self): + partner_ids = self.env["res.partner"].browse( + self._context.get('active_ids', self._context.get('active_id'))) + for partner in partner_ids: + employee = self.env['hr.employee'].search([('name', '=', partner.display_name)]) + if employee: + partner.is_employee = True \ No newline at end of file diff --git a/yuthon_partner/security/ir.model.access.csv b/yuthon_partner/security/ir.model.access.csv new file mode 100644 index 000000000..963679d4d --- /dev/null +++ b/yuthon_partner/security/ir.model.access.csv @@ -0,0 +1,5 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink + + + + diff --git a/yuthon_partner/views/inherit_res_partner.xml b/yuthon_partner/views/inherit_res_partner.xml new file mode 100644 index 000000000..3bbbb0990 --- /dev/null +++ b/yuthon_partner/views/inherit_res_partner.xml @@ -0,0 +1,20 @@ + + + + res.partner.form.inherit + res.partner + + + + + + + + + 更新 + + + code + action = model.update_is_employee() + + \ No newline at end of file diff --git a/yuthon_purchase/models/inherit_purchase_order.py b/yuthon_purchase/models/inherit_purchase_order.py index b65746d71..2c31af2ce 100644 --- a/yuthon_purchase/models/inherit_purchase_order.py +++ b/yuthon_purchase/models/inherit_purchase_order.py @@ -14,6 +14,8 @@ class InheritPurchaseOrder(models.Model): compute='_compute_json_display', store=True ) + document_ids = fields.Many2many('ir.attachment', string="附件") + @api.depends( 'order_line.product_id', diff --git a/yuthon_purchase/views/inherit_purchase_order_views.xml b/yuthon_purchase/views/inherit_purchase_order_views.xml index 4446543af..7db1929f8 100644 --- a/yuthon_purchase/views/inherit_purchase_order_views.xml +++ b/yuthon_purchase/views/inherit_purchase_order_views.xml @@ -22,44 +22,33 @@ - - - - - - - + + purchase.order.form + purchase.order + + + + + + + [('is_employee', '=', False)] + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/yuthon_purchase/views/purchase_workflow_views.xml b/yuthon_purchase/views/purchase_workflow_views.xml index f2b78f6b6..d632c22c2 100644 --- a/yuthon_purchase/views/purchase_workflow_views.xml +++ b/yuthon_purchase/views/purchase_workflow_views.xml @@ -47,7 +47,7 @@ - + @@ -63,6 +63,16 @@ + + + + + + + + + + @@ -125,16 +135,6 @@ - - - - - - - - - -