Commit Graph

28 Commits (1fb2fa7e81042c51d70eb38661ce676c7160b96e)

Author SHA1 Message Date
chenzhi 884f919387 优化聚合渠道统计
zhengyongxing 11ff884e6a Merge branch 'feature/cp_juhe_company' into hotfix/market_percentage
# Conflicts:
#	Application/Admin/Common/extend.php
#	Application/Admin/Controller/AggregateFinanceSetController.class.php
#	Application/Admin/Controller/CpJuheCompanyController.class.php
#	Application/Admin/View/CpJuheCompany/detail.html
#	Application/Admin/View/CpJuheCompany/export.html
#	Data/update.sql
zhengyongxing 1fff2e6c09 财务代码搬到新的分支上
zhengyongxing cb0ceda1cb 聚合财务导出模板修正
zhengyongxing 729136a95c 聚合订单代码导出,及重算功能修改
chenzhi e1e431804c 优化审批
chenzhi 6557938e53 优化聚合渠道财务结算单
chenzhi 861fd07965 优化检索
chenzhi 834dbe0867 优化导出支付信息不记录
chenzhi 2ad89c2fb6 优化导出时间
chenzhi 21a985ae82 聚合财务结算单ok
chenzhi 8137778ec1 新增聚合操作日志
chenzhi 63f5354dc3 优化重算
chenzhi 2a28cf9008 聚合财务优化权限
chenzhi fe662ce160 审核子操作ok
chenzhi 16d9813e18 聚合财务重算
chenzhi 253b47b2a9 聚合财务子操作
chenzhi 990c62b06a 批注增删改查
chenzhi 6b5f60f8e6 新增凭证增删改查
chenzhi afd362d847 聚合结算单导出优化3
chenzhi 2fc38b25b6 聚合结算单导出优化2
chenzhi ce4c938080 优化聚合结算导出
chenzhi cf9480eb89 聚合财务导出
chenzhi 422728ed11 聚合财务编辑
chenzhi bf7c7ed14f 审核
chenzhi 114cf4a503 聚合对账新增对账金额统计
chenzhi 51322e3317 聚合财务2
chenzhi 6d0e7c3a00 聚合对账1