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

[Aleksander Dirntiš]

[MOD] Modified behavior on two modules

=== modified file 'sale_order_extensions/i18n/en_US.po'
--- sale_order_extensions/i18n/en_US.po	2014-01-12 20:54:03 +0000
+++ sale_order_extensions/i18n/en_US.po	2014-01-21 17:01:24 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-25 14:04+0000\n"
-"PO-Revision-Date: 2013-12-25 14:04+0000\n"
+"POT-Creation-Date: 2014-01-21 16:41+0000\n"
+"PO-Revision-Date: 2014-01-21 16:41+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,15 +21,14 @@
 msgstr ""
 
 #. module: sale_order_extensions
-#: model:ir.actions.act_window,name:sale_order_extensions.action_production_quotations
-#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_production_quotations
-msgid "Quotations - Production"
+#: code:addons/sale_order_extensions/sale_order.py:141
+#, python-format
+msgid "Type \"service\" not set on next return products:"
 msgstr ""
 
 #. module: sale_order_extensions
-#: model:ir.actions.act_window,name:sale_order_extensions.action_surplus_quotations
-#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_surplus_quotations
-msgid "Quotations - Surplus"
+#: model:ir.model,name:sale_order_extensions.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: sale_order_extensions
@@ -53,6 +52,24 @@
 msgstr ""
 
 #. module: sale_order_extensions
+#: code:addons/sale_order_extensions/sale_order.py:133
+#, python-format
+msgid "Tax not set for next products:"
+msgstr ""
+
+#. module: sale_order_extensions
+#: model:ir.actions.act_window,name:sale_order_extensions.action_surplus_quotations
+#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_surplus_quotations
+msgid "Quotations - Surplus"
+msgstr ""
+
+#. module: sale_order_extensions
+#: model:ir.actions.act_window,name:sale_order_extensions.action_production_quotations
+#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_production_quotations
+msgid "Quotations - Production"
+msgstr ""
+
+#. module: sale_order_extensions
 #: view:sale.order:0
 msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
@@ -63,6 +80,15 @@
 msgstr ""
 
 #. module: sale_order_extensions
+#: code:addons/sale_order_extensions/sale_order.py:120
+#: code:addons/sale_order_extensions/sale_order.py:128
+#: code:addons/sale_order_extensions/sale_order.py:136
+#: code:addons/sale_order_extensions/sale_order.py:144
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_order_extensions
 #: model:ir.actions.act_window,help:sale_order_extensions.action_production_quotations
 #: model:ir.actions.act_window,help:sale_order_extensions.action_surplus_quotations
 msgid "<p class=\"oe_view_nocontent_create\">\n"
@@ -80,26 +106,38 @@
 msgstr ""
 
 #. module: sale_order_extensions
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: sale_order_extensions
 #: model:ir.model,name:sale_order_extensions.model_sale_shop
 msgid "Sales Shop"
 msgstr ""
 
 #. module: sale_order_extensions
 #: view:sale.order:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: sale_order_extensions
+#: code:addons/sale_order_extensions/sale_order.py:117
+#, python-format
+msgid "Price not set for next products:"
+msgstr ""
+
+#. module: sale_order_extensions
+#: view:sale.order:0
+msgid "context.get('shop_production', False)"
+msgstr ""
+
+#. module: sale_order_extensions
+#: view:sale.order:0
 msgid "Quotations"
 msgstr ""
 
 #. module: sale_order_extensions
+#: code:addons/sale_order_extensions/sale_order.py:125
+#, python-format
+msgid "Quantity not set for next products:"
+msgstr ""
+
+#. module: sale_order_extensions
 #: model:ir.model,name:sale_order_extensions.model_sale_order_line
 msgid "Sales Order Line"
 msgstr ""
-
-#. module: sale_order_extensions
-#: field:sale.order.line,product_qty_returned:0
-msgid "Quantity Returned"
-msgstr ""

