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

Merge branch 'master-wmsstatbut-jco' into master-wmsstaging-jco

This commit is contained in:
Josse Colpaert 2014-05-30 10:24:31 +02:00
parent 7b890e138a 04e86a70d9
commit 231278997e
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/stock/product.py
View File

@ -168,9 +168,16 @@ class product_product(osv.osv):
res.append(('id', 'in', ids))
return res
def _product_available_text(self, cr, uid, ids, field_names=None, arg=False, context=None):
res = {}
for product in self.browse(cr, uid, ids, context=context):
res[product.id] = str(product.qty_available) + _(" In Stock")
return res
_columns = {
'reception_count': fields.function(_stock_move_count, string="Reception", type='integer', multi='pickings'),
'delivery_count': fields.function(_stock_move_count, string="Delivery", type='integer', multi='pickings'),
'qty_in_stock': fields.function(_product_available_text, type='char'),
'qty_available': fields.function(_product_available, multi='qty_available',
type='float', digits_compute=dp.get_precision('Product Unit of Measure'),
string='Quantity On Hand',

33
addons/stock/stock_view.xml
View File

@ -365,7 +365,10 @@
<field name="arch" type="xml">
<form string="Stock Location" version="7.0">
<div class="oe_right oe_button_box" name="buttons">
<button string="Current Stock" name="%(location_open_quants)d" type="action"/>
<button string="Current Stock"
class="oe_stat_button"
icon="fa-building-o" name="%(location_open_quants)d" type="action"
context="{'search_default_internal_loc': 1}"/>
</div>
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
@ -560,7 +563,11 @@
<form string="Warehouse" version="7.0">
<sheet>
<div class="oe_right oe_button_box">
<button name="view_all_routes_for_wh" string="View Warehouse Routes" type="object"/>
<button name="view_all_routes_for_wh"
string="Routes"
icon="fa-refresh"
class="oe_stat_button"
type="object"/>
</div>
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
@ -1784,7 +1791,7 @@
<field name="res_model">stock.warehouse.orderpoint</field>
</record>
<record model="ir.actions.act_window" id="product_open_quants">
<field name="context">{'search_default_product_id': active_id, 'search_default_locationgroup':1}</field>
<field name="context">{'search_default_internal_loc': 1, 'search_default_product_id': active_id, 'search_default_locationgroup':1}</field>
<field name="name">Quants</field>
<field name="res_model">stock.quant</field>
</record>
@ -1828,10 +1835,18 @@
</xpath>
<xpath expr="//div[@name='buttons']" position="inside">
<button string="Current Stock" name="%(product_open_quants)d" type="action" attrs="{'invisible':[('type', '=', 'service')]}" groups="stock.group_locations"/>
<button string="Moves" name= "%(act_product_stock_move_open)d" type="action" attrs="{'invisible':[('type', '=', 'service')]}" groups="stock.group_stock_user"/>
<button class="oe_stat_button"
name="%(product_open_quants)d"
icon="fa-building-o"
type="action" attrs="{'invisible':[('type', '=', 'service')]}" groups="stock.group_locations">
<div><field name="qty_in_stock"/></div>
</button>
<button string="Moves" class="oe_stat_button" name= "%(act_product_stock_move_open)d" type="action"
attrs="{'invisible':[('type', '=', 'service')]}"
icon="fa-arrows-v"
groups="stock.group_stock_user"/>
<button class="oe_inline oe_stat_button" name="%(product_open_orderpoint)d" type="action"
attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-pinterest" string="Reordering Rules"/>
attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-refresh" string="Reordering Rules"/>
</xpath>
<xpath expr="//group[@string='Sale Conditions']" position="inside">
@ -2074,7 +2089,11 @@
<field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml">
<xpath expr="//div[@name='buttons']" position="inside">
<button name="action_view_routes" string="Routes" type="object" />
<button name="action_view_routes"
class="oe_stat_button"
icon="fa-arrows-alt"
string="Routes"
type="object"/>
</xpath>
</field>
</record>