Commits · b1bbd3ee2a1fe909af553504ed53a856c9930526 · wangxiaoming / traffic-front

26 Nov, 2018 11 commits
- [DEV] fixed check task bugs · b1bbd3ee
  neo authored Nov 26, 2018
  
  b1bbd3ee
- [DEV] fixed ID to id for org permission key dto · d4e1bdec
  neo authored Nov 26, 2018
  
  d4e1bdec
- [DEV] add org id in approval task info · b6a97d46
  neo authored Nov 26, 2018
  
  b6a97d46
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · 163acc9d
  neo authored Nov 26, 2018
  
  163acc9d
- [Bugfix] fixed approval all and use page permission · 767045f8
  neo authored Nov 26, 2018
  
  767045f8
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 655f5bc0
  sherlock authored Nov 26, 2018
```
Dev oracle sherlock

See merge request root/atms!209
```
  655f5bc0
- dffs org filter · cd32138b
  sherlock authored Nov 26, 2018
  
  cd32138b
- [Bugfix] do not use ID use id · 4839a91e
  neo authored Nov 26, 2018
  
  4839a91e
- [DEV] fixed all id can not set in dto · 72e3ce04
  neo authored Nov 26, 2018
  
  72e3ce04
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · d0a31158
  neo authored Nov 26, 2018
  
  d0a31158
- count total, templateName · f74c5e27
  sherlock authored Nov 26, 2018
  
  f74c5e27
23 Nov, 2018 5 commits
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 65bfaff9
  sherlock authored Nov 23, 2018
```
dffs\jffs\gl export number format

See merge request root/atms!208
```
  65bfaff9
- dffs\jffs\gl export number format · 09412b34
  sherlock authored Nov 23, 2018
  
  09412b34
- [Bugfix] fixed approval assert · 12df33d8
  neo authored Nov 23, 2018
  
  12df33d8
- [DEV] fixed approval with period and porject · 44a8b78e
  neo authored Nov 23, 2018
  
  44a8b78e
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · def95670
  neo.wang authored Nov 23, 2018
```
Dev oracle neo

See merge request root/atms!207
```
  def95670
22 Nov, 2018 5 commits
- [DEV] fixed report update time · 7e7b44b1
  neo authored Nov 22, 2018
  
  7e7b44b1
- [DEV] rename ProjectContext to PC formula · 9ab00ee7
  neo authored Nov 22, 2018
  
  9ab00ee7
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · ebf3c7d4
  sherlock authored Nov 22, 2018
```
JXFP data transfer

See merge request root/atms!206
```
  ebf3c7d4
- [DEV] hidden keyword datasorce menu in admin · 4ef6fc28
  neo authored Nov 22, 2018
  
  4ef6fc28
- JXFP data transfer · effb3cfe
  sherlock authored Nov 22, 2018
  
  effb3cfe
21 Nov, 2018 15 commits
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · bcb8d858
  sherlock authored Nov 21, 2018
```
Dev oracle sherlock

See merge request root/atms!205
```
  bcb8d858
- dffs\jffs · 3d24912b
  sherlock authored Nov 21, 2018
  
  3d24912b
- modify · e02c2c8c
  eddie.woo authored Nov 21, 2018
  
  e02c2c8c
- merge · 3dfd1bb9
  eddie.woo authored Nov 21, 2018
  
  3dfd1bb9
- modify · 0ebd6219
  eddie.woo authored Nov 21, 2018
  
  0ebd6219
- DFFS/JFFS type · 474bea32
  sherlock authored Nov 21, 2018
  
  474bea32
- dffs\jffs\gl export number format · 17b8b48c
  sherlock authored Nov 21, 2018
  
  17b8b48c
- [Bugfix] fixe base get value bug not return calcs value · b8504a11
  neo authored Nov 21, 2018
  
  b8504a11
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · e7a7133a
  sherlock authored Nov 21, 2018
```
Dev oracle sherlock

See merge request root/atms!204
```
  e7a7133a
- template import selected sheet · fc04d20f
  sherlock authored Nov 21, 2018
  
  fc04d20f
- [Bugfix] fixed bb eval code sheet index · b83c00dd
  neo authored Nov 21, 2018
  
  b83c00dd
- glBalance export · e0f1eb62
  sherlock authored Nov 21, 2018
  
  e0f1eb62
- JFFS · 19fc7c4a
  sherlock authored Nov 21, 2018
  
  19fc7c4a
- modify · 8effdfec
  eddie.woo authored Nov 21, 2018
  
  8effdfec
- Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle · 09ba34ba
  eddie.woo authored Nov 21, 2018
  
  09ba34ba
20 Nov, 2018 4 commits
- [Bugfix] set report datasource name · 8d883515
  neo authored Nov 20, 2018
  
  8d883515
- [DEV] do not update formula · d55bdc11
  neo authored Nov 20, 2018
  
  d55bdc11
- some export · c6b49c2b
  sherlock authored Nov 20, 2018
  
  c6b49c2b
- Merge branches 'dev_oracle' and 'dev_oracle_sherlock' of… · 285799ae
  sherlock authored Nov 20, 2018
```
Merge branches 'dev_oracle' and 'dev_oracle_sherlock' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle_sherlock
```
  285799ae