=== modified file 'sale_order_extensions/i18n/sale_order_extensions.pot'
--- sale_order_extensions/i18n/sale_order_extensions.pot	2014-01-12 20:54:03 +0000
+++ sale_order_extensions/i18n/sale_order_extensions.pot	2014-01-21 17:01:24 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-25 14:04+0000\n"
-"PO-Revision-Date: 2013-12-25 14:04+0000\n"
+"POT-Creation-Date: 2014-01-21 16:41+0000\n"
+"PO-Revision-Date: 2014-01-21 16:41+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,15 +21,14 @@
 msgstr ""
 
 #. module: sale_order_extensions
-#: model:ir.actions.act_window,name:sale_order_extensions.action_production_quotations
-#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_production_quotations
-msgid "Quotations - Production"
+#: code:addons/sale_order_extensions/sale_order.py:141
+#, python-format
+msgid "Type \"service\" not set on next return products:"
 msgstr ""
 
 #. module: sale_order_extensions
-#: model:ir.actions.act_window,name:sale_order_extensions.action_surplus_quotations
-#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_surplus_quotations
-msgid "Quotations - Surplus"
+#: model:ir.model,name:sale_order_extensions.model_product_product
+msgid "Product"
 msgstr ""
 
 #. module: sale_order_extensions
@@ -53,6 +52,24 @@
 msgstr ""
 
 #. module: sale_order_extensions
+#: code:addons/sale_order_extensions/sale_order.py:133
+#, python-format
+msgid "Tax not set for next products:"
+msgstr ""
+
+#. module: sale_order_extensions
+#: model:ir.actions.act_window,name:sale_order_extensions.action_surplus_quotations
+#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_surplus_quotations
+msgid "Quotations - Surplus"
+msgstr ""
+
+#. module: sale_order_extensions
+#: model:ir.actions.act_window,name:sale_order_extensions.action_production_quotations
+#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_production_quotations
+msgid "Quotations - Production"
+msgstr ""
+
+#. module: sale_order_extensions
 #: view:sale.order:0
 msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
@@ -63,6 +80,15 @@
 msgstr ""
 
 #. module: sale_order_extensions
+#: code:addons/sale_order_extensions/sale_order.py:120
+#: code:addons/sale_order_extensions/sale_order.py:128
+#: code:addons/sale_order_extensions/sale_order.py:136
+#: code:addons/sale_order_extensions/sale_order.py:144
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_order_extensions
 #: model:ir.actions.act_window,help:sale_order_extensions.action_production_quotations
 #: model:ir.actions.act_window,help:sale_order_extensions.action_surplus_quotations
 msgid "<p class=\"oe_view_nocontent_create\">\n"
@@ -80,26 +106,38 @@
 msgstr ""
 
 #. module: sale_order_extensions
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: sale_order_extensions
 #: model:ir.model,name:sale_order_extensions.model_sale_shop
 msgid "Sales Shop"
 msgstr ""
 
 #. module: sale_order_extensions
 #: view:sale.order:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: sale_order_extensions
+#: code:addons/sale_order_extensions/sale_order.py:117
+#, python-format
+msgid "Price not set for next products:"
+msgstr ""
+
+#. module: sale_order_extensions
+#: view:sale.order:0
+msgid "context.get('shop_production', False)"
+msgstr ""
+
+#. module: sale_order_extensions
+#: view:sale.order:0
 msgid "Quotations"
 msgstr ""
 
 #. module: sale_order_extensions
+#: code:addons/sale_order_extensions/sale_order.py:125
+#, python-format
+msgid "Quantity not set for next products:"
+msgstr ""
+
+#. module: sale_order_extensions
 #: model:ir.model,name:sale_order_extensions.model_sale_order_line
 msgid "Sales Order Line"
 msgstr ""
-
-#. module: sale_order_extensions
-#: field:sale.order.line,product_qty_returned:0
-msgid "Quantity Returned"
-msgstr ""

