odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] delivery: fixed errors in views inherited from stock. stock: fixed error in yaml tests (propagation of fix made in previous commit) 

bzr revid: qdp-launchpad@openerp.com-20120508212245-3flt53qftn482z84
This commit is contained in:
Quentin (OpenERP) 2012-05-08 23:22:45 +02:00
parent 7e84b4c1ce
commit 73cefa205f
2 changed files with 8 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
addons/delivery/delivery_view.xml
View File

@ -177,28 +177,13 @@
<record id="view_picking_withcarrier_out_form" model="ir.ui.view">
<field name="name">delivery.stock.picking_withcarrier.out.form.view</field>
<field name="type">form</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_out_form"/>
<field name="model">stock.picking.out</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
<field name="partner_id" position="after">
<field name="carrier_id"/>
<field name="carrier_tracking_ref"/>
<field name="number_of_packages"/>
<field name="weight"/>
<field name="weight_net"/>
</field>
</field>
</record>
<record id="view_picking_withweight_in_form" model="ir.ui.view">
<field name="name">stock.picking_withweight.in.form.view</field>
<field name="type">form</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_in_form"/>
<field name="arch" type="xml">
<field name="type" position="after">
<field name="weight"/>
<field name="weight_net"/>
</field>
</field>
</record>
@ -218,7 +203,7 @@
<record id="action_picking_tree4" model="ir.actions.act_window">
<field name="name">Picking to be invoiced</field>
<field name="res_model">stock.picking</field>
<field name="res_model">stock.picking.out</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
@ -228,39 +213,13 @@
<field name="search_view_id" ref="stock.view_picking_out_search"/>
</record>
<record id="view_picking_withcarrier_out_move_form" model="ir.ui.view">
<field name="name">delivery.stock.picking_withcarrier.out.move.form.view</field>
<field name="type">form</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_out_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
<field name="weight"/>
<field name="weight_net"/>
</xpath>
</field>
</record>
<record id="view_picking_withweight_in_move_form" model="ir.ui.view">
<field name="name">stock.picking_withweight.in.move.form.view</field>
<field name="type">form</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_in_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
<field name="weight"/>
<field name="weight_net"/>
</xpath>
</field>
</record>
<record id="view_picking_withweight_internal_move_form" model="ir.ui.view">
<field name="name">stock.picking_withweight.internal.move.form.view</field>
<field name="type">form</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
<xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
<field name="weight"/>
<field name="weight_net"/>
</xpath>
@ -316,7 +275,7 @@
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_out_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Products']/group/button[@string='Create Invoice']" position="after">
<xpath expr="/form/div[@class='oe_form_topbar']/button[@string='Create Invoice']" position="after">
<button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
</xpath>
</field>

6
addons/stock/test/shipment.yml
View File

@ -203,7 +203,7 @@
!python {model: product.product}: |
product = self.browse(cr, uid, ref('product_icecream'), context=context)
assert product.qty_available == 135.96, "Stock does not correspond."
assert round(product.virtual_available, 2) == 5.96, "Vitual stock does not correspond."
assert round(product.virtual_available, 2) == -4.04, "Vitual stock does not correspond."
-
I trace all incoming lots.
-
@ -274,9 +274,9 @@
for move_line in shipment.move_lines:
assert move_line.state == "done", "Move should be closed."
-
I check availabile stock after deliver.
I check availaible stock after deliver.
-
!python {model: product.product}: |
product = self.browse(cr, uid, ref('product_icecream'), context=context)
assert round(product.qty_available, 2) == 5.96, "Stock does not correspond."
assert round(product.virtual_available, 2) == 5.96, "Vitual stock does not correspond."
assert round(product.virtual_available, 2) == -4.04, "Vitual stock does not correspond."