Merge remote-tracking branch 'origin/shalin94_44_scripts_for_openerp' into michaelize_71_new_receipt