[MERGE] merge with trunk
authorMustufa Rangwala <mra@mra-laptop>
Mon, 14 Jun 2010 04:45:10 +0000 (10:15 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Mon, 14 Jun 2010 04:45:10 +0000 (10:15 +0530)
commite2c0ba196ef00b6f84b3c07933eed63a0d0c69e6
tree5fa4f8bed20ec67015840d162db346b11d430e59
parent38c2a2ba3ccb26db56470b64ecc9d872a8fa58d2
parent30b9d3269c2c316311b52ec837bb6f58278e1d26
[MERGE] merge with trunk

bzr revid: mra@mra-laptop-20100614044510-iffai5yviiknzqfa
14 files changed:
addons/account/account_invoice_view.xml
addons/account/account_view.xml
addons/account/partner_view.xml
addons/hr_recruitment/hr_recruitment_view.xml
addons/project_long_term/project_long_term_view.xml
addons/project_long_term/wizard/project_compute_tasks.py
addons/project_long_term/wizard/project_schedule_tasks.py
addons/purchase/board_purchase_view.xml
addons/sale/sale.py
addons/sale/sale_view.xml
addons/scrum/scrum_view.xml
addons/stock/__openerp__.py
addons/stock/stock.py
addons/stock_planning/stock_planning_view.xml