Skip to content
This repository has been archived by the owner on Nov 25, 2024. It is now read-only.

fix: Report empty with regenerate. #2991

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions src/layout/components/TagsView/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,20 @@ import { generateTitle } from '@/utils/i18n'
import path from 'path'
import draggable from 'vuedraggable'

// constants
import { REPORT_VIEWER_NAME } from '@/utils/ADempiere/constants/report'
// Constants
import {
REPORT_VIEWER_NAME
} from '@/utils/ADempiere/dictionary/report'

// utils and helper methods
// Utils and Helper Methods
import { capitalize } from '@/utils/ADempiere/formatValue/stringFormat'
import { isEmptyValue } from '@/utils/ADempiere'
import { isEmptyValue } from '@/utils/ADempiere/valueUtils'

export default {
components: { ScrollPane, draggable },
components: {
ScrollPane, draggable
},

data() {
return {
visible: false,
Expand All @@ -126,6 +131,7 @@ export default {
recordsModifiedWindow: []
}
},

computed: {
isMobile() {
return this.$store.state.app.device === 'mobile'
Expand All @@ -137,6 +143,7 @@ export default {
return this.$store.state.permission.routes
}
},

watch: {
$route() {
this.addTags()
Expand All @@ -150,10 +157,12 @@ export default {
}
}
},

mounted() {
this.initTags()
this.addTags()
},

methods: {
generateTitle, // generateTitle by vue-i18n
isActive(route) {
Expand Down
7 changes: 5 additions & 2 deletions src/router/modules/ADempiere/staticRoutes.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* ADempiere-Vue (Frontend) for ADempiere ERP & CRM Smart Business Solution
* Copyright (C) 2018-Present E.R.P. Consultores y Asociados, C.A. www.erpya.com
* Contributor(s): Leonel Matos lMatos@eroya.com
* Contributor(s): Leonel Matos lMatos@erpya.com
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
Expand All @@ -22,7 +22,10 @@ import Layout from '@/layout'
import language from '@/lang'

// Constants
import { REPORT_VIEWER_NAME, REPORT_VIEWER_ENGINE_NAME } from '@/utils/ADempiere/constants/report'
import {
REPORT_VIEWER_NAME,
REPORT_VIEWER_ENGINE_NAME
} from '@/utils/ADempiere/dictionary/report'
import { REQUEST_ALL_WINDOW_ID } from '@/utils/ADempiere/dictionary/form/Issues'

// Utils and Helper Methods
Expand Down
2 changes: 1 addition & 1 deletion src/store/modules/ADempiere/dictionary/report/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import {
import { showNotification } from '@/utils/ADempiere/notification.js'
import {
containerManager
} from '@/utils/ADempiere/dictionary/report.js'
} from '@/utils/ADempiere/dictionary/report'
import {
runReport,
runReportAs,
Expand Down
42 changes: 25 additions & 17 deletions src/store/modules/ADempiere/form/VPOS/options.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,29 @@
// ADempiere-Vue (Frontend) for ADempiere ERP & CRM Smart Business Solution
// Copyright (C) 2023-Present E.R.P. Consultores y Asociados, C.A.
// Contributor(s): Elsio Sanchez [email protected] https://github.com/elsiosanchez
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
/**
* ADempiere-Vue (Frontend) for ADempiere ERP & CRM Smart Business Solution
* Copyright (C) 2018-Present E.R.P. Consultores y Asociados, C.A. www.erpya.com
* Contributor(s): Elsio Sanchez [email protected] https://github.com/elsiosanchez
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https:www.gnu.org/licenses/>.
*/

// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>.
import router from '@/router'
import lang from '@/lang'

// Constants
import {
REPORT_VIEWER_NAME
} from '@/utils/ADempiere/dictionary/report/index.js'

// API Request Methods
import {
copyOrder,
Expand All @@ -40,12 +49,11 @@ import {
processCashClosing,
listCashSummaryMovements
} from '@/api/ADempiere/form/VPOS'
// // Utils and Helper Methods

// Utils and Helper Methods
import { isEmptyValue } from '@/utils/ADempiere/valueUtils.js'
import { showMessage } from '@/utils/ADempiere/notification'
import { buildLinkHref } from '@/utils/ADempiere/resource.js'
// Constants
import { REPORT_VIEWER_NAME } from '@/utils/ADempiere/constants/report'

const options = {
showOptions: false,
Expand Down
15 changes: 9 additions & 6 deletions src/store/modules/ADempiere/pointOfSales/order/actions.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* ADempiere-Vue (Frontend) for ADempiere ERP & CRM Smart Business Solution
* Copyright (C) 2017-Present E.R.P. Consultores y Asociados, C.A. www.erpya.com
* Copyright (C) 2018-Present E.R.P. Consultores y Asociados, C.A. www.erpya.com
* Contributor(s): Elsio Sanchez [email protected] https://github.com/elsiosanchez
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -9,7 +9,7 @@
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
Expand All @@ -19,7 +19,12 @@
import language from '@/lang'
import router from '@/router'

// api request methods
// Constants
import {
REPORT_VIEWER_NAME
} from '@/utils/ADempiere/dictionary/report'

// API Request Methods
import {
createOrder,
getOrder,
Expand All @@ -30,14 +35,12 @@ import {
printTicketPreviwer
} from '@/api/ADempiere/form/point-of-sales.js'

// utils and helper methods
// Utils and Helper Methods
import { isEmptyValue, convertValuesToSendListOrders } from '@/utils/ADempiere/valueUtils.js'
import { extractPagingToken, generatePageToken } from '@/utils/ADempiere/dataUtils'
import { showMessage } from '@/utils/ADempiere/notification.js'
import { buildLinkHref } from '@/utils/ADempiere/resource.js'

// Constants
import { REPORT_VIEWER_NAME } from '@/utils/ADempiere/constants/report'
/**
* Order Actions
*/
Expand Down
9 changes: 5 additions & 4 deletions src/store/modules/ADempiere/report/reportRun.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// import Vue from 'vue'
import router from '@/router'
import language from '@/lang'

// API Request Methods
import {
generateReportRequest,
Expand All @@ -27,10 +28,10 @@ import {

// Constants
import {
DEFAULT_REPORT_TYPE
} from '@/utils/ADempiere/dictionary/report.js'
import { REPORT_VIEWER_SUPPORTED_FORMATS } from '@/utils/ADempiere/dictionary/report.js'
import { REPORT_VIEWER_NAME } from '@/utils/ADempiere/constants/report'
DEFAULT_REPORT_TYPE,
REPORT_VIEWER_NAME,
REPORT_VIEWER_SUPPORTED_FORMATS
} from '@/utils/ADempiere/dictionary/report'

// Utils
import { buildLinkHref } from '@/utils/ADempiere/resource.js'
Expand Down
11 changes: 6 additions & 5 deletions src/store/modules/ADempiere/reportManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@ import {
} from '@/api/ADempiere/file-management/resource-reference.ts'

// Constants
import {
DEFAULT_REPORT_TYPE
} from '@/utils/ADempiere/dictionary/report.js'
import { config } from '@/utils/ADempiere/config'
import { REPORT_VIEWER_NAME, REPORT_VIEWER_ENGINE_NAME } from '@/utils/ADempiere/constants/report'
import {
DEFAULT_REPORT_TYPE,
REPORT_VIEWER_NAME,
REPORT_VIEWER_ENGINE_NAME
} from '@/utils/ADempiere/dictionary/report'

// Utils and Helper Methods
import { getToken } from '@/utils/auth'
Expand All @@ -59,7 +60,7 @@ import {
import { showMessage, showNotification } from '@/utils/ADempiere/notification.js'
import {
containerManager
} from '@/utils/ADempiere/dictionary/report.js'
} from '@/utils/ADempiere/dictionary/report'
import {
requestShareResources
} from '@/api/ADempiere/file-management/resource-reference.ts'
Expand Down
7 changes: 5 additions & 2 deletions src/store/modules/tagsView.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import router from '@/router'

// constants
import { REPORT_VIEWER_NAME, REPORT_VIEWER_ENGINE_NAME } from '@/utils/ADempiere/constants/report'
// Constants
import {
REPORT_VIEWER_NAME,
REPORT_VIEWER_ENGINE_NAME
} from '@/utils/ADempiere/dictionary/report'

const state = {
visitedViews: [],
Expand Down
94 changes: 0 additions & 94 deletions src/utils/ADempiere/constants/report.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/utils/ADempiere/dictionary/process.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import store from '@/store'
import { requestSaveProcessCustomization } from '@/api/ADempiere/user-customization/processes'

// Constants
import { REPORT_EXPORT_TYPES } from '@/utils/ADempiere/constants/report'
import { REPORT_EXPORT_TYPES } from '@/utils/ADempiere/dictionary/report'
import { BUTTON } from '@/utils/ADempiere/references'

// Utils and Helpers Methods
Expand Down
4 changes: 3 additions & 1 deletion src/utils/ADempiere/dictionary/report/actionsMenu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ import router from '@/router'
import store from '@/store'

// Constants
import { REPORT_VIEWER_NAME } from '@/utils/ADempiere/constants/report'
import {
REPORT_VIEWER_NAME
} from '@/utils/ADempiere/dictionary/report'

// Utils and Helper Methods
import { isEmptyValue } from '@/utils/ADempiere/valueUtils.js'
Expand Down
Loading
Loading