Accept Merge Request #1296: (feature/优化设备维保标准 -> develop)
Merge Request: 设备维保标准 Created By: @管欢 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @管欢 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1296
This commit is contained in:
@@ -79,6 +79,7 @@
|
||||
<field name="name" string="日常机床保养"/>
|
||||
<field name="created_user_id" string="创建人"/>
|
||||
<field name="maintenance_equipment_category_id" string="设备类别"/>
|
||||
<filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
<field name="unit_price"/>
|
||||
<field name="price" options="{'format': false}"/>
|
||||
<field name="part_drawing_number"/>
|
||||
<field name="machining_drawings" widget="image"/>
|
||||
<field name="machining_drawings" widget="pdf_viewer"/>
|
||||
<field name="sale_order_id"
|
||||
attrs='{"invisible": [("sale_order_id","=",False)],"readonly": [("sale_order_id","!=",False)]}'/>
|
||||
</group>
|
||||
|
||||
@@ -100,8 +100,7 @@
|
||||
<field name="arch" type="xml">
|
||||
<field name="property_supplier_payment_term_id" position="before">
|
||||
<field name="purchase_user_id" context="{'supplier_rank': supplier_rank }"
|
||||
widget="many2one_avatar_user"
|
||||
attrs="{'required' : [('supplier_rank','>', 0)]}"/>
|
||||
widget="many2one_avatar_user"/>
|
||||
</field>
|
||||
<xpath expr="//field[@name='property_account_position_id']" position="attributes">
|
||||
<attribute name="attrs">{'readonly': [('id','!=', False)]}</attribute>
|
||||
|
||||
Reference in New Issue
Block a user