diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index c27bf37ccfa..617d86d83de 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -402,8 +402,8 @@ class account_asset_depreciation_line(osv.osv): context.update({'date': depreciation_date}) amount = currency_obj.compute(cr, uid, current_currency, company_currency, line.amount, context=context) sign = (line.asset_id.category_id.journal_id.type == 'purchase' and 1) or -1 - asset_name = line.asset_id.name - reference = line.name + asset_name = "/" + reference = line.asset_id.name move_vals = { 'name': asset_name, 'date': depreciation_date, diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py index 1da567b166b..08834fe9046 100644 --- a/addons/stock/wizard/stock_return_picking.py +++ b/addons/stock/wizard/stock_return_picking.py @@ -61,6 +61,9 @@ class stock_return_picking(osv.osv_memory): result1 = [] if context is None: context = {} + if context and context.get('active_ids', False): + if len(context.get('active_ids')) > 1: + raise osv.except_osv(_('Warning!'), _("You may only return one picking at a time!")) res = super(stock_return_picking, self).default_get(cr, uid, fields, context=context) record_id = context and context.get('active_id', False) or False pick_obj = self.pool.get('stock.picking')