=== modified file 'sale_order_extensions/i18n/sl.po'
--- sale_order_extensions/i18n/sl.po	2014-01-12 20:54:03 +0000
+++ sale_order_extensions/i18n/sl.po	2014-01-21 17:01:24 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-25 14:04+0000\n"
-"PO-Revision-Date: 2013-12-25 14:04+0000\n"
+"POT-Creation-Date: 2014-01-21 16:41+0000\n"
+"PO-Revision-Date: 2014-01-21 16:41+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,16 +21,15 @@
 msgstr "Prodaja iz proizvodnje"
 
 #. module: sale_order_extensions
-#: model:ir.actions.act_window,name:sale_order_extensions.action_production_quotations
-#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_production_quotations
-msgid "Quotations - Production"
-msgstr "Ponudbe - Proizvodnja"
+#: code:addons/sale_order_extensions/sale_order.py:141
+#, python-format
+msgid "Type \"service\" not set on next return products:"
+msgstr "Izdelki za vračilo, ki niso vrste \"storitev\":"
 
 #. module: sale_order_extensions
-#: model:ir.actions.act_window,name:sale_order_extensions.action_surplus_quotations
-#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_surplus_quotations
-msgid "Quotations - Surplus"
-msgstr "Ponudbe - Viški"
+#: model:ir.model,name:sale_order_extensions.model_product_product
+msgid "Product"
+msgstr "Izdelek"
 
 #. module: sale_order_extensions
 #: model:ir.model,name:sale_order_extensions.model_sale_order
@@ -53,6 +52,24 @@
 msgstr "Pripravljeno"
 
 #. module: sale_order_extensions
+#: code:addons/sale_order_extensions/sale_order.py:133
+#, python-format
+msgid "Tax not set for next products:"
+msgstr "Davek ni določen za izdelke:"
+
+#. module: sale_order_extensions
+#: model:ir.actions.act_window,name:sale_order_extensions.action_surplus_quotations
+#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_surplus_quotations
+msgid "Quotations - Surplus"
+msgstr "Ponudbe - Viški"
+
+#. module: sale_order_extensions
+#: model:ir.actions.act_window,name:sale_order_extensions.action_production_quotations
+#: model:ir.ui.menu,name:sale_order_extensions.menu_sale_production_quotations
+msgid "Quotations - Production"
+msgstr "Ponudbe - Proizvodnja"
+
+#. module: sale_order_extensions
 #: view:sale.order:0
 msgid "Sales Order that haven't yet been confirmed"
 msgstr "Nepotrjeni prodajni nalogi"
@@ -63,6 +80,15 @@
 msgstr "Pripravljeno"
 
 #. module: sale_order_extensions
+#: code:addons/sale_order_extensions/sale_order.py:120
+#: code:addons/sale_order_extensions/sale_order.py:128
+#: code:addons/sale_order_extensions/sale_order.py:136
+#: code:addons/sale_order_extensions/sale_order.py:144
+#, python-format
+msgid "Error!"
+msgstr "Napaka!"
+
+#. module: sale_order_extensions
 #: model:ir.actions.act_window,help:sale_order_extensions.action_production_quotations
 #: model:ir.actions.act_window,help:sale_order_extensions.action_surplus_quotations
 msgid "<p class=\"oe_view_nocontent_create\">\n"
@@ -86,26 +112,38 @@
 "            "
 
 #. module: sale_order_extensions
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Vrni v pripravo"
-
-#. module: sale_order_extensions
 #: model:ir.model,name:sale_order_extensions.model_sale_shop
 msgid "Sales Shop"
 msgstr "Trgovina"
 
 #. module: sale_order_extensions
 #: view:sale.order:0
+msgid "Set to Draft"
+msgstr "Vrni v pripravo"
+
+#. module: sale_order_extensions
+#: code:addons/sale_order_extensions/sale_order.py:117
+#, python-format
+msgid "Price not set for next products:"
+msgstr "Cena ni določena za izdelke:"
+
+#. module: sale_order_extensions
+#: view:sale.order:0
+msgid "context.get('shop_production', False)"
+msgstr ""
+
+#. module: sale_order_extensions
+#: view:sale.order:0
 msgid "Quotations"
 msgstr "Ponudbe"
 
 #. module: sale_order_extensions
