Merge branch 'rohitwaghchaure-stock_entry_total_amount_issue' into develop