[MERGE] Merge with lp:openobject-addons
authorBhumika (OpenERP) <sbh@tinyerp.com>
Wed, 21 Mar 2012 06:53:19 +0000 (12:23 +0530)
committerBhumika (OpenERP) <sbh@tinyerp.com>
Wed, 21 Mar 2012 06:53:19 +0000 (12:23 +0530)
commit79ff0e342498f5b08d8911aaba330367974b04a4
treed57c9b2dd72cf730c51166ad531010331cb21159
parent7684f390fae6e78731966c6d3c8bffbeb89e9e7e
parent3b1bafc30c7b8bfe1dfce614d194d1704bbc4ffa
[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20120321065319-pj7o5oz8pdr0v2jm
addons/account/account.py
addons/base_calendar/base_calendar.py
addons/crm/crm.py
addons/crm_partner_assign/partner_geo_assign.py
addons/project/project_view.xml
addons/project_issue/project_issue_view.xml
addons/sale/report/sale_order.rml
addons/stock/stock.py