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

[Aleksander Dirntiš]

[MOD] Modified behavior on product cost recalculations

=== modified file 'purchase_recalculation/__init__.py'
--- purchase_recalculation/__init__.py	2014-03-17 07:50:11 +0000
+++ purchase_recalculation/__init__.py	2014-04-10 09:10:37 +0000
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 
-#import product_period_cost
+import product_period_cost
 import product_product
 
 import stock_move

=== modified file 'purchase_recalculation/__openerp__.py'
--- purchase_recalculation/__openerp__.py	2014-03-19 13:58:30 +0000
+++ purchase_recalculation/__openerp__.py	2014-04-10 09:10:37 +0000
@@ -22,13 +22,13 @@
 
 {
     'name': 'Product Cost Recalculation',
-    'version': '1.2',
+    'version': '1.3',
     'category': 'Accounting',
     'description': """
 
 Module adds several options and methods for product cost recalculation:\n
 
-Options:
+Options:\n
 - change values on supplier shipments (incoming and returns) manually (date of delivery, quantity, unit price)\n
 - change values on customer shipments (outgoing and returns) manually (date of delivery, quantity)\n
 - change values on supplier shipments (incoming and returns) shipment automatically via supplier invoice or refund (unit price)\n
@@ -38,7 +38,6 @@
 
 TODO:\n
 - change values option on inventory stock moves (date, quantity, unit price)\n
-- add inventory values to product cost recalculation\n
  
     """,
     'author': 'Mentis d.o.o.',
@@ -46,7 +45,8 @@
     'data': [
              'stock_picking_form_view.xml',
              'wizard/stock_picking_update_view.xml',
-             'wizard/account_product_cost_recalculation_view.xml'
+             'wizard/account_product_cost_recalculation_view.xml',
+             'wizard/account_product_cost_set_view.xml'
     ],
     'installable': True,
     'active': False,

=== modified file 'purchase_recalculation/account_invoice.py'
--- purchase_recalculation/account_invoice.py	2014-03-19 13:58:30 +0000
+++ purchase_recalculation/account_invoice.py	2014-04-10 09:10:37 +0000
@@ -34,27 +34,50 @@
 
         res = super(account_invoice, self).action_number(cr, uid, ids, context)
         if res:
-            _invoice_ids = self.search(cr, uid, [('id','in',ids),('type','in',['in_invoice', 'in_refund'])], context)
+            _invoice_ids = self.search(cr, uid, [('id','in',ids)], context)
             if len(_invoice_ids) > 0:
                 ctx = {}
                 _costs_installed = self.pool.get('stock.picking.in').fields_get(cr, uid, ['landing_costs_line_ids'], context) != {}
                 _picking_ids = []
                 for _invoice in self.browse(cr, uid, _invoice_ids, context):
+                    _src_usage = False
+                    _dst_usage = False
+                    
                     if _invoice.type == 'in_invoice':
                         _src_usage = 'supplier'
                         _dst_usage = 'internal'
-                    else:
+                    elif _invoice.type == 'in_refund':
                         _src_usage = 'internal'
                         _dst_usage = 'supplier'
+                    elif _invoice.type == 'out_invoice':
+                        _src_usage = 'internal'
+                        _dst_usage = 'customer'
+                    elif _invoice.type == 'out_refund':
+                        _src_usage = 'customer'
+                        _dst_usage = 'internal'
+
+                    if not _src_usage and not _dst_usage:
+                        continue
 
                     for _line in _invoice.invoice_line:
                         _quantity = 0.0
                         _uom_id = False
-                        _order_line_ids = self.pool.get('purchase.order.line').search(cr, uid, [('invoice_lines','=',_line.id)])                        
-                        _stock_move_ids = self.pool.get('stock.move').search(cr, uid, [('purchase_line_id','in',_order_line_ids),
-                                                                                       ('state','=','done'),
-                                                                                       ('location_id.usage','=',_src_usage),
-                                                                                       ('location_dest_id.usage','=',_dst_usage)])
+                        
+                        _order_line_ids = []
+                        _stock_move_ids = []
+                        if _src_usage == 'supplier' or _dst_usage == 'supplier':
+                            _order_line_ids = self.pool.get('purchase.order.line').search(cr, uid, [('invoice_lines','=',_line.id)])                        
+                            _stock_move_ids = self.pool.get('stock.move').search(cr, uid, [('purchase_line_id','in',_order_line_ids),
+                                                                                           ('state','=','done'),
+                                                                                           ('location_id.usage','=',_src_usage),
+                                                                                           ('location_dest_id.usage','=',_dst_usage)])
+                        else:
+                            _order_line_ids = self.pool.get('sale.order.line').search(cr, uid, [('invoice_lines','=',_line.id)])                        
+                            _stock_move_ids = self.pool.get('stock.move').search(cr, uid, [('sale_line_id','in',_order_line_ids),
+                                                                                           ('state','=','done'),
+                                                                                           ('location_id.usage','=',_src_usage),
+                                                                                           ('location_dest_id.usage','=',_dst_usage)])
+
                         if len(_stock_move_ids) > 0:
                             _stock_moves = self.pool.get('stock.move').browse(cr, uid, _stock_move_ids, context)
                             for _stock_move in _stock_moves:
@@ -65,22 +88,25 @@
                                 if _quantity != _line.quantity:
                                     _text = _line.invoice_id.origin + ' - ' + _line.name
                                     raise osv.except_osv(_('Error!'), _('Invoiced quantity is different than recieved quantity.\n' + _text))
-                                    
-                                for _stock_move in _stock_moves:
-                                    _updated = False
-                                    if _costs_installed:
-                                        _has_costs = len(_stock_move.landing_costs_line_ids) <> 0 or len(_stock_move.picking_id.landing_costs_line_ids) <> 0
-                                        if (_has_costs and _stock_move.price_unit_without_costs != _line.price_unit) \
-                                            or (not _has_costs and _stock_move.price_unit != _line.price_unit):
-                                            ctx['move%s' % (_stock_move.id)] = {'price_unit': _line.price_unit,
-                                                                                'price_unit_without_costs': False}
-                                            _updated = True
-                                    else:
-                                        if _stock_move.price_unit != _line.price_unit:
-                                            ctx['move%s' % (_stock_move.id)] = {'price_unit': _line.price_unit}
-                                            _updated = True
-                                    if _updated:
-                                        _picking_ids.append(_stock_move.picking_id.id)
+
+                                if _src_usage == 'supplier' or _dst_usage == 'supplier':
+                                    for _stock_move in _stock_moves:
+                                        _updated = False
+                                        if _costs_installed:
+                                            _has_costs = len(_stock_move.landing_costs_line_ids) <> 0 or len(_stock_move.picking_id.landing_costs_line_ids) <> 0
+                                            if (_has_costs and _stock_move.price_unit_without_costs != _line.price_unit) \
+                                                or (not _has_costs and _stock_move.price_unit != _line.price_unit):
+                                                ctx['move%s' % (_stock_move.id)] = {'price_unit': _line.price_unit,
+                                                                                    'price_unit_without_costs': False,
+                                                                                    'quantity': False}
+                                                _updated = True
+                                        else:
+                                            if _stock_move.price_unit != _line.price_unit:
+                                                ctx['move%s' % (_stock_move.id)] = {'price_unit': _line.price_unit,
+                                                                                    'quantity': False}
+                                                _updated = True
+                                        if _updated:
+                                            _picking_ids.append(_stock_move.picking_id.id)
                     if _picking_ids:
                         self.pool.get('stock.picking')._picking_update(cr, uid, _picking_ids, ctx)
         return res

=== modified file 'purchase_recalculation/i18n/en_US.po'
--- purchase_recalculation/i18n/en_US.po	2014-03-17 07:50:11 +0000
+++ purchase_recalculation/i18n/en_US.po	2014-04-10 09:10:37 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-03 07:50+0000\n"
-"PO-Revision-Date: 2013-10-03 07:50+0000\n"
+"POT-Creation-Date: 2014-04-10 08:29+0000\n"
+"PO-Revision-Date: 2014-04-10 08:29+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,190 +16,278 @@
 "Plural-Forms: \n"
 
 #. module: purchase_recalculation
-#: help:account.product.cost.recalculation,product_id:0
-msgid "Product for which recalculation will be done. If not set recalculation will be done for all products with cost method set 'Average Price'"
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:stock.update.values,date_delivered:0
+#: view:account.product.cost.recalculation:0
+#: view:account.product.cost.set:0
+#: view:stock.picking.update:0
+msgid "Cancel"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/wizard/account_product_cost_recalculation.py:54
+#: code:addons/purchase_recalculation/wizard/account_product_cost_set.py:59
+#, python-format
+msgid "Cannot find suitable dates for recalculation."
+msgstr ""
+
+#. module: purchase_recalculation
+#: view:stock.picking.update:0
+msgid "Confirm"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:product.period.cost,price_unit:0
+msgid "Cost for period"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/wizard/account_product_cost_set.py:112
+#, python-format
+msgid "Cost price for selected period does not exist!"
+msgstr ""
+
+#. module: purchase_recalculation
+#: selection:account.product.cost.set,type:0
+msgid "Create new cost move per period"
+msgstr ""
+
+#. module: purchase_recalculation
+#: selection:account.product.cost.set,type:0
+msgid "Create new cost move per period/product"
+msgstr ""
+
+#. module: purchase_recalculation
+#: selection:account.product.cost.set,type:0
+msgid "Create new cost move per period/product category"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:stock.picking.update,date_delivered:0
 msgid "Date delivered"
 msgstr ""
 
 #. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_stock_picking_out
+#, python-format
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/account_invoice.py:90
+#: code:addons/purchase_recalculation/product_product.py:186
+#: code:addons/purchase_recalculation/wizard/account_product_cost_recalculation.py:54
+#: code:addons/purchase_recalculation/wizard/account_product_cost_set.py:59
+#: code:addons/purchase_recalculation/wizard/account_product_cost_set.py:112
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:_description:0
 #: model:ir.model,name:purchase_recalculation.model_stock_picking_in
+#, python-format
 msgid "Incoming Shipments"
 msgstr ""
 
 #. module: purchase_recalculation
-#: help:account.product.cost.recalculation,period_id:0
-msgid "Period for which recalculation will be done. If not set recalculation will be done for whole fiscal year."
-msgstr ""
-
-#. module: purchase_recalculation
-#: model:ir.model,name:purchase_recalculation.model_stock_update_values
-msgid "Update Values Processing Wizard"
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:stock.update.values.line,wizard_id:0
-msgid "Wizard"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:stock.update.values:0
-msgid "Confirm"
-msgstr ""
-
-#. module: purchase_recalculation
-#: code:addons/purchase_recalculation/account_invoice.py:52
-#, python-format
-msgid "Invoiced stock moves are not in same period as invoice."
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:stock.update.values:0
-msgid "Product Moves"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:stock.update.values:0
-msgid "Transfer Products"
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:stock.update.values.line,price_unit_new:0
-msgid "New Price Unit"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:account.product.cost.recalculation:0
-#: model:ir.actions.act_window,name:purchase_recalculation.action_recalculate_product_cost
-#: model:ir.model,name:purchase_recalculation.model_account_product_cost_recalculation
-#: model:ir.ui.menu,name:purchase_recalculation.menu_recalculate_product_cost
-msgid "Recalculate Product Costs"
-msgstr ""
-
-#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_account_invoice
+#, python-format
+msgid "Invoice"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/account_invoice.py:90
+#, python-format
+msgid "Invoiced quantity is different than recieved quantity.\n"
+""
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:_description:0
 #: model:ir.model,name:purchase_recalculation.model_account_move_line
+#, python-format
 msgid "Journal Items"
 msgstr ""
 
 #. module: purchase_recalculation
-#: field:stock.update.values,picking_id:0
+#: field:stock.picking.update.line,move_id:0
+msgid "Move"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,price_unit_new:0
+msgid "New Price Unit"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,quantity_new:0
+msgid "New Quantity"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:account.product.cost.recalculation,period_id:0
+#: field:account.product.cost.set,period_id:0
+#: field:product.period.cost,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: purchase_recalculation
+#: help:account.product.cost.recalculation,period_id:0
+#: help:account.product.cost.set,period_id:0
+msgid "Period for which recalculation will be done."
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:stock.picking.update,picking_id:0
 msgid "Picking"
 msgstr ""
 
 #. module: purchase_recalculation
-#: model:ir.actions.act_window,name:purchase_recalculation.action_update_values
-#: view:stock.picking:0
-#: view:stock.update.values:0
-msgid "Update Values"
-msgstr ""
-
-#. module: purchase_recalculation
-#: model:ir.model,name:purchase_recalculation.model_stock_update_values_line
-msgid "stock.update.values.line"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:stock.update.values.line:0
-msgid "Stock Product Line"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:stock.update.values.line:0
-msgid "Product Returns"
-msgstr ""
-
-#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_stock_picking
+#, python-format
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,price_unit:0
+msgid "Price Unit"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:_description:0
 #: field:account.product.cost.recalculation,product_id:0
+#: field:account.product.cost.set,product_id:0
 #: model:ir.model,name:purchase_recalculation.model_product_product
-#: field:stock.update.values.line,product_id:0
+#: field:product.period.cost,product_id:0
+#: field:stock.picking.update.line,product_id:0
+#, python-format
 msgid "Product"
 msgstr ""
 
 #. module: purchase_recalculation
-#: code:addons/purchase_recalculation/account_invoice.py:52
-#: code:addons/purchase_recalculation/account_invoice.py:56
-#: code:addons/purchase_recalculation/product.py:128
-#: code:addons/purchase_recalculation/wizard/account_product_cost_recalculation.py:60
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_product_period_cost
 #, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:stock.update.values.line,price_unit:0
-msgid "Price Unit"
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:stock.update.values.line,quantity:0
+msgid "Product Cost By Period"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:stock.picking.update,move_ids:0
+msgid "Product Lines"
+msgstr ""
+
+#. module: purchase_recalculation
+#: view:stock.picking.update.line:0
+msgid "Product Returns"
+msgstr ""
+
+#. module: purchase_recalculation
+#: help:account.product.cost.recalculation,product_id:0
+#: help:account.product.cost.set,product_id:0
+msgid "Product for which recalculation will be done. If not set recalculation will be done for all products with cost method set 'Average Price'"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,quantity:0
 msgid "Quantity"
 msgstr ""
 
 #. module: purchase_recalculation
-#: field:stock.update.values,move_ids:0
-msgid "Product Lines"
-msgstr ""
-
-#. module: purchase_recalculation
-#: code:addons/purchase_recalculation/product.py:128
+#: view:account.product.cost.recalculation:0
+msgid "Recalculate Costs"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: view:account.product.cost.recalculation:0
+#: model:ir.actions.act_window,name:purchase_recalculation.action_recalculate_product_cost
+#: model:ir.model,name:purchase_recalculation.model_account_product_cost_recalculation
+#: model:ir.ui.menu,name:purchase_recalculation.menu_recalculate_product_cost
+#, python-format
+msgid "Recalculate Product Costs"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_account_product_cost_set
+#, python-format
+msgid "Set Product Costs"
+msgstr ""
+
+#. module: purchase_recalculation
+#: selection:account.product.cost.set,type:0
+msgid "Set cost price on existing account move lines"
+msgstr ""
+
+#. module: purchase_recalculation
+#: view:account.product.cost.set:0
+msgid "Set/Create Costs"
+msgstr ""
+
+#. module: purchase_recalculation
+#: view:account.product.cost.set:0
+#: model:ir.actions.act_window,name:purchase_recalculation.action_set_product_cost
+#: model:ir.ui.menu,name:purchase_recalculation.menu_set_product_cost
+msgid "Set/Create Product Costs"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/product_product.py:186
 #, python-format
 msgid "Specify valuation accounts for product: %s."
 msgstr ""
 
 #. module: purchase_recalculation
-#: code:addons/purchase_recalculation/account_invoice.py:56
-#, python-format
-msgid "Invoiced quantity is different than recieved quantity."
-msgstr ""
-
-#. module: purchase_recalculation
+#: code:_description:0
 #: field:account.move.line,stock_move_id:0
 #: model:ir.model,name:purchase_recalculation.model_stock_move
+#, python-format
 msgid "Stock Move"
 msgstr ""
 
 #. module: purchase_recalculation
-#: field:stock.update.values.line,move_id:0
-msgid "Move"
-msgstr ""
-
-#. module: purchase_recalculation
-#: code:addons/purchase_recalculation/wizard/account_product_cost_recalculation.py:60
+#: view:stock.picking.update:0
+msgid "Transfer Products"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:account.product.cost.set,type:0
+msgid "Type"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_stock_picking_update
 #, python-format
-msgid "Cannot find suitable dates for recalculation."
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:account.product.cost.recalculation,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:account.product.cost.recalculation:0
-msgid "Recalculate Costs"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:account.product.cost.recalculation:0
-#: view:stock.update.values:0
+msgid "Update Picking Values Processing Wizard"
+msgstr ""
+
+#. module: purchase_recalculation
+#: model:ir.actions.act_window,name:purchase_recalculation.action_picking_update
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+#: view:stock.picking.update:0
+msgid "Update Values"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: purchase_recalculation
+#: view:account.product.cost.recalculation:0
+#: view:account.product.cost.set:0
+#: view:stock.picking.update:0
 msgid "or"
 msgstr ""
 
 #. module: purchase_recalculation
-#: model:ir.model,name:purchase_recalculation.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:account.product.cost.recalculation:0
-#: view:stock.update.values:0
-msgid "Cancel"
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:stock.update.values.line,quantity_new:0
-msgid "New Quantity"
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_stock_picking_update_line
+#, python-format
+msgid "stock.picking.update.line"
 msgstr ""
 

=== modified file 'purchase_recalculation/i18n/purchase_recalculation.pot'
--- purchase_recalculation/i18n/purchase_recalculation.pot	2014-03-17 07:50:11 +0000
+++ purchase_recalculation/i18n/purchase_recalculation.pot	2014-04-10 09:10:37 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-03 07:50+0000\n"
-"PO-Revision-Date: 2013-10-03 07:50+0000\n"
+"POT-Creation-Date: 2014-04-10 08:29+0000\n"
+"PO-Revision-Date: 2014-04-10 08:29+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,190 +16,278 @@
 "Plural-Forms: \n"
 
 #. module: purchase_recalculation
-#: help:account.product.cost.recalculation,product_id:0
-msgid "Product for which recalculation will be done. If not set recalculation will be done for all products with cost method set 'Average Price'"
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:stock.update.values,date_delivered:0
+#: view:account.product.cost.recalculation:0
+#: view:account.product.cost.set:0
+#: view:stock.picking.update:0
+msgid "Cancel"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/wizard/account_product_cost_recalculation.py:54
+#: code:addons/purchase_recalculation/wizard/account_product_cost_set.py:59
+#, python-format
+msgid "Cannot find suitable dates for recalculation."
+msgstr ""
+
+#. module: purchase_recalculation
+#: view:stock.picking.update:0
+msgid "Confirm"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:product.period.cost,price_unit:0
+msgid "Cost for period"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/wizard/account_product_cost_set.py:112
+#, python-format
+msgid "Cost price for selected period does not exist!"
+msgstr ""
+
+#. module: purchase_recalculation
+#: selection:account.product.cost.set,type:0
+msgid "Create new cost move per period"
+msgstr ""
+
+#. module: purchase_recalculation
+#: selection:account.product.cost.set,type:0
+msgid "Create new cost move per period/product"
+msgstr ""
+
+#. module: purchase_recalculation
+#: selection:account.product.cost.set,type:0
+msgid "Create new cost move per period/product category"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:stock.picking.update,date_delivered:0
 msgid "Date delivered"
 msgstr ""
 
 #. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_stock_picking_out
+#, python-format
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/account_invoice.py:90
+#: code:addons/purchase_recalculation/product_product.py:186
+#: code:addons/purchase_recalculation/wizard/account_product_cost_recalculation.py:54
+#: code:addons/purchase_recalculation/wizard/account_product_cost_set.py:59
+#: code:addons/purchase_recalculation/wizard/account_product_cost_set.py:112
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:_description:0
 #: model:ir.model,name:purchase_recalculation.model_stock_picking_in
+#, python-format
 msgid "Incoming Shipments"
 msgstr ""
 
 #. module: purchase_recalculation
-#: help:account.product.cost.recalculation,period_id:0
-msgid "Period for which recalculation will be done. If not set recalculation will be done for whole fiscal year."
-msgstr ""
-
-#. module: purchase_recalculation
-#: model:ir.model,name:purchase_recalculation.model_stock_update_values
-msgid "Update Values Processing Wizard"
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:stock.update.values.line,wizard_id:0
-msgid "Wizard"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:stock.update.values:0
-msgid "Confirm"
-msgstr ""
-
-#. module: purchase_recalculation
-#: code:addons/purchase_recalculation/account_invoice.py:52
-#, python-format
-msgid "Invoiced stock moves are not in same period as invoice."
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:stock.update.values:0
-msgid "Product Moves"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:stock.update.values:0
-msgid "Transfer Products"
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:stock.update.values.line,price_unit_new:0
-msgid "New Price Unit"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:account.product.cost.recalculation:0
-#: model:ir.actions.act_window,name:purchase_recalculation.action_recalculate_product_cost
-#: model:ir.model,name:purchase_recalculation.model_account_product_cost_recalculation
-#: model:ir.ui.menu,name:purchase_recalculation.menu_recalculate_product_cost
-msgid "Recalculate Product Costs"
-msgstr ""
-
-#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_account_invoice
+#, python-format
+msgid "Invoice"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/account_invoice.py:90
+#, python-format
+msgid "Invoiced quantity is different than recieved quantity.\n"
+""
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:_description:0
 #: model:ir.model,name:purchase_recalculation.model_account_move_line
+#, python-format
 msgid "Journal Items"
 msgstr ""
 
 #. module: purchase_recalculation
-#: field:stock.update.values,picking_id:0
+#: field:stock.picking.update.line,move_id:0
+msgid "Move"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,price_unit_new:0
+msgid "New Price Unit"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,quantity_new:0
+msgid "New Quantity"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:account.product.cost.recalculation,period_id:0
+#: field:account.product.cost.set,period_id:0
+#: field:product.period.cost,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: purchase_recalculation
+#: help:account.product.cost.recalculation,period_id:0
+#: help:account.product.cost.set,period_id:0
+msgid "Period for which recalculation will be done."
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:stock.picking.update,picking_id:0
 msgid "Picking"
 msgstr ""
 
 #. module: purchase_recalculation
-#: model:ir.actions.act_window,name:purchase_recalculation.action_update_values
-#: view:stock.picking:0
-#: view:stock.update.values:0
-msgid "Update Values"
-msgstr ""
-
-#. module: purchase_recalculation
-#: model:ir.model,name:purchase_recalculation.model_stock_update_values_line
-msgid "stock.update.values.line"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:stock.update.values.line:0
-msgid "Stock Product Line"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:stock.update.values.line:0
-msgid "Product Returns"
-msgstr ""
-
-#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_stock_picking
+#, python-format
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,price_unit:0
+msgid "Price Unit"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:_description:0
 #: field:account.product.cost.recalculation,product_id:0
+#: field:account.product.cost.set,product_id:0
 #: model:ir.model,name:purchase_recalculation.model_product_product
-#: field:stock.update.values.line,product_id:0
+#: field:product.period.cost,product_id:0
+#: field:stock.picking.update.line,product_id:0
+#, python-format
 msgid "Product"
 msgstr ""
 
 #. module: purchase_recalculation
-#: code:addons/purchase_recalculation/account_invoice.py:52
-#: code:addons/purchase_recalculation/account_invoice.py:56
-#: code:addons/purchase_recalculation/product.py:128
-#: code:addons/purchase_recalculation/wizard/account_product_cost_recalculation.py:60
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_product_period_cost
 #, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:stock.update.values.line,price_unit:0
-msgid "Price Unit"
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:stock.update.values.line,quantity:0
+msgid "Product Cost By Period"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:stock.picking.update,move_ids:0
+msgid "Product Lines"
+msgstr ""
+
+#. module: purchase_recalculation
+#: view:stock.picking.update.line:0
+msgid "Product Returns"
+msgstr ""
+
+#. module: purchase_recalculation
+#: help:account.product.cost.recalculation,product_id:0
+#: help:account.product.cost.set,product_id:0
+msgid "Product for which recalculation will be done. If not set recalculation will be done for all products with cost method set 'Average Price'"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,quantity:0
 msgid "Quantity"
 msgstr ""
 
 #. module: purchase_recalculation
-#: field:stock.update.values,move_ids:0
-msgid "Product Lines"
-msgstr ""
-
-#. module: purchase_recalculation
-#: code:addons/purchase_recalculation/product.py:128
+#: view:account.product.cost.recalculation:0
+msgid "Recalculate Costs"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: view:account.product.cost.recalculation:0
+#: model:ir.actions.act_window,name:purchase_recalculation.action_recalculate_product_cost
+#: model:ir.model,name:purchase_recalculation.model_account_product_cost_recalculation
+#: model:ir.ui.menu,name:purchase_recalculation.menu_recalculate_product_cost
+#, python-format
+msgid "Recalculate Product Costs"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_account_product_cost_set
+#, python-format
+msgid "Set Product Costs"
+msgstr ""
+
+#. module: purchase_recalculation
+#: selection:account.product.cost.set,type:0
+msgid "Set cost price on existing account move lines"
+msgstr ""
+
+#. module: purchase_recalculation
+#: view:account.product.cost.set:0
+msgid "Set/Create Costs"
+msgstr ""
+
+#. module: purchase_recalculation
+#: view:account.product.cost.set:0
+#: model:ir.actions.act_window,name:purchase_recalculation.action_set_product_cost
+#: model:ir.ui.menu,name:purchase_recalculation.menu_set_product_cost
+msgid "Set/Create Product Costs"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/product_product.py:186
 #, python-format
 msgid "Specify valuation accounts for product: %s."
 msgstr ""
 
 #. module: purchase_recalculation
-#: code:addons/purchase_recalculation/account_invoice.py:56
-#, python-format
-msgid "Invoiced quantity is different than recieved quantity."
-msgstr ""
-
-#. module: purchase_recalculation
+#: code:_description:0
 #: field:account.move.line,stock_move_id:0
 #: model:ir.model,name:purchase_recalculation.model_stock_move
+#, python-format
 msgid "Stock Move"
 msgstr ""
 
 #. module: purchase_recalculation
-#: field:stock.update.values.line,move_id:0
-msgid "Move"
-msgstr ""
-
-#. module: purchase_recalculation
-#: code:addons/purchase_recalculation/wizard/account_product_cost_recalculation.py:60
+#: view:stock.picking.update:0
+msgid "Transfer Products"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:account.product.cost.set,type:0
+msgid "Type"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_stock_picking_update
 #, python-format
-msgid "Cannot find suitable dates for recalculation."
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:account.product.cost.recalculation,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:account.product.cost.recalculation:0
-msgid "Recalculate Costs"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:account.product.cost.recalculation:0
-#: view:stock.update.values:0
+msgid "Update Picking Values Processing Wizard"
+msgstr ""
+
+#. module: purchase_recalculation
+#: model:ir.actions.act_window,name:purchase_recalculation.action_picking_update
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+#: view:stock.picking.update:0
+msgid "Update Values"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: purchase_recalculation
+#: view:account.product.cost.recalculation:0
+#: view:account.product.cost.set:0
+#: view:stock.picking.update:0
 msgid "or"
 msgstr ""
 
 #. module: purchase_recalculation
-#: model:ir.model,name:purchase_recalculation.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:account.product.cost.recalculation:0
-#: view:stock.update.values:0
-msgid "Cancel"
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:stock.update.values.line,quantity_new:0
-msgid "New Quantity"
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_stock_picking_update_line
+#, python-format
+msgid "stock.picking.update.line"
 msgstr ""
 

=== added file 'purchase_recalculation/i18n/sl.po'
--- purchase_recalculation/i18n/sl.po	1970-01-01 00:00:00 +0000
+++ purchase_recalculation/i18n/sl.po	2014-04-10 09:10:37 +0000
@@ -0,0 +1,293 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_recalculation
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-04-10 08:29+0000\n"
+"PO-Revision-Date: 2014-04-10 08:29+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: purchase_recalculation
+#: view:account.product.cost.recalculation:0
+#: view:account.product.cost.set:0
+#: view:stock.picking.update:0
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/wizard/account_product_cost_recalculation.py:54
+#: code:addons/purchase_recalculation/wizard/account_product_cost_set.py:59
+#, python-format
+msgid "Cannot find suitable dates for recalculation."
+msgstr "Ne najdem ustreznih datumov za preračun."
+
+#. module: purchase_recalculation
+#: view:stock.picking.update:0
+msgid "Confirm"
+msgstr "Potrdi"
+
+#. module: purchase_recalculation
+#: field:product.period.cost,price_unit:0
+msgid "Cost for period"
+msgstr "Strošek za obdobje"
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/wizard/account_product_cost_set.py:112
+#, python-format
+msgid "Cost price for selected period does not exist!"
+msgstr "Izračunan strošek za izbrano obdobje ne obstoja!"
+
+#. module: purchase_recalculation
+#: selection:account.product.cost.set,type:0
+msgid "Create new cost move per period"
+msgstr "Ustvari knjižbe za celotno obdobje"
+
+#. module: purchase_recalculation
+#: selection:account.product.cost.set,type:0
+msgid "Create new cost move per period/product"
+msgstr "Ustvari knjižbe za celotno obdobje ločeno po izdelku"
+
+#. module: purchase_recalculation
+#: selection:account.product.cost.set,type:0
+msgid "Create new cost move per period/product category"
+msgstr "Ustvari knjižbe za celotno obdobje ločeno po kategoriji izdelkov"
+
+#. module: purchase_recalculation
+#: field:stock.picking.update,date_delivered:0
+msgid "Date delivered"
+msgstr "Datum dobave"
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_stock_picking_out
+#, python-format
+msgid "Delivery Orders"
+msgstr "Dobavnice"
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/account_invoice.py:90
+#: code:addons/purchase_recalculation/product_product.py:186
+#: code:addons/purchase_recalculation/wizard/account_product_cost_recalculation.py:54
+#: code:addons/purchase_recalculation/wizard/account_product_cost_set.py:59
+#: code:addons/purchase_recalculation/wizard/account_product_cost_set.py:112
+#, python-format
+msgid "Error!"
+msgstr "Napaka!"
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_stock_picking_in
+#, python-format
+msgid "Incoming Shipments"
+msgstr "Prejemnice"
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_account_invoice
+#, python-format
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/account_invoice.py:90
+#, python-format
+msgid "Invoiced quantity is different than recieved quantity.\n"
+""
+msgstr "Količina na računu se razlikuje od količine na prejemnici/dobavnici\n"
+""
+#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_account_move_line
+#, python-format
+msgid "Journal Items"
+msgstr "Postavke temeljnice"
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,move_id:0
+msgid "Move"
+msgstr "Premik"
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,price_unit_new:0
+msgid "New Price Unit"
+msgstr "Nova cena na enoto"
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,quantity_new:0
+msgid "New Quantity"
+msgstr "Nova količina"
+
+#. module: purchase_recalculation
+#: field:account.product.cost.recalculation,period_id:0
+#: field:account.product.cost.set,period_id:0
+#: field:product.period.cost,period_id:0
+msgid "Period"
+msgstr "Obdobje"
+
+#. module: purchase_recalculation
+#: help:account.product.cost.recalculation,period_id:0
+#: help:account.product.cost.set,period_id:0
+msgid "Period for which recalculation will be done."
+msgstr "Obdobje za katerega bojo izračunane cene."
+
+#. module: purchase_recalculation
+#: field:stock.picking.update,picking_id:0
+msgid "Picking"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_stock_picking
+#, python-format
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,price_unit:0
+msgid "Price Unit"
+msgstr "Cena na enoto"
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: field:account.product.cost.recalculation,product_id:0
+#: field:account.product.cost.set,product_id:0
+#: model:ir.model,name:purchase_recalculation.model_product_product
+#: field:product.period.cost,product_id:0
+#: field:stock.picking.update.line,product_id:0
+#, python-format
+msgid "Product"
+msgstr "Izdelek"
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_product_period_cost
+#, python-format
+msgid "Product Cost By Period"
+msgstr "Strošek izdelka po obdobjih"
+
+#. module: purchase_recalculation
+#: field:stock.picking.update,move_ids:0
+msgid "Product Lines"
+msgstr "Postavke"
+
+#. module: purchase_recalculation
+#: view:stock.picking.update.line:0
+msgid "Product Returns"
+msgstr "Vračila izdelkov"
+
+#. module: purchase_recalculation
+#: help:account.product.cost.recalculation,product_id:0
+#: help:account.product.cost.set,product_id:0
+msgid "Product for which recalculation will be done. If not set recalculation will be done for all products with cost method set 'Average Price'"
+msgstr "Izdelek za katerega bo izračunan strošek. Če ni določen noben izdelek bojo izračunani stroški za vse izdelke s povprečno vrednostjo stroška"
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,quantity:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: purchase_recalculation
+#: view:account.product.cost.recalculation:0
+msgid "Recalculate Costs"
+msgstr "Preračunaj stroške"
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: view:account.product.cost.recalculation:0
+#: model:ir.actions.act_window,name:purchase_recalculation.action_recalculate_product_cost
+#: model:ir.model,name:purchase_recalculation.model_account_product_cost_recalculation
+#: model:ir.ui.menu,name:purchase_recalculation.menu_recalculate_product_cost
+#, python-format
+msgid "Recalculate Product Costs"
+msgstr "Preračunaj stroške"
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_account_product_cost_set
+#, python-format
+msgid "Set Product Costs"
+msgstr "Zaknjiži stroške"
+
+#. module: purchase_recalculation
+#: selection:account.product.cost.set,type:0
+msgid "Set cost price on existing account move lines"
+msgstr "Popravi stroške na obstoječih knjižbah"
+
+#. module: purchase_recalculation
+#: view:account.product.cost.set:0
+msgid "Set/Create Costs"
+msgstr "Popravi/ustvari knjižbe stroškov"
+
+#. module: purchase_recalculation
+#: view:account.product.cost.set:0
+#: model:ir.actions.act_window,name:purchase_recalculation.action_set_product_cost
+#: model:ir.ui.menu,name:purchase_recalculation.menu_set_product_cost
+msgid "Set/Create Product Costs"
+msgstr "Popravi/ustvari knjižbe stroškov"
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/product_product.py:186
+#, python-format
+msgid "Specify valuation accounts for product: %s."
+msgstr "Nastavi konte zaloge za izdelke: %s."
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: field:account.move.line,stock_move_id:0
+#: model:ir.model,name:purchase_recalculation.model_stock_move
+#, python-format
+msgid "Stock Move"
+msgstr "Premik zaloge"
+
+#. module: purchase_recalculation
+#: view:stock.picking.update:0
+msgid "Transfer Products"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:account.product.cost.set,type:0
+msgid "Type"
+msgstr "Način"
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_stock_picking_update
+#, python-format
+msgid "Update Picking Values Processing Wizard"
+msgstr "Čarovnik za posodabljanje vrednosti na prejemih in izdajah"
+
+#. module: purchase_recalculation
+#: model:ir.actions.act_window,name:purchase_recalculation.action_picking_update
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+#: view:stock.picking.update:0
+msgid "Update Values"
+msgstr "Posodobi vrednosti"
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,wizard_id:0
+msgid "Wizard"
+msgstr "Čarovnik"
+
+#. module: purchase_recalculation
+#: view:account.product.cost.recalculation:0
+#: view:account.product.cost.set:0
+#: view:stock.picking.update:0
+msgid "or"
+msgstr ""
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_stock_picking_update_line
+#, python-format
+msgid "stock.picking.update.line"
+msgstr ""
+

=== modified file 'purchase_recalculation/i18n/sl_SI.po'
--- purchase_recalculation/i18n/sl_SI.po	2014-03-17 07:50:11 +0000
+++ purchase_recalculation/i18n/sl_SI.po	2014-04-10 09:10:37 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-03 07:50+0000\n"
-"PO-Revision-Date: 2013-10-03 07:50+0000\n"
+"POT-Creation-Date: 2014-04-10 08:29+0000\n"
+"PO-Revision-Date: 2014-04-10 08:29+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,189 +16,278 @@
 "Plural-Forms: \n"
 
 #. module: purchase_recalculation
-#: help:account.product.cost.recalculation,product_id:0
-msgid "Product for which recalculation will be done. If not set recalculation will be done for all products with cost method set 'Average Price'"
-msgstr "Izdelek, za katerega želite preračunati vrednosti. Če vrednost ni določena se preračun izvede za vse izdelke, ki imajo promet v obdobju"
-
-#. module: purchase_recalculation
-#: field:stock.update.values,date_delivered:0
+#: view:account.product.cost.recalculation:0
+#: view:account.product.cost.set:0
+#: view:stock.picking.update:0
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/wizard/account_product_cost_recalculation.py:54
+#: code:addons/purchase_recalculation/wizard/account_product_cost_set.py:59
+#, python-format
+msgid "Cannot find suitable dates for recalculation."
+msgstr "Ne najdem ustreznih datumov za preračun."
+
+#. module: purchase_recalculation
+#: view:stock.picking.update:0
+msgid "Confirm"
+msgstr "Potrdi"
+
+#. module: purchase_recalculation
+#: field:product.period.cost,price_unit:0
+msgid "Cost for period"
+msgstr "Strošek za obdobje"
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/wizard/account_product_cost_set.py:112
+#, python-format
+msgid "Cost price for selected period does not exist!"
+msgstr "Izračunan strošek za izbrano obdobje ne obstoja!"
+
+#. module: purchase_recalculation
+#: selection:account.product.cost.set,type:0
+msgid "Create new cost move per period"
+msgstr "Ustvari knjižbe za celotno obdobje"
+
+#. module: purchase_recalculation
+#: selection:account.product.cost.set,type:0
+msgid "Create new cost move per period/product"
+msgstr "Ustvari knjižbe za celotno obdobje ločeno po izdelku"
+
+#. module: purchase_recalculation
+#: selection:account.product.cost.set,type:0
+msgid "Create new cost move per period/product category"
+msgstr "Ustvari knjižbe za celotno obdobje ločeno po kategoriji izdelkov"
+
+#. module: purchase_recalculation
+#: field:stock.picking.update,date_delivered:0
 msgid "Date delivered"
-msgstr "Datum prejema"
-
-#. module: purchase_recalculation
+msgstr "Datum dobave"
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_stock_picking_out
+#, python-format
+msgid "Delivery Orders"
+msgstr "Dobavnice"
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/account_invoice.py:90
+#: code:addons/purchase_recalculation/product_product.py:186
+#: code:addons/purchase_recalculation/wizard/account_product_cost_recalculation.py:54
+#: code:addons/purchase_recalculation/wizard/account_product_cost_set.py:59
+#: code:addons/purchase_recalculation/wizard/account_product_cost_set.py:112
+#, python-format
+msgid "Error!"
+msgstr "Napaka!"
+
+#. module: purchase_recalculation
+#: code:_description:0
 #: model:ir.model,name:purchase_recalculation.model_stock_picking_in
+#, python-format
 msgid "Incoming Shipments"
-msgstr "Prihajajoče pošiljke"
+msgstr "Prejemnice"
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_account_invoice
+#, python-format
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/account_invoice.py:90
+#, python-format
+msgid "Invoiced quantity is different than recieved quantity.\n"
+""
+msgstr "Količina na računu se razlikuje od količine na prejemnici/dobavnici\n"
+""
+#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_account_move_line
+#, python-format
+msgid "Journal Items"
+msgstr "Postavke temeljnice"
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,move_id:0
+msgid "Move"
+msgstr "Premik"
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,price_unit_new:0
+msgid "New Price Unit"
+msgstr "Nova cena na enoto"
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,quantity_new:0
+msgid "New Quantity"
+msgstr "Nova količina"
+
+#. module: purchase_recalculation
+#: field:account.product.cost.recalculation,period_id:0
+#: field:account.product.cost.set,period_id:0
+#: field:product.period.cost,period_id:0
+msgid "Period"
+msgstr "Obdobje"
 
 #. module: purchase_recalculation
 #: help:account.product.cost.recalculation,period_id:0
+#: help:account.product.cost.set,period_id:0
 msgid "Period for which recalculation will be done."
-msgstr "Obdobje preračuna."
-
-#. module: purchase_recalculation
-#: model:ir.model,name:purchase_recalculation.model_stock_update_values
-msgid "Update Values Processing Wizard"
-msgstr "Čarovnik za spremembo vrednosti"
-
-#. module: purchase_recalculation
-#: field:stock.update.values.line,wizard_id:0
-msgid "Wizard"
-msgstr "Čarovnik"
-
-#. module: purchase_recalculation
-#: view:stock.update.values:0
-msgid "Confirm"
-msgstr "Potrdi"
-
-#. module: purchase_recalculation
-#: code:addons/purchase_recalculation/account_invoice.py:52
-#, python-format
-msgid "Invoiced stock moves are not in same period as invoice."
-msgstr "Obdobje računa in dobavnice ni isto."
-
-#. module: purchase_recalculation
-#: view:stock.update.values:0
-msgid "Product Moves"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:stock.update.values:0
-msgid "Transfer Products"
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:stock.update.values.line,price_unit_new:0
-msgid "New Price Unit"
-msgstr "Nova cena enote"
-
-#. module: purchase_recalculation
-#: view:account.product.cost.recalculation:0
-#: model:ir.actions.act_window,name:purchase_recalculation.action_recalculate_product_cost
-#: model:ir.model,name:purchase_recalculation.model_account_product_cost_recalculation
-#: model:ir.ui.menu,name:purchase_recalculation.menu_recalculate_product_cost
-msgid "Recalculate Product Costs"
-msgstr "Preračun stroškov izdelkov"
-
-#. module: purchase_recalculation
-#: model:ir.model,name:purchase_recalculation.model_account_move_line
-msgid "Journal Items"
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:stock.update.values,picking_id:0
+msgstr "Obdobje za katerega bojo izračunane cene."
+
+#. module: purchase_recalculation
+#: field:stock.picking.update,picking_id:0
 msgid "Picking"
 msgstr ""
 
 #. module: purchase_recalculation
-#: model:ir.actions.act_window,name:purchase_recalculation.action_update_values
-#: view:stock.picking:0
-#: view:stock.update.values:0
-msgid "Update Values"
-msgstr "Posodobi vrednosti"
-
-#. module: purchase_recalculation
-#: model:ir.model,name:purchase_recalculation.model_stock_update_values_line
-msgid "stock.update.values.line"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:stock.update.values.line:0
-msgid "Stock Product Line"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:stock.update.values.line:0
-msgid "Product Returns"
-msgstr ""
-
-#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_stock_picking
+#, python-format
+msgid "Picking List"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,price_unit:0
+msgid "Price Unit"
+msgstr "Cena na enoto"
+
+#. module: purchase_recalculation
+#: code:_description:0
 #: field:account.product.cost.recalculation,product_id:0
+#: field:account.product.cost.set,product_id:0
 #: model:ir.model,name:purchase_recalculation.model_product_product
-#: field:stock.update.values.line,product_id:0
+#: field:product.period.cost,product_id:0
+#: field:stock.picking.update.line,product_id:0
+#, python-format
 msgid "Product"
-msgstr ""
+msgstr "Izdelek"
 
 #. module: purchase_recalculation
-#: code:addons/purchase_recalculation/account_invoice.py:52
-#: code:addons/purchase_recalculation/account_invoice.py:56
-#: code:addons/purchase_recalculation/product.py:128
-#: code:addons/purchase_recalculation/wizard/account_product_cost_recalculation.py:60
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_product_period_cost
 #, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:stock.update.values.line,price_unit:0
-msgid "Price Unit"
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:stock.update.values.line,quantity:0
+msgid "Product Cost By Period"
+msgstr "Strošek izdelka po obdobjih"
+
+#. module: purchase_recalculation
+#: field:stock.picking.update,move_ids:0
+msgid "Product Lines"
+msgstr "Postavke"
+
+#. module: purchase_recalculation
+#: view:stock.picking.update.line:0
+msgid "Product Returns"
+msgstr "Vračila izdelkov"
+
+#. module: purchase_recalculation
+#: help:account.product.cost.recalculation,product_id:0
+#: help:account.product.cost.set,product_id:0
+msgid "Product for which recalculation will be done. If not set recalculation will be done for all products with cost method set 'Average Price'"
+msgstr "Izdelek za katerega bo izračunan strošek. Če ni določen noben izdelek bojo izračunani stroški za vse izdelke s povprečno vrednostjo stroška"
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,quantity:0
 msgid "Quantity"
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:stock.update.values,move_ids:0
-msgid "Product Lines"
-msgstr ""
-
-#. module: purchase_recalculation
-#: code:addons/purchase_recalculation/product.py:128
+msgstr "Količina"
+
+#. module: purchase_recalculation
+#: view:account.product.cost.recalculation:0
+msgid "Recalculate Costs"
+msgstr "Preračunaj stroške"
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: view:account.product.cost.recalculation:0
+#: model:ir.actions.act_window,name:purchase_recalculation.action_recalculate_product_cost
+#: model:ir.model,name:purchase_recalculation.model_account_product_cost_recalculation
+#: model:ir.ui.menu,name:purchase_recalculation.menu_recalculate_product_cost
+#, python-format
+msgid "Recalculate Product Costs"
+msgstr "Preračunaj stroške"
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_account_product_cost_set
+#, python-format
+msgid "Set Product Costs"
+msgstr "Zaknjiži stroške"
+
+#. module: purchase_recalculation
+#: selection:account.product.cost.set,type:0
+msgid "Set cost price on existing account move lines"
+msgstr "Popravi stroške na obstoječih knjižbah"
+
+#. module: purchase_recalculation
+#: view:account.product.cost.set:0
+msgid "Set/Create Costs"
+msgstr "Popravi/ustvari knjižbe stroškov"
+
+#. module: purchase_recalculation
+#: view:account.product.cost.set:0
+#: model:ir.actions.act_window,name:purchase_recalculation.action_set_product_cost
+#: model:ir.ui.menu,name:purchase_recalculation.menu_set_product_cost
+msgid "Set/Create Product Costs"
+msgstr "Popravi/ustvari knjižbe stroškov"
+
+#. module: purchase_recalculation
+#: code:addons/purchase_recalculation/product_product.py:186
 #, python-format
 msgid "Specify valuation accounts for product: %s."
-msgstr ""
-
-#. module: purchase_recalculation
-#: code:addons/purchase_recalculation/account_invoice.py:56
-#, python-format
-msgid "Invoiced quantity is different than recieved quantity."
-msgstr "Količina na računu ne ustreza količina na prejemnici."
-
-#. module: purchase_recalculation
+msgstr "Nastavi konte zaloge za izdelke: %s."
+
+#. module: purchase_recalculation
+#: code:_description:0
 #: field:account.move.line,stock_move_id:0
 #: model:ir.model,name:purchase_recalculation.model_stock_move
+#, python-format
 msgid "Stock Move"
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:stock.update.values.line,move_id:0
-msgid "Move"
-msgstr ""
-
-#. module: purchase_recalculation
-#: code:addons/purchase_recalculation/wizard/account_product_cost_recalculation.py:60
+msgstr "Premik zaloge"
+
+#. module: purchase_recalculation
+#: view:stock.picking.update:0
+msgid "Transfer Products"
+msgstr ""
+
+#. module: purchase_recalculation
+#: field:account.product.cost.set,type:0
+msgid "Type"
+msgstr "Način"
+
+#. module: purchase_recalculation
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_stock_picking_update
 #, python-format
-msgid "Cannot find suitable dates for recalculation."
-msgstr "Ne najdem ustreznih obdobij."
-
-#. module: purchase_recalculation
-#: field:account.product.cost.recalculation,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:account.product.cost.recalculation:0
-msgid "Recalculate Costs"
-msgstr "Preračunaj stroške"
-
-#. module: purchase_recalculation
-#: view:account.product.cost.recalculation:0
-#: view:stock.update.values:0
+msgid "Update Picking Values Processing Wizard"
+msgstr "Čarovnik za posodabljanje vrednosti na prejemih in izdajah"
+
+#. module: purchase_recalculation
+#: model:ir.actions.act_window,name:purchase_recalculation.action_picking_update
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+#: view:stock.picking.update:0
+msgid "Update Values"
+msgstr "Posodobi vrednosti"
+
+#. module: purchase_recalculation
+#: field:stock.picking.update.line,wizard_id:0
+msgid "Wizard"
+msgstr "Čarovnik"
+
+#. module: purchase_recalculation
+#: view:account.product.cost.recalculation:0
+#: view:account.product.cost.set:0
+#: view:stock.picking.update:0
 msgid "or"
 msgstr ""
 
 #. module: purchase_recalculation
-#: model:ir.model,name:purchase_recalculation.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: purchase_recalculation
-#: view:account.product.cost.recalculation:0
-#: view:stock.update.values:0
-msgid "Cancel"
-msgstr ""
-
-#. module: purchase_recalculation
-#: field:stock.update.values.line,quantity_new:0
-msgid "New Quantity"
-msgstr "Nova količina"
+#: code:_description:0
+#: model:ir.model,name:purchase_recalculation.model_stock_picking_update_line
+#, python-format
+msgid "stock.picking.update.line"
+msgstr ""
+

=== modified file 'purchase_recalculation/product_product.py'
--- purchase_recalculation/product_product.py	2014-03-26 13:18:24 +0000
+++ purchase_recalculation/product_product.py	2014-04-10 09:10:37 +0000
@@ -29,6 +29,17 @@
 class product_product(osv.Model):
     _inherit="product.product"
     
+    def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
+        res = super(product_product, self).read(cr, uid, ids, fields, context, load)
+        if context.get('active_model', False) \
+           and context.get('active_model') == 'stock.location.product' \
+           and context.get('from_date', False) \
+           and context.get('to_date', False) \
+           and 'standard_price' in fields:
+            res1 = {}
+            res1 = res
+        return res
+    
     def _get_stock_and_cost_inventory(self, cr, uid, ids, dates, context):
         if dates is None:
             dates = {}
@@ -39,16 +50,16 @@
         _inventory_line_ids = self.pool.get('stock.inventory.line').search(cr, uid, [('product_id','=',ids[0])])
         _inventory_lines = self.pool.get('stock.inventory.line').browse(cr, uid, _inventory_line_ids, context)
         for _inventory_line in _inventory_lines:
-            if _inventory_line.inventory_id.state == 'done' \
-               and _inventory_line.inventory_id.date > _date_from:
+            if _inventory_line.inventory_id.date_done >= _date_from \
+               and _inventory_line.inventory_id.date_done <= _date_to \
+               and _inventory_line.inventory_id.state == 'done':
                 for _move_line in _inventory_line.inventory_id.move_ids:
-                    if _move_line.product_id.id == ids[0]:
-                        _stock = _stock + _move_line.product_qty
-                        _acc_move_line_id = self.pool.get('account.move.line').search(cr, uid, [('stock_move_id','=',_move_line.id)], limit=1)
-                        if len(_acc_move_line_id) <> 0:
-                            _acc_move_line = self.pool.get('account.move.line').browse(cr, uid, _acc_move_line_id[0], context)
-                            if _acc_move_line:
-                                _cost = _acc_move_line.debit + _acc_move_line.credit 
+                    _stock = _stock + _move_line.product_qty
+                    _acc_move_line_id = self.pool.get('account.move.line').search(cr, uid, [('stock_move_id','=',_move_line.id)], limit=1)
+                    if len(_acc_move_line_id) <> 0:
+                        _acc_move_line = self.pool.get('account.move.line').browse(cr, uid, _acc_move_line_id[0], context)
+                        if _acc_move_line:
+                            _cost = _acc_move_line.debit + _acc_move_line.credit
         return [_stock, _cost]
 
     def _get_stock_and_cost(self, cr, uid, ids, dates, context):
@@ -86,15 +97,16 @@
                 _sql_string = '  SELECT sm.id \n' \
                               '    FROM stock_move AS sm \n' \
                               '   WHERE sm.product_id = {product} \n' \
-                              '         AND sm.date >= \'{date_from}\' \n' \
                               '         AND sm.date < \'{date_to}\' \n' \
                               '         AND sm.state = \'done\' \n' \
                               '         AND NOT EXISTS (SELECT inv.move_id \n' \
                               '                           FROM stock_inventory_move_rel AS inv \n' \
                               '                          WHERE inv.move_id = sm.id) \n ' \
-                              'ORDER BY sm.date'.format(product = ids[0],
-                                                        date_from = _date_from,
-                                                        date_to = _date_to).replace(',)', ')')
+                              '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 = []
@@ -110,6 +122,7 @@
                 
                 if _stock == 0.0:
                     _cost = 0.0
+                    _period = False
                 else:
                     _cost = _cost * _stock
 
@@ -157,22 +170,22 @@
     def _set_period_cost(self, cr, uid, ids, dates, digits, average_price, context):
         if dates is None:
             dates = {}
-
+ 
         _product_id = self.pool.get('product.product').browse(cr, uid, ids[0], context)
-
+ 
         accounts = self.pool.get('product.product').get_product_accounts(cr, uid, _product_id.id, context)
         accounts['stock_account_expense'] = _product_id.property_account_expense and _product_id.property_account_expense.id or False
         if not accounts['stock_account_expense']:
             accounts['stock_account_expense'] = _product_id.categ_id.property_account_expense_categ and _product_id.categ_id.property_account_expense_categ.id or False
-
+ 
         if not accounts['stock_journal'] \
            or not accounts['stock_account_input'] \
            or not accounts['stock_account_output'] \
            or not accounts['property_stock_valuation_account_id'] \
            or not accounts['stock_account_expense']:
             raise osv.except_osv(_('Error!'), _('Specify valuation accounts for product: %s.') % (_product_id.name))
-
-
+ 
+ 
         _date_from = dates.get('date_from', False)
         _date_to = dates.get('date_to', False)
         if _date_from and _date_to:
@@ -198,7 +211,7 @@
             _stock_move_ids = []
             for _tup in _stock_move_tups:
                 _stock_move_ids.append(_tup[0])
-            
+             
             if len(_stock_move_ids) > 0:
                 # popravim cene na stock_move
                 _sql_string = 'UPDATE stock_move \n' \
@@ -208,7 +221,7 @@
                                                                   stock_moves = tuple(_stock_move_ids)).replace(',)', ')')
                 #print _sql_string
                 cr.execute(_sql_string)
-
+ 
                 # popravim vse ustrezne stock_journale
                 _journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','stock')])
                 _location_ids = self.pool.get('stock.location').search(cr, uid, [('usage','=','internal')])
@@ -251,7 +264,7 @@
                                                                  stock_journal = accounts['stock_journal']).replace(',)', ')')
                 #print _sql_string
                 cr.execute(_sql_string)
-                
+                 
                 # popravim vse knjižbe porabe na izdanih računih in dobropisih
                 _journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','in',('sale', 'sale_refund'))])
                 _sql_string = 'WITH aml AS (SELECT aml.id,                                                \n' \
@@ -297,5 +310,5 @@
                                                                  date_to = _date_to).replace(',)', ')')
                 #print _sql_string
                 cr.execute(_sql_string)
-
+ 
         return True

=== modified file 'purchase_recalculation/stock_move.py'
--- purchase_recalculation/stock_move.py	2014-04-01 06:32:13 +0000
+++ purchase_recalculation/stock_move.py	2014-04-10 09:10:37 +0000
@@ -35,18 +35,26 @@
         _credit_lines['stock_move_id'] = move.id
         return [(0, 0, _debit_lines), (0, 0, _credit_lines)]
 
-    def _move_update_values(self, cr, uid, ids, context, date_delivered, price_unit):
+    def _move_update_values(self, cr, uid, ids, context, date_delivered, quantity, price_unit):
         _costs_installed = self.pool.get('stock.move').fields_get(cr, uid, ['landing_costs_line_ids'], context) != {}
         _moves = self.pool.get('stock.move').browse(cr, uid, ids, context)
         for _move in _moves:
             if not date_delivered:
                 date_delivered = _move.date
+            if not quantity:
+                quantity = _move.product_qty
             if _costs_installed:
+                if not price_unit:
+                    price_unit = _move.price_unit_without_costs
                 self.pool.get('stock.move').write(cr, uid, [_move.id], {'date': date_delivered,
+                                                                        'product_qty': quantity,
                                                                         'price_unit': price_unit,
                                                                         'price_unit_without_costs': False})
             else:
+                if not price_unit:
+                    price_unit = _move.price_unit
                 self.pool.get('stock.move').write(cr, uid, [_move.id], {'date': date_delivered,
+                                                                        'product_qty': quantity,
                                                                         'price_unit': price_unit})
                 
         return True

=== modified file 'purchase_recalculation/stock_picking.py'
--- purchase_recalculation/stock_picking.py	2014-04-01 06:32:13 +0000
+++ purchase_recalculation/stock_picking.py	2014-04-10 09:10:37 +0000
@@ -49,7 +49,8 @@
                 if _move_data == {}:
                     continue
                 _price_unit = _move_data.get('price_unit', False)
-                self.pool.get('stock.move')._move_update_values(cr, uid, [_move.id], context, _date_delivered, _price_unit)
+                _quantity = _move_data.get('quantity', False)
+                self.pool.get('stock.move')._move_update_values(cr, uid, [_move.id], context, _date_delivered, _quantity, _price_unit)
             if _costs_installed and (_picking_has_costs or _moves_have_costs):
                 self.pool.get('stock.move')._move_update_costs(cr, uid, _move_ids, context)
             self.pool.get('stock.move')._move_update_valuation(cr, uid, _move_ids, context)

