1
=== modified file 'stock/wizard/stock_fill_inventory.py'
2
--- stock/wizard/stock_fill_inventory.py	2011-01-14 00:11:01 +0000
3
+++ stock/wizard/stock_fill_inventory.py	2011-03-08 13:38:41 +0000
4
@@ -58,61 +58,61 @@
5
58
        @return:
58
        @return:
6
59
        """
59
        """
7
60
        if context is None:
60
        if context is None:
9
61
            context = {}        
61
            context = {}
10
62
        inventory_line_obj = self.pool.get('stock.inventory.line')
62
        inventory_line_obj = self.pool.get('stock.inventory.line')
11
63
        location_obj = self.pool.get('stock.location')
63
        location_obj = self.pool.get('stock.location')
12
64
        product_obj = self.pool.get('product.product')
64
        product_obj = self.pool.get('product.product')
13
65
        stock_location_obj = self.pool.get('stock.location')
65
        stock_location_obj = self.pool.get('stock.location')
15
66
        if ids and len(ids): 
66
        move_obj = self.pool.get('stock.move')
16
67
        if ids and len(ids):
17
67
            ids = ids[0]
68
            ids = ids[0]
18
68
        else:
69
        else:
20
69
             return {'type': 'ir.actions.act_window_close'}    
70
             return {'type': 'ir.actions.act_window_close'}
21
70
        fill_inventory = self.browse(cr, uid, ids, context=context)
71
        fill_inventory = self.browse(cr, uid, ids, context=context)
22
71
        res = {}
72
        res = {}
23
72
        res_location = {}
73
        res_location = {}
24
73
        if fill_inventory.recursive :
74
        if fill_inventory.recursive :
25
74
            location_ids = location_obj.search(cr, uid, [('location_id',
75
            location_ids = location_obj.search(cr, uid, [('location_id',
30
75
                             'child_of', fill_inventory.location_id.id)])
76
                             'child_of', fill_inventory.location_id.id)], order="id")
27
76
            for location in location_ids :
28
77
                res = location_obj._product_get(cr, uid, location)
29
78
                res_location[location] = res
31
79
        else:
77
        else:
47
80
            context.update({'compute_child': False})
78
            location_ids = [fill_inventory.location_id.id]
48
81
            res = location_obj._product_get(cr, uid,
79
49
82
                        fill_inventory.location_id.id, context=context)
80
        res = {}
50
83
            res_location[fill_inventory.location_id.id] = res
81
        flag = False
51
84
    
82
        for location in location_ids:
52
85
        product_ids = []
83
            datas = {}
53
86
        for location in res_location.keys():
84
            res[location] = {}
54
87
            res = res_location[location]
85
            move_ids = move_obj.search(cr, uid, [('location_dest_id','=',location),('state','=','done')], context=context)
55
88
            for product_id in res.keys():
86
56
89
                prod = product_obj.browse(cr, uid, product_id, context=context)
87
            for move in move_obj.browse(cr, uid, move_ids, context=context):
57
90
                uom = prod.uom_id.id
88
                lot_id = move.prodlot_id.id
58
91
                context.update(uom=uom, compute_child=False)
89
                prod_id = move.product_id.id
59
92
                amount = stock_location_obj._product_get(cr, uid,
90
                qty = move.product_qty
60
93
                         location, [product_id], context=context)[product_id]
91
                location_dest_id = move.location_dest_id.id
61
94
                if(amount):
92
                if datas.get((prod_id, lot_id)):
62
93
                    qty = datas[(prod_id, lot_id)]['product_qty'] + qty
63
94
                datas[(prod_id, lot_id)] = {'product_id': prod_id, 'location_id': location_dest_id, 'product_qty': qty, 'product_uom': move.product_id.uom_id.id, 'prod_lot_id': lot_id}
64
95
            if datas:
65
96
                flag = True
66
97
                res[location] = datas
67
98
68
99
        if not flag:
69
100
            raise osv.except_osv(_('Message !'), _('No product in this location.'))
70
101
71
102
        for i in res.values():
72
103
            if i.values():
73
104
                for mydata in i.values():
74
105
                    mydata.update({'inventory_id': context['active_ids'][0]})
75
106
                    domain = []
76
95
                    if fill_inventory.set_stock_zero:
107
                    if fill_inventory.set_stock_zero:
84
96
                        amount = 0                    
108
                        mydata.update({'product_qty': 0})
85
97
                    line_ids=inventory_line_obj.search(cr, uid,
109
                    for k, v in mydata.items():
86
98
                        [('inventory_id', '=', context['active_ids']),
110
                        domain.append((k, '=', v))
87
99
                         ('location_id', '=', location),
111
                    line_ids = inventory_line_obj.search(cr, uid, domain)
88
100
                         ('product_id', '=', product_id),
112
82
101
                         ('product_uom', '=', uom),
83
102
                        ('product_qty', '=', amount)])
89
103
                    if not len(line_ids):
113
                    if not len(line_ids):
99
104
                        inventory_line = {
114
                        inventory_line_obj.create(cr, uid, mydata)
91
105
                            'inventory_id': context['active_ids'][0],
92
106
                            'location_id': location,
93
107
                            'product_id': product_id,
94
108
                            'product_uom': uom,
95
109
                            'product_qty': amount
96
110
                        }
97
111
                        inventory_line_obj.create(cr, uid, inventory_line)
98
112
                    product_ids.append(product_id)
100
113
115
101
114
        if(len(product_ids) == 0):
102
115
            raise osv.except_osv(_('Message !'), _('No product in this location.'))
103
116
        return {'type': 'ir.actions.act_window_close'}
116
        return {'type': 'ir.actions.act_window_close'}
104
117
117
105
118
stock_fill_inventory()
118
stock_fill_inventory()
Reviewer	Date Requested	Status
qdp (OpenERP)		Abstain on 2011-03-09
Kirti Savalia(OpenERP) (community)		Needs Resubmitting on 2011-03-09
OpenERP buildbot (community)		Needs Fixing on 2011-03-08
Rucha (Open ERP) (community)	2011-03-08	Needs Fixing on 2011-03-08
Review via email: mp+52519@code.launchpad.net