Any limitations upon the punishment which may be imposed for violations of municipal ordinances which are contained in the charter of the municipality shall continue to control in municipal courts operated under this article, and if no such limitation exists the maximum punishment imposed shall not exceed a fine of $1,000.00 or six months' imprisonment or both, unless some other general law authorizes greater punishment. Other charter provisions not in conflict with this article shall continue to apply in municipal courts operated under this article.