+#: code:addons/sale_order_extensions/sale_order.py:125
+#, python-format
+msgid "Quantity not set for next products:"
+msgstr "Količina ni določena za izdelke:"
+
+#. module: sale_order_extensions
 #: model:ir.model,name:sale_order_extensions.model_sale_order_line
 msgid "Sales Order Line"
 msgstr "Postavka prodajnega naloga"
-
-#. module: sale_order_extensions
-#: field:sale.order.line,product_qty_returned:0
-msgid "Quantity Returned"
-msgstr "Vrnjena količina"

=== modified file 'sale_order_extensions/sale_order.py'
--- sale_order_extensions/sale_order.py	2014-01-06 16:13:31 +0000
+++ sale_order_extensions/sale_order.py	2014-01-21 17:01:24 +0000
@@ -108,43 +108,43 @@
             return {'value':{'order_line':lines}}
 
     def action_button_confirm_surplus(self, cr, uid, ids, context=None):
-        assert len(ids) == 1, 'This option should only be used for a single id at a time.'
-        _without_stock = self.action_check_stock(cr, uid, ids, context)
-        _without_tax = self.action_check_tax(cr, uid, ids, context)
-        if len(_without_stock) != 0:
-            _text = 'Not enough stock for next products:'
-            for _line in _without_stock:
-                _text = _text + '\n ' + _line 
-            raise osv.except_osv(('Error!'), (_text))
-            return False
-        elif len(_without_tax) != 0:
-            _text = 'Tax not set for next products:'
-            for _line in _without_stock:
-                _text = _text + '\n ' + _line 
-            raise osv.except_osv(('Error!'), (_text))
-            return False
-        else:
-            return self.action_button_confirm(cr, uid, ids, context)
-        
+        return self.action_button_confirm(cr, uid, ids, context)
     
     def action_prepare(self, cr, uid, ids, context=None):
         assert len(ids) == 1, 'This option should only be used for a single id at a time.'
         _without_price = self.action_check_prices(cr, uid, ids, context)
-        _without_tax = self.action_check_tax(cr, uid, ids, context)
         if len(_without_price) != 0:
-            _text = 'Prices for next products are not set:'
+            _text = _('Price not set for next products:')
             for _line in _without_price:
                 _text = _text + '\n ' + _line 
-            raise osv.except_osv(('Error!'), (_text))
-            return False
-        elif len(_without_tax) != 0:
-            _text = 'Tax not set for next products:'
+            raise osv.except_osv(_('Error!'), (_text))
+            return False
+        
+        _without_quantity = self.action_check_quantity(cr, uid, ids, context)
+        if len(_without_quantity) != 0:
+            _text = _('Quantity not set for next products:')
+            for _line in _without_quantity:
+                _text = _text + '\n ' + _line 
+            raise osv.except_osv(_('Error!'), (_text))
+            return False
+
+        _without_tax = self.action_check_tax(cr, uid, ids, context)
+        if len(_without_tax) != 0:
+            _text = _('Tax not set for next products:')
             for _line in _without_tax:
-                _text = _text + '\n ' + _line 
-            raise osv.except_osv(('Error!'), (_text))
-            return False
-        else:
-            return self.write(cr, uid, ids, {'state': 'prepared'}, context)
+                _text = _text + '\n ' + _line
+            raise osv.except_osv(_('Error!'), (_text))
+            return False
+
+        _return_not_service = self.action_check_return_products(cr, uid, ids, context)
+        if len(_return_not_service) != 0:
+            _text = _('Type "service" not set on next return products:')
+            for _line in _return_not_service:
+                _text = _text + '\n ' + _line
+            raise osv.except_osv(_('Error!'), (_text))
+            return False
+        
+        return self.write(cr, uid, ids, {'state': 'prepared'}, context)
 
     def action_draft(self, cr, uid, ids, context=None):
         assert len(ids) == 1, 'This option should only be used for a single id at a time.'
@@ -167,16 +167,16 @@
                         _without_price.append(_line.name)
         return _without_price
 
-    def action_check_stock(self, cr, uid, ids, context=None):
+    def action_check_quantity(self, cr, uid, ids, context=None):
         if context == None:
             context = {}
