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

[MERGE] from upstream

Browse Source 
bzr revid: fva@openerp.com-20130626141503-6krp7slz4gh1qp2b
bzr revid: fva@openerp.com-20130626141820-xjpjipb8f5blslnu
This commit is contained in:
Frédéric van der Essen
2013-06-26 16:18:20 +02:00
parent 53a8aadac3 97a63a07bc
commit e123e35439
1 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/stock.py
+28 -8
View File
@@ -1637,7 +1637,7 @@ class stock_picking(osv.osv):
error_msg = ''
#check if the barcode correspond to a product
matching_product_ids = product_obj.search(cr, uid, ['|', ('code', '=', barcode_str), ('ean', '=', barcode_str)], context=context)
matching_product_ids = product_obj.search(cr, uid, ['|', ('code', '=', barcode_str), ('ean13', '=', barcode_str)], context=context)
if matching_product_ids:
if len(matching_product_ids) > 1:
error_msg = _('Wrong bar code detected: more than one product matching the given barcode')
@@ -3693,13 +3693,32 @@ class stock_package(osv.osv):
(_check_location, 'All quant inside a package should share the same location', ['location_id']),
]
def action_plus(self, cr, uid, ids, context=None):
pass
#return {'warnings': '', 'stock_move_to_update': [{}], 'package_to_update': [{}]}
def action_copy(self, cr, uid, ids, context=None):
quant_obj = self.pool.get('stock.quant')
stock_operation_obj = self.pool.get('stock.pack.operation')
#put all the operations of the picking that aren't yet assigned to a package to this new one
operation_ids = stock_operation_obj.search(cr, uid, [('result_package_id', 'in', ids)], context=context)
#create a new empty stock.quant.package
package_id = self.create(cr, uid, {}, context=context)
new_ops = stock_operation_obj.copy(cr, uid, operation_ids, {'result_package_id': package_id}, context=context)
for operation in stock_operation_obj.browse(cr, uid, new_ops, context=context):
if operation.product_id:
todo_on_moves, todo_on_operations = stock_operation_obj._search_and_increment(cr, uid, operation.picking_id.id, ('product_id', '=', operation.product_id.id), context=context)
elif operation.quant_id:
todo_on_moves, todo_on_operations = self._deal_with_quants(cr, uid, operation.picking_id, [operation.quant_id.id], context=context)
elif operation.package_id:
included_package_ids = self.search(cr, uid, [('parent_id', 'child_of', [operation.package_id.id])], context=context)
included_quant_ids = quant_obj.search(cr, uid, [('package_id', 'in', included_package_ids)], context=context)
todo_on_moves, todo_on_operations = self._deal_with_quants(cr, uid, operation.picking_id.id, included_quant_ids, context=context)
return {'warnings': '', 'stock_move_to_update': todo_on_moves, 'package_to_update': todo_on_operations}
def action_minus(self, cr, uid, ids, context=None):
pass
#return {'warnings': '', 'stock_move_to_update': [{}], 'package_to_update': [{}]}
#def action_delete(self, cr, uid, ids, context=None):
# #no need, we use unlink of ids and with the ondelete = cascade it will work flawlessly
# stock_operation_obj = self.pool.get('stock.pack.operation')
# #delete all the operations of the picking that are assigned to the given packages
# operation_ids = stock_operation_obj.search(cr, uid, [('result_package_id', 'in', ids)], context=context)
# pass
# #return {'warnings': '', 'stock_move_to_update': [{}], 'package_to_update': [{}]}
class stock_pack_operation(osv.osv):
_name = "stock.pack.operation"
@@ -3711,7 +3730,7 @@ class stock_pack_operation(osv.osv):
'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
'package_id': fields.many2one('stock.quant.package', 'Package'), # 2
'quant_id': fields.many2one('stock.quant', 'Quant'), # 3
'result_package_id': fields.many2one('stock.quant.package', 'Package Made', help="The resulf of the packaging.", required=False),
'result_package_id': fields.many2one('stock.quant.package', 'Package Made', help="The resulf of the packaging.", required=False, ondelete='cascade'),
}
def _search_and_increment(self, cr, uid, picking_id, key, context=None):
@@ -3747,6 +3766,7 @@ class stock_pack_operation(osv.osv):
'picking_id': picking_id,
var_name: value,
'product_qty': qty,
'product_uom': 1, # FIXME
}
operation_id = self.create(cr, uid, values, context=context)
values.update({'id': operation_id})