Merge lp:~syleam/wms/5.0-jean-sebastien-suzanne into lp:~syleam/wms/5.0-christophe-chauvet

[Jean-Sebastien SUZANNE - http://www.Syleam.fr]

- Merge with branch of Sébastien LANGE
- FIX P.U.M.P. compute

[Christophe CHAUVET (christophe-chauvet)]

review: Approve

=== modified file 'wms/object/warehouse.py'
--- wms/object/warehouse.py	2011-02-27 21:11:57 +0000
+++ wms/object/warehouse.py	2011-03-09 16:12:14 +0000
@@ -39,6 +39,8 @@
         'parent_id': fields.many2one('stock.warehouse', 'Parent warehouse', help='Define the parent warehouse'),
         'crossdock_location_id': fields.many2one('stock.location', 'Crossdock location',
             help='Choose the crossdock location on this warehouse'),
+        'return_location_id': fields.many2one('stock.location', 'Return location',
+            help='Choose the return location on this warehouse'),
         'check_tracking_burst': fields.boolean('check tracking', help='Check tracking on burst out'),
         'keep_missing_product_in': fields.boolean('Keep product in', help='If check, missing product line on receipt order stay with quantity = 0'),
     }

=== modified file 'wms/view/warehouse.xml'
--- wms/view/warehouse.xml	2011-03-02 22:37:03 +0000
+++ wms/view/warehouse.xml	2011-03-09 16:12:14 +0000
@@ -51,6 +51,9 @@
                     <xpath expr="/form/field[@name='lot_output_id']" position="after">
                         <field name="crossdock_location_id" domain="[('warehouse_id','=', active_id),('usage','=', 'internal')]"/>
                     </xpath>
+                    <xpath expr="/form/field[@name='lot_output_id']" position="after">
+                        <field name="return_location_id" domain="[('warehouse_id','=', active_id),('usage','=', 'internal')]"/>
+                    </xpath>
                     <xpath expr="/form/field[@name='partner_address_id']" position="after">
                         <notebook colspan="4">
                             <page string="Information">

=== modified file 'wms/wizard/wizard_partial_picking.py'
--- wms/wizard/wizard_partial_picking.py	2010-11-23 19:06:08 +0000
+++ wms/wizard/wizard_partial_picking.py	2011-03-09 16:12:14 +0000
@@ -77,7 +77,11 @@
 
             currency=0
             if hasattr(pick, 'purchase_id') and pick.purchase_id:
-                currency=pick.purchase_id.pricelist_id.currency_id.id
+                currency = pick.purchase_id.pricelist_id.currency_id.id
+            elif hasattr(pick, 'address_id') and pick.address_id:
+                currency = pick.address_id.partner_id.property_product_pricelist.currency_id.id
+            else:
+                currency = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
 
             _moves_arch_lst.append('<group col="6" invisible="1"><field name="uom%s" nolabel="1"/>\
                     <field name="price%s"/>' % (m.id,m.id,))

=== modified file 'wms_location/data/location.xml'
--- wms_location/data/location.xml	2011-03-02 22:37:03 +0000
+++ wms_location/data/location.xml	2011-03-09 16:12:14 +0000
@@ -69,5 +69,14 @@
             <field name="active" eval="True"/>
         </record>
 
+        <!-- ************************************************************* -->
+        <!-- ** Add Return location as category                    ******* -->
+        <!-- ************************************************************* -->
+        <record id="location_category_return" model="stock.location.category">
+            <field name="name">Return</field>
+            <field name="code">RETURN</field>
+            <field name="active" eval="True"/>
+        </record>
+
     </data>
 </openerp>

=== modified file 'wms_sale/object/__init__.py'
--- wms_sale/object/__init__.py	2011-02-20 16:05:05 +0000
+++ wms_sale/object/__init__.py	2011-03-09 16:12:14 +0000
@@ -26,5 +26,6 @@
 import company
 import picking
 import sale
