X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ftypes.inc;h=8bf64e97ae9804f4eb9ab1ac6b6ebe68944ad435;hb=86e4d1627183fb4d97fe145a5dd33b43b03284ee;hp=d4f3c4a17bc4c676203a302cb6cadb718c8c2663;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git

diff --git a/includes/types.inc b/includes/types.inc
index d4f3c4a1..8bf64e97 100644
--- a/includes/types.inc
+++ b/includes/types.inc
@@ -216,8 +216,8 @@ class payment_person_types
     			$qe = get_quick_entry($person_id);
     			return ($full?payment_person_types::type_name($type) . " ":"") . $qe["description"];
     		case payment_person_types::WorkOrder() :
-    			$wo = get_work_order($person_id);
-    			return ($full?payment_person_types::type_name($type) . " ":"") . $wo["wo_ref"];
+    			global $wo_cost_types;
+    			return $wo_cost_types[$person_id];
     		case payment_person_types::customer() :
     			return ($full?payment_person_types::type_name($type) . " ":"") . get_customer_name($person_id);
     		case payment_person_types::supplier() :
@@ -309,6 +309,39 @@ class wo_types
 	}
 }
 
+define('CL_NONE', 0); // for backward compatibility
+define('CL_ASSETS', 1);
+define('CL_LIABILITIES', 2);
+define('CL_EQUITY', 3);
+define('CL_INCOME', 4);
+define('CL_COGS', 5);
+define('CL_EXPENSE', 6);
+
+$class_types = array(
+		CL_ASSETS => _("Assets"),
+		CL_LIABILITIES => _("Liabilities"),
+		CL_EQUITY => _("Equity"),
+		CL_INCOME => _("Income"),
+		CL_COGS => _("Cost of Goods Sold"),
+		CL_EXPENSE => _("Expense"),
+);
+
+function get_class_type_convert($ctype)
+{
+	global $use_oldstyle_convert;
+	if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
+		return (($ctype >= CL_INCOME || $ctype == CL_NONE) ? -1 : 1);
+	else	
+		return ((($ctype >= CL_LIABILITIES && $ctype <= CL_INCOME) || $ctype == CL_NONE) ? -1 : 1);
+}
+define('WO_LABOUR', 0);
+define('WO_OVERHEAD', 1);
+
+$wo_cost_types = array(
+		WO_LABOUR => _("Labour Cost"),
+		WO_OVERHEAD => _("Overhead Cost"),
+);
+
 $quick_actions = array(
 	'=' => _('Remainder'), // post current base amount to GL account
 	'a' => _('Amount'), // post amount to GL account
@@ -337,6 +370,4 @@ $quick_entry_types = array(
 		QE_SUPPINV => _("Supplier Invoice/Credit")
 );
 
-
-
 ?>
\ No newline at end of file