Merge lp:~sandi-dirntis/openerpsl/openerpsl_20140424_1 into lp:openerpsl/7.0

[Aleksander Dirntiš]

[FIX] purchase_recalculation: bug fixes

[lp:~sandi-dirntis/openerpsl/openerpsl_20140424_1]

393. By Aleksander Dirntiš on 2014-04-24

[FIX] purchase_recalculation: bug fixes

=== modified file 'purchase_recalculation/product_product.py'
--- purchase_recalculation/product_product.py	2014-04-23 11:51:50 +0000
+++ purchase_recalculation/product_product.py	2014-04-24 07:33:19 +0000
@@ -69,60 +69,70 @@
         _period = False
         _date_from = dates.get('date_from', False)
         _date_to = dates.get('date_to', False)
-        _location_ids = self.pool.get('stock.location').search(cr, uid, [('usage','=','supplier')])
-        if _date_from and _date_to:
-            _sql_string = '  SELECT sm.id \n' \
-                          '    FROM stock_move AS sm \n' \
-                          '   WHERE sm.product_id = {product} \n' \
-                          '         AND sm.date < \'{date_to}\' \n' \
-                          '         AND sm.state = \'done\' \n' \
-                          '         AND sm.location_id NOT IN {locations} \n' \
-                          '         AND sm.location_dest_id NOT IN {locations} \n' \
-                          'ORDER BY sm.date DESC \n' \
-                          '   LIMIT 1;'.format(product = ids[0],
-                                               date_to = _date_to,
-                                               locations = tuple(_location_ids)).replace(',)', ')')
-            cr.execute(_sql_string)
-            _last_out_move_tups = cr.fetchall()
-            _last_out_move_id = []
-            for _tup in _last_out_move_tups:
-                _last_out_move_id.append(_tup[0])
-
-            if len(_last_out_move_id) == 1:
-                _last_out_move = self.pool.get('stock.move').browse(cr, uid, _last_out_move_id[0], context)
-                _period_id = self.pool.get('account.period').find(cr, uid, _last_out_move.date, context)
-                _period = self.pool.get('account.period').browse(cr, uid, _period_id[0], context)
-                _cost = _last_out_move.price_unit
-
-                _sql_string = '  SELECT sm.id \n' \
-                              '    FROM stock_move AS sm \n' \
-                              '   WHERE sm.product_id = {product} \n' \
-                              '         AND sm.date < \'{date_to}\' \n' \
-                              '         AND sm.state = \'done\' \n' \
-                              'ORDER BY sm.date;'.format(product = ids[0],
-                                                         date_from = _date_from,
-                                                         date_to = _date_to).replace(',)', ')')
-                
-                
-                cr.execute(_sql_string)
-                _move_tups = cr.fetchall()
-                _move_ids = []
-                for _tup in _move_tups:
-                    _move_ids.append(_tup[0])
-
-                _moves = self.pool.get('stock.move').browse(cr, uid, _move_ids, context)
-                for _move in _moves:
-                    if _move.location_id.usage != 'internal' and _move.location_dest_id.usage == 'internal':
-                        _stock = _stock + _move.product_qty
-                    elif _move.location_id.usage == 'internal' and _move.location_dest_id.usage != 'internal':
-                        _stock = _stock - _move.product_qty
-                
-                if _stock == 0.0:
-                    _cost = 0.0
-                    _period = False
-                else:
-                    _cost = _cost * _stock
-
+        
+        # izračunam zalogo na začetku obdobja
+        _sql_string = '  SELECT sm.id \n' \
+                      '    FROM stock_move AS sm \n' \
+                      '   WHERE sm.product_id = {product} \n' \
+                      '         AND sm.date < \'{date_to}\' \n' \
+                      '         AND sm.state = \'done\' \n' \
+                      'ORDER BY sm.date;'.format(product = ids[0],
+                                                 date_from = _date_from,
+                                                 date_to = _date_to).replace(',)', ')')
+        
+        
+        cr.execute(_sql_string)
+        _move_tups = cr.fetchall()
+        _move_ids = []
+        for _tup in _move_tups:
+            _move_ids.append(_tup[0])
+
+        _moves = self.pool.get('stock.move').browse(cr, uid, _move_ids, context)
+        for _move in _moves:
+            if _move.location_id.usage != 'internal' and _move.location_dest_id.usage == 'internal':
+                _stock = _stock + _move.product_qty
+            elif _move.location_id.usage == 'internal' and _move.location_dest_id.usage != 'internal':
+                _stock = _stock - _move.product_qty
+        _stock = round(_stock, digits['quantity'])
+
+        # če je zaloga na zečetku obdobja 0 vrnem same nule
+        if _stock == round(0.0, digits['quantity']):
+            return [round(_stock, digits['quantity']), round(_cost, digits['price']), _period]
+        
+        # najdem zadnjo prodajo
+        _int_location_ids = self.pool.get('stock.location').search(cr, uid, [('usage','=','internal')])
+        _sup_location_ids = self.pool.get('stock.location').search(cr, uid, [('usage','=','supplier')])
+        _last_out_move_id = self.pool.get('stock.move').search(cr, uid, [('product_id','=',ids[0]),
+                                                                         ('date','<',_date_to),
+                                                                         ('location_id','in',_int_location_ids),
+                                                                         ('location_dest_id','not in',_sup_location_ids)],
+                                                               order='date desc',
+                                                               limit=1)
+
+        # če obstaja zadnja prodaja vzamem ceno iz stock_move-a
+        if len(_last_out_move_id) == 1:
+            _last_out_move = self.pool.get('stock.move').browse(cr, uid, _last_out_move_id[0], context)
+            _period_id = self.pool.get('account.period').find(cr, uid, _last_out_move.date, context)
+            _period = self.pool.get('account.period').browse(cr, uid, _period_id[0], context)
+            _cost = round(_last_out_move.price_unit, digits['price']) * _stock
+            return [round(_stock, digits['quantity']), round(_cost, digits['price']), _period]
+            
+        # če ni prodaje najdem zadnjo nabavo
+        _last_in_move_id = self.pool.get('stock.move').search(cr, uid, [('product_id','=',ids[0]),
+                                                                        ('date','<',_date_to),
+                                                                        ('location_id','in',_sup_location_ids),
+                                                                        ('location_dest_id','in',_int_location_ids)],
+                                                              order='date desc',
+                                                              limit=1)
+        # če obstaja zadnja prodaja vzamem ceno iz stock_move-a
+        if len(_last_in_move_id) == 1:
+            _last_in_move = self.pool.get('stock.move').browse(cr, uid, _last_in_move_id[0], context)
+            _period_id = self.pool.get('account.period').find(cr, uid, _last_in_move.date, context)
+            _period = self.pool.get('account.period').browse(cr, uid, _period_id[0], context)
+            _cost = round(_last_in_move.price_unit, digits['price']) * _stock
+            return [round(_stock, digits['quantity']), round(_cost, digits['price']), _period]
+
+        # če ni niti zadnje prodaje niti zadnje zaloge vrnem 0
         return [round(_stock, digits['quantity']), round(_cost, digits['price']), _period]
 
     def _get_purchase_amount_and_cost(self, cr, uid, ids, dates, digits, context):

=== modified file 'purchase_recalculation/wizard/account_product_cost_recalculation.py'
--- purchase_recalculation/wizard/account_product_cost_recalculation.py	2014-04-23 11:51:50 +0000
+++ purchase_recalculation/wizard/account_product_cost_recalculation.py	2014-04-24 07:33:19 +0000
@@ -126,9 +126,6 @@
 
             # zapišem povprečno ceno v tabelo
             if _average_cost and _average_cost <> 0:
-                _dates['date_from'] = _date_from + ' 00:00:00'
-                _dates['date_to'] = _date_to + ' 23:59:59'
-
                 _product_cost_id = self.pool.get('product.period.cost').search(cr, uid, [('product_id','=', _product.id),
                                                                                          ('period_id','=',_period.id)])
                 if len(_product_cost_id) <> 0: