odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] stock: inventory 

bzr revid: qdp-launchpad@openerp.com-20130912080344-j7qujvsp9w0exi73
This commit is contained in:
Quentin (OpenERP) 2013-09-12 10:03:44 +02:00
parent d204621fa0
commit f8fac6adb9
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/stock/stock.py
View File

@ -1961,6 +1961,7 @@ class stock_inventory_line(osv.osv):
def _resolve_inventory_line(self, cr, uid, inventory_line, theorical_lines, context=None):
found = False
uom_obj = self.pool.get('product.uom')
for th_line in theorical_lines:
#We try to match the inventory line with a theorical line with same product, lot and location and owner
@ -1969,7 +1970,9 @@ class stock_inventory_line(osv.osv):
#or match with same product (only if owner and lot are missing)
if th_line['location_id'] == inventory_line.location_id.id and th_line['product_id'] == inventory_line.product_id.id:
if (not inventory_line.prod_lot_id.id or th_line['prod_lot_id'] == inventory_line.prod_lot_id.id) and (not inventory_line.partner_id.id or th_line['partner_id'] == inventory_line.partner_id.id):
th_line['product_qty'] -= inventory_line.product_qty
uom_reference = inventory_line.product_id.uom_id
real_qty = uom_obj._compute_qty_obj(cr, uid, inventory_line.product_uom_id, inventory_line.product_qty, uom_reference)
th_line['product_qty'] -= real_qty
found = True
break
#if it was still not found, we add it to the theorical lines so that it will create a stock move for it

3
addons/stock/stock_view.xml
View File

@ -147,6 +147,9 @@
</tree>
</field>
</page>
<page string="Stock Moves" attrs="{'invisible': [('state', '!=', 'done')]}">
<field name="move_ids"/>
</page>
</notebook>
</sheet>
</form>