[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9183
authorOlivier Dony <odo@openerp.com>
Mon, 3 Jun 2013 12:18:52 +0000 (14:18 +0200)
committerOlivier Dony <odo@openerp.com>
Mon, 3 Jun 2013 12:18:52 +0000 (14:18 +0200)
commit0f983a01464fc8354f223cc0199751fa55ac6d7c
treea6913374315aa9a76d0329538ca0168ab10603c8
parent3a3841aabea0e538a4b94b330e0a47700e8e0e2f
parentddc7e6c9948adf58cfae268225cbc1876b294755
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9183

rev-id launchpad_translations_on_behalf_of_openerp-20130531070107-7d2k818beg8965ll

bzr revid: odo@openerp.com-20130603121852-jdl6vlo9dmjk0rlc
13 files changed:
addons/account/account.py
addons/account/account_view.xml
addons/account/project/project_view.xml
addons/account/wizard/pos_box.py
addons/account_followup/account_followup_customers.xml
addons/account_payment/wizard/account_payment_order.py
addons/base_action_rule/base_action_rule.py
addons/mrp/procurement.py
addons/procurement/procurement_view.xml
addons/sale_stock/sale_stock.py
addons/sale_stock/test/cancel_order_sale_stock.yml
addons/share/wizard/share_wizard.py
addons/stock/stock.py