merge

addons/stock/__openerp__.py

addons/stock/report/UPS.xml

addons/stock/report/__init__.py

addons/stock/report/ups.py

addons/stock/stock.py

addons/stock/test/stock_test.yml

addons/stock/test/stock_test_wizard.yml

addons/stock/wizard/__init__.py

addons/stock/wizard/stock_change_standard_price.py

addons/stock/wizard/stock_invoice_onshipping.py

addons/stock/wizard/stock_move.py

addons/stock/wizard/stock_move_view.xml

addons/stock/wizard/stock_replacement.py

addons/stock/wizard/stock_replacement_view.xml

addons/stock/wizard/stock_ups.py

addons/stock/wizard/stock_ups_view.xml