diff --git a/config/default.json b/config/default.json
index f24efc6c..9cceed36 100644
--- a/config/default.json
+++ b/config/default.json
@@ -36,5 +36,8 @@
},
"match": {
"endpoint": "/form/addons/match"
+ },
+ "Weight": {
+ "endpoint": "/form/addons/weight"
}
}
diff --git a/package-lock.json b/package-lock.json
index ca2acd98..4b146787 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17884,9 +17884,15 @@
}
},
"vue-loader-v16": {
+<<<<<<< HEAD
+ "version": "npm:vue-loader@16.4.1",
+ "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.4.1.tgz",
+ "integrity": "sha512-nL1bDhfMAZgTVmVkOXQaK/WJa9zFDLM9vKHbh5uGv6HeH1TmZrXMWUEVhUrACT38XPhXM4Awtjj25EvhChEgXw==",
+=======
"version": "npm:vue-loader@16.5.0",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz",
"integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==",
+>>>>>>> develop
"dev": true,
"optional": true,
"requires": {
diff --git a/src/api/ADempiere/form/weight.js b/src/api/ADempiere/form/weight.js
new file mode 100644
index 00000000..ee58e0fe
--- /dev/null
+++ b/src/api/ADempiere/form/weight.js
@@ -0,0 +1,44 @@
+// ADempiere-Vue (Frontend) for ADempiere ERP & CRM Smart Business Solution
+// Copyright (C) 2017-Present E.R.P. Consultores y Asociados, C.A.
+// Contributor(s): Yamel Senih ysenih@erpya.com www.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
+// (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 .
+
+import { request } from '@/utils/ADempiere/request'
+import { config } from '@/utils/ADempiere/config'
+
+// Get Weight
+export function getWeight({
+ idScale
+}) {
+ return request({
+ url: `${config.Weight.endpoint}/weight`,
+ method: 'get',
+ params: {
+ id_scale: idScale
+ }
+ })
+ .then(weightResponse => {
+ return weightResponse
+ })
+}
+// List Scale
+export function getListScale() {
+ return request({
+ url: `${config.Weight.endpoint}/scale`,
+ method: 'get'
+ })
+ .then(scaleResponse => {
+ return scaleResponse
+ })
+}
diff --git a/src/components/ADempiere/Form/VGetWeight/index.vue b/src/components/ADempiere/Form/VGetWeight/index.vue
new file mode 100644
index 00000000..6759e376
--- /dev/null
+++ b/src/components/ADempiere/Form/VGetWeight/index.vue
@@ -0,0 +1,169 @@
+
+
+
+
+
+
+
+
+ {{ scale.name }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/ADempiere/Form/index.vue b/src/components/ADempiere/Form/index.vue
index e0c4d36c..4608db97 100644
--- a/src/components/ADempiere/Form/index.vue
+++ b/src/components/ADempiere/Form/index.vue
@@ -63,6 +63,9 @@ export default {
case 'VPOS':
form = import('@/components/ADempiere/Form/VPOS')
break
+ case 'VGetWeight':
+ form = import('@/components/ADempiere/Form/VGetWeight')
+ break
default:
form = import('@/views/ADempiere/Unsupported')
break
diff --git a/src/lang/ADempiere/en.js b/src/lang/ADempiere/en.js
index fc9456cf..b0ad474d 100644
--- a/src/lang/ADempiere/en.js
+++ b/src/lang/ADempiere/en.js
@@ -611,6 +611,7 @@ export default {
table: {
nrDocument: 'Nr Document'
}
- }
+ },
+ weight: 'Weight'
}
}
diff --git a/src/lang/ADempiere/es.js b/src/lang/ADempiere/es.js
index 033fefe4..0ccec4e4 100644
--- a/src/lang/ADempiere/es.js
+++ b/src/lang/ADempiere/es.js
@@ -593,6 +593,7 @@ export default {
table: {
nrDocument: 'Nr Docuemnto'
}
- }
+ },
+ weight: 'Peso'
}
}
diff --git a/src/views/ADempiere/Form/index.vue b/src/views/ADempiere/Form/index.vue
index 33fd051a..b030313b 100644
--- a/src/views/ADempiere/Form/index.vue
+++ b/src/views/ADempiere/Form/index.vue
@@ -51,7 +51,7 @@
>