-        _without_stock = []
+        _without_quantity = []
         
-#        for _order in self.browse(cr, uid, ids, context):
-#            for _line in _order.order_line:
-#                if _line.product_id.qty_available < _line.product_uom_qty:
-#                    _without_stock.append(_line.name)
-        return _without_stock
+        for _order in self.browse(cr, uid, ids, context):
+            for _line in _order.order_line:
+                if _line.product_uom_qty == 0:
+                    _without_quantity.append(_line.name)
+        return _without_quantity
 
     def action_check_tax(self, cr, uid, ids, context=None):
         if context == None:
@@ -189,6 +189,18 @@
                     _without_tax.append(_line.name)
         return _without_tax
 
+    def action_check_return_products(self, cr, uid, ids, context=None):
+        if context == None:
+            context = {}
+        _return_not_service = []
+        
+        for _order in self.browse(cr, uid, ids, context):
+            for _line in _order.order_line:
+                if 'V_' in _line.product_id.default_code and _line.product_id.type != 'service':
+                    _return_not_service.append(_line.name)
+        return _return_not_service
+    
+
     def _get_line_price(self, cr, uid, partner, pricelist, date_order, product, uom, uom_quantity):
         _dp = self.pool.get('decimal.precision').precision_get(cr, uid, 'Product Price')
         _price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist], product, uom_quantity or 1.0, partner,

=== modified file 'stock_return_on_delivery/i18n/en_US.po'
--- stock_return_on_delivery/i18n/en_US.po	2013-12-09 18:09:35 +0000
+++ stock_return_on_delivery/i18n/en_US.po	2014-01-21 17:01:24 +0000
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-28 09:02+0000\n"
-"PO-Revision-Date: 2012-11-28 09:02+0000\n"
+"POT-Creation-Date: 2014-01-21 16:41+0000\n"
+"PO-Revision-Date: 2014-01-21 16:41+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@
 
 #. module: stock_return_on_delivery
 #: field:stock.move,product_qty_returned:0
-#: field:stock.partial.return.line,quantity_returned:0
 msgid "Quantity Returned"
 msgstr ""
 
@@ -47,8 +46,8 @@
 msgstr ""
 
 #. module: stock_return_on_delivery
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
+#: field:stock.move,return_move_id:0
+msgid "unknown"
 msgstr ""
 
 #. module: stock_return_on_delivery
@@ -68,19 +67,23 @@
 msgstr ""
 
 #. module: stock_return_on_delivery
+#: model:ir.model,name:stock_return_on_delivery.model_stock_partial_picking
+msgid "Partial Picking Processing Wizard"
+msgstr ""
+
+#. module: stock_return_on_delivery
 #: field:stock.partial.return,picking_id:0
 msgid "Picking"
 msgstr ""
 
 #. module: stock_return_on_delivery
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
+#: model:ir.model,name:stock_return_on_delivery.model_stock_partial_picking_line
+msgid "stock.partial.picking.line"
 msgstr ""
 
 #. module: stock_return_on_delivery
-#: field:stock.partial.return,move_ids:0
 #: view:stock.partial.return.line:0
-msgid "Product Returns"
+msgid "Stock Return Line"
 msgstr ""
 
 #. module: stock_return_on_delivery
@@ -94,13 +97,9 @@
 msgstr ""
 
 #. module: stock_return_on_delivery
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: stock_return_on_delivery
+#: field:stock.partial.return,move_ids:0
 #: view:stock.partial.return.line:0
-msgid "Stock Return Line"
+msgid "Product Returns"
 msgstr ""
 
 #. module: stock_return_on_delivery
@@ -109,19 +108,13 @@
 msgstr ""
 
 #. module: stock_return_on_delivery
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.out:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: stock_return_on_delivery
 #: model:ir.model,name:stock_return_on_delivery.model_stock_partial_return_line
 msgid "stock.partial.return.line"
 msgstr ""
 
 #. module: stock_return_on_delivery
 #: field:stock.partial.return.line,quantity:0
