Commits · d295d6fc575cf7ea32d8c325cc9ebe8f9f2629bc · wangxiaoming / traffic-front

03 Jul, 2019 1 commit

Merge branch 'dev_wzk_period1' into 'dev_mysql' · d295d6fc

Eddie.Wu authored Jul 03, 2019

1、利润表表样；2、已认证发票清单导入加入数据条数验证；3、已开增值税发票记录针对开票日期值得获取优化

See merge request root/atms!442

d295d6fc

25 Jun, 2019 1 commit
- 1、利润表表样；2、已认证发票清单导入加入数据条数验证；3、已开增值税发票记录针对开票日期值得获取优化 · e970b108
  weizhikai authored Jun 25, 2019
  
  e970b108
24 Jun, 2019 4 commits
- Merge branch 'dev_wzk_period1' into 'dev_mysql' · 46970c1a
  Eddie.Wu authored Jun 24, 2019
```
EBS数据抽取页面机构选择框改为bootstrap-selectpicker控件，以解决下拉框机构太多出错问题

See merge request root/atms!434
```
  46970c1a
- Merge branch 'dev_mysql_chase_bug_1' into 'dev_mysql' · 3d98e73e
  Eddie.Wu authored Jun 24, 2019
```
英文转换

See merge request root/atms!437
```
  3d98e73e
- 英文转换 · 38b2e9c8
  chase authored Jun 24, 2019
  
  38b2e9c8
- Merge branch 'dev_mysql_chase_bug_1' into 'dev_mysql' · fa27a8b3
  Eddie.Wu authored Jun 24, 2019
```
转换英文

See merge request root/atms!436
```
  fa27a8b3
23 Jun, 2019 1 commit
- 转换英文 · ada7c551
  chase authored Jun 23, 2019
  
  ada7c551
18 Jun, 2019 1 commit
- EBS数据抽取页面机构选择框改为bootstrap-selectpicker控件，以解决下拉框机构太多出错问题 · 4dd81ed2
  weizhikai authored Jun 18, 2019
  
  4dd81ed2
31 May, 2019 11 commits
- Merge branch 'sam_p1' into 'dev_mysql' · 683d94f8
  Eddie.Wu authored May 31, 2019
```
Sam p1

See merge request root/atms!417
```
  683d94f8
- Delete PULL_REQUEST_TEMPLATE.zh-CN.md · 984e5a6c
  sam.x.wang authored May 31, 2019
  
  984e5a6c
- Delete ISSUE_TEMPLATE.zh-CN.md · d51ac919
  sam.x.wang authored May 31, 2019
  
  d51ac919
- Delete README.en.md · c4ac551e
  sam.x.wang authored May 31, 2019
  
  c4ac551e
- Delete README.md · 1cb79d28
  sam.x.wang authored May 31, 2019
  
  1cb79d28
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into sam_p1 · 08cb6b8d
  sam.x.wang authored May 31, 2019
  
  08cb6b8d
- Merge branch 'dev_wzk_phase1' of http://code.tech.tax.asia.pwcinternal.com/root/atms into sam_p1 · f7799716
  sam.x.wang authored May 31, 2019
  
  f7799716
- Merge branch 'dev_mysql_ken' into 'dev_mysql' · c01cfa4e
  Eddie.Wu authored May 31, 2019
```
add 截止本期科目余额表 预览导出---Ken

See merge request root/atms!405
```
  c01cfa4e
- VAT手工导入页面的导入时间24小时制 · fa7ffc0d
  weizhikai authored May 31, 2019
  
  fa7ffc0d
- 手动增加分析税金计算表数据 · 96b3ed4d
  sam.x.wang authored May 31, 2019
  
  96b3ed4d
- 税金表分析问题 · 11d4ce72
  王晓明 authored May 31, 2019
  
  11d4ce72
29 May, 2019 2 commits
- 测试分支 · 2b04c438
  王晓明 authored May 29, 2019
  
  2b04c438
