audrius/stock-logistics-warehouse
1
0
Fork 1
mirror of https://github.com/OCA/stock-logistics-warehouse.git synced 2025-01-21 14:27:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stock_available_immediately2' of github.com:Therp/stock-logistics-warehouse into stock_available_immediately2

Browse Source 
Conflicts:
	stock_available_immediately/product.py
This commit is contained in:
gfcapalbo
2015-02-18 14:06:38 +01:00
parent 9eaca1db83 446bcc7e43
commit ebd2a8549c
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
stock_available_immediately/product.py
View File

@@ -20,10 +20,10 @@
##############################################################################
from openerp.addons import decimal_precision as dp
from openerp.osv import orm, fields
<<<<<<< HEAD:stock_available_immediately/product.py
class ProductTemplate(orm.Model):
"""
Immediately usable quantity is : real stock - outgoing qty
@@ -32,10 +32,7 @@ class ProductTemplate(orm.Model):
def _product_available(self, cr, uid, ids, field_names=None,
arg=False, context=None):
"""
Get super() _product_available and compute immediately_usable_qty
"""
res = super(ProductTemplate, self)._product_available(
res = super(Product, self)._product_available(
cr, uid, ids, field_names, arg, context)
if 'immediately_usable_qty' in field_names: