OpenERP Costa Rica

Merge proposals dependent on lp://staging/~ss-dtic/openerp-costa-rica/6.1-bom-price-update

  1. 6.1-bom-price-update
  2. Dependent merge proposals

lp://staging/~ss-dtic/openerp-costa-rica/6.1-bom-price-update has no merge proposals.