=== modified file 'purchase_recalculation/wizard/__init__.py'
--- purchase_recalculation/wizard/__init__.py	2014-03-17 07:50:11 +0000
+++ purchase_recalculation/wizard/__init__.py	2014-04-10 09:10:37 +0000
@@ -20,4 +20,5 @@
 ##############################################################################
 
 import account_product_cost_recalculation
+import account_product_cost_set
 import stock_picking_update
\ No newline at end of file

=== modified file 'purchase_recalculation/wizard/account_product_cost_recalculation.py'
--- purchase_recalculation/wizard/account_product_cost_recalculation.py	2014-03-26 08:11:13 +0000
+++ purchase_recalculation/wizard/account_product_cost_recalculation.py	2014-04-10 09:10:37 +0000
@@ -63,24 +63,7 @@
         if _recalc_id.product_id:
             _product_ids.append(_recalc_id.product_id.id)
         else:
-            _location_ids = self.pool.get('stock.location').search(cr, uid, [('usage','=','internal')])
-            _sql_string = '  SELECT sm.product_id AS id \n ' \
-                          '    FROM stock_move AS sm \n ' \
-                          '         INNER JOIN product_template AS pt ON pt.id = sm.product_id \n ' \
-                          '                                              AND pt.cost_method = \'average\' \n ' \
-                          '   WHERE sm.date >=  \'{date_from}\' \n' \
-                          '         AND sm.date <= \'{date_to}\' \n ' \
-                          '         AND sm.state = \'done\' \n ' \
-                          '         AND sm.location_id IN {locations} \n ' \
-                          '         AND sm.location_dest_id NOT IN {locations} \n ' \
-                          'GROUP BY sm.product_id \n ' \
-                          'ORDER BY sm.product_id;'.format(date_from = _date_from + ' 00:00:00',
-                                                           date_to = _date_to + ' 23:59:59',
-                                                           locations = tuple(_location_ids)).replace(',)', ')')
-            cr.execute(_sql_string)
-            _products_tup = cr.fetchall()
-            for _tup in _products_tup:
-                _product_ids.append(_tup[0])
+            _product_ids = self.pool.get('product.product').search(cr, uid, [('active','=',True)])
 
         _digits_obj = self.pool.get('decimal.precision')
         _digits_id = _digits_obj.search(cr, uid, [('name','=','Product Price')])
