-
+
-
-
diff --git a/client/src/modules/inventory/list/templates/reference_number.cell.html b/client/src/modules/inventory/list/templates/reference_number.cell.html
index 85e4ae65d9..93b60246a2 100644
--- a/client/src/modules/inventory/list/templates/reference_number.cell.html
+++ b/client/src/modules/inventory/list/templates/reference_number.cell.html
@@ -1,5 +1,5 @@
- {{ row.entity.external_reference_number }}
+ {{ row.entity.reference_number }}
\ No newline at end of file
diff --git a/server/controllers/inventory/inventory/core.js b/server/controllers/inventory/inventory/core.js
index 5a1201dc39..92b8d2716f 100644
--- a/server/controllers/inventory/inventory/core.js
+++ b/server/controllers/inventory/inventory/core.js
@@ -252,7 +252,7 @@ async function getItemsMetadata(params) {
inventory.consumable,inventory.locked, inventory.stock_min,
inventory.stock_max, inventory.created_at AS timestamp, inventory.type_id, inventory.unit_id,
inventory.note, inventory.unit_weight, inventory.unit_volume, inventory.is_asset,
- inventory.external_reference_number, inventory.manufacturer_brand, inventory.manufacturer_model,
+ inventory.reference_number, inventory.manufacturer_brand, inventory.manufacturer_model,
ig.sales_account, ig.stock_account, ig.donation_account, inventory.sellable,
inventory.note, inventory.unit_weight, inventory.unit_volume, ig.sales_account, ig.stock_account,
ig.donation_account, ig.cogs_account, inventory.default_quantity, ig.tracking_consumption, ig.tracking_expiration,
@@ -285,7 +285,7 @@ async function getItemsMetadata(params) {
filters.equals('is_asset');
filters.equals('manufacturer_brand');
filters.equals('manufacturer_model');
- filters.equals('external_reference_number');
+ filters.equals('reference_number');
filters.custom('tags', 't.uuid IN (?)', [params.tags]);
filters.custom('find_null_importance', 'inventory.importance IS NULL');
filters.custom('inventory_uuids', 'inventory.uuid IN (?)', params.inventory_uuids);
@@ -337,7 +337,7 @@ function remove(_uuid) {
*/
async function getItemsMetadataById(uid, query = {}) {
const sql = `
- SELECT BUID(i.uuid) as uuid, i.code, i.text AS label, i.price, i.is_asset, i.external_reference_number,
+ SELECT BUID(i.uuid) as uuid, i.code, i.text AS label, i.price, i.is_asset, i.reference_number,
iu.abbr AS unit, it.text AS type, ig.name AS groupName, BUID(ig.uuid) AS group_uuid,
ig.unique_item, i.consumable, i.locked, i.stock_min, i.sellable,
i.stock_max, i.created_at AS timestamp, i.type_id, i.unit_id, i.unit_weight, i.unit_volume,
diff --git a/server/models/migrations/next/migrate.sql b/server/models/migrations/next/migrate.sql
index 2c6e00eca3..ec3456ee7e 100644
--- a/server/models/migrations/next/migrate.sql
+++ b/server/models/migrations/next/migrate.sql
@@ -60,3 +60,7 @@ CALL add_column_if_missing('inventory', 'manufacturer_model', 'TEXT NULL');
CALL add_column_if_missing('inventory_type', 'description', 'TEXT NULL');
CALL add_column_if_missing('inventory_type', 'is_predefined', 'TINYINT(1) NOT NULL DEFAULT 0');
+
+ALTER TABLE `inventory_type`
+ CHANGE COLUMN `text` `text` VARCHAR(200) NOT NULL COLLATE AFTER `id`;
+
diff --git a/server/models/schema.sql b/server/models/schema.sql
index 35d858dc8a..a996b073bb 100644
--- a/server/models/schema.sql
+++ b/server/models/schema.sql
@@ -794,7 +794,7 @@ CREATE TABLE `inventory` (
`num_delivery` INT(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Number of stock delivery' ,
`importance` SMALLINT(5) NULL COMMENT 'Inventory level of importance : 1 -> LOW, 2 -> MID, 3 -> HIGH' ,
`is_asset` TINYINT(1) NOT NULL DEFAULT 0,
- `external_reference_number` TEXT NULL,
+ `reference_number` TEXT NULL,
`manufacturer_brand` TEXT NULL,
`manufacturer_model` TEXT NULL,
`created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
diff --git a/test/integration/inventory/metadata.js b/test/integration/inventory/metadata.js
index 7634ed2df5..450d0ebcd2 100644
--- a/test/integration/inventory/metadata.js
+++ b/test/integration/inventory/metadata.js
@@ -20,7 +20,7 @@ describe('(/inventory/metadata) The inventory metadata http API', () => {
sellable : 1,
importance : 2,
is_asset : 1,
- external_reference_number : 'BHIMA_O1',
+ reference_number : 'BHIMA_O1',
manufacturer_brand : 'BHIMA',
manufacturer_model : '2.X',
};