pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] SO/PO should be allowed to cancel by un-linking relavent picking

Browse Source 
lp bug: https://launchpad.net/bugs/596862 fixed

bzr revid: jvo@tinyerp.com-20100825190701-gszxsb81u1lofkkv
This commit is contained in:
Jay (OpenERP)
2010-08-26 00:37:01 +05:30
parent 3b5e198d6f
commit 330975ee7f
4 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/purchase/stock.py
+1 -1
View File
@@ -40,7 +40,7 @@ class stock_picking(osv.osv):
_inherit = 'stock.picking'
_columns = {
'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
ondelete='set null', select=True, readonly=True),
ondelete='set null', select=True),
}
_defaults = {
'purchase_id': lambda *a: False,
addons/purchase/stock_view.xml
+27 -2
View File
@@ -19,7 +19,32 @@
id="act_purchase_order_2_stock_picking"
name="Picking"
res_model="stock.picking"
src_model="purchase.order"/>
src_model="purchase.order"
context="{'contact_display': 'partner'}" />
<record id="action_picking_in_tree_view" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="stock.view_picking_in_tree"/>
<field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
</record>
<record id="action_picking_in_form_view" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">form</field>
<field name="view_id" ref="stock.view_picking_in_form"/>
<field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
</record>
<record id="stock_picking_in_inherit_purchase" model="ir.ui.view">
<field name="name">Incoming Picking Inherited</field>
<field name="model">stock.picking</field>
<field name="type">form</field>
<field name="inherit_id" ref="stock.view_picking_in_form"/>
<field name="arch" type="xml">
<field name="backorder_id" position="after">
<field name="purchase_id"/>
</field>
</field>
</record>
</data>
</openerp>
addons/sale/stock.py
+1 -1
View File
@@ -35,7 +35,7 @@ stock_move()
class stock_picking(osv.osv):
_inherit = 'stock.picking'
_columns = {
'sale_id': fields.many2one('sale.order', 'Sale Order', ondelete='set null', select=True, readonly=True),
'sale_id': fields.many2one('sale.order', 'Sale Order', ondelete='set null', select=True),
}
_defaults = {
'sale_id': False
addons/sale/stock_view.xml
+15
View File
@@ -12,5 +12,20 @@
</field>
</field>
</record>
<!-- Adding Sale Order Reference to outgoing picking -->
<record id="stock_picking_out_inherit_sale" model="ir.ui.view">
<field name="name">Outgoing picking Inherited</field>
<field name="model">stock.picking</field>
<field name="type">form</field>
<field name="inherit_id" ref="stock.view_picking_out_form"/>
<field name="arch" type="xml">
<field name="move_type" position="after">
<field name="sale_id"/>
</field>
</field>
</record>
</data>
</openerp>