+import product
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'wms_sale/object/common.py'
--- wms_sale/object/common.py	1970-01-01 00:00:00 +0000
+++ wms_sale/object/common.py	2011-03-09 16:12:14 +0000
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    wms_sale module for OpenERP, Module to extended sale with WMS
+#    Copyright (C) 2011 SYLEAM Info Services (<http://www.syleam.fr/>)
+#              Jean-Sébastien SUZANNE <[e-mail]>
+#
+#    This file is a part of wms_sale
+#
+#    wms_sale is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    wms_sale 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+
+def log_message(fic, section, message):
+    """
+    Format the content of the logfile
+    """
+    fic.write('[%s] %s: %s\n' % (time.strftime('%Y-%m-%d %H:%M:%S'), section.encode('utf-8'), message.encode('utf-8')))
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'wms_sale/object/move.py'
--- wms_sale/object/move.py	2011-03-04 09:52:11 +0000
+++ wms_sale/object/move.py	2011-03-09 16:12:14 +0000
@@ -26,6 +26,7 @@
 from osv import fields
 from datetime import datetime, timedelta
 from tools.translate import _
+from common import log_message
 
 
 class StockMove(osv.osv):
@@ -52,6 +53,11 @@
     _columns = {
         'partner': fields.function(_order_partner, method=True, type='char', multi='sums', string='Partner'),
         'order': fields.function(_order_partner, method=True, type='char', multi='sums', string='Order'),
+        'average_uom_id': fields.many2one('product.uom', 'Average UOM Unit', help="is the UOM of the average price" ),
+    }
+
+    _defaults = {
+         'average_uom_id': lambda *a: False,
     }
 
     def action_done(self, cr, uid, ids, context=None):
@@ -94,6 +100,52 @@
                 raise osv.except_osv(_('ERROR'), _('More move to compute without the same picking or the product'))
         return (picking_id, product_id)
 
+    def _get_qty(self, cr, uid, id, context=None):
+        """
+        return the real qty in move in function of location_id and location_dest_id
+        __________________________________________________________________________________________________
+        |  qty  in/dest | supplier | view  | internal  | customer | inventory | procurement | production |
+        --------------------------------------------------------------------------------------------------
+        | supplier      | error    | error | +         | 0        | error     | 0           | error      |
+        --------------------------------------------------------------------------------------------------
+        | view          | error    | error | error     | error    | error     | error       | error      |
+        --------------------------------------------------------------------------------------------------
+        | internal      | -        | error | 0         | -        | -         | 0           | -          |
+        --------------------------------------------------------------------------------------------------
+        | customer      | 0        | error | +         | error    | error     | 0           | error      |
+        --------------------------------------------------------------------------------------------------
+        | inventory     | error    | error | +         | error    | error     | error       | error      |
+        --------------------------------------------------------------------------------------------------
+        | procurement   | 0        | error | 0         | 0        | error     | 0           | 0          |
+        --------------------------------------------------------------------------------------------------
+        | production    | error    | error | +         | error    | error     | 0           | error      |
+        --------------------------------------------------------------------------------------------------
+        """
+        if not id:
+            raise osv.except_osv(_('Move ERROR'), _('No move ID define to get quantity'))
+        move = self.browse(cr, uid, id, context=context)
+        loc_usage = move.location_id.usage
+        loc_dest_usage = move.location_dest_id.usage
+        if loc_usage == 'internal' and loc_dest_usage in ['supplier', 'customer', 'inventary', 'production']:
+            return - move.product_qty
+        elif loc_dest_usage == 'internal' and loc_usage in ['supplier', 'customer', 'inventary', 'production']:
+            return move.product_qty
+        elif loc_usage == 'procurement' and loc_dest_usage in ['supplier', 'customer', 'internal', 'production', 'procurement']:
+            return 0.0
+        elif loc_dest_usage == 'procurement' and loc_usage in ['supplier', 'customer', 'internal', 'production']:
+            return 0.0
+        elif loc_usage == 'supplier' and loc_dest_usage == 'customer':
+            return 0.0
+        elif loc_dest_usage == 'supplier' and loc_usage == 'customer':
+            return 0.0
+        elif loc_usage == 'internal' and loc_dest_usage == 'internal':
+            return 0.0
+        else:
+            raise osv.except_osv(_('Get move quantity error'),
+                                 _('the move %s(%d) with mouvement %s(%d) usage %s ==> %s(%d) usage %s is not allowed') \
+                                 % (move.name, move.id, move.location_id.name, move.location_id.id, loc_usage, move.location_dest_id.name, move.location_dest_id.id, loc_dest_usage)
+                                  )
+
     def get_previous_pump(self, cr, uid, id, date_planned, product_id, context=None):
         """
         find the move linked with a picking type in before the current move
@@ -102,6 +154,7 @@
         if context is None:
             context = {}
         # make domain to find move
+        product_obj = self.pool.get('product.product')
         domain = [
             ('state', '=', 'done'),  # the move must be done
             ('date_planned', '<', date_planned),  # the date planned must be after the current move
@@ -118,10 +171,16 @@
         pump = 0.0
         if not move_ids:
             #No receiving picking found, we take the standard_price of the product
-            pump = self.pool.get('product.product').read(cr, uid, product_id, ['standard_price'], context=context)['standard_price']
+            pump = product_obj.read(cr, uid, product_id, ['standard_price'], context=context).get('standard_price', 0.0)
         else:
             # they are only one value so take the average_price(pump) of this move
-            pump = self.read(cr, uid, move_ids[0], ['average_price'], context=context)['average_price']
+            move_rd = self.read(cr, uid, move_ids[0], ['average_price', 'average_uom_id'], context=context)
+            if move_rd.get('average_uom_id', False):
+                uom_id = move_rd.get('average_uom_id')[0]
+                average_price = move_rd.get('average_price', 0.0)
+                pump = product_obj.convert_price_in_default_unit(cr, uid, product_id, average_price, uom_id,context=context)
+            else:
+                pump = move_rd.get('standard_price', 0.0)
         return pump
 
     def get_qty_at_previous_time(self, cr, uid, product_id, date_planned, context=None):
@@ -154,17 +213,20 @@
         """
         if context is None:
             context = {}
