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

[IMP] stock, usability: changed a button label and translate the information on availability of moves into the move uom 

bzr revid: qdp-launchpad@openerp.com-20140207084000-k7uhl82v9mlmuc92
This commit is contained in:
Quentin (OpenERP) 2014-02-07 09:40:00 +01:00
parent dc147d9120
commit 38577e23f4
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/stock/stock.py
View File

@ -1303,23 +1303,26 @@ class stock_move(osv.osv):
def _get_string_qty_information(self, cr, uid, ids, field_name, args, context=None): def _get_string_qty_information(self, cr, uid, ids, field_name, args, context=None):
settings_obj = self.pool.get('stock.config.settings') settings_obj = self.pool.get('stock.config.settings')
uom_obj = self.pool.get('product.uom')
res = dict.fromkeys(ids, '') res = dict.fromkeys(ids, '')
for move in self.browse(cr, uid, ids, context=context): for move in self.browse(cr, uid, ids, context=context):
if move.state in ('draft', 'done', 'cancel') or move.location_id.usage != 'internal': if move.state in ('draft', 'done', 'cancel') or move.location_id.usage != 'internal':
res[move.id] = _('n/a') res[move.id] = _('n/a')
continue continue
total_available = min(move.product_qty, move.reserved_availability + move.availability) total_available = min(move.product_qty, move.reserved_availability + move.availability)
total_available = uom_obj._compute_qty(cr, uid, move.product_id.uom_id.id, total_available, move.product_uom.id)
info = str(total_available) info = str(total_available)
#look in the settings if we need to display the UoM name or not #look in the settings if we need to display the UoM name or not
config_ids = settings_obj.search(cr, uid, [], limit=1, order='id DESC', context=context) config_ids = settings_obj.search(cr, uid, [], limit=1, order='id DESC', context=context)
if config_ids: if config_ids:
stock_settings = settings_obj.browse(cr, uid, config_ids[0], context=context) stock_settings = settings_obj.browse(cr, uid, config_ids[0], context=context)
if stock_settings.group_uom: if stock_settings.group_uom:
info += ' ' + move.product_id.uom_id.name info += ' ' + move.product_uom.name
if move.reserved_availability: if move.reserved_availability:
if move.reserved_availability != total_available: if move.reserved_availability != total_available:
#some of the available quantity is assigned and some are available but not reserved #some of the available quantity is assigned and some are available but not reserved
info += _(' (%s reserved)') % str(move.reserved_availability) reserved_available = uom_obj._compute_qty(cr, uid, move.product_id.uom_id.id, move.reserved_availability, move.product_uom.id)
info += _(' (%s reserved)') % str(reserved_available)
else: else:
#all available quantity is assigned #all available quantity is assigned
info += _(' (reserved)') info += _(' (reserved)')

4
addons/stock/stock_view.xml
View File

@ -754,8 +754,8 @@
<button name="action_confirm" states="draft" string="Mark as Todo" type="object" class="oe_highlight" groups="base.group_user"/> <button name="action_confirm" states="draft" string="Mark as Todo" type="object" class="oe_highlight" groups="base.group_user"/>
<button name="action_assign" states="confirmed" string="Check Availability" type="object" class="oe_highlight" groups="base.group_user"/> <button name="action_assign" states="confirmed" string="Check Availability" type="object" class="oe_highlight" groups="base.group_user"/>
<button name="force_assign" states="confirmed,partially_available" string="Force Availability" type="object" class="oe_highlight" groups="base.group_user"/> <button name="force_assign" states="confirmed,partially_available" string="Force Availability" type="object" class="oe_highlight" groups="base.group_user"/>
<button name="do_transfer" states="assigned" string="Transfer Done" groups="stock.group_stock_user" type="object" class="oe_highlight"/> <button name="do_transfer" states="assigned" string="Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight"/>
<button name="do_transfer" string="Transfer Done" groups="stock.group_stock_user" type="object" class="oe_highlight" attrs="{'invisible': ['|',('pack_operation_exist', '=', False), ('state', '!=', 'partially_available')]}"/> <button name="do_transfer" string="Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight" attrs="{'invisible': ['|',('pack_operation_exist', '=', False), ('state', '!=', 'partially_available')]}"/>
<button name="do_prepare_partial" string="Partial Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight" attrs="{'invisible': ['|',('pack_operation_exist', '=', True),('state','not in',('assigned', 'partially_available'))]}"/> <button name="do_prepare_partial" string="Partial Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight" attrs="{'invisible': ['|',('pack_operation_exist', '=', True),('state','not in',('assigned', 'partially_available'))]}"/>
<button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" groups="base.group_user"/> <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" groups="base.group_user"/>
<button name="action_cancel" states="assigned,confirmed,partially_available,draft" string="Cancel Transfer" groups="base.group_user" type="object"/> <button name="action_cancel" states="assigned,confirmed,partially_available,draft" string="Cancel Transfer" groups="base.group_user" type="object"/>