[Merge] : branch merged with lp:openobject-addons
authormso <mso@mso>
Thu, 20 May 2010 06:17:27 +0000 (11:47 +0530)
committermso <mso@mso>
Thu, 20 May 2010 06:17:27 +0000 (11:47 +0530)
commit035cfdc75f999024c74d06a61d0c24ab6f440f3c
tree55f13a7b7f6091c469faa7144b2514ad0b94a761
parent8c85100d8deebc0a89c5578702cca526cf653ee7
parent5b4c90f604aaedfe35f6aef36e4f9d2e397aa816
[Merge] : branch merged with lp:openobject-addons

bzr revid: mso@mso-20100519134757-ya5ypsrrn9k9dyx9
bzr revid: mso@mso-20100519141310-w3yplzus8x8lit4y
bzr revid: mso@mso-20100520061727-56aj2nrxouve1qpa
18 files changed:
addons/point_of_sale/pos.py
addons/point_of_sale/pos_view.xml
addons/product/product_view.xml
addons/project_mrp/__openerp__.py
addons/purchase/__openerp__.py
addons/purchase/purchase.py
addons/purchase/purchase_view.xml
addons/purchase_requisition/purchase_requisition.py
addons/purchase_requisition/purchase_requisition_view.xml
addons/sale/sale_view.xml
addons/sale/wizard/sale_line_invoice.py
addons/sale/wizard/sale_make_invoice_advance.py
addons/sale_crm/sale_crm_view.xml
addons/sale_journal/picking_journal_view.xml
addons/sale_journal/sale_journal_view.xml
addons/stock/stock.py
addons/stock/stock_view.xml
addons/stock_planning/stock_planning_view.xml