-msgid "Quantity"
+msgid "Calculated Quantity"
 msgstr ""
 
 #. module: stock_return_on_delivery
@@ -135,6 +128,11 @@
 msgstr ""
 
 #. module: stock_return_on_delivery
+#: field:stock.partial.return.line,quantity_delivered:0
+msgid "Delivered Quantity"
+msgstr ""
+
+#. module: stock_return_on_delivery
 #: view:stock.config.settings:0
 msgid "Automatic Returns On Delivery"
 msgstr ""
@@ -155,6 +153,11 @@
 msgstr ""
 
 #. module: stock_return_on_delivery
+#: field:stock.partial.return.line,quantity_returned:0
+msgid "Returned Quantity"
+msgstr ""
+
+#. module: stock_return_on_delivery
 #: model:ir.model,name:stock_return_on_delivery.model_stock_config_settings
 msgid "stock.config.settings"
 msgstr ""
@@ -168,4 +171,3 @@
 #: view:stock.partial.return:0
 msgid "or"
 msgstr ""
-

=== modified file 'stock_return_on_delivery/i18n/sl.po'
--- stock_return_on_delivery/i18n/sl.po	2014-01-06 20:29:28 +0000
+++ stock_return_on_delivery/i18n/sl.po	2014-01-21 17:01:24 +0000
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-28 09:02+0000\n"
-"PO-Revision-Date: 2012-11-28 09:02+0000\n"
+"POT-Creation-Date: 2014-01-21 16:41+0000\n"
+"PO-Revision-Date: 2014-01-21 16:41+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@
 
 #. module: stock_return_on_delivery
 #: field:stock.move,product_qty_returned:0
-#: field:stock.partial.return.line,quantity_returned:0
 msgid "Quantity Returned"
 msgstr "Vrnjena količina"
 
@@ -47,9 +46,9 @@
 msgstr "Izdelek"
 
 #. module: stock_return_on_delivery
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr "Določili ste serijo, ki ni iz tega izdelka."
+#: field:stock.move,return_move_id:0
+msgid "unknown"
+msgstr "neznano"
 
 #. module: stock_return_on_delivery
 #: view:stock.partial.return:0
@@ -68,20 +67,19 @@
 msgstr "Datum"
 
 #. module: stock_return_on_delivery
+#: model:ir.model,name:stock_return_on_delivery.model_stock_partial_picking
+msgid "Partial Picking Processing Wizard"
+msgstr "Pomočnik za delni prevzem"
+
+#. module: stock_return_on_delivery
 #: field:stock.partial.return,picking_id:0
 msgid "Picking"
 msgstr "Prevzem"
 
 #. module: stock_return_on_delivery
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr "Določiti morate serijsko številko izdelka."
-
-#. module: stock_return_on_delivery
-#: field:stock.partial.return,move_ids:0
 #: view:stock.partial.return.line:0
-msgid "Product Returns"
-msgstr "Vračila izdelka"
+msgid "Stock Return Line"
+msgstr "Postavka vračila"
 
 #. module: stock_return_on_delivery
 #: model:ir.model,name:stock_return_on_delivery.model_stock_partial_return
@@ -94,14 +92,10 @@
 msgstr "Obdelaj vračilo"
 
 #. module: stock_return_on_delivery
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr "Izdelkov ne morete premakniti iz ali na lokacijo tipa pogled."
-
-#. module: stock_return_on_delivery
+#: field:stock.partial.return,move_ids:0
 #: view:stock.partial.return.line:0
-msgid "Stock Return Line"
-msgstr "Postavka vračila"
+msgid "Product Returns"
+msgstr "Vračila izdelkov"
 
 #. module: stock_return_on_delivery
 #: view:stock.partial.return:0
@@ -109,20 +103,14 @@
 msgstr "Premiki izdelkov"
 
 #. module: stock_return_on_delivery
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.out:0
-msgid "Reference must be unique per Company!"
-msgstr "Referenca mora biti različna za podjetja!"
-
-#. module: stock_return_on_delivery
 #: model:ir.model,name:stock_return_on_delivery.model_stock_partial_return_line
 msgid "stock.partial.return.line"
 msgstr ""
 
 #. module: stock_return_on_delivery
 #: field:stock.partial.return.line,quantity:0