+        outfp = context.get('log_message', False)
+        product_obj = self.pool.get('product.product')
         #the move ids must have the same picking and the same product
         picking_id, product_id = self.get_picking_and_product_from_moves(cr, uid, ids, context=context)
         # get move_ids[0] data
         move_rd = self.read(cr, uid, ids[0], ['date_planned', 'price_unit'], context=context)
         # get the pump
+        # already in good unit
         pump = self.get_previous_pump(cr, uid, move_rd.get('id'), move_rd.get('date_planned'), product_id, context=context)
+        log_message(outfp, 'wms_sale.stock_move.compute_pump', 'The Start P.U.M.P. is %s' % repr(pump))
         # get the qantity after this moves
         stock_qty = self.get_qty_at_previous_time(cr, uid, product_id, move_rd.get('date_planned'), context=context)
 
         # list of move already compute
-        computed = []
         # define the type of picking looked for
         company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
         picking_type = ['in']
@@ -172,76 +234,68 @@
             picking_type.append('internal')
         if company.average_price_stock_picking_out:
             picking_type.append('out')
+        log_message(outfp, 'wms_sale.stock_move.compute_pump', 'List of picking to save PUMP %s (delivery is never here he is computed after)' % repr(picking_type))
 
         # make domain for search
         domain = [
             ('state', '=', 'done'),  # only the move in state done
             ('date_planned', '>=', move_rd.get('date_planned')),  # only the move after or equal the current
             ('product_id', '=', product_id),  # on this product
-            '|',  # make an 'or'
-            ('picking_id', '=', False),  # no picking
-            '&', ('picking_id.state', '=', 'done'), ('picking_id.type', 'in', picking_type),  # or picking with done and type in picking_type define in company
+            ('location_id.usage', 'not in', ['view', 'procurement']),  # we dont want view
+            ('location_dest_id.usage', 'not in', ['view', 'procurement']),  # we dont want view
         ]
         order_by = 'date_planned, id'
 
         move_ids = self.search(cr, uid, domain, order=order_by, context=context)
-        to_compute = list(move_ids)
+
+        delivery_ids = []
         for move_id in move_ids:
-            # test if the compute alredy exist
-            if move_id in computed:
-                continue
-            # group move this same date_planned, same picking in ids search
+            #get new qty at the date_planned
+            qty = self._get_qty(cr, uid, move_id, context=context)
             move = self.browse(cr, uid, move_id, context=context)
-            group_domain = [
-                    ('date_planned', '=', move.date_planned),  # the same date
-                    ('picking_id', '=', move.picking_id and move.picking_id.id or False),  # the same picking
-                    ('id', 'in', to_compute),  # in the compute found
-            ]
-            group_move_ids = self.search(cr, uid, group_domain, context=context)
-
-            #get new qty at the date_planned
-            qty = self.get_qty_at_time(cr, uid, product_id, move.date_planned, context=context)
+            log_message(outfp, 'wms_sale.stock_move.compute_pump', 'compute the move %s(%d) with picking type %s' % (move.name, move.id, move.picking_id and move.picking_id.type or 'None'))
             if move.picking_id and move.picking_id.type == 'in':
