Merge branch 'mlh_jzjx_project' into 'master'

显示金额

See merge request !36

jzjx_project/views/inherit_roke_mes_stock_picking_views.xml

@@ -48,4 +48,20 @@
             </xpath>
             </xpath>
         </field>
         </field>
     </record>
     </record>
+    <record id="inherit_view_roke_mes_stock_quant_form" model="ir.ui.view">
+        <field name="name">inherit.roke.mes.stock.quant.form</field>
+        <field name="model">roke.mes.stock.quant</field>
+        <field name="inherit_id" ref="roke_mes_stock.view_roke_mes_stock_quant_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='reserved_quantity']" position="after">
+                <field name="subtotal"/>
+            </xpath>
+            <xpath expr="//notebook/page[1]/field[@name='in_move_line_ids']//tree//field[@name='lot_note']" position="after">
+                <field name="subtotal"/>
+            </xpath>
+            <xpath expr="//notebook/page[2]/field[@name='out_move_line_ids']//tree//field[@name='lot_note']" position="after">
+                <field name="subtotal"/>
+            </xpath>
+        </field>
+    </record>
 </odoo>
 </odoo>
\ No newline at end of file