-msgid "Quantity"
-msgstr "Količina"
+msgid "Calculated Quantity"
+msgstr "Obračunana količina"
 
 #. module: stock_return_on_delivery
 #: model:ir.model,name:stock_return_on_delivery.model_stock_move
@@ -135,6 +123,11 @@
 msgstr "Premik"
 
 #. module: stock_return_on_delivery
+#: field:stock.partial.return.line,quantity_delivered:0
+msgid "Delivered Quantity"
+msgstr "Dobavljena količina"
+
+#. module: stock_return_on_delivery
 #: view:stock.config.settings:0
 msgid "Automatic Returns On Delivery"
 msgstr "Avtomatska vračila ob izdaji"
@@ -155,6 +148,11 @@
 msgstr "Prekliči"
 
 #. module: stock_return_on_delivery
+#: field:stock.partial.return.line,quantity_returned:0
+msgid "Returned Quantity"
+msgstr "Vrnjena količina"
+
+#. module: stock_return_on_delivery
 #: model:ir.model,name:stock_return_on_delivery.model_stock_config_settings
 msgid "stock.config.settings"
 msgstr ""
@@ -162,14 +160,9 @@
 #. module: stock_return_on_delivery
 #: model:ir.model,name:stock_return_on_delivery.model_stock_picking_out
 msgid "Delivery Orders"
-msgstr "Dobavnice"
+msgstr "dobavnice"
 
 #. module: stock_return_on_delivery
 #: view:stock.partial.return:0
 msgid "or"
 msgstr "ali"
-
-#. module: stock_return_on_delivery
-#: field:stock.partial.return.line,quantity_delivered:0
-msgid "Quantity Delivered"
-msgstr "Dobavljena količina"

=== modified file 'stock_return_on_delivery/i18n/stock_return_on_delivery.pot'
--- stock_return_on_delivery/i18n/stock_return_on_delivery.pot	2014-01-06 20:29:28 +0000
+++ stock_return_on_delivery/i18n/stock_return_on_delivery.pot	2014-01-21 17:01:24 +0000
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-28 09:02+0000\n"
-"PO-Revision-Date: 2012-11-28 09:02+0000\n"
+"POT-Creation-Date: 2014-01-21 16:41+0000\n"
+"PO-Revision-Date: 2014-01-21 16:41+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -27,7 +27,6 @@
 
 #. module: stock_return_on_delivery
 #: field:stock.move,product_qty_returned:0
-#: field:stock.partial.return.line,quantity_returned:0
 msgid "Quantity Returned"
 msgstr ""
 
@@ -47,8 +46,8 @@
 msgstr ""
 
 #. module: stock_return_on_delivery
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
+#: field:stock.move,return_move_id:0
+msgid "unknown"
 msgstr ""
 
 #. module: stock_return_on_delivery
@@ -68,19 +67,23 @@
 msgstr ""
 
 #. module: stock_return_on_delivery
+#: model:ir.model,name:stock_return_on_delivery.model_stock_partial_picking
+msgid "Partial Picking Processing Wizard"
+msgstr ""
+
+#. module: stock_return_on_delivery
 #: field:stock.partial.return,picking_id:0
 msgid "Picking"
 msgstr ""
 
 #. module: stock_return_on_delivery
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
+#: model:ir.model,name:stock_return_on_delivery.model_stock_partial_picking_line
+msgid "stock.partial.picking.line"
 msgstr ""
 
 #. module: stock_return_on_delivery
-#: field:stock.partial.return,move_ids:0
 #: view:stock.partial.return.line:0
-msgid "Product Returns"
+msgid "Stock Return Line"
 msgstr ""
 
 #. module: stock_return_on_delivery
@@ -94,13 +97,9 @@
 msgstr ""
 
 #. module: stock_return_on_delivery
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
-#. module: stock_return_on_delivery
+#: field:stock.partial.return,move_ids:0
 #: view:stock.partial.return.line:0