+                # get the price of the move
+                price_unit = product_obj.convert_price_in_default_unit(cr, uid, product_id, move.price_unit, move.product_uom and move.product_uom.id or False, context=context)
+                    # the pump uom is not the same that sale uom
                 #calcul new pump
                 # new pump =  [ (pump * stock_qty) + ( price_unit * received qty ) ] / (stock qty + received qty )
                 # only if stock_qty
-                if stock_qty > 0:
-                    pump = ((pump * stock_qty) + (move.price_unit * (qty - stock_qty))) / qty
+                log_message(outfp, 'wms_sale.stock_move.compute_pump', 'Compute the new P.U.M.P. = ((%s * %s) + (%s * %s)) / %s'\
+                            % (repr(pump), repr(stock_qty), repr(price_unit), repr(qty), repr(stock_qty + qty)))
+                if stock_qty + qty > 0:
+                    pump = ((pump * stock_qty) + (price_unit * qty)) / (stock_qty + qty)
                 else:
                     # if stock_qty == 0 => pump = (price_unit * qty) / qty => pump = price_unit
                     # if stock_qty < 0 (example -1) => pump = ( -pump + ( price_unit * qty) ) / (qty - 1)
                       ## error cause if qty = stock_qty => division by zero
                       ##                qty < stock_qty => pump < 0 forbiden
                       ##                qty > stock_qty => pump wrong the good pump is the price_unit
-                    pump = move.price_unit
-            # write the pump in average_price
-            self.write(cr, uid, group_move_ids, {'average_price': pump}, context=context)
+                    pump = price_unit
+                log_message(outfp, 'wms_sale.stock_move.compute_pump', 'Compute the new P.U.M.P. = %s' % repr(pump))
+            if move.picking_id and move.picking_id.type in picking_type:
+                # write the pump in average_price
+                average_uom_id = move.product_id.list_price_uom_id and move.product_id.list_price_uom_id.id or move.product_uom.id
+                self.write(cr, uid, move_id, {'average_price': pump, 'average_uom_id': average_uom_id}, context=context)
+            elif company.average_price_stock_picking_delivery and move.picking_id.type == 'delivery':
+                delivery_ids.append(move_id)
             # save new stock_qty and compute list
-            stock_qty = qty
-            computed.extend(group_move_ids)
-            # remove the id computed
-            for m in group_move_ids:
-                to_compute.remove(m)
-
-        self.pool.get('product.product').write(cr, uid, [product_id], {'standard_price': pump}, context=context)
-
+            stock_qty = (stock_qty + qty)
+
+        log_message(outfp, 'wms_sale.stock_move.compute_pump', 'save the P.U.M.P. %s on product %d' % (repr(pump), product_id))
+        product_obj.write(cr, uid, [product_id], {'standard_price': pump}, context=context)
         # only for the delivery
-        if company.average_price_stock_picking_delivery:
-            domain = [
-                ('state', '=', 'done'),  # only the move in state done
-                ('date_planned', '>=', move_rd.get('date_planned')),  # only the move after or equal the current
-                ('product_id', '=', product_id),  # on this product
-                ('picking_id.state', '=', 'done'),  # pickinf is done
-                ('picking_id.type', '=', 'delivery'),  # type in picking_type must be a delivery
-            ]
-            move_delivery_ids = self.search(cr, uid, domain, order=order_by, context=context)
-            for move in self.browse(cr, uid, move_delivery_ids, context=context):
+        if delivery_ids and company.average_price_stock_picking_out:
+            log_message(outfp, 'wms_sale.stock_move.compute_pump', 'save the P.U.M.P. On delivery with method %s' % company.average_price_stock_picking_delivery_method)
+            for move in self.browse(cr, uid, delivery_ids, context=context):
+                log_message(outfp, 'wms_sale.stock_move.compute_pump', 'for move %s(%d)'% (move.name, move.id))
                 # they are three mode:
                 # 1 : the sale order is invoiced so we dont touch of the pump
                 # 2 : the pump of the delivery is on the product (average_price_stock_picking_delivery_method == product on company) use the pump in the product
                 # 3 : the pump of the delivery is on the out picking (average_price_stock_picking_delivery_method == out on company) use the pump in the move in delivery out
                 if move.sale_line_id.order_id.invoiced:
                     # the sale order is invoiced
+                    log_message(outfp, 'wms_sale.stock_move.compute_pump', 'Already Invoiced')
                     continue
                 elif company.average_price_stock_picking_delivery_method == 'product':
                     # take the pump of the product. we have already the pump because the saved is make before and the value is in pump variable
