李鹏宇
@@ -12,8 +12,9 @@ class IssueLibrary(models.Model):
|
||||
name = fields.Char(string='议题名称')
|
||||
name_text = fields.Text(string='议题名称', compute='_compute_name', readonly=False)
|
||||
depart_opinions = fields.Text(string='部门意见')
|
||||
topic_content = fields.Text(string='议题详细描述')
|
||||
topic_content = fields.Text(string='事项背景')
|
||||
will_based = fields.Text(string='上会依据')
|
||||
deliberation_content = fields.Text(string='审议内容', default='建议同意')
|
||||
is_invisible_workflow = fields.Boolean(string="流程隐藏的判断")
|
||||
code = fields.Char(string='编号', required=True, copy=False,
|
||||
default=lambda self: self.env['ir.sequence'].next_by_code('issue_library_code'))
|
||||
|
||||
@@ -65,9 +65,10 @@
|
||||
<group>
|
||||
<field name="name" required="1" force_save="1" invisible="is_invisible_workflow"/>
|
||||
<field name="topic_content" invisible="is_invisible_workflow"/>
|
||||
<field name="will_based"/>
|
||||
<field name="deliberation_content"/>
|
||||
<field name="documents_ids" widget="preview_many2many" invisible="is_invisible_workflow"/>
|
||||
<field name="is_invisible_workflow" invisible="1"/>
|
||||
|
||||
<field name="name_text" invisible="1"/>
|
||||
<field name="work_end" invisible="1"/>
|
||||
<field name="company_id" invisible="1"/>
|
||||
|
||||
@@ -32,6 +32,8 @@ class InheritPurchaseOrder(models.Model):
|
||||
pay_way = fields.Selection([('onetime', '一次性'), ('installment', '分期')], string="付款方式", default='onetime')
|
||||
reason_text = fields.Text(string="申请事由")
|
||||
pay_line_ids = fields.One2many('purchase.order.pay.line', 'order_id', string="付款详情")
|
||||
low_line_ids = fields.One2many('purchase.low.line', 'order_id', string="低值易耗明细")
|
||||
service_line_ids = fields.One2many('purchase.service.line', 'order_id', string="服务明细")
|
||||
|
||||
def end_approval(self):
|
||||
self.button_confirm()
|
||||
|
||||
@@ -114,7 +114,7 @@ class PurchaseOrderPayLine(models.Model):
|
||||
_description = "付款详情"
|
||||
|
||||
purchase_id = fields.Many2one('purchase.workflow', string="关联采购工作流")
|
||||
order_id = fields.Many2one('purchase.order', string="关联采购工作流")
|
||||
order_id = fields.Many2one('purchase.order', string="关联采购")
|
||||
payment_stage = fields.Char(string="付款阶段")
|
||||
amount = fields.Char(string="比例/金额")
|
||||
payment_date = fields.Date(string="付款日期")
|
||||
@@ -154,7 +154,9 @@ class PurchaseLowLine(models.Model):
|
||||
_name = 'purchase.low.line'
|
||||
_description = '低值易耗采购明细'
|
||||
purchase_id = fields.Many2one('purchase.workflow', string="关联采购工作流")
|
||||
|
||||
product_id = fields.Many2one('product.product', string="物品名称")
|
||||
order_id = fields.Many2one('purchase.order', string="关联采购")
|
||||
brand = fields.Char(string="品牌")
|
||||
specs = fields.Char(string="规格")
|
||||
name = fields.Text(string="描述")
|
||||
@@ -186,6 +188,7 @@ class PurchaseServiceLine(models.Model):
|
||||
|
||||
service_id = fields.Many2one('purchase.workflow', string="关联采购工作流")
|
||||
product_id = fields.Many2one('product.product', string="服务项目")
|
||||
order_id = fields.Many2one('purchase.order', string="关联采购")
|
||||
frequency = fields.Integer(string='频次')
|
||||
fee = fields.Float(string="费用")
|
||||
name = fields.Text(string="描述")
|
||||
|
||||
@@ -80,30 +80,43 @@
|
||||
<xpath expr="//field[@name='partner_id']" position="attributes">
|
||||
<attribute name="domain">[('is_employee', '=', False)]</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//page[@name='products']" position="attributes">
|
||||
<attribute name="invisible">purchase_type != 'fixed'</attribute>
|
||||
<attribute name="string">固定资产明细</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//page[@name='products']" position="after">
|
||||
<!-- <page string="服务明细" invisible="purchase_type != 'service'">-->
|
||||
<!-- <field name="pay_line_ids">-->
|
||||
<!-- <tree editable="bottom">-->
|
||||
<!-- <field name="purchase_id" column_invisible="1"/>-->
|
||||
<!-- <field name="payment_stage" required="1"/>-->
|
||||
<!-- <field name="amount"/>-->
|
||||
<!-- <field name="payment_date"/>-->
|
||||
<!-- <field name="remake"/>-->
|
||||
<!-- </tree>-->
|
||||
<!-- </field>-->
|
||||
<!-- </page>-->
|
||||
<!-- </xpath>-->
|
||||
<!-- <page string="低值易耗明细" invisible="purchase_type != 'low'">-->
|
||||
<!-- <field name="pay_line_ids">-->
|
||||
<!-- <tree editable="bottom">-->
|
||||
<!-- <field name="purchase_id" column_invisible="1"/>-->
|
||||
<!-- <field name="payment_stage" required="1"/>-->
|
||||
<!-- <field name="amount"/>-->
|
||||
<!-- <field name="payment_date"/>-->
|
||||
<!-- <field name="remake"/>-->
|
||||
<!-- </tree>-->
|
||||
<!-- </field>-->
|
||||
<!-- </page>-->
|
||||
<page string="低值易耗明细" invisible="purchase_type != 'low'">
|
||||
<field name="low_line_ids">
|
||||
<tree editable="bottom">
|
||||
<field name="purchase_id" column_invisible="1"/>
|
||||
<field name="product_id" string="物品名称" required="1"/>
|
||||
<field name="name"/>
|
||||
<field name="brand"/>
|
||||
<field name="specs"/>
|
||||
<field name="number"/>
|
||||
<field name="unit_id"/>
|
||||
<field name="price"/>
|
||||
<field name="taxes_id"/>
|
||||
<field name="total" sum="Total"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
<page string="服务明细" invisible="purchase_type != 'service'">
|
||||
<field name="service_line_ids">
|
||||
<tree editable="bottom">
|
||||
<field name="service_id" column_invisible="1"/>
|
||||
<field name="product_id" required="1"/>
|
||||
<field name="name" string="描述" required="1"/>
|
||||
<field name="frequency"/>
|
||||
<field name="fee"/>
|
||||
<field name="product_packaging_id"/>
|
||||
<field name="unit_id"/>
|
||||
<field name="price"/>
|
||||
<field name="taxes_id"/>
|
||||
<field name="total" sum="Total"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
<page string="付款详情" invisible="pay_way == 'onetime'">
|
||||
<field name="pay_line_ids">
|
||||
<tree editable="bottom">
|
||||
|
||||
Reference in New Issue
Block a user