diff --git a/soong_workflow/models/soong_workflow_mixin.py b/soong_workflow/models/soong_workflow_mixin.py index 88c4faa6f..585bfa577 100644 --- a/soong_workflow/models/soong_workflow_mixin.py +++ b/soong_workflow/models/soong_workflow_mixin.py @@ -805,10 +805,10 @@ class SoongWorkflowMixin(models.AbstractModel): if button.has_icon: btn_exec_action_el.set("icon", button.icon) invisible_condition = "state != '%s'" % node.node_name - if model == 'purchase.order': - invisible_condition = invisible_condition.replace("询价", "draft") + # if model == 'purchase.order': + # invisible_condition = invisible_condition.replace("询价", "draft") btn_exec_action_el.set("invisible", invisible_condition) - btn_exec_action_el.set("context","{'btn_key':'%s','active_model':'%s'}" % (button.btn_key, self._name), ) + btn_exec_action_el.set("context", "{'btn_key':'%s','active_model':'%s'}" % (button.btn_key, self._name), ) else: is_apostille = False if button.btn_hide: diff --git a/yuthon_purchase/models/inherit_purchase_order.py b/yuthon_purchase/models/inherit_purchase_order.py index 0f0be886a..9e97a0a2e 100644 --- a/yuthon_purchase/models/inherit_purchase_order.py +++ b/yuthon_purchase/models/inherit_purchase_order.py @@ -17,10 +17,10 @@ class InheritPurchaseOrder(models.Model): ) name_title = fields.Char(string="默认标题", default='采购申请单', readonly=True) code = fields.Char(string="流水号", default=lambda self: self.env['ir.sequence'].next_by_code('purchase_workflow_approval_code')) - state = fields.Selection(selection_add=[('部门经理', '部门经理'), ('工会主席', '工会主席'), + state = fields.Selection(selection_add=[('申请人', '申请人'), ('部门经理', '部门经理'), ('工会主席', '工会主席'), ('协办', '协办'), ('分管领导', '分管领导'), - ('总经理', '总经理'), ('归档', '归档')], default='draft') + ('总经理', '总经理'), ('归档', '归档')], default='申请人') work_end = fields.Boolean(string="结束") user_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user) company_id = fields.Many2one(related='user_id.employee_ids.company_id', string="公司")