@@ -256,11 +310,11 @@
                         ('name', '=', move.name),  # the same name
                     ]
                     move_out_id = self.search(cr, uid, domain, context=context)[0]
-                    move_out_average_price = self.read(cr, uid, move_out_id, ['average_price'], context=context)['average_price']
-                    self.write(cr, uid, move.id, {'average_price': move_out_average_price}, context=context)
+                    move_out_average = self.read(cr, uid, move_out_id, ['average_price', 'average_uom_id', 'product_uom'], context=context)
+                    average_uom_id = move_out_average.get('average_uom_id', move_out_average.get('product_uom', [False]))[0]
+                    self.write(cr, uid, move.id, {'average_price': move_out_average.get('average_price', 0.0), 'average_uom_id': average_uom_id}, context=context)
                 else:
                     raise osv.except_osv(_('WARNING'), _('No delivery mode found for the compute of the P.U.M.P. on delivery move'))
-
         return True
 
 StockMove()

=== modified file 'wms_sale/object/picking.py'
--- wms_sale/object/picking.py	2011-02-20 16:05:05 +0000
+++ wms_sale/object/picking.py	2011-03-09 16:12:14 +0000
@@ -1,18 +1,18 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    wms_purchase module for OpenERP, Inherite purcharge for wms
+#    wms_sale module for OpenERP, Inherite purcharge for wms
 #    Copyright (C) 2010 SYLEAM Info Services (<http://www.syleam.fr/>)
 #              Jean-Sébastien SUZANNE <[e-mail]>
 #
-#    This file is a part of wms_purchase
+#    This file is a part of wms_sale
 #
-#    wms_purchase is free software: you can redistribute it and/or modify
+#    wms_sale is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
-#    wms_purchase is distributed in the hope that it will be useful,
+#    wms_sale 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 General Public License for more details.
@@ -26,6 +26,9 @@
 import pooler
 import thread
 from tools.translate import _
+import tempfile
+from common import log_message
+import base64
 import netsvc
 logger = netsvc.Logger()
 
@@ -90,18 +93,24 @@
         request_obj = self.pool.get('res.request')
         product_obj = self.pool.get('product.product')
         move_obj = self.pool.get('stock.move')
-        logger.notifyChannel('wms_purchase.stock_picking.compute_pump', netsvc.LOG_DEBUG, 'COMPUTE_PUMP START(id=%d, product_linked=%s, context=%s)' % (id, repr(product_linked), repr(context)))
+        logger.notifyChannel('wms_sale.stock_picking.compute_pump', netsvc.LOG_DEBUG, 'COMPUTE_PUMP START(id=%d, product_linked=%s, context=%s)' % (id, repr(product_linked), repr(context)))
+        outfp = tempfile.NamedTemporaryFile(prefix='openerp', suffix='pump')
+        ctx = context.copy()
+        ctx['log_message'] = outfp
+        log_message(outfp, 'wms_sale.stock_picking.compute_pump', 'COMPUTE_PUMP START(id=%d, product_linked=%s, context=%s)' % (id, repr(product_linked), repr(context)))
 
         def thread_compute_pump(self, cr, uid, id, product_linked, context):
             """
             this method is a threadind method
             """
             cr = pooler.get_db(cr.dbname).cursor()
+            outfp = context.get('log_message', False)
             # get information to display in message
             picking = self.browse(cr, uid, id, context)
             #for each move who have a product with a new price_unit compute_pump else make nothing
             for product_id in product_linked.keys():
                 product = product_obj.browse(cr, uid, product_id, context=context)
+                log_message(outfp, 'wms_sale.stock_picking.compute_pump', 'COMPUTE_PUMP with the product %s(%s)[%d] ::> cost method is %s' % (product.name, product.code, product.id, product.cost_method))
                 if product.cost_method != 'average':
                     continue
                 try:
@@ -113,9 +122,11 @@
                         if move.price_unit != product_linked[product.id]:
                             # save the new price unit one the move_ids
                             move_obj.write(cr, uid, move_ids, {'price_unit': product_linked[product.id]}, context=context)
+                            log_message(outfp, 'wms_sale.stock_picking.compute_pump', 'the new price unit is %s' % (repr(product_linked[product.id])))
                             # compute the move
                             move_obj.compute_pump(cr, uid, move_ids, context=context)
                         else:
