diff --git a/models/doctype/Item/ItemList.js b/models/doctype/Item/ItemList.js index be323e94..5ec7d930 100644 --- a/models/doctype/Item/ItemList.js +++ b/models/doctype/Item/ItemList.js @@ -5,7 +5,8 @@ export default { title: _('Item'), columns: [ 'name', + 'unit', + 'tax', 'rate', - 'tax' ] } diff --git a/reports/GeneralLedger/viewConfig.js b/reports/GeneralLedger/viewConfig.js index e6ada3cb..f91c3a4b 100644 --- a/reports/GeneralLedger/viewConfig.js +++ b/reports/GeneralLedger/viewConfig.js @@ -95,39 +95,48 @@ const viewConfig = { return [ { label: 'Date', - fieldtype: 'Date' + fieldtype: 'Date', + fieldname: 'date' }, { label: 'Account', - fieldtype: 'Link' + fieldtype: 'Link', + fieldname: 'account' }, { label: 'Debit', - fieldtype: 'Currency' + fieldtype: 'Currency', + fieldname: 'debit' }, { label: 'Credit', - fieldtype: 'Currency' + fieldtype: 'Currency', + fieldname: 'credit' }, { label: 'Balance', - fieldtype: 'Currency' + fieldtype: 'Currency', + fieldname: 'balance' }, { label: 'Reference Type', - fieldtype: 'Data' + fieldtype: 'Data', + fieldname: 'referenceType' }, { label: 'Reference Name', - fieldtype: 'Data' + fieldtype: 'Data', + fieldname: 'referenceName' }, { label: 'Party', - fieldtype: 'Link' + fieldtype: 'Link', + fieldname: 'party' }, { label: 'Description', - fieldtype: 'Data' + fieldtype: 'Data', + fieldname: 'description' } ]; } diff --git a/src/components/Row.vue b/src/components/Row.vue index 6d492105..5a678065 100644 --- a/src/components/Row.vue +++ b/src/components/Row.vue @@ -14,21 +14,24 @@ export default { ratio: { type: Array, default: () => [] - } + }, + gap: String }, computed: { style() { + let obj = {}; if (this.columnCount) { - return { - 'grid-template-columns': `repeat(${this.columnCount}, 1fr)` - } + obj['grid-template-columns'] = `repeat(${this.columnCount}, 1fr)`; } if (this.ratio.length) { - return { - 'grid-template-columns': this.ratio.map(r => `${r}fr`).join(' ') - } + obj['grid-template-columns'] = this.ratio.map(r => `${r}fr`).join(' '); } + if (this.gap) { + obj['grid-gap'] = this.gap; + } + + return obj; } } -} +}; diff --git a/src/pages/ListView/List.vue b/src/pages/ListView/List.vue index 67c45f89..8d85d072 100644 --- a/src/pages/ListView/List.vue +++ b/src/pages/ListView/List.vue @@ -1,15 +1,16 @@ + diff --git a/src/router.js b/src/router.js index dcca13d6..7d0d9b56 100644 --- a/src/router.js +++ b/src/router.js @@ -7,7 +7,7 @@ import FormView from '@/pages/FormView/FormView'; import PrintView from '@/pages/PrintView'; import QuickEditForm from '@/pages/QuickEditForm'; -import Report from '@/pages/Report'; +import Report from '@/pages/Report.vue'; import reportViewConfig from '../reports/view'; import DataImport from '@/pages/DataImport'; @@ -29,7 +29,7 @@ const routes = [ component: Dashboard }, { - path: '/edit/SalesInvoice/:name', + path: '/edit/:doctype/:name', name: 'InvoiceForm', components: { default: InvoiceForm, @@ -74,14 +74,7 @@ const routes = [ path: '/report/:reportName', name: 'Report', component: Report, - props: route => { - const { reportName } = route.params; - return { - reportName, - reportConfig: reportViewConfig[reportName] || null, - filters: route.query - }; - } + props: true }, { path: '/data-import', @@ -119,6 +112,6 @@ const routes = [ ]; let router = new Router({ routes }); -router.replace('/list/Item'); +router.replace('/report/general-ledger'); export default router;