Skip to content

Commit

Permalink
fix(report): income/expense uses report archive pg
Browse files Browse the repository at this point in the history
This commit migrates the report to using the generic report archive page
for creating reports.  It patches the functionality to make sure PDF
  reports are rendered by default and removes the client interface as it
  has been completely replaced by the generic archive page.
  • Loading branch information
Jonathan Niles committed Nov 4, 2016
1 parent 0540fe0 commit ac3afec
Show file tree
Hide file tree
Showing 23 changed files with 269 additions and 598 deletions.
4 changes: 2 additions & 2 deletions client/src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,8 @@
"HOSPITAL_FILE_NR" : "Hospital File Number",
"HOSPITAL_NO" : "Hospital No.",
"ID" : "ID",
"INCOME" : "Incomes",
"INCOME_EXPENSE" : "Incomes and Expenses",
"INCOME" : "Income",
"INCOME_EXPENSE" : "Income and Expense",
"INTL" : "International",
"INVENTORY" : "Inventory",
"INVOICE" : "Invoice",
Expand Down
6 changes: 3 additions & 3 deletions client/src/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,14 @@ function bhimaConfig($stateProvider, $urlRouterProvider, $urlMatcherFactoryProvi
controller: 'VoucherController as VoucherCtrl',
templateUrl: 'partials/vouchers/index.html'
})

/** General ledger routes**/
.state('generalLedger', {
url : '/general_ledger',
controller : 'GeneralLedgerController as GeneralLedgerCtrl',
templateUrl : 'partials/general_ledger/general_ledger.html'
})


/* references routes */

.state('references', {
Expand Down Expand Up @@ -382,7 +381,8 @@ function constantConfig() {
},
reports : {
AGED_DEBTOR : 'AGED_DEBTOR',
CASHFLOW : 'CASHFLOW'
CASHFLOW : 'CASHFLOW',
INCOME_EXPENSE : 'INCOME_EXPENSE'
}
};
}
Expand Down
59 changes: 0 additions & 59 deletions client/src/partials/finance/incomeExpense/config.html

This file was deleted.

51 changes: 0 additions & 51 deletions client/src/partials/finance/incomeExpense/config.js

This file was deleted.

25 changes: 0 additions & 25 deletions client/src/partials/finance/incomeExpense/incomeExpense.routes.js

This file was deleted.

29 changes: 0 additions & 29 deletions client/src/partials/finance/incomeExpense/index.html

This file was deleted.

41 changes: 0 additions & 41 deletions client/src/partials/finance/incomeExpense/index.js

This file was deleted.

122 changes: 0 additions & 122 deletions client/src/partials/finance/incomeExpense/report.html

This file was deleted.

Loading

0 comments on commit ac3afec

Please sign in to comment.