almost finish print receipt
fix merge conflict
Merge branch 'master' of https://github.com/shengyongjiang/sinoramacis
daily change
rreplace _dm_ prefix to _cis_
other debug fixed
rreplace _dm_ prefix to _cis_
other debug fixed
Fixed：
1 all tour channel price is calculate by id, instead of by dim1(dim1 could be double )
2 Sepeart depart city to region or country
3 add tour type (all include price/land only price)
daily change
on doing ajax fly country,citylist
normal commit
1. Finish merge option to option model
Done:
1. Finish  fronted page

Todo next:
1. Insert to db
on doing ajax fly country,citylist
Add clientmodel

---
Next, refac ordercartmodel
fixed merge confilct
fixed merge confilct
s
normail change
add domo cis report module
finish report