Fixed sql return int
Fixed getreceiptno return
Fixed merge conflict