[MERGE]: Merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
authoruco (OpenERP) <uco@tinyerp.co.in>
Thu, 29 Apr 2010 13:34:28 +0000 (19:04 +0530)
committeruco (OpenERP) <uco@tinyerp.co.in>
Thu, 29 Apr 2010 13:34:28 +0000 (19:04 +0530)
commitf8eb44bfd9a225b3144a9a4e4037aaebdb33b4e3
tree377e306cde411ac5be066d066bdedccc5b6d75e7
parent0479ed81bce80e1ac29ccf78fbf678f6ec59393b
parent2113010824f542c9690e077e0d7601ee88fd22ad
[MERGE]: Merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

bzr revid: uco@tinyerp.co.in-20100429133428-x7a9z3s9ykvc8gs5
addons/crm/crm.py
addons/crm/wizard/crm_forward_to_partner.py
addons/crm/wizard/crm_forward_to_partner_view.xml
addons/point_of_sale/posrule_data.xml