partkeepr

commit af2ab0f8fb449cb56a9ef7c47337864e02c4af6d
parent b4eca5ca0ad4645f7ce202ed61249cb19c07d42c
Author: Felicitus <felicitus@felicitus.org>
Date:   Fri,  3 May 2013 10:42:02 +0200

Merge branch 'master' of github.com:partkeepr/PartKeepr

Diffstat:
M
src/backend/PartKeepr/Part/PartManager.php
 | 
2
+-
M
src/frontend/js/Components/Part/PartsGrid.js
 | 
2
+-
M
src/frontend/js/Models/Part.js
 | 
2
++

3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/backend/PartKeepr/Part/PartManager.php b/src/backend/PartKeepr/Part/PartManager.php
@@ -47,7 +47,7 @@ class PartManager extends AbstractManager {
 					"minStockLevel", "comment", "st.id AS storageLocation_id", "c.categoryPath AS categoryPath",
 					"st.name as storageLocationName", "f.id AS footprint_id", "f.name AS footprintName",
 					"c.id AS category", "c.name AS categoryName", "pu.id AS partUnit", "pu.name AS partUnitName",
-					"pu.is_default AS partUnitDefault", "partCondition"
+                    "pu.shortName AS partUnitShortName", "pu.is_default AS partUnitDefault", "partCondition"
 				);
 	}
 	
diff --git a/src/frontend/js/Components/Part/PartsGrid.js b/src/frontend/js/Components/Part/PartsGrid.js
@@ -296,7 +296,7 @@ Ext.define('PartKeepr.PartsGrid', {
 	stockLevelRenderer: function (val,q,rec)
 	{
 		if (rec.get("partUnitDefault") !== true) {
-			return val + " " + rec.get("partUnitName");
+			return val + " " + rec.get("partUnitShortName");
 		} else {
 			return val;
 		}
diff --git a/src/frontend/js/Models/Part.js b/src/frontend/js/Models/Part.js
@@ -23,6 +23,8 @@ Ext.define("PartKeepr.Part", {
 	         {	name: 'initialStockLevelPrice',	type: 'float'},
 	         {	name: 'initialStockLevelPricePerItem',	type: 'boolean'},
 	         {	name: 'partUnitName',		type: 'string'},
+             {	name: 'partUnitShortName',	type: 'string'},
+
 	         {	name: 'footprintName',		type: 'string'},
 	         {	name: 'storageLocationName',type: 'string'},
 	         {	name: 'categoryName',		type: 'string'},