Merge pull request !11243 from 李鹏宇/dev
This commit is contained in:
@@ -45,12 +45,6 @@
|
||||
</xpath>
|
||||
<xpath expr="//page[@name='operations']//field[@name='move_ids_without_package']//field[@name='product_uom'][@groups='uom.group_uom']" position="after">
|
||||
<field name="available_location_ids" invisible="1"/>
|
||||
<field name="location_id" string="所在仓库" optional="show"
|
||||
invisible="parent.picking_type_code != 'internal'"
|
||||
domain="[('id', 'in', available_location_ids)]"
|
||||
options="{'no_create': True}"/>
|
||||
<field name="borrow_type" string="借用/领用" readonly="1" optional="show"
|
||||
invisible="parent.picking_type_code != 'internal'"/>
|
||||
</xpath>
|
||||
<xpath expr="//button[@name='%(stock.act_stock_return_picking)d']" position="attributes">
|
||||
<attribute name="invisible">1</attribute>
|
||||
@@ -350,7 +344,20 @@
|
||||
<notebook>
|
||||
<page string="作业" name="operations">
|
||||
<field name="move_ids_without_package"
|
||||
context="{'default_picking_id': id, 'default_picking_type_id': picking_type_id}"/>
|
||||
context="{'default_picking_id': id, 'default_picking_type_id': picking_type_id}">
|
||||
<tree editable="bottom">
|
||||
<field name="available_location_ids" invisible="1"/>
|
||||
<field name="company_id" invisible="1"/>
|
||||
<field name="product_uom_category_id" invisible="1"/>
|
||||
<field name="product_id" options="{'no_create': True}"/>
|
||||
<field name="product_uom_qty" string="需求"/>
|
||||
<field name="product_uom" groups="uom.group_uom"/>
|
||||
<field name="location_id" string="所在仓库"
|
||||
domain="[('id', 'in', available_location_ids)]"
|
||||
options="{'no_create': True}"/>
|
||||
<field name="borrow_type" string="借用/领用" readonly="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
@@ -375,7 +382,7 @@
|
||||
<field name="name">借用/领用</field>
|
||||
<field name="res_model">stock.picking</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="stock_picking_views_tree_borrow"/>
|
||||
<field name="views" eval="[(ref('stock_picking_views_tree_borrow'), 'tree'), (ref('stock_picking_form_borrow'), 'form')]"/>
|
||||
<field name="domain">['&', '|', ('picking_type_id.name', 'ilike', '借用'), ('picking_type_id.name', 'ilike', '领用'), '|', ('create_uid', '=', uid), ('approver_id', '=', uid)]</field>
|
||||
<field name="context">{"default_picking_type_id": 72}</field>
|
||||
</record>
|
||||
|
||||
Reference in New Issue
Block a user