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

[IMP] Put product_ul on package 

bzr revid: jco@openerp.com-20140320110651-ql2gtlkz1t4mzglx
This commit is contained in:
Josse Colpaert 2014-03-20 12:06:51 +01:00
parent 6bd66db6de
commit f0ba091358
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/stock/stock.py
View File

@ -3313,6 +3313,7 @@ class stock_package(osv.osv):
'parent_left': fields.integer('Left Parent', select=1),
'parent_right': fields.integer('Right Parent', select=1),
'packaging_id': fields.many2one('product.packaging', 'Type of Packaging'),
'ul_id': fields.many2one('product.ul', 'Type of Package'),
'location_id': fields.function(_get_package_info, type='many2one', relation='stock.location', string='Location', multi="package",
store={
'stock.quant': (_get_packages, ['location_id'], 10),

10
addons/stock/stock_view.xml
View File

@ -1970,7 +1970,8 @@
</div>
<group>
<group>
<field name="packaging_id"/>
<field name="ul_id"/>
<field name="packaging_id"/>
<field name='company_id' groups="base.group_multi_company"/>
<field name='owner_id' groups="stock.group_tracking_owner"/>
</group>
@ -1978,7 +1979,6 @@
<field name="location_id"/>
<field name="parent_id"/>
</group>
</group>
<notebook>
<page string="Content">
@ -1999,6 +1999,7 @@
<field name="children_ids">
<tree string="Contained Packages">
<field name="complete_name"/>
<field name="ul_id"/>
<field name="packaging_id"/>
<field name="location_id"/>
</tree>
@ -2006,7 +2007,6 @@
</page>
</notebook>
</sheet>
</form>
</field>
</record>
@ -2019,6 +2019,7 @@
<field name="arch" type="xml">
<tree string="Package">
<field name="complete_name"/>
<field name="ul_id"/>
<field name="packaging_id"/>
<field name="location_id"/>
<field name="company_id"/>
@ -2028,11 +2029,12 @@
<record id="quant_package_search_view" model="ir.ui.view">
<field name="name">stock.quant.package.search</field>
<field name="model">stock.quant.package</field>
<field eval="10" name="priority"/>
<field eval="10" name="priority"/>
<field name="arch" type="xml">
<search string="Package">
<field name="name" string="Package Name"/>
<field name="location_id"/>
<field name="ul_id"/>
<field name="packaging_id"/>
<group expand='0' string='Group by...'>
<filter string='Location' icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'location_id'}"/>