diff --git a/package.json b/package.json index af3dae2d7f6..af6dd5e6aec 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,12 @@ "test:ci": "yarn lint && yarn test:unit" }, "dependencies": { + "@fullcalendar/core": "^6.1.9", + "@fullcalendar/daygrid": "^6.1.9", + "@fullcalendar/interaction": "^6.1.9", + "@fullcalendar/list": "^6.1.9", + "@fullcalendar/timegrid": "^6.1.9", + "@fullcalendar/vue": "^6.1.9", "@kangc/v-md-editor": "^1.7.11", "@toast-ui/editor-plugin-chart": "^3.0.1", "@toast-ui/vue-editor": "3.2.3", diff --git a/src/api/ADempiere/form/accouting.js b/src/api/ADempiere/form/accouting.js index 1f742b65d7e..c09bcccfe8a 100644 --- a/src/api/ADempiere/form/accouting.js +++ b/src/api/ADempiere/form/accouting.js @@ -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 elsiosanches@gmail.com 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 @@ -23,6 +23,66 @@ import { camelizeObjectKeys } from '@/utils/ADempiere/transformObject.js' // Constants import { ROWS_OF_RECORDS_BY_PAGE } from '@/utils/ADempiere/tableUtils' +export function requestListAccoutingSchemas({ + searchValue, + pageToken, + pageSize = 100 +}) { + return request({ + url: '/general-ledger/accounting-schemas', + method: 'get', + params: { + page_size: pageSize, + page_token: pageToken, + // DSL Query + search_value: searchValue + } + }) + .then(response => { + return camelizeObjectKeys(response) + }) +} + +export function requestListOrganizations({ + searchValue, + pageToken, + pageSize = 100 +}) { + return request({ + url: '/general-ledger/organizations', + method: 'get', + params: { + page_size: pageSize, + page_token: pageToken, + // DSL Query + search_value: searchValue + } + }) + .then(response => { + return camelizeObjectKeys(response) + }) +} + +export function requestPostingTypesList({ + searchValue, + pageToken, + pageSize = 100 +}) { + return request({ + url: '/general-ledger/posting-types', + method: 'get', + params: { + page_size: pageSize, + page_token: pageToken, + // DSL Query + search_value: searchValue + } + }) + .then(response => { + return camelizeObjectKeys(response) + }) +} + export function requestAccountingFacts({ tableName, recordId, @@ -94,63 +154,3 @@ export function requestStartRePost({ return camelizeObjectKeys(response) }) } - -export function listAccoutingSchemasRequest({ - searchValue, - pageToken, - pageSize = 100 -}) { - return request({ - url: '/general-ledger/accounting-schemas', - method: 'get', - params: { - page_size: pageSize, - page_token: pageToken, - // DSL Query - search_value: searchValue - } - }) - .then(response => { - return camelizeObjectKeys(response) - }) -} - -export function listPostingTypesRequest({ - searchValue, - pageToken, - pageSize = 100 -}) { - return request({ - url: '/general-ledger/posting-types', - method: 'get', - params: { - page_size: pageSize, - page_token: pageToken, - // DSL Query - search_value: searchValue - } - }) - .then(response => { - return camelizeObjectKeys(response) - }) -} - -export function listOrganizationsRequest({ - searchValue, - pageToken, - pageSize = 100 -}) { - return request({ - url: '/general-ledger/list-organizations', - method: 'get', - params: { - page_size: pageSize, - page_token: pageToken, - // DSL Query - search_value: searchValue - } - }) - .then(response => { - return camelizeObjectKeys(response) - }) -} diff --git a/src/api/ADempiere/form/point-of-sales.js b/src/api/ADempiere/form/point-of-sales.js index 3d6b1bad7ba..4bce1a86dc5 100644 --- a/src/api/ADempiere/form/point-of-sales.js +++ b/src/api/ADempiere/form/point-of-sales.js @@ -626,6 +626,7 @@ export function createPayment({ chargeUuid, isRefund, currencyUuid, + invoiceReferenceId, collectingAgentUuid, customerBankAccountUuid, referenceBankAccountUuid @@ -646,6 +647,7 @@ export function createPayment({ tender_type_code: tenderTypeCode, payment_method_uuid: paymentMethodUuid, is_refund: isRefund, + invoice_reference_id: invoiceReferenceId, currency_uuid: currencyUuid, collecting_agent_uuid: collectingAgentUuid, reference_bank_account_uuid: referenceBankAccountUuid, diff --git a/src/api/ADempiere/process.js b/src/api/ADempiere/process.js index 2d89559934f..ed7ef1bceae 100644 --- a/src/api/ADempiere/process.js +++ b/src/api/ADempiere/process.js @@ -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): Edwin Betancourt EdwinBetanc0urt@outlook.com https://github.com/EdwinBetanc0urt * 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 @@ -41,12 +41,14 @@ import { ROWS_OF_RECORDS_BY_PAGE } from '@/utils/ADempiere/tableUtils' export function requestRunProcess({ id, uuid, + parametersList = [], + // window tableName, recordId, recordUuid, - parametersList = [], - selectionsList = [], - tableSelectedId + // browse + browserId, + selectionsList = [] }) { parametersList = parametersList.map(parameter => { return { @@ -61,11 +63,13 @@ export function requestRunProcess({ data: { id, uuid, + parameters: parametersList, + // table_name: tableName, record_id: recordId, record_uuid: recordUuid, - table_selected_id: tableSelectedId, - parameters: parametersList, + // + browser_id: browserId, selections: selectionsList } }) diff --git a/src/components/ADempiere/Form/AcctViewer/ActionsFooter/index.vue b/src/components/ADempiere/Form/AcctViewer/ActionsFooter/index.vue new file mode 100644 index 00000000000..4f2e51f15a7 --- /dev/null +++ b/src/components/ADempiere/Form/AcctViewer/ActionsFooter/index.vue @@ -0,0 +1,176 @@ + + + + + diff --git a/src/components/ADempiere/Form/AcctViewer/QueryCriteria/accoutingSchemaFilter.vue b/src/components/ADempiere/Form/AcctViewer/QueryCriteria/accoutingSchemaFilter.vue new file mode 100644 index 00000000000..8900631ac2a --- /dev/null +++ b/src/components/ADempiere/Form/AcctViewer/QueryCriteria/accoutingSchemaFilter.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/src/components/ADempiere/Form/AcctViewer/QueryCriteria/index.vue b/src/components/ADempiere/Form/AcctViewer/QueryCriteria/index.vue new file mode 100644 index 00000000000..e04851a1a6e --- /dev/null +++ b/src/components/ADempiere/Form/AcctViewer/QueryCriteria/index.vue @@ -0,0 +1,96 @@ + + + + + diff --git a/src/components/ADempiere/Form/AcctViewer/QueryCriteria/organizationFilter.vue b/src/components/ADempiere/Form/AcctViewer/QueryCriteria/organizationFilter.vue new file mode 100644 index 00000000000..22278510c7a --- /dev/null +++ b/src/components/ADempiere/Form/AcctViewer/QueryCriteria/organizationFilter.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/components/ADempiere/Form/AcctViewer/QueryCriteria/postingTypeFilter.vue b/src/components/ADempiere/Form/AcctViewer/QueryCriteria/postingTypeFilter.vue new file mode 100644 index 00000000000..576abfc744d --- /dev/null +++ b/src/components/ADempiere/Form/AcctViewer/QueryCriteria/postingTypeFilter.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/src/components/ADempiere/Form/AcctViewer/TableRecords/accountElementColumns.vue b/src/components/ADempiere/Form/AcctViewer/TableRecords/accountElementColumns.vue new file mode 100644 index 00000000000..d9576313348 --- /dev/null +++ b/src/components/ADempiere/Form/AcctViewer/TableRecords/accountElementColumns.vue @@ -0,0 +1,50 @@ + + + + + diff --git a/src/components/ADempiere/Form/AcctViewer/TableRecords/filterColumns.vue b/src/components/ADempiere/Form/AcctViewer/TableRecords/filterColumns.vue new file mode 100644 index 00000000000..36411cee55b --- /dev/null +++ b/src/components/ADempiere/Form/AcctViewer/TableRecords/filterColumns.vue @@ -0,0 +1,166 @@ + + + + + + + diff --git a/src/components/ADempiere/Form/AcctViewer/TableRecords/index.vue b/src/components/ADempiere/Form/AcctViewer/TableRecords/index.vue new file mode 100644 index 00000000000..c1c1cef957f --- /dev/null +++ b/src/components/ADempiere/Form/AcctViewer/TableRecords/index.vue @@ -0,0 +1,270 @@ + + + + + diff --git a/src/components/ADempiere/Form/AcctViewer/TableRecords/quantityColumns.vue b/src/components/ADempiere/Form/AcctViewer/TableRecords/quantityColumns.vue new file mode 100644 index 00000000000..47ac4f7cc5a --- /dev/null +++ b/src/components/ADempiere/Form/AcctViewer/TableRecords/quantityColumns.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/src/components/ADempiere/Form/AcctViewer/TableRecords/sourceColumns.vue b/src/components/ADempiere/Form/AcctViewer/TableRecords/sourceColumns.vue new file mode 100644 index 00000000000..91f0459b75e --- /dev/null +++ b/src/components/ADempiere/Form/AcctViewer/TableRecords/sourceColumns.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/src/components/ADempiere/Form/AcctViewer/fieldsList.js b/src/components/ADempiere/Form/AcctViewer/fieldsList.js new file mode 100644 index 00000000000..2e1cff6cbcd --- /dev/null +++ b/src/components/ADempiere/Form/AcctViewer/fieldsList.js @@ -0,0 +1,43 @@ +/** + * 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): Edwin Betancourt EdwinBetanc0urt@outlook.com https://github.com/EdwinBetanc0urt + * 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 . + */ + +export default [ + // TODO: Add User1_ID, User2_ID, User3_ID, User4_ID to database translations + // // Accounting Schema + // { + // fieldUuid: '8d3bc8b6-fb40-11e8-a479-7a0060f0aa01', + // uuid: '8d3bc8b6-fb40-11e8-a479-7a0060f0aa01', + // isFromDictionary: true, + // overwriteDefinition: { + // size: 8, + // sequence: 10, + // defaultValue: '$C_AcctSchema_ID' + // } + // }, + // // Posting Type + // { + // fieldUuid: '8d37f330-fb40-11e8-a479-7a0060f0aa01', + // uuid: '8d37f330-fb40-11e8-a479-7a0060f0aa01', + // isFromDictionary: true, + // overwriteDefinition: { + // size: 8, + // sequence: 20, + // isMandatory: false + // } + // } +] diff --git a/src/components/ADempiere/Form/AcctViewer/index.vue b/src/components/ADempiere/Form/AcctViewer/index.vue new file mode 100644 index 00000000000..4c6b5b927c7 --- /dev/null +++ b/src/components/ADempiere/Form/AcctViewer/index.vue @@ -0,0 +1,142 @@ + + + + + diff --git a/src/components/ADempiere/Form/VBankStatementMatch/index.vue b/src/components/ADempiere/Form/VBankStatementMatch/index.vue index 265ba873d90..444173e952d 100644 --- a/src/components/ADempiere/Form/VBankStatementMatch/index.vue +++ b/src/components/ADempiere/Form/VBankStatementMatch/index.vue @@ -18,7 +18,7 @@