@@ -133,12 +116,22 @@
             if _end_period_stock and _end_period_stock <> 0:
                 _period_average = round(_end_period_cost / _end_period_stock, _digits['price'])
 
-            # posodobim vrednosti prodaje na povprečno ceno za obdobje
+            # zapišem povprečno ceno v tabelo
             if _period_average and _period_average <> 0:
                 _dates['date_from'] = _date_from + ' 00:00:00'
                 _dates['date_to'] = _date_to + ' 23:59:59'
-                _product._set_period_cost(_dates, _digits, _period_average)
-
+
+                # posodobim vrednosti prodaje na povprečno ceno za obdobje
+                #_product._set_period_cost(_dates, _digits, _period_average)
+
+                _product_cost_id = self.pool.get('product.period.cost').search(cr, uid, [('product_id','=', _product.id),
+                                                                                         ('period_id','=',_period_id.id)])
+                if len(_product_cost_id) <> 0:
+                    self.pool.get('product.period.cost').write(cr, uid, _product_cost_id, {'price_unit': _period_average})
+                else:
+                    self.pool.get('product.period.cost').create(cr, uid, {'product_id': _product.id,
+                                                                          'period_id': _period_id.id,
+                                                                          'price_unit': _period_average})
         return True
     
     def execute(self, cr, uid, ids, context=None):

