Commits · 2a864c5f164db3759679f5fcc61dfaa1f7346355 · wangxiaoming / traffic-front

29 Aug, 2018 2 commits
- Merge branch 'dev' into dev_frank · 2a864c5f
  frank.xa.zhang authored Aug 29, 2018
  
  2a864c5f
- fixed formula bb datasource can't display issue · 1d979388
  frank.xa.zhang authored Aug 29, 2018
  
  1d979388
28 Aug, 2018 12 commits
- Merge branch 'dev_neo3' into 'dev' · 989b1d43
  neo.wang authored Aug 28, 2018
```
Dev neo3

See merge request root/atms!100
```
  989b1d43
- [bugfix] fix celldata without source detail item · 451926ee
  neo authored Aug 28, 2018
  
  451926ee
- [bugfix] add report name for bb formula in suorce detail · 0693f1b3
  neo authored Aug 28, 2018
  
  0693f1b3
- [bugfix] fixed bb formula reportname · e533387f
  neo authored Aug 28, 2018
  
  e533387f
- Merge branch 'dev' into dev_frank · a14726e8
  frank.xa.zhang authored Aug 28, 2018
  
  a14726e8
- fixed formula bb datasource can't display issue · 868741b0
  frank.xa.zhang authored Aug 28, 2018
  
  868741b0
- Merge branch 'dev_neo3' into 'dev' · 07f26076
  neo.wang authored Aug 28, 2018
```
Dev neo3

See merge request root/atms!99
```
  07f26076
- [bugfix] fix nulldatasource default period is current year · 14334480
  neo authored Aug 28, 2018
  
  14334480
- fixed formula datasource can't display issue · 05578079
  frank.xa.zhang authored Aug 28, 2018
  
  05578079
- [bugfix] revert bb period · 0ccba1f9
  neo authored Aug 28, 2018
  
  0ccba1f9
- [bugfix] bb formular for currentyeare fixed period · 1ae26da1
  neo authored Aug 28, 2018
  
  1ae26da1
- [bugfix] fix bb formula period saved in datasource · 9a7e6ba9
  neo authored Aug 28, 2018
  
  9a7e6ba9
27 Aug, 2018 1 commit
- fixed formula cell data can't display issue · 8e7fed59
  frank.xa.zhang authored Aug 27, 2018
  
  8e7fed59
24 Aug, 2018 11 commits
- Merge branch 'dev' into dev_frank · eb111dbe
  frank.xa.zhang authored Aug 24, 2018
  
  eb111dbe
- fixed filling issues · e0ac49ad
  frank.xa.zhang authored Aug 24, 2018
  
  e0ac49ad
- Merge branch 'dev_neo3' into 'dev' · f30b0979
  neo.wang authored Aug 24, 2018
```
Dev neo3

See merge request root/atms!98
```
  f30b0979
- [dev] bb prarameter index reduce 1 · 2948f07a
  neo authored Aug 24, 2018
  
  2948f07a
- [dev] fixed bb save datasource bug · 5d1f6902
  neo authored Aug 24, 2018
  
  5d1f6902
- [dev] over write save datasorce for bb use praramer index · 3a73a430
  neo authored Aug 24, 2018
  
  3a73a430
- [dev] bb formula for refs formual cacls · ed2e5e3b
  neo authored Aug 24, 2018
  
  ed2e5e3b
- Merge branch 'dev_neo3' into 'dev' · cd15f312
  neo.wang authored Aug 24, 2018
```
[bugfix] use return not thrown exception result for lamda

See merge request root/atms!97
```
  cd15f312
- [bugfix] use return not thrown exception result for lamda · 18072d98
  neo authored Aug 24, 2018
  
  18072d98
- Merge branch 'dev_neo3' into 'dev' · db1a5fda
  neo.wang authored Aug 24, 2018
```
[dev] when not fund celltemplate get and insert datasource

See merge request root/atms!96
```
  db1a5fda
- [dev] when not fund celltemplate get and insert datasource · 3fb96405
  neo authored Aug 24, 2018
  
  3fb96405
23 Aug, 2018 13 commits
- Merge branch 'dev' into dev_frank · 440ffbd1
  frank.xa.zhang authored Aug 23, 2018
  
  440ffbd1
- fixed filling issues · 94d86bfc
  frank.xa.zhang authored Aug 23, 2018
  
  94d86bfc
- Merge branch 'dev_neo3' into 'dev' · 6579afa3
  neo.wang authored Aug 23, 2018
```
Dev neo3

See merge request root/atms!95
```
  6579afa3
- Merge branch 'dev' into dev_frank · 6a09ce9a
  frank.xa.zhang authored Aug 23, 2018
  
  6a09ce9a
- fixed filling issues · 8287fa02
  frank.xa.zhang authored Aug 23, 2018
  
  8287fa02
- [bugfix] fix sub extention for filename throw indexout or range excetpion · ad11e28d
  neo authored Aug 23, 2018
  
  ad11e28d
- [bugfix] get filename and temp file name from form · a323707f
  neo authored Aug 23, 2018
  
  a323707f
- [bugfix] out invoice import shoulbe notempty inster · 18d4ab34
  neo authored Aug 23, 2018
  
  18d4ab34
- [bugfix] fixed delete unused parameters · ad6fc2ff
  neo authored Aug 23, 2018
  
  ad6fc2ff
- [dev] ouput vourcher item file upalod impl · c7187f34
  neo authored Aug 23, 2018
  
  c7187f34
- Merge branch 'dev_neo3' into 'dev' · a1929a65
  neo.wang authored Aug 23, 2018
```
Dev neo3

See merge request root/atms!94
```
  a1929a65
- [bugfix] null point for voucher list item toString,if null set '' · 4e43b5d6
  neo authored Aug 23, 2018
  
  4e43b5d6
- [bugfix] use api token funxtion for upload token used · a2f42d12
  neo authored Aug 23, 2018
  
  a2f42d12
22 Aug, 2018 1 commit
- Merge branch 'dev_frank' into dev · 6a7418fe
  frank.xa.zhang authored Aug 22, 2018
  
  6a7418fe