Commits · 1905d7b73b751b1f67d497b6a5c27897f89593d4 · wangxiaoming / traffic-front

06 Aug, 2018 4 commits
- Merge branch 'dev' into dev_frank · 1905d7b7
  frank.xa.zhang authored Aug 06, 2018
  
  1905d7b7
- fixed code issues and add datasource for invoice and voucher · f89cb5ba
  frank.xa.zhang authored Aug 06, 2018
  
  f89cb5ba
- merge · fa165dab
  eddie.woo authored Aug 06, 2018
  
  fa165dab
- merge · b182ecef
  eddie.woo authored Aug 06, 2018
  
  b182ecef
03 Aug, 2018 2 commits
- fixed the formula project context and remove some unused data in DB · 244ad198
  frank.xa.zhang authored Aug 03, 2018
```
need add the bspl report in the system
```
  244ad198
- Merge branch 'dev' into dev_frank · add077bc
  frank.xa.zhang authored Aug 03, 2018
  
  add077bc
02 Aug, 2018 10 commits
- fixed the formula project context and remove some unused data in DB · d49d35b7
  frank.xa.zhang authored Aug 02, 2018
```
need add the bspl report in the system
```
  d49d35b7
- Merge branch 'dev_neo' into 'dev' · 4eef6627
  neo.wang authored Aug 02, 2018
```
Dev neo

See merge request root/atms!90
```
  4eef6627
- [bugfix] fixed table alias error used · feee7cc9
  neo authored Aug 02, 2018
  
  feee7cc9
- [bugfix] use error symbol for where value · f5ccada9
  neo authored Aug 02, 2018
  
  f5ccada9
- [bugfix] split space with \s+ for sql more blank where condition · e1982a52
  neo authored Aug 02, 2018
  
  e1982a52
- [bugfix] fixed sql error for key word used whih no space · e6e4c719
  neo authored Aug 02, 2018
  
  e6e4c719
- [bugfix] fixed index of get vlaue from code · 0d9c635a
  neo authored Aug 02, 2018
  
  0d9c635a
- [bugfix] json filed fro code · b5725e69
  neo authored Aug 02, 2018
  
  b5725e69
- update spreadjs to 11.1 to fixed some display issue · 19fc07f0
  frank.xa.zhang authored Aug 02, 2018
  
  19fc07f0
- [bugfix] customer service impl query can not view · ba86838f
  neo authored Aug 02, 2018
  
  ba86838f
01 Aug, 2018 5 commits
- [bugfix] fixed bb datasource insert celltemplateid and period · 75bbf736
  neo authored Aug 01, 2018
  
  75bbf736
- [bugfix] add formuar bb char index to uppercase · 0914bd07
  neo authored Aug 01, 2018
  
  0914bd07
- Merge branch 'dev' into dev_frank · 13bb847a
  frank.xa.zhang authored Aug 01, 2018
  
  13bb847a
- fixed report generate issue · 472dc359
  frank.xa.zhang authored Aug 01, 2018
  
  472dc359
- Merge branch 'dev_neo' into 'dev' · 7e9aa6df
  neo.wang authored Aug 01, 2018
```
Dev neo

See merge request root/atms!89
```
  7e9aa6df
31 Jul, 2018 6 commits
- fixed report generate issue · f69410c1
  frank.xa.zhang authored Jul 31, 2018
  
  f69410c1
- [bugfix] delete un used packege · de0d3484
  neo authored Jul 31, 2018
  
  de0d3484
- [bugfix] fixed bb inprove function for char index · 960de1e3
  neo authored Jul 31, 2018
  
  960de1e3
- [bugfix] add post for get customs invoice data for display · a80484ee
  neo authored Jul 31, 2018
  
  a80484ee
- [dev] add json filed name for balance · d247dd16
  neo authored Jul 31, 2018
  
  d247dd16
- [bugfix] skip some validation and status check · e3047353
  neo authored Jul 31, 2018
  
  e3047353
30 Jul, 2018 13 commits
- fixed copy report template issue · f89308cd
  frank.xa.zhang authored Jul 30, 2018
  
  f89308cd
- [bugfix] merge write balance grid with new .netsource · 3588c4d9
  neo authored Jul 30, 2018
  
  3588c4d9
- [bugfix] lower treedata List to list · cb19c8e7
  neo authored Jul 30, 2018
  
  cb19c8e7
- [bugfix] fix getdatafromdatabase function treeData foreach · 331f34bd
  neo authored Jul 30, 2018
  
  331f34bd
- [bugfix] delete not fund mapper filed in db · 67db3e2f
  neo authored Jul 30, 2018
  
  67db3e2f
- [bugfix] fix company balance inport sql missed cloum · 6a0b4c60
  neo authored Jul 30, 2018
  
  6a0b4c60
- fixed report datasource display issue · ba31817d
  frank.xa.zhang authored Jul 30, 2018
  
  ba31817d
- [bugfix] null porint for importdata · 30ae82fd
  neo authored Jul 30, 2018
  
  30ae82fd
- [bugfix] erp import delete projectYear param for all · 5e95d052
  neo authored Jul 30, 2018
  
  5e95d052
- [bugfix] erp import delete projectYear param · 6c00a5f4
  neo authored Jul 30, 2018
  
  6c00a5f4
- Merge branch 'dev_neo' into 'dev' · 93b75c6c
  neo.wang authored Jul 30, 2018
```
Dev neo

See merge request root/atms!88
```
  93b75c6c
- Merge branch 'dev' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_import · a391e4aa
  neo authored Jul 30, 2018
  
  a391e4aa
- Merge branch 'dev' into dev_frank · 794ccd79
  frank.xa.zhang authored Jul 30, 2018
  
  794ccd79