Merge lp:~openerp-dev/openobject-addons/6.0-opw-575526-pso into lp:openobject-addons/6.0

[Priyesh (OpenERP)]

Hello,

To reproduced the issue, here are the steps:

- Create a new product:
Stockable / Make to order / Buy
Check the boxes for the incoming and the outgoing traceability (Track Incoming/Outcoming Lots)

- Create a Sale Order for x PRODUCT
- Run the scheduler
- Confirm the Request for Quotation
- Receive the product
- Process the reception
- Create a new production lot
- Process the internal move (toward this new lot)
- Deliver the product (from this lot) -> State: done
- Click on Return Products

-> Window with the error message

kindly review the branch and let me know your inputs on it.

Regards,
Priyesh

[lp:~openerp-dev/openobject-addons/6.0-opw-575526-pso]

5253. By Priyesh (OpenERP) on 2012-06-11

[FIX] stock: Raised warning message if return qty > available qty(case:575526)

Unmerged revisions

5253. By Priyesh (OpenERP) on 2012-06-11

[FIX] stock: Raised warning message if return qty > available qty(case:575526)

5252. By Xavier ALT on 2012-06-07

[FIX] stock: Added condition to check locations for removing warning message coming on returning outgoing moves(case:575526)

=== modified file 'stock/wizard/stock_return_picking.py'
--- stock/wizard/stock_return_picking.py	2011-01-18 13:41:41 +0000
+++ stock/wizard/stock_return_picking.py	2012-06-11 06:38:21 +0000
@@ -81,7 +81,12 @@
                 if m.state == 'done':
                     return_history[m.id] = 0
                     for rec in m.move_history_ids2:
-                        return_history[m.id] += (rec.product_qty * rec.product_uom.factor)
+                        # only take into account 'product return' stock move
+                        # (i.e move with exact opposite of ours:
+                        #     (location, dest location) = (dest location, location))
+                        if rec.location_dest_id.id == m.location_id.id \
+                            and rec.location_id.id == m.location_dest_id.id:
+                            return_history[m.id] += (rec.product_qty * rec.product_uom.factor)
                     if m.product_qty * m.product_uom.factor >= return_history[m.id]:
                         valid_lines += 1
                         if 'return%s'%(m.id) not in self._columns:
@@ -172,7 +177,12 @@
             if move.state=='done':
                 new_qty = data['return%s' % move.id]
                 returned_qty = move.product_qty
-
+                if new_qty > returned_qty:
+                    precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Product UoM')
+                    raise osv.except_osv(_('Returning Error'),
+                        _('Returning quantity %.*f for %s is larger than the available quantity %.*f!')\
+                        % (precision, new_qty, move.product_id.name, precision, returned_qty))
+                        
                 for rec in move.move_history_ids2:
                     returned_qty -= rec.product_qty