Commits · aa4d1dc9c540b665cba50bcc1ef620298e71e874 · wangxiaoming / traffic-front

08 Nov, 2018 2 commits
- 更新报表报错 · aa4d1dc9
  sherlock authored Nov 08, 2018
  
  aa4d1dc9
- bug 19773\19789 · 9d8a5dcf
  sherlock authored Nov 08, 2018
  
  9d8a5dcf
07 Nov, 2018 3 commits
- bug:app-overview:listView\cardView · 413352a3
  sherlock authored Nov 07, 2018
  
  413352a3
- 添加报表未取到公式 · c28f4dd6
  sherlock authored Nov 07, 2018
  
  c28f4dd6
- import template with formula/ export output-invoice · 4dfe6ef0
  sherlock authored Nov 07, 2018
  
  4dfe6ef0
05 Nov, 2018 1 commit
- bug:19213\纳税申报表排序\preview 优化 · 34e82a7f
  sherlock authored Nov 05, 2018
  
  34e82a7f
02 Nov, 2018 11 commits
- bug:19216 · 52408455
  sherlock authored Nov 02, 2018
  
  52408455
- Merge remote-tracking branch 'origin/dev_oracle' into dev_oracle_sherlock · e48d186a
  sherlock authored Nov 02, 2018
  
  e48d186a
- Merge remote-tracking branch 'origin/dev_oracle_sherlock' into dev_oracle_sherlock · 7bdb2138
  sherlock authored Nov 02, 2018
  
  7bdb2138
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 5f760aa4
  sherlock authored Nov 02, 2018
```
xxfp bug

See merge request root/atms!170
```
  5f760aa4
- Merge branch 'dev_oracle' into 'dev_oracle_sherlock' · a957930f
  sherlock authored Nov 02, 2018
```
# Conflicts:
#   atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
```
  a957930f
- Merge remote-tracking branch 'origin/dev_oracle' into dev_oracle_sherlock · accba4a0
  sherlock authored Nov 02, 2018
```
# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
```
  accba4a0
- xxfp bug · 4116029a
  sherlock authored Nov 02, 2018
  
  4116029a
- [Bugfix] fixed isProjectStatsuExist paramerter error · 26c6c131
  neo authored Nov 02, 2018
  
  26c6c131
- [BugFix] fixed project change period and upate status · 0da6a1e8
  neo authored Nov 02, 2018
  
  0da6a1e8
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 07b1cbc1
  sherlock authored Nov 02, 2018
```
xxfp\去掉导出按钮

See merge request root/atms!169
```
  07b1cbc1
- xxfp\去掉导出按钮 · d978f2c9
  sherlock authored Nov 02, 2018
  
  d978f2c9
01 Nov, 2018 20 commits
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 7ba95455
  neo.wang authored Nov 01, 2018
```
Dev oracle neo

See merge request root/atms!168
```
  7ba95455
- [Bugfix] fixed sql error for maunal query · a32ca02b
  neo authored Nov 01, 2018
  
  a32ca02b
- [Bugfix] fixed js qout misss · d154a365
  neo authored Nov 01, 2018
  
  d154a365
- [DEV] add comfire for munal datasrource for re gen report · 1e994fc1
  neo authored Nov 01, 2018
  
  1e994fc1
- [DEV] delete period data source with merger maual not correct · 0aedfa54
  neo authored Nov 01, 2018
  
  0aedfa54
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 2fd1fa9c
  sherlock authored Nov 01, 2018
```
Dev oracle sherlock

See merge request root/atms!167
```
  2fd1fa9c
- 金额、税额 to right · c0d2b961
  sherlock authored Nov 01, 2018
  
  c0d2b961
- bug:app-overview:listView\cardView · cd196bc9
  sherlock authored Nov 01, 2018
  
  cd196bc9
- [Bugfix] fixed muallempty id sql errro · 6b46f9ad
  neo authored Nov 01, 2018
  
  6b46f9ad
- [dev] do not delete maunual data · 7a473ec4
  neo authored Nov 01, 2018
  
  7a473ec4
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · 6cb74496
  neo authored Nov 01, 2018
  
  6cb74496
- [Bugfix] fixed data source project id is null · deee1db2
  neo authored Nov 01, 2018
  
  deee1db2
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 0f9061b2
  sherlock authored Nov 01, 2018
```
Dev oracle sherlock

See merge request root/atms!166
```
  0f9061b2
- bug:app-overview:listView\cardView · ca6e0446
  sherlock authored Nov 01, 2018
  
  ca6e0446
- [Bugfix] fixed save template group · 2e936d03
  neo authored Nov 01, 2018
  
  2e936d03
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 52786c0a
  neo.wang authored Nov 01, 2018
```
Dev oracle neo

See merge request root/atms!165
```
  52786c0a
- [BugFix] fixed bb formulate cannot xianshi · 961aa756
  neo authored Nov 01, 2018
  
  961aa756
- [bugfix] fixed nullpoint for bb formular · 4ceb93c1
  neo authored Nov 01, 2018
  
  4ceb93c1
- bug:19445 · 93edd535
  sherlock authored Nov 01, 2018
  
  93edd535
- [Bug 19426] fixed bug cannot delete templete group · 30bfbfc1
  neo authored Nov 01, 2018
  
  30bfbfc1
31 Oct, 2018 3 commits
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · 4b6261c3
  neo authored Oct 31, 2018
  
  4b6261c3
- [Bugfix] fix report gen mult result · 32194cc2
  neo authored Oct 31, 2018
  
  32194cc2
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · be5e822f
  sherlock authored Oct 31, 2018
```
Dev oracle sherlock

See merge request root/atms!164
```
  be5e822f