- Merge branch 'sam_p1' of https://gitee.com/samxwang/samDD into sam_p1 · 79950081
  王晓明 authored May 29, 2019
  
  79950081
28 May, 2019 2 commits
- add 截止本期科目余额表预览导出---Ken · 0267b2fb
  ken-y authored May 28, 2019
  
  0267b2fb
- 1、上传历史版本的同时进行归档优化 · 8d8e9da6
  weizhikai authored May 28, 2019
  
  8d8e9da6
27 May, 2019 6 commits
- Merge branch 'dev_wzk_phase1' into 'dev_mysql' · 44bda2bb
  Eddie.Wu authored May 27, 2019
```
1、卡片展示排序；2、已认证发票清单模板下载；3、手工导入的VAT数据页面展示问题；4、导入的发票资料公式计算；5、导入的现金流量表期间的set 	6、收入明细列宽调整；7、报表上传成功后自动消失后面的模态框；8、机构管理只展示当前用户有权限的机构；9、卡片列表展示时的序号问题

See merge request root/atms!402
```
  44bda2bb
- Merge branch 'dev_mysql_chase_bug' into 'dev_mysql' · 0c2c9956
  Eddie.Wu authored May 27, 2019
```
修复安全扫描

See merge request root/atms!400
```
  0c2c9956
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_wzk_phase1 · e48dc441
  weizhikai authored May 27, 2019
  
  e48dc441
- 1、收入明细列宽调整；2、报表上传成功后自动消失后面的模态框；3、机构管理只展示当前用户有权限的机构；4、卡片列表展示时的序号问题 · 4c6af1dd
  weizhikai authored May 27, 2019
  
  4c6af1dd
- 修复安全扫描 · 3830e83e
  chase authored May 27, 2019
  
  3830e83e
- 安全扫描 · 8baf5057
  eddie.woo authored May 27, 2019
  
  8baf5057
24 May, 2019 1 commit
- 1、卡片展示排序；2、已认证发票清单模板下载；3、手工导入的VAT数据页面展示问题；4、导入的发票资料公式计算；5、导入的现金流量表期间的set · ffc4dc52
  weizhikai authored May 24, 2019
  
  ffc4dc52
23 May, 2019 3 commits
- Merge branch 'dev_wzk_phase1' into 'dev_mysql' · e178d378
  Eddie.Wu authored May 23, 2019
```
1、卡片展示与列表展示状态改为一致；2、VAT报表处理时的状态；3、收入明细金额加上千分位

See merge request root/atms!393
```
  e178d378
- Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_wzk_phase1 · 96c7d2ee
  weizhikai authored May 23, 2019
  
  96c7d2ee
- 1、卡片展示与列表展示状态改为一致；2、VAT报表处理时的状态；3、收入明细金额加上千分位 · 2435c8b2
  weizhikai authored May 23, 2019
  
  2435c8b2
22 May, 2019 7 commits
- Merge branch 'dev_mysql_ken' into 'dev_mysql' · e366f85a
  Eddie.Wu authored May 22, 2019
```
fix Vat view bug ---Ken

See merge request root/atms!392
```
  e366f85a
- update excel template---Ken · 9f0fdeb8
  ken-y authored May 22, 2019
  
  9f0fdeb8
- Merge branch 'dev_mysql_ken' of… · 2b5174b4
  ken-y authored May 22, 2019
```
Merge branch 'dev_mysql_ken' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql_ken
```
  2b5174b4
- fix vat view bug ---Ken · 7636543e
  ken-y authored May 22, 2019
  
  7636543e
- Balance Sheet and Profit table Fix Bugs · b64d1a22
  Cheng C Yang authored May 22, 2019
  
  b64d1a22
- merge dev_mysql---Ken · 51feb218
  ken-y authored May 22, 2019
  
  51feb218
- Merge branch 'dev_mysql_chase_bug' into 'dev_mysql' · b01c2bc0
  Eddie.Wu authored May 22, 2019
```
修复gift查询bug

See merge request root/atms!388
```
  b01c2bc0