!7324 添加功能

Merge pull request !7324 from 李鹏宇/dev_zhou

yuthon_purchase/models/inherit_purchase_order.py

@@ -34,6 +34,7 @@ class InheritPurchaseOrder(models.Model):
     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="服务明细")
+    fixed_line_ids = fields.One2many('purchase.fixed.line', 'order_id', string="日常消耗品明细")
 
     def end_approval(self):
         self.button_confirm()

yuthon_purchase/models/purchase_workflow.py

@@ -127,6 +127,7 @@ class PurchaseFixedLine(models.Model):
 
     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="规格")
     number = fields.Integer(string="数量")

yuthon_purchase/views/inherit_purchase_order_views.xml

@@ -85,6 +85,23 @@
                     <attribute name="string">固定资产明细</attribute>
                 </xpath>
                 <xpath expr="//page[@name='products']" position="after">
+                     <page string="日常消耗品明细" invisible="purchase_type != 'day'">
+                        <field name="fixed_line_ids">
+                            <tree editable="bottom">
+                                <field name="purchase_id" column_invisible="1"/>
+                                <field name="product_id" required="1"/>
+                                <field name="brand"/>
+                                <field name="specs"/>
+                                <field name="product_packaging_id"/>
+                                <field name="number"/>
+                                <field name="unit_id"/>
+                                <field name="price_unit"/>
+                                <field name="taxes_id"/>
+                                <field name="total" sum="Total"/>
+                                <field name="name" string="描述" required="1"/>
+                            </tree>
+                        </field>
+                    </page>
                      <page string="低值易耗明细" invisible="purchase_type != 'low'">
                         <field name="low_line_ids">
                             <tree editable="bottom">