-msgid "Stock Return Line"
+msgid "Product Returns"
 msgstr ""
 
 #. module: stock_return_on_delivery
@@ -109,19 +108,13 @@
 msgstr ""
 
 #. module: stock_return_on_delivery
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.out:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: stock_return_on_delivery
 #: model:ir.model,name:stock_return_on_delivery.model_stock_partial_return_line
 msgid "stock.partial.return.line"
 msgstr ""
 
 #. module: stock_return_on_delivery
 #: field:stock.partial.return.line,quantity:0
-msgid "Quantity"
+msgid "Calculated Quantity"
 msgstr ""
 
 #. module: stock_return_on_delivery
@@ -135,6 +128,11 @@
 msgstr ""
 
 #. module: stock_return_on_delivery
+#: field:stock.partial.return.line,quantity_delivered:0
+msgid "Delivered Quantity"
+msgstr ""
+
+#. module: stock_return_on_delivery
 #: view:stock.config.settings:0
 msgid "Automatic Returns On Delivery"
 msgstr ""
@@ -155,6 +153,11 @@
 msgstr ""
 
 #. module: stock_return_on_delivery
+#: field:stock.partial.return.line,quantity_returned:0
+msgid "Returned Quantity"
+msgstr ""
+
+#. module: stock_return_on_delivery
 #: model:ir.model,name:stock_return_on_delivery.model_stock_config_settings
 msgid "stock.config.settings"
 msgstr ""
@@ -168,8 +171,3 @@
 #: view:stock.partial.return:0
 msgid "or"
 msgstr ""
-
-#. module: stock_return_on_delivery
-#: field:stock.partial.return.line,quantity_delivered:0
-msgid "Quantity Delivered"
-msgstr ""

=== modified file 'stock_return_on_delivery/stock_partial_return.py'
--- stock_return_on_delivery/stock_partial_return.py	2014-01-09 20:37:18 +0000
+++ stock_return_on_delivery/stock_partial_return.py	2014-01-21 17:01:24 +0000
@@ -32,9 +32,9 @@
     _rec_name = 'product_id'
     _columns = {
         'product_id'        : fields.many2one('product.product', string="Product", required=True, ondelete='CASCADE'),
-        'quantity'          : fields.float("Quantity", digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
-        'quantity_delivered': fields.float("Quantity Delivered", digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
-        'quantity_returned' : fields.float("Quantity Returned", digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
+        'quantity'          : fields.float("Calculated Quantity", digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
+        'quantity_delivered': fields.float("Delivered Quantity", digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
+        'quantity_returned' : fields.float("Returned Quantity", digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
         'move_id'           : fields.many2one('stock.move', "Move", ondelete='CASCADE'),
         'wizard_id'         : fields.many2one('stock.partial.return', string="Wizard", ondelete='CASCADE'),
     }
@@ -78,7 +78,7 @@
         partial_move = {
             'product_id'        : move.product_id.id,
             'quantity'          : move.state in ('assigned','done','confirmed') and move.product_qty or 0,
-            'quantity_delivered': move.state in ('assigned','done','confirmed') and move.product_qty or 0,
+            'quantity_delivered': move.state in ('assigned','done','confirmed') and (move.product_qty + move.product_qty_returned) or 0,
             'quantity_returned' : move.state in ('assigned','done','confirmed') and move.product_qty_returned or 0,
             'move_id'           : move.id,
         }
@@ -91,7 +91,7 @@
             if return_line.quantity_returned <> return_line.move_id.product_qty_returned or return_line.quantity_delivered <> return_line.move_id.product_qty:
                 if return_line.quantity_returned <> 0:
                     _returns = True
-                _product_qty = return_line.quantity_delivered + return_line.move_id.product_qty_returned - return_line.quantity_returned
+                _product_qty = return_line.quantity_delivered - return_line.quantity_returned
                 _product_uos_qty = _product_qty * return_line.move_id.product_id.uos_coeff
                 _product_qty_returned = return_line.quantity_returned
                 move_obj = self.pool.get('stock.move')