Minor fix in gross profit report
Merge pull request #2209 from nabinhait/hotfix

Minor fix in gross profit report
conflict resolveed
stock entry json fixed
manufacturing and repack sepreted, test cases fixed, patch fixed