提交 436bff77 authored 作者: 伍姿英's avatar 伍姿英

Merge branch 'release/3.1.1'

......@@ -20,9 +20,10 @@
<!-- </group>-->
<group>
<field name="bl_count" attrs="{'invisible': [('is_batch', '=', False)]}" readonly="1"/>
<field name="bl_id" required="0" attrs="{'invisible': [('is_batch', '=', True)]}" readonly="1"/>
<field name="bl_id" required="0" attrs="{'invisible': [('is_batch', '=', True)]}"
readonly="1"/>
<field name="select_type" required="1"/>
<field name="current_status"
<field name="current_status" options="{'no_create':True,'no_open':True,}"
attrs="{'invisible':[('select_type','=','tracking_no')],'required':[('select_type','=','node')]}"
domain="[('node_type','=','package')]"/>
<field name="next_code_ids" invisible="1"/>
......@@ -37,7 +38,7 @@
<field name="last_process_time"/>
<separator/>
<!-- domain="[('id','in',next_code_ids),('node_type','=','package')]"-->
<field name="update_status" required="1"/>
<field name="update_status" required="1" options="{'no_create':True,'no_open':True,}"/>
<field name="process_time" required="1" string="Process Time"/>
<field name="node_exception_reason_id" options="{'no_create':True}"/>
<field name="state_explain"/>
......
......@@ -14,9 +14,9 @@
<group>
<field name="bl_count" attrs="{'invisible': [('is_batch', '=', False)]}" readonly="1"/>
<field name="bl_id" invisible="1"/>
<field name="current_status" readonly="1"/>
<field name="current_status" readonly="1" options="{'no_create':True,'no_open':True,}"/>
<field name="last_process_time"/>
<field name="update_status" required="1"
<field name="update_status" required="1" options="{'no_create':True,'no_open':True,}"
domain="[('id','in',next_code_ids)]"/>
<field name="process_time" required="1" string="Customs Clearance Status Process Time"/>
<field name="state_explain" invisible="1"/>
......
......@@ -8,9 +8,9 @@
<record id="view_update_bl_status_wizard" model="ir.ui.view">
<field name="name">view_update_bl_status_wizard</field>
<field name="model">update.bl.status.wizard</field>
<field name="inherit_id" ref="ccs_base.view_update_bl_status_wizard"/>
<field name="inherit_id" ref="ccs_base.view_update_bl_status_wizard"/>
<field name="arch" type="xml">
<field name="bl_id" position="after">
<field name="bl_id" position="after">
<field name="is_skip_check"/>
</field>
</field>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论