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

Conflicts:
	stock_available_immediately/product.py

2015-02-18 14:06:38 +01:00

..

__init__.py

[UPD] move out from unported to 8.0

2015-02-18 11:31:46 +01:00

__openerp__.py

[UPD] move out from unported to 8.0

2015-02-18 11:31:46 +01:00

product_view.xml

[UPD] move out from unported to 8.0

2015-02-18 11:31:46 +01:00

product.py

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

2015-02-18 14:06:38 +01:00