Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改缺陷
This commit is contained in:
@@ -70,7 +70,7 @@
|
||||
</group>
|
||||
<group string="日历状态">
|
||||
<field name="status"/>
|
||||
<field name="setting_to_calendar_ids"/>
|
||||
<field name="setting_to_calendar_ids" invisible="True"/>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
@@ -175,12 +175,6 @@
|
||||
<field name="calendar_code"/>
|
||||
</group>
|
||||
</group>
|
||||
<group string="其他">
|
||||
<field name="monthly_rest_days"/>
|
||||
<field name="annual_rest_days"/>
|
||||
<field name="monthly_planned_downtime"/>
|
||||
<field name="annual_planned_downtime"/>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
|
||||
Reference in New Issue
Block a user