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

[MERGE] merge with mma branch 

bzr revid: psi@tinyerp.com-20120403060344-ostx166f9yvkc2cl
This commit is contained in:
Purnendu Singh (OpenERP) 2012-04-03 11:33:44 +05:30
parent 507b997148 6e81092a99
commit 4f92700d91
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/stock/stock.py
View File

@ -680,6 +680,7 @@ class stock_picking(osv.osv):
if context is None:
context = {}
mod_obj = self.pool.get('ir.model.data')
# To get the right view of shipment based on type from stock move and Back order.
if context.get('default_picking_id', False):
picking_type = self.browse(cr, uid, context['default_picking_id'], context=context).type
if picking_type == 'out':

6
addons/stock/stock_view.xml
View File

@ -698,7 +698,7 @@
<field name="invoice_state" string="Invoice Control" groups="base.group_extended"/>
</group>
<group colspan="2" col="2">
<field name="backorder_id" readonly="1" groups="base.group_extended"/>
<field name="backorder_id" context="{'default_picking_id':backorder_id}" readonly="1" groups="base.group_extended"/>
<field name="min_date" readonly="1"/>
</group>
</group>
@ -891,7 +891,7 @@
</group>
<group colspan="2" col="2">
<field name="backorder_id" readonly="1" groups="base.group_extended"/>
<field name="backorder_id" context="{'default_picking_id':backorder_id}" readonly="1" groups="base.group_extended"/>
<field name="min_date" readonly="1"/>
<field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
</group>
@ -1111,7 +1111,7 @@
</group>
<group colspan="2" col="2">
<field name="backorder_id" readonly="1" groups="base.group_extended"/>
<field name="backorder_id" context="{'default_picking_id':backorder_id}" readonly="1" groups="base.group_extended"/>
<field name="min_date" readonly="1"/>
<field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
</group>