=== added file 'purchase_recalculation/wizard/account_product_cost_set.py'
--- purchase_recalculation/wizard/account_product_cost_set.py	1970-01-01 00:00:00 +0000
+++ purchase_recalculation/wizard/account_product_cost_set.py	2014-04-10 09:10:37 +0000
@@ -0,0 +1,125 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>)
+#    Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+from datetime import datetime
+import time
+import openerp.addons.decimal_precision as dp
+
+class account_product_cost_set(osv.TransientModel):
+    _name="account.product.cost.set"
+    _description="Set Product Costs"
+    
+    _columns={
+        'period_id': fields.many2one('account.period', "Period", required=True,
+            help="Period for which recalculation will be done."),
+        'product_id': fields.many2one('product.product', "Product", domain=[('cost_method','=','average')], required=False,
+            help="Product for which recalculation will be done. If not set recalculation will be done for all products with cost method set 'Average Price'"),
+        'type': fields.selection((('0', 'Set cost price on existing account move lines'),
+                                  ('1', 'Create new cost move per period/product'),
+                                  ('2', 'Create new cost move per period/product category'),
+                                  ('3', 'Create new cost move per period')), 'Type', required=True)
+    }
+    _defaults={
+        'period_id': False,
+        'product_id': False,
+        'type': '0'
+    }
+    
+    def _do_recalculation(self, cr, uid, ids, context=None):
+        _recalc_id = self.browse(cr, uid, ids[0], context)
+        _period_id = False
+        _dates = {}
+        _digits = {}
+
+        # najdem ustrezna obdobja
+        if _recalc_id.period_id:
+            _period_id = _recalc_id.period_id
+        else:
+            raise osv.except_osv(_('Error!'), _('Cannot find suitable dates for recalculation.'))
+        
+        _date_from = _period_id.date_start
+        _date_to = _period_id.date_stop
+            
+        # najdem ustrezne izdelke
+        _product_ids = []
+        
+        if _recalc_id.product_id:
+            _product_ids.append(_recalc_id.product_id.id)
+        else:
+            _location_ids = self.pool.get('stock.location').search(cr, uid, [('usage','=','internal')])
+            _sql_string = '  SELECT sm.product_id AS id \n ' \
+                          '    FROM stock_move AS sm \n ' \
+                          '         INNER JOIN product_template AS pt ON pt.id = sm.product_id \n ' \
+                          '                                              AND pt.cost_method = \'average\' \n ' \
+                          '   WHERE sm.date >=  \'{date_from}\' \n' \
+                          '         AND sm.date <= \'{date_to}\' \n ' \
+                          '         AND sm.state = \'done\' \n ' \
+                          '         AND sm.location_id IN {locations} \n ' \
+                          '         AND sm.location_dest_id NOT IN {locations} \n ' \
+                          'GROUP BY sm.product_id \n ' \
+                          'ORDER BY sm.product_id;'.format(date_from = _date_from + ' 00:00:00',
+                                                           date_to = _date_to + ' 23:59:59',
+                                                           locations = tuple(_location_ids)).replace(',)', ')')
+            cr.execute(_sql_string)
+            _products_tup = cr.fetchall()
+            for _tup in _products_tup:
+                _product_ids.append(_tup[0])
+
+        _digits_obj = self.pool.get('decimal.precision')
+        _digits_id = _digits_obj.search(cr, uid, [('name','=','Product Price')])
+        if len(_digits_id) > 0:
+            _digits['price'] = _digits_obj.browse(cr, uid, _digits_id[0])['digits']
+        else:
+            _digits['price'] = 2
+        
+        _digits_id = _digits_obj.search(cr, uid, [('name','=','Account')])
+        if len(_digits_id) > 0:
+            _digits['account'] = _digits_obj.browse(cr, uid, _digits_id[0])['digits']
+        else:
+            _digits['account'] = 2
+
+        # preračunam posamezen izdelek
+        _products = self.pool.get('product.product').browse(cr, uid, _product_ids, context)
+        for _product in _products:            
+            _dates['date_from'] = _date_from + ' 00:00:00'
+            _dates['date_to'] = _date_to + ' 23:59:59'
+
+            _cost_price_id = self.pool.get('product.period.cost').search(cr, uid, [('product_id','=',_product.id),('period_id','=',_period_id.id)])
+            if len(_cost_price_id) <> 0:
+                _cost_price = self.pool.get('product.period.cost').browse(cr, uid, _cost_price_id[0], context)
+            else:
+                raise osv.except_osv(_('Error!'),_('Cost price for selected period does not exist!'))
+
+            # posodobim vrednosti prodaje na povprečno ceno za obdobje
+            _product._set_period_cost(_dates, _digits, _cost_price.price_unit)
+
+        return True
+    
+    def execute(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        if self._do_recalculation(cr, uid, ids, context):
+            return {'type': 'ir.actions.act_window_close'}
+        else:
+            return False

=== added file 'purchase_recalculation/wizard/account_product_cost_set_view.xml'
--- purchase_recalculation/wizard/account_product_cost_set_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_recalculation/wizard/account_product_cost_set_view.xml	2014-04-10 09:10:37 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="account_product_cost_set_view" model="ir.ui.view">
+            <field name="name">Set Product Costs</field>
+            <field name="model">account.product.cost.set</field>
+            <field name="arch" type="xml">
+               <form string="Set/Create Product Costs" version="7.0">
+               		<group>
+               			<field name="period_id" domain="[('special','=',False)]"/>
+               			<field name="product_id"/>
+               			<field name="type"/>
+                    </group>
+                    <footer>
+                    	<button name="execute" string="Set/Create Costs" type="object" class="oe_highlight"/>
+                    	or
+                    	<button special="cancel" string="Cancel" class="oe_link"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+		
+        <act_window name="Set/Create Product Costs"
+            res_model="account.product.cost.set"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            id="action_set_product_cost"/>    
+
+     	<menuitem action="action_set_product_cost" id="menu_set_product_cost" parent="account.menu_finance_periodical_processing" sequence="31"/>
+    </data>
+</openerp>