diff --git a/modules/client/front/balance/index/index.html b/modules/client/front/balance/index/index.html index 19db55f1a3..b505d5ab51 100644 --- a/modules/client/front/balance/index/index.html +++ b/modules/client/front/balance/index/index.html @@ -1,17 +1,40 @@ - + - + - +
- + -
+
Total by company
-
@@ -20,78 +43,94 @@
- - - - Date - Creation date - Employee - Reference - Bank - Debit - Havings - Balance - Conciliated - - - - - - - - {{::balance.payed | date:'dd/MM/yyyy'}} - - - - - {{::balance.created | date:'dd/MM/yyyy HH:mm'}} - - - - - {{::balance.userName}} - - - - -
- - {{'BILL' | translate: {ref: balance.description} }} - - - {{balance.description}} - -
-
- - - - -
- {{::balance.bankFk}} - {{::balance.debit | currency: 'EUR':2}} - {{::balance.credit | currency: 'EUR':2}} - {{balance.balance | currency: 'EUR':2}} - - - - - - - - - - + + + + Date + Creation date + Employee + Reference + Bank + Debit + Havings + Balance + Conciliated + + + + + + + + {{::balance.payed | date:'dd/MM/yyyy'}} + + + + + {{::balance.created | date:'dd/MM/yyyy HH:mm'}} + + + + + {{::balance.userName}} + + + + +
+ + {{'BILL' | translate: {ref: balance.description} }} + + + {{balance.description}} + +
+
+ + + + +
+ {{::balance.bankFk}} + {{::balance.debit | currency: 'EUR':2}} + {{::balance.credit | currency: 'EUR':2}} + {{balance.balance | currency: 'EUR':2}} + + + + + + + + + + - - @@ -101,13 +140,24 @@
- + - - + - + \ No newline at end of file diff --git a/modules/client/front/balance/index/index.js b/modules/client/front/balance/index/index.js index 103186e090..8ecdd2c700 100644 --- a/modules/client/front/balance/index/index.js +++ b/modules/client/front/balance/index/index.js @@ -45,7 +45,6 @@ class Controller extends Section { return this.aclService.hasAny(['administrative']); } - getData() { return this.$.model.applyFilter(null, { clientId: this.$params.id,