+                            log_message(outfp, 'wms_sale.stock_picking.compute_pump', 'keep the price unit ')
                             continue
                     else:
                         raise osv.except_osv(_('ERROR'), _('No move found this picking(%s) and product(%s)')) % (picking.name, product.name)
@@ -124,7 +135,7 @@
                 except Exception, err:
                     # make a rollback because the transaction is wrong
                     cr.rollback()
-                    logger.notifyChannel('wms_purchase.stock_picking.thread_compute_pump', netsvc.LOG_ERROR, repr(err))
+                    logger.notifyChannel('wms_sale.stock_picking.thread_compute_pump', netsvc.LOG_ERROR, repr(err))
                     # make a request
                     val_request = {
                         'act_to': uid,
@@ -136,12 +147,26 @@
                         #'ref_doc1':'stock.picking,%d' % picking.id,
                         #'ref_doc2':'product.product,%d' % product.id,
                                 }
-                    request_obj.create(cr, uid, val_request, context=context)
+                    req_id = request_obj.create(cr, uid, val_request, context=context)
+                    log_message(outfp, 'wms_sale.stock_picking.compute_pump', 'The error be signal in the request %d' % (req_id))
                     cr.commit()
-            logger.notifyChannel('wms_purchase.stock_picking.compute_pump', netsvc.LOG_INFO, 'COMPUTE_PUMP ENDED ....')
+            logger.notifyChannel('wms_sale.stock_picking.compute_pump', netsvc.LOG_INFO, 'COMPUTE_PUMP ENDED ....')
+            log_message(outfp, 'wms_sale.stock_picking.compute_pump', 'COMPUTE_PUMP ENDED ....')
+            outfp.flush()
+            outfp.seek(0)
+            vals = {
+                'datas': base64.encodestring(outfp.read()),
+                'datas_fname': 'pump_%s' % picking.origin,
+                'name': 'PUMP %s' % picking.origin,
+                'res_model': 'stock.picking',
+                'res_id': 0,
+            }
+            self.pool.get('ir.attachment').create(cr, uid, vals, context=context)
+            cr.commit()
+            outfp.close()
             cr.close()
 
-        thread.start_new_thread(thread_compute_pump, (self, cr, uid, id, product_linked.copy(), context.copy()))
+        thread.start_new_thread(thread_compute_pump, (self, cr, uid, id, product_linked.copy(), ctx))
         return True
 
 stock_picking()

=== added file 'wms_sale/object/product.py'
--- wms_sale/object/product.py	1970-01-01 00:00:00 +0000
+++ wms_sale/object/product.py	2011-03-09 16:12:14 +0000
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    wms_sale module for OpenERP, Module to extended sale with WMS
+#    Copyright (C) 2011 SYLEAM Info Services (<http://www.syleam.fr/>)
+#              Jean-Sébastien SUZANNE <[e-mail]>
+#
+#    This file is a part of wms_sale
+#
+#    wms_sale is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    wms_sale 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+from tools.translate import _
+
+
+class product_product(osv.osv):
+    _inherit = 'product.product'
+
+    def convert_price_in_default_unit(self, cr, uid, id, price, uom_id, context=None):
+        """
+        :param id : id of the product
+        :type id: int
+        :param price: the origin price to convert
+        :type price: float
+        :param uom_id: the unit of the product for this price
+        :type uom_id : int
+        convert the price in fonction of unit
+        - uom_id.category == product.uom_category => price = price * uom_id.factor / product.uom_id.factor
+        - uom_id.category == product.uos_category => price = price * product.uos_coeff * uom_id.factor / product.uos_id.factor
+        """
+        if not id:
+            raise osv.except_osv(_('Convert Unit Error'), _('No product defined to convert unit'))
+        if not uom_id:
+            raise osv.except_osv(_('Convert Unit Error'), _('No UOM defined to convert unit'))
+        uom_obj = self.pool.get('product.uom')
+        product = self.pool.get('product.product').browse(cr, uid, id, context=context)
+        uom = uom_obj.browse(cr, uid, uom_id, context=context)
+        if product.uos_id and product.uos_id.category_id.id == uom.category_id.id:
+            return uom_obj._compute_price(cr, uid, product.uos_id.id, price * product.uos_coeff or 1.0, product.uom_id.id)
+        elif product.uom_id.category_id.id == uom.category_id.id:
+            return uom_obj._compute_price(cr, uid, uom_id, price, product.uom_id.id)
+
+product_product()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: